299 files changed, 75527 insertions, 66738 deletions

diff --git a/ChangeLog b/ChangeLog
index ba945aa..aae6f20 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,181 @@
+2009-12-24  karl <charcoal@users.sf.net>
+
+	* 3.1.2 release.
+	* updates to src/gnome2/Makefile.am: distribution tarball sanity.
+	
+2009-12-19  karl <charcoal@users.sf.net>
+
+	* change freenode webchat to use $USER (g_get_user_name()).
+	
+2009-12-14  karl <charcoal@users.sf.net>
+
+	* preferences locale list: display language names, not xx_YY.
+	* fixed <div align=(right|left)> problem.
+	
+2009-12-14 simon<DrMeers@users.sourceforge.net>
+
+	* fixed tab bug -- closing tab B focused tab A, but cur_passage_tab
+	  got set to tab C! 
+
+2009-12-04 simon<DrMeers@users.sourceforge.net>
+
+	* fixed window title bug -- changing modules in the sidebar treeview
+	  updated window title to _previous_ module, because
+	  gui_change_window_title used tab settings prior to update
+
+2009-12-04 matthew<ransom1982@users.sourceforge.net>
+	   simon<DrMeers@users.sourceforge.net>
+
+	* new book icons for module list to better match colors
+	* improved rendering for icons
+	* rtol icons for module lists
+
+2009-12-04 matthew<ransom1982@users.sourceforge.net>
+
+	* de-gnome menus and as many other functions as possible
+	* add option to waf to build without gnome
+
+2009-12-02 matthew<ransom1982@users.sourceforge.net>
+
+	* removed display_mgr from backend
+	* delay starting search backend
+
+2009-11-28 matthew<ransom1982@users.sourceforge.net>
+
+	* added code to use libgsf to archive files
+	* small improvements to Windows file finding
+	* module manager optimizations
+
+2009-11-18 terry <tbiggs@users.sourceforge.net>
+
+	*added search results and verse lists to exporter
+
+2009-11-12  karl <charcoal@users.sf.net>
+
+	* improve search word color marking slightly, so that wildcard-
+	  matched roots get colored.
+
+2009-11-10 terry <tbiggs@users.sourceforge.net>
+
+	* add bookmark exporter.
+
+2009-11-04  karl <charcoal@users.sf.net>
+
+	* Ensure mod.mgr always has a proper icon.
+
+2009-10-27  karl <charcoal@users.sf.net>
+
+	* Resurrect verse number color selector in preferences.
+	  Also removed some defunct enums, unused for years.
+
+2009-09-30  karl <charcoal@users.sf.net>
+
+	* add gui_init() calls to settings_init() to ensure that gnome/gtk
+	  are ready if we should need any dialogs.
+	* add static status variable to gui_init() so it happens just once.
+
+2009-09-21  matthew<ransom1982@users.sourceforge.net>
+
+	* change Windows to use ShellExecuteW instead of gnome_show_url
+	* new function xiphos_open_default to open anything on any platform
+	* change help menu to point to new location for chm files on Windows
+	* added linkbutton hook so that linkbuttons (in about dialogs) would
+	   work on Windows
+
+2009-09-21  karl <charcoal@users.sf.net>
+
+	* move gconf_setup() to gui_init() where it belongs.
+
+2009-09-12  karl <charcoal@users.sf.net>
+
+	* feat.req #2813476 Interface localization (prefs->options)
+
+2009-09-06  karl <charcoal@users.sf.net>
+
+	* correct re-appearing remote ftp source for delete-then-load-standard.
+	* fix #2825898 Search triggers show-up of markers in Preview
+	  (by accurately detecting within/without html constructs).
+	* consequently removed <a></a> elimination code as well.
+	* corrected gtk store error for prayerlist (lacking -1 terminator).
+	* avoid widget destroy whine for null widget.
+	* fix #2813891 lose comm name from tab when un-Viewed.
+	* address #2798255 with a manual update.
+	* also mention Load Standard button for module manager.
+	* fix #2797805 added a word: Show/Hide _Attached_ Sidebar.
+	* feat.req.#2190241 add Enter key support for bookmarks,
+	  annotations, mod.mgr remote sources.
+	* feat.req #2797789 Open pane for activated resource (sidebar.cc)
+
+2009-09-05  karl <charcoal@users.sf.net>
+
+	* 2nd shot at CrossWire as default remote repo, requiring rather a
+	  lot of other code re-factoring due to the interdependence of the
+	  1st-time user's mod.mgr vis-a-vis existence of settings.xml data.
+
+2009-09-03  karl <charcoal@users.sf.net>
+
+	* add intro dialog box to first-time mod.mgr usage.
+	* re-work the entire locale-setting mechanism.
+	* force CrossWire as default remote repo after load-standard.
+
+2009-09-01  karl <charcoal@users.sf.net>
+
+	* fix #2841441 per verse annotation - localized reference
+	* implied a bunch of other stuff:
+	  - convert <markedverses> to <osisrefmarkedverses> on init.
+	  - move locale init inside backend ctor.
+	  - localize *u refs for previewer, per bug report.
+	  - parse in osisref form.
+	  - dispose of bogus ".xiphos-2.0" dir rename (historic from
+	    very old .gnomesword-2.0 needs).
+
+2009-08-31  karl <charcoal@users.sf.net>
+
+	* remove devotionals from "lookup selection" menus.
+	* correct null key pointer in sword.cc debug message.
+
+2009-08-21  karl <charcoal@users.sf.net>
+
+	* ensure a bit of whitespace between strong's elements when
+	  they repeat.  they can get bunched up on top of each other
+	  too easily.
+	* fix another blocking nightmare: some modules (ABP) contain
+	  bogus sequences like <seg><hi><seg><hi>word</hi></seg></hi></seg>.
+	  this results in doubling, <i><i>word</i></i>.  the block
+	  renderer gets unhappy when it mis-analyzes termination by
+	  finding the inner </i> as though it were the termination of
+	  the outer <i>.  so if we find we have an internal set of
+	  <i></i>, we simply wipe them to spaces, and try again.
+	  ugh.
+	* apply patch by andrew anderson, to respect showversenum in the
+	  passage exporter.  some additional mods beyond his basic patch.
+
+2009-08-20 matthew <ransom1982@users.sourceforge.net>
+
+	* fix #2825281 Sidebar/Regular Expression search: not finding all matches
+	
+2009-08-17  karl <charcoal@users.sf.net>
+
+	* change main window title per actually-displayed modules.
+	  (echoes tab module choice; borrows same code.)
+
+2009-08-15  karl <charcoal@users.sf.net>
+
+	* fix #2803614 Search in unpointed Hebrew not working, by ensuring
+	  that all vowel points & accents are turned off in modules and
+	  search strings.
+
+2009-08-13  karl <charcoal@users.sf.net>
+
+	* implemented glib null string detection skeleton.  enabled as part of DEBUG.
+
+2009-08-10 terry <tbiggs@users.sourceforge.net>
+
+	* added ui/editor_link_dialog.xml, editor/link_dialog.c and
+	  editor/link_dialog.h 
+	* added New menu item and button to studypad (slib-editor)
+	* added Delete menu item and button to note editor (slib-editor) 
+
 2009-08-09  karl <charcoal@users.sf.net>
 
 	* 3.1.1 release.
diff --git a/Makefile.am b/Makefile.am
index 7d14374..41fba70 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,12 +1,16 @@
 ## Process this file with automake to produce Makefile.in
 
+desktopdir = $(datadir)/applications
+desktop_in_files = @PACKAGE@.desktop.in.in
+desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop)
+
 @INTLTOOL_DESKTOP_RULE@
 
-SUBDIRS = doc po src ui help
+SUBDIRS = doc po src ui help pixmaps
 
 DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper
 
-xiphosdoc_DATA = \
+dist_doc_DATA = \
 	README \
 	RELEASE-NOTES \
 	COPYING \
@@ -16,8 +20,7 @@ xiphosdoc_DATA = \
 	INSTALL \
 	NEWS \
 	TODO \
-	Xiphos.ogg \
-	help/xiphos.pdf
+	Xiphos.ogg
 
 ACLOCAL_AMFLAGS = -I m4
 
@@ -29,49 +32,20 @@ EXTRA_DIST = \
 	intltool-extract.in \
 	intltool-merge.in \
 	intltool-update.in \
-	COPYING-DOCS \
 	TRANSLATION-HOWTO \
-	RELEASE-NOTES \
-	Xiphos.ogg \
-	help/xiphos.pdf
+	m4/* \
+	waf \
+	wscript \
+	waffles/__init__.py \
+	waffles/editor.py \
+	waffles/gecko.py \
+	waffles/gtkhtml.py \
+	waffles/misc.py \
+	src/examples/ipc_client.c \
+	src/examples/ipc_client.py \
+	src/examples/Makefile
 
 DISTCLEANFILES = gnome-doc-utils.make
 
-xiphosdocdir = $(prefix)/@NO_PREFIX_PACKAGE_DOC_DIR@
-
-gnomemenudir = $(datadir)/applications
-gnomemenu_premerge_file = xiphos.desktop.in
-gnomemenu_DATA = $(gnomemenu_premerge_file:.desktop.in=.desktop)
-
-install-data-local:
-	@$(NORMAL_INSTALL)
-	if test -d $(srcdir)/pixmaps; then \
-          $(mkinstalldirs) $(DESTDIR)$(datadir)/pixmaps/${PACKAGE}; \
-          for pixmap in $(srcdir)/pixmaps/*; do \
-            if test -f $$pixmap; then \
-              $(INSTALL_DATA) $$pixmap $(DESTDIR)$(datadir)/pixmaps/${PACKAGE}; \
-            fi \
-          done \
-	fi
-
-	$(mkinstalldirs) $(DESTDIR)$(datadir)/applications
-	$(INSTALL_DATA) ${PACKAGE}.desktop $(DESTDIR)$(datadir)/applications
-
-uninstall-local:
-	@$(NORMAL_UNINSTALL)
-	rm -f -r $(DESTDIR)$(datadir)/pixmaps/${PACKAGE}
-	rm -f $(DESTDIR)$(datadir)/applications/${PACKAGE}.desktop
-	rm -f -r $(DESTDIR)$(datadir)/gnome/help/${PACKAGE}
-
-dist-hook:
-	if test -d pixmaps; then \
-          mkdir $(DESTDIR)$(distdir)/pixmaps; \
-          for pixmap in pixmaps/*; do \
-            if test -f $$pixmap; then \
-              cp -p $$pixmap $(DESTDIR)$(distdir)/pixmaps; \
-            fi \
-          done \
-        fi
-
 rpm: dist
 	rpmbuild -ta $(distdir).tar.gz
diff --git a/Makefile.in b/Makefile.in
index 8254174..119f5e3 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 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.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@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
@@ -33,16 +35,20 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = .
-DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
-	$(srcdir)/xiphos.desktop.in.in $(srcdir)/xiphos.spec.in \
-	$(top_srcdir)/configure ABOUT-NLS AUTHORS COPYING ChangeLog \
-	INSTALL NEWS TODO acconfig.h config.guess config.sub depcomp \
-	install-sh ltmain.sh missing mkinstalldirs
+DIST_COMMON = README $(am__configure_deps) $(dist_doc_DATA) \
+	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(srcdir)/config.h.in $(srcdir)/xiphos.desktop.in.in \
+	$(srcdir)/xiphos.spec.in $(top_srcdir)/configure ABOUT-NLS \
+	AUTHORS COPYING ChangeLog INSTALL NEWS TODO compile \
+	config.guess config.sub depcomp install-sh ltmain.sh missing \
+	mkinstalldirs
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gecko.m4 \
 	$(top_srcdir)/m4/gnome-doc-utils.m4 \
-	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in
+	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
@@ -50,6 +56,13 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES = xiphos.desktop.in xiphos.spec
+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 \
@@ -64,14 +77,29 @@ am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(gnomemenudir)" \
-	"$(DESTDIR)$(xiphosdocdir)"
-gnomemenuDATA_INSTALL = $(INSTALL_DATA)
-xiphosdocDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(gnomemenu_DATA) $(xiphosdoc_DATA)
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__installdirs = "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(docdir)"
+DATA = $(desktop_DATA) $(dist_doc_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 dist dist-all distcheck
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
@@ -79,22 +107,49 @@ 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); }; }
+  { 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@
+ACLOCAL_AMFLAGS = -I m4
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AM_LDFLAGS = @AM_LDFLAGS@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-A_CPPFLAGS = @A_CPPFLAGS@
 BONOBO_IDL_INCLUDES = @BONOBO_IDL_INCLUDES@
 CATALOGS = @CATALOGS@
 CATOBJEXT = @CATOBJEXT@
@@ -112,17 +167,16 @@ DATADIRNAME = @DATADIRNAME@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DIRS = @DIRS@
+DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper
 DOC_USER_FORMATS = @DOC_USER_FORMATS@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
-EDITOR_CFLAGS = @EDITOR_CFLAGS@
-EDITOR_LIBS = @EDITOR_LIBS@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
 GECKO = @GECKO@
 GECKO_COMPONENT_CFLAGS = @GECKO_COMPONENT_CFLAGS@
 GECKO_COMPONENT_LIBS = @GECKO_COMPONENT_LIBS@
@@ -135,57 +189,26 @@ GECKO_PREFIX = @GECKO_PREFIX@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
-GNOME_CFLAGS = @GNOME_CFLAGS@
-GNOME_LIBS = @GNOME_LIBS@
 GREP = @GREP@
-GTKHTML_314_presence_CFLAGS = @GTKHTML_314_presence_CFLAGS@
-GTKHTML_314_presence_LIBS = @GTKHTML_314_presence_LIBS@
-GTKHTML_38_presence_CFLAGS = @GTKHTML_38_presence_CFLAGS@
-GTKHTML_38_presence_LIBS = @GTKHTML_38_presence_LIBS@
-GTKHTML_CFLAGS = @GTKHTML_CFLAGS@
 GTKHTML_DATA_DIR = @GTKHTML_DATA_DIR@
-GTKHTML_LIBS = @GTKHTML_LIBS@
 HELP_DIR = @HELP_DIR@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PREFIX = @INSTALL_PREFIX@
 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_ICONV = @INTLTOOL_ICONV@
-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
-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_SERVICE_RULE = @INTLTOOL_SERVICE_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_XGETTEXT = @INTLTOOL_XGETTEXT@
-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
-ImageMagick_CFLAGS = @ImageMagick_CFLAGS@
-ImageMagick_LIBS = @ImageMagick_LIBS@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
@@ -194,22 +217,18 @@ MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 MSGFMT_OPTS = @MSGFMT_OPTS@
-NO_PREFIX_PACKAGE_DATA_DIR = @NO_PREFIX_PACKAGE_DATA_DIR@
-NO_PREFIX_PACKAGE_DOC_DIR = @NO_PREFIX_PACKAGE_DOC_DIR@
-NO_PREFIX_PACKAGE_HELP_DIR = @NO_PREFIX_PACKAGE_HELP_DIR@
-NO_PREFIX_PACKAGE_MENU_DIR = @NO_PREFIX_PACKAGE_MENU_DIR@
-NO_PREFIX_PACKAGE_PIXMAPS_DIR = @NO_PREFIX_PACKAGE_PIXMAPS_DIR@
+MSGMERGE = @MSGMERGE@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 OMF_DIR = @OMF_DIR@
 ORBIT_IDL = @ORBIT_IDL@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_DATA_DIR = @PACKAGE_DATA_DIR@
-PACKAGE_DOC_DIR = @PACKAGE_DOC_DIR@
-PACKAGE_HELP_DIR = @PACKAGE_HELP_DIR@
-PACKAGE_MENU_DIR = @PACKAGE_MENU_DIR@
 PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_PIXMAPS_DIR = @PACKAGE_PIXMAPS_DIR@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
@@ -220,28 +239,24 @@ POSUB = @POSUB@
 PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
 PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
 RANLIB = @RANLIB@
-SCROLLKEEPER_BUILD_REQUIRED = @SCROLLKEEPER_BUILD_REQUIRED@
-SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-SWORD_CFLAGS = @SWORD_CFLAGS@
-SWORD_LIBS = @SWORD_LIBS@
-SWORD_MULTIVERSE_CFLAGS = @SWORD_MULTIVERSE_CFLAGS@
-SWORD_MULTIVERSE_LIBS = @SWORD_MULTIVERSE_LIBS@
-UPRINT_CFLAGS = @UPRINT_CFLAGS@
-UPRINT_LIBS = @UPRINT_LIBS@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
+WARN_CFLAGS = @WARN_CFLAGS@
+WARN_CXXFLAGS = @WARN_CXXFLAGS@
 XGETTEXT = @XGETTEXT@
+XIPHOS_CFLAGS = @XIPHOS_CFLAGS@
+XIPHOS_LIBS = @XIPHOS_LIBS@
 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@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -272,6 +287,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -284,14 +300,15 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-tooltiptext_CFLAGS = @tooltiptext_CFLAGS@
-tooltiptext_LIBS = @tooltiptext_LIBS@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 xiphos_exec = @xiphos_exec@
-SUBDIRS = doc po src ui help
-DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper
-xiphosdoc_DATA = \
+desktopdir = $(datadir)/applications
+desktop_in_files = @PACKAGE@.desktop.in.in
+desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop)
+SUBDIRS = doc po src ui help pixmaps
+dist_doc_DATA = \
 	README \
 	RELEASE-NOTES \
 	COPYING \
@@ -301,10 +318,8 @@ xiphosdoc_DATA = \
 	INSTALL \
 	NEWS \
 	TODO \
-	Xiphos.ogg \
-	help/xiphos.pdf
+	Xiphos.ogg
 
-ACLOCAL_AMFLAGS = -I m4
 EXTRA_DIST = \
 	${PACKAGE}.desktop.in.in \
 	${PACKAGE}.spec.in \
@@ -313,17 +328,20 @@ EXTRA_DIST = \
 	intltool-extract.in \
 	intltool-merge.in \
 	intltool-update.in \
-	COPYING-DOCS \
 	TRANSLATION-HOWTO \
-	RELEASE-NOTES \
-	Xiphos.ogg \
-	help/xiphos.pdf
+	m4/* \
+	waf \
+	wscript \
+	waffles/__init__.py \
+	waffles/editor.py \
+	waffles/gecko.py \
+	waffles/gtkhtml.py \
+	waffles/misc.py \
+	src/examples/ipc_client.c \
+	src/examples/ipc_client.py \
+	src/examples/Makefile
 
 DISTCLEANFILES = gnome-doc-utils.make
-xiphosdocdir = $(prefix)/@NO_PREFIX_PACKAGE_DOC_DIR@
-gnomemenudir = $(datadir)/applications
-gnomemenu_premerge_file = xiphos.desktop.in
-gnomemenu_DATA = $(gnomemenu_premerge_file:.desktop.in=.desktop)
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
@@ -334,15 +352,15 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
-	      cd $(srcdir) && $(AUTOMAKE) --gnu  \
+	      echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \
+	      $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \
 		&& exit 0; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -358,9 +376,10 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENC
 	$(SHELL) ./config.status --recheck
 
 $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(srcdir) && $(AUTOCONF)
+	$(am__cd) $(srcdir) && $(AUTOCONF)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+	$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+$(am__aclocal_m4_deps):
 
 config.h: stamp-h1
 	@if test ! -f $@; then \
@@ -371,8 +390,8 @@ config.h: stamp-h1
 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
 	@rm -f stamp-h1
 	cd $(top_builddir) && $(SHELL) ./config.status config.h
-$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) $(top_srcdir)/acconfig.h
-	cd $(top_srcdir) && $(AUTOHEADER)
+$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) 
+	($(am__cd) $(top_srcdir) && $(AUTOHEADER))
 	rm -f stamp-h1
 	touch $@
 
@@ -390,41 +409,47 @@ clean-libtool:
 	-rm -rf .libs _libs
 
 distclean-libtool:
-	-rm -f libtool
-install-gnomemenuDATA: $(gnomemenu_DATA)
+	-rm -f libtool config.lt
+install-desktopDATA: $(desktop_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(gnomemenudir)" || $(MKDIR_P) "$(DESTDIR)$(gnomemenudir)"
-	@list='$(gnomemenu_DATA)'; for p in $$list; do \
+	test -z "$(desktopdir)" || $(MKDIR_P) "$(DESTDIR)$(desktopdir)"
+	@list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(gnomemenuDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(gnomemenudir)/$$f'"; \
-	  $(gnomemenuDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(gnomemenudir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(desktopdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(desktopdir)" || exit $$?; \
 	done
 
-uninstall-gnomemenuDATA:
+uninstall-desktopDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(gnomemenu_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(gnomemenudir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(gnomemenudir)/$$f"; \
-	done
-install-xiphosdocDATA: $(xiphosdoc_DATA)
+	@list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(desktopdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(desktopdir)" && rm -f $$files
+install-dist_docDATA: $(dist_doc_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(xiphosdocdir)" || $(MKDIR_P) "$(DESTDIR)$(xiphosdocdir)"
-	@list='$(xiphosdoc_DATA)'; for p in $$list; do \
+	test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)"
+	@list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(xiphosdocDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(xiphosdocdir)/$$f'"; \
-	  $(xiphosdocDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(xiphosdocdir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(docdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(docdir)" || exit $$?; \
 	done
 
-uninstall-xiphosdocDATA:
+uninstall-dist_docDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(xiphosdoc_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(xiphosdocdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(xiphosdocdir)/$$f"; \
-	done
+	@list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(docdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(docdir)" && rm -f $$files
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -450,7 +475,7 @@ $(RECURSIVE_TARGETS):
 	  else \
 	    local_target="$$target"; \
 	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 	  || eval $$failcom; \
 	done; \
 	if test "$$dot_seen" = "no"; then \
@@ -484,16 +509,16 @@ $(RECURSIVE_CLEAN_TARGETS):
 	  else \
 	    local_target="$$target"; \
 	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  ($(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" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
 	done
 ctags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
 	done
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -501,14 +526,14 @@ ID: $(HEADERS) $(SOURCES) $(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; } \
-	       END { for (i in files) print i; }'`; \
+	  $(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) config.h.in $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
 	  include_option=--etags-include; \
@@ -520,46 +545,50 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test ! -f $$subdir/TAGS || \
-	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
 	list='$(SOURCES) $(HEADERS) config.h.in $(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; } \
-	       END { for (i in files) print i; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  $(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; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  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) config.h.in $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS) config.h.in $(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; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  $(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) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(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)
+	test -d "$(distdir)" || mkdir "$(distdir)"
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
@@ -575,41 +604,54 @@ distdir: $(DISTFILES)
 	  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 -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
-	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
 	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
-	    distdir=`$(am__cd) $(distdir) && pwd`; \
-	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-	    (cd $$subdir && \
+	  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="$$top_distdir" \
-	        distdir="$$distdir/$$subdir" \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
 		am__remove_distdir=: \
 		am__skip_length_check=: \
+		am__skip_mode_fix=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
 	done
-	$(MAKE) $(AM_MAKEFLAGS) \
-	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
-	  dist-hook
-	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
+	-test -n "$(am__skip_mode_fix)" \
+	|| find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -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)
+	|| chmod -R a+r "$(distdir)"
 dist-gzip: distdir
 	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
 	$(am__remove_distdir)
@@ -618,6 +660,14 @@ 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)
@@ -644,6 +694,10 @@ distcheck: dist
 	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
 	*.tar.bz2*) \
 	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+	*.tar.lzma*) \
+	  unlzma -c $(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*) \
@@ -655,9 +709,11 @@ distcheck: dist
 	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-$$$$/" \
-	  && cd $(distdir)/_build \
+	  && am__cwd=`pwd` \
+	  && $(am__cd) $(distdir)/_build \
 	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
 	    $(DISTCHECK_CONFIGURE_FLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) \
@@ -679,13 +735,15 @@ distcheck: dist
 	  && rm -rf "$$dc_destdir" \
 	  && $(MAKE) $(AM_MAKEFLAGS) dist \
 	  && rm -rf $(DIST_ARCHIVES) \
-	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
+	  && $(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:
-	@cd $(distuninstallcheck_dir) \
+	@$(am__cd) '$(distuninstallcheck_dir)' \
 	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
 	   || { echo "ERROR: files left after uninstall:" ; \
 	        if test -n "$(DESTDIR)"; then \
@@ -707,7 +765,7 @@ check: check-recursive
 all-am: Makefile $(DATA) config.h
 installdirs: installdirs-recursive
 installdirs-am:
-	for dir in "$(DESTDIR)$(gnomemenudir)" "$(DESTDIR)$(xiphosdocdir)"; do \
+	for dir in "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(docdir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-recursive
@@ -730,6 +788,7 @@ 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:
@@ -751,27 +810,38 @@ dvi-am:
 
 html: html-recursive
 
+html-am:
+
 info: info-recursive
 
 info-am:
 
-install-data-am: install-data-local install-gnomemenuDATA \
-	install-xiphosdocDATA
+install-data-am: install-desktopDATA install-dist_docDATA
 
 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
@@ -792,66 +862,35 @@ ps: ps-recursive
 
 ps-am:
 
-uninstall-am: uninstall-gnomemenuDATA uninstall-local \
-	uninstall-xiphosdocDATA
+uninstall-am: uninstall-desktopDATA uninstall-dist_docDATA
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
-	install-strip
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \
+	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 \
 	clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
-	dist-gzip dist-hook dist-shar dist-tarZ dist-zip distcheck \
-	distclean distclean-generic distclean-hdr distclean-libtool \
-	distclean-tags distcleancheck distdir distuninstallcheck 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-gnomemenuDATA install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	install-xiphosdocDATA installcheck installcheck-am installdirs \
+	dist-gzip dist-lzma dist-shar dist-tarZ dist-xz dist-zip \
+	distcheck distclean distclean-generic distclean-hdr \
+	distclean-libtool distclean-tags distcleancheck distdir \
+	distuninstallcheck dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am \
+	install-desktopDATA install-dist_docDATA 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 mostlyclean-libtool pdf pdf-am \
 	ps ps-am tags tags-recursive uninstall uninstall-am \
-	uninstall-gnomemenuDATA uninstall-local \
-	uninstall-xiphosdocDATA
+	uninstall-desktopDATA uninstall-dist_docDATA
 
 
 @INTLTOOL_DESKTOP_RULE@
 
-install-data-local:
-	@$(NORMAL_INSTALL)
-	if test -d $(srcdir)/pixmaps; then \
-          $(mkinstalldirs) $(DESTDIR)$(datadir)/pixmaps/${PACKAGE}; \
-          for pixmap in $(srcdir)/pixmaps/*; do \
-            if test -f $$pixmap; then \
-              $(INSTALL_DATA) $$pixmap $(DESTDIR)$(datadir)/pixmaps/${PACKAGE}; \
-            fi \
-          done \
-	fi
-
-	$(mkinstalldirs) $(DESTDIR)$(datadir)/applications
-	$(INSTALL_DATA) ${PACKAGE}.desktop $(DESTDIR)$(datadir)/applications
-
-uninstall-local:
-	@$(NORMAL_UNINSTALL)
-	rm -f -r $(DESTDIR)$(datadir)/pixmaps/${PACKAGE}
-	rm -f $(DESTDIR)$(datadir)/applications/${PACKAGE}.desktop
-	rm -f -r $(DESTDIR)$(datadir)/gnome/help/${PACKAGE}
-
-dist-hook:
-	if test -d pixmaps; then \
-          mkdir $(DESTDIR)$(distdir)/pixmaps; \
-          for pixmap in pixmaps/*; do \
-            if test -f $$pixmap; then \
-              cp -p $$pixmap $(DESTDIR)$(distdir)/pixmaps; \
-            fi \
-          done \
-        fi
-
 rpm: dist
 	rpmbuild -ta $(distdir).tar.gz
+
 # 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 85381e9..fe2e96e 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+2009-12-24  - 3.1.2.  language interface selector, export bookmarks, external
+	      navigation sampling/driving, universal synchronization.
+
 2009-08-09  - 3.1.1.  user annotations; geography interface through
 	      biblemap.org; automatic repository discovery; updated/fixed
 	      chat browser interface.
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 12f586a..4af9f2f 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -3,6 +3,175 @@ ____________________
 XIPHOS RELEASE NOTES
 ____________________
 
+Release 3.1.2
+24 Dec 2009
+
+Merry Christmas from the Xiphos development team.
+
+This version of Xiphos is the final intermediate release prior to the
+larger features planned for the forthcoming 3.2.  This release
+contains several interesting new features and enhancements, and (as
+always) a number of bugfixes.
+
+New features
+
+ 1. We have implemented a Xiphos-internal interface language selector,
+    via Preferences -> General -> Options.  This makes unnecessary
+    most previous uses of difficult-to-understand environment
+    variables to control the desired language choice.  Choosing a new
+    language requires a restart of Xiphos.
+
+ 2. Bookmarks are exportable.  Select XML, HTML, or plaintext.  For
+    the latter two, select whether to include the text referenced.
+
+ 3. The StudyPad and personal commentary editor has gained a Link
+    dialog, by which to arrange for verse reference linkage.
+
+ 4. Xiphos' main window navigation can be sampled and driven via
+    external programs such as Bibledit, notably in support of Bible
+    translators' work.  (For developers, this uses the dbus feature.
+    A test program to exercise this feature can be found in
+    src/examples/ipc_client.py.)
+
+ 5. The Module Manager has a first-time-user introductory dialog,
+    to offer brief explanation of its several parts.  All users, even
+    long-time users, will get it exactly once.
+
+ 6. CrossWire's module repository is forced as "current" after use of
+    the Load Standard button, which updates Xiphos' sense of which
+    repositories are officially recognized by CrossWire.
+
+ 7. Universal synchronization has been implemented between the main
+    window and all detached windows, including embedded parallel tab.
+    Navigating in any synchronized window makes all synchronized
+    windows follow.
+
+ 8. The verse number color selector has been resurrected, erroneously
+    removed in the early days of GnomeSword 2.2(!).  (Why did we do
+    that?  Nobody remembers.)
+
+ 9. New interface translations: Russian, Romanian, Spanish, Chinese.
+    (The last of these has been mechanically generated and is very,
+    very rough at this time -- it will need human attention to gain
+    acceptable quality.)
+
+10. New icons for module lists; RtoL icons for use in Hebrew and Farsi.
+
+Enhancements to existing behavior
+
+ 1. The Help->Chat interface has been improved by offering a default
+    IRC nickname based on the user's login name.
+
+ 2. Huge improvements have been made to startup, search, and module
+    manager setup times, due to internal refactoring of the usage of
+    the Sword library.
+
+ 3. Icons have been added to all dialogs which lacked them.
+
+ 4. Hebrew searches have been improved.
+
+ 5. The verse annotation feature localizes verse references.
+
+ 6. The main window title follows currently-open modules better.
+
+ 7. Sidebar search has had improvements and fixes.
+
+ 8. Internal improvements for poorly-marked-up module content,
+    including crash avoidance.  Some module content is really
+    dangerously bad.
+
+ 9. Improved passage export and printing.
+
+10. Much work has been done for Windows with regard to our better
+    display engine, but it is still not complete, and not present in
+    today's Windows build for public distribution.  To be done in 3.2.
+
+11. Devotionals have been removed from Lookup Selection lists on the
+    right-click context menu.
+
+12. All locale-selection logic has been completely reworked.
+
+13. Cosmetic improvements have been made to Module Manager's and main
+    window's menus.
+
+14. The Enter key is recognized for completion in bookmarks and user
+    annotations.
+
+15. Module archival in Module Manager no longer requires external
+    program support.
+
+16. Many dependencies on GNOME libraries have been removed.  We are
+    intending to completely de-GNOME Xiphos, in favor of reliance on
+    GTK support alone.
+
+Problems resolved
+
+ 1. An error in use of FTP repository registration was fixed.
+
+ 2. When doing searches, both sidebar and advanced, the "purplify"
+    word-match facility has been rewritten from the ground up, and
+    correctly identifies your search keywords.
+
+ 3. Tab names do not show the commentary when the general book is
+    displayed instead.
+
+ 4. A focus-and-select bug was fixed, when deleting one interface tab.
+
+ 5. Corrections were made to text justification handling for RtoL
+    (right-to-left) languages (Hebrew, Farsi).
+
+ 6. Minor adjustments to display have been made due to subtle
+    differences in text markup variety (ThML -vs- OSIS).
+
+ 7. A crash induced by dictionary usage with none installed was fixed.
+
+Improvements and helps for developers
+
+    - Function prototypes are enforced.
+    - The debug build of Xiphos includes substantial null pointer
+      detection in the use of certain common string functions.
+    - The ImageMagick dependency is gone, replaced with GTK functions.
+    - --enable-silent-rules leads to far less chatty output during
+      build.  Get noisy output temporarily with "V=1 make".
+    - File, URL, and Help invocations are now very general and use
+      uniform underlying library support.
+    - XPCOM_GLUE dependency errors have been fixed.
+    - Timers have been implemented to show SWMgr creation delays.
+    - Many, many updates to the build system and the Windows installer.
+
+Bug reports addressed since 3.1.1:
+2908987  crash detected in xiphos-3.1.1-1.fc12
+2896427  Isa 49:6 in HunKar text
+2893828  Malachi 4:6 in Aleppo text
+2878951  KJV Stongs lexicon stops at 5624 (ophelimos)
+2873367  Advanced Search results: Hotkey(s) to display Preview
+2873362  Hotkey for activating simple searches not working
+2872186  missing verses
+2862814  Crash when compiled against xulrunner 1.9.1.3
+2858494  Bible Window Does Not Automatically Display Selected Verse
+2852779  delete source button enlarge sources list in twice
+2849730  Lucene Text Fields search not working
+2849693  Parallel view tab does not honour link tabs setting
+2848320  Preview: Symboles for Footnotes
+2844863  Lucene Search: Not finding all results
+2841441  per verse annotation - localized reference
+
+New feature requests pending:
+2907492  Interlinear commentary
+2902403  How to install for other than listed OS
+2901374  Need for Serbian translation
+2893826  Versification in the Psalms
+2890364  Don't need to see strongs numbers, morphology
+2873364  Highlight also upper case words
+2873363  Shortcut/hotkey for simple/sidebar searches
+2836740  Additional versification systems
+
+Feature requests closed:
+2871373  Increase number of texts in parallel view
+2840134  Hide Verse Numbers in Copy/Export
+2824127  Sidebar search: Regular expression?
+________________________________________________________________
+
 Release 3.1.1
 09 Aug 2009
 
diff --git a/acconfig.h b/acconfig.h
deleted file mode 100644
index 0a76fa0..0000000
--- a/acconfig.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#undef ENABLE_NLS
-#undef HAVE_CATGETS
-#undef HAVE_GETTEXT
-#undef GETTEXT_PACKAGE
-#undef HAVE_LC_MESSAGES
-#undef HAVE_STPCPY
-#undef HAVE_LIBSM
diff --git a/aclocal.m4 b/aclocal.m4
index 790eb34..f4b22f3 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.10 -*- Autoconf -*-
+# generated automatically by aclocal 1.11 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006  Free Software Foundation, Inc.
+# 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.
@@ -11,10 +11,13 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-m4_if(m4_PACKAGE_VERSION, [2.61],,
-[m4_fatal([this file was generated for autoconf 2.61.
-You have another version of autoconf.  If you want to use that,
-you should regenerate the build system entirely.], [63])])
+m4_ifndef([AC_AUTOCONF_VERSION],
+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],,
+[m4_warning([this file was generated for autoconf 2.63.
+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'.])])
 
 # Copyright (C) 1995-2002 Free Software Foundation, Inc.
 # Copyright (C) 2001-2003,2004 Red Hat, Inc.
@@ -119,8 +122,7 @@ AC_SUBST($1)dnl
 #-----------------
 glib_DEFUN([GLIB_WITH_NLS],
   dnl NLS is obligatory
-  [AC_REQUIRE([AC_CANONICAL_HOST])dnl
-    USE_NLS=yes
+  [USE_NLS=yes
     AC_SUBST(USE_NLS)
 
     gt_cv_have_gettext=no
@@ -450,6400 +452,146 @@ sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD
 fi])
 
 
-# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+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 ******************************
 
-# serial 48 AC_PROG_LIBTOOL
+    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])"])
 
-
-# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-# -----------------------------------------------------------
-# If this macro is not defined by Autoconf, define it here.
-m4_ifdef([AC_PROVIDE_IFELSE],
-         [],
-         [m4_define([AC_PROVIDE_IFELSE],
-	         [m4_ifdef([AC_PROVIDE_$1],
-		           [$2], [$3])])])
-
-
-# AC_PROG_LIBTOOL
-# ---------------
-AC_DEFUN([AC_PROG_LIBTOOL],
-[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
-dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
-dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
-  AC_PROVIDE_IFELSE([AC_PROG_CXX],
-    [AC_LIBTOOL_CXX],
-    [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
-  ])])
-dnl And a similar setup for Fortran 77 support
-  AC_PROVIDE_IFELSE([AC_PROG_F77],
-    [AC_LIBTOOL_F77],
-    [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77
-])])
-
-dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
-dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
-dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
-  AC_PROVIDE_IFELSE([AC_PROG_GCJ],
-    [AC_LIBTOOL_GCJ],
-    [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
-      [AC_LIBTOOL_GCJ],
-      [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],
-	[AC_LIBTOOL_GCJ],
-      [ifdef([AC_PROG_GCJ],
-	     [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])
-       ifdef([A][M_PROG_GCJ],
-	     [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])])
-       ifdef([LT_AC_PROG_GCJ],
-	     [define([LT_AC_PROG_GCJ],
-		defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])])
-])])# AC_PROG_LIBTOOL
-
-
-# _AC_PROG_LIBTOOL
-# ----------------
-AC_DEFUN([_AC_PROG_LIBTOOL],
-[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
-
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-AC_SUBST(LIBTOOL)dnl
-
-# Prevent multiple expansion
-define([AC_PROG_LIBTOOL], [])
-])# _AC_PROG_LIBTOOL
-
-
-# AC_LIBTOOL_SETUP
-# ----------------
-AC_DEFUN([AC_LIBTOOL_SETUP],
-[AC_PREREQ(2.50)dnl
-AC_REQUIRE([AC_ENABLE_SHARED])dnl
-AC_REQUIRE([AC_ENABLE_STATIC])dnl
-AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_PROG_LD])dnl
-AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
-AC_REQUIRE([AC_PROG_NM])dnl
-
-AC_REQUIRE([AC_PROG_LN_S])dnl
-AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
-# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
-AC_REQUIRE([AC_OBJEXT])dnl
-AC_REQUIRE([AC_EXEEXT])dnl
-dnl
-
-AC_LIBTOOL_SYS_MAX_CMD_LEN
-AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
-AC_LIBTOOL_OBJDIR
-
-AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
-_LT_AC_PROG_ECHO_BACKSLASH
-
-case $host_os in
-aix3*)
-  # AIX sometimes has problems with the GCC collect2 program.  For some
-  # reason, if we set the COLLECT_NAMES environment variable, the problems
-  # vanish in a puff of smoke.
-  if test "X${COLLECT_NAMES+set}" != Xset; then
-    COLLECT_NAMES=
-    export COLLECT_NAMES
-  fi
-  ;;
-esac
-
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed='sed -e 1s/^X//'
-[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
-
-# Same as above, but do not quote variable references.
-[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g']
-
-# Sed substitution to delay expansion of an escaped shell variable in a
-# double_quote_subst'ed string.
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-
-# Sed substitution to avoid accidental globbing in evaled expressions
-no_glob_subst='s/\*/\\\*/g'
-
-# Constants:
-rm="rm -f"
-
-# Global variables:
-default_ofile=libtool
-can_build_shared=yes
-
-# All known linkers require a `.a' archive for static linking (except MSVC,
-# which needs '.lib').
-libext=a
-ltmain="$ac_aux_dir/ltmain.sh"
-ofile="$default_ofile"
-with_gnu_ld="$lt_cv_prog_gnu_ld"
-
-AC_CHECK_TOOL(AR, ar, false)
-AC_CHECK_TOOL(RANLIB, ranlib, :)
-AC_CHECK_TOOL(STRIP, strip, :)
-
-old_CC="$CC"
-old_CFLAGS="$CFLAGS"
-
-# Set sane defaults for various variables
-test -z "$AR" && AR=ar
-test -z "$AR_FLAGS" && AR_FLAGS=cru
-test -z "$AS" && AS=as
-test -z "$CC" && CC=cc
-test -z "$LTCC" && LTCC=$CC
-test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
-test -z "$DLLTOOL" && DLLTOOL=dlltool
-test -z "$LD" && LD=ld
-test -z "$LN_S" && LN_S="ln -s"
-test -z "$MAGIC_CMD" && MAGIC_CMD=file
-test -z "$NM" && NM=nm
-test -z "$SED" && SED=sed
-test -z "$OBJDUMP" && OBJDUMP=objdump
-test -z "$RANLIB" && RANLIB=:
-test -z "$STRIP" && STRIP=:
-test -z "$ac_objext" && ac_objext=o
-
-# Determine commands to create old-style static archives.
-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
-old_postinstall_cmds='chmod 644 $oldlib'
-old_postuninstall_cmds=
-
-if test -n "$RANLIB"; then
-  case $host_os in
-  openbsd*)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
-    ;;
-  *)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
-    ;;
-  esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
-fi
-
-_LT_CC_BASENAME([$compiler])
-
-# Only perform the check for file, if the check method requires it
-case $deplibs_check_method in
-file_magic*)
-  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    AC_PATH_MAGIC
-  fi
-  ;;
-esac
-
-AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
-AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
-enable_win32_dll=yes, enable_win32_dll=no)
-
-AC_ARG_ENABLE([libtool-lock],
-    [AC_HELP_STRING([--disable-libtool-lock],
-	[avoid locking (might break parallel builds)])])
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-
-AC_ARG_WITH([pic],
-    [AC_HELP_STRING([--with-pic],
-	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
-    [pic_mode="$withval"],
-    [pic_mode=default])
-test -z "$pic_mode" && pic_mode=default
-
-# Use C for the default configuration in the libtool script
-tagname=
-AC_LIBTOOL_LANG_C_CONFIG
-_LT_AC_TAGCONFIG
-])# AC_LIBTOOL_SETUP
-
-
-# _LT_AC_SYS_COMPILER
-# -------------------
-AC_DEFUN([_LT_AC_SYS_COMPILER],
-[AC_REQUIRE([AC_PROG_CC])dnl
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# If no C compiler flags were specified, use CFLAGS.
-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-])# _LT_AC_SYS_COMPILER
-
-
-# _LT_CC_BASENAME(CC)
-# -------------------
-# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
-AC_DEFUN([_LT_CC_BASENAME],
-[for cc_temp in $1""; do
-  case $cc_temp in
-    compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
-    distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
-    \-*) ;;
-    *) break;;
-  esac
-done
-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-])
-
-
-# _LT_COMPILER_BOILERPLATE
-# ------------------------
-# Check for compiler boilerplate output or warnings with
-# the simple compiler test code.
-AC_DEFUN([_LT_COMPILER_BOILERPLATE],
-[ac_outfile=conftest.$ac_objext
-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_compiler_boilerplate=`cat conftest.err`
-$rm conftest*
-])# _LT_COMPILER_BOILERPLATE
-
-
-# _LT_LINKER_BOILERPLATE
-# ----------------------
-# Check for linker boilerplate output or warnings with
-# the simple link test code.
-AC_DEFUN([_LT_LINKER_BOILERPLATE],
-[ac_outfile=conftest.$ac_objext
-printf "$lt_simple_link_test_code" >conftest.$ac_ext
-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_linker_boilerplate=`cat conftest.err`
-$rm conftest*
-])# _LT_LINKER_BOILERPLATE
-
-
-# _LT_AC_SYS_LIBPATH_AIX
-# ----------------------
-# Links a minimal program and checks the executable
-# for the system default hardcoded library path. In most cases,
-# this is /usr/lib:/lib, but when the MPI compilers are used
-# the location of the communication and MPI libs are included too.
-# If we don't find anything, use the default library path according
-# to the aix ld manual.
-AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],
-[AC_LINK_IFELSE(AC_LANG_PROGRAM,[
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi],[])
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-])# _LT_AC_SYS_LIBPATH_AIX
-
-
-# _LT_AC_SHELL_INIT(ARG)
-# ----------------------
-AC_DEFUN([_LT_AC_SHELL_INIT],
-[ifdef([AC_DIVERSION_NOTICE],
-	     [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
-	 [AC_DIVERT_PUSH(NOTICE)])
-$1
-AC_DIVERT_POP
-])# _LT_AC_SHELL_INIT
-
-
-# _LT_AC_PROG_ECHO_BACKSLASH
-# --------------------------
-# Add some code to the start of the generated configure script which
-# will find an echo command which doesn't interpret backslashes.
-AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH],
-[_LT_AC_SHELL_INIT([
-# Check that we are running under the correct shell.
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-case X$ECHO in
-X*--fallback-echo)
-  # Remove one level of quotation (which was required for Make).
-  ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
-  ;;
-esac
-
-echo=${ECHO-echo}
-if test "X[$]1" = X--no-reexec; then
-  # Discard the --no-reexec flag, and continue.
-  shift
-elif test "X[$]1" = X--fallback-echo; then
-  # Avoid inline document here, it may be left over
-  :
-elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then
-  # Yippee, $echo works!
-  :
-else
-  # Restart under the correct shell.
-  exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
-fi
-
-if test "X[$]1" = X--fallback-echo; then
-  # used as fallback echo
-  shift
-  cat <<EOF
-[$]*
-EOF
-  exit 0
-fi
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-if test -z "$ECHO"; then
-if test "X${echo_test_string+set}" != Xset; then
-# find a string as large as possible, as long as the shell can cope with it
-  for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
-    # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
-    if (echo_test_string=`eval $cmd`) 2>/dev/null &&
-       echo_test_string=`eval $cmd` &&
-       (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
-    then
-      break
-    fi
-  done
-fi
-
-if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
-   echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
-   test "X$echo_testing_string" = "X$echo_test_string"; then
-  :
-else
-  # The Solaris, AIX, and Digital Unix default echo programs unquote
-  # backslashes.  This makes it impossible to quote backslashes using
-  #   echo "$something" | sed 's/\\/\\\\/g'
-  #
-  # So, first we look for a working echo in the user's PATH.
-
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  for dir in $PATH /usr/ucb; do
-    IFS="$lt_save_ifs"
-    if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
-       test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
-       echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
-       test "X$echo_testing_string" = "X$echo_test_string"; then
-      echo="$dir/echo"
-      break
-    fi
-  done
-  IFS="$lt_save_ifs"
-
-  if test "X$echo" = Xecho; then
-    # We didn't find a better echo, so look for alternatives.
-    if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
-       echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
-       test "X$echo_testing_string" = "X$echo_test_string"; then
-      # This shell has a builtin print -r that does the trick.
-      echo='print -r'
-    elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
-	 test "X$CONFIG_SHELL" != X/bin/ksh; then
-      # If we have ksh, try running configure again with it.
-      ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-      export ORIGINAL_CONFIG_SHELL
-      CONFIG_SHELL=/bin/ksh
-      export CONFIG_SHELL
-      exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
-    else
-      # Try using printf.
-      echo='printf %s\n'
-      if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
-	 echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
-	 test "X$echo_testing_string" = "X$echo_test_string"; then
-	# Cool, printf works
-	:
-      elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
-	   test "X$echo_testing_string" = 'X\t' &&
-	   echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-	   test "X$echo_testing_string" = "X$echo_test_string"; then
-	CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
-	export CONFIG_SHELL
-	SHELL="$CONFIG_SHELL"
-	export SHELL
-	echo="$CONFIG_SHELL [$]0 --fallback-echo"
-      elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
-	   test "X$echo_testing_string" = 'X\t' &&
-	   echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-	   test "X$echo_testing_string" = "X$echo_test_string"; then
-	echo="$CONFIG_SHELL [$]0 --fallback-echo"
-      else
-	# maybe with a smaller string...
-	prev=:
-
-	for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
-	  if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null
-	  then
-	    break
-	  fi
-	  prev="$cmd"
-	done
-
-	if test "$prev" != 'sed 50q "[$]0"'; then
-	  echo_test_string=`eval $prev`
-	  export echo_test_string
-	  exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
-	else
-	  # Oops.  We lost completely, so just stick with echo.
-	  echo=echo
-	fi
-      fi
-    fi
-  fi
-fi
-fi
-
-# Copy echo and quote the copy suitably for passing to libtool from
-# the Makefile, instead of quoting the original, which is used later.
-ECHO=$echo
-if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
-   ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
-fi
-
-AC_SUBST(ECHO)
-])])# _LT_AC_PROG_ECHO_BACKSLASH
-
-
-# _LT_AC_LOCK
-# -----------
-AC_DEFUN([_LT_AC_LOCK],
-[AC_ARG_ENABLE([libtool-lock],
-    [AC_HELP_STRING([--disable-libtool-lock],
-	[avoid locking (might break parallel builds)])])
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-
-# Some flags need to be propagated to the compiler or linker for good
-# libtool support.
-case $host in
-ia64-*-hpux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.$ac_objext` in
-    *ELF-32*)
-      HPUX_IA64_MODE="32"
-      ;;
-    *ELF-64*)
-      HPUX_IA64_MODE="64"
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-*-*-irix6*)
-  # Find out which ABI we are using.
-  echo '[#]line __oline__ "configure"' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-   if test "$lt_cv_prog_gnu_ld" = yes; then
-    case `/usr/bin/file conftest.$ac_objext` in
-    *32-bit*)
-      LD="${LD-ld} -melf32bsmip"
-      ;;
-    *N32*)
-      LD="${LD-ld} -melf32bmipn32"
-      ;;
-    *64-bit*)
-      LD="${LD-ld} -melf64bmip"
-      ;;
-    esac
-   else
-    case `/usr/bin/file conftest.$ac_objext` in
-    *32-bit*)
-      LD="${LD-ld} -32"
-      ;;
-    *N32*)
-      LD="${LD-ld} -n32"
-      ;;
-    *64-bit*)
-      LD="${LD-ld} -64"
-      ;;
-    esac
-   fi
-  fi
-  rm -rf conftest*
-  ;;
-
-x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.o` in
-    *32-bit*)
-      case $host in
-        x86_64-*linux*)
-          LD="${LD-ld} -m elf_i386"
-          ;;
-        ppc64-*linux*|powerpc64-*linux*)
-          LD="${LD-ld} -m elf32ppclinux"
-          ;;
-        s390x-*linux*)
-          LD="${LD-ld} -m elf_s390"
-          ;;
-        sparc64-*linux*)
-          LD="${LD-ld} -m elf32_sparc"
-          ;;
-      esac
-      ;;
-    *64-bit*)
-      case $host in
-        x86_64-*linux*)
-          LD="${LD-ld} -m elf_x86_64"
-          ;;
-        ppc*-*linux*|powerpc*-*linux*)
-          LD="${LD-ld} -m elf64ppc"
-          ;;
-        s390*-*linux*)
-          LD="${LD-ld} -m elf64_s390"
-          ;;
-        sparc*-*linux*)
-          LD="${LD-ld} -m elf64_sparc"
-          ;;
-      esac
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
-*-*-sco3.2v5*)
-  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-  SAVE_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS -belf"
-  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
-    [AC_LANG_PUSH(C)
-     AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
-     AC_LANG_POP])
-  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
-    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-    CFLAGS="$SAVE_CFLAGS"
-  fi
-  ;;
-sparc*-*solaris*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.o` in
-    *64-bit*)
-      case $lt_cv_prog_gnu_ld in
-      yes*) LD="${LD-ld} -m elf64_sparc" ;;
-      *)    LD="${LD-ld} -64" ;;
-      esac
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
-AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
-[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
-  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-  AC_CHECK_TOOL(AS, as, false)
-  AC_CHECK_TOOL(OBJDUMP, objdump, false)
-  ;;
-  ])
-esac
-
-need_locks="$enable_libtool_lock"
-
-])# _LT_AC_LOCK
-
-
-# AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
-#		[OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
-# ----------------------------------------------------------------
-# Check whether the given compiler option works
-AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION],
-[AC_REQUIRE([LT_AC_PROG_SED])
-AC_CACHE_CHECK([$1], [$2],
-  [$2=no
-  ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="$3"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   # The option is referenced via a variable to avoid confusing sed.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&AS_MESSAGE_LOG_FD
-   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-   if (exit $ac_status) && test -s "$ac_outfile"; then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings other than the usual output.
-     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
-     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-       $2=yes
-     fi
-   fi
-   $rm conftest*
-])
-
-if test x"[$]$2" = xyes; then
-    ifelse([$5], , :, [$5])
-else
-    ifelse([$6], , :, [$6])
-fi
-])# AC_LIBTOOL_COMPILER_OPTION
-
-
-# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
-#                          [ACTION-SUCCESS], [ACTION-FAILURE])
-# ------------------------------------------------------------
-# Check whether the given compiler option works
-AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
-[AC_CACHE_CHECK([$1], [$2],
-  [$2=no
-   save_LDFLAGS="$LDFLAGS"
-   LDFLAGS="$LDFLAGS $3"
-   printf "$lt_simple_link_test_code" > conftest.$ac_ext
-   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-     # The linker can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test -s conftest.err; then
-       # Append any errors to the config.log.
-       cat conftest.err 1>&AS_MESSAGE_LOG_FD
-       $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
-       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
-         $2=yes
-       fi
-     else
-       $2=yes
-     fi
-   fi
-   $rm conftest*
-   LDFLAGS="$save_LDFLAGS"
-])
-
-if test x"[$]$2" = xyes; then
-    ifelse([$4], , :, [$4])
-else
-    ifelse([$5], , :, [$5])
-fi
-])# AC_LIBTOOL_LINKER_OPTION
-
-
-# AC_LIBTOOL_SYS_MAX_CMD_LEN
-# --------------------------
-AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN],
-[# find the maximum length of command line arguments
-AC_MSG_CHECKING([the maximum length of command line arguments])
-AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
-  i=0
-  teststring="ABCD"
-
-  case $build_os in
-  msdosdjgpp*)
-    # On DJGPP, this test can blow up pretty badly due to problems in libc
-    # (any single argument exceeding 2000 bytes causes a buffer overrun
-    # during glob expansion).  Even if it were fixed, the result of this
-    # check would be larger than it should be.
-    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
-    ;;
-
-  gnu*)
-    # Under GNU Hurd, this test is not required because there is
-    # no limit to the length of command line arguments.
-    # Libtool will interpret -1 as no limit whatsoever
-    lt_cv_sys_max_cmd_len=-1;
-    ;;
-
-  cygwin* | mingw*)
-    # On Win9x/ME, this test blows up -- it succeeds, but takes
-    # about 5 minutes as the teststring grows exponentially.
-    # Worse, since 9x/ME are not pre-emptively multitasking,
-    # you end up with a "frozen" computer, even though with patience
-    # the test eventually succeeds (with a max line length of 256k).
-    # Instead, let's just punt: use the minimum linelength reported by
-    # all of the supported platforms: 8192 (on NT/2K/XP).
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  amigaos*)
-    # On AmigaOS with pdksh, this test takes hours, literally.
-    # So we just punt and use a minimum line length of 8192.
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
-    # This has been around since 386BSD, at least.  Likely further.
-    if test -x /sbin/sysctl; then
-      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
-    elif test -x /usr/sbin/sysctl; then
-      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
-    else
-      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
-    fi
-    # And add a safety zone
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-    ;;
-
-  interix*)
-    # We know the value 262144 and hardcode it with a safety zone (like BSD)
-    lt_cv_sys_max_cmd_len=196608
-    ;;
-
-  osf*)
-    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
-    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
-    # nice to cause kernel panics so lets avoid the loop below.
-    # First set a reasonable default.
-    lt_cv_sys_max_cmd_len=16384
-    #
-    if test -x /sbin/sysconfig; then
-      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
-        *1*) lt_cv_sys_max_cmd_len=-1 ;;
-      esac
-    fi
-    ;;
-  sco3.2v5*)
-    lt_cv_sys_max_cmd_len=102400
-    ;;
-  sysv5* | sco5v6* | sysv4.2uw2*)
-    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
-    if test -n "$kargmax"; then
-      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ 	]]//'`
-    else
-      lt_cv_sys_max_cmd_len=32768
-    fi
-    ;;
-  *)
-    # If test is not a shell built-in, we'll probably end up computing a
-    # maximum length that is only half of the actual maximum length, but
-    # we can't tell.
-    SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-    while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
-	       = "XX$teststring") >/dev/null 2>&1 &&
-	    new_result=`expr "X$teststring" : ".*" 2>&1` &&
-	    lt_cv_sys_max_cmd_len=$new_result &&
-	    test $i != 17 # 1/2 MB should be enough
-    do
-      i=`expr $i + 1`
-      teststring=$teststring$teststring
-    done
-    teststring=
-    # Add a significant safety factor because C++ compilers can tack on massive
-    # amounts of additional arguments before passing them to the linker.
-    # It appears as though 1/2 is a usable value.
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
-    ;;
-  esac
-])
-if test -n $lt_cv_sys_max_cmd_len ; then
-  AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
-else
-  AC_MSG_RESULT(none)
-fi
-])# AC_LIBTOOL_SYS_MAX_CMD_LEN
-
-
-# _LT_AC_CHECK_DLFCN
-# ------------------
-AC_DEFUN([_LT_AC_CHECK_DLFCN],
-[AC_CHECK_HEADERS(dlfcn.h)dnl
-])# _LT_AC_CHECK_DLFCN
-
-
-# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
-#                           ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
-# ---------------------------------------------------------------------
-AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
-[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
-if test "$cross_compiling" = yes; then :
-  [$4]
-else
-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-  lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<EOF
-[#line __oline__ "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-#  define LT_DLGLOBAL		RTLD_GLOBAL
-#else
-#  ifdef DL_GLOBAL
-#    define LT_DLGLOBAL		DL_GLOBAL
-#  else
-#    define LT_DLGLOBAL		0
-#  endif
-#endif
-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-   find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-#  ifdef RTLD_LAZY
-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-#  else
-#    ifdef DL_LAZY
-#      define LT_DLLAZY_OR_NOW		DL_LAZY
-#    else
-#      ifdef RTLD_NOW
-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-#      else
-#        ifdef DL_NOW
-#          define LT_DLLAZY_OR_NOW	DL_NOW
-#        else
-#          define LT_DLLAZY_OR_NOW	0
-#        endif
-#      endif
-#    endif
-#  endif
-#endif
-
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
-
-void fnord() { int i=42;}
-int main ()
-{
-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-  int status = $lt_dlunknown;
-
-  if (self)
-    {
-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-      /* dlclose (self); */
-    }
-  else
-    puts (dlerror ());
-
-    exit (status);
-}]
-EOF
-  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
-    lt_status=$?
-    case x$lt_status in
-      x$lt_dlno_uscore) $1 ;;
-      x$lt_dlneed_uscore) $2 ;;
-      x$lt_dlunknown|x*) $3 ;;
-    esac
-  else :
-    # compilation failed
-    $3
-  fi
-fi
-rm -fr conftest*
-])# _LT_AC_TRY_DLOPEN_SELF
-
-
-# AC_LIBTOOL_DLOPEN_SELF
-# ----------------------
-AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
-[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
-if test "x$enable_dlopen" != xyes; then
-  enable_dlopen=unknown
-  enable_dlopen_self=unknown
-  enable_dlopen_self_static=unknown
-else
-  lt_cv_dlopen=no
-  lt_cv_dlopen_libs=
-
-  case $host_os in
-  beos*)
-    lt_cv_dlopen="load_add_on"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-    ;;
-
-  mingw* | pw32*)
-    lt_cv_dlopen="LoadLibrary"
-    lt_cv_dlopen_libs=
-   ;;
-
-  cygwin*)
-    lt_cv_dlopen="dlopen"
-    lt_cv_dlopen_libs=
-   ;;
-
-  darwin*)
-  # if libdl is installed we need to link against it
-    AC_CHECK_LIB([dl], [dlopen],
-		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
-    lt_cv_dlopen="dyld"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-    ])
-   ;;
-
-  *)
-    AC_CHECK_FUNC([shl_load],
-	  [lt_cv_dlopen="shl_load"],
-      [AC_CHECK_LIB([dld], [shl_load],
-	    [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"],
-	[AC_CHECK_FUNC([dlopen],
-	      [lt_cv_dlopen="dlopen"],
-	  [AC_CHECK_LIB([dl], [dlopen],
-		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
-	    [AC_CHECK_LIB([svld], [dlopen],
-		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
-	      [AC_CHECK_LIB([dld], [dld_link],
-		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
-	      ])
-	    ])
-	  ])
-	])
-      ])
-    ;;
-  esac
-
-  if test "x$lt_cv_dlopen" != xno; then
-    enable_dlopen=yes
-  else
-    enable_dlopen=no
-  fi
-
-  case $lt_cv_dlopen in
-  dlopen)
-    save_CPPFLAGS="$CPPFLAGS"
-    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-
-    save_LDFLAGS="$LDFLAGS"
-    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-
-    save_LIBS="$LIBS"
-    LIBS="$lt_cv_dlopen_libs $LIBS"
-
-    AC_CACHE_CHECK([whether a program can dlopen itself],
-	  lt_cv_dlopen_self, [dnl
-	  _LT_AC_TRY_DLOPEN_SELF(
-	    lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
-	    lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
-    ])
-
-    if test "x$lt_cv_dlopen_self" = xyes; then
-      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
-      AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
-    	  lt_cv_dlopen_self_static, [dnl
-	  _LT_AC_TRY_DLOPEN_SELF(
-	    lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
-	    lt_cv_dlopen_self_static=no,  lt_cv_dlopen_self_static=cross)
-      ])
-    fi
-
-    CPPFLAGS="$save_CPPFLAGS"
-    LDFLAGS="$save_LDFLAGS"
-    LIBS="$save_LIBS"
-    ;;
-  esac
-
-  case $lt_cv_dlopen_self in
-  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
-  *) enable_dlopen_self=unknown ;;
-  esac
-
-  case $lt_cv_dlopen_self_static in
-  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
-  *) enable_dlopen_self_static=unknown ;;
-  esac
-fi
-])# AC_LIBTOOL_DLOPEN_SELF
-
-
-# AC_LIBTOOL_PROG_CC_C_O([TAGNAME])
-# ---------------------------------
-# Check to see if options -c and -o are simultaneously supported by compiler
-AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O],
-[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
-AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
-  [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
-  [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
-   $rm -r conftest 2>/dev/null
-   mkdir conftest
-   cd conftest
-   mkdir out
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-   lt_compiler_flag="-o out/conftest2.$ac_objext"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&AS_MESSAGE_LOG_FD
-   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-   if (exit $ac_status) && test -s out/conftest2.$ac_objext
-   then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
-     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-       _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
-     fi
-   fi
-   chmod u+w . 2>&AS_MESSAGE_LOG_FD
-   $rm conftest*
-   # SGI C++ compiler will create directory out/ii_files/ for
-   # template instantiation
-   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
-   $rm out/* && rmdir out
-   cd ..
-   rmdir conftest
-   $rm conftest*
-])
-])# AC_LIBTOOL_PROG_CC_C_O
-
-
-# AC_LIBTOOL_SYS_HARD_LINK_LOCKS([TAGNAME])
-# -----------------------------------------
-# Check to see if we can do hard links to lock some files if needed
-AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS],
-[AC_REQUIRE([_LT_AC_LOCK])dnl
-
-hard_links="nottested"
-if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
-  # do not overwrite the value of need_locks provided by the user
-  AC_MSG_CHECKING([if we can lock with hard links])
-  hard_links=yes
-  $rm conftest*
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  touch conftest.a
-  ln conftest.a conftest.b 2>&5 || hard_links=no
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  AC_MSG_RESULT([$hard_links])
-  if test "$hard_links" = no; then
-    AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
-    need_locks=warn
-  fi
-else
-  need_locks=no
-fi
-])# AC_LIBTOOL_SYS_HARD_LINK_LOCKS
-
-
-# AC_LIBTOOL_OBJDIR
-# -----------------
-AC_DEFUN([AC_LIBTOOL_OBJDIR],
-[AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
-[rm -f .libs 2>/dev/null
-mkdir .libs 2>/dev/null
-if test -d .libs; then
-  lt_cv_objdir=.libs
-else
-  # MS-DOS does not allow filenames that begin with a dot.
-  lt_cv_objdir=_libs
-fi
-rmdir .libs 2>/dev/null])
-objdir=$lt_cv_objdir
-])# AC_LIBTOOL_OBJDIR
-
-
-# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME])
-# ----------------------------------------------
-# Check hardcoding attributes.
-AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH],
-[AC_MSG_CHECKING([how to hardcode library paths into programs])
-_LT_AC_TAGVAR(hardcode_action, $1)=
-if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
-   test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \
-   test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
-
-  # We can hardcode non-existant directories.
-  if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
-     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-     # have to relink, otherwise we might link with an installed library
-     # when we should be linking with a yet-to-be-installed one
-     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
-     test "$_LT_AC_TAGVAR(hardcode_minus_L, $1)" != no; then
-    # Linking always hardcodes the temporary library directory.
-    _LT_AC_TAGVAR(hardcode_action, $1)=relink
-  else
-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-    _LT_AC_TAGVAR(hardcode_action, $1)=immediate
-  fi
-else
-  # We cannot hardcode anything, or else we can only hardcode existing
-  # directories.
-  _LT_AC_TAGVAR(hardcode_action, $1)=unsupported
-fi
-AC_MSG_RESULT([$_LT_AC_TAGVAR(hardcode_action, $1)])
-
-if test "$_LT_AC_TAGVAR(hardcode_action, $1)" = relink; then
-  # Fast installation is not supported
-  enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
-     test "$enable_shared" = no; then
-  # Fast installation is not necessary
-  enable_fast_install=needless
-fi
-])# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH
-
-
-# AC_LIBTOOL_SYS_LIB_STRIP
-# ------------------------
-AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP],
-[striplib=
-old_striplib=
-AC_MSG_CHECKING([whether stripping libraries is possible])
-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
-  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-  AC_MSG_RESULT([yes])
-else
-# FIXME - insert some real tests, host_os isn't really good enough
-  case $host_os in
-   darwin*)
-       if test -n "$STRIP" ; then
-         striplib="$STRIP -x"
-         AC_MSG_RESULT([yes])
-       else
-  AC_MSG_RESULT([no])
-fi
-       ;;
-   *)
-  AC_MSG_RESULT([no])
-    ;;
-  esac
-fi
-])# AC_LIBTOOL_SYS_LIB_STRIP
-
-
-# AC_LIBTOOL_SYS_DYNAMIC_LINKER
-# -----------------------------
-# PORTME Fill in your ld.so characteristics
-AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER],
-[AC_MSG_CHECKING([dynamic linker characteristics])
-library_names_spec=
-libname_spec='lib$name'
-soname_spec=
-shrext_cmds=".so"
-postinstall_cmds=
-postuninstall_cmds=
-finish_cmds=
-finish_eval=
-shlibpath_var=
-shlibpath_overrides_runpath=unknown
-version_type=none
-dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
-if test "$GCC" = yes; then
-  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
-    # if the path contains ";" then we assume it to be the separator
-    # otherwise default to the standard path separator (i.e. ":") - it is
-    # assumed that no part of a normal pathname contains ";" but that should
-    # okay in the real world where ";" in dirpaths is itself problematic.
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-  else
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-  fi
-else
-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi
-need_lib_prefix=unknown
-hardcode_into_libs=no
-
-# when you set need_version to no, make sure it does not cause -set_version
-# flags to be left without arguments
-need_version=unknown
-
-case $host_os in
-aix3*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
-  shlibpath_var=LIBPATH
-
-  # AIX 3 has no versioning support, so we append a major version to the name.
-  soname_spec='${libname}${release}${shared_ext}$major'
-  ;;
-
-aix4* | aix5*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  hardcode_into_libs=yes
-  if test "$host_cpu" = ia64; then
-    # AIX 5 supports IA64
-    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
-    shlibpath_var=LD_LIBRARY_PATH
-  else
-    # With GCC up to 2.95.x, collect2 would create an import file
-    # for dependence libraries.  The import file would start with
-    # the line `#! .'.  This would cause the generated library to
-    # depend on `.', always an invalid library.  This was fixed in
-    # development snapshots of GCC prior to 3.0.
-    case $host_os in
-      aix4 | aix4.[[01]] | aix4.[[01]].*)
-      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-	   echo ' yes '
-	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
-	:
-      else
-	can_build_shared=no
-      fi
-      ;;
-    esac
-    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
-    # soname into executable. Probably we can add versioning support to
-    # collect2, so additional links can be useful in future.
-    if test "$aix_use_runtimelinking" = yes; then
-      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-      # instead of lib<name>.a to let people know that these are not
-      # typical AIX shared libraries.
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    else
-      # We preserve .a as extension for shared libraries through AIX4.2
-      # and later when we are not doing run time linking.
-      library_names_spec='${libname}${release}.a $libname.a'
-      soname_spec='${libname}${release}${shared_ext}$major'
-    fi
-    shlibpath_var=LIBPATH
-  fi
-  ;;
-
-amigaos*)
-  library_names_spec='$libname.ixlibrary $libname.a'
-  # Create ${libname}_ixlibrary.a entries in /sys/libs.
-  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-  ;;
-
-beos*)
-  library_names_spec='${libname}${shared_ext}'
-  dynamic_linker="$host_os ld.so"
-  shlibpath_var=LIBRARY_PATH
-  ;;
-
-bsdi[[45]]*)
-  version_type=linux
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-  # the default ld.so.conf also contains /usr/contrib/lib and
-  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-  # libtool to hard-code these into programs
-  ;;
-
-cygwin* | mingw* | pw32*)
-  version_type=windows
-  shrext_cmds=".dll"
-  need_version=no
-  need_lib_prefix=no
-
-  case $GCC,$host_os in
-  yes,cygwin* | yes,mingw* | yes,pw32*)
-    library_names_spec='$libname.dll.a'
-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \${file}`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
-      dldir=$destdir/`dirname \$dlpath`~
-      test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname~
-      chmod a+x \$dldir/$dlname'
-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-      dlpath=$dir/\$dldll~
-       $rm \$dlpath'
-    shlibpath_overrides_runpath=yes
-
-    case $host_os in
-    cygwin*)
-      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
-      ;;
-    mingw*)
-      # MinGW DLLs use traditional 'lib' prefix
-      soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-      if echo "$sys_lib_search_path_spec" | [grep ';[c-zC-Z]:/' >/dev/null]; then
-        # It is most probably a Windows format PATH printed by
-        # mingw gcc, but we are running on Cygwin. Gcc prints its search
-        # path with ; separators, and with drive letters. We can handle the
-        # drive letters (cygwin fileutils understands them), so leave them,
-        # especially as we might pass files found there to a mingw objdump,
-        # which wouldn't understand a cygwinified path. Ahh.
-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-      else
-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-      fi
-      ;;
-    pw32*)
-      # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-      ;;
-    esac
-    ;;
-
-  *)
-    library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
-    ;;
-  esac
-  dynamic_linker='Win32 ld.exe'
-  # FIXME: first we should search . and the directory the executable is in
-  shlibpath_var=PATH
-  ;;
-
-darwin* | rhapsody*)
-  dynamic_linker="$host_os dyld"
-  version_type=darwin
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-  soname_spec='${libname}${release}${major}$shared_ext'
-  shlibpath_overrides_runpath=yes
-  shlibpath_var=DYLD_LIBRARY_PATH
-  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-  if test "$GCC" = yes; then
-    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-  else
-    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-  fi
-  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-  ;;
-
-dgux*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-freebsd1*)
-  dynamic_linker=no
-  ;;
-
-kfreebsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
-freebsd* | dragonfly*)
-  # DragonFly does not have aout.  When/if they implement a new
-  # versioning mechanism, adjust this.
-  if test -x /usr/bin/objformat; then
-    objformat=`/usr/bin/objformat`
-  else
-    case $host_os in
-    freebsd[[123]]*) objformat=aout ;;
-    *) objformat=elf ;;
-    esac
-  fi
-  version_type=freebsd-$objformat
-  case $version_type in
-    freebsd-elf*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-      need_version=no
-      need_lib_prefix=no
-      ;;
-    freebsd-*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
-      need_version=yes
-      ;;
-  esac
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_os in
-  freebsd2*)
-    shlibpath_overrides_runpath=yes
-    ;;
-  freebsd3.[[01]]* | freebsdelf3.[[01]]*)
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \
-  freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1)
-    shlibpath_overrides_runpath=no
-    hardcode_into_libs=yes
-    ;;
-  freebsd*) # from 4.6 on
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  esac
-  ;;
-
-gnu*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  hardcode_into_libs=yes
-  ;;
-
-hpux9* | hpux10* | hpux11*)
-  # Give a soname corresponding to the major version so that dld.sl refuses to
-  # link against other versions.
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  case $host_cpu in
-  ia64*)
-    shrext_cmds='.so'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.so"
-    shlibpath_var=LD_LIBRARY_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    if test "X$HPUX_IA64_MODE" = X32; then
-      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
-    else
-      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
-    fi
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-    ;;
-   hppa*64*)
-     shrext_cmds='.sl'
-     hardcode_into_libs=yes
-     dynamic_linker="$host_os dld.sl"
-     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-     soname_spec='${libname}${release}${shared_ext}$major'
-     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
-     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-     ;;
-   *)
-    shrext_cmds='.sl'
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=SHLIB_PATH
-    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    ;;
-  esac
-  # HP-UX runs *really* slowly unless shared libraries are mode 555.
-  postinstall_cmds='chmod 555 $lib'
-  ;;
-
-interix3*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $host_os in
-    nonstopux*) version_type=nonstopux ;;
-    *)
-	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux
-	else
-		version_type=irix
-	fi ;;
-  esac
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
-  case $host_os in
-  irix5* | nonstopux*)
-    libsuff= shlibsuff=
-    ;;
-  *)
-    case $LD in # libtool.m4 will add one of these switches to LD
-    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
-      libsuff= shlibsuff= libmagic=32-bit;;
-    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
-      libsuff=32 shlibsuff=N32 libmagic=N32;;
-    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
-      libsuff=64 shlibsuff=64 libmagic=64-bit;;
-    *) libsuff= shlibsuff= libmagic=never-match;;
-    esac
-    ;;
-  esac
-  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-  shlibpath_overrides_runpath=no
-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-  hardcode_into_libs=yes
-  ;;
-
-# No shared lib support for Linux oldld, aout, or coff.
-linux*oldld* | linux*aout* | linux*coff*)
-  dynamic_linker=no
-  ;;
-
-# This must be Linux ELF.
-linux*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  # This implies no fast_install, which is unacceptable.
-  # Some rework will be needed to allow for fast_install
-  # before this can be enabled.
-  hardcode_into_libs=yes
-
-  # find out which ABI we are using
-  libsuff=
-  case "$host_cpu" in
-  x86_64*|s390x*|powerpc64*)
-    echo '[#]line __oline__ "configure"' > conftest.$ac_ext
-    if AC_TRY_EVAL(ac_compile); then
-      case `/usr/bin/file conftest.$ac_objext` in
-      *64-bit*)
-        libsuff=64
-        sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
-        ;;
-      esac
-    fi
-    rm -rf conftest*
-    ;;
-  esac
-
-  # Append ld.so.conf contents to the search path
-  if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/^[	 ]*//;s/#.*//;/^[^\/]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
-  fi
-
-  # We used to test for /lib/ld.so.1 and disable shared libraries on
-  # powerpc, because MkLinux only supported shared libraries with the
-  # GNU dynamic linker.  Since this was broken with cross compilers,
-  # most powerpc-linux boxes support dynamic linking these days and
-  # people can always --disable-shared, the test was removed, and we
-  # assume the GNU/Linux dynamic linker is in use.
-  dynamic_linker='GNU/Linux ld.so'
-  ;;
-
-knetbsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
-netbsd*)
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-    dynamic_linker='NetBSD (a.out) ld.so'
-  else
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    dynamic_linker='NetBSD ld.elf_so'
-  fi
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  ;;
-
-newsos6)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-nto-qnx*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-openbsd*)
-  version_type=sunos
-  sys_lib_dlsearch_path_spec="/usr/lib"
-  need_lib_prefix=no
-  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-  case $host_os in
-    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
-    *)                         need_version=no  ;;
-  esac
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    case $host_os in
-      openbsd2.[[89]] | openbsd2.[[89]].*)
-	shlibpath_overrides_runpath=no
-	;;
-      *)
-	shlibpath_overrides_runpath=yes
-	;;
-      esac
-  else
-    shlibpath_overrides_runpath=yes
-  fi
-  ;;
-
-os2*)
-  libname_spec='$name'
-  shrext_cmds=".dll"
-  need_lib_prefix=no
-  library_names_spec='$libname${shared_ext} $libname.a'
-  dynamic_linker='OS/2 ld.exe'
-  shlibpath_var=LIBPATH
-  ;;
-
-osf3* | osf4* | osf5*)
-  version_type=osf
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-  ;;
-
-solaris*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  # ldd complains unless libraries are executable
-  postinstall_cmds='chmod +x $lib'
-  ;;
-
-sunos4*)
-  version_type=sunos
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  if test "$with_gnu_ld" = yes; then
-    need_lib_prefix=no
-  fi
-  need_version=yes
-  ;;
-
-sysv4 | sysv4.3*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_vendor in
-    sni)
-      shlibpath_overrides_runpath=no
-      need_lib_prefix=no
-      export_dynamic_flag_spec='${wl}-Blargedynsym'
-      runpath_var=LD_RUN_PATH
-      ;;
-    siemens)
-      need_lib_prefix=no
-      ;;
-    motorola)
-      need_lib_prefix=no
-      need_version=no
-      shlibpath_overrides_runpath=no
-      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-      ;;
-  esac
-  ;;
-
-sysv4*MP*)
-  if test -d /usr/nec ;then
-    version_type=linux
-    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-    soname_spec='$libname${shared_ext}.$major'
-    shlibpath_var=LD_LIBRARY_PATH
-  fi
-  ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  version_type=freebsd-elf
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  hardcode_into_libs=yes
-  if test "$with_gnu_ld" = yes; then
-    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
-    shlibpath_overrides_runpath=no
-  else
-    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
-    shlibpath_overrides_runpath=yes
-    case $host_os in
-      sco3.2v5*)
-        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
-	;;
-    esac
-  fi
-  sys_lib_dlsearch_path_spec='/usr/lib'
-  ;;
-
-uts4*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-*)
-  dynamic_linker=no
-  ;;
-esac
-AC_MSG_RESULT([$dynamic_linker])
-test "$dynamic_linker" = no && can_build_shared=no
-
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
-])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
-
-
-# _LT_AC_TAGCONFIG
-# ----------------
-AC_DEFUN([_LT_AC_TAGCONFIG],
-[AC_ARG_WITH([tags],
-    [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],
-        [include additional configurations @<:@automatic@:>@])],
-    [tagnames="$withval"])
-
-if test -f "$ltmain" && test -n "$tagnames"; then
-  if test ! -f "${ofile}"; then
-    AC_MSG_WARN([output file `$ofile' does not exist])
-  fi
-
-  if test -z "$LTCC"; then
-    eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
-    if test -z "$LTCC"; then
-      AC_MSG_WARN([output file `$ofile' does not look like a libtool script])
-    else
-      AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
-    fi
-  fi
-  if test -z "$LTCFLAGS"; then
-    eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`"
-  fi
-
-  # Extract list of available tagged configurations in $ofile.
-  # Note that this assumes the entire list is on one line.
-  available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'`
-
-  lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-  for tagname in $tagnames; do
-    IFS="$lt_save_ifs"
-    # Check whether tagname contains only valid characters
-    case `$echo "X$tagname" | $Xsed -e 's:[[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]]::g'` in
-    "") ;;
-    *)  AC_MSG_ERROR([invalid tag name: $tagname])
-	;;
-    esac
-
-    if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
-    then
-      AC_MSG_ERROR([tag name \"$tagname\" already exists])
-    fi
-
-    # Update the list of available tags.
-    if test -n "$tagname"; then
-      echo appending configuration tag \"$tagname\" to $ofile
-
-      case $tagname in
-      CXX)
-	if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-	    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-	    (test "X$CXX" != "Xg++"))) ; then
-	  AC_LIBTOOL_LANG_CXX_CONFIG
-	else
-	  tagname=""
-	fi
-	;;
-
-      F77)
-	if test -n "$F77" && test "X$F77" != "Xno"; then
-	  AC_LIBTOOL_LANG_F77_CONFIG
-	else
-	  tagname=""
-	fi
-	;;
-
-      GCJ)
-	if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
-	  AC_LIBTOOL_LANG_GCJ_CONFIG
-	else
-	  tagname=""
-	fi
-	;;
-
-      RC)
-	AC_LIBTOOL_LANG_RC_CONFIG
-	;;
-
-      *)
-	AC_MSG_ERROR([Unsupported tag name: $tagname])
-	;;
-      esac
-
-      # Append the new tag name to the list of available tags.
-      if test -n "$tagname" ; then
-      available_tags="$available_tags $tagname"
-    fi
-    fi
-  done
-  IFS="$lt_save_ifs"
-
-  # Now substitute the updated list of available tags.
-  if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then
-    mv "${ofile}T" "$ofile"
-    chmod +x "$ofile"
-  else
-    rm -f "${ofile}T"
-    AC_MSG_ERROR([unable to update list of available tagged configurations.])
-  fi
-fi
-])# _LT_AC_TAGCONFIG
-
-
-# AC_LIBTOOL_DLOPEN
-# -----------------
-# enable checks for dlopen support
-AC_DEFUN([AC_LIBTOOL_DLOPEN],
- [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])
-])# AC_LIBTOOL_DLOPEN
-
-
-# AC_LIBTOOL_WIN32_DLL
-# --------------------
-# declare package support for building win32 DLLs
-AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
-[AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
-])# AC_LIBTOOL_WIN32_DLL
-
-
-# AC_ENABLE_SHARED([DEFAULT])
-# ---------------------------
-# implement the --enable-shared flag
-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-AC_DEFUN([AC_ENABLE_SHARED],
-[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE([shared],
-    [AC_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
-	[build shared libraries @<:@default=]AC_ENABLE_SHARED_DEFAULT[@:>@])],
-    [p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_shared=yes ;;
-    no) enable_shared=no ;;
-    *)
-      enable_shared=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_shared=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac],
-    [enable_shared=]AC_ENABLE_SHARED_DEFAULT)
-])# AC_ENABLE_SHARED
-
-
-# AC_DISABLE_SHARED
-# -----------------
-# set the default shared flag to --disable-shared
-AC_DEFUN([AC_DISABLE_SHARED],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-AC_ENABLE_SHARED(no)
-])# AC_DISABLE_SHARED
-
-
-# AC_ENABLE_STATIC([DEFAULT])
-# ---------------------------
-# implement the --enable-static flag
-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-AC_DEFUN([AC_ENABLE_STATIC],
-[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE([static],
-    [AC_HELP_STRING([--enable-static@<:@=PKGS@:>@],
-	[build static libraries @<:@default=]AC_ENABLE_STATIC_DEFAULT[@:>@])],
-    [p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_static=yes ;;
-    no) enable_static=no ;;
-    *)
-     enable_static=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_static=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac],
-    [enable_static=]AC_ENABLE_STATIC_DEFAULT)
-])# AC_ENABLE_STATIC
-
-
-# AC_DISABLE_STATIC
-# -----------------
-# set the default static flag to --disable-static
-AC_DEFUN([AC_DISABLE_STATIC],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-AC_ENABLE_STATIC(no)
-])# AC_DISABLE_STATIC
-
-
-# AC_ENABLE_FAST_INSTALL([DEFAULT])
-# ---------------------------------
-# implement the --enable-fast-install flag
-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-AC_DEFUN([AC_ENABLE_FAST_INSTALL],
-[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE([fast-install],
-    [AC_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
-    [optimize for fast installation @<:@default=]AC_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
-    [p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_fast_install=yes ;;
-    no) enable_fast_install=no ;;
-    *)
-      enable_fast_install=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_fast_install=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac],
-    [enable_fast_install=]AC_ENABLE_FAST_INSTALL_DEFAULT)
-])# AC_ENABLE_FAST_INSTALL
-
-
-# AC_DISABLE_FAST_INSTALL
-# -----------------------
-# set the default to --disable-fast-install
-AC_DEFUN([AC_DISABLE_FAST_INSTALL],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-AC_ENABLE_FAST_INSTALL(no)
-])# AC_DISABLE_FAST_INSTALL
-
-
-# AC_LIBTOOL_PICMODE([MODE])
-# --------------------------
-# implement the --with-pic flag
-# MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
-AC_DEFUN([AC_LIBTOOL_PICMODE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-pic_mode=ifelse($#,1,$1,default)
-])# AC_LIBTOOL_PICMODE
-
-
-# AC_PROG_EGREP
-# -------------
-# This is predefined starting with Autoconf 2.54, so this conditional
-# definition can be removed once we require Autoconf 2.54 or later.
-m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP],
-[AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep],
-   [if echo a | (grep -E '(a|b)') >/dev/null 2>&1
-    then ac_cv_prog_egrep='grep -E'
-    else ac_cv_prog_egrep='egrep'
-    fi])
- EGREP=$ac_cv_prog_egrep
- AC_SUBST([EGREP])
-])])
-
-
-# AC_PATH_TOOL_PREFIX
-# -------------------
-# find a file program which can recognise shared library
-AC_DEFUN([AC_PATH_TOOL_PREFIX],
-[AC_REQUIRE([AC_PROG_EGREP])dnl
-AC_MSG_CHECKING([for $1])
-AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
-[case $MAGIC_CMD in
-[[\\/*] |  ?:[\\/]*])
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-  ;;
-*)
-  lt_save_MAGIC_CMD="$MAGIC_CMD"
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-dnl $ac_dummy forces splitting on constant user-supplied paths.
-dnl POSIX.2 word splitting is done only on the output of word expansions,
-dnl not every word.  This closes a longstanding sh security hole.
-  ac_dummy="ifelse([$2], , $PATH, [$2])"
-  for ac_dir in $ac_dummy; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$1; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/$1"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    $EGREP "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS="$lt_save_ifs"
-  MAGIC_CMD="$lt_save_MAGIC_CMD"
-  ;;
-esac])
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  AC_MSG_RESULT($MAGIC_CMD)
-else
-  AC_MSG_RESULT(no)
-fi
-])# AC_PATH_TOOL_PREFIX
-
-
-# AC_PATH_MAGIC
-# -------------
-# find a file program which can recognise a shared library
-AC_DEFUN([AC_PATH_MAGIC],
-[AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
-if test -z "$lt_cv_path_MAGIC_CMD"; then
-  if test -n "$ac_tool_prefix"; then
-    AC_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
-  else
-    MAGIC_CMD=:
-  fi
-fi
-])# AC_PATH_MAGIC
-
-
-# AC_PROG_LD
-# ----------
-# find the pathname to the GNU or non-GNU linker
-AC_DEFUN([AC_PROG_LD],
-[AC_ARG_WITH([gnu-ld],
-    [AC_HELP_STRING([--with-gnu-ld],
-	[assume the C compiler uses GNU ld @<:@default=no@:>@])],
-    [test "$withval" = no || with_gnu_ld=yes],
-    [with_gnu_ld=no])
-AC_REQUIRE([LT_AC_PROG_SED])dnl
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-ac_prog=ld
-if test "$GCC" = yes; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  AC_MSG_CHECKING([for ld used by $CC])
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
-    # Accept absolute paths.
-    [[\\/]]* | ?:[[\\/]]*)
-      re_direlt='/[[^/]][[^/]]*/\.\./'
-      # Canonicalize the pathname of ld
-      ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
-      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
-      done
-      test -z "$LD" && LD="$ac_prog"
-      ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test "$with_gnu_ld" = yes; then
-  AC_MSG_CHECKING([for GNU ld])
-else
-  AC_MSG_CHECKING([for non-GNU ld])
-fi
-AC_CACHE_VAL(lt_cv_path_LD,
-[if test -z "$LD"; then
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  for ac_dir in $PATH; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      lt_cv_path_LD="$ac_dir/$ac_prog"
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some variants of GNU ld only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
-      *GNU* | *'with BFD'*)
-	test "$with_gnu_ld" != no && break
-	;;
-      *)
-	test "$with_gnu_ld" != yes && break
-	;;
-      esac
-    fi
-  done
-  IFS="$lt_save_ifs"
-else
-  lt_cv_path_LD="$LD" # Let the user override the test with a path.
-fi])
-LD="$lt_cv_path_LD"
-if test -n "$LD"; then
-  AC_MSG_RESULT($LD)
-else
-  AC_MSG_RESULT(no)
-fi
-test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
-AC_PROG_LD_GNU
-])# AC_PROG_LD
-
-
-# AC_PROG_LD_GNU
-# --------------
-AC_DEFUN([AC_PROG_LD_GNU],
-[AC_REQUIRE([AC_PROG_EGREP])dnl
-AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
-[# I'd rather use --version here, but apparently some GNU lds only accept -v.
-case `$LD -v 2>&1 </dev/null` in
-*GNU* | *'with BFD'*)
-  lt_cv_prog_gnu_ld=yes
-  ;;
-*)
-  lt_cv_prog_gnu_ld=no
-  ;;
-esac])
-with_gnu_ld=$lt_cv_prog_gnu_ld
-])# AC_PROG_LD_GNU
-
-
-# AC_PROG_LD_RELOAD_FLAG
-# ----------------------
-# find reload flag for linker
-#   -- PORTME Some linkers may need a different reload flag.
-AC_DEFUN([AC_PROG_LD_RELOAD_FLAG],
-[AC_CACHE_CHECK([for $LD option to reload object files],
-  lt_cv_ld_reload_flag,
-  [lt_cv_ld_reload_flag='-r'])
-reload_flag=$lt_cv_ld_reload_flag
-case $reload_flag in
-"" | " "*) ;;
-*) reload_flag=" $reload_flag" ;;
-esac
-reload_cmds='$LD$reload_flag -o $output$reload_objs'
-case $host_os in
-  darwin*)
-    if test "$GCC" = yes; then
-      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
-    else
-      reload_cmds='$LD$reload_flag -o $output$reload_objs'
-    fi
-    ;;
-esac
-])# AC_PROG_LD_RELOAD_FLAG
-
-
-# AC_DEPLIBS_CHECK_METHOD
-# -----------------------
-# how to check for library dependencies
-#  -- PORTME fill in with the dynamic library characteristics
-AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
-[AC_CACHE_CHECK([how to recognise dependent libraries],
-lt_cv_deplibs_check_method,
-[lt_cv_file_magic_cmd='$MAGIC_CMD'
-lt_cv_file_magic_test_file=
-lt_cv_deplibs_check_method='unknown'
-# Need to set the preceding variable on all platforms that support
-# interlibrary dependencies.
-# 'none' -- dependencies not supported.
-# `unknown' -- same as none, but documents that we really don't know.
-# 'pass_all' -- all dependencies passed with no checks.
-# 'test_compile' -- check by making test program.
-# 'file_magic [[regex]]' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given extended regex.
-# If you have `file' or equivalent on your system and you're not sure
-# whether `pass_all' will *always* work, you probably want this one.
-
-case $host_os in
-aix4* | aix5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-beos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-bsdi[[45]]*)
-  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  ;;
-
-cygwin*)
-  # func_win32_libid is a shell function defined in ltmain.sh
-  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-  lt_cv_file_magic_cmd='func_win32_libid'
-  ;;
-
-mingw* | pw32*)
-  # Base MSYS/MinGW do not provide the 'file' command needed by
-  # func_win32_libid shell function, so use a weaker test based on 'objdump'.
-  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-  lt_cv_file_magic_cmd='$OBJDUMP -f'
-  ;;
-
-darwin* | rhapsody*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-freebsd* | kfreebsd*-gnu | dragonfly*)
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    case $host_cpu in
-    i*86 )
-      # Not sure whether the presence of OpenBSD here was a mistake.
-      # Let's accept both of them until this is cleared up.
-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
-      lt_cv_file_magic_cmd=/usr/bin/file
-      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-      ;;
-    esac
-  else
-    lt_cv_deplibs_check_method=pass_all
-  fi
-  ;;
-
-gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-hpux10.20* | hpux11*)
-  lt_cv_file_magic_cmd=/usr/bin/file
-  case $host_cpu in
-  ia64*)
-    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
-    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-    ;;
-  hppa*64*)
-    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]']
-    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
-    ;;
-  *)
-    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
-    lt_cv_file_magic_test_file=/usr/lib/libc.sl
-    ;;
-  esac
-  ;;
-
-interix3*)
-  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
-  lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $LD in
-  *-32|*"-32 ") libmagic=32-bit;;
-  *-n32|*"-n32 ") libmagic=N32;;
-  *-64|*"-64 ") libmagic=64-bit;;
-  *) libmagic=never-match;;
-  esac
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-# This must be Linux ELF.
-linux*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-netbsd*)
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
-  fi
-  ;;
-
-newos6*)
-  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
-  lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=/usr/lib/libnls.so
-  ;;
-
-nto-qnx*)
-  lt_cv_deplibs_check_method=unknown
-  ;;
-
-openbsd*)
-  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
-  fi
-  ;;
-
-osf3* | osf4* | osf5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-solaris*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv4 | sysv4.3*)
-  case $host_vendor in
-  motorola)
-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-    ;;
-  ncr)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  sequent)
-    lt_cv_file_magic_cmd='/bin/file'
-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
-    ;;
-  sni)
-    lt_cv_file_magic_cmd='/bin/file'
-    lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
-    lt_cv_file_magic_test_file=/lib/libc.so
-    ;;
-  siemens)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  pc)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  esac
-  ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-esac
-])
-file_magic_cmd=$lt_cv_file_magic_cmd
-deplibs_check_method=$lt_cv_deplibs_check_method
-test -z "$deplibs_check_method" && deplibs_check_method=unknown
-])# AC_DEPLIBS_CHECK_METHOD
-
-
-# AC_PROG_NM
-# ----------
-# find the pathname to a BSD-compatible name lister
-AC_DEFUN([AC_PROG_NM],
-[AC_CACHE_CHECK([for BSD-compatible nm], lt_cv_path_NM,
-[if test -n "$NM"; then
-  # Let the user override the test.
-  lt_cv_path_NM="$NM"
-else
-  lt_nm_to_check="${ac_tool_prefix}nm"
-  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then 
-    lt_nm_to_check="$lt_nm_to_check nm"
-  fi
-  for lt_tmp_nm in $lt_nm_to_check; do
-    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
-      IFS="$lt_save_ifs"
-      test -z "$ac_dir" && ac_dir=.
-      tmp_nm="$ac_dir/$lt_tmp_nm"
-      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
-	# Check to see if the nm accepts a BSD-compat flag.
-	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
-	#   nm: unknown option "B" ignored
-	# Tru64's nm complains that /dev/null is an invalid object file
-	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
-	*/dev/null* | *'Invalid file or object type'*)
-	  lt_cv_path_NM="$tmp_nm -B"
-	  break
-	  ;;
-	*)
-	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
-	  */dev/null*)
-	    lt_cv_path_NM="$tmp_nm -p"
-	    break
-	    ;;
-	  *)
-	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-	    continue # so that we can try to find one that supports BSD flags
-	    ;;
-	  esac
-	  ;;
-	esac
-      fi
-    done
-    IFS="$lt_save_ifs"
-  done
-  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
-fi])
-NM="$lt_cv_path_NM"
-])# AC_PROG_NM
-
-
-# AC_CHECK_LIBM
-# -------------
-# check for math library
-AC_DEFUN([AC_CHECK_LIBM],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-LIBM=
-case $host in
-*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
-  # These system don't have libm, or don't need it
-  ;;
-*-ncr-sysv4.3*)
-  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
-  AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
-  ;;
-*)
-  AC_CHECK_LIB(m, cos, LIBM="-lm")
-  ;;
-esac
-])# AC_CHECK_LIBM
-
-
-# AC_LIBLTDL_CONVENIENCE([DIRECTORY])
-# -----------------------------------
-# sets LIBLTDL to the link flags for the libltdl convenience library and
-# LTDLINCL to the include flags for the libltdl header and adds
-# --enable-ltdl-convenience to the configure arguments.  Note that
-# AC_CONFIG_SUBDIRS is not called here.  If DIRECTORY is not provided,
-# it is assumed to be `libltdl'.  LIBLTDL will be prefixed with
-# '${top_builddir}/' and LTDLINCL will be prefixed with '${top_srcdir}/'
-# (note the single quotes!).  If your package is not flat and you're not
-# using automake, define top_builddir and top_srcdir appropriately in
-# the Makefiles.
-AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-  case $enable_ltdl_convenience in
-  no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
-  "") enable_ltdl_convenience=yes
-      ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
-  esac
-  LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
-  LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
-  # For backwards non-gettext consistent compatibility...
-  INCLTDL="$LTDLINCL"
-])# AC_LIBLTDL_CONVENIENCE
-
-
-# AC_LIBLTDL_INSTALLABLE([DIRECTORY])
-# -----------------------------------
-# sets LIBLTDL to the link flags for the libltdl installable library and
-# LTDLINCL to the include flags for the libltdl header and adds
-# --enable-ltdl-install to the configure arguments.  Note that
-# AC_CONFIG_SUBDIRS is not called here.  If DIRECTORY is not provided,
-# and an installed libltdl is not found, it is assumed to be `libltdl'.
-# LIBLTDL will be prefixed with '${top_builddir}/'# and LTDLINCL with
-# '${top_srcdir}/' (note the single quotes!).  If your package is not
-# flat and you're not using automake, define top_builddir and top_srcdir
-# appropriately in the Makefiles.
-# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
-AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-  AC_CHECK_LIB(ltdl, lt_dlinit,
-  [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
-  [if test x"$enable_ltdl_install" = xno; then
-     AC_MSG_WARN([libltdl not installed, but installation disabled])
-   else
-     enable_ltdl_install=yes
-   fi
-  ])
-  if test x"$enable_ltdl_install" = x"yes"; then
-    ac_configure_args="$ac_configure_args --enable-ltdl-install"
-    LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
-    LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
-  else
-    ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
-    LIBLTDL="-lltdl"
-    LTDLINCL=
-  fi
-  # For backwards non-gettext consistent compatibility...
-  INCLTDL="$LTDLINCL"
-])# AC_LIBLTDL_INSTALLABLE
-
-
-# AC_LIBTOOL_CXX
-# --------------
-# enable support for C++ libraries
-AC_DEFUN([AC_LIBTOOL_CXX],
-[AC_REQUIRE([_LT_AC_LANG_CXX])
-])# AC_LIBTOOL_CXX
-
-
-# _LT_AC_LANG_CXX
-# ---------------
-AC_DEFUN([_LT_AC_LANG_CXX],
-[AC_REQUIRE([AC_PROG_CXX])
-AC_REQUIRE([_LT_AC_PROG_CXXCPP])
-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX])
-])# _LT_AC_LANG_CXX
-
-# _LT_AC_PROG_CXXCPP
-# ------------------
-AC_DEFUN([_LT_AC_PROG_CXXCPP],
-[
-AC_REQUIRE([AC_PROG_CXX])
-if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-    (test "X$CXX" != "Xg++"))) ; then
-  AC_PROG_CXXCPP
-fi
-])# _LT_AC_PROG_CXXCPP
-
-# AC_LIBTOOL_F77
-# --------------
-# enable support for Fortran 77 libraries
-AC_DEFUN([AC_LIBTOOL_F77],
-[AC_REQUIRE([_LT_AC_LANG_F77])
-])# AC_LIBTOOL_F77
-
-
-# _LT_AC_LANG_F77
-# ---------------
-AC_DEFUN([_LT_AC_LANG_F77],
-[AC_REQUIRE([AC_PROG_F77])
-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}F77])
-])# _LT_AC_LANG_F77
-
-
-# AC_LIBTOOL_GCJ
-# --------------
-# enable support for GCJ libraries
-AC_DEFUN([AC_LIBTOOL_GCJ],
-[AC_REQUIRE([_LT_AC_LANG_GCJ])
-])# AC_LIBTOOL_GCJ
-
-
-# _LT_AC_LANG_GCJ
-# ---------------
-AC_DEFUN([_LT_AC_LANG_GCJ],
-[AC_PROVIDE_IFELSE([AC_PROG_GCJ],[],
-  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[],
-    [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[],
-      [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])],
-	 [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])],
-	   [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])])
-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}GCJ])
-])# _LT_AC_LANG_GCJ
-
-
-# AC_LIBTOOL_RC
-# -------------
-# enable support for Windows resource files
-AC_DEFUN([AC_LIBTOOL_RC],
-[AC_REQUIRE([LT_AC_PROG_RC])
-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}RC])
-])# AC_LIBTOOL_RC
-
-
-# AC_LIBTOOL_LANG_C_CONFIG
-# ------------------------
-# Ensure that the configuration vars for the C compiler are
-# suitably defined.  Those variables are subsequently used by
-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG], [_LT_AC_LANG_C_CONFIG])
-AC_DEFUN([_LT_AC_LANG_C_CONFIG],
-[lt_save_CC="$CC"
-AC_LANG_PUSH(C)
-
-# Source file extension for C test sources.
-ac_ext=c
-
-# Object file extension for compiled C test sources.
-objext=o
-_LT_AC_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;\n"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='int main(){return(0);}\n'
-
-_LT_AC_SYS_COMPILER
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
-AC_LIBTOOL_PROG_COMPILER_PIC($1)
-AC_LIBTOOL_PROG_CC_C_O($1)
-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
-AC_LIBTOOL_PROG_LD_SHLIBS($1)
-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
-AC_LIBTOOL_SYS_LIB_STRIP
-AC_LIBTOOL_DLOPEN_SELF
-
-# Report which library types will actually be built
-AC_MSG_CHECKING([if libtool supports shared libraries])
-AC_MSG_RESULT([$can_build_shared])
-
-AC_MSG_CHECKING([whether to build shared libraries])
-test "$can_build_shared" = "no" && enable_shared=no
-
-# On AIX, shared libraries and static libraries use the same namespace, and
-# are all built from PIC.
-case $host_os in
-aix3*)
-  test "$enable_shared" = yes && enable_static=no
-  if test -n "$RANLIB"; then
-    archive_cmds="$archive_cmds~\$RANLIB \$lib"
-    postinstall_cmds='$RANLIB $lib'
-  fi
-  ;;
-
-aix4* | aix5*)
-  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-    test "$enable_shared" = yes && enable_static=no
-  fi
-    ;;
-esac
-AC_MSG_RESULT([$enable_shared])
-
-AC_MSG_CHECKING([whether to build static libraries])
-# Make sure either enable_shared or enable_static is yes.
-test "$enable_shared" = yes || enable_static=yes
-AC_MSG_RESULT([$enable_static])
-
-AC_LIBTOOL_CONFIG($1)
-
-AC_LANG_POP
-CC="$lt_save_CC"
-])# AC_LIBTOOL_LANG_C_CONFIG
-
-
-# AC_LIBTOOL_LANG_CXX_CONFIG
-# --------------------------
-# Ensure that the configuration vars for the C compiler are
-# suitably defined.  Those variables are subsequently used by
-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [_LT_AC_LANG_CXX_CONFIG(CXX)])
-AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
-[AC_LANG_PUSH(C++)
-AC_REQUIRE([AC_PROG_CXX])
-AC_REQUIRE([_LT_AC_PROG_CXXCPP])
-
-_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-_LT_AC_TAGVAR(allow_undefined_flag, $1)=
-_LT_AC_TAGVAR(always_export_symbols, $1)=no
-_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
-_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
-_LT_AC_TAGVAR(hardcode_direct, $1)=no
-_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
-_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
-_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-_LT_AC_TAGVAR(hardcode_automatic, $1)=no
-_LT_AC_TAGVAR(module_cmds, $1)=
-_LT_AC_TAGVAR(module_expsym_cmds, $1)=
-_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
-_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_AC_TAGVAR(no_undefined_flag, $1)=
-_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-
-# Dependencies to place before and after the object being linked:
-_LT_AC_TAGVAR(predep_objects, $1)=
-_LT_AC_TAGVAR(postdep_objects, $1)=
-_LT_AC_TAGVAR(predeps, $1)=
-_LT_AC_TAGVAR(postdeps, $1)=
-_LT_AC_TAGVAR(compiler_lib_search_path, $1)=
-
-# Source file extension for C++ test sources.
-ac_ext=cpp
-
-# Object file extension for compiled C++ test sources.
-objext=o
-_LT_AC_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;\n"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }\n'
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_AC_SYS_COMPILER
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-# Allow CC to be a program name with arguments.
-lt_save_CC=$CC
-lt_save_LD=$LD
-lt_save_GCC=$GCC
-GCC=$GXX
-lt_save_with_gnu_ld=$with_gnu_ld
-lt_save_path_LD=$lt_cv_path_LD
-if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
-  lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
-else
-  $as_unset lt_cv_prog_gnu_ld
-fi
-if test -n "${lt_cv_path_LDCXX+set}"; then
-  lt_cv_path_LD=$lt_cv_path_LDCXX
-else
-  $as_unset lt_cv_path_LD
-fi
-test -z "${LDCXX+set}" || LD=$LDCXX
-CC=${CXX-"c++"}
-compiler=$CC
-_LT_AC_TAGVAR(compiler, $1)=$CC
-_LT_CC_BASENAME([$compiler])
-
-# We don't want -fno-exception wen compiling C++ code, so set the
-# no_builtin_flag separately
-if test "$GXX" = yes; then
-  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
-else
-  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
-fi
-
-if test "$GXX" = yes; then
-  # Set up default GNU C++ configuration
-
-  AC_PROG_LD
-
-  # Check if GNU C++ uses GNU ld as the underlying linker, since the
-  # archiving commands below assume that GNU ld is being used.
-  if test "$with_gnu_ld" = yes; then
-    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
-    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-
-    # If archive_cmds runs LD, not CC, wlarc should be empty
-    # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
-    #     investigate it a little bit more. (MM)
-    wlarc='${wl}'
-
-    # ancient GNU ld didn't support --whole-archive et. al.
-    if eval "`$CC -print-prog-name=ld` --help 2>&1" | \
-	grep 'no-whole-archive' > /dev/null; then
-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-    else
-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+    warnCFLAGS=
+    if test "x$GCC" != xyes; then
+	enable_compile_warnings=no
     fi
-  else
-    with_gnu_ld=no
-    wlarc=
-
-    # A generic and very simple default shared library creation
-    # command for GNU C++ for the case where it uses the native
-    # linker, instead of GNU ld.  If possible, this setting should
-    # overridden to take advantage of the native linker features on
-    # the platform it is being used on.
-    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-  fi
-
-  # Commands to make compiler produce verbose output that lists
-  # what "hidden" libraries, object files and flags are used when
-  # linking a shared library.
-  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
 
-else
-  GXX=no
-  with_gnu_ld=no
-  wlarc=
-fi
-
-# PORTME: fill in a description of your system's C++ link characteristics
-AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
-_LT_AC_TAGVAR(ld_shlibs, $1)=yes
-case $host_os in
-  aix3*)
-    # FIXME: insert proper C++ library support
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    ;;
-  aix4* | aix5*)
-    if test "$host_cpu" = ia64; then
-      # On IA64, the linker does run time linking by default, so we don't
-      # have to do anything special.
-      aix_use_runtimelinking=no
-      exp_sym_flag='-Bexport'
-      no_entry_flag=""
-    else
-      aix_use_runtimelinking=no
-
-      # Test if we are trying to use run time linking or normal
-      # AIX style linking. If -brtl is somewhere in LDFLAGS, we
-      # need to do runtime linking.
-      case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
-	for ld_flag in $LDFLAGS; do
-	  case $ld_flag in
-	  *-brtl*)
-	    aix_use_runtimelinking=yes
-	    break
-	    ;;
-	  esac
+    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
-	;;
-      esac
-
-      exp_sym_flag='-bexport'
-      no_entry_flag='-bnoentry'
-    fi
-
-    # When large executables or shared objects are built, AIX ld can
-    # have problems creating the table of contents.  If linking a library
-    # or program results in "error TOC overflow" add -mminimal-toc to
-    # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-    # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
-    _LT_AC_TAGVAR(archive_cmds, $1)=''
-    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
-    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-
-    if test "$GXX" = yes; then
-      case $host_os in aix4.[[012]]|aix4.[[012]].*)
-      # We only want to do this on AIX 4.2 and lower, the check
-      # below for broken collect2 doesn't work under 4.3+
-	collect2name=`${CC} -print-prog-name=collect2`
-	if test -f "$collect2name" && \
-	   strings "$collect2name" | grep resolve_lib_name >/dev/null
-	then
-	  # We have reworked collect2
-	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-	else
-	  # We have old collect2
-	  _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
-	  # It fails to find uninstalled libraries when the uninstalled
-	  # path is not listed in the libpath.  Setting hardcode_minus_L
-	  # to unsupported forces relinking
-	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+	unset option
+	if test "$enable_compile_warnings" = "error" ; then
+	    warning_flags="$warning_flags -Werror"
 	fi
 	;;
-      esac
-      shared_flag='-shared'
-      if test "$aix_use_runtimelinking" = yes; then
-	shared_flag="$shared_flag "'${wl}-G'
-      fi
-    else
-      # not using gcc
-      if test "$host_cpu" = ia64; then
-	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-	# chokes on -Wl,-G. The following line is correct:
-	shared_flag='-G'
-      else
-	if test "$aix_use_runtimelinking" = yes; then
-	  shared_flag='${wl}-G'
-	else
-	  shared_flag='${wl}-bM:SRE'
-	fi
-      fi
-    fi
-
-    # It seems that -bexpall does not export symbols beginning with
-    # underscore (_), so it is better to generate a list of symbols to export.
-    _LT_AC_TAGVAR(always_export_symbols, $1)=yes
-    if test "$aix_use_runtimelinking" = yes; then
-      # Warning - without using the other runtime loading flags (-brtl),
-      # -berok will link without error, but may produce a broken library.
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
-      # Determine the default libpath from the value encoded in an empty executable.
-      _LT_AC_SYS_LIBPATH_AIX
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-
-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-     else
-      if test "$host_cpu" = ia64; then
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
-      else
-	# Determine the default libpath from the value encoded in an empty executable.
-	_LT_AC_SYS_LIBPATH_AIX
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-	# Warning - without using the other run time loading flags,
-	# -berok will link without error, but may produce a broken library.
-	_LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
-	# Exported symbols can be pulled into shared objects from archives
-	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
-	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
-	# This is similar to how AIX traditionally builds its shared libraries.
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-      fi
-    fi
-    ;;
-
-  beos*)
-    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-      # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-      # support --undefined.  This deserves some investigation.  FIXME
-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-    else
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    fi
-    ;;
-
-  chorus*)
-    case $cc_basename in
-      *)
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-    esac
-    ;;
-
-  cygwin* | mingw* | pw32*)
-    # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-    # as there is no search path for DLLs.
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-    _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-    _LT_AC_TAGVAR(always_export_symbols, $1)=no
-    _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-
-    if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-      # If the export-symbols file already is a .def file (1st line
-      # is EXPORTS), use it as is; otherwise, prepend...
-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	cp $export_symbols $output_objdir/$soname.def;
-      else
-	echo EXPORTS > $output_objdir/$soname.def;
-	cat $export_symbols >> $output_objdir/$soname.def;
-      fi~
-      $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-    else
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    fi
-  ;;
-      darwin* | rhapsody*)
-        case $host_os in
-        rhapsody* | darwin1.[[012]])
-         _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
-         ;;
-       *) # Darwin 1.3 on
-         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-           _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-         else
-           case ${MACOSX_DEPLOYMENT_TARGET} in
-             10.[[012]])
-               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-               ;;
-             10.*)
-               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
-               ;;
-           esac
-         fi
-         ;;
-        esac
-      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-      _LT_AC_TAGVAR(hardcode_direct, $1)=no
-      _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
-      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-
-    if test "$GXX" = yes ; then
-      lt_int_apple_cc_single_mod=no
-      output_verbose_link_cmd='echo'
-      if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
-       lt_int_apple_cc_single_mod=yes
-      fi
-      if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-      else
-          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-        fi
-        _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-        # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-          if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          else
-            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          fi
-            _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-      else
-      case $cc_basename in
-        xlc*)
-         output_verbose_link_cmd='echo'
-          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
-          _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          ;;
-       *)
-         _LT_AC_TAGVAR(ld_shlibs, $1)=no
-          ;;
-      esac
-      fi
-        ;;
-
-  dgux*)
-    case $cc_basename in
-      ec++*)
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      ghcx*)
-	# Green Hills C++ Compiler
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      *)
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-    esac
-    ;;
-  freebsd[[12]]*)
-    # C++ shared libraries reported to be fairly broken before switch to ELF
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    ;;
-  freebsd-elf*)
-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-    ;;
-  freebsd* | kfreebsd*-gnu | dragonfly*)
-    # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
-    # conventions
-    _LT_AC_TAGVAR(ld_shlibs, $1)=yes
-    ;;
-  gnu*)
-    ;;
-  hpux9*)
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-    _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
-				# but as the default
-				# location of the library.
-
-    case $cc_basename in
-    CC*)
-      # FIXME: insert proper C++ library support
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-      ;;
-    aCC*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      # Commands to make compiler produce verbose output that lists
-      # what "hidden" libraries, object files and flags are used when
-      # linking a shared library.
-      #
-      # There doesn't appear to be a way to prevent this compiler from
-      # explicitly linking system object files so we need to strip them
-      # from the output so that they don't get included in the library
-      # dependencies.
-      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[[-]]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-      ;;
     *)
-      if test "$GXX" = yes; then
-        _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      else
-        # FIXME: insert proper C++ library support
-        _LT_AC_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-    esac
-    ;;
-  hpux10*|hpux11*)
-    if test $with_gnu_ld = no; then
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-      case $host_cpu in
-      hppa*64*|ia64*)
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
-        ;;
-      *)
-	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-        ;;
-      esac
-    fi
-    case $host_cpu in
-    hppa*64*|ia64*)
-      _LT_AC_TAGVAR(hardcode_direct, $1)=no
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-    *)
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
-					      # but as the default
-					      # location of the library.
-      ;;
-    esac
-
-    case $cc_basename in
-      CC*)
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      aCC*)
-	case $host_cpu in
-	hppa*64*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	  ;;
-	ia64*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	  ;;
-	*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	  ;;
-	esac
-	# Commands to make compiler produce verbose output that lists
-	# what "hidden" libraries, object files and flags are used when
-	# linking a shared library.
-	#
-	# There doesn't appear to be a way to prevent this compiler from
-	# explicitly linking system object files so we need to strip them
-	# from the output so that they don't get included in the library
-	# dependencies.
-	output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-	;;
-      *)
-	if test "$GXX" = yes; then
-	  if test $with_gnu_ld = no; then
-	    case $host_cpu in
-	    hppa*64*)
-	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	      ;;
-	    ia64*)
-	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	      ;;
-	    *)
-	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	      ;;
-	    esac
-	  fi
-	else
-	  # FIXME: insert proper C++ library support
-	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
-	fi
-	;;
-    esac
-    ;;
-  interix3*)
-    _LT_AC_TAGVAR(hardcode_direct, $1)=no
-    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-    # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-    # Instead, shared libraries are loaded at an image base (0x10000000 by
-    # default) and relocated if they conflict, which is a slow very memory
-    # consuming and fragmenting process.  To avoid this, we pick a random,
-    # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-    # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-    ;;
-  irix5* | irix6*)
-    case $cc_basename in
-      CC*)
-	# SGI C++
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-
-	# Archives containing C++ object files must be created using
-	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
-	# necessary to make sure instantiated templates are included
-	# in the archive.
-	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
-	;;
-      *)
-	if test "$GXX" = yes; then
-	  if test "$with_gnu_ld" = no; then
-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	  else
-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
-	  fi
-	fi
-	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+	AC_MSG_ERROR(Unknown argument '$enable_compile_warnings' to --enable-compile-warnings)
 	;;
     esac
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-    ;;
-  linux*)
-    case $cc_basename in
-      KCC*)
-	# Kuck and Associates, Inc. (KAI) C++ Compiler
-
-	# KCC will only create a shared library if the output file
-	# ends with ".so" (or ".sl" for HP-UX), so rename the library
-	# to its proper name (with version) after linking.
-	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
-	# Commands to make compiler produce verbose output that lists
-	# what "hidden" libraries, object files and flags are used when
-	# linking a shared library.
-	#
-	# There doesn't appear to be a way to prevent this compiler from
-	# explicitly linking system object files so we need to strip them
-	# from the output so that they don't get included in the library
-	# dependencies.
-	output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath,$libdir'
-	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-
-	# Archives containing C++ object files must be created using
-	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
-	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
-	;;
-      icpc*)
-	# Intel C++
-	with_gnu_ld=yes
-	# version 8.0 and above of icpc choke on multiply defined symbols
-	# if we add $predep_objects and $postdep_objects, however 7.1 and
-	# earlier do not add the objects themselves.
-	case `$CC -V 2>&1` in
-	*"Version 7."*)
-  	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-  	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-	  ;;
-	*)  # Version 8.0 or newer
-	  tmp_idyn=
-	  case $host_cpu in
-	    ia64*) tmp_idyn=' -i_dynamic';;
-	  esac
-  	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-	  ;;
+    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
-	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-	;;
-      pgCC*)
-        # Portland Group C++ compiler
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
-  	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
-
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
-	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-        ;;
-      cxx*)
-	# Compaq C++
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
-
-	runpath_var=LD_RUN_PATH
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	# Commands to make compiler produce verbose output that lists
-	# what "hidden" libraries, object files and flags are used when
-	# linking a shared library.
-	#
-	# There doesn't appear to be a way to prevent this compiler from
-	# explicitly linking system object files so we need to strip them
-	# from the output so that they don't get included in the library
-	# dependencies.
-	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-	;;
-    esac
-    ;;
-  lynxos*)
-    # FIXME: insert proper C++ library support
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    ;;
-  m88k*)
-    # FIXME: insert proper C++ library support
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    ;;
-  mvs*)
-    case $cc_basename in
-      cxx*)
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      *)
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-    esac
-    ;;
-  netbsd*)
-    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
-      wlarc=
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-    fi
-    # Workaround some broken pre-1.5 toolchains
-    output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
-    ;;
-  openbsd2*)
-    # C++ shared libraries are fairly broken
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    ;;
-  openbsd*)
-    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-    fi
-    output_verbose_link_cmd='echo'
-    ;;
-  osf3*)
-    case $cc_basename in
-      KCC*)
-	# Kuck and Associates, Inc. (KAI) C++ Compiler
-
-	# KCC will only create a shared library if the output file
-	# ends with ".so" (or ".sl" for HP-UX), so rename the library
-	# to its proper name (with version) after linking.
-	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	# Archives containing C++ object files must be created using
-	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
-	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
-
-	;;
-      RCC*)
-	# Rational C++ 2.4.1
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      cxx*)
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	# Commands to make compiler produce verbose output that lists
-	# what "hidden" libraries, object files and flags are used when
-	# linking a shared library.
-	#
-	# There doesn't appear to be a way to prevent this compiler from
-	# explicitly linking system object files so we need to strip them
-	# from the output so that they don't get included in the library
-	# dependencies.
-	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-	;;
-      *)
-	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-
-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	  # Commands to make compiler produce verbose output that lists
-	  # what "hidden" libraries, object files and flags are used when
-	  # linking a shared library.
-	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
-
-	else
-	  # FIXME: insert proper C++ library support
-	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
-	fi
-	;;
-    esac
-    ;;
-  osf4* | osf5*)
-    case $cc_basename in
-      KCC*)
-	# Kuck and Associates, Inc. (KAI) C++ Compiler
-
-	# KCC will only create a shared library if the output file
-	# ends with ".so" (or ".sl" for HP-UX), so rename the library
-	# to its proper name (with version) after linking.
-	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	# Archives containing C++ object files must be created using
-	# the KAI C++ compiler.
-	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
-	;;
-      RCC*)
-	# Rational C++ 2.4.1
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      cxx*)
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
-	  echo "-hidden">> $lib.exp~
-	  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry ${output_objdir}/so_locations -o $lib~
-	  $rm $lib.exp'
-
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	# Commands to make compiler produce verbose output that lists
-	# what "hidden" libraries, object files and flags are used when
-	# linking a shared library.
-	#
-	# There doesn't appear to be a way to prevent this compiler from
-	# explicitly linking system object files so we need to strip them
-	# from the output so that they don't get included in the library
-	# dependencies.
-	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-	;;
-      *)
-	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-
-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	  # Commands to make compiler produce verbose output that lists
-	  # what "hidden" libraries, object files and flags are used when
-	  # linking a shared library.
-	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
-
-	else
-	  # FIXME: insert proper C++ library support
-	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
-	fi
-	;;
-    esac
-    ;;
-  psos*)
-    # FIXME: insert proper C++ library support
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    ;;
-  sunos4*)
-    case $cc_basename in
-      CC*)
-	# Sun C++ 4.x
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      lcc*)
-	# Lucid
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      *)
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-    esac
-    ;;
-  solaris*)
-    case $cc_basename in
-      CC*)
-	# Sun C++ 4.2, 5.x and Centerline C++
-        _LT_AC_TAGVAR(archive_cmds_need_lc,$1)=yes
-	_LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-	$CC -G${allow_undefined_flag}  ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
-
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-	case $host_os in
-	  solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-	  *)
-	    # The C++ compiler is used as linker so we must use $wl
-	    # flag to pass the commands to the underlying system
-	    # linker. We must also pass each convience library through
-	    # to the system linker between allextract/defaultextract.
-	    # The C++ compiler will combine linker options so we
-	    # cannot just pass the convience library names through
-	    # without $wl.
-	    # Supported since Solaris 2.6 (maybe 2.5.1?)
-	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
-	    ;;
+	case " $CFLAGS " in
+	    *[\ \	]-pedantic[\ \	]*) ;;
+	    *) complCFLAGS="$complCFLAGS -pedantic" ;;
 	esac
-	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-
-	output_verbose_link_cmd='echo'
-
-	# Archives containing C++ object files must be created using
-	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
-	# necessary to make sure instantiated templates are included
-	# in the archive.
-	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
-	;;
-      gcx*)
-	# Green Hills C++ Compiler
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-
-	# The C++ compiler must be used to create the archive.
-	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-	;;
-      *)
-	# GNU C++ compiler with Solaris linker
-	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
-	  if $CC --version | grep -v '^2\.7' > /dev/null; then
-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-		$CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
-
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
-	  else
-	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
-	    # platform.
-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-		$CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
-
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
-	  fi
-
-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
-	fi
-	;;
-    esac
-    ;;
-  sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
-    _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-    runpath_var='LD_RUN_PATH'
-
-    case $cc_basename in
-      CC*)
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	;;
-      *)
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	;;
-    esac
-    ;;
-  sysv5* | sco3.2v5* | sco5v6*)
-    # Note: We can NOT use -z defs as we might desire, because we do not
-    # link with -lc, and that would cause any symbols used from libc to
-    # always be unresolved, which means just about no library would
-    # ever link correctly.  If we're not using GNU ld we use -z text
-    # though, which does catch some bad symbols but isn't as heavy-handed
-    # as -z defs.
-    # For security reasons, it is highly recommended that you always
-    # use absolute paths for naming shared libraries, and exclude the
-    # DT_RUNPATH tag from executables and libraries.  But doing so
-    # requires that you compile everything twice, which is a pain.
-    # So that behaviour is only enabled if SCOABSPATH is set to a
-    # non-empty value in the environment.  Most likely only useful for
-    # creating official distributions of packages.
-    # This is a hack until libtool officially supports absolute path
-    # names for shared libraries.
-    _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-    _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
-    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
-    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
-    runpath_var='LD_RUN_PATH'
-
-    case $cc_basename in
-      CC*)
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	;;
-      *)
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	;;
-    esac
-    ;;
-  tandem*)
-    case $cc_basename in
-      NCC*)
-	# NonStop-UX NCC 3.20
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      *)
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-    esac
-    ;;
-  vxworks*)
-    # FIXME: insert proper C++ library support
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    ;;
-  *)
-    # FIXME: insert proper C++ library support
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    ;;
-esac
-AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
-test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-
-_LT_AC_TAGVAR(GCC, $1)="$GXX"
-_LT_AC_TAGVAR(LD, $1)="$LD"
-
-AC_LIBTOOL_POSTDEP_PREDEP($1)
-AC_LIBTOOL_PROG_COMPILER_PIC($1)
-AC_LIBTOOL_PROG_CC_C_O($1)
-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
-AC_LIBTOOL_PROG_LD_SHLIBS($1)
-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
-
-AC_LIBTOOL_CONFIG($1)
-
-AC_LANG_POP
-CC=$lt_save_CC
-LDCXX=$LD
-LD=$lt_save_LD
-GCC=$lt_save_GCC
-with_gnu_ldcxx=$with_gnu_ld
-with_gnu_ld=$lt_save_with_gnu_ld
-lt_cv_path_LDCXX=$lt_cv_path_LD
-lt_cv_path_LD=$lt_save_path_LD
-lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
-lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
-])# AC_LIBTOOL_LANG_CXX_CONFIG
-
-# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME])
-# ------------------------------------
-# Figure out "hidden" library dependencies from verbose
-# compiler output when linking a shared library.
-# Parse the compiler output and extract the necessary
-# objects, libraries and library flags.
-AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[
-dnl we can't use the lt_simple_compile_test_code here,
-dnl because it contains code intended for an executable,
-dnl not a library.  It's possible we should let each
-dnl tag define a new lt_????_link_test_code variable,
-dnl but it's only used here...
-ifelse([$1],[],[cat > conftest.$ac_ext <<EOF
-int a;
-void foo (void) { a = 0; }
-EOF
-],[$1],[CXX],[cat > conftest.$ac_ext <<EOF
-class Foo
-{
-public:
-  Foo (void) { a = 0; }
-private:
-  int a;
-};
-EOF
-],[$1],[F77],[cat > conftest.$ac_ext <<EOF
-      subroutine foo
-      implicit none
-      integer*4 a
-      a=0
-      return
-      end
-EOF
-],[$1],[GCJ],[cat > conftest.$ac_ext <<EOF
-public class foo {
-  private int a;
-  public void bar (void) {
-    a = 0;
-  }
-};
-EOF
-])
-dnl Parse the compiler output and extract the necessary
-dnl objects, libraries and library flags.
-if AC_TRY_EVAL(ac_compile); then
-  # Parse the compiler output and extract the necessary
-  # objects, libraries and library flags.
-
-  # Sentinel used to keep track of whether or not we are before
-  # the conftest object file.
-  pre_test_object_deps_done=no
-
-  # The `*' in the case matches for architectures that use `case' in
-  # $output_verbose_cmd can trigger glob expansion during the loop
-  # eval without this substitution.
-  output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
-
-  for p in `eval $output_verbose_link_cmd`; do
-    case $p in
-
-    -L* | -R* | -l*)
-       # Some compilers place space between "-{L,R}" and the path.
-       # Remove the space.
-       if test $p = "-L" \
-	  || test $p = "-R"; then
-	 prev=$p
-	 continue
-       else
-	 prev=
-       fi
-
-       if test "$pre_test_object_deps_done" = no; then
-	 case $p in
-	 -L* | -R*)
-	   # Internal compiler library paths should come after those
-	   # provided the user.  The postdeps already come after the
-	   # user supplied libs so there is no need to process them.
-	   if test -z "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then
-	     _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
-	   else
-	     _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${_LT_AC_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
-	   fi
-	   ;;
-	 # The "-l" case would never come before the object being
-	 # linked, so don't bother handling this case.
-	 esac
-       else
-	 if test -z "$_LT_AC_TAGVAR(postdeps, $1)"; then
-	   _LT_AC_TAGVAR(postdeps, $1)="${prev}${p}"
-	 else
-	   _LT_AC_TAGVAR(postdeps, $1)="${_LT_AC_TAGVAR(postdeps, $1)} ${prev}${p}"
-	 fi
-       fi
-       ;;
-
-    *.$objext)
-       # This assumes that the test object file only shows up
-       # once in the compiler output.
-       if test "$p" = "conftest.$objext"; then
-	 pre_test_object_deps_done=yes
-	 continue
-       fi
-
-       if test "$pre_test_object_deps_done" = no; then
-	 if test -z "$_LT_AC_TAGVAR(predep_objects, $1)"; then
-	   _LT_AC_TAGVAR(predep_objects, $1)="$p"
-	 else
-	   _LT_AC_TAGVAR(predep_objects, $1)="$_LT_AC_TAGVAR(predep_objects, $1) $p"
-	 fi
-       else
-	 if test -z "$_LT_AC_TAGVAR(postdep_objects, $1)"; then
-	   _LT_AC_TAGVAR(postdep_objects, $1)="$p"
-	 else
-	   _LT_AC_TAGVAR(postdep_objects, $1)="$_LT_AC_TAGVAR(postdep_objects, $1) $p"
-	 fi
-       fi
-       ;;
-
-    *) ;; # Ignore the rest.
-
-    esac
-  done
-
-  # Clean up.
-  rm -f a.out a.exe
-else
-  echo "libtool.m4: error: problem compiling $1 test program"
-fi
-
-$rm -f confest.$objext
-
-# PORTME: override above test on systems where it is broken
-ifelse([$1],[CXX],
-[case $host_os in
-interix3*)
-  # Interix 3.5 installs completely hosed .la files for C++, so rather than
-  # hack all around it, let's just trust "g++" to DTRT.
-  _LT_AC_TAGVAR(predep_objects,$1)=
-  _LT_AC_TAGVAR(postdep_objects,$1)=
-  _LT_AC_TAGVAR(postdeps,$1)=
-  ;;
-
-solaris*)
-  case $cc_basename in
-  CC*)
-    # Adding this requires a known-good setup of shared libraries for
-    # Sun compiler versions before 5.6, else PIC objects from an old
-    # archive will be linked into the output, leading to subtle bugs.
-    _LT_AC_TAGVAR(postdeps,$1)='-lCstd -lCrun'
-    ;;
-  esac
-  ;;
-esac
-])
-
-case " $_LT_AC_TAGVAR(postdeps, $1) " in
-*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
-esac
-])# AC_LIBTOOL_POSTDEP_PREDEP
-
-# AC_LIBTOOL_LANG_F77_CONFIG
-# --------------------------
-# Ensure that the configuration vars for the C compiler are
-# suitably defined.  Those variables are subsequently used by
-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG], [_LT_AC_LANG_F77_CONFIG(F77)])
-AC_DEFUN([_LT_AC_LANG_F77_CONFIG],
-[AC_REQUIRE([AC_PROG_F77])
-AC_LANG_PUSH(Fortran 77)
-
-_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-_LT_AC_TAGVAR(allow_undefined_flag, $1)=
-_LT_AC_TAGVAR(always_export_symbols, $1)=no
-_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
-_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
-_LT_AC_TAGVAR(hardcode_direct, $1)=no
-_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
-_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
-_LT_AC_TAGVAR(hardcode_automatic, $1)=no
-_LT_AC_TAGVAR(module_cmds, $1)=
-_LT_AC_TAGVAR(module_expsym_cmds, $1)=
-_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
-_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_AC_TAGVAR(no_undefined_flag, $1)=
-_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-
-# Source file extension for f77 test sources.
-ac_ext=f
-
-# Object file extension for compiled f77 test sources.
-objext=o
-_LT_AC_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="      subroutine t\n      return\n      end\n"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code="      program t\n      end\n"
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_AC_SYS_COMPILER
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
-CC=${F77-"f77"}
-compiler=$CC
-_LT_AC_TAGVAR(compiler, $1)=$CC
-_LT_CC_BASENAME([$compiler])
-
-AC_MSG_CHECKING([if libtool supports shared libraries])
-AC_MSG_RESULT([$can_build_shared])
-
-AC_MSG_CHECKING([whether to build shared libraries])
-test "$can_build_shared" = "no" && enable_shared=no
-
-# On AIX, shared libraries and static libraries use the same namespace, and
-# are all built from PIC.
-case $host_os in
-aix3*)
-  test "$enable_shared" = yes && enable_static=no
-  if test -n "$RANLIB"; then
-    archive_cmds="$archive_cmds~\$RANLIB \$lib"
-    postinstall_cmds='$RANLIB $lib'
-  fi
-  ;;
-aix4* | aix5*)
-  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-    test "$enable_shared" = yes && enable_static=no
-  fi
-  ;;
-esac
-AC_MSG_RESULT([$enable_shared])
-
-AC_MSG_CHECKING([whether to build static libraries])
-# Make sure either enable_shared or enable_static is yes.
-test "$enable_shared" = yes || enable_static=yes
-AC_MSG_RESULT([$enable_static])
-
-_LT_AC_TAGVAR(GCC, $1)="$G77"
-_LT_AC_TAGVAR(LD, $1)="$LD"
-
-AC_LIBTOOL_PROG_COMPILER_PIC($1)
-AC_LIBTOOL_PROG_CC_C_O($1)
-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
-AC_LIBTOOL_PROG_LD_SHLIBS($1)
-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
-
-AC_LIBTOOL_CONFIG($1)
-
-AC_LANG_POP
-CC="$lt_save_CC"
-])# AC_LIBTOOL_LANG_F77_CONFIG
-
-
-# AC_LIBTOOL_LANG_GCJ_CONFIG
-# --------------------------
-# Ensure that the configuration vars for the C compiler are
-# suitably defined.  Those variables are subsequently used by
-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG], [_LT_AC_LANG_GCJ_CONFIG(GCJ)])
-AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG],
-[AC_LANG_SAVE
-
-# Source file extension for Java test sources.
-ac_ext=java
-
-# Object file extension for compiled Java test sources.
-objext=o
-_LT_AC_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="class foo {}\n"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }\n'
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_AC_SYS_COMPILER
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
-CC=${GCJ-"gcj"}
-compiler=$CC
-_LT_AC_TAGVAR(compiler, $1)=$CC
-_LT_CC_BASENAME([$compiler])
-
-# GCJ did not exist at the time GCC didn't implicitly link libc in.
-_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-
-_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-
-AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
-AC_LIBTOOL_PROG_COMPILER_PIC($1)
-AC_LIBTOOL_PROG_CC_C_O($1)
-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
-AC_LIBTOOL_PROG_LD_SHLIBS($1)
-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
-
-AC_LIBTOOL_CONFIG($1)
-
-AC_LANG_RESTORE
-CC="$lt_save_CC"
-])# AC_LIBTOOL_LANG_GCJ_CONFIG
-
-
-# AC_LIBTOOL_LANG_RC_CONFIG
-# -------------------------
-# Ensure that the configuration vars for the Windows resource compiler are
-# suitably defined.  Those variables are subsequently used by
-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG], [_LT_AC_LANG_RC_CONFIG(RC)])
-AC_DEFUN([_LT_AC_LANG_RC_CONFIG],
-[AC_LANG_SAVE
-
-# Source file extension for RC test sources.
-ac_ext=rc
-
-# Object file extension for compiled RC test sources.
-objext=o
-_LT_AC_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
-
-# Code to be used in simple link tests
-lt_simple_link_test_code="$lt_simple_compile_test_code"
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_AC_SYS_COMPILER
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
-CC=${RC-"windres"}
-compiler=$CC
-_LT_AC_TAGVAR(compiler, $1)=$CC
-_LT_CC_BASENAME([$compiler])
-_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
-
-AC_LIBTOOL_CONFIG($1)
-
-AC_LANG_RESTORE
-CC="$lt_save_CC"
-])# AC_LIBTOOL_LANG_RC_CONFIG
-
-
-# AC_LIBTOOL_CONFIG([TAGNAME])
-# ----------------------------
-# If TAGNAME is not passed, then create an initial libtool script
-# with a default configuration from the untagged config vars.  Otherwise
-# add code to config.status for appending the configuration named by
-# TAGNAME from the matching tagged config vars.
-AC_DEFUN([AC_LIBTOOL_CONFIG],
-[# The else clause should only fire when bootstrapping the
-# libtool distribution, otherwise you forgot to ship ltmain.sh
-# with your package, and you will get complaints that there are
-# no rules to generate ltmain.sh.
-if test -f "$ltmain"; then
-  # See if we are running on zsh, and set the options which allow our commands through
-  # without removal of \ escapes.
-  if test -n "${ZSH_VERSION+set}" ; then
-    setopt NO_GLOB_SUBST
-  fi
-  # Now quote all the things that may contain metacharacters while being
-  # careful not to overquote the AC_SUBSTed values.  We take copies of the
-  # variables and quote the copies for generation of the libtool script.
-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
-    SED SHELL STRIP \
-    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
-    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
-    deplibs_check_method reload_flag reload_cmds need_locks \
-    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
-    lt_cv_sys_global_symbol_to_c_name_address \
-    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
-    old_postinstall_cmds old_postuninstall_cmds \
-    _LT_AC_TAGVAR(compiler, $1) \
-    _LT_AC_TAGVAR(CC, $1) \
-    _LT_AC_TAGVAR(LD, $1) \
-    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1) \
-    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1) \
-    _LT_AC_TAGVAR(lt_prog_compiler_static, $1) \
-    _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) \
-    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1) \
-    _LT_AC_TAGVAR(thread_safe_flag_spec, $1) \
-    _LT_AC_TAGVAR(whole_archive_flag_spec, $1) \
-    _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) \
-    _LT_AC_TAGVAR(old_archive_cmds, $1) \
-    _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) \
-    _LT_AC_TAGVAR(predep_objects, $1) \
-    _LT_AC_TAGVAR(postdep_objects, $1) \
-    _LT_AC_TAGVAR(predeps, $1) \
-    _LT_AC_TAGVAR(postdeps, $1) \
-    _LT_AC_TAGVAR(compiler_lib_search_path, $1) \
-    _LT_AC_TAGVAR(archive_cmds, $1) \
-    _LT_AC_TAGVAR(archive_expsym_cmds, $1) \
-    _LT_AC_TAGVAR(postinstall_cmds, $1) \
-    _LT_AC_TAGVAR(postuninstall_cmds, $1) \
-    _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) \
-    _LT_AC_TAGVAR(allow_undefined_flag, $1) \
-    _LT_AC_TAGVAR(no_undefined_flag, $1) \
-    _LT_AC_TAGVAR(export_symbols_cmds, $1) \
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) \
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) \
-    _LT_AC_TAGVAR(hardcode_libdir_separator, $1) \
-    _LT_AC_TAGVAR(hardcode_automatic, $1) \
-    _LT_AC_TAGVAR(module_cmds, $1) \
-    _LT_AC_TAGVAR(module_expsym_cmds, $1) \
-    _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \
-    _LT_AC_TAGVAR(exclude_expsyms, $1) \
-    _LT_AC_TAGVAR(include_expsyms, $1); do
-
-    case $var in
-    _LT_AC_TAGVAR(old_archive_cmds, $1) | \
-    _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) | \
-    _LT_AC_TAGVAR(archive_cmds, $1) | \
-    _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
-    _LT_AC_TAGVAR(module_cmds, $1) | \
-    _LT_AC_TAGVAR(module_expsym_cmds, $1) | \
-    _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
-    _LT_AC_TAGVAR(export_symbols_cmds, $1) | \
-    extract_expsyms_cmds | reload_cmds | finish_cmds | \
-    postinstall_cmds | postuninstall_cmds | \
-    old_postinstall_cmds | old_postuninstall_cmds | \
-    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
-      # Double-quote double-evaled strings.
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
-      ;;
-    *)
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
-      ;;
-    esac
-  done
-
-  case $lt_echo in
-  *'\[$]0 --fallback-echo"')
-    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\[$]0 --fallback-echo"[$]/[$]0 --fallback-echo"/'`
-    ;;
-  esac
-
-ifelse([$1], [],
-  [cfgfile="${ofile}T"
-  trap "$rm \"$cfgfile\"; exit 1" 1 2 15
-  $rm -f "$cfgfile"
-  AC_MSG_NOTICE([creating $ofile])],
-  [cfgfile="$ofile"])
-
-  cat <<__EOF__ >> "$cfgfile"
-ifelse([$1], [],
-[#! $SHELL
-
-# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
-# NOTE: Changes made to this file will be lost: look at ltmain.sh.
-#
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
-# Free Software Foundation, Inc.
-#
-# This file is part of GNU Libtool:
-# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 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 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 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.
-
-# A sed program that does not truncate output.
-SED=$lt_SED
-
-# Sed that helps us avoid accidentally triggering echo(1) options like -n.
-Xsed="$SED -e 1s/^X//"
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-# The names of the tagged configurations supported by this script.
-available_tags=
-
-# ### BEGIN LIBTOOL CONFIG],
-[# ### BEGIN LIBTOOL TAG CONFIG: $tagname])
-
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
-
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
-
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)
-
-# Whether or not to disallow shared libs when runtime libs are static
-allow_libtool_libs_with_static_runtimes=$_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)
-
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
-
-# The host system.
-host_alias=$host_alias
-host=$host
-host_os=$host_os
-
-# The build system.
-build_alias=$build_alias
-build=$build
-build_os=$build_os
-
-# An echo program that does not interpret backslashes.
-echo=$lt_echo
-
-# The archiver.
-AR=$lt_AR
-AR_FLAGS=$lt_AR_FLAGS
-
-# A C compiler.
-LTCC=$lt_LTCC
-
-# LTCC compiler flags.
-LTCFLAGS=$lt_LTCFLAGS
-
-# A language-specific compiler.
-CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
-
-# Is the compiler the GNU C compiler?
-with_gcc=$_LT_AC_TAGVAR(GCC, $1)
-
-# An ERE matcher.
-EGREP=$lt_EGREP
-
-# The linker used to build libraries.
-LD=$lt_[]_LT_AC_TAGVAR(LD, $1)
-
-# Whether we need hard or soft links.
-LN_S=$lt_LN_S
-
-# A BSD-compatible nm program.
-NM=$lt_NM
-
-# A symbol stripping program
-STRIP=$lt_STRIP
-
-# Used to examine libraries when file_magic_cmd begins "file"
-MAGIC_CMD=$MAGIC_CMD
-
-# Used on cygwin: DLL creation program.
-DLLTOOL="$DLLTOOL"
-
-# Used on cygwin: object dumper.
-OBJDUMP="$OBJDUMP"
-
-# Used on cygwin: assembler.
-AS="$AS"
-
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
-
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
-
-# How to pass a linker flag through the compiler.
-wl=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
-
-# Object file suffix (normally "o").
-objext="$ac_objext"
-
-# Old archive suffix (normally "a").
-libext="$libext"
-
-# Shared library suffix (normally ".so").
-shrext_cmds='$shrext_cmds'
-
-# Executable file suffix (normally "").
-exeext="$exeext"
-
-# Additional compiler flags for building library objects.
-pic_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
-pic_mode=$pic_mode
-
-# What is the maximum length of a command?
-max_cmd_len=$lt_cv_sys_max_cmd_len
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
-
-# Must we lock files when doing compilation?
-need_locks=$lt_need_locks
-
-# Do we need the lib prefix for modules?
-need_lib_prefix=$need_lib_prefix
-
-# Do we need a version for libraries?
-need_version=$need_version
-
-# Whether dlopen is supported.
-dlopen_support=$enable_dlopen
-
-# Whether dlopen of programs is supported.
-dlopen_self=$enable_dlopen_self
-
-# Whether dlopen of statically linked programs is supported.
-dlopen_self_static=$enable_dlopen_self_static
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_static, $1)
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_[]_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_[]_LT_AC_TAGVAR(whole_archive_flag_spec, $1)
-
-# Compiler flag to generate thread-safe objects.
-thread_safe_flag_spec=$lt_[]_LT_AC_TAGVAR(thread_safe_flag_spec, $1)
-
-# Library versioning type.
-version_type=$version_type
-
-# Format of library name prefix.
-libname_spec=$lt_libname_spec
-
-# List of archive names.  First name is the real one, the rest are links.
-# The last name is the one that the linker finds with -lNAME.
-library_names_spec=$lt_library_names_spec
-
-# The coded name of the library, if different from the real name.
-soname_spec=$lt_soname_spec
-
-# Commands used to build and install an old-style archive.
-RANLIB=$lt_RANLIB
-old_archive_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_cmds, $1)
-old_postinstall_cmds=$lt_old_postinstall_cmds
-old_postuninstall_cmds=$lt_old_postuninstall_cmds
-
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_new_cmds, $1)
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)
-
-# Commands used to build and install a shared archive.
-archive_cmds=$lt_[]_LT_AC_TAGVAR(archive_cmds, $1)
-archive_expsym_cmds=$lt_[]_LT_AC_TAGVAR(archive_expsym_cmds, $1)
-postinstall_cmds=$lt_postinstall_cmds
-postuninstall_cmds=$lt_postuninstall_cmds
-
-# Commands used to build a loadable module (assumed same as above if empty)
-module_cmds=$lt_[]_LT_AC_TAGVAR(module_cmds, $1)
-module_expsym_cmds=$lt_[]_LT_AC_TAGVAR(module_expsym_cmds, $1)
-
-# Commands to strip libraries.
-old_striplib=$lt_old_striplib
-striplib=$lt_striplib
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1)
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1)
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1)
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
-
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
-
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method=$lt_deplibs_check_method
-
-# Command to use when deplibs_check_method == file_magic.
-file_magic_cmd=$lt_file_magic_cmd
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$lt_[]_LT_AC_TAGVAR(allow_undefined_flag, $1)
-
-# Flag that forces no undefined symbols.
-no_undefined_flag=$lt_[]_LT_AC_TAGVAR(no_undefined_flag, $1)
-
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds=$lt_finish_cmds
-
-# Same as above, but a single script fragment to be evaled but not shown.
-finish_eval=$lt_finish_eval
-
-# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
-
-# Transform the output of nm in a proper C declaration
-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-
-# Transform the output of nm in a C name address pair
-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
-
-# This is the shared library runtime path variable.
-runpath_var=$runpath_var
-
-# This is the shared library path variable.
-shlibpath_var=$shlibpath_var
-
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=$_LT_AC_TAGVAR(hardcode_action, $1)
-
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=$hardcode_into_libs
-
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)
-
-# If ld is used when linking, flag to hardcode \$libdir into
-# a binary during linking. This must work even if \$libdir does
-# not exist.
-hardcode_libdir_flag_spec_ld=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)
-
-# Whether we need a single -rpath flag with a separated argument.
-hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1)
-
-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
-# resulting binary.
-hardcode_direct=$_LT_AC_TAGVAR(hardcode_direct, $1)
-
-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-# resulting binary.
-hardcode_minus_L=$_LT_AC_TAGVAR(hardcode_minus_L, $1)
-
-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-# the resulting binary.
-hardcode_shlibpath_var=$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)
-
-# Set to yes if building a shared library automatically hardcodes DIR into the library
-# and all subsequent libraries and executables linked against it.
-hardcode_automatic=$_LT_AC_TAGVAR(hardcode_automatic, $1)
-
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at relink time.
-variables_saved_for_relink="$variables_saved_for_relink"
-
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1)
-
-# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-
-# Run-time system search path for libraries
-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-
-# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$_LT_AC_TAGVAR(fix_srcfile_path, $1)"
-
-# Set to yes if exported symbols are required.
-always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1)
-
-# The commands to list exported symbols.
-export_symbols_cmds=$lt_[]_LT_AC_TAGVAR(export_symbols_cmds, $1)
-
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=$lt_extract_expsyms_cmds
-
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$lt_[]_LT_AC_TAGVAR(exclude_expsyms, $1)
-
-# Symbols that must always be exported.
-include_expsyms=$lt_[]_LT_AC_TAGVAR(include_expsyms, $1)
-
-ifelse([$1],[],
-[# ### END LIBTOOL CONFIG],
-[# ### END LIBTOOL TAG CONFIG: $tagname])
-
-__EOF__
-
-ifelse([$1],[], [
-  case $host_os in
-  aix3*)
-    cat <<\EOF >> "$cfgfile"
-
-# AIX sometimes has problems with the GCC collect2 program.  For some
-# reason, if we set the COLLECT_NAMES environment variable, the problems
-# vanish in a puff of smoke.
-if test "X${COLLECT_NAMES+set}" != Xset; then
-  COLLECT_NAMES=
-  export COLLECT_NAMES
-fi
-EOF
-    ;;
-  esac
-
-  # We use sed instead of cat because bash on DJGPP gets confused if
-  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
-  # text mode, it properly converts lines to CR/LF.  This bash problem
-  # is reportedly fixed, but why not run on old versions too?
-  sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1)
-
-  mv -f "$cfgfile" "$ofile" || \
-    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
-  chmod +x "$ofile"
-])
-else
-  # If there is no Makefile yet, we rely on a make rule to execute
-  # `config.status --recheck' to rerun these tests and create the
-  # libtool script then.
-  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
-  if test -f "$ltmain_in"; then
-    test -f Makefile && make "$ltmain"
-  fi
-fi
-])# AC_LIBTOOL_CONFIG
-
-
-# AC_LIBTOOL_PROG_COMPILER_NO_RTTI([TAGNAME])
-# -------------------------------------------
-AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI],
-[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
-
-_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
-
-if test "$GCC" = yes; then
-  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
-
-  AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
-    lt_cv_prog_compiler_rtti_exceptions,
-    [-fno-rtti -fno-exceptions], [],
-    [_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
-fi
-])# AC_LIBTOOL_PROG_COMPILER_NO_RTTI
-
-
-# AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
-# ---------------------------------
-AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],
-[AC_REQUIRE([AC_CANONICAL_HOST])
-AC_REQUIRE([AC_PROG_NM])
-AC_REQUIRE([AC_OBJEXT])
-# Check for command to grab the raw symbol name followed by C symbol from nm.
-AC_MSG_CHECKING([command to parse $NM output from $compiler object])
-AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],
-[
-# These are sane defaults that work on at least a few old systems.
-# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
-
-# Character class describing NM global symbol codes.
-symcode='[[BCDEGRST]]'
-
-# Regexp to match symbols that can be accessed directly from C.
-sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
-
-# Transform an extracted symbol line into a proper C declaration
-lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
-
-# Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
-
-# Define system-specific variables.
-case $host_os in
-aix*)
-  symcode='[[BCDT]]'
-  ;;
-cygwin* | mingw* | pw32*)
-  symcode='[[ABCDGISTW]]'
-  ;;
-hpux*) # Its linker distinguishes data from code symbols
-  if test "$host_cpu" = ia64; then
-    symcode='[[ABCDEGRST]]'
-  fi
-  lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-  lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
-  ;;
-linux*)
-  if test "$host_cpu" = ia64; then
-    symcode='[[ABCDGIRSTW]]'
-    lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-    lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
-  fi
-  ;;
-irix* | nonstopux*)
-  symcode='[[BCDEGRST]]'
-  ;;
-osf*)
-  symcode='[[BCDEGQRST]]'
-  ;;
-solaris*)
-  symcode='[[BDRT]]'
-  ;;
-sco3.2v5*)
-  symcode='[[DT]]'
-  ;;
-sysv4.2uw2*)
-  symcode='[[DT]]'
-  ;;
-sysv5* | sco5v6* | unixware* | OpenUNIX*)
-  symcode='[[ABDT]]'
-  ;;
-sysv4)
-  symcode='[[DFNSTU]]'
-  ;;
-esac
-
-# Handle CRLF in mingw tool chain
-opt_cr=
-case $build_os in
-mingw*)
-  opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp
-  ;;
-esac
-
-# If we're using GNU nm, then use its standard symbol codes.
-case `$NM -V 2>&1` in
-*GNU* | *'with BFD'*)
-  symcode='[[ABCDGIRSTW]]' ;;
-esac
-
-# Try without a prefix undercore, then with it.
-for ac_symprfx in "" "_"; do
-
-  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
-  symxfrm="\\1 $ac_symprfx\\2 \\2"
-
-  # Write the raw and C identifiers.
-  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ 	]]\($symcode$symcode*\)[[ 	]][[ 	]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
-
-  # Check to see that the pipe works correctly.
-  pipe_works=no
-
-  rm -f conftest*
-  cat > conftest.$ac_ext <<EOF
-#ifdef __cplusplus
-extern "C" {
-#endif
-char nm_test_var;
-void nm_test_func(){}
-#ifdef __cplusplus
-}
-#endif
-int main(){nm_test_var='a';nm_test_func();return(0);}
-EOF
-
-  if AC_TRY_EVAL(ac_compile); then
-    # Now try to grab the symbols.
-    nlist=conftest.nm
-    if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
-      # Try sorting and uniquifying the output.
-      if sort "$nlist" | uniq > "$nlist"T; then
-	mv -f "$nlist"T "$nlist"
-      else
-	rm -f "$nlist"T
-      fi
-
-      # Make sure that we snagged all the symbols we need.
-      if grep ' nm_test_var$' "$nlist" >/dev/null; then
-	if grep ' nm_test_func$' "$nlist" >/dev/null; then
-	  cat <<EOF > conftest.$ac_ext
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-EOF
-	  # Now generate the symbol file.
-	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext'
-
-	  cat <<EOF >> conftest.$ac_ext
-#if defined (__STDC__) && __STDC__
-# define lt_ptr_t void *
-#else
-# define lt_ptr_t char *
-# define const
-#endif
-
-/* The mapping between symbol names and symbols. */
-const struct {
-  const char *name;
-  lt_ptr_t address;
-}
-lt_preloaded_symbols[[]] =
-{
-EOF
-	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext
-	  cat <<\EOF >> conftest.$ac_ext
-  {0, (lt_ptr_t) 0}
-};
-
-#ifdef __cplusplus
-}
-#endif
-EOF
-	  # Now try linking the two files.
-	  mv conftest.$ac_objext conftstm.$ac_objext
-	  lt_save_LIBS="$LIBS"
-	  lt_save_CFLAGS="$CFLAGS"
-	  LIBS="conftstm.$ac_objext"
-	  CFLAGS="$CFLAGS$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
-	  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
-	    pipe_works=yes
-	  fi
-	  LIBS="$lt_save_LIBS"
-	  CFLAGS="$lt_save_CFLAGS"
-	else
-	  echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
 	fi
-      else
-	echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
-      fi
-    else
-      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
     fi
-  else
-    echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
-    cat conftest.$ac_ext >&5
-  fi
-  rm -f conftest* conftst*
+    AC_MSG_RESULT($complCFLAGS)
 
-  # Do not use the global_symbol_pipe unless it works.
-  if test "$pipe_works" = yes; then
-    break
-  else
-    lt_cv_sys_global_symbol_pipe=
-  fi
-done
+    WARN_CFLAGS="$warning_flags $complCFLAGS"
+    AC_SUBST(WARN_CFLAGS)
 ])
-if test -z "$lt_cv_sys_global_symbol_pipe"; then
-  lt_cv_sys_global_symbol_to_cdecl=
-fi
-if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
-  AC_MSG_RESULT(failed)
-else
-  AC_MSG_RESULT(ok)
-fi
-]) # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
-
-
-# AC_LIBTOOL_PROG_COMPILER_PIC([TAGNAME])
-# ---------------------------------------
-AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC],
-[_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)=
-_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=
-
-AC_MSG_CHECKING([for $compiler option to produce PIC])
- ifelse([$1],[CXX],[
-  # C++ specific cases for pic, static, wl, etc.
-  if test "$GXX" = yes; then
-    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
-
-    case $host_os in
-    aix*)
-      # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      fi
-      ;;
-    amigaos*)
-      # FIXME: we need at least 68020 code to build shared libraries, but
-      # adding the `-m68020' flag to GCC prevents building anything better,
-      # like `-m68040'.
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
-      ;;
-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-    mingw* | os2* | pw32*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
-      ;;
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
-      ;;
-    *djgpp*)
-      # DJGPP does not support shared libraries at all
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-      ;;
-    interix3*)
-      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-      # Instead, we relocate shared libraries at runtime.
-      ;;
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
-      fi
-      ;;
-    hpux*)
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case $host_cpu in
-      hppa*64*|ia64*)
-	;;
-      *)
-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	;;
-      esac
-      ;;
-    *)
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-      ;;
-    esac
-  else
-    case $host_os in
-      aix4* | aix5*)
-	# All AIX code is PIC.
-	if test "$host_cpu" = ia64; then
-	  # AIX 5 now supports IA64 processor
-	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	else
-	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
-	fi
-	;;
-      chorus*)
-	case $cc_basename in
-	cxch68*)
-	  # Green Hills C++ Compiler
-	  # _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
-	  ;;
-	esac
-	;;
-       darwin*)
-         # PIC is the default on this platform
-         # Common symbols not allowed in MH_DYLIB files
-         case $cc_basename in
-           xlc*)
-           _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
-           _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-           ;;
-         esac
-       ;;
-      dgux*)
-	case $cc_basename in
-	  ec++*)
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    ;;
-	  ghcx*)
-	    # Green Hills C++ Compiler
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      freebsd* | kfreebsd*-gnu | dragonfly*)
-	# FreeBSD uses GNU C++
-	;;
-      hpux9* | hpux10* | hpux11*)
-	case $cc_basename in
-	  CC*)
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
-	    if test "$host_cpu" != ia64; then
-	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-	    fi
-	    ;;
-	  aCC*)
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
-	    case $host_cpu in
-	    hppa*64*|ia64*)
-	      # +Z the default
-	      ;;
-	    *)
-	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-	      ;;
-	    esac
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      interix*)
-	# This is c89, which is MS Visual C++ (no shared libs)
-	# Anyone wants to do a port?
-	;;
-      irix5* | irix6* | nonstopux*)
-	case $cc_basename in
-	  CC*)
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-	    # CC pic flag -KPIC is the default.
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      linux*)
-	case $cc_basename in
-	  KCC*)
-	    # KAI C++ Compiler
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	    ;;
-	  icpc* | ecpc*)
-	    # Intel C++
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
-	    ;;
-	  pgCC*)
-	    # Portland Group C++ compiler.
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	    ;;
-	  cxx*)
-	    # Compaq C++
-	    # Make sure the PIC flag is empty.  It appears that all Alpha
-	    # Linux and Compaq Tru64 Unix objects are PIC.
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      lynxos*)
-	;;
-      m88k*)
-	;;
-      mvs*)
-	case $cc_basename in
-	  cxx*)
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      netbsd*)
-	;;
-      osf3* | osf4* | osf5*)
-	case $cc_basename in
-	  KCC*)
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
-	    ;;
-	  RCC*)
-	    # Rational C++ 2.4.1
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	    ;;
-	  cxx*)
-	    # Digital/Compaq C++
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    # Make sure the PIC flag is empty.  It appears that all Alpha
-	    # Linux and Compaq Tru64 Unix objects are PIC.
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      psos*)
-	;;
-      solaris*)
-	case $cc_basename in
-	  CC*)
-	    # Sun C++ 4.2, 5.x and Centerline C++
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-	    ;;
-	  gcx*)
-	    # Green Hills C++ Compiler
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      sunos4*)
-	case $cc_basename in
-	  CC*)
-	    # Sun C++ 4.x
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	    ;;
-	  lcc*)
-	    # Lucid
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      tandem*)
-	case $cc_basename in
-	  NCC*)
-	    # NonStop-UX NCC 3.20
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-	case $cc_basename in
-	  CC*)
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	    ;;
-	esac
-	;;
-      vxworks*)
-	;;
-      *)
-	_LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-	;;
-    esac
-  fi
-],
-[
-  if test "$GCC" = yes; then
-    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
-
-    case $host_os in
-      aix*)
-      # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      fi
-      ;;
-
-    amigaos*)
-      # FIXME: we need at least 68020 code to build shared libraries, but
-      # adding the `-m68020' flag to GCC prevents building anything better,
-      # like `-m68040'.
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
-      ;;
-
-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-
-    mingw* | pw32* | os2*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
-      ;;
-
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
-      ;;
-
-    interix3*)
-      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-      # Instead, we relocate shared libraries at runtime.
-      ;;
-
-    msdosdjgpp*)
-      # Just because we use GCC doesn't mean we suddenly get shared libraries
-      # on systems that don't support them.
-      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-      enable_shared=no
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
-      fi
-      ;;
-
-    hpux*)
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case $host_cpu in
-      hppa*64*|ia64*)
-	# +Z the default
-	;;
-      *)
-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	;;
-      esac
-      ;;
-
-    *)
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-      ;;
-    esac
-  else
-    # PORTME Check for flag to pass linker flags through the system compiler.
-    case $host_os in
-    aix*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      else
-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
-      fi
-      ;;
-      darwin*)
-        # PIC is the default on this platform
-        # Common symbols not allowed in MH_DYLIB files
-       case $cc_basename in
-         xlc*)
-         _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
-         _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-         ;;
-       esac
-       ;;
-
-    mingw* | pw32* | os2*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
-      ;;
-
-    hpux9* | hpux10* | hpux11*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case $host_cpu in
-      hppa*64*|ia64*)
-	# +Z the default
-	;;
-      *)
-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-	;;
-      esac
-      # Is there a better lt_prog_compiler_static that works with the bundled CC?
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      # PIC (with -KPIC) is the default.
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-      ;;
-
-    newsos6)
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    linux*)
-      case $cc_basename in
-      icc* | ecc*)
-	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
-        ;;
-      pgcc* | pgf77* | pgf90* | pgf95*)
-        # Portland Group compilers (*not* the Pentium gcc compiler,
-	# which looks to be a dead project)
-	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-        ;;
-      ccc*)
-        _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-        # All Alpha code is PIC.
-        _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-        ;;
-      esac
-      ;;
-
-    osf3* | osf4* | osf5*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      # All OSF/1 code is PIC.
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-      ;;
-
-    solaris*)
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      case $cc_basename in
-      f77* | f90* | f95*)
-	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
-      *)
-	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
-      esac
-      ;;
-
-    sunos4*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    sysv4 | sysv4.2uw2* | sysv4.3*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec ;then
-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      fi
-      ;;
 
-    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    unicos*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-      ;;
+dnl For C++, do basically the same thing.
 
-    uts4*)
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
+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])"])
 
-    *)
-      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-      ;;
-    esac
+  AC_MSG_CHECKING(what warning flags to pass to the C++ compiler)
+  warnCXXFLAGS=
+  if test "x$GXX" != xyes; then
+    enable_cxx_warnings=no
   fi
-])
-AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)])
-
-#
-# Check to make sure the PIC flag actually works.
-#
-if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then
-  AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works],
-    _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1),
-    [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [],
-    [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in
-     "" | " "*) ;;
-     *) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)" ;;
-     esac],
-    [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-     _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
-fi
-case $host_os in
-  # For platforms which do not support PIC, -DPIC is meaningless:
-  *djgpp*)
-    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-    ;;
-  *)
-    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])"
-    ;;
-esac
-
-#
-# Check to make sure the static flag actually works.
-#
-wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\"
-AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
-  _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
-  $lt_tmp_static_flag,
-  [],
-  [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
-])
-
-
-# AC_LIBTOOL_PROG_LD_SHLIBS([TAGNAME])
-# ------------------------------------
-# See if the linker supports building shared libraries.
-AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS],
-[AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
-ifelse([$1],[CXX],[
-  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  case $host_os in
-  aix4* | aix5*)
-    # If we're using GNU nm, then we don't want the "-C" option.
-    # -C means demangle to AIX nm, but means don't demangle with GNU nm
-    if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
-      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
-    else
-      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
-    fi
-    ;;
-  pw32*)
-    _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
-  ;;
-  cygwin* | mingw*)
-    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([[^ ]]*\) [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
-  ;;
-  *)
-    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  ;;
-  esac
-],[
-  runpath_var=
-  _LT_AC_TAGVAR(allow_undefined_flag, $1)=
-  _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-  _LT_AC_TAGVAR(archive_cmds, $1)=
-  _LT_AC_TAGVAR(archive_expsym_cmds, $1)=
-  _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)=
-  _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)=
-  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
-  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-  _LT_AC_TAGVAR(thread_safe_flag_spec, $1)=
-  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
-  _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
-  _LT_AC_TAGVAR(hardcode_direct, $1)=no
-  _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
-  _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-  _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
-  _LT_AC_TAGVAR(hardcode_automatic, $1)=no
-  _LT_AC_TAGVAR(module_cmds, $1)=
-  _LT_AC_TAGVAR(module_expsym_cmds, $1)=
-  _LT_AC_TAGVAR(always_export_symbols, $1)=no
-  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  # include_expsyms should be a list of space-separated symbols to be *always*
-  # included in the symbol list
-  _LT_AC_TAGVAR(include_expsyms, $1)=
-  # exclude_expsyms can be an extended regexp of symbols to exclude
-  # it will be wrapped by ` (' and `)$', so one must not match beginning or
-  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
-  # as well as any symbol that contains `d'.
-  _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_"
-  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
-  # platforms (ab)use it in PIC code, but their linkers get confused if
-  # the symbol is explicitly referenced.  Since portable code cannot
-  # rely on this symbol name, it's probably fine to never include it in
-  # preloaded symbol tables.
-  extract_expsyms_cmds=
-  # Just being paranoid about ensuring that cc_basename is set.
-  _LT_CC_BASENAME([$compiler])
-  case $host_os in
-  cygwin* | mingw* | pw32*)
-    # FIXME: the MSVC++ port hasn't been tested in a loooong time
-    # When not using gcc, we currently assume that we are using
-    # Microsoft Visual C++.
-    if test "$GCC" != yes; then
-      with_gnu_ld=no
-    fi
-    ;;
-  interix*)
-    # we just hope/assume this is gcc and not c89 (= MSVC++)
-    with_gnu_ld=yes
-    ;;
-  openbsd*)
-    with_gnu_ld=no
-    ;;
-  esac
-
-  _LT_AC_TAGVAR(ld_shlibs, $1)=yes
-  if test "$with_gnu_ld" = yes; then
-    # If archive_cmds runs LD, not CC, wlarc should be empty
-    wlarc='${wl}'
-
-    # Set some defaults for GNU ld with shared library support. These
-    # are reset later if shared libraries are not supported. Putting them
-    # here allows them to be overridden if necessary.
-    runpath_var=LD_RUN_PATH
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
-    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-    # ancient GNU ld didn't support --whole-archive et. al.
-    if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
-	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-      else
-  	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-    fi
-    supports_anon_versioning=no
-    case `$LD -v 2>/dev/null` in
-      *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
-      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-      *\ 2.11.*) ;; # other 2.11 versions
-      *) supports_anon_versioning=yes ;;
-    esac
-
-    # See if GNU ld supports shared libraries.
-    case $host_os in
-    aix3* | aix4* | aix5*)
-      # On AIX/PPC, the GNU linker is very broken
-      if test "$host_cpu" != ia64; then
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	cat <<EOF 1>&2
-
-*** Warning: the GNU linker, at least up to release 2.9.1, is reported
-*** to be unable to reliably create shared libraries on AIX.
-*** Therefore, libtool is disabling shared libraries support.  If you
-*** really care for shared libraries, you may want to modify your PATH
-*** so that a non-GNU linker is found, and then restart.
-
-EOF
-      fi
-      ;;
-
-    amigaos*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-
-      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
-      # that the semantics of dynamic libraries on AmigaOS, at least up
-      # to version 4, is to share data among multiple programs linked
-      # with the same dynamic library.  Since this doesn't match the
-      # behavior of shared libraries on other platforms, we can't use
-      # them.
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-      ;;
-
-    beos*)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-	# support --undefined.  This deserves some investigation.  FIXME
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-      else
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    cygwin* | mingw* | pw32*)
-      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-      # as there is no search path for DLLs.
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-      _LT_AC_TAGVAR(always_export_symbols, $1)=no
-      _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
-
-      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-	# If the export-symbols file already is a .def file (1st line
-	# is EXPORTS), use it as is; otherwise, prepend...
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	  cp $export_symbols $output_objdir/$soname.def;
-	else
-	  echo EXPORTS > $output_objdir/$soname.def;
-	  cat $export_symbols >> $output_objdir/$soname.def;
-	fi~
-	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-      else
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    interix3*)
-      _LT_AC_TAGVAR(hardcode_direct, $1)=no
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-      # Instead, shared libraries are loaded at an image base (0x10000000 by
-      # default) and relocated if they conflict, which is a slow very memory
-      # consuming and fragmenting process.  To avoid this, we pick a random,
-      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      ;;
-
-    linux*)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	tmp_addflag=
-	case $cc_basename,$host_cpu in
-	pgcc*)				# Portland Group C compiler
-	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-	  tmp_addflag=' $pic_flag'
-	  ;;
-	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
-	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-	  tmp_addflag=' $pic_flag -Mnomain' ;;
-	ecc*,ia64* | icc*,ia64*)		# Intel C compiler on ia64
-	  tmp_addflag=' -i_dynamic' ;;
-	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
-	  tmp_addflag=' -i_dynamic -nofor_main' ;;
-	ifc* | ifort*)			# Intel Fortran compiler
-	  tmp_addflag=' -nofor_main' ;;
-	esac
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-
-	if test $supports_anon_versioning = yes; then
-	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
-  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-  $echo "local: *; };" >> $output_objdir/$libname.ver~
-	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-	fi
-      else
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    netbsd*)
-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-	wlarc=
-      else
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      fi
-      ;;
-
-    solaris*)
-      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	cat <<EOF 1>&2
-
-*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-*** create shared libraries on Solaris systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.9.1 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-EOF
-      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
-      case `$LD -v 2>&1` in
-        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) 
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	cat <<_LT_EOF 1>&2
-
-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
-*** reliably create shared libraries on SCO systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-_LT_EOF
-	;;
-	*)
-	  if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
-	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
-	  else
-	    _LT_AC_TAGVAR(ld_shlibs, $1)=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
-      ;;
-
-    sunos4*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      wlarc=
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    *)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-    esac
-
-    if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no; then
-      runpath_var=
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-    fi
-  else
-    # PORTME fill in a description of your system's linker (not GNU ld)
-    case $host_os in
-    aix3*)
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-      _LT_AC_TAGVAR(always_export_symbols, $1)=yes
-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
-      # Note: this linker hardcodes the directories in LIBPATH if there
-      # are no directories specified by -L.
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
-	# Neither direct hardcoding nor static linking is supported with a
-	# broken collect2.
-	_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
-      fi
-      ;;
-
-    aix4* | aix5*)
-      if test "$host_cpu" = ia64; then
-	# On IA64, the linker does run time linking by default, so we don't
-	# have to do anything special.
-	aix_use_runtimelinking=no
-	exp_sym_flag='-Bexport'
-	no_entry_flag=""
-      else
-	# If we're using GNU nm, then we don't want the "-C" option.
-	# -C means demangle to AIX nm, but means don't demangle with GNU nm
-	if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
-	  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
-	else
-	  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
-	fi
-	aix_use_runtimelinking=no
-
-	# Test if we are trying to use run time linking or normal
-	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
-	# need to do runtime linking.
-	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
-	  for ld_flag in $LDFLAGS; do
-  	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
-  	    aix_use_runtimelinking=yes
-  	    break
-  	  fi
-	  done
-	  ;;
-	esac
-
-	exp_sym_flag='-bexport'
-	no_entry_flag='-bnoentry'
-      fi
-
-      # When large executables or shared objects are built, AIX ld can
-      # have problems creating the table of contents.  If linking a library
-      # or program results in "error TOC overflow" add -mminimal-toc to
-      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
-      _LT_AC_TAGVAR(archive_cmds, $1)=''
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
-      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-
-      if test "$GCC" = yes; then
-	case $host_os in aix4.[[012]]|aix4.[[012]].*)
-	# We only want to do this on AIX 4.2 and lower, the check
-	# below for broken collect2 doesn't work under 4.3+
-	  collect2name=`${CC} -print-prog-name=collect2`
-	  if test -f "$collect2name" && \
-  	   strings "$collect2name" | grep resolve_lib_name >/dev/null
-	  then
-  	  # We have reworked collect2
-  	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-	  else
-  	  # We have old collect2
-  	  _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
-  	  # It fails to find uninstalled libraries when the uninstalled
-  	  # path is not listed in the libpath.  Setting hardcode_minus_L
-  	  # to unsupported forces relinking
-  	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-  	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-  	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
-	  fi
-	  ;;
-	esac
-	shared_flag='-shared'
-	if test "$aix_use_runtimelinking" = yes; then
-	  shared_flag="$shared_flag "'${wl}-G'
-	fi
-      else
-	# not using gcc
-	if test "$host_cpu" = ia64; then
-  	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-  	# chokes on -Wl,-G. The following line is correct:
-	  shared_flag='-G'
-	else
-	  if test "$aix_use_runtimelinking" = yes; then
-	    shared_flag='${wl}-G'
-	  else
-	    shared_flag='${wl}-bM:SRE'
-	  fi
-	fi
-      fi
 
-      # It seems that -bexpall does not export symbols beginning with
-      # underscore (_), so it is better to generate a list of symbols to export.
-      _LT_AC_TAGVAR(always_export_symbols, $1)=yes
-      if test "$aix_use_runtimelinking" = yes; then
-	# Warning - without using the other runtime loading flags (-brtl),
-	# -berok will link without error, but may produce a broken library.
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
-       # Determine the default libpath from the value encoded in an empty executable.
-       _LT_AC_SYS_LIBPATH_AIX
-       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-       else
-	if test "$host_cpu" = ia64; then
-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
-	  _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
-	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
-	else
-	 # Determine the default libpath from the value encoded in an empty executable.
-	 _LT_AC_SYS_LIBPATH_AIX
-	 _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-	  # Warning - without using the other run time loading flags,
-	  # -berok will link without error, but may produce a broken library.
-	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
-	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
-	  # Exported symbols can be pulled into shared objects from archives
-	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
-	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
-	  # This is similar to how AIX traditionally builds its shared libraries.
-	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-	fi
+      ## -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
-      ;;
-
-    amigaos*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-      # see comment about different semantics on the GNU ld section
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-      ;;
-
-    bsdi[[45]]*)
-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
-      ;;
-
-    cygwin* | mingw* | pw32*)
-      # When not using gcc, we currently assume that we are using
-      # Microsoft Visual C++.
-      # hardcode_libdir_flag_spec is actually meaningless, as there is
-      # no search path for DLLs.
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-      # Tell ltmain to make .lib files, not .a files.
-      libext=lib
-      # Tell ltmain to make .dll files, not .so files.
-      shrext_cmds=".dll"
-      # FIXME: Setting linknames here is a bad hack.
-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
-      # The linker will automatically build a .lib file if we build a DLL.
-      _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
-      # FIXME: Should let the user specify the lib program.
-      _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs'
-      _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
-      _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-      ;;
-
-    darwin* | rhapsody*)
-      case $host_os in
-        rhapsody* | darwin1.[[012]])
-         _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
-         ;;
-       *) # Darwin 1.3 on
-         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-           _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-         else
-           case ${MACOSX_DEPLOYMENT_TARGET} in
-             10.[[012]])
-               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-               ;;
-             10.*)
-               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
-               ;;
-           esac
-         fi
-         ;;
-      esac
-      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-      _LT_AC_TAGVAR(hardcode_direct, $1)=no
-      _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
-      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-    if test "$GCC" = yes ; then
-    	output_verbose_link_cmd='echo'
-        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-      _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-      _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    else
-      case $cc_basename in
-        xlc*)
-         output_verbose_link_cmd='echo'
-         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
-         _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-         _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          ;;
-       *)
-         _LT_AC_TAGVAR(ld_shlibs, $1)=no
-          ;;
-      esac
     fi
-      ;;
-
-    dgux*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    freebsd1*)
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-      ;;
-
-    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-    # support.  Future versions do this automatically, but an explicit c++rt0.o
-    # does not break anything, and helps significantly (at the cost of a little
-    # extra space).
-    freebsd2.2*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | kfreebsd*-gnu | dragonfly*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    hpux9*)
-      if test "$GCC" = yes; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      else
-	_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      fi
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-
-      # hardcode_minus_L: Not really in the search PATH,
-      # but as the default location of the library.
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-      ;;
-
-    hpux10*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      if test "$with_gnu_ld" = no; then
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	_LT_AC_TAGVAR(hardcode_direct, $1)=yes
-	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-
-	# hardcode_minus_L: Not really in the search PATH,
-	# but as the default location of the library.
-	_LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-      fi
-      ;;
-
-    hpux11*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	case $host_cpu in
-	hppa*64*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	ia64*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	esac
-      else
-	case $host_cpu in
-	hppa*64*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	ia64*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	esac
-      fi
-      if test "$with_gnu_ld" = no; then
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	case $host_cpu in
-	hppa*64*|ia64*)
-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
-	  _LT_AC_TAGVAR(hardcode_direct, $1)=no
-	  _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-	  ;;
-	*)
-	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-	  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-
-	  # hardcode_minus_L: Not really in the search PATH,
-	  # but as the default location of the library.
-	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-	  ;;
-	esac
-      fi
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      if test "$GCC" = yes; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-      else
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
-      fi
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-      ;;
-
-    netbsd*)
-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-      else
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
-      fi
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    newsos6)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    openbsd*)
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-      else
-       case $host_os in
-	 openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
-	   _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	   ;;
-	 *)
-	   _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	   ;;
-       esac
-      fi
-      ;;
-
-    os2*)
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-      _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-      _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-      ;;
-
-    osf3*)
-      if test "$GCC" = yes; then
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-      else
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-      fi
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-      ;;
-
-    osf4* | osf5*)	# as osf3* with the addition of -msym flag
-      if test "$GCC" = yes; then
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      else
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
-	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
-
-	# Both c and cxx compiler support -rpath directly
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-      fi
-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-      ;;
-
-    solaris*)
-      _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
-      if test "$GCC" = yes; then
-	wlarc='${wl}'
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
-      else
-	wlarc=''
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-  	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-      fi
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      case $host_os in
-      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-      *)
- 	# The compiler driver will combine linker options so we
- 	# cannot just pass the convience library names through
- 	# without $wl, iff we do not link with $LD.
- 	# Luckily, gcc supports the same syntax we need for Sun Studio.
- 	# Supported since Solaris 2.6 (maybe 2.5.1?)
- 	case $wlarc in
- 	'')
- 	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;;
- 	*)
- 	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
- 	esac ;;
+  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
-      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-      ;;
-
-    sunos4*)
-      if test "x$host_vendor" = xsequent; then
-	# Use $CC to link under sequent, because it throws in some extra .o
-	# files that make .init and .fini sections work.
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
 
-    sysv4)
-      case $host_vendor in
-	sni)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes # is this really true???
-	;;
-	siemens)
-	  ## LD is ld it makes a PLAMLIB
-	  ## CC just makes a GrossModule.
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-	  _LT_AC_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
-	  _LT_AC_TAGVAR(hardcode_direct, $1)=no
-        ;;
-	motorola)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  _LT_AC_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
-	;;
+      case " $CXXFLAGS " in
+      *[\ \	]-pedantic[\ \	]*) ;;
+      *) complCXXFLAGS="$complCXXFLAGS -pedantic" ;;
       esac
-      runpath_var='LD_RUN_PATH'
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    sysv4.3*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-	runpath_var=LD_RUN_PATH
-	hardcode_runpath_var=yes
-	_LT_AC_TAGVAR(ld_shlibs, $1)=yes
-      fi
-      ;;
-
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7*)
-      _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      runpath_var='LD_RUN_PATH'
-
-      if test "$GCC" = yes; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
-
-    sysv5* | sco3.2v5* | sco5v6*)
-      # Note: We can NOT use -z defs as we might desire, because we do not
-      # link with -lc, and that would cause any symbols used from libc to
-      # always be unresolved, which means just about no library would
-      # ever link correctly.  If we're not using GNU ld we use -z text
-      # though, which does catch some bad symbols but isn't as heavy-handed
-      # as -z defs.
-      _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
-      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
-      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
-      runpath_var='LD_RUN_PATH'
-
-      if test "$GCC" = yes; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
-
-    uts4*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    *)
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-      ;;
-    esac
-  fi
-])
-AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
-test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-
-#
-# Do we need to explicitly link libc?
-#
-case "x$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)" in
-x|xyes)
-  # Assume -lc should be added
-  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
-
-  if test "$enable_shared" = yes && test "$GCC" = yes; then
-    case $_LT_AC_TAGVAR(archive_cmds, $1) in
-    *'~'*)
-      # FIXME: we may have to deal with multi-command sequences.
-      ;;
-    '$CC '*)
-      # Test whether the compiler implicitly links with -lc since on some
-      # systems, -lgcc has to come before -lc. If gcc already passes -lc
-      # to ld, don't add -lc before -lgcc.
-      AC_MSG_CHECKING([whether -lc should be explicitly linked in])
-      $rm conftest*
-      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-      if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
-        soname=conftest
-        lib=conftest
-        libobjs=conftest.$ac_objext
-        deplibs=
-        wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
-	pic_flag=$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
-        compiler_flags=-v
-        linker_flags=-v
-        verstring=
-        output_objdir=.
-        libname=conftest
-        lt_save_allow_undefined_flag=$_LT_AC_TAGVAR(allow_undefined_flag, $1)
-        _LT_AC_TAGVAR(allow_undefined_flag, $1)=
-        if AC_TRY_EVAL(_LT_AC_TAGVAR(archive_cmds, $1) 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1)
-        then
-	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-        else
-	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
-        fi
-        _LT_AC_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
-      else
-        cat conftest.err 1>&5
-      fi
-      $rm conftest*
-      AC_MSG_RESULT([$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)])
-      ;;
-    esac
-  fi
-  ;;
-esac
-])# AC_LIBTOOL_PROG_LD_SHLIBS
-
-
-# _LT_AC_FILE_LTDLL_C
-# -------------------
-# Be careful that the start marker always follows a newline.
-AC_DEFUN([_LT_AC_FILE_LTDLL_C], [
-# /* ltdll.c starts here */
-# #define WIN32_LEAN_AND_MEAN
-# #include <windows.h>
-# #undef WIN32_LEAN_AND_MEAN
-# #include <stdio.h>
-#
-# #ifndef __CYGWIN__
-# #  ifdef __CYGWIN32__
-# #    define __CYGWIN__ __CYGWIN32__
-# #  endif
-# #endif
-#
-# #ifdef __cplusplus
-# extern "C" {
-# #endif
-# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved);
-# #ifdef __cplusplus
-# }
-# #endif
-#
-# #ifdef __CYGWIN__
-# #include <cygwin/cygwin_dll.h>
-# DECLARE_CYGWIN_DLL( DllMain );
-# #endif
-# HINSTANCE __hDllInstance_base;
-#
-# BOOL APIENTRY
-# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
-# {
-#   __hDllInstance_base = hInst;
-#   return TRUE;
-# }
-# /* ltdll.c ends here */
-])# _LT_AC_FILE_LTDLL_C
-
-
-# _LT_AC_TAGVAR(VARNAME, [TAGNAME])
-# ---------------------------------
-AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])])
-
-
-# old names
-AC_DEFUN([AM_PROG_LIBTOOL],   [AC_PROG_LIBTOOL])
-AC_DEFUN([AM_ENABLE_SHARED],  [AC_ENABLE_SHARED($@)])
-AC_DEFUN([AM_ENABLE_STATIC],  [AC_ENABLE_STATIC($@)])
-AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
-AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
-AC_DEFUN([AM_PROG_LD],        [AC_PROG_LD])
-AC_DEFUN([AM_PROG_NM],        [AC_PROG_NM])
-
-# This is just to silence aclocal about the macro not being used
-ifelse([AC_DISABLE_FAST_INSTALL])
-
-AC_DEFUN([LT_AC_PROG_GCJ],
-[AC_CHECK_TOOL(GCJ, gcj, no)
-  test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
-  AC_SUBST(GCJFLAGS)
-])
+     fi
+   fi
+  AC_MSG_RESULT($complCXXFLAGS)
 
-AC_DEFUN([LT_AC_PROG_RC],
-[AC_CHECK_TOOL(RC, windres, no)
-])
-
-# NOTE: This macro has been submitted for inclusion into   #
-#  GNU Autoconf as AC_PROG_SED.  When it is available in   #
-#  a released version of Autoconf we should remove this    #
-#  macro and use it instead.                               #
-# LT_AC_PROG_SED
-# --------------
-# Check for a fully-functional sed program, that truncates
-# as few characters as possible.  Prefer GNU sed if found.
-AC_DEFUN([LT_AC_PROG_SED],
-[AC_MSG_CHECKING([for a sed that does not truncate output])
-AC_CACHE_VAL(lt_cv_path_SED,
-[# Loop through the user's path and test for sed and gsed.
-# Then use that list of sed's as ones to test for truncation.
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for lt_ac_prog in sed gsed; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
-        lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
-      fi
-    done
-  done
-done
-IFS=$as_save_IFS
-lt_ac_max=0
-lt_ac_count=0
-# Add /usr/xpg4/bin/sed as it is typically found on Solaris
-# along with /bin/sed that truncates output.
-for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
-  test ! -f $lt_ac_sed && continue
-  cat /dev/null > conftest.in
-  lt_ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-  # Check for GNU sed and select it if it is found.
-  if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
-    lt_cv_path_SED=$lt_ac_sed
-    break
-  fi
-  while true; do
-    cat conftest.in conftest.in >conftest.tmp
-    mv conftest.tmp conftest.in
-    cp conftest.in conftest.nl
-    echo >>conftest.nl
-    $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
-    cmp -s conftest.out conftest.nl || break
-    # 10000 chars as input seems more than enough
-    test $lt_ac_count -gt 10 && break
-    lt_ac_count=`expr $lt_ac_count + 1`
-    if test $lt_ac_count -gt $lt_ac_max; then
-      lt_ac_max=$lt_ac_count
-      lt_cv_path_SED=$lt_ac_sed
-    fi
-  done
-done
-])
-SED=$lt_cv_path_SED
-AC_SUBST([SED])
-AC_MSG_RESULT([$SED])
+  WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS"
+  AC_SUBST(WARN_CXXFLAGS)
 ])
 
 # pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
@@ -6914,16 +662,14 @@ 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
+[if test -n "$$1"; then
+    pkg_cv_[]$1="$$1"
+ elif test -n "$PKG_CONFIG"; then
+    PKG_CHECK_EXISTS([$3],
+                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
+		     [pkg_failed=yes])
+ else
+    pkg_failed=untried
 fi[]dnl
 ])# _PKG_CONFIG
 
@@ -6967,9 +713,9 @@ 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"`
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
         else 
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
@@ -6994,7 +740,7 @@ path to pkg-config.
 
 _PKG_TEXT
 
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])],
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
 		[$4])
 else
 	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
@@ -7004,7 +750,7 @@ else
 fi[]dnl
 ])# PKG_CHECK_MODULES
 
-# Copyright (C) 2002, 2003, 2005, 2006  Free Software Foundation, Inc.
+# 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,
@@ -7016,10 +762,10 @@ fi[]dnl
 # 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.10'
+[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.10], [],
+m4_if([$1], [1.11], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -7033,10 +779,12 @@ 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 AC_INIT_AUTOMAKE.
+# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.10])dnl
-_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])
+[AM_AUTOMAKE_VERSION([1.11])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 -*-
 
@@ -7091,39 +839,16 @@ AC_PREREQ([2.50])dnl
 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
+# 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 8
+# serial 9
 
 # AM_CONDITIONAL(NAME, SHELL-CONDITION)
 # -------------------------------------
@@ -7136,6 +861,7 @@ 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='#'
@@ -7149,14 +875,14 @@ AC_CONFIG_COMMANDS_PRE(
 Usually this means the macro was only invoked conditionally.]])
 fi])])
 
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+# 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 9
+# 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,
@@ -7213,6 +939,16 @@ AC_CACHE_CHECK([dependency style of $depcc],
   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
@@ -7230,7 +966,17 @@ AC_CACHE_CHECK([dependency style of $depcc],
     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
@@ -7240,19 +986,23 @@ AC_CACHE_CHECK([dependency style of $depcc],
 	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
-    # 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.
     if depmode=$depmode \
-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
+       source=sub/conftest.c object=$am__obj \
        depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+       $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 sub/conftest.${OBJEXT-o} 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
@@ -7309,57 +1059,68 @@ _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
 
 # Generate code to set up dependency tracking.              -*- Autoconf -*-
 
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
+# 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 3
+#serial 5
 
 # _AM_OUTPUT_DEPENDENCY_COMMANDS
 # ------------------------------
 AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
-[for mf in $CONFIG_FILES; 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 10q "$mf" | grep '^#.*generated by automake' > /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"
+[{
+  # 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
-done
+}
 ])# _AM_OUTPUT_DEPENDENCY_COMMANDS
 
 
@@ -7376,28 +1137,16 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
      [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
 ])
 
-# Copyright (C) 1996, 1997, 2000, 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.
-
-# serial 8
-
-# AM_CONFIG_HEADER is obsolete.  It has been replaced by AC_CONFIG_HEADERS.
-AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
-
 # Do all the work for Automake.                             -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006 Free Software Foundation, Inc.
+# 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 12
+# 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.
@@ -7414,7 +1163,7 @@ AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
 # 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.60])dnl
+[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
@@ -7465,8 +1214,8 @@ AM_MISSING_PROG(AUTOCONF, autoconf)
 AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
 AM_MISSING_PROG(AUTOHEADER, autoheader)
 AM_MISSING_PROG(MAKEINFO, makeinfo)
-AM_PROG_INSTALL_SH
-AM_PROG_INSTALL_STRIP
+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.
@@ -7474,24 +1223,37 @@ 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([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
+		  [_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
+		  [_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_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
@@ -7502,18 +1264,19 @@ AC_PROVIDE_IFELSE([AC_PROG_OBJC],
 # 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
-    $1 | $1:* )
+    $_am_arg | $_am_arg:* )
       break ;;
     * )
       _am_stamp_count=`expr $_am_stamp_count + 1` ;;
   esac
 done
-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
+echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
 
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+# 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,
@@ -7524,7 +1287,14 @@ echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
 # Define $install_sh.
 AC_DEFUN([AM_PROG_INSTALL_SH],
 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
+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.
@@ -7551,27 +1321,38 @@ 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
+# 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 4
+# 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],
-[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
-  dnl maintainer-mode is disabled by default
-  AC_ARG_ENABLE(maintainer-mode,
-[  --enable-maintainer-mode  enable make rules and dependencies not useful
+[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=no)
+      [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])
+  AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])
   MAINT=$MAINTAINER_MODE_TRUE
-  AC_SUBST(MAINT)dnl
+  AC_SUBST([MAINT])dnl
 ]
 )
 
@@ -7579,13 +1360,13 @@ AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
 
 # Check to see how 'make' treats includes.	            -*- Autoconf -*-
 
-# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
+# 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 3
+# serial 4
 
 # AM_MAKE_INCLUDE()
 # -----------------
@@ -7594,7 +1375,7 @@ AC_DEFUN([AM_MAKE_INCLUDE],
 [am_make=${MAKE-make}
 cat > confinc << 'END'
 am__doit:
-	@echo done
+	@echo this is the am__doit target
 .PHONY: am__doit
 END
 # If we don't find an include directive, just comment out the code.
@@ -7604,24 +1385,24 @@ am__quote=
 _am_result=none
 # First try GNU make style include.
 echo "include confinc" > confmf
-# We grep out `Entering directory' and `Leaving directory'
-# messages which can occur if `w' ends up in MAKEFLAGS.
-# In particular we don't look at `^make:' because GNU make might
-# be invoked under some other name (usually "gmake"), in which
-# case it prints its new name instead of `make'.
-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
-   am__include=include
-   am__quote=
-   _am_result=GNU
-fi
+# 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
-   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
-      am__include=.include
-      am__quote="\""
-      _am_result=BSD
-   fi
+   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])
@@ -7629,16 +1410,51 @@ AC_MSG_RESULT([$_am_result])
 rm -f confinc confmf
 ])
 
+# Copyright (C) 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_PROG_CC_C_O
+# --------------
+# Like AC_PROG_CC_C_O, but changed for automake.
+AC_DEFUN([AM_PROG_CC_C_O],
+[AC_REQUIRE([AC_PROG_CC_C_O])dnl
+AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+AC_REQUIRE_AUX_FILE([compile])dnl
+# FIXME: we rely on the cache variable name because
+# there is no other way.
+set dummy $CC
+am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']`
+eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
+if test "$am_t" != yes; then
+   # Losing compiler, so override with the script.
+   # FIXME: It is wrong to rewrite CC.
+   # But if we don't then we get into trouble of one sort or another.
+   # A longer-term fix would be to have automake use am__CC in this case,
+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+   CC="$am_aux_dir/compile $CC"
+fi
+dnl Make sure AC_PROG_CC is never called again, or it will override our
+dnl setting of CC.
+m4_define([AC_PROG_CC],
+          [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])])
+])
+
 # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
 
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005
+# 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 5
+# serial 6
 
 # AM_MISSING_PROG(NAME, PROGRAM)
 # ------------------------------
@@ -7655,7 +1471,14 @@ AC_SUBST($1)])
 AC_DEFUN([AM_MISSING_HAS_RUN],
 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
 AC_REQUIRE_AUX_FILE([missing])dnl
-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
+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 "
@@ -7693,13 +1516,13 @@ esac
 
 # Helper functions for option handling.                     -*- Autoconf -*-
 
-# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
+# 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 3
+# serial 4
 
 # _AM_MANGLE_OPTION(NAME)
 # -----------------------
@@ -7716,7 +1539,7 @@ AC_DEFUN([_AM_SET_OPTION],
 # ----------------------------------
 # OPTIONS is a space-separated list of Automake options.
 AC_DEFUN([_AM_SET_OPTIONS],
-[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
+[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
 
 # _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
 # -------------------------------------------
@@ -7726,14 +1549,14 @@ AC_DEFUN([_AM_IF_OPTION],
 
 # Check to make sure that the build environment is sane.    -*- Autoconf -*-
 
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
+# 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 4
+# serial 5
 
 # AM_SANITY_CHECK
 # ---------------
@@ -7742,16 +1565,29 @@ AC_DEFUN([AM_SANITY_CHECK],
 # 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`
+   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`
+      set X `ls -t "$srcdir/configure" conftest.file`
    fi
    rm -f conftest.file
    if test "$[*]" != "X $srcdir/configure conftest.file" \
@@ -7776,6 +1612,33 @@ 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
@@ -7804,18 +1667,25 @@ fi
 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 AC_SUBST([INSTALL_STRIP_PROGRAM])])
 
-# Copyright (C) 2006  Free Software Foundation, Inc.
+# 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 outputing VARIABLE = @VARIABLE@ in Makefile.in.
+# 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.
@@ -7915,3 +1785,9 @@ AC_SUBST([am__untar])
 m4_include([m4/gecko.m4])
 m4_include([m4/gnome-doc-utils.m4])
 m4_include([m4/intltool.m4])
+m4_include([m4/libtool.m4])
+m4_include([m4/ltoptions.m4])
+m4_include([m4/ltsugar.m4])
+m4_include([m4/ltversion.m4])
+m4_include([m4/lt~obsolete.m4])
+m4_include([m4/nls.m4])
diff --git a/compile b/compile
new file mode 100755
index 0000000..ec64c62
--- /dev/null
+++ b/compile
@@ -0,0 +1,143 @@
+#! /bin/sh
+# Wrapper for compilers which do not understand `-c -o'.
+
+scriptversion=2009-04-28.21; # UTC
+
+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009  Free Software
+# Foundation, Inc.
+# Written by Tom Tromey <tromey@cygnus.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, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to <bug-automake@gnu.org> or send patches to
+# <automake-patches@gnu.org>.
+
+case $1 in
+  '')
+     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
+     exit 1;
+     ;;
+  -h | --h*)
+    cat <<\EOF
+Usage: compile [--help] [--version] PROGRAM [ARGS]
+
+Wrapper for compilers which do not understand `-c -o'.
+Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
+arguments, and rename the output as expected.
+
+If you are trying to build a whole package this is not the
+right script to run: please start by reading the file `INSTALL'.
+
+Report bugs to <bug-automake@gnu.org>.
+EOF
+    exit $?
+    ;;
+  -v | --v*)
+    echo "compile $scriptversion"
+    exit $?
+    ;;
+esac
+
+ofile=
+cfile=
+eat=
+
+for arg
+do
+  if test -n "$eat"; then
+    eat=
+  else
+    case $1 in
+      -o)
+	# configure might choose to run compile as `compile cc -o foo foo.c'.
+	# So we strip `-o arg' only if arg is an object.
+	eat=1
+	case $2 in
+	  *.o | *.obj)
+	    ofile=$2
+	    ;;
+	  *)
+	    set x "$@" -o "$2"
+	    shift
+	    ;;
+	esac
+	;;
+      *.c)
+	cfile=$1
+	set x "$@" "$1"
+	shift
+	;;
+      *)
+	set x "$@" "$1"
+	shift
+	;;
+    esac
+  fi
+  shift
+done
+
+if test -z "$ofile" || test -z "$cfile"; then
+  # If no `-o' option was seen then we might have been invoked from a
+  # pattern rule where we don't need one.  That is ok -- this is a
+  # normal compilation that the losing compiler can handle.  If no
+  # `.c' file was seen then we are probably linking.  That is also
+  # ok.
+  exec "$@"
+fi
+
+# Name of file we expect compiler to create.
+cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
+
+# Create the lock directory.
+# Note: use `[/\\:.-]' here to ensure that we don't use the same name
+# that we are using for the .o file.  Also, base the name on the expected
+# object file name, since that is what matters with a parallel build.
+lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
+while true; do
+  if mkdir "$lockdir" >/dev/null 2>&1; then
+    break
+  fi
+  sleep 1
+done
+# FIXME: race condition here if user kills between mkdir and trap.
+trap "rmdir '$lockdir'; exit 1" 1 2 15
+
+# Run the compile.
+"$@"
+ret=$?
+
+if test -f "$cofile"; then
+  mv "$cofile" "$ofile"
+elif test -f "${cofile}bj"; then
+  mv "${cofile}bj" "$ofile"
+fi
+
+rmdir "$lockdir"
+exit $ret
+
+# 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/config.guess b/config.guess
index 396482d..da83314 100755
--- a/config.guess
+++ b/config.guess
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
-#   Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+#   Free Software Foundation, Inc.
 
-timestamp='2006-07-02'
+timestamp='2009-04-27'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -56,8 +56,8 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -161,6 +161,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	    arm*) machine=arm-unknown ;;
 	    sh3el) machine=shl-unknown ;;
 	    sh3eb) machine=sh-unknown ;;
+	    sh5el) machine=sh5le-unknown ;;
 	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
 	esac
 	# The Operating System including object format, if it has switched
@@ -323,14 +324,30 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	case `/usr/bin/uname -p` in
 	    sparc) echo sparc-icl-nx7; exit ;;
 	esac ;;
+    s390x:SunOS:*:*)
+	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
     sun4H:SunOS:5.*:*)
 	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
-    i86pc:SunOS:5.*:*)
-	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
+	eval $set_cc_for_build
+	SUN_ARCH="i386"
+	# If there is a compiler, see if it is configured for 64-bit objects.
+	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
+	# This test works for both compilers.
+	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
+		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		grep IS_64BIT_ARCH >/dev/null
+	    then
+		SUN_ARCH="x86_64"
+	    fi
+	fi
+	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
     sun4*:SunOS:6*:*)
 	# According to config.sub, this is the proper way to canonicalize
@@ -531,7 +548,7 @@ EOF
 		echo rs6000-ibm-aix3.2
 	fi
 	exit ;;
-    *:AIX:*:[45])
+    *:AIX:*:[456])
 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
 		IBM_ARCH=rs6000
@@ -780,7 +797,7 @@ EOF
     i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
 	exit ;;
-    i*:MINGW*:*)
+    *:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit ;;
     i*:windows32*:*)
@@ -790,12 +807,18 @@ EOF
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit ;;
-    x86:Interix*:[3456]*)
-	echo i586-pc-interix${UNAME_RELEASE}
-	exit ;;
-    EM64T:Interix*:[3456]*)
-	echo x86_64-unknown-interix${UNAME_RELEASE}
-	exit ;;
+    *:Interix*:[3456]*)
+    	case ${UNAME_MACHINE} in
+	    x86)
+		echo i586-pc-interix${UNAME_RELEASE}
+		exit ;;
+	    EM64T | authenticamd | genuineintel)
+		echo x86_64-unknown-interix${UNAME_RELEASE}
+		exit ;;
+	    IA64)
+		echo ia64-unknown-interix${UNAME_RELEASE}
+		exit ;;
+	esac ;;
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
 	echo i${UNAME_MACHINE}-pc-mks
 	exit ;;
@@ -829,7 +852,14 @@ EOF
 	echo ${UNAME_MACHINE}-pc-minix
 	exit ;;
     arm*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	eval $set_cc_for_build
+	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+	    | grep -q __ARM_EABI__
+	then
+	    echo ${UNAME_MACHINE}-unknown-linux-gnu
+	else
+	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+	fi
 	exit ;;
     avr32*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -921,6 +951,9 @@ EOF
 	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
 	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
 	exit ;;
+    padre:Linux:*:*)
+	echo sparc-unknown-linux-gnu
+	exit ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
@@ -950,6 +983,9 @@ EOF
     x86_64:Linux:*:*)
 	echo x86_64-unknown-linux-gnu
 	exit ;;
+    xtensa*:Linux:*:*)
+    	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
     i*86:Linux:*:*)
 	# The BFD linker knows what the default object file format is, so
 	# first see if it will tell us. cd to the root directory to prevent
@@ -968,9 +1004,6 @@ EOF
 	  a.out-i386-linux)
 		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
 		exit ;;
-	  coff-i386)
-		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
-		exit ;;
 	  "")
 		# Either a pre-BFD a.out linker (linux-gnuoldld) or
 		# one that does not give us useful --help.
@@ -1085,8 +1118,11 @@ EOF
     pc:*:*:*)
 	# Left here for compatibility:
         # uname -m prints for DJGPP always 'pc', but it prints nothing about
-        # the processor, so we play safe by assuming i386.
-	echo i386-pc-msdosdjgpp
+        # the processor, so we play safe by assuming i586.
+	# Note: whatever this is, it MUST be the same as what config.sub
+	# prints for the "djgpp" host, or else GDB configury will decide that
+	# this is a cross-build.
+	echo i586-pc-msdosdjgpp
         exit ;;
     Intel:Mach:3*:*)
 	echo i386-pc-mach3
@@ -1124,6 +1160,16 @@ EOF
     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
         /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
           && { echo i486-ncr-sysv4; exit; } ;;
+    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
+	OS_REL='.3'
+	test -r /etc/.relid \
+	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
+	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
     m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
 	echo m68k-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
@@ -1199,6 +1245,9 @@ EOF
     BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
 	echo i586-pc-beos
 	exit ;;
+    BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
+	echo i586-pc-haiku
+	exit ;;
     SX-4:SUPER-UX:*:*)
 	echo sx4-nec-superux${UNAME_RELEASE}
 	exit ;;
@@ -1208,6 +1257,15 @@ EOF
     SX-6:SUPER-UX:*:*)
 	echo sx6-nec-superux${UNAME_RELEASE}
 	exit ;;
+    SX-7:SUPER-UX:*:*)
+	echo sx7-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-8:SUPER-UX:*:*)
+	echo sx8-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-8R:SUPER-UX:*:*)
+	echo sx8r-nec-superux${UNAME_RELEASE}
+	exit ;;
     Power*:Rhapsody:*:*)
 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
 	exit ;;
@@ -1298,6 +1356,9 @@ EOF
     i*86:rdos:*:*)
 	echo ${UNAME_MACHINE}-pc-rdos
 	exit ;;
+    i*86:AROS:*:*)
+	echo ${UNAME_MACHINE}-pc-aros
+	exit ;;
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2
@@ -1458,9 +1519,9 @@ This script, last modified $timestamp, has failed to recognize
 the operating system you are using. It is advised that you
 download the most up to date version of the config scripts from
 
-  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
 and
-  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
 
 If the version you run ($0) is already up to date, please
 send the following data and any information you think might be
diff --git a/config.h.in b/config.h.in
index a9a4bbd..a0b3d00 100644
--- a/config.h.in
+++ b/config.h.in
@@ -1,19 +1,12 @@
 /* config.h.in.  Generated from configure.in by autoheader.  */
-#undef ENABLE_NLS
-#undef HAVE_CATGETS
-#undef HAVE_GETTEXT
-#undef GETTEXT_PACKAGE
-#undef HAVE_LC_MESSAGES
-#undef HAVE_STPCPY
-#undef HAVE_LIBSM
 
-/* Define if you want to see debug messages */
+/* Enable additional debugging at the expense of performance and size */
 #undef DEBUG
 
 /* always defined to indicate that i18n is enabled */
 #undef ENABLE_NLS
 
-/* Gettext package */
+/* Define to the gettext package name. */
 #undef GETTEXT_PACKAGE
 
 /* Define if wish to use gtkhtml instead of gtkmozembed */
@@ -28,6 +21,9 @@
 /* Define to 1 if you have the `bind_textdomain_codeset' function. */
 #undef HAVE_BIND_TEXTDOMAIN_CODESET
 
+/* Define to enable dbus */
+#undef HAVE_DBUS
+
 /* Define to 1 if you have the `dcgettext' function. */
 #undef HAVE_DCGETTEXT
 
@@ -46,6 +42,9 @@
 /* Define if we have gecko 1.9 */
 #undef HAVE_GECKO_1_9
 
+/* Define if we have gecko 1.9.1 */
+#undef HAVE_GECKO_1_9_1
+
 /* Define if gecko is a debug build */
 #undef HAVE_GECKO_DEBUG
 
@@ -85,12 +84,6 @@
 /* Define to 1 if you have the <string.h> header file. */
 #undef HAVE_STRING_H
 
-/* Define to 1 if you have the <sys/select.h> header file. */
-#undef HAVE_SYS_SELECT_H
-
-/* Define to 1 if you have the <sys/socket.h> header file. */
-#undef HAVE_SYS_SOCKET_H
-
 /* Define to 1 if you have the <sys/stat.h> header file. */
 #undef HAVE_SYS_STAT_H
 
@@ -103,11 +96,12 @@
 /* Means gtk_widget_set_tooltip_text works */
 #undef HAVE_WIDGET_TOOLTIP_TEXT
 
-/* install prefix */
-#undef INSTALL_PREFIX
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+   */
+#undef LT_OBJDIR
 
-/* Define to 1 if you wish to enable 'maintainer-only' behavior. */
-#undef MAINTAINER_MODE
+/* Define to 1 if your C compiler doesn't accept -c and -o together. */
+#undef NO_MINUS_C_MINUS_O
 
 /* Name of package */
 #undef PACKAGE
@@ -115,30 +109,9 @@
 /* Define to the address where bug reports for this package should be sent. */
 #undef PACKAGE_BUGREPORT
 
-/* package data directory */
-#undef PACKAGE_DATA_DIR
-
-/* package doc directory */
-#undef PACKAGE_DOC_DIR
-
-/* package help directory */
-#undef PACKAGE_HELP_DIR
-
-/* package LOCALE directory */
-#undef PACKAGE_LOCALE_DIR
-
-/* package menu directory */
-#undef PACKAGE_MENU_DIR
-
 /* Define to the full name of this package. */
 #undef PACKAGE_NAME
 
-/* package pixmap directory */
-#undef PACKAGE_PIXMAPS_DIR
-
-/* package source directory */
-#undef PACKAGE_SOURCE_DIR
-
 /* Define to the full name and version of this package. */
 #undef PACKAGE_STRING
 
@@ -148,20 +121,11 @@
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
-/* Define to the type of arg 1 for `select'. */
-#undef SELECT_TYPE_ARG1
-
-/* Define to the type of args 2, 3 and 4 for `select'. */
-#undef SELECT_TYPE_ARG234
-
-/* Define to the type of arg 5 for `select'. */
-#undef SELECT_TYPE_ARG5
-
 /* Define to 1 if you have the ANSI C header files. */
 #undef STDC_HEADERS
 
-/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
-#undef TIME_WITH_SYS_TIME
+/* Define if sword has multiverse support */
+#undef SWORD_MULTIVERSE
 
 /* Define if you want to use GtkHtml-3.14 */
 #undef USE_GTKHTML3_14
@@ -175,11 +139,8 @@
 /* Define if you want to use gtk-unix-print */
 #undef USE_GTKUPRINT
 
-/* Define if wish to enable previewer autoclear */
-#undef USE_PREVIEWER_AUTOCLEAR
-
-/* Define if wish to use the treeview paths */
-#undef USE_TREEVIEW_PATH
-
 /* Version number of package */
 #undef VERSION
+
+/* Not using libgnomeui */
+#undef WITHOUT_GNOME
diff --git a/config.sub b/config.sub
index fab0aa3..a39437d 100755
--- a/config.sub
+++ b/config.sub
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
-#   Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+#   Free Software Foundation, Inc.
 
-timestamp='2006-09-20'
+timestamp='2009-04-17'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -72,8 +72,8 @@ Report bugs and patches to <config-patches@gnu.org>."
 version="\
 GNU config.sub ($timestamp)
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -122,6 +122,7 @@ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
   nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
   uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
+  kopensolaris*-gnu* | \
   storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
@@ -245,17 +246,20 @@ case $basic_machine in
 	| bfin \
 	| c4x | clipper \
 	| d10v | d30v | dlx | dsp16xx \
-	| fr30 | frv \
+	| fido | fr30 | frv \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
+	| lm32 \
 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
-	| maxq | mb | microblaze | mcore \
+	| maxq | mb | microblaze | mcore | mep | metag \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
-	| mips64vr | mips64vrel \
+	| mips64octeon | mips64octeonel \
 	| mips64orion | mips64orionel \
+	| mips64r5900 | mips64r5900el \
+	| mips64vr | mips64vrel \
 	| mips64vr4100 | mips64vr4100el \
 	| mips64vr4300 | mips64vr4300el \
 	| mips64vr5000 | mips64vr5000el \
@@ -268,6 +272,7 @@ case $basic_machine in
 	| mipsisa64sr71k | mipsisa64sr71kel \
 	| mipstx39 | mipstx39el \
 	| mn10200 | mn10300 \
+	| moxie \
 	| mt \
 	| msp430 \
 	| nios | nios2 \
@@ -277,7 +282,7 @@ case $basic_machine in
 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
 	| score \
-	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
 	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
 	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
@@ -286,7 +291,7 @@ case $basic_machine in
 	| v850 | v850e \
 	| we32k \
 	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
-	| z8k)
+	| z8k | z80)
 		basic_machine=$basic_machine-unknown
 		;;
 	m6811 | m68hc11 | m6812 | m68hc12)
@@ -324,19 +329,22 @@ case $basic_machine in
 	| clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
 	| elxsi-* \
-	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
+	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
 	| h8300-* | h8500-* \
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
 	| ip2k-* | iq2000-* \
+	| lm32-* \
 	| m32c-* | m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | maxq-* | mcore-* \
+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
 	| mips16-* \
 	| mips64-* | mips64el-* \
-	| mips64vr-* | mips64vrel-* \
+	| mips64octeon-* | mips64octeonel-* \
 	| mips64orion-* | mips64orionel-* \
+	| mips64r5900-* | mips64r5900el-* \
+	| mips64vr-* | mips64vrel-* \
 	| mips64vr4100-* | mips64vr4100el-* \
 	| mips64vr4300-* | mips64vr4300el-* \
 	| mips64vr5000-* | mips64vr5000el-* \
@@ -358,20 +366,24 @@ case $basic_machine in
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
 	| pyramid-* \
 	| romp-* | rs6000-* \
-	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
 	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
 	| sparclite-* \
 	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
 	| tahoe-* | thumb-* \
-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
 	| tron-* \
 	| v850-* | v850e-* | vax-* \
 	| we32k-* \
 	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
-	| xstormy16-* | xtensa-* \
+	| xstormy16-* | xtensa*-* \
 	| ymp-* \
-	| z8k-*)
+	| z8k-* | z80-*)
+		;;
+	# Recognize the basic CPU types without company name, with glob match.
+	xtensa*)
+		basic_machine=$basic_machine-unknown
 		;;
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
@@ -435,6 +447,10 @@ case $basic_machine in
 		basic_machine=m68k-apollo
 		os=-bsd
 		;;
+	aros)
+		basic_machine=i386-pc
+		os=-aros
+		;;
 	aux)
 		basic_machine=m68k-apple
 		os=-aux
@@ -443,10 +459,22 @@ case $basic_machine in
 		basic_machine=ns32k-sequent
 		os=-dynix
 		;;
+	blackfin)
+		basic_machine=bfin-unknown
+		os=-linux
+		;;
+	blackfin-*)
+		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
 	c90)
 		basic_machine=c90-cray
 		os=-unicos
 		;;
+        cegcc)
+		basic_machine=arm-unknown
+		os=-cegcc
+		;;
 	convex-c1)
 		basic_machine=c1-convex
 		os=-bsd
@@ -475,8 +503,8 @@ case $basic_machine in
 		basic_machine=craynv-cray
 		os=-unicosmp
 		;;
-	cr16c)
-		basic_machine=cr16c-unknown
+	cr16)
+		basic_machine=cr16-unknown
 		os=-elf
 		;;
 	crds | unos)
@@ -514,6 +542,10 @@ case $basic_machine in
 		basic_machine=m88k-motorola
 		os=-sysv3
 		;;
+	dicos)
+		basic_machine=i686-pc
+		os=-dicos
+		;;
 	djgpp)
 		basic_machine=i586-pc
 		os=-msdosdjgpp
@@ -668,6 +700,14 @@ case $basic_machine in
 		basic_machine=m68k-isi
 		os=-sysv
 		;;
+	m68knommu)
+		basic_machine=m68k-unknown
+		os=-linux
+		;;
+	m68knommu-*)
+		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
 	m88k-omron*)
 		basic_machine=m88k-omron
 		;;
@@ -683,6 +723,10 @@ case $basic_machine in
 		basic_machine=i386-pc
 		os=-mingw32
 		;;
+	mingw32ce)
+		basic_machine=arm-unknown
+		os=-mingw32ce
+		;;
 	miniframe)
 		basic_machine=m68000-convergent
 		;;
@@ -809,6 +853,14 @@ case $basic_machine in
 		basic_machine=i860-intel
 		os=-osf
 		;;
+	parisc)
+		basic_machine=hppa-unknown
+		os=-linux
+		;;
+	parisc-*)
+		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
 	pbd)
 		basic_machine=sparc-tti
 		;;
@@ -925,6 +977,9 @@ case $basic_machine in
 		basic_machine=sh-hitachi
 		os=-hms
 		;;
+	sh5el)
+		basic_machine=sh5le-unknown
+		;;
 	sh64)
 		basic_machine=sh64-unknown
 		;;
@@ -1014,6 +1069,10 @@ case $basic_machine in
 		basic_machine=tic6x-unknown
 		os=-coff
 		;;
+	tile*)
+		basic_machine=tile-unknown
+		os=-linux-gnu
+		;;
 	tx39)
 		basic_machine=mipstx39-unknown
 		;;
@@ -1089,6 +1148,10 @@ case $basic_machine in
 		basic_machine=z8k-unknown
 		os=-sim
 		;;
+	z80-*-coff)
+		basic_machine=z80-unknown
+		os=-sim
+		;;
 	none)
 		basic_machine=none-none
 		os=-none
@@ -1127,7 +1190,7 @@ case $basic_machine in
 	we32k)
 		basic_machine=we32k-att
 		;;
-	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
+	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
 		basic_machine=sh-unknown
 		;;
 	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
@@ -1199,8 +1262,9 @@ case $os in
 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
 	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
+	      | -kopensolaris* \
 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-	      | -aos* \
+	      | -aos* | -aros* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
 	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
@@ -1209,7 +1273,7 @@ case $os in
 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-	      | -chorusos* | -chorusrdb* \
+	      | -chorusos* | -chorusrdb* | -cegcc* \
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
 	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
 	      | -uxpv* | -beos* | -mpeix* | -udk* \
@@ -1219,7 +1283,7 @@ case $os in
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers*)
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1349,6 +1413,9 @@ case $os in
 	-zvmoe)
 		os=-zvmoe
 		;;
+	-dicos*)
+		os=-dicos
+		;;
 	-none)
 		;;
 	*)
@@ -1414,6 +1481,9 @@ case $basic_machine in
 	m68*-cisco)
 		os=-aout
 		;;
+        mep-*)
+		os=-elf
+		;;
 	mips*-cisco)
 		os=-elf
 		;;
diff --git a/configure b/configure
index af79b7b..ac27770 100755
--- a/configure
+++ b/configure
@@ -1,11 +1,11 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for xiphos 3.1.1.
+# Generated by GNU Autoconf 2.63 for xiphos 3.1.2.
 #
 # Report bugs to <http://sourceforge.net/tracker/?group_id=5528&atid=105528>.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 ## --------------------- ##
@@ -17,7 +17,7 @@ DUALCASE=1; export DUALCASE # for MKS sh
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # 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
@@ -39,17 +39,45 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS
 as_cr_digits='0123456789'
 as_cr_alnum=$as_cr_Letters$as_cr_digits
 
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
+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
+if (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
-    PATH_SEPARATOR=:
+    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
-  rm -f conf$$.sh
+  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
 
 # Support unset when possible.
@@ -65,8 +93,6 @@ fi
 # 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.)
-as_nl='
-'
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
@@ -89,7 +115,7 @@ if test "x$as_myself" = x; then
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   { (exit 1); exit 1; }
 fi
 
@@ -102,17 +128,10 @@ PS2='> '
 PS4='+ '
 
 # NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-  fi
-done
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
 
 # Required to use basename.
 if expr a : '\(a\)' >/dev/null 2>&1 &&
@@ -134,7 +153,7 @@ as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
+$as_echo X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -160,7 +179,7 @@ else
   as_have_required=no
 fi
 
-  if test $as_have_required = yes && 	 (eval ":
+  if test $as_have_required = yes &&	 (eval ":
 (as_func_return () {
   (exit \$1)
 }
@@ -242,7 +261,7 @@ IFS=$as_save_IFS
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # 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
@@ -263,7 +282,7 @@ _ASEOF
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # 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
@@ -343,10 +362,10 @@ fi
 
       if test "x$CONFIG_SHELL" != x; then
   for as_var in BASH_ENV ENV
-        do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-        done
-        export CONFIG_SHELL
-        exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+	do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+	done
+	export CONFIG_SHELL
+	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
 fi
 
 
@@ -415,9 +434,10 @@ fi
 
 test \$exitcode = 0") || {
   echo No shell found that supports shell functions.
-  echo Please tell autoconf@gnu.org about your system,
-  echo including any error possibly output before this
-  echo message
+  echo Please tell bug-autoconf@gnu.org about your system,
+  echo including any error possibly output before this message.
+  echo This can help us improve future autoconf versions.
+  echo Configuration will now proceed without shell functions.
 }
 
 
@@ -453,7 +473,7 @@ test \$exitcode = 0") || {
       s/-\n.*//
     ' >$as_me.lineno &&
   chmod +x "$as_me.lineno" ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
    { (exit 1); exit 1; }; }
 
   # Don't try to exec as it changes $[0], causing all sort of problems
@@ -481,7 +501,6 @@ case `echo -n x` in
 *)
   ECHO_N='-n';;
 esac
-
 if expr a : '\(a\)' >/dev/null 2>&1 &&
    test "X`expr 00001 : '.*\(...\)'`" = X001; then
   as_expr=expr
@@ -494,19 +513,22 @@ if test -d conf$$.dir; then
   rm -f conf$$.dir/conf$$.file
 else
   rm -f conf$$.dir
-  mkdir conf$$.dir
-fi
-echo >conf$$.file
-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 ||
+  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'
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
+  fi
 else
   as_ln_s='cp -p'
 fi
@@ -531,10 +553,10 @@ else
   as_test_x='
     eval sh -c '\''
       if test -d "$1"; then
-        test -d "$1/.";
+	test -d "$1/.";
       else
 	case $1 in
-        -*)set "./$1";;
+	-*)set "./$1";;
 	esac;
 	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
 	???[sx]*):;;*)false;;esac;fi
@@ -555,22 +577,22 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
 # Check that we are running under the correct shell.
 SHELL=${CONFIG_SHELL-/bin/sh}
 
-case X$ECHO in
+case X$lt_ECHO in
 X*--fallback-echo)
   # Remove one level of quotation (which was required for Make).
-  ECHO=`echo "$ECHO" | sed 's,\\\\\$\\$0,'$0','`
+  ECHO=`echo "$lt_ECHO" | sed 's,\\\\\$\\$0,'$0','`
   ;;
 esac
 
-echo=${ECHO-echo}
+ECHO=${lt_ECHO-echo}
 if test "X$1" = X--no-reexec; then
   # Discard the --no-reexec flag, and continue.
   shift
 elif test "X$1" = X--fallback-echo; then
   # Avoid inline document here, it may be left over
   :
-elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then
-  # Yippee, $echo works!
+elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then
+  # Yippee, $ECHO works!
   :
 else
   # Restart under the correct shell.
@@ -580,9 +602,9 @@ fi
 if test "X$1" = X--fallback-echo; then
   # used as fallback echo
   shift
-  cat <<EOF
+  cat <<_LT_EOF
 $*
-EOF
+_LT_EOF
   exit 0
 fi
 
@@ -590,121 +612,116 @@ fi
 # if CDPATH is set.
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
-if test -z "$ECHO"; then
-if test "X${echo_test_string+set}" != Xset; then
-# find a string as large as possible, as long as the shell can cope with it
-  for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
-    # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
-    if (echo_test_string=`eval $cmd`) 2>/dev/null &&
-       echo_test_string=`eval $cmd` &&
-       (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
-    then
-      break
-    fi
-  done
-fi
+if test -z "$lt_ECHO"; then
+  if test "X${echo_test_string+set}" != Xset; then
+    # find a string as large as possible, as long as the shell can cope with it
+    for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
+      # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
+      if { echo_test_string=`eval $cmd`; } 2>/dev/null &&
+	 { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null
+      then
+        break
+      fi
+    done
+  fi
 
-if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
-   echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
-   test "X$echo_testing_string" = "X$echo_test_string"; then
-  :
-else
-  # The Solaris, AIX, and Digital Unix default echo programs unquote
-  # backslashes.  This makes it impossible to quote backslashes using
-  #   echo "$something" | sed 's/\\/\\\\/g'
-  #
-  # So, first we look for a working echo in the user's PATH.
+  if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
+     echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
+     test "X$echo_testing_string" = "X$echo_test_string"; then
+    :
+  else
+    # The Solaris, AIX, and Digital Unix default echo programs unquote
+    # backslashes.  This makes it impossible to quote backslashes using
+    #   echo "$something" | sed 's/\\/\\\\/g'
+    #
+    # So, first we look for a working echo in the user's PATH.
 
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  for dir in $PATH /usr/ucb; do
+    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+    for dir in $PATH /usr/ucb; do
+      IFS="$lt_save_ifs"
+      if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
+         test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
+         echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
+         test "X$echo_testing_string" = "X$echo_test_string"; then
+        ECHO="$dir/echo"
+        break
+      fi
+    done
     IFS="$lt_save_ifs"
-    if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
-       test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
-       echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
-       test "X$echo_testing_string" = "X$echo_test_string"; then
-      echo="$dir/echo"
-      break
-    fi
-  done
-  IFS="$lt_save_ifs"
 
-  if test "X$echo" = Xecho; then
-    # We didn't find a better echo, so look for alternatives.
-    if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
-       echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
-       test "X$echo_testing_string" = "X$echo_test_string"; then
-      # This shell has a builtin print -r that does the trick.
-      echo='print -r'
-    elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
-	 test "X$CONFIG_SHELL" != X/bin/ksh; then
-      # If we have ksh, try running configure again with it.
-      ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-      export ORIGINAL_CONFIG_SHELL
-      CONFIG_SHELL=/bin/ksh
-      export CONFIG_SHELL
-      exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"}
-    else
-      # Try using printf.
-      echo='printf %s\n'
-      if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
-	 echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
-	 test "X$echo_testing_string" = "X$echo_test_string"; then
-	# Cool, printf works
-	:
-      elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
-	   test "X$echo_testing_string" = 'X\t' &&
-	   echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-	   test "X$echo_testing_string" = "X$echo_test_string"; then
-	CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
-	export CONFIG_SHELL
-	SHELL="$CONFIG_SHELL"
-	export SHELL
-	echo="$CONFIG_SHELL $0 --fallback-echo"
-      elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
-	   test "X$echo_testing_string" = 'X\t' &&
-	   echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-	   test "X$echo_testing_string" = "X$echo_test_string"; then
-	echo="$CONFIG_SHELL $0 --fallback-echo"
+    if test "X$ECHO" = Xecho; then
+      # We didn't find a better echo, so look for alternatives.
+      if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' &&
+         echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` &&
+         test "X$echo_testing_string" = "X$echo_test_string"; then
+        # This shell has a builtin print -r that does the trick.
+        ECHO='print -r'
+      elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &&
+	   test "X$CONFIG_SHELL" != X/bin/ksh; then
+        # If we have ksh, try running configure again with it.
+        ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
+        export ORIGINAL_CONFIG_SHELL
+        CONFIG_SHELL=/bin/ksh
+        export CONFIG_SHELL
+        exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"}
       else
-	# maybe with a smaller string...
-	prev=:
+        # Try using printf.
+        ECHO='printf %s\n'
+        if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
+	   echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
+	   test "X$echo_testing_string" = "X$echo_test_string"; then
+	  # Cool, printf works
+	  :
+        elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
+	     test "X$echo_testing_string" = 'X\t' &&
+	     echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
+	     test "X$echo_testing_string" = "X$echo_test_string"; then
+	  CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
+	  export CONFIG_SHELL
+	  SHELL="$CONFIG_SHELL"
+	  export SHELL
+	  ECHO="$CONFIG_SHELL $0 --fallback-echo"
+        elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
+	     test "X$echo_testing_string" = 'X\t' &&
+	     echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
+	     test "X$echo_testing_string" = "X$echo_test_string"; then
+	  ECHO="$CONFIG_SHELL $0 --fallback-echo"
+        else
+	  # maybe with a smaller string...
+	  prev=:
 
-	for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do
-	  if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null
-	  then
-	    break
-	  fi
-	  prev="$cmd"
-	done
+	  for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do
+	    if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null
+	    then
+	      break
+	    fi
+	    prev="$cmd"
+	  done
 
-	if test "$prev" != 'sed 50q "$0"'; then
-	  echo_test_string=`eval $prev`
-	  export echo_test_string
-	  exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"}
-	else
-	  # Oops.  We lost completely, so just stick with echo.
-	  echo=echo
-	fi
+	  if test "$prev" != 'sed 50q "$0"'; then
+	    echo_test_string=`eval $prev`
+	    export echo_test_string
+	    exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"}
+	  else
+	    # Oops.  We lost completely, so just stick with echo.
+	    ECHO=echo
+	  fi
+        fi
       fi
     fi
   fi
 fi
-fi
 
 # Copy echo and quote the copy suitably for passing to libtool from
 # the Makefile, instead of quoting the original, which is used later.
-ECHO=$echo
-if test "X$ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then
-   ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo"
+lt_ECHO=$ECHO
+if test "X$lt_ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then
+   lt_ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo"
 fi
 
 
 
 
-tagnames=${tagnames+${tagnames},}CXX
-
-tagnames=${tagnames+${tagnames},}F77
-
 exec 7<&0 </dev/null 6>&1
 
 # Name of the host.
@@ -728,8 +745,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='xiphos'
 PACKAGE_TARNAME='xiphos'
-PACKAGE_VERSION='3.1.1'
-PACKAGE_STRING='xiphos 3.1.1'
+PACKAGE_VERSION='3.1.2'
+PACKAGE_STRING='xiphos 3.1.2'
 PACKAGE_BUGREPORT='http://sourceforge.net/tracker/?group_id=5528&atid=105528'
 
 ac_unique_file="src/gnome2/xiphos.c"
@@ -769,285 +786,276 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL
-PATH_SEPARATOR
-PACKAGE_NAME
-PACKAGE_TARNAME
-PACKAGE_VERSION
-PACKAGE_STRING
-PACKAGE_BUGREPORT
-exec_prefix
-prefix
-program_transform_name
-bindir
-sbindir
-libexecdir
-datarootdir
-datadir
-sysconfdir
-sharedstatedir
-localstatedir
-includedir
-oldincludedir
-docdir
-infodir
-htmldir
-dvidir
-pdfdir
-psdir
-libdir
-localedir
-mandir
-DEFS
-ECHO_C
-ECHO_N
-ECHO_T
-LIBS
-build_alias
-host_alias
-target_alias
-INSTALL_PROGRAM
-INSTALL_SCRIPT
-INSTALL_DATA
-am__isrc
-CYGPATH_W
-PACKAGE
-VERSION
-ACLOCAL
-AUTOCONF
-AUTOMAKE
-AUTOHEADER
-MAKEINFO
-install_sh
-STRIP
-INSTALL_STRIP_PROGRAM
-mkdir_p
-AWK
-SET_MAKE
-am__leading_dot
-AMTAR
-am__tar
-am__untar
-PKG_CONFIG
-SWORD_CFLAGS
-SWORD_LIBS
-SWORD_MULTIVERSE_CFLAGS
-SWORD_MULTIVERSE_LIBS
-DIRS
+ac_subst_vars='am__EXEEXT_FALSE
+am__EXEEXT_TRUE
+LTLIBOBJS
+LIBOBJS
+AM_LDFLAGS
+WARN_CXXFLAGS
+WARN_CFLAGS
+MAINT
+MAINTAINER_MODE_FALSE
+MAINTAINER_MODE_TRUE
+GTKHTML_DATA_DIR
+XIPHOS_LIBS
+XIPHOS_CFLAGS
+BONOBO_IDL_INCLUDES
+ORBIT_IDL
+USE_GTKHTML_BONOBO_EDITOR_FALSE
+USE_GTKHTML_BONOBO_EDITOR_TRUE
+HAVE_GECKO_FALSE
+HAVE_GECKO_TRUE
+HAVE_GECKO_XPCOM_GLUE_FALSE
+HAVE_GECKO_XPCOM_GLUE_TRUE
+HAVE_GECKO_HOME_FALSE
+HAVE_GECKO_HOME_TRUE
+HAVE_GECKO_1_9_1_FALSE
+HAVE_GECKO_1_9_1_TRUE
+HAVE_GECKO_1_9_FALSE
+HAVE_GECKO_1_9_TRUE
+HAVE_GECKO_1_8_1_FALSE
+HAVE_GECKO_1_8_1_TRUE
+HAVE_GECKO_1_8_FALSE
+HAVE_GECKO_1_8_TRUE
+HAVE_GECKO_1_7_FALSE
+HAVE_GECKO_1_7_TRUE
+HAVE_GECKO_DEBUG_FALSE
+HAVE_GECKO_DEBUG_TRUE
+HAVE_MOZILLA_TOOLKIT_FALSE
+HAVE_MOZILLA_TOOLKIT_TRUE
+GECKO_GLUE_LIBS
+GECKO_EXTRA_LIBS
+GECKO_PREFIX
+GECKO_INCLUDE_ROOT
+GECKO_FLAVOUR
+GECKO_HOME
+GECKO
+GECKO_COMPONENT_LIBS
+GECKO_COMPONENT_CFLAGS
 xiphos_exec
-tooltiptext_CFLAGS
-tooltiptext_LIBS
-GTKHTML_314_presence_CFLAGS
-GTKHTML_314_presence_LIBS
-GTKHTML_38_presence_CFLAGS
-GTKHTML_38_presence_LIBS
-UPRINT_CFLAGS
-UPRINT_LIBS
-ImageMagick_CFLAGS
-ImageMagick_LIBS
-CC
-CFLAGS
-LDFLAGS
-CPPFLAGS
-ac_ct_CC
-EXEEXT
-OBJEXT
-DEPDIR
-am__include
-am__quote
-AMDEP_TRUE
-AMDEP_FALSE
-AMDEPBACKSLASH
-CCDEPMODE
-am__fastdepCC_TRUE
-am__fastdepCC_FALSE
+DIRS
+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
+PKG_CONFIG
+MKINSTALLDIRS
+POSUB
+POFILES
+PO_IN_DATADIR_FALSE
+PO_IN_DATADIR_TRUE
+INTLLIBS
+INSTOBJEXT
+GMOFILES
+CATOBJEXT
+CATALOGS
+MSGFMT_OPTS
+GETTEXT_PACKAGE
+CXXCPP
 CPP
-GREP
+OTOOL64
+OTOOL
+LIPO
+NMEDIT
+DSYMUTIL
+lt_ECHO
+RANLIB
+AR
+OBJDUMP
+LN_S
+NM
+ac_ct_DUMPBIN
+DUMPBIN
+LD
+FGREP
 EGREP
-INTLTOOL_DESKTOP_RULE
-INTLTOOL_DIRECTORY_RULE
-INTLTOOL_KEYS_RULE
-INTLTOOL_PROP_RULE
-INTLTOOL_OAF_RULE
-INTLTOOL_PONG_RULE
-INTLTOOL_SERVER_RULE
-INTLTOOL_SHEET_RULE
-INTLTOOL_SOUNDLIST_RULE
-INTLTOOL_UI_RULE
-INTLTOOL_XAM_RULE
-INTLTOOL_KBD_RULE
-INTLTOOL_XML_RULE
-INTLTOOL_XML_NOMERGE_RULE
-INTLTOOL_CAVES_RULE
-INTLTOOL_SCHEMAS_RULE
-INTLTOOL_THEME_RULE
+GREP
+SED
+host_os
+host_vendor
+host_cpu
+host
+build_os
+build_vendor
+build_cpu
+build
+LIBTOOL
+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
-INTLTOOL_PERL
-INTLTOOL_ICONV
-INTLTOOL_MSGFMT
-INTLTOOL_MSGMERGE
-INTLTOOL_XGETTEXT
-ALL_LINGUAS
-DATADIRNAME
-build
-build_cpu
-build_vendor
-build_os
-host
-host_cpu
-host_vendor
-host_os
-SED
-LN_S
-ECHO
-AR
-RANLIB
-CXX
-CXXFLAGS
-ac_ct_CXX
-CXXDEPMODE
-am__fastdepCXX_TRUE
-am__fastdepCXX_FALSE
-CXXCPP
-F77
-FFLAGS
-ac_ct_F77
-LIBTOOL
-GNOME_CFLAGS
-GNOME_LIBS
-GETTEXT_PACKAGE
 USE_NLS
-MSGFMT
-MSGFMT_OPTS
-GMSGFMT
-XGETTEXT
-CATALOGS
-CATOBJEXT
-GMOFILES
-INSTOBJEXT
-INTLLIBS
-PO_IN_DATADIR_TRUE
-PO_IN_DATADIR_FALSE
-POFILES
-POSUB
-MKINSTALLDIRS
-GTKHTML_CFLAGS
-GTKHTML_LIBS
-EDITOR_CFLAGS
-EDITOR_LIBS
-USE_GTKHTML_BONOBO_EDITOR_TRUE
-USE_GTKHTML_BONOBO_EDITOR_FALSE
-GTKHTML_DATA_DIR
-GECKO
-GECKO_FLAVOUR
-GECKO_INCLUDE_ROOT
-GECKO_HOME
-GECKO_PREFIX
-GECKO_EXTRA_LIBS
-GECKO_GLUE_LIBS
-GECKO_COMPONENT_CFLAGS
-GECKO_COMPONENT_LIBS
-USE_GTKMOZEMBED_TRUE
-USE_GTKMOZEMBED_FALSE
-HELP_DIR
-OMF_DIR
-DOC_USER_FORMATS
-ENABLE_SK_TRUE
-ENABLE_SK_FALSE
-HAVE_GNOME_DOC_UTILS_TRUE
-HAVE_GNOME_DOC_UTILS_FALSE
-SCROLLKEEPER_CONFIG
-SCROLLKEEPER_BUILD_REQUIRED
-HAVE_STRCASESTR_TRUE
 HAVE_STRCASESTR_FALSE
-HAVE_MOZILLA_TOOLKIT_TRUE
-HAVE_MOZILLA_TOOLKIT_FALSE
-HAVE_GECKO_DEBUG_TRUE
-HAVE_GECKO_DEBUG_FALSE
-HAVE_GECKO_1_7_TRUE
-HAVE_GECKO_1_7_FALSE
-HAVE_GECKO_1_8_TRUE
-HAVE_GECKO_1_8_FALSE
-HAVE_GECKO_1_8_1_TRUE
-HAVE_GECKO_1_8_1_FALSE
-HAVE_GECKO_1_9_TRUE
-HAVE_GECKO_1_9_FALSE
-HAVE_GECKO_HOME_TRUE
-HAVE_GECKO_HOME_FALSE
-HAVE_GECKO_XPCOM_GLUE_TRUE
-HAVE_GECKO_XPCOM_GLUE_FALSE
-WITH_GECKO_ENGINE_TRUE
-WITH_GECKO_ENGINE_FALSE
-HAVE_XULRUNNER_TRUE
-HAVE_XULRUNNER_FALSE
-WITH_XULRUNNER_ENGINE_TRUE
-WITH_XULRUNNER_ENGINE_FALSE
-MAINTAINER_MODE_TRUE
-MAINTAINER_MODE_FALSE
-MAINT
-A_CPPFLAGS
-ORBIT_IDL
-BONOBO_IDL_INCLUDES
-INSTALL_PREFIX
-NO_PREFIX_PACKAGE_DATA_DIR
-PACKAGE_DATA_DIR
-NO_PREFIX_PACKAGE_DOC_DIR
-PACKAGE_DOC_DIR
-NO_PREFIX_PACKAGE_PIXMAPS_DIR
-PACKAGE_PIXMAPS_DIR
-NO_PREFIX_PACKAGE_HELP_DIR
-PACKAGE_HELP_DIR
-NO_PREFIX_PACKAGE_MENU_DIR
-PACKAGE_MENU_DIR
-LIBOBJS
-LTLIBOBJS'
+HAVE_STRCASESTR_TRUE
+am__fastdepCXX_FALSE
+am__fastdepCXX_TRUE
+CXXDEPMODE
+ac_ct_CXX
+CXXFLAGS
+CXX
+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
+ACLOCAL_AMFLAGS
+AM_BACKSLASH
+AM_DEFAULT_VERBOSITY
+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_BUGREPORT
+PACKAGE_STRING
+PACKAGE_VERSION
+PACKAGE_TARNAME
+PACKAGE_NAME
+PATH_SEPARATOR
+SHELL'
 ac_subst_files=''
+ac_user_opts='
+enable_option_checking
+enable_silent_rules
+enable_dependency_tracking
+enable_nls
+enable_shared
+enable_static
+with_pic
+enable_fast_install
+with_gnu_ld
+enable_libtool_lock
+with_help_dir
+with_omf_dir
+with_help_formats
+enable_scrollkeeper
+with_gecko
+with_mozilla
+with_gecko_home
+enable_cpp_rtti
+with_editor
+with_gnome
+enable_maintainer_mode
+enable_compile_warnings
+enable_iso_c
+enable_cxx_warnings
+enable_iso_cxx
+enable_debug
+enable_as_needed
+'
       ac_precious_vars='build_alias
 host_alias
 target_alias
-PKG_CONFIG
-SWORD_CFLAGS
-SWORD_LIBS
-SWORD_MULTIVERSE_CFLAGS
-SWORD_MULTIVERSE_LIBS
-tooltiptext_CFLAGS
-tooltiptext_LIBS
-GTKHTML_314_presence_CFLAGS
-GTKHTML_314_presence_LIBS
-GTKHTML_38_presence_CFLAGS
-GTKHTML_38_presence_LIBS
-UPRINT_CFLAGS
-UPRINT_LIBS
-ImageMagick_CFLAGS
-ImageMagick_LIBS
 CC
 CFLAGS
 LDFLAGS
 LIBS
 CPPFLAGS
-CPP
 CXX
 CXXFLAGS
 CCC
+CPP
 CXXCPP
-F77
-FFLAGS
-GNOME_CFLAGS
-GNOME_LIBS
-GTKHTML_CFLAGS
-GTKHTML_LIBS
-EDITOR_CFLAGS
-EDITOR_LIBS
+PKG_CONFIG
 GECKO_COMPONENT_CFLAGS
-GECKO_COMPONENT_LIBS'
+GECKO_COMPONENT_LIBS
+XIPHOS_CFLAGS
+XIPHOS_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
@@ -1146,13 +1154,21 @@ do
     datarootdir=$ac_optarg ;;
 
   -disable-* | --disable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
    { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-    eval enable_$ac_feature=no ;;
+    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 ;;
@@ -1165,13 +1181,21 @@ do
     dvidir=$ac_optarg ;;
 
   -enable-* | --enable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
    { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-    eval enable_$ac_feature=\$ac_optarg ;;
+    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- \
@@ -1362,22 +1386,38 @@ do
     ac_init_version=: ;;
 
   -with-* | --with-*)
-    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
    { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-    eval with_$ac_package=\$ac_optarg ;;
+    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_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
    { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-    eval with_$ac_package=no ;;
+    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.
@@ -1397,7 +1437,7 @@ do
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
     x_libraries=$ac_optarg ;;
 
-  -*) { echo "$as_me: error: unrecognized option: $ac_option
+  -*) { $as_echo "$as_me: error: unrecognized option: $ac_option
 Try \`$0 --help' for more information." >&2
    { (exit 1); exit 1; }; }
     ;;
@@ -1406,16 +1446,16 @@ Try \`$0 --help' for more information." >&2
     ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
     # Reject names that are not valid shell variable names.
     expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
+      { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
    { (exit 1); exit 1; }; }
     eval $ac_envvar=\$ac_optarg
     export $ac_envvar ;;
 
   *)
     # FIXME: should be removed in autoconf 3.0.
-    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
     : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
     ;;
 
@@ -1424,22 +1464,38 @@ done
 
 if test -n "$ac_prev"; then
   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  { echo "$as_me: error: missing argument to $ac_option" >&2
+  { $as_echo "$as_me: error: missing argument to $ac_option" >&2
    { (exit 1); exit 1; }; }
 fi
 
-# Be sure to have absolute directory names.
+if test -n "$ac_unrecognized_opts"; then
+  case $enable_option_checking in
+    no) ;;
+    fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2
+   { (exit 1); exit 1; }; } ;;
+    *)     $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
-  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+  { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
    { (exit 1); exit 1; }; }
 done
 
@@ -1454,7 +1510,7 @@ target=$target_alias
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
-    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+    $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
@@ -1470,10 +1526,10 @@ 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 .` ||
-  { echo "$as_me: error: Working directory cannot be determined" >&2
+  { $as_echo "$as_me: error: working directory cannot be determined" >&2
    { (exit 1); exit 1; }; }
 test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  { echo "$as_me: error: pwd does not report name of working directory" >&2
+  { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
    { (exit 1); exit 1; }; }
 
 
@@ -1481,12 +1537,12 @@ test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
 if test -z "$srcdir"; then
   ac_srcdir_defaulted=yes
   # Try the directory containing this script, then the parent directory.
-  ac_confdir=`$as_dirname -- "$0" ||
-$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$0" : 'X\(//\)[^/]' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$0" |
+  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
@@ -1513,12 +1569,12 @@ else
 fi
 if test ! -r "$srcdir/$ac_unique_file"; then
   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
+  { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
    { (exit 1); exit 1; }; }
 fi
 ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
 ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
+	cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2
    { (exit 1); exit 1; }; }
 	pwd)`
 # When building in place, set srcdir=.
@@ -1545,7 +1601,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures xiphos 3.1.1 to adapt to many kinds of systems.
+\`configure' configures xiphos 3.1.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1567,9 +1623,9 @@ Configuration:
 
 Installation directories:
   --prefix=PREFIX         install architecture-independent files in PREFIX
-			  [$ac_default_prefix]
+                          [$ac_default_prefix]
   --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-			  [PREFIX]
+                          [PREFIX]
 
 By default, \`make install' will install all the files in
 \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
@@ -1579,25 +1635,25 @@ 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/xiphos]
-  --htmldir=DIR          html documentation [DOCDIR]
-  --dvidir=DIR           dvi documentation [DOCDIR]
-  --pdfdir=DIR           pdf documentation [DOCDIR]
-  --psdir=DIR            ps documentation [DOCDIR]
+  --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/xiphos]
+  --htmldir=DIR           html documentation [DOCDIR]
+  --dvidir=DIR            dvi documentation [DOCDIR]
+  --pdfdir=DIR            pdf documentation [DOCDIR]
+  --psdir=DIR             ps documentation [DOCDIR]
 _ACEOF
 
   cat <<\_ACEOF
@@ -1615,76 +1671,58 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of xiphos 3.1.1:";;
+     short | recursive ) echo "Configuration of xiphos 3.1.2:";;
    esac
   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-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-nls           do not use Native Language Support
   --enable-shared[=PKGS]  build shared libraries [default=yes]
   --enable-static[=PKGS]  build static libraries [default=yes]
   --enable-fast-install[=PKGS]
                           optimize for fast installation [default=yes]
   --disable-libtool-lock  avoid locking (might break parallel builds)
-  --enable-autoclear    use previewer autoclear default=no
-  --enable-treeview_path    use  treeview_path default=no
-  --enable-gtkhtml    use gtkhtml instead of gtkmozembed default=no
-  --enable-cygwin    use cygwin default=no
-  --enable-cpp-rtti       Enable C++ RTTI
   --disable-scrollkeeper  do not make updates to the scrollkeeper database
-  --enable-debug          build debug library default=no
-  --enable-maintainer-mode  enable make rules and dependencies not useful
+  --enable-cpp-rtti       Enable C++ RTTI
+  --disable-maintainer-mode  disable make rules and dependencies not useful
 			  (and sometimes confusing) to the casual installer
-  --enable-delint         use -Wall -Werror default=no
+  --enable-compile-warnings=[no/minimum/yes/maximum/error]
+                          Turn on compiler warnings
+  --enable-iso-c          Try to warn if code is not ISO C
+  --enable-cxx-warnings=[no/minimum/yes]
+                               Turn on compiler warnings.
+
+  --enable-iso-cxx        Try to warn if code is not ISO C++
+  --enable-debug          Enable debugging [default=no]
+  --enable-as-needed      Pass -Wl --as-needed to linker [default=no]
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
   --with-pic              try to use only PIC/non-PIC objects [default=use
                           both]
-  --with-tags[=TAGS]      include additional configurations [automatic]
+  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
+  --with-help-dir=DIR     path to help docs
+  --with-omf-dir=DIR      path to OMF files
+  --with-help-formats=FORMATS
+                          list of formats
   --with-gecko[=mozilla|firefox|seamonkey|xulrunner|libxul-embedding|libxul]
                           Which gecko engine to use (autodetected by default)
 
   --with-gecko-home[=path]
                           Manually set MOZILLA_FIVE_HOME
-  --with-help-dir=DIR     path to help docs
-  --with-omf-dir=DIR      path to OMF files
-  --with-help-formats=FORMATS
-                          list of formats
+  --without-editor        Ignore presence of gtkhtml-editor and use
+                          bonobo-editor instead
+  --with-oldgnome         Compile using libgnome
 
 Some influential environment variables:
-  PKG_CONFIG  path to pkg-config utility
-  SWORD_CFLAGS
-              C compiler flags for SWORD, overriding pkg-config
-  SWORD_LIBS  linker flags for SWORD, overriding pkg-config
-  SWORD_MULTIVERSE_CFLAGS
-              C compiler flags for SWORD_MULTIVERSE, overriding pkg-config
-  SWORD_MULTIVERSE_LIBS
-              linker flags for SWORD_MULTIVERSE, overriding pkg-config
-  tooltiptext_CFLAGS
-              C compiler flags for tooltiptext, overriding pkg-config
-  tooltiptext_LIBS
-              linker flags for tooltiptext, overriding pkg-config
-  GTKHTML_314_presence_CFLAGS
-              C compiler flags for GTKHTML_314_presence, overriding pkg-config
-  GTKHTML_314_presence_LIBS
-              linker flags for GTKHTML_314_presence, overriding pkg-config
-  GTKHTML_38_presence_CFLAGS
-              C compiler flags for GTKHTML_38_presence, overriding pkg-config
-  GTKHTML_38_presence_LIBS
-              linker flags for GTKHTML_38_presence, overriding pkg-config
-  UPRINT_CFLAGS
-              C compiler flags for UPRINT, overriding pkg-config
-  UPRINT_LIBS linker flags for UPRINT, overriding pkg-config
-  ImageMagick_CFLAGS
-              C compiler flags for ImageMagick, overriding pkg-config
-  ImageMagick_LIBS
-              linker flags for ImageMagick, overriding pkg-config
   CC          C compiler command
   CFLAGS      C compiler flags
   LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
@@ -1692,26 +1730,18 @@ Some influential environment variables:
   LIBS        libraries to pass to the linker, e.g. -l<library>
   CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
               you have headers in a nonstandard directory <include dir>
-  CPP         C preprocessor
   CXX         C++ compiler command
   CXXFLAGS    C++ compiler flags
+  CPP         C preprocessor
   CXXCPP      C++ preprocessor
-  F77         Fortran 77 compiler command
-  FFLAGS      Fortran 77 compiler flags
-  GNOME_CFLAGS
-              C compiler flags for GNOME, overriding pkg-config
-  GNOME_LIBS  linker flags for GNOME, overriding pkg-config
-  GTKHTML_CFLAGS
-              C compiler flags for GTKHTML, overriding pkg-config
-  GTKHTML_LIBS
-              linker flags for GTKHTML, overriding pkg-config
-  EDITOR_CFLAGS
-              C compiler flags for EDITOR, overriding pkg-config
-  EDITOR_LIBS linker flags for EDITOR, overriding pkg-config
+  PKG_CONFIG  path to pkg-config utility
   GECKO_COMPONENT_CFLAGS
               C compiler flags for GECKO_COMPONENT, overriding pkg-config
   GECKO_COMPONENT_LIBS
               linker flags for GECKO_COMPONENT, overriding pkg-config
+  XIPHOS_CFLAGS
+              C compiler flags for XIPHOS, overriding pkg-config
+  XIPHOS_LIBS linker flags for XIPHOS, 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.
@@ -1724,15 +1754,17 @@ 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" || 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=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+  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/ ;;
@@ -1768,7 +1800,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
       echo &&
       $SHELL "$ac_srcdir/configure" --help=recursive
     else
-      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
     fi || ac_status=$?
     cd "$ac_pwd" || { ac_status=$?; break; }
   done
@@ -1777,11 +1809,11 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-xiphos configure 3.1.1
-generated by GNU Autoconf 2.61
+xiphos configure 3.1.2
+generated by GNU Autoconf 2.63
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -1791,8 +1823,8 @@ 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 xiphos $as_me 3.1.1, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
+It was created by xiphos $as_me 3.1.2, which was
+generated by GNU Autoconf 2.63.  Invocation command line was
 
   $ $0 $@
 
@@ -1828,7 +1860,7 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  echo "PATH: $as_dir"
+  $as_echo "PATH: $as_dir"
 done
 IFS=$as_save_IFS
 
@@ -1863,7 +1895,7 @@ do
     | -silent | --silent | --silen | --sile | --sil)
       continue ;;
     *\'*)
-      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     case $ac_pass in
     1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
@@ -1915,11 +1947,12 @@ _ASBOX
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+      *_cv_*) { $as_echo "$as_me:$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= ;; #(
       *) $as_unset $ac_var ;;
       esac ;;
     esac
@@ -1949,9 +1982,9 @@ _ASBOX
     do
       eval ac_val=\$$ac_var
       case $ac_val in
-      *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
       esac
-      echo "$ac_var='\''$ac_val'\''"
+      $as_echo "$ac_var='\''$ac_val'\''"
     done | sort
     echo
 
@@ -1966,9 +1999,9 @@ _ASBOX
       do
 	eval ac_val=\$$ac_var
 	case $ac_val in
-	*\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
 	esac
-	echo "$ac_var='\''$ac_val'\''"
+	$as_echo "$ac_var='\''$ac_val'\''"
       done | sort
       echo
     fi
@@ -1984,8 +2017,8 @@ _ASBOX
       echo
     fi
     test "$ac_signal" != 0 &&
-      echo "$as_me: caught signal $ac_signal"
-    echo "$as_me: exit $exit_status"
+      $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 &&
@@ -2027,21 +2060,24 @@ _ACEOF
 
 
 # Let the site file select an alternate cache file if it wants to.
-# Prefer explicitly selected file to automatically selected ones.
+# Prefer an explicitly selected file to automatically selected ones.
+ac_site_file1=NONE
+ac_site_file2=NONE
 if test -n "$CONFIG_SITE"; then
-  set x "$CONFIG_SITE"
+  ac_site_file1=$CONFIG_SITE
 elif test "x$prefix" != xNONE; then
-  set x "$prefix/share/config.site" "$prefix/etc/config.site"
+  ac_site_file1=$prefix/share/config.site
+  ac_site_file2=$prefix/etc/config.site
 else
-  set x "$ac_default_prefix/share/config.site" \
-	"$ac_default_prefix/etc/config.site"
+  ac_site_file1=$ac_default_prefix/share/config.site
+  ac_site_file2=$ac_default_prefix/etc/config.site
 fi
-shift
-for ac_site_file
+for ac_site_file in "$ac_site_file1" "$ac_site_file2"
 do
+  test "x$ac_site_file" = xNONE && continue
   if test -r "$ac_site_file"; then
-    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-echo "$as_me: loading site script $ac_site_file" >&6;}
+    { $as_echo "$as_me:$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
@@ -2051,16 +2087,16 @@ if test -r "$cache_file"; then
   # Some versions of bash will fail to source /dev/null (special
   # files actually), so we avoid doing that.
   if test -f "$cache_file"; then
-    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
-echo "$as_me: loading cache $cache_file" >&6;}
+    { $as_echo "$as_me:$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
-  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
-echo "$as_me: creating cache $cache_file" >&6;}
+  { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
+$as_echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
 
@@ -2074,29 +2110,38 @@ for ac_var in $ac_precious_vars; do
   eval ac_new_val=\$ac_env_${ac_var}_value
   case $ac_old_set,$ac_new_set in
     set,)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+      { $as_echo "$as_me:$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)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+      { $as_echo "$as_me:$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
-	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
-echo "$as_me:   former value:  $ac_old_val" >&2;}
-	{ echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
-echo "$as_me:   current value: $ac_new_val" >&2;}
-	ac_cache_corrupted=:
+	# 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:$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:$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:$LINENO:   former value:  \`$ac_old_val'" >&5
+$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
+	{ $as_echo "$as_me:$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=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) 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
@@ -2106,10 +2151,12 @@ echo "$as_me:   current value: $ac_new_val" >&2;}
   fi
 done
 if $ac_cache_corrupted; then
-  { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
-echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
+  { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+  { $as_echo "$as_me:$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_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -2146,7 +2193,12 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-am__api_version='1.10'
+
+
+ac_config_headers="$ac_config_headers config.h"
+
+
+am__api_version='1.11'
 
 ac_aux_dir=
 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
@@ -2165,8 +2217,8 @@ for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
-echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
+$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -2192,11 +2244,12 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 # 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.
-{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
+# Reject install programs that cannot install multiple files.
+{ $as_echo "$as_me:$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
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
@@ -2225,17 +2278,29 @@ case $as_dir/ in
 	    # program-specific install script used by HP pwplus--don't use.
 	    :
 	  else
-	    ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-	    break 3
+	    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
@@ -2248,8 +2313,8 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
-{ echo "$as_me:$LINENO: result: $INSTALL" >&5
-echo "${ECHO_T}$INSTALL" >&6; }
+{ $as_echo "$as_me:$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.
@@ -2259,21 +2324,38 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
-{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5
-echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$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_echo "$as_me:$LINENO: error: unsafe absolute working directory name" >&5
+$as_echo "$as_me: error: unsafe absolute working directory name" >&2;}
+   { (exit 1); exit 1; }; };;
+esac
+case $srcdir in
+  *[\\\"\#\$\&\'\`$am_lf\ \	]*)
+    { { $as_echo "$as_me:$LINENO: error: unsafe srcdir value: \`$srcdir'" >&5
+$as_echo "$as_me: error: unsafe srcdir value: \`$srcdir'" >&2;}
+   { (exit 1); exit 1; }; };;
+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`
+   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`
+      set X `ls -t "$srcdir/configure" conftest.file`
    fi
    rm -f conftest.file
    if test "$*" != "X $srcdir/configure conftest.file" \
@@ -2283,9 +2365,9 @@ if (
       # 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".
-      { { echo "$as_me:$LINENO: error: ls -t appears to fail.  Make sure there is not a broken
+      { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail.  Make sure there is not a broken
 alias in your environment" >&5
-echo "$as_me: error: ls -t appears to fail.  Make sure there is not a broken
+$as_echo "$as_me: error: ls -t appears to fail.  Make sure there is not a broken
 alias in your environment" >&2;}
    { (exit 1); exit 1; }; }
    fi
@@ -2296,45 +2378,158 @@ then
    # Ok.
    :
 else
-   { { echo "$as_me:$LINENO: error: newly created file is older than distributed files!
+   { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files!
 Check your system clock" >&5
-echo "$as_me: error: newly created file is older than distributed files!
+$as_echo "$as_me: error: newly created file is older than distributed files!
 Check your system clock" >&2;}
    { (exit 1); exit 1; }; }
 fi
-{ echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+{ $as_echo "$as_me:$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 $.  echo might interpret backslashes.
+# Double any \ or $.
 # By default was `s,x,x', remove it if useless.
-cat <<\_ACEOF >conftest.sed
-s/[\\$]/&&/g;s/;s,x,x,$//
-_ACEOF
-program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
-rm -f conftest.sed
+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`
 
-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
+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=
-  { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
-echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
+  { $as_echo "$as_me:$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:$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:$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:$LINENO: result: $STRIP" >&5
+$as_echo "$STRIP" >&6; }
+else
+  { $as_echo "$as_me:$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:$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:$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:$LINENO: result: $ac_ct_STRIP" >&5
+$as_echo "$ac_ct_STRIP" >&6; }
+else
+  { $as_echo "$as_me:$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:$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"
 
-{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
-echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$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
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
@@ -2369,8 +2564,8 @@ fi
     MKDIR_P="$ac_install_sh -d"
   fi
 fi
-{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5
-echo "${ECHO_T}$MKDIR_P" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5
+$as_echo "$MKDIR_P" >&6; }
 
 mkdir_p="$MKDIR_P"
 case $mkdir_p in
@@ -2382,10 +2577,10 @@ 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
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_AWK+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$AWK"; then
   ac_cv_prog_AWK="$AWK" # Let the user override the test.
@@ -2398,7 +2593,7 @@ do
   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"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2409,22 +2604,23 @@ fi
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  { echo "$as_me:$LINENO: result: $AWK" >&5
-echo "${ECHO_T}$AWK" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $AWK" >&5
+$as_echo "$AWK" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
   test -n "$AWK" && break
 done
 
-{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
-set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+{ $as_echo "$as_me:$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
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.make <<\_ACEOF
 SHELL = /bin/sh
@@ -2441,12 +2637,12 @@ esac
 rm -f conftest.make
 fi
 if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
   SET_MAKE=
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
   SET_MAKE="MAKE=${MAKE-make}"
 fi
 
@@ -2465,8 +2661,8 @@ if test "`cd $srcdir && pwd`" != "`pwd`"; then
   am__isrc=' -I$(srcdir)'
   # test to see if srcdir already configured
   if test -f $srcdir/config.status; then
-    { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
-echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
+    { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
+$as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
    { (exit 1); exit 1; }; }
   fi
 fi
@@ -2482,8 +2678,8 @@ fi
 
 
 # Define the identity of the package.
- PACKAGE=xiphos
- VERSION=3.1.1
+ PACKAGE='xiphos'
+ VERSION='3.1.2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2511,112 +2707,6 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
 
 MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
 
-install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
-
-# 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
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_STRIP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&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"
-    echo "$as_me:$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
-  { echo "$as_me:$LINENO: result: $STRIP" >&5
-echo "${ECHO_T}$STRIP" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}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
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&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"
-    echo "$as_me:$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
-  { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-echo "${ECHO_T}$ac_ct_STRIP" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-  if test "x$ac_ct_STRIP" = x; then
-    STRIP=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&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"
-
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
 # Always define AMTAR for backward compatibility.
@@ -2629,762 +2719,19 @@ am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
 
 
 
-
-
-ac_config_headers="$ac_config_headers config.h"
-
-
-{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
-set x ${MAKE-make}; ac_make=`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
-  echo $ECHO_N "(cached) $ECHO_C" >&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
+# Check whether --enable-silent-rules was given.
+if test "${enable_silent_rules+set}" = set; then
+  enableval=$enable_silent_rules;
 fi
-if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-  SET_MAKE=
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-  SET_MAKE="MAKE=${MAKE-make}"
-fi
-
 
-
-
-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
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&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"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-  ;;
+case $enable_silent_rules in
+yes) AM_DEFAULT_VERBOSITY=0;;
+no)  AM_DEFAULT_VERBOSITY=1;;
+*)   AM_DEFAULT_VERBOSITY=1;;
 esac
-fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-if test -n "$PKG_CONFIG"; then
-  { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}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
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&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"
-    echo "$as_me:$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
-  { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
-echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-  if test "x$ac_pt_PKG_CONFIG" = x; then
-    PKG_CONFIG=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&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
-	{ echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
-echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; }
-	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-		{ echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-	else
-		{ echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-		PKG_CONFIG=""
-	fi
-
-fi
-
-pkg_failed=no
-{ echo "$as_me:$LINENO: checking for SWORD" >&5
-echo $ECHO_N "checking for SWORD... $ECHO_C" >&6; }
-
-if test -n "$PKG_CONFIG"; then
-    if test -n "$SWORD_CFLAGS"; then
-        pkg_cv_SWORD_CFLAGS="$SWORD_CFLAGS"
-    else
-        if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"sword >= 1.5.11\"") >&5
-  ($PKG_CONFIG --exists --print-errors "sword >= 1.5.11") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  pkg_cv_SWORD_CFLAGS=`$PKG_CONFIG --cflags "sword >= 1.5.11" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
-    fi
-else
-	pkg_failed=untried
-fi
-if test -n "$PKG_CONFIG"; then
-    if test -n "$SWORD_LIBS"; then
-        pkg_cv_SWORD_LIBS="$SWORD_LIBS"
-    else
-        if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"sword >= 1.5.11\"") >&5
-  ($PKG_CONFIG --exists --print-errors "sword >= 1.5.11") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  pkg_cv_SWORD_LIBS=`$PKG_CONFIG --libs "sword >= 1.5.11" 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
-	        SWORD_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "sword >= 1.5.11"`
-        else
-	        SWORD_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "sword >= 1.5.11"`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$SWORD_PKG_ERRORS" >&5
-
-	{ echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-                echo error: either no sword or sword not recent enough && exit 1
-elif test $pkg_failed = untried; then
-	echo error: either no sword or sword not recent enough && exit 1
-else
-	SWORD_CFLAGS=$pkg_cv_SWORD_CFLAGS
-	SWORD_LIBS=$pkg_cv_SWORD_LIBS
-        { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-	:
-fi
-
-pkg_failed=no
-{ echo "$as_me:$LINENO: checking for SWORD_MULTIVERSE" >&5
-echo $ECHO_N "checking for SWORD_MULTIVERSE... $ECHO_C" >&6; }
-
-if test -n "$PKG_CONFIG"; then
-    if test -n "$SWORD_MULTIVERSE_CFLAGS"; then
-        pkg_cv_SWORD_MULTIVERSE_CFLAGS="$SWORD_MULTIVERSE_CFLAGS"
-    else
-        if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"sword > 1.5.11\"") >&5
-  ($PKG_CONFIG --exists --print-errors "sword > 1.5.11") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  pkg_cv_SWORD_MULTIVERSE_CFLAGS=`$PKG_CONFIG --cflags "sword > 1.5.11" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
-    fi
-else
-	pkg_failed=untried
-fi
-if test -n "$PKG_CONFIG"; then
-    if test -n "$SWORD_MULTIVERSE_LIBS"; then
-        pkg_cv_SWORD_MULTIVERSE_LIBS="$SWORD_MULTIVERSE_LIBS"
-    else
-        if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"sword > 1.5.11\"") >&5
-  ($PKG_CONFIG --exists --print-errors "sword > 1.5.11") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  pkg_cv_SWORD_MULTIVERSE_LIBS=`$PKG_CONFIG --libs "sword > 1.5.11" 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
-	        SWORD_MULTIVERSE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "sword > 1.5.11"`
-        else
-	        SWORD_MULTIVERSE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "sword > 1.5.11"`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$SWORD_MULTIVERSE_PKG_ERRORS" >&5
-
-	{ echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-                have_sword_multiverse=no
-elif test $pkg_failed = untried; then
-	have_sword_multiverse=no
-else
-	SWORD_MULTIVERSE_CFLAGS=$pkg_cv_SWORD_MULTIVERSE_CFLAGS
-	SWORD_MULTIVERSE_LIBS=$pkg_cv_SWORD_MULTIVERSE_LIBS
-        { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-	have_sword_multiverse=yes
-fi
-if test "x$have_sword_multiverse" = xyes; then
-	export SWORD_CFLAGS="$SWORD_CFLAGS -DSWORD_MULTIVERSE"
-fi
-
-
-
-DIRS="backend gecko editor main gnome2"
-
-xiphos_exec="xiphos"
-
-
-
-pkg_failed=no
-{ echo "$as_me:$LINENO: checking for tooltiptext" >&5
-echo $ECHO_N "checking for tooltiptext... $ECHO_C" >&6; }
-
-if test -n "$PKG_CONFIG"; then
-    if test -n "$tooltiptext_CFLAGS"; then
-        pkg_cv_tooltiptext_CFLAGS="$tooltiptext_CFLAGS"
-    else
-        if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.12\"") >&5
-  ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.12") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  pkg_cv_tooltiptext_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 2.12" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
-    fi
-else
-	pkg_failed=untried
-fi
-if test -n "$PKG_CONFIG"; then
-    if test -n "$tooltiptext_LIBS"; then
-        pkg_cv_tooltiptext_LIBS="$tooltiptext_LIBS"
-    else
-        if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.12\"") >&5
-  ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.12") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  pkg_cv_tooltiptext_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 2.12" 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
-	        tooltiptext_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk+-2.0 >= 2.12"`
-        else
-	        tooltiptext_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0 >= 2.12"`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$tooltiptext_PKG_ERRORS" >&5
-
-	{ echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-                have_new_gtk2=no
-elif test $pkg_failed = untried; then
-	have_new_gtk2=no
-else
-	tooltiptext_CFLAGS=$pkg_cv_tooltiptext_CFLAGS
-	tooltiptext_LIBS=$pkg_cv_tooltiptext_LIBS
-        { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-	have_new_gtk2=yes
-fi
-if test "x$have_new_gtk2" = xyes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_WIDGET_TOOLTIP_TEXT 1
-_ACEOF
-
-fi
-
-
-
-pkg_failed=no
-{ echo "$as_me:$LINENO: checking for GTKHTML_314_presence" >&5
-echo $ECHO_N "checking for GTKHTML_314_presence... $ECHO_C" >&6; }
-
-if test -n "$PKG_CONFIG"; then
-    if test -n "$GTKHTML_314_presence_CFLAGS"; then
-        pkg_cv_GTKHTML_314_presence_CFLAGS="$GTKHTML_314_presence_CFLAGS"
-    else
-        if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.14\"") >&5
-  ($PKG_CONFIG --exists --print-errors "libgtkhtml-3.14") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  pkg_cv_GTKHTML_314_presence_CFLAGS=`$PKG_CONFIG --cflags "libgtkhtml-3.14" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
-    fi
-else
-	pkg_failed=untried
-fi
-if test -n "$PKG_CONFIG"; then
-    if test -n "$GTKHTML_314_presence_LIBS"; then
-        pkg_cv_GTKHTML_314_presence_LIBS="$GTKHTML_314_presence_LIBS"
-    else
-        if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.14\"") >&5
-  ($PKG_CONFIG --exists --print-errors "libgtkhtml-3.14") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  pkg_cv_GTKHTML_314_presence_LIBS=`$PKG_CONFIG --libs "libgtkhtml-3.14" 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
-	        GTKHTML_314_presence_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libgtkhtml-3.14"`
-        else
-	        GTKHTML_314_presence_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgtkhtml-3.14"`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$GTKHTML_314_presence_PKG_ERRORS" >&5
-
-	{ echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-                have_314=no
-elif test $pkg_failed = untried; then
-	have_314=no
-else
-	GTKHTML_314_presence_CFLAGS=$pkg_cv_GTKHTML_314_presence_CFLAGS
-	GTKHTML_314_presence_LIBS=$pkg_cv_GTKHTML_314_presence_LIBS
-        { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-	have_314=yes
-fi
-
-pkg_failed=no
-{ echo "$as_me:$LINENO: checking for GTKHTML_38_presence" >&5
-echo $ECHO_N "checking for GTKHTML_38_presence... $ECHO_C" >&6; }
-
-if test -n "$PKG_CONFIG"; then
-    if test -n "$GTKHTML_38_presence_CFLAGS"; then
-        pkg_cv_GTKHTML_38_presence_CFLAGS="$GTKHTML_38_presence_CFLAGS"
-    else
-        if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.8\"") >&5
-  ($PKG_CONFIG --exists --print-errors "libgtkhtml-3.8") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  pkg_cv_GTKHTML_38_presence_CFLAGS=`$PKG_CONFIG --cflags "libgtkhtml-3.8" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
-    fi
-else
-	pkg_failed=untried
-fi
-if test -n "$PKG_CONFIG"; then
-    if test -n "$GTKHTML_38_presence_LIBS"; then
-        pkg_cv_GTKHTML_38_presence_LIBS="$GTKHTML_38_presence_LIBS"
-    else
-        if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.8\"") >&5
-  ($PKG_CONFIG --exists --print-errors "libgtkhtml-3.8") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  pkg_cv_GTKHTML_38_presence_LIBS=`$PKG_CONFIG --libs "libgtkhtml-3.8" 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
-	        GTKHTML_38_presence_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libgtkhtml-3.8"`
-        else
-	        GTKHTML_38_presence_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgtkhtml-3.8"`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$GTKHTML_38_presence_PKG_ERRORS" >&5
-
-	{ echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-                have_38=no
-elif test $pkg_failed = untried; then
-	have_38=no
-else
-	GTKHTML_38_presence_CFLAGS=$pkg_cv_GTKHTML_38_presence_CFLAGS
-	GTKHTML_38_presence_LIBS=$pkg_cv_GTKHTML_38_presence_LIBS
-        { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-	have_38=yes
-fi
-if test "x$have_314" = xno -a "x$have_38" = xno; then
-	echo error: no gtkhtml3 development library is available.
-	exit 1
-else
-	echo gtkhtml3 development library presence...confirmed
-fi
-
-UPRINT_LIBS=""
-UPRINT_CFLAGS=""
-
-pkg_failed=no
-{ echo "$as_me:$LINENO: checking for UPRINT" >&5
-echo $ECHO_N "checking for UPRINT... $ECHO_C" >&6; }
-
-if test -n "$PKG_CONFIG"; then
-    if test -n "$UPRINT_CFLAGS"; then
-        pkg_cv_UPRINT_CFLAGS="$UPRINT_CFLAGS"
-    else
-        if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-unix-print-2.0\"") >&5
-  ($PKG_CONFIG --exists --print-errors "gtk+-unix-print-2.0") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  pkg_cv_UPRINT_CFLAGS=`$PKG_CONFIG --cflags "gtk+-unix-print-2.0" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
-    fi
-else
-	pkg_failed=untried
-fi
-if test -n "$PKG_CONFIG"; then
-    if test -n "$UPRINT_LIBS"; then
-        pkg_cv_UPRINT_LIBS="$UPRINT_LIBS"
-    else
-        if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-unix-print-2.0\"") >&5
-  ($PKG_CONFIG --exists --print-errors "gtk+-unix-print-2.0") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  pkg_cv_UPRINT_LIBS=`$PKG_CONFIG --libs "gtk+-unix-print-2.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
-	        UPRINT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk+-unix-print-2.0"`
-        else
-	        UPRINT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-unix-print-2.0"`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$UPRINT_PKG_ERRORS" >&5
-
-	{ echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-                have_gtkuprint=no
-elif test $pkg_failed = untried; then
-	have_gtkuprint=no
-else
-	UPRINT_CFLAGS=$pkg_cv_UPRINT_CFLAGS
-	UPRINT_LIBS=$pkg_cv_UPRINT_LIBS
-        { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-	have_gtkuprint=yes
-fi
-if test "x$have_gtkuprint" = xyes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define USE_GTKUPRINT 1
-_ACEOF
-
-fi
-
-
-
-
-
-pkg_failed=no
-{ echo "$as_me:$LINENO: checking for ImageMagick" >&5
-echo $ECHO_N "checking for ImageMagick... $ECHO_C" >&6; }
-
-if test -n "$PKG_CONFIG"; then
-    if test -n "$ImageMagick_CFLAGS"; then
-        pkg_cv_ImageMagick_CFLAGS="$ImageMagick_CFLAGS"
-    else
-        if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"ImageMagick++ >= 6.0.0\"") >&5
-  ($PKG_CONFIG --exists --print-errors "ImageMagick++ >= 6.0.0") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  pkg_cv_ImageMagick_CFLAGS=`$PKG_CONFIG --cflags "ImageMagick++ >= 6.0.0" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
-    fi
-else
-	pkg_failed=untried
-fi
-if test -n "$PKG_CONFIG"; then
-    if test -n "$ImageMagick_LIBS"; then
-        pkg_cv_ImageMagick_LIBS="$ImageMagick_LIBS"
-    else
-        if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"ImageMagick++ >= 6.0.0\"") >&5
-  ($PKG_CONFIG --exists --print-errors "ImageMagick++ >= 6.0.0") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  pkg_cv_ImageMagick_LIBS=`$PKG_CONFIG --libs "ImageMagick++ >= 6.0.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
-	        ImageMagick_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "ImageMagick++ >= 6.0.0"`
-        else
-	        ImageMagick_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "ImageMagick++ >= 6.0.0"`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$ImageMagick_PKG_ERRORS" >&5
-
-	{ echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-                echo error: either no ImageMagick++ or ImageMagick++ not recent enough && exit 1
-elif test $pkg_failed = untried; then
-	echo error: either no ImageMagick++ or ImageMagick++ not recent enough && exit 1
-else
-	ImageMagick_CFLAGS=$pkg_cv_ImageMagick_CFLAGS
-	ImageMagick_LIBS=$pkg_cv_ImageMagick_LIBS
-        { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-	:
-fi
-
-
-
-DEPDIR="${am__leading_dot}deps"
-
-ac_config_commands="$ac_config_commands depfiles"
-
-
-am_make=${MAKE-make}
-cat > confinc << 'END'
-am__doit:
-	@echo done
-.PHONY: am__doit
-END
-# If we don't find an include directive, just comment out the code.
-{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
-echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; }
-am__include="#"
-am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# We grep out `Entering directory' and `Leaving directory'
-# messages which can occur if `w' ends up in MAKEFLAGS.
-# In particular we don't look at `^make:' because GNU make might
-# be invoked under some other name (usually "gmake"), in which
-# case it prints its new name instead of `make'.
-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
-   am__include=include
-   am__quote=
-   _am_result=GNU
-fi
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
-   echo '.include "confinc"' > confmf
-   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
-      am__include=.include
-      am__quote="\""
-      _am_result=BSD
-   fi
-fi
-
-
-{ echo "$as_me:$LINENO: result: $_am_result" >&5
-echo "${ECHO_T}$_am_result" >&6; }
-rm -f confinc confmf
+AM_BACKSLASH='\'
 
-# 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
+ACLOCAL_AMFLAGS="-I $ac_macro_dir \$(ACLOCAL_FLAGS)"
 
 
 ac_ext=c
@@ -3395,10 +2742,10 @@ 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
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -3411,7 +2758,7 @@ do
   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"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3422,11 +2769,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -3435,10 +2782,10 @@ 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
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$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
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $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.
@@ -3451,7 +2798,7 @@ do
   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"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3462,11 +2809,11 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_CC" = x; then
@@ -3474,12 +2821,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+{ $as_echo "$as_me:$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
@@ -3492,10 +2835,10 @@ 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
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -3508,7 +2851,7 @@ do
   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"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3519,11 +2862,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -3532,10 +2875,10 @@ 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
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -3553,7 +2896,7 @@ do
        continue
      fi
     ac_cv_prog_CC="cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3576,11 +2919,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -3591,10 +2934,10 @@ if test -z "$CC"; then
   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
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -3607,7 +2950,7 @@ do
   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"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3618,11 +2961,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -3635,10 +2978,10 @@ if test -z "$CC"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$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
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $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.
@@ -3651,7 +2994,7 @@ do
   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"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3662,11 +3005,11 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -3678,12 +3021,8 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+{ $as_echo "$as_me:$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
@@ -3693,44 +3032,50 @@ fi
 fi
 
 
-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
 See \`config.log' for more details." >&5
-echo "$as_me: error: no acceptable C compiler found in \$PATH
+$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+   { (exit 1); exit 1; }; }; }
 
 # Provide some information about the compiler.
-echo "$as_me:$LINENO: checking for C compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
+$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
 { (ac_try="$ac_compiler --version >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler --version >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 { (ac_try="$ac_compiler -v >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler -v >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 { (ac_try="$ac_compiler -V >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler -V >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 
 cat >conftest.$ac_ext <<_ACEOF
@@ -3749,27 +3094,22 @@ main ()
 }
 _ACEOF
 ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.exe b.out"
+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.
-{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
-ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-#
-# List of possible output files, starting from the most likely.
-# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
-# only as a last resort.  b.out is created by i960 compilers.
-ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
-#
-# The IRIX 6 linker writes into existing files which may not be
-# executable, retaining their permissions.  Remove them first so a
-# subsequent execution test works.
+{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
+$as_echo_n "checking for C compiler default output file name... " >&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 | *.o | *.obj ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
     * ) ac_rmfiles="$ac_rmfiles $ac_file";;
   esac
 done
@@ -3780,10 +3120,11 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link_default") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; 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'
@@ -3794,7 +3135,7 @@ 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 | *.o | *.obj )
+    *.$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
@@ -3821,25 +3162,27 @@ else
   ac_file=''
 fi
 
-{ echo "$as_me:$LINENO: result: $ac_file" >&5
-echo "${ECHO_T}$ac_file" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
+$as_echo "$ac_file" >&6; }
 if test -z "$ac_file"; then
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
+{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
 See \`config.log' for more details." >&5
-echo "$as_me: error: C compiler cannot create executables
+$as_echo "$as_me: error: C compiler cannot create executables
 See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
+   { (exit 77); exit 77; }; }; }
 fi
 
 ac_exeext=$ac_cv_exeext
 
 # Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5
+$as_echo_n "checking whether the C compiler works... " >&6; }
 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
 # If not cross compiling, check that we can run a simple program.
 if test "$cross_compiling" != yes; then
@@ -3848,49 +3191,53 @@ if test "$cross_compiling" != yes; then
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
     else
-	{ { echo "$as_me:$LINENO: error: cannot run C compiled programs.
+	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run C compiled programs.
+$as_echo "$as_me: error: cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+   { (exit 1); exit 1; }; }; }
     fi
   fi
 fi
-{ echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+{ $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 
-rm -f a.out a.exe conftest$ac_cv_exeext b.out
+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
 ac_clean_files=$ac_clean_files_save
 # Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
-{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
-echo "${ECHO_T}$cross_compiling" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
+$as_echo_n "checking whether we are cross compiling... " >&6; }
+{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
+$as_echo "$cross_compiling" >&6; }
 
-{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   # If both `conftest.exe' and `conftest' are `present' (well, observable)
 # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
@@ -3899,31 +3246,33 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 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 | *.o | *.obj ) ;;
+    *.$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
-  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
+  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
+$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+   { (exit 1); exit 1; }; }; }
 fi
 
 rm -f conftest$ac_cv_exeext
-{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-echo "${ECHO_T}$ac_cv_exeext" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
+$as_echo "$ac_cv_exeext" >&6; }
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
 ac_exeext=$EXEEXT
-{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$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
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -3946,40 +3295,43 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; 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 ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
     *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
        break;;
   esac
 done
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
+{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of object files: cannot compile
+$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+   { (exit 1); exit 1; }; }; }
 fi
 
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-echo "${ECHO_T}$ac_cv_objext" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
+$as_echo "$ac_cv_objext" >&6; }
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$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
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -4005,20 +3357,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_compiler_gnu=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_compiler_gnu=no
@@ -4028,15 +3381,19 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
-GCC=`test $ac_compiler_gnu = yes && echo yes`
+{ $as_echo "$as_me:$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
-{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$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
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_save_c_werror_flag=$ac_c_werror_flag
    ac_c_werror_flag=yes
@@ -4063,20 +3420,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_g=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	CFLAGS=""
@@ -4101,20 +3459,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_c_werror_flag=$ac_save_c_werror_flag
@@ -4140,20 +3499,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_g=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -4168,8 +3528,8 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    ac_c_werror_flag=$ac_save_c_werror_flag
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
+{ $as_echo "$as_me:$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
@@ -4185,10 +3545,10 @@ else
     CFLAGS=
   fi
 fi
-{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
-echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$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
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_cv_prog_cc_c89=no
 ac_save_CC=$CC
@@ -4259,20 +3619,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_c89=$ac_arg
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -4288,15 +3649,15 @@ fi
 # AC_CACHE_VAL
 case "x$ac_cv_prog_cc_c89" in
   x)
-    { echo "$as_me:$LINENO: result: none needed" >&5
-echo "${ECHO_T}none needed" >&6; } ;;
+    { $as_echo "$as_me:$LINENO: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
   xno)
-    { echo "$as_me:$LINENO: result: unsupported" >&5
-echo "${ECHO_T}unsupported" >&6; } ;;
+    { $as_echo "$as_me:$LINENO: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
   *)
     CC="$CC $ac_cv_prog_cc_c89"
-    { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
+    { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
 esac
 
 
@@ -4305,13 +3666,75 @@ 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
+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:$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:$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
+
+
 
 depcc="$CC"   am_compiler_list=
 
-{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$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
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $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
@@ -4336,6 +3759,11 @@ else
   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
@@ -4353,7 +3781,17 @@ else
     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
@@ -4363,19 +3801,23 @@ 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
-    # 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.
     if depmode=$depmode \
-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
+       source=sub/conftest.c object=$am__obj \
        depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+       $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 sub/conftest.${OBJEXT-o} 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
@@ -4399,8 +3841,8 @@ else
 fi
 
 fi
-{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
-echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
+{ $as_echo "$as_me:$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
@@ -4414,404 +3856,291 @@ else
 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
-{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
-  CPP=
+if test "x$CC" != xcc; then
+  { $as_echo "$as_me:$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:$LINENO: checking whether cc understands -c and -o together" >&5
+$as_echo_n "checking whether cc understands -c and -o together... " >&6; }
 fi
-if test -z "$CPP"; then
-  if test "${ac_cv_prog_CPP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+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
-      # 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 >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
+# 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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # 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 >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+   test -f conftest2.$ac_objext && { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  # Broken: success on invalid input.
-continue
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # 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
-{ echo "$as_me:$LINENO: result: $CPP" >&5
-echo "${ECHO_T}$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 >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); };
+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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # 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 >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; 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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  # Broken: success on invalid input.
-continue
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 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:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); };
+      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
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+  eval ac_cv_prog_cc_${ac_cc}_c_o=no
+fi
+rm -f core conftest*
 
-  # Passes both tests.
-ac_preproc_ok=:
-break
 fi
+if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 
-rm -f conftest.err conftest.$ac_ext
+cat >>confdefs.h <<\_ACEOF
+#define NO_MINUS_C_MINUS_O 1
+_ACEOF
 
-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
-  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&5
-echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
 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
+# FIXME: we rely on the cache variable name because
+# there is no other way.
+set dummy $CC
+am_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
+eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
+if test "$am_t" != yes; then
+   # Losing compiler, so override with the script.
+   # FIXME: It is wrong to rewrite CC.
+   # But if we don't then we get into trouble of one sort or another.
+   # A longer-term fix would be to have automake use am__CC in this case,
+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+   CC="$am_aux_dir/compile $CC"
+fi
 
 
-{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
-echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
-if test "${ac_cv_path_GREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+if test -z "$CXX"; then
+  if test -n "$CCC"; then
+    CXX=$CCC
+  else
+    if test -n "$ac_tool_prefix"; then
+  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
+  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:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CXX+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
-  # Extract the first word of "grep ggrep" to use in msg output
-if test -z "$GREP"; then
-set dummy grep ggrep; ac_prog_name=$2
-if test "${ac_cv_path_GREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  if test -n "$CXX"; then
+  ac_cv_prog_CXX="$CXX" # Let the user override the test.
 else
-  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
+for as_dir in $PATH
 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
-  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    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
-    ac_count=`expr $ac_count + 1`
-    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
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
 done
-
 done
 IFS=$as_save_IFS
 
-
 fi
-
-GREP="$ac_cv_path_GREP"
-if test -z "$GREP"; then
-  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
-   { (exit 1); exit 1; }; }
 fi
-
+CXX=$ac_cv_prog_CXX
+if test -n "$CXX"; then
+  { $as_echo "$as_me:$LINENO: result: $CXX" >&5
+$as_echo "$CXX" >&6; }
 else
-  ac_cv_path_GREP=$GREP
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
+    test -n "$CXX" && break
+  done
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
-echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
- GREP="$ac_cv_path_GREP"
-
-
-{ echo "$as_me:$LINENO: checking for egrep" >&5
-echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
-if test "${ac_cv_path_EGREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+if test -z "$CXX"; then
+  ac_ct_CXX=$CXX
+  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
+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:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_CXX+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
-     # Extract the first word of "egrep" to use in msg output
-if test -z "$EGREP"; then
-set dummy egrep; ac_prog_name=$2
-if test "${ac_cv_path_EGREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  if test -n "$ac_ct_CXX"; then
+  ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
 else
-  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
+for as_dir in $PATH
 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
-  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    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
-    ac_count=`expr $ac_count + 1`
-    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
+  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_CXX="$ac_prog"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
 done
-
 done
 IFS=$as_save_IFS
 
-
 fi
-
-EGREP="$ac_cv_path_EGREP"
-if test -z "$EGREP"; then
-  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
-   { (exit 1); exit 1; }; }
 fi
-
+ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
+if test -n "$ac_ct_CXX"; then
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
+$as_echo "$ac_ct_CXX" >&6; }
 else
-  ac_cv_path_EGREP=$EGREP
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
-   fi
+  test -n "$ac_ct_CXX" && break
+done
+
+  if test "x$ac_ct_CXX" = x; then
+    CXX="g++"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:$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
+    CXX=$ac_ct_CXX
+  fi
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
-echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
- EGREP="$ac_cv_path_EGREP"
 
+  fi
+fi
+# Provide some information about the compiler.
+$as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
+{ (ac_try="$ac_compiler --version >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compiler --version >&5") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+{ (ac_try="$ac_compiler -v >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compiler -v >&5") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+{ (ac_try="$ac_compiler -V >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compiler -V >&5") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
 
-{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
-if test "${ac_cv_header_stdc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:$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_cxx_compiler_gnu+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -4819,14 +4148,13 @@ _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
 
 int
 main ()
 {
+#ifndef __GNUC__
+       choke me
+#endif
 
   ;
   return 0;
@@ -4838,245 +4166,101 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
+	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  ac_cv_header_stdc=yes
+  ac_compiler_gnu=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_header_stdc=no
+	ac_compiler_gnu=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 >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* 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*
+ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
 
 fi
-
-if test $ac_cv_header_stdc = yes; then
-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdlib.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then
-  :
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
+$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+  GXX=yes
 else
-  ac_cv_header_stdc=no
+  GXX=
 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
-  :
+ac_test_CXXFLAGS=${CXXFLAGS+set}
+ac_save_CXXFLAGS=$CXXFLAGS
+{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
+$as_echo_n "checking whether $CXX accepts -g... " >&6; }
+if test "${ac_cv_prog_cxx_g+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
+  ac_save_cxx_werror_flag=$ac_cxx_werror_flag
+   ac_cxx_werror_flag=yes
+   ac_cv_prog_cxx_g=no
+   CXXFLAGS="-g"
+   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* 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
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_header_stdc=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-
-
-fi
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
-if test $ac_cv_header_stdc = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define STDC_HEADERS 1
-_ACEOF
-
-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=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-
-#include <$ac_header>
-_ACEOF
 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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
+	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  eval "$as_ac_Header=yes"
+  ac_cv_prog_cxx_g=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	eval "$as_ac_Header=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-
-
-for ac_header in sys/select.h sys/socket.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
+	CXXFLAGS=""
+      cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
 _ACEOF
 rm -f conftest.$ac_objext
 if { (ac_try="$ac_compile"
@@ -5084,147 +4268,36 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
+	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
+  :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    ( cat <<\_ASBOX
-## ------------------------------------------------------------------------ ##
-## Report this to http://sourceforge.net/tracker/?group_id=5528&atid=105528 ##
-## ------------------------------------------------------------------------ ##
-_ASBOX
-     ) | sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-{ echo "$as_me:$LINENO: checking types of arguments for select" >&5
-echo $ECHO_N "checking types of arguments for select... $ECHO_C" >&6; }
-if test "${ac_cv_func_select_args+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  for ac_arg234 in 'fd_set *' 'int *' 'void *'; do
- for ac_arg1 in 'int' 'size_t' 'unsigned long int' 'unsigned int'; do
-  for ac_arg5 in 'struct timeval *' 'const struct timeval *'; do
-   cat >conftest.$ac_ext <<_ACEOF
+	ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+	 CXXFLAGS="-g"
+	 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-$ac_includes_default
-#ifdef HAVE_SYS_SELECT_H
-# include <sys/select.h>
-#endif
-#ifdef HAVE_SYS_SOCKET_H
-# include <sys/socket.h>
-#endif
 
 int
 main ()
 {
-extern int select ($ac_arg1,
-					    $ac_arg234, $ac_arg234, $ac_arg234,
-					    $ac_arg5);
+
   ;
   return 0;
 }
@@ -5235,60 +4308,195 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
+	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  ac_cv_func_select_args="$ac_arg1,$ac_arg234,$ac_arg5"; break 3
+  ac_cv_prog_cxx_g=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 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_cxx_werror_flag=$ac_save_cxx_werror_flag
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
+$as_echo "$ac_cv_prog_cxx_g" >&6; }
+if test "$ac_test_CXXFLAGS" = set; then
+  CXXFLAGS=$ac_save_CXXFLAGS
+elif test $ac_cv_prog_cxx_g = yes; then
+  if test "$GXX" = yes; then
+    CXXFLAGS="-g -O2"
+  else
+    CXXFLAGS="-g"
+  fi
+else
+  if test "$GXX" = yes; then
+    CXXFLAGS="-O2"
+  else
+    CXXFLAGS=
+  fi
+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="$CXX"  am_compiler_list=
+
+{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+$as_echo_n "checking dependency style of $depcc... " >&6; }
+if test "${am_cv_CXX_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_CXX_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_CXX_dependencies_compiler_type=$depmode
+        break
+      fi
+    fi
   done
- done
-done
-# Provide a safe default value.
-: ${ac_cv_func_select_args='int,int *,struct timeval *'}
 
+  cd ..
+  rm -rf conftest.dir
+else
+  am_cv_CXX_dependencies_compiler_type=none
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_select_args" >&5
-echo "${ECHO_T}$ac_cv_func_select_args" >&6; }
-ac_save_IFS=$IFS; IFS=','
-set dummy `echo "$ac_cv_func_select_args" | sed 's/\*/\*/g'`
-IFS=$ac_save_IFS
-shift
 
-cat >>confdefs.h <<_ACEOF
-#define SELECT_TYPE_ARG1 $1
-_ACEOF
+fi
+{ $as_echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
+$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
+CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
 
+ if
+  test "x$enable_dependency_tracking" != xno \
+  && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
+  am__fastdepCXX_TRUE=
+  am__fastdepCXX_FALSE='#'
+else
+  am__fastdepCXX_TRUE='#'
+  am__fastdepCXX_FALSE=
+fi
 
-cat >>confdefs.h <<_ACEOF
-#define SELECT_TYPE_ARG234 ($2)
-_ACEOF
 
 
-cat >>confdefs.h <<_ACEOF
-#define SELECT_TYPE_ARG5 ($3)
-_ACEOF
 
-rm -f conftest*
 
-{ echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5
-echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6; }
-if test "${ac_cv_header_time+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+for ac_func in strcasestr
+do
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -5296,62 +4504,129 @@ _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <sys/types.h>
-#include <sys/time.h>
-#include <time.h>
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $ac_func innocuous_$ac_func
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func (); 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 $ac_func
+
+/* 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 $ac_func ();
+/* 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_$ac_func || defined __stub___$ac_func
+choke me
+#endif
 
 int
 main ()
 {
-if ((struct tm *) 0)
-return 0;
+return $ac_func ();
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
+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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_header_time=yes
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_header_time=no
+	eval "$as_ac_var=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5
-echo "${ECHO_T}$ac_cv_header_time" >&6; }
-if test $ac_cv_header_time = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define TIME_WITH_SYS_TIME 1
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
+  if true; then
+  HAVE_STRCASESTR_TRUE=
+  HAVE_STRCASESTR_FALSE='#'
+else
+  HAVE_STRCASESTR_TRUE='#'
+  HAVE_STRCASESTR_FALSE=
+fi
+
+else
+   if false; then
+  HAVE_STRCASESTR_TRUE=
+  HAVE_STRCASESTR_FALSE='#'
+else
+  HAVE_STRCASESTR_TRUE='#'
+  HAVE_STRCASESTR_FALSE=
+fi
+
+fi
+done
+
+
 
+  { $as_echo "$as_me:$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:$LINENO: result: $USE_NLS" >&5
+$as_echo "$USE_NLS" >&6; }
+
+
 
 
 case "$am__api_version" in
     1.01234)
-	{ { echo "$as_me:$LINENO: error: Automake 1.5 or newer is required to use intltool" >&5
-echo "$as_me: error: Automake 1.5 or newer is required to use intltool" >&2;}
+	{ { $as_echo "$as_me:$LINENO: error: Automake 1.5 or newer is required to use intltool" >&5
+$as_echo "$as_me: error: Automake 1.5 or newer is required to use intltool" >&2;}
    { (exit 1); exit 1; }; }
     ;;
     *)
@@ -5359,18 +4634,144 @@ echo "$as_me: error: Automake 1.5 or newer is required to use intltool" >&2;}
 esac
 
 if test -n ""; then
-    { echo "$as_me:$LINENO: checking for intltool >= " >&5
-echo $ECHO_N "checking for intltool >= ... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for intltool >= " >&5
+$as_echo_n "checking for intltool >= ... " >&6; }
 
     INTLTOOL_REQUIRED_VERSION_AS_INT=`echo  | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
-    INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { print $ 2; }' ${ac_aux_dir}/intltool-update.in`
-    INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split($ 2, VERSION, "."); print VERSION[1] * 1000 + VERSION[2] * 100 + VERSION[3];}' ${ac_aux_dir}/intltool-update.in`
+    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; }'`
 
-    { echo "$as_me:$LINENO: result: $INTLTOOL_APPLIED_VERSION found" >&5
-echo "${ECHO_T}$INTLTOOL_APPLIED_VERSION found" >&6; }
+    { $as_echo "$as_me:$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" ||
-	{ { echo "$as_me:$LINENO: error: Your intltool is too old.  You need intltool  or later." >&5
-echo "$as_me: error: Your intltool is too old.  You need intltool  or later." >&2;}
+	{ { $as_echo "$as_me:$LINENO: error: Your intltool is too old.  You need intltool  or later." >&5
+$as_echo "$as_me: error: Your intltool is too old.  You need intltool  or later." >&2;}
+   { (exit 1); exit 1; }; }
+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:$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:$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:$LINENO: result: $INTLTOOL_UPDATE" >&5
+$as_echo "$INTLTOOL_UPDATE" >&6; }
+else
+  { $as_echo "$as_me:$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:$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:$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:$LINENO: result: $INTLTOOL_MERGE" >&5
+$as_echo "$INTLTOOL_MERGE" >&6; }
+else
+  { $as_echo "$as_me:$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:$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:$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:$LINENO: result: $INTLTOOL_EXTRACT" >&5
+$as_echo "$INTLTOOL_EXTRACT" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
+    { { $as_echo "$as_me:$LINENO: error: The intltool scripts were not found. Please install intltool." >&5
+$as_echo "$as_me: error: The intltool scripts were not found. Please install intltool." >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -5392,6 +4793,7 @@ INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcar
   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 $< $@'
 
 
 
@@ -5412,24 +4814,94 @@ INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcar
 
 
 
-# Use the tools built into the package, not the ones that are installed.
-INTLTOOL_EXTRACT='$(top_builddir)/intltool-extract'
 
-INTLTOOL_MERGE='$(top_builddir)/intltool-merge'
 
-INTLTOOL_UPDATE='$(top_builddir)/intltool-update'
 
 
-# Extract the first word of "perl", so it can be a program name with args.
-set dummy perl; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# 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:$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 $INTLTOOL_PERL in
+  case $XGETTEXT in
   [\\/]* | ?:[\\/]*)
-  ac_cv_path_INTLTOOL_PERL="$INTLTOOL_PERL" # Let the user override the test with a path.
+  ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
   ;;
   *)
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -5439,8 +4911,8 @@ do
   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"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    ac_cv_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5450,49 +4922,26 @@ IFS=$as_save_IFS
   ;;
 esac
 fi
-INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL
-if test -n "$INTLTOOL_PERL"; then
-  { echo "$as_me:$LINENO: result: $INTLTOOL_PERL" >&5
-echo "${ECHO_T}$INTLTOOL_PERL" >&6; }
+XGETTEXT=$ac_cv_path_XGETTEXT
+if test -n "$XGETTEXT"; then
+  { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5
+$as_echo "$XGETTEXT" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
-if test -z "$INTLTOOL_PERL"; then
-   { { echo "$as_me:$LINENO: error: perl not found; required for intltool" >&5
-echo "$as_me: error: perl not found; required for intltool" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then
-   { { echo "$as_me:$LINENO: error: perl 5.x required for intltool" >&5
-echo "$as_me: error: perl 5.x required for intltool" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test "x" != "xno-xml"; then
-   { echo "$as_me:$LINENO: checking for XML::Parser" >&5
-echo $ECHO_N "checking for XML::Parser... $ECHO_C" >&6; }
-   if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
-       { echo "$as_me:$LINENO: result: ok" >&5
-echo "${ECHO_T}ok" >&6; }
-   else
-       { { echo "$as_me:$LINENO: error: XML::Parser perl module is required for intltool" >&5
-echo "$as_me: error: XML::Parser perl module is required for intltool" >&2;}
-   { (exit 1); exit 1; }; }
-   fi
-fi
-
-# Extract the first word of "iconv", so it can be a program name with args.
-set dummy iconv; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_path_INTLTOOL_ICONV+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+# 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:$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 $INTLTOOL_ICONV in
+  case $MSGMERGE in
   [\\/]* | ?:[\\/]*)
-  ac_cv_path_INTLTOOL_ICONV="$INTLTOOL_ICONV" # Let the user override the test with a path.
+  ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path.
   ;;
   *)
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -5502,38 +4951,37 @@ do
   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_ICONV="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    ac_cv_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
 IFS=$as_save_IFS
 
-  test -z "$ac_cv_path_INTLTOOL_ICONV" && ac_cv_path_INTLTOOL_ICONV="iconv"
   ;;
 esac
 fi
-INTLTOOL_ICONV=$ac_cv_path_INTLTOOL_ICONV
-if test -n "$INTLTOOL_ICONV"; then
-  { echo "$as_me:$LINENO: result: $INTLTOOL_ICONV" >&5
-echo "${ECHO_T}$INTLTOOL_ICONV" >&6; }
+MSGMERGE=$ac_cv_path_MSGMERGE
+if test -n "$MSGMERGE"; then
+  { $as_echo "$as_me:$LINENO: result: $MSGMERGE" >&5
+$as_echo "$MSGMERGE" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$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
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_path_INTLTOOL_MSGFMT+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:$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 $INTLTOOL_MSGFMT in
+  case $MSGFMT in
   [\\/]* | ?:[\\/]*)
-  ac_cv_path_INTLTOOL_MSGFMT="$INTLTOOL_MSGFMT" # Let the user override the test with a path.
+  ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
   ;;
   *)
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -5543,38 +4991,37 @@ do
   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_MSGFMT="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    ac_cv_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
 IFS=$as_save_IFS
 
-  test -z "$ac_cv_path_INTLTOOL_MSGFMT" && ac_cv_path_INTLTOOL_MSGFMT="msgfmt"
   ;;
 esac
 fi
-INTLTOOL_MSGFMT=$ac_cv_path_INTLTOOL_MSGFMT
-if test -n "$INTLTOOL_MSGFMT"; then
-  { echo "$as_me:$LINENO: result: $INTLTOOL_MSGFMT" >&5
-echo "${ECHO_T}$INTLTOOL_MSGFMT" >&6; }
+MSGFMT=$ac_cv_path_MSGFMT
+if test -n "$MSGFMT"; then
+  { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5
+$as_echo "$MSGFMT" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$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
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_path_INTLTOOL_MSGMERGE+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+# 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:$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 $INTLTOOL_MSGMERGE in
+  case $GMSGFMT in
   [\\/]* | ?:[\\/]*)
-  ac_cv_path_INTLTOOL_MSGMERGE="$INTLTOOL_MSGMERGE" # Let the user override the test with a path.
+  ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
   ;;
   *)
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -5584,38 +5031,52 @@ do
   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_MSGMERGE="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
 IFS=$as_save_IFS
 
-  test -z "$ac_cv_path_INTLTOOL_MSGMERGE" && ac_cv_path_INTLTOOL_MSGMERGE="msgmerge"
+  test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
   ;;
 esac
 fi
-INTLTOOL_MSGMERGE=$ac_cv_path_INTLTOOL_MSGMERGE
-if test -n "$INTLTOOL_MSGMERGE"; then
-  { echo "$as_me:$LINENO: result: $INTLTOOL_MSGMERGE" >&5
-echo "${ECHO_T}$INTLTOOL_MSGMERGE" >&6; }
+GMSGFMT=$ac_cv_path_GMSGFMT
+if test -n "$GMSGFMT"; then
+  { $as_echo "$as_me:$LINENO: result: $GMSGFMT" >&5
+$as_echo "$GMSGFMT" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$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
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_path_INTLTOOL_XGETTEXT+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
+    { { $as_echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5
+$as_echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}
+   { (exit 1); exit 1; }; }
+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_echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5
+$as_echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}
+   { (exit 1); exit 1; }; }
+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:$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_XGETTEXT in
+  case $INTLTOOL_PERL in
   [\\/]* | ?:[\\/]*)
-  ac_cv_path_INTLTOOL_XGETTEXT="$INTLTOOL_XGETTEXT" # Let the user override the test with a path.
+  ac_cv_path_INTLTOOL_PERL="$INTLTOOL_PERL" # Let the user override the test with a path.
   ;;
   *)
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -5625,28 +5086,56 @@ do
   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_XGETTEXT="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
 IFS=$as_save_IFS
 
-  test -z "$ac_cv_path_INTLTOOL_XGETTEXT" && ac_cv_path_INTLTOOL_XGETTEXT="xgettext"
   ;;
 esac
 fi
-INTLTOOL_XGETTEXT=$ac_cv_path_INTLTOOL_XGETTEXT
-if test -n "$INTLTOOL_XGETTEXT"; then
-  { echo "$as_me:$LINENO: result: $INTLTOOL_XGETTEXT" >&5
-echo "${ECHO_T}$INTLTOOL_XGETTEXT" >&6; }
+INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL
+if test -n "$INTLTOOL_PERL"; then
+  { $as_echo "$as_me:$LINENO: result: $INTLTOOL_PERL" >&5
+$as_echo "$INTLTOOL_PERL" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
+if test -z "$INTLTOOL_PERL"; then
+   { { $as_echo "$as_me:$LINENO: error: perl not found" >&5
+$as_echo "$as_me: error: perl not found" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+{ $as_echo "$as_me:$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_echo "$as_me:$LINENO: error: perl 5.8.1 is required for intltool" >&5
+$as_echo "$as_me: error: perl 5.8.1 is required for intltool" >&2;}
+   { (exit 1); exit 1; }; }
+else
+   IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
+   { $as_echo "$as_me:$LINENO: result: $IT_PERL_VERSION" >&5
+$as_echo "$IT_PERL_VERSION" >&6; }
+fi
+if test "x" != "xno-xml"; then
+   { $as_echo "$as_me:$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:$LINENO: result: ok" >&5
+$as_echo "ok" >&6; }
+   else
+       { { $as_echo "$as_me:$LINENO: error: XML::Parser perl module is required for intltool" >&5
+$as_echo "$as_me: error: XML::Parser perl module is required for intltool" >&2;}
+   { (exit 1); exit 1; }; }
+   fi
+fi
 
 # Substitute ALL_LINGUAS so we can use it in po/Makefile
 
@@ -5665,7 +5154,7 @@ int
 main ()
 {
 extern int _nl_msg_cat_cntr;
-                 return _nl_msg_cat_cntr
+                       return _nl_msg_cat_cntr
   ;
   return 0;
 }
@@ -5676,29 +5165,32 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   DATADIRNAME=share
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	case $host in
     *-*-solaris*)
-                        { echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
-echo $ECHO_N "checking for bind_textdomain_codeset... $ECHO_C" >&6; }
+                        { $as_echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
+$as_echo_n "checking for bind_textdomain_codeset... " >&6; }
 if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -5751,32 +5243,36 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_func_bind_textdomain_codeset=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_func_bind_textdomain_codeset=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
-echo "${ECHO_T}$ac_cv_func_bind_textdomain_codeset" >&6; }
-if test $ac_cv_func_bind_textdomain_codeset = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
+$as_echo "$ac_cv_func_bind_textdomain_codeset" >&6; }
+if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then
   DATADIRNAME=share
 else
   DATADIRNAME=lib
@@ -5789,6 +5285,7 @@ fi
     esac
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
@@ -5797,109 +5294,601 @@ fi
 
 
 
-ac_config_commands="$ac_config_commands intltool"
+case `pwd` in
+  *\ * | *\	*)
+    { $as_echo "$as_me:$LINENO: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
+$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
+esac
+
+
+
+macro_version='2.2.6b'
+macro_revision='1.3017'
+
+
+
 
 
 
 
-{ echo "$as_me:$LINENO: checking for library containing strerror" >&5
-echo $ECHO_N "checking for library containing strerror... $ECHO_C" >&6; }
-if test "${ac_cv_search_strerror+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+
+
+
+
+
+
+ltmain="$ac_aux_dir/ltmain.sh"
+
+# Make sure we can run config.sub.
+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
+  { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
+$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
+   { (exit 1); exit 1; }; }
+
+{ $as_echo "$as_me:$LINENO: checking build system type" >&5
+$as_echo_n "checking build system type... " >&6; }
+if test "${ac_cv_build+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
-  ac_func_search_save_LIBS=$LIBS
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  ac_build_alias=$build_alias
+test "x$ac_build_alias" = x &&
+  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
+test "x$ac_build_alias" = x &&
+  { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
+$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
+   { (exit 1); exit 1; }; }
+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
+  { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
+$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
+   { (exit 1); exit 1; }; }
 
-/* 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
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5
+$as_echo "$ac_cv_build" >&6; }
+case $ac_cv_build in
+*-*-*) ;;
+*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
+$as_echo "$as_me: error: invalid value of canonical build" >&2;}
+   { (exit 1); exit 1; }; };;
+esac
+build=$ac_cv_build
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_build
+shift
+build_cpu=$1
+build_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+build_os=$*
+IFS=$ac_save_IFS
+case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
+
+
+{ $as_echo "$as_me:$LINENO: checking host system type" >&5
+$as_echo_n "checking host system type... " >&6; }
+if test "${ac_cv_host+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test "x$host_alias" = x; then
+  ac_cv_host=$ac_cv_build
+else
+  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
+    { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
+$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5
+$as_echo "$ac_cv_host" >&6; }
+case $ac_cv_host in
+*-*-*) ;;
+*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
+$as_echo "$as_me: error: invalid value of canonical host" >&2;}
+   { (exit 1); exit 1; }; };;
+esac
+host=$ac_cv_host
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_host
+shift
+host_cpu=$1
+host_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+host_os=$*
+IFS=$ac_save_IFS
+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
+
+
+{ $as_echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
+$as_echo_n "checking for a sed that does not truncate output... " >&6; }
+if test "${ac_cv_path_SED+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+            ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
+     for ac_i in 1 2 3 4 5 6 7; do
+       ac_script="$ac_script$as_nl$ac_script"
+     done
+     echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
+     $as_unset ac_script || ac_script=
+     if test -z "$SED"; then
+  ac_path_SED_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_prog in sed gsed; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
+      { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
+# Check for GNU ac_path_SED and select it if it is found.
+  # Check for GNU $ac_path_SED
+case `"$ac_path_SED" --version 2>&1` in
+*GNU*)
+  ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo '' >> "conftest.nl"
+    "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    ac_count=`expr $ac_count + 1`
+    if test $ac_count -gt ${ac_path_SED_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_SED="$ac_path_SED"
+      ac_path_SED_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_SED_found && break 3
+    done
+  done
+done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_SED"; then
+    { { $as_echo "$as_me:$LINENO: error: no acceptable sed could be found in \$PATH" >&5
+$as_echo "$as_me: error: no acceptable sed could be found in \$PATH" >&2;}
+   { (exit 1); exit 1; }; }
   fi
-  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;;
+else
+  ac_cv_path_SED=$SED
+fi
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_SED" >&5
+$as_echo "$ac_cv_path_SED" >&6; }
+ SED="$ac_cv_path_SED"
+  rm -f conftest.sed
+
+test -z "$SED" && SED=sed
+Xsed="$SED -e 1s/^X//"
+
+
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:$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
+    ac_count=`expr $ac_count + 1`
+    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
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_search_strerror=$ac_res
+
+      $ac_path_GREP_found && break 3
+    done
+  done
+done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_GREP"; then
+    { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+   { (exit 1); exit 1; }; }
+  fi
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+  ac_cv_path_GREP=$GREP
+fi
 
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
+$as_echo "$ac_cv_path_GREP" >&6; }
+ GREP="$ac_cv_path_GREP"
 
+
+{ $as_echo "$as_me:$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
+    ac_count=`expr $ac_count + 1`
+    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_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+   { (exit 1); exit 1; }; }
+  fi
+else
+  ac_cv_path_EGREP=$EGREP
 fi
 
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext
-  if test "${ac_cv_search_strerror+set}" = set; then
-  break
+   fi
 fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
+$as_echo "$ac_cv_path_EGREP" >&6; }
+ EGREP="$ac_cv_path_EGREP"
+
+
+{ $as_echo "$as_me:$LINENO: checking for fgrep" >&5
+$as_echo_n "checking for fgrep... " >&6; }
+if test "${ac_cv_path_FGREP+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
+   then ac_cv_path_FGREP="$GREP -F"
+   else
+     if test -z "$FGREP"; then
+  ac_path_FGREP_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 fgrep; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
+      { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
+# Check for GNU ac_path_FGREP and select it if it is found.
+  # Check for GNU $ac_path_FGREP
+case `"$ac_path_FGREP" --version 2>&1` in
+*GNU*)
+  ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_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 'FGREP' >> "conftest.nl"
+    "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    ac_count=`expr $ac_count + 1`
+    if test $ac_count -gt ${ac_path_FGREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_FGREP="$ac_path_FGREP"
+      ac_path_FGREP_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_FGREP_found && break 3
+    done
+  done
 done
-if test "${ac_cv_search_strerror+set}" = set; then
-  :
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_FGREP"; then
+    { { $as_echo "$as_me:$LINENO: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+$as_echo "$as_me: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+   { (exit 1); exit 1; }; }
+  fi
 else
-  ac_cv_search_strerror=no
+  ac_cv_path_FGREP=$FGREP
 fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
+
+   fi
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5
-echo "${ECHO_T}$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"
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_FGREP" >&5
+$as_echo "$ac_cv_path_FGREP" >&6; }
+ FGREP="$ac_cv_path_FGREP"
+
+
+test -z "$GREP" && GREP=grep
+
+
+
+
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Check whether --with-gnu-ld was given.
+if test "${with_gnu_ld+set}" = set; then
+  withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
+else
+  with_gnu_ld=no
 fi
 
-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
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+ac_prog=ld
+if test "$GCC" = yes; then
+  # Check if gcc -print-prog-name=ld gives a path.
+  { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5
+$as_echo_n "checking for ld used by $CC... " >&6; }
+  case $host in
+  *-*-mingw*)
+    # gcc leaves a trailing carriage return which upsets mingw
+    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+  *)
+    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+  esac
+  case $ac_prog in
+    # Accept absolute paths.
+    [\\/]* | ?:[\\/]*)
+      re_direlt='/[^/][^/]*/\.\./'
+      # Canonicalize the pathname of ld
+      ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
+      while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
+	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
+      done
+      test -z "$LD" && LD="$ac_prog"
+      ;;
+  "")
+    # If it fails, then pretend we aren't using GCC.
+    ac_prog=ld
+    ;;
+  *)
+    # If it is relative, then search for the first ld in PATH.
+    with_gnu_ld=unknown
+    ;;
+  esac
+elif test "$with_gnu_ld" = yes; then
+  { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5
+$as_echo_n "checking for GNU ld... " >&6; }
 else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
+  { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5
+$as_echo_n "checking for non-GNU ld... " >&6; }
+fi
+if test "${lt_cv_path_LD+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -z "$LD"; then
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  for ac_dir in $PATH; do
+    IFS="$lt_save_ifs"
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+      lt_cv_path_LD="$ac_dir/$ac_prog"
+      # Check to see if the program is GNU ld.  I'd rather use --version,
+      # but apparently some variants of GNU ld only accept -v.
+      # Break only if it was the GNU/non-GNU ld that we prefer.
+      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+      *GNU* | *'with BFD'*)
+	test "$with_gnu_ld" != no && break
+	;;
+      *)
+	test "$with_gnu_ld" != yes && break
+	;;
+      esac
+    fi
+  done
+  IFS="$lt_save_ifs"
+else
+  lt_cv_path_LD="$LD" # Let the user override the test with a path.
+fi
+fi
+
+LD="$lt_cv_path_LD"
+if test -n "$LD"; then
+  { $as_echo "$as_me:$LINENO: result: $LD" >&5
+$as_echo "$LD" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
+$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
+   { (exit 1); exit 1; }; }
+{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
+$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
+if test "${lt_cv_prog_gnu_ld+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  # I'd rather use --version here, but apparently some GNU lds only accept -v.
+case `$LD -v 2>&1 </dev/null` in
+*GNU* | *'with BFD'*)
+  lt_cv_prog_gnu_ld=yes
+  ;;
+*)
+  lt_cv_prog_gnu_ld=no
+  ;;
+esac
+fi
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
+$as_echo "$lt_cv_prog_gnu_ld" >&6; }
+with_gnu_ld=$lt_cv_prog_gnu_ld
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:$LINENO: checking for BSD- or MS-compatible name lister (nm)" >&5
+$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
+if test "${lt_cv_path_NM+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$NM"; then
+  # Let the user override the test.
+  lt_cv_path_NM="$NM"
+else
+  lt_nm_to_check="${ac_tool_prefix}nm"
+  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
+    lt_nm_to_check="$lt_nm_to_check nm"
+  fi
+  for lt_tmp_nm in $lt_nm_to_check; do
+    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
+      IFS="$lt_save_ifs"
+      test -z "$ac_dir" && ac_dir=.
+      tmp_nm="$ac_dir/$lt_tmp_nm"
+      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
+	# Check to see if the nm accepts a BSD-compat flag.
+	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
+	#   nm: unknown option "B" ignored
+	# Tru64's nm complains that /dev/null is an invalid object file
+	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
+	*/dev/null* | *'Invalid file or object type'*)
+	  lt_cv_path_NM="$tmp_nm -B"
+	  break
+	  ;;
+	*)
+	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+	  */dev/null*)
+	    lt_cv_path_NM="$tmp_nm -p"
+	    break
+	    ;;
+	  *)
+	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+	    continue # so that we can try to find one that supports BSD flags
+	    ;;
+	  esac
+	  ;;
+	esac
+      fi
+    done
+    IFS="$lt_save_ifs"
+  done
+  : ${lt_cv_path_NM=no}
+fi
+fi
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
+$as_echo "$lt_cv_path_NM" >&6; }
+if test "$lt_cv_path_NM" != "no"; then
+  NM="$lt_cv_path_NM"
+else
+  # Didn't find any BSD compatible name lister, look for dumpbin.
+  if test -n "$ac_tool_prefix"; then
+  for ac_prog in "dumpbin -symbols" "link -dump -symbols"
+  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:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_DUMPBIN+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$DUMPBIN"; then
+  ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
@@ -5908,8 +5897,8 @@ do
   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"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5918,28 +5907,32 @@ IFS=$as_save_IFS
 
 fi
 fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+DUMPBIN=$ac_cv_prog_DUMPBIN
+if test -n "$DUMPBIN"; then
+  { $as_echo "$as_me:$LINENO: result: $DUMPBIN" >&5
+$as_echo "$DUMPBIN" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
+    test -n "$DUMPBIN" && break
+  done
 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
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+if test -z "$DUMPBIN"; then
+  ac_ct_DUMPBIN=$DUMPBIN
+  for ac_prog in "dumpbin -symbols" "link -dump -symbols"
+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:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_DUMPBIN+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.
+  if test -n "$ac_ct_DUMPBIN"; then
+  ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
@@ -5948,8 +5941,8 @@ do
   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"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5958,45 +5951,314 @@ IFS=$as_save_IFS
 
 fi
 fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6; }
+ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN
+if test -n "$ac_ct_DUMPBIN"; then
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_DUMPBIN" >&5
+$as_echo "$ac_ct_DUMPBIN" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
-  if test "x$ac_ct_CC" = x; then
-    CC=""
+
+  test -n "$ac_ct_DUMPBIN" && break
+done
+
+  if test "x$ac_ct_DUMPBIN" = x; then
+    DUMPBIN=":"
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+{ $as_echo "$as_me:$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
+    DUMPBIN=$ac_ct_DUMPBIN
   fi
+fi
+
+
+  if test "$DUMPBIN" != ":"; then
+    NM="$DUMPBIN"
+  fi
+fi
+test -z "$NM" && NM=nm
+
+
+
+
+
+
+{ $as_echo "$as_me:$LINENO: checking the name lister ($NM) interface" >&5
+$as_echo_n "checking the name lister ($NM) interface... " >&6; }
+if test "${lt_cv_nm_interface+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
-  CC="$ac_cv_prog_CC"
+  lt_cv_nm_interface="BSD nm"
+  echo "int some_variable = 0;" > conftest.$ac_ext
+  (eval echo "\"\$as_me:5999: $ac_compile\"" >&5)
+  (eval "$ac_compile" 2>conftest.err)
+  cat conftest.err >&5
+  (eval echo "\"\$as_me:6002: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
+  cat conftest.err >&5
+  (eval echo "\"\$as_me:6005: output\"" >&5)
+  cat conftest.out >&5
+  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
+    lt_cv_nm_interface="MS dumpbin"
+  fi
+  rm -f conftest*
 fi
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_nm_interface" >&5
+$as_echo "$lt_cv_nm_interface" >&6; }
 
-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
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:$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:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
+  { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5
+$as_echo "no, using $LN_S" >&6; }
+fi
+
+# find the maximum length of command line arguments
+{ $as_echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
+$as_echo_n "checking the maximum length of command line arguments... " >&6; }
+if test "${lt_cv_sys_max_cmd_len+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+    i=0
+  teststring="ABCD"
+
+  case $build_os in
+  msdosdjgpp*)
+    # On DJGPP, this test can blow up pretty badly due to problems in libc
+    # (any single argument exceeding 2000 bytes causes a buffer overrun
+    # during glob expansion).  Even if it were fixed, the result of this
+    # check would be larger than it should be.
+    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
+    ;;
+
+  gnu*)
+    # Under GNU Hurd, this test is not required because there is
+    # no limit to the length of command line arguments.
+    # Libtool will interpret -1 as no limit whatsoever
+    lt_cv_sys_max_cmd_len=-1;
+    ;;
+
+  cygwin* | mingw* | cegcc*)
+    # On Win9x/ME, this test blows up -- it succeeds, but takes
+    # about 5 minutes as the teststring grows exponentially.
+    # Worse, since 9x/ME are not pre-emptively multitasking,
+    # you end up with a "frozen" computer, even though with patience
+    # the test eventually succeeds (with a max line length of 256k).
+    # Instead, let's just punt: use the minimum linelength reported by
+    # all of the supported platforms: 8192 (on NT/2K/XP).
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  amigaos*)
+    # On AmigaOS with pdksh, this test takes hours, literally.
+    # So we just punt and use a minimum line length of 8192.
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+    # This has been around since 386BSD, at least.  Likely further.
+    if test -x /sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
+    elif test -x /usr/sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
+    else
+      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
+    fi
+    # And add a safety zone
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    ;;
+
+  interix*)
+    # We know the value 262144 and hardcode it with a safety zone (like BSD)
+    lt_cv_sys_max_cmd_len=196608
+    ;;
+
+  osf*)
+    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
+    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
+    # nice to cause kernel panics so lets avoid the loop below.
+    # First set a reasonable default.
+    lt_cv_sys_max_cmd_len=16384
+    #
+    if test -x /sbin/sysconfig; then
+      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
+        *1*) lt_cv_sys_max_cmd_len=-1 ;;
+      esac
+    fi
+    ;;
+  sco3.2v5*)
+    lt_cv_sys_max_cmd_len=102400
+    ;;
+  sysv5* | sco5v6* | sysv4.2uw2*)
+    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
+    if test -n "$kargmax"; then
+      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[	 ]//'`
+    else
+      lt_cv_sys_max_cmd_len=32768
+    fi
+    ;;
+  *)
+    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
+    if test -n "$lt_cv_sys_max_cmd_len"; then
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    else
+      # Make teststring a little bigger before we do anything with it.
+      # a 1K string should be a reasonable start.
+      for i in 1 2 3 4 5 6 7 8 ; do
+        teststring=$teststring$teststring
+      done
+      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+      # If test is not a shell built-in, we'll probably end up computing a
+      # maximum length that is only half of the actual maximum length, but
+      # we can't tell.
+      while { test "X"`$SHELL $0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \
+	         = "XX$teststring$teststring"; } >/dev/null 2>&1 &&
+	      test $i != 17 # 1/2 MB should be enough
+      do
+        i=`expr $i + 1`
+        teststring=$teststring$teststring
+      done
+      # Only check the string length outside the loop.
+      lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
+      teststring=
+      # Add a significant safety factor because C++ compilers can tack on
+      # massive amounts of additional arguments before passing them to the
+      # linker.  It appears as though 1/2 is a usable value.
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+    fi
+    ;;
+  esac
+
+fi
+
+if test -n $lt_cv_sys_max_cmd_len ; then
+  { $as_echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
+$as_echo "$lt_cv_sys_max_cmd_len" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: none" >&5
+$as_echo "none" >&6; }
+fi
+max_cmd_len=$lt_cv_sys_max_cmd_len
+
+
+
+
+
+
+: ${CP="cp -f"}
+: ${MV="mv -f"}
+: ${RM="rm -f"}
+
+{ $as_echo "$as_me:$LINENO: checking whether the shell understands some XSI constructs" >&5
+$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
+# Try some XSI features
+xsi_shell=no
+( _lt_dummy="a/b/c"
+  test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
+      = c,a/b,, \
+    && eval 'test $(( 1 + 1 )) -eq 2 \
+    && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
+  && xsi_shell=yes
+{ $as_echo "$as_me:$LINENO: result: $xsi_shell" >&5
+$as_echo "$xsi_shell" >&6; }
+
+
+{ $as_echo "$as_me:$LINENO: checking whether the shell understands \"+=\"" >&5
+$as_echo_n "checking whether the shell understands \"+=\"... " >&6; }
+lt_shell_append=no
+( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \
+    >/dev/null 2>&1 \
+  && lt_shell_append=yes
+{ $as_echo "$as_me:$LINENO: result: $lt_shell_append" >&5
+$as_echo "$lt_shell_append" >&6; }
+
+
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+  lt_unset=unset
+else
+  lt_unset=false
+fi
+
+
+
+
+
+# test EBCDIC or ASCII
+case `echo X|tr X '\101'` in
+ A) # ASCII based system
+    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
+  lt_SP2NL='tr \040 \012'
+  lt_NL2SP='tr \015\012 \040\040'
+  ;;
+ *) # EBCDIC based system
+  lt_SP2NL='tr \100 \n'
+  lt_NL2SP='tr \r\n \100\100'
+  ;;
+esac
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
+$as_echo_n "checking for $LD option to reload object files... " >&6; }
+if test "${lt_cv_ld_reload_flag+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_ld_reload_flag='-r'
+fi
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
+$as_echo "$lt_cv_ld_reload_flag" >&6; }
+reload_flag=$lt_cv_ld_reload_flag
+case $reload_flag in
+"" | " "*) ;;
+*) reload_flag=" $reload_flag" ;;
+esac
+reload_cmds='$LD$reload_flag -o $output$reload_objs'
+case $host_os in
+  darwin*)
+    if test "$GCC" = yes; then
+      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
+    else
+      reload_cmds='$LD$reload_flag -o $output$reload_objs'
+    fi
+    ;;
+esac
+
+
+
+
+
+
+
+
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
+set dummy ${ac_tool_prefix}objdump; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_OBJDUMP+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$OBJDUMP"; then
+  ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
@@ -6005,8 +6267,8 @@ do
   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"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6015,30 +6277,29 @@ IFS=$as_save_IFS
 
 fi
 fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+OBJDUMP=$ac_cv_prog_OBJDUMP
+if test -n "$OBJDUMP"; then
+  { $as_echo "$as_me:$LINENO: result: $OBJDUMP" >&5
+$as_echo "$OBJDUMP" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$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
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+if test -z "$ac_cv_prog_OBJDUMP"; then
+  ac_ct_OBJDUMP=$OBJDUMP
+  # Extract the first word of "objdump", so it can be a program name with args.
+set dummy objdump; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_OBJDUMP+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.
+  if test -n "$ac_ct_OBJDUMP"; then
+  ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
 else
-  ac_prog_rejected=no
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
@@ -6046,56 +6307,273 @@ do
   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"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    ac_cv_prog_ac_ct_OBJDUMP="objdump"
+    $as_echo "$as_me:$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
+ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
+if test -n "$ac_ct_OBJDUMP"; then
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5
+$as_echo "$ac_ct_OBJDUMP" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+
+  if test "x$ac_ct_OBJDUMP" = x; then
+    OBJDUMP="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:$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
+    OBJDUMP=$ac_ct_OBJDUMP
+  fi
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  OBJDUMP="$ac_cv_prog_OBJDUMP"
 fi
 
+test -z "$OBJDUMP" && OBJDUMP=objdump
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5
+$as_echo_n "checking how to recognize dependent libraries... " >&6; }
+if test "${lt_cv_deplibs_check_method+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_file_magic_cmd='$MAGIC_CMD'
+lt_cv_file_magic_test_file=
+lt_cv_deplibs_check_method='unknown'
+# Need to set the preceding variable on all platforms that support
+# interlibrary dependencies.
+# 'none' -- dependencies not supported.
+# `unknown' -- same as none, but documents that we really don't know.
+# 'pass_all' -- all dependencies passed with no checks.
+# 'test_compile' -- check by making test program.
+# 'file_magic [[regex]]' -- check by looking for files in library path
+# which responds to the $file_magic_cmd with a given extended regex.
+# If you have `file' or equivalent on your system and you're not sure
+# whether `pass_all' will *always* work, you probably want this one.
+
+case $host_os in
+aix[4-9]*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+beos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+bsdi[45]*)
+  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
+  lt_cv_file_magic_cmd='/usr/bin/file -L'
+  lt_cv_file_magic_test_file=/shlib/libc.so
+  ;;
+
+cygwin*)
+  # func_win32_libid is a shell function defined in ltmain.sh
+  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+  lt_cv_file_magic_cmd='func_win32_libid'
+  ;;
+
+mingw* | pw32*)
+  # Base MSYS/MinGW do not provide the 'file' command needed by
+  # func_win32_libid shell function, so use a weaker test based on 'objdump',
+  # unless we find 'file', for example because we are cross-compiling.
+  if ( file / ) >/dev/null 2>&1; then
+    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+    lt_cv_file_magic_cmd='func_win32_libid'
+  else
+    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+    lt_cv_file_magic_cmd='$OBJDUMP -f'
+  fi
+  ;;
+
+cegcc)
+  # use the weaker test based on 'objdump'. See mingw*.
+  lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
+  lt_cv_file_magic_cmd='$OBJDUMP -f'
+  ;;
+
+darwin* | rhapsody*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+freebsd* | dragonfly*)
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+    case $host_cpu in
+    i*86 )
+      # Not sure whether the presence of OpenBSD here was a mistake.
+      # Let's accept both of them until this is cleared up.
+      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library'
+      lt_cv_file_magic_cmd=/usr/bin/file
+      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+      ;;
+    esac
+  else
+    lt_cv_deplibs_check_method=pass_all
+  fi
+  ;;
+
+gnu*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+hpux10.20* | hpux11*)
+  lt_cv_file_magic_cmd=/usr/bin/file
+  case $host_cpu in
+  ia64*)
+    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
+    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
+    ;;
+  hppa*64*)
+    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'
+    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
+    ;;
+  *)
+    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
+    lt_cv_file_magic_test_file=/usr/lib/libc.sl
+    ;;
+  esac
+  ;;
+
+interix[3-9]*)
+  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
+  lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $LD in
+  *-32|*"-32 ") libmagic=32-bit;;
+  *-n32|*"-n32 ") libmagic=N32;;
+  *-64|*"-64 ") libmagic=64-bit;;
+  *) libmagic=never-match;;
+  esac
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+# This must be Linux ELF.
+linux* | k*bsd*-gnu)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+netbsd*)
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+  else
+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'
+  fi
+  ;;
+
+newos6*)
+  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'
+  lt_cv_file_magic_cmd=/usr/bin/file
+  lt_cv_file_magic_test_file=/usr/lib/libnls.so
+  ;;
+
+*nto* | *qnx*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+openbsd*)
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
+  else
+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+  fi
+  ;;
+
+osf3* | osf4* | osf5*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+rdos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+solaris*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+sysv4 | sysv4.3*)
+  case $host_vendor in
+  motorola)
+    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
+    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
+    ;;
+  ncr)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  sequent)
+    lt_cv_file_magic_cmd='/bin/file'
+    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'
+    ;;
+  sni)
+    lt_cv_file_magic_cmd='/bin/file'
+    lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib"
+    lt_cv_file_magic_test_file=/lib/libc.so
+    ;;
+  siemens)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  pc)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  esac
+  ;;
+
+tpf*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+esac
 
 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
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
+$as_echo "$lt_cv_deplibs_check_method" >&6; }
+file_magic_cmd=$lt_cv_file_magic_cmd
+deplibs_check_method=$lt_cv_deplibs_check_method
+test -z "$deplibs_check_method" && deplibs_check_method=unknown
+
+
+
+
+
+
+
+
+
+
+
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
+set dummy ${ac_tool_prefix}ar; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_AR+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.
+  if test -n "$AR"; then
+  ac_cv_prog_AR="$AR" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
@@ -6104,8 +6582,8 @@ do
   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"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    ac_cv_prog_AR="${ac_tool_prefix}ar"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6114,32 +6592,93 @@ IFS=$as_save_IFS
 
 fi
 fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+AR=$ac_cv_prog_AR
+if test -n "$AR"; then
+  { $as_echo "$as_me:$LINENO: result: $AR" >&5
+$as_echo "$AR" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$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
+if test -z "$ac_cv_prog_AR"; then
+  ac_ct_AR=$AR
+  # Extract the first word of "ar", so it can be a program name with args.
+set dummy ar; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_AR"; then
+  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
 do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  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_AR="ar"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_AR=$ac_cv_prog_ac_ct_AR
+if test -n "$ac_ct_AR"; then
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
+$as_echo "$ac_ct_AR" >&6; }
 else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_AR" = x; then
+    AR="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:$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
+    AR=$ac_ct_AR
+  fi
+else
+  AR="$ac_cv_prog_AR"
+fi
+
+test -z "$AR" && AR=ar
+test -z "$AR_FLAGS" && AR_FLAGS=cru
+
+
+
+
+
+
+
+
+
+
+
+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:$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
@@ -6148,8 +6687,8 @@ do
   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"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6158,532 +6697,812 @@ IFS=$as_save_IFS
 
 fi
 fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6; }
+STRIP=$ac_cv_prog_STRIP
+if test -n "$STRIP"; then
+  { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
+$as_echo "$STRIP" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
-  test -n "$ac_ct_CC" && break
+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:$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:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
 done
+IFS=$as_save_IFS
 
-  if test "x$ac_ct_CC" = x; then
-    CC=""
+fi
+fi
+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+if test -n "$ac_ct_STRIP"; then
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+$as_echo "$ac_ct_STRIP" >&6; }
+else
+  { $as_echo "$as_me:$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:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+{ $as_echo "$as_me:$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
+    STRIP=$ac_ct_STRIP
   fi
+else
+  STRIP="$ac_cv_prog_STRIP"
 fi
 
-fi
+test -z "$STRIP" && STRIP=:
 
 
-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&5
-echo "$as_me: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
 
-# Provide some information about the compiler.
-echo "$as_me:$LINENO: checking for C compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
-{ (ac_try="$ac_compiler --version >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compiler --version >&5") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (ac_try="$ac_compiler -v >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compiler -v >&5") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (ac_try="$ac_compiler -V >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compiler -V >&5") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
 
-{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
-if test "${ac_cv_c_compiler_gnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
 
-int
-main ()
-{
-#ifndef __GNUC__
-       choke me
-#endif
 
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_compiler_gnu=yes
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
+set dummy ${ac_tool_prefix}ranlib; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_RANLIB+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+  if test -n "$RANLIB"; then
+  ac_cv_prog_RANLIB="$RANLIB" # 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_RANLIB="${ac_tool_prefix}ranlib"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
 
-	ac_compiler_gnu=no
+fi
+fi
+RANLIB=$ac_cv_prog_RANLIB
+if test -n "$RANLIB"; then
+  { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5
+$as_echo "$RANLIB" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
-GCC=`test $ac_compiler_gnu = yes && echo yes`
-ac_test_CFLAGS=${CFLAGS+set}
-ac_save_CFLAGS=$CFLAGS
-{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
-if test "${ac_cv_prog_cc_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+if test -z "$ac_cv_prog_RANLIB"; then
+  ac_ct_RANLIB=$RANLIB
+  # Extract the first word of "ranlib", so it can be a program name with args.
+set dummy ranlib; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_RANLIB+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 >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  if test -n "$ac_ct_RANLIB"; then
+  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # 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_RANLIB="ranlib"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
 
-int
-main ()
-{
+fi
+fi
+ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+if test -n "$ac_ct_RANLIB"; then
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
+$as_echo "$ac_ct_RANLIB" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
 
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
+  if test "x$ac_ct_RANLIB" = x; then
+    RANLIB=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:$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
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_prog_cc_g=yes
+    RANLIB=$ac_ct_RANLIB
+  fi
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+  RANLIB="$ac_cv_prog_RANLIB"
+fi
 
-	CFLAGS=""
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+test -z "$RANLIB" && RANLIB=:
 
-int
-main ()
-{
 
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
+
+
+
+
+# Determine commands to create old-style static archives.
+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
+old_postinstall_cmds='chmod 644 $oldlib'
+old_postuninstall_cmds=
+
+if test -n "$RANLIB"; then
+  case $host_os in
+  openbsd*)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+    ;;
+  *)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+    ;;
+  esac
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
+
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
+# Allow CC to be a program name with arguments.
+compiler=$CC
+
+
+# Check for command to grab the raw symbol name followed by C symbol from nm.
+{ $as_echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
+$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
+if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+
+# These are sane defaults that work on at least a few old systems.
+# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
+
+# Character class describing NM global symbol codes.
+symcode='[BCDEGRST]'
+
+# Regexp to match symbols that can be accessed directly from C.
+sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
+
+# Define system-specific variables.
+case $host_os in
+aix*)
+  symcode='[BCDT]'
+  ;;
+cygwin* | mingw* | pw32* | cegcc*)
+  symcode='[ABCDGISTW]'
+  ;;
+hpux*)
+  if test "$host_cpu" = ia64; then
+    symcode='[ABCDEGRST]'
+  fi
+  ;;
+irix* | nonstopux*)
+  symcode='[BCDEGRST]'
+  ;;
+osf*)
+  symcode='[BCDEGQRST]'
+  ;;
+solaris*)
+  symcode='[BDRT]'
+  ;;
+sco3.2v5*)
+  symcode='[DT]'
+  ;;
+sysv4.2uw2*)
+  symcode='[DT]'
+  ;;
+sysv5* | sco5v6* | unixware* | OpenUNIX*)
+  symcode='[ABDT]'
+  ;;
+sysv4)
+  symcode='[DFNSTU]'
+  ;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+
+# If we're using GNU nm, then use its standard symbol codes.
+case `$NM -V 2>&1` in
+*GNU* | *'with BFD'*)
+  symcode='[ABCDGIRSTW]' ;;
+esac
+
+# Transform an extracted symbol line into a proper C declaration.
+# Some systems (esp. on ia64) link data and code symbols differently,
+# so use this general approach.
+lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+
+# Transform an extracted symbol line into symbol name and symbol address
+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (void *) \&\2},/p'"
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"lib\2\", (void *) \&\2},/p'"
+
+# Handle CRLF in mingw tool chain
+opt_cr=
+case $build_os in
+mingw*)
+  opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
+  ;;
+esac
+
+# Try without a prefix underscore, then with it.
+for ac_symprfx in "" "_"; do
+
+  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
+  symxfrm="\\1 $ac_symprfx\\2 \\2"
+
+  # Write the raw and C identifiers.
+  if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+    # Fake it for dumpbin and say T for any non-static function
+    # and D for any global variable.
+    # Also find C++ and __fastcall symbols from MSVC++,
+    # which start with @ or ?.
+    lt_cv_sys_global_symbol_pipe="$AWK '"\
+"     {last_section=section; section=\$ 3};"\
+"     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
+"     \$ 0!~/External *\|/{next};"\
+"     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
+"     {if(hide[section]) next};"\
+"     {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
+"     {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
+"     s[1]~/^[@?]/{print s[1], s[1]; next};"\
+"     s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
+"     ' prfx=^$ac_symprfx"
+  else
+    lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[	 ]\($symcode$symcode*\)[	 ][	 ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
+  fi
+
+  # Check to see that the pipe works correctly.
+  pipe_works=no
+
+  rm -f conftest*
+  cat > conftest.$ac_ext <<_LT_EOF
+#ifdef __cplusplus
+extern "C" {
+#endif
+char nm_test_var;
+void nm_test_func(void);
+void nm_test_func(void){}
+#ifdef __cplusplus
+}
+#endif
+int main(){nm_test_var='a';nm_test_func();return(0);}
+_LT_EOF
+
+  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+    # Now try to grab the symbols.
+    nlist=conftest.nm
+    if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5
+  (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && test -s "$nlist"; then
+      # Try sorting and uniquifying the output.
+      if sort "$nlist" | uniq > "$nlist"T; then
+	mv -f "$nlist"T "$nlist"
+      else
+	rm -f "$nlist"T
+      fi
 
-	ac_c_werror_flag=$ac_save_c_werror_flag
-	 CFLAGS="-g"
-	 cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+      # Make sure that we snagged all the symbols we need.
+      if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
+	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
+	  cat <<_LT_EOF > conftest.$ac_ext
+#ifdef __cplusplus
+extern "C" {
+#endif
 
-int
-main ()
+_LT_EOF
+	  # Now generate the symbol file.
+	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
+
+	  cat <<_LT_EOF >> conftest.$ac_ext
+
+/* The mapping between symbol names and symbols.  */
+const struct {
+  const char *name;
+  void       *address;
+}
+lt__PROGRAM__LTX_preloaded_symbols[] =
 {
+  { "@PROGRAM@", (void *) 0 },
+_LT_EOF
+	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
+	  cat <<\_LT_EOF >> conftest.$ac_ext
+  {0, (void *) 0}
+};
 
-  ;
-  return 0;
+/* This works around a problem in FreeBSD linker */
+#ifdef FREEBSD_WORKAROUND
+static const void *lt_preloaded_setup() {
+  return lt__PROGRAM__LTX_preloaded_symbols;
 }
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+_LT_EOF
+	  # Now try linking the two files.
+	  mv conftest.$ac_objext conftstm.$ac_objext
+	  lt_save_LIBS="$LIBS"
+	  lt_save_CFLAGS="$CFLAGS"
+	  LIBS="conftstm.$ac_objext"
+	  CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
+	  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_prog_cc_g=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && test -s conftest${ac_exeext}; then
+	    pipe_works=yes
+	  fi
+	  LIBS="$lt_save_LIBS"
+	  CFLAGS="$lt_save_CFLAGS"
+	else
+	  echo "cannot find nm_test_func in $nlist" >&5
+	fi
+      else
+	echo "cannot find nm_test_var in $nlist" >&5
+      fi
+    else
+      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5
+    fi
+  else
+    echo "$progname: failed program was:" >&5
+    cat conftest.$ac_ext >&5
+  fi
+  rm -rf conftest* conftst*
 
+  # Do not use the global_symbol_pipe unless it works.
+  if test "$pipe_works" = yes; then
+    break
+  else
+    lt_cv_sys_global_symbol_pipe=
+  fi
+done
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+if test -z "$lt_cv_sys_global_symbol_pipe"; then
+  lt_cv_sys_global_symbol_to_cdecl=
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
+  { $as_echo "$as_me:$LINENO: result: failed" >&5
+$as_echo "failed" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: ok" >&5
+$as_echo "ok" >&6; }
 fi
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   ac_c_werror_flag=$ac_save_c_werror_flag
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Check whether --enable-libtool-lock was given.
+if test "${enable_libtool_lock+set}" = set; then
+  enableval=$enable_libtool_lock;
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-echo "${ECHO_T}$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"
+
+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+
+# Some flags need to be propagated to the compiler or linker for good
+# libtool support.
+case $host in
+ia64-*-hpux*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+    case `/usr/bin/file conftest.$ac_objext` in
+      *ELF-32*)
+	HPUX_IA64_MODE="32"
+	;;
+      *ELF-64*)
+	HPUX_IA64_MODE="64"
+	;;
+    esac
   fi
-else
-  if test "$GCC" = yes; then
-    CFLAGS="-O2"
-  else
-    CFLAGS=
+  rm -rf conftest*
+  ;;
+*-*-irix6*)
+  # Find out which ABI we are using.
+  echo '#line 7210 "configure"' > conftest.$ac_ext
+  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+    if test "$lt_cv_prog_gnu_ld" = yes; then
+      case `/usr/bin/file conftest.$ac_objext` in
+	*32-bit*)
+	  LD="${LD-ld} -melf32bsmip"
+	  ;;
+	*N32*)
+	  LD="${LD-ld} -melf32bmipn32"
+	  ;;
+	*64-bit*)
+	  LD="${LD-ld} -melf64bmip"
+	;;
+      esac
+    else
+      case `/usr/bin/file conftest.$ac_objext` in
+	*32-bit*)
+	  LD="${LD-ld} -32"
+	  ;;
+	*N32*)
+	  LD="${LD-ld} -n32"
+	  ;;
+	*64-bit*)
+	  LD="${LD-ld} -64"
+	  ;;
+      esac
+    fi
   fi
-fi
-{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
-echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
-if test "${ac_cv_prog_cc_c89+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  rm -rf conftest*
+  ;;
+
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+    case `/usr/bin/file conftest.o` in
+      *32-bit*)
+	case $host in
+	  x86_64-*kfreebsd*-gnu)
+	    LD="${LD-ld} -m elf_i386_fbsd"
+	    ;;
+	  x86_64-*linux*)
+	    LD="${LD-ld} -m elf_i386"
+	    ;;
+	  ppc64-*linux*|powerpc64-*linux*)
+	    LD="${LD-ld} -m elf32ppclinux"
+	    ;;
+	  s390x-*linux*)
+	    LD="${LD-ld} -m elf_s390"
+	    ;;
+	  sparc64-*linux*)
+	    LD="${LD-ld} -m elf32_sparc"
+	    ;;
+	esac
+	;;
+      *64-bit*)
+	case $host in
+	  x86_64-*kfreebsd*-gnu)
+	    LD="${LD-ld} -m elf_x86_64_fbsd"
+	    ;;
+	  x86_64-*linux*)
+	    LD="${LD-ld} -m elf_x86_64"
+	    ;;
+	  ppc*-*linux*|powerpc*-*linux*)
+	    LD="${LD-ld} -m elf64ppc"
+	    ;;
+	  s390*-*linux*|s390*-*tpf*)
+	    LD="${LD-ld} -m elf64_s390"
+	    ;;
+	  sparc*-*linux*)
+	    LD="${LD-ld} -m elf64_sparc"
+	    ;;
+	esac
+	;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+
+*-*-sco3.2v5*)
+  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+  SAVE_CFLAGS="$CFLAGS"
+  CFLAGS="$CFLAGS -belf"
+  { $as_echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
+$as_echo_n "checking whether the C compiler needs -belf... " >&6; }
+if test "${lt_cv_cc_needs_belf+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
-  ac_cv_prog_cc_c89=no
-ac_save_CC=$CC
-cat >conftest.$ac_ext <<_ACEOF
+  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
+
+     cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* 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"
-  rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
+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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_prog_cc_c89=$ac_arg
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  lt_cv_cc_needs_belf=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-
+	lt_cv_cc_needs_belf=no
 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)
-    { echo "$as_me:$LINENO: result: none needed" >&5
-echo "${ECHO_T}none needed" >&6; } ;;
-  xno)
-    { echo "$as_me:$LINENO: result: unsupported" >&5
-echo "${ECHO_T}unsupported" >&6; } ;;
-  *)
-    CC="$CC $ac_cv_prog_cc_c89"
-    { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
-esac
-
-
-ac_ext=c
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+     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=
-
-{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&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
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
+$as_echo "$lt_cv_cc_needs_belf" >&6; }
+  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
+    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
+    CFLAGS="$SAVE_CFLAGS"
   fi
-  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
-
-    case $depmode in
-    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
+  ;;
+sparc*-*solaris*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+    case `/usr/bin/file conftest.o` in
+    *64-bit*)
+      case $lt_cv_prog_gnu_ld in
+      yes*) LD="${LD-ld} -m elf64_sparc" ;;
+      *)
+	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
+	  LD="${LD-ld} -64"
+	fi
+	;;
+      esac
       ;;
-    none) break ;;
     esac
-    # 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.
-    if depmode=$depmode \
-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} 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 sub/conftest.${OBJEXT-o} 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
+  fi
+  rm -rf conftest*
+  ;;
+esac
 
-  cd ..
-  rm -rf conftest.dir
+need_locks="$enable_libtool_lock"
+
+
+  case $host_os in
+    rhapsody* | darwin*)
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
+set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_DSYMUTIL+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
-  am_cv_CC_dependencies_compiler_type=none
+  if test -n "$DSYMUTIL"; then
+  ac_cv_prog_DSYMUTIL="$DSYMUTIL" # 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_DSYMUTIL="${ac_tool_prefix}dsymutil"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+DSYMUTIL=$ac_cv_prog_DSYMUTIL
+if test -n "$DSYMUTIL"; then
+  { $as_echo "$as_me:$LINENO: result: $DSYMUTIL" >&5
+$as_echo "$DSYMUTIL" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
 fi
-{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
-echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
-CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
+if test -z "$ac_cv_prog_DSYMUTIL"; then
+  ac_ct_DSYMUTIL=$DSYMUTIL
+  # Extract the first word of "dsymutil", so it can be a program name with args.
+set dummy dsymutil; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_DSYMUTIL"; then
+  ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # 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_DSYMUTIL="dsymutil"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
 
- if
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
-  am__fastdepCC_TRUE=
-  am__fastdepCC_FALSE='#'
+fi
+fi
+ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
+if test -n "$ac_ct_DSYMUTIL"; then
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5
+$as_echo "$ac_ct_DSYMUTIL" >&6; }
 else
-  am__fastdepCC_TRUE='#'
-  am__fastdepCC_FALSE=
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+  if test "x$ac_ct_DSYMUTIL" = x; then
+    DSYMUTIL=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:$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
+    DSYMUTIL=$ac_ct_DSYMUTIL
+  fi
+else
+  DSYMUTIL="$ac_cv_prog_DSYMUTIL"
+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
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
+set dummy ${ac_tool_prefix}nmedit; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_NMEDIT+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.
+  if test -n "$NMEDIT"; then
+  ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
@@ -6692,8 +7511,8 @@ do
   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"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6702,28 +7521,28 @@ IFS=$as_save_IFS
 
 fi
 fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+NMEDIT=$ac_cv_prog_NMEDIT
+if test -n "$NMEDIT"; then
+  { $as_echo "$as_me:$LINENO: result: $NMEDIT" >&5
+$as_echo "$NMEDIT" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$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
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+if test -z "$ac_cv_prog_NMEDIT"; then
+  ac_ct_NMEDIT=$NMEDIT
+  # Extract the first word of "nmedit", so it can be a program name with args.
+set dummy nmedit; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_NMEDIT+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.
+  if test -n "$ac_ct_NMEDIT"; then
+  ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
@@ -6732,8 +7551,8 @@ do
   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"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    ac_cv_prog_ac_ct_NMEDIT="nmedit"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6742,45 +7561,40 @@ IFS=$as_save_IFS
 
 fi
 fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6; }
+ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
+if test -n "$ac_ct_NMEDIT"; then
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5
+$as_echo "$ac_ct_NMEDIT" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
-  if test "x$ac_ct_CC" = x; then
-    CC=""
+  if test "x$ac_ct_NMEDIT" = x; then
+    NMEDIT=":"
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+{ $as_echo "$as_me:$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
+    NMEDIT=$ac_ct_NMEDIT
   fi
 else
-  CC="$ac_cv_prog_CC"
+  NMEDIT="$ac_cv_prog_NMEDIT"
 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
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
+set dummy ${ac_tool_prefix}lipo; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_LIPO+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.
+  if test -n "$LIPO"; then
+  ac_cv_prog_LIPO="$LIPO" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
@@ -6789,8 +7603,8 @@ do
   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"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6799,30 +7613,29 @@ IFS=$as_save_IFS
 
 fi
 fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+LIPO=$ac_cv_prog_LIPO
+if test -n "$LIPO"; then
+  { $as_echo "$as_me:$LINENO: result: $LIPO" >&5
+$as_echo "$LIPO" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$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
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+if test -z "$ac_cv_prog_LIPO"; then
+  ac_ct_LIPO=$LIPO
+  # Extract the first word of "lipo", so it can be a program name with args.
+set dummy lipo; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_LIPO+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.
+  if test -n "$ac_ct_LIPO"; then
+  ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test.
 else
-  ac_prog_rejected=no
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
@@ -6830,56 +7643,90 @@ do
   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"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    ac_cv_prog_ac_ct_LIPO="lipo"
+    $as_echo "$as_me:$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
+ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO
+if test -n "$ac_ct_LIPO"; then
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_LIPO" >&5
+$as_echo "$ac_ct_LIPO" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_LIPO" = x; then
+    LIPO=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:$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
+    LIPO=$ac_ct_LIPO
   fi
+else
+  LIPO="$ac_cv_prog_LIPO"
 fi
+
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
+set dummy ${ac_tool_prefix}otool; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_OTOOL+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$OTOOL"; then
+  ac_cv_prog_OTOOL="$OTOOL" # 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_OTOOL="${ac_tool_prefix}otool"
+    $as_echo "$as_me:$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
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+OTOOL=$ac_cv_prog_OTOOL
+if test -n "$OTOOL"; then
+  { $as_echo "$as_me:$LINENO: result: $OTOOL" >&5
+$as_echo "$OTOOL" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$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
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+if test -z "$ac_cv_prog_OTOOL"; then
+  ac_ct_OTOOL=$OTOOL
+  # Extract the first word of "otool", so it can be a program name with args.
+set dummy otool; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_OTOOL+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.
+  if test -n "$ac_ct_OTOOL"; then
+  ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
@@ -6888,8 +7735,8 @@ do
   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"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    ac_cv_prog_ac_ct_OTOOL="otool"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6898,32 +7745,40 @@ IFS=$as_save_IFS
 
 fi
 fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL
+if test -n "$ac_ct_OTOOL"; then
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL" >&5
+$as_echo "$ac_ct_OTOOL" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
-
-    test -n "$CC" && break
-  done
+  if test "x$ac_ct_OTOOL" = x; then
+    OTOOL=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:$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
+    OTOOL=$ac_ct_OTOOL
+  fi
+else
+  OTOOL="$ac_cv_prog_OTOOL"
 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
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
+set dummy ${ac_tool_prefix}otool64; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_OTOOL64+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.
+  if test -n "$OTOOL64"; then
+  ac_cv_prog_OTOOL64="$OTOOL64" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
@@ -6932,8 +7787,8 @@ do
   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"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6942,85 +7797,135 @@ IFS=$as_save_IFS
 
 fi
 fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6; }
+OTOOL64=$ac_cv_prog_OTOOL64
+if test -n "$OTOOL64"; then
+  { $as_echo "$as_me:$LINENO: result: $OTOOL64" >&5
+$as_echo "$OTOOL64" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
-  test -n "$ac_ct_CC" && break
+fi
+if test -z "$ac_cv_prog_OTOOL64"; then
+  ac_ct_OTOOL64=$OTOOL64
+  # Extract the first word of "otool64", so it can be a program name with args.
+set dummy otool64; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_OTOOL64"; then
+  ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # 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_OTOOL64="otool64"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
 done
+done
+IFS=$as_save_IFS
 
-  if test "x$ac_ct_CC" = x; then
-    CC=""
+fi
+fi
+ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64
+if test -n "$ac_ct_OTOOL64"; then
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL64" >&5
+$as_echo "$ac_ct_OTOOL64" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_OTOOL64" = x; then
+    OTOOL64=":"
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+{ $as_echo "$as_me:$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
+    OTOOL64=$ac_ct_OTOOL64
   fi
+else
+  OTOOL64="$ac_cv_prog_OTOOL64"
 fi
 
-fi
 
 
-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&5
-echo "$as_me: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
 
-# Provide some information about the compiler.
-echo "$as_me:$LINENO: checking for C compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
-{ (ac_try="$ac_compiler --version >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compiler --version >&5") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (ac_try="$ac_compiler -v >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compiler -v >&5") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (ac_try="$ac_compiler -V >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compiler -V >&5") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
 
-{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
-if test "${ac_cv_c_compiler_gnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    { $as_echo "$as_me:$LINENO: checking for -single_module linker flag" >&5
+$as_echo_n "checking for -single_module linker flag... " >&6; }
+if test "${lt_cv_apple_cc_single_mod+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
+  lt_cv_apple_cc_single_mod=no
+      if test -z "${LT_MULTI_MODULE}"; then
+	# By default we will add the -single_module flag. You can override
+	# by either setting the environment variable LT_MULTI_MODULE
+	# non-empty at configure time, or by adding -multi_module to the
+	# link flags.
+	rm -rf libconftest.dylib*
+	echo "int foo(void){return 1;}" > conftest.c
+	echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+-dynamiclib -Wl,-single_module conftest.c" >&5
+	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
+        _lt_result=$?
+	if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
+	  lt_cv_apple_cc_single_mod=yes
+	else
+	  cat conftest.err >&5
+	fi
+	rm -rf libconftest.dylib*
+	rm -f conftest.*
+      fi
+fi
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5
+$as_echo "$lt_cv_apple_cc_single_mod" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5
+$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
+if test "${lt_cv_ld_exported_symbols_list+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_ld_exported_symbols_list=no
+      save_LDFLAGS=$LDFLAGS
+      echo "_main" > conftest.sym
+      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
+      cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -7030,314 +7935,312 @@ cat >>conftest.$ac_ext <<_ACEOF
 int
 main ()
 {
-#ifndef __GNUC__
-       choke me
-#endif
 
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
+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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_compiler_gnu=yes
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  lt_cv_ld_exported_symbols_list=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_compiler_gnu=no
+	lt_cv_ld_exported_symbols_list=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_c_compiler_gnu=$ac_compiler_gnu
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+	LDFLAGS="$save_LDFLAGS"
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
-GCC=`test $ac_compiler_gnu = yes && echo yes`
-ac_test_CFLAGS=${CFLAGS+set}
-ac_save_CFLAGS=$CFLAGS
-{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
-if test "${ac_cv_prog_cc_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5
+$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
+    case $host_os in
+    rhapsody* | darwin1.[012])
+      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
+    darwin1.*)
+      _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+    darwin*) # darwin 5.x on
+      # if running on 10.5 or later, the deployment target defaults
+      # to the OS version, if on x86, and 10.4, the deployment
+      # target defaults to 10.4. Don't you love it?
+      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
+	10.0,*86*-darwin8*|10.0,*-darwin[91]*)
+	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+	10.[012]*)
+	  _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+	10.*)
+	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+      esac
+    ;;
+  esac
+    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
+      _lt_dar_single_mod='$single_module'
+    fi
+    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
+      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
+    else
+      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
+    fi
+    if test "$DSYMUTIL" != ":"; then
+      _lt_dsymutil='~$DSYMUTIL $lib || :'
+    else
+      _lt_dsymutil=
+    fi
+    ;;
+  esac
+
+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:$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
-  ac_save_c_werror_flag=$ac_c_werror_flag
-   ac_c_werror_flag=yes
-   ac_cv_prog_cc_g=no
-   CFLAGS="-g"
-   cat >conftest.$ac_ext <<_ACEOF
+      # 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 >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		     Syntax error
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
+if { (ac_try="$ac_cpp conftest.$ac_ext"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_prog_cc_g=yes
+       }; then
+  :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	CFLAGS=""
-      cat >conftest.$ac_ext <<_ACEOF
+  # 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 >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
+#include <ac_nonexistent.h>
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
+if { (ac_try="$ac_cpp conftest.$ac_ext"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  :
+       }; then
+  # Broken: success on invalid input.
+continue
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_c_werror_flag=$ac_save_c_werror_flag
-	 CFLAGS="-g"
-	 cat >conftest.$ac_ext <<_ACEOF
+  # 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:$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 >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		     Syntax error
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
+if { (ac_try="$ac_cpp conftest.$ac_ext"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_prog_cc_g=yes
+       }; then
+  :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  # Broken: fails on valid input.
+continue
 fi
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
+rm -f conftest.err conftest.$ac_ext
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   ac_c_werror_flag=$ac_save_c_werror_flag
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-echo "${ECHO_T}$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
-{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
-echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
-if test "${ac_cv_prog_cc_c89+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_prog_cc_c89=no
-ac_save_CC=$CC
-cat >conftest.$ac_ext <<_ACEOF
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* 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;
-}
+#include <ac_nonexistent.h>
 _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"
-  rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
+if { (ac_try="$ac_cpp conftest.$ac_ext"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_prog_cc_c89=$ac_arg
+       }; then
+  # Broken: success on invalid input.
+continue
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-
+  # Passes both tests.
+ac_preproc_ok=:
+break
 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
+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:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }; }
 fi
-# AC_CACHE_VAL
-case "x$ac_cv_prog_cc_c89" in
-  x)
-    { echo "$as_me:$LINENO: result: none needed" >&5
-echo "${ECHO_T}none needed" >&6; } ;;
-  xno)
-    { echo "$as_me:$LINENO: result: unsupported" >&5
-echo "${ECHO_T}unsupported" >&6; } ;;
-  *)
-    CC="$CC $ac_cv_prog_cc_c89"
-    { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
-esac
-
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -7345,121 +8248,11 @@ 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=
 
-{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&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
-  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
-
-    case $depmode in
-    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
-      ;;
-    none) break ;;
-    esac
-    # 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.
-    if depmode=$depmode \
-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} 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 sub/conftest.${OBJEXT-o} 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
-{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
-echo "${ECHO_T}$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
-
-{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$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
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -7486,20 +8279,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_header_stdc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_header_stdc=no
@@ -7591,37 +8385,40 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $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
 
 ( exit $ac_status )
 ac_cv_header_stdc=no
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 
 fi
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+$as_echo "$ac_cv_header_stdc" >&6; }
 if test $ac_cv_header_stdc = yes; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -7630,844 +8427,96 @@ _ACEOF
 
 fi
 
-# Check whether --enable-shared was given.
-if test "${enable_shared+set}" = set; then
-  enableval=$enable_shared; p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_shared=yes ;;
-    no) enable_shared=no ;;
-    *)
-      enable_shared=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_shared=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac
-else
-  enable_shared=yes
-fi
-
-
-# Check whether --enable-static was given.
-if test "${enable_static+set}" = set; then
-  enableval=$enable_static; p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_static=yes ;;
-    no) enable_static=no ;;
-    *)
-     enable_static=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_static=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac
-else
-  enable_static=yes
-fi
-
-
-# Check whether --enable-fast-install was given.
-if test "${enable_fast_install+set}" = set; then
-  enableval=$enable_fast_install; p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_fast_install=yes ;;
-    no) enable_fast_install=no ;;
-    *)
-      enable_fast_install=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_fast_install=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac
-else
-  enable_fast_install=yes
-fi
+# On IRIX 5.3, sys/types and inttypes.h are conflicting.
 
 
-# Make sure we can run config.sub.
-$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
-echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
-   { (exit 1); exit 1; }; }
 
-{ echo "$as_me:$LINENO: checking build system type" >&5
-echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
-if test "${ac_cv_build+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_build_alias=$build_alias
-test "x$ac_build_alias" = x &&
-  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
-test "x$ac_build_alias" = x &&
-  { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
-echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
-   { (exit 1); exit 1; }; }
-ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
 
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-echo "${ECHO_T}$ac_cv_build" >&6; }
-case $ac_cv_build in
-*-*-*) ;;
-*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
-echo "$as_me: error: invalid value of canonical build" >&2;}
-   { (exit 1); exit 1; }; };;
-esac
-build=$ac_cv_build
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_build
-shift
-build_cpu=$1
-build_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-build_os=$*
-IFS=$ac_save_IFS
-case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
 
 
-{ echo "$as_me:$LINENO: checking host system type" >&5
-echo $ECHO_N "checking host system type... $ECHO_C" >&6; }
-if test "${ac_cv_host+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "x$host_alias" = x; then
-  ac_cv_host=$ac_cv_build
-else
-  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-    { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
-fi
 
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-echo "${ECHO_T}$ac_cv_host" >&6; }
-case $ac_cv_host in
-*-*-*) ;;
-*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
-echo "$as_me: error: invalid value of canonical host" >&2;}
-   { (exit 1); exit 1; }; };;
-esac
-host=$ac_cv_host
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_host
-shift
-host_cpu=$1
-host_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-host_os=$*
-IFS=$ac_save_IFS
-case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
 
 
-{ echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
-echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6; }
-if test "${lt_cv_path_SED+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  # Loop through the user's path and test for sed and gsed.
-# Then use that list of sed's as ones to test for truncation.
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
+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
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for lt_ac_prog in sed gsed; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
-        lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
-      fi
-    done
-  done
-done
-IFS=$as_save_IFS
-lt_ac_max=0
-lt_ac_count=0
-# Add /usr/xpg4/bin/sed as it is typically found on Solaris
-# along with /bin/sed that truncates output.
-for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
-  test ! -f $lt_ac_sed && continue
-  cat /dev/null > conftest.in
-  lt_ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-  # Check for GNU sed and select it if it is found.
-  if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
-    lt_cv_path_SED=$lt_ac_sed
-    break
-  fi
-  while true; do
-    cat conftest.in conftest.in >conftest.tmp
-    mv conftest.tmp conftest.in
-    cp conftest.in conftest.nl
-    echo >>conftest.nl
-    $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
-    cmp -s conftest.out conftest.nl || break
-    # 10000 chars as input seems more than enough
-    test $lt_ac_count -gt 10 && break
-    lt_ac_count=`expr $lt_ac_count + 1`
-    if test $lt_ac_count -gt $lt_ac_max; then
-      lt_ac_max=$lt_ac_count
-      lt_cv_path_SED=$lt_ac_sed
-    fi
-  done
-done
-
-fi
-
-SED=$lt_cv_path_SED
-
-{ echo "$as_me:$LINENO: result: $SED" >&5
-echo "${ECHO_T}$SED" >&6; }
-
-
-# Check whether --with-gnu-ld was given.
-if test "${with_gnu_ld+set}" = set; then
-  withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
-else
-  with_gnu_ld=no
-fi
-
-ac_prog=ld
-if test "$GCC" = yes; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  { echo "$as_me:$LINENO: checking for ld used by $CC" >&5
-echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
-    # Accept absolute paths.
-    [\\/]* | ?:[\\/]*)
-      re_direlt='/[^/][^/]*/\.\./'
-      # Canonicalize the pathname of ld
-      ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
-      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
-      done
-      test -z "$LD" && LD="$ac_prog"
-      ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test "$with_gnu_ld" = yes; then
-  { echo "$as_me:$LINENO: checking for GNU ld" >&5
-echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }
-else
-  { echo "$as_me:$LINENO: checking for non-GNU ld" >&5
-echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }
-fi
-if test "${lt_cv_path_LD+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -z "$LD"; then
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  for ac_dir in $PATH; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      lt_cv_path_LD="$ac_dir/$ac_prog"
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some variants of GNU ld only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
-      *GNU* | *'with BFD'*)
-	test "$with_gnu_ld" != no && break
-	;;
-      *)
-	test "$with_gnu_ld" != yes && break
-	;;
-      esac
-    fi
-  done
-  IFS="$lt_save_ifs"
-else
-  lt_cv_path_LD="$LD" # Let the user override the test with a path.
-fi
-fi
-
-LD="$lt_cv_path_LD"
-if test -n "$LD"; then
-  { echo "$as_me:$LINENO: result: $LD" >&5
-echo "${ECHO_T}$LD" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
-echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
-   { (exit 1); exit 1; }; }
-{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
-echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }
-if test "${lt_cv_prog_gnu_ld+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  # I'd rather use --version here, but apparently some GNU lds only accept -v.
-case `$LD -v 2>&1 </dev/null` in
-*GNU* | *'with BFD'*)
-  lt_cv_prog_gnu_ld=yes
-  ;;
-*)
-  lt_cv_prog_gnu_ld=no
-  ;;
-esac
-fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
-echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; }
-with_gnu_ld=$lt_cv_prog_gnu_ld
-
-
-{ echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
-echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6; }
-if test "${lt_cv_ld_reload_flag+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  lt_cv_ld_reload_flag='-r'
-fi
-{ echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
-echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6; }
-reload_flag=$lt_cv_ld_reload_flag
-case $reload_flag in
-"" | " "*) ;;
-*) reload_flag=" $reload_flag" ;;
-esac
-reload_cmds='$LD$reload_flag -o $output$reload_objs'
-case $host_os in
-  darwin*)
-    if test "$GCC" = yes; then
-      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
-    else
-      reload_cmds='$LD$reload_flag -o $output$reload_objs'
-    fi
-    ;;
-esac
-
-{ echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
-echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6; }
-if test "${lt_cv_path_NM+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$NM"; then
-  # Let the user override the test.
-  lt_cv_path_NM="$NM"
-else
-  lt_nm_to_check="${ac_tool_prefix}nm"
-  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
-    lt_nm_to_check="$lt_nm_to_check nm"
-  fi
-  for lt_tmp_nm in $lt_nm_to_check; do
-    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
-      IFS="$lt_save_ifs"
-      test -z "$ac_dir" && ac_dir=.
-      tmp_nm="$ac_dir/$lt_tmp_nm"
-      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
-	# Check to see if the nm accepts a BSD-compat flag.
-	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
-	#   nm: unknown option "B" ignored
-	# Tru64's nm complains that /dev/null is an invalid object file
-	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
-	*/dev/null* | *'Invalid file or object type'*)
-	  lt_cv_path_NM="$tmp_nm -B"
-	  break
-	  ;;
-	*)
-	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
-	  */dev/null*)
-	    lt_cv_path_NM="$tmp_nm -p"
-	    break
-	    ;;
-	  *)
-	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-	    continue # so that we can try to find one that supports BSD flags
-	    ;;
-	  esac
-	  ;;
-	esac
-      fi
-    done
-    IFS="$lt_save_ifs"
-  done
-  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
-fi
-fi
-{ echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
-echo "${ECHO_T}$lt_cv_path_NM" >&6; }
-NM="$lt_cv_path_NM"
-
-{ echo "$as_me:$LINENO: checking whether ln -s works" >&5
-echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; }
-LN_S=$as_ln_s
-if test "$LN_S" = "ln -s"; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no, using $LN_S" >&5
-echo "${ECHO_T}no, using $LN_S" >&6; }
-fi
-
-{ echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5
-echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6; }
-if test "${lt_cv_deplibs_check_method+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  lt_cv_file_magic_cmd='$MAGIC_CMD'
-lt_cv_file_magic_test_file=
-lt_cv_deplibs_check_method='unknown'
-# Need to set the preceding variable on all platforms that support
-# interlibrary dependencies.
-# 'none' -- dependencies not supported.
-# `unknown' -- same as none, but documents that we really don't know.
-# 'pass_all' -- all dependencies passed with no checks.
-# 'test_compile' -- check by making test program.
-# 'file_magic [[regex]]' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given extended regex.
-# If you have `file' or equivalent on your system and you're not sure
-# whether `pass_all' will *always* work, you probably want this one.
-
-case $host_os in
-aix4* | aix5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-beos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-bsdi[45]*)
-  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  ;;
-
-cygwin*)
-  # func_win32_libid is a shell function defined in ltmain.sh
-  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-  lt_cv_file_magic_cmd='func_win32_libid'
-  ;;
-
-mingw* | pw32*)
-  # Base MSYS/MinGW do not provide the 'file' command needed by
-  # func_win32_libid shell function, so use a weaker test based on 'objdump'.
-  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-  lt_cv_file_magic_cmd='$OBJDUMP -f'
-  ;;
-
-darwin* | rhapsody*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-freebsd* | kfreebsd*-gnu | dragonfly*)
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    case $host_cpu in
-    i*86 )
-      # Not sure whether the presence of OpenBSD here was a mistake.
-      # Let's accept both of them until this is cleared up.
-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library'
-      lt_cv_file_magic_cmd=/usr/bin/file
-      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-      ;;
-    esac
-  else
-    lt_cv_deplibs_check_method=pass_all
-  fi
-  ;;
-
-gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-hpux10.20* | hpux11*)
-  lt_cv_file_magic_cmd=/usr/bin/file
-  case $host_cpu in
-  ia64*)
-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
-    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-    ;;
-  hppa*64*)
-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'
-    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
-    ;;
-  *)
-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
-    lt_cv_file_magic_test_file=/usr/lib/libc.sl
-    ;;
-  esac
-  ;;
-
-interix3*)
-  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
-  lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $LD in
-  *-32|*"-32 ") libmagic=32-bit;;
-  *-n32|*"-n32 ") libmagic=N32;;
-  *-64|*"-64 ") libmagic=64-bit;;
-  *) libmagic=never-match;;
-  esac
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-# This must be Linux ELF.
-linux*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-netbsd*)
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'
-  fi
-  ;;
-
-newos6*)
-  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'
-  lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=/usr/lib/libnls.so
-  ;;
-
-nto-qnx*)
-  lt_cv_deplibs_check_method=unknown
-  ;;
-
-openbsd*)
-  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
-  fi
-  ;;
-
-osf3* | osf4* | osf5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-solaris*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv4 | sysv4.3*)
-  case $host_vendor in
-  motorola)
-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-    ;;
-  ncr)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  sequent)
-    lt_cv_file_magic_cmd='/bin/file'
-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'
-    ;;
-  sni)
-    lt_cv_file_magic_cmd='/bin/file'
-    lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib"
-    lt_cv_file_magic_test_file=/lib/libc.so
-    ;;
-  siemens)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  pc)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  esac
-  ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-esac
-
-fi
-{ echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
-echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6; }
-file_magic_cmd=$lt_cv_file_magic_cmd
-deplibs_check_method=$lt_cv_deplibs_check_method
-test -z "$deplibs_check_method" && deplibs_check_method=unknown
-
-
-
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# If no C compiler flags were specified, use CFLAGS.
-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-
-# Check whether --enable-libtool-lock was given.
-if test "${enable_libtool_lock+set}" = set; then
-  enableval=$enable_libtool_lock;
-fi
-
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-
-# Some flags need to be propagated to the compiler or linker for good
-# libtool support.
-case $host in
-ia64-*-hpux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-    case `/usr/bin/file conftest.$ac_objext` in
-    *ELF-32*)
-      HPUX_IA64_MODE="32"
-      ;;
-    *ELF-64*)
-      HPUX_IA64_MODE="64"
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-*-*-irix6*)
-  # Find out which ABI we are using.
-  echo '#line 8268 "configure"' > conftest.$ac_ext
-  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-   if test "$lt_cv_prog_gnu_ld" = yes; then
-    case `/usr/bin/file conftest.$ac_objext` in
-    *32-bit*)
-      LD="${LD-ld} -melf32bsmip"
-      ;;
-    *N32*)
-      LD="${LD-ld} -melf32bmipn32"
-      ;;
-    *64-bit*)
-      LD="${LD-ld} -melf64bmip"
-      ;;
-    esac
-   else
-    case `/usr/bin/file conftest.$ac_objext` in
-    *32-bit*)
-      LD="${LD-ld} -32"
-      ;;
-    *N32*)
-      LD="${LD-ld} -n32"
-      ;;
-    *64-bit*)
-      LD="${LD-ld} -64"
-      ;;
-    esac
-   fi
-  fi
-  rm -rf conftest*
-  ;;
-
-x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-    case `/usr/bin/file conftest.o` in
-    *32-bit*)
-      case $host in
-        x86_64-*linux*)
-          LD="${LD-ld} -m elf_i386"
-          ;;
-        ppc64-*linux*|powerpc64-*linux*)
-          LD="${LD-ld} -m elf32ppclinux"
-          ;;
-        s390x-*linux*)
-          LD="${LD-ld} -m elf_s390"
-          ;;
-        sparc64-*linux*)
-          LD="${LD-ld} -m elf32_sparc"
-          ;;
-      esac
-      ;;
-    *64-bit*)
-      case $host in
-        x86_64-*linux*)
-          LD="${LD-ld} -m elf_x86_64"
-          ;;
-        ppc*-*linux*|powerpc*-*linux*)
-          LD="${LD-ld} -m elf64ppc"
-          ;;
-        s390*-*linux*)
-          LD="${LD-ld} -m elf64_s390"
-          ;;
-        sparc*-*linux*)
-          LD="${LD-ld} -m elf64_sparc"
-          ;;
-      esac
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
-*-*-sco3.2v5*)
-  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-  SAVE_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS -belf"
-  { echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
-echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6; }
-if test "${lt_cv_cc_needs_belf+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
 else
-  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
-
-     cat >conftest.$ac_ext <<_ACEOF
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
+$ac_includes_default
 
-int
-main ()
-{
-
-  ;
-  return 0;
-}
+#include <$ac_header>
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
+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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  lt_cv_cc_needs_belf=yes
+       } && test -s conftest.$ac_objext; then
+  eval "$as_ac_Header=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	lt_cv_cc_needs_belf=no
+	eval "$as_ac_Header=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-     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
-
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
-echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6; }
-  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
-    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-    CFLAGS="$SAVE_CFLAGS"
-  fi
-  ;;
-sparc*-*solaris*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-    case `/usr/bin/file conftest.o` in
-    *64-bit*)
-      case $lt_cv_prog_gnu_ld in
-      yes*) LD="${LD-ld} -m elf64_sparc" ;;
-      *)    LD="${LD-ld} -64" ;;
-      esac
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
 
-esac
+fi
 
-need_locks="$enable_libtool_lock"
+done
 
 
 
 for ac_header in dlfcn.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+  $as_echo_n "(cached) " >&6
 else
-  # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
+
 #include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext
@@ -8476,119 +8525,45 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
+  eval "$as_ac_Header=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_header_compiler=no
+	eval "$as_ac_Header=no"
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
 fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    ( cat <<\_ASBOX
-## ------------------------------------------------------------------------ ##
-## Report this to http://sourceforge.net/tracker/?group_id=5528&atid=105528 ##
-## ------------------------------------------------------------------------ ##
-_ASBOX
-     ) | sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
 
 done
 
+
+
 ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -8603,10 +8578,10 @@ if test -z "$CXX"; then
   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
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CXX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CXX"; then
   ac_cv_prog_CXX="$CXX" # Let the user override the test.
@@ -8619,7 +8594,7 @@ do
   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_CXX="$ac_tool_prefix$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -8630,11 +8605,11 @@ fi
 fi
 CXX=$ac_cv_prog_CXX
 if test -n "$CXX"; then
-  { echo "$as_me:$LINENO: result: $CXX" >&5
-echo "${ECHO_T}$CXX" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CXX" >&5
+$as_echo "$CXX" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -8647,10 +8622,10 @@ if test -z "$CXX"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CXX"; then
   ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
@@ -8663,7 +8638,7 @@ do
   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_CXX="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -8674,11 +8649,11 @@ fi
 fi
 ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
 if test -n "$ac_ct_CXX"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
-echo "${ECHO_T}$ac_ct_CXX" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
+$as_echo "$ac_ct_CXX" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -8690,12 +8665,8 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+{ $as_echo "$as_me:$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
     CXX=$ac_ct_CXX
@@ -8705,43 +8676,47 @@ fi
   fi
 fi
 # Provide some information about the compiler.
-echo "$as_me:$LINENO: checking for C++ compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
+$as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
 { (ac_try="$ac_compiler --version >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler --version >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 { (ac_try="$ac_compiler -v >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler -v >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 { (ac_try="$ac_compiler -V >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler -V >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 
-{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$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_cxx_compiler_gnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -8767,20 +8742,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_compiler_gnu=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_compiler_gnu=no
@@ -8790,15 +8766,19 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; }
-GXX=`test $ac_compiler_gnu = yes && echo yes`
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
+$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+  GXX=yes
+else
+  GXX=
+fi
 ac_test_CXXFLAGS=${CXXFLAGS+set}
 ac_save_CXXFLAGS=$CXXFLAGS
-{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
-echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
+$as_echo_n "checking whether $CXX accepts -g... " >&6; }
 if test "${ac_cv_prog_cxx_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_save_cxx_werror_flag=$ac_cxx_werror_flag
    ac_cxx_werror_flag=yes
@@ -8825,20 +8805,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_prog_cxx_g=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	CXXFLAGS=""
@@ -8863,20 +8844,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cxx_werror_flag=$ac_save_cxx_werror_flag
@@ -8902,20 +8884,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_prog_cxx_g=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -8930,8 +8913,8 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    ac_cxx_werror_flag=$ac_save_cxx_werror_flag
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
+$as_echo "$ac_cv_prog_cxx_g" >&6; }
 if test "$ac_test_CXXFLAGS" = set; then
   CXXFLAGS=$ac_save_CXXFLAGS
 elif test $ac_cv_prog_cxx_g = yes; then
@@ -8947,18 +8930,18 @@ else
     CXXFLAGS=
   fi
 fi
-ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+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="$CXX"  am_compiler_list=
 
-{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+$as_echo_n "checking dependency style of $depcc... " >&6; }
 if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $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
@@ -8983,6 +8966,11 @@ else
   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
@@ -9000,7 +8988,17 @@ else
     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
@@ -9010,19 +9008,23 @@ 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
-    # 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.
     if depmode=$depmode \
-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
+       source=sub/conftest.c object=$am__obj \
        depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+       $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 sub/conftest.${OBJEXT-o} 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
@@ -9046,8 +9048,8 @@ else
 fi
 
 fi
-{ echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
-echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
+$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
 CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
 
  if
@@ -9061,8 +9063,6 @@ else
 fi
 
 
-
-
 if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
     ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
     (test "X$CXX" != "Xg++"))) ; then
@@ -9071,11 +9071,11 @@ ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-{ echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
-echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
+$as_echo_n "checking how to run the C++ preprocessor... " >&6; }
 if test -z "$CXXCPP"; then
   if test "${ac_cv_prog_CXXCPP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
       # Double quotes because CXXCPP needs to be expanded
     for CXXCPP in "$CXX -E" "/lib/cpp"
@@ -9107,20 +9107,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Broken: fails on valid input.
@@ -9144,13 +9145,14 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
@@ -9158,7 +9160,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   # Broken: success on invalid input.
 continue
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Passes both tests.
@@ -9183,8 +9185,8 @@ fi
 else
   ac_cv_prog_CXXCPP=$CXXCPP
 fi
-{ echo "$as_me:$LINENO: result: $CXXCPP" >&5
-echo "${ECHO_T}$CXXCPP" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $CXXCPP" >&5
+$as_echo "$CXXCPP" >&6; }
 ac_preproc_ok=false
 for ac_cxx_preproc_warn_flag in '' yes
 do
@@ -9212,20 +9214,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Broken: fails on valid input.
@@ -9249,13 +9252,14 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
@@ -9263,7 +9267,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   # Broken: success on invalid input.
 continue
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Passes both tests.
@@ -9279,623 +9283,200 @@ rm -f conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then
   :
 else
-  { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check
-See \`config.log' for more details." >&5
-echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+_lt_caught_CXX_error=yes; }
 fi
 
-ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+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
 
+else
+  _lt_caught_CXX_error=yes
 fi
 
 
-ac_ext=f
-ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
-ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_f77_compiler_gnu
-if test -n "$ac_tool_prefix"; then
-  for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn
-  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
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_F77+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$F77"; then
-  ac_cv_prog_F77="$F77" # 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_F77="$ac_tool_prefix$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
 
-fi
-fi
-F77=$ac_cv_prog_F77
-if test -n "$F77"; then
-  { echo "$as_me:$LINENO: result: $F77" >&5
-echo "${ECHO_T}$F77" >&6; }
+
+
+# Set options
+
+
+
+        enable_dlopen=no
+
+
+  enable_win32_dll=no
+
+
+            # Check whether --enable-shared was given.
+if test "${enable_shared+set}" = set; then
+  enableval=$enable_shared; p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_shared=yes ;;
+    no) enable_shared=no ;;
+    *)
+      enable_shared=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_shared=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  enable_shared=yes
 fi
 
 
-    test -n "$F77" && break
-  done
-fi
-if test -z "$F77"; then
-  ac_ct_F77=$F77
-  for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_F77+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_F77"; then
-  ac_cv_prog_ac_ct_F77="$ac_ct_F77" # 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_F77="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
 
-fi
-fi
-ac_ct_F77=$ac_cv_prog_ac_ct_F77
-if test -n "$ac_ct_F77"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_F77" >&5
-echo "${ECHO_T}$ac_ct_F77" >&6; }
+
+
+
+
+
+
+  # Check whether --enable-static was given.
+if test "${enable_static+set}" = set; then
+  enableval=$enable_static; p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_static=yes ;;
+    no) enable_static=no ;;
+    *)
+     enable_static=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_static=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  enable_static=yes
 fi
 
 
-  test -n "$ac_ct_F77" && break
-done
 
-  if test "x$ac_ct_F77" = x; then
-    F77=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
-    F77=$ac_ct_F77
-  fi
-fi
 
 
-# Provide some information about the compiler.
-echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
-{ (ac_try="$ac_compiler --version >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compiler --version >&5") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (ac_try="$ac_compiler -v >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compiler -v >&5") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (ac_try="$ac_compiler -V >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compiler -V >&5") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-rm -f a.out
 
-# If we don't use `.F' as extension, the preprocessor is not run on the
-# input file.  (Note that this only needs to work for GNU compilers.)
-ac_save_ext=$ac_ext
-ac_ext=F
-{ echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6; }
-if test "${ac_cv_f77_compiler_gnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-      program main
-#ifndef __GNUC__
-       choke me
-#endif
 
-      end
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_f77_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_compiler_gnu=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_compiler_gnu=no
-fi
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_f77_compiler_gnu=$ac_compiler_gnu
 
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6; }
-ac_ext=$ac_save_ext
-ac_test_FFLAGS=${FFLAGS+set}
-ac_save_FFLAGS=$FFLAGS
-FFLAGS=
-{ echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5
-echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6; }
-if test "${ac_cv_prog_f77_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+# Check whether --with-pic was given.
+if test "${with_pic+set}" = set; then
+  withval=$with_pic; pic_mode="$withval"
 else
-  FFLAGS=-g
-cat >conftest.$ac_ext <<_ACEOF
-      program main
+  pic_mode=default
+fi
 
-      end
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_f77_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_prog_f77_g=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_prog_f77_g=no
-fi
+test -z "$pic_mode" && pic_mode=default
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
-echo "${ECHO_T}$ac_cv_prog_f77_g" >&6; }
-if test "$ac_test_FFLAGS" = set; then
-  FFLAGS=$ac_save_FFLAGS
-elif test $ac_cv_prog_f77_g = yes; then
-  if test "x$ac_cv_f77_compiler_gnu" = xyes; then
-    FFLAGS="-g -O2"
-  else
-    FFLAGS="-g"
-  fi
+
+
+
+
+
+  # Check whether --enable-fast-install was given.
+if test "${enable_fast_install+set}" = set; then
+  enableval=$enable_fast_install; p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_fast_install=yes ;;
+    no) enable_fast_install=no ;;
+    *)
+      enable_fast_install=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_fast_install=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac
 else
-  if test "x$ac_cv_f77_compiler_gnu" = xyes; then
-    FFLAGS="-O2"
-  else
-    FFLAGS=
-  fi
+  enable_fast_install=yes
 fi
 
-G77=`test $ac_compiler_gnu = yes && echo yes`
-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
 
 
 
-# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
 
-# find the maximum length of command line arguments
-{ echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
-echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; }
-if test "${lt_cv_sys_max_cmd_len+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-    i=0
-  teststring="ABCD"
 
-  case $build_os in
-  msdosdjgpp*)
-    # On DJGPP, this test can blow up pretty badly due to problems in libc
-    # (any single argument exceeding 2000 bytes causes a buffer overrun
-    # during glob expansion).  Even if it were fixed, the result of this
-    # check would be larger than it should be.
-    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
-    ;;
 
-  gnu*)
-    # Under GNU Hurd, this test is not required because there is
-    # no limit to the length of command line arguments.
-    # Libtool will interpret -1 as no limit whatsoever
-    lt_cv_sys_max_cmd_len=-1;
-    ;;
 
-  cygwin* | mingw*)
-    # On Win9x/ME, this test blows up -- it succeeds, but takes
-    # about 5 minutes as the teststring grows exponentially.
-    # Worse, since 9x/ME are not pre-emptively multitasking,
-    # you end up with a "frozen" computer, even though with patience
-    # the test eventually succeeds (with a max line length of 256k).
-    # Instead, let's just punt: use the minimum linelength reported by
-    # all of the supported platforms: 8192 (on NT/2K/XP).
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
 
-  amigaos*)
-    # On AmigaOS with pdksh, this test takes hours, literally.
-    # So we just punt and use a minimum line length of 8192.
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
 
-  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
-    # This has been around since 386BSD, at least.  Likely further.
-    if test -x /sbin/sysctl; then
-      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
-    elif test -x /usr/sbin/sysctl; then
-      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
-    else
-      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
-    fi
-    # And add a safety zone
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-    ;;
 
-  interix*)
-    # We know the value 262144 and hardcode it with a safety zone (like BSD)
-    lt_cv_sys_max_cmd_len=196608
-    ;;
+# This can be used to rebuild libtool when needed
+LIBTOOL_DEPS="$ltmain"
 
-  osf*)
-    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
-    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
-    # nice to cause kernel panics so lets avoid the loop below.
-    # First set a reasonable default.
-    lt_cv_sys_max_cmd_len=16384
-    #
-    if test -x /sbin/sysconfig; then
-      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
-        *1*) lt_cv_sys_max_cmd_len=-1 ;;
-      esac
-    fi
-    ;;
-  sco3.2v5*)
-    lt_cv_sys_max_cmd_len=102400
-    ;;
-  sysv5* | sco5v6* | sysv4.2uw2*)
-    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
-    if test -n "$kargmax"; then
-      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[ 	]//'`
-    else
-      lt_cv_sys_max_cmd_len=32768
-    fi
-    ;;
-  *)
-    # If test is not a shell built-in, we'll probably end up computing a
-    # maximum length that is only half of the actual maximum length, but
-    # we can't tell.
-    SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-    while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \
-	       = "XX$teststring") >/dev/null 2>&1 &&
-	    new_result=`expr "X$teststring" : ".*" 2>&1` &&
-	    lt_cv_sys_max_cmd_len=$new_result &&
-	    test $i != 17 # 1/2 MB should be enough
-    do
-      i=`expr $i + 1`
-      teststring=$teststring$teststring
-    done
-    teststring=
-    # Add a significant safety factor because C++ compilers can tack on massive
-    # amounts of additional arguments before passing them to the linker.
-    # It appears as though 1/2 is a usable value.
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
-    ;;
-  esac
+# Always use our own libtool.
+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
 
-fi
 
-if test -n $lt_cv_sys_max_cmd_len ; then
-  { echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
-echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6; }
-else
-  { echo "$as_me:$LINENO: result: none" >&5
-echo "${ECHO_T}none" >&6; }
-fi
 
 
 
 
-# Check for command to grab the raw symbol name followed by C symbol from nm.
-{ echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
-echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; }
-if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
 
-# These are sane defaults that work on at least a few old systems.
-# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
 
-# Character class describing NM global symbol codes.
-symcode='[BCDEGRST]'
 
-# Regexp to match symbols that can be accessed directly from C.
-sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
 
-# Transform an extracted symbol line into a proper C declaration
-lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
 
-# Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
 
-# Define system-specific variables.
-case $host_os in
-aix*)
-  symcode='[BCDT]'
-  ;;
-cygwin* | mingw* | pw32*)
-  symcode='[ABCDGISTW]'
-  ;;
-hpux*) # Its linker distinguishes data from code symbols
-  if test "$host_cpu" = ia64; then
-    symcode='[ABCDEGRST]'
-  fi
-  lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-  lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
-  ;;
-linux*)
-  if test "$host_cpu" = ia64; then
-    symcode='[ABCDGIRSTW]'
-    lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-    lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
-  fi
-  ;;
-irix* | nonstopux*)
-  symcode='[BCDEGRST]'
-  ;;
-osf*)
-  symcode='[BCDEGQRST]'
-  ;;
-solaris*)
-  symcode='[BDRT]'
-  ;;
-sco3.2v5*)
-  symcode='[DT]'
-  ;;
-sysv4.2uw2*)
-  symcode='[DT]'
-  ;;
-sysv5* | sco5v6* | unixware* | OpenUNIX*)
-  symcode='[ABDT]'
-  ;;
-sysv4)
-  symcode='[DFNSTU]'
-  ;;
-esac
 
-# Handle CRLF in mingw tool chain
-opt_cr=
-case $build_os in
-mingw*)
-  opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp
-  ;;
-esac
 
-# If we're using GNU nm, then use its standard symbol codes.
-case `$NM -V 2>&1` in
-*GNU* | *'with BFD'*)
-  symcode='[ABCDGIRSTW]' ;;
-esac
 
-# Try without a prefix undercore, then with it.
-for ac_symprfx in "" "_"; do
 
-  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
-  symxfrm="\\1 $ac_symprfx\\2 \\2"
 
-  # Write the raw and C identifiers.
-  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ 	]\($symcode$symcode*\)[ 	][ 	]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
 
-  # Check to see that the pipe works correctly.
-  pipe_works=no
 
-  rm -f conftest*
-  cat > conftest.$ac_ext <<EOF
-#ifdef __cplusplus
-extern "C" {
-#endif
-char nm_test_var;
-void nm_test_func(){}
-#ifdef __cplusplus
-}
-#endif
-int main(){nm_test_var='a';nm_test_func();return(0);}
-EOF
 
-  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-    # Now try to grab the symbols.
-    nlist=conftest.nm
-    if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5
-  (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && test -s "$nlist"; then
-      # Try sorting and uniquifying the output.
-      if sort "$nlist" | uniq > "$nlist"T; then
-	mv -f "$nlist"T "$nlist"
-      else
-	rm -f "$nlist"T
-      fi
 
-      # Make sure that we snagged all the symbols we need.
-      if grep ' nm_test_var$' "$nlist" >/dev/null; then
-	if grep ' nm_test_func$' "$nlist" >/dev/null; then
-	  cat <<EOF > conftest.$ac_ext
-#ifdef __cplusplus
-extern "C" {
-#endif
 
-EOF
-	  # Now generate the symbol file.
-	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext'
 
-	  cat <<EOF >> conftest.$ac_ext
-#if defined (__STDC__) && __STDC__
-# define lt_ptr_t void *
-#else
-# define lt_ptr_t char *
-# define const
-#endif
 
-/* The mapping between symbol names and symbols. */
-const struct {
-  const char *name;
-  lt_ptr_t address;
-}
-lt_preloaded_symbols[] =
-{
-EOF
-	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext
-	  cat <<\EOF >> conftest.$ac_ext
-  {0, (lt_ptr_t) 0}
-};
 
-#ifdef __cplusplus
-}
-#endif
-EOF
-	  # Now try linking the two files.
-	  mv conftest.$ac_objext conftstm.$ac_objext
-	  lt_save_LIBS="$LIBS"
-	  lt_save_CFLAGS="$CFLAGS"
-	  LIBS="conftstm.$ac_objext"
-	  CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
-	  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && test -s conftest${ac_exeext}; then
-	    pipe_works=yes
-	  fi
-	  LIBS="$lt_save_LIBS"
-	  CFLAGS="$lt_save_CFLAGS"
-	else
-	  echo "cannot find nm_test_func in $nlist" >&5
-	fi
-      else
-	echo "cannot find nm_test_var in $nlist" >&5
-      fi
-    else
-      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5
-    fi
-  else
-    echo "$progname: failed program was:" >&5
-    cat conftest.$ac_ext >&5
-  fi
-  rm -f conftest* conftst*
+test -z "$LN_S" && LN_S="ln -s"
 
-  # Do not use the global_symbol_pipe unless it works.
-  if test "$pipe_works" = yes; then
-    break
-  else
-    lt_cv_sys_global_symbol_pipe=
-  fi
-done
 
-fi
 
-if test -z "$lt_cv_sys_global_symbol_pipe"; then
-  lt_cv_sys_global_symbol_to_cdecl=
-fi
-if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
-  { echo "$as_me:$LINENO: result: failed" >&5
-echo "${ECHO_T}failed" >&6; }
-else
-  { echo "$as_me:$LINENO: result: ok" >&5
-echo "${ECHO_T}ok" >&6; }
+
+
+
+
+
+
+
+
+
+
+
+if test -n "${ZSH_VERSION+set}" ; then
+   setopt NO_GLOB_SUBST
 fi
 
-{ echo "$as_me:$LINENO: checking for objdir" >&5
-echo $ECHO_N "checking for objdir... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for objdir" >&5
+$as_echo_n "checking for objdir... " >&6; }
 if test "${lt_cv_objdir+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   rm -f .libs 2>/dev/null
 mkdir .libs 2>/dev/null
@@ -9907,14 +9488,34 @@ else
 fi
 rmdir .libs 2>/dev/null
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
-echo "${ECHO_T}$lt_cv_objdir" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
+$as_echo "$lt_cv_objdir" >&6; }
 objdir=$lt_cv_objdir
 
 
 
 
 
+cat >>confdefs.h <<_ACEOF
+#define LT_OBJDIR "$lt_cv_objdir/"
+_ACEOF
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 case $host_os in
 aix3*)
   # AIX sometimes has problems with the GCC collect2 program.  For some
@@ -9929,360 +9530,41 @@ esac
 
 # Sed substitution that helps us do robust quoting.  It backslashifies
 # metacharacters that are still active within double-quoted strings.
-Xsed='sed -e 1s/^X//'
-sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
+sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
 
 # Same as above, but do not quote variable references.
-double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g'
+double_quote_subst='s/\(["`\\]\)/\\\1/g'
 
 # Sed substitution to delay expansion of an escaped shell variable in a
 # double_quote_subst'ed string.
 delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
 
+# Sed substitution to delay expansion of an escaped single quote.
+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
+
 # Sed substitution to avoid accidental globbing in evaled expressions
 no_glob_subst='s/\*/\\\*/g'
 
-# Constants:
-rm="rm -f"
-
 # Global variables:
-default_ofile=libtool
+ofile=libtool
 can_build_shared=yes
 
 # All known linkers require a `.a' archive for static linking (except MSVC,
 # which needs '.lib').
 libext=a
-ltmain="$ac_aux_dir/ltmain.sh"
-ofile="$default_ofile"
-with_gnu_ld="$lt_cv_prog_gnu_ld"
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ar; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_AR+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$AR"; then
-  ac_cv_prog_AR="$AR" # 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_AR="${ac_tool_prefix}ar"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-AR=$ac_cv_prog_AR
-if test -n "$AR"; then
-  { echo "$as_me:$LINENO: result: $AR" >&5
-echo "${ECHO_T}$AR" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_AR"; then
-  ac_ct_AR=$AR
-  # Extract the first word of "ar", so it can be a program name with args.
-set dummy ar; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_AR"; then
-  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # 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_AR="ar"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_AR=$ac_cv_prog_ac_ct_AR
-if test -n "$ac_ct_AR"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
-echo "${ECHO_T}$ac_ct_AR" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-  if test "x$ac_ct_AR" = x; then
-    AR="false"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
-    AR=$ac_ct_AR
-  fi
-else
-  AR="$ac_cv_prog_AR"
-fi
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_RANLIB+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # 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_RANLIB="${ac_tool_prefix}ranlib"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-RANLIB=$ac_cv_prog_RANLIB
-if test -n "$RANLIB"; then
-  { echo "$as_me:$LINENO: result: $RANLIB" >&5
-echo "${ECHO_T}$RANLIB" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_RANLIB"; then
-  ac_ct_RANLIB=$RANLIB
-  # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_RANLIB"; then
-  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # 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_RANLIB="ranlib"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
-if test -n "$ac_ct_RANLIB"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
-echo "${ECHO_T}$ac_ct_RANLIB" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-  if test "x$ac_ct_RANLIB" = x; then
-    RANLIB=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
-    RANLIB=$ac_ct_RANLIB
-  fi
-else
-  RANLIB="$ac_cv_prog_RANLIB"
-fi
-
-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
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_STRIP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&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"
-    echo "$as_me:$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
-  { echo "$as_me:$LINENO: result: $STRIP" >&5
-echo "${ECHO_T}$STRIP" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}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
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&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"
-    echo "$as_me:$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
-  { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-echo "${ECHO_T}$ac_ct_STRIP" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-  if test "x$ac_ct_STRIP" = x; then
-    STRIP=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
-    STRIP=$ac_ct_STRIP
-  fi
-else
-  STRIP="$ac_cv_prog_STRIP"
-fi
 
+with_gnu_ld="$lt_cv_prog_gnu_ld"
 
 old_CC="$CC"
 old_CFLAGS="$CFLAGS"
 
 # Set sane defaults for various variables
-test -z "$AR" && AR=ar
-test -z "$AR_FLAGS" && AR_FLAGS=cru
-test -z "$AS" && AS=as
 test -z "$CC" && CC=cc
 test -z "$LTCC" && LTCC=$CC
 test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
-test -z "$DLLTOOL" && DLLTOOL=dlltool
 test -z "$LD" && LD=ld
-test -z "$LN_S" && LN_S="ln -s"
-test -z "$MAGIC_CMD" && MAGIC_CMD=file
-test -z "$NM" && NM=nm
-test -z "$SED" && SED=sed
-test -z "$OBJDUMP" && OBJDUMP=objdump
-test -z "$RANLIB" && RANLIB=:
-test -z "$STRIP" && STRIP=:
 test -z "$ac_objext" && ac_objext=o
 
-# Determine commands to create old-style static archives.
-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
-old_postinstall_cmds='chmod 644 $oldlib'
-old_postuninstall_cmds=
-
-if test -n "$RANLIB"; then
-  case $host_os in
-  openbsd*)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
-    ;;
-  *)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
-    ;;
-  esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
-fi
-
 for cc_temp in $compiler""; do
   case $cc_temp in
     compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
@@ -10291,17 +9573,18 @@ for cc_temp in $compiler""; do
     *) break;;
   esac
 done
-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 
 
 # Only perform the check for file, if the check method requires it
+test -z "$MAGIC_CMD" && MAGIC_CMD=file
 case $deplibs_check_method in
 file_magic*)
   if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    { echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
-echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
+$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
 if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case $MAGIC_CMD in
 [\\/*] |  ?:[\\/]*)
@@ -10325,7 +9608,7 @@ else
 	    $EGREP "$file_magic_regex" > /dev/null; then
 	    :
 	  else
-	    cat <<EOF 1>&2
+	    cat <<_LT_EOF 1>&2
 
 *** Warning: the command libtool uses to detect shared libraries,
 *** $file_magic_cmd, produces output that libtool cannot recognize.
@@ -10336,7 +9619,7 @@ else
 *** may want to report the problem to your system manager and/or to
 *** bug-libtool@gnu.org
 
-EOF
+_LT_EOF
 	  fi ;;
 	esac
       fi
@@ -10351,19 +9634,23 @@ fi
 
 MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
 if test -n "$MAGIC_CMD"; then
-  { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
-echo "${ECHO_T}$MAGIC_CMD" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
+$as_echo "$MAGIC_CMD" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
+
+
+
 if test -z "$lt_cv_path_MAGIC_CMD"; then
   if test -n "$ac_tool_prefix"; then
-    { echo "$as_me:$LINENO: checking for file" >&5
-echo $ECHO_N "checking for file... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for file" >&5
+$as_echo_n "checking for file... " >&6; }
 if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case $MAGIC_CMD in
 [\\/*] |  ?:[\\/]*)
@@ -10387,7 +9674,7 @@ else
 	    $EGREP "$file_magic_regex" > /dev/null; then
 	    :
 	  else
-	    cat <<EOF 1>&2
+	    cat <<_LT_EOF 1>&2
 
 *** Warning: the command libtool uses to detect shared libraries,
 *** $file_magic_cmd, produces output that libtool cannot recognize.
@@ -10398,7 +9685,7 @@ else
 *** may want to report the problem to your system manager and/or to
 *** bug-libtool@gnu.org
 
-EOF
+_LT_EOF
 	  fi ;;
 	esac
       fi
@@ -10413,13 +9700,14 @@ fi
 
 MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
 if test -n "$MAGIC_CMD"; then
-  { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
-echo "${ECHO_T}$MAGIC_CMD" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
+$as_echo "$MAGIC_CMD" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
   else
     MAGIC_CMD=:
   fi
@@ -10429,28 +9717,8 @@ fi
   ;;
 esac
 
-enable_dlopen=no
-enable_win32_dll=no
-
-# Check whether --enable-libtool-lock was given.
-if test "${enable_libtool_lock+set}" = set; then
-  enableval=$enable_libtool_lock;
-fi
-
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-
-
-# Check whether --with-pic was given.
-if test "${with_pic+set}" = set; then
-  withval=$with_pic; pic_mode="$withval"
-else
-  pic_mode=default
-fi
-
-test -z "$pic_mode" && pic_mode=default
-
 # Use C for the default configuration in the libtool script
-tagname=
+
 lt_save_CC="$CC"
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -10467,10 +9735,15 @@ objext=o
 objext=$objext
 
 # Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;\n"
+lt_simple_compile_test_code="int some_variable = 0;"
 
 # Code to be used in simple link tests
-lt_simple_link_test_code='int main(){return(0);}\n'
+lt_simple_link_test_code='int main(){return(0);}'
+
+
+
+
+
 
 
 # If no C compiler was specified, use CC.
@@ -10482,36 +9755,43 @@ LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
 # Allow CC to be a program name with arguments.
 compiler=$CC
 
+# Save the default compiler, since it gets overwritten when the other
+# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP.
+compiler_DEFAULT=$CC
 
 # save warnings/boilerplate of simple test code
 ac_outfile=conftest.$ac_objext
-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
 eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_compiler_boilerplate=`cat conftest.err`
-$rm conftest*
+$RM conftest*
 
 ac_outfile=conftest.$ac_objext
-printf "$lt_simple_link_test_code" >conftest.$ac_ext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
 eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_linker_boilerplate=`cat conftest.err`
-$rm conftest*
+$RM -r conftest*
 
 
+## CAVEAT EMPTOR:
+## There is no encapsulation within the following macros, do not change
+## the running order or otherwise move them around unless you know exactly
+## what you are doing...
+if test -n "$compiler"; then
 
 lt_prog_compiler_no_builtin_flag=
 
 if test "$GCC" = yes; then
   lt_prog_compiler_no_builtin_flag=' -fno-builtin'
 
-
-{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
 if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_rtti_exceptions=no
-  ac_outfile=conftest.$ac_objext
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   ac_outfile=conftest.$ac_objext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
    lt_compiler_flag="-fno-rtti -fno-exceptions"
    # Insert the option either (1) after the last *FLAGS variable, or
    # (2) before a word containing "conftest.", or (3) at the end.
@@ -10522,25 +9802,25 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:10525: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9805: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:10529: \$? = $ac_status" >&5
+   echo "$as_me:9809: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
-     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
      if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_rtti_exceptions=yes
      fi
    fi
-   $rm conftest*
+   $RM conftest*
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
+$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
 
 if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
     lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
@@ -10550,12 +9830,17 @@ fi
 
 fi
 
-lt_prog_compiler_wl=
+
+
+
+
+
+  lt_prog_compiler_wl=
 lt_prog_compiler_pic=
 lt_prog_compiler_static=
 
-{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
 
   if test "$GCC" = yes; then
     lt_prog_compiler_wl='-Wl,'
@@ -10571,19 +9856,29 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
       ;;
 
     amigaos*)
-      # FIXME: we need at least 68020 code to build shared libraries, but
-      # adding the `-m68020' flag to GCC prevents building anything better,
-      # like `-m68040'.
-      lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            lt_prog_compiler_pic='-fPIC'
+        ;;
+      m68k)
+            # FIXME: we need at least 68020 code to build shared libraries, but
+            # adding the `-m68020' flag to GCC prevents building anything better,
+            # like `-m68040'.
+            lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
+        ;;
+      esac
       ;;
 
-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
       # PIC is the default for these OSes.
       ;;
 
-    mingw* | pw32* | os2*)
+    mingw* | cygwin* | pw32* | os2* | cegcc*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
       lt_prog_compiler_pic='-DDLL_EXPORT'
       ;;
 
@@ -10593,7 +9888,21 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
       lt_prog_compiler_pic='-fno-common'
       ;;
 
-    interix3*)
+    hpux*)
+      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
+      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
+      # sets the default TLS model and affects inlining.
+      case $host_cpu in
+      hppa*64*)
+	# +Z the default
+	;;
+      *)
+	lt_prog_compiler_pic='-fPIC'
+	;;
+      esac
+      ;;
+
+    interix[3-9]*)
       # Interix 3.x gcc -fpic/-fPIC options generate broken code.
       # Instead, we relocate shared libraries at runtime.
       ;;
@@ -10605,25 +9914,18 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
       enable_shared=no
       ;;
 
+    *nto* | *qnx*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      lt_prog_compiler_pic='-fPIC -shared'
+      ;;
+
     sysv4*MP*)
       if test -d /usr/nec; then
 	lt_prog_compiler_pic=-Kconform_pic
       fi
       ;;
 
-    hpux*)
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case $host_cpu in
-      hppa*64*|ia64*)
-	# +Z the default
-	;;
-      *)
-	lt_prog_compiler_pic='-fPIC'
-	;;
-      esac
-      ;;
-
     *)
       lt_prog_compiler_pic='-fPIC'
       ;;
@@ -10640,18 +9942,8 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
 	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
       fi
       ;;
-      darwin*)
-        # PIC is the default on this platform
-        # Common symbols not allowed in MH_DYLIB files
-       case $cc_basename in
-         xlc*)
-         lt_prog_compiler_pic='-qnocommon'
-         lt_prog_compiler_wl='-Wl,'
-         ;;
-       esac
-       ;;
 
-    mingw* | pw32* | os2*)
+    mingw* | cygwin* | pw32* | os2* | cegcc*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
       lt_prog_compiler_pic='-DDLL_EXPORT'
@@ -10679,18 +9971,27 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
       lt_prog_compiler_static='-non_shared'
       ;;
 
-    newsos6)
-      lt_prog_compiler_pic='-KPIC'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    linux*)
+    linux* | k*bsd*-gnu)
       case $cc_basename in
-      icc* | ecc*)
+      # old Intel for x86_64 which still supported -KPIC.
+      ecc*)
 	lt_prog_compiler_wl='-Wl,'
 	lt_prog_compiler_pic='-KPIC'
 	lt_prog_compiler_static='-static'
         ;;
+      # icc used to be incompatible with GCC.
+      # ICC 10 doesn't accept -KPIC any more.
+      icc* | ifort*)
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-fPIC'
+	lt_prog_compiler_static='-static'
+        ;;
+      # Lahey Fortran 8.1.
+      lf95*)
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='--shared'
+	lt_prog_compiler_static='--static'
+	;;
       pgcc* | pgf77* | pgf90* | pgf95*)
         # Portland Group compilers (*not* the Pentium gcc compiler,
 	# which looks to be a dead project)
@@ -10703,15 +10004,52 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
         # All Alpha code is PIC.
         lt_prog_compiler_static='-non_shared'
         ;;
+      xl*)
+	# IBM XL C 8.0/Fortran 10.1 on PPC
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-qpic'
+	lt_prog_compiler_static='-qstaticlink'
+	;;
+      *)
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)
+	  # Sun C 5.9
+	  lt_prog_compiler_pic='-KPIC'
+	  lt_prog_compiler_static='-Bstatic'
+	  lt_prog_compiler_wl='-Wl,'
+	  ;;
+	*Sun\ F*)
+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
+	  lt_prog_compiler_pic='-KPIC'
+	  lt_prog_compiler_static='-Bstatic'
+	  lt_prog_compiler_wl=''
+	  ;;
+	esac
+	;;
       esac
       ;;
 
+    newsos6)
+      lt_prog_compiler_pic='-KPIC'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+
+    *nto* | *qnx*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      lt_prog_compiler_pic='-fPIC -shared'
+      ;;
+
     osf3* | osf4* | osf5*)
       lt_prog_compiler_wl='-Wl,'
       # All OSF/1 code is PIC.
       lt_prog_compiler_static='-non_shared'
       ;;
 
+    rdos*)
+      lt_prog_compiler_static='-non_shared'
+      ;;
+
     solaris*)
       lt_prog_compiler_pic='-KPIC'
       lt_prog_compiler_static='-Bstatic'
@@ -10764,22 +10102,35 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
     esac
   fi
 
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic" >&6; }
+case $host_os in
+  # For platforms which do not support PIC, -DPIC is meaningless:
+  *djgpp*)
+    lt_prog_compiler_pic=
+    ;;
+  *)
+    lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
+$as_echo "$lt_prog_compiler_pic" >&6; }
+
+
+
+
+
 
 #
 # Check to make sure the PIC flag actually works.
 #
 if test -n "$lt_prog_compiler_pic"; then
-
-{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; }
-if test "${lt_prog_compiler_pic_works+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  lt_prog_compiler_pic_works=no
-  ac_outfile=conftest.$ac_objext
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+  { $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
+$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
+if test "${lt_cv_prog_compiler_pic_works+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_pic_works=no
+   ac_outfile=conftest.$ac_objext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
    lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
    # Insert the option either (1) after the last *FLAGS variable, or
    # (2) before a word containing "conftest.", or (3) at the end.
@@ -10790,27 +10141,27 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:10793: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10144: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:10797: \$? = $ac_status" >&5
+   echo "$as_me:10148: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
-     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
      if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-       lt_prog_compiler_pic_works=yes
+       lt_cv_prog_compiler_pic_works=yes
      fi
    fi
-   $rm conftest*
+   $RM conftest*
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5
+$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
 
-if test x"$lt_prog_compiler_pic_works" = xyes; then
+if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
     case $lt_prog_compiler_pic in
      "" | " "*) ;;
      *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
@@ -10821,69 +10172,125 @@ else
 fi
 
 fi
-case $host_os in
-  # For platforms which do not support PIC, -DPIC is meaningless:
-  *djgpp*)
-    lt_prog_compiler_pic=
-    ;;
-  *)
-    lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
-    ;;
-esac
+
+
+
+
+
 
 #
 # Check to make sure the static flag actually works.
 #
 wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
-{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
-if test "${lt_prog_compiler_static_works+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
+if test "${lt_cv_prog_compiler_static_works+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
-  lt_prog_compiler_static_works=no
+  lt_cv_prog_compiler_static_works=no
    save_LDFLAGS="$LDFLAGS"
    LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-   printf "$lt_simple_link_test_code" > conftest.$ac_ext
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
    if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
      # The linker can only warn and ignore the option if not recognized
      # So say no if there are warnings
      if test -s conftest.err; then
        # Append any errors to the config.log.
        cat conftest.err 1>&5
-       $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+       $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
        $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
        if diff conftest.exp conftest.er2 >/dev/null; then
-         lt_prog_compiler_static_works=yes
+         lt_cv_prog_compiler_static_works=yes
        fi
      else
-       lt_prog_compiler_static_works=yes
+       lt_cv_prog_compiler_static_works=yes
      fi
    fi
-   $rm conftest*
+   $RM -r conftest*
    LDFLAGS="$save_LDFLAGS"
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5
-echo "${ECHO_T}$lt_prog_compiler_static_works" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5
+$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
 
-if test x"$lt_prog_compiler_static_works" = xyes; then
+if test x"$lt_cv_prog_compiler_static_works" = xyes; then
     :
 else
     lt_prog_compiler_static=
 fi
 
 
-{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
+
+
+
+
+
+  { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+if test "${lt_cv_prog_compiler_c_o+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_c_o=no
+   $RM -r conftest 2>/dev/null
+   mkdir conftest
+   cd conftest
+   mkdir out
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+   lt_compiler_flag="-o out/conftest2.$ac_objext"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:10249: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>out/conftest.err)
+   ac_status=$?
+   cat out/conftest.err >&5
+   echo "$as_me:10253: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
+   then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_c_o=yes
+     fi
+   fi
+   chmod u+w . 2>&5
+   $RM conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
+   $RM out/* && rmdir out
+   cd ..
+   $RM -r conftest
+   $RM conftest*
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
+$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
+
+
+
+
+
+
+  { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
 if test "${lt_cv_prog_compiler_c_o+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_c_o=no
-   $rm -r conftest 2>/dev/null
+   $RM -r conftest 2>/dev/null
    mkdir conftest
    cd conftest
    mkdir out
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
    lt_compiler_flag="-o out/conftest2.$ac_objext"
    # Insert the option either (1) after the last *FLAGS variable, or
@@ -10894,83 +10301,93 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:10897: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10304: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:10901: \$? = $ac_status" >&5
+   echo "$as_me:10308: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
-     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
      $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
      if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_c_o=yes
      fi
    fi
    chmod u+w . 2>&5
-   $rm conftest*
+   $RM conftest*
    # SGI C++ compiler will create directory out/ii_files/ for
    # template instantiation
-   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
-   $rm out/* && rmdir out
+   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
+   $RM out/* && rmdir out
    cd ..
-   rmdir conftest
-   $rm conftest*
+   $RM -r conftest
+   $RM conftest*
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
+$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
+
+
 
 
 hard_links="nottested"
 if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
   # do not overwrite the value of need_locks provided by the user
-  { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+$as_echo_n "checking if we can lock with hard links... " >&6; }
   hard_links=yes
-  $rm conftest*
+  $RM conftest*
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
   touch conftest.a
   ln conftest.a conftest.b 2>&5 || hard_links=no
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  { echo "$as_me:$LINENO: result: $hard_links" >&5
-echo "${ECHO_T}$hard_links" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
+$as_echo "$hard_links" >&6; }
   if test "$hard_links" = no; then
-    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
     need_locks=warn
   fi
 else
   need_locks=no
 fi
 
-{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
+
+
+
+
+
+  { $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
 
   runpath_var=
   allow_undefined_flag=
-  enable_shared_with_static_runtimes=no
+  always_export_symbols=no
   archive_cmds=
   archive_expsym_cmds=
-  old_archive_From_new_cmds=
-  old_archive_from_expsyms_cmds=
+  compiler_needs_object=no
+  enable_shared_with_static_runtimes=no
   export_dynamic_flag_spec=
-  whole_archive_flag_spec=
-  thread_safe_flag_spec=
+  export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  hardcode_automatic=no
+  hardcode_direct=no
+  hardcode_direct_absolute=no
   hardcode_libdir_flag_spec=
   hardcode_libdir_flag_spec_ld=
   hardcode_libdir_separator=
-  hardcode_direct=no
   hardcode_minus_L=no
   hardcode_shlibpath_var=unsupported
+  inherit_rpath=no
   link_all_deplibs=unknown
-  hardcode_automatic=no
   module_cmds=
   module_expsym_cmds=
-  always_export_symbols=no
-  export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  old_archive_from_new_cmds=
+  old_archive_from_expsyms_cmds=
+  thread_safe_flag_spec=
+  whole_archive_flag_spec=
   # include_expsyms should be a list of space-separated symbols to be *always*
   # included in the symbol list
   include_expsyms=
@@ -10978,26 +10395,17 @@ echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared librar
   # it will be wrapped by ` (' and `)$', so one must not match beginning or
   # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
   # as well as any symbol that contains `d'.
-  exclude_expsyms="_GLOBAL_OFFSET_TABLE_"
+  exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
   # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
   # platforms (ab)use it in PIC code, but their linkers get confused if
   # the symbol is explicitly referenced.  Since portable code cannot
   # rely on this symbol name, it's probably fine to never include it in
   # preloaded symbol tables.
+  # Exclude shared library initialization/finalization symbols.
   extract_expsyms_cmds=
-  # Just being paranoid about ensuring that cc_basename is set.
-  for cc_temp in $compiler""; do
-  case $cc_temp in
-    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-    \-*) ;;
-    *) break;;
-  esac
-done
-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 
   case $host_os in
-  cygwin* | mingw* | pw32*)
+  cygwin* | mingw* | pw32* | cegcc*)
     # FIXME: the MSVC++ port hasn't been tested in a loooong time
     # When not using gcc, we currently assume that we are using
     # Microsoft Visual C++.
@@ -11023,16 +10431,16 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
     # are reset later if shared libraries are not supported. Putting them
     # here allows them to be overridden if necessary.
     runpath_var=LD_RUN_PATH
-    hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
+    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
     export_dynamic_flag_spec='${wl}--export-dynamic'
     # ancient GNU ld didn't support --whole-archive et. al.
-    if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
-	whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-      else
-  	whole_archive_flag_spec=
+    if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
+      whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+    else
+      whole_archive_flag_spec=
     fi
     supports_anon_versioning=no
-    case `$LD -v 2>/dev/null` in
+    case `$LD -v 2>&1` in
       *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
       *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
       *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
@@ -11042,11 +10450,11 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 
     # See if GNU ld supports shared libraries.
     case $host_os in
-    aix3* | aix4* | aix5*)
+    aix[3-9]*)
       # On AIX/PPC, the GNU linker is very broken
       if test "$host_cpu" != ia64; then
 	ld_shlibs=no
-	cat <<EOF 1>&2
+	cat <<_LT_EOF 1>&2
 
 *** Warning: the GNU linker, at least up to release 2.9.1, is reported
 *** to be unable to reliably create shared libraries on AIX.
@@ -11054,26 +10462,27 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 *** really care for shared libraries, you may want to modify your PATH
 *** so that a non-GNU linker is found, and then restart.
 
-EOF
+_LT_EOF
       fi
       ;;
 
     amigaos*)
-      archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_minus_L=yes
-
-      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
-      # that the semantics of dynamic libraries on AmigaOS, at least up
-      # to version 4, is to share data among multiple programs linked
-      # with the same dynamic library.  Since this doesn't match the
-      # behavior of shared libraries on other platforms, we can't use
-      # them.
-      ld_shlibs=no
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+            archive_expsym_cmds=''
+        ;;
+      m68k)
+            archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+            hardcode_libdir_flag_spec='-L$libdir'
+            hardcode_minus_L=yes
+        ;;
+      esac
       ;;
 
     beos*)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
 	allow_undefined_flag=unsupported
 	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
 	# support --undefined.  This deserves some investigation.  FIXME
@@ -11083,16 +10492,16 @@ EOF
       fi
       ;;
 
-    cygwin* | mingw* | pw32*)
-      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
+    cygwin* | mingw* | pw32* | cegcc*)
+      # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
       # as there is no search path for DLLs.
       hardcode_libdir_flag_spec='-L$libdir'
       allow_undefined_flag=unsupported
       always_export_symbols=no
       enable_shared_with_static_runtimes=yes
-      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
+      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
 
-      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+      if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
         archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
 	# If the export-symbols file already is a .def file (1st line
 	# is EXPORTS), use it as is; otherwise, prepend...
@@ -11108,7 +10517,7 @@ EOF
       fi
       ;;
 
-    interix3*)
+    interix[3-9]*)
       hardcode_direct=no
       hardcode_shlibpath_var=no
       hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
@@ -11123,39 +10532,78 @@ EOF
       archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
       ;;
 
-    linux*)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+    gnu* | linux* | tpf* | k*bsd*-gnu)
+      tmp_diet=no
+      if test "$host_os" = linux-dietlibc; then
+	case $cc_basename in
+	  diet\ *) tmp_diet=yes;;	# linux-dietlibc with static linking (!diet-dyn)
+	esac
+      fi
+      if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
+	 && test "$tmp_diet" = no
+      then
 	tmp_addflag=
+	tmp_sharedflag='-shared'
 	case $cc_basename,$host_cpu in
-	pgcc*)				# Portland Group C compiler
-	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+        pgcc*)				# Portland Group C compiler
+	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
 	  tmp_addflag=' $pic_flag'
 	  ;;
 	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
-	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
 	  tmp_addflag=' $pic_flag -Mnomain' ;;
-	ecc*,ia64* | icc*,ia64*)		# Intel C compiler on ia64
+	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
 	  tmp_addflag=' -i_dynamic' ;;
 	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
 	  tmp_addflag=' -i_dynamic -nofor_main' ;;
 	ifc* | ifort*)			# Intel Fortran compiler
 	  tmp_addflag=' -nofor_main' ;;
+	lf95*)				# Lahey Fortran 8.1
+	  whole_archive_flag_spec=
+	  tmp_sharedflag='--shared' ;;
+	xl[cC]*)			# IBM XL C 8.0 on PPC (deal with xlf below)
+	  tmp_sharedflag='-qmkshrobj'
+	  tmp_addflag= ;;
+	esac
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)			# Sun C 5.9
+	  whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+	  compiler_needs_object=yes
+	  tmp_sharedflag='-G' ;;
+	*Sun\ F*)			# Sun Fortran 8.3
+	  tmp_sharedflag='-G' ;;
 	esac
-	archive_cmds='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 
-	if test $supports_anon_versioning = yes; then
-	  archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~
-  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-  $echo "local: *; };" >> $output_objdir/$libname.ver~
-	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-	fi
+        if test "x$supports_anon_versioning" = xyes; then
+          archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
+	    cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+	    echo "local: *; };" >> $output_objdir/$libname.ver~
+	    $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+        fi
+
+	case $cc_basename in
+	xlf*)
+	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
+	  whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
+	  hardcode_libdir_flag_spec=
+	  hardcode_libdir_flag_spec_ld='-rpath $libdir'
+	  archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
+	  if test "x$supports_anon_versioning" = xyes; then
+	    archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
+	      cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+	      echo "local: *; };" >> $output_objdir/$libname.ver~
+	      $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+	  fi
+	  ;;
+	esac
       else
-	ld_shlibs=no
+        ld_shlibs=no
       fi
       ;;
 
     netbsd*)
-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
 	wlarc=
       else
@@ -11165,9 +10613,9 @@ EOF
       ;;
 
     solaris*)
-      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
+      if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
 	ld_shlibs=no
-	cat <<EOF 1>&2
+	cat <<_LT_EOF 1>&2
 
 *** Warning: The releases 2.8.* of the GNU linker cannot reliably
 *** create shared libraries on Solaris systems.  Therefore, libtool
@@ -11176,8 +10624,8 @@ EOF
 *** your PATH or compiler configuration so that the native linker is
 *** used, and then restart.
 
-EOF
-      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+_LT_EOF
+      elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
 	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
       else
@@ -11201,10 +10649,14 @@ EOF
 _LT_EOF
 	;;
 	*)
-	  if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	    hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
-	    archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
-	    archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
+	  # For security reasons, it is highly recommended that you always
+	  # use absolute paths for naming shared libraries, and exclude the
+	  # DT_RUNPATH tag from executables and libraries.  But doing so
+	  # requires that you compile everything twice, which is a pain.
+	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+	    archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	    archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
 	  else
 	    ld_shlibs=no
 	  fi
@@ -11220,7 +10672,7 @@ _LT_EOF
       ;;
 
     *)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
 	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
       else
@@ -11252,7 +10704,7 @@ _LT_EOF
       fi
       ;;
 
-    aix4* | aix5*)
+    aix[4-9]*)
       if test "$host_cpu" = ia64; then
 	# On IA64, the linker does run time linking by default, so we don't
 	# have to do anything special.
@@ -11262,22 +10714,22 @@ _LT_EOF
       else
 	# If we're using GNU nm, then we don't want the "-C" option.
 	# -C means demangle to AIX nm, but means don't demangle with GNU nm
-	if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
-	  export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
+	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+	  export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
 	else
-	  export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
+	  export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
 	fi
 	aix_use_runtimelinking=no
 
 	# Test if we are trying to use run time linking or normal
 	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
 	# need to do runtime linking.
-	case $host_os in aix4.[23]|aix4.[23].*|aix5*)
+	case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
 	  for ld_flag in $LDFLAGS; do
-  	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
-  	    aix_use_runtimelinking=yes
-  	    break
-  	  fi
+	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+	    aix_use_runtimelinking=yes
+	    break
+	  fi
 	  done
 	  ;;
 	esac
@@ -11294,28 +10746,30 @@ _LT_EOF
 
       archive_cmds=''
       hardcode_direct=yes
+      hardcode_direct_absolute=yes
       hardcode_libdir_separator=':'
       link_all_deplibs=yes
+      file_list_spec='${wl}-f,'
 
       if test "$GCC" = yes; then
 	case $host_os in aix4.[012]|aix4.[012].*)
 	# We only want to do this on AIX 4.2 and lower, the check
 	# below for broken collect2 doesn't work under 4.3+
 	  collect2name=`${CC} -print-prog-name=collect2`
-	  if test -f "$collect2name" && \
-  	   strings "$collect2name" | grep resolve_lib_name >/dev/null
+	  if test -f "$collect2name" &&
+	   strings "$collect2name" | $GREP resolve_lib_name >/dev/null
 	  then
-  	  # We have reworked collect2
-  	  hardcode_direct=yes
+	  # We have reworked collect2
+	  :
 	  else
-  	  # We have old collect2
-  	  hardcode_direct=unsupported
-  	  # It fails to find uninstalled libraries when the uninstalled
-  	  # path is not listed in the libpath.  Setting hardcode_minus_L
-  	  # to unsupported forces relinking
-  	  hardcode_minus_L=yes
-  	  hardcode_libdir_flag_spec='-L$libdir'
-  	  hardcode_libdir_separator=
+	  # We have old collect2
+	  hardcode_direct=unsupported
+	  # It fails to find uninstalled libraries when the uninstalled
+	  # path is not listed in the libpath.  Setting hardcode_minus_L
+	  # to unsupported forces relinking
+	  hardcode_minus_L=yes
+	  hardcode_libdir_flag_spec='-L$libdir'
+	  hardcode_libdir_separator=
 	  fi
 	  ;;
 	esac
@@ -11326,8 +10780,8 @@ _LT_EOF
       else
 	# not using gcc
 	if test "$host_cpu" = ia64; then
-  	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-  	# chokes on -Wl,-G. The following line is correct:
+	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+	# chokes on -Wl,-G. The following line is correct:
 	  shared_flag='-G'
 	else
 	  if test "$aix_use_runtimelinking" = yes; then
@@ -11338,6 +10792,7 @@ _LT_EOF
 	fi
       fi
 
+      export_dynamic_flag_spec='${wl}-bexpall'
       # It seems that -bexpall does not export symbols beginning with
       # underscore (_), so it is better to generate a list of symbols to export.
       always_export_symbols=yes
@@ -11345,8 +10800,9 @@ _LT_EOF
 	# Warning - without using the other runtime loading flags (-brtl),
 	# -berok will link without error, but may produce a broken library.
 	allow_undefined_flag='-berok'
-       # Determine the default libpath from the value encoded in an empty executable.
-       cat >conftest.$ac_ext <<_ACEOF
+        # Determine the default libpath from the value encoded in an
+        # empty executable.
+        cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -11367,44 +10823,56 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
 
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 # Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
-       hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-	archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-       else
+        hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
+        archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+      else
 	if test "$host_cpu" = ia64; then
 	  hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
 	  allow_undefined_flag="-z nodefs"
 	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
 	else
-	 # Determine the default libpath from the value encoded in an empty executable.
+	 # Determine the default libpath from the value encoded in an
+	 # empty executable.
 	 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -11426,31 +10894,42 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
 
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 # Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -11470,18 +10949,25 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       ;;
 
     amigaos*)
-      archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_minus_L=yes
-      # see comment about different semantics on the GNU ld section
-      ld_shlibs=no
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+            archive_expsym_cmds=''
+        ;;
+      m68k)
+            archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+            hardcode_libdir_flag_spec='-L$libdir'
+            hardcode_minus_L=yes
+        ;;
+      esac
       ;;
 
     bsdi[45]*)
       export_dynamic_flag_spec=-rdynamic
       ;;
 
-    cygwin* | mingw* | pw32*)
+    cygwin* | mingw* | pw32* | cegcc*)
       # When not using gcc, we currently assume that we are using
       # Microsoft Visual C++.
       # hardcode_libdir_flag_spec is actually meaningless, as there is
@@ -11493,63 +10979,40 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       # Tell ltmain to make .dll files, not .so files.
       shrext_cmds=".dll"
       # FIXME: Setting linknames here is a bad hack.
-      archive_cmds='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
+      archive_cmds='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames='
       # The linker will automatically build a .lib file if we build a DLL.
-      old_archive_From_new_cmds='true'
+      old_archive_from_new_cmds='true'
       # FIXME: Should let the user specify the lib program.
-      old_archive_cmds='lib /OUT:$oldlib$oldobjs$old_deplibs'
+      old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
       fix_srcfile_path='`cygpath -w "$srcfile"`'
       enable_shared_with_static_runtimes=yes
       ;;
 
     darwin* | rhapsody*)
-      case $host_os in
-        rhapsody* | darwin1.[012])
-         allow_undefined_flag='${wl}-undefined ${wl}suppress'
-         ;;
-       *) # Darwin 1.3 on
-         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-           allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-         else
-           case ${MACOSX_DEPLOYMENT_TARGET} in
-             10.[012])
-               allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-               ;;
-             10.*)
-               allow_undefined_flag='${wl}-undefined ${wl}dynamic_lookup'
-               ;;
-           esac
-         fi
-         ;;
-      esac
-      archive_cmds_need_lc=no
-      hardcode_direct=no
-      hardcode_automatic=yes
-      hardcode_shlibpath_var=unsupported
-      whole_archive_flag_spec=''
-      link_all_deplibs=yes
-    if test "$GCC" = yes ; then
-    	output_verbose_link_cmd='echo'
-        archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-      module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-      archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-      module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    else
-      case $cc_basename in
-        xlc*)
-         output_verbose_link_cmd='echo'
-         archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
-         module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-         archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          ;;
-       *)
-         ld_shlibs=no
-          ;;
-      esac
-    fi
+
+
+  archive_cmds_need_lc=no
+  hardcode_direct=no
+  hardcode_automatic=yes
+  hardcode_shlibpath_var=unsupported
+  whole_archive_flag_spec=''
+  link_all_deplibs=yes
+  allow_undefined_flag="$_lt_dar_allow_undefined"
+  case $cc_basename in
+     ifort*) _lt_dar_can_shared=yes ;;
+     *) _lt_dar_can_shared=$GCC ;;
+  esac
+  if test "$_lt_dar_can_shared" = "yes"; then
+    output_verbose_link_cmd=echo
+    archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+    module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+    archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+    module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+
+  else
+  ld_shlibs=no
+  fi
+
       ;;
 
     dgux*)
@@ -11582,7 +11045,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       ;;
 
     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | kfreebsd*-gnu | dragonfly*)
+    freebsd* | dragonfly*)
       archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
       hardcode_libdir_flag_spec='-R$libdir'
       hardcode_direct=yes
@@ -11591,9 +11054,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
     hpux9*)
       if test "$GCC" = yes; then
-	archive_cmds='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+	archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
       else
-	archive_cmds='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+	archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
       fi
       hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
       hardcode_libdir_separator=:
@@ -11613,11 +11076,11 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       fi
       if test "$with_gnu_ld" = no; then
 	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+	hardcode_libdir_flag_spec_ld='+b $libdir'
 	hardcode_libdir_separator=:
-
 	hardcode_direct=yes
+	hardcode_direct_absolute=yes
 	export_dynamic_flag_spec='${wl}-E'
-
 	# hardcode_minus_L: Not really in the search PATH,
 	# but as the default location of the library.
 	hardcode_minus_L=yes
@@ -11631,7 +11094,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 	  archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	ia64*)
-	  archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	*)
 	  archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
@@ -11656,12 +11119,12 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
 	case $host_cpu in
 	hppa*64*|ia64*)
-	  hardcode_libdir_flag_spec_ld='+b $libdir'
 	  hardcode_direct=no
 	  hardcode_shlibpath_var=no
 	  ;;
 	*)
 	  hardcode_direct=yes
+	  hardcode_direct_absolute=yes
 	  export_dynamic_flag_spec='${wl}-E'
 
 	  # hardcode_minus_L: Not really in the search PATH,
@@ -11674,18 +11137,62 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
     irix5* | irix6* | nonstopux*)
       if test "$GCC" = yes; then
-	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	# Try to use the -exported_symbol ld option, if it does not
+	# work, assume that -exports_file does not work either and
+	# implicitly export all symbols.
+        save_LDFLAGS="$LDFLAGS"
+        LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
+        cat >conftest.$ac_ext <<_ACEOF
+int foo(void) {}
+_ACEOF
+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:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 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
+  archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
+
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+        LDFLAGS="$save_LDFLAGS"
       else
-	archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-	hardcode_libdir_flag_spec_ld='-rpath $libdir'
+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
       fi
+      archive_cmds_need_lc='no'
       hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
       hardcode_libdir_separator=:
+      inherit_rpath=yes
       link_all_deplibs=yes
       ;;
 
     netbsd*)
-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
       else
 	archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
@@ -11703,25 +11210,33 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       hardcode_shlibpath_var=no
       ;;
 
+    *nto* | *qnx*)
+      ;;
+
     openbsd*)
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-	hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-	export_dynamic_flag_spec='${wl}-E'
+      if test -f /usr/libexec/ld.so; then
+	hardcode_direct=yes
+	hardcode_shlibpath_var=no
+	hardcode_direct_absolute=yes
+	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	  archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+	  hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+	  export_dynamic_flag_spec='${wl}-E'
+	else
+	  case $host_os in
+	   openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+	     archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+	     hardcode_libdir_flag_spec='-R$libdir'
+	     ;;
+	   *)
+	     archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	     hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+	     ;;
+	  esac
+	fi
       else
-       case $host_os in
-	 openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-	   archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-	   hardcode_libdir_flag_spec='-R$libdir'
-	   ;;
-	 *)
-	   archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	   hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-	   ;;
-       esac
+	ld_shlibs=no
       fi
       ;;
 
@@ -11729,18 +11244,19 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       hardcode_libdir_flag_spec='-L$libdir'
       hardcode_minus_L=yes
       allow_undefined_flag=unsupported
-      archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-      old_archive_From_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+      archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+      old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
       ;;
 
     osf3*)
       if test "$GCC" = yes; then
 	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
       else
 	allow_undefined_flag=' -expect_unresolved \*'
-	archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
       fi
+      archive_cmds_need_lc='no'
       hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
       hardcode_libdir_separator=:
       ;;
@@ -11748,49 +11264,59 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
     osf4* | osf5*)	# as osf3* with the addition of -msym flag
       if test "$GCC" = yes; then
 	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 	hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
       else
 	allow_undefined_flag=' -expect_unresolved \*'
-	archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-	archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
-	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
+	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+	archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
+	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
 
 	# Both c and cxx compiler support -rpath directly
 	hardcode_libdir_flag_spec='-rpath $libdir'
       fi
+      archive_cmds_need_lc='no'
       hardcode_libdir_separator=:
       ;;
 
     solaris*)
-      no_undefined_flag=' -z text'
+      no_undefined_flag=' -z defs'
       if test "$GCC" = yes; then
 	wlarc='${wl}'
-	archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
+	archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+	  $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
       else
-	wlarc=''
-	archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-  	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+	case `$CC -V 2>&1` in
+	*"Compilers 5.0"*)
+	  wlarc=''
+	  archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+	  $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
+	  ;;
+	*)
+	  wlarc='${wl}'
+	  archive_cmds='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+	  $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+	  ;;
+	esac
       fi
       hardcode_libdir_flag_spec='-R$libdir'
       hardcode_shlibpath_var=no
       case $host_os in
       solaris2.[0-5] | solaris2.[0-5].*) ;;
       *)
- 	# The compiler driver will combine linker options so we
- 	# cannot just pass the convience library names through
- 	# without $wl, iff we do not link with $LD.
- 	# Luckily, gcc supports the same syntax we need for Sun Studio.
- 	# Supported since Solaris 2.6 (maybe 2.5.1?)
- 	case $wlarc in
- 	'')
- 	  whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
- 	*)
- 	  whole_archive_flag_spec='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
- 	esac ;;
+	# The compiler driver will combine and reorder linker options,
+	# but understands `-z linker_flag'.  GCC discards it without `$wl',
+	# but is careful enough not to reorder.
+	# Supported since Solaris 2.6 (maybe 2.5.1?)
+	if test "$GCC" = yes; then
+	  whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+	else
+	  whole_archive_flag_spec='-z allextract$convenience -z defaultextract'
+	fi
+	;;
       esac
       link_all_deplibs=yes
       ;;
@@ -11847,7 +11373,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       fi
       ;;
 
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
       no_undefined_flag='${wl}-z,text'
       archive_cmds_need_lc=no
       hardcode_shlibpath_var=no
@@ -11873,18 +11399,18 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       allow_undefined_flag='${wl}-z,nodefs'
       archive_cmds_need_lc=no
       hardcode_shlibpath_var=no
-      hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
+      hardcode_libdir_flag_spec='${wl}-R,$libdir'
       hardcode_libdir_separator=':'
       link_all_deplibs=yes
       export_dynamic_flag_spec='${wl}-Bexport'
       runpath_var='LD_RUN_PATH'
 
       if test "$GCC" = yes; then
-	archive_cmds='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
       else
-	archive_cmds='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
       fi
       ;;
 
@@ -11898,12 +11424,36 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       ld_shlibs=no
       ;;
     esac
+
+    if test x$host_vendor = xsni; then
+      case $host in
+      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+	export_dynamic_flag_spec='${wl}-Blargedynsym'
+	;;
+      esac
+    fi
   fi
 
-{ echo "$as_me:$LINENO: result: $ld_shlibs" >&5
-echo "${ECHO_T}$ld_shlibs" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ld_shlibs" >&5
+$as_echo "$ld_shlibs" >&6; }
 test "$ld_shlibs" = no && can_build_shared=no
 
+with_gnu_ld=$with_gnu_ld
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 #
 # Do we need to explicitly link libc?
 #
@@ -11921,15 +11471,15 @@ x|xyes)
       # Test whether the compiler implicitly links with -lc since on some
       # systems, -lgcc has to come before -lc. If gcc already passes -lc
       # to ld, don't add -lc before -lgcc.
-      { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
-      $rm conftest*
-      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+      { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
+      $RM conftest*
+      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
       if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } 2>conftest.err; then
         soname=conftest
         lib=conftest
@@ -11944,10 +11494,10 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&
         libname=conftest
         lt_save_allow_undefined_flag=$allow_undefined_flag
         allow_undefined_flag=
-        if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
-  (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
+        if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\"") >&5
+  (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
         then
 	  archive_cmds_need_lc=no
@@ -11958,17 +11508,225 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&
       else
         cat conftest.err 1>&5
       fi
-      $rm conftest*
-      { echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
-echo "${ECHO_T}$archive_cmds_need_lc" >&6; }
+      $RM conftest*
+      { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
+$as_echo "$archive_cmds_need_lc" >&6; }
       ;;
     esac
   fi
   ;;
 esac
 
-{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  { $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+$as_echo_n "checking dynamic linker characteristics... " >&6; }
+
+if test "$GCC" = yes; then
+  case $host_os in
+    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
+    *) lt_awk_arg="/^libraries:/" ;;
+  esac
+  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+  if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then
+    # if the path contains ";" then we assume it to be the separator
+    # otherwise default to the standard path separator (i.e. ":") - it is
+    # assumed that no part of a normal pathname contains ";" but that should
+    # okay in the real world where ";" in dirpaths is itself problematic.
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'`
+  else
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+  fi
+  # Ok, now we have the path, separated by spaces, we can step through it
+  # and add multilib dir if necessary.
+  lt_tmp_lt_search_path_spec=
+  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+  for lt_sys_path in $lt_search_path_spec; do
+    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
+      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
+    else
+      test -d "$lt_sys_path" && \
+	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
+    fi
+  done
+  lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk '
+BEGIN {RS=" "; FS="/|\n";} {
+  lt_foo="";
+  lt_count=0;
+  for (lt_i = NF; lt_i > 0; lt_i--) {
+    if ($lt_i != "" && $lt_i != ".") {
+      if ($lt_i == "..") {
+        lt_count++;
+      } else {
+        if (lt_count == 0) {
+          lt_foo="/" $lt_i lt_foo;
+        } else {
+          lt_count--;
+        }
+      }
+    }
+  }
+  if (lt_foo != "") { lt_freq[lt_foo]++; }
+  if (lt_freq[lt_foo] == 1) { print lt_foo; }
+}'`
+  sys_lib_search_path_spec=`$ECHO $lt_search_path_spec`
+else
+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+fi
 library_names_spec=
 libname_spec='lib$name'
 soname_spec=
@@ -11982,20 +11740,6 @@ shlibpath_overrides_runpath=unknown
 version_type=none
 dynamic_linker="$host_os ld.so"
 sys_lib_dlsearch_path_spec="/lib /usr/lib"
-if test "$GCC" = yes; then
-  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
-    # if the path contains ";" then we assume it to be the separator
-    # otherwise default to the standard path separator (i.e. ":") - it is
-    # assumed that no part of a normal pathname contains ";" but that should
-    # okay in the real world where ";" in dirpaths is itself problematic.
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-  else
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-  fi
-else
-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi
 need_lib_prefix=unknown
 hardcode_into_libs=no
 
@@ -12013,7 +11757,7 @@ aix3*)
   soname_spec='${libname}${release}${shared_ext}$major'
   ;;
 
-aix4* | aix5*)
+aix[4-9]*)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -12032,7 +11776,7 @@ aix4* | aix5*)
       aix4 | aix4.[01] | aix4.[01].*)
       if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
 	   echo ' yes '
-	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
+	   echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
 	:
       else
 	can_build_shared=no
@@ -12058,9 +11802,18 @@ aix4* | aix5*)
   ;;
 
 amigaos*)
-  library_names_spec='$libname.ixlibrary $libname.a'
-  # Create ${libname}_ixlibrary.a entries in /sys/libs.
-  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+  case $host_cpu in
+  powerpc)
+    # Since July 2007 AmigaOS4 officially supports .so libraries.
+    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    ;;
+  m68k)
+    library_names_spec='$libname.ixlibrary $libname.a'
+    # Create ${libname}_ixlibrary.a entries in /sys/libs.
+    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+    ;;
+  esac
   ;;
 
 beos*)
@@ -12083,25 +11836,28 @@ bsdi[45]*)
   # libtool to hard-code these into programs
   ;;
 
-cygwin* | mingw* | pw32*)
+cygwin* | mingw* | pw32* | cegcc*)
   version_type=windows
   shrext_cmds=".dll"
   need_version=no
   need_lib_prefix=no
 
   case $GCC,$host_os in
-  yes,cygwin* | yes,mingw* | yes,pw32*)
+  yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
     library_names_spec='$libname.dll.a'
     # DLL is installed to $(libdir)/../bin by postinstall_cmds
     postinstall_cmds='base_file=`basename \${file}`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
       dldir=$destdir/`dirname \$dlpath`~
       test -d \$dldir || mkdir -p \$dldir~
       $install_prog $dir/$dlname \$dldir/$dlname~
-      chmod a+x \$dldir/$dlname'
+      chmod a+x \$dldir/$dlname~
+      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+      fi'
     postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
       dlpath=$dir/\$dldll~
-       $rm \$dlpath'
+       $RM \$dlpath'
     shlibpath_overrides_runpath=yes
 
     case $host_os in
@@ -12110,20 +11866,20 @@ cygwin* | mingw* | pw32*)
       soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
       sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
       ;;
-    mingw*)
+    mingw* | cegcc*)
       # MinGW DLLs use traditional 'lib' prefix
       soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-      if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
+      sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+      if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
         # It is most probably a Windows format PATH printed by
         # mingw gcc, but we are running on Cygwin. Gcc prints its search
         # path with ; separators, and with drive letters. We can handle the
         # drive letters (cygwin fileutils understands them), so leave them,
         # especially as we might pass files found there to a mingw objdump,
         # which wouldn't understand a cygwinified path. Ahh.
-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
       else
-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
       fi
       ;;
     pw32*)
@@ -12147,17 +11903,13 @@ darwin* | rhapsody*)
   version_type=darwin
   need_lib_prefix=no
   need_version=no
-  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
+  library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
   soname_spec='${libname}${release}${major}$shared_ext'
   shlibpath_overrides_runpath=yes
   shlibpath_var=DYLD_LIBRARY_PATH
   shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-  if test "$GCC" = yes; then
-    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-  else
-    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-  fi
+
+  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"
   sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
   ;;
 
@@ -12174,18 +11926,6 @@ freebsd1*)
   dynamic_linker=no
   ;;
 
-kfreebsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
 freebsd* | dragonfly*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
@@ -12223,7 +11963,7 @@ freebsd* | dragonfly*)
     shlibpath_overrides_runpath=no
     hardcode_into_libs=yes
     ;;
-  freebsd*) # from 4.6 on
+  *) # from 4.6 on, and DragonFly
     shlibpath_overrides_runpath=yes
     hardcode_into_libs=yes
     ;;
@@ -12262,18 +12002,18 @@ hpux9* | hpux10* | hpux11*)
     fi
     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
     ;;
-   hppa*64*)
-     shrext_cmds='.sl'
-     hardcode_into_libs=yes
-     dynamic_linker="$host_os dld.sl"
-     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-     soname_spec='${libname}${release}${shared_ext}$major'
-     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
-     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-     ;;
-   *)
+  hppa*64*)
+    shrext_cmds='.sl'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+    ;;
+  *)
     shrext_cmds='.sl'
     dynamic_linker="$host_os dld.sl"
     shlibpath_var=SHLIB_PATH
@@ -12286,7 +12026,7 @@ hpux9* | hpux10* | hpux11*)
   postinstall_cmds='chmod 555 $lib'
   ;;
 
-interix3*)
+interix[3-9]*)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -12341,7 +12081,7 @@ linux*oldld* | linux*aout* | linux*coff*)
   ;;
 
 # This must be Linux ELF.
-linux*)
+linux* | k*bsd*-gnu)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -12350,36 +12090,76 @@ linux*)
   finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=no
+  # Some binutils ld are patched to set DT_RUNPATH
+  save_LDFLAGS=$LDFLAGS
+  save_libdir=$libdir
+  eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
+       LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+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:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 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
+  if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then
+  shlibpath_overrides_runpath=yes
+fi
+
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+  LDFLAGS=$save_LDFLAGS
+  libdir=$save_libdir
+
   # This implies no fast_install, which is unacceptable.
   # Some rework will be needed to allow for fast_install
   # before this can be enabled.
   hardcode_into_libs=yes
 
-  # find out which ABI we are using
-  libsuff=
-  case "$host_cpu" in
-  x86_64*|s390x*|powerpc64*)
-    echo '#line 12362 "configure"' > conftest.$ac_ext
-    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-      case `/usr/bin/file conftest.$ac_objext` in
-      *64-bit*)
-        libsuff=64
-        sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
-        ;;
-      esac
-    fi
-    rm -rf conftest*
-    ;;
-  esac
+  # Add ABI-specific directories to the system library path.
+  sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
 
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/^	 *//;s/#.*//;/^[^\/]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
   fi
 
   # We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -12391,23 +12171,11 @@ linux*)
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
-knetbsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
 netbsd*)
   version_type=sunos
   need_lib_prefix=no
   need_version=no
-  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
     finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
     dynamic_linker='NetBSD (a.out) ld.so'
@@ -12428,14 +12196,16 @@ newsos6)
   shlibpath_overrides_runpath=yes
   ;;
 
-nto-qnx*)
-  version_type=linux
+*nto* | *qnx*)
+  version_type=qnx
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='ldqnx.so'
   ;;
 
 openbsd*)
@@ -12444,13 +12214,13 @@ openbsd*)
   need_lib_prefix=no
   # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
   case $host_os in
-    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
-    *)                         need_version=no  ;;
+    openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
+    *)				need_version=no  ;;
   esac
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
   shlibpath_var=LD_LIBRARY_PATH
-  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
     case $host_os in
       openbsd2.[89] | openbsd2.[89].*)
 	shlibpath_overrides_runpath=no
@@ -12484,6 +12254,10 @@ osf3* | osf4* | osf5*)
   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
   ;;
 
+rdos*)
+  dynamic_linker=no
+  ;;
+
 solaris*)
   version_type=linux
   need_lib_prefix=no
@@ -12518,7 +12292,6 @@ sysv4 | sysv4.3*)
     sni)
       shlibpath_overrides_runpath=no
       need_lib_prefix=no
-      export_dynamic_flag_spec='${wl}-Blargedynsym'
       runpath_var=LD_RUN_PATH
       ;;
     siemens)
@@ -12549,13 +12322,12 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
   hardcode_into_libs=yes
   if test "$with_gnu_ld" = yes; then
     sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
-    shlibpath_overrides_runpath=no
   else
     sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
-    shlibpath_overrides_runpath=yes
     case $host_os in
       sco3.2v5*)
         sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
@@ -12565,6 +12337,17 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
   sys_lib_dlsearch_path_spec='/usr/lib'
   ;;
 
+tpf*)
+  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
 uts4*)
   version_type=linux
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -12576,8 +12359,8 @@ uts4*)
   dynamic_linker=no
   ;;
 esac
-{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-echo "${ECHO_T}$dynamic_linker" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+$as_echo "$dynamic_linker" >&6; }
 test "$dynamic_linker" = no && can_build_shared=no
 
 variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
@@ -12585,19 +12368,112 @@ if test "$GCC" = yes; then
   variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
 fi
 
-{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
+  sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+fi
+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
+  sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  { $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
 hardcode_action=
-if test -n "$hardcode_libdir_flag_spec" || \
-   test -n "$runpath_var" || \
+if test -n "$hardcode_libdir_flag_spec" ||
+   test -n "$runpath_var" ||
    test "X$hardcode_automatic" = "Xyes" ; then
 
-  # We can hardcode non-existant directories.
+  # We can hardcode non-existent directories.
   if test "$hardcode_direct" != no &&
      # If the only mechanism to avoid hardcoding is shlibpath_var, we
      # have to relink, otherwise we might link with an installed library
      # when we should be linking with a yet-to-be-installed one
-     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, )" != no &&
+     ## test "$_LT_TAGVAR(hardcode_shlibpath_var, )" != no &&
      test "$hardcode_minus_L" != no; then
     # Linking always hardcodes the temporary library directory.
     hardcode_action=relink
@@ -12610,10 +12486,11 @@ else
   # directories.
   hardcode_action=unsupported
 fi
-{ echo "$as_me:$LINENO: result: $hardcode_action" >&5
-echo "${ECHO_T}$hardcode_action" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $hardcode_action" >&5
+$as_echo "$hardcode_action" >&6; }
 
-if test "$hardcode_action" = relink; then
+if test "$hardcode_action" = relink ||
+   test "$inherit_rpath" = yes; then
   # Fast installation is not supported
   enable_fast_install=no
 elif test "$shlibpath_overrides_runpath" = yes ||
@@ -12622,36 +12499,12 @@ elif test "$shlibpath_overrides_runpath" = yes ||
   enable_fast_install=needless
 fi
 
-striplib=
-old_striplib=
-{ echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6; }
-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
-  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-else
-# FIXME - insert some real tests, host_os isn't really good enough
-  case $host_os in
-   darwin*)
-       if test -n "$STRIP" ; then
-         striplib="$STRIP -x"
-         { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-       else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-       ;;
-   *)
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-    ;;
-  esac
-fi
 
-if test "x$enable_dlopen" != xyes; then
+
+
+
+
+  if test "x$enable_dlopen" != xyes; then
   enable_dlopen=unknown
   enable_dlopen_self=unknown
   enable_dlopen_self_static=unknown
@@ -12666,22 +12519,22 @@ else
     lt_cv_dlopen_self=yes
     ;;
 
-  mingw* | pw32*)
+  mingw* | pw32* | cegcc*)
     lt_cv_dlopen="LoadLibrary"
     lt_cv_dlopen_libs=
-   ;;
+    ;;
 
   cygwin*)
     lt_cv_dlopen="dlopen"
     lt_cv_dlopen_libs=
-   ;;
+    ;;
 
   darwin*)
   # if libdl is installed we need to link against it
-    { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+$as_echo_n "checking for dlopen in -ldl... " >&6; }
 if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
@@ -12713,33 +12566,37 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_dl_dlopen=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_dl_dlopen=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
-if test $ac_cv_lib_dl_dlopen = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then
   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
 else
 
@@ -12749,13 +12606,13 @@ else
 
 fi
 
-   ;;
+    ;;
 
   *)
-    { echo "$as_me:$LINENO: checking for shl_load" >&5
-echo $ECHO_N "checking for shl_load... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for shl_load" >&5
+$as_echo_n "checking for shl_load... " >&6; }
 if test "${ac_cv_func_shl_load+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -12808,38 +12665,42 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_func_shl_load=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_func_shl_load=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
-echo "${ECHO_T}$ac_cv_func_shl_load" >&6; }
-if test $ac_cv_func_shl_load = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
+$as_echo "$ac_cv_func_shl_load" >&6; }
+if test "x$ac_cv_func_shl_load" = x""yes; then
   lt_cv_dlopen="shl_load"
 else
-  { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
-echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
+$as_echo_n "checking for shl_load in -ldld... " >&6; }
 if test "${ac_cv_lib_dld_shl_load+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldld  $LIBS"
@@ -12871,39 +12732,43 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_dld_shl_load=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_dld_shl_load=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
-echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }
-if test $ac_cv_lib_dld_shl_load = yes; then
-  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
+$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
+if test "x$ac_cv_lib_dld_shl_load" = x""yes; then
+  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
 else
-  { echo "$as_me:$LINENO: checking for dlopen" >&5
-echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for dlopen" >&5
+$as_echo_n "checking for dlopen... " >&6; }
 if test "${ac_cv_func_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -12956,38 +12821,42 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_func_dlopen=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_func_dlopen=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
-echo "${ECHO_T}$ac_cv_func_dlopen" >&6; }
-if test $ac_cv_func_dlopen = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
+$as_echo "$ac_cv_func_dlopen" >&6; }
+if test "x$ac_cv_func_dlopen" = x""yes; then
   lt_cv_dlopen="dlopen"
 else
-  { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+$as_echo_n "checking for dlopen in -ldl... " >&6; }
 if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
@@ -13019,39 +12888,43 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_dl_dlopen=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_dl_dlopen=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
-if test $ac_cv_lib_dl_dlopen = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then
   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
 else
-  { echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
-echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
+$as_echo_n "checking for dlopen in -lsvld... " >&6; }
 if test "${ac_cv_lib_svld_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsvld  $LIBS"
@@ -13083,39 +12956,43 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_svld_dlopen=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_svld_dlopen=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6; }
-if test $ac_cv_lib_svld_dlopen = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
+$as_echo "$ac_cv_lib_svld_dlopen" >&6; }
+if test "x$ac_cv_lib_svld_dlopen" = x""yes; then
   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
 else
-  { echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
-echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
+$as_echo_n "checking for dld_link in -ldld... " >&6; }
 if test "${ac_cv_lib_dld_dld_link+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldld  $LIBS"
@@ -13147,34 +13024,38 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_dld_dld_link=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_dld_dld_link=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
-echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; }
-if test $ac_cv_lib_dld_dld_link = yes; then
-  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
+$as_echo "$ac_cv_lib_dld_dld_link" >&6; }
+if test "x$ac_cv_lib_dld_dld_link" = x""yes; then
+  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
 fi
 
 
@@ -13212,18 +13093,18 @@ fi
     save_LIBS="$LIBS"
     LIBS="$lt_cv_dlopen_libs $LIBS"
 
-    { echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
-echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
+$as_echo_n "checking whether a program can dlopen itself... " >&6; }
 if test "${lt_cv_dlopen_self+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   	  if test "$cross_compiling" = yes; then :
   lt_cv_dlopen_self=cross
 else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<EOF
-#line 13226 "configure"
+  cat > conftest.$ac_ext <<_LT_EOF
+#line 13107 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -13264,10 +13145,6 @@ else
 #  endif
 #endif
 
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
-
 void fnord() { int i=42;}
 int main ()
 {
@@ -13283,13 +13160,13 @@ int main ()
   else
     puts (dlerror ());
 
-    exit (status);
+  return status;
 }
-EOF
+_LT_EOF
   if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
     (./conftest; exit; ) >&5 2>/dev/null
     lt_status=$?
@@ -13307,23 +13184,23 @@ rm -fr conftest*
 
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
-echo "${ECHO_T}$lt_cv_dlopen_self" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
+$as_echo "$lt_cv_dlopen_self" >&6; }
 
     if test "x$lt_cv_dlopen_self" = xyes; then
       wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
-      { echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
-echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6; }
+      { $as_echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
+$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
 if test "${lt_cv_dlopen_self_static+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   	  if test "$cross_compiling" = yes; then :
   lt_cv_dlopen_self_static=cross
 else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<EOF
-#line 13326 "configure"
+  cat > conftest.$ac_ext <<_LT_EOF
+#line 13203 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -13364,10 +13241,6 @@ else
 #  endif
 #endif
 
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
-
 void fnord() { int i=42;}
 int main ()
 {
@@ -13383,13 +13256,13 @@ int main ()
   else
     puts (dlerror ());
 
-    exit (status);
+  return status;
 }
-EOF
+_LT_EOF
   if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
     (./conftest; exit; ) >&5 2>/dev/null
     lt_status=$?
@@ -13407,8 +13280,8 @@ rm -fr conftest*
 
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
-echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
+$as_echo "$lt_cv_dlopen_self_static" >&6; }
     fi
 
     CPPFLAGS="$save_CPPFLAGS"
@@ -13429,524 +13302,103 @@ echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6; }
 fi
 
 
-# Report which library types will actually be built
-{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
-echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; }
-{ echo "$as_me:$LINENO: result: $can_build_shared" >&5
-echo "${ECHO_T}$can_build_shared" >&6; }
-
-{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
-echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; }
-test "$can_build_shared" = "no" && enable_shared=no
-
-# On AIX, shared libraries and static libraries use the same namespace, and
-# are all built from PIC.
-case $host_os in
-aix3*)
-  test "$enable_shared" = yes && enable_static=no
-  if test -n "$RANLIB"; then
-    archive_cmds="$archive_cmds~\$RANLIB \$lib"
-    postinstall_cmds='$RANLIB $lib'
-  fi
-  ;;
-
-aix4* | aix5*)
-  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-    test "$enable_shared" = yes && enable_static=no
-  fi
-    ;;
-esac
-{ echo "$as_me:$LINENO: result: $enable_shared" >&5
-echo "${ECHO_T}$enable_shared" >&6; }
-
-{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5
-echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; }
-# Make sure either enable_shared or enable_static is yes.
-test "$enable_shared" = yes || enable_static=yes
-{ echo "$as_me:$LINENO: result: $enable_static" >&5
-echo "${ECHO_T}$enable_static" >&6; }
-
-# The else clause should only fire when bootstrapping the
-# libtool distribution, otherwise you forgot to ship ltmain.sh
-# with your package, and you will get complaints that there are
-# no rules to generate ltmain.sh.
-if test -f "$ltmain"; then
-  # See if we are running on zsh, and set the options which allow our commands through
-  # without removal of \ escapes.
-  if test -n "${ZSH_VERSION+set}" ; then
-    setopt NO_GLOB_SUBST
-  fi
-  # Now quote all the things that may contain metacharacters while being
-  # careful not to overquote the AC_SUBSTed values.  We take copies of the
-  # variables and quote the copies for generation of the libtool script.
-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
-    SED SHELL STRIP \
-    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
-    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
-    deplibs_check_method reload_flag reload_cmds need_locks \
-    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
-    lt_cv_sys_global_symbol_to_c_name_address \
-    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
-    old_postinstall_cmds old_postuninstall_cmds \
-    compiler \
-    CC \
-    LD \
-    lt_prog_compiler_wl \
-    lt_prog_compiler_pic \
-    lt_prog_compiler_static \
-    lt_prog_compiler_no_builtin_flag \
-    export_dynamic_flag_spec \
-    thread_safe_flag_spec \
-    whole_archive_flag_spec \
-    enable_shared_with_static_runtimes \
-    old_archive_cmds \
-    old_archive_from_new_cmds \
-    predep_objects \
-    postdep_objects \
-    predeps \
-    postdeps \
-    compiler_lib_search_path \
-    archive_cmds \
-    archive_expsym_cmds \
-    postinstall_cmds \
-    postuninstall_cmds \
-    old_archive_from_expsyms_cmds \
-    allow_undefined_flag \
-    no_undefined_flag \
-    export_symbols_cmds \
-    hardcode_libdir_flag_spec \
-    hardcode_libdir_flag_spec_ld \
-    hardcode_libdir_separator \
-    hardcode_automatic \
-    module_cmds \
-    module_expsym_cmds \
-    lt_cv_prog_compiler_c_o \
-    exclude_expsyms \
-    include_expsyms; do
-
-    case $var in
-    old_archive_cmds | \
-    old_archive_from_new_cmds | \
-    archive_cmds | \
-    archive_expsym_cmds | \
-    module_cmds | \
-    module_expsym_cmds | \
-    old_archive_from_expsyms_cmds | \
-    export_symbols_cmds | \
-    extract_expsyms_cmds | reload_cmds | finish_cmds | \
-    postinstall_cmds | postuninstall_cmds | \
-    old_postinstall_cmds | old_postuninstall_cmds | \
-    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
-      # Double-quote double-evaled strings.
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
-      ;;
-    *)
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
-      ;;
-    esac
-  done
-
-  case $lt_echo in
-  *'\$0 --fallback-echo"')
-    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
-    ;;
-  esac
-
-cfgfile="${ofile}T"
-  trap "$rm \"$cfgfile\"; exit 1" 1 2 15
-  $rm -f "$cfgfile"
-  { echo "$as_me:$LINENO: creating $ofile" >&5
-echo "$as_me: creating $ofile" >&6;}
-
-  cat <<__EOF__ >> "$cfgfile"
-#! $SHELL
-
-# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
-# NOTE: Changes made to this file will be lost: look at ltmain.sh.
-#
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
-# Free Software Foundation, Inc.
-#
-# This file is part of GNU Libtool:
-# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 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 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 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.
-
-# A sed program that does not truncate output.
-SED=$lt_SED
-
-# Sed that helps us avoid accidentally triggering echo(1) options like -n.
-Xsed="$SED -e 1s/^X//"
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-# The names of the tagged configurations supported by this script.
-available_tags=
-
-# ### BEGIN LIBTOOL CONFIG
-
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
-
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
-
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$archive_cmds_need_lc
-
-# Whether or not to disallow shared libs when runtime libs are static
-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes
-
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
-
-# The host system.
-host_alias=$host_alias
-host=$host
-host_os=$host_os
-
-# The build system.
-build_alias=$build_alias
-build=$build
-build_os=$build_os
-
-# An echo program that does not interpret backslashes.
-echo=$lt_echo
-
-# The archiver.
-AR=$lt_AR
-AR_FLAGS=$lt_AR_FLAGS
-
-# A C compiler.
-LTCC=$lt_LTCC
-
-# LTCC compiler flags.
-LTCFLAGS=$lt_LTCFLAGS
-
-# A language-specific compiler.
-CC=$lt_compiler
-
-# Is the compiler the GNU C compiler?
-with_gcc=$GCC
-
-# An ERE matcher.
-EGREP=$lt_EGREP
-
-# The linker used to build libraries.
-LD=$lt_LD
-
-# Whether we need hard or soft links.
-LN_S=$lt_LN_S
-
-# A BSD-compatible nm program.
-NM=$lt_NM
-
-# A symbol stripping program
-STRIP=$lt_STRIP
-
-# Used to examine libraries when file_magic_cmd begins "file"
-MAGIC_CMD=$MAGIC_CMD
-
-# Used on cygwin: DLL creation program.
-DLLTOOL="$DLLTOOL"
-
-# Used on cygwin: object dumper.
-OBJDUMP="$OBJDUMP"
-
-# Used on cygwin: assembler.
-AS="$AS"
-
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
-
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
-
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl
-
-# Object file suffix (normally "o").
-objext="$ac_objext"
-
-# Old archive suffix (normally "a").
-libext="$libext"
-
-# Shared library suffix (normally ".so").
-shrext_cmds='$shrext_cmds'
-
-# Executable file suffix (normally "").
-exeext="$exeext"
-
-# Additional compiler flags for building library objects.
-pic_flag=$lt_lt_prog_compiler_pic
-pic_mode=$pic_mode
-
-# What is the maximum length of a command?
-max_cmd_len=$lt_cv_sys_max_cmd_len
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$lt_lt_cv_prog_compiler_c_o
-
-# Must we lock files when doing compilation?
-need_locks=$lt_need_locks
-
-# Do we need the lib prefix for modules?
-need_lib_prefix=$need_lib_prefix
-
-# Do we need a version for libraries?
-need_version=$need_version
-
-# Whether dlopen is supported.
-dlopen_support=$enable_dlopen
-
-# Whether dlopen of programs is supported.
-dlopen_self=$enable_dlopen_self
-
-# Whether dlopen of statically linked programs is supported.
-dlopen_self_static=$enable_dlopen_self_static
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$lt_lt_prog_compiler_static
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_whole_archive_flag_spec
-
-# Compiler flag to generate thread-safe objects.
-thread_safe_flag_spec=$lt_thread_safe_flag_spec
 
-# Library versioning type.
-version_type=$version_type
 
-# Format of library name prefix.
-libname_spec=$lt_libname_spec
 
-# List of archive names.  First name is the real one, the rest are links.
-# The last name is the one that the linker finds with -lNAME.
-library_names_spec=$lt_library_names_spec
 
-# The coded name of the library, if different from the real name.
-soname_spec=$lt_soname_spec
 
-# Commands used to build and install an old-style archive.
-RANLIB=$lt_RANLIB
-old_archive_cmds=$lt_old_archive_cmds
-old_postinstall_cmds=$lt_old_postinstall_cmds
-old_postuninstall_cmds=$lt_old_postuninstall_cmds
 
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds
 
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
 
-# Commands used to build and install a shared archive.
-archive_cmds=$lt_archive_cmds
-archive_expsym_cmds=$lt_archive_expsym_cmds
-postinstall_cmds=$lt_postinstall_cmds
-postuninstall_cmds=$lt_postuninstall_cmds
 
-# Commands used to build a loadable module (assumed same as above if empty)
-module_cmds=$lt_module_cmds
-module_expsym_cmds=$lt_module_expsym_cmds
 
-# Commands to strip libraries.
-old_striplib=$lt_old_striplib
-striplib=$lt_striplib
 
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predep_objects=$lt_predep_objects
 
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdep_objects=$lt_postdep_objects
 
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predeps=$lt_predeps
 
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdeps=$lt_postdeps
 
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path
-
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method=$lt_deplibs_check_method
-
-# Command to use when deplibs_check_method == file_magic.
-file_magic_cmd=$lt_file_magic_cmd
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$lt_allow_undefined_flag
-
-# Flag that forces no undefined symbols.
-no_undefined_flag=$lt_no_undefined_flag
-
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds=$lt_finish_cmds
-
-# Same as above, but a single script fragment to be evaled but not shown.
-finish_eval=$lt_finish_eval
-
-# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
-
-# Transform the output of nm in a proper C declaration
-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-
-# Transform the output of nm in a C name address pair
-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
-
-# This is the shared library runtime path variable.
-runpath_var=$runpath_var
-
-# This is the shared library path variable.
-shlibpath_var=$shlibpath_var
-
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=$hardcode_action
-
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=$hardcode_into_libs
-
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
-
-# If ld is used when linking, flag to hardcode \$libdir into
-# a binary during linking. This must work even if \$libdir does
-# not exist.
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld
-
-# Whether we need a single -rpath flag with a separated argument.
-hardcode_libdir_separator=$lt_hardcode_libdir_separator
-
-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
-# resulting binary.
-hardcode_direct=$hardcode_direct
-
-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-# resulting binary.
-hardcode_minus_L=$hardcode_minus_L
-
-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-# the resulting binary.
-hardcode_shlibpath_var=$hardcode_shlibpath_var
-
-# Set to yes if building a shared library automatically hardcodes DIR into the library
-# and all subsequent libraries and executables linked against it.
-hardcode_automatic=$hardcode_automatic
+striplib=
+old_striplib=
+{ $as_echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
+$as_echo_n "checking whether stripping libraries is possible... " >&6; }
+if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
+  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+# FIXME - insert some real tests, host_os isn't really good enough
+  case $host_os in
+  darwin*)
+    if test -n "$STRIP" ; then
+      striplib="$STRIP -x"
+      old_striplib="$STRIP -S"
+      { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+    else
+      { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+    fi
+    ;;
+  *)
+    { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+    ;;
+  esac
+fi
 
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at relink time.
-variables_saved_for_relink="$variables_saved_for_relink"
 
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$link_all_deplibs
 
-# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
 
-# Run-time system search path for libraries
-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
 
-# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$fix_srcfile_path"
 
-# Set to yes if exported symbols are required.
-always_export_symbols=$always_export_symbols
 
-# The commands to list exported symbols.
-export_symbols_cmds=$lt_export_symbols_cmds
 
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=$lt_extract_expsyms_cmds
 
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$lt_exclude_expsyms
 
-# Symbols that must always be exported.
-include_expsyms=$lt_include_expsyms
 
-# ### END LIBTOOL CONFIG
 
-__EOF__
+  # Report which library types will actually be built
+  { $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
+$as_echo_n "checking if libtool supports shared libraries... " >&6; }
+  { $as_echo "$as_me:$LINENO: result: $can_build_shared" >&5
+$as_echo "$can_build_shared" >&6; }
 
+  { $as_echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
+$as_echo_n "checking whether to build shared libraries... " >&6; }
+  test "$can_build_shared" = "no" && enable_shared=no
 
+  # On AIX, shared libraries and static libraries use the same namespace, and
+  # are all built from PIC.
   case $host_os in
   aix3*)
-    cat <<\EOF >> "$cfgfile"
+    test "$enable_shared" = yes && enable_static=no
+    if test -n "$RANLIB"; then
+      archive_cmds="$archive_cmds~\$RANLIB \$lib"
+      postinstall_cmds='$RANLIB $lib'
+    fi
+    ;;
 
-# AIX sometimes has problems with the GCC collect2 program.  For some
-# reason, if we set the COLLECT_NAMES environment variable, the problems
-# vanish in a puff of smoke.
-if test "X${COLLECT_NAMES+set}" != Xset; then
-  COLLECT_NAMES=
-  export COLLECT_NAMES
-fi
-EOF
+  aix[4-9]*)
+    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+      test "$enable_shared" = yes && enable_static=no
+    fi
     ;;
   esac
+  { $as_echo "$as_me:$LINENO: result: $enable_shared" >&5
+$as_echo "$enable_shared" >&6; }
 
-  # We use sed instead of cat because bash on DJGPP gets confused if
-  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
-  # text mode, it properly converts lines to CR/LF.  This bash problem
-  # is reportedly fixed, but why not run on old versions too?
-  sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1)
+  { $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5
+$as_echo_n "checking whether to build static libraries... " >&6; }
+  # Make sure either enable_shared or enable_static is yes.
+  test "$enable_shared" = yes || enable_static=yes
+  { $as_echo "$as_me:$LINENO: result: $enable_static" >&5
+$as_echo "$enable_static" >&6; }
 
-  mv -f "$cfgfile" "$ofile" || \
-    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
-  chmod +x "$ofile"
 
-else
-  # If there is no Makefile yet, we rely on a make rule to execute
-  # `config.status --recheck' to rerun these tests and create the
-  # libtool script then.
-  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
-  if test -f "$ltmain_in"; then
-    test -f Makefile && make "$ltmain"
-  fi
-fi
 
 
+fi
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -13956,85 +13408,27 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 CC="$lt_save_CC"
 
 
-# Check whether --with-tags was given.
-if test "${with_tags+set}" = set; then
-  withval=$with_tags; tagnames="$withval"
-fi
-
-
-if test -f "$ltmain" && test -n "$tagnames"; then
-  if test ! -f "${ofile}"; then
-    { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not exist" >&5
-echo "$as_me: WARNING: output file \`$ofile' does not exist" >&2;}
-  fi
-
-  if test -z "$LTCC"; then
-    eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
-    if test -z "$LTCC"; then
-      { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not look like a libtool script" >&5
-echo "$as_me: WARNING: output file \`$ofile' does not look like a libtool script" >&2;}
-    else
-      { echo "$as_me:$LINENO: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&5
-echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
-    fi
-  fi
-  if test -z "$LTCFLAGS"; then
-    eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`"
-  fi
-
-  # Extract list of available tagged configurations in $ofile.
-  # Note that this assumes the entire list is on one line.
-  available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'`
-
-  lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-  for tagname in $tagnames; do
-    IFS="$lt_save_ifs"
-    # Check whether tagname contains only valid characters
-    case `$echo "X$tagname" | $Xsed -e 's:[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]::g'` in
-    "") ;;
-    *)  { { echo "$as_me:$LINENO: error: invalid tag name: $tagname" >&5
-echo "$as_me: error: invalid tag name: $tagname" >&2;}
-   { (exit 1); exit 1; }; }
-	;;
-    esac
-
-    if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
-    then
-      { { echo "$as_me:$LINENO: error: tag name \"$tagname\" already exists" >&5
-echo "$as_me: error: tag name \"$tagname\" already exists" >&2;}
-   { (exit 1); exit 1; }; }
-    fi
-
-    # Update the list of available tags.
-    if test -n "$tagname"; then
-      echo appending configuration tag \"$tagname\" to $ofile
-
-      case $tagname in
-      CXX)
-	if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-	    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-	    (test "X$CXX" != "Xg++"))) ; then
-	  ac_ext=cpp
+ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
-
-
-
 archive_cmds_need_lc_CXX=no
 allow_undefined_flag_CXX=
 always_export_symbols_CXX=no
 archive_expsym_cmds_CXX=
+compiler_needs_object_CXX=no
 export_dynamic_flag_spec_CXX=
 hardcode_direct_CXX=no
+hardcode_direct_absolute_CXX=no
 hardcode_libdir_flag_spec_CXX=
 hardcode_libdir_flag_spec_ld_CXX=
 hardcode_libdir_separator_CXX=
 hardcode_minus_L_CXX=no
 hardcode_shlibpath_var_CXX=unsupported
 hardcode_automatic_CXX=no
+inherit_rpath_CXX=no
 module_cmds_CXX=
 module_expsym_cmds_CXX=
 link_all_deplibs_CXX=unknown
@@ -14043,13 +13437,6 @@ no_undefined_flag_CXX=
 whole_archive_flag_spec_CXX=
 enable_shared_with_static_runtimes_CXX=no
 
-# Dependencies to place before and after the object being linked:
-predep_objects_CXX=
-postdep_objects_CXX=
-predeps_CXX=
-postdeps_CXX=
-compiler_lib_search_path_CXX=
-
 # Source file extension for C++ test sources.
 ac_ext=cpp
 
@@ -14057,13 +13444,23 @@ ac_ext=cpp
 objext=o
 objext_CXX=$objext
 
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;\n"
+# No sense in running all these tests if we already determined that
+# the CXX compiler isn't working.  Some variables (like enable_shared)
+# are currently assumed to apply to all compilers on this platform,
+# and will be corrupted by setting them based on a non-working compiler.
+if test "$_lt_caught_CXX_error" != yes; then
+  # Code to be used in simple compile tests
+  lt_simple_compile_test_code="int some_variable = 0;"
+
+  # Code to be used in simple link tests
+  lt_simple_link_test_code='int main(int, char *[]) { return(0); }'
+
+  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+
+
+
 
-# Code to be used in simple link tests
-lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n'
 
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
 
 # If no C compiler was specified, use CC.
 LTCC=${LTCC-"$CC"}
@@ -14075,42 +13472,42 @@ LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
 compiler=$CC
 
 
-# save warnings/boilerplate of simple test code
-ac_outfile=conftest.$ac_objext
-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
+  # save warnings/boilerplate of simple test code
+  ac_outfile=conftest.$ac_objext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
 eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_compiler_boilerplate=`cat conftest.err`
-$rm conftest*
+$RM conftest*
 
-ac_outfile=conftest.$ac_objext
-printf "$lt_simple_link_test_code" >conftest.$ac_ext
+  ac_outfile=conftest.$ac_objext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
 eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_linker_boilerplate=`cat conftest.err`
-$rm conftest*
-
-
-# Allow CC to be a program name with arguments.
-lt_save_CC=$CC
-lt_save_LD=$LD
-lt_save_GCC=$GCC
-GCC=$GXX
-lt_save_with_gnu_ld=$with_gnu_ld
-lt_save_path_LD=$lt_cv_path_LD
-if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
-  lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
-else
-  $as_unset lt_cv_prog_gnu_ld
-fi
-if test -n "${lt_cv_path_LDCXX+set}"; then
-  lt_cv_path_LD=$lt_cv_path_LDCXX
-else
-  $as_unset lt_cv_path_LD
-fi
-test -z "${LDCXX+set}" || LD=$LDCXX
-CC=${CXX-"c++"}
-compiler=$CC
-compiler_CXX=$CC
-for cc_temp in $compiler""; do
+$RM -r conftest*
+
+
+  # Allow CC to be a program name with arguments.
+  lt_save_CC=$CC
+  lt_save_LD=$LD
+  lt_save_GCC=$GCC
+  GCC=$GXX
+  lt_save_with_gnu_ld=$with_gnu_ld
+  lt_save_path_LD=$lt_cv_path_LD
+  if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
+    lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
+  else
+    $as_unset lt_cv_prog_gnu_ld
+  fi
+  if test -n "${lt_cv_path_LDCXX+set}"; then
+    lt_cv_path_LD=$lt_cv_path_LDCXX
+  else
+    $as_unset lt_cv_path_LD
+  fi
+  test -z "${LDCXX+set}" || LD=$LDCXX
+  CC=${CXX-"c++"}
+  compiler=$CC
+  compiler_CXX=$CC
+  for cc_temp in $compiler""; do
   case $cc_temp in
     compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
     distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
@@ -14118,19 +13515,21 @@ for cc_temp in $compiler""; do
     *) break;;
   esac
 done
-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 
 
-# We don't want -fno-exception wen compiling C++ code, so set the
-# no_builtin_flag separately
-if test "$GXX" = yes; then
-  lt_prog_compiler_no_builtin_flag_CXX=' -fno-builtin'
-else
-  lt_prog_compiler_no_builtin_flag_CXX=
-fi
+  if test -n "$compiler"; then
+    # We don't want -fno-exception when compiling C++ code, so set the
+    # no_builtin_flag separately
+    if test "$GXX" = yes; then
+      lt_prog_compiler_no_builtin_flag_CXX=' -fno-builtin'
+    else
+      lt_prog_compiler_no_builtin_flag_CXX=
+    fi
+
+    if test "$GXX" = yes; then
+      # Set up default GNU C++ configuration
 
-if test "$GXX" = yes; then
-  # Set up default GNU C++ configuration
 
 
 # Check whether --with-gnu-ld was given.
@@ -14143,8 +13542,8 @@ fi
 ac_prog=ld
 if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
-  { echo "$as_me:$LINENO: checking for ld used by $CC" >&5
-echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5
+$as_echo_n "checking for ld used by $CC... " >&6; }
   case $host in
   *-*-mingw*)
     # gcc leaves a trailing carriage return which upsets mingw
@@ -14157,9 +13556,9 @@ echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }
     [\\/]* | ?:[\\/]*)
       re_direlt='/[^/][^/]*/\.\./'
       # Canonicalize the pathname of ld
-      ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
-      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
+      ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
+      while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
+	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
       done
       test -z "$LD" && LD="$ac_prog"
       ;;
@@ -14173,14 +13572,14 @@ echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }
     ;;
   esac
 elif test "$with_gnu_ld" = yes; then
-  { echo "$as_me:$LINENO: checking for GNU ld" >&5
-echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5
+$as_echo_n "checking for GNU ld... " >&6; }
 else
-  { echo "$as_me:$LINENO: checking for non-GNU ld" >&5
-echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5
+$as_echo_n "checking for non-GNU ld... " >&6; }
 fi
 if test "${lt_cv_path_LD+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -z "$LD"; then
   lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
@@ -14210,19 +13609,19 @@ fi
 
 LD="$lt_cv_path_LD"
 if test -n "$LD"; then
-  { echo "$as_me:$LINENO: result: $LD" >&5
-echo "${ECHO_T}$LD" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $LD" >&5
+$as_echo "$LD" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
-test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
-echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
+test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
+$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
    { (exit 1); exit 1; }; }
-{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
-echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
+$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
 if test "${lt_cv_prog_gnu_ld+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   # I'd rather use --version here, but apparently some GNU lds only accept -v.
 case `$LD -v 2>&1 </dev/null` in
@@ -14234,155 +13633,163 @@ case `$LD -v 2>&1 </dev/null` in
   ;;
 esac
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
-echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
+$as_echo "$lt_cv_prog_gnu_ld" >&6; }
 with_gnu_ld=$lt_cv_prog_gnu_ld
 
 
 
-  # Check if GNU C++ uses GNU ld as the underlying linker, since the
-  # archiving commands below assume that GNU ld is being used.
-  if test "$with_gnu_ld" = yes; then
-    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-    archive_expsym_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-
-    hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
-    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
 
-    # If archive_cmds runs LD, not CC, wlarc should be empty
-    # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
-    #     investigate it a little bit more. (MM)
-    wlarc='${wl}'
 
-    # ancient GNU ld didn't support --whole-archive et. al.
-    if eval "`$CC -print-prog-name=ld` --help 2>&1" | \
-	grep 'no-whole-archive' > /dev/null; then
-      whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-    else
-      whole_archive_flag_spec_CXX=
-    fi
-  else
-    with_gnu_ld=no
-    wlarc=
-
-    # A generic and very simple default shared library creation
-    # command for GNU C++ for the case where it uses the native
-    # linker, instead of GNU ld.  If possible, this setting should
-    # overridden to take advantage of the native linker features on
-    # the platform it is being used on.
-    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-  fi
 
-  # Commands to make compiler produce verbose output that lists
-  # what "hidden" libraries, object files and flags are used when
-  # linking a shared library.
-  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
 
-else
-  GXX=no
-  with_gnu_ld=no
-  wlarc=
-fi
+      # Check if GNU C++ uses GNU ld as the underlying linker, since the
+      # archiving commands below assume that GNU ld is being used.
+      if test "$with_gnu_ld" = yes; then
+        archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+        archive_expsym_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
 
-# PORTME: fill in a description of your system's C++ link characteristics
-{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
-ld_shlibs_CXX=yes
-case $host_os in
-  aix3*)
-    # FIXME: insert proper C++ library support
-    ld_shlibs_CXX=no
-    ;;
-  aix4* | aix5*)
-    if test "$host_cpu" = ia64; then
-      # On IA64, the linker does run time linking by default, so we don't
-      # have to do anything special.
-      aix_use_runtimelinking=no
-      exp_sym_flag='-Bexport'
-      no_entry_flag=""
-    else
-      aix_use_runtimelinking=no
-
-      # Test if we are trying to use run time linking or normal
-      # AIX style linking. If -brtl is somewhere in LDFLAGS, we
-      # need to do runtime linking.
-      case $host_os in aix4.[23]|aix4.[23].*|aix5*)
-	for ld_flag in $LDFLAGS; do
-	  case $ld_flag in
-	  *-brtl*)
-	    aix_use_runtimelinking=yes
-	    break
-	    ;;
-	  esac
-	done
-	;;
-      esac
+        hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+        export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
 
-      exp_sym_flag='-bexport'
-      no_entry_flag='-bnoentry'
-    fi
+        # If archive_cmds runs LD, not CC, wlarc should be empty
+        # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
+        #     investigate it a little bit more. (MM)
+        wlarc='${wl}'
 
-    # When large executables or shared objects are built, AIX ld can
-    # have problems creating the table of contents.  If linking a library
-    # or program results in "error TOC overflow" add -mminimal-toc to
-    # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-    # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+        # ancient GNU ld didn't support --whole-archive et. al.
+        if eval "`$CC -print-prog-name=ld` --help 2>&1" |
+	  $GREP 'no-whole-archive' > /dev/null; then
+          whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+        else
+          whole_archive_flag_spec_CXX=
+        fi
+      else
+        with_gnu_ld=no
+        wlarc=
+
+        # A generic and very simple default shared library creation
+        # command for GNU C++ for the case where it uses the native
+        # linker, instead of GNU ld.  If possible, this setting should
+        # overridden to take advantage of the native linker features on
+        # the platform it is being used on.
+        archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+      fi
 
-    archive_cmds_CXX=''
-    hardcode_direct_CXX=yes
-    hardcode_libdir_separator_CXX=':'
-    link_all_deplibs_CXX=yes
+      # Commands to make compiler produce verbose output that lists
+      # what "hidden" libraries, object files and flags are used when
+      # linking a shared library.
+      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
 
-    if test "$GXX" = yes; then
-      case $host_os in aix4.[012]|aix4.[012].*)
-      # We only want to do this on AIX 4.2 and lower, the check
-      # below for broken collect2 doesn't work under 4.3+
-	collect2name=`${CC} -print-prog-name=collect2`
-	if test -f "$collect2name" && \
-	   strings "$collect2name" | grep resolve_lib_name >/dev/null
-	then
-	  # We have reworked collect2
-	  hardcode_direct_CXX=yes
-	else
-	  # We have old collect2
-	  hardcode_direct_CXX=unsupported
-	  # It fails to find uninstalled libraries when the uninstalled
-	  # path is not listed in the libpath.  Setting hardcode_minus_L
-	  # to unsupported forces relinking
-	  hardcode_minus_L_CXX=yes
-	  hardcode_libdir_flag_spec_CXX='-L$libdir'
-	  hardcode_libdir_separator_CXX=
-	fi
-	;;
-      esac
-      shared_flag='-shared'
-      if test "$aix_use_runtimelinking" = yes; then
-	shared_flag="$shared_flag "'${wl}-G'
-      fi
     else
-      # not using gcc
-      if test "$host_cpu" = ia64; then
-	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-	# chokes on -Wl,-G. The following line is correct:
-	shared_flag='-G'
-      else
-	if test "$aix_use_runtimelinking" = yes; then
-	  shared_flag='${wl}-G'
-	else
-	  shared_flag='${wl}-bM:SRE'
-	fi
-      fi
+      GXX=no
+      with_gnu_ld=no
+      wlarc=
     fi
 
-    # It seems that -bexpall does not export symbols beginning with
-    # underscore (_), so it is better to generate a list of symbols to export.
-    always_export_symbols_CXX=yes
-    if test "$aix_use_runtimelinking" = yes; then
-      # Warning - without using the other runtime loading flags (-brtl),
-      # -berok will link without error, but may produce a broken library.
-      allow_undefined_flag_CXX='-berok'
-      # Determine the default libpath from the value encoded in an empty executable.
-      cat >conftest.$ac_ext <<_ACEOF
+    # PORTME: fill in a description of your system's C++ link characteristics
+    { $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
+    ld_shlibs_CXX=yes
+    case $host_os in
+      aix3*)
+        # FIXME: insert proper C++ library support
+        ld_shlibs_CXX=no
+        ;;
+      aix[4-9]*)
+        if test "$host_cpu" = ia64; then
+          # On IA64, the linker does run time linking by default, so we don't
+          # have to do anything special.
+          aix_use_runtimelinking=no
+          exp_sym_flag='-Bexport'
+          no_entry_flag=""
+        else
+          aix_use_runtimelinking=no
+
+          # Test if we are trying to use run time linking or normal
+          # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+          # need to do runtime linking.
+          case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
+	    for ld_flag in $LDFLAGS; do
+	      case $ld_flag in
+	      *-brtl*)
+	        aix_use_runtimelinking=yes
+	        break
+	        ;;
+	      esac
+	    done
+	    ;;
+          esac
+
+          exp_sym_flag='-bexport'
+          no_entry_flag='-bnoentry'
+        fi
+
+        # When large executables or shared objects are built, AIX ld can
+        # have problems creating the table of contents.  If linking a library
+        # or program results in "error TOC overflow" add -mminimal-toc to
+        # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+        # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+        archive_cmds_CXX=''
+        hardcode_direct_CXX=yes
+        hardcode_direct_absolute_CXX=yes
+        hardcode_libdir_separator_CXX=':'
+        link_all_deplibs_CXX=yes
+        file_list_spec_CXX='${wl}-f,'
+
+        if test "$GXX" = yes; then
+          case $host_os in aix4.[012]|aix4.[012].*)
+          # We only want to do this on AIX 4.2 and lower, the check
+          # below for broken collect2 doesn't work under 4.3+
+	  collect2name=`${CC} -print-prog-name=collect2`
+	  if test -f "$collect2name" &&
+	     strings "$collect2name" | $GREP resolve_lib_name >/dev/null
+	  then
+	    # We have reworked collect2
+	    :
+	  else
+	    # We have old collect2
+	    hardcode_direct_CXX=unsupported
+	    # It fails to find uninstalled libraries when the uninstalled
+	    # path is not listed in the libpath.  Setting hardcode_minus_L
+	    # to unsupported forces relinking
+	    hardcode_minus_L_CXX=yes
+	    hardcode_libdir_flag_spec_CXX='-L$libdir'
+	    hardcode_libdir_separator_CXX=
+	  fi
+          esac
+          shared_flag='-shared'
+	  if test "$aix_use_runtimelinking" = yes; then
+	    shared_flag="$shared_flag "'${wl}-G'
+	  fi
+        else
+          # not using gcc
+          if test "$host_cpu" = ia64; then
+	  # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+	  # chokes on -Wl,-G. The following line is correct:
+	  shared_flag='-G'
+          else
+	    if test "$aix_use_runtimelinking" = yes; then
+	      shared_flag='${wl}-G'
+	    else
+	      shared_flag='${wl}-bM:SRE'
+	    fi
+          fi
+        fi
+
+        export_dynamic_flag_spec_CXX='${wl}-bexpall'
+        # It seems that -bexpall does not export symbols beginning with
+        # underscore (_), so it is better to generate a list of symbols to
+	# export.
+        always_export_symbols_CXX=yes
+        if test "$aix_use_runtimelinking" = yes; then
+          # Warning - without using the other runtime loading flags (-brtl),
+          # -berok will link without error, but may produce a broken library.
+          allow_undefined_flag_CXX='-berok'
+          # Determine the default libpath from the value encoded in an empty
+          # executable.
+          cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -14403,46 +13810,58 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
 
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 # Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
-      hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
+          hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
 
-      archive_expsym_cmds_CXX="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-     else
-      if test "$host_cpu" = ia64; then
-	hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib'
-	allow_undefined_flag_CXX="-z nodefs"
-	archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
-      else
-	# Determine the default libpath from the value encoded in an empty executable.
-	cat >conftest.$ac_ext <<_ACEOF
+          archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+        else
+          if test "$host_cpu" = ia64; then
+	    hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib'
+	    allow_undefined_flag_CXX="-z nodefs"
+	    archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+          else
+	    # Determine the default libpath from the value encoded in an
+	    # empty executable.
+	    cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -14463,771 +13882,806 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
 
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 # Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
-	hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
-	# Warning - without using the other run time loading flags,
-	# -berok will link without error, but may produce a broken library.
-	no_undefined_flag_CXX=' ${wl}-bernotok'
-	allow_undefined_flag_CXX=' ${wl}-berok'
-	# Exported symbols can be pulled into shared objects from archives
-	whole_archive_flag_spec_CXX='$convenience'
-	archive_cmds_need_lc_CXX=yes
-	# This is similar to how AIX traditionally builds its shared libraries.
-	archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-      fi
-    fi
-    ;;
-
-  beos*)
-    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-      allow_undefined_flag_CXX=unsupported
-      # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-      # support --undefined.  This deserves some investigation.  FIXME
-      archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-    else
-      ld_shlibs_CXX=no
-    fi
-    ;;
+	    hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
+	    # Warning - without using the other run time loading flags,
+	    # -berok will link without error, but may produce a broken library.
+	    no_undefined_flag_CXX=' ${wl}-bernotok'
+	    allow_undefined_flag_CXX=' ${wl}-berok'
+	    # Exported symbols can be pulled into shared objects from archives
+	    whole_archive_flag_spec_CXX='$convenience'
+	    archive_cmds_need_lc_CXX=yes
+	    # This is similar to how AIX traditionally builds its shared
+	    # libraries.
+	    archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+          fi
+        fi
+        ;;
 
-  chorus*)
-    case $cc_basename in
-      *)
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
+      beos*)
+	if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	  allow_undefined_flag_CXX=unsupported
+	  # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+	  # support --undefined.  This deserves some investigation.  FIXME
+	  archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	else
+	  ld_shlibs_CXX=no
+	fi
 	;;
-    esac
-    ;;
 
-  cygwin* | mingw* | pw32*)
-    # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
-    # as there is no search path for DLLs.
-    hardcode_libdir_flag_spec_CXX='-L$libdir'
-    allow_undefined_flag_CXX=unsupported
-    always_export_symbols_CXX=no
-    enable_shared_with_static_runtimes_CXX=yes
-
-    if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-      archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-      # If the export-symbols file already is a .def file (1st line
-      # is EXPORTS), use it as is; otherwise, prepend...
-      archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	cp $export_symbols $output_objdir/$soname.def;
-      else
-	echo EXPORTS > $output_objdir/$soname.def;
-	cat $export_symbols >> $output_objdir/$soname.def;
-      fi~
-      $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-    else
-      ld_shlibs_CXX=no
-    fi
-  ;;
-      darwin* | rhapsody*)
-        case $host_os in
-        rhapsody* | darwin1.[012])
-         allow_undefined_flag_CXX='${wl}-undefined ${wl}suppress'
-         ;;
-       *) # Darwin 1.3 on
-         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-           allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-         else
-           case ${MACOSX_DEPLOYMENT_TARGET} in
-             10.[012])
-               allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-               ;;
-             10.*)
-               allow_undefined_flag_CXX='${wl}-undefined ${wl}dynamic_lookup'
-               ;;
-           esac
-         fi
-         ;;
+      chorus*)
+        case $cc_basename in
+          *)
+	  # FIXME: insert proper C++ library support
+	  ld_shlibs_CXX=no
+	  ;;
         esac
-      archive_cmds_need_lc_CXX=no
-      hardcode_direct_CXX=no
-      hardcode_automatic_CXX=yes
-      hardcode_shlibpath_var_CXX=unsupported
-      whole_archive_flag_spec_CXX=''
-      link_all_deplibs_CXX=yes
-
-    if test "$GXX" = yes ; then
-      lt_int_apple_cc_single_mod=no
-      output_verbose_link_cmd='echo'
-      if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
-       lt_int_apple_cc_single_mod=yes
-      fi
-      if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-       archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-      else
-          archive_cmds_CXX='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-        fi
-        module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-        # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-          if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-            archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+        ;;
+
+      cygwin* | mingw* | pw32* | cegcc*)
+        # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
+        # as there is no search path for DLLs.
+        hardcode_libdir_flag_spec_CXX='-L$libdir'
+        allow_undefined_flag_CXX=unsupported
+        always_export_symbols_CXX=no
+        enable_shared_with_static_runtimes_CXX=yes
+
+        if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+          archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+          # If the export-symbols file already is a .def file (1st line
+          # is EXPORTS), use it as is; otherwise, prepend...
+          archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	    cp $export_symbols $output_objdir/$soname.def;
           else
-            archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          fi
-            module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-      else
-      case $cc_basename in
-        xlc*)
-         output_verbose_link_cmd='echo'
-          archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
-          module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-          archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          ;;
-       *)
-         ld_shlibs_CXX=no
-          ;;
-      esac
-      fi
+	    echo EXPORTS > $output_objdir/$soname.def;
+	    cat $export_symbols >> $output_objdir/$soname.def;
+          fi~
+          $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+        else
+          ld_shlibs_CXX=no
+        fi
         ;;
+      darwin* | rhapsody*)
+
+
+  archive_cmds_need_lc_CXX=no
+  hardcode_direct_CXX=no
+  hardcode_automatic_CXX=yes
+  hardcode_shlibpath_var_CXX=unsupported
+  whole_archive_flag_spec_CXX=''
+  link_all_deplibs_CXX=yes
+  allow_undefined_flag_CXX="$_lt_dar_allow_undefined"
+  case $cc_basename in
+     ifort*) _lt_dar_can_shared=yes ;;
+     *) _lt_dar_can_shared=$GCC ;;
+  esac
+  if test "$_lt_dar_can_shared" = "yes"; then
+    output_verbose_link_cmd=echo
+    archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+    module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+    archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+    module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+       if test "$lt_cv_apple_cc_single_mod" != "yes"; then
+      archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
+      archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
+    fi
+
+  else
+  ld_shlibs_CXX=no
+  fi
 
-  dgux*)
-    case $cc_basename in
-      ec++*)
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-      ghcx*)
-	# Green Hills C++ Compiler
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-      *)
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
 	;;
-    esac
-    ;;
-  freebsd[12]*)
-    # C++ shared libraries reported to be fairly broken before switch to ELF
-    ld_shlibs_CXX=no
-    ;;
-  freebsd-elf*)
-    archive_cmds_need_lc_CXX=no
-    ;;
-  freebsd* | kfreebsd*-gnu | dragonfly*)
-    # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
-    # conventions
-    ld_shlibs_CXX=yes
-    ;;
-  gnu*)
-    ;;
-  hpux9*)
-    hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
-    hardcode_libdir_separator_CXX=:
-    export_dynamic_flag_spec_CXX='${wl}-E'
-    hardcode_direct_CXX=yes
-    hardcode_minus_L_CXX=yes # Not in the search PATH,
-				# but as the default
-				# location of the library.
-
-    case $cc_basename in
-    CC*)
-      # FIXME: insert proper C++ library support
-      ld_shlibs_CXX=no
-      ;;
-    aCC*)
-      archive_cmds_CXX='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      # Commands to make compiler produce verbose output that lists
-      # what "hidden" libraries, object files and flags are used when
-      # linking a shared library.
-      #
-      # There doesn't appear to be a way to prevent this compiler from
-      # explicitly linking system object files so we need to strip them
-      # from the output so that they don't get included in the library
-      # dependencies.
-      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[-]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-      ;;
-    *)
-      if test "$GXX" = yes; then
-        archive_cmds_CXX='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      else
-        # FIXME: insert proper C++ library support
+
+      dgux*)
+        case $cc_basename in
+          ec++*)
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+          ghcx*)
+	    # Green Hills C++ Compiler
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+          *)
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+        esac
+        ;;
+
+      freebsd[12]*)
+        # C++ shared libraries reported to be fairly broken before
+	# switch to ELF
         ld_shlibs_CXX=no
-      fi
-      ;;
-    esac
-    ;;
-  hpux10*|hpux11*)
-    if test $with_gnu_ld = no; then
-      hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
-      hardcode_libdir_separator_CXX=:
+        ;;
 
-      case $host_cpu in
-      hppa*64*|ia64*)
-	hardcode_libdir_flag_spec_ld_CXX='+b $libdir'
+      freebsd-elf*)
+        archive_cmds_need_lc_CXX=no
         ;;
-      *)
-	export_dynamic_flag_spec_CXX='${wl}-E'
+
+      freebsd* | dragonfly*)
+        # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
+        # conventions
+        ld_shlibs_CXX=yes
         ;;
-      esac
-    fi
-    case $host_cpu in
-    hppa*64*|ia64*)
-      hardcode_direct_CXX=no
-      hardcode_shlibpath_var_CXX=no
-      ;;
-    *)
-      hardcode_direct_CXX=yes
-      hardcode_minus_L_CXX=yes # Not in the search PATH,
-					      # but as the default
-					      # location of the library.
-      ;;
-    esac
 
-    case $cc_basename in
-      CC*)
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-      aCC*)
-	case $host_cpu in
-	hppa*64*)
-	  archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	  ;;
-	ia64*)
-	  archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	  ;;
-	*)
-	  archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	  ;;
-	esac
-	# Commands to make compiler produce verbose output that lists
-	# what "hidden" libraries, object files and flags are used when
-	# linking a shared library.
-	#
-	# There doesn't appear to be a way to prevent this compiler from
-	# explicitly linking system object files so we need to strip them
-	# from the output so that they don't get included in the library
-	# dependencies.
-	output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-	;;
-      *)
-	if test "$GXX" = yes; then
-	  if test $with_gnu_ld = no; then
+      gnu*)
+        ;;
+
+      hpux9*)
+        hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
+        hardcode_libdir_separator_CXX=:
+        export_dynamic_flag_spec_CXX='${wl}-E'
+        hardcode_direct_CXX=yes
+        hardcode_minus_L_CXX=yes # Not in the search PATH,
+				             # but as the default
+				             # location of the library.
+
+        case $cc_basename in
+          CC*)
+            # FIXME: insert proper C++ library support
+            ld_shlibs_CXX=no
+            ;;
+          aCC*)
+            archive_cmds_CXX='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+            # Commands to make compiler produce verbose output that lists
+            # what "hidden" libraries, object files and flags are used when
+            # linking a shared library.
+            #
+            # There doesn't appear to be a way to prevent this compiler from
+            # explicitly linking system object files so we need to strip them
+            # from the output so that they don't get included in the library
+            # dependencies.
+            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+            ;;
+          *)
+            if test "$GXX" = yes; then
+              archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+            else
+              # FIXME: insert proper C++ library support
+              ld_shlibs_CXX=no
+            fi
+            ;;
+        esac
+        ;;
+
+      hpux10*|hpux11*)
+        if test $with_gnu_ld = no; then
+	  hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
+	  hardcode_libdir_separator_CXX=:
+
+          case $host_cpu in
+            hppa*64*|ia64*)
+              ;;
+            *)
+	      export_dynamic_flag_spec_CXX='${wl}-E'
+              ;;
+          esac
+        fi
+        case $host_cpu in
+          hppa*64*|ia64*)
+            hardcode_direct_CXX=no
+            hardcode_shlibpath_var_CXX=no
+            ;;
+          *)
+            hardcode_direct_CXX=yes
+            hardcode_direct_absolute_CXX=yes
+            hardcode_minus_L_CXX=yes # Not in the search PATH,
+					         # but as the default
+					         # location of the library.
+            ;;
+        esac
+
+        case $cc_basename in
+          CC*)
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+          aCC*)
 	    case $host_cpu in
-	    hppa*64*)
-	      archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	      ;;
-	    ia64*)
-	      archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	      ;;
-	    *)
-	      archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	      ;;
+	      hppa*64*)
+	        archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	        ;;
+	      ia64*)
+	        archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	        ;;
+	      *)
+	        archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	        ;;
 	    esac
-	  fi
-	else
-	  # FIXME: insert proper C++ library support
-	  ld_shlibs_CXX=no
-	fi
-	;;
-    esac
-    ;;
-  interix3*)
-    hardcode_direct_CXX=no
-    hardcode_shlibpath_var_CXX=no
-    hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-    export_dynamic_flag_spec_CXX='${wl}-E'
-    # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-    # Instead, shared libraries are loaded at an image base (0x10000000 by
-    # default) and relocated if they conflict, which is a slow very memory
-    # consuming and fragmenting process.  To avoid this, we pick a random,
-    # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-    # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-    archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-    archive_expsym_cmds_CXX='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-    ;;
-  irix5* | irix6*)
-    case $cc_basename in
-      CC*)
-	# SGI C++
-	archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-
-	# Archives containing C++ object files must be created using
-	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
-	# necessary to make sure instantiated templates are included
-	# in the archive.
-	old_archive_cmds_CXX='$CC -ar -WR,-u -o $oldlib $oldobjs'
-	;;
-      *)
-	if test "$GXX" = yes; then
-	  if test "$with_gnu_ld" = no; then
-	    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	  else
-	    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
-	  fi
-	fi
-	link_all_deplibs_CXX=yes
-	;;
-    esac
-    hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
-    hardcode_libdir_separator_CXX=:
-    ;;
-  linux*)
-    case $cc_basename in
-      KCC*)
-	# Kuck and Associates, Inc. (KAI) C++ Compiler
-
-	# KCC will only create a shared library if the output file
-	# ends with ".so" (or ".sl" for HP-UX), so rename the library
-	# to its proper name (with version) after linking.
-	archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-	archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
-	# Commands to make compiler produce verbose output that lists
-	# what "hidden" libraries, object files and flags are used when
-	# linking a shared library.
-	#
-	# There doesn't appear to be a way to prevent this compiler from
-	# explicitly linking system object files so we need to strip them
-	# from the output so that they don't get included in the library
-	# dependencies.
-	output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-
-	hardcode_libdir_flag_spec_CXX='${wl}--rpath,$libdir'
-	export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-
-	# Archives containing C++ object files must be created using
-	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
-	old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
-	;;
-      icpc*)
-	# Intel C++
-	with_gnu_ld=yes
-	# version 8.0 and above of icpc choke on multiply defined symbols
-	# if we add $predep_objects and $postdep_objects, however 7.1 and
-	# earlier do not add the objects themselves.
-	case `$CC -V 2>&1` in
-	*"Version 7."*)
-  	  archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-  	  archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-	  ;;
-	*)  # Version 8.0 or newer
-	  tmp_idyn=
-	  case $host_cpu in
-	    ia64*) tmp_idyn=' -i_dynamic';;
-	  esac
-  	  archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	  archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-	  ;;
-	esac
-	archive_cmds_need_lc_CXX=no
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+	    ;;
+          *)
+	    if test "$GXX" = yes; then
+	      if test $with_gnu_ld = no; then
+	        case $host_cpu in
+	          hppa*64*)
+	            archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            ;;
+	          ia64*)
+	            archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            ;;
+	          *)
+	            archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            ;;
+	        esac
+	      fi
+	    else
+	      # FIXME: insert proper C++ library support
+	      ld_shlibs_CXX=no
+	    fi
+	    ;;
+        esac
+        ;;
+
+      interix[3-9]*)
+	hardcode_direct_CXX=no
+	hardcode_shlibpath_var_CXX=no
 	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-	export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-	whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+	export_dynamic_flag_spec_CXX='${wl}-E'
+	# Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+	# Instead, shared libraries are loaded at an image base (0x10000000 by
+	# default) and relocated if they conflict, which is a slow very memory
+	# consuming and fragmenting process.  To avoid this, we pick a random,
+	# 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+	# time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+	archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+	archive_expsym_cmds_CXX='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
 	;;
-      pgCC*)
-        # Portland Group C++ compiler
-	archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
-  	archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
-
-	hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
-	export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-	whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+      irix5* | irix6*)
+        case $cc_basename in
+          CC*)
+	    # SGI C++
+	    archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+
+	    # Archives containing C++ object files must be created using
+	    # "CC -ar", where "CC" is the IRIX C++ compiler.  This is
+	    # necessary to make sure instantiated templates are included
+	    # in the archive.
+	    old_archive_cmds_CXX='$CC -ar -WR,-u -o $oldlib $oldobjs'
+	    ;;
+          *)
+	    if test "$GXX" = yes; then
+	      if test "$with_gnu_ld" = no; then
+	        archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	      else
+	        archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib'
+	      fi
+	    fi
+	    link_all_deplibs_CXX=yes
+	    ;;
+        esac
+        hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+        hardcode_libdir_separator_CXX=:
+        inherit_rpath_CXX=yes
         ;;
-      cxx*)
-	# Compaq C++
-	archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
 
-	runpath_var=LD_RUN_PATH
-	hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-	hardcode_libdir_separator_CXX=:
-
-	# Commands to make compiler produce verbose output that lists
-	# what "hidden" libraries, object files and flags are used when
-	# linking a shared library.
-	#
-	# There doesn't appear to be a way to prevent this compiler from
-	# explicitly linking system object files so we need to strip them
-	# from the output so that they don't get included in the library
-	# dependencies.
-	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-	;;
-    esac
-    ;;
-  lynxos*)
-    # FIXME: insert proper C++ library support
-    ld_shlibs_CXX=no
-    ;;
-  m88k*)
-    # FIXME: insert proper C++ library support
-    ld_shlibs_CXX=no
-    ;;
-  mvs*)
-    case $cc_basename in
-      cxx*)
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-      *)
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-    esac
-    ;;
-  netbsd*)
-    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-      archive_cmds_CXX='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
-      wlarc=
-      hardcode_libdir_flag_spec_CXX='-R$libdir'
-      hardcode_direct_CXX=yes
-      hardcode_shlibpath_var_CXX=no
-    fi
-    # Workaround some broken pre-1.5 toolchains
-    output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
-    ;;
-  openbsd2*)
-    # C++ shared libraries are fairly broken
-    ld_shlibs_CXX=no
-    ;;
-  openbsd*)
-    hardcode_direct_CXX=yes
-    hardcode_shlibpath_var_CXX=no
-    archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-    hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-      archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
-      export_dynamic_flag_spec_CXX='${wl}-E'
-      whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-    fi
-    output_verbose_link_cmd='echo'
-    ;;
-  osf3*)
-    case $cc_basename in
-      KCC*)
-	# Kuck and Associates, Inc. (KAI) C++ Compiler
+      linux* | k*bsd*-gnu)
+        case $cc_basename in
+          KCC*)
+	    # Kuck and Associates, Inc. (KAI) C++ Compiler
 
-	# KCC will only create a shared library if the output file
-	# ends with ".so" (or ".sl" for HP-UX), so rename the library
-	# to its proper name (with version) after linking.
-	archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+	    # KCC will only create a shared library if the output file
+	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
+	    # to its proper name (with version) after linking.
+	    archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+	    archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+
+	    hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+	    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
+
+	    # Archives containing C++ object files must be created using
+	    # "CC -Bstatic", where "CC" is the KAI C++ compiler.
+	    old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
+	    ;;
+	  icpc* | ecpc* )
+	    # Intel C++
+	    with_gnu_ld=yes
+	    # version 8.0 and above of icpc choke on multiply defined symbols
+	    # if we add $predep_objects and $postdep_objects, however 7.1 and
+	    # earlier do not add the objects themselves.
+	    case `$CC -V 2>&1` in
+	      *"Version 7."*)
+	        archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+		archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+		;;
+	      *)  # Version 8.0 or newer
+	        tmp_idyn=
+	        case $host_cpu in
+		  ia64*) tmp_idyn=' -i_dynamic';;
+		esac
+	        archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+		archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+		;;
+	    esac
+	    archive_cmds_need_lc_CXX=no
+	    hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+	    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
+	    whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+	    ;;
+          pgCC* | pgcpp*)
+            # Portland Group C++ compiler
+	    case `$CC -V` in
+	    *pgCC\ [1-5]* | *pgcpp\ [1-5]*)
+	      prelink_cmds_CXX='tpldir=Template.dir~
+		rm -rf $tpldir~
+		$CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
+		compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
+	      old_archive_cmds_CXX='tpldir=Template.dir~
+		rm -rf $tpldir~
+		$CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
+		$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
+		$RANLIB $oldlib'
+	      archive_cmds_CXX='tpldir=Template.dir~
+		rm -rf $tpldir~
+		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+	      archive_expsym_cmds_CXX='tpldir=Template.dir~
+		rm -rf $tpldir~
+		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+	      ;;
+	    *) # Version 6 will use weak symbols
+	      archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+	      archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+	      ;;
+	    esac
 
-	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-	hardcode_libdir_separator_CXX=:
+	    hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
+	    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
+	    whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+            ;;
+	  cxx*)
+	    # Compaq C++
+	    archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	    archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
 
-	# Archives containing C++ object files must be created using
-	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
-	old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
+	    runpath_var=LD_RUN_PATH
+	    hardcode_libdir_flag_spec_CXX='-rpath $libdir'
+	    hardcode_libdir_separator_CXX=:
 
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+	    ;;
+	  xl*)
+	    # IBM XL 8.0 on PPC, with GNU ld
+	    hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+	    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
+	    archive_cmds_CXX='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	    if test "x$supports_anon_versioning" = xyes; then
+	      archive_expsym_cmds_CXX='echo "{ global:" > $output_objdir/$libname.ver~
+		cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+		echo "local: *; };" >> $output_objdir/$libname.ver~
+		$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+	    fi
+	    ;;
+	  *)
+	    case `$CC -V 2>&1 | sed 5q` in
+	    *Sun\ C*)
+	      # Sun C++ 5.9
+	      no_undefined_flag_CXX=' -zdefs'
+	      archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	      archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
+	      hardcode_libdir_flag_spec_CXX='-R$libdir'
+	      whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+	      compiler_needs_object_CXX=yes
+
+	      # Not sure whether something based on
+	      # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
+	      # would be better.
+	      output_verbose_link_cmd='echo'
+
+	      # Archives containing C++ object files must be created using
+	      # "CC -xar", where "CC" is the Sun C++ compiler.  This is
+	      # necessary to make sure instantiated templates are included
+	      # in the archive.
+	      old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
+	      ;;
+	    esac
+	    ;;
+	esac
 	;;
-      RCC*)
-	# Rational C++ 2.4.1
-	# FIXME: insert proper C++ library support
+
+      lynxos*)
+        # FIXME: insert proper C++ library support
 	ld_shlibs_CXX=no
 	;;
-      cxx*)
-	allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-
-	hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
-	hardcode_libdir_separator_CXX=:
-
-	# Commands to make compiler produce verbose output that lists
-	# what "hidden" libraries, object files and flags are used when
-	# linking a shared library.
-	#
-	# There doesn't appear to be a way to prevent this compiler from
-	# explicitly linking system object files so we need to strip them
-	# from the output so that they don't get included in the library
-	# dependencies.
-	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-	;;
-      *)
-	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
-	  archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 
-	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
-	  hardcode_libdir_separator_CXX=:
+      m88k*)
+        # FIXME: insert proper C++ library support
+        ld_shlibs_CXX=no
+	;;
 
-	  # Commands to make compiler produce verbose output that lists
-	  # what "hidden" libraries, object files and flags are used when
-	  # linking a shared library.
-	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
+      mvs*)
+        case $cc_basename in
+          cxx*)
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+	  *)
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+	esac
+	;;
 
-	else
-	  # FIXME: insert proper C++ library support
-	  ld_shlibs_CXX=no
+      netbsd*)
+        if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	  archive_cmds_CXX='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
+	  wlarc=
+	  hardcode_libdir_flag_spec_CXX='-R$libdir'
+	  hardcode_direct_CXX=yes
+	  hardcode_shlibpath_var_CXX=no
 	fi
+	# Workaround some broken pre-1.5 toolchains
+	output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
 	;;
-    esac
-    ;;
-  osf4* | osf5*)
-    case $cc_basename in
-      KCC*)
-	# Kuck and Associates, Inc. (KAI) C++ Compiler
-
-	# KCC will only create a shared library if the output file
-	# ends with ".so" (or ".sl" for HP-UX), so rename the library
-	# to its proper name (with version) after linking.
-	archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-
-	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-	hardcode_libdir_separator_CXX=:
 
-	# Archives containing C++ object files must be created using
-	# the KAI C++ compiler.
-	old_archive_cmds_CXX='$CC -o $oldlib $oldobjs'
+      *nto* | *qnx*)
+        ld_shlibs_CXX=yes
 	;;
-      RCC*)
-	# Rational C++ 2.4.1
-	# FIXME: insert proper C++ library support
+
+      openbsd2*)
+        # C++ shared libraries are fairly broken
 	ld_shlibs_CXX=no
 	;;
-      cxx*)
-	allow_undefined_flag_CXX=' -expect_unresolved \*'
-	archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-	archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
-	  echo "-hidden">> $lib.exp~
-	  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry ${output_objdir}/so_locations -o $lib~
-	  $rm $lib.exp'
-
-	hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-	hardcode_libdir_separator_CXX=:
-
-	# Commands to make compiler produce verbose output that lists
-	# what "hidden" libraries, object files and flags are used when
-	# linking a shared library.
-	#
-	# There doesn't appear to be a way to prevent this compiler from
-	# explicitly linking system object files so we need to strip them
-	# from the output so that they don't get included in the library
-	# dependencies.
-	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-	;;
-      *)
-	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
-	 archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-
-	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
-	  hardcode_libdir_separator_CXX=:
-
-	  # Commands to make compiler produce verbose output that lists
-	  # what "hidden" libraries, object files and flags are used when
-	  # linking a shared library.
-	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
 
+      openbsd*)
+	if test -f /usr/libexec/ld.so; then
+	  hardcode_direct_CXX=yes
+	  hardcode_shlibpath_var_CXX=no
+	  hardcode_direct_absolute_CXX=yes
+	  archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+	  hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+	  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	    archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
+	    export_dynamic_flag_spec_CXX='${wl}-E'
+	    whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+	  fi
+	  output_verbose_link_cmd=echo
 	else
-	  # FIXME: insert proper C++ library support
 	  ld_shlibs_CXX=no
 	fi
 	;;
-    esac
-    ;;
-  psos*)
-    # FIXME: insert proper C++ library support
-    ld_shlibs_CXX=no
-    ;;
-  sunos4*)
-    case $cc_basename in
-      CC*)
-	# Sun C++ 4.x
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-      lcc*)
-	# Lucid
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-      *)
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-    esac
-    ;;
-  solaris*)
-    case $cc_basename in
-      CC*)
-	# Sun C++ 4.2, 5.x and Centerline C++
-        archive_cmds_need_lc_CXX=yes
-	no_undefined_flag_CXX=' -zdefs'
-	archive_cmds_CXX='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-	$CC -G${allow_undefined_flag}  ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
-
-	hardcode_libdir_flag_spec_CXX='-R$libdir'
-	hardcode_shlibpath_var_CXX=no
-	case $host_os in
-	  solaris2.[0-5] | solaris2.[0-5].*) ;;
-	  *)
-	    # The C++ compiler is used as linker so we must use $wl
-	    # flag to pass the commands to the underlying system
-	    # linker. We must also pass each convience library through
-	    # to the system linker between allextract/defaultextract.
-	    # The C++ compiler will combine linker options so we
-	    # cannot just pass the convience library names through
-	    # without $wl.
-	    # Supported since Solaris 2.6 (maybe 2.5.1?)
-	    whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
-	    ;;
-	esac
-	link_all_deplibs_CXX=yes
-
-	output_verbose_link_cmd='echo'
 
-	# Archives containing C++ object files must be created using
-	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
-	# necessary to make sure instantiated templates are included
-	# in the archive.
-	old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
-	;;
-      gcx*)
-	# Green Hills C++ Compiler
-	archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+      osf3* | osf4* | osf5*)
+        case $cc_basename in
+          KCC*)
+	    # Kuck and Associates, Inc. (KAI) C++ Compiler
+
+	    # KCC will only create a shared library if the output file
+	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
+	    # to its proper name (with version) after linking.
+	    archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+
+	    hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+	    hardcode_libdir_separator_CXX=:
+
+	    # Archives containing C++ object files must be created using
+	    # the KAI C++ compiler.
+	    case $host in
+	      osf3*) old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs' ;;
+	      *) old_archive_cmds_CXX='$CC -o $oldlib $oldobjs' ;;
+	    esac
+	    ;;
+          RCC*)
+	    # Rational C++ 2.4.1
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+          cxx*)
+	    case $host in
+	      osf3*)
+	        allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
+	        archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+	        hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+		;;
+	      *)
+	        allow_undefined_flag_CXX=' -expect_unresolved \*'
+	        archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+	        archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
+	          echo "-hidden">> $lib.exp~
+	          $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp  `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~
+	          $RM $lib.exp'
+	        hardcode_libdir_flag_spec_CXX='-rpath $libdir'
+		;;
+	    esac
 
-	# The C++ compiler must be used to create the archive.
-	old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-	;;
-      *)
-	# GNU C++ compiler with Solaris linker
-	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-	  no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
-	  if $CC --version | grep -v '^2\.7' > /dev/null; then
-	    archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-	    archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-		$CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+	    hardcode_libdir_separator_CXX=:
 
 	    # Commands to make compiler produce verbose output that lists
 	    # what "hidden" libraries, object files and flags are used when
 	    # linking a shared library.
-	    output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
-	  else
-	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
-	    # platform.
-	    archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-	    archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-		$CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+	    ;;
+	  *)
+	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+	      allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
+	      case $host in
+	        osf3*)
+	          archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+		  ;;
+	        *)
+	          archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+		  ;;
+	      esac
+
+	      hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+	      hardcode_libdir_separator_CXX=:
+
+	      # Commands to make compiler produce verbose output that lists
+	      # what "hidden" libraries, object files and flags are used when
+	      # linking a shared library.
+	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+
+	    else
+	      # FIXME: insert proper C++ library support
+	      ld_shlibs_CXX=no
+	    fi
+	    ;;
+        esac
+        ;;
 
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
-	  fi
+      psos*)
+        # FIXME: insert proper C++ library support
+        ld_shlibs_CXX=no
+        ;;
+
+      sunos4*)
+        case $cc_basename in
+          CC*)
+	    # Sun C++ 4.x
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+          lcc*)
+	    # Lucid
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+          *)
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+        esac
+        ;;
+
+      solaris*)
+        case $cc_basename in
+          CC*)
+	    # Sun C++ 4.2, 5.x and Centerline C++
+            archive_cmds_need_lc_CXX=yes
+	    no_undefined_flag_CXX=' -zdefs'
+	    archive_cmds_CXX='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	    archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+	      $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+	    hardcode_libdir_flag_spec_CXX='-R$libdir'
+	    hardcode_shlibpath_var_CXX=no
+	    case $host_os in
+	      solaris2.[0-5] | solaris2.[0-5].*) ;;
+	      *)
+		# The compiler driver will combine and reorder linker options,
+		# but understands `-z linker_flag'.
+	        # Supported since Solaris 2.6 (maybe 2.5.1?)
+		whole_archive_flag_spec_CXX='-z allextract$convenience -z defaultextract'
+	        ;;
+	    esac
+	    link_all_deplibs_CXX=yes
+
+	    output_verbose_link_cmd='echo'
+
+	    # Archives containing C++ object files must be created using
+	    # "CC -xar", where "CC" is the Sun C++ compiler.  This is
+	    # necessary to make sure instantiated templates are included
+	    # in the archive.
+	    old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
+	    ;;
+          gcx*)
+	    # Green Hills C++ Compiler
+	    archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+
+	    # The C++ compiler must be used to create the archive.
+	    old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
+	    ;;
+          *)
+	    # GNU C++ compiler with Solaris linker
+	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+	      no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
+	      if $CC --version | $GREP -v '^2\.7' > /dev/null; then
+	        archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+	        archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+		  $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+	        # Commands to make compiler produce verbose output that lists
+	        # what "hidden" libraries, object files and flags are used when
+	        # linking a shared library.
+	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+	      else
+	        # g++ 2.7 appears to require `-G' NOT `-shared' on this
+	        # platform.
+	        archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+	        archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+		  $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+	        # Commands to make compiler produce verbose output that lists
+	        # what "hidden" libraries, object files and flags are used when
+	        # linking a shared library.
+	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+	      fi
+
+	      hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
+	      case $host_os in
+		solaris2.[0-5] | solaris2.[0-5].*) ;;
+		*)
+		  whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+		  ;;
+	      esac
+	    fi
+	    ;;
+        esac
+        ;;
+
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
+      no_undefined_flag_CXX='${wl}-z,text'
+      archive_cmds_need_lc_CXX=no
+      hardcode_shlibpath_var_CXX=no
+      runpath_var='LD_RUN_PATH'
+
+      case $cc_basename in
+        CC*)
+	  archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	  archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+      esac
+      ;;
+
+      sysv5* | sco3.2v5* | sco5v6*)
+	# Note: We can NOT use -z defs as we might desire, because we do not
+	# link with -lc, and that would cause any symbols used from libc to
+	# always be unresolved, which means just about no library would
+	# ever link correctly.  If we're not using GNU ld we use -z text
+	# though, which does catch some bad symbols but isn't as heavy-handed
+	# as -z defs.
+	no_undefined_flag_CXX='${wl}-z,text'
+	allow_undefined_flag_CXX='${wl}-z,nodefs'
+	archive_cmds_need_lc_CXX=no
+	hardcode_shlibpath_var_CXX=no
+	hardcode_libdir_flag_spec_CXX='${wl}-R,$libdir'
+	hardcode_libdir_separator_CXX=':'
+	link_all_deplibs_CXX=yes
+	export_dynamic_flag_spec_CXX='${wl}-Bexport'
+	runpath_var='LD_RUN_PATH'
+
+	case $cc_basename in
+          CC*)
+	    archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    ;;
+	  *)
+	    archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    ;;
+	esac
+      ;;
+
+      tandem*)
+        case $cc_basename in
+          NCC*)
+	    # NonStop-UX NCC 3.20
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+          *)
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+        esac
+        ;;
+
+      vxworks*)
+        # FIXME: insert proper C++ library support
+        ld_shlibs_CXX=no
+        ;;
 
-	  hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
-	fi
-	;;
-    esac
-    ;;
-  sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
-    no_undefined_flag_CXX='${wl}-z,text'
-    archive_cmds_need_lc_CXX=no
-    hardcode_shlibpath_var_CXX=no
-    runpath_var='LD_RUN_PATH'
-
-    case $cc_basename in
-      CC*)
-	archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	;;
-      *)
-	archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	;;
-    esac
-    ;;
-  sysv5* | sco3.2v5* | sco5v6*)
-    # Note: We can NOT use -z defs as we might desire, because we do not
-    # link with -lc, and that would cause any symbols used from libc to
-    # always be unresolved, which means just about no library would
-    # ever link correctly.  If we're not using GNU ld we use -z text
-    # though, which does catch some bad symbols but isn't as heavy-handed
-    # as -z defs.
-    # For security reasons, it is highly recommended that you always
-    # use absolute paths for naming shared libraries, and exclude the
-    # DT_RUNPATH tag from executables and libraries.  But doing so
-    # requires that you compile everything twice, which is a pain.
-    # So that behaviour is only enabled if SCOABSPATH is set to a
-    # non-empty value in the environment.  Most likely only useful for
-    # creating official distributions of packages.
-    # This is a hack until libtool officially supports absolute path
-    # names for shared libraries.
-    no_undefined_flag_CXX='${wl}-z,text'
-    allow_undefined_flag_CXX='${wl}-z,nodefs'
-    archive_cmds_need_lc_CXX=no
-    hardcode_shlibpath_var_CXX=no
-    hardcode_libdir_flag_spec_CXX='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
-    hardcode_libdir_separator_CXX=':'
-    link_all_deplibs_CXX=yes
-    export_dynamic_flag_spec_CXX='${wl}-Bexport'
-    runpath_var='LD_RUN_PATH'
-
-    case $cc_basename in
-      CC*)
-	archive_cmds_CXX='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	;;
-      *)
-	archive_cmds_CXX='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	;;
-    esac
-    ;;
-  tandem*)
-    case $cc_basename in
-      NCC*)
-	# NonStop-UX NCC 3.20
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
       *)
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
+        # FIXME: insert proper C++ library support
+        ld_shlibs_CXX=no
+        ;;
     esac
-    ;;
-  vxworks*)
-    # FIXME: insert proper C++ library support
-    ld_shlibs_CXX=no
-    ;;
-  *)
-    # FIXME: insert proper C++ library support
-    ld_shlibs_CXX=no
-    ;;
-esac
-{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
-echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
-test "$ld_shlibs_CXX" = no && can_build_shared=no
 
-GCC_CXX="$GXX"
-LD_CXX="$LD"
+    { $as_echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
+$as_echo "$ld_shlibs_CXX" >&6; }
+    test "$ld_shlibs_CXX" = no && can_build_shared=no
+
+    GCC_CXX="$GXX"
+    LD_CXX="$LD"
 
+    ## CAVEAT EMPTOR:
+    ## There is no encapsulation within the following macros, do not change
+    ## the running order or otherwise move them around unless you know exactly
+    ## what you are doing...
+    # Dependencies to place before and after the object being linked:
+predep_objects_CXX=
+postdep_objects_CXX=
+predeps_CXX=
+postdeps_CXX=
+compiler_lib_search_path_CXX=
 
-cat > conftest.$ac_ext <<EOF
+cat > conftest.$ac_ext <<_LT_EOF
 class Foo
 {
 public:
@@ -15235,12 +14689,12 @@ public:
 private:
   int a;
 };
-EOF
+_LT_EOF
 
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   # Parse the compiler output and extract the necessary
   # objects, libraries and library flags.
@@ -15249,19 +14703,14 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   # the conftest object file.
   pre_test_object_deps_done=no
 
-  # The `*' in the case matches for architectures that use `case' in
-  # $output_verbose_cmd can trigger glob expansion during the loop
-  # eval without this substitution.
-  output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
-
-  for p in `eval $output_verbose_link_cmd`; do
+  for p in `eval "$output_verbose_link_cmd"`; do
     case $p in
 
     -L* | -R* | -l*)
        # Some compilers place space between "-{L,R}" and the path.
        # Remove the space.
-       if test $p = "-L" \
-	  || test $p = "-R"; then
+       if test $p = "-L" ||
+          test $p = "-R"; then
 	 prev=$p
 	 continue
        else
@@ -15326,11 +14775,11 @@ else
   echo "libtool.m4: error: problem compiling CXX test program"
 fi
 
-$rm -f confest.$objext
+$RM -f confest.$objext
 
 # PORTME: override above test on systems where it is broken
 case $host_os in
-interix3*)
+interix[3-9]*)
   # Interix 3.5 installs completely hosed .la files for C++, so rather than
   # hack all around it, let's just trust "g++" to DTRT.
   predep_objects_CXX=
@@ -15338,13 +14787,47 @@ interix3*)
   postdeps_CXX=
   ;;
 
+linux*)
+  case `$CC -V 2>&1 | sed 5q` in
+  *Sun\ C*)
+    # Sun C++ 5.9
+
+    # The more standards-conforming stlport4 library is
+    # incompatible with the Cstd library. Avoid specifying
+    # it if it's in CXXFLAGS. Ignore libCrun as
+    # -library=stlport4 depends on it.
+    case " $CXX $CXXFLAGS " in
+    *" -library=stlport4 "*)
+      solaris_use_stlport4=yes
+      ;;
+    esac
+
+    if test "$solaris_use_stlport4" != yes; then
+      postdeps_CXX='-library=Cstd -library=Crun'
+    fi
+    ;;
+  esac
+  ;;
+
 solaris*)
   case $cc_basename in
   CC*)
+    # The more standards-conforming stlport4 library is
+    # incompatible with the Cstd library. Avoid specifying
+    # it if it's in CXXFLAGS. Ignore libCrun as
+    # -library=stlport4 depends on it.
+    case " $CXX $CXXFLAGS " in
+    *" -library=stlport4 "*)
+      solaris_use_stlport4=yes
+      ;;
+    esac
+
     # Adding this requires a known-good setup of shared libraries for
     # Sun compiler versions before 5.6, else PIC objects from an old
     # archive will be linked into the output, leading to subtle bugs.
-    postdeps_CXX='-lCstd -lCrun'
+    if test "$solaris_use_stlport4" != yes; then
+      postdeps_CXX='-library=Cstd -library=Crun'
+    fi
     ;;
   esac
   ;;
@@ -15354,13 +14837,47 @@ esac
 case " $postdeps_CXX " in
 *" -lc "*) archive_cmds_need_lc_CXX=no ;;
 esac
+ compiler_lib_search_dirs_CXX=
+if test -n "${compiler_lib_search_path_CXX}"; then
+ compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
+fi
+
+
+
+
+
+
+
+
+
+
 
-lt_prog_compiler_wl_CXX=
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    lt_prog_compiler_wl_CXX=
 lt_prog_compiler_pic_CXX=
 lt_prog_compiler_static_CXX=
 
-{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
 
   # C++ specific cases for pic, static, wl, etc.
   if test "$GXX" = yes; then
@@ -15375,18 +14892,30 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
 	lt_prog_compiler_static_CXX='-Bstatic'
       fi
       ;;
+
     amigaos*)
-      # FIXME: we need at least 68020 code to build shared libraries, but
-      # adding the `-m68020' flag to GCC prevents building anything better,
-      # like `-m68040'.
-      lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4'
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            lt_prog_compiler_pic_CXX='-fPIC'
+        ;;
+      m68k)
+            # FIXME: we need at least 68020 code to build shared libraries, but
+            # adding the `-m68020' flag to GCC prevents building anything better,
+            # like `-m68040'.
+            lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4'
+        ;;
+      esac
       ;;
-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
       # PIC is the default for these OSes.
       ;;
-    mingw* | os2* | pw32*)
+    mingw* | cygwin* | os2* | pw32* | cegcc*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
       lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
       ;;
     darwin* | rhapsody*)
@@ -15398,7 +14927,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
       # DJGPP does not support shared libraries at all
       lt_prog_compiler_pic_CXX=
       ;;
-    interix3*)
+    interix[3-9]*)
       # Interix 3.x gcc -fpic/-fPIC options generate broken code.
       # Instead, we relocate shared libraries at runtime.
       ;;
@@ -15408,23 +14937,29 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
       fi
       ;;
     hpux*)
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
+      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
+      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
+      # sets the default TLS model and affects inlining.
       case $host_cpu in
-      hppa*64*|ia64*)
+      hppa*64*)
 	;;
       *)
 	lt_prog_compiler_pic_CXX='-fPIC'
 	;;
       esac
       ;;
+    *qnx* | *nto*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      lt_prog_compiler_pic_CXX='-fPIC -shared'
+      ;;
     *)
       lt_prog_compiler_pic_CXX='-fPIC'
       ;;
     esac
   else
     case $host_os in
-      aix4* | aix5*)
+      aix[4-9]*)
 	# All AIX code is PIC.
 	if test "$host_cpu" = ia64; then
 	  # AIX 5 now supports IA64 processor
@@ -15437,20 +14972,10 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
 	case $cc_basename in
 	cxch68*)
 	  # Green Hills C++ Compiler
-	  # _LT_AC_TAGVAR(lt_prog_compiler_static, CXX)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
+	  # _LT_TAGVAR(lt_prog_compiler_static, CXX)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
 	  ;;
 	esac
 	;;
-       darwin*)
-         # PIC is the default on this platform
-         # Common symbols not allowed in MH_DYLIB files
-         case $cc_basename in
-           xlc*)
-           lt_prog_compiler_pic_CXX='-qnocommon'
-           lt_prog_compiler_wl_CXX='-Wl,'
-           ;;
-         esac
-       ;;
       dgux*)
 	case $cc_basename in
 	  ec++*)
@@ -15464,7 +14989,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
 	    ;;
 	esac
 	;;
-      freebsd* | kfreebsd*-gnu | dragonfly*)
+      freebsd* | dragonfly*)
 	# FreeBSD uses GNU C++
 	;;
       hpux9* | hpux10* | hpux11*)
@@ -15507,21 +15032,28 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
 	    ;;
 	esac
 	;;
-      linux*)
+      linux* | k*bsd*-gnu)
 	case $cc_basename in
 	  KCC*)
 	    # KAI C++ Compiler
 	    lt_prog_compiler_wl_CXX='--backend -Wl,'
 	    lt_prog_compiler_pic_CXX='-fPIC'
 	    ;;
-	  icpc* | ecpc*)
-	    # Intel C++
+	  ecpc* )
+	    # old Intel C++ for x86_64 which still supported -KPIC.
 	    lt_prog_compiler_wl_CXX='-Wl,'
 	    lt_prog_compiler_pic_CXX='-KPIC'
 	    lt_prog_compiler_static_CXX='-static'
 	    ;;
-	  pgCC*)
-	    # Portland Group C++ compiler.
+	  icpc* )
+	    # Intel C++, used to be incompatible with GCC.
+	    # ICC 10 doesn't accept -KPIC any more.
+	    lt_prog_compiler_wl_CXX='-Wl,'
+	    lt_prog_compiler_pic_CXX='-fPIC'
+	    lt_prog_compiler_static_CXX='-static'
+	    ;;
+	  pgCC* | pgcpp*)
+	    # Portland Group C++ compiler
 	    lt_prog_compiler_wl_CXX='-Wl,'
 	    lt_prog_compiler_pic_CXX='-fpic'
 	    lt_prog_compiler_static_CXX='-Bstatic'
@@ -15533,7 +15065,21 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
 	    lt_prog_compiler_pic_CXX=
 	    lt_prog_compiler_static_CXX='-non_shared'
 	    ;;
+	  xlc* | xlC*)
+	    # IBM XL 8.0 on PPC
+	    lt_prog_compiler_wl_CXX='-Wl,'
+	    lt_prog_compiler_pic_CXX='-qpic'
+	    lt_prog_compiler_static_CXX='-qstaticlink'
+	    ;;
 	  *)
+	    case `$CC -V 2>&1 | sed 5q` in
+	    *Sun\ C*)
+	      # Sun C++ 5.9
+	      lt_prog_compiler_pic_CXX='-KPIC'
+	      lt_prog_compiler_static_CXX='-Bstatic'
+	      lt_prog_compiler_wl_CXX='-Qoption ld '
+	      ;;
+	    esac
 	    ;;
 	esac
 	;;
@@ -15552,6 +15098,11 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
 	;;
       netbsd*)
 	;;
+      *qnx* | *nto*)
+        # QNX uses GNU C++, but need to define -shared option too, otherwise
+        # it will coredump.
+        lt_prog_compiler_pic_CXX='-fPIC -shared'
+        ;;
       osf3* | osf4* | osf5*)
 	case $cc_basename in
 	  KCC*)
@@ -15606,22 +15157,22 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
 	    ;;
 	esac
 	;;
-      tandem*)
+      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
 	case $cc_basename in
-	  NCC*)
-	    # NonStop-UX NCC 3.20
+	  CC*)
+	    lt_prog_compiler_wl_CXX='-Wl,'
 	    lt_prog_compiler_pic_CXX='-KPIC'
-	    ;;
-	  *)
+	    lt_prog_compiler_static_CXX='-Bstatic'
 	    ;;
 	esac
 	;;
-      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+      tandem*)
 	case $cc_basename in
-	  CC*)
-	    lt_prog_compiler_wl_CXX='-Wl,'
+	  NCC*)
+	    # NonStop-UX NCC 3.20
 	    lt_prog_compiler_pic_CXX='-KPIC'
-	    lt_prog_compiler_static_CXX='-Bstatic'
+	    ;;
+	  *)
 	    ;;
 	esac
 	;;
@@ -15633,22 +15184,32 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
     esac
   fi
 
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6; }
+case $host_os in
+  # For platforms which do not support PIC, -DPIC is meaningless:
+  *djgpp*)
+    lt_prog_compiler_pic_CXX=
+    ;;
+  *)
+    lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5
+$as_echo "$lt_prog_compiler_pic_CXX" >&6; }
+
+
 
 #
 # Check to make sure the PIC flag actually works.
 #
 if test -n "$lt_prog_compiler_pic_CXX"; then
-
-{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; }
-if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  lt_prog_compiler_pic_works_CXX=no
-  ac_outfile=conftest.$ac_objext
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+  { $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
+$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; }
+if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_pic_works_CXX=no
+   ac_outfile=conftest.$ac_objext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
    lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"
    # Insert the option either (1) after the last *FLAGS variable, or
    # (2) before a word containing "conftest.", or (3) at the end.
@@ -15659,27 +15220,27 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15662: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15223: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:15666: \$? = $ac_status" >&5
+   echo "$as_me:15227: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
-     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
      if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-       lt_prog_compiler_pic_works_CXX=yes
+       lt_cv_prog_compiler_pic_works_CXX=yes
      fi
    fi
-   $rm conftest*
+   $RM conftest*
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
+$as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; }
 
-if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then
+if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then
     case $lt_prog_compiler_pic_CXX in
      "" | " "*) ;;
      *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;;
@@ -15690,69 +15251,116 @@ else
 fi
 
 fi
-case $host_os in
-  # For platforms which do not support PIC, -DPIC is meaningless:
-  *djgpp*)
-    lt_prog_compiler_pic_CXX=
-    ;;
-  *)
-    lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
-    ;;
-esac
+
+
 
 #
 # Check to make sure the static flag actually works.
 #
 wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
-{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
-if test "${lt_prog_compiler_static_works_CXX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
+if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
-  lt_prog_compiler_static_works_CXX=no
+  lt_cv_prog_compiler_static_works_CXX=no
    save_LDFLAGS="$LDFLAGS"
    LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-   printf "$lt_simple_link_test_code" > conftest.$ac_ext
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
    if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
      # The linker can only warn and ignore the option if not recognized
      # So say no if there are warnings
      if test -s conftest.err; then
        # Append any errors to the config.log.
        cat conftest.err 1>&5
-       $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+       $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
        $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
        if diff conftest.exp conftest.er2 >/dev/null; then
-         lt_prog_compiler_static_works_CXX=yes
+         lt_cv_prog_compiler_static_works_CXX=yes
        fi
      else
-       lt_prog_compiler_static_works_CXX=yes
+       lt_cv_prog_compiler_static_works_CXX=yes
      fi
    fi
-   $rm conftest*
+   $RM -r conftest*
    LDFLAGS="$save_LDFLAGS"
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5
-echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5
+$as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; }
 
-if test x"$lt_prog_compiler_static_works_CXX" = xyes; then
+if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then
     :
 else
     lt_prog_compiler_static_CXX=
 fi
 
 
-{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
+
+
+    { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_c_o_CXX=no
+   $RM -r conftest 2>/dev/null
+   mkdir conftest
+   cd conftest
+   mkdir out
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+   lt_compiler_flag="-o out/conftest2.$ac_objext"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:15322: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>out/conftest.err)
+   ac_status=$?
+   cat out/conftest.err >&5
+   echo "$as_me:15326: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
+   then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_c_o_CXX=yes
+     fi
+   fi
+   chmod u+w . 2>&5
+   $RM conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
+   $RM out/* && rmdir out
+   cd ..
+   $RM -r conftest
+   $RM conftest*
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
+$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
+
+
+
+    { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
 if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_c_o_CXX=no
-   $rm -r conftest 2>/dev/null
+   $RM -r conftest 2>/dev/null
    mkdir conftest
    cd conftest
    mkdir out
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
    lt_compiler_flag="-o out/conftest2.$ac_objext"
    # Insert the option either (1) after the last *FLAGS variable, or
@@ -15763,87 +15371,99 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15766: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15374: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:15770: \$? = $ac_status" >&5
+   echo "$as_me:15378: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
-     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
      $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
      if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_c_o_CXX=yes
      fi
    fi
    chmod u+w . 2>&5
-   $rm conftest*
+   $RM conftest*
    # SGI C++ compiler will create directory out/ii_files/ for
    # template instantiation
-   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
-   $rm out/* && rmdir out
+   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
+   $RM out/* && rmdir out
    cd ..
-   rmdir conftest
-   $rm conftest*
+   $RM -r conftest
+   $RM conftest*
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
+$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
+
+
 
 
 hard_links="nottested"
 if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then
   # do not overwrite the value of need_locks provided by the user
-  { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+$as_echo_n "checking if we can lock with hard links... " >&6; }
   hard_links=yes
-  $rm conftest*
+  $RM conftest*
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
   touch conftest.a
   ln conftest.a conftest.b 2>&5 || hard_links=no
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  { echo "$as_me:$LINENO: result: $hard_links" >&5
-echo "${ECHO_T}$hard_links" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
+$as_echo "$hard_links" >&6; }
   if test "$hard_links" = no; then
-    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
     need_locks=warn
   fi
 else
   need_locks=no
 fi
 
-{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
+
+
+    { $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
 
   export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
   case $host_os in
-  aix4* | aix5*)
+  aix[4-9]*)
     # If we're using GNU nm, then we don't want the "-C" option.
     # -C means demangle to AIX nm, but means don't demangle with GNU nm
-    if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
-      export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
+    if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+      export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
     else
-      export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
+      export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
     fi
     ;;
   pw32*)
     export_symbols_cmds_CXX="$ltdll_cmds"
   ;;
-  cygwin* | mingw*)
-    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([^ ]*\) [^ ]*/\1 DATA/;/^I /d;/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
+  cygwin* | mingw* | cegcc*)
+    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
   ;;
   *)
     export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
   ;;
   esac
+  exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
 
-{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
-echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
+$as_echo "$ld_shlibs_CXX" >&6; }
 test "$ld_shlibs_CXX" = no && can_build_shared=no
 
+with_gnu_ld_CXX=$with_gnu_ld
+
+
+
+
+
+
 #
 # Do we need to explicitly link libc?
 #
@@ -15861,15 +15481,15 @@ x|xyes)
       # Test whether the compiler implicitly links with -lc since on some
       # systems, -lgcc has to come before -lc. If gcc already passes -lc
       # to ld, don't add -lc before -lgcc.
-      { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
-      $rm conftest*
-      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+      { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
+      $RM conftest*
+      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
       if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } 2>conftest.err; then
         soname=conftest
         lib=conftest
@@ -15884,10 +15504,10 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&
         libname=conftest
         lt_save_allow_undefined_flag=$allow_undefined_flag_CXX
         allow_undefined_flag_CXX=
-        if { (eval echo "$as_me:$LINENO: \"$archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
-  (eval $archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
+        if { (eval echo "$as_me:$LINENO: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\"") >&5
+  (eval $archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
         then
 	  archive_cmds_need_lc_CXX=no
@@ -15898,2621 +15518,81 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&
       else
         cat conftest.err 1>&5
       fi
-      $rm conftest*
-      { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5
-echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6; }
-      ;;
-    esac
-  fi
-  ;;
-esac
-
-{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
-library_names_spec=
-libname_spec='lib$name'
-soname_spec=
-shrext_cmds=".so"
-postinstall_cmds=
-postuninstall_cmds=
-finish_cmds=
-finish_eval=
-shlibpath_var=
-shlibpath_overrides_runpath=unknown
-version_type=none
-dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
-if test "$GCC" = yes; then
-  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
-    # if the path contains ";" then we assume it to be the separator
-    # otherwise default to the standard path separator (i.e. ":") - it is
-    # assumed that no part of a normal pathname contains ";" but that should
-    # okay in the real world where ";" in dirpaths is itself problematic.
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-  else
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-  fi
-else
-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi
-need_lib_prefix=unknown
-hardcode_into_libs=no
-
-# when you set need_version to no, make sure it does not cause -set_version
-# flags to be left without arguments
-need_version=unknown
-
-case $host_os in
-aix3*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
-  shlibpath_var=LIBPATH
-
-  # AIX 3 has no versioning support, so we append a major version to the name.
-  soname_spec='${libname}${release}${shared_ext}$major'
-  ;;
-
-aix4* | aix5*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  hardcode_into_libs=yes
-  if test "$host_cpu" = ia64; then
-    # AIX 5 supports IA64
-    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
-    shlibpath_var=LD_LIBRARY_PATH
-  else
-    # With GCC up to 2.95.x, collect2 would create an import file
-    # for dependence libraries.  The import file would start with
-    # the line `#! .'.  This would cause the generated library to
-    # depend on `.', always an invalid library.  This was fixed in
-    # development snapshots of GCC prior to 3.0.
-    case $host_os in
-      aix4 | aix4.[01] | aix4.[01].*)
-      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-	   echo ' yes '
-	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
-	:
-      else
-	can_build_shared=no
-      fi
-      ;;
-    esac
-    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
-    # soname into executable. Probably we can add versioning support to
-    # collect2, so additional links can be useful in future.
-    if test "$aix_use_runtimelinking" = yes; then
-      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-      # instead of lib<name>.a to let people know that these are not
-      # typical AIX shared libraries.
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    else
-      # We preserve .a as extension for shared libraries through AIX4.2
-      # and later when we are not doing run time linking.
-      library_names_spec='${libname}${release}.a $libname.a'
-      soname_spec='${libname}${release}${shared_ext}$major'
-    fi
-    shlibpath_var=LIBPATH
-  fi
-  ;;
-
-amigaos*)
-  library_names_spec='$libname.ixlibrary $libname.a'
-  # Create ${libname}_ixlibrary.a entries in /sys/libs.
-  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-  ;;
-
-beos*)
-  library_names_spec='${libname}${shared_ext}'
-  dynamic_linker="$host_os ld.so"
-  shlibpath_var=LIBRARY_PATH
-  ;;
-
-bsdi[45]*)
-  version_type=linux
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-  # the default ld.so.conf also contains /usr/contrib/lib and
-  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-  # libtool to hard-code these into programs
-  ;;
-
-cygwin* | mingw* | pw32*)
-  version_type=windows
-  shrext_cmds=".dll"
-  need_version=no
-  need_lib_prefix=no
-
-  case $GCC,$host_os in
-  yes,cygwin* | yes,mingw* | yes,pw32*)
-    library_names_spec='$libname.dll.a'
-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \${file}`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
-      dldir=$destdir/`dirname \$dlpath`~
-      test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname~
-      chmod a+x \$dldir/$dlname'
-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-      dlpath=$dir/\$dldll~
-       $rm \$dlpath'
-    shlibpath_overrides_runpath=yes
-
-    case $host_os in
-    cygwin*)
-      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
-      ;;
-    mingw*)
-      # MinGW DLLs use traditional 'lib' prefix
-      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-      if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
-        # It is most probably a Windows format PATH printed by
-        # mingw gcc, but we are running on Cygwin. Gcc prints its search
-        # path with ; separators, and with drive letters. We can handle the
-        # drive letters (cygwin fileutils understands them), so leave them,
-        # especially as we might pass files found there to a mingw objdump,
-        # which wouldn't understand a cygwinified path. Ahh.
-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-      else
-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-      fi
+      $RM conftest*
+      { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5
+$as_echo "$archive_cmds_need_lc_CXX" >&6; }
       ;;
-    pw32*)
-      # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      ;;
-    esac
-    ;;
-
-  *)
-    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
-    ;;
-  esac
-  dynamic_linker='Win32 ld.exe'
-  # FIXME: first we should search . and the directory the executable is in
-  shlibpath_var=PATH
-  ;;
-
-darwin* | rhapsody*)
-  dynamic_linker="$host_os dyld"
-  version_type=darwin
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-  soname_spec='${libname}${release}${major}$shared_ext'
-  shlibpath_overrides_runpath=yes
-  shlibpath_var=DYLD_LIBRARY_PATH
-  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-  if test "$GCC" = yes; then
-    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-  else
-    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-  fi
-  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-  ;;
-
-dgux*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-freebsd1*)
-  dynamic_linker=no
-  ;;
-
-kfreebsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
-freebsd* | dragonfly*)
-  # DragonFly does not have aout.  When/if they implement a new
-  # versioning mechanism, adjust this.
-  if test -x /usr/bin/objformat; then
-    objformat=`/usr/bin/objformat`
-  else
-    case $host_os in
-    freebsd[123]*) objformat=aout ;;
-    *) objformat=elf ;;
-    esac
-  fi
-  version_type=freebsd-$objformat
-  case $version_type in
-    freebsd-elf*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-      need_version=no
-      need_lib_prefix=no
-      ;;
-    freebsd-*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
-      need_version=yes
-      ;;
-  esac
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_os in
-  freebsd2*)
-    shlibpath_overrides_runpath=yes
-    ;;
-  freebsd3.[01]* | freebsdelf3.[01]*)
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
-  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
-    shlibpath_overrides_runpath=no
-    hardcode_into_libs=yes
-    ;;
-  freebsd*) # from 4.6 on
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  esac
-  ;;
-
-gnu*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  hardcode_into_libs=yes
-  ;;
-
-hpux9* | hpux10* | hpux11*)
-  # Give a soname corresponding to the major version so that dld.sl refuses to
-  # link against other versions.
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  case $host_cpu in
-  ia64*)
-    shrext_cmds='.so'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.so"
-    shlibpath_var=LD_LIBRARY_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    if test "X$HPUX_IA64_MODE" = X32; then
-      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
-    else
-      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
-    fi
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-    ;;
-   hppa*64*)
-     shrext_cmds='.sl'
-     hardcode_into_libs=yes
-     dynamic_linker="$host_os dld.sl"
-     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-     soname_spec='${libname}${release}${shared_ext}$major'
-     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
-     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-     ;;
-   *)
-    shrext_cmds='.sl'
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=SHLIB_PATH
-    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    ;;
-  esac
-  # HP-UX runs *really* slowly unless shared libraries are mode 555.
-  postinstall_cmds='chmod 555 $lib'
-  ;;
-
-interix3*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $host_os in
-    nonstopux*) version_type=nonstopux ;;
-    *)
-	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux
-	else
-		version_type=irix
-	fi ;;
-  esac
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
-  case $host_os in
-  irix5* | nonstopux*)
-    libsuff= shlibsuff=
-    ;;
-  *)
-    case $LD in # libtool.m4 will add one of these switches to LD
-    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
-      libsuff= shlibsuff= libmagic=32-bit;;
-    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
-      libsuff=32 shlibsuff=N32 libmagic=N32;;
-    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
-      libsuff=64 shlibsuff=64 libmagic=64-bit;;
-    *) libsuff= shlibsuff= libmagic=never-match;;
     esac
-    ;;
-  esac
-  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-  shlibpath_overrides_runpath=no
-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-  hardcode_into_libs=yes
-  ;;
-
-# No shared lib support for Linux oldld, aout, or coff.
-linux*oldld* | linux*aout* | linux*coff*)
-  dynamic_linker=no
-  ;;
-
-# This must be Linux ELF.
-linux*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  # This implies no fast_install, which is unacceptable.
-  # Some rework will be needed to allow for fast_install
-  # before this can be enabled.
-  hardcode_into_libs=yes
-
-  # find out which ABI we are using
-  libsuff=
-  case "$host_cpu" in
-  x86_64*|s390x*|powerpc64*)
-    echo '#line 16302 "configure"' > conftest.$ac_ext
-    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-      case `/usr/bin/file conftest.$ac_objext` in
-      *64-bit*)
-        libsuff=64
-        sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
-        ;;
-      esac
-    fi
-    rm -rf conftest*
-    ;;
-  esac
-
-  # Append ld.so.conf contents to the search path
-  if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/^	 *//;s/#.*//;/^[^\/]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
   fi
-
-  # We used to test for /lib/ld.so.1 and disable shared libraries on
-  # powerpc, because MkLinux only supported shared libraries with the
-  # GNU dynamic linker.  Since this was broken with cross compilers,
-  # most powerpc-linux boxes support dynamic linking these days and
-  # people can always --disable-shared, the test was removed, and we
-  # assume the GNU/Linux dynamic linker is in use.
-  dynamic_linker='GNU/Linux ld.so'
-  ;;
-
-knetbsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
-netbsd*)
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-    dynamic_linker='NetBSD (a.out) ld.so'
-  else
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    dynamic_linker='NetBSD ld.elf_so'
-  fi
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  ;;
-
-newsos6)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-nto-qnx*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-openbsd*)
-  version_type=sunos
-  sys_lib_dlsearch_path_spec="/usr/lib"
-  need_lib_prefix=no
-  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-  case $host_os in
-    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
-    *)                         need_version=no  ;;
-  esac
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    case $host_os in
-      openbsd2.[89] | openbsd2.[89].*)
-	shlibpath_overrides_runpath=no
-	;;
-      *)
-	shlibpath_overrides_runpath=yes
-	;;
-      esac
-  else
-    shlibpath_overrides_runpath=yes
-  fi
-  ;;
-
-os2*)
-  libname_spec='$name'
-  shrext_cmds=".dll"
-  need_lib_prefix=no
-  library_names_spec='$libname${shared_ext} $libname.a'
-  dynamic_linker='OS/2 ld.exe'
-  shlibpath_var=LIBPATH
-  ;;
-
-osf3* | osf4* | osf5*)
-  version_type=osf
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-  ;;
-
-solaris*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  # ldd complains unless libraries are executable
-  postinstall_cmds='chmod +x $lib'
-  ;;
-
-sunos4*)
-  version_type=sunos
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  if test "$with_gnu_ld" = yes; then
-    need_lib_prefix=no
-  fi
-  need_version=yes
-  ;;
-
-sysv4 | sysv4.3*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_vendor in
-    sni)
-      shlibpath_overrides_runpath=no
-      need_lib_prefix=no
-      export_dynamic_flag_spec='${wl}-Blargedynsym'
-      runpath_var=LD_RUN_PATH
-      ;;
-    siemens)
-      need_lib_prefix=no
-      ;;
-    motorola)
-      need_lib_prefix=no
-      need_version=no
-      shlibpath_overrides_runpath=no
-      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-      ;;
-  esac
-  ;;
-
-sysv4*MP*)
-  if test -d /usr/nec ;then
-    version_type=linux
-    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-    soname_spec='$libname${shared_ext}.$major'
-    shlibpath_var=LD_LIBRARY_PATH
-  fi
-  ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  version_type=freebsd-elf
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  hardcode_into_libs=yes
-  if test "$with_gnu_ld" = yes; then
-    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
-    shlibpath_overrides_runpath=no
-  else
-    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
-    shlibpath_overrides_runpath=yes
-    case $host_os in
-      sco3.2v5*)
-        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
-	;;
-    esac
-  fi
-  sys_lib_dlsearch_path_spec='/usr/lib'
-  ;;
-
-uts4*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-*)
-  dynamic_linker=no
   ;;
 esac
-{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-echo "${ECHO_T}$dynamic_linker" >&6; }
-test "$dynamic_linker" = no && can_build_shared=no
-
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
 
-{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
-hardcode_action_CXX=
-if test -n "$hardcode_libdir_flag_spec_CXX" || \
-   test -n "$runpath_var_CXX" || \
-   test "X$hardcode_automatic_CXX" = "Xyes" ; then
-
-  # We can hardcode non-existant directories.
-  if test "$hardcode_direct_CXX" != no &&
-     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-     # have to relink, otherwise we might link with an installed library
-     # when we should be linking with a yet-to-be-installed one
-     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, CXX)" != no &&
-     test "$hardcode_minus_L_CXX" != no; then
-    # Linking always hardcodes the temporary library directory.
-    hardcode_action_CXX=relink
-  else
-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-    hardcode_action_CXX=immediate
-  fi
-else
-  # We cannot hardcode anything, or else we can only hardcode existing
-  # directories.
-  hardcode_action_CXX=unsupported
-fi
-{ echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5
-echo "${ECHO_T}$hardcode_action_CXX" >&6; }
-
-if test "$hardcode_action_CXX" = relink; then
-  # Fast installation is not supported
-  enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
-     test "$enable_shared" = no; then
-  # Fast installation is not necessary
-  enable_fast_install=needless
-fi
-
-
-# The else clause should only fire when bootstrapping the
-# libtool distribution, otherwise you forgot to ship ltmain.sh
-# with your package, and you will get complaints that there are
-# no rules to generate ltmain.sh.
-if test -f "$ltmain"; then
-  # See if we are running on zsh, and set the options which allow our commands through
-  # without removal of \ escapes.
-  if test -n "${ZSH_VERSION+set}" ; then
-    setopt NO_GLOB_SUBST
-  fi
-  # Now quote all the things that may contain metacharacters while being
-  # careful not to overquote the AC_SUBSTed values.  We take copies of the
-  # variables and quote the copies for generation of the libtool script.
-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
-    SED SHELL STRIP \
-    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
-    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
-    deplibs_check_method reload_flag reload_cmds need_locks \
-    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
-    lt_cv_sys_global_symbol_to_c_name_address \
-    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
-    old_postinstall_cmds old_postuninstall_cmds \
-    compiler_CXX \
-    CC_CXX \
-    LD_CXX \
-    lt_prog_compiler_wl_CXX \
-    lt_prog_compiler_pic_CXX \
-    lt_prog_compiler_static_CXX \
-    lt_prog_compiler_no_builtin_flag_CXX \
-    export_dynamic_flag_spec_CXX \
-    thread_safe_flag_spec_CXX \
-    whole_archive_flag_spec_CXX \
-    enable_shared_with_static_runtimes_CXX \
-    old_archive_cmds_CXX \
-    old_archive_from_new_cmds_CXX \
-    predep_objects_CXX \
-    postdep_objects_CXX \
-    predeps_CXX \
-    postdeps_CXX \
-    compiler_lib_search_path_CXX \
-    archive_cmds_CXX \
-    archive_expsym_cmds_CXX \
-    postinstall_cmds_CXX \
-    postuninstall_cmds_CXX \
-    old_archive_from_expsyms_cmds_CXX \
-    allow_undefined_flag_CXX \
-    no_undefined_flag_CXX \
-    export_symbols_cmds_CXX \
-    hardcode_libdir_flag_spec_CXX \
-    hardcode_libdir_flag_spec_ld_CXX \
-    hardcode_libdir_separator_CXX \
-    hardcode_automatic_CXX \
-    module_cmds_CXX \
-    module_expsym_cmds_CXX \
-    lt_cv_prog_compiler_c_o_CXX \
-    exclude_expsyms_CXX \
-    include_expsyms_CXX; do
-
-    case $var in
-    old_archive_cmds_CXX | \
-    old_archive_from_new_cmds_CXX | \
-    archive_cmds_CXX | \
-    archive_expsym_cmds_CXX | \
-    module_cmds_CXX | \
-    module_expsym_cmds_CXX | \
-    old_archive_from_expsyms_cmds_CXX | \
-    export_symbols_cmds_CXX | \
-    extract_expsyms_cmds | reload_cmds | finish_cmds | \
-    postinstall_cmds | postuninstall_cmds | \
-    old_postinstall_cmds | old_postuninstall_cmds | \
-    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
-      # Double-quote double-evaled strings.
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
-      ;;
-    *)
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
-      ;;
-    esac
-  done
 
-  case $lt_echo in
-  *'\$0 --fallback-echo"')
-    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
-    ;;
-  esac
 
-cfgfile="$ofile"
 
-  cat <<__EOF__ >> "$cfgfile"
-# ### BEGIN LIBTOOL TAG CONFIG: $tagname
 
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
 
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
 
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
 
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
 
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$archive_cmds_need_lc_CXX
 
-# Whether or not to disallow shared libs when runtime libs are static
-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX
 
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
 
-# The host system.
-host_alias=$host_alias
-host=$host
-host_os=$host_os
 
-# The build system.
-build_alias=$build_alias
-build=$build
-build_os=$build_os
 
-# An echo program that does not interpret backslashes.
-echo=$lt_echo
 
-# The archiver.
-AR=$lt_AR
-AR_FLAGS=$lt_AR_FLAGS
 
-# A C compiler.
-LTCC=$lt_LTCC
 
-# LTCC compiler flags.
-LTCFLAGS=$lt_LTCFLAGS
 
-# A language-specific compiler.
-CC=$lt_compiler_CXX
 
-# Is the compiler the GNU C compiler?
-with_gcc=$GCC_CXX
 
-# An ERE matcher.
-EGREP=$lt_EGREP
 
-# The linker used to build libraries.
-LD=$lt_LD_CXX
 
-# Whether we need hard or soft links.
-LN_S=$lt_LN_S
 
-# A BSD-compatible nm program.
-NM=$lt_NM
 
-# A symbol stripping program
-STRIP=$lt_STRIP
 
-# Used to examine libraries when file_magic_cmd begins "file"
-MAGIC_CMD=$MAGIC_CMD
 
-# Used on cygwin: DLL creation program.
-DLLTOOL="$DLLTOOL"
 
-# Used on cygwin: object dumper.
-OBJDUMP="$OBJDUMP"
 
-# Used on cygwin: assembler.
-AS="$AS"
 
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
 
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
 
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl_CXX
 
-# Object file suffix (normally "o").
-objext="$ac_objext"
 
-# Old archive suffix (normally "a").
-libext="$libext"
 
-# Shared library suffix (normally ".so").
-shrext_cmds='$shrext_cmds'
 
-# Executable file suffix (normally "").
-exeext="$exeext"
 
-# Additional compiler flags for building library objects.
-pic_flag=$lt_lt_prog_compiler_pic_CXX
-pic_mode=$pic_mode
 
-# What is the maximum length of a command?
-max_cmd_len=$lt_cv_sys_max_cmd_len
 
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
 
-# Must we lock files when doing compilation?
-need_locks=$lt_need_locks
 
-# Do we need the lib prefix for modules?
-need_lib_prefix=$need_lib_prefix
 
-# Do we need a version for libraries?
-need_version=$need_version
 
-# Whether dlopen is supported.
-dlopen_support=$enable_dlopen
 
-# Whether dlopen of programs is supported.
-dlopen_self=$enable_dlopen_self
 
-# Whether dlopen of statically linked programs is supported.
-dlopen_self_static=$enable_dlopen_self_static
 
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$lt_lt_prog_compiler_static_CXX
 
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
 
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX
 
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX
 
-# Compiler flag to generate thread-safe objects.
-thread_safe_flag_spec=$lt_thread_safe_flag_spec_CXX
 
-# Library versioning type.
-version_type=$version_type
 
-# Format of library name prefix.
-libname_spec=$lt_libname_spec
 
-# List of archive names.  First name is the real one, the rest are links.
-# The last name is the one that the linker finds with -lNAME.
-library_names_spec=$lt_library_names_spec
 
-# The coded name of the library, if different from the real name.
-soname_spec=$lt_soname_spec
 
-# Commands used to build and install an old-style archive.
-RANLIB=$lt_RANLIB
-old_archive_cmds=$lt_old_archive_cmds_CXX
-old_postinstall_cmds=$lt_old_postinstall_cmds
-old_postuninstall_cmds=$lt_old_postuninstall_cmds
 
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX
 
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX
 
-# Commands used to build and install a shared archive.
-archive_cmds=$lt_archive_cmds_CXX
-archive_expsym_cmds=$lt_archive_expsym_cmds_CXX
-postinstall_cmds=$lt_postinstall_cmds
-postuninstall_cmds=$lt_postuninstall_cmds
 
-# Commands used to build a loadable module (assumed same as above if empty)
-module_cmds=$lt_module_cmds_CXX
-module_expsym_cmds=$lt_module_expsym_cmds_CXX
 
-# Commands to strip libraries.
-old_striplib=$lt_old_striplib
-striplib=$lt_striplib
 
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predep_objects=$lt_predep_objects_CXX
 
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdep_objects=$lt_postdep_objects_CXX
 
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predeps=$lt_predeps_CXX
 
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdeps=$lt_postdeps_CXX
 
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
-
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method=$lt_deplibs_check_method
-
-# Command to use when deplibs_check_method == file_magic.
-file_magic_cmd=$lt_file_magic_cmd
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$lt_allow_undefined_flag_CXX
-
-# Flag that forces no undefined symbols.
-no_undefined_flag=$lt_no_undefined_flag_CXX
-
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds=$lt_finish_cmds
-
-# Same as above, but a single script fragment to be evaled but not shown.
-finish_eval=$lt_finish_eval
-
-# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
-
-# Transform the output of nm in a proper C declaration
-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-
-# Transform the output of nm in a C name address pair
-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
-
-# This is the shared library runtime path variable.
-runpath_var=$runpath_var
-
-# This is the shared library path variable.
-shlibpath_var=$shlibpath_var
-
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=$hardcode_action_CXX
-
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=$hardcode_into_libs
-
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX
-
-# If ld is used when linking, flag to hardcode \$libdir into
-# a binary during linking. This must work even if \$libdir does
-# not exist.
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX
-
-# Whether we need a single -rpath flag with a separated argument.
-hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX
-
-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
-# resulting binary.
-hardcode_direct=$hardcode_direct_CXX
-
-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-# resulting binary.
-hardcode_minus_L=$hardcode_minus_L_CXX
-
-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-# the resulting binary.
-hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX
-
-# Set to yes if building a shared library automatically hardcodes DIR into the library
-# and all subsequent libraries and executables linked against it.
-hardcode_automatic=$hardcode_automatic_CXX
-
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at relink time.
-variables_saved_for_relink="$variables_saved_for_relink"
-
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$link_all_deplibs_CXX
-
-# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-
-# Run-time system search path for libraries
-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-
-# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$fix_srcfile_path_CXX"
-
-# Set to yes if exported symbols are required.
-always_export_symbols=$always_export_symbols_CXX
-
-# The commands to list exported symbols.
-export_symbols_cmds=$lt_export_symbols_cmds_CXX
-
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=$lt_extract_expsyms_cmds
-
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$lt_exclude_expsyms_CXX
-
-# Symbols that must always be exported.
-include_expsyms=$lt_include_expsyms_CXX
-
-# ### END LIBTOOL TAG CONFIG: $tagname
-
-__EOF__
-
-
-else
-  # If there is no Makefile yet, we rely on a make rule to execute
-  # `config.status --recheck' to rerun these tests and create the
-  # libtool script then.
-  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
-  if test -f "$ltmain_in"; then
-    test -f Makefile && make "$ltmain"
-  fi
-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
-
-CC=$lt_save_CC
-LDCXX=$LD
-LD=$lt_save_LD
-GCC=$lt_save_GCC
-with_gnu_ldcxx=$with_gnu_ld
-with_gnu_ld=$lt_save_with_gnu_ld
-lt_cv_path_LDCXX=$lt_cv_path_LD
-lt_cv_path_LD=$lt_save_path_LD
-lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
-lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
-
-	else
-	  tagname=""
-	fi
-	;;
-
-      F77)
-	if test -n "$F77" && test "X$F77" != "Xno"; then
-
-ac_ext=f
-ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
-ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_f77_compiler_gnu
-
-
-archive_cmds_need_lc_F77=no
-allow_undefined_flag_F77=
-always_export_symbols_F77=no
-archive_expsym_cmds_F77=
-export_dynamic_flag_spec_F77=
-hardcode_direct_F77=no
-hardcode_libdir_flag_spec_F77=
-hardcode_libdir_flag_spec_ld_F77=
-hardcode_libdir_separator_F77=
-hardcode_minus_L_F77=no
-hardcode_automatic_F77=no
-module_cmds_F77=
-module_expsym_cmds_F77=
-link_all_deplibs_F77=unknown
-old_archive_cmds_F77=$old_archive_cmds
-no_undefined_flag_F77=
-whole_archive_flag_spec_F77=
-enable_shared_with_static_runtimes_F77=no
-
-# Source file extension for f77 test sources.
-ac_ext=f
-
-# Object file extension for compiled f77 test sources.
-objext=o
-objext_F77=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="      subroutine t\n      return\n      end\n"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code="      program t\n      end\n"
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# If no C compiler flags were specified, use CFLAGS.
-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-
-
-# save warnings/boilerplate of simple test code
-ac_outfile=conftest.$ac_objext
-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_compiler_boilerplate=`cat conftest.err`
-$rm conftest*
-
-ac_outfile=conftest.$ac_objext
-printf "$lt_simple_link_test_code" >conftest.$ac_ext
-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_linker_boilerplate=`cat conftest.err`
-$rm conftest*
-
-
-# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
-CC=${F77-"f77"}
-compiler=$CC
-compiler_F77=$CC
-for cc_temp in $compiler""; do
-  case $cc_temp in
-    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-    \-*) ;;
-    *) break;;
-  esac
-done
-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-
-
-{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
-echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; }
-{ echo "$as_me:$LINENO: result: $can_build_shared" >&5
-echo "${ECHO_T}$can_build_shared" >&6; }
-
-{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
-echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; }
-test "$can_build_shared" = "no" && enable_shared=no
-
-# On AIX, shared libraries and static libraries use the same namespace, and
-# are all built from PIC.
-case $host_os in
-aix3*)
-  test "$enable_shared" = yes && enable_static=no
-  if test -n "$RANLIB"; then
-    archive_cmds="$archive_cmds~\$RANLIB \$lib"
-    postinstall_cmds='$RANLIB $lib'
-  fi
-  ;;
-aix4* | aix5*)
-  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-    test "$enable_shared" = yes && enable_static=no
-  fi
-  ;;
-esac
-{ echo "$as_me:$LINENO: result: $enable_shared" >&5
-echo "${ECHO_T}$enable_shared" >&6; }
-
-{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5
-echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; }
-# Make sure either enable_shared or enable_static is yes.
-test "$enable_shared" = yes || enable_static=yes
-{ echo "$as_me:$LINENO: result: $enable_static" >&5
-echo "${ECHO_T}$enable_static" >&6; }
-
-GCC_F77="$G77"
-LD_F77="$LD"
-
-lt_prog_compiler_wl_F77=
-lt_prog_compiler_pic_F77=
-lt_prog_compiler_static_F77=
-
-{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
-
-  if test "$GCC" = yes; then
-    lt_prog_compiler_wl_F77='-Wl,'
-    lt_prog_compiler_static_F77='-static'
-
-    case $host_os in
-      aix*)
-      # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	lt_prog_compiler_static_F77='-Bstatic'
-      fi
-      ;;
-
-    amigaos*)
-      # FIXME: we need at least 68020 code to build shared libraries, but
-      # adding the `-m68020' flag to GCC prevents building anything better,
-      # like `-m68040'.
-      lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4'
-      ;;
-
-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-
-    mingw* | pw32* | os2*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      lt_prog_compiler_pic_F77='-DDLL_EXPORT'
-      ;;
-
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      lt_prog_compiler_pic_F77='-fno-common'
-      ;;
-
-    interix3*)
-      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-      # Instead, we relocate shared libraries at runtime.
-      ;;
-
-    msdosdjgpp*)
-      # Just because we use GCC doesn't mean we suddenly get shared libraries
-      # on systems that don't support them.
-      lt_prog_compiler_can_build_shared_F77=no
-      enable_shared=no
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	lt_prog_compiler_pic_F77=-Kconform_pic
-      fi
-      ;;
-
-    hpux*)
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case $host_cpu in
-      hppa*64*|ia64*)
-	# +Z the default
-	;;
-      *)
-	lt_prog_compiler_pic_F77='-fPIC'
-	;;
-      esac
-      ;;
-
-    *)
-      lt_prog_compiler_pic_F77='-fPIC'
-      ;;
-    esac
-  else
-    # PORTME Check for flag to pass linker flags through the system compiler.
-    case $host_os in
-    aix*)
-      lt_prog_compiler_wl_F77='-Wl,'
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	lt_prog_compiler_static_F77='-Bstatic'
-      else
-	lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp'
-      fi
-      ;;
-      darwin*)
-        # PIC is the default on this platform
-        # Common symbols not allowed in MH_DYLIB files
-       case $cc_basename in
-         xlc*)
-         lt_prog_compiler_pic_F77='-qnocommon'
-         lt_prog_compiler_wl_F77='-Wl,'
-         ;;
-       esac
-       ;;
-
-    mingw* | pw32* | os2*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      lt_prog_compiler_pic_F77='-DDLL_EXPORT'
-      ;;
+    { $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+$as_echo_n "checking dynamic linker characteristics... " >&6; }
 
-    hpux9* | hpux10* | hpux11*)
-      lt_prog_compiler_wl_F77='-Wl,'
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case $host_cpu in
-      hppa*64*|ia64*)
-	# +Z the default
-	;;
-      *)
-	lt_prog_compiler_pic_F77='+Z'
-	;;
-      esac
-      # Is there a better lt_prog_compiler_static that works with the bundled CC?
-      lt_prog_compiler_static_F77='${wl}-a ${wl}archive'
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      lt_prog_compiler_wl_F77='-Wl,'
-      # PIC (with -KPIC) is the default.
-      lt_prog_compiler_static_F77='-non_shared'
-      ;;
-
-    newsos6)
-      lt_prog_compiler_pic_F77='-KPIC'
-      lt_prog_compiler_static_F77='-Bstatic'
-      ;;
-
-    linux*)
-      case $cc_basename in
-      icc* | ecc*)
-	lt_prog_compiler_wl_F77='-Wl,'
-	lt_prog_compiler_pic_F77='-KPIC'
-	lt_prog_compiler_static_F77='-static'
-        ;;
-      pgcc* | pgf77* | pgf90* | pgf95*)
-        # Portland Group compilers (*not* the Pentium gcc compiler,
-	# which looks to be a dead project)
-	lt_prog_compiler_wl_F77='-Wl,'
-	lt_prog_compiler_pic_F77='-fpic'
-	lt_prog_compiler_static_F77='-Bstatic'
-        ;;
-      ccc*)
-        lt_prog_compiler_wl_F77='-Wl,'
-        # All Alpha code is PIC.
-        lt_prog_compiler_static_F77='-non_shared'
-        ;;
-      esac
-      ;;
-
-    osf3* | osf4* | osf5*)
-      lt_prog_compiler_wl_F77='-Wl,'
-      # All OSF/1 code is PIC.
-      lt_prog_compiler_static_F77='-non_shared'
-      ;;
-
-    solaris*)
-      lt_prog_compiler_pic_F77='-KPIC'
-      lt_prog_compiler_static_F77='-Bstatic'
-      case $cc_basename in
-      f77* | f90* | f95*)
-	lt_prog_compiler_wl_F77='-Qoption ld ';;
-      *)
-	lt_prog_compiler_wl_F77='-Wl,';;
-      esac
-      ;;
-
-    sunos4*)
-      lt_prog_compiler_wl_F77='-Qoption ld '
-      lt_prog_compiler_pic_F77='-PIC'
-      lt_prog_compiler_static_F77='-Bstatic'
-      ;;
-
-    sysv4 | sysv4.2uw2* | sysv4.3*)
-      lt_prog_compiler_wl_F77='-Wl,'
-      lt_prog_compiler_pic_F77='-KPIC'
-      lt_prog_compiler_static_F77='-Bstatic'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec ;then
-	lt_prog_compiler_pic_F77='-Kconform_pic'
-	lt_prog_compiler_static_F77='-Bstatic'
-      fi
-      ;;
-
-    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-      lt_prog_compiler_wl_F77='-Wl,'
-      lt_prog_compiler_pic_F77='-KPIC'
-      lt_prog_compiler_static_F77='-Bstatic'
-      ;;
-
-    unicos*)
-      lt_prog_compiler_wl_F77='-Wl,'
-      lt_prog_compiler_can_build_shared_F77=no
-      ;;
-
-    uts4*)
-      lt_prog_compiler_pic_F77='-pic'
-      lt_prog_compiler_static_F77='-Bstatic'
-      ;;
-
-    *)
-      lt_prog_compiler_can_build_shared_F77=no
-      ;;
-    esac
-  fi
-
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6; }
-
-#
-# Check to make sure the PIC flag actually works.
-#
-if test -n "$lt_prog_compiler_pic_F77"; then
-
-{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6; }
-if test "${lt_prog_compiler_pic_works_F77+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  lt_prog_compiler_pic_works_F77=no
-  ac_outfile=conftest.$ac_objext
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="$lt_prog_compiler_pic_F77"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   # The option is referenced via a variable to avoid confusing sed.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:17357: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&5
-   echo "$as_me:17361: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s "$ac_outfile"; then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings other than the usual output.
-     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
-     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-       lt_prog_compiler_pic_works_F77=yes
-     fi
-   fi
-   $rm conftest*
-
-fi
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6; }
-
-if test x"$lt_prog_compiler_pic_works_F77" = xyes; then
-    case $lt_prog_compiler_pic_F77 in
-     "" | " "*) ;;
-     *) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;;
-     esac
-else
-    lt_prog_compiler_pic_F77=
-     lt_prog_compiler_can_build_shared_F77=no
-fi
-
-fi
-case $host_os in
-  # For platforms which do not support PIC, -DPIC is meaningless:
-  *djgpp*)
-    lt_prog_compiler_pic_F77=
-    ;;
-  *)
-    lt_prog_compiler_pic_F77="$lt_prog_compiler_pic_F77"
-    ;;
-esac
-
-#
-# Check to make sure the static flag actually works.
-#
-wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\"
-{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
-if test "${lt_prog_compiler_static_works_F77+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  lt_prog_compiler_static_works_F77=no
-   save_LDFLAGS="$LDFLAGS"
-   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-   printf "$lt_simple_link_test_code" > conftest.$ac_ext
-   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-     # The linker can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test -s conftest.err; then
-       # Append any errors to the config.log.
-       cat conftest.err 1>&5
-       $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
-       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
-         lt_prog_compiler_static_works_F77=yes
-       fi
-     else
-       lt_prog_compiler_static_works_F77=yes
-     fi
-   fi
-   $rm conftest*
-   LDFLAGS="$save_LDFLAGS"
-
-fi
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5
-echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6; }
-
-if test x"$lt_prog_compiler_static_works_F77" = xyes; then
-    :
-else
-    lt_prog_compiler_static_F77=
-fi
-
-
-{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
-if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  lt_cv_prog_compiler_c_o_F77=no
-   $rm -r conftest 2>/dev/null
-   mkdir conftest
-   cd conftest
-   mkdir out
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-   lt_compiler_flag="-o out/conftest2.$ac_objext"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:17461: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&5
-   echo "$as_me:17465: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s out/conftest2.$ac_objext
-   then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
-     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_c_o_F77=yes
-     fi
-   fi
-   chmod u+w . 2>&5
-   $rm conftest*
-   # SGI C++ compiler will create directory out/ii_files/ for
-   # template instantiation
-   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
-   $rm out/* && rmdir out
-   cd ..
-   rmdir conftest
-   $rm conftest*
-
-fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6; }
-
-
-hard_links="nottested"
-if test "$lt_cv_prog_compiler_c_o_F77" = no && test "$need_locks" != no; then
-  # do not overwrite the value of need_locks provided by the user
-  { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
-  hard_links=yes
-  $rm conftest*
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  touch conftest.a
-  ln conftest.a conftest.b 2>&5 || hard_links=no
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  { echo "$as_me:$LINENO: result: $hard_links" >&5
-echo "${ECHO_T}$hard_links" >&6; }
-  if test "$hard_links" = no; then
-    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-    need_locks=warn
-  fi
-else
-  need_locks=no
-fi
-
-{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
-
-  runpath_var=
-  allow_undefined_flag_F77=
-  enable_shared_with_static_runtimes_F77=no
-  archive_cmds_F77=
-  archive_expsym_cmds_F77=
-  old_archive_From_new_cmds_F77=
-  old_archive_from_expsyms_cmds_F77=
-  export_dynamic_flag_spec_F77=
-  whole_archive_flag_spec_F77=
-  thread_safe_flag_spec_F77=
-  hardcode_libdir_flag_spec_F77=
-  hardcode_libdir_flag_spec_ld_F77=
-  hardcode_libdir_separator_F77=
-  hardcode_direct_F77=no
-  hardcode_minus_L_F77=no
-  hardcode_shlibpath_var_F77=unsupported
-  link_all_deplibs_F77=unknown
-  hardcode_automatic_F77=no
-  module_cmds_F77=
-  module_expsym_cmds_F77=
-  always_export_symbols_F77=no
-  export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  # include_expsyms should be a list of space-separated symbols to be *always*
-  # included in the symbol list
-  include_expsyms_F77=
-  # exclude_expsyms can be an extended regexp of symbols to exclude
-  # it will be wrapped by ` (' and `)$', so one must not match beginning or
-  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
-  # as well as any symbol that contains `d'.
-  exclude_expsyms_F77="_GLOBAL_OFFSET_TABLE_"
-  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
-  # platforms (ab)use it in PIC code, but their linkers get confused if
-  # the symbol is explicitly referenced.  Since portable code cannot
-  # rely on this symbol name, it's probably fine to never include it in
-  # preloaded symbol tables.
-  extract_expsyms_cmds=
-  # Just being paranoid about ensuring that cc_basename is set.
-  for cc_temp in $compiler""; do
-  case $cc_temp in
-    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-    \-*) ;;
-    *) break;;
-  esac
-done
-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-
-  case $host_os in
-  cygwin* | mingw* | pw32*)
-    # FIXME: the MSVC++ port hasn't been tested in a loooong time
-    # When not using gcc, we currently assume that we are using
-    # Microsoft Visual C++.
-    if test "$GCC" != yes; then
-      with_gnu_ld=no
-    fi
-    ;;
-  interix*)
-    # we just hope/assume this is gcc and not c89 (= MSVC++)
-    with_gnu_ld=yes
-    ;;
-  openbsd*)
-    with_gnu_ld=no
-    ;;
-  esac
-
-  ld_shlibs_F77=yes
-  if test "$with_gnu_ld" = yes; then
-    # If archive_cmds runs LD, not CC, wlarc should be empty
-    wlarc='${wl}'
-
-    # Set some defaults for GNU ld with shared library support. These
-    # are reset later if shared libraries are not supported. Putting them
-    # here allows them to be overridden if necessary.
-    runpath_var=LD_RUN_PATH
-    hardcode_libdir_flag_spec_F77='${wl}--rpath ${wl}$libdir'
-    export_dynamic_flag_spec_F77='${wl}--export-dynamic'
-    # ancient GNU ld didn't support --whole-archive et. al.
-    if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
-	whole_archive_flag_spec_F77="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-      else
-  	whole_archive_flag_spec_F77=
-    fi
-    supports_anon_versioning=no
-    case `$LD -v 2>/dev/null` in
-      *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
-      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-      *\ 2.11.*) ;; # other 2.11 versions
-      *) supports_anon_versioning=yes ;;
-    esac
-
-    # See if GNU ld supports shared libraries.
-    case $host_os in
-    aix3* | aix4* | aix5*)
-      # On AIX/PPC, the GNU linker is very broken
-      if test "$host_cpu" != ia64; then
-	ld_shlibs_F77=no
-	cat <<EOF 1>&2
-
-*** Warning: the GNU linker, at least up to release 2.9.1, is reported
-*** to be unable to reliably create shared libraries on AIX.
-*** Therefore, libtool is disabling shared libraries support.  If you
-*** really care for shared libraries, you may want to modify your PATH
-*** so that a non-GNU linker is found, and then restart.
-
-EOF
-      fi
-      ;;
-
-    amigaos*)
-      archive_cmds_F77='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-      hardcode_libdir_flag_spec_F77='-L$libdir'
-      hardcode_minus_L_F77=yes
-
-      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
-      # that the semantics of dynamic libraries on AmigaOS, at least up
-      # to version 4, is to share data among multiple programs linked
-      # with the same dynamic library.  Since this doesn't match the
-      # behavior of shared libraries on other platforms, we can't use
-      # them.
-      ld_shlibs_F77=no
-      ;;
-
-    beos*)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	allow_undefined_flag_F77=unsupported
-	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-	# support --undefined.  This deserves some investigation.  FIXME
-	archive_cmds_F77='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-      else
-	ld_shlibs_F77=no
-      fi
-      ;;
-
-    cygwin* | mingw* | pw32*)
-      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, F77) is actually meaningless,
-      # as there is no search path for DLLs.
-      hardcode_libdir_flag_spec_F77='-L$libdir'
-      allow_undefined_flag_F77=unsupported
-      always_export_symbols_F77=no
-      enable_shared_with_static_runtimes_F77=yes
-      export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
-
-      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-        archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-	# If the export-symbols file already is a .def file (1st line
-	# is EXPORTS), use it as is; otherwise, prepend...
-	archive_expsym_cmds_F77='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	  cp $export_symbols $output_objdir/$soname.def;
-	else
-	  echo EXPORTS > $output_objdir/$soname.def;
-	  cat $export_symbols >> $output_objdir/$soname.def;
-	fi~
-	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-      else
-	ld_shlibs_F77=no
-      fi
-      ;;
-
-    interix3*)
-      hardcode_direct_F77=no
-      hardcode_shlibpath_var_F77=no
-      hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
-      export_dynamic_flag_spec_F77='${wl}-E'
-      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-      # Instead, shared libraries are loaded at an image base (0x10000000 by
-      # default) and relocated if they conflict, which is a slow very memory
-      # consuming and fragmenting process.  To avoid this, we pick a random,
-      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-      archive_cmds_F77='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      archive_expsym_cmds_F77='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      ;;
-
-    linux*)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	tmp_addflag=
-	case $cc_basename,$host_cpu in
-	pgcc*)				# Portland Group C compiler
-	  whole_archive_flag_spec_F77='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-	  tmp_addflag=' $pic_flag'
-	  ;;
-	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
-	  whole_archive_flag_spec_F77='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-	  tmp_addflag=' $pic_flag -Mnomain' ;;
-	ecc*,ia64* | icc*,ia64*)		# Intel C compiler on ia64
-	  tmp_addflag=' -i_dynamic' ;;
-	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
-	  tmp_addflag=' -i_dynamic -nofor_main' ;;
-	ifc* | ifort*)			# Intel Fortran compiler
-	  tmp_addflag=' -nofor_main' ;;
-	esac
-	archive_cmds_F77='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-
-	if test $supports_anon_versioning = yes; then
-	  archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~
-  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-  $echo "local: *; };" >> $output_objdir/$libname.ver~
-	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-	fi
-      else
-	ld_shlibs_F77=no
-      fi
-      ;;
-
-    netbsd*)
-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-	archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-	wlarc=
-      else
-	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      fi
-      ;;
-
-    solaris*)
-      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
-	ld_shlibs_F77=no
-	cat <<EOF 1>&2
-
-*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-*** create shared libraries on Solaris systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.9.1 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-EOF
-      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	ld_shlibs_F77=no
-      fi
-      ;;
-
-    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
-      case `$LD -v 2>&1` in
-        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
-	ld_shlibs_F77=no
-	cat <<_LT_EOF 1>&2
-
-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
-*** reliably create shared libraries on SCO systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-_LT_EOF
-	;;
-	*)
-	  if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	    hardcode_libdir_flag_spec_F77='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
-	    archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
-	    archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
-	  else
-	    ld_shlibs_F77=no
-	  fi
-	;;
-      esac
-      ;;
-
-    sunos4*)
-      archive_cmds_F77='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      wlarc=
-      hardcode_direct_F77=yes
-      hardcode_shlibpath_var_F77=no
-      ;;
-
-    *)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	ld_shlibs_F77=no
-      fi
-      ;;
-    esac
-
-    if test "$ld_shlibs_F77" = no; then
-      runpath_var=
-      hardcode_libdir_flag_spec_F77=
-      export_dynamic_flag_spec_F77=
-      whole_archive_flag_spec_F77=
-    fi
-  else
-    # PORTME fill in a description of your system's linker (not GNU ld)
-    case $host_os in
-    aix3*)
-      allow_undefined_flag_F77=unsupported
-      always_export_symbols_F77=yes
-      archive_expsym_cmds_F77='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
-      # Note: this linker hardcodes the directories in LIBPATH if there
-      # are no directories specified by -L.
-      hardcode_minus_L_F77=yes
-      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
-	# Neither direct hardcoding nor static linking is supported with a
-	# broken collect2.
-	hardcode_direct_F77=unsupported
-      fi
-      ;;
-
-    aix4* | aix5*)
-      if test "$host_cpu" = ia64; then
-	# On IA64, the linker does run time linking by default, so we don't
-	# have to do anything special.
-	aix_use_runtimelinking=no
-	exp_sym_flag='-Bexport'
-	no_entry_flag=""
-      else
-	# If we're using GNU nm, then we don't want the "-C" option.
-	# -C means demangle to AIX nm, but means don't demangle with GNU nm
-	if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
-	  export_symbols_cmds_F77='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
-	else
-	  export_symbols_cmds_F77='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
-	fi
-	aix_use_runtimelinking=no
-
-	# Test if we are trying to use run time linking or normal
-	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
-	# need to do runtime linking.
-	case $host_os in aix4.[23]|aix4.[23].*|aix5*)
-	  for ld_flag in $LDFLAGS; do
-  	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
-  	    aix_use_runtimelinking=yes
-  	    break
-  	  fi
-	  done
-	  ;;
-	esac
-
-	exp_sym_flag='-bexport'
-	no_entry_flag='-bnoentry'
-      fi
-
-      # When large executables or shared objects are built, AIX ld can
-      # have problems creating the table of contents.  If linking a library
-      # or program results in "error TOC overflow" add -mminimal-toc to
-      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
-      archive_cmds_F77=''
-      hardcode_direct_F77=yes
-      hardcode_libdir_separator_F77=':'
-      link_all_deplibs_F77=yes
-
-      if test "$GCC" = yes; then
-	case $host_os in aix4.[012]|aix4.[012].*)
-	# We only want to do this on AIX 4.2 and lower, the check
-	# below for broken collect2 doesn't work under 4.3+
-	  collect2name=`${CC} -print-prog-name=collect2`
-	  if test -f "$collect2name" && \
-  	   strings "$collect2name" | grep resolve_lib_name >/dev/null
-	  then
-  	  # We have reworked collect2
-  	  hardcode_direct_F77=yes
-	  else
-  	  # We have old collect2
-  	  hardcode_direct_F77=unsupported
-  	  # It fails to find uninstalled libraries when the uninstalled
-  	  # path is not listed in the libpath.  Setting hardcode_minus_L
-  	  # to unsupported forces relinking
-  	  hardcode_minus_L_F77=yes
-  	  hardcode_libdir_flag_spec_F77='-L$libdir'
-  	  hardcode_libdir_separator_F77=
-	  fi
-	  ;;
-	esac
-	shared_flag='-shared'
-	if test "$aix_use_runtimelinking" = yes; then
-	  shared_flag="$shared_flag "'${wl}-G'
-	fi
-      else
-	# not using gcc
-	if test "$host_cpu" = ia64; then
-  	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-  	# chokes on -Wl,-G. The following line is correct:
-	  shared_flag='-G'
-	else
-	  if test "$aix_use_runtimelinking" = yes; then
-	    shared_flag='${wl}-G'
-	  else
-	    shared_flag='${wl}-bM:SRE'
-	  fi
-	fi
-      fi
-
-      # It seems that -bexpall does not export symbols beginning with
-      # underscore (_), so it is better to generate a list of symbols to export.
-      always_export_symbols_F77=yes
-      if test "$aix_use_runtimelinking" = yes; then
-	# Warning - without using the other runtime loading flags (-brtl),
-	# -berok will link without error, but may produce a broken library.
-	allow_undefined_flag_F77='-berok'
-       # Determine the default libpath from the value encoded in an empty executable.
-       cat >conftest.$ac_ext <<_ACEOF
-      program main
-
-      end
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_f77_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
-       hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath"
-	archive_expsym_cmds_F77="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-       else
-	if test "$host_cpu" = ia64; then
-	  hardcode_libdir_flag_spec_F77='${wl}-R $libdir:/usr/lib:/lib'
-	  allow_undefined_flag_F77="-z nodefs"
-	  archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
-	else
-	 # Determine the default libpath from the value encoded in an empty executable.
-	 cat >conftest.$ac_ext <<_ACEOF
-      program main
-
-      end
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_f77_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
-	 hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath"
-	  # Warning - without using the other run time loading flags,
-	  # -berok will link without error, but may produce a broken library.
-	  no_undefined_flag_F77=' ${wl}-bernotok'
-	  allow_undefined_flag_F77=' ${wl}-berok'
-	  # Exported symbols can be pulled into shared objects from archives
-	  whole_archive_flag_spec_F77='$convenience'
-	  archive_cmds_need_lc_F77=yes
-	  # This is similar to how AIX traditionally builds its shared libraries.
-	  archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-	fi
-      fi
-      ;;
-
-    amigaos*)
-      archive_cmds_F77='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-      hardcode_libdir_flag_spec_F77='-L$libdir'
-      hardcode_minus_L_F77=yes
-      # see comment about different semantics on the GNU ld section
-      ld_shlibs_F77=no
-      ;;
-
-    bsdi[45]*)
-      export_dynamic_flag_spec_F77=-rdynamic
-      ;;
-
-    cygwin* | mingw* | pw32*)
-      # When not using gcc, we currently assume that we are using
-      # Microsoft Visual C++.
-      # hardcode_libdir_flag_spec is actually meaningless, as there is
-      # no search path for DLLs.
-      hardcode_libdir_flag_spec_F77=' '
-      allow_undefined_flag_F77=unsupported
-      # Tell ltmain to make .lib files, not .a files.
-      libext=lib
-      # Tell ltmain to make .dll files, not .so files.
-      shrext_cmds=".dll"
-      # FIXME: Setting linknames here is a bad hack.
-      archive_cmds_F77='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
-      # The linker will automatically build a .lib file if we build a DLL.
-      old_archive_From_new_cmds_F77='true'
-      # FIXME: Should let the user specify the lib program.
-      old_archive_cmds_F77='lib /OUT:$oldlib$oldobjs$old_deplibs'
-      fix_srcfile_path_F77='`cygpath -w "$srcfile"`'
-      enable_shared_with_static_runtimes_F77=yes
-      ;;
-
-    darwin* | rhapsody*)
-      case $host_os in
-        rhapsody* | darwin1.[012])
-         allow_undefined_flag_F77='${wl}-undefined ${wl}suppress'
-         ;;
-       *) # Darwin 1.3 on
-         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-           allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-         else
-           case ${MACOSX_DEPLOYMENT_TARGET} in
-             10.[012])
-               allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-               ;;
-             10.*)
-               allow_undefined_flag_F77='${wl}-undefined ${wl}dynamic_lookup'
-               ;;
-           esac
-         fi
-         ;;
-      esac
-      archive_cmds_need_lc_F77=no
-      hardcode_direct_F77=no
-      hardcode_automatic_F77=yes
-      hardcode_shlibpath_var_F77=unsupported
-      whole_archive_flag_spec_F77=''
-      link_all_deplibs_F77=yes
-    if test "$GCC" = yes ; then
-    	output_verbose_link_cmd='echo'
-        archive_cmds_F77='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-      module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-      archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-      module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    else
-      case $cc_basename in
-        xlc*)
-         output_verbose_link_cmd='echo'
-         archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
-         module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-         archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          ;;
-       *)
-         ld_shlibs_F77=no
-          ;;
-      esac
-    fi
-      ;;
-
-    dgux*)
-      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_libdir_flag_spec_F77='-L$libdir'
-      hardcode_shlibpath_var_F77=no
-      ;;
-
-    freebsd1*)
-      ld_shlibs_F77=no
-      ;;
-
-    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-    # support.  Future versions do this automatically, but an explicit c++rt0.o
-    # does not break anything, and helps significantly (at the cost of a little
-    # extra space).
-    freebsd2.2*)
-      archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-      hardcode_libdir_flag_spec_F77='-R$libdir'
-      hardcode_direct_F77=yes
-      hardcode_shlibpath_var_F77=no
-      ;;
-
-    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2*)
-      archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct_F77=yes
-      hardcode_minus_L_F77=yes
-      hardcode_shlibpath_var_F77=no
-      ;;
-
-    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | kfreebsd*-gnu | dragonfly*)
-      archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-      hardcode_libdir_flag_spec_F77='-R$libdir'
-      hardcode_direct_F77=yes
-      hardcode_shlibpath_var_F77=no
-      ;;
-
-    hpux9*)
-      if test "$GCC" = yes; then
-	archive_cmds_F77='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      else
-	archive_cmds_F77='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      fi
-      hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
-      hardcode_libdir_separator_F77=:
-      hardcode_direct_F77=yes
-
-      # hardcode_minus_L: Not really in the search PATH,
-      # but as the default location of the library.
-      hardcode_minus_L_F77=yes
-      export_dynamic_flag_spec_F77='${wl}-E'
-      ;;
-
-    hpux10*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds_F77='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      if test "$with_gnu_ld" = no; then
-	hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
-	hardcode_libdir_separator_F77=:
-
-	hardcode_direct_F77=yes
-	export_dynamic_flag_spec_F77='${wl}-E'
-
-	# hardcode_minus_L: Not really in the search PATH,
-	# but as the default location of the library.
-	hardcode_minus_L_F77=yes
-      fi
-      ;;
-
-    hpux11*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	case $host_cpu in
-	hppa*64*)
-	  archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	ia64*)
-	  archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	esac
-      else
-	case $host_cpu in
-	hppa*64*)
-	  archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	ia64*)
-	  archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	esac
-      fi
-      if test "$with_gnu_ld" = no; then
-	hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
-	hardcode_libdir_separator_F77=:
-
-	case $host_cpu in
-	hppa*64*|ia64*)
-	  hardcode_libdir_flag_spec_ld_F77='+b $libdir'
-	  hardcode_direct_F77=no
-	  hardcode_shlibpath_var_F77=no
-	  ;;
-	*)
-	  hardcode_direct_F77=yes
-	  export_dynamic_flag_spec_F77='${wl}-E'
-
-	  # hardcode_minus_L: Not really in the search PATH,
-	  # but as the default location of the library.
-	  hardcode_minus_L_F77=yes
-	  ;;
-	esac
-      fi
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      if test "$GCC" = yes; then
-	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-      else
-	archive_cmds_F77='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-	hardcode_libdir_flag_spec_ld_F77='-rpath $libdir'
-      fi
-      hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator_F77=:
-      link_all_deplibs_F77=yes
-      ;;
-
-    netbsd*)
-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-	archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-      else
-	archive_cmds_F77='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
-      fi
-      hardcode_libdir_flag_spec_F77='-R$libdir'
-      hardcode_direct_F77=yes
-      hardcode_shlibpath_var_F77=no
-      ;;
-
-    newsos6)
-      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct_F77=yes
-      hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator_F77=:
-      hardcode_shlibpath_var_F77=no
-      ;;
-
-    openbsd*)
-      hardcode_direct_F77=yes
-      hardcode_shlibpath_var_F77=no
-      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-	hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
-	export_dynamic_flag_spec_F77='${wl}-E'
-      else
-       case $host_os in
-	 openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-	   archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-	   hardcode_libdir_flag_spec_F77='-R$libdir'
-	   ;;
-	 *)
-	   archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	   hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
-	   ;;
-       esac
-      fi
-      ;;
-
-    os2*)
-      hardcode_libdir_flag_spec_F77='-L$libdir'
-      hardcode_minus_L_F77=yes
-      allow_undefined_flag_F77=unsupported
-      archive_cmds_F77='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-      old_archive_From_new_cmds_F77='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-      ;;
-
-    osf3*)
-      if test "$GCC" = yes; then
-	allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-      else
-	allow_undefined_flag_F77=' -expect_unresolved \*'
-	archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-      fi
-      hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator_F77=:
-      ;;
-
-    osf4* | osf5*)	# as osf3* with the addition of -msym flag
-      if test "$GCC" = yes; then
-	allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
-      else
-	allow_undefined_flag_F77=' -expect_unresolved \*'
-	archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-	archive_expsym_cmds_F77='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
-	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
-
-	# Both c and cxx compiler support -rpath directly
-	hardcode_libdir_flag_spec_F77='-rpath $libdir'
-      fi
-      hardcode_libdir_separator_F77=:
-      ;;
-
-    solaris*)
-      no_undefined_flag_F77=' -z text'
-      if test "$GCC" = yes; then
-	wlarc='${wl}'
-	archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
-      else
-	wlarc=''
-	archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-  	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-      fi
-      hardcode_libdir_flag_spec_F77='-R$libdir'
-      hardcode_shlibpath_var_F77=no
-      case $host_os in
-      solaris2.[0-5] | solaris2.[0-5].*) ;;
-      *)
- 	# The compiler driver will combine linker options so we
- 	# cannot just pass the convience library names through
- 	# without $wl, iff we do not link with $LD.
- 	# Luckily, gcc supports the same syntax we need for Sun Studio.
- 	# Supported since Solaris 2.6 (maybe 2.5.1?)
- 	case $wlarc in
- 	'')
- 	  whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;;
- 	*)
- 	  whole_archive_flag_spec_F77='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
- 	esac ;;
-      esac
-      link_all_deplibs_F77=yes
-      ;;
-
-    sunos4*)
-      if test "x$host_vendor" = xsequent; then
-	# Use $CC to link under sequent, because it throws in some extra .o
-	# files that make .init and .fini sections work.
-	archive_cmds_F77='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      hardcode_libdir_flag_spec_F77='-L$libdir'
-      hardcode_direct_F77=yes
-      hardcode_minus_L_F77=yes
-      hardcode_shlibpath_var_F77=no
-      ;;
-
-    sysv4)
-      case $host_vendor in
-	sni)
-	  archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  hardcode_direct_F77=yes # is this really true???
-	;;
-	siemens)
-	  ## LD is ld it makes a PLAMLIB
-	  ## CC just makes a GrossModule.
-	  archive_cmds_F77='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-	  reload_cmds_F77='$CC -r -o $output$reload_objs'
-	  hardcode_direct_F77=no
-        ;;
-	motorola)
-	  archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  hardcode_direct_F77=no #Motorola manual says yes, but my tests say they lie
-	;;
-      esac
-      runpath_var='LD_RUN_PATH'
-      hardcode_shlibpath_var_F77=no
-      ;;
-
-    sysv4.3*)
-      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_shlibpath_var_F77=no
-      export_dynamic_flag_spec_F77='-Bexport'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	hardcode_shlibpath_var_F77=no
-	runpath_var=LD_RUN_PATH
-	hardcode_runpath_var=yes
-	ld_shlibs_F77=yes
-      fi
-      ;;
-
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
-      no_undefined_flag_F77='${wl}-z,text'
-      archive_cmds_need_lc_F77=no
-      hardcode_shlibpath_var_F77=no
-      runpath_var='LD_RUN_PATH'
-
-      if test "$GCC" = yes; then
-	archive_cmds_F77='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_F77='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds_F77='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_F77='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
-
-    sysv5* | sco3.2v5* | sco5v6*)
-      # Note: We can NOT use -z defs as we might desire, because we do not
-      # link with -lc, and that would cause any symbols used from libc to
-      # always be unresolved, which means just about no library would
-      # ever link correctly.  If we're not using GNU ld we use -z text
-      # though, which does catch some bad symbols but isn't as heavy-handed
-      # as -z defs.
-      no_undefined_flag_F77='${wl}-z,text'
-      allow_undefined_flag_F77='${wl}-z,nodefs'
-      archive_cmds_need_lc_F77=no
-      hardcode_shlibpath_var_F77=no
-      hardcode_libdir_flag_spec_F77='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
-      hardcode_libdir_separator_F77=':'
-      link_all_deplibs_F77=yes
-      export_dynamic_flag_spec_F77='${wl}-Bexport'
-      runpath_var='LD_RUN_PATH'
-
-      if test "$GCC" = yes; then
-	archive_cmds_F77='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_F77='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds_F77='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_F77='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
-
-    uts4*)
-      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_libdir_flag_spec_F77='-L$libdir'
-      hardcode_shlibpath_var_F77=no
-      ;;
-
-    *)
-      ld_shlibs_F77=no
-      ;;
-    esac
-  fi
-
-{ echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5
-echo "${ECHO_T}$ld_shlibs_F77" >&6; }
-test "$ld_shlibs_F77" = no && can_build_shared=no
-
-#
-# Do we need to explicitly link libc?
-#
-case "x$archive_cmds_need_lc_F77" in
-x|xyes)
-  # Assume -lc should be added
-  archive_cmds_need_lc_F77=yes
-
-  if test "$enable_shared" = yes && test "$GCC" = yes; then
-    case $archive_cmds_F77 in
-    *'~'*)
-      # FIXME: we may have to deal with multi-command sequences.
-      ;;
-    '$CC '*)
-      # Test whether the compiler implicitly links with -lc since on some
-      # systems, -lgcc has to come before -lc. If gcc already passes -lc
-      # to ld, don't add -lc before -lgcc.
-      { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
-      $rm conftest*
-      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } 2>conftest.err; then
-        soname=conftest
-        lib=conftest
-        libobjs=conftest.$ac_objext
-        deplibs=
-        wl=$lt_prog_compiler_wl_F77
-	pic_flag=$lt_prog_compiler_pic_F77
-        compiler_flags=-v
-        linker_flags=-v
-        verstring=
-        output_objdir=.
-        libname=conftest
-        lt_save_allow_undefined_flag=$allow_undefined_flag_F77
-        allow_undefined_flag_F77=
-        if { (eval echo "$as_me:$LINENO: \"$archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
-  (eval $archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-        then
-	  archive_cmds_need_lc_F77=no
-        else
-	  archive_cmds_need_lc_F77=yes
-        fi
-        allow_undefined_flag_F77=$lt_save_allow_undefined_flag
-      else
-        cat conftest.err 1>&5
-      fi
-      $rm conftest*
-      { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5
-echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6; }
-      ;;
-    esac
-  fi
-  ;;
-esac
-
-{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
 library_names_spec=
 libname_spec='lib$name'
 soname_spec=
@@ -18526,20 +15606,6 @@ shlibpath_overrides_runpath=unknown
 version_type=none
 dynamic_linker="$host_os ld.so"
 sys_lib_dlsearch_path_spec="/lib /usr/lib"
-if test "$GCC" = yes; then
-  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
-    # if the path contains ";" then we assume it to be the separator
-    # otherwise default to the standard path separator (i.e. ":") - it is
-    # assumed that no part of a normal pathname contains ";" but that should
-    # okay in the real world where ";" in dirpaths is itself problematic.
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-  else
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-  fi
-else
-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi
 need_lib_prefix=unknown
 hardcode_into_libs=no
 
@@ -18557,7 +15623,7 @@ aix3*)
   soname_spec='${libname}${release}${shared_ext}$major'
   ;;
 
-aix4* | aix5*)
+aix[4-9]*)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -18576,7 +15642,7 @@ aix4* | aix5*)
       aix4 | aix4.[01] | aix4.[01].*)
       if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
 	   echo ' yes '
-	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
+	   echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
 	:
       else
 	can_build_shared=no
@@ -18602,9 +15668,18 @@ aix4* | aix5*)
   ;;
 
 amigaos*)
-  library_names_spec='$libname.ixlibrary $libname.a'
-  # Create ${libname}_ixlibrary.a entries in /sys/libs.
-  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+  case $host_cpu in
+  powerpc)
+    # Since July 2007 AmigaOS4 officially supports .so libraries.
+    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    ;;
+  m68k)
+    library_names_spec='$libname.ixlibrary $libname.a'
+    # Create ${libname}_ixlibrary.a entries in /sys/libs.
+    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+    ;;
+  esac
   ;;
 
 beos*)
@@ -18627,25 +15702,28 @@ bsdi[45]*)
   # libtool to hard-code these into programs
   ;;
 
-cygwin* | mingw* | pw32*)
+cygwin* | mingw* | pw32* | cegcc*)
   version_type=windows
   shrext_cmds=".dll"
   need_version=no
   need_lib_prefix=no
 
   case $GCC,$host_os in
-  yes,cygwin* | yes,mingw* | yes,pw32*)
+  yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
     library_names_spec='$libname.dll.a'
     # DLL is installed to $(libdir)/../bin by postinstall_cmds
     postinstall_cmds='base_file=`basename \${file}`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
       dldir=$destdir/`dirname \$dlpath`~
       test -d \$dldir || mkdir -p \$dldir~
       $install_prog $dir/$dlname \$dldir/$dlname~
-      chmod a+x \$dldir/$dlname'
+      chmod a+x \$dldir/$dlname~
+      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+      fi'
     postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
       dlpath=$dir/\$dldll~
-       $rm \$dlpath'
+       $RM \$dlpath'
     shlibpath_overrides_runpath=yes
 
     case $host_os in
@@ -18654,20 +15732,20 @@ cygwin* | mingw* | pw32*)
       soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
       sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
       ;;
-    mingw*)
+    mingw* | cegcc*)
       # MinGW DLLs use traditional 'lib' prefix
       soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-      if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
+      sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+      if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
         # It is most probably a Windows format PATH printed by
         # mingw gcc, but we are running on Cygwin. Gcc prints its search
         # path with ; separators, and with drive letters. We can handle the
         # drive letters (cygwin fileutils understands them), so leave them,
         # especially as we might pass files found there to a mingw objdump,
         # which wouldn't understand a cygwinified path. Ahh.
-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
       else
-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
       fi
       ;;
     pw32*)
@@ -18691,17 +15769,12 @@ darwin* | rhapsody*)
   version_type=darwin
   need_lib_prefix=no
   need_version=no
-  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
+  library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
   soname_spec='${libname}${release}${major}$shared_ext'
   shlibpath_overrides_runpath=yes
   shlibpath_var=DYLD_LIBRARY_PATH
   shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-  if test "$GCC" = yes; then
-    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-  else
-    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-  fi
+
   sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
   ;;
 
@@ -18718,18 +15791,6 @@ freebsd1*)
   dynamic_linker=no
   ;;
 
-kfreebsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
 freebsd* | dragonfly*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
@@ -18767,7 +15828,7 @@ freebsd* | dragonfly*)
     shlibpath_overrides_runpath=no
     hardcode_into_libs=yes
     ;;
-  freebsd*) # from 4.6 on
+  *) # from 4.6 on, and DragonFly
     shlibpath_overrides_runpath=yes
     hardcode_into_libs=yes
     ;;
@@ -18806,18 +15867,18 @@ hpux9* | hpux10* | hpux11*)
     fi
     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
     ;;
-   hppa*64*)
-     shrext_cmds='.sl'
-     hardcode_into_libs=yes
-     dynamic_linker="$host_os dld.sl"
-     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-     soname_spec='${libname}${release}${shared_ext}$major'
-     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
-     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-     ;;
-   *)
+  hppa*64*)
+    shrext_cmds='.sl'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+    ;;
+  *)
     shrext_cmds='.sl'
     dynamic_linker="$host_os dld.sl"
     shlibpath_var=SHLIB_PATH
@@ -18830,7 +15891,7 @@ hpux9* | hpux10* | hpux11*)
   postinstall_cmds='chmod 555 $lib'
   ;;
 
-interix3*)
+interix[3-9]*)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -18885,7 +15946,7 @@ linux*oldld* | linux*aout* | linux*coff*)
   ;;
 
 # This must be Linux ELF.
-linux*)
+linux* | k*bsd*-gnu)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -18894,1614 +15955,12 @@ linux*)
   finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=no
-  # This implies no fast_install, which is unacceptable.
-  # Some rework will be needed to allow for fast_install
-  # before this can be enabled.
-  hardcode_into_libs=yes
-
-  # find out which ABI we are using
-  libsuff=
-  case "$host_cpu" in
-  x86_64*|s390x*|powerpc64*)
-    echo '#line 18906 "configure"' > conftest.$ac_ext
-    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-      case `/usr/bin/file conftest.$ac_objext` in
-      *64-bit*)
-        libsuff=64
-        sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
-        ;;
-      esac
-    fi
-    rm -rf conftest*
-    ;;
-  esac
-
-  # Append ld.so.conf contents to the search path
-  if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/^	 *//;s/#.*//;/^[^\/]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
-  fi
-
-  # We used to test for /lib/ld.so.1 and disable shared libraries on
-  # powerpc, because MkLinux only supported shared libraries with the
-  # GNU dynamic linker.  Since this was broken with cross compilers,
-  # most powerpc-linux boxes support dynamic linking these days and
-  # people can always --disable-shared, the test was removed, and we
-  # assume the GNU/Linux dynamic linker is in use.
-  dynamic_linker='GNU/Linux ld.so'
-  ;;
-
-knetbsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
-netbsd*)
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-    dynamic_linker='NetBSD (a.out) ld.so'
-  else
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    dynamic_linker='NetBSD ld.elf_so'
-  fi
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  ;;
-
-newsos6)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-nto-qnx*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-openbsd*)
-  version_type=sunos
-  sys_lib_dlsearch_path_spec="/usr/lib"
-  need_lib_prefix=no
-  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-  case $host_os in
-    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
-    *)                         need_version=no  ;;
-  esac
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    case $host_os in
-      openbsd2.[89] | openbsd2.[89].*)
-	shlibpath_overrides_runpath=no
-	;;
-      *)
-	shlibpath_overrides_runpath=yes
-	;;
-      esac
-  else
-    shlibpath_overrides_runpath=yes
-  fi
-  ;;
-
-os2*)
-  libname_spec='$name'
-  shrext_cmds=".dll"
-  need_lib_prefix=no
-  library_names_spec='$libname${shared_ext} $libname.a'
-  dynamic_linker='OS/2 ld.exe'
-  shlibpath_var=LIBPATH
-  ;;
-
-osf3* | osf4* | osf5*)
-  version_type=osf
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-  ;;
-
-solaris*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  # ldd complains unless libraries are executable
-  postinstall_cmds='chmod +x $lib'
-  ;;
-
-sunos4*)
-  version_type=sunos
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  if test "$with_gnu_ld" = yes; then
-    need_lib_prefix=no
-  fi
-  need_version=yes
-  ;;
-
-sysv4 | sysv4.3*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_vendor in
-    sni)
-      shlibpath_overrides_runpath=no
-      need_lib_prefix=no
-      export_dynamic_flag_spec='${wl}-Blargedynsym'
-      runpath_var=LD_RUN_PATH
-      ;;
-    siemens)
-      need_lib_prefix=no
-      ;;
-    motorola)
-      need_lib_prefix=no
-      need_version=no
-      shlibpath_overrides_runpath=no
-      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-      ;;
-  esac
-  ;;
-
-sysv4*MP*)
-  if test -d /usr/nec ;then
-    version_type=linux
-    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-    soname_spec='$libname${shared_ext}.$major'
-    shlibpath_var=LD_LIBRARY_PATH
-  fi
-  ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  version_type=freebsd-elf
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  hardcode_into_libs=yes
-  if test "$with_gnu_ld" = yes; then
-    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
-    shlibpath_overrides_runpath=no
-  else
-    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
-    shlibpath_overrides_runpath=yes
-    case $host_os in
-      sco3.2v5*)
-        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
-	;;
-    esac
-  fi
-  sys_lib_dlsearch_path_spec='/usr/lib'
-  ;;
-
-uts4*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-*)
-  dynamic_linker=no
-  ;;
-esac
-{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-echo "${ECHO_T}$dynamic_linker" >&6; }
-test "$dynamic_linker" = no && can_build_shared=no
-
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
-
-{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
-hardcode_action_F77=
-if test -n "$hardcode_libdir_flag_spec_F77" || \
-   test -n "$runpath_var_F77" || \
-   test "X$hardcode_automatic_F77" = "Xyes" ; then
-
-  # We can hardcode non-existant directories.
-  if test "$hardcode_direct_F77" != no &&
-     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-     # have to relink, otherwise we might link with an installed library
-     # when we should be linking with a yet-to-be-installed one
-     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, F77)" != no &&
-     test "$hardcode_minus_L_F77" != no; then
-    # Linking always hardcodes the temporary library directory.
-    hardcode_action_F77=relink
-  else
-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-    hardcode_action_F77=immediate
-  fi
-else
-  # We cannot hardcode anything, or else we can only hardcode existing
-  # directories.
-  hardcode_action_F77=unsupported
-fi
-{ echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5
-echo "${ECHO_T}$hardcode_action_F77" >&6; }
-
-if test "$hardcode_action_F77" = relink; then
-  # Fast installation is not supported
-  enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
-     test "$enable_shared" = no; then
-  # Fast installation is not necessary
-  enable_fast_install=needless
-fi
-
-
-# The else clause should only fire when bootstrapping the
-# libtool distribution, otherwise you forgot to ship ltmain.sh
-# with your package, and you will get complaints that there are
-# no rules to generate ltmain.sh.
-if test -f "$ltmain"; then
-  # See if we are running on zsh, and set the options which allow our commands through
-  # without removal of \ escapes.
-  if test -n "${ZSH_VERSION+set}" ; then
-    setopt NO_GLOB_SUBST
-  fi
-  # Now quote all the things that may contain metacharacters while being
-  # careful not to overquote the AC_SUBSTed values.  We take copies of the
-  # variables and quote the copies for generation of the libtool script.
-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
-    SED SHELL STRIP \
-    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
-    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
-    deplibs_check_method reload_flag reload_cmds need_locks \
-    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
-    lt_cv_sys_global_symbol_to_c_name_address \
-    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
-    old_postinstall_cmds old_postuninstall_cmds \
-    compiler_F77 \
-    CC_F77 \
-    LD_F77 \
-    lt_prog_compiler_wl_F77 \
-    lt_prog_compiler_pic_F77 \
-    lt_prog_compiler_static_F77 \
-    lt_prog_compiler_no_builtin_flag_F77 \
-    export_dynamic_flag_spec_F77 \
-    thread_safe_flag_spec_F77 \
-    whole_archive_flag_spec_F77 \
-    enable_shared_with_static_runtimes_F77 \
-    old_archive_cmds_F77 \
-    old_archive_from_new_cmds_F77 \
-    predep_objects_F77 \
-    postdep_objects_F77 \
-    predeps_F77 \
-    postdeps_F77 \
-    compiler_lib_search_path_F77 \
-    archive_cmds_F77 \
-    archive_expsym_cmds_F77 \
-    postinstall_cmds_F77 \
-    postuninstall_cmds_F77 \
-    old_archive_from_expsyms_cmds_F77 \
-    allow_undefined_flag_F77 \
-    no_undefined_flag_F77 \
-    export_symbols_cmds_F77 \
-    hardcode_libdir_flag_spec_F77 \
-    hardcode_libdir_flag_spec_ld_F77 \
-    hardcode_libdir_separator_F77 \
-    hardcode_automatic_F77 \
-    module_cmds_F77 \
-    module_expsym_cmds_F77 \
-    lt_cv_prog_compiler_c_o_F77 \
-    exclude_expsyms_F77 \
-    include_expsyms_F77; do
-
-    case $var in
-    old_archive_cmds_F77 | \
-    old_archive_from_new_cmds_F77 | \
-    archive_cmds_F77 | \
-    archive_expsym_cmds_F77 | \
-    module_cmds_F77 | \
-    module_expsym_cmds_F77 | \
-    old_archive_from_expsyms_cmds_F77 | \
-    export_symbols_cmds_F77 | \
-    extract_expsyms_cmds | reload_cmds | finish_cmds | \
-    postinstall_cmds | postuninstall_cmds | \
-    old_postinstall_cmds | old_postuninstall_cmds | \
-    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
-      # Double-quote double-evaled strings.
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
-      ;;
-    *)
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
-      ;;
-    esac
-  done
-
-  case $lt_echo in
-  *'\$0 --fallback-echo"')
-    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
-    ;;
-  esac
-
-cfgfile="$ofile"
-
-  cat <<__EOF__ >> "$cfgfile"
-# ### BEGIN LIBTOOL TAG CONFIG: $tagname
-
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
-
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
-
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$archive_cmds_need_lc_F77
-
-# Whether or not to disallow shared libs when runtime libs are static
-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_F77
-
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
-
-# The host system.
-host_alias=$host_alias
-host=$host
-host_os=$host_os
-
-# The build system.
-build_alias=$build_alias
-build=$build
-build_os=$build_os
-
-# An echo program that does not interpret backslashes.
-echo=$lt_echo
-
-# The archiver.
-AR=$lt_AR
-AR_FLAGS=$lt_AR_FLAGS
-
-# A C compiler.
-LTCC=$lt_LTCC
-
-# LTCC compiler flags.
-LTCFLAGS=$lt_LTCFLAGS
-
-# A language-specific compiler.
-CC=$lt_compiler_F77
-
-# Is the compiler the GNU C compiler?
-with_gcc=$GCC_F77
-
-# An ERE matcher.
-EGREP=$lt_EGREP
-
-# The linker used to build libraries.
-LD=$lt_LD_F77
-
-# Whether we need hard or soft links.
-LN_S=$lt_LN_S
-
-# A BSD-compatible nm program.
-NM=$lt_NM
-
-# A symbol stripping program
-STRIP=$lt_STRIP
-
-# Used to examine libraries when file_magic_cmd begins "file"
-MAGIC_CMD=$MAGIC_CMD
-
-# Used on cygwin: DLL creation program.
-DLLTOOL="$DLLTOOL"
-
-# Used on cygwin: object dumper.
-OBJDUMP="$OBJDUMP"
-
-# Used on cygwin: assembler.
-AS="$AS"
-
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
-
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
-
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl_F77
-
-# Object file suffix (normally "o").
-objext="$ac_objext"
-
-# Old archive suffix (normally "a").
-libext="$libext"
-
-# Shared library suffix (normally ".so").
-shrext_cmds='$shrext_cmds'
-
-# Executable file suffix (normally "").
-exeext="$exeext"
-
-# Additional compiler flags for building library objects.
-pic_flag=$lt_lt_prog_compiler_pic_F77
-pic_mode=$pic_mode
-
-# What is the maximum length of a command?
-max_cmd_len=$lt_cv_sys_max_cmd_len
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77
-
-# Must we lock files when doing compilation?
-need_locks=$lt_need_locks
-
-# Do we need the lib prefix for modules?
-need_lib_prefix=$need_lib_prefix
-
-# Do we need a version for libraries?
-need_version=$need_version
-
-# Whether dlopen is supported.
-dlopen_support=$enable_dlopen
-
-# Whether dlopen of programs is supported.
-dlopen_self=$enable_dlopen_self
-
-# Whether dlopen of statically linked programs is supported.
-dlopen_self_static=$enable_dlopen_self_static
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$lt_lt_prog_compiler_static_F77
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_F77
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_F77
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_whole_archive_flag_spec_F77
-
-# Compiler flag to generate thread-safe objects.
-thread_safe_flag_spec=$lt_thread_safe_flag_spec_F77
-
-# Library versioning type.
-version_type=$version_type
-
-# Format of library name prefix.
-libname_spec=$lt_libname_spec
-
-# List of archive names.  First name is the real one, the rest are links.
-# The last name is the one that the linker finds with -lNAME.
-library_names_spec=$lt_library_names_spec
-
-# The coded name of the library, if different from the real name.
-soname_spec=$lt_soname_spec
-
-# Commands used to build and install an old-style archive.
-RANLIB=$lt_RANLIB
-old_archive_cmds=$lt_old_archive_cmds_F77
-old_postinstall_cmds=$lt_old_postinstall_cmds
-old_postuninstall_cmds=$lt_old_postuninstall_cmds
-
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_F77
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_F77
-
-# Commands used to build and install a shared archive.
-archive_cmds=$lt_archive_cmds_F77
-archive_expsym_cmds=$lt_archive_expsym_cmds_F77
-postinstall_cmds=$lt_postinstall_cmds
-postuninstall_cmds=$lt_postuninstall_cmds
-
-# Commands used to build a loadable module (assumed same as above if empty)
-module_cmds=$lt_module_cmds_F77
-module_expsym_cmds=$lt_module_expsym_cmds_F77
-
-# Commands to strip libraries.
-old_striplib=$lt_old_striplib
-striplib=$lt_striplib
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predep_objects=$lt_predep_objects_F77
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdep_objects=$lt_postdep_objects_F77
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predeps=$lt_predeps_F77
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdeps=$lt_postdeps_F77
-
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path_F77
-
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method=$lt_deplibs_check_method
-
-# Command to use when deplibs_check_method == file_magic.
-file_magic_cmd=$lt_file_magic_cmd
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$lt_allow_undefined_flag_F77
-
-# Flag that forces no undefined symbols.
-no_undefined_flag=$lt_no_undefined_flag_F77
-
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds=$lt_finish_cmds
-
-# Same as above, but a single script fragment to be evaled but not shown.
-finish_eval=$lt_finish_eval
-
-# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
-
-# Transform the output of nm in a proper C declaration
-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-
-# Transform the output of nm in a C name address pair
-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
-
-# This is the shared library runtime path variable.
-runpath_var=$runpath_var
-
-# This is the shared library path variable.
-shlibpath_var=$shlibpath_var
-
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=$hardcode_action_F77
-
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=$hardcode_into_libs
-
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_F77
-
-# If ld is used when linking, flag to hardcode \$libdir into
-# a binary during linking. This must work even if \$libdir does
-# not exist.
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_F77
-
-# Whether we need a single -rpath flag with a separated argument.
-hardcode_libdir_separator=$lt_hardcode_libdir_separator_F77
-
-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
-# resulting binary.
-hardcode_direct=$hardcode_direct_F77
-
-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-# resulting binary.
-hardcode_minus_L=$hardcode_minus_L_F77
-
-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-# the resulting binary.
-hardcode_shlibpath_var=$hardcode_shlibpath_var_F77
-
-# Set to yes if building a shared library automatically hardcodes DIR into the library
-# and all subsequent libraries and executables linked against it.
-hardcode_automatic=$hardcode_automatic_F77
-
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at relink time.
-variables_saved_for_relink="$variables_saved_for_relink"
-
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$link_all_deplibs_F77
-
-# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-
-# Run-time system search path for libraries
-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-
-# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$fix_srcfile_path_F77"
-
-# Set to yes if exported symbols are required.
-always_export_symbols=$always_export_symbols_F77
-
-# The commands to list exported symbols.
-export_symbols_cmds=$lt_export_symbols_cmds_F77
-
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=$lt_extract_expsyms_cmds
-
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$lt_exclude_expsyms_F77
-
-# Symbols that must always be exported.
-include_expsyms=$lt_include_expsyms_F77
-
-# ### END LIBTOOL TAG CONFIG: $tagname
-
-__EOF__
-
-
-else
-  # If there is no Makefile yet, we rely on a make rule to execute
-  # `config.status --recheck' to rerun these tests and create the
-  # libtool script then.
-  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
-  if test -f "$ltmain_in"; then
-    test -f Makefile && make "$ltmain"
-  fi
-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
-
-CC="$lt_save_CC"
-
-	else
-	  tagname=""
-	fi
-	;;
-
-      GCJ)
-	if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
-
-
-# Source file extension for Java test sources.
-ac_ext=java
-
-# Object file extension for compiled Java test sources.
-objext=o
-objext_GCJ=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="class foo {}\n"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n'
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# If no C compiler flags were specified, use CFLAGS.
-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-
-
-# save warnings/boilerplate of simple test code
-ac_outfile=conftest.$ac_objext
-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_compiler_boilerplate=`cat conftest.err`
-$rm conftest*
-
-ac_outfile=conftest.$ac_objext
-printf "$lt_simple_link_test_code" >conftest.$ac_ext
-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_linker_boilerplate=`cat conftest.err`
-$rm conftest*
-
-
-# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
-CC=${GCJ-"gcj"}
-compiler=$CC
-compiler_GCJ=$CC
-for cc_temp in $compiler""; do
-  case $cc_temp in
-    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-    \-*) ;;
-    *) break;;
-  esac
-done
-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-
-
-# GCJ did not exist at the time GCC didn't implicitly link libc in.
-archive_cmds_need_lc_GCJ=no
-
-old_archive_cmds_GCJ=$old_archive_cmds
-
-
-lt_prog_compiler_no_builtin_flag_GCJ=
-
-if test "$GCC" = yes; then
-  lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin'
-
-
-{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; }
-if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  lt_cv_prog_compiler_rtti_exceptions=no
-  ac_outfile=conftest.$ac_objext
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="-fno-rtti -fno-exceptions"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   # The option is referenced via a variable to avoid confusing sed.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:19680: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&5
-   echo "$as_me:19684: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s "$ac_outfile"; then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings other than the usual output.
-     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
-     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_rtti_exceptions=yes
-     fi
-   fi
-   $rm conftest*
-
-fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; }
-
-if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
-    lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions"
-else
-    :
-fi
-
-fi
-
-lt_prog_compiler_wl_GCJ=
-lt_prog_compiler_pic_GCJ=
-lt_prog_compiler_static_GCJ=
-
-{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
-
-  if test "$GCC" = yes; then
-    lt_prog_compiler_wl_GCJ='-Wl,'
-    lt_prog_compiler_static_GCJ='-static'
-
-    case $host_os in
-      aix*)
-      # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	lt_prog_compiler_static_GCJ='-Bstatic'
-      fi
-      ;;
-
-    amigaos*)
-      # FIXME: we need at least 68020 code to build shared libraries, but
-      # adding the `-m68020' flag to GCC prevents building anything better,
-      # like `-m68040'.
-      lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4'
-      ;;
-
-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-
-    mingw* | pw32* | os2*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
-      ;;
-
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      lt_prog_compiler_pic_GCJ='-fno-common'
-      ;;
-
-    interix3*)
-      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-      # Instead, we relocate shared libraries at runtime.
-      ;;
-
-    msdosdjgpp*)
-      # Just because we use GCC doesn't mean we suddenly get shared libraries
-      # on systems that don't support them.
-      lt_prog_compiler_can_build_shared_GCJ=no
-      enable_shared=no
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	lt_prog_compiler_pic_GCJ=-Kconform_pic
-      fi
-      ;;
-
-    hpux*)
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case $host_cpu in
-      hppa*64*|ia64*)
-	# +Z the default
-	;;
-      *)
-	lt_prog_compiler_pic_GCJ='-fPIC'
-	;;
-      esac
-      ;;
-
-    *)
-      lt_prog_compiler_pic_GCJ='-fPIC'
-      ;;
-    esac
-  else
-    # PORTME Check for flag to pass linker flags through the system compiler.
-    case $host_os in
-    aix*)
-      lt_prog_compiler_wl_GCJ='-Wl,'
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	lt_prog_compiler_static_GCJ='-Bstatic'
-      else
-	lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp'
-      fi
-      ;;
-      darwin*)
-        # PIC is the default on this platform
-        # Common symbols not allowed in MH_DYLIB files
-       case $cc_basename in
-         xlc*)
-         lt_prog_compiler_pic_GCJ='-qnocommon'
-         lt_prog_compiler_wl_GCJ='-Wl,'
-         ;;
-       esac
-       ;;
-
-    mingw* | pw32* | os2*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
-      ;;
-
-    hpux9* | hpux10* | hpux11*)
-      lt_prog_compiler_wl_GCJ='-Wl,'
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case $host_cpu in
-      hppa*64*|ia64*)
-	# +Z the default
-	;;
-      *)
-	lt_prog_compiler_pic_GCJ='+Z'
-	;;
-      esac
-      # Is there a better lt_prog_compiler_static that works with the bundled CC?
-      lt_prog_compiler_static_GCJ='${wl}-a ${wl}archive'
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      lt_prog_compiler_wl_GCJ='-Wl,'
-      # PIC (with -KPIC) is the default.
-      lt_prog_compiler_static_GCJ='-non_shared'
-      ;;
-
-    newsos6)
-      lt_prog_compiler_pic_GCJ='-KPIC'
-      lt_prog_compiler_static_GCJ='-Bstatic'
-      ;;
-
-    linux*)
-      case $cc_basename in
-      icc* | ecc*)
-	lt_prog_compiler_wl_GCJ='-Wl,'
-	lt_prog_compiler_pic_GCJ='-KPIC'
-	lt_prog_compiler_static_GCJ='-static'
-        ;;
-      pgcc* | pgf77* | pgf90* | pgf95*)
-        # Portland Group compilers (*not* the Pentium gcc compiler,
-	# which looks to be a dead project)
-	lt_prog_compiler_wl_GCJ='-Wl,'
-	lt_prog_compiler_pic_GCJ='-fpic'
-	lt_prog_compiler_static_GCJ='-Bstatic'
-        ;;
-      ccc*)
-        lt_prog_compiler_wl_GCJ='-Wl,'
-        # All Alpha code is PIC.
-        lt_prog_compiler_static_GCJ='-non_shared'
-        ;;
-      esac
-      ;;
-
-    osf3* | osf4* | osf5*)
-      lt_prog_compiler_wl_GCJ='-Wl,'
-      # All OSF/1 code is PIC.
-      lt_prog_compiler_static_GCJ='-non_shared'
-      ;;
-
-    solaris*)
-      lt_prog_compiler_pic_GCJ='-KPIC'
-      lt_prog_compiler_static_GCJ='-Bstatic'
-      case $cc_basename in
-      f77* | f90* | f95*)
-	lt_prog_compiler_wl_GCJ='-Qoption ld ';;
-      *)
-	lt_prog_compiler_wl_GCJ='-Wl,';;
-      esac
-      ;;
-
-    sunos4*)
-      lt_prog_compiler_wl_GCJ='-Qoption ld '
-      lt_prog_compiler_pic_GCJ='-PIC'
-      lt_prog_compiler_static_GCJ='-Bstatic'
-      ;;
-
-    sysv4 | sysv4.2uw2* | sysv4.3*)
-      lt_prog_compiler_wl_GCJ='-Wl,'
-      lt_prog_compiler_pic_GCJ='-KPIC'
-      lt_prog_compiler_static_GCJ='-Bstatic'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec ;then
-	lt_prog_compiler_pic_GCJ='-Kconform_pic'
-	lt_prog_compiler_static_GCJ='-Bstatic'
-      fi
-      ;;
-
-    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-      lt_prog_compiler_wl_GCJ='-Wl,'
-      lt_prog_compiler_pic_GCJ='-KPIC'
-      lt_prog_compiler_static_GCJ='-Bstatic'
-      ;;
-
-    unicos*)
-      lt_prog_compiler_wl_GCJ='-Wl,'
-      lt_prog_compiler_can_build_shared_GCJ=no
-      ;;
-
-    uts4*)
-      lt_prog_compiler_pic_GCJ='-pic'
-      lt_prog_compiler_static_GCJ='-Bstatic'
-      ;;
-
-    *)
-      lt_prog_compiler_can_build_shared_GCJ=no
-      ;;
-    esac
-  fi
-
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6; }
-
-#
-# Check to make sure the PIC flag actually works.
-#
-if test -n "$lt_prog_compiler_pic_GCJ"; then
-
-{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6; }
-if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  lt_prog_compiler_pic_works_GCJ=no
-  ac_outfile=conftest.$ac_objext
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="$lt_prog_compiler_pic_GCJ"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   # The option is referenced via a variable to avoid confusing sed.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:19948: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&5
-   echo "$as_me:19952: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s "$ac_outfile"; then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings other than the usual output.
-     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
-     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-       lt_prog_compiler_pic_works_GCJ=yes
-     fi
-   fi
-   $rm conftest*
-
-fi
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6; }
-
-if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then
-    case $lt_prog_compiler_pic_GCJ in
-     "" | " "*) ;;
-     *) lt_prog_compiler_pic_GCJ=" $lt_prog_compiler_pic_GCJ" ;;
-     esac
-else
-    lt_prog_compiler_pic_GCJ=
-     lt_prog_compiler_can_build_shared_GCJ=no
-fi
-
-fi
-case $host_os in
-  # For platforms which do not support PIC, -DPIC is meaningless:
-  *djgpp*)
-    lt_prog_compiler_pic_GCJ=
-    ;;
-  *)
-    lt_prog_compiler_pic_GCJ="$lt_prog_compiler_pic_GCJ"
-    ;;
-esac
-
-#
-# Check to make sure the static flag actually works.
-#
-wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\"
-{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
-if test "${lt_prog_compiler_static_works_GCJ+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  lt_prog_compiler_static_works_GCJ=no
-   save_LDFLAGS="$LDFLAGS"
-   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-   printf "$lt_simple_link_test_code" > conftest.$ac_ext
-   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-     # The linker can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test -s conftest.err; then
-       # Append any errors to the config.log.
-       cat conftest.err 1>&5
-       $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
-       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
-         lt_prog_compiler_static_works_GCJ=yes
-       fi
-     else
-       lt_prog_compiler_static_works_GCJ=yes
-     fi
-   fi
-   $rm conftest*
-   LDFLAGS="$save_LDFLAGS"
-
-fi
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5
-echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6; }
-
-if test x"$lt_prog_compiler_static_works_GCJ" = xyes; then
-    :
-else
-    lt_prog_compiler_static_GCJ=
-fi
-
-
-{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
-if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  lt_cv_prog_compiler_c_o_GCJ=no
-   $rm -r conftest 2>/dev/null
-   mkdir conftest
-   cd conftest
-   mkdir out
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-   lt_compiler_flag="-o out/conftest2.$ac_objext"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:20052: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&5
-   echo "$as_me:20056: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s out/conftest2.$ac_objext
-   then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
-     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_c_o_GCJ=yes
-     fi
-   fi
-   chmod u+w . 2>&5
-   $rm conftest*
-   # SGI C++ compiler will create directory out/ii_files/ for
-   # template instantiation
-   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
-   $rm out/* && rmdir out
-   cd ..
-   rmdir conftest
-   $rm conftest*
-
-fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6; }
-
-
-hard_links="nottested"
-if test "$lt_cv_prog_compiler_c_o_GCJ" = no && test "$need_locks" != no; then
-  # do not overwrite the value of need_locks provided by the user
-  { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
-  hard_links=yes
-  $rm conftest*
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  touch conftest.a
-  ln conftest.a conftest.b 2>&5 || hard_links=no
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  { echo "$as_me:$LINENO: result: $hard_links" >&5
-echo "${ECHO_T}$hard_links" >&6; }
-  if test "$hard_links" = no; then
-    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-    need_locks=warn
-  fi
-else
-  need_locks=no
-fi
-
-{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
-
-  runpath_var=
-  allow_undefined_flag_GCJ=
-  enable_shared_with_static_runtimes_GCJ=no
-  archive_cmds_GCJ=
-  archive_expsym_cmds_GCJ=
-  old_archive_From_new_cmds_GCJ=
-  old_archive_from_expsyms_cmds_GCJ=
-  export_dynamic_flag_spec_GCJ=
-  whole_archive_flag_spec_GCJ=
-  thread_safe_flag_spec_GCJ=
-  hardcode_libdir_flag_spec_GCJ=
-  hardcode_libdir_flag_spec_ld_GCJ=
-  hardcode_libdir_separator_GCJ=
-  hardcode_direct_GCJ=no
-  hardcode_minus_L_GCJ=no
-  hardcode_shlibpath_var_GCJ=unsupported
-  link_all_deplibs_GCJ=unknown
-  hardcode_automatic_GCJ=no
-  module_cmds_GCJ=
-  module_expsym_cmds_GCJ=
-  always_export_symbols_GCJ=no
-  export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  # include_expsyms should be a list of space-separated symbols to be *always*
-  # included in the symbol list
-  include_expsyms_GCJ=
-  # exclude_expsyms can be an extended regexp of symbols to exclude
-  # it will be wrapped by ` (' and `)$', so one must not match beginning or
-  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
-  # as well as any symbol that contains `d'.
-  exclude_expsyms_GCJ="_GLOBAL_OFFSET_TABLE_"
-  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
-  # platforms (ab)use it in PIC code, but their linkers get confused if
-  # the symbol is explicitly referenced.  Since portable code cannot
-  # rely on this symbol name, it's probably fine to never include it in
-  # preloaded symbol tables.
-  extract_expsyms_cmds=
-  # Just being paranoid about ensuring that cc_basename is set.
-  for cc_temp in $compiler""; do
-  case $cc_temp in
-    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-    \-*) ;;
-    *) break;;
-  esac
-done
-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-
-  case $host_os in
-  cygwin* | mingw* | pw32*)
-    # FIXME: the MSVC++ port hasn't been tested in a loooong time
-    # When not using gcc, we currently assume that we are using
-    # Microsoft Visual C++.
-    if test "$GCC" != yes; then
-      with_gnu_ld=no
-    fi
-    ;;
-  interix*)
-    # we just hope/assume this is gcc and not c89 (= MSVC++)
-    with_gnu_ld=yes
-    ;;
-  openbsd*)
-    with_gnu_ld=no
-    ;;
-  esac
-
-  ld_shlibs_GCJ=yes
-  if test "$with_gnu_ld" = yes; then
-    # If archive_cmds runs LD, not CC, wlarc should be empty
-    wlarc='${wl}'
-
-    # Set some defaults for GNU ld with shared library support. These
-    # are reset later if shared libraries are not supported. Putting them
-    # here allows them to be overridden if necessary.
-    runpath_var=LD_RUN_PATH
-    hardcode_libdir_flag_spec_GCJ='${wl}--rpath ${wl}$libdir'
-    export_dynamic_flag_spec_GCJ='${wl}--export-dynamic'
-    # ancient GNU ld didn't support --whole-archive et. al.
-    if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
-	whole_archive_flag_spec_GCJ="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-      else
-  	whole_archive_flag_spec_GCJ=
-    fi
-    supports_anon_versioning=no
-    case `$LD -v 2>/dev/null` in
-      *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
-      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-      *\ 2.11.*) ;; # other 2.11 versions
-      *) supports_anon_versioning=yes ;;
-    esac
-
-    # See if GNU ld supports shared libraries.
-    case $host_os in
-    aix3* | aix4* | aix5*)
-      # On AIX/PPC, the GNU linker is very broken
-      if test "$host_cpu" != ia64; then
-	ld_shlibs_GCJ=no
-	cat <<EOF 1>&2
-
-*** Warning: the GNU linker, at least up to release 2.9.1, is reported
-*** to be unable to reliably create shared libraries on AIX.
-*** Therefore, libtool is disabling shared libraries support.  If you
-*** really care for shared libraries, you may want to modify your PATH
-*** so that a non-GNU linker is found, and then restart.
-
-EOF
-      fi
-      ;;
-
-    amigaos*)
-      archive_cmds_GCJ='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-      hardcode_libdir_flag_spec_GCJ='-L$libdir'
-      hardcode_minus_L_GCJ=yes
-
-      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
-      # that the semantics of dynamic libraries on AmigaOS, at least up
-      # to version 4, is to share data among multiple programs linked
-      # with the same dynamic library.  Since this doesn't match the
-      # behavior of shared libraries on other platforms, we can't use
-      # them.
-      ld_shlibs_GCJ=no
-      ;;
-
-    beos*)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	allow_undefined_flag_GCJ=unsupported
-	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-	# support --undefined.  This deserves some investigation.  FIXME
-	archive_cmds_GCJ='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-      else
-	ld_shlibs_GCJ=no
-      fi
-      ;;
-
-    cygwin* | mingw* | pw32*)
-      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, GCJ) is actually meaningless,
-      # as there is no search path for DLLs.
-      hardcode_libdir_flag_spec_GCJ='-L$libdir'
-      allow_undefined_flag_GCJ=unsupported
-      always_export_symbols_GCJ=no
-      enable_shared_with_static_runtimes_GCJ=yes
-      export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
-
-      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-        archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-	# If the export-symbols file already is a .def file (1st line
-	# is EXPORTS), use it as is; otherwise, prepend...
-	archive_expsym_cmds_GCJ='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	  cp $export_symbols $output_objdir/$soname.def;
-	else
-	  echo EXPORTS > $output_objdir/$soname.def;
-	  cat $export_symbols >> $output_objdir/$soname.def;
-	fi~
-	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-      else
-	ld_shlibs_GCJ=no
-      fi
-      ;;
-
-    interix3*)
-      hardcode_direct_GCJ=no
-      hardcode_shlibpath_var_GCJ=no
-      hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
-      export_dynamic_flag_spec_GCJ='${wl}-E'
-      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-      # Instead, shared libraries are loaded at an image base (0x10000000 by
-      # default) and relocated if they conflict, which is a slow very memory
-      # consuming and fragmenting process.  To avoid this, we pick a random,
-      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-      archive_cmds_GCJ='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      archive_expsym_cmds_GCJ='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      ;;
-
-    linux*)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	tmp_addflag=
-	case $cc_basename,$host_cpu in
-	pgcc*)				# Portland Group C compiler
-	  whole_archive_flag_spec_GCJ='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-	  tmp_addflag=' $pic_flag'
-	  ;;
-	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
-	  whole_archive_flag_spec_GCJ='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-	  tmp_addflag=' $pic_flag -Mnomain' ;;
-	ecc*,ia64* | icc*,ia64*)		# Intel C compiler on ia64
-	  tmp_addflag=' -i_dynamic' ;;
-	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
-	  tmp_addflag=' -i_dynamic -nofor_main' ;;
-	ifc* | ifort*)			# Intel Fortran compiler
-	  tmp_addflag=' -nofor_main' ;;
-	esac
-	archive_cmds_GCJ='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-
-	if test $supports_anon_versioning = yes; then
-	  archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~
-  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-  $echo "local: *; };" >> $output_objdir/$libname.ver~
-	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-	fi
-      else
-	ld_shlibs_GCJ=no
-      fi
-      ;;
-
-    netbsd*)
-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-	archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-	wlarc=
-      else
-	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      fi
-      ;;
-
-    solaris*)
-      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
-	ld_shlibs_GCJ=no
-	cat <<EOF 1>&2
-
-*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-*** create shared libraries on Solaris systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.9.1 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-EOF
-      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	ld_shlibs_GCJ=no
-      fi
-      ;;
-
-    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
-      case `$LD -v 2>&1` in
-        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
-	ld_shlibs_GCJ=no
-	cat <<_LT_EOF 1>&2
-
-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
-*** reliably create shared libraries on SCO systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-_LT_EOF
-	;;
-	*)
-	  if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	    hardcode_libdir_flag_spec_GCJ='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
-	    archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
-	    archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
-	  else
-	    ld_shlibs_GCJ=no
-	  fi
-	;;
-      esac
-      ;;
-
-    sunos4*)
-      archive_cmds_GCJ='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      wlarc=
-      hardcode_direct_GCJ=yes
-      hardcode_shlibpath_var_GCJ=no
-      ;;
-
-    *)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	ld_shlibs_GCJ=no
-      fi
-      ;;
-    esac
-
-    if test "$ld_shlibs_GCJ" = no; then
-      runpath_var=
-      hardcode_libdir_flag_spec_GCJ=
-      export_dynamic_flag_spec_GCJ=
-      whole_archive_flag_spec_GCJ=
-    fi
-  else
-    # PORTME fill in a description of your system's linker (not GNU ld)
-    case $host_os in
-    aix3*)
-      allow_undefined_flag_GCJ=unsupported
-      always_export_symbols_GCJ=yes
-      archive_expsym_cmds_GCJ='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
-      # Note: this linker hardcodes the directories in LIBPATH if there
-      # are no directories specified by -L.
-      hardcode_minus_L_GCJ=yes
-      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
-	# Neither direct hardcoding nor static linking is supported with a
-	# broken collect2.
-	hardcode_direct_GCJ=unsupported
-      fi
-      ;;
-
-    aix4* | aix5*)
-      if test "$host_cpu" = ia64; then
-	# On IA64, the linker does run time linking by default, so we don't
-	# have to do anything special.
-	aix_use_runtimelinking=no
-	exp_sym_flag='-Bexport'
-	no_entry_flag=""
-      else
-	# If we're using GNU nm, then we don't want the "-C" option.
-	# -C means demangle to AIX nm, but means don't demangle with GNU nm
-	if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
-	  export_symbols_cmds_GCJ='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
-	else
-	  export_symbols_cmds_GCJ='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
-	fi
-	aix_use_runtimelinking=no
-
-	# Test if we are trying to use run time linking or normal
-	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
-	# need to do runtime linking.
-	case $host_os in aix4.[23]|aix4.[23].*|aix5*)
-	  for ld_flag in $LDFLAGS; do
-  	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
-  	    aix_use_runtimelinking=yes
-  	    break
-  	  fi
-	  done
-	  ;;
-	esac
-
-	exp_sym_flag='-bexport'
-	no_entry_flag='-bnoentry'
-      fi
-
-      # When large executables or shared objects are built, AIX ld can
-      # have problems creating the table of contents.  If linking a library
-      # or program results in "error TOC overflow" add -mminimal-toc to
-      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
-      archive_cmds_GCJ=''
-      hardcode_direct_GCJ=yes
-      hardcode_libdir_separator_GCJ=':'
-      link_all_deplibs_GCJ=yes
-
-      if test "$GCC" = yes; then
-	case $host_os in aix4.[012]|aix4.[012].*)
-	# We only want to do this on AIX 4.2 and lower, the check
-	# below for broken collect2 doesn't work under 4.3+
-	  collect2name=`${CC} -print-prog-name=collect2`
-	  if test -f "$collect2name" && \
-  	   strings "$collect2name" | grep resolve_lib_name >/dev/null
-	  then
-  	  # We have reworked collect2
-  	  hardcode_direct_GCJ=yes
-	  else
-  	  # We have old collect2
-  	  hardcode_direct_GCJ=unsupported
-  	  # It fails to find uninstalled libraries when the uninstalled
-  	  # path is not listed in the libpath.  Setting hardcode_minus_L
-  	  # to unsupported forces relinking
-  	  hardcode_minus_L_GCJ=yes
-  	  hardcode_libdir_flag_spec_GCJ='-L$libdir'
-  	  hardcode_libdir_separator_GCJ=
-	  fi
-	  ;;
-	esac
-	shared_flag='-shared'
-	if test "$aix_use_runtimelinking" = yes; then
-	  shared_flag="$shared_flag "'${wl}-G'
-	fi
-      else
-	# not using gcc
-	if test "$host_cpu" = ia64; then
-  	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-  	# chokes on -Wl,-G. The following line is correct:
-	  shared_flag='-G'
-	else
-	  if test "$aix_use_runtimelinking" = yes; then
-	    shared_flag='${wl}-G'
-	  else
-	    shared_flag='${wl}-bM:SRE'
-	  fi
-	fi
-      fi
-
-      # It seems that -bexpall does not export symbols beginning with
-      # underscore (_), so it is better to generate a list of symbols to export.
-      always_export_symbols_GCJ=yes
-      if test "$aix_use_runtimelinking" = yes; then
-	# Warning - without using the other runtime loading flags (-brtl),
-	# -berok will link without error, but may produce a broken library.
-	allow_undefined_flag_GCJ='-berok'
-       # Determine the default libpath from the value encoded in an empty executable.
-       cat >conftest.$ac_ext <<_ACEOF
+  # Some binutils ld are patched to set DT_RUNPATH
+  save_LDFLAGS=$LDFLAGS
+  save_libdir=$libdir
+  eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \
+       LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\""
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -20522,1019 +15981,50 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
+	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then
+  shlibpath_overrides_runpath=yes
 fi
 
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
-       hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath"
-	archive_expsym_cmds_GCJ="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-       else
-	if test "$host_cpu" = ia64; then
-	  hardcode_libdir_flag_spec_GCJ='${wl}-R $libdir:/usr/lib:/lib'
-	  allow_undefined_flag_GCJ="-z nodefs"
-	  archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
-	else
-	 # Determine the default libpath from the value encoded in an empty executable.
-	 cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
-	 hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath"
-	  # Warning - without using the other run time loading flags,
-	  # -berok will link without error, but may produce a broken library.
-	  no_undefined_flag_GCJ=' ${wl}-bernotok'
-	  allow_undefined_flag_GCJ=' ${wl}-berok'
-	  # Exported symbols can be pulled into shared objects from archives
-	  whole_archive_flag_spec_GCJ='$convenience'
-	  archive_cmds_need_lc_GCJ=yes
-	  # This is similar to how AIX traditionally builds its shared libraries.
-	  archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-	fi
-      fi
-      ;;
-
-    amigaos*)
-      archive_cmds_GCJ='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-      hardcode_libdir_flag_spec_GCJ='-L$libdir'
-      hardcode_minus_L_GCJ=yes
-      # see comment about different semantics on the GNU ld section
-      ld_shlibs_GCJ=no
-      ;;
-
-    bsdi[45]*)
-      export_dynamic_flag_spec_GCJ=-rdynamic
-      ;;
-
-    cygwin* | mingw* | pw32*)
-      # When not using gcc, we currently assume that we are using
-      # Microsoft Visual C++.
-      # hardcode_libdir_flag_spec is actually meaningless, as there is
-      # no search path for DLLs.
-      hardcode_libdir_flag_spec_GCJ=' '
-      allow_undefined_flag_GCJ=unsupported
-      # Tell ltmain to make .lib files, not .a files.
-      libext=lib
-      # Tell ltmain to make .dll files, not .so files.
-      shrext_cmds=".dll"
-      # FIXME: Setting linknames here is a bad hack.
-      archive_cmds_GCJ='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
-      # The linker will automatically build a .lib file if we build a DLL.
-      old_archive_From_new_cmds_GCJ='true'
-      # FIXME: Should let the user specify the lib program.
-      old_archive_cmds_GCJ='lib /OUT:$oldlib$oldobjs$old_deplibs'
-      fix_srcfile_path_GCJ='`cygpath -w "$srcfile"`'
-      enable_shared_with_static_runtimes_GCJ=yes
-      ;;
-
-    darwin* | rhapsody*)
-      case $host_os in
-        rhapsody* | darwin1.[012])
-         allow_undefined_flag_GCJ='${wl}-undefined ${wl}suppress'
-         ;;
-       *) # Darwin 1.3 on
-         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-           allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-         else
-           case ${MACOSX_DEPLOYMENT_TARGET} in
-             10.[012])
-               allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-               ;;
-             10.*)
-               allow_undefined_flag_GCJ='${wl}-undefined ${wl}dynamic_lookup'
-               ;;
-           esac
-         fi
-         ;;
-      esac
-      archive_cmds_need_lc_GCJ=no
-      hardcode_direct_GCJ=no
-      hardcode_automatic_GCJ=yes
-      hardcode_shlibpath_var_GCJ=unsupported
-      whole_archive_flag_spec_GCJ=''
-      link_all_deplibs_GCJ=yes
-    if test "$GCC" = yes ; then
-    	output_verbose_link_cmd='echo'
-        archive_cmds_GCJ='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-      module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-      archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-      module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    else
-      case $cc_basename in
-        xlc*)
-         output_verbose_link_cmd='echo'
-         archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
-         module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-         archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          ;;
-       *)
-         ld_shlibs_GCJ=no
-          ;;
-      esac
-    fi
-      ;;
-
-    dgux*)
-      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_libdir_flag_spec_GCJ='-L$libdir'
-      hardcode_shlibpath_var_GCJ=no
-      ;;
-
-    freebsd1*)
-      ld_shlibs_GCJ=no
-      ;;
-
-    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-    # support.  Future versions do this automatically, but an explicit c++rt0.o
-    # does not break anything, and helps significantly (at the cost of a little
-    # extra space).
-    freebsd2.2*)
-      archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-      hardcode_libdir_flag_spec_GCJ='-R$libdir'
-      hardcode_direct_GCJ=yes
-      hardcode_shlibpath_var_GCJ=no
-      ;;
-
-    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2*)
-      archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct_GCJ=yes
-      hardcode_minus_L_GCJ=yes
-      hardcode_shlibpath_var_GCJ=no
-      ;;
-
-    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | kfreebsd*-gnu | dragonfly*)
-      archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-      hardcode_libdir_flag_spec_GCJ='-R$libdir'
-      hardcode_direct_GCJ=yes
-      hardcode_shlibpath_var_GCJ=no
-      ;;
-
-    hpux9*)
-      if test "$GCC" = yes; then
-	archive_cmds_GCJ='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      else
-	archive_cmds_GCJ='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      fi
-      hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
-      hardcode_libdir_separator_GCJ=:
-      hardcode_direct_GCJ=yes
-
-      # hardcode_minus_L: Not really in the search PATH,
-      # but as the default location of the library.
-      hardcode_minus_L_GCJ=yes
-      export_dynamic_flag_spec_GCJ='${wl}-E'
-      ;;
-
-    hpux10*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds_GCJ='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      if test "$with_gnu_ld" = no; then
-	hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
-	hardcode_libdir_separator_GCJ=:
-
-	hardcode_direct_GCJ=yes
-	export_dynamic_flag_spec_GCJ='${wl}-E'
-
-	# hardcode_minus_L: Not really in the search PATH,
-	# but as the default location of the library.
-	hardcode_minus_L_GCJ=yes
-      fi
-      ;;
-
-    hpux11*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	case $host_cpu in
-	hppa*64*)
-	  archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	ia64*)
-	  archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	esac
-      else
-	case $host_cpu in
-	hppa*64*)
-	  archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	ia64*)
-	  archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	esac
-      fi
-      if test "$with_gnu_ld" = no; then
-	hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
-	hardcode_libdir_separator_GCJ=:
-
-	case $host_cpu in
-	hppa*64*|ia64*)
-	  hardcode_libdir_flag_spec_ld_GCJ='+b $libdir'
-	  hardcode_direct_GCJ=no
-	  hardcode_shlibpath_var_GCJ=no
-	  ;;
-	*)
-	  hardcode_direct_GCJ=yes
-	  export_dynamic_flag_spec_GCJ='${wl}-E'
-
-	  # hardcode_minus_L: Not really in the search PATH,
-	  # but as the default location of the library.
-	  hardcode_minus_L_GCJ=yes
-	  ;;
-	esac
-      fi
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      if test "$GCC" = yes; then
-	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-      else
-	archive_cmds_GCJ='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-	hardcode_libdir_flag_spec_ld_GCJ='-rpath $libdir'
-      fi
-      hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator_GCJ=:
-      link_all_deplibs_GCJ=yes
-      ;;
-
-    netbsd*)
-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-	archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-      else
-	archive_cmds_GCJ='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
-      fi
-      hardcode_libdir_flag_spec_GCJ='-R$libdir'
-      hardcode_direct_GCJ=yes
-      hardcode_shlibpath_var_GCJ=no
-      ;;
-
-    newsos6)
-      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct_GCJ=yes
-      hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator_GCJ=:
-      hardcode_shlibpath_var_GCJ=no
-      ;;
-
-    openbsd*)
-      hardcode_direct_GCJ=yes
-      hardcode_shlibpath_var_GCJ=no
-      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-	hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
-	export_dynamic_flag_spec_GCJ='${wl}-E'
-      else
-       case $host_os in
-	 openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-	   archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-	   hardcode_libdir_flag_spec_GCJ='-R$libdir'
-	   ;;
-	 *)
-	   archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	   hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
-	   ;;
-       esac
-      fi
-      ;;
-
-    os2*)
-      hardcode_libdir_flag_spec_GCJ='-L$libdir'
-      hardcode_minus_L_GCJ=yes
-      allow_undefined_flag_GCJ=unsupported
-      archive_cmds_GCJ='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-      old_archive_From_new_cmds_GCJ='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-      ;;
-
-    osf3*)
-      if test "$GCC" = yes; then
-	allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-      else
-	allow_undefined_flag_GCJ=' -expect_unresolved \*'
-	archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-      fi
-      hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator_GCJ=:
-      ;;
-
-    osf4* | osf5*)	# as osf3* with the addition of -msym flag
-      if test "$GCC" = yes; then
-	allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
-      else
-	allow_undefined_flag_GCJ=' -expect_unresolved \*'
-	archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-	archive_expsym_cmds_GCJ='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
-	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
-
-	# Both c and cxx compiler support -rpath directly
-	hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
-      fi
-      hardcode_libdir_separator_GCJ=:
-      ;;
-
-    solaris*)
-      no_undefined_flag_GCJ=' -z text'
-      if test "$GCC" = yes; then
-	wlarc='${wl}'
-	archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
-      else
-	wlarc=''
-	archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-  	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-      fi
-      hardcode_libdir_flag_spec_GCJ='-R$libdir'
-      hardcode_shlibpath_var_GCJ=no
-      case $host_os in
-      solaris2.[0-5] | solaris2.[0-5].*) ;;
-      *)
- 	# The compiler driver will combine linker options so we
- 	# cannot just pass the convience library names through
- 	# without $wl, iff we do not link with $LD.
- 	# Luckily, gcc supports the same syntax we need for Sun Studio.
- 	# Supported since Solaris 2.6 (maybe 2.5.1?)
- 	case $wlarc in
- 	'')
- 	  whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;;
- 	*)
- 	  whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
- 	esac ;;
-      esac
-      link_all_deplibs_GCJ=yes
-      ;;
-
-    sunos4*)
-      if test "x$host_vendor" = xsequent; then
-	# Use $CC to link under sequent, because it throws in some extra .o
-	# files that make .init and .fini sections work.
-	archive_cmds_GCJ='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      hardcode_libdir_flag_spec_GCJ='-L$libdir'
-      hardcode_direct_GCJ=yes
-      hardcode_minus_L_GCJ=yes
-      hardcode_shlibpath_var_GCJ=no
-      ;;
-
-    sysv4)
-      case $host_vendor in
-	sni)
-	  archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  hardcode_direct_GCJ=yes # is this really true???
-	;;
-	siemens)
-	  ## LD is ld it makes a PLAMLIB
-	  ## CC just makes a GrossModule.
-	  archive_cmds_GCJ='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-	  reload_cmds_GCJ='$CC -r -o $output$reload_objs'
-	  hardcode_direct_GCJ=no
-        ;;
-	motorola)
-	  archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  hardcode_direct_GCJ=no #Motorola manual says yes, but my tests say they lie
-	;;
-      esac
-      runpath_var='LD_RUN_PATH'
-      hardcode_shlibpath_var_GCJ=no
-      ;;
-
-    sysv4.3*)
-      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_shlibpath_var_GCJ=no
-      export_dynamic_flag_spec_GCJ='-Bexport'
-      ;;
+  LDFLAGS=$save_LDFLAGS
+  libdir=$save_libdir
 
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	hardcode_shlibpath_var_GCJ=no
-	runpath_var=LD_RUN_PATH
-	hardcode_runpath_var=yes
-	ld_shlibs_GCJ=yes
-      fi
-      ;;
-
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
-      no_undefined_flag_GCJ='${wl}-z,text'
-      archive_cmds_need_lc_GCJ=no
-      hardcode_shlibpath_var_GCJ=no
-      runpath_var='LD_RUN_PATH'
-
-      if test "$GCC" = yes; then
-	archive_cmds_GCJ='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds_GCJ='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
-
-    sysv5* | sco3.2v5* | sco5v6*)
-      # Note: We can NOT use -z defs as we might desire, because we do not
-      # link with -lc, and that would cause any symbols used from libc to
-      # always be unresolved, which means just about no library would
-      # ever link correctly.  If we're not using GNU ld we use -z text
-      # though, which does catch some bad symbols but isn't as heavy-handed
-      # as -z defs.
-      no_undefined_flag_GCJ='${wl}-z,text'
-      allow_undefined_flag_GCJ='${wl}-z,nodefs'
-      archive_cmds_need_lc_GCJ=no
-      hardcode_shlibpath_var_GCJ=no
-      hardcode_libdir_flag_spec_GCJ='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
-      hardcode_libdir_separator_GCJ=':'
-      link_all_deplibs_GCJ=yes
-      export_dynamic_flag_spec_GCJ='${wl}-Bexport'
-      runpath_var='LD_RUN_PATH'
-
-      if test "$GCC" = yes; then
-	archive_cmds_GCJ='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds_GCJ='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
-
-    uts4*)
-      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_libdir_flag_spec_GCJ='-L$libdir'
-      hardcode_shlibpath_var_GCJ=no
-      ;;
-
-    *)
-      ld_shlibs_GCJ=no
-      ;;
-    esac
-  fi
-
-{ echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5
-echo "${ECHO_T}$ld_shlibs_GCJ" >&6; }
-test "$ld_shlibs_GCJ" = no && can_build_shared=no
-
-#
-# Do we need to explicitly link libc?
-#
-case "x$archive_cmds_need_lc_GCJ" in
-x|xyes)
-  # Assume -lc should be added
-  archive_cmds_need_lc_GCJ=yes
-
-  if test "$enable_shared" = yes && test "$GCC" = yes; then
-    case $archive_cmds_GCJ in
-    *'~'*)
-      # FIXME: we may have to deal with multi-command sequences.
-      ;;
-    '$CC '*)
-      # Test whether the compiler implicitly links with -lc since on some
-      # systems, -lgcc has to come before -lc. If gcc already passes -lc
-      # to ld, don't add -lc before -lgcc.
-      { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
-      $rm conftest*
-      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } 2>conftest.err; then
-        soname=conftest
-        lib=conftest
-        libobjs=conftest.$ac_objext
-        deplibs=
-        wl=$lt_prog_compiler_wl_GCJ
-	pic_flag=$lt_prog_compiler_pic_GCJ
-        compiler_flags=-v
-        linker_flags=-v
-        verstring=
-        output_objdir=.
-        libname=conftest
-        lt_save_allow_undefined_flag=$allow_undefined_flag_GCJ
-        allow_undefined_flag_GCJ=
-        if { (eval echo "$as_me:$LINENO: \"$archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
-  (eval $archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-        then
-	  archive_cmds_need_lc_GCJ=no
-        else
-	  archive_cmds_need_lc_GCJ=yes
-        fi
-        allow_undefined_flag_GCJ=$lt_save_allow_undefined_flag
-      else
-        cat conftest.err 1>&5
-      fi
-      $rm conftest*
-      { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5
-echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6; }
-      ;;
-    esac
-  fi
-  ;;
-esac
-
-{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
-library_names_spec=
-libname_spec='lib$name'
-soname_spec=
-shrext_cmds=".so"
-postinstall_cmds=
-postuninstall_cmds=
-finish_cmds=
-finish_eval=
-shlibpath_var=
-shlibpath_overrides_runpath=unknown
-version_type=none
-dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
-if test "$GCC" = yes; then
-  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
-    # if the path contains ";" then we assume it to be the separator
-    # otherwise default to the standard path separator (i.e. ":") - it is
-    # assumed that no part of a normal pathname contains ";" but that should
-    # okay in the real world where ";" in dirpaths is itself problematic.
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-  else
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-  fi
-else
-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi
-need_lib_prefix=unknown
-hardcode_into_libs=no
-
-# when you set need_version to no, make sure it does not cause -set_version
-# flags to be left without arguments
-need_version=unknown
-
-case $host_os in
-aix3*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
-  shlibpath_var=LIBPATH
-
-  # AIX 3 has no versioning support, so we append a major version to the name.
-  soname_spec='${libname}${release}${shared_ext}$major'
-  ;;
-
-aix4* | aix5*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  hardcode_into_libs=yes
-  if test "$host_cpu" = ia64; then
-    # AIX 5 supports IA64
-    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
-    shlibpath_var=LD_LIBRARY_PATH
-  else
-    # With GCC up to 2.95.x, collect2 would create an import file
-    # for dependence libraries.  The import file would start with
-    # the line `#! .'.  This would cause the generated library to
-    # depend on `.', always an invalid library.  This was fixed in
-    # development snapshots of GCC prior to 3.0.
-    case $host_os in
-      aix4 | aix4.[01] | aix4.[01].*)
-      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-	   echo ' yes '
-	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
-	:
-      else
-	can_build_shared=no
-      fi
-      ;;
-    esac
-    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
-    # soname into executable. Probably we can add versioning support to
-    # collect2, so additional links can be useful in future.
-    if test "$aix_use_runtimelinking" = yes; then
-      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-      # instead of lib<name>.a to let people know that these are not
-      # typical AIX shared libraries.
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    else
-      # We preserve .a as extension for shared libraries through AIX4.2
-      # and later when we are not doing run time linking.
-      library_names_spec='${libname}${release}.a $libname.a'
-      soname_spec='${libname}${release}${shared_ext}$major'
-    fi
-    shlibpath_var=LIBPATH
-  fi
-  ;;
-
-amigaos*)
-  library_names_spec='$libname.ixlibrary $libname.a'
-  # Create ${libname}_ixlibrary.a entries in /sys/libs.
-  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-  ;;
-
-beos*)
-  library_names_spec='${libname}${shared_ext}'
-  dynamic_linker="$host_os ld.so"
-  shlibpath_var=LIBRARY_PATH
-  ;;
-
-bsdi[45]*)
-  version_type=linux
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-  # the default ld.so.conf also contains /usr/contrib/lib and
-  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-  # libtool to hard-code these into programs
-  ;;
-
-cygwin* | mingw* | pw32*)
-  version_type=windows
-  shrext_cmds=".dll"
-  need_version=no
-  need_lib_prefix=no
-
-  case $GCC,$host_os in
-  yes,cygwin* | yes,mingw* | yes,pw32*)
-    library_names_spec='$libname.dll.a'
-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \${file}`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
-      dldir=$destdir/`dirname \$dlpath`~
-      test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname~
-      chmod a+x \$dldir/$dlname'
-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-      dlpath=$dir/\$dldll~
-       $rm \$dlpath'
-    shlibpath_overrides_runpath=yes
-
-    case $host_os in
-    cygwin*)
-      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
-      ;;
-    mingw*)
-      # MinGW DLLs use traditional 'lib' prefix
-      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-      if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
-        # It is most probably a Windows format PATH printed by
-        # mingw gcc, but we are running on Cygwin. Gcc prints its search
-        # path with ; separators, and with drive letters. We can handle the
-        # drive letters (cygwin fileutils understands them), so leave them,
-        # especially as we might pass files found there to a mingw objdump,
-        # which wouldn't understand a cygwinified path. Ahh.
-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-      else
-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-      fi
-      ;;
-    pw32*)
-      # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      ;;
-    esac
-    ;;
-
-  *)
-    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
-    ;;
-  esac
-  dynamic_linker='Win32 ld.exe'
-  # FIXME: first we should search . and the directory the executable is in
-  shlibpath_var=PATH
-  ;;
-
-darwin* | rhapsody*)
-  dynamic_linker="$host_os dyld"
-  version_type=darwin
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-  soname_spec='${libname}${release}${major}$shared_ext'
-  shlibpath_overrides_runpath=yes
-  shlibpath_var=DYLD_LIBRARY_PATH
-  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-  if test "$GCC" = yes; then
-    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-  else
-    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-  fi
-  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-  ;;
-
-dgux*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-freebsd1*)
-  dynamic_linker=no
-  ;;
-
-kfreebsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
-freebsd* | dragonfly*)
-  # DragonFly does not have aout.  When/if they implement a new
-  # versioning mechanism, adjust this.
-  if test -x /usr/bin/objformat; then
-    objformat=`/usr/bin/objformat`
-  else
-    case $host_os in
-    freebsd[123]*) objformat=aout ;;
-    *) objformat=elf ;;
-    esac
-  fi
-  version_type=freebsd-$objformat
-  case $version_type in
-    freebsd-elf*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-      need_version=no
-      need_lib_prefix=no
-      ;;
-    freebsd-*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
-      need_version=yes
-      ;;
-  esac
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_os in
-  freebsd2*)
-    shlibpath_overrides_runpath=yes
-    ;;
-  freebsd3.[01]* | freebsdelf3.[01]*)
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
-  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
-    shlibpath_overrides_runpath=no
-    hardcode_into_libs=yes
-    ;;
-  freebsd*) # from 4.6 on
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  esac
-  ;;
-
-gnu*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  hardcode_into_libs=yes
-  ;;
-
-hpux9* | hpux10* | hpux11*)
-  # Give a soname corresponding to the major version so that dld.sl refuses to
-  # link against other versions.
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  case $host_cpu in
-  ia64*)
-    shrext_cmds='.so'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.so"
-    shlibpath_var=LD_LIBRARY_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    if test "X$HPUX_IA64_MODE" = X32; then
-      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
-    else
-      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
-    fi
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-    ;;
-   hppa*64*)
-     shrext_cmds='.sl'
-     hardcode_into_libs=yes
-     dynamic_linker="$host_os dld.sl"
-     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-     soname_spec='${libname}${release}${shared_ext}$major'
-     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
-     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-     ;;
-   *)
-    shrext_cmds='.sl'
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=SHLIB_PATH
-    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    ;;
-  esac
-  # HP-UX runs *really* slowly unless shared libraries are mode 555.
-  postinstall_cmds='chmod 555 $lib'
-  ;;
-
-interix3*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $host_os in
-    nonstopux*) version_type=nonstopux ;;
-    *)
-	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux
-	else
-		version_type=irix
-	fi ;;
-  esac
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
-  case $host_os in
-  irix5* | nonstopux*)
-    libsuff= shlibsuff=
-    ;;
-  *)
-    case $LD in # libtool.m4 will add one of these switches to LD
-    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
-      libsuff= shlibsuff= libmagic=32-bit;;
-    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
-      libsuff=32 shlibsuff=N32 libmagic=N32;;
-    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
-      libsuff=64 shlibsuff=64 libmagic=64-bit;;
-    *) libsuff= shlibsuff= libmagic=never-match;;
-    esac
-    ;;
-  esac
-  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-  shlibpath_overrides_runpath=no
-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-  hardcode_into_libs=yes
-  ;;
-
-# No shared lib support for Linux oldld, aout, or coff.
-linux*oldld* | linux*aout* | linux*coff*)
-  dynamic_linker=no
-  ;;
-
-# This must be Linux ELF.
-linux*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
   # This implies no fast_install, which is unacceptable.
   # Some rework will be needed to allow for fast_install
   # before this can be enabled.
   hardcode_into_libs=yes
 
-  # find out which ABI we are using
-  libsuff=
-  case "$host_cpu" in
-  x86_64*|s390x*|powerpc64*)
-    echo '#line 21517 "configure"' > conftest.$ac_ext
-    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-      case `/usr/bin/file conftest.$ac_objext` in
-      *64-bit*)
-        libsuff=64
-        sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
-        ;;
-      esac
-    fi
-    rm -rf conftest*
-    ;;
-  esac
+  # Add ABI-specific directories to the system library path.
+  sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
 
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/^	 *//;s/#.*//;/^[^\/]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
   fi
 
   # We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -21546,23 +16036,11 @@ linux*)
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
-knetbsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
 netbsd*)
   version_type=sunos
   need_lib_prefix=no
   need_version=no
-  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
     finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
     dynamic_linker='NetBSD (a.out) ld.so'
@@ -21583,14 +16061,16 @@ newsos6)
   shlibpath_overrides_runpath=yes
   ;;
 
-nto-qnx*)
-  version_type=linux
+*nto* | *qnx*)
+  version_type=qnx
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='ldqnx.so'
   ;;
 
 openbsd*)
@@ -21599,13 +16079,13 @@ openbsd*)
   need_lib_prefix=no
   # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
   case $host_os in
-    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
-    *)                         need_version=no  ;;
+    openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
+    *)				need_version=no  ;;
   esac
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
   shlibpath_var=LD_LIBRARY_PATH
-  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
     case $host_os in
       openbsd2.[89] | openbsd2.[89].*)
 	shlibpath_overrides_runpath=no
@@ -21639,6 +16119,10 @@ osf3* | osf4* | osf5*)
   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
   ;;
 
+rdos*)
+  dynamic_linker=no
+  ;;
+
 solaris*)
   version_type=linux
   need_lib_prefix=no
@@ -21673,7 +16157,6 @@ sysv4 | sysv4.3*)
     sni)
       shlibpath_overrides_runpath=no
       need_lib_prefix=no
-      export_dynamic_flag_spec='${wl}-Blargedynsym'
       runpath_var=LD_RUN_PATH
       ;;
     siemens)
@@ -21704,13 +16187,12 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
   hardcode_into_libs=yes
   if test "$with_gnu_ld" = yes; then
     sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
-    shlibpath_overrides_runpath=no
   else
     sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
-    shlibpath_overrides_runpath=yes
     case $host_os in
       sco3.2v5*)
         sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
@@ -21720,6 +16202,17 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
   sys_lib_dlsearch_path_spec='/usr/lib'
   ;;
 
+tpf*)
+  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
 uts4*)
   version_type=linux
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -21731,8 +16224,8 @@ uts4*)
   dynamic_linker=no
   ;;
 esac
-{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-echo "${ECHO_T}$dynamic_linker" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+$as_echo "$dynamic_linker" >&6; }
 test "$dynamic_linker" = no && can_build_shared=no
 
 variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
@@ -21740,931 +16233,104 @@ if test "$GCC" = yes; then
   variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
 fi
 
-{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
-hardcode_action_GCJ=
-if test -n "$hardcode_libdir_flag_spec_GCJ" || \
-   test -n "$runpath_var_GCJ" || \
-   test "X$hardcode_automatic_GCJ" = "Xyes" ; then
-
-  # We can hardcode non-existant directories.
-  if test "$hardcode_direct_GCJ" != no &&
-     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-     # have to relink, otherwise we might link with an installed library
-     # when we should be linking with a yet-to-be-installed one
-     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, GCJ)" != no &&
-     test "$hardcode_minus_L_GCJ" != no; then
-    # Linking always hardcodes the temporary library directory.
-    hardcode_action_GCJ=relink
-  else
-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-    hardcode_action_GCJ=immediate
-  fi
-else
-  # We cannot hardcode anything, or else we can only hardcode existing
-  # directories.
-  hardcode_action_GCJ=unsupported
+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
+  sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
 fi
-{ echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
-echo "${ECHO_T}$hardcode_action_GCJ" >&6; }
-
-if test "$hardcode_action_GCJ" = relink; then
-  # Fast installation is not supported
-  enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
-     test "$enable_shared" = no; then
-  # Fast installation is not necessary
-  enable_fast_install=needless
+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
+  sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
 fi
 
 
-# The else clause should only fire when bootstrapping the
-# libtool distribution, otherwise you forgot to ship ltmain.sh
-# with your package, and you will get complaints that there are
-# no rules to generate ltmain.sh.
-if test -f "$ltmain"; then
-  # See if we are running on zsh, and set the options which allow our commands through
-  # without removal of \ escapes.
-  if test -n "${ZSH_VERSION+set}" ; then
-    setopt NO_GLOB_SUBST
-  fi
-  # Now quote all the things that may contain metacharacters while being
-  # careful not to overquote the AC_SUBSTed values.  We take copies of the
-  # variables and quote the copies for generation of the libtool script.
-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
-    SED SHELL STRIP \
-    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
-    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
-    deplibs_check_method reload_flag reload_cmds need_locks \
-    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
-    lt_cv_sys_global_symbol_to_c_name_address \
-    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
-    old_postinstall_cmds old_postuninstall_cmds \
-    compiler_GCJ \
-    CC_GCJ \
-    LD_GCJ \
-    lt_prog_compiler_wl_GCJ \
-    lt_prog_compiler_pic_GCJ \
-    lt_prog_compiler_static_GCJ \
-    lt_prog_compiler_no_builtin_flag_GCJ \
-    export_dynamic_flag_spec_GCJ \
-    thread_safe_flag_spec_GCJ \
-    whole_archive_flag_spec_GCJ \
-    enable_shared_with_static_runtimes_GCJ \
-    old_archive_cmds_GCJ \
-    old_archive_from_new_cmds_GCJ \
-    predep_objects_GCJ \
-    postdep_objects_GCJ \
-    predeps_GCJ \
-    postdeps_GCJ \
-    compiler_lib_search_path_GCJ \
-    archive_cmds_GCJ \
-    archive_expsym_cmds_GCJ \
-    postinstall_cmds_GCJ \
-    postuninstall_cmds_GCJ \
-    old_archive_from_expsyms_cmds_GCJ \
-    allow_undefined_flag_GCJ \
-    no_undefined_flag_GCJ \
-    export_symbols_cmds_GCJ \
-    hardcode_libdir_flag_spec_GCJ \
-    hardcode_libdir_flag_spec_ld_GCJ \
-    hardcode_libdir_separator_GCJ \
-    hardcode_automatic_GCJ \
-    module_cmds_GCJ \
-    module_expsym_cmds_GCJ \
-    lt_cv_prog_compiler_c_o_GCJ \
-    exclude_expsyms_GCJ \
-    include_expsyms_GCJ; do
-
-    case $var in
-    old_archive_cmds_GCJ | \
-    old_archive_from_new_cmds_GCJ | \
-    archive_cmds_GCJ | \
-    archive_expsym_cmds_GCJ | \
-    module_cmds_GCJ | \
-    module_expsym_cmds_GCJ | \
-    old_archive_from_expsyms_cmds_GCJ | \
-    export_symbols_cmds_GCJ | \
-    extract_expsyms_cmds | reload_cmds | finish_cmds | \
-    postinstall_cmds | postuninstall_cmds | \
-    old_postinstall_cmds | old_postuninstall_cmds | \
-    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
-      # Double-quote double-evaled strings.
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
-      ;;
-    *)
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
-      ;;
-    esac
-  done
-
-  case $lt_echo in
-  *'\$0 --fallback-echo"')
-    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
-    ;;
-  esac
-
-cfgfile="$ofile"
-
-  cat <<__EOF__ >> "$cfgfile"
-# ### BEGIN LIBTOOL TAG CONFIG: $tagname
-
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
-
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
-
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$archive_cmds_need_lc_GCJ
 
-# Whether or not to disallow shared libs when runtime libs are static
-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_GCJ
 
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
 
-# The host system.
-host_alias=$host_alias
-host=$host
-host_os=$host_os
 
-# The build system.
-build_alias=$build_alias
-build=$build
-build_os=$build_os
 
-# An echo program that does not interpret backslashes.
-echo=$lt_echo
 
-# The archiver.
-AR=$lt_AR
-AR_FLAGS=$lt_AR_FLAGS
 
-# A C compiler.
-LTCC=$lt_LTCC
 
-# LTCC compiler flags.
-LTCFLAGS=$lt_LTCFLAGS
 
-# A language-specific compiler.
-CC=$lt_compiler_GCJ
 
-# Is the compiler the GNU C compiler?
-with_gcc=$GCC_GCJ
 
-# An ERE matcher.
-EGREP=$lt_EGREP
 
-# The linker used to build libraries.
-LD=$lt_LD_GCJ
 
-# Whether we need hard or soft links.
-LN_S=$lt_LN_S
 
-# A BSD-compatible nm program.
-NM=$lt_NM
 
-# A symbol stripping program
-STRIP=$lt_STRIP
 
-# Used to examine libraries when file_magic_cmd begins "file"
-MAGIC_CMD=$MAGIC_CMD
 
-# Used on cygwin: DLL creation program.
-DLLTOOL="$DLLTOOL"
 
-# Used on cygwin: object dumper.
-OBJDUMP="$OBJDUMP"
 
-# Used on cygwin: assembler.
-AS="$AS"
 
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
 
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
 
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl_GCJ
 
-# Object file suffix (normally "o").
-objext="$ac_objext"
 
-# Old archive suffix (normally "a").
-libext="$libext"
 
-# Shared library suffix (normally ".so").
-shrext_cmds='$shrext_cmds'
 
-# Executable file suffix (normally "").
-exeext="$exeext"
 
-# Additional compiler flags for building library objects.
-pic_flag=$lt_lt_prog_compiler_pic_GCJ
-pic_mode=$pic_mode
 
-# What is the maximum length of a command?
-max_cmd_len=$lt_cv_sys_max_cmd_len
 
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ
 
-# Must we lock files when doing compilation?
-need_locks=$lt_need_locks
 
-# Do we need the lib prefix for modules?
-need_lib_prefix=$need_lib_prefix
 
-# Do we need a version for libraries?
-need_version=$need_version
 
-# Whether dlopen is supported.
-dlopen_support=$enable_dlopen
-
-# Whether dlopen of programs is supported.
-dlopen_self=$enable_dlopen_self
-
-# Whether dlopen of statically linked programs is supported.
-dlopen_self_static=$enable_dlopen_self_static
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$lt_lt_prog_compiler_static_GCJ
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_GCJ
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_GCJ
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_whole_archive_flag_spec_GCJ
-
-# Compiler flag to generate thread-safe objects.
-thread_safe_flag_spec=$lt_thread_safe_flag_spec_GCJ
-
-# Library versioning type.
-version_type=$version_type
-
-# Format of library name prefix.
-libname_spec=$lt_libname_spec
-
-# List of archive names.  First name is the real one, the rest are links.
-# The last name is the one that the linker finds with -lNAME.
-library_names_spec=$lt_library_names_spec
-
-# The coded name of the library, if different from the real name.
-soname_spec=$lt_soname_spec
-
-# Commands used to build and install an old-style archive.
-RANLIB=$lt_RANLIB
-old_archive_cmds=$lt_old_archive_cmds_GCJ
-old_postinstall_cmds=$lt_old_postinstall_cmds
-old_postuninstall_cmds=$lt_old_postuninstall_cmds
-
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_GCJ
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_GCJ
-
-# Commands used to build and install a shared archive.
-archive_cmds=$lt_archive_cmds_GCJ
-archive_expsym_cmds=$lt_archive_expsym_cmds_GCJ
-postinstall_cmds=$lt_postinstall_cmds
-postuninstall_cmds=$lt_postuninstall_cmds
-
-# Commands used to build a loadable module (assumed same as above if empty)
-module_cmds=$lt_module_cmds_GCJ
-module_expsym_cmds=$lt_module_expsym_cmds_GCJ
-
-# Commands to strip libraries.
-old_striplib=$lt_old_striplib
-striplib=$lt_striplib
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predep_objects=$lt_predep_objects_GCJ
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdep_objects=$lt_postdep_objects_GCJ
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predeps=$lt_predeps_GCJ
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdeps=$lt_postdeps_GCJ
-
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ
-
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method=$lt_deplibs_check_method
-
-# Command to use when deplibs_check_method == file_magic.
-file_magic_cmd=$lt_file_magic_cmd
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$lt_allow_undefined_flag_GCJ
-
-# Flag that forces no undefined symbols.
-no_undefined_flag=$lt_no_undefined_flag_GCJ
-
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds=$lt_finish_cmds
-
-# Same as above, but a single script fragment to be evaled but not shown.
-finish_eval=$lt_finish_eval
-
-# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
-
-# Transform the output of nm in a proper C declaration
-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-
-# Transform the output of nm in a C name address pair
-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
-
-# This is the shared library runtime path variable.
-runpath_var=$runpath_var
-
-# This is the shared library path variable.
-shlibpath_var=$shlibpath_var
-
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=$hardcode_action_GCJ
-
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=$hardcode_into_libs
-
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_GCJ
-
-# If ld is used when linking, flag to hardcode \$libdir into
-# a binary during linking. This must work even if \$libdir does
-# not exist.
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_GCJ
-
-# Whether we need a single -rpath flag with a separated argument.
-hardcode_libdir_separator=$lt_hardcode_libdir_separator_GCJ
-
-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
-# resulting binary.
-hardcode_direct=$hardcode_direct_GCJ
-
-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-# resulting binary.
-hardcode_minus_L=$hardcode_minus_L_GCJ
-
-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-# the resulting binary.
-hardcode_shlibpath_var=$hardcode_shlibpath_var_GCJ
-
-# Set to yes if building a shared library automatically hardcodes DIR into the library
-# and all subsequent libraries and executables linked against it.
-hardcode_automatic=$hardcode_automatic_GCJ
-
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at relink time.
-variables_saved_for_relink="$variables_saved_for_relink"
-
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$link_all_deplibs_GCJ
-
-# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-
-# Run-time system search path for libraries
-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-
-# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$fix_srcfile_path_GCJ"
-
-# Set to yes if exported symbols are required.
-always_export_symbols=$always_export_symbols_GCJ
-
-# The commands to list exported symbols.
-export_symbols_cmds=$lt_export_symbols_cmds_GCJ
-
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=$lt_extract_expsyms_cmds
-
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$lt_exclude_expsyms_GCJ
-
-# Symbols that must always be exported.
-include_expsyms=$lt_include_expsyms_GCJ
-
-# ### END LIBTOOL TAG CONFIG: $tagname
-
-__EOF__
 
+    { $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
+hardcode_action_CXX=
+if test -n "$hardcode_libdir_flag_spec_CXX" ||
+   test -n "$runpath_var_CXX" ||
+   test "X$hardcode_automatic_CXX" = "Xyes" ; then
 
-else
-  # If there is no Makefile yet, we rely on a make rule to execute
-  # `config.status --recheck' to rerun these tests and create the
-  # libtool script then.
-  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
-  if test -f "$ltmain_in"; then
-    test -f Makefile && make "$ltmain"
+  # We can hardcode non-existent directories.
+  if test "$hardcode_direct_CXX" != no &&
+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
+     # have to relink, otherwise we might link with an installed library
+     # when we should be linking with a yet-to-be-installed one
+     ## test "$_LT_TAGVAR(hardcode_shlibpath_var, CXX)" != no &&
+     test "$hardcode_minus_L_CXX" != no; then
+    # Linking always hardcodes the temporary library directory.
+    hardcode_action_CXX=relink
+  else
+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
+    hardcode_action_CXX=immediate
   fi
+else
+  # We cannot hardcode anything, or else we can only hardcode existing
+  # directories.
+  hardcode_action_CXX=unsupported
 fi
+{ $as_echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5
+$as_echo "$hardcode_action_CXX" >&6; }
 
+if test "$hardcode_action_CXX" = relink ||
+   test "$inherit_rpath_CXX" = yes; then
+  # Fast installation is not supported
+  enable_fast_install=no
+elif test "$shlibpath_overrides_runpath" = yes ||
+     test "$enable_shared" = no; then
+  # Fast installation is not necessary
+  enable_fast_install=needless
+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
-
-CC="$lt_save_CC"
-
-	else
-	  tagname=""
-	fi
-	;;
-
-      RC)
-
-
-# Source file extension for RC test sources.
-ac_ext=rc
-
-# Object file extension for compiled RC test sources.
-objext=o
-objext_RC=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
-
-# Code to be used in simple link tests
-lt_simple_link_test_code="$lt_simple_compile_test_code"
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# If no C compiler flags were specified, use CFLAGS.
-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-
-
-# save warnings/boilerplate of simple test code
-ac_outfile=conftest.$ac_objext
-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_compiler_boilerplate=`cat conftest.err`
-$rm conftest*
-
-ac_outfile=conftest.$ac_objext
-printf "$lt_simple_link_test_code" >conftest.$ac_ext
-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_linker_boilerplate=`cat conftest.err`
-$rm conftest*
-
-
-# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
-CC=${RC-"windres"}
-compiler=$CC
-compiler_RC=$CC
-for cc_temp in $compiler""; do
-  case $cc_temp in
-    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-    \-*) ;;
-    *) break;;
-  esac
-done
-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-
-lt_cv_prog_compiler_c_o_RC=yes
-
-# The else clause should only fire when bootstrapping the
-# libtool distribution, otherwise you forgot to ship ltmain.sh
-# with your package, and you will get complaints that there are
-# no rules to generate ltmain.sh.
-if test -f "$ltmain"; then
-  # See if we are running on zsh, and set the options which allow our commands through
-  # without removal of \ escapes.
-  if test -n "${ZSH_VERSION+set}" ; then
-    setopt NO_GLOB_SUBST
-  fi
-  # Now quote all the things that may contain metacharacters while being
-  # careful not to overquote the AC_SUBSTed values.  We take copies of the
-  # variables and quote the copies for generation of the libtool script.
-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
-    SED SHELL STRIP \
-    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
-    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
-    deplibs_check_method reload_flag reload_cmds need_locks \
-    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
-    lt_cv_sys_global_symbol_to_c_name_address \
-    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
-    old_postinstall_cmds old_postuninstall_cmds \
-    compiler_RC \
-    CC_RC \
-    LD_RC \
-    lt_prog_compiler_wl_RC \
-    lt_prog_compiler_pic_RC \
-    lt_prog_compiler_static_RC \
-    lt_prog_compiler_no_builtin_flag_RC \
-    export_dynamic_flag_spec_RC \
-    thread_safe_flag_spec_RC \
-    whole_archive_flag_spec_RC \
-    enable_shared_with_static_runtimes_RC \
-    old_archive_cmds_RC \
-    old_archive_from_new_cmds_RC \
-    predep_objects_RC \
-    postdep_objects_RC \
-    predeps_RC \
-    postdeps_RC \
-    compiler_lib_search_path_RC \
-    archive_cmds_RC \
-    archive_expsym_cmds_RC \
-    postinstall_cmds_RC \
-    postuninstall_cmds_RC \
-    old_archive_from_expsyms_cmds_RC \
-    allow_undefined_flag_RC \
-    no_undefined_flag_RC \
-    export_symbols_cmds_RC \
-    hardcode_libdir_flag_spec_RC \
-    hardcode_libdir_flag_spec_ld_RC \
-    hardcode_libdir_separator_RC \
-    hardcode_automatic_RC \
-    module_cmds_RC \
-    module_expsym_cmds_RC \
-    lt_cv_prog_compiler_c_o_RC \
-    exclude_expsyms_RC \
-    include_expsyms_RC; do
-
-    case $var in
-    old_archive_cmds_RC | \
-    old_archive_from_new_cmds_RC | \
-    archive_cmds_RC | \
-    archive_expsym_cmds_RC | \
-    module_cmds_RC | \
-    module_expsym_cmds_RC | \
-    old_archive_from_expsyms_cmds_RC | \
-    export_symbols_cmds_RC | \
-    extract_expsyms_cmds | reload_cmds | finish_cmds | \
-    postinstall_cmds | postuninstall_cmds | \
-    old_postinstall_cmds | old_postuninstall_cmds | \
-    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
-      # Double-quote double-evaled strings.
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
-      ;;
-    *)
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
-      ;;
-    esac
-  done
-
-  case $lt_echo in
-  *'\$0 --fallback-echo"')
-    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
-    ;;
-  esac
-
-cfgfile="$ofile"
-
-  cat <<__EOF__ >> "$cfgfile"
-# ### BEGIN LIBTOOL TAG CONFIG: $tagname
-
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
-
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
-
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$archive_cmds_need_lc_RC
-
-# Whether or not to disallow shared libs when runtime libs are static
-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_RC
-
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
-
-# The host system.
-host_alias=$host_alias
-host=$host
-host_os=$host_os
-
-# The build system.
-build_alias=$build_alias
-build=$build
-build_os=$build_os
-
-# An echo program that does not interpret backslashes.
-echo=$lt_echo
-
-# The archiver.
-AR=$lt_AR
-AR_FLAGS=$lt_AR_FLAGS
-
-# A C compiler.
-LTCC=$lt_LTCC
-
-# LTCC compiler flags.
-LTCFLAGS=$lt_LTCFLAGS
-
-# A language-specific compiler.
-CC=$lt_compiler_RC
-
-# Is the compiler the GNU C compiler?
-with_gcc=$GCC_RC
-
-# An ERE matcher.
-EGREP=$lt_EGREP
-
-# The linker used to build libraries.
-LD=$lt_LD_RC
-
-# Whether we need hard or soft links.
-LN_S=$lt_LN_S
-
-# A BSD-compatible nm program.
-NM=$lt_NM
-
-# A symbol stripping program
-STRIP=$lt_STRIP
-
-# Used to examine libraries when file_magic_cmd begins "file"
-MAGIC_CMD=$MAGIC_CMD
-
-# Used on cygwin: DLL creation program.
-DLLTOOL="$DLLTOOL"
-
-# Used on cygwin: object dumper.
-OBJDUMP="$OBJDUMP"
-
-# Used on cygwin: assembler.
-AS="$AS"
-
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
-
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
-
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl_RC
-
-# Object file suffix (normally "o").
-objext="$ac_objext"
-
-# Old archive suffix (normally "a").
-libext="$libext"
-
-# Shared library suffix (normally ".so").
-shrext_cmds='$shrext_cmds'
-
-# Executable file suffix (normally "").
-exeext="$exeext"
-
-# Additional compiler flags for building library objects.
-pic_flag=$lt_lt_prog_compiler_pic_RC
-pic_mode=$pic_mode
-
-# What is the maximum length of a command?
-max_cmd_len=$lt_cv_sys_max_cmd_len
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
-
-# Must we lock files when doing compilation?
-need_locks=$lt_need_locks
-
-# Do we need the lib prefix for modules?
-need_lib_prefix=$need_lib_prefix
-
-# Do we need a version for libraries?
-need_version=$need_version
-
-# Whether dlopen is supported.
-dlopen_support=$enable_dlopen
-
-# Whether dlopen of programs is supported.
-dlopen_self=$enable_dlopen_self
-
-# Whether dlopen of statically linked programs is supported.
-dlopen_self_static=$enable_dlopen_self_static
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$lt_lt_prog_compiler_static_RC
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_RC
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_RC
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_whole_archive_flag_spec_RC
-
-# Compiler flag to generate thread-safe objects.
-thread_safe_flag_spec=$lt_thread_safe_flag_spec_RC
-
-# Library versioning type.
-version_type=$version_type
-
-# Format of library name prefix.
-libname_spec=$lt_libname_spec
-
-# List of archive names.  First name is the real one, the rest are links.
-# The last name is the one that the linker finds with -lNAME.
-library_names_spec=$lt_library_names_spec
-
-# The coded name of the library, if different from the real name.
-soname_spec=$lt_soname_spec
-
-# Commands used to build and install an old-style archive.
-RANLIB=$lt_RANLIB
-old_archive_cmds=$lt_old_archive_cmds_RC
-old_postinstall_cmds=$lt_old_postinstall_cmds
-old_postuninstall_cmds=$lt_old_postuninstall_cmds
-
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_RC
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_RC
-
-# Commands used to build and install a shared archive.
-archive_cmds=$lt_archive_cmds_RC
-archive_expsym_cmds=$lt_archive_expsym_cmds_RC
-postinstall_cmds=$lt_postinstall_cmds
-postuninstall_cmds=$lt_postuninstall_cmds
-
-# Commands used to build a loadable module (assumed same as above if empty)
-module_cmds=$lt_module_cmds_RC
-module_expsym_cmds=$lt_module_expsym_cmds_RC
-
-# Commands to strip libraries.
-old_striplib=$lt_old_striplib
-striplib=$lt_striplib
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predep_objects=$lt_predep_objects_RC
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdep_objects=$lt_postdep_objects_RC
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predeps=$lt_predeps_RC
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdeps=$lt_postdeps_RC
-
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path_RC
-
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method=$lt_deplibs_check_method
-
-# Command to use when deplibs_check_method == file_magic.
-file_magic_cmd=$lt_file_magic_cmd
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$lt_allow_undefined_flag_RC
-
-# Flag that forces no undefined symbols.
-no_undefined_flag=$lt_no_undefined_flag_RC
-
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds=$lt_finish_cmds
-
-# Same as above, but a single script fragment to be evaled but not shown.
-finish_eval=$lt_finish_eval
-
-# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
-
-# Transform the output of nm in a proper C declaration
-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-
-# Transform the output of nm in a C name address pair
-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
-
-# This is the shared library runtime path variable.
-runpath_var=$runpath_var
-
-# This is the shared library path variable.
-shlibpath_var=$shlibpath_var
-
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=$hardcode_action_RC
-
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=$hardcode_into_libs
-
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_RC
-
-# If ld is used when linking, flag to hardcode \$libdir into
-# a binary during linking. This must work even if \$libdir does
-# not exist.
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_RC
-
-# Whether we need a single -rpath flag with a separated argument.
-hardcode_libdir_separator=$lt_hardcode_libdir_separator_RC
-
-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
-# resulting binary.
-hardcode_direct=$hardcode_direct_RC
-
-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-# resulting binary.
-hardcode_minus_L=$hardcode_minus_L_RC
-
-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-# the resulting binary.
-hardcode_shlibpath_var=$hardcode_shlibpath_var_RC
-
-# Set to yes if building a shared library automatically hardcodes DIR into the library
-# and all subsequent libraries and executables linked against it.
-hardcode_automatic=$hardcode_automatic_RC
-
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at relink time.
-variables_saved_for_relink="$variables_saved_for_relink"
-
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$link_all_deplibs_RC
-
-# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-
-# Run-time system search path for libraries
-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-
-# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$fix_srcfile_path_RC"
-
-# Set to yes if exported symbols are required.
-always_export_symbols=$always_export_symbols_RC
-
-# The commands to list exported symbols.
-export_symbols_cmds=$lt_export_symbols_cmds_RC
-
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=$lt_extract_expsyms_cmds
 
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$lt_exclude_expsyms_RC
 
-# Symbols that must always be exported.
-include_expsyms=$lt_include_expsyms_RC
 
-# ### END LIBTOOL TAG CONFIG: $tagname
 
-__EOF__
 
 
-else
-  # If there is no Makefile yet, we rely on a make rule to execute
-  # `config.status --recheck' to rerun these tests and create the
-  # libtool script then.
-  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
-  if test -f "$ltmain_in"; then
-    test -f Makefile && make "$ltmain"
-  fi
-fi
+  fi # test -n "$compiler"
 
+  CC=$lt_save_CC
+  LDCXX=$LD
+  LD=$lt_save_LD
+  GCC=$lt_save_GCC
+  with_gnu_ld=$lt_save_with_gnu_ld
+  lt_cv_path_LDCXX=$lt_cv_path_LD
+  lt_cv_path_LD=$lt_save_path_LD
+  lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
+  lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
+fi # test "$_lt_caught_CXX_error" != yes
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -22672,725 +16338,47 @@ 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
 
-CC="$lt_save_CC"
-
-	;;
-
-      *)
-	{ { echo "$as_me:$LINENO: error: Unsupported tag name: $tagname" >&5
-echo "$as_me: error: Unsupported tag name: $tagname" >&2;}
-   { (exit 1); exit 1; }; }
-	;;
-      esac
-
-      # Append the new tag name to the list of available tags.
-      if test -n "$tagname" ; then
-      available_tags="$available_tags $tagname"
-    fi
-    fi
-  done
-  IFS="$lt_save_ifs"
-
-  # Now substitute the updated list of available tags.
-  if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then
-    mv "${ofile}T" "$ofile"
-    chmod +x "$ofile"
-  else
-    rm -f "${ofile}T"
-    { { echo "$as_me:$LINENO: error: unable to update list of available tagged configurations." >&5
-echo "$as_me: error: unable to update list of available tagged configurations." >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-fi
-
-
-
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-
-# Prevent multiple expansion
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-case "$host_os" in
-  mingw*)
 
-pkg_failed=no
-{ echo "$as_me:$LINENO: checking for GNOME" >&5
-echo $ECHO_N "checking for GNOME... $ECHO_C" >&6; }
-
-if test -n "$PKG_CONFIG"; then
-    if test -n "$GNOME_CFLAGS"; then
-        pkg_cv_GNOME_CFLAGS="$GNOME_CFLAGS"
-    else
-        if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 gtk+-2.0 libgnomeui-2.0 libxml-2.0 libglade-2.0 gmodule-no-export-2.0\"") >&5
-  ($PKG_CONFIG --exists --print-errors "glib-2.0 gtk+-2.0 libgnomeui-2.0 libxml-2.0 libglade-2.0 gmodule-no-export-2.0") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  pkg_cv_GNOME_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 gtk+-2.0 libgnomeui-2.0 libxml-2.0 libglade-2.0 gmodule-no-export-2.0" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
-    fi
-else
-	pkg_failed=untried
-fi
-if test -n "$PKG_CONFIG"; then
-    if test -n "$GNOME_LIBS"; then
-        pkg_cv_GNOME_LIBS="$GNOME_LIBS"
-    else
-        if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 gtk+-2.0 libgnomeui-2.0 libxml-2.0 libglade-2.0 gmodule-no-export-2.0\"") >&5
-  ($PKG_CONFIG --exists --print-errors "glib-2.0 gtk+-2.0 libgnomeui-2.0 libxml-2.0 libglade-2.0 gmodule-no-export-2.0") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  pkg_cv_GNOME_LIBS=`$PKG_CONFIG --libs "glib-2.0 gtk+-2.0 libgnomeui-2.0 libxml-2.0 libglade-2.0 gmodule-no-export-2.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
-	        GNOME_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 gtk+-2.0 libgnomeui-2.0 libxml-2.0 libglade-2.0 gmodule-no-export-2.0"`
-        else
-	        GNOME_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 gtk+-2.0 libgnomeui-2.0 libxml-2.0 libglade-2.0 gmodule-no-export-2.0"`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$GNOME_PKG_ERRORS" >&5
-
-	{ echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-                echo error: some devel libs are missing: check for glib2 gtk2 libgnomeprintui22 libgnomeui libxml2 libglade2 && exit 1
-elif test $pkg_failed = untried; then
-	echo error: some devel libs are missing: check for glib2 gtk2 libgnomeprintui22 libgnomeui libxml2 libglade2 && exit 1
-else
-	GNOME_CFLAGS=$pkg_cv_GNOME_CFLAGS
-	GNOME_LIBS=$pkg_cv_GNOME_LIBS
-        { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-	:
-fi
-    ;;
-  *)
-
-pkg_failed=no
-{ echo "$as_me:$LINENO: checking for GNOME" >&5
-echo $ECHO_N "checking for GNOME... $ECHO_C" >&6; }
-
-if test -n "$PKG_CONFIG"; then
-    if test -n "$GNOME_CFLAGS"; then
-        pkg_cv_GNOME_CFLAGS="$GNOME_CFLAGS"
-    else
-        if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 gtk+-2.0 libgnomeui-2.0 libxml-2.0 libglade-2.0 gmodule-export-2.0\"") >&5
-  ($PKG_CONFIG --exists --print-errors "glib-2.0 gtk+-2.0 libgnomeui-2.0 libxml-2.0 libglade-2.0 gmodule-export-2.0") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  pkg_cv_GNOME_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 gtk+-2.0 libgnomeui-2.0 libxml-2.0 libglade-2.0 gmodule-export-2.0" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
-    fi
-else
-	pkg_failed=untried
-fi
-if test -n "$PKG_CONFIG"; then
-    if test -n "$GNOME_LIBS"; then
-        pkg_cv_GNOME_LIBS="$GNOME_LIBS"
-    else
-        if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 gtk+-2.0 libgnomeui-2.0 libxml-2.0 libglade-2.0 gmodule-export-2.0\"") >&5
-  ($PKG_CONFIG --exists --print-errors "glib-2.0 gtk+-2.0 libgnomeui-2.0 libxml-2.0 libglade-2.0 gmodule-export-2.0") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  pkg_cv_GNOME_LIBS=`$PKG_CONFIG --libs "glib-2.0 gtk+-2.0 libgnomeui-2.0 libxml-2.0 libglade-2.0 gmodule-export-2.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
-	        GNOME_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 gtk+-2.0 libgnomeui-2.0 libxml-2.0 libglade-2.0 gmodule-export-2.0"`
-        else
-	        GNOME_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 gtk+-2.0 libgnomeui-2.0 libxml-2.0 libglade-2.0 gmodule-export-2.0"`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$GNOME_PKG_ERRORS" >&5
-
-	{ echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-                echo error: some devel libs are missing: check for glib2 gtk2 libgnomeprintui22 libgnomeui libxml2 libglade2 && exit 1
-elif test $pkg_failed = untried; then
-	echo error: some devel libs are missing: check for glib2 gtk2 libgnomeprintui22 libgnomeui libxml2 libglade2 && exit 1
-else
-	GNOME_CFLAGS=$pkg_cv_GNOME_CFLAGS
-	GNOME_LIBS=$pkg_cv_GNOME_LIBS
-        { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-	:
-fi
-    ;;
-esac
-
-
-
-ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-if test -z "$CXX"; then
-  if test -n "$CCC"; then
-    CXX=$CCC
-  else
-    if test -n "$ac_tool_prefix"; then
-  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
-  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
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_CXX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CXX"; then
-  ac_cv_prog_CXX="$CXX" # 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_CXX="$ac_tool_prefix$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
 
-fi
-fi
-CXX=$ac_cv_prog_CXX
-if test -n "$CXX"; then
-  { echo "$as_me:$LINENO: result: $CXX" >&5
-echo "${ECHO_T}$CXX" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
 
 
-    test -n "$CXX" && break
-  done
-fi
-if test -z "$CXX"; then
-  ac_ct_CXX=$CXX
-  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_CXX"; then
-  ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # 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_CXX="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
 
-fi
-fi
-ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
-if test -n "$ac_ct_CXX"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
-echo "${ECHO_T}$ac_ct_CXX" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
 
 
-  test -n "$ac_ct_CXX" && break
-done
 
-  if test "x$ac_ct_CXX" = x; then
-    CXX="g++"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
-    CXX=$ac_ct_CXX
-  fi
-fi
 
-  fi
-fi
-# Provide some information about the compiler.
-echo "$as_me:$LINENO: checking for C++ compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
-{ (ac_try="$ac_compiler --version >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compiler --version >&5") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (ac_try="$ac_compiler -v >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compiler -v >&5") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (ac_try="$ac_compiler -V >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compiler -V >&5") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
 
-{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; }
-if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
 
-int
-main ()
-{
-#ifndef __GNUC__
-       choke me
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_compiler_gnu=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_compiler_gnu=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
-
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; }
-GXX=`test $ac_compiler_gnu = yes && echo yes`
-ac_test_CXXFLAGS=${CXXFLAGS+set}
-ac_save_CXXFLAGS=$CXXFLAGS
-{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
-echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; }
-if test "${ac_cv_prog_cxx_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_save_cxx_werror_flag=$ac_cxx_werror_flag
-   ac_cxx_werror_flag=yes
-   ac_cv_prog_cxx_g=no
-   CXXFLAGS="-g"
-   cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_prog_cxx_g=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	CXXFLAGS=""
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cxx_werror_flag=$ac_save_cxx_werror_flag
-	 CXXFLAGS="-g"
-	 cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_prog_cxx_g=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-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_cxx_werror_flag=$ac_save_cxx_werror_flag
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; }
-if test "$ac_test_CXXFLAGS" = set; then
-  CXXFLAGS=$ac_save_CXXFLAGS
-elif test $ac_cv_prog_cxx_g = yes; then
-  if test "$GXX" = yes; then
-    CXXFLAGS="-g -O2"
-  else
-    CXXFLAGS="-g"
-  fi
-else
-  if test "$GXX" = yes; then
-    CXXFLAGS="-O2"
-  else
-    CXXFLAGS=
-  fi
-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="$CXX"  am_compiler_list=
-
-{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
-if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&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_CXX_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-  fi
-  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
-
-    case $depmode in
-    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
-      ;;
-    none) break ;;
-    esac
-    # 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.
-    if depmode=$depmode \
-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} 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 sub/conftest.${OBJEXT-o} 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_CXX_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
 
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_CXX_dependencies_compiler_type=none
-fi
+        ac_config_commands="$ac_config_commands libtool"
 
-fi
-{ echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
-echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; }
-CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
 
- if
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
-  am__fastdepCXX_TRUE=
-  am__fastdepCXX_FALSE='#'
-else
-  am__fastdepCXX_TRUE='#'
-  am__fastdepCXX_FALSE=
-fi
 
 
-ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+# Only expand once:
 
 
 GETTEXT_PACKAGE=xiphos
 
 
-cat >>confdefs.h <<_ACEOF
-#define GETTEXT_PACKAGE "$GETTEXT_PACKAGE"
-_ACEOF
-
-	ALL_LINGUAS=""
-
-
-
 
 for ac_header in locale.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -23406,32 +16394,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
+	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -23445,51 +16434,52 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$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_cxx_preproc_warn_flag in
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
     ( cat <<\_ASBOX
 ## ------------------------------------------------------------------------ ##
 ## Report this to http://sourceforge.net/tracker/?group_id=5528&atid=105528 ##
@@ -23498,21 +16488,24 @@ _ASBOX
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -23520,10 +16513,10 @@ fi
 done
 
     if test $ac_cv_header_locale_h = yes; then
-    { echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5
-echo $ECHO_N "checking for LC_MESSAGES... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5
+$as_echo_n "checking for LC_MESSAGES... " >&6; }
 if test "${am_cv_val_LC_MESSAGES+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -23546,31 +16539,35 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
+	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   am_cv_val_LC_MESSAGES=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	am_cv_val_LC_MESSAGES=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5
-echo "${ECHO_T}$am_cv_val_LC_MESSAGES" >&6; }
+{ $as_echo "$as_me:$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
 
 cat >>confdefs.h <<\_ACEOF
@@ -23579,7 +16576,7 @@ _ACEOF
 
     fi
   fi
-         USE_NLS=yes
+     USE_NLS=yes
 
 
     gt_cv_have_gettext=no
@@ -23589,17 +16586,17 @@ _ACEOF
     INTLLIBS=
 
     if test "${ac_cv_header_libintl_h+set}" = set; then
-  { echo "$as_me:$LINENO: checking for libintl.h" >&5
-echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for libintl.h" >&5
+$as_echo_n "checking for libintl.h... " >&6; }
 if test "${ac_cv_header_libintl_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
-echo "${ECHO_T}$ac_cv_header_libintl_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
+$as_echo "$ac_cv_header_libintl_h" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking libintl.h usability" >&5
-echo $ECHO_N "checking libintl.h usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking libintl.h usability" >&5
+$as_echo_n "checking libintl.h usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -23615,32 +16612,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
+	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking libintl.h presence" >&5
-echo $ECHO_N "checking libintl.h presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking libintl.h presence" >&5
+$as_echo_n "checking libintl.h presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -23654,51 +16652,52 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$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_cxx_preproc_warn_flag in
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: libintl.h: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: libintl.h: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: libintl.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: libintl.h: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: libintl.h:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: libintl.h:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: libintl.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: libintl.h: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: libintl.h:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: libintl.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: libintl.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: libintl.h: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: libintl.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: libintl.h: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: libintl.h:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: libintl.h:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: libintl.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: libintl.h: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: libintl.h:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: libintl.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: libintl.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: libintl.h: in the future, the compiler will take precedence" >&2;}
     ( cat <<\_ASBOX
 ## ------------------------------------------------------------------------ ##
 ## Report this to http://sourceforge.net/tracker/?group_id=5528&atid=105528 ##
@@ -23707,28 +16706,28 @@ _ASBOX
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for libintl.h" >&5
-echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for libintl.h" >&5
+$as_echo_n "checking for libintl.h... " >&6; }
 if test "${ac_cv_header_libintl_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_cv_header_libintl_h=$ac_header_preproc
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
-echo "${ECHO_T}$ac_cv_header_libintl_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
+$as_echo "$ac_cv_header_libintl_h" >&6; }
 
 fi
-if test $ac_cv_header_libintl_h = yes; then
+if test "x$ac_cv_header_libintl_h" = x""yes; then
   gt_cv_func_dgettext_libintl="no"
       libintl_extra_libs=""
 
       #
       # First check in libc
       #
-      { echo "$as_me:$LINENO: checking for ngettext in libc" >&5
-echo $ECHO_N "checking for ngettext in libc... $ECHO_C" >&6; }
+      { $as_echo "$as_me:$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
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -23753,38 +16752,42 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
+	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   gt_cv_func_ngettext_libc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	gt_cv_func_ngettext_libc=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 
 fi
-{ echo "$as_me:$LINENO: result: $gt_cv_func_ngettext_libc" >&5
-echo "${ECHO_T}$gt_cv_func_ngettext_libc" >&6; }
+{ $as_echo "$as_me:$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
-	      { echo "$as_me:$LINENO: checking for dgettext in libc" >&5
-echo $ECHO_N "checking for dgettext in libc... $ECHO_C" >&6; }
+	      { $as_echo "$as_me:$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
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -23809,43 +16812,47 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
+	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   gt_cv_func_dgettext_libc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	gt_cv_func_dgettext_libc=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 
 fi
-{ echo "$as_me:$LINENO: result: $gt_cv_func_dgettext_libc" >&5
-echo "${ECHO_T}$gt_cv_func_dgettext_libc" >&6; }
+{ $as_echo "$as_me:$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
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -23898,35 +16905,42 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
+	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -23941,10 +16955,10 @@ done
 	 || test "$gt_cv_func_ngettext_libc" != "yes" \
          || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
 
-        { echo "$as_me:$LINENO: checking for bindtextdomain in -lintl" >&5
-echo $ECHO_N "checking for bindtextdomain in -lintl... $ECHO_C" >&6; }
+        { $as_echo "$as_me:$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
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lintl  $LIBS"
@@ -23976,37 +16990,41 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
+	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_intl_bindtextdomain=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_intl_bindtextdomain=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&5
-echo "${ECHO_T}$ac_cv_lib_intl_bindtextdomain" >&6; }
-if test $ac_cv_lib_intl_bindtextdomain = yes; then
-  { echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
-echo $ECHO_N "checking for ngettext in -lintl... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$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:$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
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lintl  $LIBS"
@@ -24038,37 +17056,41 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
+	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_intl_ngettext=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_intl_ngettext=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5
-echo "${ECHO_T}$ac_cv_lib_intl_ngettext" >&6; }
-if test $ac_cv_lib_intl_ngettext = yes; then
-  { echo "$as_me:$LINENO: checking for dgettext in -lintl" >&5
-echo $ECHO_N "checking for dgettext in -lintl... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$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:$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
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lintl  $LIBS"
@@ -24100,33 +17122,37 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
+	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_intl_dgettext=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_intl_dgettext=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dgettext" >&5
-echo "${ECHO_T}$ac_cv_lib_intl_dgettext" >&6; }
-if test $ac_cv_lib_intl_dgettext = yes; then
+{ $as_echo "$as_me:$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
 
@@ -24136,14 +17162,14 @@ fi
 
 
 	if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
-	  { echo "$as_me:$LINENO: checking if -liconv is needed to use gettext" >&5
-echo $ECHO_N "checking if -liconv is needed to use gettext... $ECHO_C" >&6; }
-	  { echo "$as_me:$LINENO: result: " >&5
-echo "${ECHO_T}" >&6; }
-  	  { echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
-echo $ECHO_N "checking for ngettext in -lintl... $ECHO_C" >&6; }
+	  { $as_echo "$as_me:$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:$LINENO: result: " >&5
+$as_echo "" >&6; }
+  	  { $as_echo "$as_me:$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
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lintl -liconv $LIBS"
@@ -24175,37 +17201,41 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
+	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_intl_ngettext=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_intl_ngettext=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5
-echo "${ECHO_T}$ac_cv_lib_intl_ngettext" >&6; }
-if test $ac_cv_lib_intl_ngettext = yes; then
-  { echo "$as_me:$LINENO: checking for dcgettext in -lintl" >&5
-echo $ECHO_N "checking for dcgettext in -lintl... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$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:$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
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lintl -liconv $LIBS"
@@ -24237,33 +17267,37 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
+	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_intl_dcgettext=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_intl_dcgettext=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dcgettext" >&5
-echo "${ECHO_T}$ac_cv_lib_intl_dcgettext" >&6; }
-if test $ac_cv_lib_intl_dcgettext = yes; then
+{ $as_echo "$as_me:$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
@@ -24288,11 +17322,11 @@ fi
 
 for ac_func in bind_textdomain_codeset
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -24345,35 +17379,42 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
+	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -24409,10 +17450,10 @@ _ACEOF
 
 	# Extract the first word of "msgfmt", so it can be a program name with args.
 set dummy msgfmt; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_path_MSGFMT+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case "$MSGFMT" in
   /*)
@@ -24436,11 +17477,11 @@ esac
 fi
 MSGFMT="$ac_cv_path_MSGFMT"
 if test "$MSGFMT" != "no"; then
-  { echo "$as_me:$LINENO: result: $MSGFMT" >&5
-echo "${ECHO_T}$MSGFMT" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5
+$as_echo "$MSGFMT" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 	if test "$MSGFMT" != "no"; then
           glib_save_LIBS="$LIBS"
@@ -24448,11 +17489,11 @@ fi
 
 for ac_func in dcgettext
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -24505,43 +17546,50 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
+	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
 done
 
 	  MSGFMT_OPTS=
-	  { echo "$as_me:$LINENO: checking if msgfmt accepts -c" >&5
-echo $ECHO_N "checking if msgfmt accepts -c... $ECHO_C" >&6; }
+	  { $as_echo "$as_me:$LINENO: checking if msgfmt accepts -c" >&5
+$as_echo_n "checking if msgfmt accepts -c... " >&6; }
 	  cat >conftest.foo <<_ACEOF
 
 msgid ""
@@ -24555,25 +17603,25 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 _ACEOF
-if { (echo "$as_me:$LINENO: \$MSGFMT -c -o /dev/null conftest.foo") >&5
+if { ($as_echo "$as_me:$LINENO: \$MSGFMT -c -o /dev/null conftest.foo") >&5
   ($MSGFMT -c -o /dev/null conftest.foo) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  MSGFMT_OPTS=-c; { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-else { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  MSGFMT_OPTS=-c; { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+else { $as_echo "$as_me:$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
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_path_GMSGFMT+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case $GMSGFMT in
   [\\/]* | ?:[\\/]*)
@@ -24588,7 +17636,7 @@ do
   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"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -24601,20 +17649,20 @@ esac
 fi
 GMSGFMT=$ac_cv_path_GMSGFMT
 if test -n "$GMSGFMT"; then
-  { echo "$as_me:$LINENO: result: $GMSGFMT" >&5
-echo "${ECHO_T}$GMSGFMT" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $GMSGFMT" >&5
+$as_echo "$GMSGFMT" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$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
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_path_XGETTEXT+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case "$XGETTEXT" in
   /*)
@@ -24638,11 +17686,11 @@ esac
 fi
 XGETTEXT="$ac_cv_path_XGETTEXT"
 if test "$XGETTEXT" != ":"; then
-  { echo "$as_me:$LINENO: result: $XGETTEXT" >&5
-echo "${ECHO_T}$XGETTEXT" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5
+$as_echo "$XGETTEXT" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 	  cat >conftest.$ac_ext <<_ACEOF
@@ -24667,30 +17715,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
+	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   CATOBJEXT=.gmo
              DATADIRNAME=share
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	case $host in
 	    *-*-solaris*)
-	    	                	    	                { echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
-echo $ECHO_N "checking for bind_textdomain_codeset... $ECHO_C" >&6; }
+	    	                	    	                { $as_echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
+$as_echo_n "checking for bind_textdomain_codeset... " >&6; }
 if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -24743,32 +17794,36 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
+	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_func_bind_textdomain_codeset=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_func_bind_textdomain_codeset=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
-echo "${ECHO_T}$ac_cv_func_bind_textdomain_codeset" >&6; }
-if test $ac_cv_func_bind_textdomain_codeset = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
+$as_echo "$ac_cv_func_bind_textdomain_codeset" >&6; }
+if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then
   CATOBJEXT=.gmo
                DATADIRNAME=share
 else
@@ -24784,6 +17839,7 @@ fi
 	    esac
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
           LIBS="$glib_save_LIBS"
@@ -24809,8 +17865,8 @@ _ACEOF
                   if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
         : ;
       else
-        { echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5
-echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6; }
+        { $as_echo "$as_me:$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
@@ -24842,8 +17898,8 @@ echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6; }
      if test "x$ALL_LINGUAS" = "x"; then
        LINGUAS=
      else
-       { echo "$as_me:$LINENO: checking for catalogs to be installed" >&5
-echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6; }
+       { $as_echo "$as_me:$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
@@ -24867,8 +17923,8 @@ echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6; }
          fi
        done
        LINGUAS=$NEW_LINGUAS
-       { echo "$as_me:$LINENO: result: $LINGUAS" >&5
-echo "${ECHO_T}$LINGUAS" >&6; }
+       { $as_echo "$as_me:$LINENO: result: $LINGUAS" >&5
+$as_echo "$LINGUAS" >&6; }
      fi
 
           if test -n "$LINGUAS"; then
@@ -24900,345 +17956,346 @@ echo "${ECHO_T}$LINGUAS" >&6; }
 	< $srcdir/po/POTFILES.in > po/POTFILES
 
 
-GTKHTML_LIBS=""
-GTKHTML_CFLAGS=""
+cat >>confdefs.h <<\_ACEOF
+#define GETTEXT_PACKAGE PACKAGE_TARNAME
+_ACEOF
 
 
-pkg_failed=no
-{ echo "$as_me:$LINENO: checking for GTKHTML" >&5
-echo $ECHO_N "checking for GTKHTML... $ECHO_C" >&6; }
 
-if test -n "$PKG_CONFIG"; then
-    if test -n "$GTKHTML_CFLAGS"; then
-        pkg_cv_GTKHTML_CFLAGS="$GTKHTML_CFLAGS"
-    else
-        if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.14 >= 3.23\"") >&5
-  ($PKG_CONFIG --exists --print-errors "libgtkhtml-3.14 >= 3.23") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  pkg_cv_GTKHTML_CFLAGS=`$PKG_CONFIG --cflags "libgtkhtml-3.14 >= 3.23" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
-    fi
+
+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:$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
-	pkg_failed=untried
+  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:$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
-    if test -n "$GTKHTML_LIBS"; then
-        pkg_cv_GTKHTML_LIBS="$GTKHTML_LIBS"
-    else
-        if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.14 >= 3.23\"") >&5
-  ($PKG_CONFIG --exists --print-errors "libgtkhtml-3.14 >= 3.23") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  pkg_cv_GTKHTML_LIBS=`$PKG_CONFIG --libs "libgtkhtml-3.14 >= 3.23" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
-    fi
+  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
 else
-	pkg_failed=untried
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 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
-	        GTKHTML_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libgtkhtml-3.14 >= 3.23"`
-        else
-	        GTKHTML_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgtkhtml-3.14 >= 3.23"`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$GTKHTML_PKG_ERRORS" >&5
+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:$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:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
 
-	{ echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-                have_gtkhtml=no
-elif test $pkg_failed = untried; then
-	have_gtkhtml=no
+  ;;
+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:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
+$as_echo "$ac_pt_PKG_CONFIG" >&6; }
 else
-	GTKHTML_CFLAGS=$pkg_cv_GTKHTML_CFLAGS
-	GTKHTML_LIBS=$pkg_cv_GTKHTML_LIBS
-        { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-	have_gtkhtml=yes
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
-if test "x$have_gtkhtml" = xyes; then
-
-pkg_failed=no
-{ echo "$as_me:$LINENO: checking for EDITOR" >&5
-echo $ECHO_N "checking for EDITOR... $ECHO_C" >&6; }
 
-if test -n "$PKG_CONFIG"; then
-    if test -n "$EDITOR_CFLAGS"; then
-        pkg_cv_EDITOR_CFLAGS="$EDITOR_CFLAGS"
-    else
-        if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtkhtml-editor\"") >&5
-  ($PKG_CONFIG --exists --print-errors "gtkhtml-editor") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  pkg_cv_EDITOR_CFLAGS=`$PKG_CONFIG --cflags "gtkhtml-editor" 2>/dev/null`
+  if test "x$ac_pt_PKG_CONFIG" = x; then
+    PKG_CONFIG=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:$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_failed=yes
+  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
 fi
-    fi
-else
-	pkg_failed=untried
+
 fi
 if test -n "$PKG_CONFIG"; then
-    if test -n "$EDITOR_LIBS"; then
-        pkg_cv_EDITOR_LIBS="$EDITOR_LIBS"
-    else
-        if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtkhtml-editor\"") >&5
-  ($PKG_CONFIG --exists --print-errors "gtkhtml-editor") 2>&5
+	_pkg_min_version=0.9.0
+	{ $as_echo "$as_me:$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:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+	else
+		{ $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+		PKG_CONFIG=""
+	fi
+
+fi
+
+gdu_cv_version_required=0.3.2
+
+if test -n "$PKG_CONFIG" && \
+    { ($as_echo "$as_me:$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=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  pkg_cv_EDITOR_LIBS=`$PKG_CONFIG --libs "gtkhtml-editor" 2>/dev/null`
+  gdu_cv_have_gdu=yes
 else
-  pkg_failed=yes
+  gdu_cv_have_gdu=no
 fi
-    fi
+
+if test "$gdu_cv_have_gdu" = "yes"; then
+	:
 else
-	pkg_failed=untried
+	{ { $as_echo "$as_me:$LINENO: error: gnome-doc-utils >= $gdu_cv_version_required not found" >&5
+$as_echo "$as_me: error: gnome-doc-utils >= $gdu_cv_version_required not found" >&2;}
+   { (exit 1); exit 1; }; }
 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
-	        EDITOR_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtkhtml-editor"`
-        else
-	        EDITOR_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtkhtml-editor"`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$EDITOR_PKG_ERRORS" >&5
-
-	{ echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-                echo error: no gtkhtml-editor && exit 1
-elif test $pkg_failed = untried; then
-	echo error: no gtkhtml-editor && exit 1
+# Check whether --with-help-dir was given.
+if test "${with_help_dir+set}" = set; then
+  withval=$with_help_dir;
 else
-	EDITOR_CFLAGS=$pkg_cv_EDITOR_CFLAGS
-	EDITOR_LIBS=$pkg_cv_EDITOR_LIBS
-        { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-	:
+  with_help_dir='${datadir}/gnome/help'
 fi
 
-cat >>confdefs.h <<\_ACEOF
-#define USE_GTKHTML3_14_23 1
-_ACEOF
-
-
-cat >>confdefs.h <<\_ACEOF
-#define USE_GTKHTML3_14 1
-_ACEOF
+HELP_DIR="$with_help_dir"
 
-		GTKHTML_DATA_DIR="`$PKG_CONFIG --variable=gtkhtml_datadir libgtkhtml-3.14`"
-		GTKHTML_API_VERSION=`$PKG_CONFIG --variable gtkhtml_apiversion libgtkhtml-3.14`
 
 
-	CFLAGS="$CFLAGS $EDITOR_CFLAGS"
-	CXXFLAGS="$CXXFLAGS $EDITOR_CFLAGS"
-	LIBS="$LIBS $EDITOR_LIBS"
-	 if false; then
-  USE_GTKHTML_BONOBO_EDITOR_TRUE=
-  USE_GTKHTML_BONOBO_EDITOR_FALSE='#'
+# Check whether --with-omf-dir was given.
+if test "${with_omf_dir+set}" = set; then
+  withval=$with_omf_dir;
 else
-  USE_GTKHTML_BONOBO_EDITOR_TRUE='#'
-  USE_GTKHTML_BONOBO_EDITOR_FALSE=
+  with_omf_dir='${datadir}/omf'
 fi
 
-else
+OMF_DIR="$with_omf_dir"
 
-pkg_failed=no
-{ echo "$as_me:$LINENO: checking for GTKHTML" >&5
-echo $ECHO_N "checking for GTKHTML... $ECHO_C" >&6; }
 
-if test -n "$PKG_CONFIG"; then
-    if test -n "$GTKHTML_CFLAGS"; then
-        pkg_cv_GTKHTML_CFLAGS="$GTKHTML_CFLAGS"
-    else
-        if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.14\"") >&5
-  ($PKG_CONFIG --exists --print-errors "libgtkhtml-3.14") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  pkg_cv_GTKHTML_CFLAGS=`$PKG_CONFIG --cflags "libgtkhtml-3.14" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
-    fi
-else
-	pkg_failed=untried
-fi
-if test -n "$PKG_CONFIG"; then
-    if test -n "$GTKHTML_LIBS"; then
-        pkg_cv_GTKHTML_LIBS="$GTKHTML_LIBS"
-    else
-        if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.14\"") >&5
-  ($PKG_CONFIG --exists --print-errors "libgtkhtml-3.14") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  pkg_cv_GTKHTML_LIBS=`$PKG_CONFIG --libs "libgtkhtml-3.14" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
-    fi
+
+# Check whether --with-help-formats was given.
+if test "${with_help_formats+set}" = set; then
+  withval=$with_help_formats;
 else
-	pkg_failed=untried
+  with_help_formats=''
 fi
 
+DOC_USER_FORMATS="$with_help_formats"
 
 
-if test $pkg_failed = yes; then
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
+# Check whether --enable-scrollkeeper was given.
+if test "${enable_scrollkeeper+set}" = set; then
+  enableval=$enable_scrollkeeper;
 else
-        _pkg_short_errors_supported=no
+  enable_scrollkeeper=yes
 fi
-        if test $_pkg_short_errors_supported = yes; then
-	        GTKHTML_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libgtkhtml-3.14"`
-        else
-	        GTKHTML_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgtkhtml-3.14"`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$GTKHTML_PKG_ERRORS" >&5
 
-	{ echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-                have_gtkhtml=no
-elif test $pkg_failed = untried; then
-	have_gtkhtml=no
+ if test "$gdu_cv_have_gdu" = "yes" -a "$enable_scrollkeeper" = "yes"; then
+  ENABLE_SK_TRUE=
+  ENABLE_SK_FALSE='#'
 else
-	GTKHTML_CFLAGS=$pkg_cv_GTKHTML_CFLAGS
-	GTKHTML_LIBS=$pkg_cv_GTKHTML_LIBS
-        { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-	have_gtkhtml=yes
+  ENABLE_SK_TRUE='#'
+  ENABLE_SK_FALSE=
 fi
 
-cat >>confdefs.h <<\_ACEOF
-#define USE_GTKHTML3_14 1
-_ACEOF
 
-		GTKHTML_DATA_DIR="`$PKG_CONFIG --variable=gtkhtml_datadir libgtkhtml-3.14`"
-		GTKHTML_API_VERSION=`$PKG_CONFIG --variable gtkhtml_apiversion libgtkhtml-3.14`
-	 if true; then
-  USE_GTKHTML_BONOBO_EDITOR_TRUE=
-  USE_GTKHTML_BONOBO_EDITOR_FALSE='#'
+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
-  USE_GTKHTML_BONOBO_EDITOR_TRUE='#'
-  USE_GTKHTML_BONOBO_EDITOR_FALSE=
+  HAVE_GNOME_DOC_UTILS_TRUE='#'
+  HAVE_GNOME_DOC_UTILS_FALSE=
 fi
 
-fi
 
-cat >>confdefs.h <<_ACEOF
-#define GTKHTML_DATA_DIR "${GTKHTML_DATA_DIR}"
-_ACEOF
 
 
-cat >>confdefs.h <<_ACEOF
-#define GTKHTML_API_VERSION "$GTKHTML_API_VERSION"
-_ACEOF
+DIRS="backend gecko editor main gnome2"
 
+xiphos_exec=xiphos
 
 
 
 
-# Check whether --enable-autoclear was given.
-if test "${enable_autoclear+set}" = set; then
-  enableval=$enable_autoclear; autoclear=$enableval
+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:$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
-  autoclear=no
-fi
-
-if test "x$autoclear" = xyes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define USE_PREVIEWER_AUTOCLEAR 1
-_ACEOF
+  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:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
 
+  ;;
+esac
 fi
-
-
-# Check whether --enable-treeview_path was given.
-if test "${enable_treeview_path+set}" = set; then
-  enableval=$enable_treeview_path; treeview_path=$enableval
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
 else
-  treeview_path=no
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
-if test "x$treeview_path" = xyes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define USE_TREEVIEW_PATH 1
-_ACEOF
 
 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:$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:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
 
-# Check whether --enable-gtkhtml was given.
-if test "${enable_gtkhtml+set}" = set; then
-  enableval=$enable_gtkhtml; gtkhtml=$enableval
+  ;;
+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:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
+$as_echo "$ac_pt_PKG_CONFIG" >&6; }
 else
-  gtkhtml=no
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
-if test "x$gtkhtml" = xyes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define GTKHTML 1
-_ACEOF
-
+  if test "x$ac_pt_PKG_CONFIG" = x; then
+    PKG_CONFIG=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:$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
 
-# Check whether --enable-cygwin was given.
-if test "${enable_cygwin+set}" = set; then
-  enableval=$enable_cygwin; cygwin=$enableval
-else
-  cygwin=no
 fi
+if test -n "$PKG_CONFIG"; then
+	_pkg_min_version=0.9.0
+	{ $as_echo "$as_me:$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:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+	else
+		{ $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+		PKG_CONFIG=""
+	fi
 
-if test "x$cygwin" = xno; then
+fi
 
-  if test "x$gtkhtml" = xno; then
+if test "x$with_gecko" != "xno"; then
 
 
 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
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_AWK+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$AWK"; then
   ac_cv_prog_AWK="$AWK" # Let the user override the test.
@@ -25251,7 +18308,7 @@ do
   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"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -25262,11 +18319,11 @@ fi
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  { echo "$as_me:$LINENO: result: $AWK" >&5
-echo "${ECHO_T}$AWK" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $AWK" >&5
+$as_echo "$AWK" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -25278,8 +18335,8 @@ done
 # Check which gecko to use
 # ************************
 
-{ echo "$as_me:$LINENO: checking which gecko to use" >&5
-echo $ECHO_N "checking which gecko to use... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking which gecko to use" >&5
+$as_echo_n "checking which gecko to use... " >&6; }
 
 
 # Check whether --with-gecko was given.
@@ -25305,6 +18362,9 @@ if test -z "$gecko_cv_gecko"; then
 		if $PKG_CONFIG --exists $lizard-xpcom; then
 			gecko_cv_gecko=$lizard
 			break;
+		elif $PKG_CONFIG --exists $lizard; then
+			gecko_cv_gecko=$lizard
+			break;
 		elif $PKG_CONFIG --exists $lizard-unstable; then
 			gecko_cv_gecko=$lizard
 			break;
@@ -25312,25 +18372,25 @@ if test -z "$gecko_cv_gecko"; then
 	done
 fi
 
-{ echo "$as_me:$LINENO: result: $gecko_cv_gecko" >&5
-echo "${ECHO_T}$gecko_cv_gecko" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $gecko_cv_gecko" >&5
+$as_echo "$gecko_cv_gecko" >&6; }
 
 if test "x$gecko_cv_gecko" = "x"; then
-	{ { echo "$as_me:$LINENO: error: No gecko found; you may need to adjust PKG_CONFIG_PATH or install a mozilla/firefox/xulrunner -devel package" >&5
-echo "$as_me: error: No gecko found; you may need to adjust PKG_CONFIG_PATH or install a mozilla/firefox/xulrunner -devel package" >&2;}
+	{ { $as_echo "$as_me:$LINENO: error: No gecko found; you may need to adjust PKG_CONFIG_PATH or install a mozilla/firefox/xulrunner -devel package" >&5
+$as_echo "$as_me: error: No gecko found; you may need to adjust PKG_CONFIG_PATH or install a mozilla/firefox/xulrunner -devel package" >&2;}
    { (exit 1); exit 1; }; }
 	gecko_cv_have_gecko=no
 elif ! ( echo "$_geckos" | egrep "(^| )$gecko_cv_gecko(\$| )" > /dev/null); then
-	{ { echo "$as_me:$LINENO: error: Unknown gecko \"$gecko_cv_gecko\" specified" >&5
-echo "$as_me: error: Unknown gecko \"$gecko_cv_gecko\" specified" >&2;}
+	{ { $as_echo "$as_me:$LINENO: error: Unknown gecko \"$gecko_cv_gecko\" specified" >&5
+$as_echo "$as_me: error: Unknown gecko \"$gecko_cv_gecko\" specified" >&2;}
    { (exit 1); exit 1; }; }
 else
 
 	gecko_cv_have_gecko=yes
 fi
 
-{ echo "$as_me:$LINENO: checking manual gecko home set" >&5
-echo $ECHO_N "checking manual gecko home set... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking manual gecko home set" >&5
+$as_echo_n "checking manual gecko home set... " >&6; }
 
 
 # Check whether --with-gecko-home was given.
@@ -25341,6 +18401,9 @@ fi
 
 gecko_cv_gecko_home=$with_gecko_home
 
+{ $as_echo "$as_me:$LINENO: result: $with_gecko_home" >&5
+$as_echo "$with_gecko_home" >&6; }
+
 # ****************
 # Define variables
 # ****************
@@ -25413,10 +18476,10 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 _SAVE_CXXFLAGS=$CXXFLAGS
 CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS -fshort-wchar"
 
-{ echo "$as_me:$LINENO: checking for compiler -fshort-wchar option" >&5
-echo $ECHO_N "checking for compiler -fshort-wchar option... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for compiler -fshort-wchar option" >&5
+$as_echo_n "checking for compiler -fshort-wchar option... " >&6; }
 if test "${gecko_cv_have_usable_wchar_option+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then
   gecko_cv_have_usable_wchar_option="maybe (cross-compiling)"
@@ -25438,44 +18501,47 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   gecko_cv_have_usable_wchar_option="yes"
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $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
 
 ( exit $ac_status )
 gecko_cv_have_usable_wchar_option="no"
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 
 fi
-{ echo "$as_me:$LINENO: result: $gecko_cv_have_usable_wchar_option" >&5
-echo "${ECHO_T}$gecko_cv_have_usable_wchar_option" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $gecko_cv_have_usable_wchar_option" >&5
+$as_echo "$gecko_cv_have_usable_wchar_option" >&6; }
 
 CXXFLAGS="$_SAVE_CXXFLAGS"
 
-ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+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 "$gecko_cv_have_usable_wchar_option" = "yes"; then
@@ -25491,8 +18557,8 @@ fi # if gecko_cv_have_gecko
 
 if test "$gecko_cv_have_gecko" = "yes"; then
 
-{ echo "$as_me:$LINENO: checking whether to enable C++ RTTI" >&5
-echo $ECHO_N "checking whether to enable C++ RTTI... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether to enable C++ RTTI" >&5
+$as_echo_n "checking whether to enable C++ RTTI... " >&6; }
 # Check whether --enable-cpp-rtti was given.
 if test "${enable_cpp_rtti+set}" = set; then
   enableval=$enable_cpp_rtti;
@@ -25500,8 +18566,8 @@ else
   enable_cpp_rtti=no
 fi
 
-{ echo "$as_me:$LINENO: result: $enable_cpp_rtti" >&5
-echo "${ECHO_T}$enable_cpp_rtti" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $enable_cpp_rtti" >&5
+$as_echo "$enable_cpp_rtti" >&6; }
 
 if test "$enable_cpp_rtti" = "no"; then
 	_GECKO_EXTRA_CXXFLAGS="-fno-rtti $_GECKO_EXTRA_CXXFLAGS"
@@ -25526,8 +18592,8 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 _SAVE_CPPFLAGS="$CPPFLAGS"
 CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS $_GECKO_CFLAGS"
 
-{ echo "$as_me:$LINENO: checking whether we have a gtk 2 gecko build" >&5
-echo $ECHO_N "checking whether we have a gtk 2 gecko build... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether we have a gtk 2 gecko build" >&5
+$as_echo_n "checking whether we have a gtk 2 gecko build... " >&6; }
 if test "$cross_compiling" = yes; then
   result=maybe
 else
@@ -25555,40 +18621,43 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   result=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $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
 
 ( exit $ac_status )
-{ { echo "$as_me:$LINENO: error: This program needs a gtk 2 gecko build" >&5
-echo "$as_me: error: This program needs a gtk 2 gecko build" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: This program needs a gtk 2 gecko build" >&5
+$as_echo "$as_me: error: This program needs a gtk 2 gecko build" >&2;}
    { (exit 1); exit 1; }; }
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 
-{ echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $result" >&5
+$as_echo "$result" >&6; }
 
-{ echo "$as_me:$LINENO: checking whether we have a gecko debug build" >&5
-echo $ECHO_N "checking whether we have a gecko debug build... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether we have a gecko debug build" >&5
+$as_echo_n "checking whether we have a gecko debug build... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -25607,31 +18676,32 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   gecko_cv_have_debug=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	gecko_cv_have_debug=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $gecko_cv_have_debug" >&5
-echo "${ECHO_T}$gecko_cv_have_debug" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $gecko_cv_have_debug" >&5
+$as_echo "$gecko_cv_have_debug" >&6; }
 
-{ echo "$as_me:$LINENO: checking whether we have a xpcom glue" >&5
-echo $ECHO_N "checking whether we have a xpcom glue... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether we have a xpcom glue" >&5
+$as_echo_n "checking whether we have a xpcom glue... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -25650,36 +18720,37 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   gecko_cv_have_xpcom_glue=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	gecko_cv_have_xpcom_glue=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $gecko_cv_have_xpcom_glue" >&5
-echo "${ECHO_T}$gecko_cv_have_xpcom_glue" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $gecko_cv_have_xpcom_glue" >&5
+$as_echo "$gecko_cv_have_xpcom_glue" >&6; }
 
 CPPFLAGS="$_SAVE_CPPFLAGS"
 
-ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+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 "$gecko_cv_have_debug" = "yes"; then
@@ -25719,10 +18790,10 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 _SAVE_CPPFLAGS="$CPPFLAGS"
 CPPFLAGS="$CPPFLAGS $_GECKO_CFLAGS"
 
-{ echo "$as_me:$LINENO: checking for gecko version" >&5
-echo $ECHO_N "checking for gecko version... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for gecko version" >&5
+$as_echo_n "checking for gecko version... " >&6; }
 if test "${gecko_cv_gecko_version+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then
   gecko_cv_gecko_version="1.7"
@@ -25778,56 +18849,61 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   gecko_cv_gecko_version="$(cat conftest.data)"
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $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
 
 ( exit $ac_status )
-{ { echo "$as_me:$LINENO: error: could not determine gecko version
+{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: could not determine gecko version
 See \`config.log' for more details." >&5
-echo "$as_me: error: could not determine gecko version
+$as_echo "$as_me: error: could not determine gecko version
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+   { (exit 1); exit 1; }; }; }
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 
 
 fi
-{ echo "$as_me:$LINENO: result: $gecko_cv_gecko_version" >&5
-echo "${ECHO_T}$gecko_cv_gecko_version" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $gecko_cv_gecko_version" >&5
+$as_echo "$gecko_cv_gecko_version" >&6; }
 
 CPPFLAGS="$_SAVE_CPPFLAGS"
 
-ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+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
 
 
 gecko_cv_gecko_version_int="$(echo "$gecko_cv_gecko_version" | $AWK -F . '{print $1 * 1000000 + $2 * 1000 + $3}')"
 
 if test "$gecko_cv_gecko_version_int" -lt "1007000" -o "$gecko_cv_gecko_version_int" -gt "1009000"; then
-	{ { echo "$as_me:$LINENO: error: Gecko version $gecko_cv_gecko_version is not supported!" >&5
-echo "$as_me: error: Gecko version $gecko_cv_gecko_version is not supported!" >&2;}
+	{ { $as_echo "$as_me:$LINENO: error: Gecko version $gecko_cv_gecko_version is not supported!" >&5
+$as_echo "$as_me: error: Gecko version $gecko_cv_gecko_version is not supported!" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -25864,6 +18940,29 @@ _ACEOF
 	gecko_cv_have_gecko_1_9=yes
 fi
 
+if test "${gecko_cv_gecko}" = "libxul-embedding" -o "${gecko_cv_gecko}" = "libxul"; then
+	if test -n "$PKG_CONFIG" && \
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\${gecko_cv_gecko} >= 1.9.1\"") >&5
+  ($PKG_CONFIG --exists --print-errors "${gecko_cv_gecko} >= 1.9.1") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  gecko_cv_have_gecko_1_9_1=yes gecko_cv_gecko_version="1.9.1" gecko_cv_gecko_version_int=1009001
+else
+  gecko_cv_have_gecko_1_9_1=no
+fi
+else
+	gecko_cv_have_gecko_1_9_1=no
+fi
+
+if test "$gecko_cv_have_gecko_1_9_1" = "yes"; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_GECKO_1_9_1 1
+_ACEOF
+
+fi
+
 fi # if gecko_cv_have_gecko
 
 GECKO_VERSION=$gecko_cv_gecko_version
@@ -25893,69 +18992,48 @@ GECKO_GLUE_LIBS="$gecko_cv_glue_libs"
 
 
 
+cat >>confdefs.h <<\_ACEOF
+#define USE_GTKMOZEMBED 1
+_ACEOF
 
-
-
-
-
-
-
-
-	case "$GECKO" in
-	 libxul*) gecko_min_version=1.8 ;;
-	 xulrunner) gecko_min_version=1.8 ;;
-	 *firefox) gecko_min_version=1.5 ;;
-	 *) { { echo "$as_me:$LINENO: error: $gecko_cv_gecko is not supported" >&5
-echo "$as_me: error: $gecko_cv_gecko is not supported" >&2;}
-   { (exit 1); exit 1; }; }
-	esac
-
-	if test "$GECKO" = "firefox"; then
-	  gecko_cv_gecko=firefox-xpcom
-	elif test "$GECKO" = "xulrunner"; then
-	  gecko_cv_gecko=xulrunner-xpcom
-	fi
-
+	    case $GECKO in
+  xulrunner)
 
 pkg_failed=no
-{ echo "$as_me:$LINENO: checking for GECKO_COMPONENT" >&5
-echo $ECHO_N "checking for GECKO_COMPONENT... $ECHO_C" >&6; }
-
-if test -n "$PKG_CONFIG"; then
-    if test -n "$GECKO_COMPONENT_CFLAGS"; then
-        pkg_cv_GECKO_COMPONENT_CFLAGS="$GECKO_COMPONENT_CFLAGS"
-    else
-        if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\${gecko_cv_gecko} >= \$gecko_min_version \$gecko_cv_extra_pkg_dependencies\"") >&5
-  ($PKG_CONFIG --exists --print-errors "${gecko_cv_gecko} >= $gecko_min_version $gecko_cv_extra_pkg_dependencies") 2>&5
+{ $as_echo "$as_me:$LINENO: checking for GECKO_COMPONENT" >&5
+$as_echo_n "checking for GECKO_COMPONENT... " >&6; }
+
+if test -n "$GECKO_COMPONENT_CFLAGS"; then
+    pkg_cv_GECKO_COMPONENT_CFLAGS="$GECKO_COMPONENT_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\${gecko_cv_gecko}-xpcom >= 1.8 \$gecko_cv_extra_pkg_dependencies\"") >&5
+  ($PKG_CONFIG --exists --print-errors "${gecko_cv_gecko}-xpcom >= 1.8 $gecko_cv_extra_pkg_dependencies") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  pkg_cv_GECKO_COMPONENT_CFLAGS=`$PKG_CONFIG --cflags "${gecko_cv_gecko} >= $gecko_min_version $gecko_cv_extra_pkg_dependencies" 2>/dev/null`
+  pkg_cv_GECKO_COMPONENT_CFLAGS=`$PKG_CONFIG --cflags "${gecko_cv_gecko}-xpcom >= 1.8 $gecko_cv_extra_pkg_dependencies" 2>/dev/null`
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
+ else
+    pkg_failed=untried
 fi
-if test -n "$PKG_CONFIG"; then
-    if test -n "$GECKO_COMPONENT_LIBS"; then
-        pkg_cv_GECKO_COMPONENT_LIBS="$GECKO_COMPONENT_LIBS"
-    else
-        if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\${gecko_cv_gecko} >= \$gecko_min_version \$gecko_cv_extra_pkg_dependencies\"") >&5
-  ($PKG_CONFIG --exists --print-errors "${gecko_cv_gecko} >= $gecko_min_version $gecko_cv_extra_pkg_dependencies") 2>&5
+if test -n "$GECKO_COMPONENT_LIBS"; then
+    pkg_cv_GECKO_COMPONENT_LIBS="$GECKO_COMPONENT_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\${gecko_cv_gecko}-xpcom >= 1.8 \$gecko_cv_extra_pkg_dependencies\"") >&5
+  ($PKG_CONFIG --exists --print-errors "${gecko_cv_gecko}-xpcom >= 1.8 $gecko_cv_extra_pkg_dependencies") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  pkg_cv_GECKO_COMPONENT_LIBS=`$PKG_CONFIG --libs "${gecko_cv_gecko} >= $gecko_min_version $gecko_cv_extra_pkg_dependencies" 2>/dev/null`
+  pkg_cv_GECKO_COMPONENT_LIBS=`$PKG_CONFIG --libs "${gecko_cv_gecko}-xpcom >= 1.8 $gecko_cv_extra_pkg_dependencies" 2>/dev/null`
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
+ else
+    pkg_failed=untried
 fi
 
 
@@ -25968,14 +19046,14 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        GECKO_COMPONENT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "${gecko_cv_gecko} >= $gecko_min_version $gecko_cv_extra_pkg_dependencies"`
+	        GECKO_COMPONENT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "${gecko_cv_gecko}-xpcom >= 1.8 $gecko_cv_extra_pkg_dependencies" 2>&1`
         else
-	        GECKO_COMPONENT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "${gecko_cv_gecko} >= $gecko_min_version $gecko_cv_extra_pkg_dependencies"`
+	        GECKO_COMPONENT_PKG_ERRORS=`$PKG_CONFIG --print-errors "${gecko_cv_gecko}-xpcom >= 1.8 $gecko_cv_extra_pkg_dependencies" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$GECKO_COMPONENT_PKG_ERRORS" >&5
 
-	{ { echo "$as_me:$LINENO: error: Package requirements (${gecko_cv_gecko} >= $gecko_min_version $gecko_cv_extra_pkg_dependencies) were not met:
+	{ { $as_echo "$as_me:$LINENO: error: Package requirements (${gecko_cv_gecko}-xpcom >= 1.8 $gecko_cv_extra_pkg_dependencies) were not met:
 
 $GECKO_COMPONENT_PKG_ERRORS
 
@@ -25986,7 +19064,7 @@ Alternatively, you may set the environment variables GECKO_COMPONENT_CFLAGS
 and GECKO_COMPONENT_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 " >&5
-echo "$as_me: error: Package requirements (${gecko_cv_gecko} >= $gecko_min_version $gecko_cv_extra_pkg_dependencies) were not met:
+$as_echo "$as_me: error: Package requirements (${gecko_cv_gecko}-xpcom >= 1.8 $gecko_cv_extra_pkg_dependencies) were not met:
 
 $GECKO_COMPONENT_PKG_ERRORS
 
@@ -25999,7 +19077,9 @@ See the pkg-config man page for more details.
 " >&2;}
    { (exit 1); exit 1; }; }
 elif test $pkg_failed = untried; then
-	{ { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
+	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: 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.
 
@@ -26007,9 +19087,9 @@ Alternatively, you may set the environment variables GECKO_COMPONENT_CFLAGS
 and GECKO_COMPONENT_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
 See \`config.log' for more details." >&5
-echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
+$as_echo "$as_me: 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.
 
@@ -26017,312 +19097,264 @@ Alternatively, you may set the environment variables GECKO_COMPONENT_CFLAGS
 and GECKO_COMPONENT_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+   { (exit 1); exit 1; }; }; }
 else
 	GECKO_COMPONENT_CFLAGS=$pkg_cv_GECKO_COMPONENT_CFLAGS
 	GECKO_COMPONENT_LIBS=$pkg_cv_GECKO_COMPONENT_LIBS
-        { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+        { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 	:
-fi
-
+fi ;;
+  libxul*)
 
-cat >>confdefs.h <<\_ACEOF
-#define USE_GTKMOZEMBED 1
-_ACEOF
-
-	 if true; then
-  USE_GTKMOZEMBED_TRUE=
-  USE_GTKMOZEMBED_FALSE='#'
+pkg_failed=no
+{ $as_echo "$as_me:$LINENO: checking for GECKO_COMPONENT" >&5
+$as_echo_n "checking for GECKO_COMPONENT... " >&6; }
+
+if test -n "$GECKO_COMPONENT_CFLAGS"; then
+    pkg_cv_GECKO_COMPONENT_CFLAGS="$GECKO_COMPONENT_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$GECKO \$gecko_cv_extra_pkg_dependencies\"") >&5
+  ($PKG_CONFIG --exists --print-errors "$GECKO $gecko_cv_extra_pkg_dependencies") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  pkg_cv_GECKO_COMPONENT_CFLAGS=`$PKG_CONFIG --cflags "$GECKO $gecko_cv_extra_pkg_dependencies" 2>/dev/null`
 else
-  USE_GTKMOZEMBED_TRUE='#'
-  USE_GTKMOZEMBED_FALSE=
+  pkg_failed=yes
 fi
-
-	gecko=yes
-  else
-	GECKO_COMPONENT_LIBS=""
-	GECKO_COMPONENT_CFLAGS=""
-	GECKO_HOME=""
-	 if false; then
-  USE_GTKMOZEMBED_TRUE=
-  USE_GTKMOZEMBED_FALSE='#'
-else
-  USE_GTKMOZEMBED_TRUE='#'
-  USE_GTKMOZEMBED_FALSE=
+ else
+    pkg_failed=untried
 fi
-
-	gecko=no
-  fi
-
-
-gdu_cv_version_required=0.3.2
-
-if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$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
+if test -n "$GECKO_COMPONENT_LIBS"; then
+    pkg_cv_GECKO_COMPONENT_LIBS="$GECKO_COMPONENT_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$GECKO \$gecko_cv_extra_pkg_dependencies\"") >&5
+  ($PKG_CONFIG --exists --print-errors "$GECKO $gecko_cv_extra_pkg_dependencies") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  gdu_cv_have_gdu=yes
+  pkg_cv_GECKO_COMPONENT_LIBS=`$PKG_CONFIG --libs "$GECKO $gecko_cv_extra_pkg_dependencies" 2>/dev/null`
 else
-  gdu_cv_have_gdu=no
+  pkg_failed=yes
 fi
-
-if test "$gdu_cv_have_gdu" = "yes"; then
-	:
-else
-	{ { echo "$as_me:$LINENO: error: gnome-doc-utils >= $gdu_cv_version_required not found" >&5
-echo "$as_me: error: gnome-doc-utils >= $gdu_cv_version_required not found" >&2;}
-   { (exit 1); exit 1; }; }
+ else
+    pkg_failed=untried
 fi
 
 
 
-# Check whether --with-help-dir was given.
-if test "${with_help_dir+set}" = set; then
-  withval=$with_help_dir;
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
 else
-  with_help_dir='${datadir}/gnome/help'
+        _pkg_short_errors_supported=no
 fi
+        if test $_pkg_short_errors_supported = yes; then
+	        GECKO_COMPONENT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$GECKO $gecko_cv_extra_pkg_dependencies" 2>&1`
+        else
+	        GECKO_COMPONENT_PKG_ERRORS=`$PKG_CONFIG --print-errors "$GECKO $gecko_cv_extra_pkg_dependencies" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$GECKO_COMPONENT_PKG_ERRORS" >&5
 
-HELP_DIR="$with_help_dir"
+	{ { $as_echo "$as_me:$LINENO: error: Package requirements ($GECKO $gecko_cv_extra_pkg_dependencies) were not met:
 
+$GECKO_COMPONENT_PKG_ERRORS
 
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
 
-# 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
+Alternatively, you may set the environment variables GECKO_COMPONENT_CFLAGS
+and GECKO_COMPONENT_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+" >&5
+$as_echo "$as_me: error: Package requirements ($GECKO $gecko_cv_extra_pkg_dependencies) were not met:
 
-OMF_DIR="$with_omf_dir"
+$GECKO_COMPONENT_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 GECKO_COMPONENT_CFLAGS
+and GECKO_COMPONENT_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+" >&2;}
+   { (exit 1); exit 1; }; }
+elif test $pkg_failed = untried; then
+	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: 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.
 
-# Check whether --with-help-formats was given.
-if test "${with_help_formats+set}" = set; then
-  withval=$with_help_formats;
-else
-  with_help_formats=''
-fi
+Alternatively, you may set the environment variables GECKO_COMPONENT_CFLAGS
+and GECKO_COMPONENT_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
 
-DOC_USER_FORMATS="$with_help_formats"
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details." >&5
+$as_echo "$as_me: 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 GECKO_COMPONENT_CFLAGS
+and GECKO_COMPONENT_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
 
-# Check whether --enable-scrollkeeper was given.
-if test "${enable_scrollkeeper+set}" = set; then
-  enableval=$enable_scrollkeeper;
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }; }
 else
-  enable_scrollkeeper=yes
+	GECKO_COMPONENT_CFLAGS=$pkg_cv_GECKO_COMPONENT_CFLAGS
+	GECKO_COMPONENT_LIBS=$pkg_cv_GECKO_COMPONENT_LIBS
+        { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+	:
 fi
+		     GECKO_COMPONENT_CFLAGS="$GECKO_COMPONENT_CFLAGS `$PKG_CONFIG --cflags ${gecko_cv_gecko}` `$PKG_CONFIG --define-variable=includetype=unstable --cflags ${gecko_cv_gecko}`" ;;
+  *firefox)
 
- if test "$gdu_cv_have_gdu" = "yes" -a "$enable_scrollkeeper" = "yes"; then
-  ENABLE_SK_TRUE=
-  ENABLE_SK_FALSE='#'
+pkg_failed=no
+{ $as_echo "$as_me:$LINENO: checking for GECKO_COMPONENT" >&5
+$as_echo_n "checking for GECKO_COMPONENT... " >&6; }
+
+if test -n "$GECKO_COMPONENT_CFLAGS"; then
+    pkg_cv_GECKO_COMPONENT_CFLAGS="$GECKO_COMPONENT_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\${gecko_cv_gecko}-xpcom >= 1.5 \$gecko_cv_extra_pkg_dependencies\"") >&5
+  ($PKG_CONFIG --exists --print-errors "${gecko_cv_gecko}-xpcom >= 1.5 $gecko_cv_extra_pkg_dependencies") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  pkg_cv_GECKO_COMPONENT_CFLAGS=`$PKG_CONFIG --cflags "${gecko_cv_gecko}-xpcom >= 1.5 $gecko_cv_extra_pkg_dependencies" 2>/dev/null`
 else
-  ENABLE_SK_TRUE='#'
-  ENABLE_SK_FALSE=
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$GECKO_COMPONENT_LIBS"; then
+    pkg_cv_GECKO_COMPONENT_LIBS="$GECKO_COMPONENT_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\${gecko_cv_gecko}-xpcom >= 1.5 \$gecko_cv_extra_pkg_dependencies\"") >&5
+  ($PKG_CONFIG --exists --print-errors "${gecko_cv_gecko}-xpcom >= 1.5 $gecko_cv_extra_pkg_dependencies") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  pkg_cv_GECKO_COMPONENT_LIBS=`$PKG_CONFIG --libs "${gecko_cv_gecko}-xpcom >= 1.5 $gecko_cv_extra_pkg_dependencies" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
 fi
 
 
- if test "$gdu_cv_have_gdu" = "yes"; then
-  HAVE_GNOME_DOC_UTILS_TRUE=
-  HAVE_GNOME_DOC_UTILS_FALSE='#'
+
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
 else
-  HAVE_GNOME_DOC_UTILS_TRUE='#'
-  HAVE_GNOME_DOC_UTILS_FALSE=
+        _pkg_short_errors_supported=no
 fi
+        if test $_pkg_short_errors_supported = yes; then
+	        GECKO_COMPONENT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "${gecko_cv_gecko}-xpcom >= 1.5 $gecko_cv_extra_pkg_dependencies" 2>&1`
+        else
+	        GECKO_COMPONENT_PKG_ERRORS=`$PKG_CONFIG --print-errors "${gecko_cv_gecko}-xpcom >= 1.5 $gecko_cv_extra_pkg_dependencies" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$GECKO_COMPONENT_PKG_ERRORS" >&5
 
+	{ { $as_echo "$as_me:$LINENO: error: Package requirements (${gecko_cv_gecko}-xpcom >= 1.5 $gecko_cv_extra_pkg_dependencies) were not met:
 
+$GECKO_COMPONENT_PKG_ERRORS
 
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
 
-  case "$host_os" in
-    mingw*)
-      ;;
-    *)
-                        # Extract the first word of "scrollkeeper-config", so it can be a program name with args.
-set dummy scrollkeeper-config; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_path_SCROLLKEEPER_CONFIG+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  case $SCROLLKEEPER_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_SCROLLKEEPER_CONFIG="$SCROLLKEEPER_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_SCROLLKEEPER_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
+Alternatively, you may set the environment variables GECKO_COMPONENT_CFLAGS
+and GECKO_COMPONENT_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+" >&5
+$as_echo "$as_me: error: Package requirements (${gecko_cv_gecko}-xpcom >= 1.5 $gecko_cv_extra_pkg_dependencies) were not met:
 
-  test -z "$ac_cv_path_SCROLLKEEPER_CONFIG" && ac_cv_path_SCROLLKEEPER_CONFIG="no"
-  ;;
-esac
-fi
-SCROLLKEEPER_CONFIG=$ac_cv_path_SCROLLKEEPER_CONFIG
-if test -n "$SCROLLKEEPER_CONFIG"; then
-  { echo "$as_me:$LINENO: result: $SCROLLKEEPER_CONFIG" >&5
-echo "${ECHO_T}$SCROLLKEEPER_CONFIG" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
+$GECKO_COMPONENT_PKG_ERRORS
 
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
 
-      if test x$SCROLLKEEPER_CONFIG = xno; then
-        { { echo "$as_me:$LINENO: error: Couldn't find scrollkeeper-config. Please install the scrollkeeper package: http://scrollkeeper.sourceforge.net" >&5
-echo "$as_me: error: Couldn't find scrollkeeper-config. Please install the scrollkeeper package: http://scrollkeeper.sourceforge.net" >&2;}
+Alternatively, you may set the environment variables GECKO_COMPONENT_CFLAGS
+and GECKO_COMPONENT_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+" >&2;}
    { (exit 1); exit 1; }; }
-      fi
-                        SCROLLKEEPER_BUILD_REQUIRED=0.3.5
+elif test $pkg_failed = untried; then
+	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: 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.
 
-      ;;
-  esac
-else
-    GECKO_COMPONENT_LIBS=""
-  GECKO_COMPONENT_CFLAGS=""
-  GECKO_HOME=""
-   if false; then
-  USE_GTKMOZEMBED_TRUE=
-  USE_GTKMOZEMBED_FALSE='#'
-else
-  USE_GTKMOZEMBED_TRUE='#'
-  USE_GTKMOZEMBED_FALSE=
-fi
+Alternatively, you may set the environment variables GECKO_COMPONENT_CFLAGS
+and GECKO_COMPONENT_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." >&5
+$as_echo "$as_me: 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.
 
-  gecko=no
+Alternatively, you may set the environment variables GECKO_COMPONENT_CFLAGS
+and GECKO_COMPONENT_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
 
-  enable_scrollkeeper=no
-   if test "x$enable_scrollkeeper" = "xyes"; then
-  ENABLE_SK_TRUE=
-  ENABLE_SK_FALSE='#'
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }; }
 else
-  ENABLE_SK_TRUE='#'
-  ENABLE_SK_FALSE=
-fi
+	GECKO_COMPONENT_CFLAGS=$pkg_cv_GECKO_COMPONENT_CFLAGS
+	GECKO_COMPONENT_LIBS=$pkg_cv_GECKO_COMPONENT_LIBS
+        { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+	:
+fi ;;
+  *) { { $as_echo "$as_me:$LINENO: error: $gecko_cv_gecko is not supported" >&5
+$as_echo "$as_me: error: $gecko_cv_gecko is not supported" >&2;}
+   { (exit 1); exit 1; }; } ;;
+esac
 
-fi
 
 
-for ac_func in strcasestr
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
 
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); 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 $ac_func
 
-/* 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 $ac_func ();
-/* 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_$ac_func || defined __stub___$ac_func
-choke me
-#endif
 
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-	eval "$as_ac_var=no"
-fi
 
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
- have_strcasestr="yes"
-fi
-done
 
- if test x$have_strcasestr = xyes; then
-  HAVE_STRCASESTR_TRUE=
-  HAVE_STRCASESTR_FALSE='#'
 else
-  HAVE_STRCASESTR_TRUE='#'
-  HAVE_STRCASESTR_FALSE=
-fi
 
+	    { $as_echo "$as_me:$LINENO: checking for GECKO" >&5
+$as_echo_n "checking for GECKO... " >&6; }
+	    { $as_echo "$as_me:$LINENO: result: disabled as requested" >&5
+$as_echo "disabled as requested" >&6; }
 
+cat >>confdefs.h <<\_ACEOF
+#define GTKHTML 1
+_ACEOF
 
+fi
 
 
 
@@ -26378,6 +19410,14 @@ else
   HAVE_GECKO_1_9_FALSE=
 fi
 
+ if test "$gecko_cv_have_gecko" = "yes" -a "$gecko_cv_have_gecko_1_9_1" = "yes"; then
+  HAVE_GECKO_1_9_1_TRUE=
+  HAVE_GECKO_1_9_1_FALSE='#'
+else
+  HAVE_GECKO_1_9_1_TRUE='#'
+  HAVE_GECKO_1_9_1_FALSE=
+fi
+
  if test "x$_GECKO_HOME" != "x"; then
   HAVE_GECKO_HOME_TRUE=
   HAVE_GECKO_HOME_FALSE='#'
@@ -26403,215 +19443,598 @@ else
 fi
 
 
- if test "$with_engine" = "mozilla"; then
-  WITH_GECKO_ENGINE_TRUE=
-  WITH_GECKO_ENGINE_FALSE='#'
+ if test "$gecko_cv_have_gecko" = "yes"; then
+  HAVE_GECKO_TRUE=
+  HAVE_GECKO_FALSE='#'
 else
-  WITH_GECKO_ENGINE_TRUE='#'
-  WITH_GECKO_ENGINE_FALSE=
+  HAVE_GECKO_TRUE='#'
+  HAVE_GECKO_FALSE=
 fi
 
- if test "$gecko_cv_gecko" = "xulrunner"; then
-  HAVE_XULRUNNER_TRUE=
-  HAVE_XULRUNNER_FALSE='#'
-else
-  HAVE_XULRUNNER_TRUE='#'
-  HAVE_XULRUNNER_FALSE=
+
+REQUIRED_LIBS="glib-2.0 gtk+-2.0 libxml-2.0 libglade-2.0 libgtkhtml-3.14 sword dbus-glib-1 libgsf-1"
+
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_DBUS 1
+_ACEOF
+
+
+case $host_os in
+  mingw*) REQUIRED_LIBS="$REQUIRED_LIBS gmodule-no-export-2.0" ;;
+  *) REQUIRED_LIBS="$REQUIRED_LIBS gmodule-export-2.0" ;;
+esac
+
+
+if test -n "$PKG_CONFIG" && \
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\${GECKO} >= 1.9.1.3\"") >&5
+  ($PKG_CONFIG --exists --print-errors "${GECKO} >= 1.9.1.3") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  REQUIRED_LIBS="$REQUIRED_LIBS nspr"
 fi
 
- if test "$with_engine" = "xulrunner"; then
-  WITH_XULRUNNER_ENGINE_TRUE=
-  WITH_XULRUNNER_ENGINE_FALSE='#'
+{ $as_echo "$as_me:$LINENO: checking for widget tooltips" >&5
+$as_echo_n "checking for widget tooltips... " >&6; }
+if test -n "$PKG_CONFIG" && \
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.12\"") >&5
+  ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.12") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_WIDGET_TOOLTIP_TEXT 1
+_ACEOF
+
+			{ $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 else
-  WITH_XULRUNNER_ENGINE_TRUE='#'
-  WITH_XULRUNNER_ENGINE_FALSE=
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+{ $as_echo "$as_me:$LINENO: checking for gtk+-unix-print" >&5
+$as_echo_n "checking for gtk+-unix-print... " >&6; }
+if test -n "$PKG_CONFIG" && \
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-unix-print-2.0\"") >&5
+  ($PKG_CONFIG --exists --print-errors "gtk+-unix-print-2.0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
 
-# Check whether --enable-debug was given.
-if test "${enable_debug+set}" = set; then
-  enableval=$enable_debug; debug=$enableval
+cat >>confdefs.h <<\_ACEOF
+#define USE_GTKUPRINT 1
+_ACEOF
+
+			REQUIRED_LIBS="$REQUIRED_LIBS gtk+-unix-print-2.0"
+			{ $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 else
-  debug=no
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
-if test "x$GXX" = xyes; then
-	CXXFLAGS="$CXXFLAGS -ftemplate-depth-25"
+
+
+# Check whether --with-editor was given.
+if test "${with_editor+set}" = set; then
+  withval=$with_editor;
 fi
 
-{ echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
-echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6; }
-    # Check whether --enable-maintainer-mode was given.
-if test "${enable_maintainer_mode+set}" = set; then
-  enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
+
+{ $as_echo "$as_me:$LINENO: checking for editor" >&5
+$as_echo_n "checking for editor... " >&6; }
+
+if test "x$with_editor" != "xno"; then
+  if test -n "$PKG_CONFIG" && \
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.14 > 3.23 gtkhtml-editor\"") >&5
+  ($PKG_CONFIG --exists --print-errors "libgtkhtml-3.14 > 3.23 gtkhtml-editor") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  have_editor=yes
 else
-  USE_MAINTAINER_MODE=no
+  have_editor=no
 fi
-
-  { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
-echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; }
-   if test $USE_MAINTAINER_MODE = yes; then
-  MAINTAINER_MODE_TRUE=
-  MAINTAINER_MODE_FALSE='#'
 else
-  MAINTAINER_MODE_TRUE='#'
-  MAINTAINER_MODE_FALSE=
+  have_editor=no
 fi
 
-  MAINT=$MAINTAINER_MODE_TRUE
-
 
-if test "x$USE_MAINTAINER_MODE" = "xyes"; then
+if test "x$have_editor" = "xyes"; then
+  { $as_echo "$as_me:$LINENO: result: gtkhtml-editor" >&5
+$as_echo "gtkhtml-editor" >&6; }
 
 cat >>confdefs.h <<\_ACEOF
-#define MAINTAINER_MODE 1
+#define USE_GTKHTML3_14_23 1
 _ACEOF
 
-  disable_werror=no
-  enable_debug=yes
-  debug=yes
+      REQUIRED_LIBS="$REQUIRED_LIBS gtkhtml-editor"
+       if false; then
+  USE_GTKHTML_BONOBO_EDITOR_TRUE=
+  USE_GTKHTML_BONOBO_EDITOR_FALSE='#'
+else
+  USE_GTKHTML_BONOBO_EDITOR_TRUE='#'
+  USE_GTKHTML_BONOBO_EDITOR_FALSE=
+fi
+
+else
+  { $as_echo "$as_me:$LINENO: result: bonobo" >&5
+$as_echo "bonobo" >&6; }
+      if test "x$with_editor" = "xyes"; then
+  { { $as_echo "$as_me:$LINENO: error: gtkhtml-editor requested but not found" >&5
+$as_echo "$as_me: error: gtkhtml-editor requested but not found" >&2;}
+   { (exit 1); exit 1; }; }
+else
+   if true; then
+  USE_GTKHTML_BONOBO_EDITOR_TRUE=
+  USE_GTKHTML_BONOBO_EDITOR_FALSE='#'
+else
+  USE_GTKHTML_BONOBO_EDITOR_TRUE='#'
+  USE_GTKHTML_BONOBO_EDITOR_FALSE=
+fi
+
+	    ORBIT_IDL=`$PKG_CONFIG --variable=orbit_idl ORBit-2.0`
+
+	    BONOBO_IDL_INCLUDES="-I`$PKG_CONFIG --variable=idldir libbonobo-2.0` -I`$PKG_CONFIG --variable=idldir bonobo-activation-2.0`"
+
+fi
+
+
+fi
+
+
+{ $as_echo "$as_me:$LINENO: checking whether to use oldgnome" >&5
+$as_echo_n "checking whether to use oldgnome... " >&6; }
+
+# Check whether --with-gnome was given.
+if test "${with_gnome+set}" = set; then
+  withval=$with_gnome;
+fi
+
+
+if test "x$with_oldgnome" != "xyes"; then
+
+	   if test -n "$PKG_CONFIG" && \
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.14\"") >&5
+  ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.14") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  have_newgtk="yes"
 else
-  disable_werror=yes
-  A_CPPFLAGS=
+  have_newgtk="no"
 fi
+else
+  have_newgtk="no"
+fi
+
 
-if test "x$GXX" = xyes; then
-if test x$debug = xyes; then
+if test "x$have_newgtk" = "xyes"; then
 
 cat >>confdefs.h <<\_ACEOF
-#define DEBUG 1
+#define WITHOUT_GNOME 1
 _ACEOF
 
-  if test x$ac_cv_prog_cc_g = xyes; then
-    CFLAGS="$CFLAGS -g3 -O0 "
-  else
-    CFLAGS="$CFLAGS -O0 "
-  fi
-  if test x$ac_cv_prog_cxx_g = xyes; then
-    CXXFLAGS="$CXXFLAGS -g3 -O0"
-  else
-    CXXFLAGS="$CXXFLAGS -O0"
-  fi
-  CFLAGS="$CFLAGS "
-  CXXFLAGS="$CXXFLAGS "
+      		{ $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+else
+  if test "x$with_oldgnome" = "xyes"; then
+  REQUIRED_LIBS="$REQUIRED_LIBS libgnomeui-2.0"
+	     { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 fi
+
+
 fi
 
-# Check whether --enable-delint was given.
-if test "${enable_delint+set}" = set; then
-  enableval=$enable_delint; delint=$enableval
+
+
+pkg_failed=no
+{ $as_echo "$as_me:$LINENO: checking for XIPHOS" >&5
+$as_echo_n "checking for XIPHOS... " >&6; }
+
+if test -n "$XIPHOS_CFLAGS"; then
+    pkg_cv_XIPHOS_CFLAGS="$XIPHOS_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\"\$REQUIRED_LIBS\"\"") >&5
+  ($PKG_CONFIG --exists --print-errors ""$REQUIRED_LIBS"") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  pkg_cv_XIPHOS_CFLAGS=`$PKG_CONFIG --cflags ""$REQUIRED_LIBS"" 2>/dev/null`
 else
-  delint=no
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
 fi
+if test -n "$XIPHOS_LIBS"; then
+    pkg_cv_XIPHOS_LIBS="$XIPHOS_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\"\$REQUIRED_LIBS\"\"") >&5
+  ($PKG_CONFIG --exists --print-errors ""$REQUIRED_LIBS"") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  pkg_cv_XIPHOS_LIBS=`$PKG_CONFIG --libs ""$REQUIRED_LIBS"" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
 
-if test "x$delint" = xyes; then
-	CFLAGS="$CFLAGS -Wall -Werror"
-	CXXFLAGS="$CXXFLAGS -Wall -Werror"
+
+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
+	        XIPHOS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors ""$REQUIRED_LIBS"" 2>&1`
+        else
+	        XIPHOS_PKG_ERRORS=`$PKG_CONFIG --print-errors ""$REQUIRED_LIBS"" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$XIPHOS_PKG_ERRORS" >&5
 
-ORBIT_IDL="`$PKG_CONFIG --variable=orbit_idl ORBit-2.0`"
+	{ { $as_echo "$as_me:$LINENO: error: Package requirements (\"$REQUIRED_LIBS\") were not met:
 
+$XIPHOS_PKG_ERRORS
 
-BONOBO_IDL_INCLUDES="-I`$PKG_CONFIG --variable=idldir libbonobo-2.0` -I`$PKG_CONFIG --variable=idldir bonobo-activation-2.0`"
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
 
+Alternatively, you may set the environment variables XIPHOS_CFLAGS
+and XIPHOS_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+" >&5
+$as_echo "$as_me: error: Package requirements (\"$REQUIRED_LIBS\") were not met:
 
+$XIPHOS_PKG_ERRORS
 
-if test "x${prefix}" = "xNONE"; then
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
 
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_LOCALE_DIR "${ac_default_prefix}/${DATADIRNAME}/locale"
+Alternatively, you may set the environment variables XIPHOS_CFLAGS
+and XIPHOS_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+" >&2;}
+   { (exit 1); exit 1; }; }
+elif test $pkg_failed = untried; then
+	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: 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 XIPHOS_CFLAGS
+and XIPHOS_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." >&5
+$as_echo "$as_me: 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 XIPHOS_CFLAGS
+and XIPHOS_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." >&2;}
+   { (exit 1); exit 1; }; }; }
+else
+	XIPHOS_CFLAGS=$pkg_cv_XIPHOS_CFLAGS
+	XIPHOS_LIBS=$pkg_cv_XIPHOS_LIBS
+        { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+	:
+fi
+
+{ $as_echo "$as_me:$LINENO: checking for SWORD multiverse" >&5
+$as_echo_n "checking for SWORD multiverse... " >&6; }
+if test -n "$PKG_CONFIG" && \
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"sword > 1.5.11\"") >&5
+  ($PKG_CONFIG --exists --print-errors "sword > 1.5.11") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+
+cat >>confdefs.h <<\_ACEOF
+#define SWORD_MULTIVERSE 1
 _ACEOF
 
+			{ $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+cat >>confdefs.h <<\_ACEOF
+#define USE_GTKHTML3_14 1
+_ACEOF
+
+GTKHTML_DATA_DIR=`$PKG_CONFIG --variable=gtkhtml_datadir libgtkhtml-3.14`
+
+cat >>confdefs.h <<_ACEOF
+#define GTKHTML_DATA_DIR "$GTKHTML_DATA_DIR"
+_ACEOF
+
 
 cat >>confdefs.h <<_ACEOF
-#define PACKAGE_LOCALE_DIR "${prefix}/${DATADIRNAME}/locale"
+#define GTKHTML_API_VERSION "$PKG_CONFIG --variable gtkhtml_apiversion libgtkhtml-3.14"
 _ACEOF
 
+
+
+
+
+
+
+{ $as_echo "$as_me:$LINENO: checking whether to disable maintainer-specific portions of Makefiles" >&5
+$as_echo_n "checking whether to disable 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=yes
+fi
+
+  { $as_echo "$as_me:$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
+
 
-packagesrcdir=`cd $srcdir && pwd`
 
-if test "x${prefix}" = "xNONE"; then
-  packageprefix=${ac_default_prefix}
+
+    # Check whether --enable-compile-warnings was given.
+if test "${enable_compile_warnings+set}" = set; then
+  enableval=$enable_compile_warnings;
 else
-  packageprefix=${prefix}
+  enable_compile_warnings="yes"
 fi
 
-INSTALL_PREFIX="${packageprefix}/"
 
+    warnCFLAGS=
+    if test "x$GCC" != xyes; then
+	enable_compile_warnings=no
+    fi
+
+    warning_flags=
+    realsave_CFLAGS="$CFLAGS"
 
-cat >>confdefs.h <<_ACEOF
-#define INSTALL_PREFIX "${packageprefix}/"
+    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:$LINENO: checking whether gcc understands $option" >&5
+$as_echo_n "checking whether gcc understands $option... " >&6; }
+		cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
 _ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
 
+int
+main ()
+{
 
+  ;
+  return 0;
+}
+_ACEOF
+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:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  has_option=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-packagedatadir=share/${PACKAGE}
-packagedocdir=share/doc/${PACKAGE}
+	has_option=no
+fi
 
-packagepixmapsdir=share/pixmaps/${PACKAGE}
-packagehelpdir=share/gnome/help/${PACKAGE}
-packagemenudir=share/applications
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+		CFLAGS="$SAVE_CFLAGS"
+		{ $as_echo "$as_me:$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_echo "$as_me:$LINENO: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&5
+$as_echo "$as_me: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&2;}
+   { (exit 1); exit 1; }; }
+	;;
+    esac
+    CFLAGS="$realsave_CFLAGS"
+    { $as_echo "$as_me:$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:$LINENO: result: $warning_flags" >&5
+$as_echo "$warning_flags" >&6; }
 
-NO_PREFIX_PACKAGE_DATA_DIR="${packagedatadir}"
+    # 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
 
-PACKAGE_DATA_DIR="${packageprefix}/${packagedatadir}"
 
+    { $as_echo "$as_me:$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:$LINENO: result: $complCFLAGS" >&5
+$as_echo "$complCFLAGS" >&6; }
 
-NO_PREFIX_PACKAGE_DOC_DIR="${packagedocdir}"
+    WARN_CFLAGS="$warning_flags $complCFLAGS"
 
-PACKAGE_DOC_DIR="${packageprefix}/${packagedocdir}"
 
 
-NO_PREFIX_PACKAGE_PIXMAPS_DIR="${packagepixmapsdir}"
+  # Check whether --enable-cxx-warnings was given.
+if test "${enable_cxx_warnings+set}" = set; then
+  enableval=$enable_cxx_warnings;
+else
+  enable_cxx_warnings="minimum"
+fi
 
-PACKAGE_PIXMAPS_DIR="${packageprefix}/${packagepixmapsdir}"
 
+  { $as_echo "$as_me:$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; }
+  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
 
-NO_PREFIX_PACKAGE_HELP_DIR="${packagehelpdir}"
+      ## -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
+  { $as_echo "$as_me:$LINENO: result: $warnCXXFLAGS" >&5
+$as_echo "$warnCXXFLAGS" >&6; }
 
-PACKAGE_HELP_DIR="${packageprefix}/${packagehelpdir}"
+   # Check whether --enable-iso-cxx was given.
+if test "${enable_iso_cxx+set}" = set; then
+  enableval=$enable_iso_cxx;
+else
+  enable_iso_cxx=no
+fi
 
 
-NO_PREFIX_PACKAGE_MENU_DIR="${packagemenudir}"
+   { $as_echo "$as_me:$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; }
+   complCXXFLAGS=
+   if test "x$enable_iso_cxx" != "xno"; then
+     if test "x$GXX" = "xyes"; then
+      case " $CXXFLAGS " in
+      *\ \	-ansi\ \	*) ;;
+      *) complCXXFLAGS="$complCXXFLAGS -ansi" ;;
+      esac
 
-PACKAGE_MENU_DIR="${packageprefix}/${packagemenudir}"
+      case " $CXXFLAGS " in
+      *\ \	-pedantic\ \	*) ;;
+      *) complCXXFLAGS="$complCXXFLAGS -pedantic" ;;
+      esac
+     fi
+   fi
+  { $as_echo "$as_me:$LINENO: result: $complCXXFLAGS" >&5
+$as_echo "$complCXXFLAGS" >&6; }
 
+  WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS"
 
 
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_DATA_DIR "${packageprefix}/${packagedatadir}"
-_ACEOF
 
+{ $as_echo "$as_me:$LINENO: checking for debug build" >&5
+$as_echo_n "checking for debug build... " >&6; }
+# Check whether --enable-debug was given.
+if test "${enable_debug+set}" = set; then
+  enableval=$enable_debug;
+fi
 
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_DOC_DIR "${packageprefix}/${packagedocdir}"
-_ACEOF
+if test "x$enable_debug" = "xyes"; then
 
 
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_PIXMAPS_DIR "${packageprefix}/${packagepixmapsdir}"
+cat >>confdefs.h <<\_ACEOF
+#define DEBUG 1
 _ACEOF
 
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_HELP_DIR "${packageprefix}/${packagehelpdir}"
-_ACEOF
+			{ $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
 
 
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_MENU_DIR "${packageprefix}/${packagemenudir}"
-_ACEOF
+# Check whether --enable-as-needed was given.
+if test "${enable_as_needed+set}" = set; then
+  enableval=$enable_as_needed;
+fi
 
+if test "x$enable_as_needed" = "xyes"; then
+  AM_LDFLAGS=-Wl,--as-needed
 
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_SOURCE_DIR "${packagesrcdir}"
-_ACEOF
+fi
 
 
-ac_config_files="$ac_config_files Makefile po/Makefile.in doc/Makefile help/Makefile src/Makefile src/backend/Makefile src/gecko/Makefile src/editor/Makefile src/gnome2/Makefile src/main/Makefile ui/Makefile xiphos.desktop.in xiphos.spec"
+ac_config_files="$ac_config_files Makefile po/Makefile.in doc/Makefile help/Makefile pixmaps/Makefile src/Makefile src/backend/Makefile src/gecko/Makefile src/editor/Makefile src/gnome2/Makefile src/main/Makefile ui/Makefile xiphos.desktop.in xiphos.spec"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -26640,11 +20063,12 @@ _ACEOF
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+      *_cv_*) { $as_echo "$as_me:$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= ;; #(
       *) $as_unset $ac_var ;;
       esac ;;
     esac
@@ -26677,12 +20101,12 @@ echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
     test "x$cache_file" != "x/dev/null" &&
-      { echo "$as_me:$LINENO: updating cache $cache_file" >&5
-echo "$as_me: updating cache $cache_file" >&6;}
+      { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
+$as_echo "$as_me: updating cache $cache_file" >&6;}
     cat confcache >$cache_file
   else
-    { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
-echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+    { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
   fi
 fi
 rm -f confcache
@@ -26698,7 +20122,7 @@ 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=`echo "$ac_i" | sed "$ac_script"`
+  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.
   ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
@@ -26709,213 +20133,180 @@ LIBOBJS=$ac_libobjs
 LTLIBOBJS=$ac_ltlibobjs
 
 
-if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+ if test -n "$EXEEXT"; then
+  am__EXEEXT_TRUE=
+  am__EXEEXT_FALSE='#'
+else
+  am__EXEEXT_TRUE='#'
+  am__EXEEXT_FALSE=
 fi
 
-  ac_config_commands="$ac_config_commands po/stamp-it"
-
-
-if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
+if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
+  { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
+$as_echo "$as_me: error: conditional \"AMDEP\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
+$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
+$as_echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
-if test -z "${USE_GTKHTML_BONOBO_EDITOR_TRUE}" && test -z "${USE_GTKHTML_BONOBO_EDITOR_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"USE_GTKHTML_BONOBO_EDITOR\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"USE_GTKHTML_BONOBO_EDITOR\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${USE_GTKHTML_BONOBO_EDITOR_TRUE}" && test -z "${USE_GTKHTML_BONOBO_EDITOR_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"USE_GTKHTML_BONOBO_EDITOR\" was never defined.
+if test -z "${HAVE_STRCASESTR_TRUE}" && test -z "${HAVE_STRCASESTR_FALSE}"; then
+  { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_STRCASESTR\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"USE_GTKHTML_BONOBO_EDITOR\" was never defined.
+$as_echo "$as_me: error: conditional \"HAVE_STRCASESTR\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
-if test -z "${USE_GTKMOZEMBED_TRUE}" && test -z "${USE_GTKMOZEMBED_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"USE_GTKMOZEMBED\" was never defined.
+if test -z "${HAVE_STRCASESTR_TRUE}" && test -z "${HAVE_STRCASESTR_FALSE}"; then
+  { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_STRCASESTR\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"USE_GTKMOZEMBED\" was never defined.
+$as_echo "$as_me: error: conditional \"HAVE_STRCASESTR\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
-if test -z "${USE_GTKMOZEMBED_TRUE}" && test -z "${USE_GTKMOZEMBED_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"USE_GTKMOZEMBED\" was never defined.
+
+  ac_config_commands="$ac_config_commands po/stamp-it"
+
+
+if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
+  { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"USE_GTKMOZEMBED\" was never defined.
+$as_echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${ENABLE_SK_TRUE}" && test -z "${ENABLE_SK_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"ENABLE_SK\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_SK\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"ENABLE_SK\" was never defined.
+$as_echo "$as_me: error: conditional \"ENABLE_SK\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${HAVE_GNOME_DOC_UTILS_TRUE}" && test -z "${HAVE_GNOME_DOC_UTILS_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"HAVE_GNOME_DOC_UTILS\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_GNOME_DOC_UTILS\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"HAVE_GNOME_DOC_UTILS\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${USE_GTKMOZEMBED_TRUE}" && test -z "${USE_GTKMOZEMBED_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"USE_GTKMOZEMBED\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"USE_GTKMOZEMBED\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${ENABLE_SK_TRUE}" && test -z "${ENABLE_SK_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"ENABLE_SK\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"ENABLE_SK\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${HAVE_STRCASESTR_TRUE}" && test -z "${HAVE_STRCASESTR_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"HAVE_STRCASESTR\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"HAVE_STRCASESTR\" was never defined.
+$as_echo "$as_me: error: conditional \"HAVE_GNOME_DOC_UTILS\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${HAVE_MOZILLA_TOOLKIT_TRUE}" && test -z "${HAVE_MOZILLA_TOOLKIT_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"HAVE_MOZILLA_TOOLKIT\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_MOZILLA_TOOLKIT\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"HAVE_MOZILLA_TOOLKIT\" was never defined.
+$as_echo "$as_me: error: conditional \"HAVE_MOZILLA_TOOLKIT\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${HAVE_GECKO_DEBUG_TRUE}" && test -z "${HAVE_GECKO_DEBUG_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"HAVE_GECKO_DEBUG\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_GECKO_DEBUG\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"HAVE_GECKO_DEBUG\" was never defined.
+$as_echo "$as_me: error: conditional \"HAVE_GECKO_DEBUG\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${HAVE_GECKO_1_7_TRUE}" && test -z "${HAVE_GECKO_1_7_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"HAVE_GECKO_1_7\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_GECKO_1_7\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"HAVE_GECKO_1_7\" was never defined.
+$as_echo "$as_me: error: conditional \"HAVE_GECKO_1_7\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${HAVE_GECKO_1_8_TRUE}" && test -z "${HAVE_GECKO_1_8_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"HAVE_GECKO_1_8\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_GECKO_1_8\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"HAVE_GECKO_1_8\" was never defined.
+$as_echo "$as_me: error: conditional \"HAVE_GECKO_1_8\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${HAVE_GECKO_1_8_1_TRUE}" && test -z "${HAVE_GECKO_1_8_1_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"HAVE_GECKO_1_8_1\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_GECKO_1_8_1\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"HAVE_GECKO_1_8_1\" was never defined.
+$as_echo "$as_me: error: conditional \"HAVE_GECKO_1_8_1\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${HAVE_GECKO_1_9_TRUE}" && test -z "${HAVE_GECKO_1_9_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"HAVE_GECKO_1_9\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_GECKO_1_9\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"HAVE_GECKO_1_9\" was never defined.
+$as_echo "$as_me: error: conditional \"HAVE_GECKO_1_9\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${HAVE_GECKO_1_9_1_TRUE}" && test -z "${HAVE_GECKO_1_9_1_FALSE}"; then
+  { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_GECKO_1_9_1\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"HAVE_GECKO_1_9_1\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${HAVE_GECKO_HOME_TRUE}" && test -z "${HAVE_GECKO_HOME_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"HAVE_GECKO_HOME\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_GECKO_HOME\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"HAVE_GECKO_HOME\" was never defined.
+$as_echo "$as_me: error: conditional \"HAVE_GECKO_HOME\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${HAVE_GECKO_DEBUG_TRUE}" && test -z "${HAVE_GECKO_DEBUG_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"HAVE_GECKO_DEBUG\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_GECKO_DEBUG\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"HAVE_GECKO_DEBUG\" was never defined.
+$as_echo "$as_me: error: conditional \"HAVE_GECKO_DEBUG\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${HAVE_GECKO_XPCOM_GLUE_TRUE}" && test -z "${HAVE_GECKO_XPCOM_GLUE_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"HAVE_GECKO_XPCOM_GLUE\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_GECKO_XPCOM_GLUE\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"HAVE_GECKO_XPCOM_GLUE\" was never defined.
+$as_echo "$as_me: error: conditional \"HAVE_GECKO_XPCOM_GLUE\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
-if test -z "${WITH_GECKO_ENGINE_TRUE}" && test -z "${WITH_GECKO_ENGINE_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"WITH_GECKO_ENGINE\" was never defined.
+if test -z "${HAVE_GECKO_TRUE}" && test -z "${HAVE_GECKO_FALSE}"; then
+  { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_GECKO\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"WITH_GECKO_ENGINE\" was never defined.
+$as_echo "$as_me: error: conditional \"HAVE_GECKO\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
-if test -z "${HAVE_XULRUNNER_TRUE}" && test -z "${HAVE_XULRUNNER_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"HAVE_XULRUNNER\" was never defined.
+if test -z "${USE_GTKHTML_BONOBO_EDITOR_TRUE}" && test -z "${USE_GTKHTML_BONOBO_EDITOR_FALSE}"; then
+  { { $as_echo "$as_me:$LINENO: error: conditional \"USE_GTKHTML_BONOBO_EDITOR\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"HAVE_XULRUNNER\" was never defined.
+$as_echo "$as_me: error: conditional \"USE_GTKHTML_BONOBO_EDITOR\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
-if test -z "${WITH_XULRUNNER_ENGINE_TRUE}" && test -z "${WITH_XULRUNNER_ENGINE_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"WITH_XULRUNNER_ENGINE\" was never defined.
+if test -z "${USE_GTKHTML_BONOBO_EDITOR_TRUE}" && test -z "${USE_GTKHTML_BONOBO_EDITOR_FALSE}"; then
+  { { $as_echo "$as_me:$LINENO: error: conditional \"USE_GTKHTML_BONOBO_EDITOR\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"WITH_XULRUNNER_ENGINE\" was never defined.
+$as_echo "$as_me: error: conditional \"USE_GTKHTML_BONOBO_EDITOR\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
+$as_echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 : ${CONFIG_STATUS=./config.status}
+ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF
+{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
+cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 #! $SHELL
 # Generated by $as_me.
 # Run this file to recreate the current configuration.
@@ -26928,7 +20319,7 @@ ac_cs_silent=false
 SHELL=\${CONFIG_SHELL-$SHELL}
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 ## --------------------- ##
 ## M4sh Initialization.  ##
 ## --------------------- ##
@@ -26938,7 +20329,7 @@ DUALCASE=1; export DUALCASE # for MKS sh
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # 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
@@ -26960,17 +20351,45 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS
 as_cr_digits='0123456789'
 as_cr_alnum=$as_cr_Letters$as_cr_digits
 
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
+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
+if (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
-    PATH_SEPARATOR=:
+    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
-  rm -f conf$$.sh
+  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
 
 # Support unset when possible.
@@ -26986,8 +20405,6 @@ fi
 # 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.)
-as_nl='
-'
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
@@ -27010,7 +20427,7 @@ if test "x$as_myself" = x; then
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   { (exit 1); exit 1; }
 fi
 
@@ -27023,17 +20440,10 @@ PS2='> '
 PS4='+ '
 
 # NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-  fi
-done
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
 
 # Required to use basename.
 if expr a : '\(a\)' >/dev/null 2>&1 &&
@@ -27055,7 +20465,7 @@ as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
+$as_echo X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -27106,7 +20516,7 @@ $as_unset CDPATH
       s/-\n.*//
     ' >$as_me.lineno &&
   chmod +x "$as_me.lineno" ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
    { (exit 1); exit 1; }; }
 
   # Don't try to exec as it changes $[0], causing all sort of problems
@@ -27134,7 +20544,6 @@ case `echo -n x` in
 *)
   ECHO_N='-n';;
 esac
-
 if expr a : '\(a\)' >/dev/null 2>&1 &&
    test "X`expr 00001 : '.*\(...\)'`" = X001; then
   as_expr=expr
@@ -27147,19 +20556,22 @@ if test -d conf$$.dir; then
   rm -f conf$$.dir/conf$$.file
 else
   rm -f conf$$.dir
-  mkdir conf$$.dir
-fi
-echo >conf$$.file
-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 ||
+  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'
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
+  fi
 else
   as_ln_s='cp -p'
 fi
@@ -27184,10 +20596,10 @@ else
   as_test_x='
     eval sh -c '\''
       if test -d "$1"; then
-        test -d "$1/.";
+	test -d "$1/.";
       else
 	case $1 in
-        -*)set "./$1";;
+	-*)set "./$1";;
 	esac;
 	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
 	???[sx]*):;;*)false;;esac;fi
@@ -27209,8 +20621,8 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by xiphos $as_me 3.1.1, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
+This file was extended by xiphos $as_me 3.1.2, which was
+generated by GNU Autoconf 2.63.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -27223,7 +20635,16 @@ on `(hostname || uname -n) 2>/dev/null | sed 1q`
 
 _ACEOF
 
-cat >>$CONFIG_STATUS <<_ACEOF
+case $ac_config_files in *"
+"*) set x $ac_config_files; shift; ac_config_files=$*;;
+esac
+
+case $ac_config_headers in *"
+"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
+esac
+
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 # Files that config.status was made for.
 config_files="$ac_config_files"
 config_headers="$ac_config_headers"
@@ -27231,22 +20652,23 @@ config_commands="$ac_config_commands"
 
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 ac_cs_usage="\
 \`$as_me' instantiates files from templates according to the
 current configuration.
 
-Usage: $0 [OPTIONS] [FILE]...
+Usage: $0 [OPTION]... [FILE]...
 
   -h, --help       print this help, then exit
   -V, --version    print version number and configuration settings, then exit
-  -q, --quiet      do not print progress messages
+  -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
-  --header=FILE[:TEMPLATE]
-		   instantiate the configuration header FILE
+      --file=FILE[:TEMPLATE]
+                   instantiate the configuration file FILE
+      --header=FILE[:TEMPLATE]
+                   instantiate the configuration header FILE
 
 Configuration files:
 $config_files
@@ -27260,13 +20682,13 @@ $config_commands
 Report bugs to <bug-autoconf@gnu.org>."
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
-xiphos config.status 3.1.1
-configured by $0, generated by GNU Autoconf 2.61,
-  with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+xiphos config.status 3.1.2
+configured by $0, generated by GNU Autoconf 2.63,
+  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
-Copyright (C) 2006 Free Software Foundation, Inc.
+Copyright (C) 2008 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -27274,11 +20696,12 @@ ac_pwd='$ac_pwd'
 srcdir='$srcdir'
 INSTALL='$INSTALL'
 MKDIR_P='$MKDIR_P'
+AWK='$AWK'
+test -n "\$AWK" || AWK=awk
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
-# If no file are specified by the user, then we need to provide default
-# value.  By we need to know if files were specified by the user.
+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
@@ -27300,30 +20723,36 @@ do
   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
     ac_cs_recheck=: ;;
   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-    echo "$ac_cs_version"; exit ;;
+    $as_echo "$ac_cs_version"; exit ;;
   --debug | --debu | --deb | --de | --d | -d )
     debug=: ;;
   --file | --fil | --fi | --f )
     $ac_shift
-    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
+    case $ac_optarg in
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
     ac_need_defaults=false;;
   --header | --heade | --head | --hea )
     $ac_shift
-    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
+    case $ac_optarg in
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'"
     ac_need_defaults=false;;
   --he | --h)
     # Conflict between --help and --header
-    { echo "$as_me: error: ambiguous option: $1
+    { $as_echo "$as_me: error: ambiguous option: $1
 Try \`$0 --help' for more information." >&2
    { (exit 1); exit 1; }; };;
   --help | --hel | -h )
-    echo "$ac_cs_usage"; exit ;;
+    $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.
-  -*) { echo "$as_me: error: unrecognized option: $1
+  -*) { $as_echo "$as_me: error: unrecognized option: $1
 Try \`$0 --help' for more information." >&2
    { (exit 1); exit 1; }; } ;;
 
@@ -27342,41 +20771,389 @@ if $ac_cs_silent; then
 fi
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 if \$ac_cs_recheck; then
-  echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-  CONFIG_SHELL=$SHELL
+  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 $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  exec "\$@"
 fi
 
 _ACEOF
-cat >>$CONFIG_STATUS <<\_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
-  echo "$ac_log"
+  $as_echo "$ac_log"
 } >&5
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 #
 # INIT-COMMANDS
 #
 AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
-INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}'
-prefix="$prefix" exec_prefix="$exec_prefix" INTLTOOL_LIBDIR="$libdir"
-INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}' INTLTOOL_ICONV='${INTLTOOL_ICONV}'
-INTLTOOL_MSGFMT='${INTLTOOL_MSGFMT}' INTLTOOL_MSGMERGE='${INTLTOOL_MSGMERGE}'
-INTLTOOL_XGETTEXT='${INTLTOOL_XGETTEXT}'
+
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+sed_quote_subst='$sed_quote_subst'
+double_quote_subst='$double_quote_subst'
+delay_variable_subst='$delay_variable_subst'
+macro_version='`$ECHO "X$macro_version" | $Xsed -e "$delay_single_quote_subst"`'
+macro_revision='`$ECHO "X$macro_revision" | $Xsed -e "$delay_single_quote_subst"`'
+enable_shared='`$ECHO "X$enable_shared" | $Xsed -e "$delay_single_quote_subst"`'
+enable_static='`$ECHO "X$enable_static" | $Xsed -e "$delay_single_quote_subst"`'
+pic_mode='`$ECHO "X$pic_mode" | $Xsed -e "$delay_single_quote_subst"`'
+enable_fast_install='`$ECHO "X$enable_fast_install" | $Xsed -e "$delay_single_quote_subst"`'
+host_alias='`$ECHO "X$host_alias" | $Xsed -e "$delay_single_quote_subst"`'
+host='`$ECHO "X$host" | $Xsed -e "$delay_single_quote_subst"`'
+host_os='`$ECHO "X$host_os" | $Xsed -e "$delay_single_quote_subst"`'
+build_alias='`$ECHO "X$build_alias" | $Xsed -e "$delay_single_quote_subst"`'
+build='`$ECHO "X$build" | $Xsed -e "$delay_single_quote_subst"`'
+build_os='`$ECHO "X$build_os" | $Xsed -e "$delay_single_quote_subst"`'
+SED='`$ECHO "X$SED" | $Xsed -e "$delay_single_quote_subst"`'
+Xsed='`$ECHO "X$Xsed" | $Xsed -e "$delay_single_quote_subst"`'
+GREP='`$ECHO "X$GREP" | $Xsed -e "$delay_single_quote_subst"`'
+EGREP='`$ECHO "X$EGREP" | $Xsed -e "$delay_single_quote_subst"`'
+FGREP='`$ECHO "X$FGREP" | $Xsed -e "$delay_single_quote_subst"`'
+LD='`$ECHO "X$LD" | $Xsed -e "$delay_single_quote_subst"`'
+NM='`$ECHO "X$NM" | $Xsed -e "$delay_single_quote_subst"`'
+LN_S='`$ECHO "X$LN_S" | $Xsed -e "$delay_single_quote_subst"`'
+max_cmd_len='`$ECHO "X$max_cmd_len" | $Xsed -e "$delay_single_quote_subst"`'
+ac_objext='`$ECHO "X$ac_objext" | $Xsed -e "$delay_single_quote_subst"`'
+exeext='`$ECHO "X$exeext" | $Xsed -e "$delay_single_quote_subst"`'
+lt_unset='`$ECHO "X$lt_unset" | $Xsed -e "$delay_single_quote_subst"`'
+lt_SP2NL='`$ECHO "X$lt_SP2NL" | $Xsed -e "$delay_single_quote_subst"`'
+lt_NL2SP='`$ECHO "X$lt_NL2SP" | $Xsed -e "$delay_single_quote_subst"`'
+reload_flag='`$ECHO "X$reload_flag" | $Xsed -e "$delay_single_quote_subst"`'
+reload_cmds='`$ECHO "X$reload_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+OBJDUMP='`$ECHO "X$OBJDUMP" | $Xsed -e "$delay_single_quote_subst"`'
+deplibs_check_method='`$ECHO "X$deplibs_check_method" | $Xsed -e "$delay_single_quote_subst"`'
+file_magic_cmd='`$ECHO "X$file_magic_cmd" | $Xsed -e "$delay_single_quote_subst"`'
+AR='`$ECHO "X$AR" | $Xsed -e "$delay_single_quote_subst"`'
+AR_FLAGS='`$ECHO "X$AR_FLAGS" | $Xsed -e "$delay_single_quote_subst"`'
+STRIP='`$ECHO "X$STRIP" | $Xsed -e "$delay_single_quote_subst"`'
+RANLIB='`$ECHO "X$RANLIB" | $Xsed -e "$delay_single_quote_subst"`'
+old_postinstall_cmds='`$ECHO "X$old_postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+old_postuninstall_cmds='`$ECHO "X$old_postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+old_archive_cmds='`$ECHO "X$old_archive_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+CC='`$ECHO "X$CC" | $Xsed -e "$delay_single_quote_subst"`'
+CFLAGS='`$ECHO "X$CFLAGS" | $Xsed -e "$delay_single_quote_subst"`'
+compiler='`$ECHO "X$compiler" | $Xsed -e "$delay_single_quote_subst"`'
+GCC='`$ECHO "X$GCC" | $Xsed -e "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_pipe='`$ECHO "X$lt_cv_sys_global_symbol_pipe" | $Xsed -e "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_cdecl='`$ECHO "X$lt_cv_sys_global_symbol_to_cdecl" | $Xsed -e "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address" | $Xsed -e "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`'
+objdir='`$ECHO "X$objdir" | $Xsed -e "$delay_single_quote_subst"`'
+SHELL='`$ECHO "X$SHELL" | $Xsed -e "$delay_single_quote_subst"`'
+ECHO='`$ECHO "X$ECHO" | $Xsed -e "$delay_single_quote_subst"`'
+MAGIC_CMD='`$ECHO "X$MAGIC_CMD" | $Xsed -e "$delay_single_quote_subst"`'
+lt_prog_compiler_no_builtin_flag='`$ECHO "X$lt_prog_compiler_no_builtin_flag" | $Xsed -e "$delay_single_quote_subst"`'
+lt_prog_compiler_wl='`$ECHO "X$lt_prog_compiler_wl" | $Xsed -e "$delay_single_quote_subst"`'
+lt_prog_compiler_pic='`$ECHO "X$lt_prog_compiler_pic" | $Xsed -e "$delay_single_quote_subst"`'
+lt_prog_compiler_static='`$ECHO "X$lt_prog_compiler_static" | $Xsed -e "$delay_single_quote_subst"`'
+lt_cv_prog_compiler_c_o='`$ECHO "X$lt_cv_prog_compiler_c_o" | $Xsed -e "$delay_single_quote_subst"`'
+need_locks='`$ECHO "X$need_locks" | $Xsed -e "$delay_single_quote_subst"`'
+DSYMUTIL='`$ECHO "X$DSYMUTIL" | $Xsed -e "$delay_single_quote_subst"`'
+NMEDIT='`$ECHO "X$NMEDIT" | $Xsed -e "$delay_single_quote_subst"`'
+LIPO='`$ECHO "X$LIPO" | $Xsed -e "$delay_single_quote_subst"`'
+OTOOL='`$ECHO "X$OTOOL" | $Xsed -e "$delay_single_quote_subst"`'
+OTOOL64='`$ECHO "X$OTOOL64" | $Xsed -e "$delay_single_quote_subst"`'
+libext='`$ECHO "X$libext" | $Xsed -e "$delay_single_quote_subst"`'
+shrext_cmds='`$ECHO "X$shrext_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+extract_expsyms_cmds='`$ECHO "X$extract_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+archive_cmds_need_lc='`$ECHO "X$archive_cmds_need_lc" | $Xsed -e "$delay_single_quote_subst"`'
+enable_shared_with_static_runtimes='`$ECHO "X$enable_shared_with_static_runtimes" | $Xsed -e "$delay_single_quote_subst"`'
+export_dynamic_flag_spec='`$ECHO "X$export_dynamic_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
+whole_archive_flag_spec='`$ECHO "X$whole_archive_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
+compiler_needs_object='`$ECHO "X$compiler_needs_object" | $Xsed -e "$delay_single_quote_subst"`'
+old_archive_from_new_cmds='`$ECHO "X$old_archive_from_new_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+old_archive_from_expsyms_cmds='`$ECHO "X$old_archive_from_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+archive_cmds='`$ECHO "X$archive_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+archive_expsym_cmds='`$ECHO "X$archive_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+module_cmds='`$ECHO "X$module_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+module_expsym_cmds='`$ECHO "X$module_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+with_gnu_ld='`$ECHO "X$with_gnu_ld" | $Xsed -e "$delay_single_quote_subst"`'
+allow_undefined_flag='`$ECHO "X$allow_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`'
+no_undefined_flag='`$ECHO "X$no_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec='`$ECHO "X$hardcode_libdir_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec_ld='`$ECHO "X$hardcode_libdir_flag_spec_ld" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_libdir_separator='`$ECHO "X$hardcode_libdir_separator" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_direct='`$ECHO "X$hardcode_direct" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_direct_absolute='`$ECHO "X$hardcode_direct_absolute" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_minus_L='`$ECHO "X$hardcode_minus_L" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_shlibpath_var='`$ECHO "X$hardcode_shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_automatic='`$ECHO "X$hardcode_automatic" | $Xsed -e "$delay_single_quote_subst"`'
+inherit_rpath='`$ECHO "X$inherit_rpath" | $Xsed -e "$delay_single_quote_subst"`'
+link_all_deplibs='`$ECHO "X$link_all_deplibs" | $Xsed -e "$delay_single_quote_subst"`'
+fix_srcfile_path='`$ECHO "X$fix_srcfile_path" | $Xsed -e "$delay_single_quote_subst"`'
+always_export_symbols='`$ECHO "X$always_export_symbols" | $Xsed -e "$delay_single_quote_subst"`'
+export_symbols_cmds='`$ECHO "X$export_symbols_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+exclude_expsyms='`$ECHO "X$exclude_expsyms" | $Xsed -e "$delay_single_quote_subst"`'
+include_expsyms='`$ECHO "X$include_expsyms" | $Xsed -e "$delay_single_quote_subst"`'
+prelink_cmds='`$ECHO "X$prelink_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+file_list_spec='`$ECHO "X$file_list_spec" | $Xsed -e "$delay_single_quote_subst"`'
+variables_saved_for_relink='`$ECHO "X$variables_saved_for_relink" | $Xsed -e "$delay_single_quote_subst"`'
+need_lib_prefix='`$ECHO "X$need_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`'
+need_version='`$ECHO "X$need_version" | $Xsed -e "$delay_single_quote_subst"`'
+version_type='`$ECHO "X$version_type" | $Xsed -e "$delay_single_quote_subst"`'
+runpath_var='`$ECHO "X$runpath_var" | $Xsed -e "$delay_single_quote_subst"`'
+shlibpath_var='`$ECHO "X$shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`'
+shlibpath_overrides_runpath='`$ECHO "X$shlibpath_overrides_runpath" | $Xsed -e "$delay_single_quote_subst"`'
+libname_spec='`$ECHO "X$libname_spec" | $Xsed -e "$delay_single_quote_subst"`'
+library_names_spec='`$ECHO "X$library_names_spec" | $Xsed -e "$delay_single_quote_subst"`'
+soname_spec='`$ECHO "X$soname_spec" | $Xsed -e "$delay_single_quote_subst"`'
+postinstall_cmds='`$ECHO "X$postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+postuninstall_cmds='`$ECHO "X$postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+finish_cmds='`$ECHO "X$finish_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+finish_eval='`$ECHO "X$finish_eval" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_into_libs='`$ECHO "X$hardcode_into_libs" | $Xsed -e "$delay_single_quote_subst"`'
+sys_lib_search_path_spec='`$ECHO "X$sys_lib_search_path_spec" | $Xsed -e "$delay_single_quote_subst"`'
+sys_lib_dlsearch_path_spec='`$ECHO "X$sys_lib_dlsearch_path_spec" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_action='`$ECHO "X$hardcode_action" | $Xsed -e "$delay_single_quote_subst"`'
+enable_dlopen='`$ECHO "X$enable_dlopen" | $Xsed -e "$delay_single_quote_subst"`'
+enable_dlopen_self='`$ECHO "X$enable_dlopen_self" | $Xsed -e "$delay_single_quote_subst"`'
+enable_dlopen_self_static='`$ECHO "X$enable_dlopen_self_static" | $Xsed -e "$delay_single_quote_subst"`'
+old_striplib='`$ECHO "X$old_striplib" | $Xsed -e "$delay_single_quote_subst"`'
+striplib='`$ECHO "X$striplib" | $Xsed -e "$delay_single_quote_subst"`'
+compiler_lib_search_dirs='`$ECHO "X$compiler_lib_search_dirs" | $Xsed -e "$delay_single_quote_subst"`'
+predep_objects='`$ECHO "X$predep_objects" | $Xsed -e "$delay_single_quote_subst"`'
+postdep_objects='`$ECHO "X$postdep_objects" | $Xsed -e "$delay_single_quote_subst"`'
+predeps='`$ECHO "X$predeps" | $Xsed -e "$delay_single_quote_subst"`'
+postdeps='`$ECHO "X$postdeps" | $Xsed -e "$delay_single_quote_subst"`'
+compiler_lib_search_path='`$ECHO "X$compiler_lib_search_path" | $Xsed -e "$delay_single_quote_subst"`'
+LD_CXX='`$ECHO "X$LD_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+old_archive_cmds_CXX='`$ECHO "X$old_archive_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+compiler_CXX='`$ECHO "X$compiler_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+GCC_CXX='`$ECHO "X$GCC_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "X$lt_prog_compiler_no_builtin_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+lt_prog_compiler_wl_CXX='`$ECHO "X$lt_prog_compiler_wl_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+lt_prog_compiler_pic_CXX='`$ECHO "X$lt_prog_compiler_pic_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+lt_prog_compiler_static_CXX='`$ECHO "X$lt_prog_compiler_static_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+lt_cv_prog_compiler_c_o_CXX='`$ECHO "X$lt_cv_prog_compiler_c_o_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+archive_cmds_need_lc_CXX='`$ECHO "X$archive_cmds_need_lc_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+enable_shared_with_static_runtimes_CXX='`$ECHO "X$enable_shared_with_static_runtimes_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+export_dynamic_flag_spec_CXX='`$ECHO "X$export_dynamic_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+whole_archive_flag_spec_CXX='`$ECHO "X$whole_archive_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+compiler_needs_object_CXX='`$ECHO "X$compiler_needs_object_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+old_archive_from_new_cmds_CXX='`$ECHO "X$old_archive_from_new_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+old_archive_from_expsyms_cmds_CXX='`$ECHO "X$old_archive_from_expsyms_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+archive_cmds_CXX='`$ECHO "X$archive_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+archive_expsym_cmds_CXX='`$ECHO "X$archive_expsym_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+module_cmds_CXX='`$ECHO "X$module_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+module_expsym_cmds_CXX='`$ECHO "X$module_expsym_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+with_gnu_ld_CXX='`$ECHO "X$with_gnu_ld_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+allow_undefined_flag_CXX='`$ECHO "X$allow_undefined_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+no_undefined_flag_CXX='`$ECHO "X$no_undefined_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec_CXX='`$ECHO "X$hardcode_libdir_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec_ld_CXX='`$ECHO "X$hardcode_libdir_flag_spec_ld_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_libdir_separator_CXX='`$ECHO "X$hardcode_libdir_separator_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_direct_CXX='`$ECHO "X$hardcode_direct_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_direct_absolute_CXX='`$ECHO "X$hardcode_direct_absolute_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_minus_L_CXX='`$ECHO "X$hardcode_minus_L_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_shlibpath_var_CXX='`$ECHO "X$hardcode_shlibpath_var_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_automatic_CXX='`$ECHO "X$hardcode_automatic_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+inherit_rpath_CXX='`$ECHO "X$inherit_rpath_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+link_all_deplibs_CXX='`$ECHO "X$link_all_deplibs_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+fix_srcfile_path_CXX='`$ECHO "X$fix_srcfile_path_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+always_export_symbols_CXX='`$ECHO "X$always_export_symbols_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+export_symbols_cmds_CXX='`$ECHO "X$export_symbols_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+exclude_expsyms_CXX='`$ECHO "X$exclude_expsyms_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+include_expsyms_CXX='`$ECHO "X$include_expsyms_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+prelink_cmds_CXX='`$ECHO "X$prelink_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+file_list_spec_CXX='`$ECHO "X$file_list_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_action_CXX='`$ECHO "X$hardcode_action_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+compiler_lib_search_dirs_CXX='`$ECHO "X$compiler_lib_search_dirs_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+predep_objects_CXX='`$ECHO "X$predep_objects_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+postdep_objects_CXX='`$ECHO "X$postdep_objects_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+predeps_CXX='`$ECHO "X$predeps_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+postdeps_CXX='`$ECHO "X$postdeps_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+compiler_lib_search_path_CXX='`$ECHO "X$compiler_lib_search_path_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+
+LTCC='$LTCC'
+LTCFLAGS='$LTCFLAGS'
+compiler='$compiler_DEFAULT'
+
+# Quote evaled strings.
+for var in SED \
+GREP \
+EGREP \
+FGREP \
+LD \
+NM \
+LN_S \
+lt_SP2NL \
+lt_NL2SP \
+reload_flag \
+OBJDUMP \
+deplibs_check_method \
+file_magic_cmd \
+AR \
+AR_FLAGS \
+STRIP \
+RANLIB \
+CC \
+CFLAGS \
+compiler \
+lt_cv_sys_global_symbol_pipe \
+lt_cv_sys_global_symbol_to_cdecl \
+lt_cv_sys_global_symbol_to_c_name_address \
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
+SHELL \
+ECHO \
+lt_prog_compiler_no_builtin_flag \
+lt_prog_compiler_wl \
+lt_prog_compiler_pic \
+lt_prog_compiler_static \
+lt_cv_prog_compiler_c_o \
+need_locks \
+DSYMUTIL \
+NMEDIT \
+LIPO \
+OTOOL \
+OTOOL64 \
+shrext_cmds \
+export_dynamic_flag_spec \
+whole_archive_flag_spec \
+compiler_needs_object \
+with_gnu_ld \
+allow_undefined_flag \
+no_undefined_flag \
+hardcode_libdir_flag_spec \
+hardcode_libdir_flag_spec_ld \
+hardcode_libdir_separator \
+fix_srcfile_path \
+exclude_expsyms \
+include_expsyms \
+file_list_spec \
+variables_saved_for_relink \
+libname_spec \
+library_names_spec \
+soname_spec \
+finish_eval \
+old_striplib \
+striplib \
+compiler_lib_search_dirs \
+predep_objects \
+postdep_objects \
+predeps \
+postdeps \
+compiler_lib_search_path \
+LD_CXX \
+compiler_CXX \
+lt_prog_compiler_no_builtin_flag_CXX \
+lt_prog_compiler_wl_CXX \
+lt_prog_compiler_pic_CXX \
+lt_prog_compiler_static_CXX \
+lt_cv_prog_compiler_c_o_CXX \
+export_dynamic_flag_spec_CXX \
+whole_archive_flag_spec_CXX \
+compiler_needs_object_CXX \
+with_gnu_ld_CXX \
+allow_undefined_flag_CXX \
+no_undefined_flag_CXX \
+hardcode_libdir_flag_spec_CXX \
+hardcode_libdir_flag_spec_ld_CXX \
+hardcode_libdir_separator_CXX \
+fix_srcfile_path_CXX \
+exclude_expsyms_CXX \
+include_expsyms_CXX \
+file_list_spec_CXX \
+compiler_lib_search_dirs_CXX \
+predep_objects_CXX \
+postdep_objects_CXX \
+predeps_CXX \
+postdeps_CXX \
+compiler_lib_search_path_CXX; do
+    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
+    *[\\\\\\\`\\"\\\$]*)
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
+      ;;
+    *)
+      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+      ;;
+    esac
+done
+
+# Double-quote double-evaled strings.
+for var in reload_cmds \
+old_postinstall_cmds \
+old_postuninstall_cmds \
+old_archive_cmds \
+extract_expsyms_cmds \
+old_archive_from_new_cmds \
+old_archive_from_expsyms_cmds \
+archive_cmds \
+archive_expsym_cmds \
+module_cmds \
+module_expsym_cmds \
+export_symbols_cmds \
+prelink_cmds \
+postinstall_cmds \
+postuninstall_cmds \
+finish_cmds \
+sys_lib_search_path_spec \
+sys_lib_dlsearch_path_spec \
+old_archive_cmds_CXX \
+old_archive_from_new_cmds_CXX \
+old_archive_from_expsyms_cmds_CXX \
+archive_cmds_CXX \
+archive_expsym_cmds_CXX \
+module_cmds_CXX \
+module_expsym_cmds_CXX \
+export_symbols_cmds_CXX \
+prelink_cmds_CXX; do
+    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
+    *[\\\\\\\`\\"\\\$]*)
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
+      ;;
+    *)
+      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+      ;;
+    esac
+done
+
+# Fix-up fallback echo if it was mangled by the above quoting rules.
+case \$lt_ECHO in
+*'\\\$0 --fallback-echo"')  lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\$0 --fallback-echo"\$/\$0 --fallback-echo"/'\`
+  ;;
+esac
+
+ac_aux_dir='$ac_aux_dir'
+xsi_shell='$xsi_shell'
+lt_shell_append='$lt_shell_append'
+
+# See if we are running on zsh, and set the options which allow our
+# commands through without removal of \ escapes INIT.
+if test -n "\${ZSH_VERSION+set}" ; then
+   setopt NO_GLOB_SUBST
+fi
+
+
+    PACKAGE='$PACKAGE'
+    VERSION='$VERSION'
+    TIMESTAMP='$TIMESTAMP'
+    RM='$RM'
+    ofile='$ofile'
+
+
+
+
+
 
 
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 
 # Handling of arguments.
 for ac_config_target in $ac_config_targets
@@ -27384,12 +21161,13 @@ do
   case $ac_config_target in
     "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
     "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-    "intltool") CONFIG_COMMANDS="$CONFIG_COMMANDS intltool" ;;
+    "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
     "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
     "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
     "help/Makefile") CONFIG_FILES="$CONFIG_FILES help/Makefile" ;;
+    "pixmaps/Makefile") CONFIG_FILES="$CONFIG_FILES pixmaps/Makefile" ;;
     "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
     "src/backend/Makefile") CONFIG_FILES="$CONFIG_FILES src/backend/Makefile" ;;
     "src/gecko/Makefile") CONFIG_FILES="$CONFIG_FILES src/gecko/Makefile" ;;
@@ -27401,8 +21179,8 @@ do
     "xiphos.spec") CONFIG_FILES="$CONFIG_FILES xiphos.spec" ;;
     "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
 
-  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+  *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
+$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
 done
@@ -27443,382 +21221,144 @@ $debug ||
   (umask 077 && mkdir "$tmp")
 } ||
 {
-   echo "$me: cannot create a temporary directory in ." >&2
+   $as_echo "$as_me: cannot create a temporary directory in ." >&2
    { (exit 1); exit 1; }
 }
 
-#
-# Set up the sed scripts for CONFIG_FILES section.
-#
-
-# No need to generate the scripts if there are no CONFIG_FILES.
-# This happens for instance when ./config.status config.h
+# 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
 
-_ACEOF
-
-
-
-ac_delim='%!_!# '
-for ac_last_try in false false false false false :; do
-  cat >conf$$subs.sed <<_ACEOF
-SHELL!$SHELL$ac_delim
-PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
-PACKAGE_NAME!$PACKAGE_NAME$ac_delim
-PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
-PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
-PACKAGE_STRING!$PACKAGE_STRING$ac_delim
-PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
-exec_prefix!$exec_prefix$ac_delim
-prefix!$prefix$ac_delim
-program_transform_name!$program_transform_name$ac_delim
-bindir!$bindir$ac_delim
-sbindir!$sbindir$ac_delim
-libexecdir!$libexecdir$ac_delim
-datarootdir!$datarootdir$ac_delim
-datadir!$datadir$ac_delim
-sysconfdir!$sysconfdir$ac_delim
-sharedstatedir!$sharedstatedir$ac_delim
-localstatedir!$localstatedir$ac_delim
-includedir!$includedir$ac_delim
-oldincludedir!$oldincludedir$ac_delim
-docdir!$docdir$ac_delim
-infodir!$infodir$ac_delim
-htmldir!$htmldir$ac_delim
-dvidir!$dvidir$ac_delim
-pdfdir!$pdfdir$ac_delim
-psdir!$psdir$ac_delim
-libdir!$libdir$ac_delim
-localedir!$localedir$ac_delim
-mandir!$mandir$ac_delim
-DEFS!$DEFS$ac_delim
-ECHO_C!$ECHO_C$ac_delim
-ECHO_N!$ECHO_N$ac_delim
-ECHO_T!$ECHO_T$ac_delim
-LIBS!$LIBS$ac_delim
-build_alias!$build_alias$ac_delim
-host_alias!$host_alias$ac_delim
-target_alias!$target_alias$ac_delim
-INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
-INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
-INSTALL_DATA!$INSTALL_DATA$ac_delim
-am__isrc!$am__isrc$ac_delim
-CYGPATH_W!$CYGPATH_W$ac_delim
-PACKAGE!$PACKAGE$ac_delim
-VERSION!$VERSION$ac_delim
-ACLOCAL!$ACLOCAL$ac_delim
-AUTOCONF!$AUTOCONF$ac_delim
-AUTOMAKE!$AUTOMAKE$ac_delim
-AUTOHEADER!$AUTOHEADER$ac_delim
-MAKEINFO!$MAKEINFO$ac_delim
-install_sh!$install_sh$ac_delim
-STRIP!$STRIP$ac_delim
-INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim
-mkdir_p!$mkdir_p$ac_delim
-AWK!$AWK$ac_delim
-SET_MAKE!$SET_MAKE$ac_delim
-am__leading_dot!$am__leading_dot$ac_delim
-AMTAR!$AMTAR$ac_delim
-am__tar!$am__tar$ac_delim
-am__untar!$am__untar$ac_delim
-PKG_CONFIG!$PKG_CONFIG$ac_delim
-SWORD_CFLAGS!$SWORD_CFLAGS$ac_delim
-SWORD_LIBS!$SWORD_LIBS$ac_delim
-SWORD_MULTIVERSE_CFLAGS!$SWORD_MULTIVERSE_CFLAGS$ac_delim
-SWORD_MULTIVERSE_LIBS!$SWORD_MULTIVERSE_LIBS$ac_delim
-DIRS!$DIRS$ac_delim
-xiphos_exec!$xiphos_exec$ac_delim
-tooltiptext_CFLAGS!$tooltiptext_CFLAGS$ac_delim
-tooltiptext_LIBS!$tooltiptext_LIBS$ac_delim
-GTKHTML_314_presence_CFLAGS!$GTKHTML_314_presence_CFLAGS$ac_delim
-GTKHTML_314_presence_LIBS!$GTKHTML_314_presence_LIBS$ac_delim
-GTKHTML_38_presence_CFLAGS!$GTKHTML_38_presence_CFLAGS$ac_delim
-GTKHTML_38_presence_LIBS!$GTKHTML_38_presence_LIBS$ac_delim
-UPRINT_CFLAGS!$UPRINT_CFLAGS$ac_delim
-UPRINT_LIBS!$UPRINT_LIBS$ac_delim
-ImageMagick_CFLAGS!$ImageMagick_CFLAGS$ac_delim
-ImageMagick_LIBS!$ImageMagick_LIBS$ac_delim
-CC!$CC$ac_delim
-CFLAGS!$CFLAGS$ac_delim
-LDFLAGS!$LDFLAGS$ac_delim
-CPPFLAGS!$CPPFLAGS$ac_delim
-ac_ct_CC!$ac_ct_CC$ac_delim
-EXEEXT!$EXEEXT$ac_delim
-OBJEXT!$OBJEXT$ac_delim
-DEPDIR!$DEPDIR$ac_delim
-am__include!$am__include$ac_delim
-am__quote!$am__quote$ac_delim
-AMDEP_TRUE!$AMDEP_TRUE$ac_delim
-AMDEP_FALSE!$AMDEP_FALSE$ac_delim
-AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim
-CCDEPMODE!$CCDEPMODE$ac_delim
-am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim
-am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
-CPP!$CPP$ac_delim
-GREP!$GREP$ac_delim
-EGREP!$EGREP$ac_delim
-INTLTOOL_DESKTOP_RULE!$INTLTOOL_DESKTOP_RULE$ac_delim
-INTLTOOL_DIRECTORY_RULE!$INTLTOOL_DIRECTORY_RULE$ac_delim
-_ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-    break
-  elif $ac_last_try; then
-    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
-  else
-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-  fi
-done
-
-ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-if test -n "$ac_eof"; then
-  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-  ac_eof=`expr $ac_eof + 1`
+ac_cr='
'
+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
 
-cat >>$CONFIG_STATUS <<_ACEOF
-cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-_ACEOF
-sed '
-s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-s/^/s,@/; s/!/@,|#_!!_#|/
-:n
-t n
-s/'"$ac_delim"'$/,g/; t
-s/$/\\/; p
-N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-' >>$CONFIG_STATUS <conf$$subs.sed
-rm -f conf$$subs.sed
-cat >>$CONFIG_STATUS <<_ACEOF
-CEOF$ac_eof
+echo 'BEGIN {' >"$tmp/subs1.awk" &&
 _ACEOF
 
 
-ac_delim='%!_!# '
-for ac_last_try in false false false false false :; do
-  cat >conf$$subs.sed <<_ACEOF
-INTLTOOL_KEYS_RULE!$INTLTOOL_KEYS_RULE$ac_delim
-INTLTOOL_PROP_RULE!$INTLTOOL_PROP_RULE$ac_delim
-INTLTOOL_OAF_RULE!$INTLTOOL_OAF_RULE$ac_delim
-INTLTOOL_PONG_RULE!$INTLTOOL_PONG_RULE$ac_delim
-INTLTOOL_SERVER_RULE!$INTLTOOL_SERVER_RULE$ac_delim
-INTLTOOL_SHEET_RULE!$INTLTOOL_SHEET_RULE$ac_delim
-INTLTOOL_SOUNDLIST_RULE!$INTLTOOL_SOUNDLIST_RULE$ac_delim
-INTLTOOL_UI_RULE!$INTLTOOL_UI_RULE$ac_delim
-INTLTOOL_XAM_RULE!$INTLTOOL_XAM_RULE$ac_delim
-INTLTOOL_KBD_RULE!$INTLTOOL_KBD_RULE$ac_delim
-INTLTOOL_XML_RULE!$INTLTOOL_XML_RULE$ac_delim
-INTLTOOL_XML_NOMERGE_RULE!$INTLTOOL_XML_NOMERGE_RULE$ac_delim
-INTLTOOL_CAVES_RULE!$INTLTOOL_CAVES_RULE$ac_delim
-INTLTOOL_SCHEMAS_RULE!$INTLTOOL_SCHEMAS_RULE$ac_delim
-INTLTOOL_THEME_RULE!$INTLTOOL_THEME_RULE$ac_delim
-INTLTOOL_SERVICE_RULE!$INTLTOOL_SERVICE_RULE$ac_delim
-INTLTOOL_EXTRACT!$INTLTOOL_EXTRACT$ac_delim
-INTLTOOL_MERGE!$INTLTOOL_MERGE$ac_delim
-INTLTOOL_UPDATE!$INTLTOOL_UPDATE$ac_delim
-INTLTOOL_PERL!$INTLTOOL_PERL$ac_delim
-INTLTOOL_ICONV!$INTLTOOL_ICONV$ac_delim
-INTLTOOL_MSGFMT!$INTLTOOL_MSGFMT$ac_delim
-INTLTOOL_MSGMERGE!$INTLTOOL_MSGMERGE$ac_delim
-INTLTOOL_XGETTEXT!$INTLTOOL_XGETTEXT$ac_delim
-ALL_LINGUAS!$ALL_LINGUAS$ac_delim
-DATADIRNAME!$DATADIRNAME$ac_delim
-build!$build$ac_delim
-build_cpu!$build_cpu$ac_delim
-build_vendor!$build_vendor$ac_delim
-build_os!$build_os$ac_delim
-host!$host$ac_delim
-host_cpu!$host_cpu$ac_delim
-host_vendor!$host_vendor$ac_delim
-host_os!$host_os$ac_delim
-SED!$SED$ac_delim
-LN_S!$LN_S$ac_delim
-ECHO!$ECHO$ac_delim
-AR!$AR$ac_delim
-RANLIB!$RANLIB$ac_delim
-CXX!$CXX$ac_delim
-CXXFLAGS!$CXXFLAGS$ac_delim
-ac_ct_CXX!$ac_ct_CXX$ac_delim
-CXXDEPMODE!$CXXDEPMODE$ac_delim
-am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim
-am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim
-CXXCPP!$CXXCPP$ac_delim
-F77!$F77$ac_delim
-FFLAGS!$FFLAGS$ac_delim
-ac_ct_F77!$ac_ct_F77$ac_delim
-LIBTOOL!$LIBTOOL$ac_delim
-GNOME_CFLAGS!$GNOME_CFLAGS$ac_delim
-GNOME_LIBS!$GNOME_LIBS$ac_delim
-GETTEXT_PACKAGE!$GETTEXT_PACKAGE$ac_delim
-USE_NLS!$USE_NLS$ac_delim
-MSGFMT!$MSGFMT$ac_delim
-MSGFMT_OPTS!$MSGFMT_OPTS$ac_delim
-GMSGFMT!$GMSGFMT$ac_delim
-XGETTEXT!$XGETTEXT$ac_delim
-CATALOGS!$CATALOGS$ac_delim
-CATOBJEXT!$CATOBJEXT$ac_delim
-GMOFILES!$GMOFILES$ac_delim
-INSTOBJEXT!$INSTOBJEXT$ac_delim
-INTLLIBS!$INTLLIBS$ac_delim
-PO_IN_DATADIR_TRUE!$PO_IN_DATADIR_TRUE$ac_delim
-PO_IN_DATADIR_FALSE!$PO_IN_DATADIR_FALSE$ac_delim
-POFILES!$POFILES$ac_delim
-POSUB!$POSUB$ac_delim
-MKINSTALLDIRS!$MKINSTALLDIRS$ac_delim
-GTKHTML_CFLAGS!$GTKHTML_CFLAGS$ac_delim
-GTKHTML_LIBS!$GTKHTML_LIBS$ac_delim
-EDITOR_CFLAGS!$EDITOR_CFLAGS$ac_delim
-EDITOR_LIBS!$EDITOR_LIBS$ac_delim
-USE_GTKHTML_BONOBO_EDITOR_TRUE!$USE_GTKHTML_BONOBO_EDITOR_TRUE$ac_delim
-USE_GTKHTML_BONOBO_EDITOR_FALSE!$USE_GTKHTML_BONOBO_EDITOR_FALSE$ac_delim
-GTKHTML_DATA_DIR!$GTKHTML_DATA_DIR$ac_delim
-GECKO!$GECKO$ac_delim
-GECKO_FLAVOUR!$GECKO_FLAVOUR$ac_delim
-GECKO_INCLUDE_ROOT!$GECKO_INCLUDE_ROOT$ac_delim
-GECKO_HOME!$GECKO_HOME$ac_delim
-GECKO_PREFIX!$GECKO_PREFIX$ac_delim
-GECKO_EXTRA_LIBS!$GECKO_EXTRA_LIBS$ac_delim
-GECKO_GLUE_LIBS!$GECKO_GLUE_LIBS$ac_delim
-GECKO_COMPONENT_CFLAGS!$GECKO_COMPONENT_CFLAGS$ac_delim
-GECKO_COMPONENT_LIBS!$GECKO_COMPONENT_LIBS$ac_delim
-USE_GTKMOZEMBED_TRUE!$USE_GTKMOZEMBED_TRUE$ac_delim
-USE_GTKMOZEMBED_FALSE!$USE_GTKMOZEMBED_FALSE$ac_delim
-HELP_DIR!$HELP_DIR$ac_delim
-OMF_DIR!$OMF_DIR$ac_delim
-DOC_USER_FORMATS!$DOC_USER_FORMATS$ac_delim
-ENABLE_SK_TRUE!$ENABLE_SK_TRUE$ac_delim
-ENABLE_SK_FALSE!$ENABLE_SK_FALSE$ac_delim
-HAVE_GNOME_DOC_UTILS_TRUE!$HAVE_GNOME_DOC_UTILS_TRUE$ac_delim
-HAVE_GNOME_DOC_UTILS_FALSE!$HAVE_GNOME_DOC_UTILS_FALSE$ac_delim
-SCROLLKEEPER_CONFIG!$SCROLLKEEPER_CONFIG$ac_delim
-SCROLLKEEPER_BUILD_REQUIRED!$SCROLLKEEPER_BUILD_REQUIRED$ac_delim
-HAVE_STRCASESTR_TRUE!$HAVE_STRCASESTR_TRUE$ac_delim
-HAVE_STRCASESTR_FALSE!$HAVE_STRCASESTR_FALSE$ac_delim
-_ACEOF
-
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-    break
-  elif $ac_last_try; then
-    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+{
+  echo "cat >conf$$subs.awk <<_ACEOF" &&
+  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
+  echo "_ACEOF"
+} >conf$$subs.sh ||
+  { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
    { (exit 1); exit 1; }; }
-  else
-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-  fi
-done
-
-ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-if test -n "$ac_eof"; then
-  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-  ac_eof=`expr $ac_eof + 1`
-fi
-
-cat >>$CONFIG_STATUS <<_ACEOF
-cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-_ACEOF
-sed '
-s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-s/^/s,@/; s/!/@,|#_!!_#|/
-:n
-t n
-s/'"$ac_delim"'$/,g/; t
-s/$/\\/; p
-N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-' >>$CONFIG_STATUS <conf$$subs.sed
-rm -f conf$$subs.sed
-cat >>$CONFIG_STATUS <<_ACEOF
-CEOF$ac_eof
-_ACEOF
-
-
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
-  cat >conf$$subs.sed <<_ACEOF
-HAVE_MOZILLA_TOOLKIT_TRUE!$HAVE_MOZILLA_TOOLKIT_TRUE$ac_delim
-HAVE_MOZILLA_TOOLKIT_FALSE!$HAVE_MOZILLA_TOOLKIT_FALSE$ac_delim
-HAVE_GECKO_DEBUG_TRUE!$HAVE_GECKO_DEBUG_TRUE$ac_delim
-HAVE_GECKO_DEBUG_FALSE!$HAVE_GECKO_DEBUG_FALSE$ac_delim
-HAVE_GECKO_1_7_TRUE!$HAVE_GECKO_1_7_TRUE$ac_delim
-HAVE_GECKO_1_7_FALSE!$HAVE_GECKO_1_7_FALSE$ac_delim
-HAVE_GECKO_1_8_TRUE!$HAVE_GECKO_1_8_TRUE$ac_delim
-HAVE_GECKO_1_8_FALSE!$HAVE_GECKO_1_8_FALSE$ac_delim
-HAVE_GECKO_1_8_1_TRUE!$HAVE_GECKO_1_8_1_TRUE$ac_delim
-HAVE_GECKO_1_8_1_FALSE!$HAVE_GECKO_1_8_1_FALSE$ac_delim
-HAVE_GECKO_1_9_TRUE!$HAVE_GECKO_1_9_TRUE$ac_delim
-HAVE_GECKO_1_9_FALSE!$HAVE_GECKO_1_9_FALSE$ac_delim
-HAVE_GECKO_HOME_TRUE!$HAVE_GECKO_HOME_TRUE$ac_delim
-HAVE_GECKO_HOME_FALSE!$HAVE_GECKO_HOME_FALSE$ac_delim
-HAVE_GECKO_XPCOM_GLUE_TRUE!$HAVE_GECKO_XPCOM_GLUE_TRUE$ac_delim
-HAVE_GECKO_XPCOM_GLUE_FALSE!$HAVE_GECKO_XPCOM_GLUE_FALSE$ac_delim
-WITH_GECKO_ENGINE_TRUE!$WITH_GECKO_ENGINE_TRUE$ac_delim
-WITH_GECKO_ENGINE_FALSE!$WITH_GECKO_ENGINE_FALSE$ac_delim
-HAVE_XULRUNNER_TRUE!$HAVE_XULRUNNER_TRUE$ac_delim
-HAVE_XULRUNNER_FALSE!$HAVE_XULRUNNER_FALSE$ac_delim
-WITH_XULRUNNER_ENGINE_TRUE!$WITH_XULRUNNER_ENGINE_TRUE$ac_delim
-WITH_XULRUNNER_ENGINE_FALSE!$WITH_XULRUNNER_ENGINE_FALSE$ac_delim
-MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim
-MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim
-MAINT!$MAINT$ac_delim
-A_CPPFLAGS!$A_CPPFLAGS$ac_delim
-ORBIT_IDL!$ORBIT_IDL$ac_delim
-BONOBO_IDL_INCLUDES!$BONOBO_IDL_INCLUDES$ac_delim
-INSTALL_PREFIX!$INSTALL_PREFIX$ac_delim
-NO_PREFIX_PACKAGE_DATA_DIR!$NO_PREFIX_PACKAGE_DATA_DIR$ac_delim
-PACKAGE_DATA_DIR!$PACKAGE_DATA_DIR$ac_delim
-NO_PREFIX_PACKAGE_DOC_DIR!$NO_PREFIX_PACKAGE_DOC_DIR$ac_delim
-PACKAGE_DOC_DIR!$PACKAGE_DOC_DIR$ac_delim
-NO_PREFIX_PACKAGE_PIXMAPS_DIR!$NO_PREFIX_PACKAGE_PIXMAPS_DIR$ac_delim
-PACKAGE_PIXMAPS_DIR!$PACKAGE_PIXMAPS_DIR$ac_delim
-NO_PREFIX_PACKAGE_HELP_DIR!$NO_PREFIX_PACKAGE_HELP_DIR$ac_delim
-PACKAGE_HELP_DIR!$PACKAGE_HELP_DIR$ac_delim
-NO_PREFIX_PACKAGE_MENU_DIR!$NO_PREFIX_PACKAGE_MENU_DIR$ac_delim
-PACKAGE_MENU_DIR!$PACKAGE_MENU_DIR$ac_delim
-LIBOBJS!$LIBOBJS$ac_delim
-LTLIBOBJS!$LTLIBOBJS$ac_delim
-_ACEOF
+  . ./conf$$subs.sh ||
+    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 41; then
+  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
-    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
    { (exit 1); exit 1; }; }
   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 = ""
 
-ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-if test -n "$ac_eof"; then
-  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-  ac_eof=`expr $ac_eof + 1`
-fi
+}
+{
+  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
+}
 
-cat >>$CONFIG_STATUS <<_ACEOF
-cat >"\$tmp/subs-3.sed" <<\CEOF$ac_eof
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
+_ACAWK
 _ACEOF
-sed '
-s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-s/^/s,@/; s/!/@,|#_!!_#|/
-:n
-t n
-s/'"$ac_delim"'$/,g/; t
-s/$/\\/; p
-N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-' >>$CONFIG_STATUS <conf$$subs.sed
-rm -f conf$$subs.sed
-cat >>$CONFIG_STATUS <<_ACEOF
-:end
-s/|#_!!_#|//g
-CEOF$ac_eof
+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_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
+$as_echo "$as_me: error: could not setup config files machinery" >&2;}
+   { (exit 1); exit 1; }; }
 _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
@@ -27834,19 +21374,133 @@ s/^[^=]*=[	 ]*$//
 }'
 fi
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 fi # test -n "$CONFIG_FILES"
 
+# Set up the scripts for CONFIG_HEADERS section.
+# No need to generate them if there are no CONFIG_HEADERS.
+# This happens for instance with `./config.status Makefile'.
+if test -n "$CONFIG_HEADERS"; then
+cat >"$tmp/defines.awk" <<\_ACAWK ||
+BEGIN {
+_ACEOF
+
+# Transform confdefs.h into an awk script `defines.awk', embedded as
+# here-document in config.status, that substitutes the proper values into
+# config.h.in to produce config.h.
 
-for ac_tag in  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS
+# Create a delimiter string that does not exist in confdefs.h, to ease
+# handling of long lines.
+ac_delim='%!_!# '
+for ac_last_try in false false :; do
+  ac_t=`sed -n "/$ac_delim/p" confdefs.h`
+  if test -z "$ac_t"; then
+    break
+  elif $ac_last_try; then
+    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;}
+   { (exit 1); exit 1; }; }
+  else
+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+  fi
+done
+
+# For the awk script, D is an array of macro values keyed by name,
+# likewise P contains macro parameters if any.  Preserve backslash
+# newline sequences.
+
+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
+sed -n '
+s/.\{148\}/&'"$ac_delim"'/g
+t rset
+:rset
+s/^[	 ]*#[	 ]*define[	 ][	 ]*/ /
+t def
+d
+:def
+s/\\$//
+t bsnl
+s/["\\]/\\&/g
+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
+D["\1"]=" \3"/p
+s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2"/p
+d
+:bsnl
+s/["\\]/\\&/g
+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
+D["\1"]=" \3\\\\\\n"\\/p
+t cont
+s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
+t cont
+d
+:cont
+n
+s/.\{148\}/&'"$ac_delim"'/g
+t clear
+:clear
+s/\\$//
+t bsnlc
+s/["\\]/\\&/g; s/^/"/; s/$/"/p
+d
+:bsnlc
+s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
+b cont
+' <confdefs.h | sed '
+s/'"$ac_delim"'/"\\\
+"/g' >>$CONFIG_STATUS || ac_write_fail=1
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+  for (key in D) D_is_set[key] = 1
+  FS = ""
+}
+/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
+  line = \$ 0
+  split(line, arg, " ")
+  if (arg[1] == "#") {
+    defundef = arg[2]
+    mac1 = arg[3]
+  } else {
+    defundef = substr(arg[1], 2)
+    mac1 = arg[2]
+  }
+  split(mac1, mac2, "(") #)
+  macro = mac2[1]
+  prefix = substr(line, 1, index(line, defundef) - 1)
+  if (D_is_set[macro]) {
+    # Preserve the white space surrounding the "#".
+    print prefix "define", macro P[macro] D[macro]
+    next
+  } else {
+    # Replace #undef with comments.  This is necessary, for example,
+    # in the case of _POSIX_SOURCE, which is predefined and required
+    # on some systems where configure will not decide to define it.
+    if (defundef == "undef") {
+      print "/*", prefix defundef, macro, "*/"
+      next
+    }
+  }
+}
+{ print }
+_ACAWK
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+  { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5
+$as_echo "$as_me: error: could not setup config headers machinery" >&2;}
+   { (exit 1); exit 1; }; }
+fi # test -n "$CONFIG_HEADERS"
+
+
+eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :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*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
-echo "$as_me: error: Invalid tag $ac_tag." >&2;}
+  :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5
+$as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
    { (exit 1); exit 1; }; };;
   :[FH]-) ac_tag=-:-;;
   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
@@ -27875,26 +21529,38 @@ echo "$as_me: error: Invalid tag $ac_tag." >&2;}
 	   [\\/$]*) false;;
 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
 	   esac ||
-	   { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
-echo "$as_me: error: cannot find input file: $ac_f" >&2;}
+	   { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
+$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
    { (exit 1); exit 1; }; };;
       esac
-      ac_file_inputs="$ac_file_inputs $ac_f"
+      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+      ac_file_inputs="$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 "`IFS=:
-	  echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
+    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"
-      { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
+      { $as_echo "$as_me:$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";;
+    *:-:* | *:-) cat >"$tmp/stdin" \
+      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; } ;;
     esac
     ;;
   esac
@@ -27904,7 +21570,7 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$ac_file" : 'X\(//\)[^/]' \| \
 	 X"$ac_file" : 'X\(//\)$' \| \
 	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$ac_file" |
+$as_echo X"$ac_file" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -27930,7 +21596,7 @@ echo X"$ac_file" |
     as_dirs=
     while :; do
       case $as_dir in #(
-      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
       *) as_qdir=$as_dir;;
       esac
       as_dirs="'$as_qdir' $as_dirs"
@@ -27939,7 +21605,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
 	 X"$as_dir" : 'X\(//\)$' \| \
 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$as_dir" |
+$as_echo X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -27960,17 +21626,17 @@ echo X"$as_dir" |
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-echo "$as_me: error: cannot create directory $as_dir" >&2;}
+  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
    { (exit 1); exit 1; }; }; }
   ac_builddir=.
 
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+  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/ ;;
@@ -28015,12 +21681,13 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
   esac
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_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=
 
-case `sed -n '/datarootdir/ {
+ac_sed_dataroot='
+/datarootdir/ {
   p
   q
 }
@@ -28029,13 +21696,14 @@ case `sed -n '/datarootdir/ {
 /@infodir@/p
 /@localedir@/p
 /@mandir@/p
-' $ac_file_inputs` in
+'
+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
 *datarootdir*) ac_datarootdir_seen=yes;;
 *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+  { $as_echo "$as_me:$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
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
   ac_datarootdir_hack='
   s&@datadir@&$datadir&g
   s&@docdir@&$docdir&g
@@ -28049,15 +21717,16 @@ _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
-  sed "$ac_vpsub
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_sed_extra="$ac_vpsub
 $extrasub
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 :t
 /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s&@configure_input@&$configure_input&;t t
+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
@@ -28068,135 +21737,75 @@ 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
-" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" >$tmp/out
+"
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
+  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
 
 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"; } &&
-  { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+  { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined." >&5
-echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+$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
+  -) cat "$tmp/out" && rm -f "$tmp/out";;
+  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
+  esac \
+  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
  ;;
   :H)
   #
   # CONFIG_HEADER
   #
-_ACEOF
-
-# Transform confdefs.h into a sed script `conftest.defines', that
-# substitutes the proper values into config.h.in to produce config.h.
-rm -f conftest.defines conftest.tail
-# First, append a space to every undef/define line, to ease matching.
-echo 's/$/ /' >conftest.defines
-# Then, protect against being on the right side of a sed subst, or in
-# an unquoted here document, in config.status.  If some macros were
-# called several times there might be several #defines for the same
-# symbol, which is useless.  But do not sort them, since the last
-# AC_DEFINE must be honored.
-ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
-# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where
-# NAME is the cpp macro being defined, VALUE is the value it is being given.
-# PARAMS is the parameter list in the macro definition--in most cases, it's
-# just an empty string.
-ac_dA='s,^\\([	 #]*\\)[^	 ]*\\([	 ]*'
-ac_dB='\\)[	 (].*,\\1define\\2'
-ac_dC=' '
-ac_dD=' ,'
-
-uniq confdefs.h |
-  sed -n '
-	t rset
-	:rset
-	s/^[	 ]*#[	 ]*define[	 ][	 ]*//
-	t ok
-	d
-	:ok
-	s/[\\&,]/\\&/g
-	s/^\('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p
-	s/^\('"$ac_word_re"'\)[	 ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p
-  ' >>conftest.defines
-
-# Remove the space that was appended to ease matching.
-# Then replace #undef with comments.  This is necessary, for
-# example, in the case of _POSIX_SOURCE, which is predefined and required
-# on some systems where configure will not decide to define it.
-# (The regexp can be short, since the line contains either #define or #undef.)
-echo 's/ $//
-s,^[	 #]*u.*,/* & */,' >>conftest.defines
-
-# Break up conftest.defines:
-ac_max_sed_lines=50
-
-# First sed command is:	 sed -f defines.sed $ac_file_inputs >"$tmp/out1"
-# Second one is:	 sed -f defines.sed "$tmp/out1" >"$tmp/out2"
-# Third one will be:	 sed -f defines.sed "$tmp/out2" >"$tmp/out1"
-# et cetera.
-ac_in='$ac_file_inputs'
-ac_out='"$tmp/out1"'
-ac_nxt='"$tmp/out2"'
-
-while :
-do
-  # Write a here document:
-    cat >>$CONFIG_STATUS <<_ACEOF
-    # First, check the format of the line:
-    cat >"\$tmp/defines.sed" <<\\CEOF
-/^[	 ]*#[	 ]*undef[	 ][	 ]*$ac_word_re[	 ]*\$/b def
-/^[	 ]*#[	 ]*define[	 ][	 ]*$ac_word_re[(	 ]/b def
-b
-:def
-_ACEOF
-  sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS
-  echo 'CEOF
-    sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS
-  ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in
-  sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail
-  grep . conftest.tail >/dev/null || break
-  rm -f conftest.defines
-  mv conftest.tail conftest.defines
-done
-rm -f conftest.defines conftest.tail
-
-echo "ac_result=$ac_in" >>$CONFIG_STATUS
-cat >>$CONFIG_STATUS <<\_ACEOF
   if test x"$ac_file" != x-; then
-    echo "/* $configure_input  */" >"$tmp/config.h"
-    cat "$ac_result" >>"$tmp/config.h"
-    if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then
-      { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
-echo "$as_me: $ac_file is unchanged" >&6;}
+    {
+      $as_echo "/* $configure_input  */" \
+      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
+    } >"$tmp/config.h" \
+      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
+    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
+      { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5
+$as_echo "$as_me: $ac_file is unchanged" >&6;}
     else
-      rm -f $ac_file
-      mv "$tmp/config.h" $ac_file
+      rm -f "$ac_file"
+      mv "$tmp/config.h" "$ac_file" \
+	|| { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
     fi
   else
-    echo "/* $configure_input  */"
-    cat "$ac_result"
+    $as_echo "/* $configure_input  */" \
+      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
+      || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5
+$as_echo "$as_me: error: could not create -" >&2;}
+   { (exit 1); exit 1; }; }
   fi
-  rm -f "$tmp/out12"
-# Compute $ac_file's index in $config_headers.
+# Compute "$ac_file"'s index in $config_headers.
+_am_arg="$ac_file"
 _am_stamp_count=1
 for _am_header in $config_headers :; do
   case $_am_header in
-    $ac_file | $ac_file:* )
+    $_am_arg | $_am_arg:* )
       break ;;
     * )
       _am_stamp_count=`expr $_am_stamp_count + 1` ;;
   esac
 done
-echo "timestamp for $ac_file" >`$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 ||
-echo X$ac_file |
+echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
+$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$_am_arg" : 'X\(//\)[^/]' \| \
+	 X"$_am_arg" : 'X\(//\)$' \| \
+	 X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$_am_arg" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -28216,30 +21825,40 @@ echo X$ac_file |
 	  s/.*/./; q'`/stamp-h$_am_stamp_count
  ;;
 
-  :C)  { echo "$as_me:$LINENO: executing $ac_file commands" >&5
-echo "$as_me: executing $ac_file commands" >&6;}
+  :C)  { $as_echo "$as_me:$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"" || for mf in $CONFIG_FILES; 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 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
-    dirpart=`$as_dirname -- "$mf" ||
+    "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 ||
-echo X"$mf" |
+$as_echo X"$mf" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -28257,33 +21876,33 @@ echo X"$mf" |
 	    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" ||
+    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 ||
-echo X"$file" |
+$as_echo X"$file" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -28301,7 +21920,7 @@ echo X"$file" |
 	    q
 	  }
 	  s/.*/./; q'`
-    { as_dir=$dirpart/$fdir
+      { as_dir=$dirpart/$fdir
   case $as_dir in #(
   -*) as_dir=./$as_dir;;
   esac
@@ -28309,7 +21928,7 @@ echo X"$file" |
     as_dirs=
     while :; do
       case $as_dir in #(
-      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
       *) as_qdir=$as_dir;;
       esac
       as_dirs="'$as_qdir' $as_dirs"
@@ -28318,7 +21937,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
 	 X"$as_dir" : 'X\(//\)$' \| \
 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$as_dir" |
+$as_echo X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -28339,39 +21958,826 @@ echo X"$as_dir" |
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-echo "$as_me: error: cannot create directory $as_dir" >&2;}
+  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
    { (exit 1); exit 1; }; }; }
-    # echo "creating $dirpart/$file"
-    echo '# dummy' > "$dirpart/$file"
+      # echo "creating $dirpart/$file"
+      echo '# dummy' > "$dirpart/$file"
+    done
   done
-done
+}
  ;;
-    "intltool":C)
-
-for file in intltool-extract intltool-merge intltool-update; do
-  sed -e "s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g" \
-      -e "s|@INTLTOOL_LIBDIR@|${INTLTOOL_LIBDIR}|g" \
-      -e "s|@INTLTOOL_ICONV@|${INTLTOOL_ICONV}|g" \
-      -e "s|@INTLTOOL_MSGFMT@|${INTLTOOL_MSGFMT}|g" \
-      -e "s|@INTLTOOL_MSGMERGE@|${INTLTOOL_MSGMERGE}|g" \
-      -e "s|@INTLTOOL_XGETTEXT@|${INTLTOOL_XGETTEXT}|g" \
-      -e "s|@INTLTOOL_PERL@|${INTLTOOL_PERL}|g" \
-	< ${ac_aux_dir}/${file}.in > ${file}.out
-  if cmp -s ${file} ${file}.out 2>/dev/null; then
-    rm -f ${file}.out
+    "libtool":C)
+
+    # See if we are running on zsh, and set the options which allow our
+    # commands through without removal of \ escapes.
+    if test -n "${ZSH_VERSION+set}" ; then
+      setopt NO_GLOB_SUBST
+    fi
+
+    cfgfile="${ofile}T"
+    trap "$RM \"$cfgfile\"; exit 1" 1 2 15
+    $RM "$cfgfile"
+
+    cat <<_LT_EOF >> "$cfgfile"
+#! $SHELL
+
+# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
+# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+# NOTE: Changes made to this file will be lost: look at ltmain.sh.
+#
+#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
+#                 2006, 2007, 2008 Free Software Foundation, Inc.
+#   Written by Gordon Matzigkeit, 1996
+#
+#   This file is part of GNU Libtool.
+#
+# GNU Libtool 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.
+#
+# As a special exception to the GNU General Public License,
+# if you distribute this file as part of a program or library that
+# is built using GNU Libtool, you may include this file under the
+# same distribution terms that you use for the rest of that program.
+#
+# GNU Libtool 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 GNU Libtool; see the file COPYING.  If not, a copy
+# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
+# obtained by writing to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+
+# The names of the tagged configurations supported by this script.
+available_tags="CXX "
+
+# ### BEGIN LIBTOOL CONFIG
+
+# Which release of libtool.m4 was used?
+macro_version=$macro_version
+macro_revision=$macro_revision
+
+# Whether or not to build shared libraries.
+build_libtool_libs=$enable_shared
+
+# Whether or not to build static libraries.
+build_old_libs=$enable_static
+
+# What type of objects to build.
+pic_mode=$pic_mode
+
+# Whether or not to optimize for fast installation.
+fast_install=$enable_fast_install
+
+# The host system.
+host_alias=$host_alias
+host=$host
+host_os=$host_os
+
+# The build system.
+build_alias=$build_alias
+build=$build
+build_os=$build_os
+
+# A sed program that does not truncate output.
+SED=$lt_SED
+
+# Sed that helps us avoid accidentally triggering echo(1) options like -n.
+Xsed="\$SED -e 1s/^X//"
+
+# A grep program that handles long lines.
+GREP=$lt_GREP
+
+# An ERE matcher.
+EGREP=$lt_EGREP
+
+# A literal string matcher.
+FGREP=$lt_FGREP
+
+# A BSD- or MS-compatible name lister.
+NM=$lt_NM
+
+# Whether we need soft or hard links.
+LN_S=$lt_LN_S
+
+# What is the maximum length of a command?
+max_cmd_len=$max_cmd_len
+
+# Object file suffix (normally "o").
+objext=$ac_objext
+
+# Executable file suffix (normally "").
+exeext=$exeext
+
+# whether the shell understands "unset".
+lt_unset=$lt_unset
+
+# turn spaces into newlines.
+SP2NL=$lt_lt_SP2NL
+
+# turn newlines into spaces.
+NL2SP=$lt_lt_NL2SP
+
+# How to create reloadable object files.
+reload_flag=$lt_reload_flag
+reload_cmds=$lt_reload_cmds
+
+# An object symbol dumper.
+OBJDUMP=$lt_OBJDUMP
+
+# Method to check whether dependent libraries are shared objects.
+deplibs_check_method=$lt_deplibs_check_method
+
+# Command to use when deplibs_check_method == "file_magic".
+file_magic_cmd=$lt_file_magic_cmd
+
+# The archiver.
+AR=$lt_AR
+AR_FLAGS=$lt_AR_FLAGS
+
+# A symbol stripping program.
+STRIP=$lt_STRIP
+
+# Commands used to install an old-style archive.
+RANLIB=$lt_RANLIB
+old_postinstall_cmds=$lt_old_postinstall_cmds
+old_postuninstall_cmds=$lt_old_postuninstall_cmds
+
+# A C compiler.
+LTCC=$lt_CC
+
+# LTCC compiler flags.
+LTCFLAGS=$lt_CFLAGS
+
+# Take the output of nm and produce a listing of raw symbols and C names.
+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
+
+# Transform the output of nm in a proper C declaration.
+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
+
+# Transform the output of nm in a C name address pair.
+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
+
+# Transform the output of nm in a C name address pair when lib prefix is needed.
+global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
+
+# The name of the directory that contains temporary libtool files.
+objdir=$objdir
+
+# Shell to use when invoking shell scripts.
+SHELL=$lt_SHELL
+
+# An echo program that does not interpret backslashes.
+ECHO=$lt_ECHO
+
+# Used to examine libraries when file_magic_cmd begins with "file".
+MAGIC_CMD=$MAGIC_CMD
+
+# Must we lock files when doing compilation?
+need_locks=$lt_need_locks
+
+# Tool to manipulate archived DWARF debug symbol files on Mac OS X.
+DSYMUTIL=$lt_DSYMUTIL
+
+# Tool to change global to local symbols on Mac OS X.
+NMEDIT=$lt_NMEDIT
+
+# Tool to manipulate fat objects and archives on Mac OS X.
+LIPO=$lt_LIPO
+
+# ldd/readelf like tool for Mach-O binaries on Mac OS X.
+OTOOL=$lt_OTOOL
+
+# ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4.
+OTOOL64=$lt_OTOOL64
+
+# Old archive suffix (normally "a").
+libext=$libext
+
+# Shared library suffix (normally ".so").
+shrext_cmds=$lt_shrext_cmds
+
+# The commands to extract the exported symbol list from a shared archive.
+extract_expsyms_cmds=$lt_extract_expsyms_cmds
+
+# Variables whose values should be saved in libtool wrapper scripts and
+# restored at link time.
+variables_saved_for_relink=$lt_variables_saved_for_relink
+
+# Do we need the "lib" prefix for modules?
+need_lib_prefix=$need_lib_prefix
+
+# Do we need a version for libraries?
+need_version=$need_version
+
+# Library versioning type.
+version_type=$version_type
+
+# Shared library runtime path variable.
+runpath_var=$runpath_var
+
+# Shared library path variable.
+shlibpath_var=$shlibpath_var
+
+# Is shlibpath searched before the hard-coded library search path?
+shlibpath_overrides_runpath=$shlibpath_overrides_runpath
+
+# Format of library name prefix.
+libname_spec=$lt_libname_spec
+
+# List of archive names.  First name is the real one, the rest are links.
+# The last name is the one that the linker finds with -lNAME
+library_names_spec=$lt_library_names_spec
+
+# The coded name of the library, if different from the real name.
+soname_spec=$lt_soname_spec
+
+# Command to use after installation of a shared archive.
+postinstall_cmds=$lt_postinstall_cmds
+
+# Command to use after uninstallation of a shared archive.
+postuninstall_cmds=$lt_postuninstall_cmds
+
+# Commands used to finish a libtool library installation in a directory.
+finish_cmds=$lt_finish_cmds
+
+# As "finish_cmds", except a single script fragment to be evaled but
+# not shown.
+finish_eval=$lt_finish_eval
+
+# Whether we should hardcode library paths into libraries.
+hardcode_into_libs=$hardcode_into_libs
+
+# Compile-time system search path for libraries.
+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+
+# Run-time system search path for libraries.
+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+
+# Whether dlopen is supported.
+dlopen_support=$enable_dlopen
+
+# Whether dlopen of programs is supported.
+dlopen_self=$enable_dlopen_self
+
+# Whether dlopen of statically linked programs is supported.
+dlopen_self_static=$enable_dlopen_self_static
+
+# Commands to strip libraries.
+old_striplib=$lt_old_striplib
+striplib=$lt_striplib
+
+
+# The linker used to build libraries.
+LD=$lt_LD
+
+# Commands used to build an old-style archive.
+old_archive_cmds=$lt_old_archive_cmds
+
+# A language specific compiler.
+CC=$lt_compiler
+
+# Is the compiler the GNU compiler?
+with_gcc=$GCC
+
+# Compiler flag to turn off builtin functions.
+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
+
+# How to pass a linker flag through the compiler.
+wl=$lt_lt_prog_compiler_wl
+
+# Additional compiler flags for building library objects.
+pic_flag=$lt_lt_prog_compiler_pic
+
+# Compiler flag to prevent dynamic linking.
+link_static_flag=$lt_lt_prog_compiler_static
+
+# Does compiler simultaneously support -c and -o options?
+compiler_c_o=$lt_lt_cv_prog_compiler_c_o
+
+# Whether or not to add -lc for building shared libraries.
+build_libtool_need_lc=$archive_cmds_need_lc
+
+# Whether or not to disallow shared libs when runtime libs are static.
+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes
+
+# Compiler flag to allow reflexive dlopens.
+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
+
+# Compiler flag to generate shared objects directly from archives.
+whole_archive_flag_spec=$lt_whole_archive_flag_spec
+
+# Whether the compiler copes with passing no objects directly.
+compiler_needs_object=$lt_compiler_needs_object
+
+# Create an old-style archive from a shared archive.
+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds
+
+# Create a temporary old-style archive to link instead of a shared archive.
+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
+
+# Commands used to build a shared archive.
+archive_cmds=$lt_archive_cmds
+archive_expsym_cmds=$lt_archive_expsym_cmds
+
+# Commands used to build a loadable module if different from building
+# a shared archive.
+module_cmds=$lt_module_cmds
+module_expsym_cmds=$lt_module_expsym_cmds
+
+# Whether we are building with GNU ld or not.
+with_gnu_ld=$lt_with_gnu_ld
+
+# Flag that allows shared libraries with undefined symbols to be built.
+allow_undefined_flag=$lt_allow_undefined_flag
+
+# Flag that enforces no undefined symbols.
+no_undefined_flag=$lt_no_undefined_flag
+
+# Flag to hardcode \$libdir into a binary during linking.
+# This must work even if \$libdir does not exist
+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
+
+# If ld is used when linking, flag to hardcode \$libdir into a binary
+# during linking.  This must work even if \$libdir does not exist.
+hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld
+
+# Whether we need a single "-rpath" flag with a separated argument.
+hardcode_libdir_separator=$lt_hardcode_libdir_separator
+
+# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
+# DIR into the resulting binary.
+hardcode_direct=$hardcode_direct
+
+# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
+# DIR into the resulting binary and the resulting library dependency is
+# "absolute",i.e impossible to change by setting \${shlibpath_var} if the
+# library is relocated.
+hardcode_direct_absolute=$hardcode_direct_absolute
+
+# Set to "yes" if using the -LDIR flag during linking hardcodes DIR
+# into the resulting binary.
+hardcode_minus_L=$hardcode_minus_L
+
+# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
+# into the resulting binary.
+hardcode_shlibpath_var=$hardcode_shlibpath_var
+
+# Set to "yes" if building a shared library automatically hardcodes DIR
+# into the library and all subsequent libraries and executables linked
+# against it.
+hardcode_automatic=$hardcode_automatic
+
+# Set to yes if linker adds runtime paths of dependent libraries
+# to runtime path list.
+inherit_rpath=$inherit_rpath
+
+# Whether libtool must link a program against all its dependency libraries.
+link_all_deplibs=$link_all_deplibs
+
+# Fix the shell variable \$srcfile for the compiler.
+fix_srcfile_path=$lt_fix_srcfile_path
+
+# Set to "yes" if exported symbols are required.
+always_export_symbols=$always_export_symbols
+
+# The commands to list exported symbols.
+export_symbols_cmds=$lt_export_symbols_cmds
+
+# Symbols that should not be listed in the preloaded symbols.
+exclude_expsyms=$lt_exclude_expsyms
+
+# Symbols that must always be exported.
+include_expsyms=$lt_include_expsyms
+
+# Commands necessary for linking programs (against libraries) with templates.
+prelink_cmds=$lt_prelink_cmds
+
+# Specify filename containing input files.
+file_list_spec=$lt_file_list_spec
+
+# How to hardcode a shared library path into an executable.
+hardcode_action=$hardcode_action
+
+# The directories searched by this compiler when creating a shared library.
+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs
+
+# Dependencies to place before and after the objects being linked to
+# create a shared library.
+predep_objects=$lt_predep_objects
+postdep_objects=$lt_postdep_objects
+predeps=$lt_predeps
+postdeps=$lt_postdeps
+
+# The library search path used internally by the compiler when linking
+# a shared library.
+compiler_lib_search_path=$lt_compiler_lib_search_path
+
+# ### END LIBTOOL CONFIG
+
+_LT_EOF
+
+  case $host_os in
+  aix3*)
+    cat <<\_LT_EOF >> "$cfgfile"
+# AIX sometimes has problems with the GCC collect2 program.  For some
+# reason, if we set the COLLECT_NAMES environment variable, the problems
+# vanish in a puff of smoke.
+if test "X${COLLECT_NAMES+set}" != Xset; then
+  COLLECT_NAMES=
+  export COLLECT_NAMES
+fi
+_LT_EOF
+    ;;
+  esac
+
+
+ltmain="$ac_aux_dir/ltmain.sh"
+
+
+  # We use sed instead of cat because bash on DJGPP gets confused if
+  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
+  # text mode, it properly converts lines to CR/LF.  This bash problem
+  # is reportedly fixed, but why not run on old versions too?
+  sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
+    || (rm -f "$cfgfile"; exit 1)
+
+  case $xsi_shell in
+  yes)
+    cat << \_LT_EOF >> "$cfgfile"
+
+# func_dirname file append nondir_replacement
+# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
+# otherwise set result to NONDIR_REPLACEMENT.
+func_dirname ()
+{
+  case ${1} in
+    */*) func_dirname_result="${1%/*}${2}" ;;
+    *  ) func_dirname_result="${3}" ;;
+  esac
+}
+
+# func_basename file
+func_basename ()
+{
+  func_basename_result="${1##*/}"
+}
+
+# func_dirname_and_basename file append nondir_replacement
+# perform func_basename and func_dirname in a single function
+# call:
+#   dirname:  Compute the dirname of FILE.  If nonempty,
+#             add APPEND to the result, otherwise set result
+#             to NONDIR_REPLACEMENT.
+#             value returned in "$func_dirname_result"
+#   basename: Compute filename of FILE.
+#             value retuned in "$func_basename_result"
+# Implementation must be kept synchronized with func_dirname
+# and func_basename. For efficiency, we do not delegate to
+# those functions but instead duplicate the functionality here.
+func_dirname_and_basename ()
+{
+  case ${1} in
+    */*) func_dirname_result="${1%/*}${2}" ;;
+    *  ) func_dirname_result="${3}" ;;
+  esac
+  func_basename_result="${1##*/}"
+}
+
+# func_stripname prefix suffix name
+# strip PREFIX and SUFFIX off of NAME.
+# PREFIX and SUFFIX must not contain globbing or regex special
+# characters, hashes, percent signs, but SUFFIX may contain a leading
+# dot (in which case that matches only a dot).
+func_stripname ()
+{
+  # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
+  # positional parameters, so assign one to ordinary parameter first.
+  func_stripname_result=${3}
+  func_stripname_result=${func_stripname_result#"${1}"}
+  func_stripname_result=${func_stripname_result%"${2}"}
+}
+
+# func_opt_split
+func_opt_split ()
+{
+  func_opt_split_opt=${1%%=*}
+  func_opt_split_arg=${1#*=}
+}
+
+# func_lo2o object
+func_lo2o ()
+{
+  case ${1} in
+    *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
+    *)    func_lo2o_result=${1} ;;
+  esac
+}
+
+# func_xform libobj-or-source
+func_xform ()
+{
+  func_xform_result=${1%.*}.lo
+}
+
+# func_arith arithmetic-term...
+func_arith ()
+{
+  func_arith_result=$(( $* ))
+}
+
+# func_len string
+# STRING may not start with a hyphen.
+func_len ()
+{
+  func_len_result=${#1}
+}
+
+_LT_EOF
+    ;;
+  *) # Bourne compatible functions.
+    cat << \_LT_EOF >> "$cfgfile"
+
+# func_dirname file append nondir_replacement
+# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
+# otherwise set result to NONDIR_REPLACEMENT.
+func_dirname ()
+{
+  # Extract subdirectory from the argument.
+  func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
+  if test "X$func_dirname_result" = "X${1}"; then
+    func_dirname_result="${3}"
   else
-    mv -f ${file}.out ${file}
+    func_dirname_result="$func_dirname_result${2}"
   fi
-  chmod ugo+x ${file}
-  chmod u+w ${file}
-done
+}
+
+# func_basename file
+func_basename ()
+{
+  func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
+}
+
+
+# func_stripname prefix suffix name
+# strip PREFIX and SUFFIX off of NAME.
+# PREFIX and SUFFIX must not contain globbing or regex special
+# characters, hashes, percent signs, but SUFFIX may contain a leading
+# dot (in which case that matches only a dot).
+# func_strip_suffix prefix name
+func_stripname ()
+{
+  case ${2} in
+    .*) func_stripname_result=`$ECHO "X${3}" \
+           | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;
+    *)  func_stripname_result=`$ECHO "X${3}" \
+           | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;
+  esac
+}
+
+# sed scripts:
+my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
+my_sed_long_arg='1s/^-[^=]*=//'
+
+# func_opt_split
+func_opt_split ()
+{
+  func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`
+  func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`
+}
+
+# func_lo2o object
+func_lo2o ()
+{
+  func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
+}
+
+# func_xform libobj-or-source
+func_xform ()
+{
+  func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[^.]*$/.lo/'`
+}
+
+# func_arith arithmetic-term...
+func_arith ()
+{
+  func_arith_result=`expr "$@"`
+}
+
+# func_len string
+# STRING may not start with a hyphen.
+func_len ()
+{
+  func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
+}
+
+_LT_EOF
+esac
+
+case $lt_shell_append in
+  yes)
+    cat << \_LT_EOF >> "$cfgfile"
+
+# func_append var value
+# Append VALUE to the end of shell variable VAR.
+func_append ()
+{
+  eval "$1+=\$2"
+}
+_LT_EOF
+    ;;
+  *)
+    cat << \_LT_EOF >> "$cfgfile"
+
+# func_append var value
+# Append VALUE to the end of shell variable VAR.
+func_append ()
+{
+  eval "$1=\$$1\$2"
+}
+
+_LT_EOF
+    ;;
+  esac
+
+
+  sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
+    || (rm -f "$cfgfile"; exit 1)
+
+  mv -f "$cfgfile" "$ofile" ||
+    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
+  chmod +x "$ofile"
+
+
+    cat <<_LT_EOF >> "$ofile"
+
+# ### BEGIN LIBTOOL TAG CONFIG: CXX
+
+# The linker used to build libraries.
+LD=$lt_LD_CXX
+
+# Commands used to build an old-style archive.
+old_archive_cmds=$lt_old_archive_cmds_CXX
+
+# A language specific compiler.
+CC=$lt_compiler_CXX
+
+# Is the compiler the GNU compiler?
+with_gcc=$GCC_CXX
+
+# Compiler flag to turn off builtin functions.
+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
+
+# How to pass a linker flag through the compiler.
+wl=$lt_lt_prog_compiler_wl_CXX
+
+# Additional compiler flags for building library objects.
+pic_flag=$lt_lt_prog_compiler_pic_CXX
+
+# Compiler flag to prevent dynamic linking.
+link_static_flag=$lt_lt_prog_compiler_static_CXX
+
+# Does compiler simultaneously support -c and -o options?
+compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
+
+# Whether or not to add -lc for building shared libraries.
+build_libtool_need_lc=$archive_cmds_need_lc_CXX
+
+# Whether or not to disallow shared libs when runtime libs are static.
+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX
+
+# Compiler flag to allow reflexive dlopens.
+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX
+
+# Compiler flag to generate shared objects directly from archives.
+whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX
+
+# Whether the compiler copes with passing no objects directly.
+compiler_needs_object=$lt_compiler_needs_object_CXX
+
+# Create an old-style archive from a shared archive.
+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX
+
+# Create a temporary old-style archive to link instead of a shared archive.
+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX
+
+# Commands used to build a shared archive.
+archive_cmds=$lt_archive_cmds_CXX
+archive_expsym_cmds=$lt_archive_expsym_cmds_CXX
+
+# Commands used to build a loadable module if different from building
+# a shared archive.
+module_cmds=$lt_module_cmds_CXX
+module_expsym_cmds=$lt_module_expsym_cmds_CXX
+
+# Whether we are building with GNU ld or not.
+with_gnu_ld=$lt_with_gnu_ld_CXX
+
+# Flag that allows shared libraries with undefined symbols to be built.
+allow_undefined_flag=$lt_allow_undefined_flag_CXX
+
+# Flag that enforces no undefined symbols.
+no_undefined_flag=$lt_no_undefined_flag_CXX
+
+# Flag to hardcode \$libdir into a binary during linking.
+# This must work even if \$libdir does not exist
+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX
+
+# If ld is used when linking, flag to hardcode \$libdir into a binary
+# during linking.  This must work even if \$libdir does not exist.
+hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX
+
+# Whether we need a single "-rpath" flag with a separated argument.
+hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX
+
+# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
+# DIR into the resulting binary.
+hardcode_direct=$hardcode_direct_CXX
+
+# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
+# DIR into the resulting binary and the resulting library dependency is
+# "absolute",i.e impossible to change by setting \${shlibpath_var} if the
+# library is relocated.
+hardcode_direct_absolute=$hardcode_direct_absolute_CXX
+
+# Set to "yes" if using the -LDIR flag during linking hardcodes DIR
+# into the resulting binary.
+hardcode_minus_L=$hardcode_minus_L_CXX
+
+# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
+# into the resulting binary.
+hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX
+
+# Set to "yes" if building a shared library automatically hardcodes DIR
+# into the library and all subsequent libraries and executables linked
+# against it.
+hardcode_automatic=$hardcode_automatic_CXX
+
+# Set to yes if linker adds runtime paths of dependent libraries
+# to runtime path list.
+inherit_rpath=$inherit_rpath_CXX
+
+# Whether libtool must link a program against all its dependency libraries.
+link_all_deplibs=$link_all_deplibs_CXX
+
+# Fix the shell variable \$srcfile for the compiler.
+fix_srcfile_path=$lt_fix_srcfile_path_CXX
+
+# Set to "yes" if exported symbols are required.
+always_export_symbols=$always_export_symbols_CXX
+
+# The commands to list exported symbols.
+export_symbols_cmds=$lt_export_symbols_cmds_CXX
+
+# Symbols that should not be listed in the preloaded symbols.
+exclude_expsyms=$lt_exclude_expsyms_CXX
+
+# Symbols that must always be exported.
+include_expsyms=$lt_include_expsyms_CXX
+
+# Commands necessary for linking programs (against libraries) with templates.
+prelink_cmds=$lt_prelink_cmds_CXX
+
+# Specify filename containing input files.
+file_list_spec=$lt_file_list_spec_CXX
+
+# How to hardcode a shared library path into an executable.
+hardcode_action=$hardcode_action_CXX
+
+# The directories searched by this compiler when creating a shared library.
+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_CXX
+
+# Dependencies to place before and after the objects being linked to
+# create a shared library.
+predep_objects=$lt_predep_objects_CXX
+postdep_objects=$lt_postdep_objects_CXX
+predeps=$lt_predeps_CXX
+postdeps=$lt_postdeps_CXX
+
+# The library search path used internally by the compiler when linking
+# a shared library.
+compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
+
+# ### END LIBTOOL TAG CONFIG: CXX
+_LT_EOF
 
  ;;
     "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_echo "$as_me:$LINENO: error: po/Makefile.in.in was not created by intltoolize." >&5
+$as_echo "$as_me: error: po/Makefile.in.in was not created by intltoolize." >&2;}
+   { (exit 1); exit 1; }; }
+    fi
     rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp"
     >"po/stamp-it.tmp"
     sed '/^#/d
@@ -28380,17 +22786,11 @@ done
 	'"s|^|	$ac_top_srcdir/|" \
       "$srcdir/po/POTFILES.in" | sed '$!s/$/ \\/' >"po/POTFILES"
 
-    if test ! -f "po/Makefile"; then
-      { { echo "$as_me:$LINENO: error: po/Makefile is not ready." >&5
-echo "$as_me: error: po/Makefile is not ready." >&2;}
-   { (exit 1); exit 1; }; }
-    fi
-    mv "po/Makefile" "po/Makefile.tmp"
     sed '/^POTFILES =/,/[^\\]$/ {
 		/^POTFILES =/!d
 		r po/POTFILES
 	  }
-	 ' "po/Makefile.tmp" >"po/Makefile"
+	 ' "po/Makefile.in" >"po/Makefile"
     rm -f "po/Makefile.tmp"
     mv "po/stamp-it.tmp" "po/stamp-it"
    ;;
@@ -28404,6 +22804,11 @@ _ACEOF
 chmod +x $CONFIG_STATUS
 ac_clean_files=$ac_clean_files_save
 
+test $ac_write_fail = 0 ||
+  { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
+
 
 # configure is writing to config.log, and then calls config.status.
 # config.status does its own redirection, appending to config.log.
@@ -28425,49 +22830,8 @@ if test "$no_create" != yes; then
   # would make configure fail if this is the last instruction.
   $ac_cs_success || { (exit 1); exit 1; }
 fi
-
-
-echo
-echo "Summary of Xiphos configuration:"
-if test "x$gecko" = xyes; then
-echo "mozilla:                  enabled"
-else
-echo "mozilla:                  disabled"
+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+  { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
 fi
-echo "install directory:      ${prefix}/bin"
-if test "x$have_gtkuprint" = xyes; then
-  echo "gtk-unix-print:          enabled"
-else
-  echo "gtk-unix-print:       not enabled"
 
-fi
-if test "x$debug" = xyes; then
-  echo "debug:                    enabled"
-  if test "x$have_gtkhtml" = xyes; then
-    echo "GTKHTML_CFLAGS        $GTKHTML_CFLAGS"
-  fi
-
-      echo "GECKO_COMPONENT_CFLAGS  $GECKO_COMPONENT_CFLAGS"
-
-  if test "x$ac_static_sword" = xYES; then
-    echo "Static link to Sword:           enabled"
-  else
-    echo "Dynamic link to Sword:          enabled"
-  fi
-
-  if test "x$exporter" = xyes; then
-    echo "Passage exporter:           enabled"
-  else
-    echo "Passage exporter:          disabled"
-  fi
-
-  echo "SWORD_LIBS:   $SWORD_LIBS"
-  echo "SWORD_CFLAGS: $SWORD_CFLAGS"
-  echo "CFLAGS: $CFLAGS"
-  echo "CPPFLAGS: $CPPFLAGS"
-  echo "CXXFLAGS: $CXXFLAGS"
-  echo "GNOME_CFLAGS: $GNOME_CFLAGS"
-  echo "GTKHTML_DATA_DIR        $GTKHTML_DATA_DIR"
-  echo "GTKHTML_API_VERSION     $GTKHTML_API_VERSION"
-  echo "USE_MAINTAINER_MODE                    $USE_MAINTAINER_MODE"
-fi
diff --git a/configure.in b/configure.in
index cdea793..06d4266 100644
--- a/configure.in
+++ b/configure.in
@@ -1,387 +1,163 @@
-AC_INIT(xiphos, 3.1.1, http://sourceforge.net/tracker/?group_id=5528&atid=105528)
-AC_CONFIG_SRCDIR(src/gnome2/xiphos.c)
+AC_INIT([xiphos],[3.1.2],[http://sourceforge.net/tracker/?group_id=5528&atid=105528])
+AC_PREREQ(2.60)
+
+AC_CONFIG_SRCDIR([src/gnome2/xiphos.c])
 AC_CONFIG_MACRO_DIR([m4])
-AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
-
-
-AM_CONFIG_HEADER(config.h)
-
-AC_PROG_MAKE_SET
-
-dnl ***
-dnl Sword libs
-dnl ***
-PKG_CHECK_MODULES(SWORD, sword >= 1.5.11, , echo error: either no sword or sword not recent enough && exit 1)
-PKG_CHECK_MODULES(SWORD_MULTIVERSE, sword > 1.5.11, have_sword_multiverse=yes, have_sword_multiverse=no)
-if test "x$have_sword_multiverse" = xyes; then
-	export SWORD_CFLAGS="$SWORD_CFLAGS -DSWORD_MULTIVERSE"
-fi
-AC_SUBST(SWORD_LIBS)
-AC_SUBST(SWORD_CFLAGS)
-
-dnl ***
-dnl basic environment
-dnl ***
-DIRS="backend gecko editor main gnome2"
-AC_SUBST(DIRS)
-xiphos_exec="xiphos"
-AC_SUBST(xiphos_exec)	
-
-dnl all platforms have a gtk-VIDEOPLATFORM-2.0 lib, but
-dnl it must be at least version 2.12 in order for widget
-dnl tooltips to be set (ha, giggle - cf. F7).
-PKG_CHECK_MODULES(tooltiptext, gtk+-2.0 >= 2.12, have_new_gtk2=yes, have_new_gtk2=no)
-if test "x$have_new_gtk2" = xyes; then
-  AC_DEFINE(HAVE_WIDGET_TOOLTIP_TEXT, 1, [Means gtk_widget_set_tooltip_text works])
-fi
-
-dnl AC_ENABLE_STATIC(yes)
-
-dnl ***
-dnl preliminary check for either flavor of libgtkhtml development support
-dnl ***
-PKG_CHECK_MODULES(GTKHTML_314_presence, libgtkhtml-3.14, have_314=yes, have_314=no)
-PKG_CHECK_MODULES(GTKHTML_38_presence,  libgtkhtml-3.8,  have_38=yes,  have_38=no)
-if test "x$have_314" = xno -a "x$have_38" = xno; then
-	echo error: no gtkhtml3 development library is available.
-	exit 1
-else
-	echo gtkhtml3 development library presence...confirmed
-fi
-
-dnl ***
-dnl gtk+-unix-print
-dnl ***
-UPRINT_LIBS=""
-UPRINT_CFLAGS=""
-PKG_CHECK_MODULES(UPRINT, gtk+-unix-print-2.0, have_gtkuprint=yes,have_gtkuprint=no)
-if test "x$have_gtkuprint" = xyes; then
-  AC_DEFINE(USE_GTKUPRINT, 1, [Define if you want to use gtk-unix-print])
-fi
-AC_SUBST(UPRINT_LIBS)
-AC_SUBST(UPRINT_CFLAGS)
-
-
-dnl ***
-dnl ImageMagick for image dimensions/resize
-dnl ***
-PKG_CHECK_MODULES(ImageMagick, ImageMagick++ >= 6.0.0, , echo error: either no ImageMagick++ or ImageMagick++ not recent enough && exit 1)
-AC_SUBST(ImageMagick_LIBS)
-AC_SUBST(ImageMagick_CFLAGS)
-
-dnl Checks select argument types
-AC_FUNC_SELECT_ARGTYPES
-AC_HEADER_TIME
-
-AC_PROG_INTLTOOL()
-
-AC_ISC_POSIX
-AC_PROG_CC
-AM_PROG_CC_STDC
-AC_HEADER_STDC
-dnl ================================================================
-dnl host_os not declared until after the line below
-dnl ================================================================
-AM_PROG_LIBTOOL
-
-case "$host_os" in
-  mingw*)
-    PKG_CHECK_MODULES(GNOME, glib-2.0 gtk+-2.0 libgnomeui-2.0 libxml-2.0 libglade-2.0 gmodule-no-export-2.0,,echo error: some devel libs are missing: check for glib2 gtk2 libgnomeprintui22 libgnomeui libxml2 libglade2 && exit 1)
-    ;;
-  *)
-    PKG_CHECK_MODULES(GNOME, glib-2.0 gtk+-2.0 libgnomeui-2.0 libxml-2.0 libglade-2.0 gmodule-export-2.0,,echo error: some devel libs are missing: check for glib2 gtk2 libgnomeprintui22 libgnomeui libxml2 libglade2 && exit 1)
-    ;;
-esac
-AC_SUBST(GNOME_LIBS)
-AC_SUBST(GNOME_CFLAGS)
+AC_CONFIG_HEADERS([config.h])
 
+AM_INIT_AUTOMAKE([foreign])
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES])
+AC_SUBST([ACLOCAL_AMFLAGS], ["-I $ac_macro_dir \$(ACLOCAL_FLAGS)"])
+
+AC_PROG_CC
+AM_PROG_CC_C_O
 AC_PROG_CXX
-AC_LANG_CPLUSPLUS
 
-dnl ================================================================
-dnl Gettext stuff.
-dnl ================================================================
-GETTEXT_PACKAGE=xiphos
-AC_SUBST(GETTEXT_PACKAGE)
-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package])
-dnl Languages which your application supports
-	ALL_LINGUAS=""
+AC_CHECK_FUNCS(strcasestr, [AM_CONDITIONAL(HAVE_STRCASESTR, true)], [AM_CONDITIONAL(HAVE_STRCASESTR, false)])
 
+IT_PROG_INTLTOOL([])
+AC_PROG_LIBTOOL dnl using old name instead of LT_INIT for compatability
+
+AC_SUBST([GETTEXT_PACKAGE], [xiphos])
 AM_GLIB_GNU_GETTEXT
+AC_DEFINE([GETTEXT_PACKAGE],  [PACKAGE_TARNAME], [Define to the gettext package name.])
+
+GNOME_DOC_INIT
+
+AC_SUBST(DIRS, [["backend gecko editor main gnome2"]])
+AC_SUBST(xiphos_exec, [[xiphos]])
+
+PKG_PROG_PKG_CONFIG([])
+
+AS_IF([test "x$with_gecko" != "xno"], [
+	    GECKO_INIT([GECKO])
+	    AC_DEFINE(USE_GTKMOZEMBED, 1, [Define if you want to use gtkmozembed])
+	    AS_CASE([$GECKO],
+		[xulrunner], [
+		     PKG_CHECK_MODULES([GECKO_COMPONENT],[${gecko_cv_gecko}-xpcom >= 1.8 $gecko_cv_extra_pkg_dependencies])],
+		[libxul*],   [
+		     PKG_CHECK_MODULES([GECKO_COMPONENT],[$GECKO $gecko_cv_extra_pkg_dependencies])
+		     GECKO_COMPONENT_CFLAGS="$GECKO_COMPONENT_CFLAGS `$PKG_CONFIG --cflags ${gecko_cv_gecko}` `$PKG_CONFIG --define-variable=includetype=unstable --cflags ${gecko_cv_gecko}`"],
+		[*firefox],  [
+		     PKG_CHECK_MODULES([GECKO_COMPONENT],[${gecko_cv_gecko}-xpcom >= 1.5 $gecko_cv_extra_pkg_dependencies])],
+		[AC_MSG_ERROR([$gecko_cv_gecko is not supported])])
+	    AC_SUBST([GECKO])
+	    AC_SUBST(GECKO_HOME)
+	    AC_SUBST(GECKO_COMPONENT_LIBS)
+	    AC_SUBST(GECKO_COMPONENT_CFLAGS)
+	    AC_SUBST([GECKO_FLAVOUR])
+	    AC_SUBST([GECKO_INCLUDE_ROOT])
+	    AC_SUBST([GECKO_PREFIX])
+	    AC_SUBST([GECKO_EXTRA_LIBS])
+	    AC_SUBST([GECKO_GLUE_LIBS])
+	    ],[
+	    AC_MSG_CHECKING([[for GECKO]])
+	    AC_MSG_RESULT([[disabled as requested]])
+	    AC_DEFINE(GTKHTML, 1, [Define if wish to use gtkhtml instead of gtkmozembed])])
+
+GECKO_DEFINES
+AM_CONDITIONAL([HAVE_GECKO],[test "$gecko_cv_have_gecko" = "yes"])
+
+REQUIRED_LIBS="glib-2.0 gtk+-2.0 libxml-2.0 libglade-2.0 libgtkhtml-3.14 sword dbus-glib-1 libgsf-1"
+
+AC_DEFINE(HAVE_DBUS, 1, [Define to enable dbus])
+
+AS_CASE([$host_os], [mingw*],
+		    [REQUIRED_LIBS="$REQUIRED_LIBS gmodule-no-export-2.0"],
+		    [REQUIRED_LIBS="$REQUIRED_LIBS gmodule-export-2.0"])
+
+PKG_CHECK_EXISTS(${GECKO} >= 1.9.1.3, [REQUIRED_LIBS="$REQUIRED_LIBS nspr"])
+
+AC_MSG_CHECKING([for widget tooltips])
+PKG_CHECK_EXISTS(gtk+-2.0 >= 2.12,
+		[AC_DEFINE(HAVE_WIDGET_TOOLTIP_TEXT, 1, [Means gtk_widget_set_tooltip_text works])
+			AC_MSG_RESULT([yes])],
+		[AC_MSG_RESULT([no])])
+
+AC_MSG_CHECKING([for gtk+-unix-print])
+PKG_CHECK_EXISTS(gtk+-unix-print-2.0,
+		[AC_DEFINE(USE_GTKUPRINT, 1, [Define if you want to use gtk-unix-print])
+			[REQUIRED_LIBS="$REQUIRED_LIBS gtk+-unix-print-2.0"]
+			AC_MSG_RESULT([yes])],
+		[AC_MSG_RESULT([no])])
 
-dnl ================================================================
-dnl check for GtkHTML
-dnl ================================================================
-GTKHTML_LIBS=""
-GTKHTML_CFLAGS=""
-
-PKG_CHECK_MODULES(GTKHTML, libgtkhtml-3.14 >= 3.23, have_gtkhtml=yes,have_gtkhtml=no)
-if test "x$have_gtkhtml" = xyes; then
-	PKG_CHECK_MODULES(EDITOR, gtkhtml-editor, , echo error: no gtkhtml-editor && exit 1)
-	AC_DEFINE(USE_GTKHTML3_14_23, 1, [Define if you want to use GtkHtml-3.14])
-	AC_DEFINE(USE_GTKHTML3_14, 1, [Define if you want to use GtkHtml-3.14])
-	dnl gtkhtml_datadir
-	GTKHTML_DATA_DIR="`$PKG_CONFIG --variable=gtkhtml_datadir libgtkhtml-3.14`"
-	dnl gtkhtml api version
-	GTKHTML_API_VERSION=`$PKG_CONFIG --variable gtkhtml_apiversion libgtkhtml-3.14`
-	AC_SUBST(EDITOR_LIBS)
-	AC_SUBST(EDITOR_CFLAGS)
-	CFLAGS="$CFLAGS $EDITOR_CFLAGS"
-	CXXFLAGS="$CXXFLAGS $EDITOR_CFLAGS"
-	LIBS="$LIBS $EDITOR_LIBS"
-	AM_CONDITIONAL(USE_GTKHTML_BONOBO_EDITOR, false)
-else
-	PKG_CHECK_MODULES(GTKHTML, libgtkhtml-3.14, have_gtkhtml=yes,have_gtkhtml=no)
-	AC_DEFINE(USE_GTKHTML3_14, 1, [Define if you want to use GtkHtml-3.14])
-	dnl gtkhtml_datadir
-	GTKHTML_DATA_DIR="`$PKG_CONFIG --variable=gtkhtml_datadir libgtkhtml-3.14`"
-	dnl gtkhtml api version
-	GTKHTML_API_VERSION=`$PKG_CONFIG --variable gtkhtml_apiversion libgtkhtml-3.14`
-	AM_CONDITIONAL(USE_GTKHTML_BONOBO_EDITOR, true)
-fi	
-AC_DEFINE_UNQUOTED(GTKHTML_DATA_DIR, "${GTKHTML_DATA_DIR}", [GtkHTML data directory])
-AC_DEFINE_UNQUOTED(GTKHTML_API_VERSION, "$GTKHTML_API_VERSION", [The gtkhtml api version])
-AC_SUBST(GTKHTML_LIBS)
-AC_SUBST(GTKHTML_CFLAGS)
+
+AC_ARG_WITH([editor],
+    AS_HELP_STRING([--without-editor], [Ignore presence of gtkhtml-editor and use bonobo-editor instead]))
+
+AC_MSG_CHECKING([for editor])
+
+AS_IF([test "x$with_editor" != "xno"],
+      [PKG_CHECK_EXISTS([libgtkhtml-3.14 > 3.23 gtkhtml-editor], [have_editor=yes], [have_editor=no])],
+      [have_editor=no])
+
+AS_IF([test "x$have_editor" = "xyes"],
+      [AC_MSG_RESULT([gtkhtml-editor])
+      AC_DEFINE(USE_GTKHTML3_14_23, 1, [Define if you want to use GtkHtml-3.14])
+      REQUIRED_LIBS="$REQUIRED_LIBS gtkhtml-editor"
+      AM_CONDITIONAL(USE_GTKHTML_BONOBO_EDITOR, false)],
+      [AC_MSG_RESULT([bonobo])
+      AS_IF([test "x$with_editor" = "xyes"],
+            [AC_MSG_ERROR([gtkhtml-editor requested but not found])],
+	    [AM_CONDITIONAL(USE_GTKHTML_BONOBO_EDITOR, true)
+	    AC_SUBST(ORBIT_IDL, [`$PKG_CONFIG --variable=orbit_idl ORBit-2.0`])
+	    AC_SUBST(BONOBO_IDL_INCLUDES, ["-I`$PKG_CONFIG --variable=idldir libbonobo-2.0` -I`$PKG_CONFIG --variable=idldir bonobo-activation-2.0`"])])
+])
+
+AC_MSG_CHECKING([whether to use oldgnome])
+AC_ARG_WITH([gnome], AS_HELP_STRING([--with-oldgnome], [Compile using libgnome]))
+
+AS_IF([test "x$with_oldgnome" != "xyes"],[
+	   PKG_CHECK_EXISTS(gtk+-2.0 >= 2.14, [have_newgtk="yes"], [have_newgtk="no"])],
+	   [have_newgtk="no"]) 
+
+AS_IF([test "x$have_newgtk" = "xyes"],
+      [AC_DEFINE(WITHOUT_GNOME, 1, [Not using libgnomeui])
+      		AC_MSG_RESULT([no])],
+      [AS_IF([test "x$with_oldgnome" = "xyes"],
+             [REQUIRED_LIBS="$REQUIRED_LIBS libgnomeui-2.0"
+	     AC_MSG_RESULT([yes])])
+      ])
+
+PKG_CHECK_MODULES(XIPHOS, "$REQUIRED_LIBS")
+
+AC_MSG_CHECKING([for SWORD multiverse])
+PKG_CHECK_EXISTS(sword > 1.5.11,
+		[AC_DEFINE(SWORD_MULTIVERSE, 1, [Define if sword has multiverse support])
+			AC_MSG_RESULT([yes])],
+		[AC_MSG_RESULT([no])])
+
+AC_DEFINE(USE_GTKHTML3_14, 1, [Define if you want to use GtkHtml-3.14])
+GTKHTML_DATA_DIR=`$PKG_CONFIG --variable=gtkhtml_datadir libgtkhtml-3.14`
+AC_DEFINE_UNQUOTED(GTKHTML_DATA_DIR, ["$GTKHTML_DATA_DIR"], [GtkHTML data directory])
+AC_DEFINE_UNQUOTED(GTKHTML_API_VERSION, ["$PKG_CONFIG --variable gtkhtml_apiversion libgtkhtml-3.14"], [The gtkhtml api version])
 AC_SUBST(GTKHTML_DATA_DIR)
 
-AC_ARG_ENABLE(autoclear,[  --enable-autoclear    use previewer autoclear [default=no]],autoclear=$enableval,autoclear=no)
-if test "x$autoclear" = xyes; then
-  AC_DEFINE(USE_PREVIEWER_AUTOCLEAR, 1, [Define if wish to enable previewer autoclear])
-fi
-
-dnl AC_ARG_ENABLE(old_navbar,[  --enable-old_navbar    use old_navbar [default=no]],old_navbar=$enableval,old_navbar=no)
-dnl if test "x$old_navbar" = xyes; then
-dnl   AC_DEFINE(OLD_NAVBAR, 1, [Define if wish to use the old style navbar])
-dnl fi
-
-AC_ARG_ENABLE(treeview_path,[  --enable-treeview_path    use  treeview_path [default=no]],treeview_path=$enableval,treeview_path=no)
-if test "x$treeview_path" = xyes; then
-  AC_DEFINE(USE_TREEVIEW_PATH, 1, [Define if wish to use the treeview paths])
-fi
-
-AC_ARG_ENABLE(gtkhtml,[  --enable-gtkhtml    use gtkhtml instead of gtkmozembed [default=no]],gtkhtml=$enableval,gtkhtml=no)
-if test "x$gtkhtml" = xyes; then
-  AC_DEFINE(GTKHTML, 1, [Define if wish to use gtkhtml instead of gtkmozembed])
-fi
-
-dnl ====================================
-dnl cygwin
-dnl  ====================================
-AC_ARG_ENABLE(cygwin,[  --enable-cygwin    use cygwin [default=no]],cygwin=$enableval,cygwin=no)
-if test "x$cygwin" = xno; then
-
-  if test "x$gtkhtml" = xno; then
-	dnl  *****
-	dnl  Gecko
-	dnl  *****
-	
-	GECKO_INIT([GECKO])
-
-	AC_SUBST([GECKO])
-	AC_SUBST([GECKO_FLAVOUR])
-	AC_SUBST([GECKO_INCLUDE_ROOT])
-	AC_SUBST([GECKO_HOME])
-	AC_SUBST([GECKO_PREFIX])
-	AC_SUBST([GECKO_EXTRA_LIBS])
-	AC_SUBST([GECKO_GLUE_LIBS])
-
-	case "$GECKO" in
-	 libxul*) gecko_min_version=1.8 ;;
-	 xulrunner) gecko_min_version=1.8 ;;
-	 *firefox) gecko_min_version=1.5 ;;
-	 *) AC_MSG_ERROR([$gecko_cv_gecko is not supported])
-	esac
-	  
-	if test "$GECKO" = "firefox"; then
-	  gecko_cv_gecko=firefox-xpcom
-	elif test "$GECKO" = "xulrunner"; then
-	  gecko_cv_gecko=xulrunner-xpcom
-	fi
-
-	PKG_CHECK_MODULES([GECKO_COMPONENT],[${gecko_cv_gecko} >= $gecko_min_version $gecko_cv_extra_pkg_dependencies])
-
-	AC_DEFINE(USE_GTKMOZEMBED, 1, [Define if you want to use gtkmozembed])
-	AM_CONDITIONAL(USE_GTKMOZEMBED, true)
-	gecko=yes  
-  else
-	GECKO_COMPONENT_LIBS=""
-	GECKO_COMPONENT_CFLAGS="" 
-	GECKO_HOME=""
-	AM_CONDITIONAL(USE_GTKMOZEMBED, false)
-	gecko=no 
-  fi
-
-dnl ==================================================
-dnl Gnome-doc-utils
-dnl under mingw, if GNOME_DOC_INIT is not called we get
-dnl  error: conditional "ENABLE_SK" was never defined.
-dnl ==================================================
-      GNOME_DOC_INIT
-	  
-  case "$host_os" in
-    mingw*)
-      ;;
-    *)
-      dnl ====================================
-      dnl = Begin tests for scrollkeeper
-      dnl ====================================
-      AC_PATH_PROG(SCROLLKEEPER_CONFIG, scrollkeeper-config,no)
-      if test x$SCROLLKEEPER_CONFIG = xno; then
-        AC_MSG_ERROR(Couldn't find scrollkeeper-config. Please install the scrollkeeper package: http://scrollkeeper.sourceforge.net)
-      fi
-      dnl ====================================
-      dnl = End tests for scrollkeeper
-      dnl ====================================Y
-      SCROLLKEEPER_BUILD_REQUIRED=0.3.5
-      AC_SUBST(SCROLLKEEPER_BUILD_REQUIRED)
-      ;;
-  esac
-else
-  dnl cygwin-specific
-  GECKO_COMPONENT_LIBS=""
-  GECKO_COMPONENT_CFLAGS=""
-  GECKO_HOME=""
-  AM_CONDITIONAL(USE_GTKMOZEMBED, false)
-  gecko=no 
-
-  enable_scrollkeeper=no
-  AM_CONDITIONAL(ENABLE_SK,  test "x$enable_scrollkeeper" = "xyes")
-fi
-
-AC_CHECK_FUNCS(strcasestr, [have_strcasestr="yes"])
-AM_CONDITIONAL(HAVE_STRCASESTR, test x$have_strcasestr = xyes)
-
-AC_SUBST(GECKO_HOME)
-AC_SUBST(GECKO_COMPONENT_LIBS)
-AC_SUBST(GECKO_COMPONENT_CFLAGS)
-GECKO_DEFINES
-AM_CONDITIONAL([WITH_GECKO_ENGINE], [test "$with_engine" = "mozilla"])
-AM_CONDITIONAL([HAVE_XULRUNNER],[test "$gecko_cv_gecko" = "xulrunner"])
-AM_CONDITIONAL([WITH_XULRUNNER_ENGINE],[test "$with_engine" = "xulrunner"])
-
-AC_ARG_ENABLE(debug,[  --enable-debug          build debug library [default=no]],debug=$enableval,debug=no)
-if test "x$GXX" = xyes; then
-	CXXFLAGS="$CXXFLAGS -ftemplate-depth-25"
-fi
-
-AM_MAINTAINER_MODE
-if test "x$USE_MAINTAINER_MODE" = "xyes"; then
-  AC_DEFINE(MAINTAINER_MODE, 1, [Define to 1 if you wish to enable 'maintainer-only' behavior.])
-  disable_werror=no
-  enable_debug=yes
-  debug=yes
-dnl   A_CPPFLAGS="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGCONF_DISABLE_DEPRECATED -DGNOME_VFS_DISABLE_DEPRECATED -DBONOBO_UI_DISABLE_DEPRECATED -DBONOBO_DISABLE_DEPRECATED -DLIBGLADE_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED"
-else
-  disable_werror=yes
-  A_CPPFLAGS=
-fi
-AC_SUBST(A_CPPFLAGS)
-if test "x$GXX" = xyes; then
-if test x$debug = xyes; then
-  AC_DEFINE(DEBUG, 1, [Define if you want to see debug messages])
-  if test x$ac_cv_prog_cc_g = xyes; then
-    CFLAGS="$CFLAGS -g3 -O0 "
-  else
-    CFLAGS="$CFLAGS -O0 "
-  fi
-  if test x$ac_cv_prog_cxx_g = xyes; then
-    CXXFLAGS="$CXXFLAGS -g3 -O0"
-  else
-    CXXFLAGS="$CXXFLAGS -O0"
-  fi
-  CFLAGS="$CFLAGS "
-  CXXFLAGS="$CXXFLAGS "
-fi
-fi
-
-AC_ARG_ENABLE(delint,[  --enable-delint         use -Wall -Werror [default=no]],delint=$enableval,delint=no)
-if test "x$delint" = xyes; then
-	CFLAGS="$CFLAGS -Wall -Werror"
-	CXXFLAGS="$CXXFLAGS -Wall -Werror"
-fi
-
-ORBIT_IDL="`$PKG_CONFIG --variable=orbit_idl ORBit-2.0`"
-AC_SUBST(ORBIT_IDL)
-
-BONOBO_IDL_INCLUDES="-I`$PKG_CONFIG --variable=idldir libbonobo-2.0` -I`$PKG_CONFIG --variable=idldir bonobo-activation-2.0`"
-AC_SUBST(BONOBO_IDL_INCLUDES)
-
-
-dnl Set PACKAGE_LOCALE_DIR in config.h.
-if test "x${prefix}" = "xNONE"; then
-  AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "${ac_default_prefix}/${DATADIRNAME}/locale",[package LOCALE directory])
-else
-  AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "${prefix}/${DATADIRNAME}/locale",[package LOCALE directory])
-fi
-
-
-dnl Set PACKAGE SOURCE DIR in config.h.
-packagesrcdir=`cd $srcdir && pwd`
-
-dnl Set PACKAGE PREFIX
-if test "x${prefix}" = "xNONE"; then
-  packageprefix=${ac_default_prefix}
-else
-  packageprefix=${prefix}
-fi
-
-INSTALL_PREFIX="${packageprefix}/"
-AC_SUBST(INSTALL_PREFIX)
-AC_DEFINE_UNQUOTED(INSTALL_PREFIX, "${packageprefix}/",[install prefix])
-
-
-dnl Set PACKAGE DATA & DOC DIR
-packagedatadir=share/${PACKAGE}
-packagedocdir=share/doc/${PACKAGE}
-
-dnl Set PACKAGE DIRs in config.h.
-packagepixmapsdir=share/pixmaps/${PACKAGE}
-packagehelpdir=share/gnome/help/${PACKAGE}
-packagemenudir=share/applications
-
-dnl Subst PACKAGE_DATA_DIR.
-NO_PREFIX_PACKAGE_DATA_DIR="${packagedatadir}"
-AC_SUBST(NO_PREFIX_PACKAGE_DATA_DIR)
-PACKAGE_DATA_DIR="${packageprefix}/${packagedatadir}"
-AC_SUBST(PACKAGE_DATA_DIR)
-
-dnl Subst PACKAGE_DOC_DIR.
-NO_PREFIX_PACKAGE_DOC_DIR="${packagedocdir}"
-AC_SUBST(NO_PREFIX_PACKAGE_DOC_DIR)
-PACKAGE_DOC_DIR="${packageprefix}/${packagedocdir}"
-AC_SUBST(PACKAGE_DOC_DIR)
-
-dnl Subst PACKAGE_PIXMAPS_DIR.
-NO_PREFIX_PACKAGE_PIXMAPS_DIR="${packagepixmapsdir}"
-AC_SUBST(NO_PREFIX_PACKAGE_PIXMAPS_DIR)
-PACKAGE_PIXMAPS_DIR="${packageprefix}/${packagepixmapsdir}"
-AC_SUBST(PACKAGE_PIXMAPS_DIR)
-
-dnl Subst PACKAGE_HELP_DIR.
-NO_PREFIX_PACKAGE_HELP_DIR="${packagehelpdir}"
-AC_SUBST(NO_PREFIX_PACKAGE_HELP_DIR)
-PACKAGE_HELP_DIR="${packageprefix}/${packagehelpdir}"
-AC_SUBST(PACKAGE_HELP_DIR)
-
-dnl Subst PACKAGE_MENU_DIR.
-NO_PREFIX_PACKAGE_MENU_DIR="${packagemenudir}"
-AC_SUBST(NO_PREFIX_PACKAGE_MENU_DIR)
-PACKAGE_MENU_DIR="${packageprefix}/${packagemenudir}"
-AC_SUBST(PACKAGE_MENU_DIR)
-
-AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${packageprefix}/${packagedatadir}",[package data directory])
-AC_DEFINE_UNQUOTED(PACKAGE_DOC_DIR, "${packageprefix}/${packagedocdir}",[package doc directory])
-AC_DEFINE_UNQUOTED(PACKAGE_PIXMAPS_DIR, "${packageprefix}/${packagepixmapsdir}",[package pixmap directory])
-AC_DEFINE_UNQUOTED(PACKAGE_HELP_DIR, "${packageprefix}/${packagehelpdir}",[package help directory])
-AC_DEFINE_UNQUOTED(PACKAGE_MENU_DIR, "${packageprefix}/${packagemenudir}",[package menu directory])
-AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "${packagesrcdir}",[package source directory])
-
-AC_OUTPUT([ 
+AC_SUBST(XIPHOS_LIBS)
+AC_SUBST(XIPHOS_CFLAGS)
+
+AM_MAINTAINER_MODE([enable])
+GNOME_COMPILE_WARNINGS
+GNOME_CXX_WARNINGS
+
+AC_MSG_CHECKING([for debug build])
+AC_ARG_ENABLE([debug],
+	AS_HELP_STRING([--enable-debug], [Enable debugging @<:@default=no@:>@]))
+AS_IF([test "x$enable_debug" = "xyes"], [
+	    AC_DEFINE(DEBUG, 1, [Enable additional debugging at the expense of performance and size])
+			AC_MSG_RESULT([yes])],
+	    [AC_MSG_RESULT([no])])
+
+AC_ARG_ENABLE([as-needed],
+	AS_HELP_STRING([--enable-as-needed], [Pass -Wl --as-needed to linker @<:@default=no@:>@]))
+AS_IF([test "x$enable_as_needed" = "xyes"], [AC_SUBST([AM_LDFLAGS],[[-Wl,--as-needed]])])
+
+AC_CONFIG_FILES([
 Makefile
 po/Makefile.in
 doc/Makefile
 help/Makefile
+pixmaps/Makefile
 src/Makefile
 src/backend/Makefile
 src/gecko/Makefile
@@ -392,50 +168,4 @@ ui/Makefile
 xiphos.desktop.in
 xiphos.spec
 ])
-
-echo
-echo "Summary of Xiphos configuration:"
-if test "x$gecko" = xyes; then
-echo "mozilla:                  enabled"
-else
-echo "mozilla:                  disabled"
-fi
-echo "install directory:      ${prefix}/bin"
-if test "x$have_gtkuprint" = xyes; then
-  echo "gtk-unix-print:          enabled"
-else
-  echo "gtk-unix-print:       not enabled"
-
-fi
-if test "x$debug" = xyes; then
-  echo "debug:                    enabled"
-  if test "x$have_gtkhtml" = xyes; then
-    echo "GTKHTML_CFLAGS        $GTKHTML_CFLAGS"
-  fi
-
-  dnl if test "x$no_gecko" = xyes; then
-    echo "GECKO_COMPONENT_CFLAGS  $GECKO_COMPONENT_CFLAGS"
-  dnl fi
-
-  if test "x$ac_static_sword" = xYES; then
-    echo "Static link to Sword:           enabled"
-  else  
-    echo "Dynamic link to Sword:          enabled"
-  fi
-  
-  if test "x$exporter" = xyes; then
-    echo "Passage exporter:           enabled"
-  else  
-    echo "Passage exporter:          disabled"
-  fi
-  
-  echo "SWORD_LIBS:   $SWORD_LIBS"
-  echo "SWORD_CFLAGS: $SWORD_CFLAGS"
-  echo "CFLAGS: $CFLAGS"
-  echo "CPPFLAGS: $CPPFLAGS"
-  echo "CXXFLAGS: $CXXFLAGS"
-  echo "GNOME_CFLAGS: $GNOME_CFLAGS"
-  echo "GTKHTML_DATA_DIR        $GTKHTML_DATA_DIR"
-  echo "GTKHTML_API_VERSION     $GTKHTML_API_VERSION"
-  echo "USE_MAINTAINER_MODE                    $USE_MAINTAINER_MODE"
-fi
+AC_OUTPUT
diff --git a/depcomp b/depcomp
index ca5ea4e..df8eea7 100755
--- a/depcomp
+++ b/depcomp
@@ -1,10 +1,10 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
 
-scriptversion=2006-10-15.18
+scriptversion=2009-04-28.21; # UTC
 
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006 Free Software
-# Foundation, Inc.
+# 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
@@ -17,9 +17,7 @@ scriptversion=2006-10-15.18
 # 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., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# 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
@@ -87,6 +85,15 @@ if test "$depmode" = dashXmstdout; then
    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
@@ -192,14 +199,14 @@ sgi)
 ' < "$tmpdepfile" \
     | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
     tr '
-' ' ' >> $depfile
-    echo >> $depfile
+' ' ' >> "$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
+   >> "$depfile"
   else
     # The sourcefile does not contain any dependencies, so just
     # store a dummy comment line, to avoid errors with the Makefile
@@ -215,34 +222,39 @@ aix)
   # 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.
-  stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'`
-  tmpdepfile="$stripped.u"
+  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 -f "$tmpdepfile"; then :
-  else
-    stripped=`echo "$stripped" | sed 's,^.*/,,'`
-    tmpdepfile="$stripped.u"
-  fi
-
   if test $stat -eq 0; then :
   else
-    rm -f "$tmpdepfile"
+    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
-    outname="$stripped.o"
     # 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,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
-    sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
+    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
@@ -323,7 +335,12 @@ hp2)
   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"
+    sed -ne '2,${
+	       s/^ *//
+	       s/ \\*$//
+	       s/$/:/
+	       p
+	     }' "$tmpdepfile" >> "$depfile"
   else
     echo "#dummy" > "$depfile"
   fi
@@ -399,7 +416,7 @@ dashmstdout)
 
   # Remove the call to Libtool.
   if test "$libtool" = yes; then
-    while test $1 != '--mode=compile'; do
+    while test "X$1" != 'X--mode=compile'; do
       shift
     done
     shift
@@ -450,32 +467,39 @@ makedepend)
   "$@" || exit $?
   # Remove any Libtool call
   if test "$libtool" = yes; then
-    while test $1 != '--mode=compile'; do
+    while test "X$1" != 'X--mode=compile'; do
       shift
     done
     shift
   fi
   # X makedepend
   shift
-  cleared=no
-  for arg in "$@"; do
+  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/^.*\././'`"
+  obj_suffix=`echo "$object" | sed 's/^.*\././'`
   touch "$tmpdepfile"
   ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
   rm -f "$depfile"
@@ -495,7 +519,7 @@ cpp)
 
   # Remove the call to Libtool.
   if test "$libtool" = yes; then
-    while test $1 != '--mode=compile'; do
+    while test "X$1" != 'X--mode=compile'; do
       shift
     done
     shift
@@ -533,13 +557,27 @@ cpp)
 
 msvisualcpp)
   # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout, regardless of -o,
-  # because we must use -o when running libtool.
+  # 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
@@ -552,16 +590,23 @@ msvisualcpp)
 	;;
     esac
   done
-  "$@" -E |
-  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
+  "$@" -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"
-  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
+  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
   echo "	" >> "$depfile"
-  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$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 "$@"
   ;;
@@ -580,5 +625,6 @@ exit 0
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
 # End:
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 49ba57d..ce50c46 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 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.
@@ -15,8 +16,9 @@
 @SET_MAKE@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@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
@@ -36,24 +38,36 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gecko.m4 \
 	$(top_srcdir)/m4/gnome-doc-utils.m4 \
-	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in
+	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 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@
+ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AM_LDFLAGS = @AM_LDFLAGS@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-A_CPPFLAGS = @A_CPPFLAGS@
 BONOBO_IDL_INCLUDES = @BONOBO_IDL_INCLUDES@
 CATALOGS = @CATALOGS@
 CATOBJEXT = @CATOBJEXT@
@@ -71,17 +85,16 @@ DATADIRNAME = @DATADIRNAME@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DIRS = @DIRS@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
 DOC_USER_FORMATS = @DOC_USER_FORMATS@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
-EDITOR_CFLAGS = @EDITOR_CFLAGS@
-EDITOR_LIBS = @EDITOR_LIBS@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
 GECKO = @GECKO@
 GECKO_COMPONENT_CFLAGS = @GECKO_COMPONENT_CFLAGS@
 GECKO_COMPONENT_LIBS = @GECKO_COMPONENT_LIBS@
@@ -94,57 +107,26 @@ GECKO_PREFIX = @GECKO_PREFIX@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
-GNOME_CFLAGS = @GNOME_CFLAGS@
-GNOME_LIBS = @GNOME_LIBS@
 GREP = @GREP@
-GTKHTML_314_presence_CFLAGS = @GTKHTML_314_presence_CFLAGS@
-GTKHTML_314_presence_LIBS = @GTKHTML_314_presence_LIBS@
-GTKHTML_38_presence_CFLAGS = @GTKHTML_38_presence_CFLAGS@
-GTKHTML_38_presence_LIBS = @GTKHTML_38_presence_LIBS@
-GTKHTML_CFLAGS = @GTKHTML_CFLAGS@
 GTKHTML_DATA_DIR = @GTKHTML_DATA_DIR@
-GTKHTML_LIBS = @GTKHTML_LIBS@
 HELP_DIR = @HELP_DIR@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PREFIX = @INSTALL_PREFIX@
 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_ICONV = @INTLTOOL_ICONV@
-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
-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_SERVICE_RULE = @INTLTOOL_SERVICE_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_XGETTEXT = @INTLTOOL_XGETTEXT@
-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
-ImageMagick_CFLAGS = @ImageMagick_CFLAGS@
-ImageMagick_LIBS = @ImageMagick_LIBS@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
@@ -153,22 +135,18 @@ MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 MSGFMT_OPTS = @MSGFMT_OPTS@
-NO_PREFIX_PACKAGE_DATA_DIR = @NO_PREFIX_PACKAGE_DATA_DIR@
-NO_PREFIX_PACKAGE_DOC_DIR = @NO_PREFIX_PACKAGE_DOC_DIR@
-NO_PREFIX_PACKAGE_HELP_DIR = @NO_PREFIX_PACKAGE_HELP_DIR@
-NO_PREFIX_PACKAGE_MENU_DIR = @NO_PREFIX_PACKAGE_MENU_DIR@
-NO_PREFIX_PACKAGE_PIXMAPS_DIR = @NO_PREFIX_PACKAGE_PIXMAPS_DIR@
+MSGMERGE = @MSGMERGE@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 OMF_DIR = @OMF_DIR@
 ORBIT_IDL = @ORBIT_IDL@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_DATA_DIR = @PACKAGE_DATA_DIR@
-PACKAGE_DOC_DIR = @PACKAGE_DOC_DIR@
-PACKAGE_HELP_DIR = @PACKAGE_HELP_DIR@
-PACKAGE_MENU_DIR = @PACKAGE_MENU_DIR@
 PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_PIXMAPS_DIR = @PACKAGE_PIXMAPS_DIR@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
@@ -179,28 +157,24 @@ POSUB = @POSUB@
 PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
 PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
 RANLIB = @RANLIB@
-SCROLLKEEPER_BUILD_REQUIRED = @SCROLLKEEPER_BUILD_REQUIRED@
-SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-SWORD_CFLAGS = @SWORD_CFLAGS@
-SWORD_LIBS = @SWORD_LIBS@
-SWORD_MULTIVERSE_CFLAGS = @SWORD_MULTIVERSE_CFLAGS@
-SWORD_MULTIVERSE_LIBS = @SWORD_MULTIVERSE_LIBS@
-UPRINT_CFLAGS = @UPRINT_CFLAGS@
-UPRINT_LIBS = @UPRINT_LIBS@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
+WARN_CFLAGS = @WARN_CFLAGS@
+WARN_CXXFLAGS = @WARN_CXXFLAGS@
 XGETTEXT = @XGETTEXT@
+XIPHOS_CFLAGS = @XIPHOS_CFLAGS@
+XIPHOS_LIBS = @XIPHOS_LIBS@
 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@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -231,6 +205,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -243,8 +218,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-tooltiptext_CFLAGS = @tooltiptext_CFLAGS@
-tooltiptext_LIBS = @tooltiptext_LIBS@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 xiphos_exec = @xiphos_exec@
@@ -255,14 +229,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( 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  doc/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  doc/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign doc/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -280,6 +254,7 @@ $(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):
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -309,13 +284,17 @@ distdir: $(DISTFILES)
 	  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 -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -343,6 +322,7 @@ 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"
@@ -361,6 +341,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -369,18 +351,28 @@ install-data-am:
 
 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
@@ -414,6 +406,7 @@ uninstall-am:
 	maintainer-clean-generic mostlyclean mostlyclean-generic \
 	mostlyclean-libtool pdf pdf-am ps ps-am 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/gnome-doc-utils.make b/gnome-doc-utils.make
index a5279cc..b7ea210 100644
--- a/gnome-doc-utils.make
+++ b/gnome-doc-utils.make
@@ -416,6 +416,11 @@ dist-doc-docs: $(_DOC_C_DOCS) $(_DOC_LC_DOCS) $(_DOC_POFILES)
 	@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
@@ -466,8 +471,8 @@ check-doc-docs: $(_DOC_C_DOCS) $(_DOC_LC_DOCS)
 
 check-doc-omf: $(_DOC_OMF_ALL)
 	@list='$(_DOC_OMF_ALL)'; for omf in $$list; do \
-	  echo "xmllint --noout --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf"; \
-	  xmllint --noout --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf; \
+	  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
 
 
@@ -486,6 +491,12 @@ install-doc-docs:
 	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_MODULE)/$$docdir"; \
+	  if ! test -d "$$docdir"; then \
+	    echo "$(mkinstalldirs) $$docdir"; \
+	    $(mkinstalldirs) "$$docdir"; \
+	  fi; \
 	  echo "$(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc"; \
 	  $(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc; \
 	done
@@ -493,14 +504,13 @@ install-doc-docs:
 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"; \
-	    elif test -f "C/$$fig"; then \
-	      figfile="C/$$fig"; \
 	    else \
-	      figfile="$(srcdir)/C/$$fig"; \
+	      figsymlink=true; \
 	    fi; \
 	    figdir="$$lc/"`echo $$fig | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
 	    figdir="$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$figdir"; \
@@ -509,8 +519,13 @@ install-doc-figs:
 	      $(mkinstalldirs) "$$figdir"; \
 	    fi; \
 	    figbase=`echo $$fig | sed -e 's/^.*\///'`; \
-	    echo "$(INSTALL_DATA) $$figfile $$figdir$$figbase"; \
-	    $(INSTALL_DATA) "$$figfile" "$$figdir$$figbase"; \
+	    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
 
@@ -554,7 +569,7 @@ uninstall-doc-figs:
 
 uninstall-doc-omf:
 	@list='$(_DOC_OMF_ALL)'; for omf in $$list; do \
-	  if test "x$(_ENABLE_SK)" == "xtrue"; then \
+	  if test "x$(_ENABLE_SK)" = "xtrue"; then \
 	    echo "scrollkeeper-uninstall -p $(_sklocalstatedir) $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
 	    scrollkeeper-uninstall -p "$(_sklocalstatedir)" "$(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
 	  fi; \
diff --git a/help/C/interface.xml b/help/C/interface.xml
index 1101e4d..b5641c1 100644
--- a/help/C/interface.xml
+++ b/help/C/interface.xml
@@ -587,6 +587,10 @@
 		<guibutton>*u</guibutton> at the beginning of the verse.  Hovering on this marker will show the annotation in the previewer, just as
 		for publisher's footnotes.
 		</para>
+		<para>
+		If a devotional has been set via the Preferences dialog, then the day's devotional reference will also appear in the
+		previewer, either on program startup or when the user requests it via the <guimenuitem>View</guimenuitem> menu.
+		</para>
 	</sect2>	
 <!-- ============= Commentary Pane  ============--> 
 	<sect2 id="xiphos-commentaries">
diff --git a/help/C/legal.xml b/help/C/legal.xml
index 565b938..ea7403b 100644
--- a/help/C/legal.xml
+++ b/help/C/legal.xml
@@ -1,431 +1,363 @@
- <legalnotice id="legalnotice">
-   <title>GNU GENERAL PUBLIC LICENSE</title>
-   <para>Version 2, June 1991</para>
-   <para>
-     Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-   </para>
-   <para>
-     51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-   </para>
-   <para>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-   </para>
-   
-   <sect2 id="legal-preamble">
-     <title>Preamble</title>
-     <para>
-       The licenses for most software are designed to take away your
-       freedom to share and change it.  By contrast, the GNU General Public
-       License is intended to guarantee your freedom to share and change free
-       software--to make sure the software is free for all its users.  This
-       General Public License applies to most of the Free Software
-       Foundation's software and to any other program whose authors commit to
-       using it.  (Some other Free Software Foundation software is covered by
-       the GNU Library General Public License instead.)  You can apply it to
-       your programs, too.
-     </para>
-     <para>
-       When we speak of free software, we are referring to freedom, not
-       price.  Our General Public Licenses are designed to make sure that you
-       have the freedom to distribute copies of free software (and charge for
-       this service if you wish), that you receive source code or can get it
-       if you want it, that you can change the software or use pieces of it
-       in new free programs; and that you know you can do these things.
-     </para>
-     <para>
-       To protect your rights, we need to make restrictions that forbid
-       anyone to deny you these rights or to ask you to surrender the rights.
-       These restrictions translate to certain responsibilities for you if you
-       distribute copies of the software, or if you modify it.
-     </para>
-     <para>
-       For example, if you distribute copies of such a program, whether
-       gratis or for a fee, you must give the recipients all the rights that
-       you have.  You must make sure that they, too, receive or can get the
-       source code.  And you must show them these terms so they know their
-       rights.
-     </para>
-     <para>
-       We protect your rights with two steps: (1) copyright the software, and
-       (2) offer you this license which gives you legal permission to copy,
-       distribute and/or modify the software.
-     </para>
-     <para>
-       Also, for each author's protection and ours, we want to make certain
-       that everyone understands that there is no warranty for this free
-       software.  If the software is modified by someone else and passed on, we
-       want its recipients to know that what they have is not the original, so
-       that any problems introduced by others will not reflect on the original
-       authors' reputations.
-     </para>
-     <para>
-       Finally, any free program is threatened constantly by software
-       patents.  We wish to avoid the danger that redistributors of a free
-       program will individually obtain patent licenses, in effect making the
-       program proprietary.  To prevent this, we have made it clear that any
-       patent must be licensed for everyone's free use or not licensed at all.
-     </para>
-     <para>
-       The precise terms and conditions for copying, distribution and
-       modification follow.
-     </para>
-   </sect2>
-   
-   <sect2 id="legal-distribution">
-     <title>GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS
-       FOR COPYING, DISTRIBUTION AND MODIFICATION</title>
-     <itemizedlist>
-       <listitem>
-	 <para>
-	   0. This License applies to any program or other work which contains
-	   a notice placed by the copyright holder saying it may be distributed
-	   under the terms of this General Public License.  The "Program", below,
-	   refers to any such program or work, and a "work based on the Program"
-	   means either the Program or any derivative work under copyright law:
-	   that is to say, a work containing the Program or a portion of it,
-	   either verbatim or with modifications and/or translated into another
-	   language.  (Hereinafter, translation is included without limitation in
-	   the term "modification".)  Each licensee is addressed as "you".
-	 </para>
-	 <para>
-	   Activities other than copying, distribution and modification are not
-	   covered by this License; they are outside its scope.  The act of
-	   running the Program is not restricted, and the output from the Program
-	   is covered only if its contents constitute a work based on the
-	   Program (independent of having been made by running the Program).
-	   Whether that is true depends on what the Program does.
-	 </para>
-       </listitem>
-       <listitem>
-	 <para>
-	   1. You may copy and distribute verbatim copies of the Program's
-	   source code as you receive it, in any medium, provided that you
-	   conspicuously and appropriately publish on each copy an appropriate
-	   copyright notice and disclaimer of warranty; keep intact all the
-	   notices that refer to this License and to the absence of any warranty;
-	   and give any other recipients of the Program a copy of this License
-	   along with the Program.
-	 </para>
-	 <para>
-	   You may charge a fee for the physical act of transferring a copy, and
-	   you may at your option offer warranty protection in exchange for a fee.
-	 </para>
-       </listitem>
-       <listitem>
-	 <para>
-	   2. You may modify your copy or copies of the Program or any portion
-	   of it, thus forming a work based on the Program, and copy and
-	   distribute such modifications or work under the terms of Section 1
-	   above, provided that you also meet all of these conditions:
-	 </para>
-	 <para>
-	   a) You must cause the modified files to carry prominent notices
-	   stating that you changed the files and the date of any change.
-	 </para>
-	 <para>
-	   b) You must cause any work that you distribute or publish, that in
-	   whole or in part contains or is derived from the Program or any
-	   part thereof, to be licensed as a whole at no charge to all third
-	   parties under the terms of this License.
-	 </para>
-	 <para>
-	   c) If the modified program normally reads commands interactively
-	   when run, you must cause it, when started running for such
-	   interactive use in the most ordinary way, to print or display an
-	   announcement including an appropriate copyright notice and a
-	   notice that there is no warranty (or else, saying that you provide
-	   a warranty) and that users may redistribute the program under
-	   these conditions, and telling the user how to view a copy of this
-	   License.  (Exception: if the Program itself is interactive but
-	   does not normally print such an announcement, your work based on
-	   the Program is not required to print an announcement.)
-	 </para>
-	 <para>
-	   These requirements apply to the modified work as a whole.  If
-	   identifiable sections of that work are not derived from the Program,
-	   and can be reasonably considered independent and separate works in
-	   themselves, then this License, and its terms, do not apply to those
-	   sections when you distribute them as separate works.  But when you
-	   distribute the same sections as part of a whole which is a work based
-	   on the Program, the distribution of the whole must be on the terms of
-	   this License, whose permissions for other licensees extend to the
-	   entire whole, and thus to each and every part regardless of who wrote it.
-	 </para>
-	 <para>
-	   Thus, it is not the intent of this section to claim rights or contest
-	   your rights to work written entirely by you; rather, the intent is to
-	   exercise the right to control the distribution of derivative or
-	   collective works based on the Program.
-	 </para>
-	 <para>
-	   In addition, mere aggregation of another work not based on the Program
-	   with the Program (or with a work based on the Program) on a volume of
-	   a storage or distribution medium does not bring the other work under
-	   the scope of this License.
-	 </para>
-       </listitem>
-       <listitem>
-	 <para>
-	   3. You may copy and distribute the Program (or a work based on it,
-	   under Section 2) in object code or executable form under the terms of
-	   Sections 1 and 2 above provided that you also do one of the following:
-	 </para>
-	 <para>
-	   a) Accompany it with the complete corresponding machine-readable
-	   source code, which must be distributed under the terms of Sections
-	   1 and 2 above on a medium customarily used for software interchange; or,
-	 </para>
-	 <para>
-	   b) Accompany it with a written offer, valid for at least three
-	   years, to give any third party, for a charge no more than your
-	   cost of physically performing source distribution, a complete
-	   machine-readable copy of the corresponding source code, to be
-	   distributed under the terms of Sections 1 and 2 above on a medium
-	   customarily used for software interchange; or,
-	 </para>
-	 <para>
-	   c) Accompany it with the information you received as to the offer
-	   to distribute corresponding source code.  (This alternative is
-	   allowed only for noncommercial distribution and only if you
-	   received the program in object code or executable form with such
-	   an offer, in accord with Subsection b above.)
-	 </para>
-	 <para>
-	   The source code for a work means the preferred form of the work for
-	   making modifications to it.  For an executable work, complete source
-	   code means all the source code for all modules it contains, plus any
-	   associated interface definition files, plus the scripts used to
-	   control compilation and installation of the executable.  However, as a
-	   special exception, the source code distributed need not include
-	   anything that is normally distributed (in either source or binary
-	   form) with the major components (compiler, kernel, and so on) of the
-	   operating system on which the executable runs, unless that component
-	   itself accompanies the executable.
-	 </para>
-	 <para>
-	   If distribution of executable or object code is made by offering
-	   access to copy from a designated place, then offering equivalent
-	   access to copy the source code from the same place counts as
-	   distribution of the source code, even though third parties are not
-	   compelled to copy the source along with the object code.
-	 </para>
-       </listitem>
-       <listitem>
-	 <para>
-	   4. You may not copy, modify, sublicense, or distribute the Program
-	   except as expressly provided under this License.  Any attempt
-	   otherwise to copy, modify, sublicense or distribute the Program is
-	   void, and will automatically terminate your rights under this License.
-	   However, parties who have received copies, or rights, from you under
-	   this License will not have their licenses terminated so long as such
-	   parties remain in full compliance.
-	 </para>
-       </listitem>
-       <listitem>
-	 <para>
-	   5. You are not required to accept this License, since you have not
-	   signed it.  However, nothing else grants you permission to modify or
-	   distribute the Program or its derivative works.  These actions are
-	   prohibited by law if you do not accept this License.  Therefore, by
-	   modifying or distributing the Program (or any work based on the
-	   Program), you indicate your acceptance of this License to do so, and
-	   all its terms and conditions for copying, distributing or modifying
-	   the Program or works based on it.
-	 </para>
-       </listitem>
-       <listitem>
-	 <para>
-	   6. Each time you redistribute the Program (or any work based on the
-	   Program), the recipient automatically receives a license from the
-	   original licensor to copy, distribute or modify the Program subject to
-	   these terms and conditions.  You may not impose any further
-	   restrictions on the recipients' exercise of the rights granted herein.
-	   You are not responsible for enforcing compliance by third parties to
-	   this License.
-	 </para>
-       </listitem>
-       <listitem>
-	 <para>
-	   7. If, as a consequence of a court judgment or allegation of patent
-	   infringement or for any other reason (not limited to patent issues),
-	   conditions are imposed on you (whether by court order, agreement or
-	   otherwise) that contradict the conditions of this License, they do not
-	   excuse you from the conditions of this License.  If you cannot
-	   distribute so as to satisfy simultaneously your obligations under this
-	   License and any other pertinent obligations, then as a consequence you
-	   may not distribute the Program at all.  For example, if a patent
-	   license would not permit royalty-free redistribution of the Program by
-	   all those who receive copies directly or indirectly through you, then
-	   the only way you could satisfy both it and this License would be to
-	   refrain entirely from distribution of the Program.
-	 </para>
-	 <para>
-	   If any portion of this section is held invalid or unenforceable under
-	   any particular circumstance, the balance of the section is intended to
-	   apply and the section as a whole is intended to apply in other
-	   circumstances.
-	 </para>
-	 <para>
-	   It is not the purpose of this section to induce you to infringe any
-	   patents or other property right claims or to contest validity of any
-	   such claims; this section has the sole purpose of protecting the
-	   integrity of the free software distribution system, which is
-	   implemented by public license practices.  Many people have made
-	   generous contributions to the wide range of software distributed
-	   through that system in reliance on consistent application of that
-	   system; it is up to the author/donor to decide if he or she is willing
-	   to distribute software through any other system and a licensee cannot
-	   impose that choice.
-	 </para>
-	 <para>
-	   This section is intended to make thoroughly clear what is believed to
-	   be a consequence of the rest of this License.
-	 </para>
-       </listitem>
-       <listitem>
-	 <para>
-	   8. If the distribution and/or use of the Program is restricted in
-	   certain countries either by patents or by copyrighted interfaces, the
-	   original copyright holder who places the Program under this License
-	   may add an explicit geographical distribution limitation excluding
-	   those countries, so that distribution is permitted only in or among
-	   countries not thus excluded.  In such case, this License incorporates
-	   the limitation as if written in the body of this License.
-	 </para>
-       </listitem>
-       <listitem>
-	 <para>
-	   9. The Free Software Foundation may publish revised and/or new versions
-	   of the General Public License from time to time.  Such new versions will
-	   be similar in spirit to the present version, but may differ in detail to
-	   address new problems or concerns.
-	 </para>
-	 <para>
-	   Each version is given a distinguishing version number.  If the Program
-	   specifies a version number of this License which applies to it and "any
-	   later version", you have the option of following the terms and conditions
-	   either of that version or of any later version published by the Free
-	   Software Foundation.  If the Program does not specify a version number of
-	   this License, you may choose any version ever published by the Free Software
-	   Foundation.
-	 </para>
-       </listitem>
-       <listitem>
-	 <para>
-	   10. If you wish to incorporate parts of the Program into other free
-	   programs whose distribution conditions are different, write to the author
-	   to ask for permission.  For software which is copyrighted by the Free
-	   Software Foundation, write to the Free Software Foundation; we sometimes
-	   make exceptions for this.  Our decision will be guided by the two goals
-	   of preserving the free status of all derivatives of our free software and
-	   of promoting the sharing and reuse of software generally.
-	 </para>
-       </listitem>
-       <listitem>
-	 <para>NO WARRANTY</para>
-	 <para>
-	   11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-	   FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-	   OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-	   PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-	   OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-	   MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-	   TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-	   PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-	   REPAIR OR CORRECTION.
-	 </para>
-       </listitem>
-       <listitem>
-	 <para>
-	   12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-	   WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-	   REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-	   INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-	   OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-	   TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-	   YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-	   PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-	   POSSIBILITY OF SUCH DAMAGES.
-	 </para>
-       </listitem>
-     </itemizedlist>
-     <para>END OF TERMS AND CONDITIONS</para>
-   </sect2>
-   <sect2>
-     <title>How to Apply These Terms to Your New Programs</title>
-     <para>
-       If you develop a new program, and you want it to be of the greatest
-       possible use to the public, the best way to achieve this is to make it
-       free software which everyone can redistribute and change under these terms.
-     </para>
-     <para>
-       To do so, attach the following notices to the program.  It is safest
-       to attach them to the start of each source file to most effectively
-       convey the exclusion of warranty; and each file should have at least
-       the "copyright" line and a pointer to where the full notice is found.
-     </para>
-     <para>
-       &lt;one line to give the program's name and a brief idea of what it does.&gt;
-	 Copyright (C) &lt;year&gt;  &lt;name of author&gt;
-     </para>
-     <para> 
-       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.
-     </para>
-     <para>
-       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.
-     </para>
-     <para>
-       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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-     </para>
-     <para>
-       Also add information on how to contact you by electronic and paper mail.
-     </para>
-     <para>
-       If the program is interactive, make it output a short notice like this
-       when it starts in an interactive mode:
-       <para>
-	 Gnomovision version 69, Copyright (C) year  name of author
-	 Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-	 This is free software, and you are welcome to redistribute it
-	 under certain conditions; type `show c' for details.
-       </para>
-     </para>
-     <para>
-       The hypothetical commands `show w' and `show c' should show the appropriate
-       parts of the General Public License.  Of course, the commands you use may
-       be called something other than `show w' and `show c'; they could even be
-       mouse-clicks or menu items--whatever suits your program.
-     </para>
-     <para>
-       You should also get your employer (if you work as a programmer) or your
-       school, if any, to sign a "copyright disclaimer" for the program, if
-       necessary.  Here is a sample; alter the names:
-       <para>
-	 Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-	 `Gnomovision' (which makes passes at compilers) written by James Hacker.
-       </para>
-       <para>
-         &lt;signature of Ty Coon&gt;, 1 April 1989
-       </para>
-       <para>
-	 Ty Coon, President of Vice
-       </para>
-     </para>
-     <para>
-       This General Public License does not permit incorporating your program into
-       proprietary programs.  If your program is a subroutine library, you may
-       consider it more useful to permit linking proprietary applications with the
-       library.  If this is what you want to do, use the GNU Library General
-       Public License instead of this License.
-     </para>
-   </sect2>
-</legalnotice>
+<appendix id="gpl">
+  <appendixinfo>
+    <title>GNU General Public License</title>
+    <pubdate>Version 2, June 1991</pubdate>
+    <copyright>
+      <year>1989, 1991</year>
+      <holder>Free Software Foundation, Inc.</holder>
+    </copyright>
+    <legalnotice id="gpl-legalnotice">
+      <para>
+        <address>Free Software Foundation, Inc.
+          <street>51 Franklin Street, Fifth Floor</street>,
+          <city>Boston</city>, <state>MA</state> <postcode>02110-1301</postcode>
+          <country>USA</country>
+        </address>
+      </para>
+      <para>Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.</para>
+    </legalnotice>
+    <releaseinfo>Version 2, June 1991</releaseinfo>
+  </appendixinfo>
+  <title>GNU General Public License</title>
+  <section id="gpl-1">
+    <title>Preamble</title>
+    <para>The licenses for most software are designed to take away your
+      freedom to share and change it. By contrast, the GNU General Public License is
+      intended to guarantee your freedom to share and change
+      free software - to make sure the software is free for all its users.
+      This General Public License applies to most of the Free Software
+      Foundation&apos;s software and to any other program whose authors commit
+      to using it. (Some other Free Software Foundation software is covered
+      by the GNU Library General Public License instead.) You can apply it
+      to your programs, too.</para>
+
+    <para>When we speak of free software, we are referring to freedom, not price.
+      Our General Public Licenses are designed to make sure that you have the
+      freedom to distribute copies of free software (and charge for this
+      service if you wish), that you receive source code or can get it if you
+      want it, that you can change the software or use pieces of it in new free
+      programs; and that you know you can do these things.</para>
+
+    <para>To protect your rights, we need to make restrictions that forbid anyone
+      to deny you these rights or to ask you to surrender the rights. These
+      restrictions translate to certain responsibilities for you if you distribute
+      copies of the software, or if you modify it.</para>
+
+    <para>For example, if you distribute copies of such a program, whether gratis or
+      for a fee, you must give the recipients all the rights that you have. You
+      must make sure that they, too, receive or can get the source code. And you
+      must show them these terms so they know their rights.</para>
+
+    <para>We protect your rights with two steps:
+      <orderedlist>
+        <listitem>
+          <para>copyright the software, and</para>
+        </listitem>
+        <listitem>
+          <para>offer you this license which gives you legal permission to copy,
+            distribute and/or modify the software.</para>
+        </listitem>
+      </orderedlist>
+    </para>
+
+    <para>Also, for each author&apos;s protection and ours, we want to make certain that
+      everyone understands that there is no warranty for this free software. If
+      the software is modified by someone else and passed on, we want its
+      recipients to know that what they have is not the original, so that any
+      problems introduced by others will not reflect on the original authors&apos;
+      reputations.</para>
+
+    <para>Finally, any free program is threatened constantly by software patents.
+      We wish to avoid the danger that redistributors of a free program will
+      individually obtain patent licenses, in effect making the program
+      proprietary. To prevent this, we have made it clear that any patent must be
+      licensed for everyone&apos;s free use or not licensed at all.</para>
+
+    <para>The precise terms and conditions for copying, distribution and modification
+      follow.</para>
+  </section>
+  <section id="gpl-2">
+    <title>TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION</title>
+    <section id="gpl-2-0">
+      <title>Section 0</title>
+      <para>This License applies to any program or other work which contains a notice
+        placed by the copyright holder saying it may be distributed under the terms
+        of this General Public License. The <quote>Program</quote>, below, refers to any such
+        program or work, and a
+        <quote>work based on the Program</quote> means either
+        the Program or any derivative work under copyright law: that is to say, a
+        work containing the Program or a portion of it, either verbatim or with
+        modifications and/or translated into another language. (Hereinafter, translation
+        is included without limitation in the term
+        <quote>modification</quote>.) Each licensee is addressed as <quote>you</quote>.</para>
+
+      <para>Activities other than copying, distribution and modification are not covered by
+        this License; they are outside its scope. The act of running the Program is not
+        restricted, and the output from the Program is covered only if its contents
+        constitute a work based on the Program (independent of having been made by running
+        the Program). Whether that is true depends on what the Program does.</para>
+    </section>
+    <section id="gpl-2-1">
+      <title>Section 1</title>
+      <para>You may copy and distribute verbatim copies of the Program&apos;s source code as you
+        receive it, in any medium, provided that you conspicuously and appropriately
+        publish on each copy an appropriate copyright notice and disclaimer of warranty;
+        keep intact all the notices that refer to this License and to the absence of any
+        warranty; and give any other recipients of the Program a copy of this License
+        along with the Program.</para>
+
+      <para>You may charge a fee for the physical act of transferring a copy, and you may at
+        your option offer warranty protection in exchange for a fee.</para>
+    </section>
+    <section id="gpl-2-2">
+      <title>Section 2</title>
+      <para>You may modify your copy or copies of the Program or any portion of it, thus
+        forming a work based on the Program, and copy and distribute such modifications
+        or work under the terms of
+        <link linkend="gpl-2-1">Section 1</link> above, provided
+        that you also meet all of these conditions:
+        <orderedlist numeration="loweralpha">
+          <listitem>
+            <para>You must cause the modified files to carry prominent notices stating that
+              you changed the files and the date of any change.</para>
+          </listitem>
+          <listitem>
+            <para>You must cause any work that you distribute or publish, that in whole or
+              in part contains or is derived from the Program or any part thereof, to be
+              licensed as a whole at no charge to all third parties under the terms of
+              this License.</para>
+          </listitem>
+          <listitem>
+            <para>If the modified program normally reads commands interactively when run, you
+              must cause it, when started running for such interactive use in the most
+              ordinary way, to print or display an announcement including an appropriate
+              copyright notice and a notice that there is no warranty (or else, saying
+              that you provide a warranty) and that users may redistribute the program
+              under these conditions, and telling the user how to view a copy of this
+              License. (Exception: If the Program itself is interactive but does not
+              normally print such an announcement, your work based on the Program is not
+              required to print an   announcement.)</para>
+          </listitem>
+        </orderedlist>
+      </para>
+
+      <para>These requirements apply to the modified work as a whole. If identifiable sections
+        of that work are not derived from the Program, and can be reasonably considered
+        independent and separate works in themselves, then this License, and its terms,
+        do not apply to those sections when you distribute them as separate works. But when
+        you distribute the same sections as part of a whole which is a work based on the
+        Program, the distribution of the whole must be on the terms of this License, whose
+        permissions for other licensees extend to the entire whole, and thus to each and
+        every part regardless of who wrote it.</para>
+
+      <para>Thus, it is not the intent of this section to claim rights or contest your rights
+        to work written entirely by you; rather, the intent is to exercise the right to control
+        the distribution of derivative or collective works based on the Program.</para>
+
+      <para>In addition, mere aggregation of another work not based on the Program with the Program
+        (or with a work based on the Program) on a volume of a storage or distribution medium
+        does not bring the other work under the scope of this License.</para>
+    </section>
+    <section id="gpl-2-3">
+      <title>Section 3</title>
+      <para>You may copy and distribute the Program (or a work based on it, under
+        <link linkend="gpl-2-2">Section 2</link> in object code or executable form under the terms of
+        <link linkend="gpl-2-1">Sections 1</link> and
+        <link linkend="gpl-2-2">2</link> above provided that you also do one of the following:
+        <orderedlist numeration="loweralpha">
+          <listitem>
+            <para>Accompany it with the complete corresponding machine-readable source code, which
+              must be distributed under the terms of Sections 1 and 2 above on a medium
+              customarily used for software interchange; or,</para>
+          </listitem>
+          <listitem>
+            <para>Accompany it with a written offer, valid for at least three years, to give any
+              third party, for a charge no more than your cost of physically performing source
+              distribution, a complete machine-readable copy of the corresponding source code,
+              to be distributed under the terms of Sections 1 and 2 above on a medium customarily
+              used for software interchange; or,</para>
+          </listitem>
+          <listitem>
+            <para>Accompany it with the information you received as to the offer to distribute
+              corresponding source code. (This alternative is allowed only for noncommercial
+              distribution and only if you received the program in object code or executable form
+              with such an offer, in accord with Subsection b above.)</para>
+          </listitem>
+        </orderedlist>
+      </para>
+
+      <para>The source code for a work means the preferred form of the work for making modifications
+        to it. For an executable work, complete source code means all the source code for all modules
+        it contains, plus any associated interface definition files, plus the scripts used to control
+        compilation and installation of the executable. However, as a special exception, the source
+        code distributed need not include anything that is normally distributed (in either source or
+        binary form) with the major components (compiler, kernel, and so on) of the operating system
+        on which the executable runs, unless that component itself accompanies the executable.</para>
+
+      <para>If distribution of executable or object code is made by offering access to copy from a
+        designated place, then offering equivalent access to copy the source code from the same place
+        counts as distribution of the source code, even though third parties are not compelled to
+        copy the source along with the object code.</para>
+    </section>
+    <section id="gpl-2-4">
+      <title>Section 4</title>
+      <para>You may not copy, modify, sublicense, or distribute the Program except as expressly provided
+        under this License. Any attempt otherwise to copy, modify, sublicense or distribute the
+        Program is void, and will automatically terminate your rights under this License. However,
+        parties who have received copies, or rights, from you under this License will not have their
+        licenses terminated so long as such parties remain in full compliance.</para>
+    </section>
+    <section id="gpl-2-5">
+      <title>Section 5</title>
+      <para>You are not required to accept this License, since you have not signed it. However, nothing
+        else grants you permission to modify or distribute the Program or its derivative works.
+        These actions are prohibited by law if you do not accept this License. Therefore, by modifying
+        or distributing the Program (or any work based on the Program), you indicate your acceptance
+        of this License to do so, and all its terms and conditions for copying, distributing or
+        modifying the Program or works based on it.</para>
+    </section>
+    <section id="gpl-2-6">
+      <title>Section 6</title>
+      <para>Each time you redistribute the Program (or any work based on the Program), the recipient
+        automatically receives a license from the original licensor to copy, distribute or modify
+        the Program subject to these terms and conditions. You may not impose any further restrictions
+        on the recipients&apos; exercise of the rights granted herein. You are not responsible for enforcing
+        compliance by third parties to this License.</para>
+    </section>
+    <section id="gpl-2-7">
+      <title>Section 7</title>
+      <para>If, as a consequence of a court judgment or allegation of patent infringement or for any other
+        reason (not limited to patent issues), conditions are imposed on you (whether by court order,
+        agreement or otherwise) that contradict the conditions of this License, they do not excuse you
+        from the conditions of this License. If you cannot distribute so as to satisfy simultaneously
+        your obligations under this License and any other pertinent obligations, then as a consequence
+        you may not distribute the Program at all. For example, if a patent license would not permit
+        royalty-free redistribution of the Program by all those who receive copies directly or
+        indirectly through you, then the only way you could satisfy both it and this License would be
+        to refrain entirely from distribution of the Program.</para>
+
+      <para>If any portion of this section is held invalid or unenforceable under any particular circumstance,
+        the balance of the section is intended to apply and the section as a whole is intended to apply
+        in other circumstances.</para>
+
+      <para>It is not the purpose of this section to induce you to infringe any patents or other property
+        right claims or to contest validity of any such claims; this section has the sole purpose of
+        protecting the integrity of the free software distribution system, which is implemented by public
+        license practices. Many people have made generous contributions to the wide range of software
+        distributed through that system in reliance on consistent application of that system; it is up
+        to the author/donor to decide if he or she is willing to distribute software through any other
+        system and a licensee cannot impose that choice.</para>
+
+      <para>This section is intended to make thoroughly clear what is believed to be a consequence of the
+        rest of this License.</para>
+    </section>
+    <section id="gpl-2-8">
+      <title>Section 8</title>
+      <para>If the distribution and/or use of the Program is restricted in certain countries either by patents
+        or by copyrighted interfaces, the original copyright holder who places the Program under this License
+        may add an explicit geographical distribution limitation excluding those countries, so that
+        distribution is permitted only in or among countries not thus excluded. In such case, this License
+        incorporates the limitation as if written in the body of this License.</para>
+    </section>
+    <section id="gpl-2-9">
+      <title>Section 9</title>
+      <para>The Free Software Foundation may publish revised and/or new versions of the General Public License
+        from time to time. Such new versions will be similar in spirit to the present version, but may differ
+        in detail to address new problems or concerns.</para>
+
+      <para>Each version is given a distinguishing version number. If the Program specifies a version number of
+        this License which applies to it and <quote>any later version</quote>, you have the option of following the terms
+        and conditions either of that version or of any later version published by the Free Software
+        Foundation. If the Program does not specify a version number of this License, you may choose any
+        version ever published by the Free Software Foundation.</para>
+    </section>
+    <section id="gpl-2-10">
+      <title>Section 10</title>
+      <para>If you wish to incorporate parts of the Program into other free programs whose distribution
+        conditions are different, write to the author to ask for permission. For software which is copyrighted
+        by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions
+        for this. Our decision will be guided by the two goals of preserving the free status of all
+        derivatives of our free software and of promoting the sharing and reuse of software generally.</para>
+    </section>
+    <section id="gpl-2-11">
+      <title>NO WARRANTY Section 11</title>
+      <para>BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT
+        PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+        OTHER PARTIES PROVIDE THE PROGRAM <quote>AS IS</quote> WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED,
+        INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+        PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+        PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.</para>
+    </section>
+    <section id="gpl-2-12">
+      <title>Section 12</title>
+      <para>IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR
+        ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU
+        FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+        USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED
+        INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH
+        ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+        DAMAGES.</para>
+
+      <para>END OF TERMS AND CONDITIONS</para>
+    </section>
+  </section>
+  <section id="gpl-3">
+    <title>How to Apply These Terms to Your New Programs</title>
+    <para>If you develop a new program, and you want it to be of the greatest
+      possible use to the public, the best way to achieve this is to make it
+      free software which everyone can redistribute and change under these terms.</para>
+
+    <para>To do so, attach the following notices to the program.  It is safest
+      to attach them to the start of each source file to most effectively
+      convey the exclusion of warranty; and each file should have at least
+      the <quote>copyright</quote> line and a pointer to where the full notice is found.</para>
+
+    <para>&lt;one line to give the program&apos;s name and a brief idea of what it does.&gt;
+      Copyright (C) &lt;year&gt;    &lt;name of author&gt;</para>
+
+    <para>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.</para>
+
+    <para>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.</para>
+
+    <para>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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA</para>
+
+    <para>Also add information on how to contact you by electronic and paper mail.</para>
+
+    <para>If the program is interactive, make it output a short notice like this
+      when it starts in an interactive mode:</para>
+
+    <para>Gnomovision version 69, Copyright (C) year name of author
+      Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type <quote>show w</quote>.
+      This is free software, and you are welcome to redistribute it
+      under certain conditions; type <quote>show c</quote> for details.</para>
+
+    <para>The hypothetical commands <quote>show w</quote> and <quote>show c</quote> should
+      show the appropriate parts of the General Public License.  Of course, the commands you
+      use may be called something other than <quote>show w</quote> and <quote>show c</quote>;
+      they could even be mouse-clicks or menu items--whatever suits your program.</para>
+
+    <para>You should also get your employer (if you work as a programmer) or your
+      school, if any, to sign a <quote>copyright disclaimer</quote> for the program, if
+      necessary.  Here is a sample; alter the names:</para>
+
+    <para>Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+      <quote>Gnomovision</quote> (which makes passes at compilers) written by James Hacker.</para>
+
+    <para>&lt;signature of Ty Coon&gt;, 1 April 1989
+      Ty Coon, President of Vice</para>
+
+    <para>This General Public License does not permit incorporating your program into
+      proprietary programs.  If your program is a subroutine library, you may
+      consider it more useful to permit linking proprietary applications with the
+      library.  If this is what you want to do, use the GNU Library General
+      Public License instead of this License.</para>
+  </section>
+</appendix>
diff --git a/help/C/modules.xml b/help/C/modules.xml
index ccd3ba9..3c96c65 100644
--- a/help/C/modules.xml
+++ b/help/C/modules.xml
@@ -40,9 +40,9 @@
 	<sect2 id="sword-config">
 	<title>Sword Module Configurations</title>
 		<sect3 id="sword-sources">
-			<title>Sword Sources Settings</title>
+			<title>Module Sources Settings</title>
 			<figure>
-				<title>Sword Sources Settings</title>
+				<title>Module Sources Settings</title>
 	        	<screenshot> 
 	  <mediaobject> 
 	    <imageobject><imagedata
@@ -62,10 +62,16 @@
 
 			</figure>
 		<para>
-		There are other repositories available besides Crosswire's own, though the modules available from other repositories do not
+		There are other repositories available besides CrossWire's own, though the modules available from other repositories do not
 		represent content officially sanctioned by Crosswire.  On the web, see this page for list of those repositories known:
 		<ulink type="http" url="http://www.crosswire.org/wiki/Module_Repositories">http://www.crosswire.org/wiki/Module_Repositories</ulink>		
 		</para>
+		<para>
+		The list of standard repositories is maintained at CrossWire.  Xiphos normally auto-synchronizes with that list one time,
+		when the user first puts the Module Manager to use.  The list may change, as new repositories come into existence;
+		occasional re-synchronization with the list is suggested, which is accomplished by clicking the <guibutton>Load
+		Standard</guibutton>.
+		</para>
 		</sect3>
 		<sect3 id="installation">
 			<title>Sword Module Installations</title>
diff --git a/help/C/onlinehelp.xml b/help/C/onlinehelp.xml
index 2dd7d89..02753e6 100644
--- a/help/C/onlinehelp.xml
+++ b/help/C/onlinehelp.xml
@@ -12,7 +12,7 @@
 	<sect2 id="xiphos-live-chat">
 		<title>Live Chat</title>
 		<para>Another way to get help is with online chat. Xiphos has an IRC channel on freenode, #xiphos.
-		If you don't know what that means, it's ok. Just click <ulink url="http://embed.mibbit.com/?server=irc.freenode.net&amp;channel=%23xiphos">this link</ulink> (it will open your web browser), type a nickname or accept the default, and click "Click to join chatroom".
+		If you don't know what that means, it's ok. Just click <ulink url="http://webchat.freenode.net/?randomnick=1&amp;channels=xiphos&amp;prompt=1">this link</ulink> (it will open your web browser), type a nickname or accept the default, and click "Click to join chatroom".
 		This will take you to a chatroom where the developers and other users are available to help you with issues
 		you may be having. Although many times someone will answer your question immediately, sometimes you may
 		have to wait a few minutes or longer.
diff --git a/help/C/search.xml b/help/C/search.xml
index 63513e0..0e4c848 100644
--- a/help/C/search.xml
+++ b/help/C/search.xml
@@ -106,7 +106,7 @@
 					to match a string of text. A regular expression can be 
 					used to find verses with words that match a particular 
 					pattern. For example the regular expression
-					<userinput>\ A[a-z]*iah </userinput> will match verses that contain
+					<userinput>[a-z]*iah </userinput> will match verses that contain
 					the words Aiah, Ahaziah, Athaliah and Amariah.</para>
 					<para>A complete discussion of regular expressions is 
 					beyond the scope of this manual, but more information 
diff --git a/help/C/xiphos.xml b/help/C/xiphos.xml
index f3559a5..7036f17 100644
--- a/help/C/xiphos.xml
+++ b/help/C/xiphos.xml
@@ -16,9 +16,9 @@
   <!ENTITY onlinehelp SYSTEM "onlinehelp.xml">
   <!ENTITY originallanguage SYSTEM "originallanguage.xml">
 
-  <!ENTITY appversion "3.1">
-  <!ENTITY manrevision "3.1">
-  <!ENTITY date "2009-05-11">
+  <!ENTITY appversion "3.1.2">
+  <!ENTITY manrevision "3.1.2">
+  <!ENTITY date "11 May 2009">
   <!ENTITY app "<application>Xiphos</application>">
   <!ENTITY appname "Xiphos">
   <!ENTITY xiphos "the Xiphos Team">
@@ -54,7 +54,7 @@ Template last modified Apr 11, 2002
 <!-- appropriate code -->
   <articleinfo>
     <title>&app; Manual</title>
-    <abstract>
+    <abstract role="description">
       <para>&appname; is an application to aid in study of the Bible.</para>
     </abstract>
     <copyright>
@@ -74,7 +74,7 @@ Template last modified Apr 11, 2002
     <!-- An address can be added to the publisher information.  If a role is
     not specified, the publisher/author is the same for all versions of the
     document.  -->
-    <publisher>
+    <publisher role="maintainer">
       <publishername>The Xiphos Team</publishername>
     </publisher>
 
@@ -146,7 +146,17 @@ Template last modified Apr 11, 2002
 
     <releaseinfo>This manual describes version &appversion; of &appname;.
     </releaseinfo>
-    <legalnotice>
+     <revhistory> 
+	<revision> 
+          <revnumber>Xiphos Manual V3.1.2</revnumber> 
+          <date>August 2009</date> 
+          <revdescription> 
+             <para role="author">The Xiphos Team</para>
+             <para role="publisher">The Xiphos Team</para>
+          </revdescription> 
+        </revision>
+     </revhistory> 
+     <legalnotice>
       <title>Feedback</title>
       <para>To report a bug or make a suggestion regarding the &appname; application or
       this manual, Use the <ulink url="http://sourceforge.net/tracker/?group_id=5528">
diff --git a/help/Makefile.am b/help/Makefile.am
index 50e1e74..8d4ce19 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -54,5 +54,5 @@ DOC_FIGURES = 	figures/first_start.png \
 		figures/sword_remove.png \
 		figures/sword_sources.png
 
-DOC_LINGUAS =	fr fa de
-
+# add "de" when it's farther along
+DOC_LINGUAS =	fr fa
diff --git a/help/Makefile.in b/help/Makefile.in
index fc8c2cb..43f1eb0 100644
--- a/help/Makefile.in
+++ b/help/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 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.
@@ -39,8 +40,9 @@
 ################################################################################
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@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
@@ -61,24 +63,36 @@ subdir = help
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gecko.m4 \
 	$(top_srcdir)/m4/gnome-doc-utils.m4 \
-	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in
+	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 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@
+ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AM_LDFLAGS = @AM_LDFLAGS@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-A_CPPFLAGS = @A_CPPFLAGS@
 BONOBO_IDL_INCLUDES = @BONOBO_IDL_INCLUDES@
 CATALOGS = @CATALOGS@
 CATOBJEXT = @CATOBJEXT@
@@ -96,17 +110,16 @@ DATADIRNAME = @DATADIRNAME@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DIRS = @DIRS@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
 DOC_USER_FORMATS = @DOC_USER_FORMATS@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
-EDITOR_CFLAGS = @EDITOR_CFLAGS@
-EDITOR_LIBS = @EDITOR_LIBS@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
 GECKO = @GECKO@
 GECKO_COMPONENT_CFLAGS = @GECKO_COMPONENT_CFLAGS@
 GECKO_COMPONENT_LIBS = @GECKO_COMPONENT_LIBS@
@@ -119,57 +132,26 @@ GECKO_PREFIX = @GECKO_PREFIX@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
-GNOME_CFLAGS = @GNOME_CFLAGS@
-GNOME_LIBS = @GNOME_LIBS@
 GREP = @GREP@
-GTKHTML_314_presence_CFLAGS = @GTKHTML_314_presence_CFLAGS@
-GTKHTML_314_presence_LIBS = @GTKHTML_314_presence_LIBS@
-GTKHTML_38_presence_CFLAGS = @GTKHTML_38_presence_CFLAGS@
-GTKHTML_38_presence_LIBS = @GTKHTML_38_presence_LIBS@
-GTKHTML_CFLAGS = @GTKHTML_CFLAGS@
 GTKHTML_DATA_DIR = @GTKHTML_DATA_DIR@
-GTKHTML_LIBS = @GTKHTML_LIBS@
 HELP_DIR = @HELP_DIR@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PREFIX = @INSTALL_PREFIX@
 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_ICONV = @INTLTOOL_ICONV@
-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
-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_SERVICE_RULE = @INTLTOOL_SERVICE_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_XGETTEXT = @INTLTOOL_XGETTEXT@
-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
-ImageMagick_CFLAGS = @ImageMagick_CFLAGS@
-ImageMagick_LIBS = @ImageMagick_LIBS@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
@@ -178,22 +160,18 @@ MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 MSGFMT_OPTS = @MSGFMT_OPTS@
-NO_PREFIX_PACKAGE_DATA_DIR = @NO_PREFIX_PACKAGE_DATA_DIR@
-NO_PREFIX_PACKAGE_DOC_DIR = @NO_PREFIX_PACKAGE_DOC_DIR@
-NO_PREFIX_PACKAGE_HELP_DIR = @NO_PREFIX_PACKAGE_HELP_DIR@
-NO_PREFIX_PACKAGE_MENU_DIR = @NO_PREFIX_PACKAGE_MENU_DIR@
-NO_PREFIX_PACKAGE_PIXMAPS_DIR = @NO_PREFIX_PACKAGE_PIXMAPS_DIR@
+MSGMERGE = @MSGMERGE@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 OMF_DIR = @OMF_DIR@
 ORBIT_IDL = @ORBIT_IDL@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_DATA_DIR = @PACKAGE_DATA_DIR@
-PACKAGE_DOC_DIR = @PACKAGE_DOC_DIR@
-PACKAGE_HELP_DIR = @PACKAGE_HELP_DIR@
-PACKAGE_MENU_DIR = @PACKAGE_MENU_DIR@
 PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_PIXMAPS_DIR = @PACKAGE_PIXMAPS_DIR@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
@@ -204,28 +182,24 @@ POSUB = @POSUB@
 PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
 PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
 RANLIB = @RANLIB@
-SCROLLKEEPER_BUILD_REQUIRED = @SCROLLKEEPER_BUILD_REQUIRED@
-SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-SWORD_CFLAGS = @SWORD_CFLAGS@
-SWORD_LIBS = @SWORD_LIBS@
-SWORD_MULTIVERSE_CFLAGS = @SWORD_MULTIVERSE_CFLAGS@
-SWORD_MULTIVERSE_LIBS = @SWORD_MULTIVERSE_LIBS@
-UPRINT_CFLAGS = @UPRINT_CFLAGS@
-UPRINT_LIBS = @UPRINT_LIBS@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
+WARN_CFLAGS = @WARN_CFLAGS@
+WARN_CXXFLAGS = @WARN_CXXFLAGS@
 XGETTEXT = @XGETTEXT@
+XIPHOS_CFLAGS = @XIPHOS_CFLAGS@
+XIPHOS_LIBS = @XIPHOS_LIBS@
 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@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -256,6 +230,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -268,8 +243,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-tooltiptext_CFLAGS = @tooltiptext_CFLAGS@
-tooltiptext_LIBS = @tooltiptext_LIBS@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 xiphos_exec = @xiphos_exec@
@@ -425,7 +399,9 @@ DOC_FIGURES = figures/first_start.png \
 		figures/sword_remove.png \
 		figures/sword_sources.png
 
-DOC_LINGUAS = fr fa de
+
+# add "de" when it's farther along
+DOC_LINGUAS = fr fa
 all: all-am
 
 .SUFFIXES:
@@ -433,14 +409,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( 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'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  help/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign help/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign help/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -458,6 +434,7 @@ $(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):
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -487,13 +464,17 @@ distdir: $(DISTFILES)
 	  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 -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -524,6 +505,7 @@ 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"
@@ -542,6 +524,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -550,18 +534,28 @@ 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
@@ -812,6 +806,11 @@ dist-doc-docs: $(_DOC_C_DOCS) $(_DOC_LC_DOCS) $(_DOC_POFILES)
 	@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
@@ -861,8 +860,8 @@ check-doc-docs: $(_DOC_C_DOCS) $(_DOC_LC_DOCS)
 
 check-doc-omf: $(_DOC_OMF_ALL)
 	@list='$(_DOC_OMF_ALL)'; for omf in $$list; do \
-	  echo "xmllint --noout --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf"; \
-	  xmllint --noout --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf; \
+	  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
@@ -880,6 +879,12 @@ install-doc-docs:
 	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_MODULE)/$$docdir"; \
+	  if ! test -d "$$docdir"; then \
+	    echo "$(mkinstalldirs) $$docdir"; \
+	    $(mkinstalldirs) "$$docdir"; \
+	  fi; \
 	  echo "$(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc"; \
 	  $(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc; \
 	done
@@ -887,14 +892,13 @@ install-doc-docs:
 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"; \
-	    elif test -f "C/$$fig"; then \
-	      figfile="C/$$fig"; \
 	    else \
-	      figfile="$(srcdir)/C/$$fig"; \
+	      figsymlink=true; \
 	    fi; \
 	    figdir="$$lc/"`echo $$fig | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
 	    figdir="$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$figdir"; \
@@ -903,8 +907,13 @@ install-doc-figs:
 	      $(mkinstalldirs) "$$figdir"; \
 	    fi; \
 	    figbase=`echo $$fig | sed -e 's/^.*\///'`; \
-	    echo "$(INSTALL_DATA) $$figfile $$figdir$$figbase"; \
-	    $(INSTALL_DATA) "$$figfile" "$$figdir$$figbase"; \
+	    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
 
@@ -947,7 +956,7 @@ uninstall-doc-figs:
 
 uninstall-doc-omf:
 	@list='$(_DOC_OMF_ALL)'; for omf in $$list; do \
-	  if test "x$(_ENABLE_SK)" == "xtrue"; then \
+	  if test "x$(_ENABLE_SK)" = "xtrue"; then \
 	    echo "scrollkeeper-uninstall -p $(_sklocalstatedir) $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
 	    scrollkeeper-uninstall -p "$(_sklocalstatedir)" "$(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
 	  fi; \
@@ -955,6 +964,7 @@ uninstall-doc-omf:
 	  rm -f "$(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$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/help/de/authors.xml b/help/de/authors.xml
deleted file mode 100644
index 81fb78e..0000000
--- a/help/de/authors.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Authors -->
-<para>
-    	This manual was written by:
-		</para>
diff --git a/help/de/de.po b/help/de/de.po
deleted file mode 100644
index 0b3ef93..0000000
--- a/help/de/de.po
+++ /dev/null
@@ -1,2419 +0,0 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-05-11 23:57+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/xiphos.xml:34(None) 
-msgid "@@image: 'figures/sword3.png'; md5=3d9c6ae738d16324db1e79e7ef9eff8b"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/xiphos.xml:63(None) ../C/xiphos.xml:87(None) 
-msgid "@@image: 'figures/interface.png'; md5=b0167fed338a11d27d137c07f33a75e8"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/xiphos.xml:53(None) 
-msgid "@@image: 'figures/first_start.png'; md5=d9bbfcf2353fff9419416655a51dac15"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/xiphos.xml:18(None) ../C/interface.xml:18(None) 
-msgid "@@image: 'figures/interface_menubar.png'; md5=e565033e6a203b845ee4875c1d647057"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/xiphos.xml:49(None) 
-msgid "@@image: 'figures/interface_toolbar.png'; md5=af22d3813ded59e152cac9f7d35635d9"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/xiphos.xml:148(None) 
-msgid "@@image: 'figures/interface_sidepane.png'; md5=d1783275662a57144b38d80c10688739"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/xiphos.xml:174(None) 
-msgid "@@image: 'figures/interface_shortcut.png'; md5=1be0299ec3584f5262a3a4950fee745f"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/xiphos.xml:197(None) 
-msgid "@@image: 'figures/interface_biblepane.png'; md5=092f45c81f0cf6682ec36a451da243ce"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/xiphos.xml:255(None) 
-msgid "@@image: 'figures/interface_parallel.png'; md5=dbe32bdff5271afb087248f913363cce"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/xiphos.xml:279(None) 
-msgid "@@image: 'figures/interface_parallel-separate.png'; md5=259f72c50a2050fff5d61db45e1a117a"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/xiphos.xml:398(None) 
-msgid "@@image: 'figures/interface_biblepane-options.png'; md5=16023367059854aed6c53b3fd0c34f33"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/xiphos.xml:424(None) 
-msgid "@@image: 'figures/interface_menubar-view.png'; md5=1b203231796686231e0151e018628bc2"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/xiphos.xml:522(None) 
-msgid "@@image: 'figures/interface_viewer.png'; md5=e26c63cfa273aa2e1180d66fee1f1033"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/xiphos.xml:562(None) 
-msgid "@@image: 'figures/interface_commentarypane.png'; md5=1142e8288deee464c1dcd51460bd2cce"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/xiphos.xml:635(None) 
-msgid "@@image: 'figures/interface_dictionary.png'; md5=d0d5561dae3d893d8287f22a1424ace4"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/xiphos.xml:815(None) 
-msgid "@@image: 'figures/gtkhtml3-vs-mozembed.png'; md5=deec924e49812ac32cfd027e53d2b193"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/xiphos.xml:12(None) ../C/preferences.xml:12(None) 
-msgid "@@image: 'figures/preferences.png'; md5=1bb4a411bbec6a269a5e9904ebc37e89"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/xiphos.xml:38(None) 
-msgid "@@image: 'figures/preferences_fonts-color.png'; md5=48d21eae6efe78b745d063ca0d3094a8"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/xiphos.xml:62(None) 
-msgid "@@image: 'figures/preferences_fonts-misc.png'; md5=44017ad5ee9d666eb8a6c85a27ad44ca"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/xiphos.xml:100(None) 
-msgid "@@image: 'figures/preferences_general-tabs.png'; md5=d6d30137f2bb1b26ace8fac0edf48203"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/xiphos.xml:124(None) 
-msgid "@@image: 'figures/preferences_general-misc.png'; md5=a100cbdac54da698c5fee8b386f82b78"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/xiphos.xml:176(None) 
-msgid "@@image: 'figures/preferences_modules-main.png'; md5=8100495250f0a100812a5907006a88ad"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/xiphos.xml:196(None) 
-msgid "@@image: 'figures/preferences_modules-parallel.png'; md5=f880f02801dbc9e1673a2c50aad58ae1"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/xiphos.xml:216(None) 
-msgid "@@image: 'figures/preferences_modules-misc.png'; md5=cf421f044c87d47185f3a85128d1786e"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/xiphos.xml:23(None) ../C/modules.xml:23(None) 
-msgid "@@image: 'figures/module.png'; md5=c27ec45463d4c3d3765f35770c31414a"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/xiphos.xml:49(None) 
-msgid "@@image: 'figures/sword_sources.png'; md5=a1182919f9c770abd01edee116fc0f48"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/xiphos.xml:77(None) 
-msgid "@@image: 'figures/sword_config.png'; md5=4811d390ad124e63b4d7145fb3cba0ab"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/xiphos.xml:146(None) 
-msgid "@@image: 'figures/sword_install.png'; md5=ac72af69d94af20a2f38c3be663ca51c"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/xiphos.xml:189(None) 
-msgid "@@image: 'figures/sword_remove.png'; md5=a6ef5b13d854ff3ebf348523e729b2d2"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/xiphos.xml:15(None) ../C/search.xml:15(None) 
-msgid "@@image: 'figures/interface_searchpane.png'; md5=9b02269f6a1a4aa3a2a627aaca52d66c"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/xiphos.xml:214(None) 
-msgid "@@image: 'figures/search_search.png'; md5=8c46acb73426be8ca481336b25d83659"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/xiphos.xml:16(None) ../C/studypad.xml:16(None) 
-msgid "@@image: 'figures/studypad.png'; md5=e50d36fb2348bbb0156b9a4a6457fed0"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/xiphos.xml:22(None) 
-msgid "@@image: 'figures/personal.png'; md5=540ea58ba392455d42860ee20e84b56e"
-msgstr ""
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/xiphos.xml:36(None) 
-msgid "@@image: 'figures/journal.png'; md5=2fe75c9ce423fa7975c901ce97d43065"
-msgstr ""
-
-#: ../C/xiphos.xml:56(title) 
-msgid "<application>Xiphos</application> Manual"
-msgstr ""
-
-#: ../C/xiphos.xml:58(para) 
-msgid "Xiphos is an application to aid in study of the Bible."
-msgstr ""
-
-#: ../C/xiphos.xml:61(year) 
-msgid "2003"
-msgstr ""
-
-#: ../C/xiphos.xml:62(year) 
-msgid "2009"
-msgstr ""
-
-#: ../C/xiphos.xml:63(holder) ../C/xiphos.xml:78(publishername) 
-msgid "The Xiphos Team"
-msgstr ""
-
-#: ../C/xiphos.xml:2(para) ../C/legal.xml:2(para) 
-msgid "Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any later version published by the Free Software Foundation with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy of the GFDL at this <ulink type=\"help\" url=\"ghelp:fdl\">link</ulink> or in the file COPYING-DOCS distributed with this manual."
-msgstr ""
-
-#: ../C/xiphos.xml:12(para) ../C/legal.xml:12(para) 
-msgid "This manual is part of a collection of GNOME manuals distributed under the GFDL. If you want to distribute this manual separately from the collection, you can do so by adding a copy of the license to the manual, as described in section 6 of the license."
-msgstr ""
-
-#: ../C/xiphos.xml:19(para) ../C/legal.xml:19(para) 
-msgid "Many of the names used by companies to distinguish their products and services are claimed as trademarks. Where those names appear in any GNOME documentation, and the members of the GNOME Documentation Project are made aware of those trademarks, then the names are in capital letters or initial capital letters."
-msgstr ""
-
-#: ../C/xiphos.xml:33(para) ../C/legal.xml:33(para) 
-msgid "DOCUMENT IS PROVIDED ON AN \"AS IS\" BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS FREE OF DEFECTS MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY, ACCURACY, AND PERFORMANCE OF THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS WITH YOU. SHOULD ANY DOCUMENT OR MODIFIED VERSION PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL WRITER, AUTHOR OR ANY CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER; AND"
-msgstr ""
-
-#: ../C/xiphos.xml:54(para) ../C/legal.xml:54(para) 
-msgid "UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER IN TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE AUTHOR, INITIAL WRITER, ANY CONTRIBUTOR, OR ANY DISTRIBUTOR OF THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER DAMAGES OR LOSSES ARISING OUT OF OR RELATING TO USE OF THE DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES."
-msgstr ""
-
-#: ../C/xiphos.xml:27(para) ../C/legal.xml:27(para) 
-msgid "DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT ARE PROVIDED UNDER THE TERMS OF THE GNU FREE DOCUMENTATION LICENSE WITH THE FURTHER UNDERSTANDING THAT: <placeholder-1/>"
-msgstr ""
-
-#: ../C/xiphos.xml:88(firstname) 
-msgid "Andy"
-msgstr ""
-
-#: ../C/xiphos.xml:89(surname) 
-msgid "Piper"
-msgstr ""
-
-#: ../C/xiphos.xml:92(firstname) 
-msgid "Pierre"
-msgstr ""
-
-#: ../C/xiphos.xml:93(surname) 
-msgid "Benz"
-msgstr ""
-
-#: ../C/xiphos.xml:96(firstname) 
-msgid "Dr Peter"
-msgstr ""
-
-#: ../C/xiphos.xml:97(surname) 
-msgid "von Kaehne"
-msgstr ""
-
-#: ../C/xiphos.xml:100(firstname) 
-msgid "Karl"
-msgstr ""
-
-#: ../C/xiphos.xml:101(surname) 
-msgid "Kleinpaste"
-msgstr ""
-
-#: ../C/xiphos.xml:104(firstname) 
-msgid "Matthew"
-msgstr ""
-
-#: ../C/xiphos.xml:105(surname) 
-msgid "Talbert"
-msgstr ""
-
-#: ../C/xiphos.xml:139(revnumber) 
-msgid "Xiphos 3.0.0"
-msgstr ""
-
-#: ../C/xiphos.xml:140(date) 
-msgid "2009-02-09"
-msgstr ""
-
-#: ../C/xiphos.xml:143(revnumber) 
-msgid "Xiphos 2.4.0"
-msgstr ""
-
-#: ../C/xiphos.xml:144(date) 
-msgid "2008-09-20"
-msgstr ""
-
-#: ../C/xiphos.xml:147(revnumber) 
-msgid "Xiphos 2.3.6"
-msgstr ""
-
-#: ../C/xiphos.xml:148(date) 
-msgid "2008-08-02"
-msgstr ""
-
-#: ../C/xiphos.xml:151(revnumber) 
-msgid "Xiphos 2.3.5"
-msgstr ""
-
-#: ../C/xiphos.xml:152(date) 
-msgid "2008-07-02"
-msgstr ""
-
-#: ../C/xiphos.xml:155(revnumber) 
-msgid "Xiphos 2.3.4"
-msgstr ""
-
-#: ../C/xiphos.xml:156(date) 
-msgid "2008-05-26"
-msgstr ""
-
-#: ../C/xiphos.xml:159(revnumber) 
-msgid "Xiphos 2.3.3"
-msgstr ""
-
-#: ../C/xiphos.xml:160(date) 
-msgid "2008-01-20"
-msgstr ""
-
-#: ../C/xiphos.xml:163(revnumber) 
-msgid "Xiphos 2.3.2"
-msgstr ""
-
-#: ../C/xiphos.xml:164(date) 
-msgid "2007-12-26"
-msgstr ""
-
-#: ../C/xiphos.xml:167(revnumber) 
-msgid "Xiphos 2.3.1"
-msgstr ""
-
-#: ../C/xiphos.xml:168(date) 
-msgid "2007-10-15"
-msgstr ""
-
-#: ../C/xiphos.xml:171(revnumber) 
-msgid "Xiphos 2.2.3"
-msgstr ""
-
-#: ../C/xiphos.xml:172(date) 
-msgid "2007-03-26"
-msgstr ""
-
-#: ../C/xiphos.xml:175(revnumber) 
-msgid "Xiphos 2.2.1"
-msgstr ""
-
-#: ../C/xiphos.xml:176(date) 
-msgid "2007-01-27"
-msgstr ""
-
-#: ../C/xiphos.xml:179(revnumber) 
-msgid "Xiphos 2.2.0"
-msgstr ""
-
-#: ../C/xiphos.xml:180(date) 
-msgid "2006-12-23"
-msgstr ""
-
-#: ../C/xiphos.xml:183(revnumber) 
-msgid "Xiphos 2.1.10"
-msgstr ""
-
-#: ../C/xiphos.xml:184(date) 
-msgid "2006-12-10"
-msgstr ""
-
-#: ../C/xiphos.xml:187(revnumber) 
-msgid "Xiphos 2.1.9"
-msgstr ""
-
-#: ../C/xiphos.xml:188(date) 
-msgid "2006-11-12"
-msgstr ""
-
-#: ../C/xiphos.xml:191(revnumber) 
-msgid "Xiphos 2.1.8"
-msgstr ""
-
-#: ../C/xiphos.xml:192(date) 
-msgid "2006-11-08"
-msgstr ""
-
-#: ../C/xiphos.xml:195(revnumber) 
-msgid "Xiphos 2.1.7"
-msgstr ""
-
-#: ../C/xiphos.xml:196(date) 
-msgid "2006-05-04"
-msgstr ""
-
-#: ../C/xiphos.xml:199(revnumber) 
-msgid "Xiphos 2.1.6"
-msgstr ""
-
-#: ../C/xiphos.xml:200(date) 
-msgid "2006-04-13"
-msgstr ""
-
-#: ../C/xiphos.xml:203(revnumber) 
-msgid "Xiphos 2.1.5"
-msgstr ""
-
-#: ../C/xiphos.xml:204(date) 
-msgid "2005-12-14"
-msgstr ""
-
-#: ../C/xiphos.xml:207(revnumber) 
-msgid "Xiphos 2.1.4"
-msgstr ""
-
-#: ../C/xiphos.xml:208(date) 
-msgid "2005-12-13"
-msgstr ""
-
-#: ../C/xiphos.xml:211(revnumber) 
-msgid "Xiphos 2.1.2"
-msgstr ""
-
-#: ../C/xiphos.xml:212(date) 
-msgid "2005-05-31"
-msgstr ""
-
-#: ../C/xiphos.xml:215(revnumber) 
-msgid "Xiphos 2.1.1"
-msgstr ""
-
-#: ../C/xiphos.xml:216(date) 
-msgid "2004-07-18"
-msgstr ""
-
-#: ../C/xiphos.xml:219(revnumber) 
-msgid "Xiphos 2.1.0"
-msgstr ""
-
-#: ../C/xiphos.xml:220(date) 
-msgid "2004-08-30"
-msgstr ""
-
-#: ../C/xiphos.xml:223(revnumber) 
-msgid "Xiphos 2.0.0"
-msgstr ""
-
-#: ../C/xiphos.xml:224(date) 
-msgid "2003-12-25"
-msgstr ""
-
-#: ../C/xiphos.xml:227(revnumber) 
-msgid "Xiphos 0.7.10"
-msgstr ""
-
-#: ../C/xiphos.xml:228(date) 
-msgid "2003-09-05"
-msgstr ""
-
-#: ../C/xiphos.xml:231(revnumber) 
-msgid "Xiphos 0.7.9"
-msgstr ""
-
-#: ../C/xiphos.xml:232(date) 
-msgid "2003-03-26"
-msgstr ""
-
-#: ../C/xiphos.xml:235(revnumber) 
-msgid "Xiphos 0.7.8"
-msgstr ""
-
-#: ../C/xiphos.xml:236(date) 
-msgid "2003-01-12"
-msgstr ""
-
-#: ../C/xiphos.xml:239(revnumber) 
-msgid "Xiphos 0.7.7"
-msgstr ""
-
-#: ../C/xiphos.xml:240(date) 
-msgid "2002-12-20"
-msgstr ""
-
-#: ../C/xiphos.xml:243(revnumber) 
-msgid "Xiphos 0.7.6"
-msgstr ""
-
-#: ../C/xiphos.xml:244(date) 
-msgid "2002-11-03"
-msgstr ""
-
-#: ../C/xiphos.xml:247(revnumber) 
-msgid "Xiphos 0.7.5"
-msgstr ""
-
-#: ../C/xiphos.xml:248(date) 
-msgid "2002-07-01"
-msgstr ""
-
-#: ../C/xiphos.xml:251(revnumber) 
-msgid "Xiphos 0.7.4"
-msgstr ""
-
-#: ../C/xiphos.xml:252(date) 
-msgid "2002-06-10"
-msgstr ""
-
-#: ../C/xiphos.xml:255(revnumber) 
-msgid "Xiphos 0.7.3"
-msgstr ""
-
-#: ../C/xiphos.xml:256(date) 
-msgid "2002-05-10"
-msgstr ""
-
-#: ../C/xiphos.xml:259(revnumber) 
-msgid "Xiphos 0.7.2"
-msgstr ""
-
-#: ../C/xiphos.xml:260(date) 
-msgid "2002-04-22"
-msgstr ""
-
-#: ../C/xiphos.xml:263(revnumber) 
-msgid "Xiphos 0.7.1"
-msgstr ""
-
-#: ../C/xiphos.xml:264(date) 
-msgid "2002-04-10"
-msgstr ""
-
-#: ../C/xiphos.xml:267(revnumber) 
-msgid "Xiphos 0.7.0"
-msgstr ""
-
-#: ../C/xiphos.xml:268(date) 
-msgid "2002-04-09"
-msgstr ""
-
-#: ../C/xiphos.xml:271(revnumber) 
-msgid "Xiphos 0.5.0"
-msgstr ""
-
-#: ../C/xiphos.xml:272(date) 
-msgid "2001-08-13"
-msgstr ""
-
-#: ../C/xiphos.xml:275(revnumber) 
-msgid "Xiphos 0.4.1"
-msgstr ""
-
-#: ../C/xiphos.xml:276(date) 
-msgid "2001-04-10"
-msgstr ""
-
-#: ../C/xiphos.xml:279(revnumber) 
-msgid "Xiphos 0.4.0"
-msgstr ""
-
-#: ../C/xiphos.xml:280(date) 
-msgid "2001-04-06"
-msgstr ""
-
-#: ../C/xiphos.xml:283(revnumber) 
-msgid "Xiphos 0.3.7"
-msgstr ""
-
-#: ../C/xiphos.xml:284(date) 
-msgid "2000-12-08"
-msgstr ""
-
-#: ../C/xiphos.xml:287(revnumber) 
-msgid "Xiphos 0.3.6"
-msgstr ""
-
-#: ../C/xiphos.xml:288(date) 
-msgid "2000-12-07"
-msgstr ""
-
-#: ../C/xiphos.xml:291(revnumber) 
-msgid "Xiphos 0.3.2"
-msgstr ""
-
-#: ../C/xiphos.xml:292(date) 
-msgid "2000-11-21"
-msgstr ""
-
-#: ../C/xiphos.xml:295(revnumber) 
-msgid "Xiphos 0.3.0"
-msgstr ""
-
-#: ../C/xiphos.xml:296(date) 
-msgid "2000-11-10"
-msgstr ""
-
-#: ../C/xiphos.xml:299(revnumber) 
-msgid "Xiphos 0.2.5"
-msgstr ""
-
-#: ../C/xiphos.xml:300(date) 
-msgid "2000-10-06"
-msgstr ""
-
-#: ../C/xiphos.xml:303(revnumber) 
-msgid "Xiphos 0.2.4"
-msgstr ""
-
-#: ../C/xiphos.xml:304(date) 
-msgid "2000-09-16"
-msgstr ""
-
-#: ../C/xiphos.xml:307(revnumber) 
-msgid "Xiphos 0.2.3"
-msgstr ""
-
-#: ../C/xiphos.xml:308(date) 
-msgid "2000-09-07"
-msgstr ""
-
-#: ../C/xiphos.xml:311(revnumber) 
-msgid "Xiphos 0.2.2"
-msgstr ""
-
-#: ../C/xiphos.xml:312(date) 
-msgid "2000-09-06"
-msgstr ""
-
-#: ../C/xiphos.xml:315(revnumber) 
-msgid "Xiphos 0.2.1"
-msgstr ""
-
-#: ../C/xiphos.xml:316(date) 
-msgid "2000-08-29"
-msgstr ""
-
-#: ../C/xiphos.xml:319(revnumber) 
-msgid "Xiphos 0.2.0"
-msgstr ""
-
-#: ../C/xiphos.xml:320(date) 
-msgid "2000-08-19"
-msgstr ""
-
-#: ../C/xiphos.xml:323(revnumber) 
-msgid "Xiphos 0.1.8"
-msgstr ""
-
-#: ../C/xiphos.xml:324(date) 
-msgid "2000-06-10"
-msgstr ""
-
-#: ../C/xiphos.xml:327(revnumber) 
-msgid "Xiphos 0.1.7"
-msgstr ""
-
-#: ../C/xiphos.xml:328(date) 
-msgid "2000-05-19"
-msgstr ""
-
-#: ../C/xiphos.xml:331(revnumber) 
-msgid "Xiphos 0.1.6"
-msgstr ""
-
-#: ../C/xiphos.xml:332(date) 
-msgid "2000-05-08"
-msgstr ""
-
-#: ../C/xiphos.xml:336(releaseinfo) 
-msgid "This manual describes version 3.0.0 of Xiphos."
-msgstr ""
-
-#: ../C/xiphos.xml:339(title) 
-msgid "Feedback"
-msgstr ""
-
-#: ../C/xiphos.xml:340(para) 
-msgid "To report a bug or make a suggestion regarding the Xiphos application or this manual, Use the <ulink url=\"http://sourceforge.net/tracker/?group_id=5528\"> Tracker on SourceForge</ulink> or the mailing lists."
-msgstr ""
-
-#: ../C/xiphos.xml:348(keyword) 
-msgid "gnome"
-msgstr ""
-
-#: ../C/xiphos.xml:349(keyword) 
-msgid "xiphos"
-msgstr ""
-
-#: ../C/xiphos.xml:350(keyword) 
-msgid "sword"
-msgstr ""
-
-#: ../C/xiphos.xml:351(keyword) 
-msgid "crosswire"
-msgstr ""
-
-#: ../C/xiphos.xml:352(keyword) 
-msgid "help dialog"
-msgstr ""
-
-#: ../C/xiphos.xml:358(primary) 
-msgid "Xiphos"
-msgstr ""
-
-#: ../C/xiphos.xml:373(title) 
-msgid "Introduction"
-msgstr ""
-
-#. Use the Introduction section to give a brief overview of what
-#.      the application is and what it does.
-#: ../C/xiphos.xml:5(para) 
-msgid "<application>Xiphos</application> is a Bible study and research tool based upon the \"SWORD Project\" libraries and the GNOME Desktop libraries. You can use <application>Xiphos</application> to do the following:"
-msgstr ""
-
-#: ../C/xiphos.xml:9(para) 
-msgid "View your favorite Scripture verse"
-msgstr ""
-
-#: ../C/xiphos.xml:12(para) 
-msgid "Make sermon or personal notes on selected passages"
-msgstr ""
-
-#: ../C/xiphos.xml:15(para) 
-msgid "Automatically follow Bible footnotes and cross-references"
-msgstr ""
-
-#: ../C/xiphos.xml:18(para) 
-msgid "Compare translations in parallel"
-msgstr ""
-
-#: ../C/xiphos.xml:21(para) 
-msgid "Work in original language study using the available Hebrew and Greek translations"
-msgstr ""
-
-#: ../C/xiphos.xml:25(para) 
-msgid "<application>Xiphos</application> aims to provide a simple and clean user interface while providing a powerful tool allowing a personalized Bible study environment."
-msgstr ""
-
-#: ../C/xiphos.xml:30(title) ../C/xiphos.xml:43(phrase) 
-msgid "The SWORD Project logo"
-msgstr ""
-
-#: ../C/xiphos.xml:49(para) 
-msgid "\"The SWORD Project\" is based at <ulink type=\"http\" url=\"http://www.crosswire.org\">http://www.crosswire.org</ulink>. Other applications under the same banner are <application>The SWORD Project for Windows</application> (aka <application>BibleCS</application> or <application>WinSword</application>), <application>MacSword</application> for the Macintosh, <application>BibleDesktop</application>, a Java application, and <application>BibleTime</application>, another Linux program."
-msgstr ""
-
-#: ../C/xiphos.xml:59(title) ../C/xiphos.xml:72(phrase) 
-msgid "Xiphos in action"
-msgstr ""
-
-#: ../C/xiphos.xml:81(para) 
-msgid "<application>Xiphos</application> is currently in development, so this manual may not reflect the program as you see it. If it does not, please file a bug at the <ulink type=\"http\" url=\"http://sourceforge.net/projects/xiphos\"> project website</ulink>, or email <email>xiphos-developers@lists.sourceforge.net</email>. All help is appreciated, as it will improve the software."
-msgstr ""
-
-#: ../C/xiphos.xml:386(title) 
-msgid "Getting Started with Xiphos"
-msgstr ""
-
-#: ../C/xiphos.xml:4(title) ../C/start.xml:4(title) 
-msgid "Starting Xiphos"
-msgstr ""
-
-#: ../C/xiphos.xml:5(para) ../C/start.xml:5(para) 
-msgid "You can start <application>Xiphos</application> in the following ways:"
-msgstr ""
-
-#: ../C/xiphos.xml:10(term) ../C/start.xml:10(term) 
-msgid "Applications menu"
-msgstr ""
-
-#: ../C/xiphos.xml:12(para) ../C/start.xml:12(para) 
-msgid "Choose <menuchoice><guisubmenu>Accessories</guisubmenu><guimenuitem>Xiphos Bible Guide</guimenuitem></menuchoice>."
-msgstr ""
-
-#: ../C/xiphos.xml:20(term) ../C/start.xml:20(term) 
-msgid "Command line"
-msgstr ""
-
-#: ../C/xiphos.xml:22(para) ../C/start.xml:22(para) 
-msgid "Type <command>xiphos</command>, then press <keycap>Return</keycap>."
-msgstr ""
-
-#: ../C/xiphos.xml:28(term) ../C/start.xml:28(term) 
-msgid "Windows"
-msgstr ""
-
-#: ../C/xiphos.xml:30(para) ../C/start.xml:30(para) 
-msgid "Go to <menuchoice><guisubmenu>All Programs</guisubmenu><guisubmenu>Xiphos </guisubmenu><guimenuitem>Xiphos</guimenuitem></menuchoice>."
-msgstr ""
-
-#: ../C/xiphos.xml:41(title) 
-msgid "Starting Xiphos For The First Time"
-msgstr ""
-
-#: ../C/xiphos.xml:42(para) 
-msgid "When you start <application>Xiphos</application> for the first time, <application>Xiphos</application> creates a default selection of options for display. Also, if no other Sword application has ever been run, and thus there are no Bible modules installed, then <application>Xiphos</application> asks permission to start the Module Manager so that you can select and install a Bible module in your language preference."
-msgstr ""
-
-#: ../C/xiphos.xml:49(title) ../C/xiphos.xml:62(phrase) 
-msgid "Xiphos Download Question"
-msgstr ""
-
-#: ../C/xiphos.xml:69(para) 
-msgid "<application>Xiphos</application> then opens its interface with one tab displayed, showing Romans 8:28. Once the interface is open, you can use <menuchoice><guimenuitem>Edit</guimenuitem><guimenuitem>Preferences</guimenuitem></menuchoice> to change any of the selections already made by default."
-msgstr ""
-
-#: ../C/xiphos.xml:78(title) 
-msgid "Launching Xiphos"
-msgstr ""
-
-#: ../C/xiphos.xml:79(para) 
-msgid "When you start <application>Xiphos</application>, the following interface is displayed:"
-msgstr ""
-
-#: ../C/xiphos.xml:83(title) 
-msgid "Xiphos interface"
-msgstr ""
-
-#: ../C/xiphos.xml:96(phrase) 
-msgid "The Xiphos Interface"
-msgstr ""
-
-#: ../C/xiphos.xml:103(para) 
-msgid "The <application>Xiphos</application> interface contains the following elements:"
-msgstr ""
-
-#: ../C/xiphos.xml:108(term) ../C/xiphos.xml:5(title) ../C/xiphos.xml:14(title) ../C/interface.xml:5(title) ../C/interface.xml:14(title) 
-msgid "Menubar"
-msgstr ""
-
-#: ../C/xiphos.xml:110(para) 
-msgid "The menus on the menubar contain several commands which extend the use of <application>Xiphos </application>. These include the StudyPad and advanced search functions. The menus also help you to customize your use of <application>Xiphos</application>."
-msgstr ""
-
-#: ../C/xiphos.xml:118(term) 
-msgid "Toolbar"
-msgstr ""
-
-#: ../C/xiphos.xml:120(para) 
-msgid "The <interface>toolbar</interface> contains buttons that let you quickly navigate through the Bible."
-msgstr ""
-
-#: ../C/xiphos.xml:126(term) ../C/xiphos.xml:144(title) 
-msgid "Sidebar"
-msgstr ""
-
-#: ../C/xiphos.xml:128(para) 
-msgid "The <interface>Sidebar</interface> provides access to several features. It contains your bookmarks and the list of installed books. It can also be used to perform simple searches."
-msgstr ""
-
-#: ../C/xiphos.xml:136(term) 
-msgid "Bible Text Pane"
-msgstr ""
-
-#: ../C/xiphos.xml:138(para) 
-msgid "The <interface>Bible Text pane</interface> displays the Bible text which is currently being viewed."
-msgstr ""
-
-#: ../C/xiphos.xml:144(term) ../C/xiphos.xml:517(title) ../C/xiphos.xml:531(phrase) 
-msgid "Previewer"
-msgstr ""
-
-#: ../C/xiphos.xml:146(para) 
-msgid "The <interface>Previewer</interface> displays Bible text module options. These include Strong's numbers, footnotes and morphological tags. It is located below the Bible Text Pane."
-msgstr ""
-
-#: ../C/xiphos.xml:153(term) ../C/xiphos.xml:571(phrase) 
-msgid "Commentary Pane"
-msgstr ""
-
-#: ../C/xiphos.xml:155(para) 
-msgid "The <interface>Commentary pane</interface> displays commentaries on the current Bible Text being used."
-msgstr ""
-
-#: ../C/xiphos.xml:161(term) 
-msgid "Book Pane"
-msgstr ""
-
-#: ../C/xiphos.xml:163(para) 
-msgid "The <interface>Book Pane</interface> displays general books available from the Sword Project. These include modules like \"Calvin's Institutes\", \"Josephus: The Complete Works\" etc. This Pane can be accessed via the Book View tab just below the Commentary Pane."
-msgstr ""
-
-#: ../C/xiphos.xml:171(term) 
-msgid "Dictionary/Book Pane"
-msgstr ""
-
-#: ../C/xiphos.xml:173(para) 
-msgid "The <interface>Dictionary/Book Pane</interface> displays dictionary information on selected words in the <interface>Bible Text Pane</interface>. It is located just below the Commentary Pane"
-msgstr ""
-
-#: ../C/xiphos.xml:180(para) 
-msgid "When you right-click in the different interface sections, the interface displays a popup menu, which provides access to more module-specific options, including display controls and printing services."
-msgstr ""
-
-#: ../C/xiphos.xml:392(title) 
-msgid "Interface"
-msgstr ""
-
-#: ../C/xiphos.xml:6(para) ../C/interface.xml:6(para) 
-msgid "At the top of the <application>Xiphos</application> main window is the menubar. Almost all of the functions are available by activating the appropriate menu item. The functions have been grouped according to their type. For example, the file operations have been grouped into the <guisubmenu>File</guisubmenu> menu."
-msgstr ""
-
-#: ../C/xiphos.xml:27(phrase) 
-msgid "Xiphos menubar"
-msgstr ""
-
-#: ../C/xiphos.xml:37(title) 
-msgid "Toolbars"
-msgstr ""
-
-#: ../C/xiphos.xml:38(para) 
-msgid "The function of the Toolbar is to provide control over the Bible and Commentary Panes. Activation of the Toolbar option is done by moving the mouse cursor over the desired toolbar button and selecting it. A tooltip will appear if the mouse cursor is held stationary over a toolbar button, describing the function of the button."
-msgstr ""
-
-#: ../C/xiphos.xml:45(title) 
-msgid "ToolBar"
-msgstr ""
-
-#: ../C/xiphos.xml:58(phrase) 
-msgid "The Toolbar"
-msgstr ""
-
-#: ../C/xiphos.xml:63(para) 
-msgid "The <interface>Toolbar</interface> consists of the following functions:"
-msgstr ""
-
-#: ../C/xiphos.xml:68(para) 
-msgid "History View Toggle and drop-down menu"
-msgstr ""
-
-#: ../C/xiphos.xml:73(para) ../C/xiphos.xml:102(title) 
-msgid "Bible Book Selector"
-msgstr ""
-
-#: ../C/xiphos.xml:78(para) ../C/xiphos.xml:110(title) 
-msgid "Bible Chapter Selector"
-msgstr ""
-
-#: ../C/xiphos.xml:83(para) ../C/xiphos.xml:118(title) 
-msgid "Bible Verse Selector"
-msgstr ""
-
-#: ../C/xiphos.xml:88(para) ../C/xiphos.xml:126(title) 
-msgid "Bible Passage Summary"
-msgstr ""
-
-#: ../C/xiphos.xml:95(title) 
-msgid "History Forward/Backward Selector"
-msgstr ""
-
-#: ../C/xiphos.xml:96(para) 
-msgid "Switches between current and previous passage selections."
-msgstr ""
-
-#: ../C/xiphos.xml:103(para) 
-msgid "Selects the Biblical book to be displayed in the <interface>Bible Text Pane</interface> and <interface>Commentary Pane</interface>. Changes take immediate effect."
-msgstr ""
-
-#: ../C/xiphos.xml:111(para) 
-msgid "Selects the Biblical chapter of current book to be displayed in the <interface>Bible Text Pane</interface> and <interface>Commentary Pane</interface>. Changes take immediate effect."
-msgstr ""
-
-#: ../C/xiphos.xml:119(para) 
-msgid "Selects the Biblical verse of current chapter to be displayed in the <interface>Bible Text Pane</interface> and <interface>Commentary Pane</interface>. Changes take immediate effect."
-msgstr ""
-
-#: ../C/xiphos.xml:127(para) 
-msgid "Allows manual editing of passages which are displayed in the <interface>Bible Text Pane</interface> and <interface>Commentary Pane</interface>. Changes take effect once Enter is typed."
-msgstr ""
-
-#: ../C/xiphos.xml:132(para) 
-msgid "Ensure that edited book,chapter and verse naming is correct, otherwise the wrong or no information will be displayed."
-msgstr ""
-
-#: ../C/xiphos.xml:142(title) ../C/xiphos.xml:157(phrase) 
-msgid "The Sidebar"
-msgstr ""
-
-#: ../C/xiphos.xml:163(para) 
-msgid "On the left hand side of <application>Xiphos</application> there is the Sidebar. Here the user can switch between the different Sword modules, view bookmarks, do simple searches and view verse lists. To switch between all Sidebar functions, shortcuts have been placed at the bottom of the Sidebar. Clicking on the shortcut activates the option."
-msgstr ""
-
-#: ../C/xiphos.xml:170(title) 
-msgid "Sidebar Shortcuts"
-msgstr ""
-
-#: ../C/xiphos.xml:183(phrase) 
-msgid "Sidebar shortcuts"
-msgstr ""
-
-#: ../C/xiphos.xml:191(title) 
-msgid "The Bible Text Pane"
-msgstr ""
-
-#: ../C/xiphos.xml:193(title) 
-msgid "The Bible Textpane"
-msgstr ""
-
-#: ../C/xiphos.xml:206(phrase) 
-msgid "The Bible textpane"
-msgstr ""
-
-#: ../C/xiphos.xml:212(para) 
-msgid "Positioned to the right of the Shortcut bar is the Bible text pane. All your different translations will be displayed for full viewing. When starting <application>Xiphos</application> either your default Bible translation or the translation last used will be displayed."
-msgstr ""
-
-#: ../C/xiphos.xml:219(title) 
-msgid "Opening A Specific Bible Translation"
-msgstr ""
-
-#: ../C/xiphos.xml:220(para) 
-msgid "In order to change the current Bible translation to another of your choice:"
-msgstr ""
-
-#: ../C/xiphos.xml:225(para) 
-msgid "right-click in the <interface>Bible Text Pane</interface>. In the popup menu choose <menuchoice><guimenuitem>File</guimenuitem><guimenuitem>Open Module</guimenuitem></menuchoice> and select your specific translation that you want to view."
-msgstr ""
-
-#: ../C/xiphos.xml:232(para) 
-msgid "under the <guibutton>Modules</guibutton> option in the <interface>Sidebar</interface>, choose <menuchoice><guimenuitem>Biblical Texts</guimenuitem><guimenuitem>language choice</guimenuitem></menuchoice> and select your specific translation."
-msgstr ""
-
-#: ../C/xiphos.xml:242(title) 
-msgid "Using the Parallel View Mode"
-msgstr ""
-
-#: ../C/xiphos.xml:243(para) 
-msgid "A nice function in <application>Xiphos</application> is the ability to view your specified bible text in five parallel translations of your choice. The Parallel View mode can be accessed by selecting <guimenuitem>Parallel View</guimenuitem> just below the <interface>Bible Text Pane</interface>, next to the <guimenuitem>Standard View</guimenuitem> tab. Please note that you can only view one verse at a time. You can change the verse by selecting another verse, chapter, or book at the toolbar. Also note that modules that are Old Testament or New Testament only (eg Westminster Leningrad Codex and Byzantine Majority Text ) will not be able to display books, chapters, or verses that they don't have."
-msgstr ""
-
-#: ../C/xiphos.xml:252(title) ../C/xiphos.xml:264(phrase) 
-msgid "Bible textpane - parallel view"
-msgstr ""
-
-#: ../C/xiphos.xml:270(para) 
-msgid "Additionally, a separate Parallel View window can be selected from the right click menu with <guimenuitem>Detach/Attach</guimenuitem>. Your Bible pane will return to its normal single text view, and the new Parallel View window will show the complete chapter, in all 5 translations."
-msgstr ""
-
-#: ../C/xiphos.xml:276(title) ../C/xiphos.xml:288(phrase) 
-msgid "Parallel View - separate window"
-msgstr ""
-
-#: ../C/xiphos.xml:297(title) 
-msgid "Opening A Separate Bible Translation"
-msgstr ""
-
-#: ../C/xiphos.xml:298(para) 
-msgid "In order to view a Bible translation separate from the <application>Xiphos</application> interface:"
-msgstr ""
-
-#: ../C/xiphos.xml:303(para) 
-msgid "Under the <guibutton>Modules</guibutton> option in the <interface>Sidebar</interface>,choose <menuchoice><guimenuitem>Biblical Texts</guimenuitem><guimenuitem>language choice</guimenuitem></menuchoice>. Then right-click on a translation and choose the <guimenuitem>Open in dialog</guimenuitem> option."
-msgstr ""
-
-#: ../C/xiphos.xml:314(title) 
-msgid "Finding Out About The Current Translation"
-msgstr ""
-
-#: ../C/xiphos.xml:315(para) 
-msgid "To find out about the Bible translation currently being displayed:"
-msgstr ""
-
-#: ../C/xiphos.xml:320(para) 
-msgid "right-click in the <interface>Bible Text pane</interface>. In the popup menu choose <guimenuitem>About </guimenuitem> module name."
-msgstr ""
-
-#: ../C/xiphos.xml:326(para) 
-msgid "Under the <guibutton>Modules</guibutton> option in the <interface>Sidebar</interface>,choose <menuchoice><guimenuitem>Biblical Texts</guimenuitem><guimenuitem>language choice</guimenuitem></menuchoice>. Then right-click on a translation and choose the <guimenuitem>About</guimenuitem> option."
-msgstr ""
-
-#: ../C/xiphos.xml:337(title) ../C/xiphos.xml:395(title) ../C/xiphos.xml:407(phrase) 
-msgid "Module Options"
-msgstr ""
-
-#: ../C/xiphos.xml:338(para) 
-msgid "Most Bible translations have additional options which the user can select."
-msgstr ""
-
-#: ../C/xiphos.xml:343(para) 
-msgid "Words Of Christ In Red"
-msgstr ""
-
-#: ../C/xiphos.xml:348(para) 
-msgid "Strong's Numbers"
-msgstr ""
-
-#: ../C/xiphos.xml:353(para) 
-msgid "Morphological Tags"
-msgstr ""
-
-#: ../C/xiphos.xml:358(para) 
-msgid "Footnotes"
-msgstr ""
-
-#: ../C/xiphos.xml:363(para) 
-msgid "Scripture Cross-Reference"
-msgstr ""
-
-#: ../C/xiphos.xml:368(para) 
-msgid "Headings"
-msgstr ""
-
-#: ../C/xiphos.xml:373(para) 
-msgid "Image Content"
-msgstr ""
-
-#: ../C/xiphos.xml:379(para) 
-msgid "Translations in other languages such as Greek or Hebrew have specific options which deal only with the specific language."
-msgstr ""
-
-#: ../C/xiphos.xml:383(para) 
-msgid "In order to access these options:"
-msgstr ""
-
-#: ../C/xiphos.xml:388(para) 
-msgid "right-click in the <interface>Bible Text pane</interface>. In the popup menu (example shown), choose <guibutton>Module Options</guibutton> and select the specific option."
-msgstr ""
-
-#: ../C/xiphos.xml:416(title) ../C/xiphos.xml:421(title) ../C/xiphos.xml:433(phrase) 
-msgid "View Options"
-msgstr ""
-
-#: ../C/xiphos.xml:417(para) 
-msgid "There are several additional modes that can be selected from the menubar's <guimenuitem>View</guimenuitem> pulldown."
-msgstr ""
-
-#: ../C/xiphos.xml:440(para) 
-msgid "The first 4 checkboxes control whether each named subwindow is displayed. The viewable state of the subwindows is remembered on a per-tab basis. This makes it possible, for example, to have a tab dedicated to a maps module alone (in a dictionary module, having alphabetically-listed places), by turning off the display of Bible, Previewer, and Commentary for that tab."
-msgstr ""
-
-#: ../C/xiphos.xml:445(para) 
-msgid "The remaining checkboxes control these other display features:"
-msgstr ""
-
-#: ../C/xiphos.xml:450(para) 
-msgid "Verse Style - Toggles between Bible text display in separate verses, or in paragraphs instead. This is set on a per-module basis."
-msgstr ""
-
-#: ../C/xiphos.xml:456(para) 
-msgid "Link Tabs - When more than one tab is open, each one's verse is navigated separately in the disabled case. If tab linking is enabled, then all tabs navigate together, keeping all translations on the same verse."
-msgstr ""
-
-#: ../C/xiphos.xml:463(para) 
-msgid "Read Aloud - If you enable this, then Xiphos will funnel all selected verses through the <application>festival</application> text-to-speech system. <application>Festival</application> is a widely-available TTS, often installed by default in Linux distributions. Reading aloud is not currently supported on Windows."
-msgstr ""
-
-#: ../C/xiphos.xml:469(para) 
-msgid "Also, mouse-selected text may be read aloud from Bibles, commentaries, and general books, using the right-click menu, regardless of whether Read Aloud is selected."
-msgstr ""
-
-#: ../C/xiphos.xml:476(para) 
-msgid "Show Verse Numbers - Normally enabled, this toggle can be disabled to prevent display of verse numbers within the text."
-msgstr ""
-
-#: ../C/xiphos.xml:482(para) 
-msgid "Highlight Current Verse - Initially disabled, this toggle replaces mere alternate colorization of the current verse with a substitute high-contrast highlight. The colors used may be selected from the Preferences dialog."
-msgstr ""
-
-#: ../C/xiphos.xml:492(title) 
-msgid "Specific Word Meanings"
-msgstr ""
-
-#: ../C/xiphos.xml:493(para) 
-msgid "In order to check the meaning of a specific word, double-click on the word you wish to lookup. The word should then highlight itself and the explanation should be displayed, if available, in the <interface>Dictionary Pane</interface>."
-msgstr ""
-
-#: ../C/xiphos.xml:500(title) 
-msgid "Finding A Specific Word"
-msgstr ""
-
-#: ../C/xiphos.xml:501(para) 
-msgid "To find a specific word within a passage:"
-msgstr ""
-
-#: ../C/xiphos.xml:506(para) 
-msgid "right-click in the <interface>Bible Text Pane</interface>. In the popup menu, choose <guibutton>Edit</guibutton>-&gt; <guibutton>Find</guibutton>. A separate dialog will appear, which provides text searches. Fill out dialog and click the <guibutton>Find</guibutton> and <guibutton>Find Next</guibutton> buttons."
-msgstr ""
-
-#: ../C/xiphos.xml:519(title) 
-msgid "PreViewer"
-msgstr ""
-
-#: ../C/xiphos.xml:537(para) 
-msgid "The Previewer is where the user sees Strong's numbers, morphological tags, footnotes, and cross-references that the <interface>Bible Text Pane</interface> provides."
-msgstr ""
-
-#: ../C/xiphos.xml:541(para) 
-msgid "Footnote content is displayed in the Previewer when you hover over the indicator <guibutton>*n</guibutton> in the Bible text; It remains visible until your mouse moves over another indicator, Strong's number, etc. Sometimes you may want the text to remain anchored until you can move the mouse to the previewer to click on a link or to read large footnotes. To anchor the text so that you can scroll it in the Previewer, middle-click the indicator (or hold down the <guibutton>Shift key</guibutton>) and move to the Previewer."
-msgstr ""
-
-#: ../C/xiphos.xml:548(para) 
-msgid "Cross-reference indicators <guibutton>*x</guibutton> work much the same way. Clicking the indicator will send the set of references to the <guibutton>Verse List</guibutton> in the <interface>Sidebar</interface>, where you can click them individually for reading in the Previewer."
-msgstr ""
-
-#: ../C/xiphos.xml:556(title) ../C/xiphos.xml:558(title) 
-msgid "The Commentary Pane"
-msgstr ""
-
-#: ../C/xiphos.xml:577(para) 
-msgid "The <interface>Commentary pane</interface> is where the commentary modules are displayed. This provides easy reading, reference, and access to different commentaries currently installed. The passage viewed by the <interface>Commentary pane</interface> is directly controlled by the current passage viewed in the <interface>Bible Text pane</interface>, so in order to change to a different passage commentary, select the desired passage on the <interface>Toolbar</interface>."
-msgstr ""
-
-#: ../C/xiphos.xml:584(para) 
-msgid "If there are images that are part of a commentary, general book, or dictionary/lexicon, they may be clicked to invoke a viewer on that single image, in order to get a better view. This is particularly useful if image resizing has been enabled with the result that images are made very small in the subwindow."
-msgstr ""
-
-#: ../C/xiphos.xml:590(para) 
-msgid "By changing to passage settings on the <interface>Toolbar</interface>, the contents in the <interface>Bible Text pane</interface> and the <interface>Commentary Pane</interface> will be changed."
-msgstr ""
-
-#: ../C/xiphos.xml:597(title) 
-msgid "Finding Out About The Commentary Module"
-msgstr ""
-
-#: ../C/xiphos.xml:598(para) 
-msgid "To find out about the commentary currently being displayed:"
-msgstr ""
-
-#: ../C/xiphos.xml:603(para) 
-msgid "right-click in the <interface>Commentary Pane</interface>. In the popup menu choose <guimenuitem>About </guimenuitem> module name."
-msgstr ""
-
-#: ../C/xiphos.xml:612(title) 
-msgid "Commentary Headings."
-msgstr ""
-
-#: ../C/xiphos.xml:613(para) 
-msgid "Many commentaries have additional headings which enable introductory information about the book and chapter currently being displayed in the <interface>Bible Text pane</interface>. In order to view them:"
-msgstr ""
-
-#: ../C/xiphos.xml:619(para) 
-msgid "right-click in the <interface>Commentary Pane</interface>. In the popup menu choose <guimenuitem>Display Book Heading</guimenuitem> or <guimenuitem>Display Chapter Heading</guimenuitem>."
-msgstr ""
-
-#: ../C/xiphos.xml:629(title) 
-msgid "Dictionary Pane"
-msgstr ""
-
-#: ../C/xiphos.xml:631(title) ../C/xiphos.xml:644(phrase) 
-msgid "The Dictionary Pane"
-msgstr ""
-
-#: ../C/xiphos.xml:651(para) 
-msgid "The Dictionary Pane's content is driven by its up/down selectors, typing in its navbar text, or double-clicks in the Bible, Commentary, or Book Panes."
-msgstr ""
-
-#: ../C/xiphos.xml:657(title) 
-msgid "Keyboard Shortcuts"
-msgstr ""
-
-#: ../C/xiphos.xml:658(para) 
-msgid "Several keyboard shortcuts exist in <application>Xiphos</application>:"
-msgstr ""
-
-#: ../C/xiphos.xml:663(para) 
-msgid "<guibutton>F1</guibutton>: opens this manual."
-msgstr ""
-
-#: ../C/xiphos.xml:668(para) 
-msgid "<guibutton>F2</guibutton>: opens the <guibutton>Preferences</guibutton> dialog."
-msgstr ""
-
-#: ../C/xiphos.xml:673(para) 
-msgid "<guibutton>F3</guibutton>: opens <guibutton>Advanced Search</guibutton>."
-msgstr ""
-
-#: ../C/xiphos.xml:678(para) 
-msgid "<guibutton>F4</guibutton>: opens the <guibutton>Module Manager</guibutton>."
-msgstr ""
-
-#: ../C/xiphos.xml:683(para) 
-msgid "<guibutton>Ctrl-L</guibutton> focuses and selects the main verse navbar text. You can then immediately type in new verse selection text. Be aware that, as is the case with most Sword applications, <application>Xiphos</application> understands many abbreviations: \"G\" is adequate to specify Genesis, for example, and any book name by itself implies 1:1."
-msgstr ""
-
-#: ../C/xiphos.xml:691(para) 
-msgid "<guibutton>Ctrl-F</guibutton> opens the \"Find\" dialog. The subwindow to which it applies depends on which of them are visible: The Bible is first preference, then the commentary or general book, then the dictionary. So a tab can be dedicated to just a genbook, and Ctrl-F will perform \"Find\" within that pane."
-msgstr ""
-
-#: ../C/xiphos.xml:698(para) 
-msgid "<guibutton>Alt-C</guibutton> brings the Commentary View forward when previously obscured by the Book View."
-msgstr ""
-
-#: ../C/xiphos.xml:703(para) 
-msgid "<guibutton>Alt-G</guibutton> is the opposite of Alt-C, focusing on the general book."
-msgstr ""
-
-#: ../C/xiphos.xml:708(para) 
-msgid "<guibutton>Alt-B</guibutton> opens a bookmark dialog on the current verse."
-msgstr ""
-
-#: ../C/xiphos.xml:713(para) 
-msgid "<guibutton>Alt-D</guibutton> focuses on the dictionary navbar text."
-msgstr ""
-
-#: ../C/xiphos.xml:718(para) 
-msgid "<guibutton>Alt-P</guibutton> detaches/re-attaches the parallel view dialog."
-msgstr ""
-
-#: ../C/xiphos.xml:723(para) 
-msgid "<guibutton>Alt-Z</guibutton> opens the personal commentary editor."
-msgstr ""
-
-#: ../C/xiphos.xml:728(para) 
-msgid "<guibutton>Ctrl-Plus/Ctrl-Minus</guibutton> increases/decreases the base font size."
-msgstr ""
-
-#: ../C/xiphos.xml:737(para) 
-msgid "<guibutton>Ctrl-p/Ctrl-n</guibutton>: Verse previous/next."
-msgstr ""
-
-#: ../C/xiphos.xml:741(para) 
-msgid "<guibutton>p/n</guibutton>: Chapter previous/next."
-msgstr ""
-
-#: ../C/xiphos.xml:745(para) 
-msgid "<guibutton>P/N</guibutton>: Book previous/next."
-msgstr ""
-
-#: ../C/xiphos.xml:733(para) 
-msgid "Location bar navigation: <placeholder-1/>"
-msgstr ""
-
-#: ../C/xiphos.xml:755(title) 
-msgid "Version Differences in <application>Xiphos</application>'s Display"
-msgstr ""
-
-#: ../C/xiphos.xml:756(para) 
-msgid "The <application>Xiphos</application> interface has evolved over time, and there are two display libraries with which <application>Xiphos</application> can be built. The older, less featureful version is called \"gtkhtml3\", and the newer, more capable version is called \"MozEmbed\". Both of these display libraries render text in a browser-like fashion, using HTML constructs to control display."
-msgstr ""
-
-#: ../C/xiphos.xml:763(para) 
-msgid "Several desirable capabilities are unsupportable in gtkhtml3, and although recent <application>Xiphos</application> is written to take advantage of MozEmbed features, it is possible that the version running on your computer needed to be built with gtkhtml3 instead, either because the version of MozEmbed available for your system is not recent enough to support the needs of <application>Xiphos</application>, or it simply doesn't exist for your system. (Mozembed is not supported under Windows at this time.) The following differences will be apparent, depending on whether gtkhtml3 or MozEmbed is the underlying display engine:"
-msgstr ""
-
-#: ../C/xiphos.xml:774(para) 
-msgid "Morphology and Strong's references, enabled via the right-click menu in some modules, are displayed inline with gtkhtml3; with MozEmbed, a blocked display is used, where these references are aligned beneath the word to which they refer, for a much more readable, less cluttered display."
-msgstr ""
-
-#: ../C/xiphos.xml:781(para) 
-msgid "Footnote and cross-reference markers (<guibutton>*n</guibutton>, <guibutton>*x</guibutton>) are displayed as proper superscripts in MozEmbed, but not in gtkhtml3."
-msgstr ""
-
-#: ../C/xiphos.xml:787(para) 
-msgid "Links in gtkhtml3 are necessarily both colored and underlined; in MozEmbed, no underlines are needed."
-msgstr ""
-
-#: ../C/xiphos.xml:792(para) 
-msgid "Under MozEmbed, double-space display is available using the <guimenuitem>View</guimenuitem> menu, but not under gtkhtml3."
-msgstr ""
-
-#: ../C/xiphos.xml:798(para) 
-msgid "It is not possible for gtkhtml3 to interpret multiple font face directives in a single window, so the gtkhtml3 detached parallel view window cannot provide per-module font selections. Also, modules' internal font requests are ignored in any gtkhtml3 window."
-msgstr ""
-
-#: ../C/xiphos.xml:806(para) 
-msgid "Using the \"About Xiphos\" selection under the <guimenuitem>Help</guimenuitem> menu, you will see the display library with which <application>Xiphos</application> was built."
-msgstr ""
-
-#: ../C/xiphos.xml:811(title) ../C/xiphos.xml:818(phrase) 
-msgid "Comparison, gtkhtml3 -vs- mozembed"
-msgstr ""
-
-#: ../C/xiphos.xml:398(title) 
-msgid "Preferences"
-msgstr ""
-
-#: ../C/xiphos.xml:6(title) ../C/preferences.xml:6(title) 
-msgid "Introduction To Preferences"
-msgstr ""
-
-#: ../C/xiphos.xml:8(title) ../C/preferences.xml:8(title) 
-msgid "The Preference Dialog"
-msgstr ""
-
-#: ../C/xiphos.xml:21(phrase) ../C/preferences.xml:21(phrase) 
-msgid "The Preferences Dialog"
-msgstr ""
-
-#: ../C/xiphos.xml:30(title) 
-msgid "Fonts And Colors"
-msgstr ""
-
-#: ../C/xiphos.xml:32(title) 
-msgid "Setting Font Colors"
-msgstr ""
-
-#: ../C/xiphos.xml:34(title) ../C/xiphos.xml:47(phrase) 
-msgid "Font Colour Settings"
-msgstr ""
-
-#: ../C/xiphos.xml:56(title) ../C/xiphos.xml:58(title) ../C/xiphos.xml:71(phrase) 
-msgid "Miscellaneous Font Settings"
-msgstr ""
-
-#: ../C/xiphos.xml:78(para) 
-msgid "In individual modules' display, the right-click menu's <guimenuitem>Module Options</guimenuitem> selector provides font name and size selection."
-msgstr ""
-
-#: ../C/xiphos.xml:83(para) 
-msgid "The base font size is the size initially chosen for all modules displayed by <application>Xiphos</application>. The verse number and individual modules' font size choices are relative to the base font size."
-msgstr ""
-
-#: ../C/xiphos.xml:92(title) 
-msgid "General Settings"
-msgstr ""
-
-#: ../C/xiphos.xml:94(title) 
-msgid "Tabs and Pane Settings"
-msgstr ""
-
-#: ../C/xiphos.xml:96(title) ../C/xiphos.xml:109(phrase) 
-msgid "Tab and Pane Settings"
-msgstr ""
-
-#: ../C/xiphos.xml:118(title) ../C/xiphos.xml:120(title) ../C/xiphos.xml:133(phrase) 
-msgid "General Preferences and StudyPad directory"
-msgstr ""
-
-#: ../C/xiphos.xml:140(para) 
-msgid "Certain dictionary-style modules are <guilabel>Daily Devotionals</guilabel> whose keys are numerically in the form \"Month.Day\". If you have such a module installed and it has been selected as your preferred devotional, then you can ask that <application>Xiphos</application> display today's selection during startup."
-msgstr ""
-
-#: ../C/xiphos.xml:145(para) 
-msgid "<guilabel>Verse style</guilabel> indicates that each verse should begin on a separate line, or (when disabled) that verses should be allowed to group in paragraphs, according to the Bible module's internal markup. Not all Bible modules have such markup."
-msgstr ""
-
-#: ../C/xiphos.xml:150(para) 
-msgid "With <guilabel>Scroll to Previous/Next Chapter</guilabel> enabled, using the mouse to scroll to the beginning or end of a chapter will cause <application>Xiphos</application> to move automatically to the appropriate chapter."
-msgstr ""
-
-#: ../C/xiphos.xml:154(para) 
-msgid "If you enable <guilabel>Resize images</guilabel>, <application>Xiphos</application> will automatically resize image content in commentaries, general books, and dictionaries so as to fit the subwindow which contains them."
-msgstr ""
-
-#: ../C/xiphos.xml:158(para) 
-msgid "<guilabel>Highlight current verse</guilabel>, if enabled, will cause <application>Xiphos</application> to substitute mere current verse colorization with a high-contrast alternate color scheme on the current verse. The colors used may be chosen from the color selector pane (see above)."
-msgstr ""
-
-#: ../C/xiphos.xml:168(title) 
-msgid "Module Settings"
-msgstr ""
-
-#: ../C/xiphos.xml:170(title) 
-msgid "Main Module Settings"
-msgstr ""
-
-#: ../C/xiphos.xml:172(title) ../C/xiphos.xml:185(phrase) 
-msgid "The Module Preferences Dialog"
-msgstr ""
-
-#: ../C/xiphos.xml:192(title) ../C/xiphos.xml:205(phrase) 
-msgid "Parallel Preferences"
-msgstr ""
-
-#: ../C/xiphos.xml:212(title) 
-msgid "Various preferences Modules"
-msgstr ""
-
-#: ../C/xiphos.xml:225(phrase) 
-msgid "Various Preferences Modules"
-msgstr ""
-
-#: ../C/xiphos.xml:404(title) 
-msgid "Module Manager"
-msgstr ""
-
-#: ../C/xiphos.xml:5(title) ../C/modules.xml:5(title) 
-msgid "Introduction To The Module Manager"
-msgstr ""
-
-#: ../C/xiphos.xml:6(para) ../C/modules.xml:6(para) 
-msgid "The \"module\" is the unit of content in <application>Xiphos</application>, and Sword generally; a Sword module is a resource available for viewing in Sword applications. There are several varieties: Most importantly, Bible texts, as well as dictionaries and lexicons, commentaries, and general books, any of which may include image content (e.g. atlases). They are installed either from a local directory structure (typically on removable media, such as a CDROM distribution) or remotely via ftp from a repository such as Crosswire, which is the home of Sword, and from which all officially Sword-sanctioned modules are available. Also, many other modules are available from non-Crosswire repositories."
-msgstr ""
-
-#: ../C/xiphos.xml:14(para) ../C/modules.xml:14(para) 
-msgid "If you have other Sword applications installed, they will all share the same set of Sword modules that you install through the Module Manager."
-msgstr ""
-
-#: ../C/xiphos.xml:19(title) ../C/xiphos.xml:32(phrase) ../C/modules.xml:19(title) ../C/modules.xml:32(phrase) 
-msgid "The Module Manager Dialog"
-msgstr ""
-
-#: ../C/xiphos.xml:41(title) 
-msgid "Sword Module Configurations"
-msgstr ""
-
-#: ../C/xiphos.xml:43(title) ../C/xiphos.xml:45(title) 
-msgid "Sword Sources Settings"
-msgstr ""
-
-#: ../C/xiphos.xml:58(phrase) ../C/xiphos.xml:86(phrase) ../C/xiphos.xml:155(phrase) 
-msgid "Module Installation"
-msgstr ""
-
-#: ../C/xiphos.xml:64(para) 
-msgid "There are other repositories available besides Crosswire's own, though the modules available from other repositories do not represent content officially sanctioned by Crosswire. On the web, see this page for list of those repositories known: <ulink type=\"http\" url=\"http://www.crosswire.org/wiki/Module_Repositories\">http://www.crosswire.org/wiki/Module_Repositories</ulink>"
-msgstr ""
-
-#: ../C/xiphos.xml:71(title) ../C/xiphos.xml:73(title) 
-msgid "Sword Module Installations"
-msgstr ""
-
-#: ../C/xiphos.xml:91(para) 
-msgid "After you have selected your Install Source, click the <guimenuitem>Refresh</guimenuitem> button to cause <application>Xiphos</application> to find the module summary available from that source before moving on."
-msgstr ""
-
-#: ../C/xiphos.xml:96(para) 
-msgid "Take note of the \"Install Destination\". In most cases, you will have a choice of a personal area or a system area. The details vary according to your operating system."
-msgstr ""
-
-#: ../C/xiphos.xml:102(title) 
-msgid "Linux"
-msgstr ""
-
-#: ../C/xiphos.xml:103(para) 
-msgid "Unless you run as root (via su or sudo) you will only be able to install in your personal area, under ~/.sword. If you run as root, or change permissions on the shared directory, you will also be able to install modules for all users, typically in /usr/share/sword. There have been some requests for Xiphos to provide a means by which an ordinary (non-root) user could start the program, gain temporary write access to the system area while installing modules, and then revoke that access after installation is complete. Attempting to devise a scheme to do this has proven quite difficult, given the different superuser management schemes employed by various Linux distributions. Therefore, at this time there are no ongoing plans to try to solve this problem, and users are advised to enable write access to the system area outside Xiphos."
-msgstr ""
-
-#: ../C/xiphos.xml:116(title) 
-msgid "Windows XP"
-msgstr ""
-
-#: ../C/xiphos.xml:117(para) 
-msgid "You may install modules to a shared folder so the modules are available to all users. If you have previously used \"The Sword Project for Windows\", this folder will be \"C:\\Program Files\\Crosswire\\The Sword Project\\Sword\". Otherwise it will be \"C:\\Documents and Settings\\All Users\\Application Data\\Sword\". You may also install modules to a location that can only be seen by you. This location is \"C:\\Documents and Settings\\YOUR NAME\\Application Data\\Sword\"."
-msgstr ""
-
-#: ../C/xiphos.xml:126(title) 
-msgid "Windows Vista"
-msgstr ""
-
-#: ../C/xiphos.xml:127(para) 
-msgid "Vista works much the same as XP, except for the locations. The private location is \"C:\\Users\\YOUR NAME\\AppData\\Roaming\\Sword\". The shared location is \"C:\\ProgramData\\Sword\"."
-msgstr ""
-
-#: ../C/xiphos.xml:138(title) ../C/xiphos.xml:140(title) 
-msgid "Installing, Updating, and Maintaining Modules"
-msgstr ""
-
-#: ../C/xiphos.xml:142(title) 
-msgid "Installing and Updating Modules"
-msgstr ""
-
-#: ../C/xiphos.xml:161(para) 
-msgid "The module manager generates both a per-type module list as well as a parallel availability list. The latter is intended to make it easier to find new items without having to work one's way through the per-type list, one subtree at a time. Modules which are either not yet installed or updated beyond what is currently installed will appear in both lists."
-msgstr ""
-
-#: ../C/xiphos.xml:166(para) 
-msgid "Modules that are already installed will show a checkmark beside them. If a fast search (\"lucene\") index is available, a magnifying glass will be displayed, otherwise an \"X\" will be shown; creation of the index is available on the Maintenance pane. Locked modules, which require that you purchase an unlock key from the module's copyright holder, will show a lock symbol. If there are modules installed for which a more recent version is available, a refresh icon will appear between the differing old and new version stamps. There may be an approximate size displayed, if the repository management provides this information, otherwise a question mark (\"-?-\") will be shown."
-msgstr ""
-
-#: ../C/xiphos.xml:173(para) 
-msgid "Select new modules to be installed by clicking the checkboxes and then the Install button at the bottom. Any number of modules may be requested for installation at one time."
-msgstr ""
-
-#: ../C/xiphos.xml:177(para) 
-msgid "If you acquire a locked module and have obtained the cipher key for it, the module is then unlocked in the main window: Open the module, which will probably appear blank, then using the right-click context menu, choose \"Unlock This Module.\""
-msgstr ""
-
-#: ../C/xiphos.xml:183(title) ../C/xiphos.xml:185(title) ../C/xiphos.xml:198(phrase) 
-msgid "Module Maintenance"
-msgstr ""
-
-#: ../C/xiphos.xml:203(para) 
-msgid "Several maintenance functions are available: Removal, archival, index, and index deletion."
-msgstr ""
-
-#: ../C/xiphos.xml:206(para) 
-msgid "Removal disposes of a module entirely. There is no recovery of the module unless you have previously archived a copy of it."
-msgstr ""
-
-#: ../C/xiphos.xml:209(para) 
-msgid "Archival is available for any module, although it is provided with personal commentaries specifically in mind. A *.zip of the module is left in the directory ~/.sword/zip. Archival prior to removal of personal commentaries is recommended, in order to be available for future re-install if the subject matter of the personal commentary becomes important again."
-msgstr ""
-
-#: ../C/xiphos.xml:214(para) 
-msgid "Indexing is provided so that the underlying Sword search support can create the index needed for the \"lucene\" multi-word fast-search functions. If the index is not created, multi-word search will still be available, but it will be much slower. With the index in place, searches through an entire Bible can take just a few seconds."
-msgstr ""
-
-#: ../C/xiphos.xml:219(para) 
-msgid "Indexes may be deleted as well."
-msgstr ""
-
-#: ../C/xiphos.xml:227(title) 
-msgid "Installing Non-Standard Modules"
-msgstr ""
-
-#: ../C/xiphos.xml:228(para) 
-msgid "Some resource modules in Sword Project format are available from sources other than Crosswire and not from a module manager-ready repository. Necessarily, installing such a module is a manual task."
-msgstr ""
-
-#: ../C/xiphos.xml:232(para) 
-msgid "Modules are normally packaged as *.zip files; they contain a configuration file plus a number of data files. Installation of such a module is done by cd'ing to your personal Sword (not <application>Xiphos</application>) configuration directory, ~/.sword, and unzipping the file there. The configuration file will be left in \"mods.d\", and the module's data files will go into a subdirectory of \"modules\". Alternatively, if you have write access to the system Sword directory, typically /usr/share/sword, you may cd there instead before unzipping."
-msgstr ""
-
-#: ../C/xiphos.xml:239(para) 
-msgid "Restart <application>Xiphos</application> after installing such a module, so that a fresh instance of the program can notice the new module in place."
-msgstr ""
-
-#: ../C/xiphos.xml:410(title) 
-msgid "The Search Function"
-msgstr ""
-
-#: ../C/xiphos.xml:4(title) ../C/search.xml:4(title) 
-msgid "Simple Searches"
-msgstr ""
-
-#: ../C/xiphos.xml:5(para) ../C/search.xml:5(para) 
-msgid "To conduct a quick search within the current Bible or commentary module, the Search Bar in the Sidebar should usually be adequate. Click either in the menu bar <guimenuitem>Edit-&gt;Search</guimenuitem> or in the Sidebar <guimenuitem>Modules-&gt;Search</guimenuitem> to access it."
-msgstr ""
-
-#: ../C/xiphos.xml:11(title) ../C/xiphos.xml:24(phrase) ../C/search.xml:11(title) ../C/search.xml:24(phrase) 
-msgid "The Search Bar"
-msgstr ""
-
-#: ../C/xiphos.xml:31(para) ../C/search.xml:31(para) 
-msgid "The <interface>Search Dialog</interface> consists of the following parts:"
-msgstr ""
-
-#: ../C/xiphos.xml:36(para) ../C/search.xml:36(para) 
-msgid "Search Key Entry box"
-msgstr ""
-
-#: ../C/xiphos.xml:41(para) ../C/xiphos.xml:83(title) ../C/search.xml:41(para) ../C/search.xml:83(title) 
-msgid "Search Module Selector"
-msgstr ""
-
-#: ../C/xiphos.xml:46(para) ../C/xiphos.xml:91(title) ../C/search.xml:46(para) ../C/search.xml:91(title) 
-msgid "Search Type Selector"
-msgstr ""
-
-#: ../C/xiphos.xml:51(para) ../C/xiphos.xml:129(title) ../C/search.xml:51(para) ../C/search.xml:129(title) 
-msgid "Search Options Checkbox"
-msgstr ""
-
-#: ../C/xiphos.xml:56(para) ../C/xiphos.xml:136(title) ../C/search.xml:56(para) ../C/search.xml:136(title) 
-msgid "Search Scope Selector"
-msgstr ""
-
-#: ../C/xiphos.xml:61(para) ../C/xiphos.xml:173(title) ../C/search.xml:61(para) ../C/search.xml:173(title) 
-msgid "Search Results View"
-msgstr ""
-
-#: ../C/xiphos.xml:67(title) ../C/search.xml:67(title) 
-msgid "Search Key Entry Box"
-msgstr ""
-
-#: ../C/xiphos.xml:68(para) ../C/search.xml:68(para) 
-msgid "Allows entry of the key for which you would like to search. The search key can be a word, part of a word, several words, a phrase, or a regular expression depending on the type of search selected. When the search key is entered and all other selections in the search dialog are complete, click the <guibutton>Find</guibutton> button to begin the search."
-msgstr ""
-
-#: ../C/xiphos.xml:75(para) ../C/search.xml:75(para) 
-msgid "This search uses the optimized search method (see next section) if the module has previously been indexed, and will use AND semantics by default (verses must contain all words you entered)."
-msgstr ""
-
-#: ../C/xiphos.xml:84(para) ../C/search.xml:84(para) 
-msgid "Allows selection of which modules you would like to search. Select <guibutton>Bible</guibutton> to search Bible versions or <guibutton>Commentary</guibutton> to search commentaries. Only the currently active module will be searched."
-msgstr ""
-
-#: ../C/xiphos.xml:92(para) ../C/search.xml:92(para) 
-msgid "Allows selection of the type of search. There are three search types available:"
-msgstr ""
-
-#: ../C/xiphos.xml:97(guibutton) ../C/search.xml:97(guibutton) 
-msgid "Multi word"
-msgstr ""
-
-#: ../C/xiphos.xml:98(para) ../C/search.xml:98(para) 
-msgid "This type will match any verse that has all the words in the search key, regardless of where they appear in the verse."
-msgstr ""
-
-#: ../C/xiphos.xml:103(guibutton) ../C/search.xml:103(guibutton) 
-msgid "Regular expression"
-msgstr ""
-
-#: ../C/xiphos.xml:104(para) ../C/search.xml:104(para) 
-msgid "This search uses a regular expression as a search key. A regular expression is a pattern used to match a string of text. A regular expression can be used to find verses with words that match a particular pattern. For example the regular expression <userinput>\\ A[a-z]*iah </userinput> will match verses that contain the words Aiah, Ahaziah, Athaliah and Amariah."
-msgstr ""
-
-#: ../C/xiphos.xml:111(para) ../C/search.xml:111(para) 
-msgid "A complete discussion of regular expressions is beyond the scope of this manual, but more information can be found in the grep man page."
-msgstr ""
-
-#: ../C/xiphos.xml:116(guibutton) ../C/search.xml:116(guibutton) 
-msgid "Exact phrase"
-msgstr ""
-
-#: ../C/xiphos.xml:117(para) ../C/search.xml:117(para) 
-msgid "This type will match the search key exatly as entered. If the search key is <userinput>\n\t\t\t\t\tit is good</userinput>, this search would match a verse which contains \"<emphasis>it is good</emphasis>,\" but would not match a verse which contains \"<emphasis> good</emphasis>, and doeth <emphasis>it</emphasis> not, to him it <emphasis>is</emphasis> sin.\""
-msgstr ""
-
-#: ../C/xiphos.xml:130(para) ../C/search.xml:130(para) 
-msgid "Allows selecting of search options. The only available option is <guibutton>Match case</guibutton>. Check this box to make the search case sensitive."
-msgstr ""
-
-#: ../C/xiphos.xml:137(para) ../C/search.xml:137(para) 
-msgid "Allows defining the range within the specificed module that will be searched. There are three search scopes available:"
-msgstr ""
-
-#: ../C/xiphos.xml:141(guibutton) ../C/search.xml:141(guibutton) 
-msgid "No scope"
-msgstr ""
-
-#: ../C/xiphos.xml:142(para) ../C/search.xml:142(para) 
-msgid "This button causes the search to to include the entire module."
-msgstr ""
-
-#: ../C/xiphos.xml:147(guibutton) ../C/search.xml:147(guibutton) 
-msgid "Use bounds"
-msgstr ""
-
-#: ../C/xiphos.xml:148(para) ../C/search.xml:148(para) 
-msgid "Selecting this button produces two dropdown selector boxes marked <guilabel>Lower</guilabel> and <guilabel>Upper</guilabel>. Select the first book to search in the <guilabel>Lower</guilabel> box and the last book to search in the <guilabel>Upper</guilabel> box. The search will begin with the <guilabel>Lower </guilabel> book and end with the <guilabel>Upper </guilabel> book and include all books in between."
-msgstr ""
-
-#: ../C/xiphos.xml:157(para) ../C/search.xml:157(para) 
-msgid "Chapter and verse numbers can be entered into the search bound boxes as well to further narrow the search."
-msgstr ""
-
-#: ../C/xiphos.xml:163(guibutton) ../C/search.xml:163(guibutton) 
-msgid "Last search"
-msgstr ""
-
-#: ../C/xiphos.xml:164(para) ../C/search.xml:164(para) 
-msgid "Select this button to do a new search including only the verses returned as a result of the last search. Use this with a new search key to narrow the search further."
-msgstr ""
-
-#: ../C/xiphos.xml:174(para) ../C/search.xml:174(para) 
-msgid "This shows a list of the current search results for previewing, navigation, or saving."
-msgstr ""
-
-#: ../C/xiphos.xml:177(term) ../C/search.xml:177(term) 
-msgid "Preview"
-msgstr ""
-
-#: ../C/xiphos.xml:178(para) ../C/search.xml:178(para) 
-msgid "To preview the search result, simply click on an individual result. The entry will show in the preview pane."
-msgstr ""
-
-#: ../C/xiphos.xml:184(term) ../C/search.xml:184(term) 
-msgid "Navigation"
-msgstr ""
-
-#: ../C/xiphos.xml:185(para) ../C/search.xml:185(para) 
-msgid "Navigation to the search result can be done in two ways. To open the result in a new tab, middle-click the mouse. To open the result in the current tab, double-click the result."
-msgstr ""
-
-#: ../C/xiphos.xml:191(term) ../C/search.xml:191(term) 
-msgid "Save Results"
-msgstr ""
-
-#: ../C/xiphos.xml:192(para) ../C/search.xml:192(para) 
-msgid "You may save your results as a list of bookmarks. To do this, right-click and select <guilabel>Save List</guilabel>. You will be prompted to enter a name for the folder that your results will be saved to. After you have saved the results, you may view them by going to your bookmarks and finding the folder you just named."
-msgstr ""
-
-#: ../C/xiphos.xml:203(title) 
-msgid "Advanced Searches"
-msgstr ""
-
-#: ../C/xiphos.xml:204(para) 
-msgid "More complicated searches might require the use of the advanced search functions, found under <guimenuitem>Edit-&gt;Advanced Search</guimenuitem>."
-msgstr ""
-
-#: ../C/xiphos.xml:210(title) 
-msgid "The Advanced Search Dialogue"
-msgstr ""
-
-#: ../C/xiphos.xml:223(phrase) 
-msgid "The Advanced Search Dialog"
-msgstr ""
-
-#: ../C/xiphos.xml:231(para) 
-msgid "In <guimenuitem>Advanced Search</guimenuitem>, much more complex queries can be constructed, involving custom search ranges, custom lists of modules over which to search, regular expression matching (see next section), and attribute-based searches such as are found in footnotes or Strong's Hebrew and Greek dictionary references."
-msgstr ""
-
-#: ../C/xiphos.xml:237(para) 
-msgid "The default search is multi-word, a somewhat slow and blunt search through module text. Also available is an optimized search based on the Lucene indexing and search library. In order to use the optimized search, the index must be constructed beforehand: Please see the preceding section on the Module Manager regarding the Maintenance functions, including indexing. A web search will provide several references to the syntax needed to put to use the power of optimized Lucene search. A few examples follow:"
-msgstr ""
-
-#: ../C/xiphos.xml:245(para) 
-msgid "Simple Searches: just type in the words you want to search for. To return only verses that include all of the words, prefix the word with \"+\". So, in the KJV, you could find Psalm 23 by searching for \"+Lord +shepherd +want\". To search for an entire phrase, surround the entire phrase with quotes, like \"maketh me to lie down\" (note that quotes are unnecessary in all of the other examples)."
-msgstr ""
-
-#: ../C/xiphos.xml:252(para) 
-msgid "Single Letter Wildcard: to search for \"veil\" or \"vail\", use this syntax \"v?il\". The \"?\" represents a single character that could be anything. A more complex example returns both spellings for Isaiah used in the KJV. \"?saia?\" will return results for \"Isaiah\" and \"Esaias\"."
-msgstr ""
-
-#: ../C/xiphos.xml:258(para) 
-msgid "Multiple Letter Wildcard: to search for \"prophet\" or \"prophesy\" or \"prophecy\" or \"prophesied\", use this syntax \"prophe*\"."
-msgstr ""
-
-#: ../C/xiphos.xml:262(para) 
-msgid "AND syntax: in the advanced search to return results for all of the search terms, you must put \"AND\" in between the terms. To continue our example, if we wish to search for any occurrence of Isaiah or Esaias that also mention either prophet, or prophecy, or prophesy, we can do a search like this: \"?saia? AND prophe*\"."
-msgstr ""
-
-#: ../C/xiphos.xml:268(para) 
-msgid "By default, two standard search ranges are defined, for Old and New Testament; you may wish to define others for e.g. \"Gospels\" or \"Paul's Epistles\". One custom module list containing only the first Bible found will be present. If desired, new searches can be performed across only the current results of the previous search. Any modules may be searched, including general books and even dictionaries, in any combination."
-msgstr ""
-
-#: ../C/xiphos.xml:275(para) 
-msgid "Note the tooltip in the screenshot above, for Attributes search. This qualifier is used to perform searches on attributes that are carried with verses, instead of verse content proper, such as footnote content or Strong's Hebrew and Greek references. If this button is selected, specific attribute qualifiers must be made in the Attribute Search tab, at the right end of the tab set. Strong's references are identified with a leading \"H\" or \"G\" and the numeric Strong's identifier. Thus, a search of KJV for Strong's Greek #140, using \"G140\", will return the single result of Matthew 12:18."
-msgstr ""
-
-#: ../C/xiphos.xml:283(para) 
-msgid "If you have indexed your modules, there is a much faster way to search for Strong's references. Enter your search preceded by \"lemma:\", so to search for Strong's Greek #140, enter \"lemma:G140\". You must have selected <guibutton>Optimized (\"Lucene\")</guibutton> for this to work."
-msgstr ""
-
-#: ../C/xiphos.xml:289(para) 
-msgid "The \"Find\" button also stops an in-progress search, as its tooltip indicates."
-msgstr ""
-
-#: ../C/xiphos.xml:293(para) 
-msgid "Results will show in the <guibutton>Results</guibutton> tab. If you wish to show Strongs, Morphology, or Footnote tags, make those selections on the <guibutton>Attributes Search</guibutton> tab. Clicking once on the result will show the result in the <guibutton>Advanced Search</guibutton> previewer. Hovering over Strongs, Morphology, Footnote, or Cross-reference tags will show the results in the main previewer. Double-clicking a result will cause the current tab to navigate to that result. This applies to search results in general books and commentaries as well, but note that the respective tab must be visible."
-msgstr ""
-
-#: ../C/xiphos.xml:303(para) 
-msgid "Changes to some of the settings (e.g. scope of search, searched modules, etc.) in Advanced Search will affect the simple search via the side pane but not vice versa."
-msgstr ""
-
-#: ../C/xiphos.xml:310(title) 
-msgid "Search Syntax using Regular Expression"
-msgstr ""
-
-#: ../C/xiphos.xml:312(para) 
-msgid "Regular expression searches provide a way to do simple or complex searches for strings that match a pattern or set of patterns (branches) separated by vertical bars \"|\". While a pattern can be built to look for a word or phrase, a simple pattern that consists of a word does not look for only that word but for any place the string of letters that make that word are found. A search for \"right\" will return verses that contain the word \"right\", but also \"<emphasis>right</emphasis>eous\", \"<emphasis>right</emphasis>eousness\", \"un<emphasis>right</emphasis>eous\", \"up<emphasis>right</emphasis>\" and even \"b<emphasis>right</emphasis>\". A search for \"hall not\" is not a search for \"hall\" AND \"not\" but for the string \"hall not\" with a space between the second \"l\" and the \"n\". The search for \"hall not\" will find occurrences of \"s<emphasis>hall not</emphasis>\"."
-msgstr ""
-
-#: ../C/xiphos.xml:315(para) 
-msgid "The power of Regular Expressions is in the patterns (or templates) used to define a search. A pattern consists of ordinary characters and some special characters that are used and interpreted by a set of rules. Special characters include .\\[^*$?+. Ordinary (or simple) characters are any characters that are not special. The backslash, \"\\\", is used to convert special characters to ordinary and ordinary characters to special."
-msgstr ""
-
-#: ../C/xiphos.xml:320(para) 
-msgid "Example: the pattern \"<emphasis>i. love\\.</emphasis>\" will find sentences that end with \"h<emphasis>i</emphasis>s <emphasis>love</emphasis>\" or \"<emphasis>i</emphasis>n <emphasis>love</emphasis>\" or \"<emphasis>i</emphasis>s <emphasis>love</emphasis>\" followed by a period. The first period in \"i. love\\.\" is a special character that means allow any character in this position. The backslash in \"i. love\\.\" means that the period following it is not to be considered a special character, but is an ordinary period."
-msgstr ""
-
-#: ../C/xiphos.xml:328(title) 
-msgid "Rules for Regular Expression Search Requests"
-msgstr ""
-
-#: ../C/xiphos.xml:330(para) 
-msgid ". The period matches any character."
-msgstr ""
-
-#: ../C/xiphos.xml:331(para) 
-msgid "* The asterisk matches 0 or more characters of the preceding: set, character or indicated character."
-msgstr ""
-
-#: ../C/xiphos.xml:333(para) 
-msgid "+ The plus sign matches 1 or more characters of the preceding: set, character or indicated character."
-msgstr ""
-
-#: ../C/xiphos.xml:335(para) 
-msgid "? The question mark matches 0 or 1 character of the preceding: set, character or indicated character."
-msgstr ""
-
-#: ../C/xiphos.xml:337(para) 
-msgid "[ ] Square brackets match any one of the characters specified inside [ ]."
-msgstr ""
-
-#: ../C/xiphos.xml:339(para) 
-msgid "^ A caret as the first character inside [ ] means NOT."
-msgstr ""
-
-#: ../C/xiphos.xml:340(para) 
-msgid "^ A caret beginning a pattern anchors the beginning of a line."
-msgstr ""
-
-#: ../C/xiphos.xml:342(para) 
-msgid "$ A dollar at the end of a pattern anchors the end of a line."
-msgstr ""
-
-#: ../C/xiphos.xml:344(para) 
-msgid "| A vertical bar means logical OR."
-msgstr ""
-
-#: ../C/xiphos.xml:345(para) 
-msgid "( ) Parentheses enclose expressions for grouping. <emphasis>Not supported!</emphasis>"
-msgstr ""
-
-#: ../C/xiphos.xml:347(para) 
-msgid "\\ A backslash can be used prior to any special character to match that character."
-msgstr ""
-
-#: ../C/xiphos.xml:349(para) 
-msgid "\\ A backslash can be used prior to an ordinary character to make it a special character."
-msgstr ""
-
-#: ../C/xiphos.xml:354(title) 
-msgid "The Period"
-msgstr ""
-
-#: ../C/xiphos.xml:356(para) 
-msgid "The Period \".\" will match any single character even a space or other non-alphabet character. <emphasis>s.t</emphasis> matches <emphasis>s</emphasis>i<emphasis>t</emphasis>, <emphasis>s</emphasis>e<emphasis>t</emphasis>,<emphasis> s</emphasis>o<emphasis>t</emphasis>, etc., which could be located in <emphasis>s</emphasis>i<emphasis>t</emphasis>ting, compas<emphasis>s</emphasis>e<emphasis>t</emphasis>h and <emphasis>s</emphasis>o<emphasis>t</emphasis>tish <emphasis>b..t</emphasis> matches <emphasis>b</emphasis>oo<emphasis>t</emphasis>, <emphasis>b</emphasis>oa<emphasis>t</emphasis> and <emphasis>b</emphasis>ea<emphasis>t foot.tool </emphasis>matches <emphasis>foot</emphasis>s<emphasis>tool </emphasis>and <emphasis>foot tool</emphasis>"
-msgstr ""
-
-#: ../C/xiphos.xml:370(title) 
-msgid "The Asterisk"
-msgstr ""
-
-#: ../C/xiphos.xml:372(para) 
-msgid "The asterisk \"*\" matches zero or more characters of the preceding: set, character or indicated character. Using a period asterisk combination \".*\" after a commonly found pattern can cause the search to take a very long time, making the program seem to freeze. <emphasis>be*n</emphasis> matches<emphasis> beeen, been, ben</emphasis>, and <emphasis>bn</emphasis> which could locate Reu<emphasis>ben</emphasis> and She<emphasis>bn</emphasis>a."
-msgstr ""
-
-#: ../C/xiphos.xml:384(title) 
-msgid "The Plus Sign"
-msgstr ""
-
-#: ../C/xiphos.xml:385(para) 
-msgid "The Plus Sign \"+\" matches one or more characters of the preceding: set, character or indicated character. Using a period and plus sign combination \".+\" after a commonly found pattern can cause the search to take a very long time, making the program seem to freeze. <emphasis>be+n</emphasis> matches <emphasis>beeen, been</emphasis> and <emphasis>ben</emphasis>, but not <emphasis>bn</emphasis>."
-msgstr ""
-
-#: ../C/xiphos.xml:396(title) 
-msgid "The Question Mark"
-msgstr ""
-
-#: ../C/xiphos.xml:397(para) 
-msgid "The Question Mark \"?\"matches zero or one character of the preceding: set, character or indicated character. <emphasis>be?n</emphasis> matches <emphasis>ben</emphasis> and <emphasis>bn</emphasis> but not <emphasis>been</emphasis>. <emphasis>trees?</emphasis> matches <emphasis>trees</emphasis> or <emphasis>tree</emphasis>."
-msgstr ""
-
-#: ../C/xiphos.xml:406(title) 
-msgid "The Square Brackets"
-msgstr ""
-
-#: ../C/xiphos.xml:407(para) 
-msgid "The Square Brackets \"[]\" enclose a set of characters that can match. The period, asterisk, plus sign and question mark are not special inside the brackets. A minus sign can be used to indicate a range. If you want a caret \"^\" to be part of the range do not place it first after the left bracket or it will be a special character. To include a \"]\" in the set make it the first (or second after a special \"^\") character in the set. To include a minus sign in the set make it the first (or second after a special \"^\") or last character in the set. <emphasis>s[eia]t</emphasis> matches <emphasis>set</emphasis>, <emphasis>sit</emphasis>, and <emphasis>sat</emphasis>, but not <emphasis>s</emphasis>o<emphasis>t</emphasis>. <emphasis>s[eia]+t </emphasis>matches as above but also, <emphasis>seat, seet, siet</emphasis>, etc. <emphasis>[a-d]</emphasis> matches <emphasis>a, b, c,</emphasis> or <emphasis>d</emphasis>. <emphasis>[A-Z]</emphasis> matches any uppercase letter. [.;:?!] matches ., ;, :, ?, or ! but not a comma. [ ]^-] matches ] or ^ or -"
-msgstr ""
-
-#: ../C/xiphos.xml:429(title) 
-msgid "The Caret first in Square Brackets"
-msgstr ""
-
-#: ../C/xiphos.xml:430(para) 
-msgid "If the Caret is the first character after the left bracket (\"[^\") it means NOT. <emphasis>s[^io]t</emphasis> matches <emphasis>set, sat</emphasis>, etc., but not <emphasis>s</emphasis>i<emphasis>t</emphasis> and <emphasis>s</emphasis>o<emphasis>t</emphasis>."
-msgstr ""
-
-#: ../C/xiphos.xml:437(title) 
-msgid "The Caret as Start of Line Anchor"
-msgstr ""
-
-#: ../C/xiphos.xml:438(para) 
-msgid "If the Caret is the first character in a pattern (\"^xxx\") it anchors the pattern to the start of a line. Any match must be at the beginning of a line. Because of unfiltered formatting characters in some texts, this feature does not always work, but may if a few periods are placed after the caret to account for the formatting characters. <emphasis>^In the beginning</emphasis> matches lines that start with \"<emphasis>In the beginning</emphasis>\". (May need to use: <emphasis>^.....In the beginning</emphasis>)"
-msgstr ""
-
-#: ../C/xiphos.xml:451(title) 
-msgid "The Dollar Sign as End of Line Anchor"
-msgstr ""
-
-#: ../C/xiphos.xml:452(para) 
-msgid "If the Dollar Sign is the last character (\"xxx$\") in a pattern it anchors the pattern to the end of a line. Any match must be at the end of a line. Because of unfiltered formatting characters in some texts, this feature does not always work, but may if a few periods are placed before the dollar sign to account for the formatting characters. <emphasis>Amen\\.$</emphasis> matches lines that end with \"<emphasis>Amen.</emphasis>\" (May need to use Amen\\....$, Amen\\..........$, or even Amen\\....................$)"
-msgstr ""
-
-#: ../C/xiphos.xml:466(title) 
-msgid "The Vertical Bar"
-msgstr ""
-
-#: ../C/xiphos.xml:467(para) 
-msgid "The Vertical Bar \"|\" between patterns means OR. <emphasis>John|Peter</emphasis> matches <emphasis>John</emphasis> or <emphasis>Peter. John .*Peter|Peter .*John</emphasis> matches <emphasis>John</emphasis> ... <emphasis>Peter</emphasis> or <emphasis>Peter</emphasis> ... <emphasis>John</emphasis>. (.* slows a search) <emphasis>pain|suffering|sorrow</emphasis> matches <emphasis>pain</emphasis>, or <emphasis>suffering</emphasis>, or <emphasis>sorrow</emphasis>."
-msgstr ""
-
-#: ../C/xiphos.xml:478(title) 
-msgid "The Parentheses"
-msgstr ""
-
-#: ../C/xiphos.xml:479(emphasis) 
-msgid "The use of Parentheses \"( )\" is not supported!"
-msgstr ""
-
-#: ../C/xiphos.xml:485(title) 
-msgid "The Backslash Prior to a Special Character"
-msgstr ""
-
-#: ../C/xiphos.xml:486(para) 
-msgid "The Backslash prior to a special character (\"\\*\") indicates that the character is not being used in its special meaning, but is just to match itself. <emphasis>amen\\.</emphasis> matches <emphasis>amen.</emphasis> but not <emphasis>amen</emphasis>t and will not locate firm<emphasis>amen</emphasis>t."
-msgstr ""
-
-#: ../C/xiphos.xml:494(title) 
-msgid "The Backslash Prior to an Ordinary Character"
-msgstr ""
-
-#: ../C/xiphos.xml:496(para) 
-msgid "The Backslash prior to an ordinary character (\"\\o\") indicates that the character is not being used to match itself, but has special meaning."
-msgstr ""
-
-#: ../C/xiphos.xml:501(para) 
-msgid "\\b if use outside [ ] means word boundary. If used inside [ ] means backspace. <emphasis>\\brighteous\\b</emphasis> matches <emphasis>righteous</emphasis> but not un<emphasis>righteous</emphasis> or <emphasis>righteous</emphasis>ness"
-msgstr ""
-
-#: ../C/xiphos.xml:505(para) 
-msgid "\\B means non-word boundary. <emphasis>\\Brighteous\\B</emphasis> matches un<emphasis>righteous</emphasis>ness and un<emphasis>righteous</emphasis>ly but not <emphasis>righteous</emphasis>, un<emphasis>righteous</emphasis> or <emphasis> righteous</emphasis>ness."
-msgstr ""
-
-#: ../C/xiphos.xml:509(para) 
-msgid "\\d means digit; same as [0-9]."
-msgstr ""
-
-#: ../C/xiphos.xml:510(para) 
-msgid "\\D means non-digit, same as [^0-9]."
-msgstr ""
-
-#: ../C/xiphos.xml:511(para) 
-msgid "\\s means space."
-msgstr ""
-
-#: ../C/xiphos.xml:512(para) 
-msgid "\\S means not a space."
-msgstr ""
-
-#: ../C/xiphos.xml:513(para) 
-msgid "\\w means alphanumeric; same as [a-zA-Z0-9_]."
-msgstr ""
-
-#: ../C/xiphos.xml:514(para) 
-msgid "\\W means not alphanumeric; same as [^a-zA-Z0-9_]."
-msgstr ""
-
-#: ../C/xiphos.xml:416(title) ../C/xiphos.xml:12(title) ../C/xiphos.xml:25(phrase) ../C/studypad.xml:12(title) ../C/studypad.xml:25(phrase) 
-msgid "The Studypad"
-msgstr ""
-
-#: ../C/xiphos.xml:4(title) ../C/studypad.xml:4(title) 
-msgid "Using The Studypad"
-msgstr ""
-
-#: ../C/xiphos.xml:5(para) ../C/studypad.xml:5(para) 
-msgid "The Studypad can be opened by choosing <guibutton>File-&gt;Open Studypad</guibutton>"
-msgstr ""
-
-#: ../C/xiphos.xml:8(para) ../C/studypad.xml:8(para) 
-msgid "This is what the Studypad typically looks like:"
-msgstr ""
-
-#: ../C/xiphos.xml:33(para) ../C/studypad.xml:33(para) 
-msgid "The Studypad will save into your working directory, making it useful for collecting and exporting information and Bible study material from Xiphos into other programmes."
-msgstr ""
-
-#: ../C/xiphos.xml:34(para) ../C/xiphos.xml:57(para) ../C/studypad.xml:34(para) 
-msgid "Toolbar 1"
-msgstr ""
-
-#: ../C/xiphos.xml:36(para) ../C/xiphos.xml:59(para) ../C/studypad.xml:36(para) 
-msgid "Font Size and Environment"
-msgstr ""
-
-#: ../C/xiphos.xml:37(para) ../C/xiphos.xml:60(para) ../C/studypad.xml:37(para) 
-msgid "Font Type"
-msgstr ""
-
-#: ../C/xiphos.xml:38(para) ../C/xiphos.xml:61(para) ../C/studypad.xml:38(para) 
-msgid "Bold, Italics, Underscored, Crossed Out"
-msgstr ""
-
-#: ../C/xiphos.xml:39(para) ../C/xiphos.xml:62(para) ../C/studypad.xml:39(para) 
-msgid "Left, Centre and Right Bound"
-msgstr ""
-
-#: ../C/xiphos.xml:40(para) ../C/xiphos.xml:63(para) ../C/studypad.xml:40(para) 
-msgid "Shift Paragraph Right or Left"
-msgstr ""
-
-#: ../C/xiphos.xml:41(para) ../C/xiphos.xml:64(para) ../C/studypad.xml:41(para) 
-msgid "Colour Selector"
-msgstr ""
-
-#: ../C/xiphos.xml:43(para) ../C/xiphos.xml:66(para) ../C/studypad.xml:43(para) 
-msgid "Toolbar 2"
-msgstr ""
-
-#: ../C/xiphos.xml:45(para) ../C/studypad.xml:45(para) 
-msgid "New, Save, Delete and Print"
-msgstr ""
-
-#: ../C/xiphos.xml:46(para) ../C/xiphos.xml:69(para) ../C/studypad.xml:46(para) 
-msgid "Cut, Copy, Paste and Undo"
-msgstr ""
-
-#: ../C/xiphos.xml:47(para) ../C/xiphos.xml:70(para) ../C/studypad.xml:47(para) 
-msgid "Find and 'Find and Replace'"
-msgstr ""
-
-#: ../C/xiphos.xml:48(para) ../C/xiphos.xml:71(para) ../C/studypad.xml:48(para) 
-msgid "Spellcheck"
-msgstr ""
-
-#: ../C/xiphos.xml:51(para) ../C/xiphos.xml:74(para) ../C/studypad.xml:51(para) 
-msgid "In order for spellcheck to be available, one of the languages under <guimenuitem>Edit-&gt;Current Languages</guimenuitem> must be set."
-msgstr ""
-
-#: ../C/xiphos.xml:422(title) ../C/xiphos.xml:31(phrase) 
-msgid "The Personal Commentary"
-msgstr ""
-
-#. Personal Commentary
-#: ../C/xiphos.xml:3(para) ../C/personal.xml:3(para) 
-msgid "To build up a personal commentary you will need to install the editable 'Personal' sword module from the English Commentaries section. Right click it and choose <guimenuitem>Edit-&gt;Note-&gt;Personal</guimenuitem> in the menu."
-msgstr ""
-
-#: ../C/xiphos.xml:11(para) 
-msgid "An editor window similar to the <guimenuitem>Study Pad</guimenuitem> will appear. Edit your comment and save it; in the future it will appear as your comment to the relevant verse."
-msgstr ""
-
-#: ../C/xiphos.xml:18(title) 
-msgid "The Personal Commentary Editor"
-msgstr ""
-
-#: ../C/xiphos.xml:37(para) 
-msgid "Locationbar"
-msgstr ""
-
-#: ../C/xiphos.xml:41(para) 
-msgid "Synchronise Button"
-msgstr ""
-
-#: ../C/xiphos.xml:42(para) 
-msgid "Bible Book, Chapter and Verse Selectors"
-msgstr ""
-
-#: ../C/xiphos.xml:43(para) 
-msgid "Location Summary"
-msgstr ""
-
-#: ../C/xiphos.xml:46(para) 
-msgid "Use the <guimenuitem>Synchronise Button</guimenuitem> to quickly change location of your editor to that of the underlying Bibletext or use the <guimenuitem>Book</guimenuitem>, <guimenuitem>Chapter</guimenuitem>, and <guimenuitem>Verse</guimenuitem> selectors to choose to edit your comment to one particular verse."
-msgstr ""
-
-#: ../C/xiphos.xml:68(para) 
-msgid "Save, Delete and Print"
-msgstr ""
-
-#: ../C/xiphos.xml:80(para) 
-msgid "To create a link to other verses right click the text and choose <guimenuitem>Link..</guimenuitem>. In the pop-up window enter the link location and the module linked to."
-msgstr ""
-
-#: ../C/xiphos.xml:86(para) 
-msgid "It is possible to rename a personal commentary to suit a particular subject of study for that commentary. Thus, multiple personal commentaries may be installed: Rename the existing personal commentary, and then re-install another instance of the personal commentary if desired. Personal commentary names can consist only of letters and digits, and cannot duplicate an existing module's name. Rename is accessible off the right-click menu."
-msgstr ""
-
-#: ../C/xiphos.xml:97(para) 
-msgid "If the study embodied in a particular personal commentary is no longer needed, archival is available in the module manager, prior to removal, for possible future re-installation. See the module manager's Remove/Archive page. Any module may be archived, not just personal commentaries."
-msgstr ""
-
-#: ../C/xiphos.xml:105(para) 
-msgid "Although there are 31,102 verses in standard versification, it is unlikely that more than a tiny fraction of all verses will have personal commentary attached to them. A verse list showing where personal commentary notes exist is available from <menuchoice><guisubmenu>Right Click</guisubmenu><guimenuitem> Dump Pers.Comm.</guimenuitem></menuchoice>."
-msgstr ""
-
-#: ../C/xiphos.xml:115(para) 
-msgid "The created commentary page will be attached to an individual verse only. To write commentary pages from within Xiphos, attached to longer stretches of text use the <guimenuitem>Link..</guimenuitem> function to link several pages together"
-msgstr ""
-
-#: ../C/xiphos.xml:428(title) 
-msgid "Journals and Prayer Lists"
-msgstr ""
-
-#. Journals and Prayer Lists
-#: ../C/xiphos.xml:3(para) ../C/journals.xml:3(para) 
-msgid "<application>Xiphos</application> supports user-created and -editable modules to contain general content. Initially conceived as simple prayer lists, they have expanded to include daily journals and topic-outline content. The user can maintain prayer lists, or prepare sermons, or write any structured content desired."
-msgstr ""
-
-#: ../C/xiphos.xml:13(para) 
-msgid "To enable prayer list and journal support, see the Preferences dialog as previously described. There, in <guibutton>General-&gt;Misc</guibutton>, check the item labeled <guimenuitem>Enable Prayer Lists</guimenuitem>. You will see a new item appear at the bottom of the sidebar's module list for \"Prayer Lists/Journals\"."
-msgstr ""
-
-#: ../C/xiphos.xml:23(para) 
-msgid "Right-click on this entry, and you will be offered a context menu to create new modules. All the offered options are of the same type, but what is offered is a variety of templates from which to work. There are 5 templates at this time."
-msgstr ""
-
-#: ../C/xiphos.xml:32(title) 
-msgid "Creating a journal or prayer list"
-msgstr ""
-
-#: ../C/xiphos.xml:39(phrase) 
-msgid "New journal or prayer list"
-msgstr ""
-
-#: ../C/xiphos.xml:45(para) 
-msgid "Their structure is the same, but the offered templates provide a variety of hints regarding ways to organize content. <guimenuitem>Simple</guimenuitem> is trivial, and can be considered a mental Post-It note. <guimenuitem>Subject</guimenuitem> is useful as a more organized version. <guimenuitem>Monthly</guimenuitem> provides a per-month structure in which to track needed content. <guimenuitem>Daily Journal</guimenuitem> is a full 365-day calendar in which to track a personal journal or ongoing prayer needs. And finally, <guimenuitem>Outlined Topic</guimenuitem> is a full, expandable outline suitable for topics and subtopics."
-msgstr ""
-
-#: ../C/xiphos.xml:61(para) 
-msgid "Journals and prayer lists have the structure of a general book: If simply selected for display from the module list, they will appear in the usual subwindow for general books."
-msgstr ""
-
-#: ../C/xiphos.xml:68(para) 
-msgid "Editing a journal or prayer list is done by right-clicking the module name to get its context menu, whose middle item is <guimenuitem>Open in Editor</guimenuitem>. The sections and subsections will be listed in the left margin. Click one, and the editor navigates to that section. The context menu on right-click of section keys provides for adding, deleting, and editing the names of sections and subsections."
-msgstr ""
-
-#: ../C/xiphos.xml:80(para) 
-msgid "If the general book subwindow is currently displaying the journal or prayer list being edited, it will synchronize with new content when <guimenuitem>Save</guimenuitem> is used."
-msgstr ""
-
-#: ../C/xiphos.xml:87(para) 
-msgid "As mentioned, these user-edited modules are in effect general books. This means they can be viewed in any Sword Project application. Thus, you can use these modules immediately in <application>BibleTime</application>, for example; or from the Module Manager's <guimenuitem>Maintenance</guimenuitem> page, you can archive a zip file to copy to a Windows system where you can then install the zip content as a module for the Windows user interface. Few other Sword Project applications provide for editing these modules, however, meaning that they will appear in such other applications as just ordinary general books."
-msgstr ""
-
-#: ../C/xiphos.xml:103(para) 
-msgid "In the future, it is planned that a module sharing facility will become available, by which user-edited modules such as these can be uploaded to become available to a wide audience. The current install repository facility will be expanded to provide upload as well as the existing download capability in order to support this. Thus, users will be able to share their sermons, Bible studies, and other personally-authored content with other Sword application users."
-msgstr ""
-
-#: ../C/xiphos.xml:434(title) 
-msgid "Getting Help Online"
-msgstr ""
-
-#: ../C/xiphos.xml:4(title) ../C/onlinehelp.xml:4(title) 
-msgid "Users Mailing List"
-msgstr ""
-
-#: ../C/xiphos.xml:5(para) ../C/onlinehelp.xml:5(para) 
-msgid "One way you can get help with Xiphos is using our low-traffic users' mailing list. You can sign up by clicking <ulink url=\"https://lists.sourceforge.net/lists/listinfo/gnomesword-users/\"> this link</ulink>. Once you are signed up, you can email the list with any problems you are having and other users or the developers will respond, typically within a day."
-msgstr ""
-
-#: ../C/xiphos.xml:13(title) 
-msgid "Live Chat"
-msgstr ""
-
-#: ../C/xiphos.xml:14(para) 
-msgid "Another way to get help is with online chat. Xiphos has an IRC channel on freenode, #xiphos. If you don't know what that means, it's ok. Just click <ulink url=\"http://embed.mibbit.com/?server=irc.freenode.net&amp;channel=%23xiphos\">this link</ulink> (it will open your web browser), type a nickname or accept the default, and click \"Click to join chatroom\". This will take you to a chatroom where the developers and other users are available to help you with issues you may be having. Although many times someone will answer your question immediately, sometimes you may have to wait a few minutes or longer."
-msgstr ""
-
-#: ../C/xiphos.xml:440(title) 
-msgid "Original Language Research"
-msgstr ""
-
-#: ../C/xiphos.xml:4(title) ../C/originallanguage.xml:4(title) 
-msgid "Installing Needed Modules"
-msgstr ""
-
-#: ../C/xiphos.xml:5(para) ../C/originallanguage.xml:5(para) 
-msgid "Xiphos is ideally suited for studying the original Greek and Hebrew. To get started, you will want the following modules:"
-msgstr ""
-
-#: ../C/xiphos.xml:8(para) ../C/originallanguage.xml:8(para) 
-msgid "From Crosswire Repository:"
-msgstr ""
-
-#: ../C/xiphos.xml:13(para) ../C/originallanguage.xml:13(para) 
-msgid "StrongsHebrew Dictionary (or get StrongsRealHebrew from the Xiphos Repository)"
-msgstr ""
-
-#: ../C/xiphos.xml:18(para) ../C/originallanguage.xml:18(para) 
-msgid "StrongsGreek Dictionary (or get StrongsRealGreek from the Xiphos Repository)"
-msgstr ""
-
-#: ../C/xiphos.xml:23(para) ../C/originallanguage.xml:23(para) 
-msgid "Robinson Dictionary"
-msgstr ""
-
-#: ../C/xiphos.xml:28(para) ../C/originallanguage.xml:28(para) 
-msgid "KJV Bible"
-msgstr ""
-
-#: ../C/xiphos.xml:33(para) ../C/originallanguage.xml:33(para) 
-msgid "From Xiphos Repository:"
-msgstr ""
-
-#: ../C/xiphos.xml:38(para) ../C/originallanguage.xml:38(para) 
-msgid "StrongsRealGreek Dictionary (same as StrongsGreek, but with Greek characters, B-Greek transliteration, and self-referencing links)"
-msgstr ""
-
-#: ../C/xiphos.xml:43(para) ../C/originallanguage.xml:43(para) 
-msgid "StrongsRealHebrew Dictionary (same as StrongsHebrew, but with Hebrew characters and self-referencing links)"
-msgstr ""
-
-#: ../C/xiphos.xml:48(para) ../C/originallanguage.xml:48(para) 
-msgid "InvertedStrongsRealGreek (key in or copy actual Greek word, rather than number)"
-msgstr ""
-
-#: ../C/xiphos.xml:56(title) 
-msgid "Setting Up"
-msgstr ""
-
-#: ../C/xiphos.xml:57(para) 
-msgid "While still in the module manager, create indexes for all of the modules you just installed. Then close the module manager and open <menuchoice><guisubmenu>Edit</guisubmenu><guimenuitem> Preferences</guimenuitem></menuchoice> and go to <menuchoice><guisubmenu>Modules</guisubmenu><guimenuitem>Misc</guimenuitem></menuchoice>. Set your Hebrew and Greek lexicons according to what you installed. Close preferences and open the KJV module. Turn on the module options <menuchoice><guisubmenu>Right Click</guisubmenu><guisubmenu>Module Options</guisubmenu><guimenuitem>Show Strongs </guimenuitem></menuchoice> and <menuchoice><guisubmenu>Right Click</guisubmenu><guisubmenu>Module Options </guisubmenu><guimenuitem>Show Morphology</guimenuitem></menuchoice>. You should see the Bible text change to show Strongs numbers underneath the appropriate English words. Hover over the numbers (or letters for morphology) with the mouse and you will see the definition displayed in the previewer pane. Click on the link and the definition will show in the dictionary pane. If you are using StrongsRealGreek or StrongsRealHebrew, you can click on any other number referenced in the definition and you will be taken to that entry."
-msgstr ""
-
-#: ../C/xiphos.xml:73(title) 
-msgid "Searching for Strongs Numbers"
-msgstr ""
-
-#: ../C/xiphos.xml:74(para) 
-msgid "Choose <menuchoice><guisubmenu>Edit</guisubmenu><guimenuitem>Advanced Search</guimenuitem></menuchoice>or press <keycap>F3</keycap>. Under <interface>Search Type</interface>, select <guibutton>Optimized (\"Lucene\")</guibutton>. Click on the <interface>Attribute Search</interface> tab, and make check the box that says <guibutton> Strongs Numbers</guibutton>. Now click in the entry field at the top and search for the number you are looking for preceded by \"lemma:\" and \"G\" for Greek or \"H\" for Hebrew. So to look for the Hebrew word tsad-deek (6662), enter \"lemma:H6662\". Once the search is done, the results pane will be shown. Notice that when you click on a result, it will show the result in the preview pane, and the strong's numbers will show as well, following immediately after the words they match. Also note that hovering over these numbers will show the definition in the main preview pane."
-msgstr ""
-
-#: ../C/xiphos.xml:86(title) 
-msgid "Additional Modules"
-msgstr ""
-
-#: ../C/xiphos.xml:87(para) 
-msgid "For more advanced research, the following modules are also available:"
-msgstr ""
-
-#: ../C/xiphos.xml:91(para) 
-msgid "2TGreek (Xiphos Repository) : This module contains the entire Bible in Greek. It combines the LXX and Tischendorf8 NT into one easy-to-use module. In addition, it contains Strongs, Morphology,Greek Accents, and primary/secondary readings. As with all modules that include Strongs, Xiphos displays 2TGreek in beautiful interlinear form."
-msgstr ""
-
-#: ../C/xiphos.xml:99(para) 
-msgid "Elzevir Textus Receptus (Crosswire Beta Repository as of this writing) : 1624 edition with Strongs and Morphology"
-msgstr ""
-
-#: ../C/xiphos.xml:104(para) 
-msgid "LXX (Crosswire Repository) : the Septuagint with Strongs, Morphology, and footnotes"
-msgstr ""
-
-#: ../C/xiphos.xml:109(para) 
-msgid "MorphGNT (Crosswire Beta Repository as of this writing) : This is derived from the morphologically parsed GNT provided by UPenn's CCAT. It was reformatted and error-corrected by James Tauber. It includes Greek accents and Morphology."
-msgstr ""
-
-#: ../C/xiphos.xml:116(para) 
-msgid "TR (Crosswire Repository) : This is the Textus Receptus with Strongs and Morphology"
-msgstr ""
-
-#: ../C/xiphos.xml:121(para) 
-msgid "TischMorph (Xiphos Repository) : As described above, this has Strongs, Morphology, accents, and alternate readings."
-msgstr ""
-
-#: ../C/xiphos.xml:126(para) 
-msgid "WHNU (Crosswire Repository) : Westcott-Hort of 1881 with Strongs and Morphology"
-msgstr ""
-
-#: ../C/xiphos.xml:131(para) 
-msgid "GreekHebrew (Crosswire Repository) : This is a dictionary keyed to Strongs. It contains words in the LXX that are also found in the New Testament. In addition, it contains the equivalent Hebrew words also keyed to Strongs."
-msgstr ""
-
-#: ../C/xiphos.xml:138(para) 
-msgid "Didache (Crosswire Beta Repository as of this writing) : This is an early Christian treatise in Greek dated to the late first or early second century. It includes Strongs, Morphology, and Greek accents."
-msgstr ""
-
-#: ../C/xiphos.xml:446(title) 
-msgid "Authors"
-msgstr ""
-
-#. Authors
-#: ../C/xiphos.xml:3(para) ../C/authors.xml:3(para) 
-msgid "This manual was written by:"
-msgstr ""
-
-#: ../C/xiphos.xml:8(para) 
-msgid "Andy Piper"
-msgstr ""
-
-#: ../C/xiphos.xml:13(para) 
-msgid "Pierre Benz"
-msgstr ""
-
-#: ../C/xiphos.xml:18(para) 
-msgid "Dr Peter von Kaehne"
-msgstr ""
-
-#: ../C/xiphos.xml:23(para) 
-msgid "Karl Kleinpaste"
-msgstr ""
-
-#: ../C/xiphos.xml:28(para) 
-msgid "Dominique Corbex"
-msgstr ""
-
-#: ../C/xiphos.xml:33(para) 
-msgid "Matthew Talbert"
-msgstr ""
-
-#: ../C/xiphos.xml:38(para) 
-msgid "Please send all comments and suggestions regarding this manual to Xiphos Development list <email>xiphos-developers@lists.sourceforge.net</email>. Comments may also be submitted via the project trackers at SourceForge."
-msgstr ""
-
-#: ../C/xiphos.xml:43(para) 
-msgid "For more information on <application>Xiphos</application>, please visit the project website at <ulink type=\"http\" url=\"http://xiphos.sf.net/\">http://xiphos.sf.net</ulink>. Bug reports should be made using the Bug Tracker at the project development site <ulink type=\"http\" url=\"http://www.sourceforge.net/projects/xiphos\"> http://www.sourceforge.net/projects/xiphos</ulink>"
-msgstr ""
-
-#: ../C/xiphos.xml:452(title) 
-msgid "License"
-msgstr ""
-
-#: ../C/xiphos.xml:2(para) ../C/license.xml:2(para) 
-msgid "This program is free software; you can redistribute it and/or modify it under the terms of the <ulink type=\"ghelp\" url=\"gnome-help:gpl\">GNU General Public License</ulink> version 2 as published by the Free Software Foundation."
-msgstr ""
-
-#: ../C/xiphos.xml:7(para) 
-msgid "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 <citetitle>GNU General Public License</citetitle> for more details."
-msgstr ""
-
-#: ../C/xiphos.xml:13(para) 
-msgid "A copy of the <citetitle>GNU General Public License</citetitle> is included as an appendix to the <citetitle>GNOME Users Guide</citetitle>. You may also obtain a copy of the <citetitle>GNU General Public License</citetitle> from the Free Software Foundation by visiting <ulink type=\"http\" url=\"http://www.fsf.org\"> their Web site</ulink> or by writing to <address> Free Software Foundation, Inc. <street>51 Franklin St</street>, Fifth Floor, <city>Boston</city>, <state>MA</state><postcode>02110-1301</postcode><country>USA</country></address>"
-msgstr ""
-
-#. Use the Introduction section to give a brief overview of what
-#.      the application is and what it does.
-#: ../C/introduction.xml:5(para) 
-msgid "is a Bible study and research tool based upon the \"SWORD Project\" libraries and the GNOME Desktop libraries. You can use to do the following:"
-msgstr ""
-
-#: ../C/interface.xml:27(phrase) 
-msgid "menubar"
-msgstr ""
-
-#. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2.
-#: ../C/authors.xml:0(None) 
-msgid "translator-credits"
-msgstr ""
-
diff --git a/help/de/interface.xml b/help/de/interface.xml
deleted file mode 100644
index db0cf93..0000000
--- a/help/de/interface.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- ============= Interface ============================== -->
-<!-- ============= Menubar  ============-->
-<sect2 id="menubar">
-   		<title>Menubar</title>
-   		<para>
-   		At the top of the <application>Xiphos</application> main window is the menubar. 
-   		Almost all of the functions are available by activating the appropriate 
-   		menu item. The functions have been grouped according to their type. For 
-   		example, the file operations have been grouped into 
-   		the <guisubmenu>File</guisubmenu> menu.
-   		</para>
-	        <figure id="menubar_figure">
-			<title>Menubar</title>
-	  		<screenshot> 
-			  <mediaobject> 
-			    <imageobject><imagedata fileref="figures/interface_menubar.png" format="PNG"/> 
-			    </imageobject>
-	    		<!-- EPS versions of the figures are not required at the moment. -->
-          		<!-- 
-		    <imageobject>
-      			<imagedata fileref="figures/interface_menubar.eps" format="EPS"/>
-    		    </imageobject>
-		    -->
-	    <textobject> 
-	      <phrase> menubar 
-	     
-	   
-	
-		      	
-	    	
-	</phrase></textobject></mediaobject></screenshot></figure></sect2>
diff --git a/help/de/introduction.xml b/help/de/introduction.xml
deleted file mode 100644
index 8a527be..0000000
--- a/help/de/introduction.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- ============= Introduction ============================== -->
-<!-- Use the Introduction section to give a brief overview of what
-     the application is and what it does. -->
-<para> is a Bible study and research tool based upon the "SWORD Project" libraries
-    and the GNOME Desktop libraries. You can use  to do the following:</para>
diff --git a/help/de/journals.xml b/help/de/journals.xml
deleted file mode 100644
index 0d5438a..0000000
--- a/help/de/journals.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Journals and Prayer Lists -->
-<para>
-		<application>Xiphos</application> supports
-		user-created and -editable modules to contain general
-		content.  Initially conceived as simple prayer lists,
-		they have expanded to include daily journals and
-		topic-outline content.  The user can maintain prayer
-		lists, or prepare sermons, or write any structured
-		content desired.
-		</para>
diff --git a/help/de/license.xml b/help/de/license.xml
deleted file mode 100644
index be785f7..0000000
--- a/help/de/license.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<para>
-    	This program is free software; you can redistribute it and/or
-    	modify it under the terms of the <ulink type="ghelp" url="gnome-help:gpl">GNU General Public
-    	License</ulink> version 2 or any later version as published by the Free Software Foundation.
-   		</para>
diff --git a/help/de/modules.xml b/help/de/modules.xml
deleted file mode 100644
index 8bc725e..0000000
--- a/help/de/modules.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Modules -->
-<!-- Introduction To Module Manager -->
-<sect2 id="module-introduction">
-  		<title>Introduction To The Module Manager</title>
-		<para>
-		The "module" is the unit of content in <application>Xiphos</application>, and Sword generally; a Sword module is a
-		resource available for viewing in Sword applications.  There are several varieties: Most importantly, Bible texts, as well
-		as dictionaries and lexicons, commentaries, and general books, any of which may include image content (e.g. atlases).
-		They are installed either from a local directory structure (typically on removable media, such as a CDROM distribution)
-		or remotely via ftp from a repository such as Crosswire, which is the home of Sword, and from which all officially
-		Sword-sanctioned modules are available.  Also, many other modules are available from non-Crosswire repositories.
-		</para>
-		<para>
-		If you have other Sword applications installed, they will all share the same set of Sword modules that you install through
-		the Module Manager.
-		</para>
-		<figure>
-			<title>The Module Manager Dialog</title>
-	        	<screenshot> 
-	  <mediaobject> 
-	    <imageobject><imagedata fileref="figures/module.png" format="PNG"/> 
-	    </imageobject>
-	    <!-- EPS versions of the figures are not required at the moment. -->
-            <!-- 
-		    <imageobject>
-      		<imagedata fileref="figures/module.eps" format="EPS"/>
-    		    </imageobject>
-	    -->
-	    <textobject> 
-	      <phrase>The Module Manager Dialog</phrase> 
-	    </textobject> 
-	  </mediaobject> 
-                        </screenshot>
-		</figure>
-	</sect2>
-<!-- Sword Configure-->
diff --git a/help/de/onlinehelp.xml b/help/de/onlinehelp.xml
deleted file mode 100644
index 785f122..0000000
--- a/help/de/onlinehelp.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- ============= Online Help  ============-->
-<sect2 id="xiphos-mailing-list">
-		<title>Users Mailing List</title>
-		<para>One way you can get help with Xiphos is using our low-traffic users' mailing list.
-		You can sign up by clicking <ulink url="https://lists.sourceforge.net/lists/listinfo/gnomesword-users/">
-		this link</ulink>. Once you are signed up, you can email the list with any problems you are having
-		and other users or the developers will respond, typically within a day.
-		</para>
-	</sect2>
diff --git a/help/de/originallanguage.xml b/help/de/originallanguage.xml
deleted file mode 100644
index 27587f9..0000000
--- a/help/de/originallanguage.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- ============= Original Language Research  ============-->
-<sect2 id="orig-lang-install-modules">
-		<title>Installing Needed Modules</title>
-		<para>Xiphos is ideally suited for studying the original Greek and Hebrew. 
-		To get started, you will want the following modules:
-		</para>
-		<para>
-		From Crosswire Repository:
-		</para>
-    		<itemizedlist>
-			<listitem>
-				<para>
-        			StrongsHebrew Dictionary (or get StrongsRealHebrew from the Xiphos Repository)
-				</para>
-			</listitem>
-			<listitem>
-				<para>
-        			StrongsGreek Dictionary (or get StrongsRealGreek from the Xiphos Repository)
-				</para>
-			</listitem>
-			<listitem>
-				<para>
-				Robinson Dictionary
-				</para>
-			</listitem>
-			<listitem>
-				<para>
-				KJV Bible
-				</para>
-			</listitem>
-		</itemizedlist>
-		<para>
-		From Xiphos Repository:
-		</para>
-		<itemizedlist>
-			<listitem>
-				<para>
-				StrongsRealGreek Dictionary (same as StrongsGreek, but with Greek characters, B-Greek transliteration, and self-referencing links)
-				</para>
-			</listitem>
-			<listitem>
-				<para>
-				StrongsRealHebrew Dictionary (same as StrongsHebrew, but with Hebrew characters and self-referencing links)
-				</para>
-			</listitem>
-			<listitem>
-				<para>
-				InvertedStrongsRealGreek (key in or copy actual Greek word, rather than number)
-				</para>
-			</listitem>
-		</itemizedlist>
-	</sect2>
diff --git a/help/de/personal.xml b/help/de/personal.xml
deleted file mode 100644
index a3cc393..0000000
--- a/help/de/personal.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Personal Commentary-->
-<para>
-		To build up a personal commentary you will need to install the
-		editable 'Personal' sword module from the English Commentaries
-		section. Right click it and choose
-		<guimenuitem>Edit-&gt;Note-&gt;Personal</guimenuitem>
-		in the menu.
-		</para>
diff --git a/help/de/preferences.xml b/help/de/preferences.xml
deleted file mode 100644
index ea7f758..0000000
--- a/help/de/preferences.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Preferences -->
-<!-- Introduction -->
-<sect2 id="preferences-introduction">
-  		<title>Introduction To Preferences</title>
-		<figure>
-			<title>The Preference Dialog</title>
-	        	<screenshot> 
-	  <mediaobject> 
-	    <imageobject><imagedata fileref="figures/preferences.png" format="PNG"/> 
-	    </imageobject>
-	    <!-- EPS versions of the figures are not required at the moment. -->
-            <!-- 
-		    <imageobject>
-      		<imagedata fileref="figures/preferences.eps" format="EPS"/>
-    		    </imageobject>
-	    -->
-	    <textobject> 
-	      <phrase>The Preferences Dialog</phrase> 
-	    </textobject> 
-	  </mediaobject> 
-                        </screenshot>
-                </figure>
-               </sect2>
-<!-- Fonts And Colors -->
diff --git a/help/de/search.xml b/help/de/search.xml
deleted file mode 100644
index 8c846e9..0000000
--- a/help/de/search.xml
+++ /dev/null
@@ -1,200 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- ============= Search  ============-->
-<sect2 id="xiphos-searchpane">
-		<title>Simple Searches</title>
-		<para>
-		To conduct a quick search within the current Bible or commentary module, the Search Bar in the Sidebar should usually be adequate. Click either
-		in the menu bar <guimenuitem>Edit-&gt;Search</guimenuitem> or in the Sidebar <guimenuitem>Modules-&gt;Search</guimenuitem> to access it.
-		</para> 
-	
-		<figure>
-		<title>The Search Bar</title>
-                       <screenshot> 
-	  <mediaobject> 
-	    <imageobject><imagedata fileref="figures/interface_searchpane.png" format="PNG"/> 
-	    </imageobject>
-	    <!-- EPS versions of the figures are not required at the moment. -->
-            <!-- 
-		    <imageobject>
-      		<imagedata fileref="figures/interface_searchpane.eps" format="EPS"/>
-    		    </imageobject>
-	    -->
-	    <textobject> 
-	      <phrase>The Search Bar</phrase> 
-	    </textobject> 
-	  </mediaobject> 
-	
-                       </screenshot>
-
-                </figure>
-              <para>
-		The <interface>Search Dialog</interface> consists of the following parts:
-		</para>
-			<itemizedlist>
-				<listitem>
-					<para>
-					Search Key Entry box
-					</para>
-				</listitem>
-				<listitem>
-					<para>
-					Search Module Selector
-					</para>
-				</listitem>
-				<listitem>
-					<para>
-					Search Type Selector
-					</para>
-				</listitem>
-				<listitem>
-					<para>
-					Search Options Checkbox
-					</para>
-				</listitem>
-				<listitem>
-					<para>
-					Search Scope Selector
-					</para>
-				</listitem>
-				<listitem>
-					<para>
-					Search Results View
-					</para>
-				</listitem>
-			</itemizedlist>			
-		<sect3 id="xiphos-search-key">
-			<title>Search Key Entry Box</title>
-			<para>Allows entry of the key for which you would like to search. The 
-			search key can be a word, part of a word, several words, a phrase, or 
-			a regular expression depending on the type of search selected. When 
-			the search key is entered and all other selections in the search dialog 
-			are complete, click the <guibutton>Find</guibutton> button to begin 
-			the search.
-			</para>
-			<para>
-			This search uses the optimized search method (see next section) if
-			the module has previously been indexed, and will use AND semantics by default 
-			(verses must contain all words you entered).
-			</para>
-			</sect3>
-		
-		<sect3 id="xiphos-search-modselect">
-			<title>Search Module Selector</title>
-			<para>Allows selection of which modules	you would like to search. 
-			Select <guibutton>Bible</guibutton> to search Bible versions or 
-			<guibutton>Commentary</guibutton> to search commentaries. Only 
-			the currently active module will be searched.</para>
-		</sect3>
-		
-		<sect3 id="xiphos-search-typeselect">
-		<title>Search Type Selector</title>
-		<para>Allows selection of the type of search. There are three search
-		types available:
-		</para>
-			<variablelist>
-				<varlistentry>
-					<term><guibutton>Multi word</guibutton></term> 
-					<listitem><para>This type will match any verse that has 
-					all the words in the search key, regardless of where 
-					they appear in the verse.</para></listitem>
-				</varlistentry>
-				<varlistentry>
-					<term><guibutton>Regular expression</guibutton></term> 
-					<listitem><para>This search uses a regular expression
-					as a search key. A regular expression is a pattern used 
-					to match a string of text. A regular expression can be 
-					used to find verses with words that match a particular 
-					pattern. For example the regular expression
-					<userinput>\ A[a-z]*iah </userinput> will match verses that contain
-					the words Aiah, Ahaziah, Athaliah and Amariah.</para>
-					<para>A complete discussion of regular expressions is 
-					beyond the scope of this manual, but more information 
-					can be found in the grep man page.</para></listitem>
-				</varlistentry>
-				<varlistentry>
-					<term><guibutton>Exact phrase</guibutton></term> 
-					<listitem><para>This type will match the search key
-					exatly as entered. If the search key is <userinput>
-					it is good</userinput>, this search would match a verse
-					which contains "<emphasis>it is good</emphasis>," but 
-					would not match a verse	which contains "<emphasis>
-					good</emphasis>, and doeth <emphasis>it</emphasis> not, 
-					to him it <emphasis>is</emphasis> sin."</para></listitem>
-				</varlistentry>
-			</variablelist>
- 		</sect3>
-
-		<sect3 id="xiphos-search-options">
-			<title>Search Options Checkbox</title>
-			<para>Allows selecting of search options. The only available option 
-			is <guibutton>Match case</guibutton>. Check this box to make the 
-			search case sensitive.</para>
-		</sect3>
-		
-		<sect3 id="xiphos-search-scopeselect">
-			<title>Search Scope Selector</title>
-			<para>Allows defining the range within the specificed module that will
-			be searched. There are three search scopes available:</para>
-			<variablelist>
-				<varlistentry>
-					<term><guibutton>No scope</guibutton></term>
-					<listitem><para>This button causes the search to
-					to include the entire module.</para>
-					</listitem>
-				</varlistentry>
-				<varlistentry>
-					<term><guibutton>Use bounds</guibutton></term>
-					<listitem><para>Selecting this button produces two dropdown
-					selector boxes marked <guilabel>Lower</guilabel> and
-					<guilabel>Upper</guilabel>. Select the first book
-					to search in the <guilabel>Lower</guilabel> box and
-					the last book to search in the <guilabel>Upper</guilabel>
-					box. The search will begin with the <guilabel>Lower
-					</guilabel> book and end with the <guilabel>Upper
-					</guilabel> book and include all books in between.
-					</para>
-					<para>Chapter and verse numbers can be entered into
-					the search bound boxes as well to further narrow the
-					search. </para>
-					</listitem>
-				</varlistentry>
-				<varlistentry>
-					<term><guibutton>Last search</guibutton></term>
-					<listitem><para>Select this button to do a new 
-					search including only the verses returned as a 
-					result of the last search. Use this with a new 
-					search key to narrow the search further.</para>
-					</listitem>
-				</varlistentry>
-			</variablelist> 
-		</sect3>
-		<sect3 id="xiphos-search-results">
-			<title>Search Results View</title>
-			<para>This shows a list of the current search results for previewing, navigation, or saving.</para>
-			<variablelist>
-				<varlistentry>
-					<term>Preview</term>
-					<listitem><para>To preview the search result, simply click on an individual result.
-					The entry will show in the preview pane.
-					</para>
-					</listitem>
-				</varlistentry>
-				<varlistentry>
-					<term>Navigation</term>
-					<listitem><para>Navigation to the search result can be done in two ways. To open the result
-					in a new tab, middle-click the mouse. To open the result in the current tab, double-click the result.
-					</para>
-					</listitem>
-				</varlistentry>
-				<varlistentry>
-					<term>Save Results</term>
-					<listitem><para>You may save your results as a list of bookmarks. To do this, right-click and select
-					<guilabel>Save List</guilabel>. You will be prompted to enter a name for the folder that your results
-					will be saved to. After you have saved the results, you may view them by going to your bookmarks and
-					finding the folder you just named.
-					</para>
-					</listitem>
-				</varlistentry>
-			</variablelist>
-	</sect3>
-	</sect2>
diff --git a/help/de/start.xml b/help/de/start.xml
deleted file mode 100644
index ad5a12b..0000000
--- a/help/de/start.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- ============= Getting Started with Xiphos  ============-->
-<sect2 id="xiphos-getting-started">
-  		<title>Starting Xiphos</title>
-			<para>
-			You can start <application>Xiphos</application> in the following ways:
-			</para>
-			<variablelist>
-				<varlistentry>
-					<term>Applications menu</term>
-					<listitem>
-						<para>
-						Choose <menuchoice><guisubmenu>Accessories</guisubmenu>
-						<guimenuitem>Xiphos Bible Guide</guimenuitem>
-						</menuchoice>.
-			            </para>
-    				</listitem>
-    			</varlistentry>
-    			<varlistentry>
-    				<term>Command line</term>
-    				<listitem>
-    					<para>
-						Type <command>xiphos</command>, then press <keycap>Return</keycap>.
-						</para>
-    				</listitem>
-    			</varlistentry>
-			<varlistentry>
-				<term>Windows</term>
-				<listitem>
-					<para>
-						Go to <menuchoice><guisubmenu>All Programs</guisubmenu><guisubmenu>Xiphos
-						</guisubmenu><guimenuitem>Xiphos</guimenuitem></menuchoice>.
-					</para>
-				</listitem>
-			</varlistentry>
-
-  		  	</variablelist>
-    </sect2>
-<!--Starting Xiphos for the First Time  -->
diff --git a/help/de/studypad.xml b/help/de/studypad.xml
deleted file mode 100644
index 0a8629f..0000000
--- a/help/de/studypad.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- ============= The Studypad ============================= -->
-<sect2 id="xiphos-studypad">
-		<title>Using The Studypad</title>
-		<para>
-		The Studypad can be opened by choosing <guibutton>File-&gt;Open Studypad</guibutton>
-		</para>
-		<para>
-		This is what the Studypad typically looks like:
-		</para>
-		<figure>
-			<title>The Studypad</title>
-			<screenshot> 
-	  <mediaobject> 
-	    <imageobject><imagedata fileref="figures/studypad.png" format="PNG"/> 
-	    </imageobject>
-	    <!-- EPS versions of the figures are not required at the moment. -->
-            <!-- 
-		    <imageobject>
-      		<imagedata fileref="figures/studypad.eps" format="EPS"/>
-    		    </imageobject>
-	    -->
-	    <textobject> 
-	      <phrase>The Studypad</phrase> 
-	    </textobject> 
-	  </mediaobject> 
-	
-                        </screenshot>
-
-                </figure>
-                                        
-		<para> The Studypad will save into your working directory, making it useful for collecting and exporting information and Bible study material from Xiphos into other programmes.</para>
-		<para> Toolbar 1</para>
-			        	<itemizedlist>
-			     		<listitem><para>Font Size and Environment</para></listitem>
-			     		<listitem><para>Font Type</para></listitem>
-			     		<listitem><para>Bold, Italics, Underscored, Crossed Out</para></listitem>
-			     		<listitem><para>Left, Centre and Right  Bound</para></listitem>
-			     		<listitem><para>Shift Paragraph Right or Left</para></listitem>
-			     		<listitem><para>Colour Selector</para></listitem>
-			     		</itemizedlist>
-		<para> Toolbar 2</para>
-			        	<itemizedlist>
-			        	<listitem><para>New, Save, Delete and Print</para></listitem>
-			        	<listitem><para>Cut, Copy, Paste and Undo</para></listitem>
-			        	<listitem><para>Find and 'Find and Replace'</para></listitem>
-			        	<listitem><para>Spellcheck</para></listitem>
-			        	</itemizedlist>
-
-	        <para>
-		In order for spellcheck to be available, one of the languages
-		under <guimenuitem>Edit-&gt;Current Languages</guimenuitem>
-		must be set.
-	        </para>
-
-	</sect2>
diff --git a/help/de/xiphos.xml b/help/de/xiphos.xml
deleted file mode 100644
index c182a54..0000000
--- a/help/de/xiphos.xml
+++ /dev/null
@@ -1,3335 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-<!ENTITY introduction SYSTEM "introduction.xml">
-<!ENTITY start SYSTEM "start.xml">
-<!ENTITY interface SYSTEM "interface.xml">
-<!ENTITY preferences SYSTEM "preferences.xml">
-<!ENTITY modules SYSTEM "modules.xml">
-<!ENTITY search SYSTEM "search.xml">
-<!ENTITY studypad SYSTEM "studypad.xml">
-<!ENTITY personal SYSTEM "personal.xml">
-<!ENTITY journals SYSTEM "journals.xml">
-<!ENTITY authors SYSTEM "authors.xml">
-<!ENTITY legal SYSTEM "legal.xml">
-<!ENTITY license SYSTEM "license.xml">
-<!ENTITY onlinehelp SYSTEM "onlinehelp.xml">
-<!ENTITY originallanguage SYSTEM "originallanguage.xml">
-<!ENTITY appversion "3.1">
-<!ENTITY manrevision "3.1">
-<!ENTITY date "2009-05-11">
-<!ENTITY app "<application>Xiphos</application>">
-<!ENTITY appname "Xiphos">
-<!ENTITY xiphos "the Xiphos Team">
-<!-- Information about the entities
-       The legal.xml file contains legal information, there is no need to edit the file.
-       Use the appversion entity to specify the version of the application.
-       Use the manrevision entity to specify the revision number of this manual.
-       Use the date entity to specify the release date of this manual.
-       Use the app entity to specify the name of the application. -->]>
-<!--
-This is a GNOME documentation template, designed by the GNOME
-Documentation Project Team. Please use it for writing GNOME
-documentation, making obvious changes. In particular, all the words
-written in UPPERCASE (with the exception of GNOME) should be
-replaced. As for "legalnotice", please leave the reference
-unchanged.
-
-Remember that this is a guide, rather than a perfect model to follow
-slavishly. Make your manual logical and readable.  And don't forget
-to remove these comments in your final documentation!  ;-)
--->
-<!--
-    (Do not remove this comment block.)
-Maintained by the GNOME Documentation Project
-http://developer.gnome.org/projects/gdp
-Template version: 2.0 beta
-Template last modified Apr 11, 2002
--->
-<!-- =============Document Header ============================= -->
-<article id="index" lang="de">
-<!-- please do not change the id; for translations, change lang to -->
-<!-- appropriate code -->
-  <articleinfo>
-    <title><application>Xiphos</application> Manual</title>
-    <abstract>
-      <para>Xiphos is an application to aid in study of the Bible.</para>
-    </abstract>
-    <copyright>
-      <year>2003</year>
-      <year>2009</year>
-      <holder>The Xiphos Team</holder>
-    </copyright>
-
-    <!-- translators: uncomment this:
-
-    <copyright>
-      <year>2006</year>
-      <holder>ME-THE-TRANSLATOR (Latin translation)</holder>
-    </copyright>
-
-    -->
-    <!-- An address can be added to the publisher information.  If a role is
-    not specified, the publisher/author is the same for all versions of the
-    document.  -->
-    <publisher>
-      <publishername>The Xiphos Team</publishername>
-    </publisher>
-
-     <legalnotice id="legalnotice">
-   <title>GNU GENERAL PUBLIC LICENSE</title>
-   <para>Version 2, June 1991</para>
-   <para>
-     Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-   </para>
-   <para>
-     51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-   </para>
-   <para>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-   </para>
-   
-   <sect2 id="legal-preamble">
-     <title>Preamble</title>
-     <para>
-       The licenses for most software are designed to take away your
-       freedom to share and change it.  By contrast, the GNU General Public
-       License is intended to guarantee your freedom to share and change free
-       software--to make sure the software is free for all its users.  This
-       General Public License applies to most of the Free Software
-       Foundation's software and to any other program whose authors commit to
-       using it.  (Some other Free Software Foundation software is covered by
-       the GNU Library General Public License instead.)  You can apply it to
-       your programs, too.
-     </para>
-     <para>
-       When we speak of free software, we are referring to freedom, not
-       price.  Our General Public Licenses are designed to make sure that you
-       have the freedom to distribute copies of free software (and charge for
-       this service if you wish), that you receive source code or can get it
-       if you want it, that you can change the software or use pieces of it
-       in new free programs; and that you know you can do these things.
-     </para>
-     <para>
-       To protect your rights, we need to make restrictions that forbid
-       anyone to deny you these rights or to ask you to surrender the rights.
-       These restrictions translate to certain responsibilities for you if you
-       distribute copies of the software, or if you modify it.
-     </para>
-     <para>
-       For example, if you distribute copies of such a program, whether
-       gratis or for a fee, you must give the recipients all the rights that
-       you have.  You must make sure that they, too, receive or can get the
-       source code.  And you must show them these terms so they know their
-       rights.
-     </para>
-     <para>
-       We protect your rights with two steps: (1) copyright the software, and
-       (2) offer you this license which gives you legal permission to copy,
-       distribute and/or modify the software.
-     </para>
-     <para>
-       Also, for each author's protection and ours, we want to make certain
-       that everyone understands that there is no warranty for this free
-       software.  If the software is modified by someone else and passed on, we
-       want its recipients to know that what they have is not the original, so
-       that any problems introduced by others will not reflect on the original
-       authors' reputations.
-     </para>
-     <para>
-       Finally, any free program is threatened constantly by software
-       patents.  We wish to avoid the danger that redistributors of a free
-       program will individually obtain patent licenses, in effect making the
-       program proprietary.  To prevent this, we have made it clear that any
-       patent must be licensed for everyone's free use or not licensed at all.
-     </para>
-     <para>
-       The precise terms and conditions for copying, distribution and
-       modification follow.
-     </para>
-   </sect2>
-   
-   <sect2 id="legal-distribution">
-     <title>GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS
-       FOR COPYING, DISTRIBUTION AND MODIFICATION</title>
-     <itemizedlist>
-       <listitem>
-	 <para>
-	   0. This License applies to any program or other work which contains
-	   a notice placed by the copyright holder saying it may be distributed
-	   under the terms of this General Public License.  The "Program", below,
-	   refers to any such program or work, and a "work based on the Program"
-	   means either the Program or any derivative work under copyright law:
-	   that is to say, a work containing the Program or a portion of it,
-	   either verbatim or with modifications and/or translated into another
-	   language.  (Hereinafter, translation is included without limitation in
-	   the term "modification".)  Each licensee is addressed as "you".
-	 </para>
-	 <para>
-	   Activities other than copying, distribution and modification are not
-	   covered by this License; they are outside its scope.  The act of
-	   running the Program is not restricted, and the output from the Program
-	   is covered only if its contents constitute a work based on the
-	   Program (independent of having been made by running the Program).
-	   Whether that is true depends on what the Program does.
-	 </para>
-       </listitem>
-       <listitem>
-	 <para>
-	   1. You may copy and distribute verbatim copies of the Program's
-	   source code as you receive it, in any medium, provided that you
-	   conspicuously and appropriately publish on each copy an appropriate
-	   copyright notice and disclaimer of warranty; keep intact all the
-	   notices that refer to this License and to the absence of any warranty;
-	   and give any other recipients of the Program a copy of this License
-	   along with the Program.
-	 </para>
-	 <para>
-	   You may charge a fee for the physical act of transferring a copy, and
-	   you may at your option offer warranty protection in exchange for a fee.
-	 </para>
-       </listitem>
-       <listitem>
-	 <para>
-	   2. You may modify your copy or copies of the Program or any portion
-	   of it, thus forming a work based on the Program, and copy and
-	   distribute such modifications or work under the terms of Section 1
-	   above, provided that you also meet all of these conditions:
-	 </para>
-	 <para>
-	   a) You must cause the modified files to carry prominent notices
-	   stating that you changed the files and the date of any change.
-	 </para>
-	 <para>
-	   b) You must cause any work that you distribute or publish, that in
-	   whole or in part contains or is derived from the Program or any
-	   part thereof, to be licensed as a whole at no charge to all third
-	   parties under the terms of this License.
-	 </para>
-	 <para>
-	   c) If the modified program normally reads commands interactively
-	   when run, you must cause it, when started running for such
-	   interactive use in the most ordinary way, to print or display an
-	   announcement including an appropriate copyright notice and a
-	   notice that there is no warranty (or else, saying that you provide
-	   a warranty) and that users may redistribute the program under
-	   these conditions, and telling the user how to view a copy of this
-	   License.  (Exception: if the Program itself is interactive but
-	   does not normally print such an announcement, your work based on
-	   the Program is not required to print an announcement.)
-	 </para>
-	 <para>
-	   These requirements apply to the modified work as a whole.  If
-	   identifiable sections of that work are not derived from the Program,
-	   and can be reasonably considered independent and separate works in
-	   themselves, then this License, and its terms, do not apply to those
-	   sections when you distribute them as separate works.  But when you
-	   distribute the same sections as part of a whole which is a work based
-	   on the Program, the distribution of the whole must be on the terms of
-	   this License, whose permissions for other licensees extend to the
-	   entire whole, and thus to each and every part regardless of who wrote it.
-	 </para>
-	 <para>
-	   Thus, it is not the intent of this section to claim rights or contest
-	   your rights to work written entirely by you; rather, the intent is to
-	   exercise the right to control the distribution of derivative or
-	   collective works based on the Program.
-	 </para>
-	 <para>
-	   In addition, mere aggregation of another work not based on the Program
-	   with the Program (or with a work based on the Program) on a volume of
-	   a storage or distribution medium does not bring the other work under
-	   the scope of this License.
-	 </para>
-       </listitem>
-       <listitem>
-	 <para>
-	   3. You may copy and distribute the Program (or a work based on it,
-	   under Section 2) in object code or executable form under the terms of
-	   Sections 1 and 2 above provided that you also do one of the following:
-	 </para>
-	 <para>
-	   a) Accompany it with the complete corresponding machine-readable
-	   source code, which must be distributed under the terms of Sections
-	   1 and 2 above on a medium customarily used for software interchange; or,
-	 </para>
-	 <para>
-	   b) Accompany it with a written offer, valid for at least three
-	   years, to give any third party, for a charge no more than your
-	   cost of physically performing source distribution, a complete
-	   machine-readable copy of the corresponding source code, to be
-	   distributed under the terms of Sections 1 and 2 above on a medium
-	   customarily used for software interchange; or,
-	 </para>
-	 <para>
-	   c) Accompany it with the information you received as to the offer
-	   to distribute corresponding source code.  (This alternative is
-	   allowed only for noncommercial distribution and only if you
-	   received the program in object code or executable form with such
-	   an offer, in accord with Subsection b above.)
-	 </para>
-	 <para>
-	   The source code for a work means the preferred form of the work for
-	   making modifications to it.  For an executable work, complete source
-	   code means all the source code for all modules it contains, plus any
-	   associated interface definition files, plus the scripts used to
-	   control compilation and installation of the executable.  However, as a
-	   special exception, the source code distributed need not include
-	   anything that is normally distributed (in either source or binary
-	   form) with the major components (compiler, kernel, and so on) of the
-	   operating system on which the executable runs, unless that component
-	   itself accompanies the executable.
-	 </para>
-	 <para>
-	   If distribution of executable or object code is made by offering
-	   access to copy from a designated place, then offering equivalent
-	   access to copy the source code from the same place counts as
-	   distribution of the source code, even though third parties are not
-	   compelled to copy the source along with the object code.
-	 </para>
-       </listitem>
-       <listitem>
-	 <para>
-	   4. You may not copy, modify, sublicense, or distribute the Program
-	   except as expressly provided under this License.  Any attempt
-	   otherwise to copy, modify, sublicense or distribute the Program is
-	   void, and will automatically terminate your rights under this License.
-	   However, parties who have received copies, or rights, from you under
-	   this License will not have their licenses terminated so long as such
-	   parties remain in full compliance.
-	 </para>
-       </listitem>
-       <listitem>
-	 <para>
-	   5. You are not required to accept this License, since you have not
-	   signed it.  However, nothing else grants you permission to modify or
-	   distribute the Program or its derivative works.  These actions are
-	   prohibited by law if you do not accept this License.  Therefore, by
-	   modifying or distributing the Program (or any work based on the
-	   Program), you indicate your acceptance of this License to do so, and
-	   all its terms and conditions for copying, distributing or modifying
-	   the Program or works based on it.
-	 </para>
-       </listitem>
-       <listitem>
-	 <para>
-	   6. Each time you redistribute the Program (or any work based on the
-	   Program), the recipient automatically receives a license from the
-	   original licensor to copy, distribute or modify the Program subject to
-	   these terms and conditions.  You may not impose any further
-	   restrictions on the recipients' exercise of the rights granted herein.
-	   You are not responsible for enforcing compliance by third parties to
-	   this License.
-	 </para>
-       </listitem>
-       <listitem>
-	 <para>
-	   7. If, as a consequence of a court judgment or allegation of patent
-	   infringement or for any other reason (not limited to patent issues),
-	   conditions are imposed on you (whether by court order, agreement or
-	   otherwise) that contradict the conditions of this License, they do not
-	   excuse you from the conditions of this License.  If you cannot
-	   distribute so as to satisfy simultaneously your obligations under this
-	   License and any other pertinent obligations, then as a consequence you
-	   may not distribute the Program at all.  For example, if a patent
-	   license would not permit royalty-free redistribution of the Program by
-	   all those who receive copies directly or indirectly through you, then
-	   the only way you could satisfy both it and this License would be to
-	   refrain entirely from distribution of the Program.
-	 </para>
-	 <para>
-	   If any portion of this section is held invalid or unenforceable under
-	   any particular circumstance, the balance of the section is intended to
-	   apply and the section as a whole is intended to apply in other
-	   circumstances.
-	 </para>
-	 <para>
-	   It is not the purpose of this section to induce you to infringe any
-	   patents or other property right claims or to contest validity of any
-	   such claims; this section has the sole purpose of protecting the
-	   integrity of the free software distribution system, which is
-	   implemented by public license practices.  Many people have made
-	   generous contributions to the wide range of software distributed
-	   through that system in reliance on consistent application of that
-	   system; it is up to the author/donor to decide if he or she is willing
-	   to distribute software through any other system and a licensee cannot
-	   impose that choice.
-	 </para>
-	 <para>
-	   This section is intended to make thoroughly clear what is believed to
-	   be a consequence of the rest of this License.
-	 </para>
-       </listitem>
-       <listitem>
-	 <para>
-	   8. If the distribution and/or use of the Program is restricted in
-	   certain countries either by patents or by copyrighted interfaces, the
-	   original copyright holder who places the Program under this License
-	   may add an explicit geographical distribution limitation excluding
-	   those countries, so that distribution is permitted only in or among
-	   countries not thus excluded.  In such case, this License incorporates
-	   the limitation as if written in the body of this License.
-	 </para>
-       </listitem>
-       <listitem>
-	 <para>
-	   9. The Free Software Foundation may publish revised and/or new versions
-	   of the General Public License from time to time.  Such new versions will
-	   be similar in spirit to the present version, but may differ in detail to
-	   address new problems or concerns.
-	 </para>
-	 <para>
-	   Each version is given a distinguishing version number.  If the Program
-	   specifies a version number of this License which applies to it and "any
-	   later version", you have the option of following the terms and conditions
-	   either of that version or of any later version published by the Free
-	   Software Foundation.  If the Program does not specify a version number of
-	   this License, you may choose any version ever published by the Free Software
-	   Foundation.
-	 </para>
-       </listitem>
-       <listitem>
-	 <para>
-	   10. If you wish to incorporate parts of the Program into other free
-	   programs whose distribution conditions are different, write to the author
-	   to ask for permission.  For software which is copyrighted by the Free
-	   Software Foundation, write to the Free Software Foundation; we sometimes
-	   make exceptions for this.  Our decision will be guided by the two goals
-	   of preserving the free status of all derivatives of our free software and
-	   of promoting the sharing and reuse of software generally.
-	 </para>
-       </listitem>
-       <listitem>
-	 <para>NO WARRANTY</para>
-	 <para>
-	   11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-	   FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-	   OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-	   PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-	   OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-	   MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-	   TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-	   PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-	   REPAIR OR CORRECTION.
-	 </para>
-       </listitem>
-       <listitem>
-	 <para>
-	   12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-	   WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-	   REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-	   INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-	   OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-	   TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-	   YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-	   PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-	   POSSIBILITY OF SUCH DAMAGES.
-	 </para>
-       </listitem>
-     </itemizedlist>
-     <para>END OF TERMS AND CONDITIONS</para>
-   </sect2>
-   <sect2>
-     <title>How to Apply These Terms to Your New Programs</title>
-     <para>
-       If you develop a new program, and you want it to be of the greatest
-       possible use to the public, the best way to achieve this is to make it
-       free software which everyone can redistribute and change under these terms.
-     </para>
-     <para>
-       To do so, attach the following notices to the program.  It is safest
-       to attach them to the start of each source file to most effectively
-       convey the exclusion of warranty; and each file should have at least
-       the "copyright" line and a pointer to where the full notice is found.
-     </para>
-     <para>
-       &lt;one line to give the program's name and a brief idea of what it does.&gt;
-	 Copyright (C) &lt;year&gt;  &lt;name of author&gt;
-     </para>
-     <para> 
-       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.
-     </para>
-     <para>
-       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.
-     </para>
-     <para>
-       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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-     </para>
-     <para>
-       Also add information on how to contact you by electronic and paper mail.
-     </para>
-     <para>
-       If the program is interactive, make it output a short notice like this
-       when it starts in an interactive mode:
-       <para>
-	 Gnomovision version 69, Copyright (C) year  name of author
-	 Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-	 This is free software, and you are welcome to redistribute it
-	 under certain conditions; type `show c' for details.
-       </para>
-     </para>
-     <para>
-       The hypothetical commands `show w' and `show c' should show the appropriate
-       parts of the General Public License.  Of course, the commands you use may
-       be called something other than `show w' and `show c'; they could even be
-       mouse-clicks or menu items--whatever suits your program.
-     </para>
-     <para>
-       You should also get your employer (if you work as a programmer) or your
-       school, if any, to sign a "copyright disclaimer" for the program, if
-       necessary.  Here is a sample; alter the names:
-       <para>
-	 Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-	 `Gnomovision' (which makes passes at compilers) written by James Hacker.
-       </para>
-       <para>
-         &lt;signature of Ty Coon&gt;, 1 April 1989
-       </para>
-       <para>
-	 Ty Coon, President of Vice
-       </para>
-     </para>
-     <para>
-       This General Public License does not permit incorporating your program into
-       proprietary programs.  If your program is a subroutine library, you may
-       consider it more useful to permit linking proprietary applications with the
-       library.  If this is what you want to do, use the GNU Library General
-       Public License instead of this License.
-     </para>
-   </sect2>
-</legalnotice>
-
-    <!-- This file  contains link to license for the documentation (GNU FDL), and
-    other legal stuff such as "NO WARRANTY" statement. Please do not change
-    any of this. -->
-
-    <authorgroup>
-      <author>
-        <firstname>Andy</firstname>
-        <surname>Piper</surname>
-      </author>
-      <author>
-        <firstname>Pierre</firstname>
-        <surname>Benz</surname>
-      </author>
-      <author>
-        <firstname>Dr Peter</firstname>
-        <surname>von Kaehne</surname>
-      </author>
-      <author>
-        <firstname>Karl</firstname>
-        <surname>Kleinpaste</surname>
-      </author>
-      <author>
-	<firstname>Matthew</firstname>
-	<surname>Talbert</surname>
-      </author>
-      <othercredit role="translator">
-	<firstname>Dominique</firstname>
-	<surname>Corbex</surname>
-	<affiliation>
-	  <orgname>Xiphos Development team</orgname>
-	</affiliation>
-	<contrib>French translation</contrib>
-      </othercredit>
-
-
-      <!-- This is appropriate place for other contributors: translators,
-      maintainers,  etc. Commented out by default.
-
-      <othercredit role="translator">
-        <firstname>Latin</firstname>
-        <surname>Translator 1</surname>
-        <affiliation>
-          <orgname>Latin Translation Team</orgname>
-          <address> <email>translator@gnome.org</email> </address>
-        </affiliation>
-        <contrib>Latin translation</contrib>
-      </othercredit>
-      -->
-    </authorgroup>
-
-
-    <!-- According to GNU FDL, revision history is mandatory if you are -->
-    <!-- modifying/reusing someone else's document.  If not, you can omit it. -->
-    <!-- Remember to remove the &manrevision; entity from the revision entries other
-    -->
-    <!-- than the current revision. -->
-    <!-- The revision numbering system for GNOME manuals is as follows: -->
-    <!-- * the revision number consists of two components -->
-    <!-- * the first component of the revision number reflects the release version of the GNOME desktop. -->
-    <!-- * the second component of the revision number is a decimal unit that is incremented with each revision of the manual. -->
-    <!-- For example, if the GNOME desktop release is V2.x, the first version of the manual that -->
-    <!-- is written in that desktop timeframe is V2.0, the second version of the manual is V2.1, etc. -->
-    <!-- When the desktop release version changes to V3.x, the revision number of the manual changes -->
-    <!-- to V3.0, and so on. -->
-
-    <releaseinfo>This manual describes version 3.1 of Xiphos.
-    </releaseinfo>
-    <legalnotice>
-      <title>Feedback</title>
-      <para>To report a bug or make a suggestion regarding the Xiphos application or
-      this manual, Use the <ulink url="http://sourceforge.net/tracker/?group_id=5528">
-      Tracker on SourceForge</ulink> or the mailing lists.
-      </para>
-      <!-- Translators may also add here feedback address for translations -->
-    </legalnotice>
-
-    <keywordset>
-      <keyword>gnome</keyword>
-      <keyword>xiphos</keyword>
-      <keyword>sword</keyword>
-      <keyword>crosswire</keyword>
-      <keyword>help dialog</keyword>
-    </keywordset>
-
-  </articleinfo>
-
-  <indexterm zone="index">
-    <primary>Xiphos</primary>
-  </indexterm>
-
-
-  <!-- ============= Document Body ============================= -->
-
-  <!-- Please note: the headers of the included files (introduction.xml,
-  start.xml and so on) must be into this main help file. If they are not,
-  the table of contents is not displayed by yelp.
-  -->
-
-  <!-- ============= Introduction ============================== -->
-  <!-- Use the Introduction section to give a brief overview of what
-  the application is and what it does. -->
-  <sect1 id="xiphos-introduction">
-    <title>Introduction</title>
-    <!-- ============= Introduction ============================== -->
-<!-- Use the Introduction section to give a brief overview of what
-     the application is and what it does. -->
- 
-    <para><application>Xiphos</application> is a Bible study and research tool based upon the "SWORD Project" libraries
-    and the GNOME Desktop libraries. You can use <application>Xiphos</application> to do the following:</para>
-    <itemizedlist>
-       <listitem>
-          <para>View your favorite Scripture verse</para>
-       </listitem>
-       <listitem>
-          <para>Make sermon or personal notes on selected passages</para>
-       </listitem>
-       <listitem>
-           <para>Automatically follow Bible footnotes and cross-references</para>
-       </listitem>
-       <listitem>
-           <para>Compare translations in parallel</para>
-       </listitem>
-       <listitem>
-           <para>Work in original language study using the available Hebrew and Greek
-           translations</para>
-        </listitem>
-      </itemizedlist>
-      <para><application>Xiphos</application> aims to provide a simple and clean user interface while providing a
-      powerful tool allowing a personalized Bible study environment.</para>
-
-      <!-- ==== Figure ==== -->
-      <figure id="sword-logo">
-      <title>The SWORD Project logo</title> 	
-      <screenshot>
-        <mediaobject> 
-	    <imageobject>
-              <imagedata fileref="figures/sword3.png" format="PNG"/>
-	    </imageobject>
-	    <!-- EPS versions of the figures are not required at the moment. -->
-            <!-- 
-		    <imageobject>
-      		<imagedata fileref="figures/sword3.eps" format="EPS"/>
-    		    </imageobject>
-	    -->
-	    <textobject> 
-	      <phrase>The SWORD Project logo</phrase> 
-	    </textobject> 
-        </mediaobject> 
-      </screenshot>
-      </figure>
-
-      <para>"The SWORD Project" is based at 
-      <ulink type="http" url="http://www.crosswire.org">http://www.crosswire.org</ulink>.
-      Other applications under the same banner are <application>The SWORD Project for Windows</application>
-      (aka <application>BibleCS</application> or <application>WinSword</application>),      
-      <application>MacSword</application> for the Macintosh,
-      <application>BibleDesktop</application>, a Java application,
-      and <application>BibleTime</application>, another Linux program.</para>
-
-      <para>
-      <figure id="main-screenshot">
-      <title>Xiphos in action</title>
-      <screenshot> 
-	  <mediaobject> 
-	    <imageobject><imagedata fileref="figures/interface.png" format="PNG"/> 
-	    </imageobject>
-	    <!-- EPS versions of the figures are not required at the moment. -->
-            <!-- 
-		    <imageobject>
-      		<imagedata fileref="figures/interface.eps" format="EPS"/>
-    		    </imageobject>
-	    -->
-	    <textobject> 
-	      <phrase>Xiphos in action</phrase> 
-	    </textobject> 
-	  </mediaobject> 
-         </screenshot>
-       </figure>
-       </para>
-
-       <!-- Where important notices are kept regarding Xiphos  -->
-       <warning>
-         <para><application>Xiphos</application> is currently in development, so this manual may not
-         reflect the program as you see it. If it does not, please file a
-         bug at the <ulink type="http" url="http://sourceforge.net/projects/xiphos">
-	 project website</ulink>, or email <email>xiphos-developers@lists.sourceforge.net</email>.
-         All help is appreciated, as it will improve the software.</para>
-       </warning>
-
-
-  </sect1>
-
-  <!-- =========== Getting Started ============================== -->
-  <!-- Use the Getting Started section to describe the steps required
-  to start the application and to describe the user interface components
-  of the application. If there is other information that it is important
-  for readers to know before they start using the application, you should
-  also include this information here.
-  If the information about how to get started is very short, you can
-  include it in the Introduction and omit this section. -->
-  <sect1 id="familiar">
-    <title>Getting Started with Xiphos</title>
-    
-<!-- ============= Getting Started with Xiphos  ============-->
-	<sect2 id="xiphos-getting-started">
-  		<title>Starting Xiphos</title>
-			<para>
-			You can start <application>Xiphos</application> in the following ways:
-			</para>
-			<variablelist>
-				<varlistentry>
-					<term>Applications menu</term>
-					<listitem>
-						<para>
-						Choose <menuchoice><guisubmenu>Accessories</guisubmenu>
-						<guimenuitem>Xiphos Bible Guide</guimenuitem>
-						</menuchoice>.
-			            </para>
-    				</listitem>
-    			</varlistentry>
-    			<varlistentry>
-    				<term>Command line</term>
-    				<listitem>
-    					<para>
-						Type <command>xiphos</command>, then press <keycap>Return</keycap>.
-						</para>
-    				</listitem>
-    			</varlistentry>
-			<varlistentry>
-				<term>Windows</term>
-				<listitem>
-					<para>
-						Go to <menuchoice><guisubmenu>All Programs</guisubmenu><guisubmenu>Xiphos
-						</guisubmenu><guimenuitem>Xiphos</guimenuitem></menuchoice>.
-					</para>
-				</listitem>
-			</varlistentry>
-
-  		  	</variablelist>
-    </sect2>
-<!--Starting Xiphos for the First Time  -->
-  	<sect2 id="xiphos-first-start">
-  		<title>Starting Xiphos For The First Time</title>
-		<para>
-		When you start <application>Xiphos</application> for the first time, <application>Xiphos</application> creates a
-		default selection of options for display.  Also, if no other Sword application has ever been run, and thus there are no
-		Bible modules installed, then <application>Xiphos</application> asks permission to start the Module Manager so
-		that you can select and install a Bible module in your language preference.
-		</para>
-		<figure id="xiphos-start-question">
-			<title>Xiphos Download Question</title>
-			<screenshot> 
-	  <mediaobject> 
-	    <imageobject><imagedata fileref="figures/first_start.png" format="PNG"/> 
-	    </imageobject>
-	    <!-- EPS versions of the figures are not required at the moment. -->
-            <!-- 
-		    <imageobject>
-      		<imagedata fileref="figures/first_start.eps" format="EPS"/>
-    		    </imageobject>
-	    -->
-	    <textobject> 
-	      <phrase>Xiphos Download Question</phrase> 
-	    </textobject> 
-	  </mediaobject> 
-	
-                        </screenshot>
-
-                </figure>
-		<para>
-		<application>Xiphos</application> then opens its interface with one tab displayed, showing Romans 8:28.  Once the
-		interface is open, you can use
-		<menuchoice><guimenuitem>Edit</guimenuitem><guimenuitem>Preferences</guimenuitem></menuchoice> to change any of the
-		selections already made by default.
-		</para>
-	 </sect2>
-<!-- Xiphos on first time use -->
-   	 <sect2 id="xiphos-when-you-start">
-	 <title>Launching Xiphos</title>
-		<para>
-		When you start <application>Xiphos</application>, the following interface is displayed:
-		</para>
-		<figure id="xiphos-start-interface">
-			<title>Xiphos interface</title>
-			<screenshot> 
-	  <mediaobject> 
-	    <imageobject><imagedata fileref="figures/interface.png" format="PNG"/> 
-	    </imageobject>
-	    <!-- EPS versions of the figures are not required at the moment. -->
-            <!-- 
-		    <imageobject>
-      		<imagedata fileref="figures/interface.eps" format="EPS"/>
-    		    </imageobject>
-	    -->
-	    <textobject> 
-	      <phrase>The Xiphos Interface</phrase> 
-	    </textobject> 
-	  </mediaobject> 
-	
-                        </screenshot>
-
-                </figure>
-                <para>
-		The <application>Xiphos</application> interface contains the following elements:
-		</para>
-		<variablelist>
-			<varlistentry>
-				<term>Menubar</term>
-				<listitem>
-					<para>
-					The menus on the menubar contain several commands which extend the use of <application>Xiphos
-					</application>. These include the StudyPad and advanced search functions. The menus also help you to customize
-					your use of <application>Xiphos</application>.
-			        </para>
-				</listitem>
-		 	</varlistentry>
-	        <varlistentry>
-				<term>Toolbar</term>
-					<listitem>
-						<para>
-						 The <interface>toolbar</interface> contains buttons that let you quickly navigate through the Bible.
-						</para>
-					</listitem>
-		 		</varlistentry>
-                <varlistentry>
-					<term>Sidebar</term>
-					<listitem>
-						<para>
-						The <interface>Sidebar</interface> provides access to several features. 
-						It contains your bookmarks and the list of installed books. It can also be 
-						used to perform simple searches.
-					</para>
-				</listitem>
-		  	</varlistentry>
-		  	<varlistentry>
-				<term>Bible Text Pane</term>
-				<listitem>
-					<para>
-					The <interface>Bible Text pane</interface> displays the Bible text which is currently being viewed.
-					</para>
-			    </listitem>
-		  	 </varlistentry>
-			<varlistentry>
-				<term>Previewer</term>
-				<listitem>
-					<para>
-					The <interface>Previewer</interface> displays Bible text module options. These include Strong's
-					numbers, footnotes and morphological tags. It is located below the Bible Text Pane.
-					</para>
-				</listitem>
-			 </varlistentry>
-		  	 <varlistentry>
-			 	<term>Commentary Pane</term>
-			 	<listitem>
-					<para>
-					The <interface>Commentary pane</interface> displays commentaries on the current Bible Text being used.
-					</para>
-			 	</listitem>
-		         </varlistentry>
-			 <varlistentry>
-			 	<term>Book Pane</term>
-			 	<listitem>
-					<para>
-					The <interface>Book Pane</interface> displays general books available from the Sword Project. These include modules like
-					"Calvin's Institutes", "Josephus: The Complete Works" etc. This Pane can be accessed	via the Book View tab just below the
-					Commentary Pane.
-					</para>
-			 	</listitem>
-		         </varlistentry>
-			 <varlistentry>
-			 	<term>Dictionary/Book Pane</term>
-			 	<listitem>
-					<para>
-					The <interface>Dictionary/Book Pane</interface> displays dictionary information
-					on selected words in the <interface>Bible Text Pane</interface>. It is located just below the Commentary Pane
-					</para>
-			 	</listitem>
-		     </varlistentry>
-			 </variablelist>
-		     <para>
-			When you right-click in the different interface sections, the interface displays a popup menu, which provides access
-			to more module-specific options, including display controls and printing services.
-			</para>
-	</sect2>
-
-
-  </sect1>
-
-  <!-- Interface -->
-  <sect1 id="interface">
-    <title>Interface</title>
-    <!-- ============= Interface ============================== -->
-	
- <!-- ============= Menubar  ============-->
-	<sect2 id="menubar">
-   		<title>Menubar</title>
-   		<para>
-   		At the top of the <application>Xiphos</application> main window is the menubar. 
-   		Almost all of the functions are available by activating the appropriate 
-   		menu item. The functions have been grouped according to their type. For 
-   		example, the file operations have been grouped into 
-   		the <guisubmenu>File</guisubmenu> menu.
-   		</para>
-	        <figure id="menubar_figure">
-			<title>Menubar</title>
-	  		<screenshot> 
-			  <mediaobject> 
-			    <imageobject><imagedata fileref="figures/interface_menubar.png" format="PNG"/> 
-			    </imageobject>
-	    		<!-- EPS versions of the figures are not required at the moment. -->
-          		<!-- 
-		    <imageobject>
-      			<imagedata fileref="figures/interface_menubar.eps" format="EPS"/>
-    		    </imageobject>
-		    -->
-	    <textobject> 
-	      <phrase>Xiphos menubar</phrase> 
-	    </textobject> 
-	  </mediaobject> 
-	
-		      	</screenshot>
-	    	</figure>
-	</sect2>
-	
-<!-- ============= Toolbars  ============-->
-	<sect2 id="toolbars">
-   		<title>Toolbars</title>
-   		<para>
-	    	The function of the Toolbar is to provide control over the Bible and Commentary Panes.
-		Activation of the Toolbar option is done by moving the mouse cursor over the 
-		desired toolbar button and selecting it. A tooltip will appear if the mouse cursor 
-		is held stationary over a toolbar button, describing the function of the button. 
-    	</para>
-		<figure id="toolbar_figure">
-			<title>ToolBar</title>
-			<screenshot> 
-	  <mediaobject> 
-	    <imageobject>
-		<imagedata fileref="figures/interface_toolbar.png" format="PNG"/> 
-	    </imageobject>
-	    <!-- EPS versions of the figures are not required at the moment. -->
-            <!-- 
-		    <imageobject>
-      		<imagedata fileref="figures/interface_toolbar.eps" format="EPS"/>
-    		    </imageobject>
-	    -->
-	    <textobject> 
-	      <phrase>The Toolbar</phrase> 
-	    </textobject> 
-	  </mediaobject> 
-	</screenshot>
-		</figure>	
-		<para>
-		The <interface>Toolbar</interface> consists of the following functions:
-		</para>
-		<itemizedlist>
-			<listitem>
-				<para>
-				History View Toggle and drop-down menu
-				</para>
-			</listitem>
-			<listitem>
-				<para>
-				Bible Book Selector
-				</para>
-			</listitem>
-			<listitem>
-				<para>
-				Bible Chapter Selector
-				</para>
-			</listitem>
-			<listitem>
-				<para>
-				Bible Verse Selector
-				</para>
-			</listitem>
-			<listitem>
-				<para>
-				Bible Passage Summary
-				</para>
-			</listitem>
-		</itemizedlist>
-		
-		<sect3>
-			<title>History Forward/Backward Selector</title>
-			<para>
-			Switches between current and previous passage selections.
-			</para>
-		</sect3>
-			
-		<sect3 id="xiphos-toolbar-book">
-			<title>Bible Book Selector</title>
-			<para>		
-			Selects the Biblical book to be displayed in the <interface>Bible Text Pane</interface> and 
-			<interface>Commentary Pane</interface>. Changes take immediate effect.
-			</para>
-		</sect3>
-			
-		<sect3 id="xiphos-toolbar-chapter">
-			<title>Bible Chapter Selector</title>
-			<para>
-			Selects the Biblical chapter of current book to be displayed in the <interface>Bible Text Pane</interface> and 
-			<interface>Commentary Pane</interface>. Changes take immediate effect.
-			</para>
-		</sect3>
-			
-		<sect3 id="xiphos-toolbar-verse">
-			<title>Bible Verse Selector</title>
-			<para>
-			Selects the Biblical verse of current chapter to be displayed in the <interface>Bible Text Pane</interface> and 
-			<interface>Commentary Pane</interface>. Changes take immediate effect.
-			</para>
-		</sect3>
-		
-		<sect3 id="xiphos-toolbar-summary">
-			<title>Bible Passage Summary</title>
-			<para>
-			Allows manual editing of passages which are displayed in the <interface>Bible Text Pane</interface> and 
-			<interface>Commentary Pane</interface>. Changes take effect once Enter is typed.
-			</para>
-			<warning>
-				<para>
-				Ensure that edited book,chapter and verse naming is correct, otherwise the wrong or no information
-				will be displayed.
-				</para>
-			</warning>
-		</sect3>
-	</sect2>
-   
-<!-- ============= Sidebar  ============-->  
-	<sect2 id="xiphos-sidebar">
-   	 	<title>The Sidebar</title>
-		<figure id="sidebar_figure">
-			<title>Sidebar</title>
-	  		<screenshot> 
-	  <mediaobject> 
-	    <imageobject>
-		<imagedata fileref="figures/interface_sidepane.png" format="PNG"/> 
-	    </imageobject>
-	    <!-- EPS versions of the figures are not required at the moment. -->
-            <!-- 
-		    <imageobject>
-      		<imagedata fileref="figures/interface_sidepane.eps" format="EPS"/>
-    		    </imageobject>
-	    -->
-	    <textobject> 
-	      <phrase>The Sidebar</phrase> 
-	    </textobject> 
-	  </mediaobject> 
-	   </screenshot>
-
-	    	</figure>
-		<para>
-	     	On the left hand side of <application>Xiphos</application> there is the Sidebar. Here the
-	     	user can switch between the different Sword modules, view bookmarks, do simple searches and view verse lists.
-		To switch between all Sidebar functions, buttons have been placed at the top of the Sidebar.
-		</para>
-		<figure id="shortcut_figure">
-			<title>Sidebar Shortcuts</title>
-	  		<screenshot> 
-	  <mediaobject> 
-	    <imageobject>
-		<imagedata fileref="figures/interface_shortcut.png" format="PNG"/> 
-	    </imageobject>
-	    <!-- EPS versions of the figures are not required at the moment. -->
-            <!-- 
-		    <imageobject>
-      		<imagedata fileref="figures/interface_shortcut.eps" format="EPS"/>
-    		    </imageobject>
-	    -->
-	    <textobject> 
-	      <phrase>Sidebar shortcuts</phrase> 
-	    </textobject> 
-	  </mediaobject> 
-			</screenshot>
-	    	</figure>
-	</sect2>
-<!-- ============= Bible Text Pane  ============--> 
-	<sect2 id="xiphos-bible">
-   		<title>The Bible Text Pane</title>
-  		<figure id="textpane_figure">
-			<title>The Bible Textpane</title>
-	  		<screenshot> 
-	  <mediaobject> 
-	    <imageobject>
-		<imagedata fileref="figures/interface_biblepane.png" format="PNG"/> 
-	    </imageobject>
-	    <!-- EPS versions of the figures are not required at the moment. -->
-            <!-- 
-		    <imageobject>
-      		<imagedata fileref="figures/interface_biblepane.eps" format="EPS"/>
-    		    </imageobject>
-	    -->
-	    <textobject> 
-	      <phrase>The Bible textpane</phrase> 
-	    </textobject> 
-	  </mediaobject> 
-	
-			</screenshot>
-	    	</figure>
-		<para>
-		Positioned to the right of the Shortcut bar is the Bible text pane. All your different translations
-		will be displayed for full viewing. When starting <application>Xiphos</application> either your default Bible translation or the translation
-		last used will be displayed.
-		</para>
-		
-		<sect3 id="xiphos-bible-open">
-			<title>Opening A Specific Bible Translation</title>
-			<para>
-			In order to change the current Bible translation to another of your choice:
-			</para>
-			<itemizedlist>
-				<listitem>
-					<para>
-					right-click in the <interface>Bible Text Pane</interface>. In the popup menu choose
-					<menuchoice><guimenuitem>File</guimenuitem><guimenuitem>Open Module</guimenuitem></menuchoice>
-					and select your specific translation that you want to view.
-					</para>
-				</listitem>
-				<listitem>
-					<para>
-					under the <guibutton>Modules</guibutton> option in the <interface>Sidebar</interface>, choose <menuchoice>
-					<guimenuitem>Biblical Texts</guimenuitem><guimenuitem>language choice</guimenuitem></menuchoice>
-					and select your specific translation. 
-					</para>
-				</listitem>
-			</itemizedlist>
-		</sect3>
-		
-		<sect3 id="xiphos-bible-parallel">
-			<title>Using the Parallel View Mode</title>
-			<para>
-			A nice function in <application>Xiphos</application> is the ability to view your specified bible text in five parallel
-			translations of your choice. The Parallel View mode can be accessed by selecting <guimenuitem>Parallel View</guimenuitem> just
-			below the <interface>Bible Text Pane</interface>, next to the <guimenuitem>Standard View</guimenuitem> tab. Please note that you
-			can only view one verse at a time. You can change the verse by selecting another verse, chapter, or book at the toolbar. Also note
-			that modules that are Old Testament or New Testament only (eg Westminster Leningrad Codex and Byzantine Majority Text ) will not be able
-			to display books, chapters, or verses that they don't have.  
-			</para>
-		<figure id="parallel_figure">
-			<title>Bible textpane - parallel view</title>
-	  		<screenshot> 
-	  <mediaobject> 
-	    <imageobject><imagedata fileref="figures/interface_parallel.png" format="PNG"/>
-	    </imageobject>
-	    <!-- EPS versions of the figures are not required at the moment. -->
-            <!-- 
-		    <imageobject>
-      		<imagedata fileref="figures/interface_parallel.eps" format="EPS"/>
-    		    </imageobject>
-	    -->
-	    <textobject> 
-	      <phrase>Bible textpane - parallel view</phrase> 
-	    </textobject> 
-	  </mediaobject> 
-	
-		      	</screenshot>
-	    	</figure>
-			<para>
-			Additionally, a separate Parallel View window can be selected from the right click menu with <guimenuitem>Detach/Attach</guimenuitem>.
-			Your Bible pane will return to its normal single text view, and the new Parallel View window will show the complete
-			chapter, in all 5 translations.
-			</para>
-		<figure id="parallel_figure_separate">
-			<title>Parallel View - separate window</title>
-	  		<screenshot> 
-	  <mediaobject> 
-	    <imageobject><imagedata fileref="figures/interface_parallel-separate.png" format="PNG"/> 
-	    </imageobject>
-	    <!-- EPS versions of the figures are not required at the moment. -->
-            <!-- 
-		    <imageobject>
-      		<imagedata fileref="figures/interface_parallel-separate.eps" format="EPS"/>
-    		    </imageobject>
-	    -->
-	    <textobject> 
-	      <phrase>Parallel View - separate window</phrase> 
-	    </textobject> 
-	  </mediaobject> 
-	
-		      	</screenshot>
-		</figure>
-		</sect3>
-		
-		<sect3 id="xiphos-bible-open-separate">
-			<title>Opening A Separate Bible Translation</title>
-			<para>
-			In order to view a Bible translation separate from the <application>Xiphos</application> interface:
-			</para>
-			<itemizedlist>
-				<listitem>
-					<para>
-					Under the <guibutton>Modules</guibutton> option in the <interface>Sidebar</interface>,choose <menuchoice>
-					<guimenuitem>Biblical Texts</guimenuitem><guimenuitem>language choice</guimenuitem></menuchoice>.
-					Then right-click on a translation and choose the <guimenuitem>Open in dialog</guimenuitem>
-					option.
-					</para>
-				</listitem>
-			</itemizedlist>
-		</sect3>
-		
-		<sect3 id="xiphos-bible-about">
-			<title>Finding Out About The Current Translation</title>
-			<para>
-			To find out about the Bible translation currently being displayed:
-			</para>
-			<itemizedlist>
-				<listitem>
-					<para>
-					right-click in the <interface>Bible Text pane</interface>. In the popup menu choose
-					<guimenuitem>About </guimenuitem> module name.
-					</para>
-				</listitem>
-				<listitem>
-					<para>
-					Under the <guibutton>Modules</guibutton> option in the <interface>Sidebar</interface>,choose <menuchoice>
-					<guimenuitem>Biblical Texts</guimenuitem><guimenuitem>language choice</guimenuitem></menuchoice>.
-					Then right-click on a translation and choose the <guimenuitem>About</guimenuitem>
-					option.
-					</para>
-				</listitem>
-			</itemizedlist>
-		</sect3>
-		
-		<sect3 id="xiphos-bible-options">
-			<title>Module Options</title>
-			<para>
-			Most Bible translations have additional options which the user can select.
-			</para>
-			<itemizedlist>
-				<listitem>
-					<para>
-					Words Of Christ In Red
-					</para>
-				</listitem>
-				<listitem>
-					<para>
-					Strong's Numbers
-					</para>
-				</listitem>
-				<listitem>
-					<para>
-					Morphological Tags
-					</para>
-				</listitem>
-				<listitem>	
-					<para>
-					Footnotes
-					</para>
-				</listitem>
-				<listitem>	
-					<para>
-					Scripture Cross-Reference
-					</para>
-				</listitem>
-				<listitem>	
-					<para>
-					Headings
-					</para>
-				</listitem>
-				<listitem>	
-					<para>
-					Image Content
-					</para>
-				</listitem>
-			</itemizedlist>
-			<note>
-				<para>
-				Translations in other languages such as Greek or Hebrew have specific options which deal only with the specific language.
-				</para>
-			</note>
-			<para>
-				In order to access these options:
-			</para>
-			<itemizedlist>
-				<listitem>
-					<para>
-					right-click in the <interface>Bible Text pane</interface>. In the popup menu (example shown), choose
-					<guibutton>Module Options</guibutton> and select the specific option.
-					</para>
-				</listitem>
-			</itemizedlist>
-			<figure id="module_options">
-				<title>Module Options</title>
-		  		<screenshot> 
-	  <mediaobject> 
-	    <imageobject><imagedata fileref="figures/interface_biblepane-options.png" format="PNG"/> 
-	    </imageobject>
-	    <!-- EPS versions of the figures are not required at the moment. -->
-            <!-- 
-		    <imageobject>
-      		<imagedata fileref="figures/interface_biblepane-options.eps" format="EPS"/>
-    		    </imageobject>
-	    -->
-	    <textobject> 
-	      <phrase>Module Options</phrase> 
-	    </textobject> 
-	  </mediaobject> 
-	
-			      	</screenshot>
-		    	</figure>
-		</sect3>
-		
-		<sect3 id="xiphos-view-options">
-			<title>View Options</title>
-			<para>
-			There are several additional modes that can be selected from the menubar's <guimenuitem>View</guimenuitem> pulldown.
-			</para>
-			<figure id="view_options">
-				<title>View Options</title>
-		  		<screenshot> 
-	  <mediaobject> 
-	    <imageobject><imagedata fileref="figures/interface_menubar-view.png" format="PNG"/> 
-	    </imageobject>
-	    <!-- EPS versions of the figures are not required at the moment. -->
-            <!-- 
-		    <imageobject>
-      		<imagedata fileref="figures/interface_menubar-view.eps" format="EPS"/>
-    		    </imageobject>
-	    -->
-	    <textobject> 
-	      <phrase>View Options</phrase> 
-	    </textobject> 
-	  </mediaobject> 
-	
-			      	</screenshot>
-
-		    	</figure>
-			<para>
-			The first 4 checkboxes control whether each named subwindow is displayed.  The viewable state of the subwindows is remembered on a
-			per-tab basis.  This makes it possible, for example, to have a tab dedicated to a maps module alone (in a dictionary module, having
-			alphabetically-listed places), by turning off the display of Bible, Previewer, and Commentary for that tab.
-			</para>
-			<para>
-			The remaining checkboxes control these other display features:
-			</para>
-			<itemizedlist>
-				<listitem>	
-					<para>
-					Verse Style - Toggles between Bible text display in separate verses, or in paragraphs instead.
-					This is set on a per-module basis.
-					</para>
-				</listitem>
-				<listitem>	
-					<para>
-					Link Tabs - When more than one tab is open, each one's verse is navigated separately in the disabled
-					case.  If tab linking is enabled, then all tabs navigate together, keeping all translations on the
-					same verse.
-					</para>
-				</listitem>
-				<listitem>	
-					<para>
-					Read Aloud - If you enable this, then <application>Xiphos</application> will funnel all selected verses
-					through the <application>festival</application> text-to-speech system.  <application>Festival</application> is
-					a widely-available TTS, often installed by default in Linux distributions. Reading aloud is not currently
-					supported on Windows.
-					</para>
-					<para>
-					Also, mouse-selected text may be read aloud from Bibles, commentaries, and general books, using the
-					right-click menu, regardless of whether Read Aloud is selected.
-					</para>
-
-				</listitem>
-				<listitem>	
-					<para>
-					Show Verse Numbers - Normally enabled, this toggle can be disabled to prevent display of verse
-					numbers within the text.
-					</para>
-				</listitem>
-				<listitem>	
-					<para>
-					Highlight Current Verse - Initially disabled, this toggle replaces mere alternate colorization of
-					the current verse with a substitute high-contrast highlight.  The colors used may be selected from
-					the Preferences dialog.
-					</para>
-				</listitem>
-			</itemizedlist>
-		</sect3>
-		
-		<sect3 id="xiphos-user-annotation">
-			<title>User Annotation</title>
-			<para>
-			Many users wish to make personal annotations on individual verses, without the need to put a full "personal commentary" module
-			to use.  <application>Xiphos</application> provides this in the right-click context menu in the Bible pane.
-			This brings up a dialog showing the current verse reference and offering a text box into which to enter a brief personal note.
-			Once the user closes the dialog with "Mark," the verse will be displayed in reverse-highlight (default, blue on yellow) and a
-			marker <guibutton>*u</guibutton> will be inserted at the verse's beginning.  This is metaphorically similar for users who mark
-			verses in paper Bibles with a yellow highlighter and write personal notes in the margins.
-			</para>
-			<para>
-			Selecting an already-annotated verse will (in the usual case) bring up the existing content for re-editing.  An
-			already-annotated verse can be unmarked; the verse will cease to show in reverse-highlight.
-			</para>
-			<para>
-			If the user deletes the module name from the reference at the top of the dialog, then the annotation will apply to any Bible
-			module at the selected verse.  However, in this case, re-selecting the annotated verse will not initialize with the existing
-			content, because the dialog is created based on the specific module reference.
-			</para>
-		</sect3>
-		
-		<sect3 id="xiphos-geography-support">
-			<title>Geography Support</title>
-			<para>
-			A connection to browsing BibleMap.org is available by mouse-selecting a place name in any text.  Use the right-click context
-			menu to select <menuchoice><guimenuitem>Lookup Selection</guimenuitem><guimenuitem>Browse in
-			BibleMap.org</guimenuitem></menuchoice>.  A web browser will be brought up to show the selected name's geography via
-			BibleMap, which provides Biblical detail overlaid on a Google Maps interface.
-			</para>
-			<para>
-			</para>
-		</sect3>
-		
-		<sect3 id="xiphos-bible-dictionary">
-			<title>Specific Word Meanings</title>
-			<para>
-			In order to check the meaning of a specific word, double-click on the word you wish to lookup. The word should then highlight itself and the
-			explanation should be displayed, if available, in the <interface>Dictionary Pane</interface>. 
-			</para>
-		</sect3>
-		
-		<sect3 id="xiphos-bible-find">
-			<title>Finding A Specific Word</title>
-			<para>
-			To find a specific word within a passage:
-			</para>
-			<itemizedlist>
-				<listitem>
-					<para>
-					right-click in the <interface>Bible Text Pane</interface>. In the popup menu, choose <guibutton>Edit</guibutton>-&gt;
-					<guibutton>Find</guibutton>. A separate dialog will appear, which provides text searches. Fill out
-					dialog and click the <guibutton>Find</guibutton> and <guibutton>Find Next</guibutton> buttons.
-					</para>	
-				</listitem>
-			</itemizedlist>
-		</sect3>
-	</sect2>
-<!-- ============= Previewer	================ -->
-	<sect2 id="xiphos-viewer">
-		<title>Previewer</title>
-		<figure id="viewer_figure">
-			<title>PreViewer</title>
-	  		<screenshot> 
-	  <mediaobject> 
-	    <imageobject><imagedata fileref="figures/interface_viewer.png" format="PNG"/> 
-	    </imageobject>
-	    <!-- EPS versions of the figures are not required at the moment. -->
-            <!-- 
-		    <imageobject>
-      		<imagedata fileref="figures/interface_viewer.eps" format="EPS"/>
-    		    </imageobject>
-	    -->
-	    <textobject> 
-	      <phrase>Previewer</phrase> 
-	    </textobject> 
-	  </mediaobject> 
-	
-		      	</screenshot>
-		</figure>
-		<para>
-		The Previewer is where the user sees Strong's numbers, morphological tags, footnotes, and cross-references that the
-		<interface>Bible Text Pane</interface> provides.
-		</para>
-		<para>
-		Footnote content is displayed in the Previewer when you hover over the indicator <guibutton>*n</guibutton> in the Bible text;
-		it remains visible until your mouse moves over another indicator, Strong's number, etc. Sometimes you may want the text to
-		remain anchored until you can move the mouse to the previewer to click on a link or to read large footnotes. To anchor the text so
-		that you can scroll it in the Previewer, middle-click the indicator (or hold down the <guibutton>Shift key</guibutton>)
-		and move to the Previewer.
-		</para>
-		<para>
-		Cross-reference indicators <guibutton>*x</guibutton> work much the same way.  Clicking the
-		indicator will send the set of references to the <guibutton>Verse List</guibutton> in the
-		<interface>Sidebar</interface>, where you can click them individually for reading in the Previewer.
-		</para>
-		<para>
-		Any verses shown in reverse-highlight have personal annotation associated with them, and such verses will include
-		<guibutton>*u</guibutton> at the beginning of the verse.  Hovering on this marker will show the annotation in the previewer, just as
-		for publisher's footnotes.
-		</para>
-	</sect2>	
-<!-- ============= Commentary Pane  ============--> 
-	<sect2 id="xiphos-commentaries">
-   		<title>The Commentary Pane</title>
-		<figure id="commentary_figure">
-			<title>The Commentary Pane</title>
-	  		<screenshot> 
-	  <mediaobject> 
-	    <imageobject><imagedata fileref="figures/interface_commentarypane.png" format="PNG"/>
-	    </imageobject>
-	    <!-- EPS versions of the figures are not required at the moment. -->
-            <!-- 
-		    <imageobject>
-      		<imagedata fileref="figures/interface_commentarypane.eps" format="EPS"/>
-    		    </imageobject>
-	    -->
-	    <textobject> 
-	      <phrase>Commentary Pane</phrase> 
-	    </textobject> 
-	  </mediaobject> 
-	
-	      		</screenshot>
-    		</figure>
-		<para>
-		The <interface>Commentary pane</interface> is where the commentary modules are displayed. This provides easy
-		reading, reference, and access to different commentaries currently installed. The passage viewed by the 
-		<interface>Commentary pane</interface> is directly controlled by the current passage viewed in the <interface>Bible
-		Text pane</interface>, so in order to change to a different passage commentary, select the desired passage
-		on the <interface>Toolbar</interface>.
-		</para>
-		<para>
-		If there are images that are part of a commentary, general book, or dictionary/lexicon, they may be clicked to invoke a
-		viewer on that single image, in order to get a better view.  This is particularly useful if image resizing has been enabled
-		with the result that images are made very small in the subwindow.
-		</para>
-		<note>
-			<para>
-			By changing to passage settings on the <interface>Toolbar</interface>, the contents in the 
-			<interface>Bible Text pane</interface> and the <interface>Commentary Pane</interface> will be changed. 	
-			</para>
-		</note>
-		
-		<sect3 id="xiphos-commentary-about">
-			<title>Finding Out About The Commentary Module</title>
-			<para>
-			To find out about the commentary currently being displayed:
-			</para>
-			<itemizedlist>
-				<listitem>
-					<para>
-					right-click in the <interface>Commentary Pane</interface>. In the popup menu choose
-					<guimenuitem>About </guimenuitem> module name.
-					</para>
-				</listitem>
-			</itemizedlist>
-		</sect3>
-
-		<sect3 id="xiphos-commentary-headings">
-			<title>Commentary Headings.</title>
-			<para>
-			Many commentaries have additional headings which enable introductory information about the book and chapter currently
-			being displayed in the <interface>Bible Text pane</interface>. In order to view them:
-			</para>
-			<itemizedlist>
-				<listitem>
-					<para>
-					right-click in the <interface>Commentary Pane</interface>. In the popup menu choose
-					<guimenuitem>Display Book Heading</guimenuitem> or <guimenuitem>Display Chapter Heading</guimenuitem>.
-					</para>
-				</listitem>
-			</itemizedlist>
-		</sect3>
-	</sect2>
-
-	<sect2 id="xiphos-dictionary">
-		<title>Dictionary Pane</title>
-		<figure id="dict_figure">
-			<title>The Dictionary Pane</title>
-	  		<screenshot> 
-	  <mediaobject> 
-	    <imageobject><imagedata fileref="figures/interface_dictionary.png" format="PNG"/> 
-	    </imageobject>
-	    <!-- EPS versions of the figures are not required at the moment. -->
-            <!-- 
-		    <imageobject>
-      		<imagedata fileref="figures/image.eps" format="EPS"/>
-    		    </imageobject>
-	    -->
-	    <textobject> 
-	      <phrase>The Dictionary Pane</phrase> 
-	    </textobject> 
-	  </mediaobject> 
-	
-	      		</screenshot>
-    		</figure>
-
-		<para>
-		The Dictionary Pane's content is driven by its up/down selectors, typing in its navbar text, or double-clicks in the Bible, Commentary, or Book Panes.
-		</para>
-	</sect2>
-
-	<sect2 id="xiphos-shortcut">
-		<title>Keyboard Shortcuts</title>
-		<para>
-		Several keyboard shortcuts exist in <application>Xiphos</application>:
-		</para>
-		<itemizedlist>
-		       <listitem>
-				<para>
-					<guibutton>F1</guibutton>: opens this manual.
-				</para>
-			</listitem>
-			<listitem>
-				<para>
-					<guibutton>F2</guibutton>: opens the <guibutton>Preferences</guibutton> dialog.
-				</para>
-			</listitem>
-			<listitem>
-				<para>
-					<guibutton>F3</guibutton>: opens <guibutton>Advanced Search</guibutton>.
-				</para>
-			</listitem>
-			<listitem>
-				<para>
-					<guibutton>F4</guibutton>: opens the <guibutton>Module Manager</guibutton>.
-				</para>
-			</listitem>
-			<listitem>
-				<para>
-					<guibutton>Ctrl-L</guibutton> focuses and selects the main verse navbar text.  You can then immediately type
-					in new verse selection text.  Be aware that, as is the case with most Sword applications,
-					<application>Xiphos</application> understands many abbreviations: "G" is adequate to specify Genesis,
-					for example, and any book name by itself implies 1:1.
-				</para>
-			</listitem>
-			<listitem>
-				<para>
-					<guibutton>Ctrl-F</guibutton> opens the "Find" dialog.  The subwindow to which it applies depends on which
-					of them are visible: The Bible is first preference, then the commentary or general book, then the
-					dictionary.  So a tab can be dedicated to just a genbook, and Ctrl-F will perform "Find" within that pane.
-				</para>
-			</listitem>
-			<listitem>
-				<para>
-					<guibutton>Alt-C</guibutton> brings the Commentary View forward when previously obscured by the Book View.
-				</para>
-			</listitem>
-			<listitem>
-				<para>
-					<guibutton>Alt-G</guibutton> is the opposite of Alt-C, focusing on the general book.
-				</para>
-			</listitem>
-			<listitem>
-				<para>
-					<guibutton>Alt-B</guibutton> opens a bookmark dialog on the current verse.
-				</para>
-			</listitem>
-			<listitem>
-				<para>
-					<guibutton>Alt-D</guibutton> focuses on the dictionary navbar text.
-				</para>
-			</listitem>
-			<listitem>
-				<para>
-					<guibutton>Alt-P</guibutton> detaches/re-attaches the parallel view dialog.
-				</para>
-			</listitem>
-			<listitem>
-				<para>
-					<guibutton>Alt-Z</guibutton> opens the personal commentary editor.
-				</para>
-			</listitem>
-			<listitem>
-				<para>
-					<guibutton>Ctrl-Plus/Ctrl-Minus</guibutton> increases/decreases the base font size.
-				</para>
-			</listitem>
-			<listitem>
-				<para>
-				Location bar navigation:
-				<itemizedlist>
-					<listitem>
-						<para><guibutton>Ctrl-p/Ctrl-n</guibutton>: Verse
-					previous/next.</para>
-					</listitem>
-					<listitem>
-						<para><guibutton>p/n</guibutton>: Chapter
-					previous/next.</para>
-					</listitem>
-					<listitem>
-						<para><guibutton>P/N</guibutton>: Book
-					previous/next.</para>
-					</listitem>
-				</itemizedlist>
-				</para>
-			</listitem>
-		</itemizedlist>
-	</sect2>
-
-	<sect2 id="xiphos-differences">
-		<title>Version Differences in <application>Xiphos</application>'s Display</title>
-		<para>
-		The <application>Xiphos</application> interface has evolved over time, and there are two display libraries with which
-		<application>Xiphos</application> can be built.  The older, less featureful version is called "gtkhtml3", and the newer,
-		more capable version is called "MozEmbed".  Both of these display libraries render text in a browser-like fashion, using HTML
-		constructs to control display.
-		</para>
-
-		<para>
-		Several desirable capabilities are unsupportable in gtkhtml3, and although recent <application>Xiphos</application> is
-		written to take advantage of MozEmbed features, it is possible that the version running on your computer needed to be
-		built with gtkhtml3 instead, either because the version of MozEmbed available for your system is not recent enough to
-		support the needs of <application>Xiphos</application>, or it simply doesn't exist for your system.  (Mozembed is not
-		supported under Windows at this time.)  The following differences will be apparent, depending on whether gtkhtml3 or 
-		MozEmbed is the underlying display engine:
-		</para>
-
-		<itemizedlist>
-			<listitem>
-				<para>
-				Morphology and Strong's references, enabled via the right-click menu in some modules, are displayed inline
-				with gtkhtml3; with MozEmbed, a blocked display is used, where these references are aligned beneath the word
-				to which they refer, for a much more readable, less cluttered display.
-				</para>
-			</listitem>
-			<listitem>
-				<para>
-				Footnote and cross-reference markers (<guibutton>*n</guibutton>, <guibutton>*x</guibutton>) are displayed as
-				proper superscripts in MozEmbed, but not in gtkhtml3.
-				</para>
-			</listitem>
-			<listitem>
-				<para>
-				Links in gtkhtml3 are necessarily both colored and underlined; in MozEmbed, no underlines are needed.
-				</para>
-			</listitem>
-			<listitem>
-				<para>
-				Under MozEmbed, double-space display is available using the <guimenuitem>View</guimenuitem> menu, but not
-				under gtkhtml3.
-				</para>
-			</listitem>
-			<listitem>
-				<para>
-				It is not possible for gtkhtml3 to interpret multiple font face directives in a single window, so the
-				gtkhtml3 detached parallel view window cannot provide per-module font selections.  Also, modules' internal
-				font requests are ignored in any gtkhtml3 window.
-				</para>	
-			</listitem>
-		</itemizedlist>
-
-		<para>
-		Using the "About Xiphos" selection under the <guimenuitem>Help</guimenuitem> menu, you will see the display library with
-		which <application>Xiphos</application> was built.
-		</para>
-		<figure id="displib_figure">
-		  <title>Comparison, gtkhtml3 -vs- mozembed</title>
-		  <screenshot> 
-		    <mediaobject> 
-		      <imageobject>
-			<imagedata fileref="figures/gtkhtml3-vs-mozembed.png" format="PNG"/> 
-		      </imageobject>
-		      <textobject> 
-			<phrase>Comparison, gtkhtml3 -vs- mozembed</phrase> 
-		      </textobject> 
-		   </mediaobject> 
-		  </screenshot>
-		</figure>
-	</sect2>
-
-  </sect1>
-
-  <!-- Preferences -->
-  <sect1 id="preferences">
-    <title>Preferences</title>
-    <!-- Preferences -->
-
-
-<!-- Introduction -->
-	<sect2 id="preferences-introduction">
-  		<title>Introduction To Preferences</title>
-		<figure>
-			<title>The Preference Dialog</title>
-	        	<screenshot> 
-	  <mediaobject> 
-	    <imageobject><imagedata fileref="figures/preferences.png" format="PNG"/> 
-	    </imageobject>
-	    <!-- EPS versions of the figures are not required at the moment. -->
-            <!-- 
-		    <imageobject>
-      		<imagedata fileref="figures/preferences.eps" format="EPS"/>
-    		    </imageobject>
-	    -->
-	    <textobject> 
-	      <phrase>The Preferences Dialog</phrase> 
-	    </textobject> 
-	  </mediaobject> 
-                        </screenshot>
-                </figure>
-               </sect2>
-	
-<!-- Fonts And Colors -->
-	<sect2 id="fonts-and-colors">
-		<title>Fonts And Colors</title>
-		<sect3 id="font-color">
-			<title>Setting Font Colors</title>
-			<figure>
-			<title>Font Colour Settings</title>
-	        	<screenshot> 
-	  <mediaobject> 
-	    <imageobject><imagedata fileref="figures/preferences_fonts-color.png" format="PNG"/>
-	    </imageobject>
-	    <!-- EPS versions of the figures are not required at the moment. -->
-            <!-- 
-		    <imageobject>
-      		<imagedata fileref="figures/image.eps" format="EPS"/>
-    		    </imageobject>
-	    -->
-	    <textobject> 
-	      <phrase>Font Colour Settings</phrase> 
-	    </textobject> 
-	  </mediaobject> 
-                        </screenshot>
-
-                </figure>
-                </sect3>
-		
-		<sect3 id="font-misc">
-			<title>Miscellaneous Font Settings</title>
-			<figure>
-			<title>Miscellaneous Font Settings</title>
-	        	<screenshot> 
-	  <mediaobject> 
-	    <imageobject><imagedata fileref="figures/preferences_fonts-misc.png" format="PNG"/> 
-	    </imageobject>
-	    <!-- EPS versions of the figures are not required at the moment. -->
-            <!-- 
-		    <imageobject>
-      		<imagedata fileref="figures/preferences_fonts-misc.eps" format="EPS"/>
-    		    </imageobject>
-	    -->
-	    <textobject> 
-	      <phrase>Miscellaneous Font Settings</phrase> 
-	    </textobject> 
-	  </mediaobject> 
-	
-                        </screenshot>
-                </figure>
-
-		<para>
-		In individual modules' display, the right-click menu's <guimenuitem>Module Options</guimenuitem> selector provides font name
-		and size selection.
-		</para>
-
-		<para>
-		The base font size is the size initially chosen for all modules displayed by <application>Xiphos</application>.  The
-		verse number and individual modules' font size choices are relative to the base font size.
-		</para>
-		</sect3>
-	</sect2>
-	
-<!-- General Settings -->
-	<sect2 id="general-settings">
-		<title>General Settings</title>
-		<sect3 id="tab-pane1">
-			<title>Tabs and Pane Settings</title>
-		<figure>
-			<title>Tab and Pane Settings</title>
-	        	<screenshot> 
-	  <mediaobject> 
-	    <imageobject><imagedata fileref="figures/preferences_general-tabs.png" format="PNG"/> 
-	    </imageobject>
-	    <!-- EPS versions of the figures are not required at the moment. -->
-            <!-- 
-		    <imageobject>
-      		<imagedata fileref="figures/preferences_general-tabs.eps" format="EPS"/>
-    		    </imageobject>
-	    -->
-	    <textobject> 
-	      <phrase>Tab and Pane Settings</phrase> 
-	    </textobject> 
-	  </mediaobject> 
-	
-                        </screenshot>
-
-                </figure>
-                </sect3>
-		<sect3 id="tab-pane2">
-			<title>General Preferences and StudyPad directory</title>
-		<figure>
-			<title>General Preferences and StudyPad directory</title>
-	        	<screenshot> 
-	  <mediaobject> 
-	    <imageobject><imagedata fileref="figures/preferences_general-misc.png" format="PNG"/>
-	    </imageobject>
-	    <!-- EPS versions of the figures are not required at the moment. -->
-            <!-- 
-		    <imageobject>
-      		<imagedata fileref="figures/preferences_general-misc.eps" format="EPS"/>
-    		    </imageobject>
-	    -->
-	    <textobject> 
-	      <phrase>General Preferences and StudyPad directory</phrase> 
-	    </textobject> 
-	  </mediaobject> 
-	
-                        </screenshot>
-
-                </figure>
-		<para>
-		Certain dictionary-style modules are <guilabel>Daily Devotionals</guilabel> whose keys are numerically in the form "Month.Day".  If you have
-		such a module installed and it has been selected as your preferred devotional, then you can ask that <application>Xiphos</application>
-		display today's selection during startup.
-		</para>
-		<para>
-		<guilabel>Verse style</guilabel> indicates that each verse should begin on a separate line, or (when disabled) that verses
-		should be allowed to group in paragraphs, according to the Bible module's internal markup.  Not all Bible modules have such
-		markup.
-		</para>
-		<para>
-		With <guilabel>Scroll to Previous/Next Chapter</guilabel> enabled, using the mouse to scroll to the beginning or end of a
-		chapter will cause <application>Xiphos</application> to move automatically to the appropriate chapter.
-		</para>
-		<para>
-		If you enable <guilabel>Resize images</guilabel>, <application>Xiphos</application> will automatically resize image
-		content in commentaries, general books, and dictionaries so as to fit the subwindow which contains them.
-		</para>
-		<para>
-		<guilabel>Highlight current verse</guilabel>, if enabled, will cause <application>Xiphos</application> to substitute
-		mere current verse colorization with a high-contrast alternate color scheme on the current verse.  The colors used may be
-		chosen from the color selector pane (see above).
-		</para>
-                </sect3>
-	</sect2>
-	
-<!-- Module Settings -->
-	<sect2 id="module-settings">
-		<title>Module Settings</title>
-		<sect3 id="main-modules">
-			<title>Main Module Settings</title>
-		<figure>
-			<title>The Module Preferences Dialog</title>
-	        	<screenshot> 
-	  <mediaobject> 
-	    <imageobject><imagedata fileref="figures/preferences_modules-main.png" format="PNG"/>
-	    </imageobject>
-	    <!-- EPS versions of the figures are not required at the moment. -->
-            <!-- 
-		    <imageobject>
-      		<imagedata fileref="figures/preferences_modules-main.eps" format="EPS"/>
-    		    </imageobject>
-	    -->
-	    <textobject> 
-	      <phrase>The Module Preferences Dialog</phrase> 
-	    </textobject> 
-	  </mediaobject>
-                        </screenshot>
-
-                </figure>
-		<figure>
-			<title>Parallel Preferences</title>
-	        	<screenshot> 
-	  <mediaobject> 
-	    <imageobject><imagedata fileref="figures/preferences_modules-parallel.png" format="PNG"/> 
-	    </imageobject>
-	    <!-- EPS versions of the figures are not required at the moment. -->
-            <!-- 
-		    <imageobject>
-      		<imagedata fileref="figures/preferences_modules-parallel.eps" format="EPS"/>
-    		    </imageobject>
-	    -->
-	    <textobject> 
-	      <phrase>Parallel Preferences</phrase> 
-	    </textobject> 
-	  </mediaobject> 
-                        </screenshot>
-
-                </figure>
-                <figure>
-			<title>Various preferences Modules </title>
-	        	<screenshot> 
-	  <mediaobject> 
-	    <imageobject><imagedata fileref="figures/preferences_modules-misc.png" format="PNG"/> 
-	    </imageobject>
-	    <!-- EPS versions of the figures are not required at the moment. -->
-            <!-- 
-		    <imageobject>
-      		<imagedata fileref="figures/preferences_modules-misc.eps" format="EPS"/>
-    		    </imageobject>
-	    -->
-	    <textobject> 
-	      <phrase>Various Preferences Modules</phrase> 
-	    </textobject> 
-	  </mediaobject> 
-	
-                        </screenshot>
-
-                </figure>
-          	</sect3>
-	</sect2>
-
-
-  </sect1>
-
-  <!-- Modules -->
-  <sect1 id="module-manager">
-    <title>Module Manager</title>
-    <!-- Modules -->
-
-<!-- Introduction To Module Manager -->
-	<sect2 id="module-introduction">
-  		<title>Introduction To The Module Manager</title>
-		<para>
-		The "module" is the unit of content in <application>Xiphos</application>, and Sword generally; a Sword module is a
-		resource available for viewing in Sword applications.  There are several varieties: Most importantly, Bible texts, as well
-		as dictionaries and lexicons, commentaries, and general books, any of which may include image content (e.g. atlases).
-		They are installed either from a local directory structure (typically on removable media, such as a CDROM distribution)
-		or remotely via ftp from a repository such as Crosswire, which is the home of Sword, and from which all officially
-		Sword-sanctioned modules are available.  Also, many other modules are available from non-Crosswire repositories.
-		</para>
-		<para>
-		If you have other Sword applications installed, they will all share the same set of Sword modules that you install through
-		the Module Manager.
-		</para>
-		<figure>
-			<title>The Module Manager Dialog</title>
-	        	<screenshot> 
-	  <mediaobject> 
-	    <imageobject><imagedata fileref="figures/module.png" format="PNG"/> 
-	    </imageobject>
-	    <!-- EPS versions of the figures are not required at the moment. -->
-            <!-- 
-		    <imageobject>
-      		<imagedata fileref="figures/module.eps" format="EPS"/>
-    		    </imageobject>
-	    -->
-	    <textobject> 
-	      <phrase>The Module Manager Dialog</phrase> 
-	    </textobject> 
-	  </mediaobject> 
-                        </screenshot>
-		</figure>
-	</sect2>
-	
-<!-- Sword Configure-->
-	<sect2 id="sword-config">
-	<title>Sword Module Configurations</title>
-		<sect3 id="sword-sources">
-			<title>Sword Sources Settings</title>
-			<figure>
-				<title>Sword Sources Settings</title>
-	        	<screenshot> 
-	  <mediaobject> 
-	    <imageobject><imagedata fileref="figures/sword_sources.png" format="PNG"/>
-	    </imageobject>
-	    <!-- EPS versions of the figures are not required at the moment. -->
-            <!-- 
-		    <imageobject>
-      		<imagedata fileref="figures/sword_sources.eps" format="EPS"/>
-    		    </imageobject>
-	    -->
-	    <textobject> 
-	      <phrase>Module Installation</phrase> 
-	    </textobject> 
-	  </mediaobject> 
-                        	</screenshot>
-
-			</figure>
-		<para>
-		There are other repositories available besides Crosswire's own, though the modules available from other repositories do not
-		represent content officially sanctioned by Crosswire.  On the web, see this page for list of those repositories known:
-		<ulink type="http" url="http://www.crosswire.org/wiki/Module_Repositories">http://www.crosswire.org/wiki/Module_Repositories</ulink>		
-		</para>
-		</sect3>
-		<sect3 id="installation">
-			<title>Sword Module Installations</title>
-			<figure>
-				<title>Sword Module Installations</title>
-	        	<screenshot> 
-	  <mediaobject> 
-	    <imageobject><imagedata fileref="figures/sword_config.png" format="PNG"/> 
-	    </imageobject>
-	    <!-- EPS versions of the figures are not required at the moment. -->
-            <!-- 
-		    <imageobject>
-      		<imagedata fileref="figures/sword_config.eps" format="EPS"/>
-    		    </imageobject>
-	    -->
-	    <textobject> 
-	      <phrase>Module Installation</phrase> 
-	    </textobject> 
-	  </mediaobject> 
-                        </screenshot>
-			</figure>
-			<para>
-			After you have selected your Install Source, click the <guimenuitem>Refresh</guimenuitem> button to cause
-			<application>Xiphos</application> to find the module summary available from that source before moving on.
-			</para>
-
-			<para>
-			Take note of the "Install Destination". In most cases, you will have a choice of a personal area or a system area. 
-			The details vary according to your operating system.
-			</para>
-			
-			<sect4 id="destination-linux">
-				<title>Linux</title>
-				<para>
-    				Unless you run as root (via su or sudo) you will only be able to install in your personal area, under ~/.sword.
-				If you run as root, or change permissions on the shared directory, you will also be able to install modules for
-				all users, typically in /usr/share/sword. There have been some requests for Xiphos to provide a means by which
-				an ordinary (non-root) user could start the program, gain temporary write access to the system area while installing
-				modules, and then revoke that access after installation is complete.  Attempting to devise a scheme to do this has
-				proven quite difficult, given the different superuser management schemes employed by various Linux distributions. 
-				Therefore, at this time there are no ongoing plans to try to solve this problem, and users are advised to enable 
-				write access to the system area outside Xiphos.
-				</para>
-			</sect4>
-			
-			<sect4 id="destination-xp">
-				<title>Windows XP</title>
-				<para>
-				You may install modules to a shared folder so the modules are available to all users. If you have previously used
-				"The Sword Project for Windows", this folder will be "C:\Program Files\Crosswire\The Sword Project\Sword". Otherwise
-				it will be "C:\Documents and Settings\All Users\Application Data\Sword". You may also install modules to a location
-				that can only be seen by you. This location is "C:\Documents and Settings\YOUR NAME\Application Data\Sword".
-				</para>
-			</sect4>
-			
-			<sect4 id="destination-vista">
-				<title>Windows Vista</title>
-				<para>
-				Vista works much the same as XP, except for the locations. The private location is 
-				"C:\Users\YOUR NAME\AppData\Roaming\Sword". The shared location is "C:\ProgramData\Sword".
-				</para>
-			</sect4>
-			
-		</sect3>
-	</sect2>
-	
-<!-- Installing, Updating, and Maintaining Modules -->
-	<sect2 id="module-management">
-		<title>Installing, Updating, and Maintaining Modules</title>
-		<sect3 id="add-module">
-			<title>Installing, Updating, and Maintaining Modules</title>
-			<figure>
-				<title>Installing and Updating Modules</title>
-	       		<screenshot> 
-	  <mediaobject> 
-	    <imageobject><imagedata fileref="figures/sword_install.png" format="PNG"/> 
-	    </imageobject>
-	    <!-- EPS versions of the figures are not required at the moment. -->
-            <!-- 
-		    <imageobject>
-      		<imagedata fileref="figures/image.eps" format="EPS"/>
-    		    </imageobject>
-	    -->
-	    <textobject> 
-	      <phrase>Module Installation</phrase> 
-	    </textobject> 
-	  </mediaobject> 
-	
-                        </screenshot>
-			</figure>
-		<para>
-		The module manager generates both a per-type module list as well as a parallel availability list.  The latter is
-		intended to make it easier to find new items without having to work one's way through the per-type list, one subtree at a
-		time.  Modules which are either not yet installed or updated beyond what is currently installed will appear in both lists.
-		</para>
-		<para>
-		Modules that are already installed will show a checkmark beside them.  If a fast search ("lucene") index is available, a magnifying glass will be
-		displayed, otherwise an "X" will be shown; creation of the index is available on the Maintenance pane.  Locked modules, which require that you
-		purchase an unlock key from the module's copyright holder, will show a lock symbol.  If there are modules installed for which a more recent
-		version is available, a refresh icon will appear between the differing old and new version stamps.  There may be an approximate size displayed,
-		if the repository management provides this information, otherwise a question mark ("-?-") will be shown.
-		</para>
-		<para>
-		Select new modules to be installed by clicking the checkboxes and then the Install button at the bottom.  Any number of
-		modules may be requested for installation at one time.
-		</para>
-		<para>
-		If you acquire a locked module and have obtained the cipher key for it, the module is then unlocked in the main window: Open
-		the module, which will probably appear blank, then using the right-click context menu, choose "Unlock This Module."
-		</para>
-		</sect3>
-		<sect3 id="remove-module">
-			<title>Module Maintenance</title>
-			<figure>
-				<title>Module Maintenance</title>
-	       		<screenshot> 
-	  <mediaobject> 
-	    <imageobject><imagedata fileref="figures/sword_remove.png" format="PNG"/> 
-	    </imageobject>
-	    <!-- EPS versions of the figures are not required at the moment. -->
-            <!-- 
-		    <imageobject>
-      		<imagedata fileref="figures/sword_remove.eps" format="EPS"/>
-    		    </imageobject>
-	    -->
-	    <textobject> 
-	      <phrase>Module Maintenance</phrase> 
-	    </textobject> 
-	  </mediaobject> 
-                        	</screenshot>
-			</figure>
-		<para>
-		Several maintenance functions are available: Removal, archival, index, and index deletion.
-		</para>
-		<para>
-		Removal disposes of a module entirely.  There is no recovery of the module unless you have previously archived a copy of it.
-		</para>
-		<para>
-		Archival is available for any module, although it is provided with personal commentaries specifically in mind.  A *.zip of
-		the module is left in the directory ~/.sword/zip.  Archival prior to removal of personal commentaries is recommended, in
-		order to be available for future re-install if the subject matter of the personal commentary becomes important again.
-		</para>
-		<para>
-		Indexing is provided so that the underlying Sword search support can create the index needed for the "lucene" multi-word
-		fast-search functions.  If the index is not created, multi-word search will still be available, but it will be much slower.
-		With the index in place, searches through an entire Bible can take just a few seconds.
-		</para>
-		<para>
-		Indexes may be deleted as well.
-		</para>
-		</sect3>
-	</sect2>
-
-<!-- Installing Non-Standard Modules -->
-	<sect2 id="non-standard-modules">
-		<title>Installing Non-Standard Modules</title>
-		<para>
-		Some resource modules in Sword Project format are available from sources other than Crosswire and not from a module manager-ready repository.
-		Necessarily, installing such a module is a manual task.
-		</para>
-		<para>
-		Modules are normally packaged as *.zip files; they contain a configuration file plus a number of data files.  Installation
-		of such a module is done by cd'ing to your personal Sword (not <application>Xiphos</application>) configuration
-		directory, ~/.sword, and unzipping the file there.  The configuration file will be left in "mods.d", and the module's data
-		files will go into a subdirectory of "modules".  Alternatively, if you have write access to the system Sword directory,
-		typically /usr/share/sword, you may cd there instead before unzipping.
-		</para>
-		<para>
-		Restart <application>Xiphos</application> after installing such a module, so that a fresh instance of the program can
-		notice the new module in place.
-		</para>
-	</sect2>
-
-  </sect1>
-
-  <!-- Searching -->
-  <sect1 id="search">
-    <title>The Search Function</title>
-    <!-- ============= Search  ============--> 
-
-	<sect2 id="xiphos-searchpane">
-		<title>Simple Searches</title>
-		<para>
-		To conduct a quick search within the current Bible or commentary module, the Search Bar in the Sidebar should usually be adequate. Click either
-		in the menu bar <guimenuitem>Edit-&gt;Search</guimenuitem> or in the Sidebar <guimenuitem>Modules-&gt;Search</guimenuitem> to access it.
-		</para> 
-	
-		<figure>
-		<title>The Search Bar</title>
-                       <screenshot> 
-	  <mediaobject> 
-	    <imageobject><imagedata fileref="figures/interface_searchpane.png" format="PNG"/> 
-	    </imageobject>
-	    <!-- EPS versions of the figures are not required at the moment. -->
-            <!-- 
-		    <imageobject>
-      		<imagedata fileref="figures/interface_searchpane.eps" format="EPS"/>
-    		    </imageobject>
-	    -->
-	    <textobject> 
-	      <phrase>The Search Bar</phrase> 
-	    </textobject> 
-	  </mediaobject> 
-	
-                       </screenshot>
-
-                </figure>
-              <para>
-		The <interface>Search Dialog</interface> consists of the following parts:
-		</para>
-			<itemizedlist>
-				<listitem>
-					<para>
-					Search Key Entry box
-					</para>
-				</listitem>
-				<listitem>
-					<para>
-					Search Module Selector
-					</para>
-				</listitem>
-				<listitem>
-					<para>
-					Search Type Selector
-					</para>
-				</listitem>
-				<listitem>
-					<para>
-					Search Options Checkbox
-					</para>
-				</listitem>
-				<listitem>
-					<para>
-					Search Scope Selector
-					</para>
-				</listitem>
-				<listitem>
-					<para>
-					Search Results View
-					</para>
-				</listitem>
-			</itemizedlist>			
-		<sect3 id="xiphos-search-key">
-			<title>Search Key Entry Box</title>
-			<para>Allows entry of the key for which you would like to search. The 
-			search key can be a word, part of a word, several words, a phrase, or 
-			a regular expression depending on the type of search selected. When 
-			the search key is entered and all other selections in the search dialog 
-			are complete, click the <guibutton>Find</guibutton> button to begin 
-			the search.
-			</para>
-			<para>
-			This search uses the optimized search method (see next section) if
-			the module has previously been indexed, and will use AND semantics by default 
-			(verses must contain all words you entered).
-			</para>
-			</sect3>
-		
-		<sect3 id="xiphos-search-modselect">
-			<title>Search Module Selector</title>
-			<para>Allows selection of which modules	you would like to search. 
-			Select <guibutton>Bible</guibutton> to search Bible versions or 
-			<guibutton>Commentary</guibutton> to search commentaries. Only 
-			the currently active module will be searched.</para>
-		</sect3>
-		
-		<sect3 id="xiphos-search-typeselect">
-		<title>Search Type Selector</title>
-		<para>Allows selection of the type of search. There are three search
-		types available:
-		</para>
-			<variablelist>
-				<varlistentry>
-					<term><guibutton>Multi word</guibutton></term> 
-					<listitem><para>This type will match any verse that has 
-					all the words in the search key, regardless of where 
-					they appear in the verse.</para></listitem>
-				</varlistentry>
-				<varlistentry>
-					<term><guibutton>Regular expression</guibutton></term> 
-					<listitem><para>This search uses a regular expression
-					as a search key. A regular expression is a pattern used 
-					to match a string of text. A regular expression can be 
-					used to find verses with words that match a particular 
-					pattern. For example the regular expression
-					<userinput>\ A[a-z]*iah </userinput> will match verses that contain
-					the words Aiah, Ahaziah, Athaliah and Amariah.</para>
-					<para>A complete discussion of regular expressions is 
-					beyond the scope of this manual, but more information 
-					can be found in the grep man page.</para></listitem>
-				</varlistentry>
-				<varlistentry>
-					<term><guibutton>Exact phrase</guibutton></term> 
-					<listitem><para>This type will match the search key
-					exatly as entered. If the search key is <userinput>
-					it is good</userinput>, this search would match a verse
-					which contains "<emphasis>it is good</emphasis>," but 
-					would not match a verse	which contains "<emphasis>
-					good</emphasis>, and doeth <emphasis>it</emphasis> not, 
-					to him it <emphasis>is</emphasis> sin."</para></listitem>
-				</varlistentry>
-			</variablelist>
- 		</sect3>
-
-		<sect3 id="xiphos-search-options">
-			<title>Search Options Checkbox</title>
-			<para>Allows selecting of search options. The only available option 
-			is <guibutton>Match case</guibutton>. Check this box to make the 
-			search case sensitive.</para>
-		</sect3>
-		
-		<sect3 id="xiphos-search-scopeselect">
-			<title>Search Scope Selector</title>
-			<para>Allows defining the range within the specificed module that will
-			be searched. There are three search scopes available:</para>
-			<variablelist>
-				<varlistentry>
-					<term><guibutton>No scope</guibutton></term>
-					<listitem><para>This button causes the search to
-					to include the entire module.</para>
-					</listitem>
-				</varlistentry>
-				<varlistentry>
-					<term><guibutton>Use bounds</guibutton></term>
-					<listitem><para>Selecting this button produces two dropdown
-					selector boxes marked <guilabel>Lower</guilabel> and
-					<guilabel>Upper</guilabel>. Select the first book
-					to search in the <guilabel>Lower</guilabel> box and
-					the last book to search in the <guilabel>Upper</guilabel>
-					box. The search will begin with the <guilabel>Lower
-					</guilabel> book and end with the <guilabel>Upper
-					</guilabel> book and include all books in between.
-					</para>
-					<para>Chapter and verse numbers can be entered into
-					the search bound boxes as well to further narrow the
-					search. </para>
-					</listitem>
-				</varlistentry>
-				<varlistentry>
-					<term><guibutton>Last search</guibutton></term>
-					<listitem><para>Select this button to do a new 
-					search including only the verses returned as a 
-					result of the last search. Use this with a new 
-					search key to narrow the search further.</para>
-					</listitem>
-				</varlistentry>
-			</variablelist> 
-		</sect3>
-		<sect3 id="xiphos-search-results">
-			<title>Search Results View</title>
-			<para>This shows a list of the current search results for previewing, navigation, or saving.</para>
-			<variablelist>
-				<varlistentry>
-					<term>Preview</term>
-					<listitem><para>To preview the search result, simply click on an individual result.
-					The entry will show in the preview pane.
-					</para>
-					</listitem>
-				</varlistentry>
-				<varlistentry>
-					<term>Navigation</term>
-					<listitem><para>Navigation to the search result can be done in two ways. To open the result
-					in a new tab, middle-click the mouse. To open the result in the current tab, double-click the result.
-					</para>
-					</listitem>
-				</varlistentry>
-				<varlistentry>
-					<term>Save Results</term>
-					<listitem><para>You may save your results as a list of bookmarks. To do this, right-click and select
-					<guilabel>Save List</guilabel>. You will be prompted to enter a name for the folder that your results
-					will be saved to. After you have saved the results, you may view them by going to your bookmarks and
-					finding the folder you just named.
-					</para>
-					</listitem>
-				</varlistentry>
-			</variablelist>
-	</sect3>
-	</sect2>
-	<sect2 id="xiphos-advanced-search">
-	   <title>Advanced Searches</title> 
-	   <para>
-		More complicated searches might require the use of the advanced search functions, found under <guimenuitem>Edit-&gt;Advanced
-		Search</guimenuitem>.
-	   </para>
-	 
-	  <figure>
-	  <title>The Advanced Search Dialogue</title>
-	  <screenshot> 
-	  <mediaobject> 
-	    <imageobject><imagedata fileref="figures/search_search.png" format="PNG"/> 
-	    </imageobject>
-	    <!-- EPS versions of the figures are not required at the moment. -->
-            <!-- 
-		    <imageobject>
-      		<imagedata fileref="figures/search_search.eps" format="EPS"/>
-    		    </imageobject>
-	    -->
-	    <textobject> 
-	      <phrase>The Advanced Search  Dialog</phrase> 
-	    </textobject> 
-	  </mediaobject> 
-	
-          </screenshot>	
-
-          </figure>
-           
-	   <para>
-		In <guimenuitem>Advanced Search</guimenuitem>, much more complex queries can be constructed, involving custom search ranges,
-		custom lists of modules over which to search, regular expression matching (see next section), and attribute-based searches
-		such as are found in footnotes or Strong's Hebrew and Greek dictionary references.
-	   </para>
-
-	   <para>
-		The default search is multi-word, a somewhat slow and blunt search through module text.  Also available is an optimized
-		search based on the Lucene indexing and search library. In order to use the optimized search, the index must be constructed
-		beforehand: Please see the preceding section on the Module Manager regarding the Maintenance functions, including indexing. A
-		web search will provide several references to the syntax needed to put to use the power of optimized Lucene search. A few
-		examples follow:
-	   </para>
-	   
-	   <para>
-		Simple Searches: just type in the words you want to search for. To return only verses that include all of the words,
-		prefix the word with "+". So, in the KJV, you could find Psalm 23 by searching for "+Lord +shepherd +want". To search for
-		an entire phrase, surround the entire phrase with quotes, like "maketh me to lie down" (note that quotes are unnecessary
-		in all of the other examples).
-	   </para>
-	   
-	   <para>
-		Single Letter Wildcard: to search for "veil" or "vail", use this syntax "v?il". The "?" represents a single character
-		that could be anything. A more complex example returns both spellings for Isaiah used in the KJV. "?saia?" will return
-		results for "Isaiah" and "Esaias".
-	   </para>
-
-	   <para>
-		Multiple Letter Wildcard: to search for "prophet" or "prophesy" or "prophecy" or "prophesied", use this syntax "prophe*".
-	   </para>
-
-	  <para>
-		AND syntax: in the advanced search to return results for all of the search terms, you must put "AND" in between the terms.
-		To continue our example, if we wish to search for any occurrence of Isaiah or Esaias that also mention either prophet, or
-		prophecy, or prophesy, we can do a search like this: "?saia? AND prophe*". 
-	  </para>
-
-	   <para>
-		By default, two standard search ranges are defined, for Old and New Testament; you may wish to define others for
-		e.g. "Gospels" or "Paul's Epistles". One custom module list containing only the first Bible found will be present.
-		If desired, new searches can be performed across only the current results of the previous search.  Any modules may be
-		searched, including general books and even dictionaries, in any combination.
-	   </para>
-
-	   <para>
-		Note the tooltip in the screenshot above, for Attributes search.  This qualifier is used to perform searches on attributes
-		that are carried with verses, instead of verse content proper, such as footnote content or Strong's Hebrew and Greek
-		references.  If this button is selected, specific attribute qualifiers must be made in the Attribute Search tab, at the
-		right end of the tab set.  Strong's references are identified with a leading "H" or "G" and the numeric Strong's identifier.
-		Thus, a search of KJV for Strong's Greek #140, using "G140", will return the single result of Matthew 12:18.
-	   </para>
-		
-	   <para>
-		If you have indexed your modules, there is a much faster way to search for Strong's references. Enter your search preceded by 
-		"lemma:", so to search for Strong's Greek #140, enter "lemma:G140". You must have selected <guibutton>Optimized ("Lucene")</guibutton>
-		for this to work.
-	  </para>
-
-	   <para>
-		The "Find" button also stops an in-progress search, as its tooltip indicates.
-	   </para>
-
-	   <para>
-		Results will show in the <guibutton>Results</guibutton> tab. If you wish to show Strongs, Morphology, or Footnote tags,
-		make those selections on the <guibutton>Attributes Search</guibutton> tab. Clicking once on the result will show the result
-		in the <guibutton>Advanced Search</guibutton> previewer. Hovering over Strongs, Morphology, Footnote, or Cross-reference
-		tags will show the results in the main previewer. Double-clicking a result will cause the current tab to navigate to that
-		result. This applies to search results in general books and commentaries as well, but note that the respective tab must
-		be visible.
-	   </para>
-
-	   <warning>
-	   	<para>
-		 Changes to some of the settings (e.g. scope of search, searched modules, etc.) in Advanced Search will 	affect the simple search via the side pane but not vice versa.
-		</para>
-	   </warning>  
-	   </sect2>
-
-	<sect2 id="hdbk-op-search-dialog-text-regexp">
-		<title>Search Syntax using Regular Expression</title>
-
-		<para>
-			Regular expression searches provide a way to do simple or complex searches for strings that match a pattern or set of patterns (branches) separated by vertical bars "|". While a pattern can be built to look for a word or phrase, a simple pattern that consists of a word does not look for only that word but for any place the string of letters that make that word are found. A search for "right" will return verses that contain the word "right", but also "<emphasis>right</emphasis>eous", "<emphasis>right</emphasis>eousness", "un<emphasis>right</emphasis>eous", "up<emphasis>right</emphasis>" and even "b<emphasis>right</emphasis>". A search for "hall not" is not a search for "hall" AND "not" but for the string "hall not" with a space between the second "l" and the "n". The search for "hall not" will find occurrences of "s<emphasis>hall not</emphasis>".
-		</para>
-		<para>
-			The power of Regular Expressions is in the patterns (or templates) used to define a search. A pattern consists of
-ordinary characters and some special characters that are used and interpreted by a set of rules. Special characters include
-.\[^*$?+. Ordinary (or simple) characters are any characters that are not special. The backslash, "\", is used to convert special characters to ordinary and ordinary characters to special.
-		 </para>
-		<para>
-			Example: the pattern "<emphasis>i. love\.</emphasis>" will find sentences that end with "h<emphasis>i</emphasis>s <emphasis>love</emphasis>" or "<emphasis>i</emphasis>n <emphasis>love</emphasis>" or "<emphasis>i</emphasis>s <emphasis>love</emphasis>" followed by
-a period. The first period in "i. love\." is a special character that means allow any character in this position. The
-backslash in "i. love\." means that the period following it is not to be considered a special character, but is
-an ordinary period. 
-		</para>
-
-		<sect3 id="hdbk-op-search-dialog-text-regexp-rules">
-			<title>Rules for Regular Expression Search Requests</title>
-			<itemizedlist>
-<listitem><para>. The period matches any character.</para></listitem>
-<listitem><para>* The asterisk matches 0 or more characters of the
-	preceding: set, character or indicated character.</para></listitem>
-<listitem><para>+ The plus sign matches 1 or more characters of the
-	preceding: set, character or indicated character.</para></listitem>
-<listitem><para>? The question mark matches 0 or 1 character of the
-	preceding: set, character or indicated character.</para></listitem>
-<listitem><para>[ ] Square brackets match any one of the characters
-	specified inside [ ].</para></listitem>
-<listitem><para>^ A caret as the first character inside [ ] means NOT.</para></listitem>
-<listitem><para>^ A caret beginning a pattern anchors the beginning of a
-	line.</para></listitem>
-<listitem><para>$ A dollar at the end of a pattern anchors the end of a
-	line.</para></listitem>
-<listitem><para>| A vertical bar means logical OR.</para></listitem>
-<listitem><para>( ) Parentheses enclose expressions for grouping.
-<emphasis>Not supported!</emphasis></para></listitem>
-<listitem><para>\ A backslash can be used prior to any special character
-	to match that character.</para></listitem>
-<listitem><para>\ A backslash can be used prior to an ordinary character
-	to make it a special character.</para></listitem>
-</itemizedlist>
-
-<sect4 id="period">
-<title>The Period</title>
-
-<para>The Period "." will match any single character even
-a space or other non-alphabet character.
-<emphasis>s.t</emphasis> matches <emphasis>s</emphasis>i<emphasis>t</emphasis>,
-<emphasis>s</emphasis>e<emphasis>t</emphasis>,<emphasis> s</emphasis>o<emphasis>t</emphasis>,
-etc., which could be located in <emphasis>s</emphasis>i<emphasis>t</emphasis>ting,
-compas<emphasis>s</emphasis>e<emphasis>t</emphasis>h and <emphasis>s</emphasis>o<emphasis>t</emphasis>tish
-<emphasis>b..t</emphasis> matches <emphasis>b</emphasis>oo<emphasis>t</emphasis>,
-<emphasis>b</emphasis>oa<emphasis>t</emphasis> and <emphasis>b</emphasis>ea<emphasis>t
-foot.tool </emphasis>matches <emphasis>foot</emphasis>s<emphasis>tool </emphasis>and
-<emphasis>foot tool</emphasis></para>
-</sect4>
-
-
-<sect4 id="asterisk">
-<title>The Asterisk</title>
-
-<para>The asterisk "*" matches zero or more characters of the preceding:
-set, character or indicated character. Using
-a period asterisk combination ".*" after a commonly
-found pattern can cause the search to take a very long time,
-making the program seem to freeze.
-<emphasis>be*n</emphasis> matches<emphasis> beeen, been, ben</emphasis>,
-and <emphasis>bn</emphasis> which could locate Reu<emphasis>ben</emphasis>
-and She<emphasis>bn</emphasis>a.</para>
-</sect4>
-
-
-<sect4 id="plus">
-<title>The Plus Sign</title>
-<para>The Plus Sign "+" matches one or more characters of the preceding:
-set, character or indicated character. Using
-a period and plus sign combination ".+" after a
-commonly found pattern can cause the search to take a very long
-time, making the program seem to freeze.
-<emphasis>be+n</emphasis> matches <emphasis>beeen, been</emphasis> and <emphasis>ben</emphasis>,
-but not <emphasis>bn</emphasis>.</para>
-</sect4>
-
-
-<sect4 id="question">
-<title>The Question Mark</title>
-<para>The Question Mark "?"matches zero or one character of the
-preceding: set, character or indicated character.
-<emphasis>be?n</emphasis> matches <emphasis>ben</emphasis> and <emphasis>bn</emphasis>
-but not <emphasis>been</emphasis>.
-<emphasis>trees?</emphasis> matches <emphasis>trees</emphasis> or <emphasis>tree</emphasis>.</para>
-</sect4>
-
-
-<sect4 id="bracket">
-<title>The Square Brackets </title>
-<para>The Square Brackets "[]" enclose a set of characters that can
-match. The period, asterisk, plus sign and question mark are not
-special inside the brackets. A minus sign can be used to indicate
-a range. If you want a caret "^" to be part of the
-range do not place it first after the left bracket or it will be
-a special character. To include a "]" in the set make
-it the first (or second after a special "^") character
-in the set. To include a minus sign in the set make it the first
-(or second after a special "^") or last character in
-the set.
-<emphasis>s[eia]t</emphasis> matches <emphasis>set</emphasis>, <emphasis>sit</emphasis>,
-and <emphasis>sat</emphasis>, but not <emphasis>s</emphasis>o<emphasis>t</emphasis>.
-<emphasis>s[eia]+t </emphasis>matches as above but also, <emphasis>seat,
-seet, siet</emphasis>, etc.
-<emphasis>[a-d]</emphasis> matches <emphasis>a, b, c,</emphasis> or <emphasis>d</emphasis>.
-<emphasis>[A-Z]</emphasis> matches any uppercase letter.
-[.;:?!] matches ., ;, :, ?, or ! but not a comma.
-[ ]^-] matches ] or ^ or -</para>
-</sect4>
-
-
-<sect4 id="caret">
-<title>The Caret first in Square Brackets </title>
-<para>If the Caret is the first character after the left bracket ("[^") it
-means NOT.
-<emphasis>s[^io]t</emphasis> matches <emphasis>set, sat</emphasis>, etc.,
-but not <emphasis>s</emphasis>i<emphasis>t</emphasis> and <emphasis>s</emphasis>o<emphasis>t</emphasis>.</para>
-</sect4>
-
-<sect4 id="caret-s">
-<title>The Caret as Start of Line Anchor </title>
-<para>If the Caret is the first character in a pattern ("^xxx") it anchors
-the pattern to the start of a line. Any match must be at the
-beginning of a line. Because of unfiltered
-formatting characters in some texts, this feature does not always
-work, but may if a few periods are placed after the caret to
-account for the formatting characters.
-<emphasis>^In the beginning</emphasis> matches lines that
-start with "<emphasis>In the beginning</emphasis>".
-(May need to use: <emphasis>^.....In the beginning</emphasis>)</para>
-</sect4>
-
-
-<sect4 id="dollar">
-<title>The Dollar Sign as End of Line Anchor </title>
-<para>If the Dollar Sign is the last character ("xxx$") in a pattern it
-anchors the pattern to the end of a line. Any match must be at
-the end of a line. Because of unfiltered
-formatting characters in some texts, this feature does not always
-work, but may if a few periods are placed before the dollar sign
-to account for the formatting characters.
-<emphasis>Amen\.$</emphasis> matches lines that end with
-"<emphasis>Amen.</emphasis>" (May
-need to use Amen\....$, Amen\..........$, or even
-Amen\....................$)</para>
-</sect4>
-
-
-<sect4 id="bar">
-<title>The Vertical Bar </title>
-<para>The Vertical Bar "|" between patterns means OR.
-<emphasis>John|Peter</emphasis> matches <emphasis>John</emphasis> or <emphasis>Peter.
-John .*Peter|Peter .*John</emphasis> matches <emphasis>John</emphasis>
-... <emphasis>Peter</emphasis> or <emphasis>Peter</emphasis> ... <emphasis>John</emphasis>.
-(.* slows a search)
-<emphasis>pain|suffering|sorrow</emphasis> matches <emphasis>pain</emphasis>,
-or <emphasis>suffering</emphasis>, or <emphasis>sorrow</emphasis>.</para>
-</sect4>
-
-
-<sect4 id="parenth">
-<title>The Parentheses</title>
-<para><emphasis>The use of Parentheses "( )" is
-not supported!</emphasis></para>
-</sect4>
-
-
-<sect4 id="backslash">
-<title>The Backslash Prior to a Special Character</title>
-<para>The Backslash prior to a special character ("\*") indicates that the
-character is not being used in its special meaning, but is just
-to match itself.
-<emphasis>amen\.</emphasis> matches <emphasis>amen.</emphasis> but not <emphasis>amen</emphasis>t
-and will not locate firm<emphasis>amen</emphasis>t.</para>
-</sect4>
-
-<sect4 id="backslash-o">
-<title>The Backslash Prior to an Ordinary Character </title>
-
-<para>The Backslash prior to an ordinary character ("\o") indicates that
-the character is not being used to match itself, but has special
-meaning.</para>
-
-<itemizedlist>
-<listitem><para>
-\b if use outside [ ] means word boundary. If used inside [ ] means backspace.
-<emphasis>\brighteous\b</emphasis> matches <emphasis>righteous</emphasis> but
-not un<emphasis>righteous</emphasis> or <emphasis>righteous</emphasis>ness</para></listitem>
-<listitem><para>\B means non-word boundary.  <emphasis>\Brighteous\B</emphasis>
-matches un<emphasis>righteous</emphasis>ness and un<emphasis>righteous</emphasis>ly
-but not <emphasis>righteous</emphasis>, un<emphasis>righteous</emphasis> or <emphasis>
-righteous</emphasis>ness.</para></listitem>
-<listitem><para>\d means digit; same as [0-9].</para></listitem>
-<listitem><para>\D means non-digit, same as [^0-9].</para></listitem>
-<listitem><para>\s means space. </para></listitem>
-<listitem><para>\S means not a space. </para></listitem>
-<listitem><para>\w means alphanumeric; same as [a-zA-Z0-9_].</para></listitem>
-<listitem><para>\W means not alphanumeric; same as [^a-zA-Z0-9_].</para></listitem>
-</itemizedlist>
-</sect4>
-</sect3>
-</sect2>
-
-
-  </sect1>
-
-  <!-- Studypad -->
-  <sect1 id="studypad">
-    <title>The Studypad</title>
-    
-<!-- ============= The Studypad ============================= -->
-    <sect2 id="xiphos-studypad">
-		<title>Using The Studypad</title>
-		<para>
-		The Studypad can be opened by choosing <guibutton>File-&gt;Open Studypad</guibutton>
-		</para>
-		<para>
-		This is what the Studypad typically looks like:
-		</para>
-		<figure>
-			<title>The Studypad</title>
-			<screenshot> 
-	  <mediaobject> 
-	    <imageobject><imagedata fileref="figures/studypad.png" format="PNG"/> 
-	    </imageobject>
-	    <!-- EPS versions of the figures are not required at the moment. -->
-            <!-- 
-		    <imageobject>
-      		<imagedata fileref="figures/studypad.eps" format="EPS"/>
-    		    </imageobject>
-	    -->
-	    <textobject> 
-	      <phrase>The Studypad</phrase> 
-	    </textobject> 
-	  </mediaobject> 
-	
-                        </screenshot>
-
-                </figure>
-                                        
-		<para> The Studypad will save into your working directory, making it useful for collecting and exporting information and Bible study material from Xiphos into other programmes.</para>
-		<para> Toolbar 1</para>
-			        	<itemizedlist>
-			     		<listitem><para>Font Size and Environment</para></listitem>
-			     		<listitem><para>Font Type</para></listitem>
-			     		<listitem><para>Bold, Italics, Underscored, Crossed Out</para></listitem>
-			     		<listitem><para>Left, Centre and Right  Bound</para></listitem>
-			     		<listitem><para>Shift Paragraph Right or Left</para></listitem>
-			     		<listitem><para>Colour Selector</para></listitem>
-			     		</itemizedlist>
-		<para> Toolbar 2</para>
-			        	<itemizedlist>
-			        	<listitem><para>New, Save, Delete and Print</para></listitem>
-			        	<listitem><para>Cut, Copy, Paste and Undo</para></listitem>
-			        	<listitem><para>Find and 'Find and Replace'</para></listitem>
-			        	<listitem><para>Spellcheck</para></listitem>
-			        	</itemizedlist>
-
-	        <para>
-		In order for spellcheck to be available, one of the languages
-		under <guimenuitem>Edit-&gt;Current Languages</guimenuitem>
-		must be set.
-	        </para>
-
-	</sect2>
-
-
-  </sect1>
-
-  <!-- Personal Commentary -->
-  <sect1 id="personal">
-    <title>The Personal Commentary</title>
-    <!-- Personal Commentary-->
-
-		<para>
-		To build up a personal commentary you will need to install the
-		editable 'Personal' sword module from the English Commentaries
-		section. Right click it and choose
-		<guimenuitem>Edit-&gt;Note-&gt;Personal</guimenuitem>
-		in the menu.
-		</para>
-
-		<para>
-		An editor window similar to the
-		<guimenuitem>Study Pad</guimenuitem>
-		will appear. Edit your comment and save it; in the future it will
-		appear as your comment to the relevant verse.
-		</para>
-		<figure>
-    		<title>The Personal Commentary Editor </title>
-     		<screenshot> 
-		  <mediaobject> 
-		    <imageobject><imagedata fileref="figures/personal.png" format="PNG"/>
-		    </imageobject>
-	    <!-- EPS versions of the figures are not required at the moment. -->
-            <!-- 
-		    <imageobject>
-      		<imagedata fileref="figures/personal.eps" format="EPS"/>
-    		    </imageobject>
-	    -->
-		    <textobject> 
-		      <phrase>The Personal Commentary</phrase> 
-		    </textobject> 
-		  </mediaobject> 
-	        </screenshot>
-	        </figure>
-
-	        <para>
-		Locationbar
-		</para>
-	        	<itemizedlist>
-	        	<listitem><para> Synchronise Button</para></listitem>
-	        	<listitem><para>Bible Book, Chapter and Verse Selectors</para></listitem>
-	        	<listitem><para>Location Summary</para></listitem>
-	        	</itemizedlist>
-
-	        <para>
-		Use the <guimenuitem>Synchronise Button</guimenuitem> to
-		quickly change location of your editor to that of the
-		underlying Bibletext or use the
-		<guimenuitem>Book</guimenuitem>,
-		<guimenuitem>Chapter</guimenuitem>, and
-		<guimenuitem>Verse</guimenuitem>
-		selectors to choose to edit your comment to one particular
-		verse.
-		</para>
-
-		<para>Toolbar 1</para>
-	        	<itemizedlist>
-	     		<listitem><para>Font Size and Environment</para></listitem>
-	     		<listitem><para>Font Type</para></listitem>
-	     		<listitem><para>Bold, Italics, Underscored, Crossed Out</para></listitem>
-	     		<listitem><para>Left, Centre and Right  Bound</para></listitem>
-	     		<listitem><para>Shift Paragraph Right or Left</para></listitem>
-	     		<listitem><para>Colour Selector</para></listitem>
-	     		</itemizedlist>
-	        <para>Toolbar 2</para>
-	        	<itemizedlist>
-	        	<listitem><para>Save, Delete and Print</para></listitem>
-	        	<listitem><para>Cut, Copy, Paste and Undo</para></listitem>
-	        	<listitem><para>Find and 'Find and Replace'</para></listitem>
-	        	<listitem><para>Spellcheck</para></listitem>
-	        	</itemizedlist>
-
-	        <para>
-		In order for spellcheck to be available, one of the languages
-		under <guimenuitem>Edit-&gt;Current Languages</guimenuitem>
-		must be set.
-	        </para>
-
-	        <para>
-		To create a link to other verses right click the text and
-		choose <guimenuitem>Link..</guimenuitem>. In the pop-up window
-		enter the link location and the module linked to.
-		</para>
-
-		<para>
-		It is possible to rename a personal commentary to suit a
-		particular subject of study for that commentary.  Thus,
-		multiple personal commentaries may be installed: Rename the
-		existing personal commentary, and then re-install another
-		instance of the personal commentary if desired.  Personal
-		commentary names can consist only of letters and digits, and
-		cannot duplicate an existing module's name.  Rename is
-		accessible off the right-click menu.
-		</para>
-
-		<para>
-		If the study embodied in a particular personal commentary is
-		no longer needed, archival is available in the module manager,
-		prior to removal, for possible future re-installation.  See
-		the module manager's Remove/Archive page.  Any module may be
-		archived, not just personal commentaries.
-		</para>
-
-		<para>
-		Although there are 31,102 verses in standard versification, it
-		is unlikely that more than a tiny fraction of all verses will
-		have personal commentary attached to them.  A verse list
-		showing where personal commentary notes exist is available
-		from <menuchoice><guisubmenu>Right Click</guisubmenu><guimenuitem>
-		Dump Pers.Comm.</guimenuitem></menuchoice>.
-		</para>
-			        
-	        <tip>
-        	<para>
-		The created commentary page will be attached to an individual
-		verse only. To write commentary pages from within
-		Xiphos, attached to longer stretches of text use the
-		<guimenuitem>Link..</guimenuitem> function to link several
-		pages together
-		</para>
-		</tip>
-
-  </sect1>
-
-  <!-- Journals and Prayer Lists -->
-  <sect1 id="journals">
-    <title>Journals and Prayer Lists</title>
-    <!-- Journals and Prayer Lists -->
-
-		<para>
-		<application>Xiphos</application> supports
-		user-created and -editable modules to contain general
-		content.  Initially conceived as simple prayer lists,
-		they have expanded to include daily journals and
-		topic-outline content.  The user can maintain prayer
-		lists, or prepare sermons, or write any structured
-		content desired.
-		</para>
-
-		<para>
-		To enable prayer list and journal support, see the
-		Preferences dialog as previously described.  There, in
-		<guibutton>General-&gt;Misc</guibutton>, check the
-		item labeled
-		<guimenuitem>Enable Prayer Lists</guimenuitem>.
-		You will see a new item appear at the bottom of the
-		sidebar's module list for "Prayer Lists/Journals".
-		</para>
-
-		<para>
-		Right-click on this entry, and you will be offered a
-		context menu to create new modules.  All the offered
-		options are of the same type, but what is offered is a
-		variety of templates from which to work.  There are 5
-		templates at this time.
-		</para>
-
-		<figure>
-    		<title>Creating a journal or prayer list</title>
-     		<screenshot> 
-		  <mediaobject> 
-		    <imageobject><imagedata fileref="figures/journal.png" format="PNG"/>
-		    </imageobject>
-		    <textobject> 
-		      <phrase>New journal or prayer list</phrase> 
-		    </textobject> 
-		  </mediaobject> 
-	        </screenshot>
-	        </figure>
-
-		<para>
-		Their structure is the same, but the offered templates
-		provide a variety of hints regarding ways to organize
-		content.  <guimenuitem>Simple</guimenuitem> is
-		trivial, and can be considered a mental Post-It
-		note.  <guimenuitem>Subject</guimenuitem> is useful as
-		a more organized version.
-		<guimenuitem>Monthly</guimenuitem> provides a
-		per-month structure in which to track needed content.
-		<guimenuitem>Daily Journal</guimenuitem> is a full
-		365-day calendar in which to track a personal journal
-		or ongoing prayer needs.  And finally,
-		<guimenuitem>Outlined Topic</guimenuitem> is a full,
-		expandable outline suitable for topics and subtopics.
-		</para>
-
-		<para>
-		Journals and prayer lists have the structure of a
-		general book: If simply selected for display from the
-		module list, they will appear in the usual subwindow
-		for general books.
-		</para>
-
-		<para>
-		Editing a journal or prayer list is done by
-		right-clicking the module name to get its context
-		menu, whose middle item is <guimenuitem>Open in
-		Editor</guimenuitem>.  The sections and subsections
-		will be listed in the left margin.  Click one, and the
-		editor navigates to that section.  The context menu on
-		right-click of section keys provides for adding,
-		deleting, and editing the names of sections and
-		subsections.
-		</para>
-
-		<para>
-		If the general book subwindow is currently displaying
-		the journal or prayer list being edited, it will
-		synchronize with new content when
-		<guimenuitem>Save</guimenuitem> is used.
-		</para>
-
-		<para>
-		As mentioned, these user-edited modules are in effect
-		general books.  This means they can be viewed in any
-		Sword Project application.  Thus, you can use these
-		modules immediately in
-		<application>BibleTime</application>, for example; or
-		from the Module Manager's
-		<guimenuitem>Maintenance</guimenuitem> page, you can
-		archive a zip file to copy to a Windows system where
-		you can then install the zip content as a module for
-		the Windows user interface.  Few other Sword Project
-		applications provide for editing these modules,
-		however, meaning that they will appear in such other
-		applications as just ordinary general books.
-		</para>
-
-		<para>
-		In the future, it is planned that a module sharing
-		facility will become available, by which user-edited
-		modules such as these can be uploaded to become
-		available to a wide audience.  The current install
-		repository facility will be expanded to provide upload
-		as well as the existing download capability in order
-		to support this.  Thus, users will be able to share
-		their sermons, Bible studies, and other
-		personally-authored content with other Sword
-		application users.
-		</para>
-
-  </sect1>
-
-  <!-- Getting Help Online -->
-  <sect1 id="onlinehelp">
-    <title>Getting Help Online</title>
-    <!-- ============= Online Help  ============--> 
-
-	<sect2 id="xiphos-mailing-list">
-		<title>Users Mailing List</title>
-		<para>One way you can get help with Xiphos is using our low-traffic users' mailing list.
-		You can sign up by clicking <ulink url="https://lists.sourceforge.net/lists/listinfo/gnomesword-users/">
-		this link</ulink>. Once you are signed up, you can email the list with any problems you are having
-		and other users or the developers will respond, typically within a day.
-		</para>
-	</sect2>
- 
-	<sect2 id="xiphos-live-chat">
-		<title>Live Chat</title>
-		<para>Another way to get help is with online chat. Xiphos has an IRC channel on freenode, #xiphos.
-		If you don't know what that means, it's ok. Just click <ulink url="http://embed.mibbit.com/?server=irc.freenode.net&amp;channel=%23xiphos">this link</ulink> (it will open your web browser), type a nickname or accept the default, and click "Click to join chatroom".
-		This will take you to a chatroom where the developers and other users are available to help you with issues
-		you may be having. Although many times someone will answer your question immediately, sometimes you may
-		have to wait a few minutes or longer.
-		</para>
-	</sect2>
-
-  </sect1>
-
-  <!-- Original Language Research -->
-  <sect1 id="originallanguage">
-     <title>Original Language Research</title>
-     <!-- ============= Original Language Research  ============--> 
-
-	<sect2 id="orig-lang-install-modules">
-		<title>Installing Needed Modules</title>
-		<para>Xiphos is ideally suited for studying the original Greek and Hebrew. 
-		To get started, you will want the following modules:
-		</para>
-		<para>
-		From Crosswire Repository:
-		</para>
-    		<itemizedlist>
-			<listitem>
-				<para>
-        			StrongsHebrew Dictionary (or get StrongsRealHebrew from the Xiphos Repository)
-				</para>
-			</listitem>
-			<listitem>
-				<para>
-        			StrongsGreek Dictionary (or get StrongsRealGreek from the Xiphos Repository)
-				</para>
-			</listitem>
-			<listitem>
-				<para>
-				Robinson Dictionary
-				</para>
-			</listitem>
-			<listitem>
-				<para>
-				KJV Bible
-				</para>
-			</listitem>
-		</itemizedlist>
-		<para>
-		From Xiphos Repository:
-		</para>
-		<itemizedlist>
-			<listitem>
-				<para>
-				StrongsRealGreek Dictionary (same as StrongsGreek, but with Greek characters, B-Greek transliteration, and self-referencing links)
-				</para>
-			</listitem>
-			<listitem>
-				<para>
-				StrongsRealHebrew Dictionary (same as StrongsHebrew, but with Hebrew characters and self-referencing links)
-				</para>
-			</listitem>
-			<listitem>
-				<para>
-				InvertedStrongsRealGreek (key in or copy actual Greek word, rather than number)
-				</para>
-			</listitem>
-		</itemizedlist>
-	</sect2>
-
-	<sect2 id="orig-lang-setup">
-	 	<title>Setting Up</title>
-		<para>While still in the module manager, create indexes for all of the modules you just installed. 
-		Then close the module manager and open <menuchoice><guisubmenu>Edit</guisubmenu><guimenuitem>
-		Preferences</guimenuitem></menuchoice> and go to <menuchoice><guisubmenu>Modules</guisubmenu>
-		<guimenuitem>Misc</guimenuitem></menuchoice>. Set your Hebrew and Greek lexicons according to what you installed.
-		Close preferences and open the KJV module. Turn on the module options <menuchoice>
-		<guisubmenu>Right Click</guisubmenu><guisubmenu>Module Options</guisubmenu><guimenuitem>Show Strongs
-		</guimenuitem></menuchoice> and <menuchoice><guisubmenu>Right Click</guisubmenu><guisubmenu>Module Options
-		</guisubmenu><guimenuitem>Show Morphology</guimenuitem></menuchoice>. You should see the Bible text
-		change to show Strongs numbers underneath the appropriate English words. Hover over the numbers 
-		(or letters for morphology) with the mouse and you will see the definition displayed in the previewer pane. 
-		Click on the link and the definition will show in the dictionary pane. If you are using StrongsRealGreek or
-		StrongsRealHebrew, you can click on any other number referenced in the definition and you will be taken to that entry.
-		</para>
-	</sect2>
-
-	<sect2 id="orig-lang-search">
-		<title>Searching for Strongs Numbers</title>
-		<para>Choose <menuchoice><guisubmenu>Edit</guisubmenu><guimenuitem>Advanced Search</guimenuitem></menuchoice>or press
-		<keycap>F3</keycap>. Under <interface>Search Type</interface>, select <guibutton>Optimized ("Lucene")</guibutton>.
-		Click on the <interface>Attribute Search</interface> tab, and make check the box that says <guibutton>
-		Strongs Numbers</guibutton>. Now click in the entry field at the top and search for the number you are looking for
-		preceded by "lemma:" and "G" for Greek or "H" for Hebrew. So to look for the Hebrew word tsad-deek (6662), enter 
-		"lemma:H6662". Once the search is done, the results pane will be shown. Notice that when you click on a result, 
-		it will show the result in the preview pane, and the strong's numbers will show as well, following immediately 
-		after the words they match. Also note that hovering over these numbers will show the definition in the main preview pane.
-		</para>
-	</sect2>
-	
-	<sect2 id="orig-lang-additional">
-		<title>Additional Modules</title>
-		<para>For more advanced research, the following modules are also available:</para>
-
-		<itemizedlist>
-			<listitem>
-				<para>   
-    				2TGreek (Xiphos Repository) : This module contains the entire Bible in Greek. It combines the LXX
-				and Tischendorf8 NT into one easy-to-use module. In addition, it contains Strongs, Morphology,Greek Accents,
-				and primary/secondary readings. As with all modules that include Strongs, Xiphos displays 2TGreek in 
-				beautiful interlinear form.
-				</para>
-			</listitem>
-			<listitem>
-				<para>
-   				Elzevir Textus Receptus (Crosswire Beta Repository as of this writing) : 1624 edition with Strongs and Morphology
-				</para>
-			</listitem>
-			<listitem>
-				<para>
-				LXX (Crosswire Repository) : the Septuagint with Strongs, Morphology, and footnotes
-				</para>
-			</listitem>
-			<listitem>
-				<para>
-				MorphGNT (Crosswire Beta Repository as of this writing) : This is derived from the morphologically parsed GNT
-				provided by UPenn's CCAT. It was reformatted and error-corrected by James Tauber. It includes Greek accents
-				and Morphology.
-				</para>
-			</listitem>
-			<listitem>
-				<para>
-				TR (Crosswire Repository) : This is the Textus Receptus with Strongs and Morphology
-				</para>
-			</listitem>
-			<listitem>
-				<para>
-				TischMorph (Xiphos Repository) : As described above, this has Strongs, Morphology, accents, and alternate readings.
-				</para>
-			</listitem>
-			<listitem>
-				<para>
-				WHNU (Crosswire Repository) : Westcott-Hort of 1881 with Strongs and Morphology
-				</para>
-			</listitem>
-			<listitem>
-				<para>
-				GreekHebrew (Crosswire Repository) : This is a dictionary keyed to Strongs. It contains words in the LXX 
-				that are also found in the New Testament. In addition, it contains the equivalent Hebrew words also keyed
-				to Strongs.
-				</para>
-			</listitem>
-			<listitem>
-				<para>
-				Didache (Crosswire Beta Repository as of this writing) : This is an early Christian treatise in Greek dated
-				to the late first or early second century. It includes Strongs, Morphology, and Greek accents.
-				</para>
-			</listitem>
-		</itemizedlist>
-	</sect2>
-
-
-  </sect1>
-
-  <!-- Authors -->
-  <sect1 id="authors">
-    <title>Authors</title>
-    <!-- Authors -->
-
-		<para>
-    	This manual was written by:
-		</para>
-		<itemizedlist>
-		<listitem>
-			<para>
-			Andy Piper
-			</para>
-		</listitem>
-		<listitem>
-			<para>
-			Pierre Benz
-			</para>
-		</listitem>
-		<listitem>
-			<para>
-			Dr Peter von Kaehne
-			</para>
-		</listitem>
-		<listitem>
-			<para>
-			Karl Kleinpaste
-			</para>
-		</listitem>
-		<listitem>
-			<para>
-			Dominique Corbex
-			</para>
-		</listitem>
-		<listitem>
-			<para>
-			Matthew Talbert
-			</para>
-		</listitem>
-	</itemizedlist>
-	<para>
-	Please send all comments and suggestions regarding 
-    	this manual to Xiphos Development list <email>xiphos-developers@lists.sourceforge.net</email>. 
-	Comments may also be submitted via the project trackers at SourceForge.
-   		</para> 
-<para>
-    	For more information on <application>Xiphos</application>, please visit the project 
-    	website at <ulink type="http" url="http://xiphos.sf.net/">http://xiphos.sf.net</ulink>. 
-    	Bug reports should be made using the Bug Tracker at the project development site 
-    	<ulink type="http" url="http://www.sourceforge.net/projects/xiphos">
-    	http://www.sourceforge.net/projects/xiphos</ulink>
-		</para>
-
-
-  </sect1>
-
-  <!-- License -->
-  <sect1 id="license">
-    <title>License</title>
-    
-   		<para>
-    	This program is free software; you can redistribute it and/or
-    	modify it under the terms of the <ulink type="ghelp" url="gnome-help:gpl">GNU General Public
-    	License</ulink> version 2 or any later version as published by the Free Software Foundation.
-   		</para>
-   		<para>
-    	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
-    	<citetitle>GNU General Public License</citetitle> for more details.
-   		</para>
-   		<para>
-    	A copy of the <citetitle>GNU General Public License</citetitle> is
-    	included as an appendix to the <citetitle>GNOME Users
-    	Guide</citetitle>.  You may also obtain a copy of the
-    	<citetitle>GNU General Public License</citetitle> from the Free
-    	Software Foundation by visiting <ulink type="http" url="http://www.fsf.org">
-    	their Web site</ulink> or by writing to
-    	<address>
-     	Free Software Foundation, Inc.
-     	<street>51 Franklin St</street>, Fifth Floor,
-     	<city>Boston</city>, <state>MA</state> <postcode>02110-1301</postcode>
-     	<country>USA</country>
-    	</address>
-   		</para>
-
-
-  </sect1>
-
-</article>
diff --git a/help/fa/fa.po b/help/fa/fa.po
index 03a19b8..b8cd1f6 100644
--- a/help/fa/fa.po
+++ b/help/fa/fa.po
@@ -2,8 +2,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "POT-Creation-Date: 2009-05-11 23:54+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2009-09-24 06:54-0800\n"
+"PO-Revision-Date: 2009-09-23 22:44-0800\n"
+"Last-Translator: Mansour <manhid1@yahoo.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -11,2409 +12,2583 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/xiphos.xml:34(None) 
+#: ../C/xiphos.xml:34(None)
 msgid "@@image: 'figures/sword3.png'; md5=3d9c6ae738d16324db1e79e7ef9eff8b"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/xiphos.xml:63(None) ../C/xiphos.xml:87(None) 
+#: ../C/xiphos.xml:63(None)
+#: ../C/xiphos.xml:87(None)
 msgid "@@image: 'figures/interface.png'; md5=b0167fed338a11d27d137c07f33a75e8"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/xiphos.xml:53(None) 
+#: ../C/xiphos.xml:53(None)
 msgid "@@image: 'figures/first_start.png'; md5=d9bbfcf2353fff9419416655a51dac15"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/xiphos.xml:18(None) ../C/interface.xml:18(None) 
+#: ../C/xiphos.xml:18(None)
+#: ../C/interface.xml:18(None)
 msgid "@@image: 'figures/interface_menubar.png'; md5=e565033e6a203b845ee4875c1d647057"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/xiphos.xml:49(None) 
+#: ../C/xiphos.xml:49(None)
 msgid "@@image: 'figures/interface_toolbar.png'; md5=af22d3813ded59e152cac9f7d35635d9"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/xiphos.xml:148(None) 
+#: ../C/xiphos.xml:148(None)
 msgid "@@image: 'figures/interface_sidepane.png'; md5=d1783275662a57144b38d80c10688739"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/xiphos.xml:174(None) 
+#: ../C/xiphos.xml:174(None)
 msgid "@@image: 'figures/interface_shortcut.png'; md5=1be0299ec3584f5262a3a4950fee745f"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/xiphos.xml:197(None) 
+#: ../C/xiphos.xml:197(None)
 msgid "@@image: 'figures/interface_biblepane.png'; md5=092f45c81f0cf6682ec36a451da243ce"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/xiphos.xml:255(None) 
+#: ../C/xiphos.xml:255(None)
 msgid "@@image: 'figures/interface_parallel.png'; md5=dbe32bdff5271afb087248f913363cce"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/xiphos.xml:279(None) 
+#: ../C/xiphos.xml:279(None)
 msgid "@@image: 'figures/interface_parallel-separate.png'; md5=259f72c50a2050fff5d61db45e1a117a"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/xiphos.xml:398(None) 
+#: ../C/xiphos.xml:398(None)
 msgid "@@image: 'figures/interface_biblepane-options.png'; md5=16023367059854aed6c53b3fd0c34f33"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/xiphos.xml:424(None) 
+#: ../C/xiphos.xml:424(None)
 msgid "@@image: 'figures/interface_menubar-view.png'; md5=1b203231796686231e0151e018628bc2"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/xiphos.xml:522(None) 
+#: ../C/xiphos.xml:522(None)
 msgid "@@image: 'figures/interface_viewer.png'; md5=e26c63cfa273aa2e1180d66fee1f1033"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/xiphos.xml:562(None) 
+#: ../C/xiphos.xml:562(None)
 msgid "@@image: 'figures/interface_commentarypane.png'; md5=1142e8288deee464c1dcd51460bd2cce"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/xiphos.xml:635(None) 
+#: ../C/xiphos.xml:635(None)
 msgid "@@image: 'figures/interface_dictionary.png'; md5=d0d5561dae3d893d8287f22a1424ace4"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/xiphos.xml:815(None) 
+#: ../C/xiphos.xml:815(None)
 msgid "@@image: 'figures/gtkhtml3-vs-mozembed.png'; md5=deec924e49812ac32cfd027e53d2b193"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/xiphos.xml:12(None) ../C/preferences.xml:12(None) 
+#: ../C/xiphos.xml:12(None)
+#: ../C/preferences.xml:12(None)
 msgid "@@image: 'figures/preferences.png'; md5=1bb4a411bbec6a269a5e9904ebc37e89"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/xiphos.xml:38(None) 
+#: ../C/xiphos.xml:38(None)
 msgid "@@image: 'figures/preferences_fonts-color.png'; md5=48d21eae6efe78b745d063ca0d3094a8"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/xiphos.xml:62(None) 
+#: ../C/xiphos.xml:62(None)
 msgid "@@image: 'figures/preferences_fonts-misc.png'; md5=44017ad5ee9d666eb8a6c85a27ad44ca"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/xiphos.xml:100(None) 
+#: ../C/xiphos.xml:100(None)
 msgid "@@image: 'figures/preferences_general-tabs.png'; md5=d6d30137f2bb1b26ace8fac0edf48203"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/xiphos.xml:124(None) 
+#: ../C/xiphos.xml:124(None)
 msgid "@@image: 'figures/preferences_general-misc.png'; md5=a100cbdac54da698c5fee8b386f82b78"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/xiphos.xml:176(None) 
+#: ../C/xiphos.xml:176(None)
 msgid "@@image: 'figures/preferences_modules-main.png'; md5=8100495250f0a100812a5907006a88ad"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/xiphos.xml:196(None) 
+#: ../C/xiphos.xml:196(None)
 msgid "@@image: 'figures/preferences_modules-parallel.png'; md5=f880f02801dbc9e1673a2c50aad58ae1"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/xiphos.xml:216(None) 
+#: ../C/xiphos.xml:216(None)
 msgid "@@image: 'figures/preferences_modules-misc.png'; md5=cf421f044c87d47185f3a85128d1786e"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/xiphos.xml:23(None) ../C/modules.xml:23(None) 
+#: ../C/xiphos.xml:23(None)
+#: ../C/modules.xml:23(None)
 msgid "@@image: 'figures/module.png'; md5=c27ec45463d4c3d3765f35770c31414a"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/xiphos.xml:49(None) 
+#: ../C/xiphos.xml:49(None)
 msgid "@@image: 'figures/sword_sources.png'; md5=a1182919f9c770abd01edee116fc0f48"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/xiphos.xml:77(None) 
+#: ../C/xiphos.xml:77(None)
 msgid "@@image: 'figures/sword_config.png'; md5=4811d390ad124e63b4d7145fb3cba0ab"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/xiphos.xml:146(None) 
+#: ../C/xiphos.xml:146(None)
 msgid "@@image: 'figures/sword_install.png'; md5=ac72af69d94af20a2f38c3be663ca51c"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/xiphos.xml:189(None) 
+#: ../C/xiphos.xml:189(None)
 msgid "@@image: 'figures/sword_remove.png'; md5=a6ef5b13d854ff3ebf348523e729b2d2"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/xiphos.xml:15(None) ../C/search.xml:15(None) 
+#: ../C/xiphos.xml:15(None)
+#: ../C/search.xml:15(None)
 msgid "@@image: 'figures/interface_searchpane.png'; md5=9b02269f6a1a4aa3a2a627aaca52d66c"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/xiphos.xml:214(None) 
+#: ../C/xiphos.xml:214(None)
 msgid "@@image: 'figures/search_search.png'; md5=8c46acb73426be8ca481336b25d83659"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/xiphos.xml:16(None) ../C/studypad.xml:16(None) 
+#: ../C/xiphos.xml:16(None)
+#: ../C/studypad.xml:16(None)
 msgid "@@image: 'figures/studypad.png'; md5=e50d36fb2348bbb0156b9a4a6457fed0"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/xiphos.xml:22(None) 
+#: ../C/xiphos.xml:22(None)
 msgid "@@image: 'figures/personal.png'; md5=540ea58ba392455d42860ee20e84b56e"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/xiphos.xml:36(None) 
+#: ../C/xiphos.xml:36(None)
 msgid "@@image: 'figures/journal.png'; md5=2fe75c9ce423fa7975c901ce97d43065"
 msgstr ""
 
-#: ../C/xiphos.xml:56(title) 
+#: ../C/xiphos.xml:56(title)
 msgid "<application>Xiphos</application> Manual"
-msgstr ""
+msgstr "<application>Xiphos</application> راهنما"
 
-#: ../C/xiphos.xml:58(para) 
+#: ../C/xiphos.xml:58(para)
 msgid "Xiphos is an application to aid in study of the Bible."
-msgstr ""
+msgstr "زیفوس برنامه‏ای است که به منظور کمک رسانی در مطالعۀ کتاب‏مقدس تهیه شده است."
 
-#: ../C/xiphos.xml:61(year) 
+#: ../C/xiphos.xml:61(year)
 msgid "2003"
-msgstr ""
+msgstr "2003"
 
-#: ../C/xiphos.xml:62(year) 
+#: ../C/xiphos.xml:62(year)
 msgid "2009"
-msgstr ""
+msgstr "2009"
 
-#: ../C/xiphos.xml:63(holder) ../C/xiphos.xml:78(publishername) 
+#: ../C/xiphos.xml:63(holder)
+#: ../C/xiphos.xml:78(publishername)
 msgid "The Xiphos Team"
-msgstr ""
+msgstr "تیم زیفوس"
 
-#: ../C/xiphos.xml:2(para) ../C/legal.xml:2(para) 
+#: ../C/xiphos.xml:2(para)
+#: ../C/legal.xml:2(para)
 msgid "Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any later version published by the Free Software Foundation with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy of the GFDL at this <ulink type=\"help\" url=\"ghelp:fdl\">link</ulink> or in the file COPYING-DOCS distributed with this manual."
-msgstr ""
+msgstr "این مجوز برای کپی، توزیع و/یا هر گونه تغییر در این کتابچه تحت شرایط مندرج در مجوز جی‏ان‏یو مدارک آزاد (جی‏اف‏دی‏ال) نسخۀ 1.1 یا بالاتر که توسط بنیاد نرم‏افزار رایگان تهیه و توزیع گردیده است، اعطا می‏شود مشروط بر اینکه هیچگونه تغییری در بخش‏ها، نوشتجات رو و یا پشت جلد داده نشود. نسخه‏ای از مجوز جی‏اف‏دی‏ال در لینک زیر موجود است  <ulink type=\"help\" url=\"ghelp:fdl\">link</ulink>و یا می‏توانید این مجوز را در بخش کپی-مدارک که همراه با این نرم‏افزار آمده است مطالعه نمایید."
 
-#: ../C/xiphos.xml:12(para) ../C/legal.xml:12(para) 
+#: ../C/xiphos.xml:12(para)
+#: ../C/legal.xml:12(para)
 msgid "This manual is part of a collection of GNOME manuals distributed under the GFDL. If you want to distribute this manual separately from the collection, you can do so by adding a copy of the license to the manual, as described in section 6 of the license."
-msgstr ""
+msgstr "این کتابچه بخشی از مجموعه‏ی کتابچه‏های جی‏ان‏او‏ام‏ای است که تحت مقررات جی‏اف‏دی‏ال توزیع گردیده است. توزیع این کتابچه بدون مجموعۀ مورد بحث اشکالی ندارد مشروط بر آنکه یک کپی از مجوز این کتابچه همراه آن باشد، درست همانگونه که در بخش 6 مجوز توضیح داده شده است.  "
 
-#: ../C/xiphos.xml:19(para) ../C/legal.xml:19(para) 
+#: ../C/xiphos.xml:19(para)
+#: ../C/legal.xml:19(para)
 msgid "Many of the names used by companies to distinguish their products and services are claimed as trademarks. Where those names appear in any GNOME documentation, and the members of the GNOME Documentation Project are made aware of those trademarks, then the names are in capital letters or initial capital letters."
-msgstr ""
+msgstr "بیشتر اسامی که توسط شرکت‏ها استفاده شده است به منظور تمایز قایل شدن بین محصولات و خدماتی است که دارای علامت تجاری می‏باشند. چنانچه اسامی ذکر شده در مدارک جی‏ان‏او‏ام‏ای با حروف بزرگ انگلیسی و یا حرف اول اسم با حروف بزرگ تایپ شده باشد، این به منزلۀ آنست که اعضای پروژۀ مستند سازی جی‏ان‏او‏ام‏ای از این امر مطلع گردیده‏اند."
 
-#: ../C/xiphos.xml:33(para) ../C/legal.xml:33(para) 
+#: ../C/xiphos.xml:33(para)
+#: ../C/legal.xml:33(para)
 msgid "DOCUMENT IS PROVIDED ON AN \"AS IS\" BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS FREE OF DEFECTS MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY, ACCURACY, AND PERFORMANCE OF THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS WITH YOU. SHOULD ANY DOCUMENT OR MODIFIED VERSION PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL WRITER, AUTHOR OR ANY CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER; AND"
 msgstr ""
 
-#: ../C/xiphos.xml:54(para) ../C/legal.xml:54(para) 
+#: ../C/xiphos.xml:54(para)
+#: ../C/legal.xml:54(para)
 msgid "UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER IN TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE AUTHOR, INITIAL WRITER, ANY CONTRIBUTOR, OR ANY DISTRIBUTOR OF THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER DAMAGES OR LOSSES ARISING OUT OF OR RELATING TO USE OF THE DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES."
 msgstr ""
 
-#: ../C/xiphos.xml:27(para) ../C/legal.xml:27(para) 
+#: ../C/xiphos.xml:27(para)
+#: ../C/legal.xml:27(para)
 msgid "DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT ARE PROVIDED UNDER THE TERMS OF THE GNU FREE DOCUMENTATION LICENSE WITH THE FURTHER UNDERSTANDING THAT: <placeholder-1/>"
 msgstr ""
 
-#: ../C/xiphos.xml:88(firstname) 
+#: ../C/xiphos.xml:88(firstname)
 msgid "Andy"
-msgstr ""
+msgstr "اندی"
 
-#: ../C/xiphos.xml:89(surname) 
+#: ../C/xiphos.xml:89(surname)
 msgid "Piper"
-msgstr ""
+msgstr "پایپر"
 
-#: ../C/xiphos.xml:92(firstname) 
+#: ../C/xiphos.xml:92(firstname)
 msgid "Pierre"
-msgstr ""
+msgstr "پیر"
 
-#: ../C/xiphos.xml:93(surname) 
+#: ../C/xiphos.xml:93(surname)
 msgid "Benz"
-msgstr ""
+msgstr "بنز"
 
-#: ../C/xiphos.xml:96(firstname) 
+#: ../C/xiphos.xml:96(firstname)
 msgid "Dr Peter"
-msgstr ""
+msgstr "دکتر پیتر"
 
-#: ../C/xiphos.xml:97(surname) 
+#: ../C/xiphos.xml:97(surname)
 msgid "von Kaehne"
-msgstr ""
+msgstr "فن کاهن"
 
-#: ../C/xiphos.xml:100(firstname) 
+#: ../C/xiphos.xml:100(firstname)
 msgid "Karl"
-msgstr ""
+msgstr "کارل"
 
-#: ../C/xiphos.xml:101(surname) 
+#: ../C/xiphos.xml:101(surname)
 msgid "Kleinpaste"
-msgstr ""
+msgstr "کلاین‏پیست"
 
-#: ../C/xiphos.xml:104(firstname) 
+#: ../C/xiphos.xml:104(firstname)
 msgid "Matthew"
-msgstr ""
+msgstr "متیو"
 
-#: ../C/xiphos.xml:105(surname) 
+#: ../C/xiphos.xml:105(surname)
 msgid "Talbert"
-msgstr ""
+msgstr "تالبرت"
 
-#: ../C/xiphos.xml:139(revnumber) 
+#: ../C/xiphos.xml:139(revnumber)
 msgid "Xiphos 3.0.0"
-msgstr ""
+msgstr "زیفوس 3.0.0"
 
-#: ../C/xiphos.xml:140(date) 
+#: ../C/xiphos.xml:140(date)
 msgid "2009-02-09"
-msgstr ""
+msgstr "9 فوریه 2009"
 
-#: ../C/xiphos.xml:143(revnumber) 
+#: ../C/xiphos.xml:143(revnumber)
 msgid "Xiphos 2.4.0"
-msgstr ""
+msgstr "زیفوس 2.4.0"
 
-#: ../C/xiphos.xml:144(date) 
+#: ../C/xiphos.xml:144(date)
 msgid "2008-09-20"
-msgstr ""
+msgstr "20 اوت 2008"
 
-#: ../C/xiphos.xml:147(revnumber) 
+#: ../C/xiphos.xml:147(revnumber)
 msgid "Xiphos 2.3.6"
-msgstr ""
+msgstr "زیفوس 2.3.6"
 
-#: ../C/xiphos.xml:148(date) 
+#: ../C/xiphos.xml:148(date)
 msgid "2008-08-02"
-msgstr ""
+msgstr "8 فوریه 2008"
 
-#: ../C/xiphos.xml:151(revnumber) 
+#: ../C/xiphos.xml:151(revnumber)
 msgid "Xiphos 2.3.5"
-msgstr ""
+msgstr "زیفوس 2.3.5"
 
-#: ../C/xiphos.xml:152(date) 
+#: ../C/xiphos.xml:152(date)
 msgid "2008-07-02"
-msgstr ""
+msgstr "2 ژوئیه 2008"
 
-#: ../C/xiphos.xml:155(revnumber) 
+#: ../C/xiphos.xml:155(revnumber)
 msgid "Xiphos 2.3.4"
-msgstr ""
+msgstr "زیفوس 2.3.4"
 
-#: ../C/xiphos.xml:156(date) 
+#: ../C/xiphos.xml:156(date)
 msgid "2008-05-26"
-msgstr ""
+msgstr "26 می 2008"
 
-#: ../C/xiphos.xml:159(revnumber) 
+#: ../C/xiphos.xml:159(revnumber)
 msgid "Xiphos 2.3.3"
-msgstr ""
+msgstr "زیفوس 2.3.3"
 
-#: ../C/xiphos.xml:160(date) 
+#: ../C/xiphos.xml:160(date)
 msgid "2008-01-20"
-msgstr ""
+msgstr "20 ژانویه 2008"
 
-#: ../C/xiphos.xml:163(revnumber) 
+#: ../C/xiphos.xml:163(revnumber)
 msgid "Xiphos 2.3.2"
-msgstr ""
+msgstr "زیفوس 2.3.2"
 
-#: ../C/xiphos.xml:164(date) 
+#: ../C/xiphos.xml:164(date)
 msgid "2007-12-26"
-msgstr ""
+msgstr "26 دسامبر 2007"
 
-#: ../C/xiphos.xml:167(revnumber) 
+#: ../C/xiphos.xml:167(revnumber)
 msgid "Xiphos 2.3.1"
-msgstr ""
+msgstr "زیفوس 2.3.1"
 
-#: ../C/xiphos.xml:168(date) 
+#: ../C/xiphos.xml:168(date)
 msgid "2007-10-15"
-msgstr ""
+msgstr "15 اکتبر 2007"
 
-#: ../C/xiphos.xml:171(revnumber) 
+#: ../C/xiphos.xml:171(revnumber)
 msgid "Xiphos 2.2.3"
-msgstr ""
+msgstr "زیفوس 2.2.3"
 
-#: ../C/xiphos.xml:172(date) 
+#: ../C/xiphos.xml:172(date)
 msgid "2007-03-26"
-msgstr ""
+msgstr "26 مارس 2007"
 
-#: ../C/xiphos.xml:175(revnumber) 
+#: ../C/xiphos.xml:175(revnumber)
 msgid "Xiphos 2.2.1"
-msgstr ""
+msgstr "زیفوس 2.2.1"
 
-#: ../C/xiphos.xml:176(date) 
+#: ../C/xiphos.xml:176(date)
 msgid "2007-01-27"
-msgstr ""
+msgstr "27 ژانویه 2007"
 
-#: ../C/xiphos.xml:179(revnumber) 
+#: ../C/xiphos.xml:179(revnumber)
 msgid "Xiphos 2.2.0"
-msgstr ""
+msgstr "زیفوس 2.20"
 
-#: ../C/xiphos.xml:180(date) 
+#: ../C/xiphos.xml:180(date)
 msgid "2006-12-23"
-msgstr ""
+msgstr "23 دسامبر 2006"
 
-#: ../C/xiphos.xml:183(revnumber) 
+#: ../C/xiphos.xml:183(revnumber)
 msgid "Xiphos 2.1.10"
-msgstr ""
+msgstr "زیفوس 2.1.10"
 
-#: ../C/xiphos.xml:184(date) 
+#: ../C/xiphos.xml:184(date)
 msgid "2006-12-10"
-msgstr ""
+msgstr "10 دسامبر 2006"
 
-#: ../C/xiphos.xml:187(revnumber) 
+#: ../C/xiphos.xml:187(revnumber)
 msgid "Xiphos 2.1.9"
-msgstr ""
+msgstr "زیفوس 2.1.9"
 
-#: ../C/xiphos.xml:188(date) 
+#: ../C/xiphos.xml:188(date)
 msgid "2006-11-12"
-msgstr ""
+msgstr "12 نوامبر 2006"
 
-#: ../C/xiphos.xml:191(revnumber) 
+#: ../C/xiphos.xml:191(revnumber)
 msgid "Xiphos 2.1.8"
-msgstr ""
+msgstr "زیفوس 2.1.8"
 
-#: ../C/xiphos.xml:192(date) 
+#: ../C/xiphos.xml:192(date)
 msgid "2006-11-08"
-msgstr ""
+msgstr "8 نوامبر 2006"
 
-#: ../C/xiphos.xml:195(revnumber) 
+#: ../C/xiphos.xml:195(revnumber)
 msgid "Xiphos 2.1.7"
-msgstr ""
+msgstr "زیفوس 2.1.7"
 
-#: ../C/xiphos.xml:196(date) 
+#: ../C/xiphos.xml:196(date)
 msgid "2006-05-04"
-msgstr ""
+msgstr "4 می 2006"
 
-#: ../C/xiphos.xml:199(revnumber) 
+#: ../C/xiphos.xml:199(revnumber)
 msgid "Xiphos 2.1.6"
-msgstr ""
+msgstr "زیفوس 2.1.6"
 
-#: ../C/xiphos.xml:200(date) 
+#: ../C/xiphos.xml:200(date)
 msgid "2006-04-13"
-msgstr ""
+msgstr "13 آوریل 2006"
 
-#: ../C/xiphos.xml:203(revnumber) 
+#: ../C/xiphos.xml:203(revnumber)
 msgid "Xiphos 2.1.5"
-msgstr ""
+msgstr "زیفوس 2.1.5"
 
-#: ../C/xiphos.xml:204(date) 
+#: ../C/xiphos.xml:204(date)
 msgid "2005-12-14"
-msgstr ""
+msgstr "14 دسامبر 2005"
 
-#: ../C/xiphos.xml:207(revnumber) 
+#: ../C/xiphos.xml:207(revnumber)
 msgid "Xiphos 2.1.4"
-msgstr ""
+msgstr "زیفوس 2.1.4"
 
-#: ../C/xiphos.xml:208(date) 
+#: ../C/xiphos.xml:208(date)
 msgid "2005-12-13"
-msgstr ""
+msgstr "13 دسامبر 2005"
 
-#: ../C/xiphos.xml:211(revnumber) 
+#: ../C/xiphos.xml:211(revnumber)
 msgid "Xiphos 2.1.2"
-msgstr ""
+msgstr "زیفوس 2.1.2"
 
-#: ../C/xiphos.xml:212(date) 
+#: ../C/xiphos.xml:212(date)
 msgid "2005-05-31"
-msgstr ""
+msgstr "31 می 2005"
 
-#: ../C/xiphos.xml:215(revnumber) 
+#: ../C/xiphos.xml:215(revnumber)
 msgid "Xiphos 2.1.1"
-msgstr ""
+msgstr "زیفوس 2.1.1"
 
-#: ../C/xiphos.xml:216(date) 
+#: ../C/xiphos.xml:216(date)
 msgid "2004-07-18"
-msgstr ""
+msgstr "18 ژوئیه 2004"
 
-#: ../C/xiphos.xml:219(revnumber) 
+#: ../C/xiphos.xml:219(revnumber)
 msgid "Xiphos 2.1.0"
-msgstr ""
+msgstr "زیفوس 2.1.0"
 
-#: ../C/xiphos.xml:220(date) 
+#: ../C/xiphos.xml:220(date)
 msgid "2004-08-30"
-msgstr ""
+msgstr "30 اوت 2004"
 
-#: ../C/xiphos.xml:223(revnumber) 
+#: ../C/xiphos.xml:223(revnumber)
 msgid "Xiphos 2.0.0"
-msgstr ""
+msgstr "زیفوس2.0.0"
 
-#: ../C/xiphos.xml:224(date) 
+#: ../C/xiphos.xml:224(date)
 msgid "2003-12-25"
-msgstr ""
+msgstr "25 دسامبر 2003"
 
-#: ../C/xiphos.xml:227(revnumber) 
+#: ../C/xiphos.xml:227(revnumber)
 msgid "Xiphos 0.7.10"
-msgstr ""
+msgstr "زیفوس 0.7.10"
 
-#: ../C/xiphos.xml:228(date) 
+#: ../C/xiphos.xml:228(date)
 msgid "2003-09-05"
-msgstr ""
+msgstr "05 سپتامبر 2003"
 
-#: ../C/xiphos.xml:231(revnumber) 
+#: ../C/xiphos.xml:231(revnumber)
 msgid "Xiphos 0.7.9"
-msgstr ""
+msgstr "زیفوس 0.7.9"
 
-#: ../C/xiphos.xml:232(date) 
+#: ../C/xiphos.xml:232(date)
 msgid "2003-03-26"
-msgstr ""
+msgstr "26 مارس 2003"
 
-#: ../C/xiphos.xml:235(revnumber) 
+#: ../C/xiphos.xml:235(revnumber)
 msgid "Xiphos 0.7.8"
-msgstr ""
+msgstr " زیفوس 0.7.8"
 
-#: ../C/xiphos.xml:236(date) 
+#: ../C/xiphos.xml:236(date)
 msgid "2003-01-12"
-msgstr ""
+msgstr "12 ژانویه 2003"
 
-#: ../C/xiphos.xml:239(revnumber) 
+#: ../C/xiphos.xml:239(revnumber)
 msgid "Xiphos 0.7.7"
-msgstr ""
+msgstr "زیفوس 0.7.7"
 
-#: ../C/xiphos.xml:240(date) 
+#: ../C/xiphos.xml:240(date)
 msgid "2002-12-20"
-msgstr ""
+msgstr "20 دسامبر 2002"
 
-#: ../C/xiphos.xml:243(revnumber) 
+#: ../C/xiphos.xml:243(revnumber)
 msgid "Xiphos 0.7.6"
-msgstr ""
+msgstr "زیفوس0.7.6"
 
-#: ../C/xiphos.xml:244(date) 
+#: ../C/xiphos.xml:244(date)
 msgid "2002-11-03"
-msgstr ""
+msgstr "03 نوامبر 2002"
 
-#: ../C/xiphos.xml:247(revnumber) 
+#: ../C/xiphos.xml:247(revnumber)
 msgid "Xiphos 0.7.5"
-msgstr ""
+msgstr "زیفوس 0.7.5"
 
-#: ../C/xiphos.xml:248(date) 
+#: ../C/xiphos.xml:248(date)
 msgid "2002-07-01"
-msgstr ""
+msgstr "01 ژوئیه 2002"
 
-#: ../C/xiphos.xml:251(revnumber) 
+#: ../C/xiphos.xml:251(revnumber)
 msgid "Xiphos 0.7.4"
-msgstr ""
+msgstr "زیفوس 0.7.4"
 
-#: ../C/xiphos.xml:252(date) 
+#: ../C/xiphos.xml:252(date)
 msgid "2002-06-10"
-msgstr ""
+msgstr "10 ژوئن 2002"
 
-#: ../C/xiphos.xml:255(revnumber) 
+#: ../C/xiphos.xml:255(revnumber)
 msgid "Xiphos 0.7.3"
-msgstr ""
+msgstr "زیفوس0.7.3"
 
-#: ../C/xiphos.xml:256(date) 
+#: ../C/xiphos.xml:256(date)
 msgid "2002-05-10"
-msgstr ""
+msgstr "10 می 2002"
 
-#: ../C/xiphos.xml:259(revnumber) 
+#: ../C/xiphos.xml:259(revnumber)
 msgid "Xiphos 0.7.2"
-msgstr ""
+msgstr "زیفوس 0.7.2"
 
-#: ../C/xiphos.xml:260(date) 
+#: ../C/xiphos.xml:260(date)
 msgid "2002-04-22"
-msgstr ""
+msgstr "22 آوریل 2002"
 
-#: ../C/xiphos.xml:263(revnumber) 
+#: ../C/xiphos.xml:263(revnumber)
 msgid "Xiphos 0.7.1"
-msgstr ""
+msgstr "زیفوس0.7.1"
 
-#: ../C/xiphos.xml:264(date) 
+#: ../C/xiphos.xml:264(date)
 msgid "2002-04-10"
-msgstr ""
+msgstr "10 آوریل 2002"
 
-#: ../C/xiphos.xml:267(revnumber) 
+#: ../C/xiphos.xml:267(revnumber)
 msgid "Xiphos 0.7.0"
-msgstr ""
+msgstr "زیفوس 0.7.0"
 
-#: ../C/xiphos.xml:268(date) 
+#: ../C/xiphos.xml:268(date)
 msgid "2002-04-09"
-msgstr ""
+msgstr "09 آوریل 2002"
 
-#: ../C/xiphos.xml:271(revnumber) 
+#: ../C/xiphos.xml:271(revnumber)
 msgid "Xiphos 0.5.0"
-msgstr ""
+msgstr "زیفوس0.5.0"
 
-#: ../C/xiphos.xml:272(date) 
+#: ../C/xiphos.xml:272(date)
 msgid "2001-08-13"
-msgstr ""
+msgstr "13 اوت 2001"
 
-#: ../C/xiphos.xml:275(revnumber) 
+#: ../C/xiphos.xml:275(revnumber)
 msgid "Xiphos 0.4.1"
-msgstr ""
+msgstr "زیفوس0.4.1"
 
-#: ../C/xiphos.xml:276(date) 
+#: ../C/xiphos.xml:276(date)
 msgid "2001-04-10"
-msgstr ""
+msgstr "10 آوریل 2001"
 
-#: ../C/xiphos.xml:279(revnumber) 
+#: ../C/xiphos.xml:279(revnumber)
 msgid "Xiphos 0.4.0"
-msgstr ""
+msgstr "زیفوس0.4.0"
 
-#: ../C/xiphos.xml:280(date) 
+#: ../C/xiphos.xml:280(date)
 msgid "2001-04-06"
-msgstr ""
+msgstr "06 آوریل 2001"
 
-#: ../C/xiphos.xml:283(revnumber) 
+#: ../C/xiphos.xml:283(revnumber)
 msgid "Xiphos 0.3.7"
-msgstr ""
+msgstr "زیفوس0.3.7"
 
-#: ../C/xiphos.xml:284(date) 
+#: ../C/xiphos.xml:284(date)
 msgid "2000-12-08"
-msgstr ""
+msgstr "08 دسامبر 2000"
 
-#: ../C/xiphos.xml:287(revnumber) 
+#: ../C/xiphos.xml:287(revnumber)
 msgid "Xiphos 0.3.6"
-msgstr ""
+msgstr "زیفوس0.3.6"
 
-#: ../C/xiphos.xml:288(date) 
+#: ../C/xiphos.xml:288(date)
 msgid "2000-12-07"
-msgstr ""
+msgstr "07 دسامبر 2000"
 
-#: ../C/xiphos.xml:291(revnumber) 
+#: ../C/xiphos.xml:291(revnumber)
 msgid "Xiphos 0.3.2"
-msgstr ""
+msgstr "زیفوس0.3.2"
 
-#: ../C/xiphos.xml:292(date) 
+#: ../C/xiphos.xml:292(date)
 msgid "2000-11-21"
-msgstr ""
+msgstr "21 موامبر 2000"
 
-#: ../C/xiphos.xml:295(revnumber) 
+#: ../C/xiphos.xml:295(revnumber)
 msgid "Xiphos 0.3.0"
-msgstr ""
+msgstr "زیفوس 0.3.0"
 
-#: ../C/xiphos.xml:296(date) 
+#: ../C/xiphos.xml:296(date)
 msgid "2000-11-10"
-msgstr ""
+msgstr "10 نوامبر 2000"
 
-#: ../C/xiphos.xml:299(revnumber) 
+#: ../C/xiphos.xml:299(revnumber)
 msgid "Xiphos 0.2.5"
-msgstr ""
+msgstr "زیفوس0.2.5"
 
-#: ../C/xiphos.xml:300(date) 
+#: ../C/xiphos.xml:300(date)
 msgid "2000-10-06"
-msgstr ""
+msgstr "06 اکتبر 2000"
 
-#: ../C/xiphos.xml:303(revnumber) 
+#: ../C/xiphos.xml:303(revnumber)
 msgid "Xiphos 0.2.4"
-msgstr ""
+msgstr "زیفوس0.2.4"
 
-#: ../C/xiphos.xml:304(date) 
+#: ../C/xiphos.xml:304(date)
 msgid "2000-09-16"
-msgstr ""
+msgstr "16 سپتامبر 2000"
 
-#: ../C/xiphos.xml:307(revnumber) 
+#: ../C/xiphos.xml:307(revnumber)
 msgid "Xiphos 0.2.3"
-msgstr ""
+msgstr "زیفوس 0.2.3"
 
-#: ../C/xiphos.xml:308(date) 
+#: ../C/xiphos.xml:308(date)
 msgid "2000-09-07"
-msgstr ""
+msgstr "07 سپتامبر 2000"
 
-#: ../C/xiphos.xml:311(revnumber) 
+#: ../C/xiphos.xml:311(revnumber)
 msgid "Xiphos 0.2.2"
-msgstr ""
+msgstr "زیفوس0.2.2"
 
-#: ../C/xiphos.xml:312(date) 
+#: ../C/xiphos.xml:312(date)
 msgid "2000-09-06"
-msgstr ""
+msgstr "06سپتامبر 2000"
 
-#: ../C/xiphos.xml:315(revnumber) 
+#: ../C/xiphos.xml:315(revnumber)
 msgid "Xiphos 0.2.1"
-msgstr ""
+msgstr "زیفوس 0.2.1 "
 
-#: ../C/xiphos.xml:316(date) 
+#: ../C/xiphos.xml:316(date)
 msgid "2000-08-29"
-msgstr ""
+msgstr "29 اوت 2000"
 
-#: ../C/xiphos.xml:319(revnumber) 
+#: ../C/xiphos.xml:319(revnumber)
 msgid "Xiphos 0.2.0"
-msgstr ""
+msgstr "زیفوس 0.2.0"
 
-#: ../C/xiphos.xml:320(date) 
+#: ../C/xiphos.xml:320(date)
 msgid "2000-08-19"
-msgstr ""
+msgstr "19 اوت 2000"
 
-#: ../C/xiphos.xml:323(revnumber) 
+#: ../C/xiphos.xml:323(revnumber)
 msgid "Xiphos 0.1.8"
-msgstr ""
+msgstr "زیفوس 0.1.8"
 
-#: ../C/xiphos.xml:324(date) 
+#: ../C/xiphos.xml:324(date)
 msgid "2000-06-10"
-msgstr ""
+msgstr "10 ژوئن 2000"
 
-#: ../C/xiphos.xml:327(revnumber) 
+#: ../C/xiphos.xml:327(revnumber)
 msgid "Xiphos 0.1.7"
-msgstr ""
+msgstr "زیفوس 0.1.7"
 
-#: ../C/xiphos.xml:328(date) 
+#: ../C/xiphos.xml:328(date)
 msgid "2000-05-19"
-msgstr ""
+msgstr "19 می 2000"
 
-#: ../C/xiphos.xml:331(revnumber) 
+#: ../C/xiphos.xml:331(revnumber)
 msgid "Xiphos 0.1.6"
-msgstr ""
+msgstr "زیفوس 0.1.6"
 
-#: ../C/xiphos.xml:332(date) 
+#: ../C/xiphos.xml:332(date)
 msgid "2000-05-08"
-msgstr ""
+msgstr "08 می 2000"
 
-#: ../C/xiphos.xml:336(releaseinfo) 
+#: ../C/xiphos.xml:336(releaseinfo)
 msgid "This manual describes version 3.0.0 of Xiphos."
-msgstr ""
+msgstr "مطالب مندرج در این کتابچه مربوط به نسخۀ 3.0.0 زیفوس می‏باشد."
 
-#: ../C/xiphos.xml:339(title) 
+#: ../C/xiphos.xml:339(title)
 msgid "Feedback"
-msgstr ""
+msgstr "پیشنهادات و نظرات شما"
 
-#: ../C/xiphos.xml:340(para) 
+#: ../C/xiphos.xml:340(para)
 msgid "To report a bug or make a suggestion regarding the Xiphos application or this manual, Use the <ulink url=\"http://sourceforge.net/tracker/?group_id=5528\"> Tracker on SourceForge</ulink> or the mailing lists."
-msgstr ""
+msgstr "برای گزارش هر گونه ایراد و یا ارائۀ پیشنهاداتتان در ارتباط با نرم‏افزار زیفوس و یا این کتابچه، لطفا روی لینک زیر کلیک بفرمایید:<ulink url=\"http://sourceforge.net/tracker/?group_id=5528\"> "
 
-#: ../C/xiphos.xml:348(keyword) 
+#: ../C/xiphos.xml:348(keyword)
 msgid "gnome"
-msgstr ""
+msgstr "گنوم"
 
-#: ../C/xiphos.xml:349(keyword) 
+#: ../C/xiphos.xml:349(keyword)
 msgid "xiphos"
-msgstr ""
+msgstr "زیفوس"
 
-#: ../C/xiphos.xml:350(keyword) 
+#: ../C/xiphos.xml:350(keyword)
 msgid "sword"
-msgstr ""
+msgstr "سورد"
 
-#: ../C/xiphos.xml:351(keyword) 
+#: ../C/xiphos.xml:351(keyword)
 msgid "crosswire"
-msgstr ""
+msgstr "کراس وایر"
 
-#: ../C/xiphos.xml:352(keyword) 
+#: ../C/xiphos.xml:352(keyword)
 msgid "help dialog"
-msgstr ""
+msgstr "هلپ دایالوگ"
 
-#: ../C/xiphos.xml:358(primary) 
+#: ../C/xiphos.xml:358(primary)
 msgid "Xiphos"
-msgstr ""
+msgstr "زیفوس"
 
-#: ../C/xiphos.xml:373(title) 
+#: ../C/xiphos.xml:373(title)
 msgid "Introduction"
-msgstr ""
+msgstr "مقدمه"
 
 #. Use the Introduction section to give a brief overview of what
-#.      the application is and what it does.
-#: ../C/xiphos.xml:5(para) 
+#. the application is and what it does.
+#: ../C/xiphos.xml:5(para)
 msgid "<application>Xiphos</application> is a Bible study and research tool based upon the \"SWORD Project\" libraries and the GNOME Desktop libraries. You can use <application>Xiphos</application> to do the following:"
-msgstr ""
+msgstr "<application>زیفوس</application> ابزاری برای مطالعۀ کتاب‏مقدّس است که بر پایۀ \"SWORD Project\" کتابخانه‏های جی‏ان‏او‏ام‏ای بنا شده است. برنامۀ <application>زیفوس</application> را می‏توانید برای موارد زیر بکار ببرید:"
 
-#: ../C/xiphos.xml:9(para) 
+#: ../C/xiphos.xml:9(para)
 msgid "View your favorite Scripture verse"
-msgstr ""
+msgstr "مشاهدۀ آیات مورد علاقه"
 
-#: ../C/xiphos.xml:12(para) 
+#: ../C/xiphos.xml:12(para)
 msgid "Make sermon or personal notes on selected passages"
-msgstr ""
+msgstr "یادداشتهای موعظه و یادداشتهای شخصی خود را در مورد آیات مورد نظر می‏توانید تایپ کنید"
 
-#: ../C/xiphos.xml:15(para) 
+#: ../C/xiphos.xml:15(para)
 msgid "Automatically follow Bible footnotes and cross-references"
-msgstr ""
+msgstr "بصورت اتوماتیک پانویس‏های کتاب‏مقدس و سایر کتب مرجع را دنبال کنید "
 
-#: ../C/xiphos.xml:18(para) 
+#: ../C/xiphos.xml:18(para)
 msgid "Compare translations in parallel"
-msgstr ""
+msgstr "ترجمه‏های گوناگون را بصورت موازی مقایسه کنید"
 
-#: ../C/xiphos.xml:21(para) 
+#: ../C/xiphos.xml:21(para)
 msgid "Work in original language study using the available Hebrew and Greek translations"
-msgstr ""
+msgstr "با بهره برداری از متون عبری و یونانی روی زبان‏های اصلی کتاب‏مقدس کارهای مطالعاتی و تحقیقاتی انجام دهید"
 
-#: ../C/xiphos.xml:25(para) 
+#: ../C/xiphos.xml:25(para)
 msgid "<application>Xiphos</application> aims to provide a simple and clean user interface while providing a powerful tool allowing a personalized Bible study environment."
-msgstr ""
+msgstr "<application>زیفوس</application> این را هدف خود قرار داده است که یک محیط کاری ساده در اختیار کاربران قرار دهد، در عین حال با در اختیار قرار دادن ابزاری بسیار قوی به کاربر اجازه دهد که کارهای مطالعاتی-تحقیقاتی خود را بر روی کتاب‏مقدّس انجام دهد."
 
-#: ../C/xiphos.xml:30(title) ../C/xiphos.xml:43(phrase) 
+#: ../C/xiphos.xml:30(title)
+#: ../C/xiphos.xml:43(phrase)
 msgid "The SWORD Project logo"
-msgstr ""
+msgstr "علامت انحصاری پروژۀ شمشیر"
 
-#: ../C/xiphos.xml:49(para) 
+#: ../C/xiphos.xml:49(para)
 msgid "\"The SWORD Project\" is based at <ulink type=\"http\" url=\"http://www.crosswire.org\">http://www.crosswire.org</ulink>. Other applications under the same banner are <application>The SWORD Project for Windows</application> (aka <application>BibleCS</application> or <application>WinSword</application>), <application>MacSword</application> for the Macintosh, <application>BibleDesktop</application>, a Java application, and <application>BibleTime</application>, another Linux program."
-msgstr ""
+msgstr "\"پروژۀ شمشیر\" بر مبنای <ulink type=\"http\" url=\"http://www.crosswire.org\">http://www.crosswire.org</ulink> است. سایر برنامه‏هایی که تحت همان علامت هستند، شامل <application>پروژۀ شمشیر برای ویندوز</application> (aka <application>BibleCS</application> or <application>WinSword</application>), <application>مک‏سورد</application> برای کامپیوترهای مک‏اینتاش, <application>بایبل دسکتاپ</application>, که یک برنامۀ جاوا است, و <application>بایبل تایم</application>, که یک برنامۀ دیگر قابل اجرا تحت لینوکس است، می‏باشند."
 
-#: ../C/xiphos.xml:59(title) ../C/xiphos.xml:72(phrase) 
+#: ../C/xiphos.xml:59(title)
+#: ../C/xiphos.xml:72(phrase)
 msgid "Xiphos in action"
-msgstr ""
+msgstr "زیفوس در حال اجرا می‏باشد"
 
-#: ../C/xiphos.xml:81(para) 
+#: ../C/xiphos.xml:81(para)
 msgid "<application>Xiphos</application> is currently in development, so this manual may not reflect the program as you see it. If it does not, please file a bug at the <ulink type=\"http\" url=\"http://sourceforge.net/projects/xiphos\"> project website</ulink>, or email <email>xiphos-developers@lists.sourceforge.net</email>. All help is appreciated, as it will improve the software."
-msgstr ""
+msgstr "<application>زیفوس</application> در حال حاضر تحت گسترش است، به همین دلیل ممکن است در بخشی از برنامه مشکلاتی به چشمتان بخورد، که در اینصورت لطفاً آن مورد را از لینک زیر به ما اطلاع دهید <ulink type=\"http\" url=\"http://sourceforge.net/projects/xiphos\"> وب‏سایت پروژه</ulink>، یا ایمیل <email>xiphos-developers@lists.sourceforge.net</email>. از هرگونه راهنمایی و کمک شما پیشاپیش سپاسگزاریم"
 
-#: ../C/xiphos.xml:386(title) 
+#: ../C/xiphos.xml:386(title)
 msgid "Getting Started with Xiphos"
-msgstr ""
+msgstr "شروع به استفاده از زیفوس"
 
-#: ../C/xiphos.xml:4(title) ../C/start.xml:4(title) 
+#: ../C/xiphos.xml:4(title)
+#: ../C/start.xml:4(title)
 msgid "Starting Xiphos"
-msgstr ""
+msgstr "زیفوس در حال بارگذاری"
 
-#: ../C/xiphos.xml:5(para) ../C/start.xml:5(para) 
+#: ../C/xiphos.xml:5(para)
+#: ../C/start.xml:5(para)
 msgid "You can start <application>Xiphos</application> in the following ways:"
-msgstr ""
+msgstr "شما می‏توانید برنامۀ <application>زیفوس</application> را به یکی از روش‏های زیر اجرا نمایید:"
 
-#: ../C/xiphos.xml:10(term) ../C/start.xml:10(term) 
+#: ../C/xiphos.xml:10(term)
+#: ../C/start.xml:10(term)
 msgid "Applications menu"
-msgstr ""
+msgstr "فهرست برنامه‏ها"
 
-#: ../C/xiphos.xml:12(para) ../C/start.xml:12(para) 
+#: ../C/xiphos.xml:12(para)
+#: ../C/start.xml:12(para)
 msgid "Choose <menuchoice><guisubmenu>Accessories</guisubmenu><guimenuitem>Xiphos Bible Guide</guimenuitem></menuchoice>."
-msgstr ""
+msgstr "گزینۀ  <menuchoice><guisubmenu>لوازم را برگزینید</guisubmenu><guimenuitem> و سپس به راهنمای زیفوس کتاب‏مقدس بروید</guimenuitem></menuchoice>."
 
-#: ../C/xiphos.xml:20(term) ../C/start.xml:20(term) 
+#: ../C/xiphos.xml:20(term)
+#: ../C/start.xml:20(term)
 msgid "Command line"
-msgstr ""
+msgstr "خط فرمان"
 
-#: ../C/xiphos.xml:22(para) ../C/start.xml:22(para) 
+#: ../C/xiphos.xml:22(para)
+#: ../C/start.xml:22(para)
 msgid "Type <command>xiphos</command>, then press <keycap>Return</keycap>."
-msgstr ""
+msgstr "عبارت <command>زیفوس</command>,  را وارد نموده، سپس کلید <keycap>اینتر</keycap>را بزنید."
 
-#: ../C/xiphos.xml:28(term) ../C/start.xml:28(term) 
+#: ../C/xiphos.xml:28(term)
+#: ../C/start.xml:28(term)
 msgid "Windows"
-msgstr ""
+msgstr "پنجره‏ها"
 
-#: ../C/xiphos.xml:30(para) ../C/start.xml:30(para) 
+#: ../C/xiphos.xml:30(para)
+#: ../C/start.xml:30(para)
 msgid "Go to <menuchoice><guisubmenu>All Programs</guisubmenu><guisubmenu>Xiphos </guisubmenu><guimenuitem>Xiphos</guimenuitem></menuchoice>."
-msgstr ""
+msgstr "گزینۀ <menuchoice><guisubmenu>تمام برنامه‏ها</guisubmenu><guisubmenu>زیفوس </guisubmenu><guimenuitem>زیفوس</guimenuitem></menuchoice>را برگزیند."
 
-#: ../C/xiphos.xml:41(title) 
+#: ../C/xiphos.xml:41(title)
 msgid "Starting Xiphos For The First Time"
-msgstr ""
+msgstr "شروع برنامۀ زیفوس برای اولین مرتبه"
 
-#: ../C/xiphos.xml:42(para) 
+#: ../C/xiphos.xml:42(para)
 msgid "When you start <application>Xiphos</application> for the first time, <application>Xiphos</application> creates a default selection of options for display. Also, if no other Sword application has ever been run, and thus there are no Bible modules installed, then <application>Xiphos</application> asks permission to start the Module Manager so that you can select and install a Bible module in your language preference."
-msgstr ""
+msgstr "هنگامی که<application>برنامۀ زیفوس</application> را برای اولین مرتبه باز می‏کنید،<application>زیفوس</application> یک‏سری گزینه‏های قراردادی ایجاد می‏کند. همچنین، چنانچه در گذشته برنامۀ دیگری از سری سورد اجرا شده باشد، ولی با این وجود هیچ مدول کتاب‏مقدس نصب نشده باشد، در آنصورت <application>زیفوس</application> از شما اجازه خواهد خواست تا برنامۀ مدیر مدول را اجرا نماید که به کمک آن شما می‏توانید یک مدول کتاب‏مقدس را به زبانی که بیشتر آنرا ترجیح می‏دهید، نصب کنید."
 
-#: ../C/xiphos.xml:49(title) ../C/xiphos.xml:62(phrase) 
+#: ../C/xiphos.xml:49(title)
+#: ../C/xiphos.xml:62(phrase)
 msgid "Xiphos Download Question"
-msgstr ""
+msgstr "پرسش‏های مرتبط با دانلود کردن زیفوس"
 
-#: ../C/xiphos.xml:69(para) 
+#: ../C/xiphos.xml:69(para)
 msgid "<application>Xiphos</application> then opens its interface with one tab displayed, showing Romans 8:28. Once the interface is open, you can use <menuchoice><guimenuitem>Edit</guimenuitem><guimenuitem>Preferences</guimenuitem></menuchoice> to change any of the selections already made by default."
-msgstr ""
+msgstr "<application>زیفوس</application> در ابتدای اجرای آن یک محیط کاری دارای یک برگه باز می‏کند، که در آن آیۀ رومیان 8: 28 به چشم می‏خورد. کاربر در این محیط کاری، می‏تواند در  بخش <menuchoice><guimenuitem>ویرایش</guimenuitem><guimenuitem>فرمان ترجیحات</guimenuitem></menuchoice> را برگزیند و بدینوسیله تغییرات دلخواه را در قسمت‏هایی که بصورت اتوماتیک ایجاد شده‏اند، بدهد."
 
-#: ../C/xiphos.xml:78(title) 
+#: ../C/xiphos.xml:78(title)
 msgid "Launching Xiphos"
-msgstr ""
+msgstr "بارگذاری زیفوس"
 
-#: ../C/xiphos.xml:79(para) 
+#: ../C/xiphos.xml:79(para)
 msgid "When you start <application>Xiphos</application>, the following interface is displayed:"
-msgstr ""
+msgstr "هر زمان که برنامۀ <application>زیفوس</application>را باز کنید، محیط کاری زیر را مشاهده خواهید کرد:"
 
-#: ../C/xiphos.xml:83(title) 
+#: ../C/xiphos.xml:83(title)
 msgid "Xiphos interface"
-msgstr ""
+msgstr "محیط کاری زیفوس"
 
-#: ../C/xiphos.xml:96(phrase) 
+#: ../C/xiphos.xml:96(phrase)
 msgid "The Xiphos Interface"
-msgstr ""
+msgstr "محیط کاری زیفوس"
 
-#: ../C/xiphos.xml:103(para) 
+#: ../C/xiphos.xml:103(para)
 msgid "The <application>Xiphos</application> interface contains the following elements:"
-msgstr ""
+msgstr "محیط کاری <application>زیفوس</application>دارای عناصر زیر می‏باشد."
 
-#: ../C/xiphos.xml:108(term) ../C/xiphos.xml:5(title) ../C/xiphos.xml:14(title) ../C/interface.xml:5(title) ../C/interface.xml:14(title) 
+#: ../C/xiphos.xml:108(term)
+#: ../C/xiphos.xml:5(title)
+#: ../C/xiphos.xml:14(title)
+#: ../C/interface.xml:5(title)
+#: ../C/interface.xml:14(title)
 msgid "Menubar"
-msgstr ""
+msgstr "خط فرمان"
 
-#: ../C/xiphos.xml:110(para) 
+#: ../C/xiphos.xml:110(para)
 msgid "The menus on the menubar contain several commands which extend the use of <application>Xiphos </application>. These include the StudyPad and advanced search functions. The menus also help you to customize your use of <application>Xiphos</application>."
-msgstr ""
+msgstr "خط فرمان دارای چند فرمان است که کاربرد<application>زیفوس</application>را گسترش می‏بخشد. این فرامین شامل محلی برای یادداشت‏های مطالعه و نیز توابع جستجوی پیشرفته می‏باشد. فرامی همچنین به شما کمک می‏کنند تا بتوانید استفاده از برنامۀ <application>زیفوس </application>را بسیار شخصی و به دلخواه خود بنمایید."
 
-#: ../C/xiphos.xml:118(term) 
+#: ../C/xiphos.xml:118(term)
 msgid "Toolbar"
-msgstr ""
+msgstr "ستون ابزار"
 
-#: ../C/xiphos.xml:120(para) 
+#: ../C/xiphos.xml:120(para)
 msgid "The <interface>toolbar</interface> contains buttons that let you quickly navigate through the Bible."
-msgstr ""
+msgstr "ستون<interface>ابزار</interface>شامل کلیدهایی است که به شما کمک می‏کند تا به سرعت و سهولت بتوانید از کتاب‏مقدس استفاده نمایید."
 
-#: ../C/xiphos.xml:126(term) ../C/xiphos.xml:144(title) 
+#: ../C/xiphos.xml:126(term)
+#: ../C/xiphos.xml:144(title)
 msgid "Sidebar"
-msgstr ""
+msgstr "ستون جانبی"
 
-#: ../C/xiphos.xml:128(para) 
+#: ../C/xiphos.xml:128(para)
 msgid "The <interface>Sidebar</interface> provides access to several features. It contains your bookmarks and the list of installed books. It can also be used to perform simple searches."
-msgstr ""
+msgstr "ستون<interface>جانبی</interface>دستیابی به چندین کاربرد اساسی را ممکن می‏سازذ. این ستون شامل تمام علائم و نیز لیست کتابهایی است که نصب کرده‏اید. این ابزار همچنین برای جستجوهای ساده نیز قابل استفاده است."
 
-#: ../C/xiphos.xml:136(term) 
+#: ../C/xiphos.xml:136(term)
 msgid "Bible Text Pane"
-msgstr ""
+msgstr "چارچوب متن کتاب‏مقدس"
 
-#: ../C/xiphos.xml:138(para) 
+#: ../C/xiphos.xml:138(para)
 msgid "The <interface>Bible Text pane</interface> displays the Bible text which is currently being viewed."
-msgstr ""
+msgstr "چارچوب<interface>متن کتاب‏مقدس</interface>متن کتاب‏مقدسی را که باز دارید نشان می‏دهد."
 
-#: ../C/xiphos.xml:144(term) ../C/xiphos.xml:517(title) ../C/xiphos.xml:531(phrase) 
+#: ../C/xiphos.xml:144(term)
+#: ../C/xiphos.xml:517(title)
+#: ../C/xiphos.xml:531(phrase)
 msgid "Previewer"
-msgstr ""
+msgstr "پیش‏نگر"
 
-#: ../C/xiphos.xml:146(para) 
+#: ../C/xiphos.xml:146(para)
 msgid "The <interface>Previewer</interface> displays Bible text module options. These include Strong's numbers, footnotes and morphological tags. It is located below the Bible Text Pane."
-msgstr ""
+msgstr "فرمان <interface>پیش‏نگر</interface>گزینه‏های مدول متن کتاب‏مقدس را نشان می‏دهد. این شامل اعداد مرتبط با کشف‏الآیات استرانگ، پانویس‏ها و نیز علائم زبان‏شناسی می‏باشند. این فرمان در زیر چاچوب متن کتاب‏مقدس قرار دارد."
 
-#: ../C/xiphos.xml:153(term) ../C/xiphos.xml:571(phrase) 
+#: ../C/xiphos.xml:153(term)
+#: ../C/xiphos.xml:571(phrase)
 msgid "Commentary Pane"
-msgstr ""
+msgstr "چارچوب تفاسیر"
 
-#: ../C/xiphos.xml:155(para) 
+#: ../C/xiphos.xml:155(para)
 msgid "The <interface>Commentary pane</interface> displays commentaries on the current Bible Text being used."
-msgstr ""
+msgstr "فرمان<interface>چارچوب تفسیر</interface>کتابهای تفسیری را که در مرتبط با متن کتاب‏مقدس در حال استفاده است، نشان می‏دهد."
 
-#: ../C/xiphos.xml:161(term) 
+#: ../C/xiphos.xml:161(term)
 msgid "Book Pane"
-msgstr ""
+msgstr "چارچوب کتاب"
 
-#: ../C/xiphos.xml:163(para) 
+#: ../C/xiphos.xml:163(para)
 msgid "The <interface>Book Pane</interface> displays general books available from the Sword Project. These include modules like \"Calvin's Institutes\", \"Josephus: The Complete Works\" etc. This Pane can be accessed via the Book View tab just below the Commentary Pane."
-msgstr ""
+msgstr "فرمان <interface>چارچوب کتاب</interface>کتابهای عمومی را که از طریق سورد در اختیار کاربر قرار دارند، نشان می‏دهد. این شامل مدول‏هایی از قبیل کتابهایی چون: \"قوانین کالوین\", \"ژوزفوس: سری کامل نوشتجات \" و غیره. این چارچوب را می‏توان از طریق فرمان مشاهدۀ مرور کتاب که در زیر فرمان چارچوب تفسیر است مورد استفاده قرار داد."
 
-#: ../C/xiphos.xml:171(term) 
+#: ../C/xiphos.xml:171(term)
 msgid "Dictionary/Book Pane"
-msgstr ""
+msgstr "چارچوب فرهنگ واژه‏ها/کتاب"
 
-#: ../C/xiphos.xml:173(para) 
+#: ../C/xiphos.xml:173(para)
 msgid "The <interface>Dictionary/Book Pane</interface> displays dictionary information on selected words in the <interface>Bible Text Pane</interface>. It is located just below the Commentary Pane"
-msgstr ""
+msgstr "گزینه <interface>دیکشنری</interface> تعریف واژه های برگزیده شده را نشان می دهد در در بخش <interface>متن کتاب مقدس</interface>. نشان می دهد این گزینه پس از گزینه تفسیر قرار دارد."
 
-#: ../C/xiphos.xml:180(para) 
+#: ../C/xiphos.xml:180(para)
 msgid "When you right-click in the different interface sections, the interface displays a popup menu, which provides access to more module-specific options, including display controls and printing services."
-msgstr ""
+msgstr "هنگامی که شما در محیط‏های کاری گوناگون روی ماوس رایت‏کلیک بکنید، یک صفحۀ جدید در آن محیط کاری باز خواهد شد، که به شما گزینه‏های بیشتری خواهد داد، شامل کنترل‏های صفحۀ نمایش و خدمات چاپ."
 
-#: ../C/xiphos.xml:392(title) 
+#: ../C/xiphos.xml:392(title)
 msgid "Interface"
-msgstr ""
+msgstr "محیط کاری"
 
-#: ../C/xiphos.xml:6(para) ../C/interface.xml:6(para) 
+#: ../C/xiphos.xml:6(para)
+#: ../C/interface.xml:6(para)
 msgid "At the top of the <application>Xiphos</application> main window is the menubar. Almost all of the functions are available by activating the appropriate menu item. The functions have been grouped according to their type. For example, the file operations have been grouped into the <guisubmenu>File</guisubmenu> menu."
-msgstr ""
+msgstr "در بخش بالایی برنامۀ<application>زیفوس</application>خط فرمان قرار دارد.تقریباً تمامی کاربردها توسط انتخاب منوی درست اجرا می‏شوند. این کابردها بسته به نوع کاری که انجام می‏دهند گروه‏بندی شده‏اند. بعنوان نمونه، گروه فرامین کاربردی مرتبط با فایل، زیر فرمان<guisubmenu>پرونده</guisubmenu>دسته‏بندی شده‏اند."
 
-#: ../C/xiphos.xml:27(phrase) 
+#: ../C/xiphos.xml:27(phrase)
 msgid "Xiphos menubar"
-msgstr ""
+msgstr "خط فرمان زیفوس"
 
-#: ../C/xiphos.xml:37(title) 
+#: ../C/xiphos.xml:37(title)
 msgid "Toolbars"
-msgstr ""
+msgstr "ستون‏فرمان"
 
-#: ../C/xiphos.xml:38(para) 
+#: ../C/xiphos.xml:38(para)
 msgid "The function of the Toolbar is to provide control over the Bible and Commentary Panes. Activation of the Toolbar option is done by moving the mouse cursor over the desired toolbar button and selecting it. A tooltip will appear if the mouse cursor is held stationary over a toolbar button, describing the function of the button."
-msgstr ""
+msgstr "The function of the Toolbar is to provide control over the Bible and Commentary Panes. Activation of the Toolbar option is done by moving the mouse cursor over the desired toolbar button and selecting it. A tooltip will appear if the mouse cursor is held stationary over a toolbar button, describing the function of the button.کاربرد ستون ابزار اینست که کنترل‏های مربویط به چارچوب‏های کتاب‏مقدس و تفسیر را فراهم نماید. با حرکت دادن نشانگر ماوس بر روی دکمۀ ابزار مورد نظرتان و انتخاب آن، این گزینه فعال خواهد شد. اگر نشانگر ماوس را برای چند لحظه بر روی ابزار نگاه دارید، یک راهنمای کوچک باز خواهد شد که کاربرد آن کلید را توضیح خواهد داد. "
 
-#: ../C/xiphos.xml:45(title) 
+#: ../C/xiphos.xml:45(title)
 msgid "ToolBar"
-msgstr ""
+msgstr "ابزار"
 
-#: ../C/xiphos.xml:58(phrase) 
+#: ../C/xiphos.xml:58(phrase)
 msgid "The Toolbar"
-msgstr ""
+msgstr "ابزار"
 
-#: ../C/xiphos.xml:63(para) 
+#: ../C/xiphos.xml:63(para)
 msgid "The <interface>Toolbar</interface> consists of the following functions:"
-msgstr ""
+msgstr "گزینۀ <interface>ابزار</interface>شامل کاربردهای زیر است:"
 
-#: ../C/xiphos.xml:68(para) 
+#: ../C/xiphos.xml:68(para)
 msgid "History View Toggle and drop-down menu"
-msgstr ""
+msgstr "تاریخچه مرور انتخاب و لیست"
 
-#: ../C/xiphos.xml:73(para) ../C/xiphos.xml:102(title) 
+#: ../C/xiphos.xml:73(para)
+#: ../C/xiphos.xml:102(title)
 msgid "Bible Book Selector"
-msgstr ""
+msgstr "انتخاب بخشی از کتاب‏مقدس"
 
-#: ../C/xiphos.xml:78(para) ../C/xiphos.xml:110(title) 
+#: ../C/xiphos.xml:78(para)
+#: ../C/xiphos.xml:110(title)
 msgid "Bible Chapter Selector"
-msgstr ""
+msgstr "انتخاب فصلی از کتاب‏مقدس"
 
-#: ../C/xiphos.xml:83(para) ../C/xiphos.xml:118(title) 
+#: ../C/xiphos.xml:83(para)
+#: ../C/xiphos.xml:118(title)
 msgid "Bible Verse Selector"
-msgstr ""
+msgstr "انتخاب آیه‏ای از کتاب‏مقدس"
 
-#: ../C/xiphos.xml:88(para) ../C/xiphos.xml:126(title) 
+#: ../C/xiphos.xml:88(para)
+#: ../C/xiphos.xml:126(title)
 msgid "Bible Passage Summary"
-msgstr ""
+msgstr "خلاصۀ بخش بخصوصی از کتاب‏مقدس"
 
-#: ../C/xiphos.xml:95(title) 
+#: ../C/xiphos.xml:95(title)
 msgid "History Forward/Backward Selector"
-msgstr ""
+msgstr "انتخاب کردن تاریخچۀ پیشین/پسین"
 
-#: ../C/xiphos.xml:96(para) 
+#: ../C/xiphos.xml:96(para)
 msgid "Switches between current and previous passage selections."
-msgstr ""
+msgstr "حرکت بین قسمت برگزیده شدۀ فعلی و پیشین."
 
-#: ../C/xiphos.xml:103(para) 
+#: ../C/xiphos.xml:103(para)
 msgid "Selects the Biblical book to be displayed in the <interface>Bible Text Pane</interface> and <interface>Commentary Pane</interface>. Changes take immediate effect."
-msgstr ""
+msgstr "این فرمان یک کتاب از کتاب‏مقدس را که مایل هستید در بخش <interface>چارچوب متن کتاب‏مقدس</interface> و <interface>چارچوب تفسیر</interface>نشان می‏دهد. هرگونه تغییری در این قسمت بلافاصله اعمال خواهد شد."
 
-#: ../C/xiphos.xml:111(para) 
+#: ../C/xiphos.xml:111(para)
 msgid "Selects the Biblical chapter of current book to be displayed in the <interface>Bible Text Pane</interface> and <interface>Commentary Pane</interface>. Changes take immediate effect."
-msgstr ""
+msgstr "این فرمان فصلی از کتاب‏مقدس را که مایل هستید در بخش <interface>چارچوب متن کتاب‏مقدس</interface> و <interface>چارچوب تفسیر</interface>نشان می‏دهد. هرگونه تغییری در این قسمت بلافاصله اعمال خواهد شد."
 
-#: ../C/xiphos.xml:119(para) 
+#: ../C/xiphos.xml:119(para)
 msgid "Selects the Biblical verse of current chapter to be displayed in the <interface>Bible Text Pane</interface> and <interface>Commentary Pane</interface>. Changes take immediate effect."
-msgstr ""
+msgstr "این فرمان یک آیه از کتاب‏مقدس را که مایل هستید در بخش <interface>چارچوب متن کتاب‏مقدس</interface> و <interface>چارچوب تفسیر</interface>نشان می‏دهد. هرگونه تغییری در این قسمت بلافاصله اعمال خواهد شد."
 
-#: ../C/xiphos.xml:127(para) 
+#: ../C/xiphos.xml:127(para)
 msgid "Allows manual editing of passages which are displayed in the <interface>Bible Text Pane</interface> and <interface>Commentary Pane</interface>. Changes take effect once Enter is typed."
-msgstr ""
+msgstr "Allows manual editing of passages which are displayed in the <interface>Bible Text Pane</interface> and <interface>Commentary Pane</interface>. Changes take effect once Enter is typed.این فرمان، اجازه می‏دهد که شما قسمتهایی  را که مایل هستید در بخش <interface>چارچوب متن کتاب‏مقدس</interface> و <interface>چارچوب تفسیر</interface>ویرایش کنید. هرگونه تغییری در این قسمت بلافاصله اعمال خواهد شد."
 
-#: ../C/xiphos.xml:132(para) 
+#: ../C/xiphos.xml:132(para)
 msgid "Ensure that edited book,chapter and verse naming is correct, otherwise the wrong or no information will be displayed."
-msgstr ""
+msgstr "لطفا اطمینان حاصل کنید که کتاب، فصل، و یا آیه‏ای که آنرا ویرایش کرده‏اید به درستی نامگذاری شده است، در غیر اینصورت اطلاعات اشتباه نمایش داده خواهد شد."
 
-#: ../C/xiphos.xml:142(title) ../C/xiphos.xml:157(phrase) 
+#: ../C/xiphos.xml:142(title)
+#: ../C/xiphos.xml:157(phrase)
 msgid "The Sidebar"
-msgstr ""
+msgstr "ابزار جانبی"
 
-#: ../C/xiphos.xml:163(para) 
+#: ../C/xiphos.xml:163(para)
 msgid "On the left hand side of <application>Xiphos</application> there is the Sidebar. Here the user can switch between the different Sword modules, view bookmarks, do simple searches and view verse lists. To switch between all Sidebar functions, shortcuts have been placed at the bottom of the Sidebar. Clicking on the shortcut activates the option."
-msgstr ""
+msgstr "در بخش کناری برنامۀ<application>زیفوس</application>ستون جانبی به چشم می‏خورد. در این بخش، کاربر می‏تواند بین مدول‏های مختلف حرکت کند، علامت‏گذاری‏هایش را مشاهده کند، فرمان جستجوی ساده را اجرا کند و لیست آیات را مشاهده نماید. به منظور تغییر کاربرد فرامین ستون جانبی، آیکون‏هایی به همین منظور ساخته شده‏اند که در پایین ستون جانبی قرار دارند. توسط کلیک کردن بر روی این آیکون‏ها، مسیرهای کوتاه فعال و اجرا خواهند شد. "
 
-#: ../C/xiphos.xml:170(title) 
+#: ../C/xiphos.xml:170(title)
 msgid "Sidebar Shortcuts"
-msgstr ""
+msgstr "میان‏بر به ابزار جانبی"
 
-#: ../C/xiphos.xml:183(phrase) 
+#: ../C/xiphos.xml:183(phrase)
 msgid "Sidebar shortcuts"
-msgstr ""
+msgstr "میان‏بر به ابزار جانبی"
 
-#: ../C/xiphos.xml:191(title) 
+#: ../C/xiphos.xml:191(title)
 msgid "The Bible Text Pane"
-msgstr ""
+msgstr "چارچوب متن کتاب‏مقدس"
 
-#: ../C/xiphos.xml:193(title) 
+#: ../C/xiphos.xml:193(title)
 msgid "The Bible Textpane"
-msgstr ""
+msgstr "چارچوب متن کتاب‏مقدس"
 
-#: ../C/xiphos.xml:206(phrase) 
+#: ../C/xiphos.xml:206(phrase)
 msgid "The Bible textpane"
-msgstr ""
+msgstr "چارچوب متن کتاب‏مقدس"
 
-#: ../C/xiphos.xml:212(para) 
+#: ../C/xiphos.xml:212(para)
 msgid "Positioned to the right of the Shortcut bar is the Bible text pane. All your different translations will be displayed for full viewing. When starting <application>Xiphos</application> either your default Bible translation or the translation last used will be displayed."
-msgstr ""
+msgstr "در سمت راست ستون شورت‏کات‏ها، چارچوب متن کتاب‏مقدس قرار دارد. تمام ترجمه‏های گوناگونی که شما دارید در این قسمت نشان داده می‏شوند. هنگامی که برنامۀ <application>زیفوس</application>را باز می‏کنید، بصورت اتوماتیک یا کتاب‏مقدس استاندارد شما و یا آخرین کتاب‏مقدسی که باز کرده بودید، بر روی این صفحه باز خواهد شد. "
 
-#: ../C/xiphos.xml:219(title) 
+#: ../C/xiphos.xml:219(title)
 msgid "Opening A Specific Bible Translation"
-msgstr ""
+msgstr "باز کردن ترجمۀ خاصی از کتاب‏مقدس"
 
-#: ../C/xiphos.xml:220(para) 
+#: ../C/xiphos.xml:220(para)
 msgid "In order to change the current Bible translation to another of your choice:"
-msgstr ""
+msgstr "به منظور تعویض ترجمۀ فعلی کتاب‏مقدس به یکی دیگر از ترجمه‏ها:"
 
-#: ../C/xiphos.xml:225(para) 
+#: ../C/xiphos.xml:225(para)
 msgid "right-click in the <interface>Bible Text Pane</interface>. In the popup menu choose <menuchoice><guimenuitem>File</guimenuitem><guimenuitem>Open Module</guimenuitem></menuchoice> and select your specific translation that you want to view."
-msgstr ""
+msgstr "بر روی <interface>چارچوب متن کتاب‏مقدس</interface>رایت‏کلیک کنید. از صفحۀ فهرستی که باز شد، گزینۀ <menuchoice><guimenuitem>پرونده</guimenuitem><guimenuitem>بازکردن مدول</guimenuitem></menuchoice>را برگزینید و سپس ترجمه‏ای را دوست دارید، استفاده کنید، باز نمایید."
 
-#: ../C/xiphos.xml:232(para) 
+#: ../C/xiphos.xml:232(para)
 msgid "under the <guibutton>Modules</guibutton> option in the <interface>Sidebar</interface>, choose <menuchoice><guimenuitem>Biblical Texts</guimenuitem><guimenuitem>language choice</guimenuitem></menuchoice> and select your specific translation."
-msgstr ""
+msgstr "زیر عنوان<guibutton> مدول‏ها،</guibutton>در بخش <interface>ستون جانبی</interface>،گزینۀ<menuchoice><guimenuitem>متون کتابمقدس</guimenuitem><guimenuitem>،زبان مورد علاقه</guimenuitem></menuchoice>، و ترجمۀ خاصی را که دوست دارید، می‏توانید انتخاب کنید."
 
-#: ../C/xiphos.xml:242(title) 
+#: ../C/xiphos.xml:242(title)
 msgid "Using the Parallel View Mode"
-msgstr ""
+msgstr "استفاده از کاربرد موازی"
 
-#: ../C/xiphos.xml:243(para) 
+#: ../C/xiphos.xml:243(para)
 msgid "A nice function in <application>Xiphos</application> is the ability to view your specified bible text in five parallel translations of your choice. The Parallel View mode can be accessed by selecting <guimenuitem>Parallel View</guimenuitem> just below the <interface>Bible Text Pane</interface>, next to the <guimenuitem>Standard View</guimenuitem> tab. Please note that you can only view one verse at a time. You can change the verse by selecting another verse, chapter, or book at the toolbar. Also note that modules that are Old Testament or New Testament only (eg Westminster Leningrad Codex and Byzantine Majority Text ) will not be able to display books, chapters, or verses that they don't have."
 msgstr ""
 
-#: ../C/xiphos.xml:252(title) ../C/xiphos.xml:264(phrase) 
+#: ../C/xiphos.xml:252(title)
+#: ../C/xiphos.xml:264(phrase)
 msgid "Bible textpane - parallel view"
-msgstr ""
+msgstr "چارچوب متن کتاب‏مقدس- نگرش موازی"
 
-#: ../C/xiphos.xml:270(para) 
+#: ../C/xiphos.xml:270(para)
 msgid "Additionally, a separate Parallel View window can be selected from the right click menu with <guimenuitem>Detach/Attach</guimenuitem>. Your Bible pane will return to its normal single text view, and the new Parallel View window will show the complete chapter, in all 5 translations."
 msgstr ""
 
-#: ../C/xiphos.xml:276(title) ../C/xiphos.xml:288(phrase) 
+#: ../C/xiphos.xml:276(title)
+#: ../C/xiphos.xml:288(phrase)
 msgid "Parallel View - separate window"
-msgstr ""
+msgstr "نگرش موازی - پنجره‏ای دیگر"
 
-#: ../C/xiphos.xml:297(title) 
+#: ../C/xiphos.xml:297(title)
 msgid "Opening A Separate Bible Translation"
-msgstr ""
+msgstr "ترجمۀ دیگری از کتاب‏مقدس را باز می‏کند"
 
-#: ../C/xiphos.xml:298(para) 
+#: ../C/xiphos.xml:298(para)
 msgid "In order to view a Bible translation separate from the <application>Xiphos</application> interface:"
-msgstr ""
+msgstr "به منظور مشاهدۀ یک ترجمۀ دیگری از کتاب‏مقدس از ترجمه‏های موجود در <application>محیط کاری</application>زیفوس:"
 
-#: ../C/xiphos.xml:303(para) 
+#: ../C/xiphos.xml:303(para)
 msgid "Under the <guibutton>Modules</guibutton> option in the <interface>Sidebar</interface>,choose <menuchoice><guimenuitem>Biblical Texts</guimenuitem><guimenuitem>language choice</guimenuitem></menuchoice>. Then right-click on a translation and choose the <guimenuitem>Open in dialog</guimenuitem> option."
 msgstr ""
 
-#: ../C/xiphos.xml:314(title) 
+#: ../C/xiphos.xml:314(title)
 msgid "Finding Out About The Current Translation"
 msgstr ""
 
-#: ../C/xiphos.xml:315(para) 
+#: ../C/xiphos.xml:315(para)
 msgid "To find out about the Bible translation currently being displayed:"
 msgstr ""
 
-#: ../C/xiphos.xml:320(para) 
+#: ../C/xiphos.xml:320(para)
 msgid "right-click in the <interface>Bible Text pane</interface>. In the popup menu choose <guimenuitem>About </guimenuitem> module name."
 msgstr ""
 
-#: ../C/xiphos.xml:326(para) 
+#: ../C/xiphos.xml:326(para)
 msgid "Under the <guibutton>Modules</guibutton> option in the <interface>Sidebar</interface>,choose <menuchoice><guimenuitem>Biblical Texts</guimenuitem><guimenuitem>language choice</guimenuitem></menuchoice>. Then right-click on a translation and choose the <guimenuitem>About</guimenuitem> option."
-msgstr ""
+msgstr "تحت <guibutton>مدول‏های</guibutton>موجود در<interface>ستون جانبی،</interface>گزینۀ<menuchoice><guimenuitem>متون کتاب‏مقدس</guimenuitem><guimenuitem>گزینۀ زبان‏ها</guimenuitem></menuchoice>را برگزینید. سپس روی یک ترجمه کلیک سمت راست ماوس را فشار دهید و در این قسمت گزینۀ<guimenuitem>در بارۀ</guimenuitem>را برگزینید."
 
-#: ../C/xiphos.xml:337(title) ../C/xiphos.xml:395(title) ../C/xiphos.xml:407(phrase) 
+#: ../C/xiphos.xml:337(title)
+#: ../C/xiphos.xml:395(title)
+#: ../C/xiphos.xml:407(phrase)
 msgid "Module Options"
-msgstr ""
+msgstr "گزینه‏های مدول"
 
-#: ../C/xiphos.xml:338(para) 
+#: ../C/xiphos.xml:338(para)
 msgid "Most Bible translations have additional options which the user can select."
 msgstr ""
 
-#: ../C/xiphos.xml:343(para) 
+#: ../C/xiphos.xml:343(para)
 msgid "Words Of Christ In Red"
-msgstr ""
+msgstr "کلمات عیسی مسیح به رنگ قرمز"
 
-#: ../C/xiphos.xml:348(para) 
+#: ../C/xiphos.xml:348(para)
 msgid "Strong's Numbers"
-msgstr ""
+msgstr "شماره‏های کشف‏الآیات استرانگ"
 
-#: ../C/xiphos.xml:353(para) 
+#: ../C/xiphos.xml:353(para)
 msgid "Morphological Tags"
-msgstr ""
+msgstr "علائم واژه‏شناسی"
 
-#: ../C/xiphos.xml:358(para) 
+#: ../C/xiphos.xml:358(para)
 msgid "Footnotes"
-msgstr ""
+msgstr "پانویس‏ها"
 
-#: ../C/xiphos.xml:363(para) 
+#: ../C/xiphos.xml:363(para)
 msgid "Scripture Cross-Reference"
-msgstr ""
+msgstr "ارجاعات به کتاب‏مقدس"
 
-#: ../C/xiphos.xml:368(para) 
+#: ../C/xiphos.xml:368(para)
 msgid "Headings"
-msgstr ""
+msgstr "سر تیترها"
 
-#: ../C/xiphos.xml:373(para) 
+#: ../C/xiphos.xml:373(para)
 msgid "Image Content"
-msgstr ""
+msgstr "محتویات تصویر"
 
-#: ../C/xiphos.xml:379(para) 
+#: ../C/xiphos.xml:379(para)
 msgid "Translations in other languages such as Greek or Hebrew have specific options which deal only with the specific language."
 msgstr ""
 
-#: ../C/xiphos.xml:383(para) 
+#: ../C/xiphos.xml:383(para)
 msgid "In order to access these options:"
-msgstr ""
+msgstr "به منظور دستیابی به این گزینه‏ها:"
 
-#: ../C/xiphos.xml:388(para) 
+#: ../C/xiphos.xml:388(para)
 msgid "right-click in the <interface>Bible Text pane</interface>. In the popup menu (example shown), choose <guibutton>Module Options</guibutton> and select the specific option."
-msgstr ""
+msgstr "روی ماوس رایت کلیک کنید،<interface>چارچوب متن کتابمقدس باز خواهد شد.</interface>در منویی که باز خواهد شد (مانند نمونۀ زیر)،<guibutton>گزینۀ مدول</guibutton>را انتخاب و کاربرد مورد نظر را علامت گذاری کنید."
 
-#: ../C/xiphos.xml:416(title) ../C/xiphos.xml:421(title) ../C/xiphos.xml:433(phrase) 
+#: ../C/xiphos.xml:416(title)
+#: ../C/xiphos.xml:421(title)
+#: ../C/xiphos.xml:433(phrase)
 msgid "View Options"
-msgstr ""
+msgstr "گزینه‏های مرور"
 
-#: ../C/xiphos.xml:417(para) 
+#: ../C/xiphos.xml:417(para)
 msgid "There are several additional modes that can be selected from the menubar's <guimenuitem>View</guimenuitem> pulldown."
 msgstr ""
 
-#: ../C/xiphos.xml:440(para) 
+#: ../C/xiphos.xml:440(para)
 msgid "The first 4 checkboxes control whether each named subwindow is displayed. The viewable state of the subwindows is remembered on a per-tab basis. This makes it possible, for example, to have a tab dedicated to a maps module alone (in a dictionary module, having alphabetically-listed places), by turning off the display of Bible, Previewer, and Commentary for that tab."
 msgstr ""
 
-#: ../C/xiphos.xml:445(para) 
+#: ../C/xiphos.xml:445(para)
 msgid "The remaining checkboxes control these other display features:"
 msgstr ""
 
-#: ../C/xiphos.xml:450(para) 
+#: ../C/xiphos.xml:450(para)
 msgid "Verse Style - Toggles between Bible text display in separate verses, or in paragraphs instead. This is set on a per-module basis."
 msgstr ""
 
-#: ../C/xiphos.xml:456(para) 
+#: ../C/xiphos.xml:456(para)
 msgid "Link Tabs - When more than one tab is open, each one's verse is navigated separately in the disabled case. If tab linking is enabled, then all tabs navigate together, keeping all translations on the same verse."
 msgstr ""
 
-#: ../C/xiphos.xml:463(para) 
+#: ../C/xiphos.xml:463(para)
 msgid "Read Aloud - If you enable this, then Xiphos will funnel all selected verses through the <application>festival</application> text-to-speech system. <application>Festival</application> is a widely-available TTS, often installed by default in Linux distributions. Reading aloud is not currently supported on Windows."
 msgstr ""
 
-#: ../C/xiphos.xml:469(para) 
+#: ../C/xiphos.xml:469(para)
 msgid "Also, mouse-selected text may be read aloud from Bibles, commentaries, and general books, using the right-click menu, regardless of whether Read Aloud is selected."
 msgstr ""
 
-#: ../C/xiphos.xml:476(para) 
+#: ../C/xiphos.xml:476(para)
 msgid "Show Verse Numbers - Normally enabled, this toggle can be disabled to prevent display of verse numbers within the text."
 msgstr ""
 
-#: ../C/xiphos.xml:482(para) 
+#: ../C/xiphos.xml:482(para)
 msgid "Highlight Current Verse - Initially disabled, this toggle replaces mere alternate colorization of the current verse with a substitute high-contrast highlight. The colors used may be selected from the Preferences dialog."
 msgstr ""
 
-#: ../C/xiphos.xml:492(title) 
+#: ../C/xiphos.xml:492(title)
 msgid "Specific Word Meanings"
 msgstr ""
 
-#: ../C/xiphos.xml:493(para) 
+#: ../C/xiphos.xml:493(para)
 msgid "In order to check the meaning of a specific word, double-click on the word you wish to lookup. The word should then highlight itself and the explanation should be displayed, if available, in the <interface>Dictionary Pane</interface>."
 msgstr ""
 
-#: ../C/xiphos.xml:500(title) 
+#: ../C/xiphos.xml:500(title)
 msgid "Finding A Specific Word"
 msgstr ""
 
-#: ../C/xiphos.xml:501(para) 
+#: ../C/xiphos.xml:501(para)
 msgid "To find a specific word within a passage:"
 msgstr ""
 
-#: ../C/xiphos.xml:506(para) 
+#: ../C/xiphos.xml:506(para)
 msgid "right-click in the <interface>Bible Text Pane</interface>. In the popup menu, choose <guibutton>Edit</guibutton>-&gt; <guibutton>Find</guibutton>. A separate dialog will appear, which provides text searches. Fill out dialog and click the <guibutton>Find</guibutton> and <guibutton>Find Next</guibutton> buttons."
 msgstr ""
 
-#: ../C/xiphos.xml:519(title) 
+#: ../C/xiphos.xml:519(title)
 msgid "PreViewer"
 msgstr ""
 
-#: ../C/xiphos.xml:537(para) 
+#: ../C/xiphos.xml:537(para)
 msgid "The Previewer is where the user sees Strong's numbers, morphological tags, footnotes, and cross-references that the <interface>Bible Text Pane</interface> provides."
 msgstr ""
 
-#: ../C/xiphos.xml:541(para) 
+#: ../C/xiphos.xml:541(para)
 msgid "Footnote content is displayed in the Previewer when you hover over the indicator <guibutton>*n</guibutton> in the Bible text; It remains visible until your mouse moves over another indicator, Strong's number, etc. Sometimes you may want the text to remain anchored until you can move the mouse to the previewer to click on a link or to read large footnotes. To anchor the text so that you can scroll it in the Previewer, middle-click the indicator (or hold down the <guibutton>Shift key</guibutton>) and move to the Previewer."
 msgstr ""
 
-#: ../C/xiphos.xml:548(para) 
+#: ../C/xiphos.xml:548(para)
 msgid "Cross-reference indicators <guibutton>*x</guibutton> work much the same way. Clicking the indicator will send the set of references to the <guibutton>Verse List</guibutton> in the <interface>Sidebar</interface>, where you can click them individually for reading in the Previewer."
 msgstr ""
 
-#: ../C/xiphos.xml:556(title) ../C/xiphos.xml:558(title) 
+#: ../C/xiphos.xml:556(title)
+#: ../C/xiphos.xml:558(title)
 msgid "The Commentary Pane"
 msgstr ""
 
-#: ../C/xiphos.xml:577(para) 
+#: ../C/xiphos.xml:577(para)
 msgid "The <interface>Commentary pane</interface> is where the commentary modules are displayed. This provides easy reading, reference, and access to different commentaries currently installed. The passage viewed by the <interface>Commentary pane</interface> is directly controlled by the current passage viewed in the <interface>Bible Text pane</interface>, so in order to change to a different passage commentary, select the desired passage on the <interface>Toolbar</interface>."
 msgstr ""
 
-#: ../C/xiphos.xml:584(para) 
+#: ../C/xiphos.xml:584(para)
 msgid "If there are images that are part of a commentary, general book, or dictionary/lexicon, they may be clicked to invoke a viewer on that single image, in order to get a better view. This is particularly useful if image resizing has been enabled with the result that images are made very small in the subwindow."
 msgstr ""
 
-#: ../C/xiphos.xml:590(para) 
+#: ../C/xiphos.xml:590(para)
 msgid "By changing to passage settings on the <interface>Toolbar</interface>, the contents in the <interface>Bible Text pane</interface> and the <interface>Commentary Pane</interface> will be changed."
 msgstr ""
 
-#: ../C/xiphos.xml:597(title) 
+#: ../C/xiphos.xml:597(title)
 msgid "Finding Out About The Commentary Module"
 msgstr ""
 
-#: ../C/xiphos.xml:598(para) 
+#: ../C/xiphos.xml:598(para)
 msgid "To find out about the commentary currently being displayed:"
 msgstr ""
 
-#: ../C/xiphos.xml:603(para) 
+#: ../C/xiphos.xml:603(para)
 msgid "right-click in the <interface>Commentary Pane</interface>. In the popup menu choose <guimenuitem>About </guimenuitem> module name."
 msgstr ""
 
-#: ../C/xiphos.xml:612(title) 
+#: ../C/xiphos.xml:612(title)
 msgid "Commentary Headings."
 msgstr ""
 
-#: ../C/xiphos.xml:613(para) 
+#: ../C/xiphos.xml:613(para)
 msgid "Many commentaries have additional headings which enable introductory information about the book and chapter currently being displayed in the <interface>Bible Text pane</interface>. In order to view them:"
 msgstr ""
 
-#: ../C/xiphos.xml:619(para) 
+#: ../C/xiphos.xml:619(para)
 msgid "right-click in the <interface>Commentary Pane</interface>. In the popup menu choose <guimenuitem>Display Book Heading</guimenuitem> or <guimenuitem>Display Chapter Heading</guimenuitem>."
 msgstr ""
 
-#: ../C/xiphos.xml:629(title) 
+#: ../C/xiphos.xml:629(title)
 msgid "Dictionary Pane"
 msgstr ""
 
-#: ../C/xiphos.xml:631(title) ../C/xiphos.xml:644(phrase) 
+#: ../C/xiphos.xml:631(title)
+#: ../C/xiphos.xml:644(phrase)
 msgid "The Dictionary Pane"
 msgstr ""
 
-#: ../C/xiphos.xml:651(para) 
+#: ../C/xiphos.xml:651(para)
 msgid "The Dictionary Pane's content is driven by its up/down selectors, typing in its navbar text, or double-clicks in the Bible, Commentary, or Book Panes."
 msgstr ""
 
-#: ../C/xiphos.xml:657(title) 
+#: ../C/xiphos.xml:657(title)
 msgid "Keyboard Shortcuts"
 msgstr ""
 
-#: ../C/xiphos.xml:658(para) 
+#: ../C/xiphos.xml:658(para)
 msgid "Several keyboard shortcuts exist in <application>Xiphos</application>:"
 msgstr ""
 
-#: ../C/xiphos.xml:663(para) 
+#: ../C/xiphos.xml:663(para)
 msgid "<guibutton>F1</guibutton>: opens this manual."
 msgstr ""
 
-#: ../C/xiphos.xml:668(para) 
+#: ../C/xiphos.xml:668(para)
 msgid "<guibutton>F2</guibutton>: opens the <guibutton>Preferences</guibutton> dialog."
 msgstr ""
 
-#: ../C/xiphos.xml:673(para) 
+#: ../C/xiphos.xml:673(para)
 msgid "<guibutton>F3</guibutton>: opens <guibutton>Advanced Search</guibutton>."
 msgstr ""
 
-#: ../C/xiphos.xml:678(para) 
+#: ../C/xiphos.xml:678(para)
 msgid "<guibutton>F4</guibutton>: opens the <guibutton>Module Manager</guibutton>."
 msgstr ""
 
-#: ../C/xiphos.xml:683(para) 
+#: ../C/xiphos.xml:683(para)
 msgid "<guibutton>Ctrl-L</guibutton> focuses and selects the main verse navbar text. You can then immediately type in new verse selection text. Be aware that, as is the case with most Sword applications, <application>Xiphos</application> understands many abbreviations: \"G\" is adequate to specify Genesis, for example, and any book name by itself implies 1:1."
 msgstr ""
 
-#: ../C/xiphos.xml:691(para) 
+#: ../C/xiphos.xml:691(para)
 msgid "<guibutton>Ctrl-F</guibutton> opens the \"Find\" dialog. The subwindow to which it applies depends on which of them are visible: The Bible is first preference, then the commentary or general book, then the dictionary. So a tab can be dedicated to just a genbook, and Ctrl-F will perform \"Find\" within that pane."
 msgstr ""
 
-#: ../C/xiphos.xml:698(para) 
+#: ../C/xiphos.xml:698(para)
 msgid "<guibutton>Alt-C</guibutton> brings the Commentary View forward when previously obscured by the Book View."
 msgstr ""
 
-#: ../C/xiphos.xml:703(para) 
+#: ../C/xiphos.xml:703(para)
 msgid "<guibutton>Alt-G</guibutton> is the opposite of Alt-C, focusing on the general book."
 msgstr ""
 
-#: ../C/xiphos.xml:708(para) 
+#: ../C/xiphos.xml:708(para)
 msgid "<guibutton>Alt-B</guibutton> opens a bookmark dialog on the current verse."
 msgstr ""
 
-#: ../C/xiphos.xml:713(para) 
+#: ../C/xiphos.xml:713(para)
 msgid "<guibutton>Alt-D</guibutton> focuses on the dictionary navbar text."
 msgstr ""
 
-#: ../C/xiphos.xml:718(para) 
+#: ../C/xiphos.xml:718(para)
 msgid "<guibutton>Alt-P</guibutton> detaches/re-attaches the parallel view dialog."
 msgstr ""
 
-#: ../C/xiphos.xml:723(para) 
+#: ../C/xiphos.xml:723(para)
 msgid "<guibutton>Alt-Z</guibutton> opens the personal commentary editor."
 msgstr ""
 
-#: ../C/xiphos.xml:728(para) 
+#: ../C/xiphos.xml:728(para)
 msgid "<guibutton>Ctrl-Plus/Ctrl-Minus</guibutton> increases/decreases the base font size."
 msgstr ""
 
-#: ../C/xiphos.xml:737(para) 
+#: ../C/xiphos.xml:737(para)
 msgid "<guibutton>Ctrl-p/Ctrl-n</guibutton>: Verse previous/next."
 msgstr ""
 
-#: ../C/xiphos.xml:741(para) 
+#: ../C/xiphos.xml:741(para)
 msgid "<guibutton>p/n</guibutton>: Chapter previous/next."
 msgstr ""
 
-#: ../C/xiphos.xml:745(para) 
+#: ../C/xiphos.xml:745(para)
 msgid "<guibutton>P/N</guibutton>: Book previous/next."
 msgstr ""
 
-#: ../C/xiphos.xml:733(para) 
+#: ../C/xiphos.xml:733(para)
 msgid "Location bar navigation: <placeholder-1/>"
 msgstr ""
 
-#: ../C/xiphos.xml:755(title) 
+#: ../C/xiphos.xml:755(title)
 msgid "Version Differences in <application>Xiphos</application>'s Display"
 msgstr ""
 
-#: ../C/xiphos.xml:756(para) 
+#: ../C/xiphos.xml:756(para)
 msgid "The <application>Xiphos</application> interface has evolved over time, and there are two display libraries with which <application>Xiphos</application> can be built. The older, less featureful version is called \"gtkhtml3\", and the newer, more capable version is called \"MozEmbed\". Both of these display libraries render text in a browser-like fashion, using HTML constructs to control display."
 msgstr ""
 
-#: ../C/xiphos.xml:763(para) 
+#: ../C/xiphos.xml:763(para)
 msgid "Several desirable capabilities are unsupportable in gtkhtml3, and although recent <application>Xiphos</application> is written to take advantage of MozEmbed features, it is possible that the version running on your computer needed to be built with gtkhtml3 instead, either because the version of MozEmbed available for your system is not recent enough to support the needs of <application>Xiphos</application>, or it simply doesn't exist for your system. (Mozembed is not supported under Windows at this time.) The following differences will be apparent, depending on whether gtkhtml3 or MozEmbed is the underlying display engine:"
 msgstr ""
 
-#: ../C/xiphos.xml:774(para) 
+#: ../C/xiphos.xml:774(para)
 msgid "Morphology and Strong's references, enabled via the right-click menu in some modules, are displayed inline with gtkhtml3; with MozEmbed, a blocked display is used, where these references are aligned beneath the word to which they refer, for a much more readable, less cluttered display."
 msgstr ""
 
-#: ../C/xiphos.xml:781(para) 
+#: ../C/xiphos.xml:781(para)
 msgid "Footnote and cross-reference markers (<guibutton>*n</guibutton>, <guibutton>*x</guibutton>) are displayed as proper superscripts in MozEmbed, but not in gtkhtml3."
 msgstr ""
 
-#: ../C/xiphos.xml:787(para) 
+#: ../C/xiphos.xml:787(para)
 msgid "Links in gtkhtml3 are necessarily both colored and underlined; in MozEmbed, no underlines are needed."
 msgstr ""
 
-#: ../C/xiphos.xml:792(para) 
+#: ../C/xiphos.xml:792(para)
 msgid "Under MozEmbed, double-space display is available using the <guimenuitem>View</guimenuitem> menu, but not under gtkhtml3."
 msgstr ""
 
-#: ../C/xiphos.xml:798(para) 
+#: ../C/xiphos.xml:798(para)
 msgid "It is not possible for gtkhtml3 to interpret multiple font face directives in a single window, so the gtkhtml3 detached parallel view window cannot provide per-module font selections. Also, modules' internal font requests are ignored in any gtkhtml3 window."
 msgstr ""
 
-#: ../C/xiphos.xml:806(para) 
+#: ../C/xiphos.xml:806(para)
 msgid "Using the \"About Xiphos\" selection under the <guimenuitem>Help</guimenuitem> menu, you will see the display library with which <application>Xiphos</application> was built."
 msgstr ""
 
-#: ../C/xiphos.xml:811(title) ../C/xiphos.xml:818(phrase) 
+#: ../C/xiphos.xml:811(title)
+#: ../C/xiphos.xml:818(phrase)
 msgid "Comparison, gtkhtml3 -vs- mozembed"
 msgstr ""
 
-#: ../C/xiphos.xml:398(title) 
+#: ../C/xiphos.xml:398(title)
 msgid "Preferences"
 msgstr ""
 
-#: ../C/xiphos.xml:6(title) ../C/preferences.xml:6(title) 
+#: ../C/xiphos.xml:6(title)
+#: ../C/preferences.xml:6(title)
 msgid "Introduction To Preferences"
 msgstr ""
 
-#: ../C/xiphos.xml:8(title) ../C/preferences.xml:8(title) 
+#: ../C/xiphos.xml:8(title)
+#: ../C/preferences.xml:8(title)
 msgid "The Preference Dialog"
 msgstr ""
 
-#: ../C/xiphos.xml:21(phrase) ../C/preferences.xml:21(phrase) 
+#: ../C/xiphos.xml:21(phrase)
+#: ../C/preferences.xml:21(phrase)
 msgid "The Preferences Dialog"
 msgstr ""
 
-#: ../C/xiphos.xml:30(title) 
+#: ../C/xiphos.xml:30(title)
 msgid "Fonts And Colors"
 msgstr ""
 
-#: ../C/xiphos.xml:32(title) 
+#: ../C/xiphos.xml:32(title)
 msgid "Setting Font Colors"
 msgstr ""
 
-#: ../C/xiphos.xml:34(title) ../C/xiphos.xml:47(phrase) 
+#: ../C/xiphos.xml:34(title)
+#: ../C/xiphos.xml:47(phrase)
 msgid "Font Colour Settings"
 msgstr ""
 
-#: ../C/xiphos.xml:56(title) ../C/xiphos.xml:58(title) ../C/xiphos.xml:71(phrase) 
+#: ../C/xiphos.xml:56(title)
+#: ../C/xiphos.xml:58(title)
+#: ../C/xiphos.xml:71(phrase)
 msgid "Miscellaneous Font Settings"
 msgstr ""
 
-#: ../C/xiphos.xml:78(para) 
+#: ../C/xiphos.xml:78(para)
 msgid "In individual modules' display, the right-click menu's <guimenuitem>Module Options</guimenuitem> selector provides font name and size selection."
 msgstr ""
 
-#: ../C/xiphos.xml:83(para) 
+#: ../C/xiphos.xml:83(para)
 msgid "The base font size is the size initially chosen for all modules displayed by <application>Xiphos</application>. The verse number and individual modules' font size choices are relative to the base font size."
 msgstr ""
 
-#: ../C/xiphos.xml:92(title) 
+#: ../C/xiphos.xml:92(title)
 msgid "General Settings"
 msgstr ""
 
-#: ../C/xiphos.xml:94(title) 
+#: ../C/xiphos.xml:94(title)
 msgid "Tabs and Pane Settings"
 msgstr ""
 
-#: ../C/xiphos.xml:96(title) ../C/xiphos.xml:109(phrase) 
+#: ../C/xiphos.xml:96(title)
+#: ../C/xiphos.xml:109(phrase)
 msgid "Tab and Pane Settings"
 msgstr ""
 
-#: ../C/xiphos.xml:118(title) ../C/xiphos.xml:120(title) ../C/xiphos.xml:133(phrase) 
+#: ../C/xiphos.xml:118(title)
+#: ../C/xiphos.xml:120(title)
+#: ../C/xiphos.xml:133(phrase)
 msgid "General Preferences and StudyPad directory"
 msgstr ""
 
-#: ../C/xiphos.xml:140(para) 
+#: ../C/xiphos.xml:140(para)
 msgid "Certain dictionary-style modules are <guilabel>Daily Devotionals</guilabel> whose keys are numerically in the form \"Month.Day\". If you have such a module installed and it has been selected as your preferred devotional, then you can ask that <application>Xiphos</application> display today's selection during startup."
 msgstr ""
 
-#: ../C/xiphos.xml:145(para) 
+#: ../C/xiphos.xml:145(para)
 msgid "<guilabel>Verse style</guilabel> indicates that each verse should begin on a separate line, or (when disabled) that verses should be allowed to group in paragraphs, according to the Bible module's internal markup. Not all Bible modules have such markup."
 msgstr ""
 
-#: ../C/xiphos.xml:150(para) 
+#: ../C/xiphos.xml:150(para)
 msgid "With <guilabel>Scroll to Previous/Next Chapter</guilabel> enabled, using the mouse to scroll to the beginning or end of a chapter will cause <application>Xiphos</application> to move automatically to the appropriate chapter."
 msgstr ""
 
-#: ../C/xiphos.xml:154(para) 
+#: ../C/xiphos.xml:154(para)
 msgid "If you enable <guilabel>Resize images</guilabel>, <application>Xiphos</application> will automatically resize image content in commentaries, general books, and dictionaries so as to fit the subwindow which contains them."
 msgstr ""
 
-#: ../C/xiphos.xml:158(para) 
+#: ../C/xiphos.xml:158(para)
 msgid "<guilabel>Highlight current verse</guilabel>, if enabled, will cause <application>Xiphos</application> to substitute mere current verse colorization with a high-contrast alternate color scheme on the current verse. The colors used may be chosen from the color selector pane (see above)."
 msgstr ""
 
-#: ../C/xiphos.xml:168(title) 
+#: ../C/xiphos.xml:168(title)
 msgid "Module Settings"
 msgstr ""
 
-#: ../C/xiphos.xml:170(title) 
+#: ../C/xiphos.xml:170(title)
 msgid "Main Module Settings"
 msgstr ""
 
-#: ../C/xiphos.xml:172(title) ../C/xiphos.xml:185(phrase) 
+#: ../C/xiphos.xml:172(title)
+#: ../C/xiphos.xml:185(phrase)
 msgid "The Module Preferences Dialog"
 msgstr ""
 
-#: ../C/xiphos.xml:192(title) ../C/xiphos.xml:205(phrase) 
+#: ../C/xiphos.xml:192(title)
+#: ../C/xiphos.xml:205(phrase)
 msgid "Parallel Preferences"
 msgstr ""
 
-#: ../C/xiphos.xml:212(title) 
+#: ../C/xiphos.xml:212(title)
 msgid "Various preferences Modules"
 msgstr ""
 
-#: ../C/xiphos.xml:225(phrase) 
+#: ../C/xiphos.xml:225(phrase)
 msgid "Various Preferences Modules"
 msgstr ""
 
-#: ../C/xiphos.xml:404(title) 
+#: ../C/xiphos.xml:404(title)
 msgid "Module Manager"
 msgstr ""
 
-#: ../C/xiphos.xml:5(title) ../C/modules.xml:5(title) 
+#: ../C/xiphos.xml:5(title)
+#: ../C/modules.xml:5(title)
 msgid "Introduction To The Module Manager"
 msgstr ""
 
-#: ../C/xiphos.xml:6(para) ../C/modules.xml:6(para) 
+#: ../C/xiphos.xml:6(para)
+#: ../C/modules.xml:6(para)
 msgid "The \"module\" is the unit of content in <application>Xiphos</application>, and Sword generally; a Sword module is a resource available for viewing in Sword applications. There are several varieties: Most importantly, Bible texts, as well as dictionaries and lexicons, commentaries, and general books, any of which may include image content (e.g. atlases). They are installed either from a local directory structure (typically on removable media, such as a CDROM distribution) or remotely via ftp from a repository such as Crosswire, which is the home of Sword, and from which all officially Sword-sanctioned modules are available. Also, many other modules are available from non-Crosswire repositories."
 msgstr ""
 
-#: ../C/xiphos.xml:14(para) ../C/modules.xml:14(para) 
+#: ../C/xiphos.xml:14(para)
+#: ../C/modules.xml:14(para)
 msgid "If you have other Sword applications installed, they will all share the same set of Sword modules that you install through the Module Manager."
 msgstr ""
 
-#: ../C/xiphos.xml:19(title) ../C/xiphos.xml:32(phrase) ../C/modules.xml:19(title) ../C/modules.xml:32(phrase) 
+#: ../C/xiphos.xml:19(title)
+#: ../C/xiphos.xml:32(phrase)
+#: ../C/modules.xml:19(title)
+#: ../C/modules.xml:32(phrase)
 msgid "The Module Manager Dialog"
 msgstr ""
 
-#: ../C/xiphos.xml:41(title) 
+#: ../C/xiphos.xml:41(title)
 msgid "Sword Module Configurations"
 msgstr ""
 
-#: ../C/xiphos.xml:43(title) ../C/xiphos.xml:45(title) 
+#: ../C/xiphos.xml:43(title)
+#: ../C/xiphos.xml:45(title)
 msgid "Sword Sources Settings"
 msgstr ""
 
-#: ../C/xiphos.xml:58(phrase) ../C/xiphos.xml:86(phrase) ../C/xiphos.xml:155(phrase) 
+#: ../C/xiphos.xml:58(phrase)
+#: ../C/xiphos.xml:86(phrase)
+#: ../C/xiphos.xml:155(phrase)
 msgid "Module Installation"
 msgstr ""
 
-#: ../C/xiphos.xml:64(para) 
+#: ../C/xiphos.xml:64(para)
 msgid "There are other repositories available besides Crosswire's own, though the modules available from other repositories do not represent content officially sanctioned by Crosswire. On the web, see this page for list of those repositories known: <ulink type=\"http\" url=\"http://www.crosswire.org/wiki/Module_Repositories\">http://www.crosswire.org/wiki/Module_Repositories</ulink>"
 msgstr ""
 
-#: ../C/xiphos.xml:71(title) ../C/xiphos.xml:73(title) 
+#: ../C/xiphos.xml:71(title)
+#: ../C/xiphos.xml:73(title)
 msgid "Sword Module Installations"
 msgstr ""
 
-#: ../C/xiphos.xml:91(para) 
+#: ../C/xiphos.xml:91(para)
 msgid "After you have selected your Install Source, click the <guimenuitem>Refresh</guimenuitem> button to cause <application>Xiphos</application> to find the module summary available from that source before moving on."
 msgstr ""
 
-#: ../C/xiphos.xml:96(para) 
+#: ../C/xiphos.xml:96(para)
 msgid "Take note of the \"Install Destination\". In most cases, you will have a choice of a personal area or a system area. The details vary according to your operating system."
 msgstr ""
 
-#: ../C/xiphos.xml:102(title) 
+#: ../C/xiphos.xml:102(title)
 msgid "Linux"
 msgstr ""
 
-#: ../C/xiphos.xml:103(para) 
+#: ../C/xiphos.xml:103(para)
 msgid "Unless you run as root (via su or sudo) you will only be able to install in your personal area, under ~/.sword. If you run as root, or change permissions on the shared directory, you will also be able to install modules for all users, typically in /usr/share/sword. There have been some requests for Xiphos to provide a means by which an ordinary (non-root) user could start the program, gain temporary write access to the system area while installing modules, and then revoke that access after installation is complete. Attempting to devise a scheme to do this has proven quite difficult, given the different superuser management schemes employed by various Linux distributions. Therefore, at this time there are no ongoing plans to try to solve this problem, and users are advised to enable write access to the system area outside Xiphos."
 msgstr ""
 
-#: ../C/xiphos.xml:116(title) 
+#: ../C/xiphos.xml:116(title)
 msgid "Windows XP"
 msgstr ""
 
-#: ../C/xiphos.xml:117(para) 
+#: ../C/xiphos.xml:117(para)
 msgid "You may install modules to a shared folder so the modules are available to all users. If you have previously used \"The Sword Project for Windows\", this folder will be \"C:\\Program Files\\Crosswire\\The Sword Project\\Sword\". Otherwise it will be \"C:\\Documents and Settings\\All Users\\Application Data\\Sword\". You may also install modules to a location that can only be seen by you. This location is \"C:\\Documents and Settings\\YOUR NAME\\Application Data\\Sword\"."
 msgstr ""
 
-#: ../C/xiphos.xml:126(title) 
+#: ../C/xiphos.xml:126(title)
 msgid "Windows Vista"
 msgstr ""
 
-#: ../C/xiphos.xml:127(para) 
+#: ../C/xiphos.xml:127(para)
 msgid "Vista works much the same as XP, except for the locations. The private location is \"C:\\Users\\YOUR NAME\\AppData\\Roaming\\Sword\". The shared location is \"C:\\ProgramData\\Sword\"."
 msgstr ""
 
-#: ../C/xiphos.xml:138(title) ../C/xiphos.xml:140(title) 
+#: ../C/xiphos.xml:138(title)
+#: ../C/xiphos.xml:140(title)
 msgid "Installing, Updating, and Maintaining Modules"
 msgstr ""
 
-#: ../C/xiphos.xml:142(title) 
+#: ../C/xiphos.xml:142(title)
 msgid "Installing and Updating Modules"
 msgstr ""
 
-#: ../C/xiphos.xml:161(para) 
+#: ../C/xiphos.xml:161(para)
 msgid "The module manager generates both a per-type module list as well as a parallel availability list. The latter is intended to make it easier to find new items without having to work one's way through the per-type list, one subtree at a time. Modules which are either not yet installed or updated beyond what is currently installed will appear in both lists."
 msgstr ""
 
-#: ../C/xiphos.xml:166(para) 
+#: ../C/xiphos.xml:166(para)
 msgid "Modules that are already installed will show a checkmark beside them. If a fast search (\"lucene\") index is available, a magnifying glass will be displayed, otherwise an \"X\" will be shown; creation of the index is available on the Maintenance pane. Locked modules, which require that you purchase an unlock key from the module's copyright holder, will show a lock symbol. If there are modules installed for which a more recent version is available, a refresh icon will appear between the differing old and new version stamps. There may be an approximate size displayed, if the repository management provides this information, otherwise a question mark (\"-?-\") will be shown."
 msgstr ""
 
-#: ../C/xiphos.xml:173(para) 
+#: ../C/xiphos.xml:173(para)
 msgid "Select new modules to be installed by clicking the checkboxes and then the Install button at the bottom. Any number of modules may be requested for installation at one time."
 msgstr ""
 
-#: ../C/xiphos.xml:177(para) 
+#: ../C/xiphos.xml:177(para)
 msgid "If you acquire a locked module and have obtained the cipher key for it, the module is then unlocked in the main window: Open the module, which will probably appear blank, then using the right-click context menu, choose \"Unlock This Module.\""
 msgstr ""
 
-#: ../C/xiphos.xml:183(title) ../C/xiphos.xml:185(title) ../C/xiphos.xml:198(phrase) 
+#: ../C/xiphos.xml:183(title)
+#: ../C/xiphos.xml:185(title)
+#: ../C/xiphos.xml:198(phrase)
 msgid "Module Maintenance"
 msgstr ""
 
-#: ../C/xiphos.xml:203(para) 
+#: ../C/xiphos.xml:203(para)
 msgid "Several maintenance functions are available: Removal, archival, index, and index deletion."
 msgstr ""
 
-#: ../C/xiphos.xml:206(para) 
+#: ../C/xiphos.xml:206(para)
 msgid "Removal disposes of a module entirely. There is no recovery of the module unless you have previously archived a copy of it."
 msgstr ""
 
-#: ../C/xiphos.xml:209(para) 
+#: ../C/xiphos.xml:209(para)
 msgid "Archival is available for any module, although it is provided with personal commentaries specifically in mind. A *.zip of the module is left in the directory ~/.sword/zip. Archival prior to removal of personal commentaries is recommended, in order to be available for future re-install if the subject matter of the personal commentary becomes important again."
 msgstr ""
 
-#: ../C/xiphos.xml:214(para) 
+#: ../C/xiphos.xml:214(para)
 msgid "Indexing is provided so that the underlying Sword search support can create the index needed for the \"lucene\" multi-word fast-search functions. If the index is not created, multi-word search will still be available, but it will be much slower. With the index in place, searches through an entire Bible can take just a few seconds."
 msgstr ""
 
-#: ../C/xiphos.xml:219(para) 
+#: ../C/xiphos.xml:219(para)
 msgid "Indexes may be deleted as well."
 msgstr ""
 
-#: ../C/xiphos.xml:227(title) 
+#: ../C/xiphos.xml:227(title)
 msgid "Installing Non-Standard Modules"
 msgstr ""
 
-#: ../C/xiphos.xml:228(para) 
+#: ../C/xiphos.xml:228(para)
 msgid "Some resource modules in Sword Project format are available from sources other than Crosswire and not from a module manager-ready repository. Necessarily, installing such a module is a manual task."
 msgstr ""
 
-#: ../C/xiphos.xml:232(para) 
+#: ../C/xiphos.xml:232(para)
 msgid "Modules are normally packaged as *.zip files; they contain a configuration file plus a number of data files. Installation of such a module is done by cd'ing to your personal Sword (not <application>Xiphos</application>) configuration directory, ~/.sword, and unzipping the file there. The configuration file will be left in \"mods.d\", and the module's data files will go into a subdirectory of \"modules\". Alternatively, if you have write access to the system Sword directory, typically /usr/share/sword, you may cd there instead before unzipping."
 msgstr ""
 
-#: ../C/xiphos.xml:239(para) 
+#: ../C/xiphos.xml:239(para)
 msgid "Restart <application>Xiphos</application> after installing such a module, so that a fresh instance of the program can notice the new module in place."
 msgstr ""
 
-#: ../C/xiphos.xml:410(title) 
+#: ../C/xiphos.xml:410(title)
 msgid "The Search Function"
 msgstr ""
 
-#: ../C/xiphos.xml:4(title) ../C/search.xml:4(title) 
+#: ../C/xiphos.xml:4(title)
+#: ../C/search.xml:4(title)
 msgid "Simple Searches"
 msgstr ""
 
-#: ../C/xiphos.xml:5(para) ../C/search.xml:5(para) 
+#: ../C/xiphos.xml:5(para)
+#: ../C/search.xml:5(para)
 msgid "To conduct a quick search within the current Bible or commentary module, the Search Bar in the Sidebar should usually be adequate. Click either in the menu bar <guimenuitem>Edit-&gt;Search</guimenuitem> or in the Sidebar <guimenuitem>Modules-&gt;Search</guimenuitem> to access it."
 msgstr ""
 
-#: ../C/xiphos.xml:11(title) ../C/xiphos.xml:24(phrase) ../C/search.xml:11(title) ../C/search.xml:24(phrase) 
+#: ../C/xiphos.xml:11(title)
+#: ../C/xiphos.xml:24(phrase)
+#: ../C/search.xml:11(title)
+#: ../C/search.xml:24(phrase)
 msgid "The Search Bar"
 msgstr ""
 
-#: ../C/xiphos.xml:31(para) ../C/search.xml:31(para) 
+#: ../C/xiphos.xml:31(para)
+#: ../C/search.xml:31(para)
 msgid "The <interface>Search Dialog</interface> consists of the following parts:"
 msgstr ""
 
-#: ../C/xiphos.xml:36(para) ../C/search.xml:36(para) 
+#: ../C/xiphos.xml:36(para)
+#: ../C/search.xml:36(para)
 msgid "Search Key Entry box"
 msgstr ""
 
-#: ../C/xiphos.xml:41(para) ../C/xiphos.xml:83(title) ../C/search.xml:41(para) ../C/search.xml:83(title) 
+#: ../C/xiphos.xml:41(para)
+#: ../C/xiphos.xml:83(title)
+#: ../C/search.xml:41(para)
+#: ../C/search.xml:83(title)
 msgid "Search Module Selector"
 msgstr ""
 
-#: ../C/xiphos.xml:46(para) ../C/xiphos.xml:91(title) ../C/search.xml:46(para) ../C/search.xml:91(title) 
+#: ../C/xiphos.xml:46(para)
+#: ../C/xiphos.xml:91(title)
+#: ../C/search.xml:46(para)
+#: ../C/search.xml:91(title)
 msgid "Search Type Selector"
 msgstr ""
 
-#: ../C/xiphos.xml:51(para) ../C/xiphos.xml:129(title) ../C/search.xml:51(para) ../C/search.xml:129(title) 
+#: ../C/xiphos.xml:51(para)
+#: ../C/xiphos.xml:129(title)
+#: ../C/search.xml:51(para)
+#: ../C/search.xml:129(title)
 msgid "Search Options Checkbox"
 msgstr ""
 
-#: ../C/xiphos.xml:56(para) ../C/xiphos.xml:136(title) ../C/search.xml:56(para) ../C/search.xml:136(title) 
+#: ../C/xiphos.xml:56(para)
+#: ../C/xiphos.xml:136(title)
+#: ../C/search.xml:56(para)
+#: ../C/search.xml:136(title)
 msgid "Search Scope Selector"
 msgstr ""
 
-#: ../C/xiphos.xml:61(para) ../C/xiphos.xml:173(title) ../C/search.xml:61(para) ../C/search.xml:173(title) 
+#: ../C/xiphos.xml:61(para)
+#: ../C/xiphos.xml:173(title)
+#: ../C/search.xml:61(para)
+#: ../C/search.xml:173(title)
 msgid "Search Results View"
 msgstr ""
 
-#: ../C/xiphos.xml:67(title) ../C/search.xml:67(title) 
+#: ../C/xiphos.xml:67(title)
+#: ../C/search.xml:67(title)
 msgid "Search Key Entry Box"
 msgstr ""
 
-#: ../C/xiphos.xml:68(para) ../C/search.xml:68(para) 
+#: ../C/xiphos.xml:68(para)
+#: ../C/search.xml:68(para)
 msgid "Allows entry of the key for which you would like to search. The search key can be a word, part of a word, several words, a phrase, or a regular expression depending on the type of search selected. When the search key is entered and all other selections in the search dialog are complete, click the <guibutton>Find</guibutton> button to begin the search."
 msgstr ""
 
-#: ../C/xiphos.xml:75(para) ../C/search.xml:75(para) 
+#: ../C/xiphos.xml:75(para)
+#: ../C/search.xml:75(para)
 msgid "This search uses the optimized search method (see next section) if the module has previously been indexed, and will use AND semantics by default (verses must contain all words you entered)."
 msgstr ""
 
-#: ../C/xiphos.xml:84(para) ../C/search.xml:84(para) 
+#: ../C/xiphos.xml:84(para)
+#: ../C/search.xml:84(para)
 msgid "Allows selection of which modules you would like to search. Select <guibutton>Bible</guibutton> to search Bible versions or <guibutton>Commentary</guibutton> to search commentaries. Only the currently active module will be searched."
 msgstr ""
 
-#: ../C/xiphos.xml:92(para) ../C/search.xml:92(para) 
+#: ../C/xiphos.xml:92(para)
+#: ../C/search.xml:92(para)
 msgid "Allows selection of the type of search. There are three search types available:"
 msgstr ""
 
-#: ../C/xiphos.xml:97(guibutton) ../C/search.xml:97(guibutton) 
+#: ../C/xiphos.xml:97(guibutton)
+#: ../C/search.xml:97(guibutton)
 msgid "Multi word"
 msgstr ""
 
-#: ../C/xiphos.xml:98(para) ../C/search.xml:98(para) 
+#: ../C/xiphos.xml:98(para)
+#: ../C/search.xml:98(para)
 msgid "This type will match any verse that has all the words in the search key, regardless of where they appear in the verse."
 msgstr ""
 
-#: ../C/xiphos.xml:103(guibutton) ../C/search.xml:103(guibutton) 
+#: ../C/xiphos.xml:103(guibutton)
+#: ../C/search.xml:103(guibutton)
 msgid "Regular expression"
 msgstr ""
 
-#: ../C/xiphos.xml:104(para) ../C/search.xml:104(para) 
+#: ../C/xiphos.xml:104(para)
+#: ../C/search.xml:104(para)
 msgid "This search uses a regular expression as a search key. A regular expression is a pattern used to match a string of text. A regular expression can be used to find verses with words that match a particular pattern. For example the regular expression <userinput>\\ A[a-z]*iah </userinput> will match verses that contain the words Aiah, Ahaziah, Athaliah and Amariah."
 msgstr ""
 
-#: ../C/xiphos.xml:111(para) ../C/search.xml:111(para) 
+#: ../C/xiphos.xml:111(para)
+#: ../C/search.xml:111(para)
 msgid "A complete discussion of regular expressions is beyond the scope of this manual, but more information can be found in the grep man page."
 msgstr ""
 
-#: ../C/xiphos.xml:116(guibutton) ../C/search.xml:116(guibutton) 
+#: ../C/xiphos.xml:116(guibutton)
+#: ../C/search.xml:116(guibutton)
 msgid "Exact phrase"
 msgstr ""
 
-#: ../C/xiphos.xml:117(para) ../C/search.xml:117(para) 
-msgid "This type will match the search key exatly as entered. If the search key is <userinput>\n\t\t\t\t\tit is good</userinput>, this search would match a verse which contains \"<emphasis>it is good</emphasis>,\" but would not match a verse which contains \"<emphasis> good</emphasis>, and doeth <emphasis>it</emphasis> not, to him it <emphasis>is</emphasis> sin.\""
+#: ../C/xiphos.xml:117(para)
+#: ../C/search.xml:117(para)
+msgid ""
+"This type will match the search key exatly as entered. If the search key is <userinput>\n"
+"\t\t\t\t\tit is good</userinput>, this search would match a verse which contains \"<emphasis>it is good</emphasis>,\" but would not match a verse which contains \"<emphasis> good</emphasis>, and doeth <emphasis>it</emphasis> not, to him it <emphasis>is</emphasis> sin.\""
 msgstr ""
 
-#: ../C/xiphos.xml:130(para) ../C/search.xml:130(para) 
+#: ../C/xiphos.xml:130(para)
+#: ../C/search.xml:130(para)
 msgid "Allows selecting of search options. The only available option is <guibutton>Match case</guibutton>. Check this box to make the search case sensitive."
 msgstr ""
 
-#: ../C/xiphos.xml:137(para) ../C/search.xml:137(para) 
+#: ../C/xiphos.xml:137(para)
+#: ../C/search.xml:137(para)
 msgid "Allows defining the range within the specificed module that will be searched. There are three search scopes available:"
 msgstr ""
 
-#: ../C/xiphos.xml:141(guibutton) ../C/search.xml:141(guibutton) 
+#: ../C/xiphos.xml:141(guibutton)
+#: ../C/search.xml:141(guibutton)
 msgid "No scope"
 msgstr ""
 
-#: ../C/xiphos.xml:142(para) ../C/search.xml:142(para) 
+#: ../C/xiphos.xml:142(para)
+#: ../C/search.xml:142(para)
 msgid "This button causes the search to to include the entire module."
 msgstr ""
 
-#: ../C/xiphos.xml:147(guibutton) ../C/search.xml:147(guibutton) 
+#: ../C/xiphos.xml:147(guibutton)
+#: ../C/search.xml:147(guibutton)
 msgid "Use bounds"
 msgstr ""
 
-#: ../C/xiphos.xml:148(para) ../C/search.xml:148(para) 
+#: ../C/xiphos.xml:148(para)
+#: ../C/search.xml:148(para)
 msgid "Selecting this button produces two dropdown selector boxes marked <guilabel>Lower</guilabel> and <guilabel>Upper</guilabel>. Select the first book to search in the <guilabel>Lower</guilabel> box and the last book to search in the <guilabel>Upper</guilabel> box. The search will begin with the <guilabel>Lower </guilabel> book and end with the <guilabel>Upper </guilabel> book and include all books in between."
 msgstr ""
 
-#: ../C/xiphos.xml:157(para) ../C/search.xml:157(para) 
+#: ../C/xiphos.xml:157(para)
+#: ../C/search.xml:157(para)
 msgid "Chapter and verse numbers can be entered into the search bound boxes as well to further narrow the search."
 msgstr ""
 
-#: ../C/xiphos.xml:163(guibutton) ../C/search.xml:163(guibutton) 
+#: ../C/xiphos.xml:163(guibutton)
+#: ../C/search.xml:163(guibutton)
 msgid "Last search"
 msgstr ""
 
-#: ../C/xiphos.xml:164(para) ../C/search.xml:164(para) 
+#: ../C/xiphos.xml:164(para)
+#: ../C/search.xml:164(para)
 msgid "Select this button to do a new search including only the verses returned as a result of the last search. Use this with a new search key to narrow the search further."
 msgstr ""
 
-#: ../C/xiphos.xml:174(para) ../C/search.xml:174(para) 
+#: ../C/xiphos.xml:174(para)
+#: ../C/search.xml:174(para)
 msgid "This shows a list of the current search results for previewing, navigation, or saving."
 msgstr ""
 
-#: ../C/xiphos.xml:177(term) ../C/search.xml:177(term) 
+#: ../C/xiphos.xml:177(term)
+#: ../C/search.xml:177(term)
 msgid "Preview"
 msgstr ""
 
-#: ../C/xiphos.xml:178(para) ../C/search.xml:178(para) 
+#: ../C/xiphos.xml:178(para)
+#: ../C/search.xml:178(para)
 msgid "To preview the search result, simply click on an individual result. The entry will show in the preview pane."
 msgstr ""
 
-#: ../C/xiphos.xml:184(term) ../C/search.xml:184(term) 
+#: ../C/xiphos.xml:184(term)
+#: ../C/search.xml:184(term)
 msgid "Navigation"
 msgstr ""
 
-#: ../C/xiphos.xml:185(para) ../C/search.xml:185(para) 
+#: ../C/xiphos.xml:185(para)
+#: ../C/search.xml:185(para)
 msgid "Navigation to the search result can be done in two ways. To open the result in a new tab, middle-click the mouse. To open the result in the current tab, double-click the result."
 msgstr ""
 
-#: ../C/xiphos.xml:191(term) ../C/search.xml:191(term) 
+#: ../C/xiphos.xml:191(term)
+#: ../C/search.xml:191(term)
 msgid "Save Results"
 msgstr ""
 
-#: ../C/xiphos.xml:192(para) ../C/search.xml:192(para) 
+#: ../C/xiphos.xml:192(para)
+#: ../C/search.xml:192(para)
 msgid "You may save your results as a list of bookmarks. To do this, right-click and select <guilabel>Save List</guilabel>. You will be prompted to enter a name for the folder that your results will be saved to. After you have saved the results, you may view them by going to your bookmarks and finding the folder you just named."
 msgstr ""
 
-#: ../C/xiphos.xml:203(title) 
+#: ../C/xiphos.xml:203(title)
 msgid "Advanced Searches"
 msgstr ""
 
-#: ../C/xiphos.xml:204(para) 
+#: ../C/xiphos.xml:204(para)
 msgid "More complicated searches might require the use of the advanced search functions, found under <guimenuitem>Edit-&gt;Advanced Search</guimenuitem>."
 msgstr ""
 
-#: ../C/xiphos.xml:210(title) 
+#: ../C/xiphos.xml:210(title)
 msgid "The Advanced Search Dialogue"
 msgstr ""
 
-#: ../C/xiphos.xml:223(phrase) 
+#: ../C/xiphos.xml:223(phrase)
 msgid "The Advanced Search Dialog"
 msgstr ""
 
-#: ../C/xiphos.xml:231(para) 
+#: ../C/xiphos.xml:231(para)
 msgid "In <guimenuitem>Advanced Search</guimenuitem>, much more complex queries can be constructed, involving custom search ranges, custom lists of modules over which to search, regular expression matching (see next section), and attribute-based searches such as are found in footnotes or Strong's Hebrew and Greek dictionary references."
 msgstr ""
 
-#: ../C/xiphos.xml:237(para) 
+#: ../C/xiphos.xml:237(para)
 msgid "The default search is multi-word, a somewhat slow and blunt search through module text. Also available is an optimized search based on the Lucene indexing and search library. In order to use the optimized search, the index must be constructed beforehand: Please see the preceding section on the Module Manager regarding the Maintenance functions, including indexing. A web search will provide several references to the syntax needed to put to use the power of optimized Lucene search. A few examples follow:"
 msgstr ""
 
-#: ../C/xiphos.xml:245(para) 
+#: ../C/xiphos.xml:245(para)
 msgid "Simple Searches: just type in the words you want to search for. To return only verses that include all of the words, prefix the word with \"+\". So, in the KJV, you could find Psalm 23 by searching for \"+Lord +shepherd +want\". To search for an entire phrase, surround the entire phrase with quotes, like \"maketh me to lie down\" (note that quotes are unnecessary in all of the other examples)."
 msgstr ""
 
-#: ../C/xiphos.xml:252(para) 
+#: ../C/xiphos.xml:252(para)
 msgid "Single Letter Wildcard: to search for \"veil\" or \"vail\", use this syntax \"v?il\". The \"?\" represents a single character that could be anything. A more complex example returns both spellings for Isaiah used in the KJV. \"?saia?\" will return results for \"Isaiah\" and \"Esaias\"."
 msgstr ""
 
-#: ../C/xiphos.xml:258(para) 
+#: ../C/xiphos.xml:258(para)
 msgid "Multiple Letter Wildcard: to search for \"prophet\" or \"prophesy\" or \"prophecy\" or \"prophesied\", use this syntax \"prophe*\"."
 msgstr ""
 
-#: ../C/xiphos.xml:262(para) 
+#: ../C/xiphos.xml:262(para)
 msgid "AND syntax: in the advanced search to return results for all of the search terms, you must put \"AND\" in between the terms. To continue our example, if we wish to search for any occurrence of Isaiah or Esaias that also mention either prophet, or prophecy, or prophesy, we can do a search like this: \"?saia? AND prophe*\"."
 msgstr ""
 
-#: ../C/xiphos.xml:268(para) 
+#: ../C/xiphos.xml:268(para)
 msgid "By default, two standard search ranges are defined, for Old and New Testament; you may wish to define others for e.g. \"Gospels\" or \"Paul's Epistles\". One custom module list containing only the first Bible found will be present. If desired, new searches can be performed across only the current results of the previous search. Any modules may be searched, including general books and even dictionaries, in any combination."
 msgstr ""
 
-#: ../C/xiphos.xml:275(para) 
+#: ../C/xiphos.xml:275(para)
 msgid "Note the tooltip in the screenshot above, for Attributes search. This qualifier is used to perform searches on attributes that are carried with verses, instead of verse content proper, such as footnote content or Strong's Hebrew and Greek references. If this button is selected, specific attribute qualifiers must be made in the Attribute Search tab, at the right end of the tab set. Strong's references are identified with a leading \"H\" or \"G\" and the numeric Strong's identifier. Thus, a search of KJV for Strong's Greek #140, using \"G140\", will return the single result of Matthew 12:18."
 msgstr ""
 
-#: ../C/xiphos.xml:283(para) 
+#: ../C/xiphos.xml:283(para)
 msgid "If you have indexed your modules, there is a much faster way to search for Strong's references. Enter your search preceded by \"lemma:\", so to search for Strong's Greek #140, enter \"lemma:G140\". You must have selected <guibutton>Optimized (\"Lucene\")</guibutton> for this to work."
 msgstr ""
 
-#: ../C/xiphos.xml:289(para) 
+#: ../C/xiphos.xml:289(para)
 msgid "The \"Find\" button also stops an in-progress search, as its tooltip indicates."
 msgstr ""
 
-#: ../C/xiphos.xml:293(para) 
+#: ../C/xiphos.xml:293(para)
 msgid "Results will show in the <guibutton>Results</guibutton> tab. If you wish to show Strongs, Morphology, or Footnote tags, make those selections on the <guibutton>Attributes Search</guibutton> tab. Clicking once on the result will show the result in the <guibutton>Advanced Search</guibutton> previewer. Hovering over Strongs, Morphology, Footnote, or Cross-reference tags will show the results in the main previewer. Double-clicking a result will cause the current tab to navigate to that result. This applies to search results in general books and commentaries as well, but note that the respective tab must be visible."
 msgstr ""
 
-#: ../C/xiphos.xml:303(para) 
+#: ../C/xiphos.xml:303(para)
 msgid "Changes to some of the settings (e.g. scope of search, searched modules, etc.) in Advanced Search will affect the simple search via the side pane but not vice versa."
 msgstr ""
 
-#: ../C/xiphos.xml:310(title) 
+#: ../C/xiphos.xml:310(title)
 msgid "Search Syntax using Regular Expression"
 msgstr ""
 
-#: ../C/xiphos.xml:312(para) 
+#: ../C/xiphos.xml:312(para)
 msgid "Regular expression searches provide a way to do simple or complex searches for strings that match a pattern or set of patterns (branches) separated by vertical bars \"|\". While a pattern can be built to look for a word or phrase, a simple pattern that consists of a word does not look for only that word but for any place the string of letters that make that word are found. A search for \"right\" will return verses that contain the word \"right\", but also \"<emphasis>right</emphasis>eous\", \"<emphasis>right</emphasis>eousness\", \"un<emphasis>right</emphasis>eous\", \"up<emphasis>right</emphasis>\" and even \"b<emphasis>right</emphasis>\". A search for \"hall not\" is not a search for \"hall\" AND \"not\" but for the string \"hall not\" with a space between the second \"l\" and the \"n\". The search for \"hall not\" will find occurrences of \"s<emphasis>hall not</emphasis>\"."
 msgstr ""
 
-#: ../C/xiphos.xml:315(para) 
+#: ../C/xiphos.xml:315(para)
 msgid "The power of Regular Expressions is in the patterns (or templates) used to define a search. A pattern consists of ordinary characters and some special characters that are used and interpreted by a set of rules. Special characters include .\\[^*$?+. Ordinary (or simple) characters are any characters that are not special. The backslash, \"\\\", is used to convert special characters to ordinary and ordinary characters to special."
 msgstr ""
 
-#: ../C/xiphos.xml:320(para) 
+#: ../C/xiphos.xml:320(para)
 msgid "Example: the pattern \"<emphasis>i. love\\.</emphasis>\" will find sentences that end with \"h<emphasis>i</emphasis>s <emphasis>love</emphasis>\" or \"<emphasis>i</emphasis>n <emphasis>love</emphasis>\" or \"<emphasis>i</emphasis>s <emphasis>love</emphasis>\" followed by a period. The first period in \"i. love\\.\" is a special character that means allow any character in this position. The backslash in \"i. love\\.\" means that the period following it is not to be considered a special character, but is an ordinary period."
 msgstr ""
 
-#: ../C/xiphos.xml:328(title) 
+#: ../C/xiphos.xml:328(title)
 msgid "Rules for Regular Expression Search Requests"
 msgstr ""
 
-#: ../C/xiphos.xml:330(para) 
+#: ../C/xiphos.xml:330(para)
 msgid ". The period matches any character."
 msgstr ""
 
-#: ../C/xiphos.xml:331(para) 
+#: ../C/xiphos.xml:331(para)
 msgid "* The asterisk matches 0 or more characters of the preceding: set, character or indicated character."
 msgstr ""
 
-#: ../C/xiphos.xml:333(para) 
+#: ../C/xiphos.xml:333(para)
 msgid "+ The plus sign matches 1 or more characters of the preceding: set, character or indicated character."
 msgstr ""
 
-#: ../C/xiphos.xml:335(para) 
+#: ../C/xiphos.xml:335(para)
 msgid "? The question mark matches 0 or 1 character of the preceding: set, character or indicated character."
 msgstr ""
 
-#: ../C/xiphos.xml:337(para) 
+#: ../C/xiphos.xml:337(para)
 msgid "[ ] Square brackets match any one of the characters specified inside [ ]."
 msgstr ""
 
-#: ../C/xiphos.xml:339(para) 
+#: ../C/xiphos.xml:339(para)
 msgid "^ A caret as the first character inside [ ] means NOT."
 msgstr ""
 
-#: ../C/xiphos.xml:340(para) 
+#: ../C/xiphos.xml:340(para)
 msgid "^ A caret beginning a pattern anchors the beginning of a line."
 msgstr ""
 
-#: ../C/xiphos.xml:342(para) 
+#: ../C/xiphos.xml:342(para)
 msgid "$ A dollar at the end of a pattern anchors the end of a line."
 msgstr ""
 
-#: ../C/xiphos.xml:344(para) 
+#: ../C/xiphos.xml:344(para)
 msgid "| A vertical bar means logical OR."
 msgstr ""
 
-#: ../C/xiphos.xml:345(para) 
+#: ../C/xiphos.xml:345(para)
 msgid "( ) Parentheses enclose expressions for grouping. <emphasis>Not supported!</emphasis>"
 msgstr ""
 
-#: ../C/xiphos.xml:347(para) 
+#: ../C/xiphos.xml:347(para)
 msgid "\\ A backslash can be used prior to any special character to match that character."
 msgstr ""
 
-#: ../C/xiphos.xml:349(para) 
+#: ../C/xiphos.xml:349(para)
 msgid "\\ A backslash can be used prior to an ordinary character to make it a special character."
 msgstr ""
 
-#: ../C/xiphos.xml:354(title) 
+#: ../C/xiphos.xml:354(title)
 msgid "The Period"
 msgstr ""
 
-#: ../C/xiphos.xml:356(para) 
+#: ../C/xiphos.xml:356(para)
 msgid "The Period \".\" will match any single character even a space or other non-alphabet character. <emphasis>s.t</emphasis> matches <emphasis>s</emphasis>i<emphasis>t</emphasis>, <emphasis>s</emphasis>e<emphasis>t</emphasis>,<emphasis> s</emphasis>o<emphasis>t</emphasis>, etc., which could be located in <emphasis>s</emphasis>i<emphasis>t</emphasis>ting, compas<emphasis>s</emphasis>e<emphasis>t</emphasis>h and <emphasis>s</emphasis>o<emphasis>t</emphasis>tish <emphasis>b..t</emphasis> matches <emphasis>b</emphasis>oo<emphasis>t</emphasis>, <emphasis>b</emphasis>oa<emphasis>t</emphasis> and <emphasis>b</emphasis>ea<emphasis>t foot.tool </emphasis>matches <emphasis>foot</emphasis>s<emphasis>tool </emphasis>and <emphasis>foot tool</emphasis>"
 msgstr ""
 
-#: ../C/xiphos.xml:370(title) 
+#: ../C/xiphos.xml:370(title)
 msgid "The Asterisk"
 msgstr ""
 
-#: ../C/xiphos.xml:372(para) 
+#: ../C/xiphos.xml:372(para)
 msgid "The asterisk \"*\" matches zero or more characters of the preceding: set, character or indicated character. Using a period asterisk combination \".*\" after a commonly found pattern can cause the search to take a very long time, making the program seem to freeze. <emphasis>be*n</emphasis> matches<emphasis> beeen, been, ben</emphasis>, and <emphasis>bn</emphasis> which could locate Reu<emphasis>ben</emphasis> and She<emphasis>bn</emphasis>a."
 msgstr ""
 
-#: ../C/xiphos.xml:384(title) 
+#: ../C/xiphos.xml:384(title)
 msgid "The Plus Sign"
 msgstr ""
 
-#: ../C/xiphos.xml:385(para) 
+#: ../C/xiphos.xml:385(para)
 msgid "The Plus Sign \"+\" matches one or more characters of the preceding: set, character or indicated character. Using a period and plus sign combination \".+\" after a commonly found pattern can cause the search to take a very long time, making the program seem to freeze. <emphasis>be+n</emphasis> matches <emphasis>beeen, been</emphasis> and <emphasis>ben</emphasis>, but not <emphasis>bn</emphasis>."
 msgstr ""
 
-#: ../C/xiphos.xml:396(title) 
+#: ../C/xiphos.xml:396(title)
 msgid "The Question Mark"
 msgstr ""
 
-#: ../C/xiphos.xml:397(para) 
+#: ../C/xiphos.xml:397(para)
 msgid "The Question Mark \"?\"matches zero or one character of the preceding: set, character or indicated character. <emphasis>be?n</emphasis> matches <emphasis>ben</emphasis> and <emphasis>bn</emphasis> but not <emphasis>been</emphasis>. <emphasis>trees?</emphasis> matches <emphasis>trees</emphasis> or <emphasis>tree</emphasis>."
 msgstr ""
 
-#: ../C/xiphos.xml:406(title) 
+#: ../C/xiphos.xml:406(title)
 msgid "The Square Brackets"
 msgstr ""
 
-#: ../C/xiphos.xml:407(para) 
+#: ../C/xiphos.xml:407(para)
 msgid "The Square Brackets \"[]\" enclose a set of characters that can match. The period, asterisk, plus sign and question mark are not special inside the brackets. A minus sign can be used to indicate a range. If you want a caret \"^\" to be part of the range do not place it first after the left bracket or it will be a special character. To include a \"]\" in the set make it the first (or second after a special \"^\") character in the set. To include a minus sign in the set make it the first (or second after a special \"^\") or last character in the set. <emphasis>s[eia]t</emphasis> matches <emphasis>set</emphasis>, <emphasis>sit</emphasis>, and <emphasis>sat</emphasis>, but not <emphasis>s</emphasis>o<emphasis>t</emphasis>. <emphasis>s[eia]+t </emphasis>matches as above but also, <emphasis>seat, seet, siet</emphasis>, etc. <emphasis>[a-d]</emphasis> matches <emphasis>a, b, c,</emphasis> or <emphasis>d</emphasis>. <emphasis>[A-Z]</emphasis> matches any uppercase letter. [.;:?!] matches ., ;, :, ?, or ! but not a comma. [ ]^-] matches ] or ^ or -"
 msgstr ""
 
-#: ../C/xiphos.xml:429(title) 
+#: ../C/xiphos.xml:429(title)
 msgid "The Caret first in Square Brackets"
 msgstr ""
 
-#: ../C/xiphos.xml:430(para) 
+#: ../C/xiphos.xml:430(para)
 msgid "If the Caret is the first character after the left bracket (\"[^\") it means NOT. <emphasis>s[^io]t</emphasis> matches <emphasis>set, sat</emphasis>, etc., but not <emphasis>s</emphasis>i<emphasis>t</emphasis> and <emphasis>s</emphasis>o<emphasis>t</emphasis>."
 msgstr ""
 
-#: ../C/xiphos.xml:437(title) 
+#: ../C/xiphos.xml:437(title)
 msgid "The Caret as Start of Line Anchor"
 msgstr ""
 
-#: ../C/xiphos.xml:438(para) 
+#: ../C/xiphos.xml:438(para)
 msgid "If the Caret is the first character in a pattern (\"^xxx\") it anchors the pattern to the start of a line. Any match must be at the beginning of a line. Because of unfiltered formatting characters in some texts, this feature does not always work, but may if a few periods are placed after the caret to account for the formatting characters. <emphasis>^In the beginning</emphasis> matches lines that start with \"<emphasis>In the beginning</emphasis>\". (May need to use: <emphasis>^.....In the beginning</emphasis>)"
 msgstr ""
 
-#: ../C/xiphos.xml:451(title) 
+#: ../C/xiphos.xml:451(title)
 msgid "The Dollar Sign as End of Line Anchor"
 msgstr ""
 
-#: ../C/xiphos.xml:452(para) 
+#: ../C/xiphos.xml:452(para)
 msgid "If the Dollar Sign is the last character (\"xxx$\") in a pattern it anchors the pattern to the end of a line. Any match must be at the end of a line. Because of unfiltered formatting characters in some texts, this feature does not always work, but may if a few periods are placed before the dollar sign to account for the formatting characters. <emphasis>Amen\\.$</emphasis> matches lines that end with \"<emphasis>Amen.</emphasis>\" (May need to use Amen\\....$, Amen\\..........$, or even Amen\\....................$)"
 msgstr ""
 
-#: ../C/xiphos.xml:466(title) 
+#: ../C/xiphos.xml:466(title)
 msgid "The Vertical Bar"
 msgstr ""
 
-#: ../C/xiphos.xml:467(para) 
+#: ../C/xiphos.xml:467(para)
 msgid "The Vertical Bar \"|\" between patterns means OR. <emphasis>John|Peter</emphasis> matches <emphasis>John</emphasis> or <emphasis>Peter. John .*Peter|Peter .*John</emphasis> matches <emphasis>John</emphasis> ... <emphasis>Peter</emphasis> or <emphasis>Peter</emphasis> ... <emphasis>John</emphasis>. (.* slows a search) <emphasis>pain|suffering|sorrow</emphasis> matches <emphasis>pain</emphasis>, or <emphasis>suffering</emphasis>, or <emphasis>sorrow</emphasis>."
 msgstr ""
 
-#: ../C/xiphos.xml:478(title) 
+#: ../C/xiphos.xml:478(title)
 msgid "The Parentheses"
 msgstr ""
 
-#: ../C/xiphos.xml:479(emphasis) 
+#: ../C/xiphos.xml:479(emphasis)
 msgid "The use of Parentheses \"( )\" is not supported!"
 msgstr ""
 
-#: ../C/xiphos.xml:485(title) 
+#: ../C/xiphos.xml:485(title)
 msgid "The Backslash Prior to a Special Character"
 msgstr ""
 
-#: ../C/xiphos.xml:486(para) 
+#: ../C/xiphos.xml:486(para)
 msgid "The Backslash prior to a special character (\"\\*\") indicates that the character is not being used in its special meaning, but is just to match itself. <emphasis>amen\\.</emphasis> matches <emphasis>amen.</emphasis> but not <emphasis>amen</emphasis>t and will not locate firm<emphasis>amen</emphasis>t."
 msgstr ""
 
-#: ../C/xiphos.xml:494(title) 
+#: ../C/xiphos.xml:494(title)
 msgid "The Backslash Prior to an Ordinary Character"
 msgstr ""
 
-#: ../C/xiphos.xml:496(para) 
+#: ../C/xiphos.xml:496(para)
 msgid "The Backslash prior to an ordinary character (\"\\o\") indicates that the character is not being used to match itself, but has special meaning."
 msgstr ""
 
-#: ../C/xiphos.xml:501(para) 
+#: ../C/xiphos.xml:501(para)
 msgid "\\b if use outside [ ] means word boundary. If used inside [ ] means backspace. <emphasis>\\brighteous\\b</emphasis> matches <emphasis>righteous</emphasis> but not un<emphasis>righteous</emphasis> or <emphasis>righteous</emphasis>ness"
 msgstr ""
 
-#: ../C/xiphos.xml:505(para) 
+#: ../C/xiphos.xml:505(para)
 msgid "\\B means non-word boundary. <emphasis>\\Brighteous\\B</emphasis> matches un<emphasis>righteous</emphasis>ness and un<emphasis>righteous</emphasis>ly but not <emphasis>righteous</emphasis>, un<emphasis>righteous</emphasis> or <emphasis> righteous</emphasis>ness."
 msgstr ""
 
-#: ../C/xiphos.xml:509(para) 
+#: ../C/xiphos.xml:509(para)
 msgid "\\d means digit; same as [0-9]."
 msgstr ""
 
-#: ../C/xiphos.xml:510(para) 
+#: ../C/xiphos.xml:510(para)
 msgid "\\D means non-digit, same as [^0-9]."
 msgstr ""
 
-#: ../C/xiphos.xml:511(para) 
+#: ../C/xiphos.xml:511(para)
 msgid "\\s means space."
 msgstr ""
 
-#: ../C/xiphos.xml:512(para) 
+#: ../C/xiphos.xml:512(para)
 msgid "\\S means not a space."
 msgstr ""
 
-#: ../C/xiphos.xml:513(para) 
+#: ../C/xiphos.xml:513(para)
 msgid "\\w means alphanumeric; same as [a-zA-Z0-9_]."
 msgstr ""
 
-#: ../C/xiphos.xml:514(para) 
+#: ../C/xiphos.xml:514(para)
 msgid "\\W means not alphanumeric; same as [^a-zA-Z0-9_]."
 msgstr ""
 
-#: ../C/xiphos.xml:416(title) ../C/xiphos.xml:12(title) ../C/xiphos.xml:25(phrase) ../C/studypad.xml:12(title) ../C/studypad.xml:25(phrase) 
+#: ../C/xiphos.xml:416(title)
+#: ../C/xiphos.xml:12(title)
+#: ../C/xiphos.xml:25(phrase)
+#: ../C/studypad.xml:12(title)
+#: ../C/studypad.xml:25(phrase)
 msgid "The Studypad"
 msgstr ""
 
-#: ../C/xiphos.xml:4(title) ../C/studypad.xml:4(title) 
+#: ../C/xiphos.xml:4(title)
+#: ../C/studypad.xml:4(title)
 msgid "Using The Studypad"
 msgstr ""
 
-#: ../C/xiphos.xml:5(para) ../C/studypad.xml:5(para) 
+#: ../C/xiphos.xml:5(para)
+#: ../C/studypad.xml:5(para)
 msgid "The Studypad can be opened by choosing <guibutton>File-&gt;Open Studypad</guibutton>"
 msgstr ""
 
-#: ../C/xiphos.xml:8(para) ../C/studypad.xml:8(para) 
+#: ../C/xiphos.xml:8(para)
+#: ../C/studypad.xml:8(para)
 msgid "This is what the Studypad typically looks like:"
 msgstr ""
 
-#: ../C/xiphos.xml:33(para) ../C/studypad.xml:33(para) 
+#: ../C/xiphos.xml:33(para)
+#: ../C/studypad.xml:33(para)
 msgid "The Studypad will save into your working directory, making it useful for collecting and exporting information and Bible study material from Xiphos into other programmes."
 msgstr ""
 
-#: ../C/xiphos.xml:34(para) ../C/xiphos.xml:57(para) ../C/studypad.xml:34(para) 
+#: ../C/xiphos.xml:34(para)
+#: ../C/xiphos.xml:57(para)
+#: ../C/studypad.xml:34(para)
 msgid "Toolbar 1"
 msgstr ""
 
-#: ../C/xiphos.xml:36(para) ../C/xiphos.xml:59(para) ../C/studypad.xml:36(para) 
+#: ../C/xiphos.xml:36(para)
+#: ../C/xiphos.xml:59(para)
+#: ../C/studypad.xml:36(para)
 msgid "Font Size and Environment"
 msgstr ""
 
-#: ../C/xiphos.xml:37(para) ../C/xiphos.xml:60(para) ../C/studypad.xml:37(para) 
+#: ../C/xiphos.xml:37(para)
+#: ../C/xiphos.xml:60(para)
+#: ../C/studypad.xml:37(para)
 msgid "Font Type"
 msgstr ""
 
-#: ../C/xiphos.xml:38(para) ../C/xiphos.xml:61(para) ../C/studypad.xml:38(para) 
+#: ../C/xiphos.xml:38(para)
+#: ../C/xiphos.xml:61(para)
+#: ../C/studypad.xml:38(para)
 msgid "Bold, Italics, Underscored, Crossed Out"
 msgstr ""
 
-#: ../C/xiphos.xml:39(para) ../C/xiphos.xml:62(para) ../C/studypad.xml:39(para) 
+#: ../C/xiphos.xml:39(para)
+#: ../C/xiphos.xml:62(para)
+#: ../C/studypad.xml:39(para)
 msgid "Left, Centre and Right Bound"
 msgstr ""
 
-#: ../C/xiphos.xml:40(para) ../C/xiphos.xml:63(para) ../C/studypad.xml:40(para) 
+#: ../C/xiphos.xml:40(para)
+#: ../C/xiphos.xml:63(para)
+#: ../C/studypad.xml:40(para)
 msgid "Shift Paragraph Right or Left"
 msgstr ""
 
-#: ../C/xiphos.xml:41(para) ../C/xiphos.xml:64(para) ../C/studypad.xml:41(para) 
+#: ../C/xiphos.xml:41(para)
+#: ../C/xiphos.xml:64(para)
+#: ../C/studypad.xml:41(para)
 msgid "Colour Selector"
 msgstr ""
 
-#: ../C/xiphos.xml:43(para) ../C/xiphos.xml:66(para) ../C/studypad.xml:43(para) 
+#: ../C/xiphos.xml:43(para)
+#: ../C/xiphos.xml:66(para)
+#: ../C/studypad.xml:43(para)
 msgid "Toolbar 2"
 msgstr ""
 
-#: ../C/xiphos.xml:45(para) ../C/studypad.xml:45(para) 
+#: ../C/xiphos.xml:45(para)
+#: ../C/studypad.xml:45(para)
 msgid "New, Save, Delete and Print"
 msgstr ""
 
-#: ../C/xiphos.xml:46(para) ../C/xiphos.xml:69(para) ../C/studypad.xml:46(para) 
+#: ../C/xiphos.xml:46(para)
+#: ../C/xiphos.xml:69(para)
+#: ../C/studypad.xml:46(para)
 msgid "Cut, Copy, Paste and Undo"
 msgstr ""
 
-#: ../C/xiphos.xml:47(para) ../C/xiphos.xml:70(para) ../C/studypad.xml:47(para) 
+#: ../C/xiphos.xml:47(para)
+#: ../C/xiphos.xml:70(para)
+#: ../C/studypad.xml:47(para)
 msgid "Find and 'Find and Replace'"
 msgstr ""
 
-#: ../C/xiphos.xml:48(para) ../C/xiphos.xml:71(para) ../C/studypad.xml:48(para) 
+#: ../C/xiphos.xml:48(para)
+#: ../C/xiphos.xml:71(para)
+#: ../C/studypad.xml:48(para)
 msgid "Spellcheck"
 msgstr ""
 
-#: ../C/xiphos.xml:51(para) ../C/xiphos.xml:74(para) ../C/studypad.xml:51(para) 
+#: ../C/xiphos.xml:51(para)
+#: ../C/xiphos.xml:74(para)
+#: ../C/studypad.xml:51(para)
 msgid "In order for spellcheck to be available, one of the languages under <guimenuitem>Edit-&gt;Current Languages</guimenuitem> must be set."
 msgstr ""
 
-#: ../C/xiphos.xml:422(title) ../C/xiphos.xml:31(phrase) 
+#: ../C/xiphos.xml:422(title)
+#: ../C/xiphos.xml:31(phrase)
 msgid "The Personal Commentary"
 msgstr ""
 
 #. Personal Commentary
-#: ../C/xiphos.xml:3(para) ../C/personal.xml:3(para) 
+#: ../C/xiphos.xml:3(para)
+#: ../C/personal.xml:3(para)
 msgid "To build up a personal commentary you will need to install the editable 'Personal' sword module from the English Commentaries section. Right click it and choose <guimenuitem>Edit-&gt;Note-&gt;Personal</guimenuitem> in the menu."
 msgstr ""
 
-#: ../C/xiphos.xml:11(para) 
+#: ../C/xiphos.xml:11(para)
 msgid "An editor window similar to the <guimenuitem>Study Pad</guimenuitem> will appear. Edit your comment and save it; in the future it will appear as your comment to the relevant verse."
 msgstr ""
 
-#: ../C/xiphos.xml:18(title) 
+#: ../C/xiphos.xml:18(title)
 msgid "The Personal Commentary Editor"
 msgstr ""
 
-#: ../C/xiphos.xml:37(para) 
+#: ../C/xiphos.xml:37(para)
 msgid "Locationbar"
 msgstr ""
 
-#: ../C/xiphos.xml:41(para) 
+#: ../C/xiphos.xml:41(para)
 msgid "Synchronise Button"
 msgstr ""
 
-#: ../C/xiphos.xml:42(para) 
+#: ../C/xiphos.xml:42(para)
 msgid "Bible Book, Chapter and Verse Selectors"
 msgstr ""
 
-#: ../C/xiphos.xml:43(para) 
+#: ../C/xiphos.xml:43(para)
 msgid "Location Summary"
 msgstr ""
 
-#: ../C/xiphos.xml:46(para) 
+#: ../C/xiphos.xml:46(para)
 msgid "Use the <guimenuitem>Synchronise Button</guimenuitem> to quickly change location of your editor to that of the underlying Bibletext or use the <guimenuitem>Book</guimenuitem>, <guimenuitem>Chapter</guimenuitem>, and <guimenuitem>Verse</guimenuitem> selectors to choose to edit your comment to one particular verse."
 msgstr ""
 
-#: ../C/xiphos.xml:68(para) 
+#: ../C/xiphos.xml:68(para)
 msgid "Save, Delete and Print"
 msgstr ""
 
-#: ../C/xiphos.xml:80(para) 
+#: ../C/xiphos.xml:80(para)
 msgid "To create a link to other verses right click the text and choose <guimenuitem>Link..</guimenuitem>. In the pop-up window enter the link location and the module linked to."
 msgstr ""
 
-#: ../C/xiphos.xml:86(para) 
+#: ../C/xiphos.xml:86(para)
 msgid "It is possible to rename a personal commentary to suit a particular subject of study for that commentary. Thus, multiple personal commentaries may be installed: Rename the existing personal commentary, and then re-install another instance of the personal commentary if desired. Personal commentary names can consist only of letters and digits, and cannot duplicate an existing module's name. Rename is accessible off the right-click menu."
 msgstr ""
 
-#: ../C/xiphos.xml:97(para) 
+#: ../C/xiphos.xml:97(para)
 msgid "If the study embodied in a particular personal commentary is no longer needed, archival is available in the module manager, prior to removal, for possible future re-installation. See the module manager's Remove/Archive page. Any module may be archived, not just personal commentaries."
 msgstr ""
 
-#: ../C/xiphos.xml:105(para) 
+#: ../C/xiphos.xml:105(para)
 msgid "Although there are 31,102 verses in standard versification, it is unlikely that more than a tiny fraction of all verses will have personal commentary attached to them. A verse list showing where personal commentary notes exist is available from <menuchoice><guisubmenu>Right Click</guisubmenu><guimenuitem> Dump Pers.Comm.</guimenuitem></menuchoice>."
 msgstr ""
 
-#: ../C/xiphos.xml:115(para) 
+#: ../C/xiphos.xml:115(para)
 msgid "The created commentary page will be attached to an individual verse only. To write commentary pages from within Xiphos, attached to longer stretches of text use the <guimenuitem>Link..</guimenuitem> function to link several pages together"
 msgstr ""
 
-#: ../C/xiphos.xml:428(title) 
+#: ../C/xiphos.xml:428(title)
 msgid "Journals and Prayer Lists"
 msgstr ""
 
 #. Journals and Prayer Lists
-#: ../C/xiphos.xml:3(para) ../C/journals.xml:3(para) 
+#: ../C/xiphos.xml:3(para)
+#: ../C/journals.xml:3(para)
 msgid "<application>Xiphos</application> supports user-created and -editable modules to contain general content. Initially conceived as simple prayer lists, they have expanded to include daily journals and topic-outline content. The user can maintain prayer lists, or prepare sermons, or write any structured content desired."
 msgstr ""
 
-#: ../C/xiphos.xml:13(para) 
+#: ../C/xiphos.xml:13(para)
 msgid "To enable prayer list and journal support, see the Preferences dialog as previously described. There, in <guibutton>General-&gt;Misc</guibutton>, check the item labeled <guimenuitem>Enable Prayer Lists</guimenuitem>. You will see a new item appear at the bottom of the sidebar's module list for \"Prayer Lists/Journals\"."
 msgstr ""
 
-#: ../C/xiphos.xml:23(para) 
+#: ../C/xiphos.xml:23(para)
 msgid "Right-click on this entry, and you will be offered a context menu to create new modules. All the offered options are of the same type, but what is offered is a variety of templates from which to work. There are 5 templates at this time."
 msgstr ""
 
-#: ../C/xiphos.xml:32(title) 
+#: ../C/xiphos.xml:32(title)
 msgid "Creating a journal or prayer list"
 msgstr ""
 
-#: ../C/xiphos.xml:39(phrase) 
+#: ../C/xiphos.xml:39(phrase)
 msgid "New journal or prayer list"
 msgstr ""
 
-#: ../C/xiphos.xml:45(para) 
+#: ../C/xiphos.xml:45(para)
 msgid "Their structure is the same, but the offered templates provide a variety of hints regarding ways to organize content. <guimenuitem>Simple</guimenuitem> is trivial, and can be considered a mental Post-It note. <guimenuitem>Subject</guimenuitem> is useful as a more organized version. <guimenuitem>Monthly</guimenuitem> provides a per-month structure in which to track needed content. <guimenuitem>Daily Journal</guimenuitem> is a full 365-day calendar in which to track a personal journal or ongoing prayer needs. And finally, <guimenuitem>Outlined Topic</guimenuitem> is a full, expandable outline suitable for topics and subtopics."
 msgstr ""
 
-#: ../C/xiphos.xml:61(para) 
+#: ../C/xiphos.xml:61(para)
 msgid "Journals and prayer lists have the structure of a general book: If simply selected for display from the module list, they will appear in the usual subwindow for general books."
 msgstr ""
 
-#: ../C/xiphos.xml:68(para) 
+#: ../C/xiphos.xml:68(para)
 msgid "Editing a journal or prayer list is done by right-clicking the module name to get its context menu, whose middle item is <guimenuitem>Open in Editor</guimenuitem>. The sections and subsections will be listed in the left margin. Click one, and the editor navigates to that section. The context menu on right-click of section keys provides for adding, deleting, and editing the names of sections and subsections."
 msgstr ""
 
-#: ../C/xiphos.xml:80(para) 
+#: ../C/xiphos.xml:80(para)
 msgid "If the general book subwindow is currently displaying the journal or prayer list being edited, it will synchronize with new content when <guimenuitem>Save</guimenuitem> is used."
 msgstr ""
 
-#: ../C/xiphos.xml:87(para) 
+#: ../C/xiphos.xml:87(para)
 msgid "As mentioned, these user-edited modules are in effect general books. This means they can be viewed in any Sword Project application. Thus, you can use these modules immediately in <application>BibleTime</application>, for example; or from the Module Manager's <guimenuitem>Maintenance</guimenuitem> page, you can archive a zip file to copy to a Windows system where you can then install the zip content as a module for the Windows user interface. Few other Sword Project applications provide for editing these modules, however, meaning that they will appear in such other applications as just ordinary general books."
 msgstr ""
 
-#: ../C/xiphos.xml:103(para) 
+#: ../C/xiphos.xml:103(para)
 msgid "In the future, it is planned that a module sharing facility will become available, by which user-edited modules such as these can be uploaded to become available to a wide audience. The current install repository facility will be expanded to provide upload as well as the existing download capability in order to support this. Thus, users will be able to share their sermons, Bible studies, and other personally-authored content with other Sword application users."
 msgstr ""
 
-#: ../C/xiphos.xml:434(title) 
+#: ../C/xiphos.xml:434(title)
 msgid "Getting Help Online"
 msgstr ""
 
-#: ../C/xiphos.xml:4(title) ../C/onlinehelp.xml:4(title) 
+#: ../C/xiphos.xml:4(title)
+#: ../C/onlinehelp.xml:4(title)
 msgid "Users Mailing List"
 msgstr ""
 
-#: ../C/xiphos.xml:5(para) ../C/onlinehelp.xml:5(para) 
+#: ../C/xiphos.xml:5(para)
+#: ../C/onlinehelp.xml:5(para)
 msgid "One way you can get help with Xiphos is using our low-traffic users' mailing list. You can sign up by clicking <ulink url=\"https://lists.sourceforge.net/lists/listinfo/gnomesword-users/\"> this link</ulink>. Once you are signed up, you can email the list with any problems you are having and other users or the developers will respond, typically within a day."
 msgstr ""
 
-#: ../C/xiphos.xml:13(title) 
+#: ../C/xiphos.xml:13(title)
 msgid "Live Chat"
 msgstr ""
 
-#: ../C/xiphos.xml:14(para) 
+#: ../C/xiphos.xml:14(para)
 msgid "Another way to get help is with online chat. Xiphos has an IRC channel on freenode, #xiphos. If you don't know what that means, it's ok. Just click <ulink url=\"http://embed.mibbit.com/?server=irc.freenode.net&amp;channel=%23xiphos\">this link</ulink> (it will open your web browser), type a nickname or accept the default, and click \"Click to join chatroom\". This will take you to a chatroom where the developers and other users are available to help you with issues you may be having. Although many times someone will answer your question immediately, sometimes you may have to wait a few minutes or longer."
 msgstr ""
 
-#: ../C/xiphos.xml:440(title) 
+#: ../C/xiphos.xml:440(title)
 msgid "Original Language Research"
 msgstr ""
 
-#: ../C/xiphos.xml:4(title) ../C/originallanguage.xml:4(title) 
+#: ../C/xiphos.xml:4(title)
+#: ../C/originallanguage.xml:4(title)
 msgid "Installing Needed Modules"
 msgstr ""
 
-#: ../C/xiphos.xml:5(para) ../C/originallanguage.xml:5(para) 
+#: ../C/xiphos.xml:5(para)
+#: ../C/originallanguage.xml:5(para)
 msgid "Xiphos is ideally suited for studying the original Greek and Hebrew. To get started, you will want the following modules:"
 msgstr ""
 
-#: ../C/xiphos.xml:8(para) ../C/originallanguage.xml:8(para) 
+#: ../C/xiphos.xml:8(para)
+#: ../C/originallanguage.xml:8(para)
 msgid "From Crosswire Repository:"
 msgstr ""
 
-#: ../C/xiphos.xml:13(para) ../C/originallanguage.xml:13(para) 
+#: ../C/xiphos.xml:13(para)
+#: ../C/originallanguage.xml:13(para)
 msgid "StrongsHebrew Dictionary (or get StrongsRealHebrew from the Xiphos Repository)"
 msgstr ""
 
-#: ../C/xiphos.xml:18(para) ../C/originallanguage.xml:18(para) 
+#: ../C/xiphos.xml:18(para)
+#: ../C/originallanguage.xml:18(para)
 msgid "StrongsGreek Dictionary (or get StrongsRealGreek from the Xiphos Repository)"
 msgstr ""
 
-#: ../C/xiphos.xml:23(para) ../C/originallanguage.xml:23(para) 
+#: ../C/xiphos.xml:23(para)
+#: ../C/originallanguage.xml:23(para)
 msgid "Robinson Dictionary"
 msgstr ""
 
-#: ../C/xiphos.xml:28(para) ../C/originallanguage.xml:28(para) 
+#: ../C/xiphos.xml:28(para)
+#: ../C/originallanguage.xml:28(para)
 msgid "KJV Bible"
 msgstr ""
 
-#: ../C/xiphos.xml:33(para) ../C/originallanguage.xml:33(para) 
+#: ../C/xiphos.xml:33(para)
+#: ../C/originallanguage.xml:33(para)
 msgid "From Xiphos Repository:"
 msgstr ""
 
-#: ../C/xiphos.xml:38(para) ../C/originallanguage.xml:38(para) 
+#: ../C/xiphos.xml:38(para)
+#: ../C/originallanguage.xml:38(para)
 msgid "StrongsRealGreek Dictionary (same as StrongsGreek, but with Greek characters, B-Greek transliteration, and self-referencing links)"
 msgstr ""
 
-#: ../C/xiphos.xml:43(para) ../C/originallanguage.xml:43(para) 
+#: ../C/xiphos.xml:43(para)
+#: ../C/originallanguage.xml:43(para)
 msgid "StrongsRealHebrew Dictionary (same as StrongsHebrew, but with Hebrew characters and self-referencing links)"
 msgstr ""
 
-#: ../C/xiphos.xml:48(para) ../C/originallanguage.xml:48(para) 
+#: ../C/xiphos.xml:48(para)
+#: ../C/originallanguage.xml:48(para)
 msgid "InvertedStrongsRealGreek (key in or copy actual Greek word, rather than number)"
 msgstr ""
 
-#: ../C/xiphos.xml:56(title) 
+#: ../C/xiphos.xml:56(title)
 msgid "Setting Up"
 msgstr ""
 
-#: ../C/xiphos.xml:57(para) 
+#: ../C/xiphos.xml:57(para)
 msgid "While still in the module manager, create indexes for all of the modules you just installed. Then close the module manager and open <menuchoice><guisubmenu>Edit</guisubmenu><guimenuitem> Preferences</guimenuitem></menuchoice> and go to <menuchoice><guisubmenu>Modules</guisubmenu><guimenuitem>Misc</guimenuitem></menuchoice>. Set your Hebrew and Greek lexicons according to what you installed. Close preferences and open the KJV module. Turn on the module options <menuchoice><guisubmenu>Right Click</guisubmenu><guisubmenu>Module Options</guisubmenu><guimenuitem>Show Strongs </guimenuitem></menuchoice> and <menuchoice><guisubmenu>Right Click</guisubmenu><guisubmenu>Module Options </guisubmenu><guimenuitem>Show Morphology</guimenuitem></menuchoice>. You should see the Bible text change to show Strongs numbers underneath the appropriate English words. Hover over the numbers (or letters for morphology) with the mouse and you will see the definition displayed in the previewer pane. Click on the link and the definition will show in the dictionary pane. If you are using StrongsRealGreek or StrongsRealHebrew, you can click on any other number referenced in the definition and you will be taken to that entry."
 msgstr ""
 
-#: ../C/xiphos.xml:73(title) 
+#: ../C/xiphos.xml:73(title)
 msgid "Searching for Strongs Numbers"
 msgstr ""
 
-#: ../C/xiphos.xml:74(para) 
+#: ../C/xiphos.xml:74(para)
 msgid "Choose <menuchoice><guisubmenu>Edit</guisubmenu><guimenuitem>Advanced Search</guimenuitem></menuchoice>or press <keycap>F3</keycap>. Under <interface>Search Type</interface>, select <guibutton>Optimized (\"Lucene\")</guibutton>. Click on the <interface>Attribute Search</interface> tab, and make check the box that says <guibutton> Strongs Numbers</guibutton>. Now click in the entry field at the top and search for the number you are looking for preceded by \"lemma:\" and \"G\" for Greek or \"H\" for Hebrew. So to look for the Hebrew word tsad-deek (6662), enter \"lemma:H6662\". Once the search is done, the results pane will be shown. Notice that when you click on a result, it will show the result in the preview pane, and the strong's numbers will show as well, following immediately after the words they match. Also note that hovering over these numbers will show the definition in the main preview pane."
 msgstr ""
 
-#: ../C/xiphos.xml:86(title) 
+#: ../C/xiphos.xml:86(title)
 msgid "Additional Modules"
 msgstr ""
 
-#: ../C/xiphos.xml:87(para) 
+#: ../C/xiphos.xml:87(para)
 msgid "For more advanced research, the following modules are also available:"
 msgstr ""
 
-#: ../C/xiphos.xml:91(para) 
+#: ../C/xiphos.xml:91(para)
 msgid "2TGreek (Xiphos Repository) : This module contains the entire Bible in Greek. It combines the LXX and Tischendorf8 NT into one easy-to-use module. In addition, it contains Strongs, Morphology,Greek Accents, and primary/secondary readings. As with all modules that include Strongs, Xiphos displays 2TGreek in beautiful interlinear form."
 msgstr ""
 
-#: ../C/xiphos.xml:99(para) 
+#: ../C/xiphos.xml:99(para)
 msgid "Elzevir Textus Receptus (Crosswire Beta Repository as of this writing) : 1624 edition with Strongs and Morphology"
 msgstr ""
 
-#: ../C/xiphos.xml:104(para) 
+#: ../C/xiphos.xml:104(para)
 msgid "LXX (Crosswire Repository) : the Septuagint with Strongs, Morphology, and footnotes"
 msgstr ""
 
-#: ../C/xiphos.xml:109(para) 
+#: ../C/xiphos.xml:109(para)
 msgid "MorphGNT (Crosswire Beta Repository as of this writing) : This is derived from the morphologically parsed GNT provided by UPenn's CCAT. It was reformatted and error-corrected by James Tauber. It includes Greek accents and Morphology."
 msgstr ""
 
-#: ../C/xiphos.xml:116(para) 
+#: ../C/xiphos.xml:116(para)
 msgid "TR (Crosswire Repository) : This is the Textus Receptus with Strongs and Morphology"
 msgstr ""
 
-#: ../C/xiphos.xml:121(para) 
+#: ../C/xiphos.xml:121(para)
 msgid "TischMorph (Xiphos Repository) : As described above, this has Strongs, Morphology, accents, and alternate readings."
 msgstr ""
 
-#: ../C/xiphos.xml:126(para) 
+#: ../C/xiphos.xml:126(para)
 msgid "WHNU (Crosswire Repository) : Westcott-Hort of 1881 with Strongs and Morphology"
 msgstr ""
 
-#: ../C/xiphos.xml:131(para) 
+#: ../C/xiphos.xml:131(para)
 msgid "GreekHebrew (Crosswire Repository) : This is a dictionary keyed to Strongs. It contains words in the LXX that are also found in the New Testament. In addition, it contains the equivalent Hebrew words also keyed to Strongs."
 msgstr ""
 
-#: ../C/xiphos.xml:138(para) 
+#: ../C/xiphos.xml:138(para)
 msgid "Didache (Crosswire Beta Repository as of this writing) : This is an early Christian treatise in Greek dated to the late first or early second century. It includes Strongs, Morphology, and Greek accents."
 msgstr ""
 
-#: ../C/xiphos.xml:446(title) 
+#: ../C/xiphos.xml:446(title)
 msgid "Authors"
 msgstr ""
 
 #. Authors
-#: ../C/xiphos.xml:3(para) ../C/authors.xml:3(para) 
+#: ../C/xiphos.xml:3(para)
+#: ../C/authors.xml:3(para)
 msgid "This manual was written by:"
 msgstr ""
 
-#: ../C/xiphos.xml:8(para) 
+#: ../C/xiphos.xml:8(para)
 msgid "Andy Piper"
 msgstr ""
 
-#: ../C/xiphos.xml:13(para) 
+#: ../C/xiphos.xml:13(para)
 msgid "Pierre Benz"
 msgstr ""
 
-#: ../C/xiphos.xml:18(para) 
+#: ../C/xiphos.xml:18(para)
 msgid "Dr Peter von Kaehne"
 msgstr ""
 
-#: ../C/xiphos.xml:23(para) 
+#: ../C/xiphos.xml:23(para)
 msgid "Karl Kleinpaste"
 msgstr ""
 
-#: ../C/xiphos.xml:28(para) 
+#: ../C/xiphos.xml:28(para)
 msgid "Dominique Corbex"
 msgstr ""
 
-#: ../C/xiphos.xml:33(para) 
+#: ../C/xiphos.xml:33(para)
 msgid "Matthew Talbert"
 msgstr ""
 
-#: ../C/xiphos.xml:38(para) 
+#: ../C/xiphos.xml:38(para)
 msgid "Please send all comments and suggestions regarding this manual to Xiphos Development list <email>xiphos-developers@lists.sourceforge.net</email>. Comments may also be submitted via the project trackers at SourceForge."
 msgstr ""
 
-#: ../C/xiphos.xml:43(para) 
+#: ../C/xiphos.xml:43(para)
 msgid "For more information on <application>Xiphos</application>, please visit the project website at <ulink type=\"http\" url=\"http://xiphos.sf.net/\">http://xiphos.sf.net</ulink>. Bug reports should be made using the Bug Tracker at the project development site <ulink type=\"http\" url=\"http://www.sourceforge.net/projects/xiphos\"> http://www.sourceforge.net/projects/xiphos</ulink>"
 msgstr ""
 
-#: ../C/xiphos.xml:452(title) 
+#: ../C/xiphos.xml:452(title)
 msgid "License"
 msgstr ""
 
-#: ../C/xiphos.xml:2(para) ../C/license.xml:2(para) 
+#: ../C/xiphos.xml:2(para)
+#: ../C/license.xml:2(para)
 msgid "This program is free software; you can redistribute it and/or modify it under the terms of the <ulink type=\"ghelp\" url=\"gnome-help:gpl\">GNU General Public License</ulink> version 2 as published by the Free Software Foundation."
 msgstr ""
 
-#: ../C/xiphos.xml:7(para) 
+#: ../C/xiphos.xml:7(para)
 msgid "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 <citetitle>GNU General Public License</citetitle> for more details."
 msgstr ""
 
-#: ../C/xiphos.xml:13(para) 
+#: ../C/xiphos.xml:13(para)
 msgid "A copy of the <citetitle>GNU General Public License</citetitle> is included as an appendix to the <citetitle>GNOME Users Guide</citetitle>. You may also obtain a copy of the <citetitle>GNU General Public License</citetitle> from the Free Software Foundation by visiting <ulink type=\"http\" url=\"http://www.fsf.org\"> their Web site</ulink> or by writing to <address> Free Software Foundation, Inc. <street>51 Franklin St</street>, Fifth Floor, <city>Boston</city>, <state>MA</state><postcode>02110-1301</postcode><country>USA</country></address>"
 msgstr ""
 
 #. Use the Introduction section to give a brief overview of what
-#.      the application is and what it does.
-#: ../C/introduction.xml:5(para) 
+#. the application is and what it does.
+#: ../C/introduction.xml:5(para)
 msgid "is a Bible study and research tool based upon the \"SWORD Project\" libraries and the GNOME Desktop libraries. You can use to do the following:"
 msgstr ""
 
-#: ../C/interface.xml:27(phrase) 
+#: ../C/interface.xml:27(phrase)
 msgid "menubar"
 msgstr ""
 
 #. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2.
-#: ../C/authors.xml:0(None) 
+#: ../C/authors.xml:0(None)
 msgid "translator-credits"
 msgstr ""
 
diff --git a/help/fa/figures/first_start.png b/help/fa/figures/first_start.png
new file mode 100644
index 0000000..e8e3328
--- /dev/null
+++ b/help/fa/figures/first_start.png
diff --git a/help/fa/figures/gtkhtml3-vs-mozembed.png b/help/fa/figures/gtkhtml3-vs-mozembed.png
new file mode 100644
index 0000000..94b4c3e
--- /dev/null
+++ b/help/fa/figures/gtkhtml3-vs-mozembed.png
diff --git a/help/fa/figures/interface.png b/help/fa/figures/interface.png
index 1531da5..aef8cac 100644
--- a/help/fa/figures/interface.png
+++ b/help/fa/figures/interface.png
diff --git a/help/fa/figures/interface_biblepane.png b/help/fa/figures/interface_biblepane.png
new file mode 100644
index 0000000..b5034cd
--- /dev/null
+++ b/help/fa/figures/interface_biblepane.png
diff --git a/help/fa/figures/interface_commentarypane.png b/help/fa/figures/interface_commentarypane.png
new file mode 100644
index 0000000..31a43a9
--- /dev/null
+++ b/help/fa/figures/interface_commentarypane.png
diff --git a/help/fa/figures/interface_dictionary.png b/help/fa/figures/interface_dictionary.png
new file mode 100644
index 0000000..05c4efe
--- /dev/null
+++ b/help/fa/figures/interface_dictionary.png
diff --git a/help/fa/figures/interface_menubar-view.png b/help/fa/figures/interface_menubar-view.png
new file mode 100644
index 0000000..98d71de
--- /dev/null
+++ b/help/fa/figures/interface_menubar-view.png
diff --git a/help/fa/figures/interface_menubar.png b/help/fa/figures/interface_menubar.png
new file mode 100644
index 0000000..b82197c
--- /dev/null
+++ b/help/fa/figures/interface_menubar.png
diff --git a/help/fa/figures/interface_parallel-separate.png b/help/fa/figures/interface_parallel-separate.png
index cb742e4..942ee64 100644
--- a/help/fa/figures/interface_parallel-separate.png
+++ b/help/fa/figures/interface_parallel-separate.png
diff --git a/help/fa/figures/interface_parallel.png b/help/fa/figures/interface_parallel.png
new file mode 100644
index 0000000..6012687
--- /dev/null
+++ b/help/fa/figures/interface_parallel.png
diff --git a/help/fa/figures/interface_searchpane.png b/help/fa/figures/interface_searchpane.png
new file mode 100644
index 0000000..ef337d5
--- /dev/null
+++ b/help/fa/figures/interface_searchpane.png
diff --git a/help/fa/figures/interface_shortcut.png b/help/fa/figures/interface_shortcut.png
new file mode 100644
index 0000000..b3cbcc1
--- /dev/null
+++ b/help/fa/figures/interface_shortcut.png
diff --git a/help/fa/figures/interface_sidepane.png b/help/fa/figures/interface_sidepane.png
new file mode 100644
index 0000000..ebce69f
--- /dev/null
+++ b/help/fa/figures/interface_sidepane.png
diff --git a/help/fa/figures/interface_toolbar.png b/help/fa/figures/interface_toolbar.png
new file mode 100644
index 0000000..d9cd739
--- /dev/null
+++ b/help/fa/figures/interface_toolbar.png
diff --git a/help/fa/figures/interface_viewer.png b/help/fa/figures/interface_viewer.png
new file mode 100644
index 0000000..806500c
--- /dev/null
+++ b/help/fa/figures/interface_viewer.png
diff --git a/help/fa/figures/journal.png b/help/fa/figures/journal.png
new file mode 100644
index 0000000..de46544
--- /dev/null
+++ b/help/fa/figures/journal.png
diff --git a/help/fa/figures/module.png b/help/fa/figures/module.png
new file mode 100644
index 0000000..52da725
--- /dev/null
+++ b/help/fa/figures/module.png
diff --git a/help/fa/figures/personal.png b/help/fa/figures/personal.png
new file mode 100644
index 0000000..d4d18d0
--- /dev/null
+++ b/help/fa/figures/personal.png
diff --git a/help/fa/figures/preferences.png b/help/fa/figures/preferences.png
index 86b78c4..b2d57aa 100644
--- a/help/fa/figures/preferences.png
+++ b/help/fa/figures/preferences.png
diff --git a/help/fa/figures/preferences_fonts-color.png b/help/fa/figures/preferences_fonts-color.png
index aa3cfe0..bb1d787 100644
--- a/help/fa/figures/preferences_fonts-color.png
+++ b/help/fa/figures/preferences_fonts-color.png
diff --git a/help/fa/figures/preferences_fonts-misc.png b/help/fa/figures/preferences_fonts-misc.png
index e349e3e..1b5ce15 100644
--- a/help/fa/figures/preferences_fonts-misc.png
+++ b/help/fa/figures/preferences_fonts-misc.png
diff --git a/help/fa/figures/preferences_general-misc.png b/help/fa/figures/preferences_general-misc.png
index 9b2a1e3..e66e35c 100644
--- a/help/fa/figures/preferences_general-misc.png
+++ b/help/fa/figures/preferences_general-misc.png
diff --git a/help/fa/figures/preferences_general-tabs.png b/help/fa/figures/preferences_general-tabs.png
index 80a5bcf..9a9e8e5 100644
--- a/help/fa/figures/preferences_general-tabs.png
+++ b/help/fa/figures/preferences_general-tabs.png
diff --git a/help/fa/figures/preferences_modules-main.png b/help/fa/figures/preferences_modules-main.png
index 8c9f6d4..e55cb0c 100644
--- a/help/fa/figures/preferences_modules-main.png
+++ b/help/fa/figures/preferences_modules-main.png
diff --git a/help/fa/figures/preferences_modules-misc.png b/help/fa/figures/preferences_modules-misc.png
index b902f70..54406a4 100644
--- a/help/fa/figures/preferences_modules-misc.png
+++ b/help/fa/figures/preferences_modules-misc.png
diff --git a/help/fa/figures/preferences_modules-parallel.png b/help/fa/figures/preferences_modules-parallel.png
index f9a3418..6286233 100644
--- a/help/fa/figures/preferences_modules-parallel.png
+++ b/help/fa/figures/preferences_modules-parallel.png
diff --git a/help/fa/figures/studypad.png b/help/fa/figures/studypad.png
new file mode 100644
index 0000000..8b79171
--- /dev/null
+++ b/help/fa/figures/studypad.png
diff --git a/help/fa/figures/sword3.png b/help/fa/figures/sword3.png
index a2a466c..c96c52f 100644
--- a/help/fa/figures/sword3.png
+++ b/help/fa/figures/sword3.png
diff --git a/help/fa/figures/sword_config.png b/help/fa/figures/sword_config.png
new file mode 100644
index 0000000..c5b8c05
--- /dev/null
+++ b/help/fa/figures/sword_config.png
diff --git a/help/fa/figures/sword_install.png b/help/fa/figures/sword_install.png
new file mode 100644
index 0000000..34b2e6e
--- /dev/null
+++ b/help/fa/figures/sword_install.png
diff --git a/help/fa/figures/sword_remove.png b/help/fa/figures/sword_remove.png
new file mode 100644
index 0000000..feb137b
--- /dev/null
+++ b/help/fa/figures/sword_remove.png
diff --git a/help/fa/figures/sword_sources.png b/help/fa/figures/sword_sources.png
new file mode 100644
index 0000000..8741b47
--- /dev/null
+++ b/help/fa/figures/sword_sources.png
diff --git a/help/fa/interface.xml b/help/fa/interface.xml
index db0cf93..e89b7c1 100644
--- a/help/fa/interface.xml
+++ b/help/fa/interface.xml
@@ -2,16 +2,10 @@
 <!-- ============= Interface ============================== -->
 <!-- ============= Menubar  ============-->
 <sect2 id="menubar">
-   		<title>Menubar</title>
-   		<para>
-   		At the top of the <application>Xiphos</application> main window is the menubar. 
-   		Almost all of the functions are available by activating the appropriate 
-   		menu item. The functions have been grouped according to their type. For 
-   		example, the file operations have been grouped into 
-   		the <guisubmenu>File</guisubmenu> menu.
-   		</para>
+   		<title>خط فرمان</title>
+   		<para>در بخش بالایی برنامۀ<application>زیفوس</application>خط فرمان قرار دارد.تقریباً تمامی کاربردها توسط انتخاب منوی درست اجرا می‏شوند. این کابردها بسته به نوع کاری که انجام می‏دهند گروه‏بندی شده‏اند. بعنوان نمونه، گروه فرامین کاربردی مرتبط با فایل، زیر فرمان<guisubmenu>پرونده</guisubmenu>دسته‏بندی شده‏اند.</para>
 	        <figure id="menubar_figure">
-			<title>Menubar</title>
+			<title>خط فرمان</title>
 	  		<screenshot> 
 			  <mediaobject> 
 			    <imageobject><imagedata fileref="figures/interface_menubar.png" format="PNG"/> 
diff --git a/help/fa/search.xml b/help/fa/search.xml
index 8c846e9..493650e 100644
--- a/help/fa/search.xml
+++ b/help/fa/search.xml
@@ -105,7 +105,7 @@
 					to match a string of text. A regular expression can be 
 					used to find verses with words that match a particular 
 					pattern. For example the regular expression
-					<userinput>\ A[a-z]*iah </userinput> will match verses that contain
+					<userinput>[a-z]*iah </userinput> will match verses that contain
 					the words Aiah, Ahaziah, Athaliah and Amariah.</para>
 					<para>A complete discussion of regular expressions is 
 					beyond the scope of this manual, but more information 
diff --git a/help/fa/start.xml b/help/fa/start.xml
index ad5a12b..3037465 100644
--- a/help/fa/start.xml
+++ b/help/fa/start.xml
@@ -1,36 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- ============= Getting Started with Xiphos  ============-->
 <sect2 id="xiphos-getting-started">
-  		<title>Starting Xiphos</title>
-			<para>
-			You can start <application>Xiphos</application> in the following ways:
-			</para>
+  		<title>زیفوس در حال بارگذاری</title>
+			<para>شما می‏توانید برنامۀ <application>زیفوس</application> را به یکی از روش‏های زیر اجرا نمایید:</para>
 			<variablelist>
 				<varlistentry>
-					<term>Applications menu</term>
+					<term>فهرست برنامه‏ها</term>
 					<listitem>
-						<para>
-						Choose <menuchoice><guisubmenu>Accessories</guisubmenu>
-						<guimenuitem>Xiphos Bible Guide</guimenuitem>
-						</menuchoice>.
-			            </para>
+						<para>گزینۀ  <menuchoice><guisubmenu>لوازم را برگزینید</guisubmenu><guimenuitem> و سپس به راهنمای زیفوس کتاب‏مقدس بروید</guimenuitem></menuchoice>.</para>
     				</listitem>
     			</varlistentry>
     			<varlistentry>
-    				<term>Command line</term>
+    				<term>خط فرمان</term>
     				<listitem>
-    					<para>
-						Type <command>xiphos</command>, then press <keycap>Return</keycap>.
-						</para>
+    					<para>عبارت <command>زیفوس</command>,  را وارد نموده، سپس کلید <keycap>اینتر</keycap>را بزنید.</para>
     				</listitem>
     			</varlistentry>
 			<varlistentry>
-				<term>Windows</term>
+				<term>پنجره‏ها</term>
 				<listitem>
-					<para>
-						Go to <menuchoice><guisubmenu>All Programs</guisubmenu><guisubmenu>Xiphos
-						</guisubmenu><guimenuitem>Xiphos</guimenuitem></menuchoice>.
-					</para>
+					<para>گزینۀ <menuchoice><guisubmenu>تمام برنامه‏ها</guisubmenu><guisubmenu>زیفوس </guisubmenu><guimenuitem>زیفوس</guimenuitem></menuchoice>را برگزیند.</para>
 				</listitem>
 			</varlistentry>
 
diff --git a/help/fa/xiphos.xml b/help/fa/xiphos.xml
index a6a7301..211983f 100644
--- a/help/fa/xiphos.xml
+++ b/help/fa/xiphos.xml
@@ -14,9 +14,9 @@
 <!ENTITY license SYSTEM "license.xml">
 <!ENTITY onlinehelp SYSTEM "onlinehelp.xml">
 <!ENTITY originallanguage SYSTEM "originallanguage.xml">
-<!ENTITY appversion "3.1">
-<!ENTITY manrevision "3.1">
-<!ENTITY date "2009-05-11">
+<!ENTITY appversion "3.1.2">
+<!ENTITY manrevision "3.1.2">
+<!ENTITY date "11 May 2009">
 <!ENTITY app "<application>Xiphos</application>">
 <!ENTITY appname "Xiphos">
 <!ENTITY xiphos "the Xiphos Team">
@@ -50,14 +50,14 @@ Template last modified Apr 11, 2002
 <!-- please do not change the id; for translations, change lang to -->
 <!-- appropriate code -->
   <articleinfo>
-    <title><application>Xiphos</application> Manual</title>
-    <abstract>
-      <para>Xiphos is an application to aid in study of the Bible.</para>
+    <title><application>Xiphos</application> راهنما</title>
+    <abstract role="description">
+      <para>زیفوس برنامه‏ای است که به منظور کمک رسانی در مطالعۀ کتاب‏مقدس تهیه شده است.</para>
     </abstract>
     <copyright>
       <year>2003</year>
       <year>2009</year>
-      <holder>The Xiphos Team</holder>
+      <holder>تیم زیفوس</holder>
     </copyright>
 
     <!-- translators: uncomment this:
@@ -71,441 +71,373 @@ Template last modified Apr 11, 2002
     <!-- An address can be added to the publisher information.  If a role is
     not specified, the publisher/author is the same for all versions of the
     document.  -->
-    <publisher>
-      <publishername>The Xiphos Team</publishername>
+    <publisher role="maintainer">
+      <publishername>تیم زیفوس</publishername>
     </publisher>
 
-     <legalnotice id="legalnotice">
-   <title>GNU GENERAL PUBLIC LICENSE</title>
-   <para>Version 2, June 1991</para>
-   <para>
-     Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-   </para>
-   <para>
-     51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-   </para>
-   <para>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-   </para>
-   
-   <sect2 id="legal-preamble">
-     <title>Preamble</title>
-     <para>
-       The licenses for most software are designed to take away your
-       freedom to share and change it.  By contrast, the GNU General Public
-       License is intended to guarantee your freedom to share and change free
-       software--to make sure the software is free for all its users.  This
-       General Public License applies to most of the Free Software
-       Foundation's software and to any other program whose authors commit to
-       using it.  (Some other Free Software Foundation software is covered by
-       the GNU Library General Public License instead.)  You can apply it to
-       your programs, too.
-     </para>
-     <para>
-       When we speak of free software, we are referring to freedom, not
-       price.  Our General Public Licenses are designed to make sure that you
-       have the freedom to distribute copies of free software (and charge for
-       this service if you wish), that you receive source code or can get it
-       if you want it, that you can change the software or use pieces of it
-       in new free programs; and that you know you can do these things.
-     </para>
-     <para>
-       To protect your rights, we need to make restrictions that forbid
-       anyone to deny you these rights or to ask you to surrender the rights.
-       These restrictions translate to certain responsibilities for you if you
-       distribute copies of the software, or if you modify it.
-     </para>
-     <para>
-       For example, if you distribute copies of such a program, whether
-       gratis or for a fee, you must give the recipients all the rights that
-       you have.  You must make sure that they, too, receive or can get the
-       source code.  And you must show them these terms so they know their
-       rights.
-     </para>
-     <para>
-       We protect your rights with two steps: (1) copyright the software, and
-       (2) offer you this license which gives you legal permission to copy,
-       distribute and/or modify the software.
-     </para>
-     <para>
-       Also, for each author's protection and ours, we want to make certain
-       that everyone understands that there is no warranty for this free
-       software.  If the software is modified by someone else and passed on, we
-       want its recipients to know that what they have is not the original, so
-       that any problems introduced by others will not reflect on the original
-       authors' reputations.
-     </para>
-     <para>
-       Finally, any free program is threatened constantly by software
-       patents.  We wish to avoid the danger that redistributors of a free
-       program will individually obtain patent licenses, in effect making the
-       program proprietary.  To prevent this, we have made it clear that any
-       patent must be licensed for everyone's free use or not licensed at all.
-     </para>
-     <para>
-       The precise terms and conditions for copying, distribution and
-       modification follow.
-     </para>
-   </sect2>
-   
-   <sect2 id="legal-distribution">
-     <title>GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS
-       FOR COPYING, DISTRIBUTION AND MODIFICATION</title>
-     <itemizedlist>
-       <listitem>
-	 <para>
-	   0. This License applies to any program or other work which contains
-	   a notice placed by the copyright holder saying it may be distributed
-	   under the terms of this General Public License.  The "Program", below,
-	   refers to any such program or work, and a "work based on the Program"
-	   means either the Program or any derivative work under copyright law:
-	   that is to say, a work containing the Program or a portion of it,
-	   either verbatim or with modifications and/or translated into another
-	   language.  (Hereinafter, translation is included without limitation in
-	   the term "modification".)  Each licensee is addressed as "you".
-	 </para>
-	 <para>
-	   Activities other than copying, distribution and modification are not
-	   covered by this License; they are outside its scope.  The act of
-	   running the Program is not restricted, and the output from the Program
-	   is covered only if its contents constitute a work based on the
-	   Program (independent of having been made by running the Program).
-	   Whether that is true depends on what the Program does.
-	 </para>
-       </listitem>
-       <listitem>
-	 <para>
-	   1. You may copy and distribute verbatim copies of the Program's
-	   source code as you receive it, in any medium, provided that you
-	   conspicuously and appropriately publish on each copy an appropriate
-	   copyright notice and disclaimer of warranty; keep intact all the
-	   notices that refer to this License and to the absence of any warranty;
-	   and give any other recipients of the Program a copy of this License
-	   along with the Program.
-	 </para>
-	 <para>
-	   You may charge a fee for the physical act of transferring a copy, and
-	   you may at your option offer warranty protection in exchange for a fee.
-	 </para>
-       </listitem>
-       <listitem>
-	 <para>
-	   2. You may modify your copy or copies of the Program or any portion
-	   of it, thus forming a work based on the Program, and copy and
-	   distribute such modifications or work under the terms of Section 1
-	   above, provided that you also meet all of these conditions:
-	 </para>
-	 <para>
-	   a) You must cause the modified files to carry prominent notices
-	   stating that you changed the files and the date of any change.
-	 </para>
-	 <para>
-	   b) You must cause any work that you distribute or publish, that in
-	   whole or in part contains or is derived from the Program or any
-	   part thereof, to be licensed as a whole at no charge to all third
-	   parties under the terms of this License.
-	 </para>
-	 <para>
-	   c) If the modified program normally reads commands interactively
-	   when run, you must cause it, when started running for such
-	   interactive use in the most ordinary way, to print or display an
-	   announcement including an appropriate copyright notice and a
-	   notice that there is no warranty (or else, saying that you provide
-	   a warranty) and that users may redistribute the program under
-	   these conditions, and telling the user how to view a copy of this
-	   License.  (Exception: if the Program itself is interactive but
-	   does not normally print such an announcement, your work based on
-	   the Program is not required to print an announcement.)
-	 </para>
-	 <para>
-	   These requirements apply to the modified work as a whole.  If
-	   identifiable sections of that work are not derived from the Program,
-	   and can be reasonably considered independent and separate works in
-	   themselves, then this License, and its terms, do not apply to those
-	   sections when you distribute them as separate works.  But when you
-	   distribute the same sections as part of a whole which is a work based
-	   on the Program, the distribution of the whole must be on the terms of
-	   this License, whose permissions for other licensees extend to the
-	   entire whole, and thus to each and every part regardless of who wrote it.
-	 </para>
-	 <para>
-	   Thus, it is not the intent of this section to claim rights or contest
-	   your rights to work written entirely by you; rather, the intent is to
-	   exercise the right to control the distribution of derivative or
-	   collective works based on the Program.
-	 </para>
-	 <para>
-	   In addition, mere aggregation of another work not based on the Program
-	   with the Program (or with a work based on the Program) on a volume of
-	   a storage or distribution medium does not bring the other work under
-	   the scope of this License.
-	 </para>
-       </listitem>
-       <listitem>
-	 <para>
-	   3. You may copy and distribute the Program (or a work based on it,
-	   under Section 2) in object code or executable form under the terms of
-	   Sections 1 and 2 above provided that you also do one of the following:
-	 </para>
-	 <para>
-	   a) Accompany it with the complete corresponding machine-readable
-	   source code, which must be distributed under the terms of Sections
-	   1 and 2 above on a medium customarily used for software interchange; or,
-	 </para>
-	 <para>
-	   b) Accompany it with a written offer, valid for at least three
-	   years, to give any third party, for a charge no more than your
-	   cost of physically performing source distribution, a complete
-	   machine-readable copy of the corresponding source code, to be
-	   distributed under the terms of Sections 1 and 2 above on a medium
-	   customarily used for software interchange; or,
-	 </para>
-	 <para>
-	   c) Accompany it with the information you received as to the offer
-	   to distribute corresponding source code.  (This alternative is
-	   allowed only for noncommercial distribution and only if you
-	   received the program in object code or executable form with such
-	   an offer, in accord with Subsection b above.)
-	 </para>
-	 <para>
-	   The source code for a work means the preferred form of the work for
-	   making modifications to it.  For an executable work, complete source
-	   code means all the source code for all modules it contains, plus any
-	   associated interface definition files, plus the scripts used to
-	   control compilation and installation of the executable.  However, as a
-	   special exception, the source code distributed need not include
-	   anything that is normally distributed (in either source or binary
-	   form) with the major components (compiler, kernel, and so on) of the
-	   operating system on which the executable runs, unless that component
-	   itself accompanies the executable.
-	 </para>
-	 <para>
-	   If distribution of executable or object code is made by offering
-	   access to copy from a designated place, then offering equivalent
-	   access to copy the source code from the same place counts as
-	   distribution of the source code, even though third parties are not
-	   compelled to copy the source along with the object code.
-	 </para>
-       </listitem>
-       <listitem>
-	 <para>
-	   4. You may not copy, modify, sublicense, or distribute the Program
-	   except as expressly provided under this License.  Any attempt
-	   otherwise to copy, modify, sublicense or distribute the Program is
-	   void, and will automatically terminate your rights under this License.
-	   However, parties who have received copies, or rights, from you under
-	   this License will not have their licenses terminated so long as such
-	   parties remain in full compliance.
-	 </para>
-       </listitem>
-       <listitem>
-	 <para>
-	   5. You are not required to accept this License, since you have not
-	   signed it.  However, nothing else grants you permission to modify or
-	   distribute the Program or its derivative works.  These actions are
-	   prohibited by law if you do not accept this License.  Therefore, by
-	   modifying or distributing the Program (or any work based on the
-	   Program), you indicate your acceptance of this License to do so, and
-	   all its terms and conditions for copying, distributing or modifying
-	   the Program or works based on it.
-	 </para>
-       </listitem>
-       <listitem>
-	 <para>
-	   6. Each time you redistribute the Program (or any work based on the
-	   Program), the recipient automatically receives a license from the
-	   original licensor to copy, distribute or modify the Program subject to
-	   these terms and conditions.  You may not impose any further
-	   restrictions on the recipients' exercise of the rights granted herein.
-	   You are not responsible for enforcing compliance by third parties to
-	   this License.
-	 </para>
-       </listitem>
-       <listitem>
-	 <para>
-	   7. If, as a consequence of a court judgment or allegation of patent
-	   infringement or for any other reason (not limited to patent issues),
-	   conditions are imposed on you (whether by court order, agreement or
-	   otherwise) that contradict the conditions of this License, they do not
-	   excuse you from the conditions of this License.  If you cannot
-	   distribute so as to satisfy simultaneously your obligations under this
-	   License and any other pertinent obligations, then as a consequence you
-	   may not distribute the Program at all.  For example, if a patent
-	   license would not permit royalty-free redistribution of the Program by
-	   all those who receive copies directly or indirectly through you, then
-	   the only way you could satisfy both it and this License would be to
-	   refrain entirely from distribution of the Program.
-	 </para>
-	 <para>
-	   If any portion of this section is held invalid or unenforceable under
-	   any particular circumstance, the balance of the section is intended to
-	   apply and the section as a whole is intended to apply in other
-	   circumstances.
-	 </para>
-	 <para>
-	   It is not the purpose of this section to induce you to infringe any
-	   patents or other property right claims or to contest validity of any
-	   such claims; this section has the sole purpose of protecting the
-	   integrity of the free software distribution system, which is
-	   implemented by public license practices.  Many people have made
-	   generous contributions to the wide range of software distributed
-	   through that system in reliance on consistent application of that
-	   system; it is up to the author/donor to decide if he or she is willing
-	   to distribute software through any other system and a licensee cannot
-	   impose that choice.
-	 </para>
-	 <para>
-	   This section is intended to make thoroughly clear what is believed to
-	   be a consequence of the rest of this License.
-	 </para>
-       </listitem>
-       <listitem>
-	 <para>
-	   8. If the distribution and/or use of the Program is restricted in
-	   certain countries either by patents or by copyrighted interfaces, the
-	   original copyright holder who places the Program under this License
-	   may add an explicit geographical distribution limitation excluding
-	   those countries, so that distribution is permitted only in or among
-	   countries not thus excluded.  In such case, this License incorporates
-	   the limitation as if written in the body of this License.
-	 </para>
-       </listitem>
-       <listitem>
-	 <para>
-	   9. The Free Software Foundation may publish revised and/or new versions
-	   of the General Public License from time to time.  Such new versions will
-	   be similar in spirit to the present version, but may differ in detail to
-	   address new problems or concerns.
-	 </para>
-	 <para>
-	   Each version is given a distinguishing version number.  If the Program
-	   specifies a version number of this License which applies to it and "any
-	   later version", you have the option of following the terms and conditions
-	   either of that version or of any later version published by the Free
-	   Software Foundation.  If the Program does not specify a version number of
-	   this License, you may choose any version ever published by the Free Software
-	   Foundation.
-	 </para>
-       </listitem>
-       <listitem>
-	 <para>
-	   10. If you wish to incorporate parts of the Program into other free
-	   programs whose distribution conditions are different, write to the author
-	   to ask for permission.  For software which is copyrighted by the Free
-	   Software Foundation, write to the Free Software Foundation; we sometimes
-	   make exceptions for this.  Our decision will be guided by the two goals
-	   of preserving the free status of all derivatives of our free software and
-	   of promoting the sharing and reuse of software generally.
-	 </para>
-       </listitem>
-       <listitem>
-	 <para>NO WARRANTY</para>
-	 <para>
-	   11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-	   FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-	   OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-	   PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-	   OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-	   MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-	   TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-	   PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-	   REPAIR OR CORRECTION.
-	 </para>
-       </listitem>
-       <listitem>
-	 <para>
-	   12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-	   WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-	   REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-	   INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-	   OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-	   TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-	   YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-	   PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-	   POSSIBILITY OF SUCH DAMAGES.
-	 </para>
-       </listitem>
-     </itemizedlist>
-     <para>END OF TERMS AND CONDITIONS</para>
-   </sect2>
-   <sect2>
-     <title>How to Apply These Terms to Your New Programs</title>
-     <para>
-       If you develop a new program, and you want it to be of the greatest
-       possible use to the public, the best way to achieve this is to make it
-       free software which everyone can redistribute and change under these terms.
-     </para>
-     <para>
-       To do so, attach the following notices to the program.  It is safest
-       to attach them to the start of each source file to most effectively
-       convey the exclusion of warranty; and each file should have at least
-       the "copyright" line and a pointer to where the full notice is found.
-     </para>
-     <para>
-       &lt;one line to give the program's name and a brief idea of what it does.&gt;
-	 Copyright (C) &lt;year&gt;  &lt;name of author&gt;
-     </para>
-     <para> 
-       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.
-     </para>
-     <para>
-       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.
-     </para>
-     <para>
-       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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-     </para>
-     <para>
-       Also add information on how to contact you by electronic and paper mail.
-     </para>
-     <para>
-       If the program is interactive, make it output a short notice like this
-       when it starts in an interactive mode:
-       <para>
-	 Gnomovision version 69, Copyright (C) year  name of author
-	 Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-	 This is free software, and you are welcome to redistribute it
-	 under certain conditions; type `show c' for details.
-       </para>
-     </para>
-     <para>
-       The hypothetical commands `show w' and `show c' should show the appropriate
-       parts of the General Public License.  Of course, the commands you use may
-       be called something other than `show w' and `show c'; they could even be
-       mouse-clicks or menu items--whatever suits your program.
-     </para>
-     <para>
-       You should also get your employer (if you work as a programmer) or your
-       school, if any, to sign a "copyright disclaimer" for the program, if
-       necessary.  Here is a sample; alter the names:
-       <para>
-	 Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-	 `Gnomovision' (which makes passes at compilers) written by James Hacker.
-       </para>
-       <para>
-         &lt;signature of Ty Coon&gt;, 1 April 1989
-       </para>
-       <para>
-	 Ty Coon, President of Vice
-       </para>
-     </para>
-     <para>
-       This General Public License does not permit incorporating your program into
-       proprietary programs.  If your program is a subroutine library, you may
-       consider it more useful to permit linking proprietary applications with the
-       library.  If this is what you want to do, use the GNU Library General
-       Public License instead of this License.
-     </para>
-   </sect2>
-</legalnotice>
+    <appendix id="gpl">
+  <appendixinfo>
+    <title>GNU General Public License</title>
+    <pubdate>Version 2, June 1991</pubdate>
+    <copyright>
+      <year>1989, 1991</year>
+      <holder>Free Software Foundation, Inc.</holder>
+    </copyright>
+    <legalnotice id="gpl-legalnotice">
+      <para>
+        <address>Free Software Foundation, Inc.
+          <street>51 Franklin Street, Fifth Floor</street>,
+          <city>Boston</city>, <state>MA</state> <postcode>02110-1301</postcode>
+          <country>USA</country>
+        </address>
+      </para>
+      <para>Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.</para>
+    </legalnotice>
+    <releaseinfo>Version 2, June 1991</releaseinfo>
+  </appendixinfo>
+  <title>GNU General Public License</title>
+  <section id="gpl-1">
+    <title>Preamble</title>
+    <para>The licenses for most software are designed to take away your
+      freedom to share and change it. By contrast, the GNU General Public License is
+      intended to guarantee your freedom to share and change
+      free software - to make sure the software is free for all its users.
+      This General Public License applies to most of the Free Software
+      Foundation's software and to any other program whose authors commit
+      to using it. (Some other Free Software Foundation software is covered
+      by the GNU Library General Public License instead.) You can apply it
+      to your programs, too.</para>
+
+    <para>When we speak of free software, we are referring to freedom, not price.
+      Our General Public Licenses are designed to make sure that you have the
+      freedom to distribute copies of free software (and charge for this
+      service if you wish), that you receive source code or can get it if you
+      want it, that you can change the software or use pieces of it in new free
+      programs; and that you know you can do these things.</para>
+
+    <para>To protect your rights, we need to make restrictions that forbid anyone
+      to deny you these rights or to ask you to surrender the rights. These
+      restrictions translate to certain responsibilities for you if you distribute
+      copies of the software, or if you modify it.</para>
+
+    <para>For example, if you distribute copies of such a program, whether gratis or
+      for a fee, you must give the recipients all the rights that you have. You
+      must make sure that they, too, receive or can get the source code. And you
+      must show them these terms so they know their rights.</para>
+
+    <para>We protect your rights with two steps:
+      <orderedlist>
+        <listitem>
+          <para>copyright the software, and</para>
+        </listitem>
+        <listitem>
+          <para>offer you this license which gives you legal permission to copy,
+            distribute and/or modify the software.</para>
+        </listitem>
+      </orderedlist>
+    </para>
+
+    <para>Also, for each author's protection and ours, we want to make certain that
+      everyone understands that there is no warranty for this free software. If
+      the software is modified by someone else and passed on, we want its
+      recipients to know that what they have is not the original, so that any
+      problems introduced by others will not reflect on the original authors'
+      reputations.</para>
+
+    <para>Finally, any free program is threatened constantly by software patents.
+      We wish to avoid the danger that redistributors of a free program will
+      individually obtain patent licenses, in effect making the program
+      proprietary. To prevent this, we have made it clear that any patent must be
+      licensed for everyone's free use or not licensed at all.</para>
+
+    <para>The precise terms and conditions for copying, distribution and modification
+      follow.</para>
+  </section>
+  <section id="gpl-2">
+    <title>TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION</title>
+    <section id="gpl-2-0">
+      <title>Section 0</title>
+      <para>This License applies to any program or other work which contains a notice
+        placed by the copyright holder saying it may be distributed under the terms
+        of this General Public License. The <quote>Program</quote>, below, refers to any such
+        program or work, and a
+        <quote>work based on the Program</quote> means either
+        the Program or any derivative work under copyright law: that is to say, a
+        work containing the Program or a portion of it, either verbatim or with
+        modifications and/or translated into another language. (Hereinafter, translation
+        is included without limitation in the term
+        <quote>modification</quote>.) Each licensee is addressed as <quote>you</quote>.</para>
+
+      <para>Activities other than copying, distribution and modification are not covered by
+        this License; they are outside its scope. The act of running the Program is not
+        restricted, and the output from the Program is covered only if its contents
+        constitute a work based on the Program (independent of having been made by running
+        the Program). Whether that is true depends on what the Program does.</para>
+    </section>
+    <section id="gpl-2-1">
+      <title>Section 1</title>
+      <para>You may copy and distribute verbatim copies of the Program's source code as you
+        receive it, in any medium, provided that you conspicuously and appropriately
+        publish on each copy an appropriate copyright notice and disclaimer of warranty;
+        keep intact all the notices that refer to this License and to the absence of any
+        warranty; and give any other recipients of the Program a copy of this License
+        along with the Program.</para>
+
+      <para>You may charge a fee for the physical act of transferring a copy, and you may at
+        your option offer warranty protection in exchange for a fee.</para>
+    </section>
+    <section id="gpl-2-2">
+      <title>Section 2</title>
+      <para>You may modify your copy or copies of the Program or any portion of it, thus
+        forming a work based on the Program, and copy and distribute such modifications
+        or work under the terms of
+        <link linkend="gpl-2-1">Section 1</link> above, provided
+        that you also meet all of these conditions:
+        <orderedlist numeration="loweralpha">
+          <listitem>
+            <para>You must cause the modified files to carry prominent notices stating that
+              you changed the files and the date of any change.</para>
+          </listitem>
+          <listitem>
+            <para>You must cause any work that you distribute or publish, that in whole or
+              in part contains or is derived from the Program or any part thereof, to be
+              licensed as a whole at no charge to all third parties under the terms of
+              this License.</para>
+          </listitem>
+          <listitem>
+            <para>If the modified program normally reads commands interactively when run, you
+              must cause it, when started running for such interactive use in the most
+              ordinary way, to print or display an announcement including an appropriate
+              copyright notice and a notice that there is no warranty (or else, saying
+              that you provide a warranty) and that users may redistribute the program
+              under these conditions, and telling the user how to view a copy of this
+              License. (Exception: If the Program itself is interactive but does not
+              normally print such an announcement, your work based on the Program is not
+              required to print an   announcement.)</para>
+          </listitem>
+        </orderedlist>
+      </para>
+
+      <para>These requirements apply to the modified work as a whole. If identifiable sections
+        of that work are not derived from the Program, and can be reasonably considered
+        independent and separate works in themselves, then this License, and its terms,
+        do not apply to those sections when you distribute them as separate works. But when
+        you distribute the same sections as part of a whole which is a work based on the
+        Program, the distribution of the whole must be on the terms of this License, whose
+        permissions for other licensees extend to the entire whole, and thus to each and
+        every part regardless of who wrote it.</para>
+
+      <para>Thus, it is not the intent of this section to claim rights or contest your rights
+        to work written entirely by you; rather, the intent is to exercise the right to control
+        the distribution of derivative or collective works based on the Program.</para>
+
+      <para>In addition, mere aggregation of another work not based on the Program with the Program
+        (or with a work based on the Program) on a volume of a storage or distribution medium
+        does not bring the other work under the scope of this License.</para>
+    </section>
+    <section id="gpl-2-3">
+      <title>Section 3</title>
+      <para>You may copy and distribute the Program (or a work based on it, under
+        <link linkend="gpl-2-2">Section 2</link> in object code or executable form under the terms of
+        <link linkend="gpl-2-1">Sections 1</link> and
+        <link linkend="gpl-2-2">2</link> above provided that you also do one of the following:
+        <orderedlist numeration="loweralpha">
+          <listitem>
+            <para>Accompany it with the complete corresponding machine-readable source code, which
+              must be distributed under the terms of Sections 1 and 2 above on a medium
+              customarily used for software interchange; or,</para>
+          </listitem>
+          <listitem>
+            <para>Accompany it with a written offer, valid for at least three years, to give any
+              third party, for a charge no more than your cost of physically performing source
+              distribution, a complete machine-readable copy of the corresponding source code,
+              to be distributed under the terms of Sections 1 and 2 above on a medium customarily
+              used for software interchange; or,</para>
+          </listitem>
+          <listitem>
+            <para>Accompany it with the information you received as to the offer to distribute
+              corresponding source code. (This alternative is allowed only for noncommercial
+              distribution and only if you received the program in object code or executable form
+              with such an offer, in accord with Subsection b above.)</para>
+          </listitem>
+        </orderedlist>
+      </para>
+
+      <para>The source code for a work means the preferred form of the work for making modifications
+        to it. For an executable work, complete source code means all the source code for all modules
+        it contains, plus any associated interface definition files, plus the scripts used to control
+        compilation and installation of the executable. However, as a special exception, the source
+        code distributed need not include anything that is normally distributed (in either source or
+        binary form) with the major components (compiler, kernel, and so on) of the operating system
+        on which the executable runs, unless that component itself accompanies the executable.</para>
+
+      <para>If distribution of executable or object code is made by offering access to copy from a
+        designated place, then offering equivalent access to copy the source code from the same place
+        counts as distribution of the source code, even though third parties are not compelled to
+        copy the source along with the object code.</para>
+    </section>
+    <section id="gpl-2-4">
+      <title>Section 4</title>
+      <para>You may not copy, modify, sublicense, or distribute the Program except as expressly provided
+        under this License. Any attempt otherwise to copy, modify, sublicense or distribute the
+        Program is void, and will automatically terminate your rights under this License. However,
+        parties who have received copies, or rights, from you under this License will not have their
+        licenses terminated so long as such parties remain in full compliance.</para>
+    </section>
+    <section id="gpl-2-5">
+      <title>Section 5</title>
+      <para>You are not required to accept this License, since you have not signed it. However, nothing
+        else grants you permission to modify or distribute the Program or its derivative works.
+        These actions are prohibited by law if you do not accept this License. Therefore, by modifying
+        or distributing the Program (or any work based on the Program), you indicate your acceptance
+        of this License to do so, and all its terms and conditions for copying, distributing or
+        modifying the Program or works based on it.</para>
+    </section>
+    <section id="gpl-2-6">
+      <title>Section 6</title>
+      <para>Each time you redistribute the Program (or any work based on the Program), the recipient
+        automatically receives a license from the original licensor to copy, distribute or modify
+        the Program subject to these terms and conditions. You may not impose any further restrictions
+        on the recipients' exercise of the rights granted herein. You are not responsible for enforcing
+        compliance by third parties to this License.</para>
+    </section>
+    <section id="gpl-2-7">
+      <title>Section 7</title>
+      <para>If, as a consequence of a court judgment or allegation of patent infringement or for any other
+        reason (not limited to patent issues), conditions are imposed on you (whether by court order,
+        agreement or otherwise) that contradict the conditions of this License, they do not excuse you
+        from the conditions of this License. If you cannot distribute so as to satisfy simultaneously
+        your obligations under this License and any other pertinent obligations, then as a consequence
+        you may not distribute the Program at all. For example, if a patent license would not permit
+        royalty-free redistribution of the Program by all those who receive copies directly or
+        indirectly through you, then the only way you could satisfy both it and this License would be
+        to refrain entirely from distribution of the Program.</para>
+
+      <para>If any portion of this section is held invalid or unenforceable under any particular circumstance,
+        the balance of the section is intended to apply and the section as a whole is intended to apply
+        in other circumstances.</para>
+
+      <para>It is not the purpose of this section to induce you to infringe any patents or other property
+        right claims or to contest validity of any such claims; this section has the sole purpose of
+        protecting the integrity of the free software distribution system, which is implemented by public
+        license practices. Many people have made generous contributions to the wide range of software
+        distributed through that system in reliance on consistent application of that system; it is up
+        to the author/donor to decide if he or she is willing to distribute software through any other
+        system and a licensee cannot impose that choice.</para>
+
+      <para>This section is intended to make thoroughly clear what is believed to be a consequence of the
+        rest of this License.</para>
+    </section>
+    <section id="gpl-2-8">
+      <title>Section 8</title>
+      <para>If the distribution and/or use of the Program is restricted in certain countries either by patents
+        or by copyrighted interfaces, the original copyright holder who places the Program under this License
+        may add an explicit geographical distribution limitation excluding those countries, so that
+        distribution is permitted only in or among countries not thus excluded. In such case, this License
+        incorporates the limitation as if written in the body of this License.</para>
+    </section>
+    <section id="gpl-2-9">
+      <title>Section 9</title>
+      <para>The Free Software Foundation may publish revised and/or new versions of the General Public License
+        from time to time. Such new versions will be similar in spirit to the present version, but may differ
+        in detail to address new problems or concerns.</para>
+
+      <para>Each version is given a distinguishing version number. If the Program specifies a version number of
+        this License which applies to it and <quote>any later version</quote>, you have the option of following the terms
+        and conditions either of that version or of any later version published by the Free Software
+        Foundation. If the Program does not specify a version number of this License, you may choose any
+        version ever published by the Free Software Foundation.</para>
+    </section>
+    <section id="gpl-2-10">
+      <title>Section 10</title>
+      <para>If you wish to incorporate parts of the Program into other free programs whose distribution
+        conditions are different, write to the author to ask for permission. For software which is copyrighted
+        by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions
+        for this. Our decision will be guided by the two goals of preserving the free status of all
+        derivatives of our free software and of promoting the sharing and reuse of software generally.</para>
+    </section>
+    <section id="gpl-2-11">
+      <title>NO WARRANTY Section 11</title>
+      <para>BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT
+        PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+        OTHER PARTIES PROVIDE THE PROGRAM <quote>AS IS</quote> WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED,
+        INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+        PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+        PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.</para>
+    </section>
+    <section id="gpl-2-12">
+      <title>Section 12</title>
+      <para>IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR
+        ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU
+        FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+        USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED
+        INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH
+        ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+        DAMAGES.</para>
+
+      <para>END OF TERMS AND CONDITIONS</para>
+    </section>
+  </section>
+  <section id="gpl-3">
+    <title>How to Apply These Terms to Your New Programs</title>
+    <para>If you develop a new program, and you want it to be of the greatest
+      possible use to the public, the best way to achieve this is to make it
+      free software which everyone can redistribute and change under these terms.</para>
+
+    <para>To do so, attach the following notices to the program.  It is safest
+      to attach them to the start of each source file to most effectively
+      convey the exclusion of warranty; and each file should have at least
+      the <quote>copyright</quote> line and a pointer to where the full notice is found.</para>
+
+    <para>&lt;one line to give the program's name and a brief idea of what it does.&gt;
+      Copyright (C) &lt;year&gt;    &lt;name of author&gt;</para>
+
+    <para>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.</para>
+
+    <para>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.</para>
+
+    <para>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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA</para>
+
+    <para>Also add information on how to contact you by electronic and paper mail.</para>
+
+    <para>If the program is interactive, make it output a short notice like this
+      when it starts in an interactive mode:</para>
+
+    <para>Gnomovision version 69, Copyright (C) year name of author
+      Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type <quote>show w</quote>.
+      This is free software, and you are welcome to redistribute it
+      under certain conditions; type <quote>show c</quote> for details.</para>
+
+    <para>The hypothetical commands <quote>show w</quote> and <quote>show c</quote> should
+      show the appropriate parts of the General Public License.  Of course, the commands you
+      use may be called something other than <quote>show w</quote> and <quote>show c</quote>;
+      they could even be mouse-clicks or menu items--whatever suits your program.</para>
+
+    <para>You should also get your employer (if you work as a programmer) or your
+      school, if any, to sign a <quote>copyright disclaimer</quote> for the program, if
+      necessary.  Here is a sample; alter the names:</para>
+
+    <para>Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+      <quote>Gnomovision</quote> (which makes passes at compilers) written by James Hacker.</para>
+
+    <para>&lt;signature of Ty Coon&gt;, 1 April 1989
+      Ty Coon, President of Vice</para>
+
+    <para>This General Public License does not permit incorporating your program into
+      proprietary programs.  If your program is a subroutine library, you may
+      consider it more useful to permit linking proprietary applications with the
+      library.  If this is what you want to do, use the GNU Library General
+      Public License instead of this License.</para>
+  </section>
+</appendix>
 
     <!-- This file  contains link to license for the documentation (GNU FDL), and
     other legal stuff such as "NO WARRANTY" statement. Please do not change
@@ -513,24 +445,24 @@ Template last modified Apr 11, 2002
 
     <authorgroup>
       <author>
-        <firstname>Andy</firstname>
-        <surname>Piper</surname>
+        <firstname>اندی</firstname>
+        <surname>پایپر</surname>
       </author>
       <author>
-        <firstname>Pierre</firstname>
-        <surname>Benz</surname>
+        <firstname>پیر</firstname>
+        <surname>بنز</surname>
       </author>
       <author>
-        <firstname>Dr Peter</firstname>
-        <surname>von Kaehne</surname>
+        <firstname>دکتر پیتر</firstname>
+        <surname>فن کاهن</surname>
       </author>
       <author>
-        <firstname>Karl</firstname>
-        <surname>Kleinpaste</surname>
+        <firstname>کارل</firstname>
+        <surname>کلاین‏پیست</surname>
       </author>
       <author>
-	<firstname>Matthew</firstname>
-	<surname>Talbert</surname>
+	<firstname>متیو</firstname>
+	<surname>تالبرت</surname>
       </author>
       <othercredit role="translator">
 	<firstname>Dominique</firstname>
@@ -572,29 +504,36 @@ Template last modified Apr 11, 2002
     <!-- When the desktop release version changes to V3.x, the revision number of the manual changes -->
     <!-- to V3.0, and so on. -->
 
-    <releaseinfo>This manual describes version 3.1 of Xiphos.
+    <releaseinfo>This manual describes version 3.1.2 of Xiphos.
     </releaseinfo>
-    <legalnotice>
-      <title>Feedback</title>
-      <para>To report a bug or make a suggestion regarding the Xiphos application or
-      this manual, Use the <ulink url="http://sourceforge.net/tracker/?group_id=5528">
-      Tracker on SourceForge</ulink> or the mailing lists.
-      </para>
+     <revhistory> 
+	<revision> 
+          <revnumber>Xiphos Manual V3.1.2</revnumber> 
+          <date>August 2009</date> 
+          <revdescription> 
+             <para role="author">تیم زیفوس</para>
+             <para role="publisher">تیم زیفوس</para>
+          </revdescription> 
+        </revision>
+     </revhistory> 
+     <legalnotice>
+      <title>پیشنهادات و نظرات شما</title>
+      <para>برای گزارش هر گونه ایراد و یا ارائۀ پیشنهاداتتان در ارتباط با نرم‏افزار زیفوس و یا این کتابچه، لطفا روی لینک زیر کلیک بفرمایید:<ulink url="http://sourceforge.net/tracker/?group_id=5528"> </ulink></para>
       <!-- Translators may also add here feedback address for translations -->
     </legalnotice>
 
     <keywordset>
-      <keyword>gnome</keyword>
-      <keyword>xiphos</keyword>
-      <keyword>sword</keyword>
-      <keyword>crosswire</keyword>
-      <keyword>help dialog</keyword>
+      <keyword>گنوم</keyword>
+      <keyword>زیفوس</keyword>
+      <keyword>سورد</keyword>
+      <keyword>کراس وایر</keyword>
+      <keyword>هلپ دایالوگ</keyword>
     </keywordset>
 
   </articleinfo>
 
   <indexterm zone="index">
-    <primary>Xiphos</primary>
+    <primary>زیفوس</primary>
   </indexterm>
 
 
@@ -609,37 +548,34 @@ Template last modified Apr 11, 2002
   <!-- Use the Introduction section to give a brief overview of what
   the application is and what it does. -->
   <sect1 id="xiphos-introduction">
-    <title>Introduction</title>
+    <title>مقدمه</title>
     <!-- ============= Introduction ============================== -->
 <!-- Use the Introduction section to give a brief overview of what
      the application is and what it does. -->
  
-    <para><application>Xiphos</application> is a Bible study and research tool based upon the "SWORD Project" libraries
-    and the GNOME Desktop libraries. You can use <application>Xiphos</application> to do the following:</para>
+    <para><application>زیفوس</application> ابزاری برای مطالعۀ کتاب‏مقدّس است که بر پایۀ "SWORD Project" کتابخانه‏های جی‏ان‏او‏ام‏ای بنا شده است. برنامۀ <application>زیفوس</application> را می‏توانید برای موارد زیر بکار ببرید:</para>
     <itemizedlist>
        <listitem>
-          <para>View your favorite Scripture verse</para>
+          <para>مشاهدۀ آیات مورد علاقه</para>
        </listitem>
        <listitem>
-          <para>Make sermon or personal notes on selected passages</para>
+          <para>یادداشتهای موعظه و یادداشتهای شخصی خود را در مورد آیات مورد نظر می‏توانید تایپ کنید</para>
        </listitem>
        <listitem>
-           <para>Automatically follow Bible footnotes and cross-references</para>
+           <para>بصورت اتوماتیک پانویس‏های کتاب‏مقدس و سایر کتب مرجع را دنبال کنید </para>
        </listitem>
        <listitem>
-           <para>Compare translations in parallel</para>
+           <para>ترجمه‏های گوناگون را بصورت موازی مقایسه کنید</para>
        </listitem>
        <listitem>
-           <para>Work in original language study using the available Hebrew and Greek
-           translations</para>
+           <para>با بهره برداری از متون عبری و یونانی روی زبان‏های اصلی کتاب‏مقدس کارهای مطالعاتی و تحقیقاتی انجام دهید</para>
         </listitem>
       </itemizedlist>
-      <para><application>Xiphos</application> aims to provide a simple and clean user interface while providing a
-      powerful tool allowing a personalized Bible study environment.</para>
+      <para><application>زیفوس</application> این را هدف خود قرار داده است که یک محیط کاری ساده در اختیار کاربران قرار دهد، در عین حال با در اختیار قرار دادن ابزاری بسیار قوی به کاربر اجازه دهد که کارهای مطالعاتی-تحقیقاتی خود را بر روی کتاب‏مقدّس انجام دهد.</para>
 
       <!-- ==== Figure ==== -->
       <figure id="sword-logo">
-      <title>The SWORD Project logo</title> 	
+      <title>علامت انحصاری پروژۀ شمشیر</title> 	
       <screenshot>
         <mediaobject> 
 	    <imageobject>
@@ -652,23 +588,17 @@ Template last modified Apr 11, 2002
     		    </imageobject>
 	    -->
 	    <textobject> 
-	      <phrase>The SWORD Project logo</phrase> 
+	      <phrase>علامت انحصاری پروژۀ شمشیر</phrase> 
 	    </textobject> 
         </mediaobject> 
       </screenshot>
       </figure>
 
-      <para>"The SWORD Project" is based at 
-      <ulink type="http" url="http://www.crosswire.org">http://www.crosswire.org</ulink>.
-      Other applications under the same banner are <application>The SWORD Project for Windows</application>
-      (aka <application>BibleCS</application> or <application>WinSword</application>),      
-      <application>MacSword</application> for the Macintosh,
-      <application>BibleDesktop</application>, a Java application,
-      and <application>BibleTime</application>, another Linux program.</para>
+      <para>"پروژۀ شمشیر" بر مبنای <ulink type="http" url="http://www.crosswire.org">http://www.crosswire.org</ulink> است. سایر برنامه‏هایی که تحت همان علامت هستند، شامل <application>پروژۀ شمشیر برای ویندوز</application> (aka <application>BibleCS</application> or <application>WinSword</application>), <application>مک‏سورد</application> برای کامپیوترهای مک‏اینتاش, <application>بایبل دسکتاپ</application>, که یک برنامۀ جاوا است, و <application>بایبل تایم</application>, که یک برنامۀ دیگر قابل اجرا تحت لینوکس است، می‏باشند.</para>
 
       <para>
       <figure id="main-screenshot">
-      <title>Xiphos in action</title>
+      <title>زیفوس در حال اجرا می‏باشد</title>
       <screenshot> 
 	  <mediaobject> 
 	    <imageobject><imagedata fileref="figures/interface.png" format="PNG"/> 
@@ -680,7 +610,7 @@ Template last modified Apr 11, 2002
     		    </imageobject>
 	    -->
 	    <textobject> 
-	      <phrase>Xiphos in action</phrase> 
+	      <phrase>زیفوس در حال اجرا می‏باشد</phrase> 
 	    </textobject> 
 	  </mediaobject> 
          </screenshot>
@@ -689,11 +619,7 @@ Template last modified Apr 11, 2002
 
        <!-- Where important notices are kept regarding Xiphos  -->
        <warning>
-         <para><application>Xiphos</application> is currently in development, so this manual may not
-         reflect the program as you see it. If it does not, please file a
-         bug at the <ulink type="http" url="http://sourceforge.net/projects/xiphos">
-	 project website</ulink>, or email <email>xiphos-developers@lists.sourceforge.net</email>.
-         All help is appreciated, as it will improve the software.</para>
+         <para><application>زیفوس</application> در حال حاضر تحت گسترش است، به همین دلیل ممکن است در بخشی از برنامه مشکلاتی به چشمتان بخورد، که در اینصورت لطفاً آن مورد را از لینک زیر به ما اطلاع دهید <ulink type="http" url="http://sourceforge.net/projects/xiphos"> وب‏سایت پروژه</ulink>، یا ایمیل <email>xiphos-developers@lists.sourceforge.net</email>. از هرگونه راهنمایی و کمک شما پیشاپیش سپاسگزاریم</para>
        </warning>
 
 
@@ -708,40 +634,29 @@ Template last modified Apr 11, 2002
   If the information about how to get started is very short, you can
   include it in the Introduction and omit this section. -->
   <sect1 id="familiar">
-    <title>Getting Started with Xiphos</title>
+    <title>شروع به استفاده از زیفوس</title>
     
 <!-- ============= Getting Started with Xiphos  ============-->
 	<sect2 id="xiphos-getting-started">
-  		<title>Starting Xiphos</title>
-			<para>
-			You can start <application>Xiphos</application> in the following ways:
-			</para>
+  		<title>زیفوس در حال بارگذاری</title>
+			<para>شما می‏توانید برنامۀ <application>زیفوس</application> را به یکی از روش‏های زیر اجرا نمایید:</para>
 			<variablelist>
 				<varlistentry>
-					<term>Applications menu</term>
+					<term>فهرست برنامه‏ها</term>
 					<listitem>
-						<para>
-						Choose <menuchoice><guisubmenu>Accessories</guisubmenu>
-						<guimenuitem>Xiphos Bible Guide</guimenuitem>
-						</menuchoice>.
-			            </para>
+						<para>گزینۀ  <menuchoice><guisubmenu>لوازم را برگزینید</guisubmenu><guimenuitem> و سپس به راهنمای زیفوس کتاب‏مقدس بروید</guimenuitem></menuchoice>.</para>
     				</listitem>
     			</varlistentry>
     			<varlistentry>
-    				<term>Command line</term>
+    				<term>خط فرمان</term>
     				<listitem>
-    					<para>
-						Type <command>xiphos</command>, then press <keycap>Return</keycap>.
-						</para>
+    					<para>عبارت <command>زیفوس</command>,  را وارد نموده، سپس کلید <keycap>اینتر</keycap>را بزنید.</para>
     				</listitem>
     			</varlistentry>
 			<varlistentry>
-				<term>Windows</term>
+				<term>پنجره‏ها</term>
 				<listitem>
-					<para>
-						Go to <menuchoice><guisubmenu>All Programs</guisubmenu><guisubmenu>Xiphos
-						</guisubmenu><guimenuitem>Xiphos</guimenuitem></menuchoice>.
-					</para>
+					<para>گزینۀ <menuchoice><guisubmenu>تمام برنامه‏ها</guisubmenu><guisubmenu>زیفوس </guisubmenu><guimenuitem>زیفوس</guimenuitem></menuchoice>را برگزیند.</para>
 				</listitem>
 			</varlistentry>
 
@@ -749,15 +664,10 @@ Template last modified Apr 11, 2002
     </sect2>
 <!--Starting Xiphos for the First Time  -->
   	<sect2 id="xiphos-first-start">
-  		<title>Starting Xiphos For The First Time</title>
-		<para>
-		When you start <application>Xiphos</application> for the first time, <application>Xiphos</application> creates a
-		default selection of options for display.  Also, if no other Sword application has ever been run, and thus there are no
-		Bible modules installed, then <application>Xiphos</application> asks permission to start the Module Manager so
-		that you can select and install a Bible module in your language preference.
-		</para>
+  		<title>شروع برنامۀ زیفوس برای اولین مرتبه</title>
+		<para>هنگامی که<application>برنامۀ زیفوس</application> را برای اولین مرتبه باز می‏کنید،<application>زیفوس</application> یک‏سری گزینه‏های قراردادی ایجاد می‏کند. همچنین، چنانچه در گذشته برنامۀ دیگری از سری سورد اجرا شده باشد، ولی با این وجود هیچ مدول کتاب‏مقدس نصب نشده باشد، در آنصورت <application>زیفوس</application> از شما اجازه خواهد خواست تا برنامۀ مدیر مدول را اجرا نماید که به کمک آن شما می‏توانید یک مدول کتاب‏مقدس را به زبانی که بیشتر آنرا ترجیح می‏دهید، نصب کنید.</para>
 		<figure id="xiphos-start-question">
-			<title>Xiphos Download Question</title>
+			<title>پرسش‏های مرتبط با دانلود کردن زیفوس</title>
 			<screenshot> 
 	  <mediaobject> 
 	    <imageobject><imagedata fileref="figures/first_start.png" format="PNG"/> 
@@ -769,28 +679,21 @@ Template last modified Apr 11, 2002
     		    </imageobject>
 	    -->
 	    <textobject> 
-	      <phrase>Xiphos Download Question</phrase> 
+	      <phrase>پرسش‏های مرتبط با دانلود کردن زیفوس</phrase> 
 	    </textobject> 
 	  </mediaobject> 
 	
                         </screenshot>
 
                 </figure>
-		<para>
-		<application>Xiphos</application> then opens its interface with one tab displayed, showing Romans 8:28.  Once the
-		interface is open, you can use
-		<menuchoice><guimenuitem>Edit</guimenuitem><guimenuitem>Preferences</guimenuitem></menuchoice> to change any of the
-		selections already made by default.
-		</para>
+		<para><application>زیفوس</application> در ابتدای اجرای آن یک محیط کاری دارای یک برگه باز می‏کند، که در آن آیۀ رومیان 8: 28 به چشم می‏خورد. کاربر در این محیط کاری، می‏تواند در  بخش <menuchoice><guimenuitem>ویرایش</guimenuitem><guimenuitem>فرمان ترجیحات</guimenuitem></menuchoice> را برگزیند و بدینوسیله تغییرات دلخواه را در قسمت‏هایی که بصورت اتوماتیک ایجاد شده‏اند، بدهد.</para>
 	 </sect2>
 <!-- Xiphos on first time use -->
    	 <sect2 id="xiphos-when-you-start">
-	 <title>Launching Xiphos</title>
-		<para>
-		When you start <application>Xiphos</application>, the following interface is displayed:
-		</para>
+	 <title>بارگذاری زیفوس</title>
+		<para>هر زمان که برنامۀ <application>زیفوس</application>را باز کنید، محیط کاری زیر را مشاهده خواهید کرد:</para>
 		<figure id="xiphos-start-interface">
-			<title>Xiphos interface</title>
+			<title>محیط کاری زیفوس</title>
 			<screenshot> 
 	  <mediaobject> 
 	    <imageobject><imagedata fileref="figures/interface.png" format="PNG"/> 
@@ -802,94 +705,65 @@ Template last modified Apr 11, 2002
     		    </imageobject>
 	    -->
 	    <textobject> 
-	      <phrase>The Xiphos Interface</phrase> 
+	      <phrase>محیط کاری زیفوس</phrase> 
 	    </textobject> 
 	  </mediaobject> 
 	
                         </screenshot>
 
                 </figure>
-                <para>
-		The <application>Xiphos</application> interface contains the following elements:
-		</para>
+                <para>محیط کاری <application>زیفوس</application>دارای عناصر زیر می‏باشد.</para>
 		<variablelist>
 			<varlistentry>
-				<term>Menubar</term>
+				<term>خط فرمان</term>
 				<listitem>
-					<para>
-					The menus on the menubar contain several commands which extend the use of <application>Xiphos
-					</application>. These include the StudyPad and advanced search functions. The menus also help you to customize
-					your use of <application>Xiphos</application>.
-			        </para>
+					<para>خط فرمان دارای چند فرمان است که کاربرد<application>زیفوس</application>را گسترش می‏بخشد. این فرامین شامل محلی برای یادداشت‏های مطالعه و نیز توابع جستجوی پیشرفته می‏باشد. فرامی همچنین به شما کمک می‏کنند تا بتوانید استفاده از برنامۀ <application>زیفوس </application>را بسیار شخصی و به دلخواه خود بنمایید.</para>
 				</listitem>
 		 	</varlistentry>
 	        <varlistentry>
-				<term>Toolbar</term>
+				<term>ستون ابزار</term>
 					<listitem>
-						<para>
-						 The <interface>toolbar</interface> contains buttons that let you quickly navigate through the Bible.
-						</para>
+						<para>ستون<interface>ابزار</interface>شامل کلیدهایی است که به شما کمک می‏کند تا به سرعت و سهولت بتوانید از کتاب‏مقدس استفاده نمایید.</para>
 					</listitem>
 		 		</varlistentry>
                 <varlistentry>
-					<term>Sidebar</term>
+					<term>ستون جانبی</term>
 					<listitem>
-						<para>
-						The <interface>Sidebar</interface> provides access to several features. 
-						It contains your bookmarks and the list of installed books. It can also be 
-						used to perform simple searches.
-					</para>
+						<para>ستون<interface>جانبی</interface>دستیابی به چندین کاربرد اساسی را ممکن می‏سازذ. این ستون شامل تمام علائم و نیز لیست کتابهایی است که نصب کرده‏اید. این ابزار همچنین برای جستجوهای ساده نیز قابل استفاده است.</para>
 				</listitem>
 		  	</varlistentry>
 		  	<varlistentry>
-				<term>Bible Text Pane</term>
+				<term>چارچوب متن کتاب‏مقدس</term>
 				<listitem>
-					<para>
-					The <interface>Bible Text pane</interface> displays the Bible text which is currently being viewed.
-					</para>
+					<para>چارچوب<interface>متن کتاب‏مقدس</interface>متن کتاب‏مقدسی را که باز دارید نشان می‏دهد.</para>
 			    </listitem>
 		  	 </varlistentry>
 			<varlistentry>
-				<term>Previewer</term>
+				<term>پیش‏نگر</term>
 				<listitem>
-					<para>
-					The <interface>Previewer</interface> displays Bible text module options. These include Strong's
-					numbers, footnotes and morphological tags. It is located below the Bible Text Pane.
-					</para>
+					<para>فرمان <interface>پیش‏نگر</interface>گزینه‏های مدول متن کتاب‏مقدس را نشان می‏دهد. این شامل اعداد مرتبط با کشف‏الآیات استرانگ، پانویس‏ها و نیز علائم زبان‏شناسی می‏باشند. این فرمان در زیر چاچوب متن کتاب‏مقدس قرار دارد.</para>
 				</listitem>
 			 </varlistentry>
 		  	 <varlistentry>
-			 	<term>Commentary Pane</term>
+			 	<term>چارچوب تفاسیر</term>
 			 	<listitem>
-					<para>
-					The <interface>Commentary pane</interface> displays commentaries on the current Bible Text being used.
-					</para>
+					<para>فرمان<interface>چارچوب تفسیر</interface>کتابهای تفسیری را که در مرتبط با متن کتاب‏مقدس در حال استفاده است، نشان می‏دهد.</para>
 			 	</listitem>
 		         </varlistentry>
 			 <varlistentry>
-			 	<term>Book Pane</term>
+			 	<term>چارچوب کتاب</term>
 			 	<listitem>
-					<para>
-					The <interface>Book Pane</interface> displays general books available from the Sword Project. These include modules like
-					"Calvin's Institutes", "Josephus: The Complete Works" etc. This Pane can be accessed	via the Book View tab just below the
-					Commentary Pane.
-					</para>
+					<para>فرمان <interface>چارچوب کتاب</interface>کتابهای عمومی را که از طریق سورد در اختیار کاربر قرار دارند، نشان می‏دهد. این شامل مدول‏هایی از قبیل کتابهایی چون: "قوانین کالوین", "ژوزفوس: سری کامل نوشتجات " و غیره. این چارچوب را می‏توان از طریق فرمان مشاهدۀ مرور کتاب که در زیر فرمان چارچوب تفسیر است مورد استفاده قرار داد.</para>
 			 	</listitem>
 		         </varlistentry>
 			 <varlistentry>
-			 	<term>Dictionary/Book Pane</term>
+			 	<term>چارچوب فرهنگ واژه‏ها/کتاب</term>
 			 	<listitem>
-					<para>
-					The <interface>Dictionary/Book Pane</interface> displays dictionary information
-					on selected words in the <interface>Bible Text Pane</interface>. It is located just below the Commentary Pane
-					</para>
+					<para>گزینه <interface>دیکشنری</interface> تعریف واژه های برگزیده شده را نشان می دهد در در بخش <interface>متن کتاب مقدس</interface>. نشان می دهد این گزینه پس از گزینه تفسیر قرار دارد.</para>
 			 	</listitem>
 		     </varlistentry>
 			 </variablelist>
-		     <para>
-			When you right-click in the different interface sections, the interface displays a popup menu, which provides access
-			to more module-specific options, including display controls and printing services.
-			</para>
+		     <para>هنگامی که شما در محیط‏های کاری گوناگون روی ماوس رایت‏کلیک بکنید، یک صفحۀ جدید در آن محیط کاری باز خواهد شد، که به شما گزینه‏های بیشتری خواهد داد، شامل کنترل‏های صفحۀ نمایش و خدمات چاپ.</para>
 	</sect2>
 
 
@@ -897,21 +771,15 @@ Template last modified Apr 11, 2002
 
   <!-- Interface -->
   <sect1 id="interface">
-    <title>Interface</title>
+    <title>محیط کاری</title>
     <!-- ============= Interface ============================== -->
 	
  <!-- ============= Menubar  ============-->
 	<sect2 id="menubar">
-   		<title>Menubar</title>
-   		<para>
-   		At the top of the <application>Xiphos</application> main window is the menubar. 
-   		Almost all of the functions are available by activating the appropriate 
-   		menu item. The functions have been grouped according to their type. For 
-   		example, the file operations have been grouped into 
-   		the <guisubmenu>File</guisubmenu> menu.
-   		</para>
+   		<title>خط فرمان</title>
+   		<para>در بخش بالایی برنامۀ<application>زیفوس</application>خط فرمان قرار دارد.تقریباً تمامی کاربردها توسط انتخاب منوی درست اجرا می‏شوند. این کابردها بسته به نوع کاری که انجام می‏دهند گروه‏بندی شده‏اند. بعنوان نمونه، گروه فرامین کاربردی مرتبط با فایل، زیر فرمان<guisubmenu>پرونده</guisubmenu>دسته‏بندی شده‏اند.</para>
 	        <figure id="menubar_figure">
-			<title>Menubar</title>
+			<title>خط فرمان</title>
 	  		<screenshot> 
 			  <mediaobject> 
 			    <imageobject><imagedata fileref="figures/interface_menubar.png" format="PNG"/> 
@@ -923,7 +791,7 @@ Template last modified Apr 11, 2002
     		    </imageobject>
 		    -->
 	    <textobject> 
-	      <phrase>Xiphos menubar</phrase> 
+	      <phrase>خط فرمان زیفوس</phrase> 
 	    </textobject> 
 	  </mediaobject> 
 	
@@ -933,15 +801,10 @@ Template last modified Apr 11, 2002
 	
 <!-- ============= Toolbars  ============-->
 	<sect2 id="toolbars">
-   		<title>Toolbars</title>
-   		<para>
-	    	The function of the Toolbar is to provide control over the Bible and Commentary Panes.
-		Activation of the Toolbar option is done by moving the mouse cursor over the 
-		desired toolbar button and selecting it. A tooltip will appear if the mouse cursor 
-		is held stationary over a toolbar button, describing the function of the button. 
-    	</para>
+   		<title>ستون‏فرمان</title>
+   		<para>The function of the Toolbar is to provide control over the Bible and Commentary Panes. Activation of the Toolbar option is done by moving the mouse cursor over the desired toolbar button and selecting it. A tooltip will appear if the mouse cursor is held stationary over a toolbar button, describing the function of the button.کاربرد ستون ابزار اینست که کنترل‏های مربویط به چارچوب‏های کتاب‏مقدس و تفسیر را فراهم نماید. با حرکت دادن نشانگر ماوس بر روی دکمۀ ابزار مورد نظرتان و انتخاب آن، این گزینه فعال خواهد شد. اگر نشانگر ماوس را برای چند لحظه بر روی ابزار نگاه دارید، یک راهنمای کوچک باز خواهد شد که کاربرد آن کلید را توضیح خواهد داد. </para>
 		<figure id="toolbar_figure">
-			<title>ToolBar</title>
+			<title>ابزار</title>
 			<screenshot> 
 	  <mediaobject> 
 	    <imageobject>
@@ -954,93 +817,64 @@ Template last modified Apr 11, 2002
     		    </imageobject>
 	    -->
 	    <textobject> 
-	      <phrase>The Toolbar</phrase> 
+	      <phrase>ابزار</phrase> 
 	    </textobject> 
 	  </mediaobject> 
 	</screenshot>
 		</figure>	
-		<para>
-		The <interface>Toolbar</interface> consists of the following functions:
-		</para>
+		<para>گزینۀ <interface>ابزار</interface>شامل کاربردهای زیر است:</para>
 		<itemizedlist>
 			<listitem>
-				<para>
-				History View Toggle and drop-down menu
-				</para>
+				<para>تاریخچه مرور انتخاب و لیست</para>
 			</listitem>
 			<listitem>
-				<para>
-				Bible Book Selector
-				</para>
+				<para>انتخاب بخشی از کتاب‏مقدس</para>
 			</listitem>
 			<listitem>
-				<para>
-				Bible Chapter Selector
-				</para>
+				<para>انتخاب فصلی از کتاب‏مقدس</para>
 			</listitem>
 			<listitem>
-				<para>
-				Bible Verse Selector
-				</para>
+				<para>انتخاب آیه‏ای از کتاب‏مقدس</para>
 			</listitem>
 			<listitem>
-				<para>
-				Bible Passage Summary
-				</para>
+				<para>خلاصۀ بخش بخصوصی از کتاب‏مقدس</para>
 			</listitem>
 		</itemizedlist>
 		
 		<sect3>
-			<title>History Forward/Backward Selector</title>
-			<para>
-			Switches between current and previous passage selections.
-			</para>
+			<title>انتخاب کردن تاریخچۀ پیشین/پسین</title>
+			<para>حرکت بین قسمت برگزیده شدۀ فعلی و پیشین.</para>
 		</sect3>
 			
 		<sect3 id="xiphos-toolbar-book">
-			<title>Bible Book Selector</title>
-			<para>		
-			Selects the Biblical book to be displayed in the <interface>Bible Text Pane</interface> and 
-			<interface>Commentary Pane</interface>. Changes take immediate effect.
-			</para>
+			<title>انتخاب بخشی از کتاب‏مقدس</title>
+			<para>این فرمان یک کتاب از کتاب‏مقدس را که مایل هستید در بخش <interface>چارچوب متن کتاب‏مقدس</interface> و <interface>چارچوب تفسیر</interface>نشان می‏دهد. هرگونه تغییری در این قسمت بلافاصله اعمال خواهد شد.</para>
 		</sect3>
 			
 		<sect3 id="xiphos-toolbar-chapter">
-			<title>Bible Chapter Selector</title>
-			<para>
-			Selects the Biblical chapter of current book to be displayed in the <interface>Bible Text Pane</interface> and 
-			<interface>Commentary Pane</interface>. Changes take immediate effect.
-			</para>
+			<title>انتخاب فصلی از کتاب‏مقدس</title>
+			<para>این فرمان فصلی از کتاب‏مقدس را که مایل هستید در بخش <interface>چارچوب متن کتاب‏مقدس</interface> و <interface>چارچوب تفسیر</interface>نشان می‏دهد. هرگونه تغییری در این قسمت بلافاصله اعمال خواهد شد.</para>
 		</sect3>
 			
 		<sect3 id="xiphos-toolbar-verse">
-			<title>Bible Verse Selector</title>
-			<para>
-			Selects the Biblical verse of current chapter to be displayed in the <interface>Bible Text Pane</interface> and 
-			<interface>Commentary Pane</interface>. Changes take immediate effect.
-			</para>
+			<title>انتخاب آیه‏ای از کتاب‏مقدس</title>
+			<para>این فرمان یک آیه از کتاب‏مقدس را که مایل هستید در بخش <interface>چارچوب متن کتاب‏مقدس</interface> و <interface>چارچوب تفسیر</interface>نشان می‏دهد. هرگونه تغییری در این قسمت بلافاصله اعمال خواهد شد.</para>
 		</sect3>
 		
 		<sect3 id="xiphos-toolbar-summary">
-			<title>Bible Passage Summary</title>
-			<para>
-			Allows manual editing of passages which are displayed in the <interface>Bible Text Pane</interface> and 
-			<interface>Commentary Pane</interface>. Changes take effect once Enter is typed.
-			</para>
+			<title>خلاصۀ بخش بخصوصی از کتاب‏مقدس</title>
+			<para>Allows manual editing of passages which are displayed in the <interface>Bible Text Pane</interface> and <interface>Commentary Pane</interface>. Changes take effect once Enter is typed.این فرمان، اجازه می‏دهد که شما قسمتهایی  را که مایل هستید در بخش <interface>چارچوب متن کتاب‏مقدس</interface> و <interface>چارچوب تفسیر</interface>ویرایش کنید. هرگونه تغییری در این قسمت بلافاصله اعمال خواهد شد.</para>
 			<warning>
-				<para>
-				Ensure that edited book,chapter and verse naming is correct, otherwise the wrong or no information
-				will be displayed.
-				</para>
+				<para>لطفا اطمینان حاصل کنید که کتاب، فصل، و یا آیه‏ای که آنرا ویرایش کرده‏اید به درستی نامگذاری شده است، در غیر اینصورت اطلاعات اشتباه نمایش داده خواهد شد.</para>
 			</warning>
 		</sect3>
 	</sect2>
    
 <!-- ============= Sidebar  ============-->  
 	<sect2 id="xiphos-sidebar">
-   	 	<title>The Sidebar</title>
+   	 	<title>ابزار جانبی</title>
 		<figure id="sidebar_figure">
-			<title>Sidebar</title>
+			<title>ستون جانبی</title>
 	  		<screenshot> 
 	  <mediaobject> 
 	    <imageobject>
@@ -1053,7 +887,7 @@ Template last modified Apr 11, 2002
     		    </imageobject>
 	    -->
 	    <textobject> 
-	      <phrase>The Sidebar</phrase> 
+	      <phrase>ابزار جانبی</phrase> 
 	    </textobject> 
 	  </mediaobject> 
 	   </screenshot>
@@ -1065,7 +899,7 @@ Template last modified Apr 11, 2002
 		To switch between all Sidebar functions, buttons have been placed at the top of the Sidebar.
 		</para>
 		<figure id="shortcut_figure">
-			<title>Sidebar Shortcuts</title>
+			<title>میان‏بر به ابزار جانبی</title>
 	  		<screenshot> 
 	  <mediaobject> 
 	    <imageobject>
@@ -1078,7 +912,7 @@ Template last modified Apr 11, 2002
     		    </imageobject>
 	    -->
 	    <textobject> 
-	      <phrase>Sidebar shortcuts</phrase> 
+	      <phrase>میان‏بر به ابزار جانبی</phrase> 
 	    </textobject> 
 	  </mediaobject> 
 			</screenshot>
@@ -1086,9 +920,9 @@ Template last modified Apr 11, 2002
 	</sect2>
 <!-- ============= Bible Text Pane  ============--> 
 	<sect2 id="xiphos-bible">
-   		<title>The Bible Text Pane</title>
+   		<title>چارچوب متن کتاب‏مقدس</title>
   		<figure id="textpane_figure">
-			<title>The Bible Textpane</title>
+			<title>چارچوب متن کتاب‏مقدس</title>
 	  		<screenshot> 
 	  <mediaobject> 
 	    <imageobject>
@@ -1101,43 +935,29 @@ Template last modified Apr 11, 2002
     		    </imageobject>
 	    -->
 	    <textobject> 
-	      <phrase>The Bible textpane</phrase> 
+	      <phrase>چارچوب متن کتاب‏مقدس</phrase> 
 	    </textobject> 
 	  </mediaobject> 
 	
 			</screenshot>
 	    	</figure>
-		<para>
-		Positioned to the right of the Shortcut bar is the Bible text pane. All your different translations
-		will be displayed for full viewing. When starting <application>Xiphos</application> either your default Bible translation or the translation
-		last used will be displayed.
-		</para>
+		<para>در سمت راست ستون شورت‏کات‏ها، چارچوب متن کتاب‏مقدس قرار دارد. تمام ترجمه‏های گوناگونی که شما دارید در این قسمت نشان داده می‏شوند. هنگامی که برنامۀ <application>زیفوس</application>را باز می‏کنید، بصورت اتوماتیک یا کتاب‏مقدس استاندارد شما و یا آخرین کتاب‏مقدسی که باز کرده بودید، بر روی این صفحه باز خواهد شد. </para>
 		
 		<sect3 id="xiphos-bible-open">
-			<title>Opening A Specific Bible Translation</title>
-			<para>
-			In order to change the current Bible translation to another of your choice:
-			</para>
+			<title>باز کردن ترجمۀ خاصی از کتاب‏مقدس</title>
+			<para>به منظور تعویض ترجمۀ فعلی کتاب‏مقدس به یکی دیگر از ترجمه‏ها:</para>
 			<itemizedlist>
 				<listitem>
-					<para>
-					right-click in the <interface>Bible Text Pane</interface>. In the popup menu choose
-					<menuchoice><guimenuitem>File</guimenuitem><guimenuitem>Open Module</guimenuitem></menuchoice>
-					and select your specific translation that you want to view.
-					</para>
+					<para>بر روی <interface>چارچوب متن کتاب‏مقدس</interface>رایت‏کلیک کنید. از صفحۀ فهرستی که باز شد، گزینۀ <menuchoice><guimenuitem>پرونده</guimenuitem><guimenuitem>بازکردن مدول</guimenuitem></menuchoice>را برگزینید و سپس ترجمه‏ای را دوست دارید، استفاده کنید، باز نمایید.</para>
 				</listitem>
 				<listitem>
-					<para>
-					under the <guibutton>Modules</guibutton> option in the <interface>Sidebar</interface>, choose <menuchoice>
-					<guimenuitem>Biblical Texts</guimenuitem><guimenuitem>language choice</guimenuitem></menuchoice>
-					and select your specific translation. 
-					</para>
+					<para>زیر عنوان<guibutton> مدول‏ها،</guibutton>در بخش <interface>ستون جانبی</interface>،گزینۀ<menuchoice><guimenuitem>متون کتابمقدس</guimenuitem><guimenuitem>،زبان مورد علاقه</guimenuitem></menuchoice>، و ترجمۀ خاصی را که دوست دارید، می‏توانید انتخاب کنید.</para>
 				</listitem>
 			</itemizedlist>
 		</sect3>
 		
 		<sect3 id="xiphos-bible-parallel">
-			<title>Using the Parallel View Mode</title>
+			<title>استفاده از کاربرد موازی</title>
 			<para>
 			A nice function in <application>Xiphos</application> is the ability to view your specified bible text in five parallel
 			translations of your choice. The Parallel View mode can be accessed by selecting <guimenuitem>Parallel View</guimenuitem> just
@@ -1147,7 +967,7 @@ Template last modified Apr 11, 2002
 			to display books, chapters, or verses that they don't have.  
 			</para>
 		<figure id="parallel_figure">
-			<title>Bible textpane - parallel view</title>
+			<title>چارچوب متن کتاب‏مقدس- نگرش موازی</title>
 	  		<screenshot> 
 	  <mediaobject> 
 	    <imageobject><imagedata fileref="figures/interface_parallel.png" format="PNG"/>
@@ -1159,7 +979,7 @@ Template last modified Apr 11, 2002
     		    </imageobject>
 	    -->
 	    <textobject> 
-	      <phrase>Bible textpane - parallel view</phrase> 
+	      <phrase>چارچوب متن کتاب‏مقدس- نگرش موازی</phrase> 
 	    </textobject> 
 	  </mediaobject> 
 	
@@ -1171,7 +991,7 @@ Template last modified Apr 11, 2002
 			chapter, in all 5 translations.
 			</para>
 		<figure id="parallel_figure_separate">
-			<title>Parallel View - separate window</title>
+			<title>نگرش موازی - پنجره‏ای دیگر</title>
 	  		<screenshot> 
 	  <mediaobject> 
 	    <imageobject><imagedata fileref="figures/interface_parallel-separate.png" format="PNG"/> 
@@ -1183,7 +1003,7 @@ Template last modified Apr 11, 2002
     		    </imageobject>
 	    -->
 	    <textobject> 
-	      <phrase>Parallel View - separate window</phrase> 
+	      <phrase>نگرش موازی - پنجره‏ای دیگر</phrase> 
 	    </textobject> 
 	  </mediaobject> 
 	
@@ -1192,10 +1012,8 @@ Template last modified Apr 11, 2002
 		</sect3>
 		
 		<sect3 id="xiphos-bible-open-separate">
-			<title>Opening A Separate Bible Translation</title>
-			<para>
-			In order to view a Bible translation separate from the <application>Xiphos</application> interface:
-			</para>
+			<title>ترجمۀ دیگری از کتاب‏مقدس را باز می‏کند</title>
+			<para>به منظور مشاهدۀ یک ترجمۀ دیگری از کتاب‏مقدس از ترجمه‏های موجود در <application>محیط کاری</application>زیفوس:</para>
 			<itemizedlist>
 				<listitem>
 					<para>
@@ -1221,56 +1039,37 @@ Template last modified Apr 11, 2002
 					</para>
 				</listitem>
 				<listitem>
-					<para>
-					Under the <guibutton>Modules</guibutton> option in the <interface>Sidebar</interface>,choose <menuchoice>
-					<guimenuitem>Biblical Texts</guimenuitem><guimenuitem>language choice</guimenuitem></menuchoice>.
-					Then right-click on a translation and choose the <guimenuitem>About</guimenuitem>
-					option.
-					</para>
+					<para>تحت <guibutton>مدول‏های</guibutton>موجود در<interface>ستون جانبی،</interface>گزینۀ<menuchoice><guimenuitem>متون کتاب‏مقدس</guimenuitem><guimenuitem>گزینۀ زبان‏ها</guimenuitem></menuchoice>را برگزینید. سپس روی یک ترجمه کلیک سمت راست ماوس را فشار دهید و در این قسمت گزینۀ<guimenuitem>در بارۀ</guimenuitem>را برگزینید.</para>
 				</listitem>
 			</itemizedlist>
 		</sect3>
 		
 		<sect3 id="xiphos-bible-options">
-			<title>Module Options</title>
+			<title>گزینه‏های مدول</title>
 			<para>
 			Most Bible translations have additional options which the user can select.
 			</para>
 			<itemizedlist>
 				<listitem>
-					<para>
-					Words Of Christ In Red
-					</para>
+					<para>کلمات عیسی مسیح به رنگ قرمز</para>
 				</listitem>
 				<listitem>
-					<para>
-					Strong's Numbers
-					</para>
+					<para>شماره‏های کشف‏الآیات استرانگ</para>
 				</listitem>
 				<listitem>
-					<para>
-					Morphological Tags
-					</para>
+					<para>علائم واژه‏شناسی</para>
 				</listitem>
 				<listitem>	
-					<para>
-					Footnotes
-					</para>
+					<para>پانویس‏ها</para>
 				</listitem>
 				<listitem>	
-					<para>
-					Scripture Cross-Reference
-					</para>
+					<para>ارجاعات به کتاب‏مقدس</para>
 				</listitem>
 				<listitem>	
-					<para>
-					Headings
-					</para>
+					<para>سر تیترها</para>
 				</listitem>
 				<listitem>	
-					<para>
-					Image Content
-					</para>
+					<para>محتویات تصویر</para>
 				</listitem>
 			</itemizedlist>
 			<note>
@@ -1278,19 +1077,14 @@ Template last modified Apr 11, 2002
 				Translations in other languages such as Greek or Hebrew have specific options which deal only with the specific language.
 				</para>
 			</note>
-			<para>
-				In order to access these options:
-			</para>
+			<para>به منظور دستیابی به این گزینه‏ها:</para>
 			<itemizedlist>
 				<listitem>
-					<para>
-					right-click in the <interface>Bible Text pane</interface>. In the popup menu (example shown), choose
-					<guibutton>Module Options</guibutton> and select the specific option.
-					</para>
+					<para>روی ماوس رایت کلیک کنید،<interface>چارچوب متن کتابمقدس باز خواهد شد.</interface>در منویی که باز خواهد شد (مانند نمونۀ زیر)،<guibutton>گزینۀ مدول</guibutton>را انتخاب و کاربرد مورد نظر را علامت گذاری کنید.</para>
 				</listitem>
 			</itemizedlist>
 			<figure id="module_options">
-				<title>Module Options</title>
+				<title>گزینه‏های مدول</title>
 		  		<screenshot> 
 	  <mediaobject> 
 	    <imageobject><imagedata fileref="figures/interface_biblepane-options.png" format="PNG"/> 
@@ -1302,7 +1096,7 @@ Template last modified Apr 11, 2002
     		    </imageobject>
 	    -->
 	    <textobject> 
-	      <phrase>Module Options</phrase> 
+	      <phrase>گزینه‏های مدول</phrase> 
 	    </textobject> 
 	  </mediaobject> 
 	
@@ -1311,12 +1105,12 @@ Template last modified Apr 11, 2002
 		</sect3>
 		
 		<sect3 id="xiphos-view-options">
-			<title>View Options</title>
+			<title>گزینه‏های مرور</title>
 			<para>
 			There are several additional modes that can be selected from the menubar's <guimenuitem>View</guimenuitem> pulldown.
 			</para>
 			<figure id="view_options">
-				<title>View Options</title>
+				<title>گزینه‏های مرور</title>
 		  		<screenshot> 
 	  <mediaobject> 
 	    <imageobject><imagedata fileref="figures/interface_menubar-view.png" format="PNG"/> 
@@ -1328,7 +1122,7 @@ Template last modified Apr 11, 2002
     		    </imageobject>
 	    -->
 	    <textobject> 
-	      <phrase>View Options</phrase> 
+	      <phrase>گزینه‏های مرور</phrase> 
 	    </textobject> 
 	  </mediaobject> 
 	
@@ -1445,7 +1239,7 @@ Template last modified Apr 11, 2002
 	</sect2>
 <!-- ============= Previewer	================ -->
 	<sect2 id="xiphos-viewer">
-		<title>Previewer</title>
+		<title>پیش‏نگر</title>
 		<figure id="viewer_figure">
 			<title>PreViewer</title>
 	  		<screenshot> 
@@ -1459,7 +1253,7 @@ Template last modified Apr 11, 2002
     		    </imageobject>
 	    -->
 	    <textobject> 
-	      <phrase>Previewer</phrase> 
+	      <phrase>پیش‏نگر</phrase> 
 	    </textobject> 
 	  </mediaobject> 
 	
@@ -1486,6 +1280,10 @@ Template last modified Apr 11, 2002
 		<guibutton>*u</guibutton> at the beginning of the verse.  Hovering on this marker will show the annotation in the previewer, just as
 		for publisher's footnotes.
 		</para>
+		<para>
+		If a devotional has been set via the Preferences dialog, then the day's devotional reference will also appear in the
+		previewer, either on program startup or when the user requests it via the <guimenuitem>View</guimenuitem> menu.
+		</para>
 	</sect2>	
 <!-- ============= Commentary Pane  ============--> 
 	<sect2 id="xiphos-commentaries">
@@ -1503,7 +1301,7 @@ Template last modified Apr 11, 2002
     		    </imageobject>
 	    -->
 	    <textobject> 
-	      <phrase>Commentary Pane</phrase> 
+	      <phrase>چارچوب تفاسیر</phrase> 
 	    </textobject> 
 	  </mediaobject> 
 	
@@ -2034,9 +1832,9 @@ Template last modified Apr 11, 2002
 	<sect2 id="sword-config">
 	<title>Sword Module Configurations</title>
 		<sect3 id="sword-sources">
-			<title>Sword Sources Settings</title>
+			<title>Module Sources Settings</title>
 			<figure>
-				<title>Sword Sources Settings</title>
+				<title>Module Sources Settings</title>
 	        	<screenshot> 
 	  <mediaobject> 
 	    <imageobject><imagedata fileref="figures/sword_sources.png" format="PNG"/>
@@ -2055,10 +1853,16 @@ Template last modified Apr 11, 2002
 
 			</figure>
 		<para>
-		There are other repositories available besides Crosswire's own, though the modules available from other repositories do not
+		There are other repositories available besides CrossWire's own, though the modules available from other repositories do not
 		represent content officially sanctioned by Crosswire.  On the web, see this page for list of those repositories known:
 		<ulink type="http" url="http://www.crosswire.org/wiki/Module_Repositories">http://www.crosswire.org/wiki/Module_Repositories</ulink>		
 		</para>
+		<para>
+		The list of standard repositories is maintained at CrossWire.  Xiphos normally auto-synchronizes with that list one time,
+		when the user first puts the Module Manager to use.  The list may change, as new repositories come into existence;
+		occasional re-synchronization with the list is suggested, which is accomplished by clicking the <guibutton>Load
+		Standard</guibutton>.
+		</para>
 		</sect3>
 		<sect3 id="installation">
 			<title>Sword Module Installations</title>
@@ -2344,7 +2148,7 @@ Template last modified Apr 11, 2002
 					to match a string of text. A regular expression can be 
 					used to find verses with words that match a particular 
 					pattern. For example the regular expression
-					<userinput>\ A[a-z]*iah </userinput> will match verses that contain
+					<userinput>[a-z]*iah </userinput> will match verses that contain
 					the words Aiah, Ahaziah, Athaliah and Amariah.</para>
 					<para>A complete discussion of regular expressions is 
 					beyond the scope of this manual, but more information 
@@ -3083,7 +2887,7 @@ righteous</emphasis>ness.</para></listitem>
 	<sect2 id="xiphos-live-chat">
 		<title>Live Chat</title>
 		<para>Another way to get help is with online chat. Xiphos has an IRC channel on freenode, #xiphos.
-		If you don't know what that means, it's ok. Just click <ulink url="http://embed.mibbit.com/?server=irc.freenode.net&amp;channel=%23xiphos">this link</ulink> (it will open your web browser), type a nickname or accept the default, and click "Click to join chatroom".
+		If you don't know what that means, it's ok. Just click <ulink url="http://webchat.freenode.net/?randomnick=1&amp;channels=xiphos&amp;prompt=1">this link</ulink> (it will open your web browser), type a nickname or accept the default, and click "Click to join chatroom".
 		This will take you to a chatroom where the developers and other users are available to help you with issues
 		you may be having. Although many times someone will answer your question immediately, sometimes you may
 		have to wait a few minutes or longer.
diff --git a/help/fr/fr.po b/help/fr/fr.po
index de15f64..822f126 100644
--- a/help/fr/fr.po
+++ b/help/fr/fr.po
@@ -1,841 +1,20 @@
 # French translation of Xiphos
-# Copyright (C) 2008 Free Software Foundation, Inc.
-# Dominique Corbex <domcox@users.sourceforge.net>, 2008
+# Copyright (C) 2003, 2010 Free Software Foundation, Inc.
+# Dominique Corbex <domcox@users.sourceforge.net>, 2003, 2010
 #
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Xiphos 2.4.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-29 13:48+0200\n"
-"PO-Revision-Date: 2009-04-29 13:58+0200\n"
+"Project-Id-Version: Xiphos 3.1.2\n"
+"Report-Msgid-Bugs-To: Dominique Corbex <domcox@users.sourceforge.net>>\n"
+"POT-Creation-Date: 2009-12-12 13:57+0100\n"
+"PO-Revision-Date: 2009-12-12 13:58+0100\n"
 "Last-Translator: Dominique Corbex <domcox@users.sourceforge.net>>\n"
-"Language-Team: French <gnomefr@traduc.org>\n"
+"Language-Team: emacs + po-mode; French <gnomefr@traduc.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);"
-
-#. Authors
-#: ../C/authors.xml:3(para) ../C/xiphos.xml:3(para)
-msgid "This manual was written by:"
-msgstr "Ce manuel a été écrit par :"
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/interface.xml:18(None) ../C/xiphos.xml:18(None)
-msgid ""
-"@@image: 'figures/interface_menubar.png'; "
-"md5=e565033e6a203b845ee4875c1d647057"
-msgstr "interface_menubar.png"
-
-#: ../C/interface.xml:5(title) ../C/interface.xml:14(title)
-#: ../C/xiphos.xml:108(term) ../C/xiphos.xml:5(title)
-#: ../C/xiphos.xml:14(title)
-msgid "Menubar"
-msgstr "Barre de menu"
-
-#: ../C/interface.xml:6(para) ../C/xiphos.xml:6(para)
-msgid ""
-"At the top of the <application>Xiphos</application> main window is the "
-"menubar. Almost all of the functions are available by activating the "
-"appropriate menu item. The functions have been grouped according to their "
-"type. For example, the file operations have been grouped into the "
-"<guisubmenu>File</guisubmenu> menu."
-msgstr ""
-"La <interface>Barre de menu</interface> se situe en haut de la fenêtre de "
-"l'application <application>&appname;</application>.  Pratiquement toutes les "
-"fonctions sont disponibles en utilisant les éléments de menu appropriés. Les "
-"différentes fonctions sont regroupées par type. Par exemple, les opérations "
-"sur les fichiers sont regroupées dans le menu  <guisubmenu>Fichier</"
-"guisubmenu>."
-
-#: ../C/interface.xml:27(phrase)
-msgid "menubar"
-msgstr "Barre de menu"
-
-#. Use the Introduction section to give a brief overview of what
-#.      the application is and what it does.
-#: ../C/introduction.xml:5(para)
-msgid ""
-"is a Bible study and research tool based upon the \"SWORD Project\" "
-"libraries and the GNOME Desktop libraries. You can use to do the following:"
-msgstr ""
-"est un outil de recherche et d'étude biblique s'appuyant sur les composants "
-"de l'architecture logicielle du Projet SWORD et l'environnement de bureau "
-"GNOME. <application>&appname;</application> offre les fonctionnalités "
-"suivantes :"
-
-#. Journals and Prayer Lists
-#: ../C/journals.xml:3(para) ../C/xiphos.xml:3(para)
-msgid ""
-"<application>Xiphos</application> supports user-created and -editable "
-"modules to contain general content. Initially conceived as simple prayer "
-"lists, they have expanded to include daily journals and topic-outline "
-"content. The user can maintain prayer lists, or prepare sermons, or write "
-"any structured content desired."
-msgstr ""
-"<application>Xiphos</application> accepte la création et l'édition par "
-"l'utilisateur de modules contenant du texte. Originellement conçus pour "
-"l'édition de simples listes de prières, ces modules incluent désormais des "
-"journaux quotidiens et des notes structurées. Il est ainsi possible de tenir "
-"à jour des listes de prières, de préparer des sermons, ou d'écrire n'importe "
-"quel contenu structuré."
-
-#: ../C/legal.xml:2(para) ../C/xiphos.xml:2(para)
-msgid ""
-"Permission is granted to copy, distribute and/or modify this document under "
-"the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any "
-"later version published by the Free Software Foundation with no Invariant "
-"Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy "
-"of the GFDL at this <ulink type=\"help\" url=\"ghelp:fdl\">link</ulink> or "
-"in the file COPYING-DOCS distributed with this manual."
-msgstr ""
-"L'autorisation de copier, distribuer et/ou modifier le présent document est "
-"soumise aux conditions de la licence relative à la documentation gratuite "
-"GNU, version 1.1 ou toute version publiée ultérieurement par la Free "
-"Software Foundation sans sections identiques et sans aucun texte indiqué sur "
-"la première de couverture ni sur la quatrième de couverture.  Vous pouvez "
-"trouver une copie de cette licence à l'adresse suivante : <ulink type=\"help"
-"\" url=\"ghelp:fdl\">lien</ulink> ou dans le fichier COPYING-DOCS distribué "
-"avec le présent manuel."
-
-#: ../C/legal.xml:12(para) ../C/xiphos.xml:12(para)
-msgid ""
-"This manual is part of a collection of GNOME manuals distributed under the "
-"GFDL. If you want to distribute this manual separately from the collection, "
-"you can do so by adding a copy of the license to the manual, as described in "
-"section 6 of the license."
-msgstr ""
-"Le présent manuel appartient à une collection de manuels GNOME distribués "
-"conformément à cette licence.  Si vous souhaitez distribuer le présent  "
-"manuel séparément de la collection, cela est possible moyennant l'ajout "
-"d'une copie de la licence au manuel, tel que décrit dans la section 6 de la "
-"licence."
-
-#: ../C/legal.xml:19(para) ../C/xiphos.xml:19(para)
-msgid ""
-"Many of the names used by companies to distinguish their products and "
-"services are claimed as trademarks. Where those names appear in any GNOME "
-"documentation, and the members of the GNOME Documentation Project are made "
-"aware of those trademarks, then the names are in capital letters or initial "
-"capital letters."
-msgstr ""
-"De nombreux noms utilisés par les sociétés pour désigner leurs produits et "
-"services sont protégés en tant que marques commerciales. Lorsque ces noms "
-"apparaissent dans la documentation GNOME et lorsque les membres du projet de "
-"documentation GNOME connaissent l'existence d'une telle protection, ces noms "
-"sont imprimés en lettres majuscules ou portent une lettre majuscule à "
-"l'initiale."
-
-#: ../C/legal.xml:33(para) ../C/xiphos.xml:33(para)
-msgid ""
-"DOCUMENT IS PROVIDED ON AN \"AS IS\" BASIS, WITHOUT WARRANTY OF ANY KIND, "
-"EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT "
-"THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS FREE OF DEFECTS "
-"MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE "
-"RISK AS TO THE QUALITY, ACCURACY, AND PERFORMANCE OF THE DOCUMENT OR "
-"MODIFIED VERSION OF THE DOCUMENT IS WITH YOU. SHOULD ANY DOCUMENT OR "
-"MODIFIED VERSION PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL "
-"WRITER, AUTHOR OR ANY CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY "
-"SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN "
-"ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY DOCUMENT OR MODIFIED VERSION "
-"OF THE DOCUMENT IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER; AND"
-msgstr ""
-"CE DOCUMENT EST FOURNI \"TEL QUEL\", SANS AUCUNE GARANTIE, EXPLICITE OU "
-"IMPLICITE, Y COMPRIS, SANS LIMITATION, TOUTE GARANTIE ASSURANT QUE LE "
-"DOCUMENT OU LA VERSION MODIFIÉE DE CELUI-CI EST EXEMPT DE DÉFAUTS, "
-"COMMERCIALISABLE, ADAPTÉ À UN USAGE DONNÉ ET N'EST CONTRAIRE À AUCUNE "
-"LÉGISLATION. VOUS ASSUMEZ L'ENSEMBLE DES RISQUES ASSOCIÉS À LA QUALITÉ, A "
-"L'EXACTITUDE ET A LA PERFORMANCE DU PRÉSENT DOCUMENT OU D'UNE VERSION "
-"MODIFIÉE DE CELUI-CI. SI LE DOCUMENT OU UNE VERSION MODIFIÉE DE CELUI-CI "
-"DEVAIT S'AVÉRER DÉFECTUEUX A QUELQUE ÉGARD, VOUS (ET NON LE RÉDACTEUR "
-"INITIAL, L'AUTEUR OU TOUT AUTRE CONTRIBUTEUR) ASSUMEZ LES COÛTS DE TOUTE "
-"MAINTENANCE, RÉPARATION OU CORRECTION NÉCESSAIRE. LA PRÉSENTE CLAUSE DE NON-"
-"RESPONSABILITÉ EN MATIÈRE DE GARANTIE CONSTITUE UNE PARTIE ESSENTIELLE DE LA "
-"PRÉSENTE LICENCE. AUCUNE UTILISATION DU PRÉSENT DOCUMENT OU D'UNE VERSION "
-"MODIFIÉE DE CELUI-CI N'EST AUTORISÉE AU TITRE DE LA PRÉSENTE LICENCE SANS "
-"APPLICATION DE LA CLAUSE DE NON-RESPONSABILITÉ."
-
-#: ../C/legal.xml:54(para) ../C/xiphos.xml:54(para)
-msgid ""
-"UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER IN TORT (INCLUDING "
-"NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE AUTHOR, INITIAL WRITER, ANY "
-"CONTRIBUTOR, OR ANY DISTRIBUTOR OF THE DOCUMENT OR MODIFIED VERSION OF THE "
-"DOCUMENT, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON "
-"FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF "
-"ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, "
-"WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER DAMAGES "
-"OR LOSSES ARISING OUT OF OR RELATING TO USE OF THE DOCUMENT AND MODIFIED "
-"VERSIONS OF THE DOCUMENT, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE "
-"POSSIBILITY OF SUCH DAMAGES."
-msgstr ""
-"PAR AILLEURS, EN AUCUN CAS ET AU TITRE D'AUCUNE THÉORIE JURIDIQUE, QUE CE "
-"SOIT EN VERTU D'UN PRÉJUDICE (EN CE COMPRISE LA NÉGLIGENCE), D'UN CONTRAT OU "
-"D'UNE QUELCONQUE AUTRE RAISON, L'AUTEUR, LE RÉDACTEUR INITIAL, TOUT AUTRE "
-"CONTRIBUTEUR OU DISTRIBUTEUR DU PRÉSENT DOCUMENT OU D'UNE VERSION MODIFIÉE "
-"DE CELUI-CI, OU TOUT FOURNISSEUR D'UNE TELLE PARTIE, NE POURRA ÊTRE TENU "
-"POUR RESPONSABLE PAR UN TIERS DE TOUT DOMMAGE DIRECT, INDIRECT, SPÉCIAL, "
-"ACCIDENTEL OU CONSÉCUTIF QUEL QU'EN SOIT LE CARACTÈRE, Y COMPRIS, SANS "
-"LIMITATION, LES DOMMAGES CAUSÉS PAR UNE PERTE DE CLIENTÈLE, D'ARRÊT DE "
-"TRAVAIL, DE PANNE OU DE DYSFONCTIONNEMENT INFORMATIQUE OU POUR TOUT AUTRE "
-"DOMMAGE OU PERTE DÉCOULANT DE OU ASSOCIÉ À L'UTILISATION DU PRÉSENT DOCUMENT "
-"OU DE VERSIONS MODIFIÉES DE CELUI-CI, ET CE, MÊME SI LADITE PARTIE A ÉTÉ "
-"INFORMÉE DE LA POSSIBILITÉ DE TELS DOMMAGES."
-
-#: ../C/legal.xml:27(para) ../C/xiphos.xml:27(para)
-msgid ""
-"DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT ARE PROVIDED UNDER THE TERMS "
-"OF THE GNU FREE DOCUMENTATION LICENSE WITH THE FURTHER UNDERSTANDING THAT: "
-"<placeholder-1/>"
-msgstr ""
-"LA DISTRIBUTION DU PRÉSENT DOCUMENT ET DES VERSIONS MODIFIÉES DE CELUI-CI "
-"EST RÉGIE  PAR LA LICENCE RELATIVE À LA DOCUMENTATION GRATUITE GNU, CE QUI "
-"IMPLIQUE QUE :<placeholder-1/>"
-
-#: ../C/license.xml:2(para) ../C/xiphos.xml:2(para)
-msgid ""
-"This program is free software; you can redistribute it and/or modify it "
-"under the terms of the <ulink type=\"ghelp\" url=\"gnome-help:gpl\">GNU "
-"General Public License</ulink> version 2 as published by the Free Software "
-"Foundation."
-msgstr ""
-"Ce programme est libre, vous pouvez le redistribuer et/ou le modifier selon "
-"les termes de la <ulink type=\"ghelp\" url=\"gnome-help:gpl\">Licence "
-"Publique Générale GNU</ulink> publiée par la Free Software Foundation "
-"(version 2)."
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/modules.xml:23(None) ../C/xiphos.xml:23(None)
-msgid "@@image: 'figures/module.png'; md5=c27ec45463d4c3d3765f35770c31414a"
-msgstr "module.png"
-
-#: ../C/modules.xml:5(title) ../C/xiphos.xml:5(title)
-msgid "Introduction To The Module Manager"
-msgstr "Introduction à la gestion des modules"
-
-#: ../C/modules.xml:6(para) ../C/xiphos.xml:6(para)
-msgid ""
-"The \"module\" is the unit of content in <application>Xiphos</application>, "
-"and Sword generally; a Sword module is a resource available for viewing in "
-"Sword applications. There are several varieties: Most importantly, Bible "
-"texts, as well as dictionaries and lexicons, commentaries, and general "
-"books, any of which may include image content (e.g. atlases). They are "
-"installed either from a local directory structure (typically on removable "
-"media, such as a CDROM distribution) or remotely via ftp from a repository "
-"such as Crosswire, which is the home of Sword, and from which all officially "
-"Sword-sanctioned modules are available. Also, many other modules are "
-"available from non-Crosswire repositories."
-msgstr ""
-"Le «­­&nbsp;module&nbsp;» est un bloc de contenu dans <application>&appname;</"
-"application> et plus généralement dans toute application basée sur Sword. Un "
-"module de Sword est une ressource destinée à être affichée dans une "
-"application Sword. Les modules sont de plusieurs types dont, en premier, les "
-"textes bibliques, puis les commentaires, les dictionnaires et lexiques, les "
-"livres ordinaires, ceux offrant un contenu graphique (Atlas). Ils sont à "
-"installer depuis un dépot local (distribution par CDROM) ou par "
-"téléchargement ftp depuis un dépot distant comme celui de Crosswire, site de "
-"Sword, où tous les modules certiifiés par Crosswire sont disponibles. Des "
-"modules sont également disponibles auprès d'autres sources."
-
-#: ../C/modules.xml:14(para) ../C/xiphos.xml:14(para)
-msgid ""
-"If you have other Sword applications installed, they will all share the same "
-"set of Sword modules that you install through the Module Manager."
-msgstr ""
-"Si d'autres applications basées sur Sword sont installées, elles ont accès "
-"aux modules installés par le gestionnaire de modules."
-
-#: ../C/modules.xml:19(title) ../C/modules.xml:32(phrase)
-#: ../C/xiphos.xml:19(title) ../C/xiphos.xml:32(phrase)
-msgid "The Module Manager Dialog"
-msgstr "La fenêtre de gestion des modules"
-
-#: ../C/onlinehelp.xml:4(title) ../C/xiphos.xml:4(title)
-msgid "Users Mailing List"
-msgstr "Liste de diffusion des utilisateurs"
-
-#: ../C/onlinehelp.xml:5(para) ../C/xiphos.xml:5(para)
-msgid ""
-"One way you can get help with Xiphos is using our low-traffic users' mailing "
-"list. You can sign up by clicking <ulink url=\"https://lists.sourceforge.net/"
-"lists/listinfo/gnomesword-users/\"> this link</ulink>. Once you are signed "
-"up, you can email the list with any problems you are having and other users "
-"or the developers will respond, typically within a day."
-msgstr ""
-"Une façon d'obtenir de l'aide au sujet de <application>&appname;</"
-"application> est d'utiliser nos listes de diffusion à faible trafic. il "
-"suffit de s'abonner en sélectionnant <ulink url=\"https://lists.sourceforge."
-"net/lists/listinfo/gnomesword-users/\"> ce lien</ulink>. Une fois inscrit, "
-"un simple e-mail envoyé sur la liste décrivant les problèmes rencontrés "
-"amènera une réponse des autres utilisateurs ou des développeurs généralement "
-"dans la journée.<para>[NDT : La liste de diffusion est en langue anglaise]</"
-"para>"
-
-#: ../C/originallanguage.xml:4(title) ../C/xiphos.xml:4(title)
-msgid "Installing Needed Modules"
-msgstr "Installer les modules nécessaires"
-
-#: ../C/originallanguage.xml:5(para) ../C/xiphos.xml:5(para)
-msgid ""
-"Xiphos is ideally suited for studying the original Greek and Hebrew. To get "
-"started, you will want the following modules:"
-msgstr ""
-"Xiphos convient parfaitement à l'étude des textes originaux en grec ou "
-"hébreu. Pour commencer, il est recommandé d'installer les modules suivants :"
-
-#: ../C/originallanguage.xml:8(para) ../C/xiphos.xml:8(para)
-msgid "From Crosswire Repository:"
-msgstr "Dépot Crosswire"
-
-#: ../C/originallanguage.xml:13(para) ../C/xiphos.xml:13(para)
-msgid ""
-"StrongsHebrew Dictionary (or get StrongsRealHebrew from the Xiphos "
-"Repository)"
-msgstr ""
-"Dictionnaire StrongsHebrew (ou le StrongsRealHebrew du dépot &appname;)<para>"
-"[NDT : dictionnaires en langue anglaise]</para>"
-
-#: ../C/originallanguage.xml:18(para) ../C/xiphos.xml:18(para)
-msgid ""
-"StrongsGreek Dictionary (or get StrongsRealGreek from the Xiphos Repository)"
-msgstr ""
-"Dictionnaire StrongsGreek (ou le StrongsRealGreek du dépot &appname;)<para>"
-"[NDT : dictionnaires en langue anglaise]</para>"
-
-#: ../C/originallanguage.xml:23(para) ../C/xiphos.xml:23(para)
-msgid "Robinson Dictionary"
-msgstr ""
-"Dictionnaire Robinson (codes morphologiques)<para>[NDT : dictionnaire en "
-"langue anglaise]</para>"
-
-#: ../C/originallanguage.xml:28(para) ../C/xiphos.xml:28(para)
-msgid "KJV Bible"
-msgstr "Bible Louis Segond 1910 avec codes Strong et étiquettes morphologiques"
-
-#: ../C/originallanguage.xml:33(para) ../C/xiphos.xml:33(para)
-msgid "From Xiphos Repository:"
-msgstr "Dépot &appname;"
-
-#: ../C/originallanguage.xml:38(para) ../C/xiphos.xml:38(para)
-msgid ""
-"StrongsRealGreek Dictionary (same as StrongsGreek, but with Greek "
-"characters, B-Greek transliteration, and self-referencing links)"
-msgstr ""
-"Dictionnaire StrongsRealGreek (identique au StrongsGreek, mais avec "
-"caractères grecs, transliteration B-Greek, et liens de renvois)<para>[NDT : "
-"dictionnaire en langue anglaise]</para>"
-
-#: ../C/originallanguage.xml:43(para) ../C/xiphos.xml:43(para)
-msgid ""
-"StrongsRealHebrew Dictionary (same as StrongsHebrew, but with Hebrew "
-"characters and self-referencing links)"
-msgstr ""
-"Dictionnaire StrongsRealHebrew (identique au StrongsHebrew, mais avec "
-"caractères hébreu et liens de renvois)<para>[NDT : dictionnaire en langue "
-"anglaise]</para>"
-
-#: ../C/originallanguage.xml:48(para) ../C/xiphos.xml:48(para)
-msgid ""
-"InvertedStrongsRealGreek (key in or copy actual Greek word, rather than "
-"number)"
-msgstr ""
-"Dictionnaire InvertedStrongsRealGreek définitions des mots grecs<para>NDT : "
-"dictionnaire en langue anglaise]</para>"
-
-#. Personal Commentary
-#: ../C/personal.xml:3(para) ../C/xiphos.xml:3(para)
-msgid ""
-"To build up a personal commentary you will need to install the editable "
-"'Personal' sword module from the English Commentaries section. Right click "
-"it and choose <guimenuitem>Edit-&gt;Note-&gt;Personal</guimenuitem> in the "
-"menu."
-msgstr ""
-"Écrire son propre commentaire personnel nécessite l'utilisation du module "
-"Sword «­­&nbsp;Personal&nbsp;». Pour utiliser ce module, sélectionner le "
-"bouton <guibutton>Modules</guibutton> du volet latéral, puis choisir ensuite "
-"<menuchoice><guimenuitem>Commentaires</guimenuitem><guimenuitem>English</"
-"guimenuitem><guimenuitem>+*Personal*+</guimenuitem></menuchoice>. Pour "
-"modifier ses commentaires, faire un clic du bouton droit à l'aide de la "
-"souris sur la fenêtre des commentaires, puis sélectionner "
-"<menuchoice><guimenuitem>Éditer</guimenuitem><guimenuitem>Note</"
-"guimenuitem><guimenuitem>+*Personal*+</guimenuitem></menuchoice>."
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/preferences.xml:12(None) ../C/xiphos.xml:12(None)
-msgid ""
-"@@image: 'figures/preferences.png'; md5=1bb4a411bbec6a269a5e9904ebc37e89"
-msgstr "preferences.png"
-
-#: ../C/preferences.xml:6(title) ../C/xiphos.xml:6(title)
-msgid "Introduction To Preferences"
-msgstr "Introduction aux préférences"
-
-#: ../C/preferences.xml:8(title) ../C/xiphos.xml:8(title)
-msgid "The Preference Dialog"
-msgstr "La fenêtre des préférences"
-
-#: ../C/preferences.xml:21(phrase) ../C/xiphos.xml:21(phrase)
-msgid "The Preferences Dialog"
-msgstr "La fenêtre des préférences"
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/search.xml:15(None) ../C/xiphos.xml:15(None)
-msgid ""
-"@@image: 'figures/interface_searchpane.png'; "
-"md5=9b02269f6a1a4aa3a2a627aaca52d66c"
-msgstr "interface_searchpane.png"
-
-#: ../C/search.xml:4(title) ../C/xiphos.xml:4(title)
-msgid "Simple Searches"
-msgstr "Recherche simple"
-
-#: ../C/search.xml:5(para) ../C/xiphos.xml:5(para)
-msgid ""
-"To conduct a quick search within the current Bible or commentary module, the "
-"Search Bar in the Sidebar should usually be adequate. Click either in the "
-"menu bar <guimenuitem>Edit-&gt;Search</guimenuitem> or in the Sidebar "
-"<guimenuitem>Modules-&gt;Search</guimenuitem> to access it."
-msgstr ""
-"Pour rechercher rapidement un mot ou une expression dans un module en cours "
-"d'utilisation, le plus simple est d'utiliser la fonction recherche du volet "
-"latéral. Cette fonction de recherche rapide est activée en sélectionnant  le "
-"menu <menuchoice><guimenuitem>Éditer</guimenuitem><guimenuitem>Rechercher</"
-"guimenuitem></menuchoice> ou le bouton <guibutton>Rechercher</guibutton> du "
-"volet latéral."
-
-#: ../C/search.xml:11(title) ../C/search.xml:24(phrase)
-#: ../C/xiphos.xml:11(title) ../C/xiphos.xml:24(phrase)
-msgid "The Search Bar"
-msgstr "La barre de recherche"
-
-#: ../C/search.xml:31(para) ../C/xiphos.xml:31(para)
-msgid ""
-"The <interface>Search Dialog</interface> consists of the following parts:"
-msgstr ""
-"Le formulaire <interface>Rechercher</interface> est constitué des éléments "
-"suivants :"
-
-#: ../C/search.xml:36(para) ../C/xiphos.xml:36(para)
-msgid "Search Key Entry box"
-msgstr "Boite de saisie de l'expression à rechercher"
-
-#: ../C/search.xml:41(para) ../C/search.xml:83(title) ../C/xiphos.xml:41(para)
-#: ../C/xiphos.xml:83(title)
-msgid "Search Module Selector"
-msgstr "Sélecteur du module objet de la requête"
-
-#: ../C/search.xml:46(para) ../C/search.xml:91(title) ../C/xiphos.xml:46(para)
-#: ../C/xiphos.xml:91(title)
-msgid "Search Type Selector"
-msgstr "Sélecteur du type de requête"
-
-#: ../C/search.xml:51(para) ../C/search.xml:129(title)
-#: ../C/xiphos.xml:51(para) ../C/xiphos.xml:129(title)
-msgid "Search Options Checkbox"
-msgstr "Case à cocher des options de la requête"
-
-#: ../C/search.xml:56(para) ../C/search.xml:136(title)
-#: ../C/xiphos.xml:56(para) ../C/xiphos.xml:136(title)
-msgid "Search Scope Selector"
-msgstr "Sélecteur de la plage de versets"
-
-#: ../C/search.xml:61(para) ../C/search.xml:173(title)
-#: ../C/xiphos.xml:61(para) ../C/xiphos.xml:173(title)
-msgid "Search Results View"
-msgstr "Affichage des résultats"
-
-#: ../C/search.xml:67(title) ../C/xiphos.xml:67(title)
-msgid "Search Key Entry Box"
-msgstr "Boite de saisie de l'expression à rechercher"
-
-#: ../C/search.xml:68(para) ../C/xiphos.xml:68(para)
-msgid ""
-"Allows entry of the key for which you would like to search. The search key "
-"can be a word, part of a word, several words, a phrase, or a regular "
-"expression depending on the type of search selected. When the search key is "
-"entered and all other selections in the search dialog are complete, click "
-"the <guibutton>Find</guibutton> button to begin the search."
-msgstr ""
-"La boite d'entrée permet de saisir l'expression à rechercher. Cette "
-"expression peut être un mot, une partie de mot, plusieurs mots, une phrase, "
-"ou une expression rationnelle suivant le type de requête sélectionné. Une "
-"fois l'expression à rechercher saisie, et les options définies, un clic sur "
-"le bouton <guimenuitem>Rechercher</guimenuitem> démarre la séquence de "
-"recherche."
-
-#: ../C/search.xml:75(para) ../C/xiphos.xml:75(para)
-msgid ""
-"This search uses the optimized search method (see next section) if the "
-"module has previously been indexed, and will use AND semantics by default "
-"(verses must contain all words you entered)."
-msgstr ""
-"Cette requête employe la méthode de recherche optimisée (Voir la section "
-"suivante) à la condition que le module concerné ait été précédemment indexé, "
-"et utilisera le ET logique par défaut (les versets doivent contenir tous les "
-"mots saisis)"
-
-#: ../C/search.xml:84(para) ../C/xiphos.xml:84(para)
-msgid ""
-"Allows selection of which modules you would like to search. Select "
-"<guibutton>Bible</guibutton> to search Bible versions or "
-"<guibutton>Commentary</guibutton> to search commentaries. Only the currently "
-"active module will be searched."
-msgstr ""
-"Permet la sélection du module dans lequel la requête sera exécutée. "
-"Sélectionner <guimenuitem>Texte biblique</guimenuitem> pour exécuter une "
-"requête dans le texte biblique ou <guimenuitem>Commentaire</guimenuitem>  "
-"pour le module de commentaires. La requête ne s'exécute que dans les modules "
-"en cours de consultation."
-
-#: ../C/search.xml:92(para) ../C/xiphos.xml:92(para)
-msgid ""
-"Allows selection of the type of search. There are three search types "
-"available:"
-msgstr ""
-"Permet se sélectionner le type de requête. Trois types de requête sont "
-"possibles :"
-
-#: ../C/search.xml:97(guibutton) ../C/xiphos.xml:97(guibutton)
-msgid "Multi word"
-msgstr "Mots multiples"
-
-#: ../C/search.xml:98(para) ../C/xiphos.xml:98(para)
-msgid ""
-"This type will match any verse that has all the words in the search key, "
-"regardless of where they appear in the verse."
-msgstr ""
-"La requête  recherche n'importe quel verset contenant tous les mots de "
-"l'expression  à rechercher, quelque soit l'ordre dans lequel ils "
-"apparaissent dans le verset."
-
-#: ../C/search.xml:103(guibutton) ../C/xiphos.xml:103(guibutton)
-msgid "Regular expression"
-msgstr "Expression rationnelle"
-
-#: ../C/search.xml:104(para) ../C/xiphos.xml:104(para)
-msgid ""
-"This search uses a regular expression as a search key. A regular expression "
-"is a pattern used to match a string of text. A regular expression can be "
-"used to find verses with words that match a particular pattern. For example "
-"the regular expression <userinput>\\ A[a-z]*iah </userinput> will match "
-"verses that contain the words Aiah, Ahaziah, Athaliah and Amariah."
-msgstr ""
-"L'expression à rechercher est une expression rationnelle. Une expression "
-"rationnelle est basée sur un langage et une syntaxe spécifiques permettant "
-"de retrouver un mot, une phrase à l'aide de combinaisons complexes. Par "
-"exemple l'expression rationnelle <userinput>\\ A[a-z]*iah </userinput> "
-"permet de retrouver les passages qui contiennent les mots Aiah, Ahaziah, "
-"Athaliah et Amariah."
-
-#: ../C/search.xml:111(para) ../C/xiphos.xml:111(para)
-msgid ""
-"A complete discussion of regular expressions is beyond the scope of this "
-"manual, but more information can be found in the grep man page."
-msgstr ""
-"Un exposé complet de l'emploi des expressions rationnelles dépasse le cadre "
-"de ce manuel, mais cependant plus d'informations à ce sujet peuvent être "
-"obtenues en parcourant le manuel de <command>grep</command>."
-
-#: ../C/search.xml:116(guibutton) ../C/xiphos.xml:116(guibutton)
-msgid "Exact phrase"
-msgstr "Phrase exacte"
-
-#: ../C/search.xml:117(para) ../C/xiphos.xml:117(para)
-msgid ""
-"This type will match the search key exatly as entered. If the search key is "
-"<userinput>\n"
-"\t\t\t\t\tit is good</userinput>, this search would match a verse which "
-"contains \"<emphasis>it is good</emphasis>,\" but would not match a verse "
-"which contains \"<emphasis> good</emphasis>, and doeth <emphasis>it</"
-"emphasis> not, to him it <emphasis>is</emphasis> sin.\""
-msgstr ""
-"La requête recherche la phrase exacte contenue dans l'expression à "
-"rechercher. Si la phrase à rechercher est <userinput>en vérité</userinput>, "
-"les passages obtenus contiendront «­­&nbsp;<emphasis>en vérité</"
-"emphasis>&nbsp;», mais pas «­­&nbsp;<emphasis>en</emphasis> toute  "
-"<emphasis>vérité</emphasis>&nbsp;»."
-
-#: ../C/search.xml:130(para) ../C/xiphos.xml:130(para)
-msgid ""
-"Allows selecting of search options. The only available option is "
-"<guibutton>Match case</guibutton>. Check this box to make the search case "
-"sensitive."
-msgstr ""
-"Permet de définir les options de recherche. L'option disponible est "
-"<guimenuitem>Respecter la casse</guimenuitem>. Cocher cette boite rend la "
-"recherche sensible à la casse des caractères."
-
-#: ../C/search.xml:137(para) ../C/xiphos.xml:137(para)
-msgid ""
-"Allows defining the range within the specificed module that will be "
-"searched. There are three search scopes available:"
-msgstr ""
-"Permet de définir la plage de versets à parcourir dans le module spécifié. "
-"Trois plages de recherche sont possibles :"
-
-#: ../C/search.xml:141(guibutton) ../C/xiphos.xml:141(guibutton)
-msgid "No scope"
-msgstr "Sans limites"
-
-#: ../C/search.xml:142(para) ../C/xiphos.xml:142(para)
-msgid "This button causes the search to to include the entire module."
-msgstr ""
-"Sélectionner ce bouton implique que la requête s'exécute sur l'ensemble des "
-"versets."
-
-#: ../C/search.xml:147(guibutton) ../C/xiphos.xml:147(guibutton)
-msgid "Use bounds"
-msgstr "Limites définies"
-
-#: ../C/search.xml:148(para) ../C/xiphos.xml:148(para)
-msgid ""
-"Selecting this button produces two dropdown selector boxes marked "
-"<guilabel>Lower</guilabel> and <guilabel>Upper</guilabel>. Select the first "
-"book to search in the <guilabel>Lower</guilabel> box and the last book to "
-"search in the <guilabel>Upper</guilabel> box. The search will begin with the "
-"<guilabel>Lower </guilabel> book and end with the <guilabel>Upper </"
-"guilabel> book and include all books in between."
-msgstr ""
-"Sélectionner ce bouton provoque l'ouverture de deux zones supplémentaires "
-"permettant la saisie des limites de la recherche. La première référence, "
-"début de la recherche, est à saisir dans la limite <guilabel>Basse</"
-"guilabel> et la deuxième référence, fin de la recherche, dans la limite "
-"<guilabel>Haute</guilabel>. La requête commencera au verset indiqué dans la "
-"limite <guilabel>Basse</guilabel> et se terminera au verset indiqué dans la "
-"limite <guilabel>Haute</guilabel> en incluant tous les versets situés entre "
-"les deux limites."
-
-#: ../C/search.xml:157(para) ../C/xiphos.xml:157(para)
-msgid ""
-"Chapter and verse numbers can be entered into the search bound boxes as well "
-"to further narrow the search."
-msgstr ""
-"Des numéros de chapitres ou de versets peuvent aussi être saisis dans les "
-"deux zones basse et haute  afin de mieux cibler la recherche."
-
-#: ../C/search.xml:163(guibutton) ../C/xiphos.xml:163(guibutton)
-msgid "Last search"
-msgstr "Dernière requête"
-
-#: ../C/search.xml:164(para) ../C/xiphos.xml:164(para)
-msgid ""
-"Select this button to do a new search including only the verses returned as "
-"a result of the last search. Use this with a new search key to narrow the "
-"search further."
-msgstr ""
-"Sélectionner ce bouton pour relancer une recherche uniquement sur les  "
-"versets retournés en résultat de la requête précédente. Utilisée avec une "
-"nouvelle expression, cette méthode permet de réduire la liste des versets "
-"restitués."
-
-#: ../C/search.xml:174(para) ../C/xiphos.xml:174(para)
-msgid ""
-"This shows a list of the current search results for previewing, navigation, "
-"or saving."
-msgstr ""
-"La liste des résultats est affichée permettant d'obtenir un aperçu du verset "
-"retourné, la navigation vers le chapître concerné ou l'enregistrement sous "
-"forme de signets."
-
-#: ../C/search.xml:177(term) ../C/xiphos.xml:177(term)
-msgid "Preview"
-msgstr "Aperçu"
-
-#: ../C/search.xml:178(para) ../C/xiphos.xml:178(para)
-msgid ""
-"To preview the search result, simply click on an individual result. The "
-"entry will show in the preview pane."
-msgstr ""
-"Pour visualiser le résultat, un simple clic sur un élément affiche le "
-"contenu dans le volet <interface>Aperçu</interface>"
-
-#: ../C/search.xml:184(term) ../C/xiphos.xml:184(term)
-msgid "Navigation"
-msgstr "Navigation"
-
-#: ../C/search.xml:185(para) ../C/xiphos.xml:185(para)
-msgid ""
-"Navigation to the search result can be done in two ways. To open the result "
-"in a new tab, middle-click the mouse. To open the result in the current tab, "
-"double-click the result."
-msgstr ""
-"La navigation vers le chapître concerné pour retrouver le contexte "
-"s'effectue de deux manières. Un clic du bouton milieu de la souris ouvre le "
-"verset dans un nouvel onglet, un double-clic l'ouvre dans l'onget courant."
-
-#: ../C/search.xml:191(term) ../C/xiphos.xml:191(term)
-msgid "Save Results"
-msgstr "Enregistrer les résultats"
-
-#: ../C/search.xml:192(para) ../C/xiphos.xml:192(para)
-msgid ""
-"You may save your results as a list of bookmarks. To do this, right-click "
-"and select <guilabel>Save List</guilabel>. You will be prompted to enter a "
-"name for the folder that your results will be saved to. After you have saved "
-"the results, you may view them by going to your bookmarks and finding the "
-"folder you just named."
-msgstr ""
-"Les résultats de la requête peuvent être enregistrés sous forme de signets. "
-"Dans le menu contextuel obtenu à l'aide du bouton droit de la souris, "
-"sélectionner <guilabel>Convertir en signets</guilabel>, il sera alors "
-"demandé le nom du dossier sous lequel la liste sera enregistrée. Ensuite, "
-"une fois la liste sauvegardée, il devient possible de retrouver les "
-"résultats de la requête en affichant les signets puis en choisissant le "
-"dossier précédemment nommé."
-
-#: ../C/start.xml:4(title) ../C/xiphos.xml:4(title)
-msgid "Starting Xiphos"
-msgstr "Démarrer Xiphos"
-
-#: ../C/start.xml:5(para) ../C/xiphos.xml:5(para)
-msgid "You can start <application>Xiphos</application> in the following ways:"
-msgstr ""
-"Vous pouvez démarrer <application>Xiphos</application> en utilisant l'une "
-"des méthodes suivantes :"
-
-#: ../C/start.xml:10(term) ../C/xiphos.xml:10(term)
-msgid "Applications menu"
-msgstr "Menu applications"
-
-#: ../C/start.xml:12(para) ../C/xiphos.xml:12(para)
-msgid ""
-"Choose <menuchoice><guisubmenu>Accessories</guisubmenu><guimenuitem>Xiphos "
-"Bible Guide</guimenuitem></menuchoice>."
-msgstr ""
-"Sélectionnez <menuchoice><guisubmenu>Accessoires</"
-"guisubmenu><guimenuitem>Xiphos</guimenuitem></menuchoice>."
-
-#: ../C/start.xml:20(term) ../C/xiphos.xml:20(term)
-msgid "Command line"
-msgstr "Ligne de commande"
-
-#: ../C/start.xml:22(para) ../C/xiphos.xml:22(para)
-msgid "Type <command>xiphos</command>, then press <keycap>Return</keycap>."
-msgstr ""
-"Entrez <command>xiphos</command>, puis appuyez sur <keycap>Entrée</keycap>."
-
-#: ../C/start.xml:28(term) ../C/xiphos.xml:28(term)
-msgid "Windows"
-msgstr "Windows"
-
-#: ../C/start.xml:30(para) ../C/xiphos.xml:30(para)
-msgid ""
-"Go to <menuchoice><guisubmenu>All Programs</guisubmenu><guisubmenu>Xiphos </"
-"guisubmenu><guimenuitem>Xiphos</guimenuitem></menuchoice>."
-msgstr ""
-"Sélectionnez <menuchoice><guisubmenu>Tous les programmes</"
-"guisubmenu><guisubmenu>Xiphos·</guisubmenu><guimenuitem>Xiphos</"
-"guimenuitem></menuchoice>."
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/studypad.xml:16(None) ../C/xiphos.xml:16(None)
-msgid "@@image: 'figures/studypad.png'; md5=e50d36fb2348bbb0156b9a4a6457fed0"
-msgstr "studypad.png"
-
-#: ../C/studypad.xml:4(title) ../C/xiphos.xml:4(title)
-msgid "Using The Studypad"
-msgstr "Usage du bloc-notes :"
-
-#: ../C/studypad.xml:5(para) ../C/xiphos.xml:5(para)
-msgid ""
-"The Studypad can be opened by choosing <guibutton>File-&gt;Open Studypad</"
-"guibutton>"
-msgstr ""
-"Le bloc-notes s'obtient à l'aide du menu <menuchoice><guimenuitem>Fichier</"
-"guimenuitem><guimenuitem>Bloc-notes..</guimenuitem></menuchoice>"
-
-#: ../C/studypad.xml:8(para) ../C/xiphos.xml:8(para)
-msgid "This is what the Studypad typically looks like:"
-msgstr "Présentation du bloc-notes :"
-
-#: ../C/studypad.xml:12(title) ../C/studypad.xml:25(phrase)
-#: ../C/xiphos.xml:416(title) ../C/xiphos.xml:12(title)
-#: ../C/xiphos.xml:25(phrase)
-msgid "The Studypad"
-msgstr "Bloc-notes"
-
-#: ../C/studypad.xml:33(para) ../C/xiphos.xml:33(para)
-msgid ""
-"The Studypad will save into your working directory, making it useful for "
-"collecting and exporting information and Bible study material from Xiphos "
-"into other programmes."
-msgstr ""
-"Le bloc-notes enregistre les données dans votre répertoire de travail, ce "
-"qui est pratique pour échanger des informations avec d'autres applications. "
-
-#: ../C/studypad.xml:34(para) ../C/xiphos.xml:34(para)
-#: ../C/xiphos.xml:57(para)
-msgid "Toolbar 1"
-msgstr "Barre d'outils 1"
-
-#: ../C/studypad.xml:36(para) ../C/xiphos.xml:36(para)
-#: ../C/xiphos.xml:59(para)
-msgid "Font Size and Environment"
-msgstr "Taille de police"
-
-#: ../C/studypad.xml:37(para) ../C/xiphos.xml:37(para)
-#: ../C/xiphos.xml:60(para)
-msgid "Font Type"
-msgstr "Type de plice"
-
-#: ../C/studypad.xml:38(para) ../C/xiphos.xml:38(para)
-#: ../C/xiphos.xml:61(para)
-msgid "Bold, Italics, Underscored, Crossed Out"
-msgstr "Gras, italique, souligné, barré"
-
-#: ../C/studypad.xml:39(para) ../C/xiphos.xml:39(para)
-#: ../C/xiphos.xml:62(para)
-msgid "Left, Centre and Right Bound"
-msgstr "Aligné à gauche, au centre et àdroite"
-
-#: ../C/studypad.xml:40(para) ../C/xiphos.xml:40(para)
-#: ../C/xiphos.xml:63(para)
-msgid "Shift Paragraph Right or Left"
-msgstr "Décalage d'un paragraphe à droite ou à gauche"
-
-#: ../C/studypad.xml:41(para) ../C/xiphos.xml:41(para)
-#: ../C/xiphos.xml:64(para)
-msgid "Colour Selector"
-msgstr "Choix des couleurs"
-
-#: ../C/studypad.xml:43(para) ../C/xiphos.xml:43(para)
-#: ../C/xiphos.xml:66(para)
-msgid "Toolbar 2"
-msgstr "Barre d'outils 2"
-
-#: ../C/studypad.xml:45(para) ../C/xiphos.xml:45(para)
-msgid "New, Save, Delete and Print"
-msgstr "Nouveau, enregistrer, supprimer et imprimer"
-
-#: ../C/studypad.xml:46(para) ../C/xiphos.xml:46(para)
-#: ../C/xiphos.xml:69(para)
-msgid "Cut, Copy, Paste and Undo"
-msgstr "Couper, copier, coller et défaire"
-
-#: ../C/studypad.xml:47(para) ../C/xiphos.xml:47(para)
-#: ../C/xiphos.xml:70(para)
-msgid "Find and 'Find and Replace'"
-msgstr "Chercher et remplacer"
-
-#: ../C/studypad.xml:48(para) ../C/xiphos.xml:48(para)
-#: ../C/xiphos.xml:71(para)
-msgid "Spellcheck"
-msgstr "Vérification de l'orthographe"
-
-#: ../C/studypad.xml:51(para) ../C/xiphos.xml:51(para)
-#: ../C/xiphos.xml:74(para)
-msgid ""
-"In order for spellcheck to be available, one of the languages under "
-"<guimenuitem>Edit-&gt;Current Languages</guimenuitem> must be set."
-msgstr ""
-"Pour activer la vérification orthographique, un des langages du menu "
-"<menuchoice><guisubmenu>Éditer</guisubmenu><guimenuitem>Langues actuelles</"
-"guimenuitem></menuchoice> doit être sélectionné."
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
@@ -858,6 +37,14 @@ msgstr "first_start.png"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
+#: ../C/xiphos.xml:18(None) ../C/interface.xml:18(None)
+msgid ""
+"@@image: 'figures/interface_menubar.png'; "
+"md5=e565033e6a203b845ee4875c1d647057"
+msgstr "interface_menubar.png"
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
 #: ../C/xiphos.xml:49(None)
 msgid ""
 "@@image: 'figures/interface_toolbar.png'; "
@@ -874,7 +61,7 @@ msgstr "interface_sidepane.png"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/xiphos.xml:174(None)
+#: ../C/xiphos.xml:173(None)
 msgid ""
 "@@image: 'figures/interface_shortcut.png'; "
 "md5=1be0299ec3584f5262a3a4950fee745f"
@@ -882,7 +69,7 @@ msgstr "interface_shortcut.png"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/xiphos.xml:197(None)
+#: ../C/xiphos.xml:196(None)
 msgid ""
 "@@image: 'figures/interface_biblepane.png'; "
 "md5=092f45c81f0cf6682ec36a451da243ce"
@@ -890,7 +77,7 @@ msgstr "interface_biblepane.png"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/xiphos.xml:255(None)
+#: ../C/xiphos.xml:254(None)
 msgid ""
 "@@image: 'figures/interface_parallel.png'; "
 "md5=dbe32bdff5271afb087248f913363cce"
@@ -898,7 +85,7 @@ msgstr "interface_parallel.png"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/xiphos.xml:279(None)
+#: ../C/xiphos.xml:278(None)
 msgid ""
 "@@image: 'figures/interface_parallel-separate.png'; "
 "md5=259f72c50a2050fff5d61db45e1a117a"
@@ -906,7 +93,7 @@ msgstr "interface_parallel-separate.png"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/xiphos.xml:398(None)
+#: ../C/xiphos.xml:397(None)
 msgid ""
 "@@image: 'figures/interface_biblepane-options.png'; "
 "md5=16023367059854aed6c53b3fd0c34f33"
@@ -914,7 +101,7 @@ msgstr "interface_biblepane-options.png"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/xiphos.xml:424(None)
+#: ../C/xiphos.xml:423(None)
 msgid ""
 "@@image: 'figures/interface_menubar-view.png'; "
 "md5=1b203231796686231e0151e018628bc2"
@@ -922,14 +109,14 @@ msgstr "interface_menubar-view.png"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/xiphos.xml:522(None)
+#: ../C/xiphos.xml:554(None)
 msgid ""
 "@@image: 'figures/interface_viewer.png'; md5=e26c63cfa273aa2e1180d66fee1f1033"
 msgstr "interface_viewer.png"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/xiphos.xml:562(None)
+#: ../C/xiphos.xml:603(None)
 msgid ""
 "@@image: 'figures/interface_commentarypane.png'; "
 "md5=1142e8288deee464c1dcd51460bd2cce"
@@ -937,7 +124,7 @@ msgstr "interface_commentarypane.png"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/xiphos.xml:635(None)
+#: ../C/xiphos.xml:676(None)
 msgid ""
 "@@image: 'figures/interface_dictionary.png'; "
 "md5=d0d5561dae3d893d8287f22a1424ace4"
@@ -945,7 +132,7 @@ msgstr "interface_dictionary.png"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/xiphos.xml:815(None)
+#: ../C/xiphos.xml:856(None)
 msgid ""
 "@@image: 'figures/gtkhtml3-vs-mozembed.png'; "
 "md5=deec924e49812ac32cfd027e53d2b193"
@@ -953,6 +140,13 @@ msgstr "gtkhtml3-vs-mozembed.png"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
+#: ../C/xiphos.xml:12(None) ../C/preferences.xml:12(None)
+msgid ""
+"@@image: 'figures/preferences.png'; md5=1bb4a411bbec6a269a5e9904ebc37e89"
+msgstr "preferences.png"
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
 #: ../C/xiphos.xml:38(None)
 msgid ""
 "@@image: 'figures/preferences_fonts-color.png'; "
@@ -1009,6 +203,12 @@ msgstr "preferences_modules-misc.png"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
+#: ../C/xiphos.xml:23(None) ../C/modules.xml:23(None)
+msgid "@@image: 'figures/module.png'; md5=c27ec45463d4c3d3765f35770c31414a"
+msgstr "module.png"
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
 #: ../C/xiphos.xml:49(None)
 msgid ""
 "@@image: 'figures/sword_sources.png'; md5=a1182919f9c770abd01edee116fc0f48"
@@ -1016,27 +216,35 @@ msgstr "sword_sources.png"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/xiphos.xml:77(None)
+#: ../C/xiphos.xml:83(None)
 msgid ""
 "@@image: 'figures/sword_config.png'; md5=4811d390ad124e63b4d7145fb3cba0ab"
 msgstr "sword_config.png"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/xiphos.xml:146(None)
+#: ../C/xiphos.xml:152(None)
 msgid ""
 "@@image: 'figures/sword_install.png'; md5=ac72af69d94af20a2f38c3be663ca51c"
 msgstr "sword_install.png"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: ../C/xiphos.xml:189(None)
+#: ../C/xiphos.xml:195(None)
 msgid ""
 "@@image: 'figures/sword_remove.png'; md5=a6ef5b13d854ff3ebf348523e729b2d2"
 msgstr "sword_remove.png"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
+#: ../C/xiphos.xml:15(None) ../C/search.xml:15(None)
+msgid ""
+"@@image: 'figures/interface_searchpane.png'; "
+"md5=9b02269f6a1a4aa3a2a627aaca52d66c"
+msgstr "interface_searchpane.png"
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
 #: ../C/xiphos.xml:214(None)
 msgid ""
 "@@image: 'figures/search_search.png'; md5=8c46acb73426be8ca481336b25d83659"
@@ -1044,6 +252,12 @@ msgstr "search_search.png"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
+#: ../C/xiphos.xml:16(None) ../C/studypad.xml:16(None)
+msgid "@@image: 'figures/studypad.png'; md5=e50d36fb2348bbb0156b9a4a6457fed0"
+msgstr "studypad.png"
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
 #: ../C/xiphos.xml:22(None)
 msgid "@@image: 'figures/personal.png'; md5=540ea58ba392455d42860ee20e84b56e"
 msgstr "personal.png"
@@ -1073,9 +287,939 @@ msgid "2009"
 msgstr "2009"
 
 #: ../C/xiphos.xml:63(holder) ../C/xiphos.xml:78(publishername)
+#: ../C/xiphos.xml:154(para) ../C/xiphos.xml:155(para)
 msgid "The Xiphos Team"
 msgstr "L'équipe de développement Xiphos"
 
+#: ../C/xiphos.xml:3(title) ../C/xiphos.xml:21(title) ../C/legal.xml:3(title)
+#: ../C/legal.xml:21(title)
+msgid "GNU General Public License"
+msgstr "Licence Publique Générale GNU"
+
+#: ../C/xiphos.xml:4(pubdate) ../C/xiphos.xml:19(releaseinfo)
+#: ../C/legal.xml:4(pubdate) ../C/legal.xml:19(releaseinfo)
+msgid "Version 2, June 1991"
+msgstr "Version 2, Juin 1991"
+
+#: ../C/xiphos.xml:6(year) ../C/legal.xml:6(year)
+msgid "1989, 1991"
+msgstr "1989, 1991"
+
+#: ../C/xiphos.xml:7(holder) ../C/legal.xml:7(holder)
+msgid "Free Software Foundation, Inc."
+msgstr "Free Software Foundation, Inc."
+
+#: ../C/xiphos.xml:12(street) ../C/legal.xml:12(street)
+msgid "51 Franklin Street, Fifth Floor"
+msgstr "51 Franklin Street, Fifth Floor"
+
+#: ../C/xiphos.xml:13(city) ../C/legal.xml:13(city)
+msgid "Boston"
+msgstr "Boston"
+
+#: ../C/xiphos.xml:13(state) ../C/legal.xml:13(state)
+msgid "MA"
+msgstr "MA"
+
+#: ../C/xiphos.xml:13(postcode) ../C/legal.xml:13(postcode)
+msgid "02110-1301"
+msgstr "02110-1301"
+
+#: ../C/xiphos.xml:14(country) ../C/legal.xml:14(country)
+msgid "USA"
+msgstr "États-Unis"
+
+#: ../C/xiphos.xml:11(address) ../C/legal.xml:11(address)
+msgid ""
+"Free Software Foundation, Inc. <placeholder-1/>, <placeholder-2/>, "
+"<placeholder-3/><placeholder-4/><placeholder-5/>"
+msgstr ""
+"Free Software Foundation, Inc. <placeholder-1/>, <placeholder-2/>, "
+"<placeholder-3/><placeholder-4/><placeholder-5/>"
+
+#: ../C/xiphos.xml:17(para) ../C/legal.xml:17(para)
+msgid ""
+"Everyone is permitted to copy and distribute verbatim copies of this license "
+"document, but changing it is not allowed."
+msgstr ""
+"Ceci est une traduction non officielle de la GNU General Public License en "
+"français. Elle n'a pas été publiée par la Free Software Foundation, et ne "
+"détermine pas les termes de distribution pour les logiciels qui utilisent la "
+"GNU GPL, seul le texte anglais original de la GNU GPL déterminent ces "
+"termes. Cependant, nous espérons que cette traduction aidera les "
+"francophones à mieux comprendre la GNU GPL. \n"
+"\n"
+"La copie et la distribution de copies exactes de ce document sont "
+"autorisées, mais aucune modification n'est permise."
+
+#: ../C/xiphos.xml:23(title) ../C/legal.xml:23(title)
+msgid "Preamble"
+msgstr "Préambule"
+
+#: ../C/xiphos.xml:24(para) ../C/legal.xml:24(para)
+msgid ""
+"The licenses for most software are designed to take away your freedom to "
+"share and change it. By contrast, the GNU General Public License is intended "
+"to guarantee your freedom to share and change free software - to make sure "
+"the software is free for all its users. This General Public License applies "
+"to most of the Free Software Foundation's software and to any other program "
+"whose authors commit to using it. (Some other Free Software Foundation "
+"software is covered by the GNU Library General Public License instead.) You "
+"can apply it to your programs, too."
+msgstr ""
+"Les licences de la plupart des logiciels sont conçues pour vous enlever "
+"toute liberté de les partager et de les modifier.\n"
+"A contrario, la Licence Publique Générale est destinée à garantir votre "
+"liberté de partager et de modifier les logiciels libres, et à assurer que "
+"ces logiciels soient libres pour tous leurs utilisateurs.\n"
+"La présente Licence Publique Générale s'applique à la plupart des logiciels "
+"de la Free Software Foundation, ainsi qu'à tout autre programme pour lequel "
+"ses auteurs s'engagent à l'utiliser.\n"
+"(Certains autres logiciels de la Free Software Foundation sont couverts par "
+"la GNU Lesser General Public License à la place.) Vous pouvez aussi "
+"l'appliquer aux programmes qui sont les vôtres."
+
+#: ../C/xiphos.xml:34(para) ../C/legal.xml:34(para)
+msgid ""
+"When we speak of free software, we are referring to freedom, not price. Our "
+"General Public Licenses are designed to make sure that you have the freedom "
+"to distribute copies of free software (and charge for this service if you "
+"wish), that you receive source code or can get it if you want it, that you "
+"can change the software or use pieces of it in new free programs; and that "
+"you know you can do these things."
+msgstr ""
+"Quand nous parlons de logiciels libres, nous parlons de liberté, non de "
+"prix.\n"
+"Nos licences publiques générales sont conçues pour vous donner l'assurance "
+"d'être libres de distribuer des copies des logiciels libres (et de facturer "
+"ce service, si vous le souhaitez), de recevoir le code source ou de pouvoir "
+"l'obtenir si vous le souhaitez, de pouvoir modifier les logiciels ou en "
+"utiliser des éléments dans de nouveaux programmes libres et de savoir que "
+"vous pouvez le faire. "
+
+#: ../C/xiphos.xml:41(para) ../C/legal.xml:41(para)
+msgid ""
+"To protect your rights, we need to make restrictions that forbid anyone to "
+"deny you these rights or to ask you to surrender the rights. These "
+"restrictions translate to certain responsibilities for you if you distribute "
+"copies of the software, or if you modify it."
+msgstr ""
+"Pour protéger vos droits, il nous est nécessaire d'imposer des limitations "
+"qui interdisent à quiconque de vous refuser ces droits ou de vous demander "
+"d'y renoncer.\n"
+"Certaines responsabilités vous incombent en raison de ces limitations si "
+"vous distribuez des copies de ces logiciels, ou si vous les modifiez."
+
+#: ../C/xiphos.xml:46(para) ../C/legal.xml:46(para)
+msgid ""
+"For example, if you distribute copies of such a program, whether gratis or "
+"for a fee, you must give the recipients all the rights that you have. You "
+"must make sure that they, too, receive or can get the source code. And you "
+"must show them these terms so they know their rights."
+msgstr ""
+"Par exemple, si vous distribuez des copies d'un tel programme, à titre "
+"gratuit ou contre une rémunération, vous devez accorder aux destinataires "
+"tous les droits dont vous disposez.\n"
+"Vous devez vous assurer qu'eux aussi reçoivent ou puissent disposer du code "
+"source.\n"
+"Et vous devez leur montrer les présentes conditions afin qu'ils aient "
+"connaissance de leurs droits."
+
+#: ../C/xiphos.xml:54(para) ../C/legal.xml:54(para)
+msgid "copyright the software, and"
+msgstr "(1) nous sommes titulaires des droits d'auteur du logiciel, et "
+
+#: ../C/xiphos.xml:57(para) ../C/legal.xml:57(para)
+msgid ""
+"offer you this license which gives you legal permission to copy, distribute "
+"and/or modify the software."
+msgstr ""
+"(2) nous vous délivrons cette licence, qui vous donne l'autorisation légale "
+"de copier, distribuer et/ou modifier le logiciel."
+
+#: ../C/xiphos.xml:51(para) ../C/legal.xml:51(para)
+msgid "We protect your rights with two steps: <placeholder-1/>"
+msgstr "Nous protégeons vos droits en deux étapes : <placeholder-1/>"
+
+#: ../C/xiphos.xml:63(para) ../C/legal.xml:63(para)
+msgid ""
+"Also, for each author's protection and ours, we want to make certain that "
+"everyone understands that there is no warranty for this free software. If "
+"the software is modified by someone else and passed on, we want its "
+"recipients to know that what they have is not the original, so that any "
+"problems introduced by others will not reflect on the original authors' "
+"reputations."
+msgstr ""
+"En outre, pour la protection de chaque auteur ainsi que la nôtre, nous "
+"voulons nous assurer que chacun comprenne que ce logiciel libre ne fait "
+"l'objet d'aucune garantie.\n"
+"Si le logiciel est modifié par quelqu'un d'autre puis transmis à des tiers, "
+"nous voulons que les destinataires soient mis au courant que ce qu'ils ont "
+"reçu n'est pas le logiciel d'origine, de sorte que tout problème introduit "
+"par d'autres ne puisse entacher la réputation de l'auteur originel."
+
+#: ../C/xiphos.xml:70(para) ../C/legal.xml:70(para)
+msgid ""
+"Finally, any free program is threatened constantly by software patents. We "
+"wish to avoid the danger that redistributors of a free program will "
+"individually obtain patent licenses, in effect making the program "
+"proprietary. To prevent this, we have made it clear that any patent must be "
+"licensed for everyone's free use or not licensed at all."
+msgstr ""
+"En définitive, un programme libre restera à la merci des brevets de "
+"logiciels.\n"
+"Nous souhaitons éviter le risque que les redistributeurs d'un programme "
+"libre fassent des demandes individuelles de licence de brevet, ceci ayant "
+"pour effet de rendre le programme propriétaire. \n"
+"Pour éviter cela, nous établissons clairement que toute licence de brevet "
+"doit être concédée de façon à ce que l'usage en soit libre pour tous ou bien "
+"qu'aucune licence ne soit concédée."
+
+#: ../C/xiphos.xml:76(para) ../C/legal.xml:76(para)
+msgid ""
+"The precise terms and conditions for copying, distribution and modification "
+"follow."
+msgstr ""
+"Les termes exacts et les conditions de copie, distribution et modification "
+"sont les suivants:"
+
+#: ../C/xiphos.xml:80(title) ../C/legal.xml:80(title)
+msgid "TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION"
+msgstr ""
+"Conditions de copie, distribution et modification de la Licence Publique "
+"Générale GNU."
+
+#: ../C/xiphos.xml:82(title) ../C/legal.xml:82(title)
+msgid "Section 0"
+msgstr "Article 0"
+
+#: ../C/xiphos.xml:83(para) ../C/legal.xml:83(para)
+msgid ""
+"This License applies to any program or other work which contains a notice "
+"placed by the copyright holder saying it may be distributed under the terms "
+"of this General Public License. The <quote>Program</quote>, below, refers to "
+"any such program or work, and a <quote>work based on the Program</quote> "
+"means either the Program or any derivative work under copyright law: that is "
+"to say, a work containing the Program or a portion of it, either verbatim or "
+"with modifications and/or translated into another language. (Hereinafter, "
+"translation is included without limitation in the term <quote>modification</"
+"quote>.) Each licensee is addressed as <quote>you</quote>."
+msgstr ""
+"La présente Licence s'applique à tout programme ou tout autre ouvrage "
+"contenant un avis, apposé par le titulaire des droits d'auteur, stipulant "
+"qu'il peut être distribué au titre des conditions de la présente Licence "
+"Publique Générale.\n"
+"Ci-après, le <quote>Programme</quote> désigne l'un quelconque de ces "
+"programmes ou ouvrages, et un <quote>ouvrage fondé sur le Programme</quote> "
+"désigne soit le Programme, soit un ouvrage qui en dérive au titre des lois "
+"sur le droit d'auteur : en d'autres termes, un ouvrage contenant le "
+"Programme ou une partie de ce dernier, soit à l'identique, soit avec des "
+"modifications et/ou traduit dans un autre langage.\n"
+"(Ci-après, le terme <quote>modification</quote> implique, sans s'y réduire, "
+"le terme traduction)\n"
+"Chaque concessionaire sera désigné par <quote>vous</quote>."
+
+#: ../C/xiphos.xml:94(para) ../C/legal.xml:94(para)
+msgid ""
+"Activities other than copying, distribution and modification are not covered "
+"by this License; they are outside its scope. The act of running the Program "
+"is not restricted, and the output from the Program is covered only if its "
+"contents constitute a work based on the Program (independent of having been "
+"made by running the Program). Whether that is true depends on what the "
+"Program does."
+msgstr ""
+"Les activités autres que la copie, la distribution et la modification ne "
+"sont pas couvertes par la présente Licence ; elles sont hors de son champ "
+"d'application.\n"
+"L'opération consistant à exécuter le Programme n'est soumise à aucune "
+"limitation et les sorties du programme ne sont couvertes que si leur contenu "
+"constitue un ouvrage fondé sur le Programme (indépendamment du fait qu'il "
+"ait été réalisé par l'exécution du Programme).\n"
+"La validité de ce qui précède dépend de ce que fait le Programme."
+
+#: ../C/xiphos.xml:101(title) ../C/legal.xml:101(title)
+msgid "Section 1"
+msgstr "Article 1"
+
+#: ../C/xiphos.xml:102(para) ../C/legal.xml:102(para)
+msgid ""
+"You may copy and distribute verbatim copies of the Program's source code as "
+"you receive it, in any medium, provided that you conspicuously and "
+"appropriately publish on each copy an appropriate copyright notice and "
+"disclaimer of warranty; keep intact all the notices that refer to this "
+"License and to the absence of any warranty; and give any other recipients of "
+"the Program a copy of this License along with the Program."
+msgstr ""
+"Vous pouvez copier et distribuer des copies à l'identique du code source du "
+"Programme tel que vous l'avez reçu, sur n'importe quel support, du moment "
+"que vous apposiez sur chaque copie, de manière ad hoc et parfaitement "
+"visible, l'avis de droit d'auteur adéquat et une exonération de garantie ; "
+"que vous gardiez intacts tous les avis faisant référence à la présente "
+"Licence et à l'absence de toute garantie ; et que vous fournissiez à tout "
+"destinataire du Programme autre que vous-même un exemplaire de la présente "
+"Licence en même temps que le Programme."
+
+#: ../C/xiphos.xml:109(para) ../C/legal.xml:109(para)
+msgid ""
+"You may charge a fee for the physical act of transferring a copy, and you "
+"may at your option offer warranty protection in exchange for a fee."
+msgstr ""
+"Vous pouvez faire payer l'acte physique de transmission d'une copie, et vous "
+"pouvez, à votre discrétion, proposer une garantie contre rémunération."
+
+#: ../C/xiphos.xml:113(title) ../C/legal.xml:113(title)
+msgid "Section 2"
+msgstr "Article 2"
+
+#: ../C/xiphos.xml:121(para) ../C/legal.xml:121(para)
+msgid ""
+"You must cause the modified files to carry prominent notices stating that "
+"you changed the files and the date of any change."
+msgstr ""
+"a) Vous devez munir les fichiers modifiés d'avis bien visibles stipulants "
+"que vous avez modifié ces fichiers, ainsi que la date de chaque "
+"modification ;"
+
+#: ../C/xiphos.xml:125(para) ../C/legal.xml:125(para)
+msgid ""
+"You must cause any work that you distribute or publish, that in whole or in "
+"part contains or is derived from the Program or any part thereof, to be "
+"licensed as a whole at no charge to all third parties under the terms of "
+"this License."
+msgstr ""
+"b) Vous devez prendre les dispositions nécessaires pour que tout ouvrage que "
+"vous distribuez ou publiez, et qui, en totalité ou en partie, contient ou "
+"est fondé sur le Programme - ou une partie quelconque de ce dernier - soit "
+"concédé comme un tout, à titre gratuit, à n'importe quel tiers, au titre des "
+"conditions de la présente Licence."
+
+#: ../C/xiphos.xml:131(para) ../C/legal.xml:131(para)
+msgid ""
+"If the modified program normally reads commands interactively when run, you "
+"must cause it, when started running for such interactive use in the most "
+"ordinary way, to print or display an announcement including an appropriate "
+"copyright notice and a notice that there is no warranty (or else, saying "
+"that you provide a warranty) and that users may redistribute the program "
+"under these conditions, and telling the user how to view a copy of this "
+"License. (Exception: If the Program itself is interactive but does not "
+"normally print such an announcement, your work based on the Program is not "
+"required to print an announcement.)"
+msgstr ""
+"c) Si le programme modifié lit habituellement des instructions de façon "
+"interactive lorsqu'on l'exécute, vous devez, quand il commence son exécution "
+"pour ladite utilisation interactive de la manière la plus usuelle, faire en "
+"sorte qu'il imprime ou affiche une annonce comprenant un avis de droit "
+"d'auteur ad hoc, et un avis stipulant qu'il n'y a pas de garantie (ou bien "
+"indiquant que c'est vous qui fournissez la garantie), et que les "
+"utilisateurs peuvent redistribuer le programme en respectant les présentes "
+"obligations, et expliquant à l'utilisateur comment voir une copie de la "
+"présente Licence.\n"
+"Exception : si le Programme est lui-même interactif mais n'imprime pas "
+"habituellement une telle annonce, votre ouvrage fondé sur le Programme n'est "
+"pas obligé d'imprimer une annonce)."
+
+#: ../C/xiphos.xml:114(para) ../C/legal.xml:114(para)
+msgid ""
+"You may modify your copy or copies of the Program or any portion of it, thus "
+"forming a work based on the Program, and copy and distribute such "
+"modifications or work under the terms of <link linkend=\"gpl-2-1\">Section "
+"1</link> above, provided that you also meet all of these conditions: "
+"<placeholder-1/>"
+msgstr ""
+"Vous pouvez modifier votre copie ou des copies du Programme ou n'importe "
+"quelle partie de celui-ci, créant ainsi un ouvrage fondé sur le Programme, "
+"et copier et distribuer de telles modifications ou ouvrage selon les termes "
+"de l'<link linkend=\"gpl-2-1\">Article 1</link> ci-dessus, à condition de "
+"vous conformer également à chacune des obligations suivantes : <placeholder-"
+"1/>"
+
+#: ../C/xiphos.xml:144(para) ../C/legal.xml:144(para)
+msgid ""
+"These requirements apply to the modified work as a whole. If identifiable "
+"sections of that work are not derived from the Program, and can be "
+"reasonably considered independent and separate works in themselves, then "
+"this License, and its terms, do not apply to those sections when you "
+"distribute them as separate works. But when you distribute the same sections "
+"as part of a whole which is a work based on the Program, the distribution of "
+"the whole must be on the terms of this License, whose permissions for other "
+"licensees extend to the entire whole, and thus to each and every part "
+"regardless of who wrote it."
+msgstr ""
+"Ces obligations s'appliquent à l'ouvrage modifié pris comme un tout.\n"
+"Si des éléments identifiables de cet ouvrage ne sont pas fondés sur le "
+"Programme et peuvent raisonnablement être considérés comme des ouvrages "
+"indépendants distincts en eux mêmes, alors la présente Licence et ses "
+"conditions ne s'appliquent pas à ces éléments lorsque vous les distribuez en "
+"tant qu'ouvrages distincts.\n"
+"Mais lorsque vous distribuez ces mêmes éléments comme partie d'un tout, "
+"lequel constitue un ouvrage fondé sur le Programme, la distribution de ce "
+"tout doit être soumise aux conditions de la présente Licence, et les "
+"autorisations qu'elle octroie aux autres concessionnaires s'étendent à "
+"l'ensemble de l'ouvrage et par conséquent à chaque et toute partie "
+"indifférement de qui l'a écrite. "
+
+#: ../C/xiphos.xml:153(para) ../C/legal.xml:153(para)
+msgid ""
+"Thus, it is not the intent of this section to claim rights or contest your "
+"rights to work written entirely by you; rather, the intent is to exercise "
+"the right to control the distribution of derivative or collective works "
+"based on the Program."
+msgstr ""
+"Par conséquent, l'objet du présent article n'est pas de revendiquer des "
+"droits ou de contester vos droits sur un ouvrage entièrement écrit par vous; "
+"son objet est plutôt d'exercer le droit de contrôler la distribution "
+"d'ouvrages dérivés ou d'ouvrages collectifs fondés sur le Programme. "
+
+#: ../C/xiphos.xml:157(para) ../C/legal.xml:157(para)
+msgid ""
+"In addition, mere aggregation of another work not based on the Program with "
+"the Program (or with a work based on the Program) on a volume of a storage "
+"or distribution medium does not bring the other work under the scope of this "
+"License."
+msgstr ""
+"De plus, la simple proximité du Programme avec un autre ouvrage qui n'est "
+"pas fondé sur le Programme (ou un ouvrage fondé sur le Programme) sur une "
+"partition d'un espace de stockage ou un support de distribution ne place pas "
+"cet autre ouvrage dans le champ d'application de la présente Licence. "
+
+#: ../C/xiphos.xml:162(title) ../C/legal.xml:162(title)
+msgid "Section 3"
+msgstr "Article 3"
+
+#: ../C/xiphos.xml:169(para) ../C/legal.xml:169(para)
+msgid ""
+"Accompany it with the complete corresponding machine-readable source code, "
+"which must be distributed under the terms of Sections 1 and 2 above on a "
+"medium customarily used for software interchange; or,"
+msgstr ""
+"a) L'accompagner de l'intégralité du code source correspondant, sous une "
+"forme lisible par un ordinateur, lequel doit être distribué au titre des "
+"termes des Articles 1 et 2 ci-dessus, sur un support habituellement utilisé "
+"pour l'échange de logiciels; ou,"
+
+#: ../C/xiphos.xml:174(para) ../C/legal.xml:174(para)
+msgid ""
+"Accompany it with a written offer, valid for at least three years, to give "
+"any third party, for a charge no more than your cost of physically "
+"performing source distribution, a complete machine-readable copy of the "
+"corresponding source code, to be distributed under the terms of Sections 1 "
+"and 2 above on a medium customarily used for software interchange; or,"
+msgstr ""
+"b) L'accompagner d'une proposition écrite, valable pendant au moins trois "
+"ans, de fournir à tout tiers, à un tarif qui ne soit pas supérieur à ce que "
+"vous coûte l'acte physique de réaliser une distribution source, une copie "
+"intégrale du code source correspondant sous une forme lisible par un "
+"ordinateur, qui sera distribuée au titre des termes des Articles 1 et 2 ci-"
+"dessus, sur un support habituellement utilisé pour l'échange de logiciels; "
+"ou, "
+
+#: ../C/xiphos.xml:181(para) ../C/legal.xml:181(para)
+msgid ""
+"Accompany it with the information you received as to the offer to distribute "
+"corresponding source code. (This alternative is allowed only for "
+"noncommercial distribution and only if you received the program in object "
+"code or executable form with such an offer, in accord with Subsection b "
+"above.)"
+msgstr ""
+"c) L'accompagner des informations reçues par vous concernant la proposition "
+"de distribution du code source correspondant. (Cette solution n'est "
+"autorisée que dans le cas d'une distribution non commerciale et seulement si "
+"vous avez reçu le programme sous forme de code objet ou d'exécutable "
+"accompagné d'une telle proposition - en conformité avec le sous-Article b ci-"
+"dessus.) "
+
+#: ../C/xiphos.xml:163(para) ../C/legal.xml:163(para)
+msgid ""
+"You may copy and distribute the Program (or a work based on it, under <link "
+"linkend=\"gpl-2-2\">Section 2</link> in object code or executable form under "
+"the terms of <link linkend=\"gpl-2-1\">Sections 1</link> and <link linkend="
+"\"gpl-2-2\">2</link> above provided that you also do one of the following: "
+"<placeholder-1/>"
+msgstr ""
+"Vous pouvez copier et distribuer le Programme (ou un ouvrage fondé sur lui, "
+"selon l'<link linkend=\"gpl-2-2\">Article 2</link>) sous forme de code objet "
+"ou d'exécutable, selon les termes des <link linkend=\"gpl-2-1\">Articles </"
+"link>1 et <link linkend=\"gpl-2-2\">2</link> ci-dessus, à condition que vous "
+"accomplissiez l'un des points suivants :"
+
+#: ../C/xiphos.xml:189(para) ../C/legal.xml:189(para)
+msgid ""
+"The source code for a work means the preferred form of the work for making "
+"modifications to it. For an executable work, complete source code means all "
+"the source code for all modules it contains, plus any associated interface "
+"definition files, plus the scripts used to control compilation and "
+"installation of the executable. However, as a special exception, the source "
+"code distributed need not include anything that is normally distributed (in "
+"either source or binary form) with the major components (compiler, kernel, "
+"and so on) of the operating system on which the executable runs, unless that "
+"component itself accompanies the executable."
+msgstr ""
+"Le code source d'un ouvrage désigne la forme favorite pour travailler à des "
+"modifications de cet ouvrage. Pour un ouvrage exécutable, le code source "
+"intégral désigne la totalité du code source de la totalité des modules qu'il "
+"contient, ainsi que les éventuels fichiers de définition des interfaces qui "
+"y sont associés, ainsi que les scripts utilisés pour contrôler la "
+"compilation et l'installation de l'exécutable. Cependant, par exception "
+"spéciale, le code source distribué n'est pas censé inclure quoi que ce soit "
+"de normalement distribué (que ce soit sous forme source ou binaire) avec les "
+"composants principaux (compilateur, noyau, et autre) du système "
+"d'exploitation sur lequel l'exécutable tourne, à moins que ce composant lui-"
+"même n'accompagne l'exécutable. "
+
+#: ../C/xiphos.xml:197(para) ../C/legal.xml:197(para)
+msgid ""
+"If distribution of executable or object code is made by offering access to "
+"copy from a designated place, then offering equivalent access to copy the "
+"source code from the same place counts as distribution of the source code, "
+"even though third parties are not compelled to copy the source along with "
+"the object code."
+msgstr ""
+" Si distribuer un exécutable ou un code objet consiste à offrir un accès "
+"permettant leur copie depuis un endroit particulier, alors l'offre d'un "
+"accès équivalent pour copier le code source depuis le même endroit compte "
+"comme une distribution du code source - même si les tiers ne sont pas "
+"contraints de copier le source en même temps que le code objet."
+
+#: ../C/xiphos.xml:203(title) ../C/legal.xml:203(title)
+msgid "Section 4"
+msgstr "Article 4"
+
+#: ../C/xiphos.xml:204(para) ../C/legal.xml:204(para)
+msgid ""
+"You may not copy, modify, sublicense, or distribute the Program except as "
+"expressly provided under this License. Any attempt otherwise to copy, "
+"modify, sublicense or distribute the Program is void, and will automatically "
+"terminate your rights under this License. However, parties who have received "
+"copies, or rights, from you under this License will not have their licenses "
+"terminated so long as such parties remain in full compliance."
+msgstr ""
+"Vous ne pouvez copier, modifier, concéder en sous-licence, ou distribuer le "
+"Programme, sauf tel qu'expressément prévu par la présente Licence. Toute "
+"tentative de copier, modifier, concéder en sous-licence, ou distribuer le "
+"Programme d'une autre manière est réputée non valable, et met immédiatement "
+"fin à vos droits au titre de la présente Licence. Toutefois, les tiers ayant "
+"reçu de vous des copies, ou des droits, au titre de la présente Licence ne "
+"verront pas leurs autorisations résiliées aussi longtemps que ledits tiers "
+"se conforment pleinement à elle. "
+
+#: ../C/xiphos.xml:211(title) ../C/legal.xml:211(title)
+msgid "Section 5"
+msgstr "Article 5"
+
+#: ../C/xiphos.xml:212(para) ../C/legal.xml:212(para)
+msgid ""
+"You are not required to accept this License, since you have not signed it. "
+"However, nothing else grants you permission to modify or distribute the "
+"Program or its derivative works. These actions are prohibited by law if you "
+"do not accept this License. Therefore, by modifying or distributing the "
+"Program (or any work based on the Program), you indicate your acceptance of "
+"this License to do so, and all its terms and conditions for copying, "
+"distributing or modifying the Program or works based on it."
+msgstr ""
+"Vous n'êtes pas obligé d'accepter la présente Licence étant donné que vous "
+"ne l'avez pas signée. Cependant, rien d'autre ne vous accorde l'autorisation "
+"de modifier ou distribuer le Programme ou les ouvrages fondés sur lui. Ces "
+"actions sont interdites par la loi si vous n'acceptez pas la présente "
+"Licence. En conséquence, en modifiant ou distribuant le Programme (ou un "
+"ouvrage quelconque fondé sur le Programme), vous signifiez votre acceptation "
+"de la présente Licence en le faisant, et de toutes ses conditions concernant "
+"la copie, la distribution ou la modification du Programme ou d'ouvrages "
+"fondés sur lui."
+
+#: ../C/xiphos.xml:220(title) ../C/legal.xml:220(title)
+msgid "Section 6"
+msgstr "Article 6"
+
+#: ../C/xiphos.xml:221(para) ../C/legal.xml:221(para)
+msgid ""
+"Each time you redistribute the Program (or any work based on the Program), "
+"the recipient automatically receives a license from the original licensor to "
+"copy, distribute or modify the Program subject to these terms and "
+"conditions. You may not impose any further restrictions on the recipients' "
+"exercise of the rights granted herein. You are not responsible for enforcing "
+"compliance by third parties to this License."
+msgstr ""
+"Chaque fois que vous redistribuez le Programme (ou n'importe quel ouvrage "
+"fondé sur le Programme), une licence est automatiquement concédée au "
+"destinataire par le concédant originel de la licence, l'autorisant à copier, "
+"distribuer ou modifier le Programme, sous réserve des présentes conditions. "
+"Vous ne pouvez imposer une quelconque limitation supplémentaire à l'exercice "
+"des droits octroyés au titre des présentes par le destinataire. Vous n'avez "
+"pas la responsabilité d'imposer le respect de la présente Licence à des "
+"tiers."
+
+#: ../C/xiphos.xml:228(title) ../C/legal.xml:228(title)
+msgid "Section 7"
+msgstr "Article 7"
+
+#: ../C/xiphos.xml:229(para) ../C/legal.xml:229(para)
+msgid ""
+"If, as a consequence of a court judgment or allegation of patent "
+"infringement or for any other reason (not limited to patent issues), "
+"conditions are imposed on you (whether by court order, agreement or "
+"otherwise) that contradict the conditions of this License, they do not "
+"excuse you from the conditions of this License. If you cannot distribute so "
+"as to satisfy simultaneously your obligations under this License and any "
+"other pertinent obligations, then as a consequence you may not distribute "
+"the Program at all. For example, if a patent license would not permit "
+"royalty-free redistribution of the Program by all those who receive copies "
+"directly or indirectly through you, then the only way you could satisfy both "
+"it and this License would be to refrain entirely from distribution of the "
+"Program."
+msgstr ""
+"Si, conséquement à une décision de justice ou l'allégation d'une "
+"transgression de brevet ou pour toute autre raison (non limitée à un "
+"probleme de brevet), des obligations vous sont imposées (que ce soit par "
+"jugement, conciliation ou autre) qui contredisent les conditions de la "
+"présente Licence, elles ne vous excusent pas des conditions de la présente "
+"Licence. Si vous ne pouvez distribuer de manière à satisfaire simultanément "
+"vos obligations au titre de la présente Licence et toute autre obligation "
+"pertinente, alors il en découle que vous ne pouvez pas du tout distribuer le "
+"Programme. Par exemple, si une licence de brevet ne permettait pas une "
+"redistribution sans redevance du Programme par tous ceux qui reçoivent une "
+"copie directement ou indirectement par votre intermédiaire, alors la seule "
+"façon pour vous de satisfaire à la fois à la licence du brevet et à la "
+"présente Licence serait de vous abstenir totalement de toute distribution du "
+"Programme."
+
+#: ../C/xiphos.xml:239(para) ../C/legal.xml:239(para)
+msgid ""
+"If any portion of this section is held invalid or unenforceable under any "
+"particular circumstance, the balance of the section is intended to apply and "
+"the section as a whole is intended to apply in other circumstances."
+msgstr ""
+"Si une partie quelconque de cet article est tenue pour nulle ou inopposable "
+"dans une circonstance particulière quelconque, l'intention est que le reste "
+"de l'article s'applique. La totalité de la section s'appliquera dans toutes "
+"les autres circonstances."
+
+#: ../C/xiphos.xml:243(para) ../C/legal.xml:243(para)
+msgid ""
+"It is not the purpose of this section to induce you to infringe any patents "
+"or other property right claims or to contest validity of any such claims; "
+"this section has the sole purpose of protecting the integrity of the free "
+"software distribution system, which is implemented by public license "
+"practices. Many people have made generous contributions to the wide range of "
+"software distributed through that system in reliance on consistent "
+"application of that system; it is up to the author/donor to decide if he or "
+"she is willing to distribute software through any other system and a "
+"licensee cannot impose that choice."
+msgstr ""
+"Cet article n'a pas pour but de vous induire à transgresser un quelconque "
+"brevet ou d'autres revendications à un droit de propriété ou à contester la "
+"validité de la moindre de ces revendications ; cet article a pour seul "
+"objectif de protéger l'intégrité du système de distribution du logiciel "
+"libre, qui est mis en oeuvre par la pratique des licenses publiques. De "
+"nombreuses personnes ont fait de généreuses contributions au large spectre "
+"de logiciels distribués par ce système en se fiant à l'application cohérente "
+"de ce système ; il appartient à chaque auteur/donateur de décider si il ou "
+"elle veut distribuer du logiciel par l'intermédiaire d'un quelconque autre "
+"système et un concessionaire ne peut imposer ce choix. "
+
+#: ../C/xiphos.xml:251(para) ../C/legal.xml:251(para)
+msgid ""
+"This section is intended to make thoroughly clear what is believed to be a "
+"consequence of the rest of this License."
+msgstr ""
+"Cet article a pour but de rendre totalement limpide ce que l'on pense être "
+"une conséquence du reste de la présente Licence."
+
+#: ../C/xiphos.xml:255(title) ../C/legal.xml:255(title)
+msgid "Section 8"
+msgstr "Article 8"
+
+#: ../C/xiphos.xml:256(para) ../C/legal.xml:256(para)
+msgid ""
+"If the distribution and/or use of the Program is restricted in certain "
+"countries either by patents or by copyrighted interfaces, the original "
+"copyright holder who places the Program under this License may add an "
+"explicit geographical distribution limitation excluding those countries, so "
+"that distribution is permitted only in or among countries not thus excluded. "
+"In such case, this License incorporates the limitation as if written in the "
+"body of this License."
+msgstr ""
+"Si la distribution et/ou l'utilisation du Programme est limitée dans "
+"certains pays que ce soit par des brevets ou par des interfaces soumises au "
+"droit d'auteur, le titulaire originel des droits d'auteur qui décide de "
+"couvrir le Programme par la présente Licence peut ajouter une limitation "
+"géographique de distribution explicite qui exclue ces pays afin que la "
+"distribution soit permise seulement dans ou entre les pays qui ne sont pas "
+"ainsi exclus. Dans ce cas, la présente Licence incorpore la limitation comme "
+"si elle était écrite dans le corps de la présente Licence. "
+
+#: ../C/xiphos.xml:263(title) ../C/legal.xml:263(title)
+msgid "Section 9"
+msgstr "Article 9"
+
+#: ../C/xiphos.xml:264(para) ../C/legal.xml:264(para)
+msgid ""
+"The Free Software Foundation may publish revised and/or new versions of the "
+"General Public License from time to time. Such new versions will be similar "
+"in spirit to the present version, but may differ in detail to address new "
+"problems or concerns."
+msgstr ""
+"La Free Software Foundation peut, de temps à autre, publier des versions "
+"révisées et/ou nouvelles de la Licence Publique Générale. De telles "
+"nouvelles versions seront similaires à la présente version dans l'esprit "
+"mais pourront différer dans le détail pour prendre en compte de nouvelles "
+"problématiques ou inquiétudes. "
+
+#: ../C/xiphos.xml:268(para) ../C/legal.xml:268(para)
+msgid ""
+"Each version is given a distinguishing version number. If the Program "
+"specifies a version number of this License which applies to it and "
+"<quote>any later version</quote>, you have the option of following the terms "
+"and conditions either of that version or of any later version published by "
+"the Free Software Foundation. If the Program does not specify a version "
+"number of this License, you may choose any version ever published by the "
+"Free Software Foundation."
+msgstr ""
+"Chaque version possède un numéro de version la distinguant. Si le Programme "
+"précise le numéro de version de la présente Licence qui s'y applique et "
+"\"une version ultérieure quelconque\", vous avez le choix de suivre les "
+"conditions de la présente version ou de toute autre version ultérieure "
+"publiée par la Free Software Foundation. Si le Programme ne spécifie aucun "
+"numéro de version de la présente Licence, vous pouvez choisir une version "
+"quelconque publiée par la Free Software Foundation à quelque moment que ce "
+"soit."
+
+#: ../C/xiphos.xml:275(title) ../C/legal.xml:275(title)
+msgid "Section 10"
+msgstr "Article 10"
+
+#: ../C/xiphos.xml:276(para) ../C/legal.xml:276(para)
+msgid ""
+"If you wish to incorporate parts of the Program into other free programs "
+"whose distribution conditions are different, write to the author to ask for "
+"permission. For software which is copyrighted by the Free Software "
+"Foundation, write to the Free Software Foundation; we sometimes make "
+"exceptions for this. Our decision will be guided by the two goals of "
+"preserving the free status of all derivatives of our free software and of "
+"promoting the sharing and reuse of software generally."
+msgstr ""
+"Si vous souhaitez incorporer des parties du Programme dans d'autres "
+"programmes libres dont les conditions de distribution sont différentes, "
+"écrivez à l'auteur pour lui en demander l'autorisation. Pour les logiciels "
+"dont la Free Software Foundation est titulaire des droits d'auteur, écrivez "
+"à la Free Software Foundation ; nous faisons parfois des exceptions dans ce "
+"sens. Notre décision sera guidée par le double objectif de préserver le "
+"statut libre de tous les dérivés de nos logiciels libres et de promouvoir le "
+"partage et la réutilisation des logiciels en général. "
+
+#: ../C/xiphos.xml:283(title) ../C/legal.xml:283(title)
+msgid "NO WARRANTY Section 11"
+msgstr "ABSENCE DE GARANTIE Article 11"
+
+#: ../C/xiphos.xml:284(para) ../C/legal.xml:284(para)
+msgid ""
+"BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE "
+"PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE "
+"STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE "
+"PROGRAM <quote>AS IS</quote> WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED "
+"OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF "
+"MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO "
+"THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM "
+"PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR "
+"CORRECTION."
+msgstr ""
+"COMME LA LICENCE DU PROGRAMME EST CONCEDEE A TITRE GRATUIT, AUCUNE GARANTIE "
+"NE S'APPLIQUE AU PROGRAMME, DANS LES LIMITES AUTORISEES PAR LA LOI "
+"APPLICABLE. SAUF MENTION CONTRAIRE ECRITE, LES TITULAIRES DU DROIT D'AUTEUR "
+"ET/OU LES AUTRES PARTIES FOURNISSENT LE PROGRAMME \"EN L'ETAT\", SANS AUCUNE "
+"GARANTIE DE QUELQUE NATURE QUE CE SOIT, EXPRESSE OU IMPLICITE, Y COMPRIS, "
+"MAIS SANS Y ETRE LIMITE, LES GARANTIES IMPLICITES DE COMMERCIABILITE ET DE "
+"LA CONFORMITE A UNE UTILISATION PARTICULIERE. VOUS ASSUMEZ LA TOTALITE DES "
+"RISQUES LIES A LA QUALITE ET AUX PERFORMANCES DU PROGRAMME. SI LE PROGRAMME "
+"SE REVELAIT DEFECTUEUX, LE COUT DE L'ENTRETIEN, DES REPARATIONS OU DES "
+"CORRECTIONS NECESSAIRES VOUS INCOMBENT INTEGRALEMENT."
+
+#: ../C/xiphos.xml:292(title) ../C/legal.xml:292(title)
+msgid "Section 12"
+msgstr "Article 12"
+
+#: ../C/xiphos.xml:293(para) ../C/legal.xml:293(para)
+msgid ""
+"IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL "
+"ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE "
+"THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY "
+"GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE "
+"OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA "
+"OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD "
+"PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), "
+"EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF "
+"SUCH DAMAGES."
+msgstr ""
+"EN AUCUN CAS, SAUF LORSQUE LA LOI APPLICABLE OU UNE CONVENTION ECRITE "
+"L'EXIGE, UN TITULAIRE DE DROIT D'AUTEUR QUEL QU'IL SOIT, OU TOUTE PARTIE QUI "
+"POURRAIT MODIFIER ET/OU REDISTRIBUER LE PROGRAMME COMME PERMIS CI-DESSUS, NE "
+"POURRAIT ETRE TENU POUR RESPONSABLE A VOTRE EGARD DES DOMMAGES, INCLUANT LES "
+"DOMMAGES GENERIQUES, SPECIFIQUES, SECONDAIRES OU CONSECUTIFS, RESULTANT DE "
+"L'UTILISATION OU DE L'INCAPACITE D'UTILISER LE PROGRAMME (Y COMPRIS, MAIS "
+"SANS Y ETRE LIMITE, LA PERTE DE DONNEES, OU LE FAIT QUE DES DONNEES SOIENT "
+"RENDUES IMPRECISES, OU LES PERTES EPROUVEES PAR VOUS OU PAR DES TIERS, OU LE "
+"FAIT QUE LE PROGRAMME ECHOUE A INTEROPERER AVEC UN AUTRE PROGRAMME QUEL "
+"QU'IL SOIT) MEME SI LE DIT TITULAIRE DU DROIT D'AUTEUR OU LE PARTIE "
+"CONCERNEE A ETE AVERTI DE L'EVENTUALITE DE TELS DOMMAGES. "
+
+#: ../C/xiphos.xml:301(para) ../C/legal.xml:301(para)
+msgid "END OF TERMS AND CONDITIONS"
+msgstr "FIN DES CONDITIONS"
+
+#: ../C/xiphos.xml:305(title) ../C/legal.xml:305(title)
+msgid "How to Apply These Terms to Your New Programs"
+msgstr "Comment appliquer ces conditions à vos nouveaux programmes"
+
+#: ../C/xiphos.xml:306(para) ../C/legal.xml:306(para)
+msgid ""
+"If you develop a new program, and you want it to be of the greatest possible "
+"use to the public, the best way to achieve this is to make it free software "
+"which everyone can redistribute and change under these terms."
+msgstr ""
+"Si vous développez un nouveau programme, et si vous voulez qu'il soit de la "
+"plus grande utilité possible pour le public, le meilleur moyen d'y parvenir "
+"est d'en faire un logiciel libre que chacun peut redistribuer et modifier au "
+"titre des présentes conditions."
+
+#: ../C/xiphos.xml:310(para) ../C/legal.xml:310(para)
+msgid ""
+"To do so, attach the following notices to the program. It is safest to "
+"attach them to the start of each source file to most effectively convey the "
+"exclusion of warranty; and each file should have at least the "
+"<quote>copyright</quote> line and a pointer to where the full notice is "
+"found."
+msgstr ""
+"Pour ce faire, munissez le programme des avis qui suivent. Le plus sûr est "
+"de les ajouter au début de chaque fichier source pour véhiculer le plus "
+"efficacement possible l'absence de toute garantie ; chaque fichier devrait "
+"aussi contenir au moins la ligne <quote>copyright</quote> et une indication "
+"de l'endroit où se trouve l'avis complet. "
+
+#: ../C/xiphos.xml:315(para) ../C/legal.xml:315(para)
+msgid ""
+"&lt;one line to give the program's name and a brief idea of what it does."
+"&gt; Copyright (C) &lt;year&gt; &lt;name of author&gt;"
+msgstr ""
+"[Une ligne donnant le nom du programme et une courte idée de ce qu'il "
+"fait.] \n"
+"Copyright (C) [année] [nom de l'auteur] "
+
+#: ../C/xiphos.xml:318(para) ../C/legal.xml:318(para)
+msgid ""
+"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."
+msgstr ""
+"Ce programme est un logiciel libre ; vous pouvez le redistribuer et/ou le "
+"modifier au titre des clauses de la Licence Publique Générale GNU, telle que "
+"publiée par la Free Software Foundation ; soit la version 2 de la Licence, "
+"ou (à votre discrétion) une version ultérieure quelconque. "
+
+#: ../C/xiphos.xml:323(para) ../C/legal.xml:323(para)
+msgid ""
+"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."
+msgstr ""
+"Ce programme est distribué dans l'espoir qu'il sera utile, mais SANS AUCUNE "
+"GARANTIE ; sans même une garantie implicite de COMMERCIABILITE ou DE "
+"CONFORMITE A UNE UTILISATION PARTICULIERE. Voir la Licence Publique Générale "
+"GNU pour plus de détails."
+
+#: ../C/xiphos.xml:328(para) ../C/legal.xml:328(para)
+msgid ""
+"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., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA"
+msgstr ""
+"Vous devriez avoir reçu un exemplaire de la Licence Publique Générale GNU "
+"avec ce programme ; si ce n'est pas le cas, écrivez à la Free Software "
+"Foundation Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
+
+#: ../C/xiphos.xml:332(para) ../C/legal.xml:332(para)
+msgid ""
+"Also add information on how to contact you by electronic and paper mail."
+msgstr ""
+"Ajoutez aussi des informations sur la manière de vous contacter par courrier "
+"électronique et courrier postal."
+
+#: ../C/xiphos.xml:334(para) ../C/legal.xml:334(para)
+msgid ""
+"If the program is interactive, make it output a short notice like this when "
+"it starts in an interactive mode:"
+msgstr ""
+"Si le programme est interactif, faites en sorte qu'il affiche un court avis "
+"tel que celui-ci lorsqu'il démarre en mode interactif : "
+
+#: ../C/xiphos.xml:337(para) ../C/legal.xml:337(para)
+msgid ""
+"Gnomovision version 69, Copyright (C) year name of author Gnomovision comes "
+"with ABSOLUTELY NO WARRANTY; for details type <quote>show w</quote>. This is "
+"free software, and you are welcome to redistribute it under certain "
+"conditions; type <quote>show c</quote> for details."
+msgstr ""
+"Gnomovision version 69, Copyright (C) année nom de l'auteur Gnomovision "
+"n'est accompagné d'ABSOLUMENT AUCUNE GARANTIE ; pour plus de détails tapez "
+"<quote>show w</quote>. Ceci est un logiciel libre et vous êtes invité à le "
+"redistribuer en respectant certaines obligations ; pour plus de détails "
+"tapez <quote>show c</quote>."
+
+#: ../C/xiphos.xml:342(para) ../C/legal.xml:342(para)
+msgid ""
+"The hypothetical commands <quote>show w</quote> and <quote>show c</quote> "
+"should show the appropriate parts of the General Public License. Of course, "
+"the commands you use may be called something other than <quote>show w</"
+"quote> and <quote>show c</quote>; they could even be mouse-clicks or menu "
+"items--whatever suits your program."
+msgstr ""
+"Les instructions hypothétiques <quote>show w</quote> et <quote>show c</"
+"quote> sont supposées montrer les parties ad hoc de la Licence Publique "
+"Générale. Bien entendu, les instructions que vous utilisez peuvent porter "
+"d'autres noms que <quote>show w</quote> et <quote>show c</quote> ; elles "
+"peuvent même être des clics de souris ou des éléments d'un menu ou tout ce "
+"qui convient à votre programme."
+
+#: ../C/xiphos.xml:347(para) ../C/legal.xml:347(para)
+msgid ""
+"You should also get your employer (if you work as a programmer) or your "
+"school, if any, to sign a <quote>copyright disclaimer</quote> for the "
+"program, if necessary. Here is a sample; alter the names:"
+msgstr ""
+"Vous devriez aussi obtenir de votre employeur (si vous travaillez en tant "
+"que développeur) ou de votre école, si c'est le cas, qu'il (ou elle) signe "
+"une <quote>renonciation aux droits d'auteur</quote> concernant le programme, "
+"si nécessaire. Voici un exemple (changez les noms) : "
+
+#: ../C/xiphos.xml:351(para) ../C/legal.xml:351(para)
+msgid ""
+"Yoyodyne, Inc., hereby disclaims all copyright interest in the program "
+"<quote>Gnomovision</quote> (which makes passes at compilers) written by "
+"James Hacker."
+msgstr ""
+"Yoyodyne, Inc., déclare par la présente renoncer à toute prétention sur les "
+"droits d'auteur du programme <quote>Gnomovision</quote> (qui fait des "
+"avances aux compilateurs) écrit par James Hacker."
+
+#: ../C/xiphos.xml:354(para) ../C/legal.xml:354(para)
+msgid "&lt;signature of Ty Coon&gt;, 1 April 1989 Ty Coon, President of Vice"
+msgstr "[signature de Ty Coon], 1er avril 1989 Ty Coon, Président du Vice"
+
+#: ../C/xiphos.xml:357(para) ../C/legal.xml:357(para)
+msgid ""
+"This General Public License does not permit incorporating your program into "
+"proprietary programs. If your program is a subroutine library, you may "
+"consider it more useful to permit linking proprietary applications with the "
+"library. If this is what you want to do, use the GNU Library General Public "
+"License instead of this License."
+msgstr ""
+"La présente Licence Publique Générale n'autorise pas l'incorporation de "
+"votre programme dans des programmes propriétaires. Si votre programme est "
+"une bibliothèque de sous-programmes, vous pouvez considérer plus utile "
+"d'autoriser l'édition de liens d'applications propriétaires avec la "
+"bibliothèque. Si c'est ce que vous voulez faire, utilisez la GNU Lesser "
+"General Public License au lieu de la présente Licence. "
+
 #: ../C/xiphos.xml:88(firstname)
 msgid "Andy"
 msgstr "Andy"
@@ -1116,409 +1260,42 @@ msgstr "Matthew"
 msgid "Talbert"
 msgstr "Talbert"
 
-#: ../C/xiphos.xml:139(revnumber)
-msgid "Xiphos 3.0.0"
-msgstr "Xiphos 3.0.0"
-
-#: ../C/xiphos.xml:140(date)
-msgid "2009-02-09"
-msgstr "2009-02-09"
+#: ../C/xiphos.xml:108(firstname)
+msgid "Dominique"
+msgstr "Dominique"
 
-#: ../C/xiphos.xml:143(revnumber)
-msgid "Xiphos 2.4.0"
-msgstr "Xiphos 2.4.0"
+#: ../C/xiphos.xml:109(surname)
+msgid "Corbex"
+msgstr "Corbex"
 
-#: ../C/xiphos.xml:144(date)
-msgid "2008-09-20"
-msgstr "2008-09-20"
+#: ../C/xiphos.xml:111(orgname)
+msgid "Xiphos Development team"
+msgstr "L'équipe de développement Xiphos"
 
-#: ../C/xiphos.xml:147(revnumber)
-msgid "Xiphos 2.3.6"
-msgstr "Xiphos 2.3.6"
+#: ../C/xiphos.xml:113(contrib)
+msgid "French translation"
+msgstr "Traduction française"
 
-#: ../C/xiphos.xml:148(date)
-msgid "2008-08-02"
-msgstr "2008-08-02"
+#. to V3.0, and so on.
+#: ../C/xiphos.xml:147(releaseinfo)
+msgid "This manual describes version 3.1.1 of Xiphos."
+msgstr ""
+"Ce manuel documente la version &manrevision; de <application>&appname;</"
+"application>"
 
 #: ../C/xiphos.xml:151(revnumber)
-msgid "Xiphos 2.3.5"
-msgstr "Xiphos 2.3.5"
+msgid "Xiphos Manual V3.1.1"
+msgstr "Manuel de Xiphos &manrevision;"
 
 #: ../C/xiphos.xml:152(date)
-msgid "2008-07-02"
-msgstr "2007-07-02"
-
-#: ../C/xiphos.xml:155(revnumber)
-msgid "Xiphos 2.3.4"
-msgstr "Xiphos 2.3.4"
-
-#: ../C/xiphos.xml:156(date)
-msgid "2008-05-26"
-msgstr "2008-05-26"
-
-#: ../C/xiphos.xml:159(revnumber)
-msgid "Xiphos 2.3.3"
-msgstr "Xiphos 2.3.3"
-
-#: ../C/xiphos.xml:160(date)
-msgid "2008-01-20"
-msgstr "2007-01-20"
-
-#: ../C/xiphos.xml:163(revnumber)
-msgid "Xiphos 2.3.2"
-msgstr "Xiphos 2.3.2"
-
-#: ../C/xiphos.xml:164(date)
-msgid "2007-12-26"
-msgstr "2007-12-26"
-
-#: ../C/xiphos.xml:167(revnumber)
-msgid "Xiphos 2.3.1"
-msgstr "Xiphos 2.3.1"
-
-#: ../C/xiphos.xml:168(date)
-msgid "2007-10-15"
-msgstr "2007-10-15"
-
-#: ../C/xiphos.xml:171(revnumber)
-msgid "Xiphos 2.2.3"
-msgstr "Xiphos 2.2.3"
-
-#: ../C/xiphos.xml:172(date)
-msgid "2007-03-26"
-msgstr "2007-03-26"
-
-#: ../C/xiphos.xml:175(revnumber)
-msgid "Xiphos 2.2.1"
-msgstr "Xiphos 2.2.1"
-
-#: ../C/xiphos.xml:176(date)
-msgid "2007-01-27"
-msgstr "2007-01-27"
-
-#: ../C/xiphos.xml:179(revnumber)
-msgid "Xiphos 2.2.0"
-msgstr "Xiphos 2.2.0"
-
-#: ../C/xiphos.xml:180(date)
-msgid "2006-12-23"
-msgstr "2006-12-23"
-
-#: ../C/xiphos.xml:183(revnumber)
-msgid "Xiphos 2.1.10"
-msgstr "Xiphos 2.1.10"
-
-#: ../C/xiphos.xml:184(date)
-msgid "2006-12-10"
-msgstr "2006-12-10"
-
-#: ../C/xiphos.xml:187(revnumber)
-msgid "Xiphos 2.1.9"
-msgstr "Xiphos 2.1.9"
-
-#: ../C/xiphos.xml:188(date)
-msgid "2006-11-12"
-msgstr "2006-11-12"
-
-#: ../C/xiphos.xml:191(revnumber)
-msgid "Xiphos 2.1.8"
-msgstr "Xiphos 2.1.8"
-
-#: ../C/xiphos.xml:192(date)
-msgid "2006-11-08"
-msgstr "2006-11-08"
-
-#: ../C/xiphos.xml:195(revnumber)
-msgid "Xiphos 2.1.7"
-msgstr "Xiphos 2.1.7"
-
-#: ../C/xiphos.xml:196(date)
-msgid "2006-05-04"
-msgstr "2006-05-04"
-
-#: ../C/xiphos.xml:199(revnumber)
-msgid "Xiphos 2.1.6"
-msgstr "Xiphos 2.1.6"
-
-#: ../C/xiphos.xml:200(date)
-msgid "2006-04-13"
-msgstr "2006-04-13"
-
-#: ../C/xiphos.xml:203(revnumber)
-msgid "Xiphos 2.1.5"
-msgstr "Xiphos 2.1.5"
-
-#: ../C/xiphos.xml:204(date)
-msgid "2005-12-14"
-msgstr "2005-12-14"
-
-#: ../C/xiphos.xml:207(revnumber)
-msgid "Xiphos 2.1.4"
-msgstr "Xiphos 2.1.4"
-
-#: ../C/xiphos.xml:208(date)
-msgid "2005-12-13"
-msgstr "2005-12-13"
-
-#: ../C/xiphos.xml:211(revnumber)
-msgid "Xiphos 2.1.2"
-msgstr "Xiphos 2.1.2"
-
-#: ../C/xiphos.xml:212(date)
-msgid "2005-05-31"
-msgstr "2005-05-31"
-
-#: ../C/xiphos.xml:215(revnumber)
-msgid "Xiphos 2.1.1"
-msgstr "Xiphos 2.1.1"
-
-#: ../C/xiphos.xml:216(date)
-msgid "2004-07-18"
-msgstr "2004-07-18"
-
-#: ../C/xiphos.xml:219(revnumber)
-msgid "Xiphos 2.1.0"
-msgstr "Xiphos 2.1.0"
-
-#: ../C/xiphos.xml:220(date)
-msgid "2004-08-30"
-msgstr "2004-08-30"
-
-#: ../C/xiphos.xml:223(revnumber)
-msgid "Xiphos 2.0.0"
-msgstr "Xiphos 2.0.0"
-
-#: ../C/xiphos.xml:224(date)
-msgid "2003-12-25"
-msgstr "2003-12-25"
-
-#: ../C/xiphos.xml:227(revnumber)
-msgid "Xiphos 0.7.10"
-msgstr "Xiphos 0.7.10"
-
-#: ../C/xiphos.xml:228(date)
-msgid "2003-09-05"
-msgstr "2003-09-05"
-
-#: ../C/xiphos.xml:231(revnumber)
-msgid "Xiphos 0.7.9"
-msgstr "Xiphos 0.7.9"
-
-#: ../C/xiphos.xml:232(date)
-msgid "2003-03-26"
-msgstr "2003-03-26"
-
-#: ../C/xiphos.xml:235(revnumber)
-msgid "Xiphos 0.7.8"
-msgstr "Xiphos 0.7.8"
-
-#: ../C/xiphos.xml:236(date)
-msgid "2003-01-12"
-msgstr "2003-01-12"
-
-#: ../C/xiphos.xml:239(revnumber)
-msgid "Xiphos 0.7.7"
-msgstr "Xiphos 0.7.7"
-
-#: ../C/xiphos.xml:240(date)
-msgid "2002-12-20"
-msgstr "2002-12-20"
-
-#: ../C/xiphos.xml:243(revnumber)
-msgid "Xiphos 0.7.6"
-msgstr "Xiphos 0.7.6"
-
-#: ../C/xiphos.xml:244(date)
-msgid "2002-11-03"
-msgstr "2002-11-03"
-
-#: ../C/xiphos.xml:247(revnumber)
-msgid "Xiphos 0.7.5"
-msgstr "Xiphos 0.7.5"
-
-#: ../C/xiphos.xml:248(date)
-msgid "2002-07-01"
-msgstr "2002-07-01"
-
-#: ../C/xiphos.xml:251(revnumber)
-msgid "Xiphos 0.7.4"
-msgstr "Xiphos 0.7.4"
-
-#: ../C/xiphos.xml:252(date)
-msgid "2002-06-10"
-msgstr "2002-06-10"
-
-#: ../C/xiphos.xml:255(revnumber)
-msgid "Xiphos 0.7.3"
-msgstr "Xiphos 0.7.3"
-
-#: ../C/xiphos.xml:256(date)
-msgid "2002-05-10"
-msgstr "2002-05-10"
-
-#: ../C/xiphos.xml:259(revnumber)
-msgid "Xiphos 0.7.2"
-msgstr "Xiphos 0.7.2"
-
-#: ../C/xiphos.xml:260(date)
-msgid "2002-04-22"
-msgstr "2002-04-22"
-
-#: ../C/xiphos.xml:263(revnumber)
-msgid "Xiphos 0.7.1"
-msgstr "Xiphos 0.7.1"
-
-#: ../C/xiphos.xml:264(date)
-msgid "2002-04-10"
-msgstr "2002-04-10"
-
-#: ../C/xiphos.xml:267(revnumber)
-msgid "Xiphos 0.7.0"
-msgstr "Xiphos 0.7.0"
-
-#: ../C/xiphos.xml:268(date)
-msgid "2002-04-09"
-msgstr "2002-04-09"
-
-#: ../C/xiphos.xml:271(revnumber)
-msgid "Xiphos 0.5.0"
-msgstr "Xiphos 0.5.0"
-
-#: ../C/xiphos.xml:272(date)
-msgid "2001-08-13"
-msgstr "2001-08-13"
-
-#: ../C/xiphos.xml:275(revnumber)
-msgid "Xiphos 0.4.1"
-msgstr "Xiphos 0.4.1"
-
-#: ../C/xiphos.xml:276(date)
-msgid "2001-04-10"
-msgstr "2001-04-10"
-
-#: ../C/xiphos.xml:279(revnumber)
-msgid "Xiphos 0.4.0"
-msgstr "Xiphos 0.4.0"
-
-#: ../C/xiphos.xml:280(date)
-msgid "2001-04-06"
-msgstr "2001-04-06"
-
-#: ../C/xiphos.xml:283(revnumber)
-msgid "Xiphos 0.3.7"
-msgstr "Xiphos 0.3.7"
-
-#: ../C/xiphos.xml:284(date)
-msgid "2000-12-08"
-msgstr "2000-12-08"
-
-#: ../C/xiphos.xml:287(revnumber)
-msgid "Xiphos 0.3.6"
-msgstr "Xiphos 0.3.6"
-
-#: ../C/xiphos.xml:288(date)
-msgid "2000-12-07"
-msgstr "2000-12-07"
-
-#: ../C/xiphos.xml:291(revnumber)
-msgid "Xiphos 0.3.2"
-msgstr "Xiphos 0.3.2"
-
-#: ../C/xiphos.xml:292(date)
-msgid "2000-11-21"
-msgstr "2000-11-21"
-
-#: ../C/xiphos.xml:295(revnumber)
-msgid "Xiphos 0.3.0"
-msgstr "Xiphos 0.3.0"
-
-#: ../C/xiphos.xml:296(date)
-msgid "2000-11-10"
-msgstr "2000-11-10"
-
-#: ../C/xiphos.xml:299(revnumber)
-msgid "Xiphos 0.2.5"
-msgstr "Xiphos 0.2.5"
-
-#: ../C/xiphos.xml:300(date)
-msgid "2000-10-06"
-msgstr "2000-10-06"
-
-#: ../C/xiphos.xml:303(revnumber)
-msgid "Xiphos 0.2.4"
-msgstr "Xiphos 0.2.4"
-
-#: ../C/xiphos.xml:304(date)
-msgid "2000-09-16"
-msgstr "2000-09-16"
-
-#: ../C/xiphos.xml:307(revnumber)
-msgid "Xiphos 0.2.3"
-msgstr "Xiphos 0.2.3"
+msgid "August 2009"
+msgstr "Août 2009"
 
-#: ../C/xiphos.xml:308(date)
-msgid "2000-09-07"
-msgstr "2000-09-07"
-
-#: ../C/xiphos.xml:311(revnumber)
-msgid "Xiphos 0.2.2"
-msgstr "Xiphos 0.2.2"
-
-#: ../C/xiphos.xml:312(date)
-msgid "2000-09-06"
-msgstr "2000-09-06"
-
-#: ../C/xiphos.xml:315(revnumber)
-msgid "Xiphos 0.2.1"
-msgstr "Xiphos 0.2.1"
-
-#: ../C/xiphos.xml:316(date)
-msgid "2000-08-29"
-msgstr "2000-08-29"
-
-#: ../C/xiphos.xml:319(revnumber)
-msgid "Xiphos 0.2.0"
-msgstr "Xiphos 0.2.0"
-
-#: ../C/xiphos.xml:320(date)
-msgid "2000-08-19"
-msgstr "2000-08-19"
-
-#: ../C/xiphos.xml:323(revnumber)
-msgid "Xiphos 0.1.8"
-msgstr "Xiphos 0.1.8"
-
-#: ../C/xiphos.xml:324(date)
-msgid "2000-06-10"
-msgstr "2000-06-10"
-
-#: ../C/xiphos.xml:327(revnumber)
-msgid "Xiphos 0.1.7"
-msgstr "Xiphos 0.1.7"
-
-#: ../C/xiphos.xml:328(date)
-msgid "2000-05-19"
-msgstr "2000-05-19"
-
-#: ../C/xiphos.xml:331(revnumber)
-msgid "Xiphos 0.1.6"
-msgstr "Xiphos 0.1.6"
-
-#: ../C/xiphos.xml:332(date)
-msgid "2000-05-08"
-msgstr "2000-05-08"
-
-#: ../C/xiphos.xml:336(releaseinfo)
-msgid "This manual describes version 3.0.0 of Xiphos."
-msgstr ""
-"Ce manuel documente la version &manrevision; de <application>&appname;</"
-"application>"
-
-#: ../C/xiphos.xml:339(title)
+#: ../C/xiphos.xml:160(title)
 msgid "Feedback"
 msgstr "Votre avis"
 
-#: ../C/xiphos.xml:340(para)
+#: ../C/xiphos.xml:161(para)
 msgid ""
 "To report a bug or make a suggestion regarding the Xiphos application or "
 "this manual, Use the <ulink url=\"http://sourceforge.net/tracker/?"
@@ -1529,31 +1306,31 @@ msgstr ""
 "tracker/?group_id=5528\">Tracker de SourceForge</ulink>  ou aux listes de "
 "diffusion."
 
-#: ../C/xiphos.xml:348(keyword)
+#: ../C/xiphos.xml:169(keyword)
 msgid "gnome"
 msgstr "gnome"
 
-#: ../C/xiphos.xml:349(keyword)
+#: ../C/xiphos.xml:170(keyword)
 msgid "xiphos"
 msgstr "xiphos"
 
-#: ../C/xiphos.xml:350(keyword)
+#: ../C/xiphos.xml:171(keyword)
 msgid "sword"
 msgstr "sword"
 
-#: ../C/xiphos.xml:351(keyword)
+#: ../C/xiphos.xml:172(keyword)
 msgid "crosswire"
 msgstr "crosswire"
 
-#: ../C/xiphos.xml:352(keyword)
+#: ../C/xiphos.xml:173(keyword)
 msgid "help dialog"
 msgstr "Fenêtre d'aide"
 
-#: ../C/xiphos.xml:358(primary)
+#: ../C/xiphos.xml:179(primary)
 msgid "Xiphos"
 msgstr "&appname;"
 
-#: ../C/xiphos.xml:373(title)
+#: ../C/xiphos.xml:194(title)
 msgid "Introduction"
 msgstr "Introduction"
 
@@ -1566,8 +1343,8 @@ msgid ""
 "can use <application>Xiphos</application> to do the following:"
 msgstr ""
 "<application>&appname;</application> est un logiciel d'étude biblique "
-"utilisant l'architecture logicielle du Projet&nbsp;SWORD et l'environnement "
-"de bureau «­­&nbsp;GNOME&nbsp;». <application>&appname;</application> permet "
+"utilisant l'architecture logicielle du Projet&#160;SWORD et l'environnement "
+"de bureau «­­&#160;GNOME&#160;». <application>&appname;</application> permet "
 "d'effectuer les tâches suivantes :"
 
 #: ../C/xiphos.xml:9(para)
@@ -1619,9 +1396,9 @@ msgid ""
 "<application>BibleDesktop</application>, a Java application, and "
 "<application>BibleTime</application>, another Linux program."
 msgstr ""
-"Le Projet­­&nbsp;SWORD est hébergé à <ulink type=\"http\" url=\"http://www."
+"Le Projet­­&#160;SWORD est hébergé à <ulink type=\"http\" url=\"http://www."
 "crosswire.org\"> http://www.crosswire.org</ulink>. D'autres applications "
-"utilisant l'architecture logicielle du Projet­­&nbsp;SWORD sont&nbsp;: "
+"utilisant l'architecture logicielle du Projet­­&#160;SWORD sont&#160;: "
 "<application>The SWORD Project for Windows</application> "
 "(<application>BibleCS</application> ou <application>WinSword</application>), "
 "<application>MacSword</application> pour Macintosh, "
@@ -1649,10 +1426,54 @@ msgstr ""
 "email> Toute aide est appréciée et permet d'améliorer <application>&appname;"
 "</application>."
 
-#: ../C/xiphos.xml:386(title)
+#: ../C/xiphos.xml:207(title)
 msgid "Getting Started with Xiphos"
 msgstr "Premiers pas"
 
+#: ../C/xiphos.xml:4(title) ../C/start.xml:4(title)
+msgid "Starting Xiphos"
+msgstr "Démarrer Xiphos"
+
+#: ../C/xiphos.xml:5(para) ../C/start.xml:5(para)
+msgid "You can start <application>Xiphos</application> in the following ways:"
+msgstr ""
+"Vous pouvez démarrer <application>Xiphos</application> en utilisant l'une "
+"des méthodes suivantes :"
+
+#: ../C/xiphos.xml:10(term) ../C/start.xml:10(term)
+msgid "Applications menu"
+msgstr "Menu applications"
+
+#: ../C/xiphos.xml:12(para) ../C/start.xml:12(para)
+msgid ""
+"Choose <menuchoice><guisubmenu>Accessories</guisubmenu><guimenuitem>Xiphos "
+"Bible Guide</guimenuitem></menuchoice>."
+msgstr ""
+"Sélectionnez <menuchoice><guisubmenu>Accessoires</"
+"guisubmenu><guimenuitem>Xiphos</guimenuitem></menuchoice>."
+
+#: ../C/xiphos.xml:20(term) ../C/start.xml:20(term)
+msgid "Command line"
+msgstr "Ligne de commande"
+
+#: ../C/xiphos.xml:22(para) ../C/start.xml:22(para)
+msgid "Type <command>xiphos</command>, then press <keycap>Return</keycap>."
+msgstr ""
+"Entrez <command>xiphos</command>, puis appuyez sur <keycap>Entrée</keycap>."
+
+#: ../C/xiphos.xml:28(term) ../C/start.xml:28(term)
+msgid "Windows"
+msgstr "Windows"
+
+#: ../C/xiphos.xml:30(para) ../C/start.xml:30(para)
+msgid ""
+"Go to <menuchoice><guisubmenu>All Programs</guisubmenu><guisubmenu>Xiphos </"
+"guisubmenu><guimenuitem>Xiphos</guimenuitem></menuchoice>."
+msgstr ""
+"Sélectionnez <menuchoice><guisubmenu>Tous les programmes</"
+"guisubmenu><guisubmenu>Xiphos·</guisubmenu><guimenuitem>Xiphos</"
+"guimenuitem></menuchoice>."
+
 #: ../C/xiphos.xml:41(title)
 msgid "Starting Xiphos For The First Time"
 msgstr "Démarrer Xiphos la première fois"
@@ -1721,6 +1542,12 @@ msgstr ""
 "La fenêtre de <application>Xiphos</application> contient les éléments "
 "suivants :"
 
+#: ../C/xiphos.xml:108(term) ../C/xiphos.xml:5(title)
+#: ../C/xiphos.xml:14(title) ../C/interface.xml:5(title)
+#: ../C/interface.xml:14(title)
+msgid "Menubar"
+msgstr "Barre de menu"
+
 #: ../C/xiphos.xml:110(para)
 msgid ""
 "The menus on the menubar contain several commands which extend the use of "
@@ -1771,8 +1598,8 @@ msgstr ""
 "Le volet des<interface> Textes bibliques</interface> affiche le texte "
 "biblique sélectionné."
 
-#: ../C/xiphos.xml:144(term) ../C/xiphos.xml:517(title)
-#: ../C/xiphos.xml:531(phrase)
+#: ../C/xiphos.xml:144(term) ../C/xiphos.xml:549(title)
+#: ../C/xiphos.xml:563(phrase)
 msgid "Previewer"
 msgstr "Aperçu"
 
@@ -1787,7 +1614,7 @@ msgstr ""
 "Strong, les notes de bas de page et les étiquettes morphologiques. Il est "
 "situé en-dessous du volet des textes bibliques."
 
-#: ../C/xiphos.xml:153(term) ../C/xiphos.xml:571(phrase)
+#: ../C/xiphos.xml:153(term) ../C/xiphos.xml:612(phrase)
 msgid "Commentary Pane"
 msgstr "Commentaire"
 
@@ -1840,10 +1667,25 @@ msgstr ""
 "contextuel permettant d'imprimer ou d'accéder aux options spécifiques du "
 "module concerné."
 
-#: ../C/xiphos.xml:392(title)
+#: ../C/xiphos.xml:213(title)
 msgid "Interface"
 msgstr "Interface"
 
+#: ../C/xiphos.xml:6(para) ../C/interface.xml:6(para)
+msgid ""
+"At the top of the <application>Xiphos</application> main window is the "
+"menubar. Almost all of the functions are available by activating the "
+"appropriate menu item. The functions have been grouped according to their "
+"type. For example, the file operations have been grouped into the "
+"<guisubmenu>File</guisubmenu> menu."
+msgstr ""
+"La <interface>Barre de menu</interface> se situe en haut de la fenêtre de "
+"l'application <application>&appname;</application>.  Pratiquement toutes les "
+"fonctions sont disponibles en utilisant les éléments de menu appropriés. Les "
+"différentes fonctions sont regroupées par type. Par exemple, les opérations "
+"sur les fichiers sont regroupées dans le menu  <guisubmenu>Fichier</"
+"guisubmenu>."
+
 #: ../C/xiphos.xml:27(phrase)
 msgid "Xiphos menubar"
 msgstr "Barre d'outil de Xiphos"
@@ -1967,38 +1809,36 @@ msgid ""
 "On the left hand side of <application>Xiphos</application> there is the "
 "Sidebar. Here the user can switch between the different Sword modules, view "
 "bookmarks, do simple searches and view verse lists. To switch between all "
-"Sidebar functions, shortcuts have been placed at the bottom of the Sidebar. "
-"Clicking on the shortcut activates the option."
+"Sidebar functions, buttons have been placed at the top of the Sidebar."
 msgstr ""
 "Le <interface>volet latéral</interface> est situé sur la partie gauche de la "
 "fenêtre principale de <application>&appname;</application>. Le "
 "<interface>volet latéral</interface> permet de choisir les modules Sword, de "
 "gérer et utiliser les signets,d' effectuer des recherches basiques ou "
-"d'afficher les listes de versets. Les raccourcis du <interface>volet "
-"latéral</interface> permettent, par un simple clic, d'activer ces "
-"différentes fonctions."
+"d'afficher les listes de versets. Les boutons du <interface>volet latéral</"
+"interface> permettent d'activer ces différentes fonctions."
 
-#: ../C/xiphos.xml:170(title)
+#: ../C/xiphos.xml:169(title)
 msgid "Sidebar Shortcuts"
 msgstr "Raccourcis du volet latéral"
 
-#: ../C/xiphos.xml:183(phrase)
+#: ../C/xiphos.xml:182(phrase)
 msgid "Sidebar shortcuts"
 msgstr "Raccourcis du volet latéral"
 
-#: ../C/xiphos.xml:191(title)
+#: ../C/xiphos.xml:190(title)
 msgid "The Bible Text Pane"
 msgstr "Le volet des textes bibliques"
 
-#: ../C/xiphos.xml:193(title)
+#: ../C/xiphos.xml:192(title)
 msgid "The Bible Textpane"
 msgstr "Le volet des textes bibliques"
 
-#: ../C/xiphos.xml:206(phrase)
+#: ../C/xiphos.xml:205(phrase)
 msgid "The Bible textpane"
 msgstr "Le volet des textes bibliques"
 
-#: ../C/xiphos.xml:212(para)
+#: ../C/xiphos.xml:211(para)
 msgid ""
 "Positioned to the right of the Shortcut bar is the Bible text pane. All your "
 "different translations will be displayed for full viewing. When starting "
@@ -2010,18 +1850,18 @@ msgstr ""
 "cette zone. Au démarrage de <application>&appname;</application>, la version "
 "utilisée précédemment ou la version définie par défaut est affichée."
 
-#: ../C/xiphos.xml:219(title)
+#: ../C/xiphos.xml:218(title)
 msgid "Opening A Specific Bible Translation"
 msgstr "Ouvrir une version différente de la Bible"
 
-#: ../C/xiphos.xml:220(para)
+#: ../C/xiphos.xml:219(para)
 msgid ""
 "In order to change the current Bible translation to another of your choice:"
 msgstr ""
 "Pour remplacer la version de la Bible en cours d'utilisation par une autre "
 "version :"
 
-#: ../C/xiphos.xml:225(para)
+#: ../C/xiphos.xml:224(para)
 msgid ""
 "right-click in the <interface>Bible Text Pane</interface>. In the popup menu "
 "choose <menuchoice><guimenuitem>File</guimenuitem><guimenuitem>Open Module</"
@@ -2033,7 +1873,7 @@ msgstr ""
 "choisir <menuchoice><guimenuitem>Fichier</guimenuitem><guimenuitem>Ouvrir le "
 "module</guimenuitem></menuchoice> et sélectionner la version désirée."
 
-#: ../C/xiphos.xml:232(para)
+#: ../C/xiphos.xml:231(para)
 msgid ""
 "under the <guibutton>Modules</guibutton> option in the <interface>Sidebar</"
 "interface>, choose <menuchoice><guimenuitem>Biblical Texts</"
@@ -2046,11 +1886,11 @@ msgstr ""
 "de votre choix </guimenuitem></menuchoice> et sélectionner la version "
 "désirée."
 
-#: ../C/xiphos.xml:242(title)
+#: ../C/xiphos.xml:241(title)
 msgid "Using the Parallel View Mode"
 msgstr "Utilisation du mode Vue parallèle"
 
-#: ../C/xiphos.xml:243(para)
+#: ../C/xiphos.xml:242(para)
 msgid ""
 "A nice function in <application>Xiphos</application> is the ability to view "
 "your specified bible text in five parallel translations of your choice. The "
@@ -2074,11 +1914,11 @@ msgstr ""
 "seulement le Nouveau Testament ou seulement l'Ancien Testament ne pourront "
 "pas afficher les livres, chapitres, versets qu'ils n'ont pas."
 
-#: ../C/xiphos.xml:252(title) ../C/xiphos.xml:264(phrase)
+#: ../C/xiphos.xml:251(title) ../C/xiphos.xml:263(phrase)
 msgid "Bible textpane - parallel view"
 msgstr "Volet des textes bibliques, vue parallèle"
 
-#: ../C/xiphos.xml:270(para)
+#: ../C/xiphos.xml:269(para)
 msgid ""
 "Additionally, a separate Parallel View window can be selected from the right "
 "click menu with <guimenuitem>Detach/Attach</guimenuitem>. Your Bible pane "
@@ -2093,15 +1933,15 @@ msgstr ""
 "parallèle</interface> s'ouvre affichant le chapitre en cours dans les cinq "
 "versions."
 
-#: ../C/xiphos.xml:276(title) ../C/xiphos.xml:288(phrase)
+#: ../C/xiphos.xml:275(title) ../C/xiphos.xml:287(phrase)
 msgid "Parallel View - separate window"
 msgstr "Vue parallèle - Fenêtre distincte"
 
-#: ../C/xiphos.xml:297(title)
+#: ../C/xiphos.xml:296(title)
 msgid "Opening A Separate Bible Translation"
 msgstr "Ouvrir le texte·biblique dans une fenêtre distincte"
 
-#: ../C/xiphos.xml:298(para)
+#: ../C/xiphos.xml:297(para)
 msgid ""
 "In order to view a Bible translation separate from the <application>Xiphos</"
 "application> interface:"
@@ -2109,7 +1949,7 @@ msgstr ""
 "Pour ouvrir le texte biblique dans une fenêtre séparée de la fenêtre "
 "principale de <application>&appname;</application> :"
 
-#: ../C/xiphos.xml:303(para)
+#: ../C/xiphos.xml:302(para)
 msgid ""
 "Under the <guibutton>Modules</guibutton> option in the <interface>Sidebar</"
 "interface>,choose <menuchoice><guimenuitem>Biblical Texts</"
@@ -2124,16 +1964,16 @@ msgstr ""
 "qui s'affiche, choisir l'option <guimenuitem>Ouvrir dans une fenêtre</"
 "guimenuitem>."
 
-#: ../C/xiphos.xml:314(title)
+#: ../C/xiphos.xml:313(title)
 msgid "Finding Out About The Current Translation"
 msgstr "Rechercher les informations à propos de la version courante."
 
-#: ../C/xiphos.xml:315(para)
+#: ../C/xiphos.xml:314(para)
 msgid "To find out about the Bible translation currently being displayed:"
 msgstr ""
 "Pour obtenir des informations à propos de la version de la Bible en cours :"
 
-#: ../C/xiphos.xml:320(para)
+#: ../C/xiphos.xml:319(para)
 msgid ""
 "right-click in the <interface>Bible Text pane</interface>. In the popup menu "
 "choose <guimenuitem>About </guimenuitem> module name."
@@ -2142,7 +1982,7 @@ msgstr ""
 "<interface>textes bibliques</interface>. Dans le menu contextuel qui "
 "s'affiche, sélectionner <guimenuitem>À propos</guimenuitem>."
 
-#: ../C/xiphos.xml:326(para)
+#: ../C/xiphos.xml:325(para)
 msgid ""
 "Under the <guibutton>Modules</guibutton> option in the <interface>Sidebar</"
 "interface>,choose <menuchoice><guimenuitem>Biblical Texts</"
@@ -2156,47 +1996,47 @@ msgstr ""
 "Faire un clic droit sur la version souhaitée, puis dans le menu contextuel "
 "qui s'affiche, choisir l'option <guimenuitem>À propos</guimenuitem>."
 
-#: ../C/xiphos.xml:337(title) ../C/xiphos.xml:395(title)
-#: ../C/xiphos.xml:407(phrase)
+#: ../C/xiphos.xml:336(title) ../C/xiphos.xml:394(title)
+#: ../C/xiphos.xml:406(phrase)
 msgid "Module Options"
 msgstr "Options des modules"
 
-#: ../C/xiphos.xml:338(para)
+#: ../C/xiphos.xml:337(para)
 msgid ""
 "Most Bible translations have additional options which the user can select."
 msgstr ""
 "De nombreux modules de textes bibliques proposent des options additionnelles "
 "à activer suivant les besoins de  l'utilisateur :"
 
-#: ../C/xiphos.xml:343(para)
+#: ../C/xiphos.xml:342(para)
 msgid "Words Of Christ In Red"
 msgstr "Paroles de Christ en rouge"
 
-#: ../C/xiphos.xml:348(para)
+#: ../C/xiphos.xml:347(para)
 msgid "Strong's Numbers"
 msgstr "Nombres de Strong"
 
-#: ../C/xiphos.xml:353(para)
+#: ../C/xiphos.xml:352(para)
 msgid "Morphological Tags"
 msgstr "Étiquettes morphologiques"
 
-#: ../C/xiphos.xml:358(para)
+#: ../C/xiphos.xml:357(para)
 msgid "Footnotes"
 msgstr "Notes de bas de page"
 
-#: ../C/xiphos.xml:363(para)
+#: ../C/xiphos.xml:362(para)
 msgid "Scripture Cross-Reference"
 msgstr "Références croisées de l'Écriture"
 
-#: ../C/xiphos.xml:368(para)
+#: ../C/xiphos.xml:367(para)
 msgid "Headings"
 msgstr "Entêtes"
 
-#: ../C/xiphos.xml:373(para)
+#: ../C/xiphos.xml:372(para)
 msgid "Image Content"
 msgstr "Afficher les images"
 
-#: ../C/xiphos.xml:379(para)
+#: ../C/xiphos.xml:378(para)
 msgid ""
 "Translations in other languages such as Greek or Hebrew have specific "
 "options which deal only with the specific language."
@@ -2204,11 +2044,11 @@ msgstr ""
 "Les versions en d'autres langues tel le grec ou l'hébreu offrent des options "
 "particulières qui ne s'appliquent qu'à ces langues."
 
-#: ../C/xiphos.xml:383(para)
+#: ../C/xiphos.xml:382(para)
 msgid "In order to access these options:"
 msgstr "pour accéder à ces options :"
 
-#: ../C/xiphos.xml:388(para)
+#: ../C/xiphos.xml:387(para)
 msgid ""
 "right-click in the <interface>Bible Text pane</interface>. In the popup menu "
 "(example shown), choose <guibutton>Module Options</guibutton> and select the "
@@ -2219,12 +2059,12 @@ msgstr ""
 "s'affiche, choisir <guimenuitem>Options du module</guimenuitem>, puis "
 "l'option désirée."
 
-#: ../C/xiphos.xml:416(title) ../C/xiphos.xml:421(title)
-#: ../C/xiphos.xml:433(phrase)
+#: ../C/xiphos.xml:415(title) ../C/xiphos.xml:420(title)
+#: ../C/xiphos.xml:432(phrase)
 msgid "View Options"
 msgstr "Options d'affichage"
 
-#: ../C/xiphos.xml:417(para)
+#: ../C/xiphos.xml:416(para)
 msgid ""
 "There are several additional modes that can be selected from the menubar's "
 "<guimenuitem>View</guimenuitem> pulldown."
@@ -2232,7 +2072,7 @@ msgstr ""
 "Plusieurs modes supplémentaires peuvent être sélectionnés à l'aide du menu "
 "<guimenuitem>Afficher</guimenuitem> de la barre de menu."
 
-#: ../C/xiphos.xml:440(para)
+#: ../C/xiphos.xml:439(para)
 msgid ""
 "The first 4 checkboxes control whether each named subwindow is displayed. "
 "The viewable state of the subwindows is remembered on a per-tab basis. This "
@@ -2247,11 +2087,11 @@ msgstr ""
 "l'affichage des volets <interface>Textes bibliques</interface>, "
 "<interface>Commentaires</interface> et <interface>Aperçu</interface>."
 
-#: ../C/xiphos.xml:445(para)
+#: ../C/xiphos.xml:444(para)
 msgid "The remaining checkboxes control these other display features:"
 msgstr "Les options restantes commandent les autres options d'affichage."
 
-#: ../C/xiphos.xml:450(para)
+#: ../C/xiphos.xml:449(para)
 msgid ""
 "Verse Style - Toggles between Bible text display in separate verses, or in "
 "paragraphs instead. This is set on a per-module basis."
@@ -2260,7 +2100,7 @@ msgstr ""
 "biblique entre versets distinctifs ou par paragraphes. Cette option "
 "s'applique à un module entier."
 
-#: ../C/xiphos.xml:456(para)
+#: ../C/xiphos.xml:455(para)
 msgid ""
 "Link Tabs - When more than one tab is open, each one's verse is navigated "
 "separately in the disabled case. If tab linking is enabled, then all tabs "
@@ -2271,22 +2111,22 @@ msgstr ""
 "Quand cette option est activée, tous les onglets sont liés ensemble, et "
 "affichent le même verset."
 
-#: ../C/xiphos.xml:463(para)
+#: ../C/xiphos.xml:462(para)
 msgid ""
-"Read Aloud - If you enable this, then Xiphos will funnel all selected verses "
-"through the <application>festival</application> text-to-speech system. "
-"<application>Festival</application> is a widely-available TTS, often "
-"installed by default in Linux distributions. Reading aloud is not currently "
-"supported on Windows."
+"Read Aloud - If you enable this, then <application>Xiphos</application> will "
+"funnel all selected verses through the <application>festival</application> "
+"text-to-speech system. <application>Festival</application> is a widely-"
+"available TTS, often installed by default in Linux distributions. Reading "
+"aloud is not currently supported on Windows."
 msgstr ""
 "<guimenuitem>Synthèse vocale</guimenuitem> - Quand cette option est activée, "
 "<application>&appname;</application> lit à voix haute les textes "
 "sélectionnés à l'aide du logiciel de synthèse vocale <application>Festival</"
 "application>. <application>Festival</application> est souvent installé par "
 "défaut dans les distributions Linux. (NDT: En général, les résultats sont "
-"meilleurs en anglais )Non disponible sous WIndows."
+"meilleurs en anglais ) Non disponible sous Windows."
 
-#: ../C/xiphos.xml:469(para)
+#: ../C/xiphos.xml:468(para)
 msgid ""
 "Also, mouse-selected text may be read aloud from Bibles, commentaries, and "
 "general books, using the right-click menu, regardless of whether Read Aloud "
@@ -2298,7 +2138,7 @@ msgstr ""
 "sélectionné</guimenuitem> dans le menu contextuel obtenu à l'aide du clic "
 "droit de la souris."
 
-#: ../C/xiphos.xml:476(para)
+#: ../C/xiphos.xml:475(para)
 msgid ""
 "Show Verse Numbers - Normally enabled, this toggle can be disabled to "
 "prevent display of verse numbers within the text."
@@ -2307,7 +2147,7 @@ msgstr ""
 "activée, cette option peut être désactivée pour ne pas afficher les numéros "
 "de versets dans le texte. "
 
-#: ../C/xiphos.xml:482(para)
+#: ../C/xiphos.xml:481(para)
 msgid ""
 "Highlight Current Verse - Initially disabled, this toggle replaces mere "
 "alternate colorization of the current verse with a substitute high-contrast "
@@ -2318,11 +2158,87 @@ msgstr ""
 "une coloration au contraste plus élevée. Les couleurs sont modifiables dans "
 "la fenêtre de préférences."
 
-#: ../C/xiphos.xml:492(title)
+#: ../C/xiphos.xml:491(title)
+msgid "User Annotation"
+msgstr "Annotation personnelle"
+
+#: ../C/xiphos.xml:492(para)
+msgid ""
+"Many users wish to make personal annotations on individual verses, without "
+"the need to put a full \"personal commentary\" module to use. "
+"<application>Xiphos</application> provides this in the right-click context "
+"menu in the Bible pane. This brings up a dialog showing the current verse "
+"reference and offering a text box into which to enter a brief personal note. "
+"Once the user closes the dialog with \"Mark,\" the verse will be displayed "
+"in reverse-highlight (default, blue on yellow) and a marker <guibutton>*u</"
+"guibutton> will be inserted at the verse's beginning. This is metaphorically "
+"similar for users who mark verses in paper Bibles with a yellow highlighter "
+"and write personal notes in the margins."
+msgstr ""
+"De nombreux utilisateurs souhaitent ajouter des annotations personnelles à "
+"des versets individuels, sans éprouver pour autant le besoin d'employer un "
+"module complet de commentaire personnel.\n"
+"<application>Xiphos</application> offre accès à cette fonctionnalité par le "
+"menu contextuel du volet biblique obtenu par un clic-droit. Une boite de "
+"dialogue s'affiche indiquant la référence du verset en cours et offrant une "
+"zone de saisie où entrer une brève annotaion personnelle. Dès que "
+"l'utilisateur ferme la boite de dialogue avec <guibutton>Annoter</"
+"guibutton>, le verset est surligné (par défaut bleu sur jaune) et une marque "
+"<guibutton>*u</guibutton> est insérée au début du verset. Ceci est "
+"métaphoriquement similaire aux utilisateurs qui marquent les versets dans "
+"leurs Bibles papier avec un surligneur jaune, et écrivent des notes "
+"personnelles dans les marges. "
+
+#: ../C/xiphos.xml:500(para)
+msgid ""
+"Selecting an already-annotated verse will (in the usual case) bring up the "
+"existing content for re-editing. An already-annotated verse can be unmarked; "
+"the verse will cease to show in reverse-highlight."
+msgstr ""
+"La sélection d'un verset déjà annoté, fait apparaître (dans le cas habituel) "
+"le contenu existant prêt pour être re-édité. L'annotation d'un verset peut "
+"être retirée; le verset cesse alors d'être affiché en surbrillance."
+
+#: ../C/xiphos.xml:504(para)
+msgid ""
+"If the user deletes the module name from the reference at the top of the "
+"dialog, then the annotation will apply to any Bible module at the selected "
+"verse. However, in this case, re-selecting the annotated verse will not "
+"initialize with the existing content, because the dialog is created based on "
+"the specific module reference."
+msgstr ""
+"Si l'utilisateur retire le nom du module de la référence affichée en haut de "
+"la boite de dialogue, l'annotation s'applique alors à n'importe quel module "
+"Biblique pour le verset sélectionné. Toutefois, dans ce cas, re-sélectionner "
+"le verset annoté ne fait pas afficher le contenu existant, car le contenu "
+"est lié à la référence du module original."
+
+#: ../C/xiphos.xml:512(title)
+msgid "Geography Support"
+msgstr "Support de la géographie"
+
+#: ../C/xiphos.xml:513(para)
+msgid ""
+"A connection to browsing BibleMap.org is available by mouse-selecting a "
+"place name in any text. Use the right-click context menu to select "
+"<menuchoice><guimenuitem>Lookup Selection</guimenuitem><guimenuitem>Browse "
+"in BibleMap.org</guimenuitem></menuchoice>. A web browser will be brought up "
+"to show the selected name's geography via BibleMap, which provides Biblical "
+"detail overlaid on a Google Maps interface."
+msgstr ""
+"Une connection pour naviguer sur le site BibleMap.org est fournie lors de la "
+"sélection d'un lieu par la souris dans n'importe quel texte. Sélectionner "
+"<menuchoice><guimenuitem>Définition du mot sélectionné</"
+"guimenuitem><guimenuitem>Recherche sur BibleMap.org</guimenuitem></"
+"menuchoice> par un clic-droit dans le menu contextuel. Un navigateur web est "
+"alors lancé pour montrer la géographie du nom sélectionné via BibleMap qui "
+"affiche le détail biblique superposé sur une interface Google Maps."
+
+#: ../C/xiphos.xml:524(title)
 msgid "Specific Word Meanings"
 msgstr "Définition d'un mot particulier"
 
-#: ../C/xiphos.xml:493(para)
+#: ../C/xiphos.xml:525(para)
 msgid ""
 "In order to check the meaning of a specific word, double-click on the word "
 "you wish to lookup. The word should then highlight itself and the "
@@ -2334,15 +2250,15 @@ msgstr ""
 "définition, si le mot est répertorié, s'affiche ensuite dans le volet "
 "<interface>dictionnaire</interface>."
 
-#: ../C/xiphos.xml:500(title)
+#: ../C/xiphos.xml:532(title)
 msgid "Finding A Specific Word"
 msgstr "Rechercher un mot spécifique"
 
-#: ../C/xiphos.xml:501(para)
+#: ../C/xiphos.xml:533(para)
 msgid "To find a specific word within a passage:"
 msgstr "Pour rechercher un mot spécifique dans un passage :"
 
-#: ../C/xiphos.xml:506(para)
+#: ../C/xiphos.xml:538(para)
 msgid ""
 "right-click in the <interface>Bible Text Pane</interface>. In the popup "
 "menu, choose <guibutton>Edit</guibutton>-&gt; <guibutton>Find</guibutton>. A "
@@ -2358,11 +2274,11 @@ msgstr ""
 "texte à rechercher, puis ensuite valider à l'aide du bouton "
 "<guibutton>Rechercher</guibutton>."
 
-#: ../C/xiphos.xml:519(title)
+#: ../C/xiphos.xml:551(title)
 msgid "PreViewer"
 msgstr "Aperçu"
 
-#: ../C/xiphos.xml:537(para)
+#: ../C/xiphos.xml:569(para)
 msgid ""
 "The Previewer is where the user sees Strong's numbers, morphological tags, "
 "footnotes, and cross-references that the <interface>Bible Text Pane</"
@@ -2372,10 +2288,10 @@ msgstr ""
 "étiquettes morphologiques et les références croisées présentées dans le "
 "volet des <interface>textes bibliques</interface>."
 
-#: ../C/xiphos.xml:541(para)
+#: ../C/xiphos.xml:573(para)
 msgid ""
 "Footnote content is displayed in the Previewer when you hover over the "
-"indicator <guibutton>*n</guibutton> in the Bible text; It remains visible "
+"indicator <guibutton>*n</guibutton> in the Bible text; it remains visible "
 "until your mouse moves over another indicator, Strong's number, etc. "
 "Sometimes you may want the text to remain anchored until you can move the "
 "mouse to the previewer to click on a link or to read large footnotes. To "
@@ -2383,18 +2299,18 @@ msgid ""
 "indicator (or hold down the <guibutton>Shift key</guibutton>) and move to "
 "the Previewer."
 msgstr ""
-"Les notes de bas de page sont affichées dans le volet <interface> Aperçu</"
-"interface> quand le curseur de la souris survole un indicateur de type "
-"<guimenuitem>*n</guimenuitem> dans le texte biblique; Elles restent visibles "
-"tant que le curseur de la souris n'a pas survolé un autre indicateur. "
-"Cependant, dans certains cas, il peut être souhaitable de figer le texte "
-"pour se déplacer ensuite dans la fenêtre et utiliser l'ascenseur vertical ou "
-"sélectionner des liens. Dans ce cas, un clic sur le de bouton du milieu à "
-"l'aide de la souris (ou un appui sur la touche <guibutton>Majuscule</"
-"guibutton>) fige l'affichage de la note de bas de page dans le volet "
-"<interface>aperçu</interface>."
+"Les notes de bas de page s'affichent dans le volet <interface>Aperçu</"
+"interface> quand un indicateur de type <guimenuitem>*n</guimenuitem> est "
+"survolé par la souris dans un texte biblique; Elles restent visibles jusqu'à "
+"ce que le curseur de la souris survole un autre indicateur. Cependant, dans "
+"certains cas, il peut être souhaitable de figer le texte pour déplacer "
+"ensuite le curseur de la souris dans le volet <interface>Aperçu</interface> "
+"pour sélectionner un lien ou lire une longue note. Dans ce cas, un clic sur "
+"le de bouton du milieu à l'aide de la souris (ou un appui sur la touche "
+"<guibutton>Majuscule</guibutton>) fige l'affichage de la note de bas de page "
+"et permet de se déplacer ensuite dans le volet <interface>aperçu</interface>."
 
-#: ../C/xiphos.xml:548(para)
+#: ../C/xiphos.xml:580(para)
 msgid ""
 "Cross-reference indicators <guibutton>*x</guibutton> work much the same way. "
 "Clicking the indicator will send the set of references to the "
@@ -2408,11 +2324,35 @@ msgstr ""
 "<interface>volet latéral</interface>, où ensuite sélectionnés un par un, ils "
 "pourront être affichés dans le volet <interface>aperçu</interface>."
 
-#: ../C/xiphos.xml:556(title) ../C/xiphos.xml:558(title)
+#: ../C/xiphos.xml:585(para)
+msgid ""
+"Any verses shown in reverse-highlight have personal annotation associated "
+"with them, and such verses will include <guibutton>*u</guibutton> at the "
+"beginning of the verse. Hovering on this marker will show the annotation in "
+"the previewer, just as for publisher's footnotes."
+msgstr ""
+"N'importe quel verset surligné indique une annotation personnelle associée "
+"avec lui, ces versets incluent une marque <guibutton>*u</guibutton> au "
+"début. Survoler cette marque permet d'afficher l'annotation dans le volet "
+"Aperçu, de la même façon que les notes de bas de page."
+
+#: ../C/xiphos.xml:590(para)
+msgid ""
+"If a devotional has been set via the Preferences dialog, then the day's "
+"devotional reference will also appear in the previewer, either on program "
+"startup or when the user requests it via the <guimenuitem>View</guimenuitem> "
+"menu."
+msgstr ""
+"Si un calendrier biblique a été défini dans les Préférences, alors la "
+"méditation biblique du jour est affichée dans le volet Aperçu, soit au "
+"démarrage du programme ou soit lorsque l'utilisateur le demande via le menu "
+"<guimenuitem>Affichage</guimenuitem>."
+
+#: ../C/xiphos.xml:597(title) ../C/xiphos.xml:599(title)
 msgid "The Commentary Pane"
 msgstr "Le volet des commentaires"
 
-#: ../C/xiphos.xml:577(para)
+#: ../C/xiphos.xml:618(para)
 msgid ""
 "The <interface>Commentary pane</interface> is where the commentary modules "
 "are displayed. This provides easy reading, reference, and access to "
@@ -2430,7 +2370,7 @@ msgstr ""
 "suffit de changer de verset à l'aide de la <interface>Barre d'outils</"
 "interface>."
 
-#: ../C/xiphos.xml:584(para)
+#: ../C/xiphos.xml:625(para)
 msgid ""
 "If there are images that are part of a commentary, general book, or "
 "dictionary/lexicon, they may be clicked to invoke a viewer on that single "
@@ -2444,7 +2384,7 @@ msgstr ""
 "intéressante si l'option de réduction des images a été activée avec pour "
 "résultat des images très rétrécies."
 
-#: ../C/xiphos.xml:590(para)
+#: ../C/xiphos.xml:631(para)
 msgid ""
 "By changing to passage settings on the <interface>Toolbar</interface>, the "
 "contents in the <interface>Bible Text pane</interface> and the "
@@ -2455,15 +2395,15 @@ msgstr ""
 "bibliques</interface> et du  volet d'affichage des<interface> commentaires</"
 "interface> changent simultanément."
 
-#: ../C/xiphos.xml:597(title)
+#: ../C/xiphos.xml:638(title)
 msgid "Finding Out About The Commentary Module"
 msgstr "Rechercher les informations à propos du module de commentaires"
 
-#: ../C/xiphos.xml:598(para)
+#: ../C/xiphos.xml:639(para)
 msgid "To find out about the commentary currently being displayed:"
 msgstr "À propos du commentaire actuellement affiché :"
 
-#: ../C/xiphos.xml:603(para)
+#: ../C/xiphos.xml:644(para)
 msgid ""
 "right-click in the <interface>Commentary Pane</interface>. In the popup menu "
 "choose <guimenuitem>About </guimenuitem> module name."
@@ -2472,11 +2412,11 @@ msgstr ""
 "d'affichage des <interface>commentaires</interface>. Dans le menu contextuel "
 "qui se présente, sélectionner <guimenuitem>À propos de</guimenuitem>."
 
-#: ../C/xiphos.xml:612(title)
+#: ../C/xiphos.xml:653(title)
 msgid "Commentary Headings."
 msgstr "Entêtes des commentaires"
 
-#: ../C/xiphos.xml:613(para)
+#: ../C/xiphos.xml:654(para)
 msgid ""
 "Many commentaries have additional headings which enable introductory "
 "information about the book and chapter currently being displayed in the "
@@ -2485,9 +2425,9 @@ msgstr ""
 "De nombreux commentaires incorporent des entêtes avec une note "
 "d'introduction sur le livre ou le chapitre en cours d'utilisation dans le "
 "volet des<interface> textes bibliques</interface>. Pour obtenir l'affichage "
-"de l'entête&nbsp;:"
+"de l'entête&#160;:"
 
-#: ../C/xiphos.xml:619(para)
+#: ../C/xiphos.xml:660(para)
 msgid ""
 "right-click in the <interface>Commentary Pane</interface>. In the popup menu "
 "choose <guimenuitem>Display Book Heading</guimenuitem> or "
@@ -2498,15 +2438,15 @@ msgstr ""
 "qui se présente, choisir <guimenuitem>Afficher l'entête du livre</"
 "guimenuitem> ou <guimenuitem>Afficher l'entête du chapitre</guimenuitem>."
 
-#: ../C/xiphos.xml:629(title)
+#: ../C/xiphos.xml:670(title)
 msgid "Dictionary Pane"
 msgstr "Volet dictionnaire"
 
-#: ../C/xiphos.xml:631(title) ../C/xiphos.xml:644(phrase)
+#: ../C/xiphos.xml:672(title) ../C/xiphos.xml:685(phrase)
 msgid "The Dictionary Pane"
 msgstr "Le volet du dictionnaire"
 
-#: ../C/xiphos.xml:651(para)
+#: ../C/xiphos.xml:692(para)
 msgid ""
 "The Dictionary Pane's content is driven by its up/down selectors, typing in "
 "its navbar text, or double-clicks in the Bible, Commentary, or Book Panes."
@@ -2516,41 +2456,42 @@ msgstr ""
 "sur des mots dans les volets <interface>Textes bibliques</interface>, "
 "<interface>Commentaires</interface>, <interface>Livre</interface>."
 
-#: ../C/xiphos.xml:657(title)
+#: ../C/xiphos.xml:698(title)
 msgid "Keyboard Shortcuts"
 msgstr "Raccourcis clavier"
 
-#: ../C/xiphos.xml:658(para)
+#: ../C/xiphos.xml:699(para)
 msgid "Several keyboard shortcuts exist in <application>Xiphos</application>:"
 msgstr ""
 "<application>Xiphos</application>  présente un certain nombre de raccourcis "
 "clavier :"
 
-#: ../C/xiphos.xml:663(para)
+#: ../C/xiphos.xml:704(para)
 msgid "<guibutton>F1</guibutton>: opens this manual."
 msgstr "<guibutton>F1</guibutton> : ouvre ce manuel."
 
-#: ../C/xiphos.xml:668(para)
+#: ../C/xiphos.xml:709(para)
 msgid ""
 "<guibutton>F2</guibutton>: opens the <guibutton>Preferences</guibutton> "
 "dialog."
 msgstr ""
-"<guibutton>F2</guibutton>:·ouvre·la fenêtre des·<guibutton>Préférences"
-"</guibutton>·"
-""
+"<guibutton>F2</guibutton>:·ouvre·la fenêtre des·<guibutton>Préférences</"
+"guibutton>·"
 
-#: ../C/xiphos.xml:673(para)
+#: ../C/xiphos.xml:714(para)
 msgid ""
 "<guibutton>F3</guibutton>: opens <guibutton>Advanced Search</guibutton>."
-msgstr "<guibutton>F3</guibutton> :·ouvre·la <guibutton>Recherche avancée</guibutton>"
+msgstr ""
+"<guibutton>F3</guibutton> :·ouvre·la <guibutton>Recherche avancée</guibutton>"
 
-#: ../C/xiphos.xml:678(para)
+#: ../C/xiphos.xml:719(para)
 msgid ""
 "<guibutton>F4</guibutton>: opens the <guibutton>Module Manager</guibutton>."
-msgstr "<guibutton>F4</guibutton> :·ouvre·le·<guibutton>Gestionnaire de modules"
-"</guibutton>."
+msgstr ""
+"<guibutton>F4</guibutton> :·ouvre·le·<guibutton>Gestionnaire de modules</"
+"guibutton>."
 
-#: ../C/xiphos.xml:683(para)
+#: ../C/xiphos.xml:724(para)
 msgid ""
 "<guibutton>Ctrl-L</guibutton> focuses and selects the main verse navbar "
 "text. You can then immediately type in new verse selection text. Be aware "
@@ -2558,14 +2499,14 @@ msgid ""
 "application> understands many abbreviations: \"G\" is adequate to specify "
 "Genesis, for example, and any book name by itself implies 1:1."
 msgstr ""
-"<guibutton>Ctrl-L</guibutton> sélectionne la zone de saisie de référence biblique. "
-"Il est ainsi possible de saisir directement une nouvelle référence de verset. Il "
-"est à noter que <placeholder-2/>, comme d'autres applications Sword, accepte "
-"de nombreuses abréviations. «­­&nbsp;G&nbsp;»  correspond à Genèse par "
-"exemple, et n'importe quel nom de livre saisi seul implique chapitre 1, "
-"verset 1."
+"<guibutton>Ctrl-L</guibutton> sélectionne la zone de saisie de référence "
+"biblique. Il est ainsi possible de saisir directement une nouvelle référence "
+"de verset. Il est à noter que <placeholder-2/>, comme d'autres applications "
+"Sword, accepte de nombreuses abréviations. «­­&#160;G&#160;»  correspond à "
+"Genèse par exemple, et n'importe quel nom de livre saisi seul implique "
+"chapitre 1, verset 1."
 
-#: ../C/xiphos.xml:691(para)
+#: ../C/xiphos.xml:732(para)
 msgid ""
 "<guibutton>Ctrl-F</guibutton> opens the \"Find\" dialog. The subwindow to "
 "which it applies depends on which of them are visible: The Bible is first "
@@ -2573,23 +2514,23 @@ msgid ""
 "tab can be dedicated to just a genbook, and Ctrl-F will perform \"Find\" "
 "within that pane."
 msgstr ""
-"<guibutton>Ctrl-F</guibutton> ouvre la fenêtre de recherche. Le volet sur lequel "
-"elle est exécutée dépend desquels d'entre eux sont visibles. Le volet biblique a la "
-"première préférence, puis le volet des commentaires ou le livre et enfin le "
-"dictionnaire. Ainsi un onglet peut être dédié à n'afficher que le volet "
-"livre et la recherche initiée par <placeholder-1/> ne sera effectuée que "
-"dans les limites de ce volet."
+"<guibutton>Ctrl-F</guibutton> ouvre la fenêtre de recherche. Le volet sur "
+"lequel elle est exécutée dépend desquels d'entre eux sont visibles. Le volet "
+"biblique a la première préférence, puis le volet des commentaires ou le "
+"livre et enfin le dictionnaire. Ainsi un onglet peut être dédié à n'afficher "
+"que le volet livre et la recherche initiée par <placeholder-1/> ne sera "
+"effectuée que dans les limites de ce volet."
 
-#: ../C/xiphos.xml:698(para)
+#: ../C/xiphos.xml:739(para)
 msgid ""
 "<guibutton>Alt-C</guibutton> brings the Commentary View forward when "
 "previously obscured by the Book View."
 msgstr ""
-"<guibutton>Alt-C</guibutton> ramène au premier-plan le volet <interface>"
-"Commentaire</interface> si celui-ci est masqué par le volet <interface>Livre"
-"</interface>."
+"<guibutton>Alt-C</guibutton> ramène au premier-plan le volet "
+"<interface>Commentaire</interface> si celui-ci est masqué par le volet "
+"<interface>Livre</interface>."
 
-#: ../C/xiphos.xml:703(para)
+#: ../C/xiphos.xml:744(para)
 msgid ""
 "<guibutton>Alt-G</guibutton> is the opposite of Alt-C, focusing on the "
 "general book."
@@ -2597,55 +2538,59 @@ msgstr ""
 "<guibutton>Alt-G</guibutton> ramène au premier-plan le volet "
 "<interface>Livre</interface>."
 
-#: ../C/xiphos.xml:708(para)
+#: ../C/xiphos.xml:749(para)
 msgid ""
 "<guibutton>Alt-B</guibutton> opens a bookmark dialog on the current verse."
 msgstr ""
-"<guibutton>Alt-B</guibutton> ouvre la fenêtre <interface>Ajouter un signet"
-"</interface> sur le verset en cours"
+"<guibutton>Alt-B</guibutton> ouvre la fenêtre <interface>Ajouter un signet</"
+"interface> sur le verset en cours"
 
-#: ../C/xiphos.xml:713(para)
+#: ../C/xiphos.xml:754(para)
 msgid "<guibutton>Alt-D</guibutton> focuses on the dictionary navbar text."
 msgstr ""
-"<guibutton>Alt-D</guibutton> place le focus sur la barre de navigation du volet "
-"<interface>Dictionnaire</interface>."
+"<guibutton>Alt-D</guibutton> place le focus sur la barre de navigation du "
+"volet <interface>Dictionnaire</interface>."
 
-#: ../C/xiphos.xml:718(para)
+#: ../C/xiphos.xml:759(para)
 msgid ""
 "<guibutton>Alt-P</guibutton> detaches/re-attaches the parallel view dialog."
-msgstr "<guibutton>Alt-P</guibutton> détache / rattache la fenêtre de vue parallèle."
+msgstr ""
+"<guibutton>Alt-P</guibutton> détache / rattache la fenêtre de vue parallèle."
 
-#: ../C/xiphos.xml:723(para)
+#: ../C/xiphos.xml:764(para)
 msgid "<guibutton>Alt-Z</guibutton> opens the personal commentary editor."
-msgstr "<guibutton>Alt-Z</guibutton> ouvre l'éditeur de commentaires personnels."
+msgstr ""
+"<guibutton>Alt-Z</guibutton> ouvre l'éditeur de commentaires personnels."
 
-#: ../C/xiphos.xml:728(para)
+#: ../C/xiphos.xml:769(para)
 msgid ""
 "<guibutton>Ctrl-Plus/Ctrl-Minus</guibutton> increases/decreases the base "
 "font size."
-msgstr "<guibutton>Ctrl-Plus/Ctrl-Minus</guibutton> augmente / diminue la taille de police"
+msgstr ""
+"<guibutton>Ctrl-Plus/Ctrl-Minus</guibutton> augmente / diminue la taille de "
+"police"
 
-#: ../C/xiphos.xml:737(para)
+#: ../C/xiphos.xml:778(para)
 msgid "<guibutton>Ctrl-p/Ctrl-n</guibutton>: Verse previous/next."
 msgstr "<guibutton>Ctrl-p/Ctrl-n</guibutton> : Verset précédent/suivant."
 
-#: ../C/xiphos.xml:741(para)
+#: ../C/xiphos.xml:782(para)
 msgid "<guibutton>p/n</guibutton>: Chapter previous/next."
 msgstr "<guibutton>p/n</guibutton> : Chapitre précédent/suivant."
 
-#: ../C/xiphos.xml:745(para)
+#: ../C/xiphos.xml:786(para)
 msgid "<guibutton>P/N</guibutton>: Book previous/next."
 msgstr "<guibutton>P/N</guibutton>:·Livre biblique suivant/précédent."
 
-#: ../C/xiphos.xml:733(para)
+#: ../C/xiphos.xml:774(para)
 msgid "Location bar navigation: <placeholder-1/>"
 msgstr "Activer la barre de navigation:·<placeholder-1/>"
 
-#: ../C/xiphos.xml:755(title)
+#: ../C/xiphos.xml:796(title)
 msgid "Version Differences in <application>Xiphos</application>'s Display"
 msgstr "Différences d'affichage dans <application>&appname;</application> :"
 
-#: ../C/xiphos.xml:756(para)
+#: ../C/xiphos.xml:797(para)
 msgid ""
 "The <application>Xiphos</application> interface has evolved over time, and "
 "there are two display libraries with which <application>Xiphos</application> "
@@ -2657,10 +2602,10 @@ msgstr ""
 "L'application <application>&appname;</application> a évolué au niveau des "
 "possibilités d'affichage. <application>&appname;</application> peut être "
 "compilé avec l'une des 2 bibliothèques suivantes au choix. La plus ancienne, "
-"moins complète se nomme «&nbsp;gtkhtml3&nbsp;», et la nouvelle offrant plus "
-"de possibilités est «&nbsp;MozEmbed&nbsp;»."
+"moins complète se nomme «&#160;gtkhtml3&#160;», et la nouvelle offrant plus "
+"de possibilités est «&#160;MozEmbed&#160;»."
 
-#: ../C/xiphos.xml:763(para)
+#: ../C/xiphos.xml:804(para)
 msgid ""
 "Several desirable capabilities are unsupportable in gtkhtml3, and although "
 "recent <application>Xiphos</application> is written to take advantage of "
@@ -2673,17 +2618,17 @@ msgid ""
 "MozEmbed is the underlying display engine:"
 msgstr ""
 "Un certain nombre de fonctionalités de <application>&appname;</application> "
-"ne sont pas supportées par «&nbsp;gtkhtml3&nbsp;». Bien que "
+"ne sont pas supportées par «&#160;gtkhtml3&#160;». Bien que "
 "<application>&appname;</application> soit écrit pour tirer parti des "
-"possibilités de «&nbsp;MozEmbed&nbsp;», il est possible que la version "
-"installée sur votre système ait été construite avec «&nbsp;gtkhtml3&nbsp;», "
+"possibilités de «&#160;MozEmbed&#160;», il est possible que la version "
+"installée sur votre système ait été construite avec «&#160;gtkhtml3&#160;», "
 "soit parceque la version de MozEmbed n'est pas suffisamment récente soit "
-"tout simplement parce qu'elle n'existe pas. (Note: «&nbsp;MozEmbed&nbsp;» "
+"tout simplement parce qu'elle n'existe pas. (Note: «&#160;MozEmbed&#160;» "
 "n'est passupporté par Window pour le moment). Les différences suivantes se "
-"feront observer selon l'utilisation de «&nbsp;gtkhtml3&nbsp;» ou «&nbsp;"
-"MozEmbed&nbsp;» comme moteur d'affichage :"
+"feront observer selon l'utilisation de «&#160;gtkhtml3&#160;» ou «&#160;"
+"MozEmbed&#160;» comme moteur d'affichage :"
 
-#: ../C/xiphos.xml:774(para)
+#: ../C/xiphos.xml:815(para)
 msgid ""
 "Morphology and Strong's references, enabled via the right-click menu in some "
 "modules, are displayed inline with gtkhtml3; with MozEmbed, a blocked "
@@ -2692,37 +2637,38 @@ msgid ""
 msgstr ""
 "Les étiquettes morphologiques ainsi que les références de Strong, activées "
 "via un menu contextuel dans certains modules, sont affichées dans le corps "
-"du texte avec  «&nbsp;gtkhtml3&nbsp;». Avec «&nbsp;MozEmbed&nbsp;», ces "
+"du texte avec  «&#160;gtkhtml3&#160;». Avec «&#160;MozEmbed&#160;», ces "
 "références sont alignées au-dessous du mot auxquelles elles se rapportent de "
 "façon à procurer un affichage plus aéré et plus lisible."
 
-#: ../C/xiphos.xml:781(para)
+#: ../C/xiphos.xml:822(para)
 msgid ""
 "Footnote and cross-reference markers (<guibutton>*n</guibutton>, "
 "<guibutton>*x</guibutton>) are displayed as proper superscripts in MozEmbed, "
 "but not in gtkhtml3."
 msgstr ""
-"Les notes de pied de page et les références croisées (<guibutton>*n</guibutton>,·"
-"<guibutton>*x</guibutton>) s'affichent en mode exposant avec «&nbsp;MozEmbed&nbsp;»."
+"Les notes de pied de page et les références croisées (<guibutton>*n</"
+"guibutton>,·<guibutton>*x</guibutton>) s'affichent en mode exposant avec "
+"«&#160;MozEmbed&#160;»."
 
-#: ../C/xiphos.xml:787(para)
+#: ../C/xiphos.xml:828(para)
 msgid ""
 "Links in gtkhtml3 are necessarily both colored and underlined; in MozEmbed, "
 "no underlines are needed."
 msgstr ""
-"Les liens avec «&nbsp;gtkhtml3&nbsp;» sont à la fois colorés et soulignés. "
-"Ils ne sont pas soulignés avec «&nbsp;MozEmbed&nbsp;»."
+"Les liens avec «&#160;gtkhtml3&#160;» sont à la fois colorés et soulignés. "
+"Ils ne sont pas soulignés avec «&#160;MozEmbed&#160;»."
 
-#: ../C/xiphos.xml:792(para)
+#: ../C/xiphos.xml:833(para)
 msgid ""
 "Under MozEmbed, double-space display is available using the "
 "<guimenuitem>View</guimenuitem> menu, but not under gtkhtml3."
 msgstr ""
-"Avec «&nbsp;MozEmbed&nbsp;», l'affichage en double espacement du texte est "
+"Avec «&#160;MozEmbed&#160;», l'affichage en double espacement du texte est "
 "activable à l'aide du menu <guimenuitem>Affichage</guimenuitem>, cette "
-"option est indisponible avec «&nbsp;gtkhtml3&nbsp;»."
+"option est indisponible avec «&#160;gtkhtml3&#160;»."
 
-#: ../C/xiphos.xml:798(para)
+#: ../C/xiphos.xml:839(para)
 msgid ""
 "It is not possible for gtkhtml3 to interpret multiple font face directives "
 "in a single window, so the gtkhtml3 detached parallel view window cannot "
@@ -2730,10 +2676,10 @@ msgid ""
 "are ignored in any gtkhtml3 window."
 msgstr ""
 "Gtkhtml3 ne sait pas interpréter les directives de polices multiples dans "
-"une même fenêtre, c'est pourquoi la fenêtre détachée «&nbsp;Vue "
-"parallèle&nbsp;» ne permet pas une sélection de police par module."
+"une même fenêtre, c'est pourquoi la fenêtre détachée «&#160;Vue "
+"parallèle&#160;» ne permet pas une sélection de police par module."
 
-#: ../C/xiphos.xml:806(para)
+#: ../C/xiphos.xml:847(para)
 msgid ""
 "Using the \"About Xiphos\" selection under the <guimenuitem>Help</"
 "guimenuitem> menu, you will see the display library with which "
@@ -2744,14 +2690,26 @@ msgstr ""
 "bibliothèque avec laquelle <application>&appname;</application> a été "
 "construit."
 
-#: ../C/xiphos.xml:811(title) ../C/xiphos.xml:818(phrase)
+#: ../C/xiphos.xml:852(title) ../C/xiphos.xml:859(phrase)
 msgid "Comparison, gtkhtml3 -vs- mozembed"
 msgstr "Comparaison d'affichage entre gtkhtml3 et mozembed"
 
-#: ../C/xiphos.xml:398(title)
+#: ../C/xiphos.xml:219(title)
 msgid "Preferences"
 msgstr "Préférences"
 
+#: ../C/xiphos.xml:6(title) ../C/preferences.xml:6(title)
+msgid "Introduction To Preferences"
+msgstr "Introduction aux préférences"
+
+#: ../C/xiphos.xml:8(title) ../C/preferences.xml:8(title)
+msgid "The Preference Dialog"
+msgstr "La fenêtre des préférences"
+
+#: ../C/xiphos.xml:21(phrase) ../C/preferences.xml:21(phrase)
+msgid "The Preferences Dialog"
+msgstr "La fenêtre des préférences"
+
 #: ../C/xiphos.xml:30(title)
 msgid "Fonts And Colors"
 msgstr "Polices et couleurs"
@@ -2818,7 +2776,7 @@ msgid ""
 msgstr ""
 "Les <guilabel>Calendriers bibliques</guilabel> sont des modules "
 "dictionnaires spécifiques dont les entrées sont de la forme numérique \"Mois:"
-"Jour\" (ex&nbsp;: 12:25). Si un module de ce type a été installé puis "
+"Jour\" (ex&#160;: 12:25). Si un module de ce type a été installé puis "
 "déclaré comme Calendrier biblique dans les préférences diverses des modules, "
 "<application>&appname;</application> peut présenter le texte du jour lors du "
 "démarrage."
@@ -2896,43 +2854,100 @@ msgstr "Préférences diverses des modules"
 msgid "Various Preferences Modules"
 msgstr "Préférences diverses des modules"
 
-#: ../C/xiphos.xml:404(title)
+#: ../C/xiphos.xml:225(title)
 msgid "Module Manager"
 msgstr "Gérer les modules"
 
+#: ../C/xiphos.xml:5(title) ../C/modules.xml:5(title)
+msgid "Introduction To The Module Manager"
+msgstr "Introduction à la gestion des modules"
+
+#: ../C/xiphos.xml:6(para) ../C/modules.xml:6(para)
+msgid ""
+"The \"module\" is the unit of content in <application>Xiphos</application>, "
+"and Sword generally; a Sword module is a resource available for viewing in "
+"Sword applications. There are several varieties: Most importantly, Bible "
+"texts, as well as dictionaries and lexicons, commentaries, and general "
+"books, any of which may include image content (e.g. atlases). They are "
+"installed either from a local directory structure (typically on removable "
+"media, such as a CDROM distribution) or remotely via ftp from a repository "
+"such as Crosswire, which is the home of Sword, and from which all officially "
+"Sword-sanctioned modules are available. Also, many other modules are "
+"available from non-Crosswire repositories."
+msgstr ""
+"Le «­­&#160;module&#160;» est un bloc de contenu dans <application>&appname;</"
+"application> et plus généralement dans toute application basée sur Sword. Un "
+"module de Sword est une ressource destinée à être affichée dans une "
+"application Sword. Les modules sont de plusieurs types dont, en premier, les "
+"textes bibliques, puis les commentaires, les dictionnaires et lexiques, les "
+"livres ordinaires, ceux offrant un contenu graphique (Atlas). Ils sont à "
+"installer depuis un dépot local (distribution par CDROM) ou par "
+"téléchargement ftp depuis un dépot distant comme celui de Crosswire, site de "
+"Sword, où tous les modules certiifiés par Crosswire sont disponibles. Des "
+"modules sont également disponibles auprès d'autres sources."
+
+#: ../C/xiphos.xml:14(para) ../C/modules.xml:14(para)
+msgid ""
+"If you have other Sword applications installed, they will all share the same "
+"set of Sword modules that you install through the Module Manager."
+msgstr ""
+"Si d'autres applications basées sur Sword sont installées, elles ont accès "
+"aux modules installés par le gestionnaire de modules."
+
+#: ../C/xiphos.xml:19(title) ../C/xiphos.xml:32(phrase)
+#: ../C/modules.xml:19(title) ../C/modules.xml:32(phrase)
+msgid "The Module Manager Dialog"
+msgstr "La fenêtre de gestion des modules"
+
 #: ../C/xiphos.xml:41(title)
 msgid "Sword Module Configurations"
 msgstr "Configuration des modules de Sword"
 
 #: ../C/xiphos.xml:43(title) ../C/xiphos.xml:45(title)
-msgid "Sword Sources Settings"
-msgstr "Configurer les dépots Sword"
+msgid "Module Sources Settings"
+msgstr "Configurer les dépots de modules"
 
-#: ../C/xiphos.xml:58(phrase) ../C/xiphos.xml:86(phrase)
-#: ../C/xiphos.xml:155(phrase)
+#: ../C/xiphos.xml:58(phrase) ../C/xiphos.xml:92(phrase)
+#: ../C/xiphos.xml:161(phrase)
 msgid "Module Installation"
 msgstr "Installation de module"
 
 #: ../C/xiphos.xml:64(para)
 msgid ""
-"There are other repositories available besides Crosswire's own, though the "
+"There are other repositories available besides CrossWire's own, though the "
 "modules available from other repositories do not represent content "
 "officially sanctioned by Crosswire. On the web, see this page for list of "
 "those repositories known: <ulink type=\"http\" url=\"http://www.crosswire."
 "org/wiki/Module_Repositories\">http://www.crosswire.org/wiki/"
 "Module_Repositories</ulink>"
 msgstr ""
-"D'autres dépots non liés à Crosswire proposent des modules Sword, bien que "
+"Il y a d'autres dépots disponibles en plus de ceux de Crosswire, bien que "
 "les modules offerts par ces autres dépots ne présentent pas un contenu "
-"officiellement certifié par Crosswire. La page web <ulink url=\"http://www."
-"crosswire.org/wiki/index.php/Module_Repositories\">http://www.crosswire.org/"
-"wiki/index.php/Module_Repositories</ulink> recense les dépots connus."
+"officiellement certifié par Crosswire. Sur le web, cette page recense les "
+"dépots connus : <ulink url=\"http://www.crosswire.org/wiki/"
+"Module_Repositories\">http://www.crosswire.org/wiki/Module_Repositories</"
+"ulink>."
+
+#: ../C/xiphos.xml:69(para)
+msgid ""
+"The list of standard repositories is maintained at CrossWire. Xiphos "
+"normally auto-synchronizes with that list one time, when the user first puts "
+"the Module Manager to use. The list may change, as new repositories come "
+"into existence; occasional re-synchronization with the list is suggested, "
+"which is accomplished by clicking the <guibutton>Load Standard</guibutton>."
+msgstr ""
+"La liste des dépots standard est maintenue par Crosswire. Xiphos s'auto-"
+"synchronise une fois avec cette liste, quand l'utilisateur se sert de la "
+"première fois du gestionnaire de modules. La liste peut changer, au fur et à "
+"mesure que de nouveaux dépots viennent à existence; une resynchronisation "
+"occasionnelle avec cette liste est suggérée, ce qui est accompli en cliquant "
+"the <guibutton>Charger standard</guibutton>."
 
-#: ../C/xiphos.xml:71(title) ../C/xiphos.xml:73(title)
+#: ../C/xiphos.xml:77(title) ../C/xiphos.xml:79(title)
 msgid "Sword Module Installations"
 msgstr "Destination des modules Sword"
 
-#: ../C/xiphos.xml:91(para)
+#: ../C/xiphos.xml:97(para)
 msgid ""
 "After you have selected your Install Source, click the <guimenuitem>Refresh</"
 "guimenuitem> button to cause <application>Xiphos</application> to find the "
@@ -2942,7 +2957,7 @@ msgstr ""
 "guimenuitem>, ce qui conduit <application>&appname;</application> à "
 "répertorier les modules disponibles au niveau du dépot."
 
-#: ../C/xiphos.xml:96(para)
+#: ../C/xiphos.xml:102(para)
 msgid ""
 "Take note of the \"Install Destination\". In most cases, you will have a "
 "choice of a personal area or a system area. The details vary according to "
@@ -2952,11 +2967,11 @@ msgstr ""
 "est proposé le choix entre un espace personnel et un espace système. Ceci "
 "est dépendant du système d'exploitation."
 
-#: ../C/xiphos.xml:102(title)
+#: ../C/xiphos.xml:108(title)
 msgid "Linux"
 msgstr "Linux"
 
-#: ../C/xiphos.xml:103(para)
+#: ../C/xiphos.xml:109(para)
 msgid ""
 "Unless you run as root (via su or sudo) you will only be able to install in "
 "your personal area, under ~/.sword. If you run as root, or change "
@@ -2988,11 +3003,11 @@ msgstr ""
 "d'accès en écriture à l'emplacement système en dehors de "
 "<application>&appname;</application>."
 
-#: ../C/xiphos.xml:116(title)
+#: ../C/xiphos.xml:122(title)
 msgid "Windows XP"
 msgstr "Windows XP"
 
-#: ../C/xiphos.xml:117(para)
+#: ../C/xiphos.xml:123(para)
 msgid ""
 "You may install modules to a shared folder so the modules are available to "
 "all users. If you have previously used \"The Sword Project for Windows\", "
@@ -3004,19 +3019,19 @@ msgid ""
 msgstr ""
 "Les modules peuvent être installés dans un dossier partagé de façon à "
 "permettre l'accès à ces modules par tous les utilisateurs. Si le logiciel "
-"«&nbsp;The·Sword Project for Windows&nbsp;» a été utilisé précédemment, ce "
-"répertoire est «&nbsp;C:\\Program Files\\Crosswire\\The Sword Project"
-"\\Sword&nbsp;», sinon c'est «&nbsp;C:\\Documents and Settings\\All Users"
-"\\Application Data\\Sword&nbsp;». Les modules peuvent être également "
+"«&#160;The·Sword Project for Windows&#160;» a été utilisé précédemment, ce "
+"répertoire est «&#160;C:\\Program Files\\Crosswire\\The Sword Project"
+"\\Sword&#160;», sinon c'est «&#160;C:\\Documents and Settings\\All Users"
+"\\Application Data\\Sword&#160;». Les modules peuvent être également "
 "installés dans un compte d'utilisateur spécifique et seront accessibles à "
-"lui seul, ce dossier est «&nbsp;C:\\Documents and Settings\\{Nom du compte "
-"d'utilisateur}\\Application Data\\Sword&nbsp;»"
+"lui seul, ce dossier est «&#160;C:\\Documents and Settings\\{Nom du compte "
+"d'utilisateur}\\Application Data\\Sword&#160;»"
 
-#: ../C/xiphos.xml:126(title)
+#: ../C/xiphos.xml:132(title)
 msgid "Windows Vista"
 msgstr "Windows Vista"
 
-#: ../C/xiphos.xml:127(para)
+#: ../C/xiphos.xml:133(para)
 msgid ""
 "Vista works much the same as XP, except for the locations. The private "
 "location is \"C:\\Users\\YOUR NAME\\AppData\\Roaming\\Sword\". The shared "
@@ -3024,19 +3039,19 @@ msgid ""
 msgstr ""
 "Windows Vista fonctionne sensiblement de la même façon que Windows XP, les "
 "dossiers sont cependant différents. L'espace du compte utilisateur se trouve "
-"dans «&nbsp;C:\\Utilisateurs\\{Nom du compte utilisateur}\\AppData\\Roaming"
-"\\Sword&nbsp;» et l'espace partagé dans «&nbsp;C:\\ProgramData\\Sword&nbsp;»."
+"dans «&#160;C:\\Utilisateurs\\{Nom du compte utilisateur}\\AppData\\Roaming"
+"\\Sword&#160;» et l'espace partagé dans «&#160;C:\\ProgramData\\Sword&#160;»."
 "(Ce répertoire fait partie des répertoires cachés)."
 
-#: ../C/xiphos.xml:138(title) ../C/xiphos.xml:140(title)
+#: ../C/xiphos.xml:144(title) ../C/xiphos.xml:146(title)
 msgid "Installing, Updating, and Maintaining Modules"
 msgstr "Installer, mettre à jour et maintenir les modules"
 
-#: ../C/xiphos.xml:142(title)
+#: ../C/xiphos.xml:148(title)
 msgid "Installing and Updating Modules"
 msgstr "Installation et mise à jour de modules"
 
-#: ../C/xiphos.xml:161(para)
+#: ../C/xiphos.xml:167(para)
 msgid ""
 "The module manager generates both a per-type module list as well as a "
 "parallel availability list. The latter is intended to make it easier to find "
@@ -3051,7 +3066,7 @@ msgstr ""
 "installés ou pour lesquels existe une mise à jour apparaissent dans cette "
 "liste."
 
-#: ../C/xiphos.xml:166(para)
+#: ../C/xiphos.xml:172(para)
 msgid ""
 "Modules that are already installed will show a checkmark beside them. If a "
 "fast search (\"lucene\") index is available, a magnifying glass will be "
@@ -3066,7 +3081,7 @@ msgid ""
 msgstr ""
 "Une coche indique les modules déjà installés. Si un index de recherche "
 "optimisée (\"Lucène\") a été créé, un symbole représentant une loupe est "
-"affiché, sinon un «&nbsp;X&nbsp;» est présenté. La création d'un index de "
+"affiché, sinon un «&#160;X&#160;» est présenté. La création d'un index de "
 "recherche optimisée se fait dans l'onglet <guimenuitem>Maintenance</"
 "guimenuitem>. Les modules verrouillés, nécessitant l'achat d'une clé de "
 "déverrouillage auprès du détenteur des droits d'un module sous copyright "
@@ -3074,10 +3089,10 @@ msgstr ""
 "plus récente des modules déjà installés, un symbole de rafraîchissement "
 "apparaît entre les deux références de version du module. La taille "
 "approximative du module est affichée à condition que le dépot de modules "
-"fournisse cette information, sinon un point d'interrogation («&nbsp;?&nbsp;») "
+"fournisse cette information, sinon un point d'interrogation («&#160;?&#160;») "
 "est présenté.."
 
-#: ../C/xiphos.xml:173(para)
+#: ../C/xiphos.xml:179(para)
 msgid ""
 "Select new modules to be installed by clicking the checkboxes and then the "
 "Install button at the bottom. Any number of modules may be requested for "
@@ -3088,7 +3103,7 @@ msgstr ""
 "<guibutton>Installer</guibutton>. Plusieurs modules peuvent être installés "
 "simultanément."
 
-#: ../C/xiphos.xml:177(para)
+#: ../C/xiphos.xml:183(para)
 msgid ""
 "If you acquire a locked module and have obtained the cipher key for it, the "
 "module is then unlocked in the main window: Open the module, which will "
@@ -3102,12 +3117,12 @@ msgstr ""
 "droit de la souris, de sélectionner <guimenu>Déverrouiller ce module</"
 "guimenu> et de saisir la clé."
 
-#: ../C/xiphos.xml:183(title) ../C/xiphos.xml:185(title)
-#: ../C/xiphos.xml:198(phrase)
+#: ../C/xiphos.xml:189(title) ../C/xiphos.xml:191(title)
+#: ../C/xiphos.xml:204(phrase)
 msgid "Module Maintenance"
 msgstr "Maintenance des modules"
 
-#: ../C/xiphos.xml:203(para)
+#: ../C/xiphos.xml:209(para)
 msgid ""
 "Several maintenance functions are available: Removal, archival, index, and "
 "index deletion."
@@ -3115,7 +3130,7 @@ msgstr ""
 "Plusieurs opérations de maintenance sont possibles : Suppression, archivage, "
 "indexation et suppression d'index."
 
-#: ../C/xiphos.xml:206(para)
+#: ../C/xiphos.xml:212(para)
 msgid ""
 "Removal disposes of a module entirely. There is no recovery of the module "
 "unless you have previously archived a copy of it."
@@ -3123,7 +3138,7 @@ msgstr ""
 "Supprimer un module est une opération définitive. Il est impossible de "
 "récupérer le module à moins que vous n'ayez une copie de celui-ci."
 
-#: ../C/xiphos.xml:209(para)
+#: ../C/xiphos.xml:215(para)
 msgid ""
 "Archival is available for any module, although it is provided with personal "
 "commentaries specifically in mind. A *.zip of the module is left in the "
@@ -3137,7 +3152,7 @@ msgstr ""
 "sword/zip. Il est recommandé d'archiver les commentaires personnels avant de "
 "les supprimer de façon à pouvoir les réinstaller si besoin est."
 
-#: ../C/xiphos.xml:214(para)
+#: ../C/xiphos.xml:220(para)
 msgid ""
 "Indexing is provided so that the underlying Sword search support can create "
 "the index needed for the \"lucene\" multi-word fast-search functions. If the "
@@ -3151,15 +3166,15 @@ msgstr ""
 "recherche de type multi-mots sur l'ensemble de la Bible ne dure que quelques "
 "secondes."
 
-#: ../C/xiphos.xml:219(para)
+#: ../C/xiphos.xml:225(para)
 msgid "Indexes may be deleted as well."
 msgstr "Les index peuvent être supprimés."
 
-#: ../C/xiphos.xml:227(title)
+#: ../C/xiphos.xml:233(title)
 msgid "Installing Non-Standard Modules"
 msgstr "Installer des modules manuellement"
 
-#: ../C/xiphos.xml:228(para)
+#: ../C/xiphos.xml:234(para)
 msgid ""
 "Some resource modules in Sword Project format are available from sources "
 "other than Crosswire and not from a module manager-ready repository. "
@@ -3170,7 +3185,7 @@ msgstr ""
 "gestionnaire de modules. Il est donc nécessaire de les installer "
 "manuellement."
 
-#: ../C/xiphos.xml:232(para)
+#: ../C/xiphos.xml:238(para)
 msgid ""
 "Modules are normally packaged as *.zip files; they contain a configuration "
 "file plus a number of data files. Installation of such a module is done by "
@@ -3187,14 +3202,14 @@ msgstr ""
 "répertoire de configuration Sword personnel. Ce répertoire se nomme ~/."
 "sword, et se trouve dans votre répertoire personnel (ce n'est pas celui de "
 "<application>&app;</application>) puis de décompresser le fichier zip à cet "
-"endroit. Le fichier de configuration sera placé dans le répertoire «­­&nbsp;"
-"mods.d&nbsp;»,et les fichiers de données dans les sous-répertoires de «­­"
-"&nbsp;modules&nbsp;». Si vous avez les droits en écriture du répertoire "
+"endroit. Le fichier de configuration sera placé dans le répertoire «­­&#160;"
+"mods.d&#160;»,et les fichiers de données dans les sous-répertoires de «­­"
+"&#160;modules&#160;». Si vous avez les droits en écriture du répertoire "
 "général de Sword usr/share/sword, vous pouvez aussi décompresser le fichier "
 "zip dans ce répertoire, ce module sera alors accessible à tous les "
 "utilisateurs."
 
-#: ../C/xiphos.xml:239(para)
+#: ../C/xiphos.xml:245(para)
 msgid ""
 "Restart <application>Xiphos</application> after installing such a module, so "
 "that a fresh instance of the program can notice the new module in place."
@@ -3203,10 +3218,308 @@ msgstr ""
 "avoir installé un module non-standard de façon à ce que le logiciel détecte "
 "le nouveau module en place."
 
-#: ../C/xiphos.xml:410(title)
+#: ../C/xiphos.xml:231(title)
 msgid "The Search Function"
 msgstr "Fonctions de recherche"
 
+#: ../C/xiphos.xml:4(title) ../C/search.xml:4(title)
+msgid "Simple Searches"
+msgstr "Recherche simple"
+
+#: ../C/xiphos.xml:5(para) ../C/search.xml:5(para)
+msgid ""
+"To conduct a quick search within the current Bible or commentary module, the "
+"Search Bar in the Sidebar should usually be adequate. Click either in the "
+"menu bar <guimenuitem>Edit-&gt;Search</guimenuitem> or in the Sidebar "
+"<guimenuitem>Modules-&gt;Search</guimenuitem> to access it."
+msgstr ""
+"Pour rechercher rapidement un mot ou une expression dans un module en cours "
+"d'utilisation, le plus simple est d'utiliser la fonction recherche du volet "
+"latéral. Cette fonction de recherche rapide est activée en sélectionnant  le "
+"menu <menuchoice><guimenuitem>Éditer</guimenuitem><guimenuitem>Rechercher</"
+"guimenuitem></menuchoice> ou le bouton <guibutton>Rechercher</guibutton> du "
+"volet latéral."
+
+#: ../C/xiphos.xml:11(title) ../C/xiphos.xml:24(phrase)
+#: ../C/search.xml:11(title) ../C/search.xml:24(phrase)
+msgid "The Search Bar"
+msgstr "La barre de recherche"
+
+#: ../C/xiphos.xml:31(para) ../C/search.xml:31(para)
+msgid ""
+"The <interface>Search Dialog</interface> consists of the following parts:"
+msgstr ""
+"Le formulaire <interface>Rechercher</interface> est constitué des éléments "
+"suivants :"
+
+#: ../C/xiphos.xml:36(para) ../C/search.xml:36(para)
+msgid "Search Key Entry box"
+msgstr "Boite de saisie de l'expression à rechercher"
+
+#: ../C/xiphos.xml:41(para) ../C/xiphos.xml:83(title) ../C/search.xml:41(para)
+#: ../C/search.xml:83(title)
+msgid "Search Module Selector"
+msgstr "Sélecteur du module objet de la requête"
+
+#: ../C/xiphos.xml:46(para) ../C/xiphos.xml:91(title) ../C/search.xml:46(para)
+#: ../C/search.xml:91(title)
+msgid "Search Type Selector"
+msgstr "Sélecteur du type de requête"
+
+#: ../C/xiphos.xml:51(para) ../C/xiphos.xml:129(title)
+#: ../C/search.xml:51(para) ../C/search.xml:129(title)
+msgid "Search Options Checkbox"
+msgstr "Case à cocher des options de la requête"
+
+#: ../C/xiphos.xml:56(para) ../C/xiphos.xml:136(title)
+#: ../C/search.xml:56(para) ../C/search.xml:136(title)
+msgid "Search Scope Selector"
+msgstr "Sélecteur de la plage de versets"
+
+#: ../C/xiphos.xml:61(para) ../C/xiphos.xml:173(title)
+#: ../C/search.xml:61(para) ../C/search.xml:173(title)
+msgid "Search Results View"
+msgstr "Affichage des résultats"
+
+#: ../C/xiphos.xml:67(title) ../C/search.xml:67(title)
+msgid "Search Key Entry Box"
+msgstr "Boite de saisie de l'expression à rechercher"
+
+#: ../C/xiphos.xml:68(para) ../C/search.xml:68(para)
+msgid ""
+"Allows entry of the key for which you would like to search. The search key "
+"can be a word, part of a word, several words, a phrase, or a regular "
+"expression depending on the type of search selected. When the search key is "
+"entered and all other selections in the search dialog are complete, click "
+"the <guibutton>Find</guibutton> button to begin the search."
+msgstr ""
+"La boite d'entrée permet de saisir l'expression à rechercher. Cette "
+"expression peut être un mot, une partie de mot, plusieurs mots, une phrase, "
+"ou une expression rationnelle suivant le type de requête sélectionné. Une "
+"fois l'expression à rechercher saisie, et les options définies, un clic sur "
+"le bouton <guimenuitem>Rechercher</guimenuitem> démarre la séquence de "
+"recherche."
+
+#: ../C/xiphos.xml:75(para) ../C/search.xml:75(para)
+msgid ""
+"This search uses the optimized search method (see next section) if the "
+"module has previously been indexed, and will use AND semantics by default "
+"(verses must contain all words you entered)."
+msgstr ""
+"Cette requête employe la méthode de recherche optimisée (Voir la section "
+"suivante) à la condition que le module concerné ait été précédemment indexé, "
+"et utilisera le ET logique par défaut (les versets doivent contenir tous les "
+"mots saisis)"
+
+#: ../C/xiphos.xml:84(para) ../C/search.xml:84(para)
+msgid ""
+"Allows selection of which modules you would like to search. Select "
+"<guibutton>Bible</guibutton> to search Bible versions or "
+"<guibutton>Commentary</guibutton> to search commentaries. Only the currently "
+"active module will be searched."
+msgstr ""
+"Permet la sélection du module dans lequel la requête sera exécutée. "
+"Sélectionner <guimenuitem>Texte biblique</guimenuitem> pour exécuter une "
+"requête dans le texte biblique ou <guimenuitem>Commentaire</guimenuitem>  "
+"pour le module de commentaires. La requête ne s'exécute que dans les modules "
+"en cours de consultation."
+
+#: ../C/xiphos.xml:92(para) ../C/search.xml:92(para)
+msgid ""
+"Allows selection of the type of search. There are three search types "
+"available:"
+msgstr ""
+"Permet se sélectionner le type de requête. Trois types de requête sont "
+"possibles :"
+
+#: ../C/xiphos.xml:97(guibutton) ../C/search.xml:97(guibutton)
+msgid "Multi word"
+msgstr "Mots multiples"
+
+#: ../C/xiphos.xml:98(para) ../C/search.xml:98(para)
+msgid ""
+"This type will match any verse that has all the words in the search key, "
+"regardless of where they appear in the verse."
+msgstr ""
+"La requête  recherche n'importe quel verset contenant tous les mots de "
+"l'expression  à rechercher, quelque soit l'ordre dans lequel ils "
+"apparaissent dans le verset."
+
+#: ../C/xiphos.xml:103(guibutton) ../C/search.xml:103(guibutton)
+msgid "Regular expression"
+msgstr "Expression rationnelle"
+
+#: ../C/xiphos.xml:104(para) ../C/search.xml:104(para)
+msgid ""
+"This search uses a regular expression as a search key. A regular expression "
+"is a pattern used to match a string of text. A regular expression can be "
+"used to find verses with words that match a particular pattern. For example "
+"the regular expression <userinput>[a-z]*iah </userinput> will match verses "
+"that contain the words Aiah, Ahaziah, Athaliah and Amariah."
+msgstr ""
+"Cette requête utilise une expression rationnelle comme clé de recherche. Une "
+"expression rationnelle est basée sur un langage et une syntaxe spécifiques "
+"permettant de retrouver un mot, une phrase à l'aide de combinaisons "
+"complexes. Par exemple l'expression rationnelle <userinput>\\ A[a-z]*iah </"
+"userinput> permet de retrouver les passages qui contiennent les mots Aiah, "
+"Ahaziah, Athaliah et Amariah."
+
+#: ../C/xiphos.xml:111(para) ../C/search.xml:111(para)
+msgid ""
+"A complete discussion of regular expressions is beyond the scope of this "
+"manual, but more information can be found in the grep man page."
+msgstr ""
+"Un exposé complet de l'emploi des expressions rationnelles dépasse le cadre "
+"de ce manuel, mais cependant plus d'informations à ce sujet peuvent être "
+"obtenues en parcourant le manuel de <command>grep</command>."
+
+#: ../C/xiphos.xml:116(guibutton) ../C/search.xml:116(guibutton)
+msgid "Exact phrase"
+msgstr "Phrase exacte"
+
+#: ../C/xiphos.xml:117(para) ../C/search.xml:117(para)
+msgid ""
+"This type will match the search key exatly as entered. If the search key is "
+"<userinput>\n"
+"\t\t\t\t\tit is good</userinput>, this search would match a verse which "
+"contains \"<emphasis>it is good</emphasis>,\" but would not match a verse "
+"which contains \"<emphasis> good</emphasis>, and doeth <emphasis>it</"
+"emphasis> not, to him it <emphasis>is</emphasis> sin.\""
+msgstr ""
+"La requête recherche la phrase exacte contenue dans l'expression à "
+"rechercher. Si la phrase à rechercher est <userinput>en vérité</userinput>, "
+"les passages obtenus contiendront «­­&#160;<emphasis>en vérité</"
+"emphasis>&#160;», mais pas «­­&#160;<emphasis>en</emphasis> toute  "
+"<emphasis>vérité</emphasis>&#160;»."
+
+#: ../C/xiphos.xml:130(para) ../C/search.xml:130(para)
+msgid ""
+"Allows selecting of search options. The only available option is "
+"<guibutton>Match case</guibutton>. Check this box to make the search case "
+"sensitive."
+msgstr ""
+"Permet de définir les options de recherche. L'option disponible est "
+"<guimenuitem>Respecter la casse</guimenuitem>. Cocher cette boite rend la "
+"recherche sensible à la casse des caractères."
+
+#: ../C/xiphos.xml:137(para) ../C/search.xml:137(para)
+msgid ""
+"Allows defining the range within the specificed module that will be "
+"searched. There are three search scopes available:"
+msgstr ""
+"Permet de définir la plage de versets à parcourir dans le module spécifié. "
+"Trois plages de recherche sont possibles :"
+
+#: ../C/xiphos.xml:141(guibutton) ../C/search.xml:141(guibutton)
+msgid "No scope"
+msgstr "Sans limites"
+
+#: ../C/xiphos.xml:142(para) ../C/search.xml:142(para)
+msgid "This button causes the search to to include the entire module."
+msgstr ""
+"Sélectionner ce bouton implique que la requête s'exécute sur l'ensemble des "
+"versets."
+
+#: ../C/xiphos.xml:147(guibutton) ../C/search.xml:147(guibutton)
+msgid "Use bounds"
+msgstr "Limites définies"
+
+#: ../C/xiphos.xml:148(para) ../C/search.xml:148(para)
+msgid ""
+"Selecting this button produces two dropdown selector boxes marked "
+"<guilabel>Lower</guilabel> and <guilabel>Upper</guilabel>. Select the first "
+"book to search in the <guilabel>Lower</guilabel> box and the last book to "
+"search in the <guilabel>Upper</guilabel> box. The search will begin with the "
+"<guilabel>Lower </guilabel> book and end with the <guilabel>Upper </"
+"guilabel> book and include all books in between."
+msgstr ""
+"Sélectionner ce bouton provoque l'ouverture de deux zones supplémentaires "
+"permettant la saisie des limites de la recherche. La première référence, "
+"début de la recherche, est à saisir dans la limite <guilabel>Basse</"
+"guilabel> et la deuxième référence, fin de la recherche, dans la limite "
+"<guilabel>Haute</guilabel>. La requête commencera au verset indiqué dans la "
+"limite <guilabel>Basse</guilabel> et se terminera au verset indiqué dans la "
+"limite <guilabel>Haute</guilabel> en incluant tous les versets situés entre "
+"les deux limites."
+
+#: ../C/xiphos.xml:157(para) ../C/search.xml:157(para)
+msgid ""
+"Chapter and verse numbers can be entered into the search bound boxes as well "
+"to further narrow the search."
+msgstr ""
+"Des numéros de chapitres ou de versets peuvent aussi être saisis dans les "
+"deux zones basse et haute  afin de mieux cibler la recherche."
+
+#: ../C/xiphos.xml:163(guibutton) ../C/search.xml:163(guibutton)
+msgid "Last search"
+msgstr "Dernière requête"
+
+#: ../C/xiphos.xml:164(para) ../C/search.xml:164(para)
+msgid ""
+"Select this button to do a new search including only the verses returned as "
+"a result of the last search. Use this with a new search key to narrow the "
+"search further."
+msgstr ""
+"Sélectionner ce bouton pour relancer une recherche uniquement sur les  "
+"versets retournés en résultat de la requête précédente. Utilisée avec une "
+"nouvelle expression, cette méthode permet de réduire la liste des versets "
+"restitués."
+
+#: ../C/xiphos.xml:174(para) ../C/search.xml:174(para)
+msgid ""
+"This shows a list of the current search results for previewing, navigation, "
+"or saving."
+msgstr ""
+"La liste des résultats est affichée permettant d'obtenir un aperçu du verset "
+"retourné, la navigation vers le chapître concerné ou l'enregistrement sous "
+"forme de signets."
+
+#: ../C/xiphos.xml:177(term) ../C/search.xml:177(term)
+msgid "Preview"
+msgstr "Aperçu"
+
+#: ../C/xiphos.xml:178(para) ../C/search.xml:178(para)
+msgid ""
+"To preview the search result, simply click on an individual result. The "
+"entry will show in the preview pane."
+msgstr ""
+"Pour visualiser le résultat, un simple clic sur un élément affiche le "
+"contenu dans le volet <interface>Aperçu</interface>"
+
+#: ../C/xiphos.xml:184(term) ../C/search.xml:184(term)
+msgid "Navigation"
+msgstr "Navigation"
+
+#: ../C/xiphos.xml:185(para) ../C/search.xml:185(para)
+msgid ""
+"Navigation to the search result can be done in two ways. To open the result "
+"in a new tab, middle-click the mouse. To open the result in the current tab, "
+"double-click the result."
+msgstr ""
+"La navigation vers le chapître concerné pour retrouver le contexte "
+"s'effectue de deux manières. Un clic du bouton milieu de la souris ouvre le "
+"verset dans un nouvel onglet, un double-clic l'ouvre dans l'onget courant."
+
+#: ../C/xiphos.xml:191(term) ../C/search.xml:191(term)
+msgid "Save Results"
+msgstr "Enregistrer les résultats"
+
+#: ../C/xiphos.xml:192(para) ../C/search.xml:192(para)
+msgid ""
+"You may save your results as a list of bookmarks. To do this, right-click "
+"and select <guilabel>Save List</guilabel>. You will be prompted to enter a "
+"name for the folder that your results will be saved to. After you have saved "
+"the results, you may view them by going to your bookmarks and finding the "
+"folder you just named."
+msgstr ""
+"Les résultats de la requête peuvent être enregistrés sous forme de signets. "
+"Dans le menu contextuel obtenu à l'aide du bouton droit de la souris, "
+"sélectionner <guilabel>Convertir en signets</guilabel>, il sera alors "
+"demandé le nom du dossier sous lequel la liste sera enregistrée. Ensuite, "
+"une fois la liste sauvegardée, il devient possible de retrouver les "
+"résultats de la requête en affichant les signets puis en choisissant le "
+"dossier précédemment nommé."
+
 #: ../C/xiphos.xml:203(title)
 msgid "Advanced Searches"
 msgstr "Recherche avancée"
@@ -3273,11 +3586,11 @@ msgid ""
 msgstr ""
 "Requêtes simples : saisir simplement les mots recherchés. Pour obtenir "
 "seulement les versets contenant tous les mots, il suffit de faire précéder "
-"les mots du signe «­­&nbsp;<emphasis>+</emphasis>&nbsp;». Ainsi la requête "
-"«&nbsp;<emphasis>+L'Eternel +mon +berger</emphasis>&nbsp;» trouve le Psaume "
+"les mots du signe «­­&#160;<emphasis>+</emphasis>&#160;». Ainsi la requête "
+"«&#160;<emphasis>+L'Eternel +mon +berger</emphasis>&#160;» trouve le Psaume "
 "23. Pour rechercher une phrase entière, il suffit de l'entourer de "
-"guillemets, comme dans \"&nbsp;<emphasis>Il me fait reposer dans de verts "
-"pâturages</emphasis>&nbsp;\"."
+"guillemets, comme dans \"&#160;<emphasis>Il me fait reposer dans de verts "
+"pâturages</emphasis>&#160;\"."
 
 #: ../C/xiphos.xml:252(para)
 msgid ""
@@ -3286,23 +3599,23 @@ msgid ""
 "more complex example returns both spellings for Isaiah used in the KJV. \"?"
 "saia?\" will return results for \"Isaiah\" and \"Esaias\"."
 msgstr ""
-"Caractère de substitution unique (&nbsp;?&nbsp;) : Le «­­&nbsp;?&nbsp;» "
-"représente un caractère quelconque. Par exemple, «­­&nbsp;<emphasis>cri?</"
-"emphasis>&nbsp;» permet de rechercher «­­&nbsp;<emphasis>cris</"
-"emphasis>&nbsp;», «­­&nbsp;<emphasis>crie</emphasis>&nbsp;»,·«­­&nbsp;"
-"<emphasis>crié</emphasis>&nbsp;» etc.. Ceci est pratique pour retrouver les "
-"noms qui peuvent avoir plusieurs écritures ainsi, «­­&nbsp;<emphasis>?saïe</"
-"emphasis>&nbsp;» retrouvera «­­&nbsp;Esaïe&nbsp;» ou «­­&nbsp;Isaïe&nbsp;»"
+"Caractère de substitution unique (&#160;?&#160;) : Le «­­&#160;?&#160;» "
+"représente un caractère quelconque. Par exemple, «­­&#160;<emphasis>cri?</"
+"emphasis>&#160;» permet de rechercher «­­&#160;<emphasis>cris</"
+"emphasis>&#160;», «­­&#160;<emphasis>crie</emphasis>&#160;»,·«­­&#160;"
+"<emphasis>crié</emphasis>&#160;» etc.. Ceci est pratique pour retrouver les "
+"noms qui peuvent avoir plusieurs écritures ainsi, «­­&#160;<emphasis>?saïe</"
+"emphasis>&#160;» retrouvera «­­&#160;Esaïe&#160;» ou «­­&#160;Isaïe&#160;»"
 
 #: ../C/xiphos.xml:258(para)
 msgid ""
 "Multiple Letter Wildcard: to search for \"prophet\" or \"prophesy\" or "
 "\"prophecy\" or \"prophesied\", use this syntax \"prophe*\"."
 msgstr ""
-"Caractère de substitution multiple (&nbsp;*&nbsp;) : «&nbsp;*&nbsp;» remplace "
-"toute une série de caractères. Ainsi «&nbsp;<emphasis>proph*</"
-"emphasis>&nbsp;» retrouve «&nbsp;prophète&nbsp;», «&nbsp;prophétiser&nbsp;», "
-"«&nbsp;prophétie&nbsp;» etc.."
+"Caractère de substitution multiple (&#160;*&#160;) : «&#160;*&#160;» remplace "
+"toute une série de caractères. Ainsi «&#160;<emphasis>proph*</"
+"emphasis>&#160;» retrouve «&#160;prophète&#160;», «&#160;prophétiser&#160;», "
+"«&#160;prophétie&#160;» etc.."
 
 #: ../C/xiphos.xml:262(para)
 msgid ""
@@ -3314,10 +3627,10 @@ msgid ""
 msgstr ""
 "Syntaxe AND : Dans la recherche avancée, pour retourner les résultats pour "
 "tous les termes d'une requête, il est nécessaire de placer l'opérateur "
-"logique «&nbsp;<emphasis>AND</emphasis>&nbsp;» entre les termes. Ainsi pour "
-"retrouver les occurences de «&nbsp;Isaïe&nbsp;» ou «&nbsp;Esaïe&nbsp;» qui "
-"font mention également de «&nbsp;prophète&nbsp;» ou «&nbsp;prophétie&nbsp;», "
-"la requête appropriée est «&nbsp;<emphasis>?saïe AND proph*</emphasis>&nbsp;»."
+"logique «&#160;<emphasis>AND</emphasis>&#160;» entre les termes. Ainsi pour "
+"retrouver les occurences de «&#160;Isaïe&#160;» ou «&#160;Esaïe&#160;» qui "
+"font mention également de «&#160;prophète&#160;» ou «&#160;prophétie&#160;», "
+"la requête appropriée est «&#160;<emphasis>?saïe AND proph*</emphasis>&#160;»."
 
 #: ../C/xiphos.xml:268(para)
 msgid ""
@@ -3330,8 +3643,8 @@ msgid ""
 msgstr ""
 "Par défaut, deux plages de versets sont définies, correspondant à l'Ancien "
 "Testament et au Nouveau Testament. D'autres limites peuvent être définies à "
-"volonté par l'utilisateur comme par exemple les «­­&nbsp;Évangiles&nbsp;» ou "
-"les «­­&nbsp;Épîtres de Paul&nbsp;». Une liste des modules contenant "
+"volonté par l'utilisateur comme par exemple les «­­&#160;Évangiles&#160;» ou "
+"les «­­&#160;Épîtres de Paul&#160;». Une liste des modules contenant "
 "seulement le premier module de texte biblique installé est définie par "
 "défaut. Si besoin, de nouvelles requêtes peuvent être réalisés sur la plage "
 "des versets obtenu par la requête précédente. Des listes de modules peuvent "
@@ -3358,7 +3671,7 @@ msgstr ""
 "l'onglet Attribut, situé à droite des autres onglets. Les références de "
 "Strong  sont identifiées par le nombre de Strong précédé par la lettre H "
 "(Hébreu) ou la lettre G (Grec). Ainsi une requête sur le nombre de Strong "
-"grec n° 140, en utilisant «­­&nbsp;G140&nbsp;», retourne  Matthieu 12:18 "
+"grec n° 140, en utilisant «­­&#160;G140&#160;», retourne  Matthieu 12:18 "
 "comme résultat."
 
 #: ../C/xiphos.xml:283(para)
@@ -3370,9 +3683,9 @@ msgid ""
 msgstr ""
 "Si vos modules sont indexés, il existe un moyen beaucoup plus rapide pour "
 "rechercher des références de Strong. Une requête doit être précédée du mot "
-"«&nbsp;<emphasis>lemma</emphasis>&nbsp;», par exemple pour rechercher le "
-"nombre de Strong grec 140, saisir «&nbsp;<emphasis>lemma:G140</"
-"emphasis>&nbsp;». Le bouton radio <guibutton>Optimisée Lucene</guibutton> "
+"«&#160;<emphasis>lemma</emphasis>&#160;», par exemple pour rechercher le "
+"nombre de Strong grec 140, saisir «&#160;<emphasis>lemma:G140</"
+"emphasis>&#160;». Le bouton radio <guibutton>Optimisée Lucene</guibutton> "
 "doit être sélectionné pour que cette requête fonctionne."
 
 #: ../C/xiphos.xml:289(para)
@@ -3441,18 +3754,18 @@ msgstr ""
 "La recherche au moyen d'expressions rationnelles permet d'effectuer des "
 "recherches simples ou complexes sur des chaînes de caractères qui "
 "correspondent à un motif ou un ensemble de motifs séparés par une barre "
-"verticale «­­&nbsp;|&nbsp;». Alors qu'un motif peut être crée pour rechercher "
+"verticale «­­&#160;|&#160;». Alors qu'un motif peut être crée pour rechercher "
 "un mot ou une phrase, un motif simple composé d'un seul mot ne permettra pas "
 "de rechercher seulement ce mot, mais toute séquence de caractères contenant "
-"ce mot. Une recherche du mot «­­&nbsp;droit&nbsp;» ne retournera pas "
-"seulement la liste des versets contenant le mot «­­&nbsp;<emphasis>droit</"
-"emphasis>&nbsp;»  mais aussi ceux contenant les mots «­­&nbsp;"
-"a<emphasis>droit</emphasis>&nbsp;», «­­&nbsp;<emphasis>droit</"
-"emphasis>e&nbsp;». La recherche de «­­&nbsp;ne pas&nbsp;» ne retournera pas "
-"les versets contenant les mots «­­&nbsp;ne&nbsp;» ET «­­&nbsp;pas&nbsp;» mais "
-"les versets contenant la séquence «­­&nbsp;ne pas&nbsp;» avec une espace "
-"entre les deux mots. Une recherche de «­­&nbsp;ne pas&nbsp;» trouvera aussi "
-"les versets contenant «­­&nbsp;<emphasis>ne pas</emphasis>se&nbsp;»."
+"ce mot. Une recherche du mot «­­&#160;droit&#160;» ne retournera pas "
+"seulement la liste des versets contenant le mot «­­&#160;<emphasis>droit</"
+"emphasis>&#160;»  mais aussi ceux contenant les mots «­­&#160;"
+"a<emphasis>droit</emphasis>&#160;», «­­&#160;<emphasis>droit</"
+"emphasis>e&#160;». La recherche de «­­&#160;ne pas&#160;» ne retournera pas "
+"les versets contenant les mots «­­&#160;ne&#160;» ET «­­&#160;pas&#160;» mais "
+"les versets contenant la séquence «­­&#160;ne pas&#160;» avec une espace "
+"entre les deux mots. Une recherche de «­­&#160;ne pas&#160;» trouvera aussi "
+"les versets contenant «­­&#160;<emphasis>ne pas</emphasis>se&#160;»."
 
 #: ../C/xiphos.xml:315(para)
 msgid ""
@@ -3467,7 +3780,7 @@ msgstr ""
 "définir une recherche. Un motif est constitué de caractères ordinaires  et "
 "de quelques caractères  spéciaux qui sont interprétés suivant des règles "
 "précises. Les caractères spéciaux sont \\[^*$?+. Les autres caractères sont "
-"des caractères ordinaires. L'antislash «­­&nbsp;\\&nbsp;», est utilisé pour "
+"des caractères ordinaires. L'antislash «­­&#160;\\&#160;», est utilisé pour "
 "convertir les caractères spéciaux en caractères ordinaires et inversement "
 "les caractères ordinaires en caractères spéciaux."
 
@@ -3482,11 +3795,11 @@ msgid ""
 "period following it is not to be considered a special character, but is an "
 "ordinary period."
 msgstr ""
-"Exemple : le motif «­­&nbsp;<emphasis>.amour\\.</emphasis>&nbsp;» retournera "
-"les phrases qui se terminent par «­­&nbsp;s<emphasis>o</emphasis>n "
-"<emphasis>amour</emphasis>&nbsp;» ou «­­&nbsp;<emphasis>l</"
-"emphasis>'<emphasis>amour</emphasis>&nbsp;» ou «­­&nbsp;<emphasis>d</"
-"emphasis>'<emphasis>amour</emphasis>&nbsp;» suivi d'un point. Le premier "
+"Exemple : le motif «­­&#160;<emphasis>.amour\\.</emphasis>&#160;» retournera "
+"les phrases qui se terminent par «­­&#160;s<emphasis>o</emphasis>n "
+"<emphasis>amour</emphasis>&#160;» ou «­­&#160;<emphasis>l</"
+"emphasis>'<emphasis>amour</emphasis>&#160;» ou «­­&#160;<emphasis>d</"
+"emphasis>'<emphasis>amour</emphasis>&#160;» suivi d'un point. Le premier "
 "point dans <emphasis>.amour\\.</emphasis> est un caractère spécial dont la "
 "signification est de remplacer n'importe quel caractère à cette position. "
 "L'antislash dans <emphasis>.amour\\.</emphasis> indique que le point  "
@@ -3499,14 +3812,14 @@ msgstr "Règles des requêtes de recherche à l'aide des expressions rationnelle
 
 #: ../C/xiphos.xml:330(para)
 msgid ". The period matches any character."
-msgstr "«­­&nbsp;.&nbsp;» Le point remplace n'importe quel caractère."
+msgstr "«­­&#160;.&#160;» Le point remplace n'importe quel caractère."
 
 #: ../C/xiphos.xml:331(para)
 msgid ""
 "* The asterisk matches 0 or more characters of the preceding: set, character "
 "or indicated character."
 msgstr ""
-"«­­&nbsp;*&nbsp;» L'astérisque correspond à toute répétition de caractères "
+"«­­&#160;*&#160;» L'astérisque correspond à toute répétition de caractères "
 "d'une chaîne ou d'une expression rationnelle la précédant, incluant zéro "
 "caractère."
 
@@ -3515,16 +3828,16 @@ msgid ""
 "+ The plus sign matches 1 or more characters of the preceding: set, "
 "character or indicated character."
 msgstr ""
-"«­­&nbsp;+&nbsp;» Le signe plus correspond à une répétition ou plus de la "
-"précédente expression régulière. Il joue un rôle similaire à «­­&nbsp;"
-"*&nbsp;» (astérisque), mais ne correspond pas à zéro occurrence."
+"«­­&#160;+&#160;» Le signe plus correspond à une répétition ou plus de la "
+"précédente expression régulière. Il joue un rôle similaire à «­­&#160;"
+"*&#160;» (astérisque), mais ne correspond pas à zéro occurrence."
 
 #: ../C/xiphos.xml:335(para)
 msgid ""
 "? The question mark matches 0 or 1 character of the preceding: set, "
 "character or indicated character."
 msgstr ""
-"«­­&nbsp;?&nbsp;» Le point d'interrogation correspond à aucune ou une "
+"«­­&#160;?&#160;» Le point d'interrogation correspond à aucune ou une "
 "instance de la précédente expression rationnelle. Il est généralement "
 "utilisé pour correspondre à des caractères uniques."
 
@@ -3532,38 +3845,38 @@ msgstr ""
 msgid ""
 "[ ] Square brackets match any one of the characters specified inside [ ]."
 msgstr ""
-"«­­&nbsp;[...]&nbsp;» Les crochets englobent un ensemble de caractères pour "
+"«­­&#160;[...]&#160;» Les crochets englobent un ensemble de caractères pour "
 "réaliser une correspondance dans une seule expression rationnelle."
 
 #: ../C/xiphos.xml:339(para)
 msgid "^ A caret as the first character inside [ ] means NOT."
 msgstr ""
-"«­­&nbsp;^&nbsp;» La puissance comme premier caractère à l'intérieur "
+"«­­&#160;^&#160;» La puissance comme premier caractère à l'intérieur "
 "d'accolades inverse la signification de l'ensemble des caractères de  "
 "l'expression rationnelle."
 
 #: ../C/xiphos.xml:340(para)
 msgid "^ A caret beginning a pattern anchors the beginning of a line."
 msgstr ""
-"«­­&nbsp;^&nbsp;» La puissance en dehors d'accolades correspond au début "
+"«­­&#160;^&#160;» La puissance en dehors d'accolades correspond au début "
 "d'une ligne."
 
 #: ../C/xiphos.xml:342(para)
 msgid "$ A dollar at the end of a pattern anchors the end of a line."
 msgstr ""
-"«­­&nbsp;$&nbsp;» Le signe dollar à la fin d'une expression rationnelle "
+"«­­&#160;$&#160;» Le signe dollar à la fin d'une expression rationnelle "
 "correspond à la fin d'une ligne."
 
 #: ../C/xiphos.xml:344(para)
 msgid "| A vertical bar means logical OR."
-msgstr "«­­&nbsp;|&nbsp;» La barre verticale signifie OU logique"
+msgstr "«­­&#160;|&#160;» La barre verticale signifie OU logique"
 
 #: ../C/xiphos.xml:345(para)
 msgid ""
 "( ) Parentheses enclose expressions for grouping. <emphasis>Not supported!</"
 "emphasis>"
 msgstr ""
-"«­­&nbsp;()&nbsp;» Les parenthèses servent à regrouper des expressions. "
+"«­­&#160;()&#160;» Les parenthèses servent à regrouper des expressions. "
 "<emphasis>Non supporté dans <application>&appname;</application></emphasis>"
 
 #: ../C/xiphos.xml:347(para)
@@ -3571,7 +3884,7 @@ msgid ""
 "\\ A backslash can be used prior to any special character to match that "
 "character."
 msgstr ""
-"«­­&nbsp;\\&nbsp;» L'antislash échappe un caractère spécial, ce qui signifie "
+"«­­&#160;\\&#160;» L'antislash échappe un caractère spécial, ce qui signifie "
 "que le caractère est interprété littéralement."
 
 #: ../C/xiphos.xml:349(para)
@@ -3579,7 +3892,7 @@ msgid ""
 "\\ A backslash can be used prior to an ordinary character to make it a "
 "special character."
 msgstr ""
-"«­­&nbsp;\\&nbsp;» L'antislash utilisé devant un caractère ordinaire, le "
+"«­­&#160;\\&#160;» L'antislash utilisé devant un caractère ordinaire, le "
 "transforme en caractère spécial.."
 
 #: ../C/xiphos.xml:354(title)
@@ -3600,9 +3913,9 @@ msgid ""
 "foot.tool </emphasis>matches <emphasis>foot</emphasis>s<emphasis>tool </"
 "emphasis>and <emphasis>foot tool</emphasis>"
 msgstr ""
-"Le point «­­&nbsp;.&nbsp;» remplace n'importe quel caractère y compris "
-"l'espace et d'autres caractères non alphabétiques. Par exemple : «­­&nbsp;13."
-"&nbsp;» correspond à 13 plus au moins un caractère (incluant une espace), ce "
+"Le point «­­&#160;.&#160;» remplace n'importe quel caractère y compris "
+"l'espace et d'autres caractères non alphabétiques. Par exemple : «­­&#160;13."
+"&#160;» correspond à 13 plus au moins un caractère (incluant une espace), ce "
 "qui retourne 1133, 11333 mais pas 13 (un caractère supplémentaire est "
 "manquant)."
 
@@ -3620,9 +3933,9 @@ msgid ""
 "which could locate Reu<emphasis>ben</emphasis> and She<emphasis>bn</"
 "emphasis>a."
 msgstr ""
-"L'astérisque «­­&nbsp;*&nbsp;» correspond à toute répétition de caractères "
+"L'astérisque «­­&#160;*&#160;» correspond à toute répétition de caractères "
 "d'une chaîne ou d'une expression rationnelle la précédant, incluant zéro "
-"caractère. Par exemple : «­­&nbsp;1133*&nbsp;» correspond à 11 plus un ou "
+"caractère. Par exemple : «­­&#160;1133*&#160;» correspond à 11 plus un ou "
 "plus de 3 ainsi que d'autres caractères : 113, 1133, 111312 et ainsi de "
 "suite."
 
@@ -3639,9 +3952,9 @@ msgid ""
 "matches <emphasis>beeen, been</emphasis> and <emphasis>ben</emphasis>, but "
 "not <emphasis>bn</emphasis>."
 msgstr ""
-"Le signe plus «­­&nbsp;+&nbsp;» correspond à une répétition ou plus de la "
-"précédente expression rationnelle. Il joue un rôle similaire à «­­&nbsp;"
-"*&nbsp;» (astérisque), mais ne correspond pas à zéro occurrence."
+"Le signe plus «­­&#160;+&#160;» correspond à une répétition ou plus de la "
+"précédente expression rationnelle. Il joue un rôle similaire à «­­&#160;"
+"*&#160;» (astérisque), mais ne correspond pas à zéro occurrence."
 
 #: ../C/xiphos.xml:396(title)
 msgid "The Question Mark"
@@ -3655,7 +3968,7 @@ msgid ""
 "emphasis>. <emphasis>trees?</emphasis> matches <emphasis>trees</emphasis> or "
 "<emphasis>tree</emphasis>."
 msgstr ""
-"Le point d'interrogation «­­&nbsp;?&nbsp;» correspond à aucune ou à une "
+"Le point d'interrogation «­­&#160;?&#160;» correspond à aucune ou à une "
 "instance au·plus·de la précédente expression rationnelle. Il est "
 "généralement utilisé pour correspondre à des caractères uniques."
 
@@ -3681,18 +3994,18 @@ msgid ""
 "uppercase letter. [.;:?!] matches ., ;, :, ?, or ! but not a comma. [ ]^-] "
 "matches ] or ^ or -"
 msgstr ""
-"Les crochets «­­&nbsp;[...]&nbsp;» englobent un ensemble de caractères pour "
-"réaliser une correspondance dans une seule expression rationnelle. «­­&nbsp;"
-"[xyz]&nbsp;» correspond aux caractères x, y ou z. «­­&nbsp;[c-n]&nbsp;» "
-"correspond à tout caractère compris entre c et n. «­­&nbsp;[B-Pk-y]&nbsp;» "
-"correspond à tout caractère compris entre B et P et entre k et y. «­­&nbsp;[a-"
-"z0-9]&nbsp;» correspond à toute lettre en minuscule et à tout chiffre. «­­"
-"&nbsp;[^b-d]&nbsp;» correspond à tous les caractères sauf ceux compris entre "
+"Les crochets «­­&#160;[...]&#160;» englobent un ensemble de caractères pour "
+"réaliser une correspondance dans une seule expression rationnelle. «­­&#160;"
+"[xyz]&#160;» correspond aux caractères x, y ou z. «­­&#160;[c-n]&#160;» "
+"correspond à tout caractère compris entre c et n. «­­&#160;[B-Pk-y]&#160;» "
+"correspond à tout caractère compris entre B et P et entre k et y. «­­&#160;[a-"
+"z0-9]&#160;» correspond à toute lettre en minuscule et à tout chiffre. «­­"
+"&#160;[^b-d]&#160;» correspond à tous les caractères sauf ceux compris entre "
 "b et d. Ceci est un exemple de l'inversion de la signification de "
-"l'expression rationnelle suivante grâce à l'opérateur «­­&nbsp;"
-"^&nbsp;» (prenant le même rôle que «­­&nbsp;!&nbsp;» dans un contexte "
+"l'expression rationnelle suivante grâce à l'opérateur «­­&#160;"
+"^&#160;» (prenant le même rôle que «­­&#160;!&#160;» dans un contexte "
 "différent). Les séquences combinées de caractères entre crochets "
-"correspondent à des modèles de mots communs. «­­&nbsp;[Oo][Uu][Ii]&nbsp;» "
+"correspondent à des modèles de mots communs. «­­&#160;[Oo][Uu][Ii]&#160;» "
 "correspond à oui, Oui, OUI, oUi et ainsi de suite. "
 
 #: ../C/xiphos.xml:429(title)
@@ -3706,7 +4019,7 @@ msgid ""
 "etc., but not <emphasis>s</emphasis>i<emphasis>t</emphasis> and <emphasis>s</"
 "emphasis>o<emphasis>t</emphasis>."
 msgstr ""
-"Si la puissance «­­&nbsp;^&nbsp;» est le premier caractère d'une expression "
+"Si la puissance «­­&#160;^&#160;» est le premier caractère d'une expression "
 "entre crochets, il  inverse la signification de l'ensemble des caractères de "
 "l'expression rationnelle."
 
@@ -3724,16 +4037,16 @@ msgid ""
 "emphasis> matches lines that start with \"<emphasis>In the beginning</"
 "emphasis>\". (May need to use: <emphasis>^.....In the beginning</emphasis>)"
 msgstr ""
-"La puissance «­­&nbsp;^&nbsp;» correspond au début d'une ligne. Toutes les "
+"La puissance «­­&#160;^&#160;» correspond au début d'une ligne. Toutes les "
 "réponses correspondront au début d'une ligne comportant la séquence "
 "recherchée. Cependant, comme certains modules de textes contiennent des "
 "caractères non filtrés en début de ligne, cette fonction ne retourne pas "
 "toujours les résultats escomptés. Ajouter quelques points après la "
 "puissance, permet de contourner le défaut de format de certains textes. «­­"
-"&nbsp;<emphasis>^Au commencement</emphasis>&nbsp;» recherche les phrases "
-"commençant par «­­&nbsp;<emphasis>Au commencement</emphasis>&nbsp;». (Mais il "
-"est préférable d'utiliser : «­­&nbsp;<emphasis>^....Au commencement</"
-"emphasis>&nbsp;»)."
+"&#160;<emphasis>^Au commencement</emphasis>&#160;» recherche les phrases "
+"commençant par «­­&#160;<emphasis>Au commencement</emphasis>&#160;». (Mais il "
+"est préférable d'utiliser : «­­&#160;<emphasis>^....Au commencement</"
+"emphasis>&#160;»)."
 
 #: ../C/xiphos.xml:451(title)
 msgid "The Dollar Sign as End of Line Anchor"
@@ -3749,17 +4062,17 @@ msgid ""
 "matches lines that end with \"<emphasis>Amen.</emphasis>\" (May need to use "
 "Amen\\....$, Amen\\..........$, or even Amen\\....................$)"
 msgstr ""
-"Le signe dollar «­­&nbsp;$&nbsp;» à la fin d'une expression régulière "
-"correspond à la fin d'une ligne. «­­&nbsp;XXX$&nbsp;» correspond à XXX à la "
-"fin d'une ligne. «­­&nbsp;^$&nbsp;» correspond à des lignes blanches. "
+"Le signe dollar «­­&#160;$&#160;» à la fin d'une expression régulière "
+"correspond à la fin d'une ligne. «­­&#160;XXX$&#160;» correspond à XXX à la "
+"fin d'une ligne. «­­&#160;^$&#160;» correspond à des lignes blanches. "
 "Cependant, comme certains modules de textes contiennent des caractères non "
 "filtrés en fin de ligne, cette fonction ne retourne pas toujours les "
 "résultats escomptés. Ajouter quelques points après le dollar, permet de "
-"contourner ce défaut de format de certains textes. «­­&nbsp;<emphasis>Amen\\."
-"$</emphasis>&nbsp;» retourne les phrases qui se terminent par «­­&nbsp;"
-"<emphasis>Amen.</emphasis>&nbsp;» (Il est préférable d'utiliser «­­&nbsp;Amen"
-"\\....$&nbsp;», «Amen\\..........$&nbsp;», ou même «­­&nbsp;Amen"
-"\\....................$&nbsp;»)."
+"contourner ce défaut de format de certains textes. «­­&#160;<emphasis>Amen\\."
+"$</emphasis>&#160;» retourne les phrases qui se terminent par «­­&#160;"
+"<emphasis>Amen.</emphasis>&#160;» (Il est préférable d'utiliser «­­&#160;Amen"
+"\\....$&#160;», «Amen\\..........$&#160;», ou même «­­&#160;Amen"
+"\\....................$&#160;»)."
 
 #: ../C/xiphos.xml:466(title)
 msgid "The Vertical Bar"
@@ -3775,15 +4088,15 @@ msgid ""
 "matches <emphasis>pain</emphasis>, or <emphasis>suffering</emphasis>, or "
 "<emphasis>sorrow</emphasis>."
 msgstr ""
-"La barre verticale «­­&nbsp;|&nbsp;» correspond à l'opérateur logique OU et "
-"permet donc de définir une alternative. «­­&nbsp;<emphasis>Jean | Pierre</"
-"emphasis>&nbsp;» retrouve les phrases contenant «­­&nbsp;<emphasis>Jean</"
-"emphasis>&nbsp;» ou «­­&nbsp;<emphasis>Pierre</emphasis>&nbsp;». De même, «­­"
-"&nbsp;<emphasis> Jean.*Pierre | Pierre.*Jean</emphasis>&nbsp;» retourne «­­"
-"&nbsp;<emphasis>Jean</emphasis> ... <emphasis>Pierre</emphasis>&nbsp;» ou «­­"
-"&nbsp;<emphasis>Pierre</emphasis> ... <emphasis>Jean</emphasis>&nbsp;». (* "
-"ralentit la recherche). «­­&nbsp;<emphasis>douleur | souffrance | tourment</"
-"emphasis>&nbsp;» retourne <emphasis>douleur</emphasis> ou "
+"La barre verticale «­­&#160;|&#160;» correspond à l'opérateur logique OU et "
+"permet donc de définir une alternative. «­­&#160;<emphasis>Jean | Pierre</"
+"emphasis>&#160;» retrouve les phrases contenant «­­&#160;<emphasis>Jean</"
+"emphasis>&#160;» ou «­­&#160;<emphasis>Pierre</emphasis>&#160;». De même, «­­"
+"&#160;<emphasis> Jean.*Pierre | Pierre.*Jean</emphasis>&#160;» retourne «­­"
+"&#160;<emphasis>Jean</emphasis> ... <emphasis>Pierre</emphasis>&#160;» ou «­­"
+"&#160;<emphasis>Pierre</emphasis> ... <emphasis>Jean</emphasis>&#160;». (* "
+"ralentit la recherche). «­­&#160;<emphasis>douleur | souffrance | tourment</"
+"emphasis>&#160;» retourne <emphasis>douleur</emphasis> ou "
 "<emphasis>souffrance</emphasis> ou <emphasis>tourment</emphasis>."
 
 #: ../C/xiphos.xml:478(title)
@@ -3792,7 +4105,7 @@ msgstr "Les parenthèses"
 
 #: ../C/xiphos.xml:479(emphasis)
 msgid "The use of Parentheses \"( )\" is not supported!"
-msgstr "L'usage des parenthèses «­­&nbsp;()&nbsp;» n'est pas prévu."
+msgstr "L'usage des parenthèses «­­&#160;()&#160;» n'est pas prévu."
 
 #: ../C/xiphos.xml:485(title)
 msgid "The Backslash Prior to a Special Character"
@@ -3806,7 +4119,7 @@ msgid ""
 "not <emphasis>amen</emphasis>t and will not locate firm<emphasis>amen</"
 "emphasis>t."
 msgstr ""
-"L'antislash précédant un caractère spécial «­­&nbsp;\\*&nbsp;» indique que ce "
+"L'antislash précédant un caractère spécial «­­&#160;\\*&#160;» indique que ce "
 "caractère n'a plus de signification spéciale, mais devient un caractère "
 "ordinaire. <emphasis>amen\\.</emphasis> retourne <emphasis>amen.</emphasis> "
 "mais pas <emphasis>amen</emphasis>t et ne trouvera donc pas "
@@ -3821,7 +4134,7 @@ msgid ""
 "The Backslash prior to an ordinary character (\"\\o\") indicates that the "
 "character is not being used to match itself, but has special meaning."
 msgstr ""
-"L'antislash précédant un caractère ordinaire «­­&nbsp;\\o&nbsp;» indique que "
+"L'antislash précédant un caractère ordinaire «­­&#160;\\o&#160;» indique que "
 "ce caractère n'est plus utilisé comme tel mais prend une signification "
 "spéciale."
 
@@ -3834,7 +4147,7 @@ msgid ""
 msgstr ""
 "\\b ce symbole d'ancrage indique une limite de mot obligatoire, à l'endroit "
 "où il est inséré dans le motif. Par contre, s'il est utilisé entre crochets, "
-"il correspond au caractère «­­&nbsp;retour arrière&nbsp;». <emphasis>\\bjuste"
+"il correspond au caractère «­­&#160;retour arrière&#160;». <emphasis>\\bjuste"
 "\\b</emphasis> retourne <emphasis>juste</emphasis> mais pas "
 "in<emphasis>juste</emphasis> ou <emphasis>juste</emphasis>sse."
 
@@ -3873,10 +4186,128 @@ msgstr "\\w signifie alphanumérique, identique à [a-zA-Z0-9_]."
 msgid "\\W means not alphanumeric; same as [^a-zA-Z0-9_]."
 msgstr "\\W signifie non alphanumérique, identique à [^a-zA-Z0-9_]."
 
-#: ../C/xiphos.xml:422(title) ../C/xiphos.xml:31(phrase)
+#: ../C/xiphos.xml:237(title) ../C/xiphos.xml:12(title)
+#: ../C/xiphos.xml:25(phrase) ../C/studypad.xml:12(title)
+#: ../C/studypad.xml:25(phrase)
+msgid "The Studypad"
+msgstr "Bloc-notes"
+
+#: ../C/xiphos.xml:4(title) ../C/studypad.xml:4(title)
+msgid "Using The Studypad"
+msgstr "Usage du bloc-notes :"
+
+#: ../C/xiphos.xml:5(para) ../C/studypad.xml:5(para)
+msgid ""
+"The Studypad can be opened by choosing <guibutton>File-&gt;Open Studypad</"
+"guibutton>"
+msgstr ""
+"Le bloc-notes s'obtient à l'aide du menu <menuchoice><guimenuitem>Fichier</"
+"guimenuitem><guimenuitem>Bloc-notes..</guimenuitem></menuchoice>"
+
+#: ../C/xiphos.xml:8(para) ../C/studypad.xml:8(para)
+msgid "This is what the Studypad typically looks like:"
+msgstr "Présentation du bloc-notes :"
+
+#: ../C/xiphos.xml:33(para) ../C/studypad.xml:33(para)
+msgid ""
+"The Studypad will save into your working directory, making it useful for "
+"collecting and exporting information and Bible study material from Xiphos "
+"into other programmes."
+msgstr ""
+"Le bloc-notes enregistre les données dans votre répertoire de travail, ce "
+"qui est pratique pour échanger des informations avec d'autres applications. "
+
+#: ../C/xiphos.xml:34(para) ../C/xiphos.xml:57(para)
+#: ../C/studypad.xml:34(para)
+msgid "Toolbar 1"
+msgstr "Barre d'outils 1"
+
+#: ../C/xiphos.xml:36(para) ../C/xiphos.xml:59(para)
+#: ../C/studypad.xml:36(para)
+msgid "Font Size and Environment"
+msgstr "Taille de police"
+
+#: ../C/xiphos.xml:37(para) ../C/xiphos.xml:60(para)
+#: ../C/studypad.xml:37(para)
+msgid "Font Type"
+msgstr "Type de plice"
+
+#: ../C/xiphos.xml:38(para) ../C/xiphos.xml:61(para)
+#: ../C/studypad.xml:38(para)
+msgid "Bold, Italics, Underscored, Crossed Out"
+msgstr "Gras, italique, souligné, barré"
+
+#: ../C/xiphos.xml:39(para) ../C/xiphos.xml:62(para)
+#: ../C/studypad.xml:39(para)
+msgid "Left, Centre and Right Bound"
+msgstr "Aligné à gauche, au centre et àdroite"
+
+#: ../C/xiphos.xml:40(para) ../C/xiphos.xml:63(para)
+#: ../C/studypad.xml:40(para)
+msgid "Shift Paragraph Right or Left"
+msgstr "Décalage d'un paragraphe à droite ou à gauche"
+
+#: ../C/xiphos.xml:41(para) ../C/xiphos.xml:64(para)
+#: ../C/studypad.xml:41(para)
+msgid "Colour Selector"
+msgstr "Choix des couleurs"
+
+#: ../C/xiphos.xml:43(para) ../C/xiphos.xml:66(para)
+#: ../C/studypad.xml:43(para)
+msgid "Toolbar 2"
+msgstr "Barre d'outils 2"
+
+#: ../C/xiphos.xml:45(para) ../C/studypad.xml:45(para)
+msgid "New, Save, Delete and Print"
+msgstr "Nouveau, enregistrer, supprimer et imprimer"
+
+#: ../C/xiphos.xml:46(para) ../C/xiphos.xml:69(para)
+#: ../C/studypad.xml:46(para)
+msgid "Cut, Copy, Paste and Undo"
+msgstr "Couper, copier, coller et défaire"
+
+#: ../C/xiphos.xml:47(para) ../C/xiphos.xml:70(para)
+#: ../C/studypad.xml:47(para)
+msgid "Find and 'Find and Replace'"
+msgstr "Chercher et remplacer"
+
+#: ../C/xiphos.xml:48(para) ../C/xiphos.xml:71(para)
+#: ../C/studypad.xml:48(para)
+msgid "Spellcheck"
+msgstr "Vérification de l'orthographe"
+
+#: ../C/xiphos.xml:51(para) ../C/xiphos.xml:74(para)
+#: ../C/studypad.xml:51(para)
+msgid ""
+"In order for spellcheck to be available, one of the languages under "
+"<guimenuitem>Edit-&gt;Current Languages</guimenuitem> must be set."
+msgstr ""
+"Pour activer la vérification orthographique, un des langages du menu "
+"<menuchoice><guisubmenu>Éditer</guisubmenu><guimenuitem>Langues actuelles</"
+"guimenuitem></menuchoice> doit être sélectionné."
+
+#: ../C/xiphos.xml:243(title) ../C/xiphos.xml:31(phrase)
 msgid "The Personal Commentary"
 msgstr "Commentaires personnels"
 
+#. Personal Commentary
+#: ../C/xiphos.xml:3(para) ../C/personal.xml:3(para)
+msgid ""
+"To build up a personal commentary you will need to install the editable "
+"'Personal' sword module from the English Commentaries section. Right click "
+"it and choose <guimenuitem>Edit-&gt;Note-&gt;Personal</guimenuitem> in the "
+"menu."
+msgstr ""
+"Écrire son propre commentaire personnel nécessite l'utilisation du module "
+"Sword «­­&#160;Personal&#160;». Pour utiliser ce module, sélectionner le "
+"bouton <guibutton>Modules</guibutton> du volet latéral, puis choisir ensuite "
+"<menuchoice><guimenuitem>Commentaires</guimenuitem><guimenuitem>English</"
+"guimenuitem><guimenuitem>+*Personal*+</guimenuitem></menuchoice>. Pour "
+"modifier ses commentaires, faire un clic du bouton droit à l'aide de la "
+"souris sur la fenêtre des commentaires, puis sélectionner "
+"<menuchoice><guimenuitem>Éditer</guimenuitem><guimenuitem>Note</"
+"guimenuitem><guimenuitem>+*Personal*+</guimenuitem></menuchoice>."
+
 #: ../C/xiphos.xml:11(para)
 msgid ""
 "An editor window similar to the <guimenuitem>Study Pad</guimenuitem> will "
@@ -3999,10 +4430,26 @@ msgstr ""
 "fonction <guimenuitem>Lien</guimenuitem> pour relier les commentaires entre "
 "eux."
 
-#: ../C/xiphos.xml:428(title)
+#: ../C/xiphos.xml:249(title)
 msgid "Journals and Prayer Lists"
 msgstr "Listes de prières et Journaux"
 
+#. Journals and Prayer Lists
+#: ../C/xiphos.xml:3(para) ../C/journals.xml:3(para)
+msgid ""
+"<application>Xiphos</application> supports user-created and -editable "
+"modules to contain general content. Initially conceived as simple prayer "
+"lists, they have expanded to include daily journals and topic-outline "
+"content. The user can maintain prayer lists, or prepare sermons, or write "
+"any structured content desired."
+msgstr ""
+"<application>Xiphos</application> accepte la création et l'édition par "
+"l'utilisateur de modules contenant du texte. Originellement conçus pour "
+"l'édition de simples listes de prières, ces modules incluent désormais des "
+"journaux quotidiens et des notes structurées. Il est ainsi possible de tenir "
+"à jour des listes de prières, de préparer des sermons, ou d'écrire n'importe "
+"quel contenu structuré."
+
 #: ../C/xiphos.xml:13(para)
 msgid ""
 "To enable prayer list and journal support, see the Preferences dialog as "
@@ -4016,7 +4463,7 @@ msgstr ""
 "<menuchoice><guimenuitem>Général</guimenuitem><guimenuitem>Divers</"
 "guimenuitem></menuchoice>, sélectionner l'élément indiquant "
 "<guimenuitem>Activer les listes de prières</guimenuitem>. Une nouvelle "
-"entrée <guimenuitem>Liste de prières&nbsp;/&nbsp;Journal</guimenuitem> "
+"entrée <guimenuitem>Liste de prières&#160;/&#160;Journal</guimenuitem> "
 "apparaît dès cet instant dans la liste de modules du <interface>volet "
 "latéral</interface>."
 
@@ -4144,10 +4591,31 @@ msgstr ""
 "contenu composé personnellement, avec d'autres utilisateurs d'applications "
 "utilisant l'architecture logicielle du Projet SWORD."
 
-#: ../C/xiphos.xml:434(title)
+#: ../C/xiphos.xml:255(title)
 msgid "Getting Help Online"
 msgstr "Obtenir de l'aide en ligne"
 
+#: ../C/xiphos.xml:4(title) ../C/onlinehelp.xml:4(title)
+msgid "Users Mailing List"
+msgstr "Liste de diffusion des utilisateurs"
+
+#: ../C/xiphos.xml:5(para) ../C/onlinehelp.xml:5(para)
+msgid ""
+"One way you can get help with Xiphos is using our low-traffic users' mailing "
+"list. You can sign up by clicking <ulink url=\"https://lists.sourceforge.net/"
+"lists/listinfo/gnomesword-users/\"> this link</ulink>. Once you are signed "
+"up, you can email the list with any problems you are having and other users "
+"or the developers will respond, typically within a day."
+msgstr ""
+"Une façon d'obtenir de l'aide au sujet de <application>&appname;</"
+"application> est d'utiliser nos listes de diffusion à faible trafic. il "
+"suffit de s'abonner en sélectionnant <ulink url=\"https://lists.sourceforge."
+"net/lists/listinfo/gnomesword-users/\"> ce lien</ulink>. Une fois inscrit, "
+"un simple e-mail envoyé sur la liste décrivant les problèmes rencontrés "
+"amènera une réponse des autres utilisateurs ou des développeurs généralement "
+"dans la journée.<para>[NDT : La liste de diffusion est en langue anglaise]</"
+"para>"
+
 #: ../C/xiphos.xml:13(title)
 msgid "Live Chat"
 msgstr "Discussion en ligne"
@@ -4156,30 +4624,101 @@ msgstr "Discussion en ligne"
 msgid ""
 "Another way to get help is with online chat. Xiphos has an IRC channel on "
 "freenode, #xiphos. If you don't know what that means, it's ok. Just click "
-"<ulink url=\"http://embed.mibbit.com/?server=irc.freenode.net&amp;channel=%"
-"23xiphos\">this link</ulink> (it will open your web browser), type a "
-"nickname or accept the default, and click \"Click to join chatroom\". This "
-"will take you to a chatroom where the developers and other users are "
-"available to help you with issues you may be having. Although many times "
-"someone will answer your question immediately, sometimes you may have to "
-"wait a few minutes or longer."
+"<ulink url=\"http://webchat.freenode.net/?randomnick=1&amp;"
+"channels=xiphos&amp;prompt=1\">this link</ulink> (it will open your web "
+"browser), type a nickname or accept the default, and click \"Click to join "
+"chatroom\". This will take you to a chatroom where the developers and other "
+"users are available to help you with issues you may be having. Although many "
+"times someone will answer your question immediately, sometimes you may have "
+"to wait a few minutes or longer."
 msgstr ""
 "Une autre façon d'obtenir de l'aide est d'utiliser le chat en ligne. "
 "<application>&appname;</application> a un canal IRC ouvert sur freenode, "
 "#xiphos;. Un moyen simple de se connecter est de sélectionner <ulink url="
-"\"http://embed.mibbit.com/?server=irc.freenode.net&amp;channel=%23xiphos"
+"\"http://webchat.freenode.net/?randomnick=1&amp;channels=xiphos&amp;prompt=1"
 "\">ce lien</ulink>. (Ceci ouvre la fenêtre du navigateur Internet). Ensuite, "
-"saisir un pseudo ou accepter celui par defaut, et sélectionner «&nbsp;Click "
-"to join chatroom&nbsp;». Ceci ouvre l'accès au salon où les développeurs et "
+"saisir un pseudo ou accepter celui par defaut, et sélectionner «&#160;Click "
+"to join chatroom&#160;». Ceci ouvre l'accès au salon où les développeurs et "
 "d'autres utilisateurs sont prêts à discuter des problèmes rencontrés. "
 "Généralement, les réponses aux questions sont immédiates, mais parfois cela "
 "peut prendre quelques minutes voire plus longtemps.<para>[NDT : Le chat en "
 "ligne est en langue anglaise]</para>"
 
-#: ../C/xiphos.xml:440(title)
+#: ../C/xiphos.xml:261(title)
 msgid "Original Language Research"
 msgstr "Étude des textes originaux"
 
+#: ../C/xiphos.xml:4(title) ../C/originallanguage.xml:4(title)
+msgid "Installing Needed Modules"
+msgstr "Installer les modules nécessaires"
+
+#: ../C/xiphos.xml:5(para) ../C/originallanguage.xml:5(para)
+msgid ""
+"Xiphos is ideally suited for studying the original Greek and Hebrew. To get "
+"started, you will want the following modules:"
+msgstr ""
+"Xiphos convient parfaitement à l'étude des textes originaux en grec ou "
+"hébreu. Pour commencer, il est recommandé d'installer les modules suivants :"
+
+#: ../C/xiphos.xml:8(para) ../C/originallanguage.xml:8(para)
+msgid "From Crosswire Repository:"
+msgstr "Dépot Crosswire"
+
+#: ../C/xiphos.xml:13(para) ../C/originallanguage.xml:13(para)
+msgid ""
+"StrongsHebrew Dictionary (or get StrongsRealHebrew from the Xiphos "
+"Repository)"
+msgstr ""
+"Dictionnaire StrongsHebrew (ou le StrongsRealHebrew du dépot &appname;)<para>"
+"[NDT : dictionnaires en langue anglaise]</para>"
+
+#: ../C/xiphos.xml:18(para) ../C/originallanguage.xml:18(para)
+msgid ""
+"StrongsGreek Dictionary (or get StrongsRealGreek from the Xiphos Repository)"
+msgstr ""
+"Dictionnaire StrongsGreek (ou le StrongsRealGreek du dépot &appname;)<para>"
+"[NDT : dictionnaires en langue anglaise]</para>"
+
+#: ../C/xiphos.xml:23(para) ../C/originallanguage.xml:23(para)
+msgid "Robinson Dictionary"
+msgstr ""
+"Dictionnaire Robinson (codes morphologiques)<para>[NDT : dictionnaire en "
+"langue anglaise]</para>"
+
+#: ../C/xiphos.xml:28(para) ../C/originallanguage.xml:28(para)
+msgid "KJV Bible"
+msgstr "Bible Louis Segond 1910 avec codes Strong et étiquettes morphologiques"
+
+#: ../C/xiphos.xml:33(para) ../C/originallanguage.xml:33(para)
+msgid "From Xiphos Repository:"
+msgstr "Dépot &appname;"
+
+#: ../C/xiphos.xml:38(para) ../C/originallanguage.xml:38(para)
+msgid ""
+"StrongsRealGreek Dictionary (same as StrongsGreek, but with Greek "
+"characters, B-Greek transliteration, and self-referencing links)"
+msgstr ""
+"Dictionnaire StrongsRealGreek (identique au StrongsGreek, mais avec "
+"caractères grecs, transliteration B-Greek, et liens de renvois)<para>[NDT : "
+"dictionnaire en langue anglaise]</para>"
+
+#: ../C/xiphos.xml:43(para) ../C/originallanguage.xml:43(para)
+msgid ""
+"StrongsRealHebrew Dictionary (same as StrongsHebrew, but with Hebrew "
+"characters and self-referencing links)"
+msgstr ""
+"Dictionnaire StrongsRealHebrew (identique au StrongsHebrew, mais avec "
+"caractères hébreu et liens de renvois)<para>[NDT : dictionnaire en langue "
+"anglaise]</para>"
+
+#: ../C/xiphos.xml:48(para) ../C/originallanguage.xml:48(para)
+msgid ""
+"InvertedStrongsRealGreek (key in or copy actual Greek word, rather than "
+"number)"
+msgstr ""
+"Dictionnaire InvertedStrongsRealGreek définitions des mots grecs<para>NDT : "
+"dictionnaire en langue anglaise]</para>"
+
 #: ../C/xiphos.xml:56(title)
 msgid "Setting Up"
 msgstr "Configurer"
@@ -4249,11 +4788,11 @@ msgstr ""
 "guibutton>. Ensuite sélectionner l'onglet <interface>Attributs</interface>, "
 "et cocher la case <guibutton>Nombres de Strong</guibutton>. Il est "
 "maintenant possible de rechercher un nombre de Strong dans la zone de saisie "
-"en le faisant précéder de «&nbsp;<emphasis>lemma:</emphasis>&nbsp;» "
-"accompagné de «&nbsp;<emphasis>G</emphasis>&nbsp;» pour la langue grecque et "
-"«&nbsp;<emphasis>H</emphasis>&nbsp;» pour la langue hébraïque. Ainsi pour "
+"en le faisant précéder de «&#160;<emphasis>lemma:</emphasis>&#160;» "
+"accompagné de «&#160;<emphasis>G</emphasis>&#160;» pour la langue grecque et "
+"«&#160;<emphasis>H</emphasis>&#160;» pour la langue hébraïque. Ainsi pour "
 "rechercher le mot hébreu <emphasis>tsad-deek (6662)</emphasis>, entrer : "
-"«&nbsp;<emphasis>lemma:G662</emphasis>&nbsp;». Une fois la recherche terminée "
+"«&#160;<emphasis>lemma:G662</emphasis>&#160;». Une fois la recherche terminée "
 "et les résultats affichés, un clic sur un résultat fait afficher le contenu "
 "dans la zone <interface>Aperçu</interface> ainsi que les nombres de Strong "
 "suivant immédiatement les mots associés. Noter que survoler ces nombres avec "
@@ -4356,10 +4895,15 @@ msgstr ""
 "Sont inclus les codes Strong, les étiquettes morphologiques et les accents "
 "grecs."
 
-#: ../C/xiphos.xml:446(title)
+#: ../C/xiphos.xml:267(title)
 msgid "Authors"
 msgstr "Auteurs"
 
+#. Authors
+#: ../C/xiphos.xml:3(para) ../C/authors.xml:3(para)
+msgid "This manual was written by:"
+msgstr "Ce manuel a été écrit par :"
+
 #: ../C/xiphos.xml:8(para)
 msgid "Andy Piper"
 msgstr "Andy Piper"
@@ -4411,10 +4955,22 @@ msgstr ""
 "<ulink type=\"http\" url=\"http://www.sourceforge.net/projects/xiphos"
 "\">http://www.sourceforge.net/projects/xiphos</ulink>"
 
-#: ../C/xiphos.xml:452(title)
+#: ../C/xiphos.xml:273(title)
 msgid "License"
 msgstr "Licence"
 
+#: ../C/xiphos.xml:2(para) ../C/license.xml:2(para)
+msgid ""
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the <ulink type=\"ghelp\" url=\"gnome-help:gpl\">GNU "
+"General Public License</ulink> version 2 or any later version as published "
+"by the Free Software Foundation."
+msgstr ""
+"Ce programme est libre, vous pouvez le redistribuer et/ou le modifier selon "
+"les termes de la <ulink type=\"ghelp\" url=\"gnome-help:gpl\">Licence "
+"Publique Générale GNU</ulink> publiée par la Free Software Foundation "
+"(version 2)."
+
 #: ../C/xiphos.xml:7(para)
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
@@ -4446,17 +5002,429 @@ msgstr ""
 "Fifth Floor <city>Boston</city>, <state>MA</state><postcode>02110-1301</"
 "postcode> <country>USA</country></address>"
 
-#. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2.
-#: ../C/xiphos.xml:0(None)
+#. Use the Introduction section to give a brief overview of what
+#.      the application is and what it does.
+#: ../C/introduction.xml:5(para)
+msgid ""
+"is a Bible study and research tool based upon the \"SWORD Project\" "
+"libraries and the GNOME Desktop libraries. You can use to do the following:"
+msgstr ""
+"est un outil de recherche et d'étude biblique s'appuyant sur les composants "
+"de l'architecture logicielle du Projet SWORD et l'environnement de bureau "
+"GNOME. <application>&appname;</application> offre les fonctionnalités "
+"suivantes :"
+
+#: ../C/interface.xml:27(phrase)
+msgid "menubar"
+msgstr "Barre de menu"
+
+#. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2
+#: ../C/authors.xml:0(None)
 msgid "translator-credits"
 msgstr "Accréditions aux traducteurs"
 
+#~ msgid ""
+#~ "Permission is granted to copy, distribute and/or modify this document "
+#~ "under the terms of the GNU Free Documentation License (GFDL), Version 1.1 "
+#~ "or any later version published by the Free Software Foundation with no "
+#~ "Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. You "
+#~ "can find a copy of the GFDL at this <ulink type=\"help\" url=\"ghelp:fdl"
+#~ "\">link</ulink> or in the file COPYING-DOCS distributed with this manual."
+#~ msgstr ""
+#~ "L'autorisation de copier, distribuer et/ou modifier le présent document "
+#~ "est soumise aux conditions de la licence relative à la documentation "
+#~ "gratuite GNU, version 1.1 ou toute version publiée ultérieurement par la "
+#~ "Free Software Foundation sans sections identiques et sans aucun texte "
+#~ "indiqué sur la première de couverture ni sur la quatrième de couverture.  "
+#~ "Vous pouvez trouver une copie de cette licence à l'adresse suivante : "
+#~ "<ulink type=\"help\" url=\"ghelp:fdl\">lien</ulink> ou dans le fichier "
+#~ "COPYING-DOCS distribué avec le présent manuel."
+
+#~ msgid ""
+#~ "This manual is part of a collection of GNOME manuals distributed under "
+#~ "the GFDL. If you want to distribute this manual separately from the "
+#~ "collection, you can do so by adding a copy of the license to the manual, "
+#~ "as described in section 6 of the license."
+#~ msgstr ""
+#~ "Le présent manuel appartient à une collection de manuels GNOME distribués "
+#~ "conformément à cette licence.  Si vous souhaitez distribuer le présent  "
+#~ "manuel séparément de la collection, cela est possible moyennant l'ajout "
+#~ "d'une copie de la licence au manuel, tel que décrit dans la section 6 de "
+#~ "la licence."
+
+#~ msgid ""
+#~ "Many of the names used by companies to distinguish their products and "
+#~ "services are claimed as trademarks. Where those names appear in any GNOME "
+#~ "documentation, and the members of the GNOME Documentation Project are "
+#~ "made aware of those trademarks, then the names are in capital letters or "
+#~ "initial capital letters."
+#~ msgstr ""
+#~ "De nombreux noms utilisés par les sociétés pour désigner leurs produits "
+#~ "et services sont protégés en tant que marques commerciales. Lorsque ces "
+#~ "noms apparaissent dans la documentation GNOME et lorsque les membres du "
+#~ "projet de documentation GNOME connaissent l'existence d'une telle "
+#~ "protection, ces noms sont imprimés en lettres majuscules ou portent une "
+#~ "lettre majuscule à l'initiale."
+
+#~ msgid ""
+#~ "DOCUMENT IS PROVIDED ON AN \"AS IS\" BASIS, WITHOUT WARRANTY OF ANY KIND, "
+#~ "EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES "
+#~ "THAT THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS FREE OF DEFECTS "
+#~ "MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE "
+#~ "RISK AS TO THE QUALITY, ACCURACY, AND PERFORMANCE OF THE DOCUMENT OR "
+#~ "MODIFIED VERSION OF THE DOCUMENT IS WITH YOU. SHOULD ANY DOCUMENT OR "
+#~ "MODIFIED VERSION PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL "
+#~ "WRITER, AUTHOR OR ANY CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY "
+#~ "SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES "
+#~ "AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY DOCUMENT OR MODIFIED "
+#~ "VERSION OF THE DOCUMENT IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS "
+#~ "DISCLAIMER; AND"
+#~ msgstr ""
+#~ "CE DOCUMENT EST FOURNI \"TEL QUEL\", SANS AUCUNE GARANTIE, EXPLICITE OU "
+#~ "IMPLICITE, Y COMPRIS, SANS LIMITATION, TOUTE GARANTIE ASSURANT QUE LE "
+#~ "DOCUMENT OU LA VERSION MODIFIÉE DE CELUI-CI EST EXEMPT DE DÉFAUTS, "
+#~ "COMMERCIALISABLE, ADAPTÉ À UN USAGE DONNÉ ET N'EST CONTRAIRE À AUCUNE "
+#~ "LÉGISLATION. VOUS ASSUMEZ L'ENSEMBLE DES RISQUES ASSOCIÉS À LA QUALITÉ, A "
+#~ "L'EXACTITUDE ET A LA PERFORMANCE DU PRÉSENT DOCUMENT OU D'UNE VERSION "
+#~ "MODIFIÉE DE CELUI-CI. SI LE DOCUMENT OU UNE VERSION MODIFIÉE DE CELUI-CI "
+#~ "DEVAIT S'AVÉRER DÉFECTUEUX A QUELQUE ÉGARD, VOUS (ET NON LE RÉDACTEUR "
+#~ "INITIAL, L'AUTEUR OU TOUT AUTRE CONTRIBUTEUR) ASSUMEZ LES COÛTS DE TOUTE "
+#~ "MAINTENANCE, RÉPARATION OU CORRECTION NÉCESSAIRE. LA PRÉSENTE CLAUSE DE "
+#~ "NON-RESPONSABILITÉ EN MATIÈRE DE GARANTIE CONSTITUE UNE PARTIE "
+#~ "ESSENTIELLE DE LA PRÉSENTE LICENCE. AUCUNE UTILISATION DU PRÉSENT "
+#~ "DOCUMENT OU D'UNE VERSION MODIFIÉE DE CELUI-CI N'EST AUTORISÉE AU TITRE "
+#~ "DE LA PRÉSENTE LICENCE SANS APPLICATION DE LA CLAUSE DE NON-"
+#~ "RESPONSABILITÉ."
+
+#~ msgid ""
+#~ "UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER IN TORT "
+#~ "(INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE AUTHOR, INITIAL "
+#~ "WRITER, ANY CONTRIBUTOR, OR ANY DISTRIBUTOR OF THE DOCUMENT OR MODIFIED "
+#~ "VERSION OF THE DOCUMENT, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE "
+#~ "LIABLE TO ANY PERSON FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR "
+#~ "CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, "
+#~ "DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR "
+#~ "MALFUNCTION, OR ANY AND ALL OTHER DAMAGES OR LOSSES ARISING OUT OF OR "
+#~ "RELATING TO USE OF THE DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT, "
+#~ "EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH "
+#~ "DAMAGES."
+#~ msgstr ""
+#~ "PAR AILLEURS, EN AUCUN CAS ET AU TITRE D'AUCUNE THÉORIE JURIDIQUE, QUE CE "
+#~ "SOIT EN VERTU D'UN PRÉJUDICE (EN CE COMPRISE LA NÉGLIGENCE), D'UN CONTRAT "
+#~ "OU D'UNE QUELCONQUE AUTRE RAISON, L'AUTEUR, LE RÉDACTEUR INITIAL, TOUT "
+#~ "AUTRE CONTRIBUTEUR OU DISTRIBUTEUR DU PRÉSENT DOCUMENT OU D'UNE VERSION "
+#~ "MODIFIÉE DE CELUI-CI, OU TOUT FOURNISSEUR D'UNE TELLE PARTIE, NE POURRA "
+#~ "ÊTRE TENU POUR RESPONSABLE PAR UN TIERS DE TOUT DOMMAGE DIRECT, INDIRECT, "
+#~ "SPÉCIAL, ACCIDENTEL OU CONSÉCUTIF QUEL QU'EN SOIT LE CARACTÈRE, Y "
+#~ "COMPRIS, SANS LIMITATION, LES DOMMAGES CAUSÉS PAR UNE PERTE DE CLIENTÈLE, "
+#~ "D'ARRÊT DE TRAVAIL, DE PANNE OU DE DYSFONCTIONNEMENT INFORMATIQUE OU POUR "
+#~ "TOUT AUTRE DOMMAGE OU PERTE DÉCOULANT DE OU ASSOCIÉ À L'UTILISATION DU "
+#~ "PRÉSENT DOCUMENT OU DE VERSIONS MODIFIÉES DE CELUI-CI, ET CE, MÊME SI "
+#~ "LADITE PARTIE A ÉTÉ INFORMÉE DE LA POSSIBILITÉ DE TELS DOMMAGES."
+
+#~ msgid ""
+#~ "DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT ARE PROVIDED UNDER THE "
+#~ "TERMS OF THE GNU FREE DOCUMENTATION LICENSE WITH THE FURTHER "
+#~ "UNDERSTANDING THAT: <placeholder-1/>"
+#~ msgstr ""
+#~ "LA DISTRIBUTION DU PRÉSENT DOCUMENT ET DES VERSIONS MODIFIÉES DE CELUI-CI "
+#~ "EST RÉGIE  PAR LA LICENCE RELATIVE À LA DOCUMENTATION GRATUITE GNU, CE "
+#~ "QUI IMPLIQUE QUE :<placeholder-1/>"
+
+#~ msgid "Xiphos 3.0.0"
+#~ msgstr "Xiphos 3.0.0"
+
+#~ msgid "2009-02-09"
+#~ msgstr "2009-02-09"
+
+#~ msgid "Xiphos 2.4.0"
+#~ msgstr "Xiphos 2.4.0"
+
+#~ msgid "2008-09-20"
+#~ msgstr "2008-09-20"
+
+#~ msgid "Xiphos 2.3.6"
+#~ msgstr "Xiphos 2.3.6"
+
+#~ msgid "2008-08-02"
+#~ msgstr "2008-08-02"
+
+#~ msgid "Xiphos 2.3.5"
+#~ msgstr "Xiphos 2.3.5"
+
+#~ msgid "2008-07-02"
+#~ msgstr "2007-07-02"
+
+#~ msgid "Xiphos 2.3.4"
+#~ msgstr "Xiphos 2.3.4"
+
+#~ msgid "2008-05-26"
+#~ msgstr "2008-05-26"
+
+#~ msgid "Xiphos 2.3.3"
+#~ msgstr "Xiphos 2.3.3"
+
+#~ msgid "2008-01-20"
+#~ msgstr "2007-01-20"
+
+#~ msgid "Xiphos 2.3.2"
+#~ msgstr "Xiphos 2.3.2"
+
+#~ msgid "2007-12-26"
+#~ msgstr "2007-12-26"
+
+#~ msgid "Xiphos 2.3.1"
+#~ msgstr "Xiphos 2.3.1"
+
+#~ msgid "Xiphos 2.2.3"
+#~ msgstr "Xiphos 2.2.3"
+
+#~ msgid "2007-03-26"
+#~ msgstr "2007-03-26"
+
+#~ msgid "Xiphos 2.2.1"
+#~ msgstr "Xiphos 2.2.1"
+
+#~ msgid "2007-01-27"
+#~ msgstr "2007-01-27"
+
+#~ msgid "Xiphos 2.2.0"
+#~ msgstr "Xiphos 2.2.0"
+
+#~ msgid "2006-12-23"
+#~ msgstr "2006-12-23"
+
+#~ msgid "Xiphos 2.1.10"
+#~ msgstr "Xiphos 2.1.10"
+
+#~ msgid "2006-12-10"
+#~ msgstr "2006-12-10"
+
+#~ msgid "Xiphos 2.1.9"
+#~ msgstr "Xiphos 2.1.9"
+
+#~ msgid "2006-11-12"
+#~ msgstr "2006-11-12"
+
+#~ msgid "Xiphos 2.1.8"
+#~ msgstr "Xiphos 2.1.8"
+
+#~ msgid "2006-11-08"
+#~ msgstr "2006-11-08"
+
+#~ msgid "Xiphos 2.1.7"
+#~ msgstr "Xiphos 2.1.7"
+
+#~ msgid "2006-05-04"
+#~ msgstr "2006-05-04"
+
+#~ msgid "Xiphos 2.1.6"
+#~ msgstr "Xiphos 2.1.6"
+
+#~ msgid "2006-04-13"
+#~ msgstr "2006-04-13"
+
+#~ msgid "Xiphos 2.1.5"
+#~ msgstr "Xiphos 2.1.5"
+
+#~ msgid "2005-12-14"
+#~ msgstr "2005-12-14"
+
+#~ msgid "Xiphos 2.1.4"
+#~ msgstr "Xiphos 2.1.4"
+
+#~ msgid "2005-12-13"
+#~ msgstr "2005-12-13"
+
+#~ msgid "Xiphos 2.1.2"
+#~ msgstr "Xiphos 2.1.2"
+
+#~ msgid "2005-05-31"
+#~ msgstr "2005-05-31"
+
+#~ msgid "Xiphos 2.1.1"
+#~ msgstr "Xiphos 2.1.1"
+
+#~ msgid "2004-07-18"
+#~ msgstr "2004-07-18"
+
+#~ msgid "Xiphos 2.1.0"
+#~ msgstr "Xiphos 2.1.0"
+
+#~ msgid "2004-08-30"
+#~ msgstr "2004-08-30"
+
+#~ msgid "Xiphos 2.0.0"
+#~ msgstr "Xiphos 2.0.0"
+
+#~ msgid "2003-12-25"
+#~ msgstr "2003-12-25"
+
+#~ msgid "Xiphos 0.7.10"
+#~ msgstr "Xiphos 0.7.10"
+
+#~ msgid "2003-09-05"
+#~ msgstr "2003-09-05"
+
+#~ msgid "Xiphos 0.7.9"
+#~ msgstr "Xiphos 0.7.9"
+
+#~ msgid "2003-03-26"
+#~ msgstr "2003-03-26"
+
+#~ msgid "Xiphos 0.7.8"
+#~ msgstr "Xiphos 0.7.8"
+
+#~ msgid "2003-01-12"
+#~ msgstr "2003-01-12"
+
+#~ msgid "Xiphos 0.7.7"
+#~ msgstr "Xiphos 0.7.7"
+
+#~ msgid "2002-12-20"
+#~ msgstr "2002-12-20"
+
+#~ msgid "Xiphos 0.7.6"
+#~ msgstr "Xiphos 0.7.6"
+
+#~ msgid "2002-11-03"
+#~ msgstr "2002-11-03"
+
+#~ msgid "Xiphos 0.7.5"
+#~ msgstr "Xiphos 0.7.5"
+
+#~ msgid "2002-07-01"
+#~ msgstr "2002-07-01"
+
+#~ msgid "Xiphos 0.7.4"
+#~ msgstr "Xiphos 0.7.4"
+
+#~ msgid "2002-06-10"
+#~ msgstr "2002-06-10"
+
+#~ msgid "Xiphos 0.7.3"
+#~ msgstr "Xiphos 0.7.3"
+
+#~ msgid "2002-05-10"
+#~ msgstr "2002-05-10"
+
+#~ msgid "Xiphos 0.7.2"
+#~ msgstr "Xiphos 0.7.2"
+
+#~ msgid "2002-04-22"
+#~ msgstr "2002-04-22"
+
+#~ msgid "Xiphos 0.7.1"
+#~ msgstr "Xiphos 0.7.1"
+
+#~ msgid "2002-04-10"
+#~ msgstr "2002-04-10"
+
+#~ msgid "Xiphos 0.7.0"
+#~ msgstr "Xiphos 0.7.0"
+
+#~ msgid "2002-04-09"
+#~ msgstr "2002-04-09"
+
+#~ msgid "Xiphos 0.5.0"
+#~ msgstr "Xiphos 0.5.0"
+
+#~ msgid "2001-08-13"
+#~ msgstr "2001-08-13"
+
+#~ msgid "Xiphos 0.4.1"
+#~ msgstr "Xiphos 0.4.1"
+
+#~ msgid "2001-04-10"
+#~ msgstr "2001-04-10"
+
+#~ msgid "Xiphos 0.4.0"
+#~ msgstr "Xiphos 0.4.0"
+
+#~ msgid "2001-04-06"
+#~ msgstr "2001-04-06"
+
+#~ msgid "Xiphos 0.3.7"
+#~ msgstr "Xiphos 0.3.7"
+
+#~ msgid "2000-12-08"
+#~ msgstr "2000-12-08"
+
+#~ msgid "Xiphos 0.3.6"
+#~ msgstr "Xiphos 0.3.6"
+
+#~ msgid "2000-12-07"
+#~ msgstr "2000-12-07"
+
+#~ msgid "Xiphos 0.3.2"
+#~ msgstr "Xiphos 0.3.2"
+
+#~ msgid "2000-11-21"
+#~ msgstr "2000-11-21"
+
+#~ msgid "Xiphos 0.3.0"
+#~ msgstr "Xiphos 0.3.0"
+
+#~ msgid "2000-11-10"
+#~ msgstr "2000-11-10"
+
+#~ msgid "Xiphos 0.2.5"
+#~ msgstr "Xiphos 0.2.5"
+
+#~ msgid "2000-10-06"
+#~ msgstr "2000-10-06"
+
+#~ msgid "Xiphos 0.2.4"
+#~ msgstr "Xiphos 0.2.4"
+
+#~ msgid "2000-09-16"
+#~ msgstr "2000-09-16"
+
+#~ msgid "Xiphos 0.2.3"
+#~ msgstr "Xiphos 0.2.3"
+
+#~ msgid "2000-09-07"
+#~ msgstr "2000-09-07"
+
+#~ msgid "Xiphos 0.2.2"
+#~ msgstr "Xiphos 0.2.2"
+
+#~ msgid "2000-09-06"
+#~ msgstr "2000-09-06"
+
+#~ msgid "Xiphos 0.2.1"
+#~ msgstr "Xiphos 0.2.1"
+
+#~ msgid "2000-08-29"
+#~ msgstr "2000-08-29"
+
+#~ msgid "Xiphos 0.2.0"
+#~ msgstr "Xiphos 0.2.0"
+
+#~ msgid "2000-08-19"
+#~ msgstr "2000-08-19"
+
+#~ msgid "Xiphos 0.1.8"
+#~ msgstr "Xiphos 0.1.8"
+
+#~ msgid "2000-06-10"
+#~ msgstr "2000-06-10"
+
+#~ msgid "Xiphos 0.1.7"
+#~ msgstr "Xiphos 0.1.7"
+
+#~ msgid "2000-05-19"
+#~ msgstr "2000-05-19"
+
+#~ msgid "Xiphos 0.1.6"
+#~ msgstr "Xiphos 0.1.6"
+
+#~ msgid "2000-05-08"
+#~ msgstr "2000-05-08"
+
 #~ msgid "2008"
 #~ msgstr "2008"
 
-#~ msgid "Xiphos Manual 2.4.0"
-#~ msgstr "Manuel de Xiphos &manrevision;"
-
 #~ msgid "Sat, 20 Sep 2008"
 #~ msgstr "20 septembre 2008"
 
@@ -4597,8 +5565,8 @@ msgstr "Accréditions aux traducteurs"
 #~ "these limitations is present."
 #~ msgstr ""
 #~ "La bibliothÚque d'affichage gtkhtml3 ne supporte qu'une seule police à "
-#~ "la fois. En conséquence, la fenêtre détachée «&nbsp;Vue "
-#~ "parallÚle&nbsp;» ne peut respecter les choix individuels de police "
+#~ "la fois. En conséquence, la fenêtre détachée «&#160;Vue "
+#~ "parallÚle&#160;» ne peut respecter les choix individuels de police "
 #~ "prédéfinis et les changements de police sont ignorés. Dans la "
 #~ "bibliothÚque MozEmbed, ces limitations ne sont pas présentes "
 
diff --git a/help/fr/license.xml b/help/fr/license.xml
index be785f7..6523f48 100644
--- a/help/fr/license.xml
+++ b/help/fr/license.xml
@@ -1,6 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<para>
-    	This program is free software; you can redistribute it and/or
-    	modify it under the terms of the <ulink type="ghelp" url="gnome-help:gpl">GNU General Public
-    	License</ulink> version 2 or any later version as published by the Free Software Foundation.
-   		</para>
+<para>Ce programme est libre, vous pouvez le redistribuer et/ou le modifier selon les termes de la <ulink type="ghelp" url="gnome-help:gpl">Licence Publique Générale GNU</ulink> publiée par la Free Software Foundation (version 2).</para>
diff --git a/help/fr/modules.xml b/help/fr/modules.xml
index 10014e3..a7e7f5e 100644
--- a/help/fr/modules.xml
+++ b/help/fr/modules.xml
@@ -3,7 +3,7 @@
 <!-- Introduction To Module Manager -->
 <sect2 id="module-introduction">
   		<title>Introduction à la gestion des modules</title>
-		<para>Le «­­module et plus g</para>
+		<para>Le «­­ module » est un bloc de contenu dans <application> et plus g</application></para>
 		<para>Si d'autres applications basées sur Sword sont installées, elles ont accès aux modules installés par le gestionnaire de modules.</para>
 		<figure>
 			<title>La fenêtre de gestion des modules</title>
diff --git a/help/fr/personal.xml b/help/fr/personal.xml
index bf22516..96be8b8 100644
--- a/help/fr/personal.xml
+++ b/help/fr/personal.xml
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Personal Commentary-->
-<para>Écrire son propre commentaire personnel nécessite l'utilisation du module Sword «­­PersonalModules du volet latCommentairesEnglish+*Personal*+. Pour modifier ses commentaires, faire un clic du bouton droit Note+*Personal*+.</para>
+<para>Écrire son propre commentaire personnel nécessite l'utilisation du module Sword «­­ Personal ». Pour utiliser ce module, sélectionner le bouton <guibutton>Modules</guibutton> du volet latéral, puis choisir ensuite <menuchoice><guimenuitem>Commentaires</guimenuitem><guimenuitem>English</guimenuitem><guimenuitem>+*Personal*+</guimenuitem></menuchoice>. Pour modifier ses commentaires, faire un clic du bouton droit à l'aide de la souris sur la fenêtre des commentaires, puis sélectionner <menuchoice><guimenuitem>Éditer</guimenuitem><guimenuitem>Note</guimenuitem><guimenuitem>+*Personal*+</guimenuitem></menuchoice>.</para>
diff --git a/help/fr/search.xml b/help/fr/search.xml
index 77c602f..e78dda5 100644
--- a/help/fr/search.xml
+++ b/help/fr/search.xml
@@ -66,12 +66,12 @@
 				</varlistentry>
 				<varlistentry>
 					<term><guibutton>Expression rationnelle</guibutton></term> 
-					<listitem><para>L'expression à rechercher est une expression rationnelle. Une expression rationnelle est basée sur un langage et une syntaxe spécifiques permettant de retrouver un mot, une phrase à l'aide de combinaisons complexes. Par exemple l'expression rationnelle <userinput>\ A[a-z]*iah </userinput> permet de retrouver les passages qui contiennent les mots Aiah, Ahaziah, Athaliah et Amariah.</para>
+					<listitem><para>Cette requête utilise une expression rationnelle comme clé de recherche. Une expression rationnelle est basée sur un langage et une syntaxe spécifiques permettant de retrouver un mot, une phrase à l'aide de combinaisons complexes. Par exemple l'expression rationnelle <userinput>\ A[a-z]*iah </userinput> permet de retrouver les passages qui contiennent les mots Aiah, Ahaziah, Athaliah et Amariah.</para>
 					<para>Un exposé complet de l'emploi des expressions rationnelles dépasse le cadre de ce manuel, mais cependant plus d'informations à ce sujet peuvent être obtenues en parcourant le manuel de <command>grep</command>.</para></listitem>
 				</varlistentry>
 				<varlistentry>
 					<term><guibutton>Phrase exacte</guibutton></term> 
-					<listitem><para>La requête recherche la phrase exacte contenue dans l'expression à rechercher. Si la phrase à rechercher est <userinput>en vérité</userinput>, les passages obtenus contiendront «­­en ven toute  v</para></listitem>
+					<listitem><para>La requête recherche la phrase exacte contenue dans l'expression à rechercher. Si la phrase à rechercher est <userinput>en vérité</userinput>, les passages obtenus contiendront «­­ <emphasis>en vérité</emphasis> », mais pas «­­ <emphasis>en</emphasis> toute  <emphasis>vérité</emphasis> ».</para></listitem>
 				</varlistentry>
 			</variablelist>
  		</sect3>
diff --git a/help/fr/xiphos.xml b/help/fr/xiphos.xml
index 6581a79..4f8583a 100644
--- a/help/fr/xiphos.xml
+++ b/help/fr/xiphos.xml
@@ -14,9 +14,9 @@
 <!ENTITY license SYSTEM "license.xml">
 <!ENTITY onlinehelp SYSTEM "onlinehelp.xml">
 <!ENTITY originallanguage SYSTEM "originallanguage.xml">
-<!ENTITY appversion "3.1">
-<!ENTITY manrevision "3.1">
-<!ENTITY date "2009-05-11">
+<!ENTITY appversion "3.1.2">
+<!ENTITY manrevision "3.1.2">
+<!ENTITY date "11 May 2009">
 <!ENTITY app "<application>Xiphos</application>">
 <!ENTITY appname "Xiphos">
 <!ENTITY xiphos "the Xiphos Team">
@@ -51,7 +51,7 @@ Template last modified Apr 11, 2002
 <!-- appropriate code -->
   <articleinfo>
     <title>Manuel de <application>&appname;</application> :</title>
-    <abstract>
+    <abstract role="description">
       <para><application>&appname;</application> est un logiciel d'aide à l'étude biblique.</para>
     </abstract>
     <copyright>
@@ -71,441 +71,193 @@ Template last modified Apr 11, 2002
     <!-- An address can be added to the publisher information.  If a role is
     not specified, the publisher/author is the same for all versions of the
     document.  -->
-    <publisher>
+    <publisher role="maintainer">
       <publishername>L'équipe de développement Xiphos</publishername>
     </publisher>
 
-     <legalnotice id="legalnotice">
-   <title>GNU GENERAL PUBLIC LICENSE</title>
-   <para>Version 2, June 1991</para>
-   <para>
-     Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-   </para>
-   <para>
-     51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-   </para>
-   <para>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-   </para>
-   
-   <sect2 id="legal-preamble">
-     <title>Preamble</title>
-     <para>
-       The licenses for most software are designed to take away your
-       freedom to share and change it.  By contrast, the GNU General Public
-       License is intended to guarantee your freedom to share and change free
-       software--to make sure the software is free for all its users.  This
-       General Public License applies to most of the Free Software
-       Foundation's software and to any other program whose authors commit to
-       using it.  (Some other Free Software Foundation software is covered by
-       the GNU Library General Public License instead.)  You can apply it to
-       your programs, too.
-     </para>
-     <para>
-       When we speak of free software, we are referring to freedom, not
-       price.  Our General Public Licenses are designed to make sure that you
-       have the freedom to distribute copies of free software (and charge for
-       this service if you wish), that you receive source code or can get it
-       if you want it, that you can change the software or use pieces of it
-       in new free programs; and that you know you can do these things.
-     </para>
-     <para>
-       To protect your rights, we need to make restrictions that forbid
-       anyone to deny you these rights or to ask you to surrender the rights.
-       These restrictions translate to certain responsibilities for you if you
-       distribute copies of the software, or if you modify it.
-     </para>
-     <para>
-       For example, if you distribute copies of such a program, whether
-       gratis or for a fee, you must give the recipients all the rights that
-       you have.  You must make sure that they, too, receive or can get the
-       source code.  And you must show them these terms so they know their
-       rights.
-     </para>
-     <para>
-       We protect your rights with two steps: (1) copyright the software, and
-       (2) offer you this license which gives you legal permission to copy,
-       distribute and/or modify the software.
-     </para>
-     <para>
-       Also, for each author's protection and ours, we want to make certain
-       that everyone understands that there is no warranty for this free
-       software.  If the software is modified by someone else and passed on, we
-       want its recipients to know that what they have is not the original, so
-       that any problems introduced by others will not reflect on the original
-       authors' reputations.
-     </para>
-     <para>
-       Finally, any free program is threatened constantly by software
-       patents.  We wish to avoid the danger that redistributors of a free
-       program will individually obtain patent licenses, in effect making the
-       program proprietary.  To prevent this, we have made it clear that any
-       patent must be licensed for everyone's free use or not licensed at all.
-     </para>
-     <para>
-       The precise terms and conditions for copying, distribution and
-       modification follow.
-     </para>
-   </sect2>
-   
-   <sect2 id="legal-distribution">
-     <title>GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS
-       FOR COPYING, DISTRIBUTION AND MODIFICATION</title>
-     <itemizedlist>
-       <listitem>
-	 <para>
-	   0. This License applies to any program or other work which contains
-	   a notice placed by the copyright holder saying it may be distributed
-	   under the terms of this General Public License.  The "Program", below,
-	   refers to any such program or work, and a "work based on the Program"
-	   means either the Program or any derivative work under copyright law:
-	   that is to say, a work containing the Program or a portion of it,
-	   either verbatim or with modifications and/or translated into another
-	   language.  (Hereinafter, translation is included without limitation in
-	   the term "modification".)  Each licensee is addressed as "you".
-	 </para>
-	 <para>
-	   Activities other than copying, distribution and modification are not
-	   covered by this License; they are outside its scope.  The act of
-	   running the Program is not restricted, and the output from the Program
-	   is covered only if its contents constitute a work based on the
-	   Program (independent of having been made by running the Program).
-	   Whether that is true depends on what the Program does.
-	 </para>
-       </listitem>
-       <listitem>
-	 <para>
-	   1. You may copy and distribute verbatim copies of the Program's
-	   source code as you receive it, in any medium, provided that you
-	   conspicuously and appropriately publish on each copy an appropriate
-	   copyright notice and disclaimer of warranty; keep intact all the
-	   notices that refer to this License and to the absence of any warranty;
-	   and give any other recipients of the Program a copy of this License
-	   along with the Program.
-	 </para>
-	 <para>
-	   You may charge a fee for the physical act of transferring a copy, and
-	   you may at your option offer warranty protection in exchange for a fee.
-	 </para>
-       </listitem>
-       <listitem>
-	 <para>
-	   2. You may modify your copy or copies of the Program or any portion
-	   of it, thus forming a work based on the Program, and copy and
-	   distribute such modifications or work under the terms of Section 1
-	   above, provided that you also meet all of these conditions:
-	 </para>
-	 <para>
-	   a) You must cause the modified files to carry prominent notices
-	   stating that you changed the files and the date of any change.
-	 </para>
-	 <para>
-	   b) You must cause any work that you distribute or publish, that in
-	   whole or in part contains or is derived from the Program or any
-	   part thereof, to be licensed as a whole at no charge to all third
-	   parties under the terms of this License.
-	 </para>
-	 <para>
-	   c) If the modified program normally reads commands interactively
-	   when run, you must cause it, when started running for such
-	   interactive use in the most ordinary way, to print or display an
-	   announcement including an appropriate copyright notice and a
-	   notice that there is no warranty (or else, saying that you provide
-	   a warranty) and that users may redistribute the program under
-	   these conditions, and telling the user how to view a copy of this
-	   License.  (Exception: if the Program itself is interactive but
-	   does not normally print such an announcement, your work based on
-	   the Program is not required to print an announcement.)
-	 </para>
-	 <para>
-	   These requirements apply to the modified work as a whole.  If
-	   identifiable sections of that work are not derived from the Program,
-	   and can be reasonably considered independent and separate works in
-	   themselves, then this License, and its terms, do not apply to those
-	   sections when you distribute them as separate works.  But when you
-	   distribute the same sections as part of a whole which is a work based
-	   on the Program, the distribution of the whole must be on the terms of
-	   this License, whose permissions for other licensees extend to the
-	   entire whole, and thus to each and every part regardless of who wrote it.
-	 </para>
-	 <para>
-	   Thus, it is not the intent of this section to claim rights or contest
-	   your rights to work written entirely by you; rather, the intent is to
-	   exercise the right to control the distribution of derivative or
-	   collective works based on the Program.
-	 </para>
-	 <para>
-	   In addition, mere aggregation of another work not based on the Program
-	   with the Program (or with a work based on the Program) on a volume of
-	   a storage or distribution medium does not bring the other work under
-	   the scope of this License.
-	 </para>
-       </listitem>
-       <listitem>
-	 <para>
-	   3. You may copy and distribute the Program (or a work based on it,
-	   under Section 2) in object code or executable form under the terms of
-	   Sections 1 and 2 above provided that you also do one of the following:
-	 </para>
-	 <para>
-	   a) Accompany it with the complete corresponding machine-readable
-	   source code, which must be distributed under the terms of Sections
-	   1 and 2 above on a medium customarily used for software interchange; or,
-	 </para>
-	 <para>
-	   b) Accompany it with a written offer, valid for at least three
-	   years, to give any third party, for a charge no more than your
-	   cost of physically performing source distribution, a complete
-	   machine-readable copy of the corresponding source code, to be
-	   distributed under the terms of Sections 1 and 2 above on a medium
-	   customarily used for software interchange; or,
-	 </para>
-	 <para>
-	   c) Accompany it with the information you received as to the offer
-	   to distribute corresponding source code.  (This alternative is
-	   allowed only for noncommercial distribution and only if you
-	   received the program in object code or executable form with such
-	   an offer, in accord with Subsection b above.)
-	 </para>
-	 <para>
-	   The source code for a work means the preferred form of the work for
-	   making modifications to it.  For an executable work, complete source
-	   code means all the source code for all modules it contains, plus any
-	   associated interface definition files, plus the scripts used to
-	   control compilation and installation of the executable.  However, as a
-	   special exception, the source code distributed need not include
-	   anything that is normally distributed (in either source or binary
-	   form) with the major components (compiler, kernel, and so on) of the
-	   operating system on which the executable runs, unless that component
-	   itself accompanies the executable.
-	 </para>
-	 <para>
-	   If distribution of executable or object code is made by offering
-	   access to copy from a designated place, then offering equivalent
-	   access to copy the source code from the same place counts as
-	   distribution of the source code, even though third parties are not
-	   compelled to copy the source along with the object code.
-	 </para>
-       </listitem>
-       <listitem>
-	 <para>
-	   4. You may not copy, modify, sublicense, or distribute the Program
-	   except as expressly provided under this License.  Any attempt
-	   otherwise to copy, modify, sublicense or distribute the Program is
-	   void, and will automatically terminate your rights under this License.
-	   However, parties who have received copies, or rights, from you under
-	   this License will not have their licenses terminated so long as such
-	   parties remain in full compliance.
-	 </para>
-       </listitem>
-       <listitem>
-	 <para>
-	   5. You are not required to accept this License, since you have not
-	   signed it.  However, nothing else grants you permission to modify or
-	   distribute the Program or its derivative works.  These actions are
-	   prohibited by law if you do not accept this License.  Therefore, by
-	   modifying or distributing the Program (or any work based on the
-	   Program), you indicate your acceptance of this License to do so, and
-	   all its terms and conditions for copying, distributing or modifying
-	   the Program or works based on it.
-	 </para>
-       </listitem>
-       <listitem>
-	 <para>
-	   6. Each time you redistribute the Program (or any work based on the
-	   Program), the recipient automatically receives a license from the
-	   original licensor to copy, distribute or modify the Program subject to
-	   these terms and conditions.  You may not impose any further
-	   restrictions on the recipients' exercise of the rights granted herein.
-	   You are not responsible for enforcing compliance by third parties to
-	   this License.
-	 </para>
-       </listitem>
-       <listitem>
-	 <para>
-	   7. If, as a consequence of a court judgment or allegation of patent
-	   infringement or for any other reason (not limited to patent issues),
-	   conditions are imposed on you (whether by court order, agreement or
-	   otherwise) that contradict the conditions of this License, they do not
-	   excuse you from the conditions of this License.  If you cannot
-	   distribute so as to satisfy simultaneously your obligations under this
-	   License and any other pertinent obligations, then as a consequence you
-	   may not distribute the Program at all.  For example, if a patent
-	   license would not permit royalty-free redistribution of the Program by
-	   all those who receive copies directly or indirectly through you, then
-	   the only way you could satisfy both it and this License would be to
-	   refrain entirely from distribution of the Program.
-	 </para>
-	 <para>
-	   If any portion of this section is held invalid or unenforceable under
-	   any particular circumstance, the balance of the section is intended to
-	   apply and the section as a whole is intended to apply in other
-	   circumstances.
-	 </para>
-	 <para>
-	   It is not the purpose of this section to induce you to infringe any
-	   patents or other property right claims or to contest validity of any
-	   such claims; this section has the sole purpose of protecting the
-	   integrity of the free software distribution system, which is
-	   implemented by public license practices.  Many people have made
-	   generous contributions to the wide range of software distributed
-	   through that system in reliance on consistent application of that
-	   system; it is up to the author/donor to decide if he or she is willing
-	   to distribute software through any other system and a licensee cannot
-	   impose that choice.
-	 </para>
-	 <para>
-	   This section is intended to make thoroughly clear what is believed to
-	   be a consequence of the rest of this License.
-	 </para>
-       </listitem>
-       <listitem>
-	 <para>
-	   8. If the distribution and/or use of the Program is restricted in
-	   certain countries either by patents or by copyrighted interfaces, the
-	   original copyright holder who places the Program under this License
-	   may add an explicit geographical distribution limitation excluding
-	   those countries, so that distribution is permitted only in or among
-	   countries not thus excluded.  In such case, this License incorporates
-	   the limitation as if written in the body of this License.
-	 </para>
-       </listitem>
-       <listitem>
-	 <para>
-	   9. The Free Software Foundation may publish revised and/or new versions
-	   of the General Public License from time to time.  Such new versions will
-	   be similar in spirit to the present version, but may differ in detail to
-	   address new problems or concerns.
-	 </para>
-	 <para>
-	   Each version is given a distinguishing version number.  If the Program
-	   specifies a version number of this License which applies to it and "any
-	   later version", you have the option of following the terms and conditions
-	   either of that version or of any later version published by the Free
-	   Software Foundation.  If the Program does not specify a version number of
-	   this License, you may choose any version ever published by the Free Software
-	   Foundation.
-	 </para>
-       </listitem>
-       <listitem>
-	 <para>
-	   10. If you wish to incorporate parts of the Program into other free
-	   programs whose distribution conditions are different, write to the author
-	   to ask for permission.  For software which is copyrighted by the Free
-	   Software Foundation, write to the Free Software Foundation; we sometimes
-	   make exceptions for this.  Our decision will be guided by the two goals
-	   of preserving the free status of all derivatives of our free software and
-	   of promoting the sharing and reuse of software generally.
-	 </para>
-       </listitem>
-       <listitem>
-	 <para>NO WARRANTY</para>
-	 <para>
-	   11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-	   FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-	   OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-	   PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-	   OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-	   MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-	   TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-	   PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-	   REPAIR OR CORRECTION.
-	 </para>
-       </listitem>
-       <listitem>
-	 <para>
-	   12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-	   WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-	   REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-	   INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-	   OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-	   TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-	   YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-	   PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-	   POSSIBILITY OF SUCH DAMAGES.
-	 </para>
-       </listitem>
-     </itemizedlist>
-     <para>END OF TERMS AND CONDITIONS</para>
-   </sect2>
-   <sect2>
-     <title>How to Apply These Terms to Your New Programs</title>
-     <para>
-       If you develop a new program, and you want it to be of the greatest
-       possible use to the public, the best way to achieve this is to make it
-       free software which everyone can redistribute and change under these terms.
-     </para>
-     <para>
-       To do so, attach the following notices to the program.  It is safest
-       to attach them to the start of each source file to most effectively
-       convey the exclusion of warranty; and each file should have at least
-       the "copyright" line and a pointer to where the full notice is found.
-     </para>
-     <para>
-       &lt;one line to give the program's name and a brief idea of what it does.&gt;
-	 Copyright (C) &lt;year&gt;  &lt;name of author&gt;
-     </para>
-     <para> 
-       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.
-     </para>
-     <para>
-       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.
-     </para>
-     <para>
-       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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-     </para>
-     <para>
-       Also add information on how to contact you by electronic and paper mail.
-     </para>
-     <para>
-       If the program is interactive, make it output a short notice like this
-       when it starts in an interactive mode:
-       <para>
-	 Gnomovision version 69, Copyright (C) year  name of author
-	 Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-	 This is free software, and you are welcome to redistribute it
-	 under certain conditions; type `show c' for details.
-       </para>
-     </para>
-     <para>
-       The hypothetical commands `show w' and `show c' should show the appropriate
-       parts of the General Public License.  Of course, the commands you use may
-       be called something other than `show w' and `show c'; they could even be
-       mouse-clicks or menu items--whatever suits your program.
-     </para>
-     <para>
-       You should also get your employer (if you work as a programmer) or your
-       school, if any, to sign a "copyright disclaimer" for the program, if
-       necessary.  Here is a sample; alter the names:
-       <para>
-	 Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-	 `Gnomovision' (which makes passes at compilers) written by James Hacker.
-       </para>
-       <para>
-         &lt;signature of Ty Coon&gt;, 1 April 1989
-       </para>
-       <para>
-	 Ty Coon, President of Vice
-       </para>
-     </para>
-     <para>
-       This General Public License does not permit incorporating your program into
-       proprietary programs.  If your program is a subroutine library, you may
-       consider it more useful to permit linking proprietary applications with the
-       library.  If this is what you want to do, use the GNU Library General
-       Public License instead of this License.
-     </para>
-   </sect2>
-</legalnotice>
+    <appendix id="gpl">
+  <appendixinfo>
+    <title>Licence Publique Générale GNU</title>
+    <pubdate>Version 2, Juin 1991</pubdate>
+    <copyright>
+      <year>1989, 1991</year>
+      <holder>Free Software Foundation, Inc.</holder>
+    </copyright>
+    <legalnotice id="gpl-legalnotice">
+      <para>
+        <address>Free Software Foundation, Inc. <street>51 Franklin Street, Fifth Floor</street>, <city>Boston</city>, <state>MA</state><postcode>02110-1301</postcode><country>États-Unis</country></address>
+      </para>
+      <para>Ceci est une traduction non officielle de la GNU General Public License en français. Elle n'a pas été publiée par la Free Software Foundation, et ne détermine pas les termes de distribution pour les logiciels qui utilisent la GNU GPL, seul le texte anglais original de la GNU GPL déterminent ces termes. Cependant, nous espérons que cette traduction aidera les francophones à mieux comprendre la GNU GPL. 
+
+La copie et la distribution de copies exactes de ce document sont autorisées, mais aucune modification n'est permise.</para>
+    </legalnotice>
+    <releaseinfo>Version 2, Juin 1991</releaseinfo>
+  </appendixinfo>
+  <title>Licence Publique Générale GNU</title>
+  <section id="gpl-1">
+    <title>Préambule</title>
+    <para>Les licences de la plupart des logiciels sont conçues pour vous enlever toute liberté de les partager et de les modifier.
+A contrario, la Licence Publique Générale est destinée à garantir votre liberté de partager et de modifier les logiciels libres, et à assurer que ces logiciels soient libres pour tous leurs utilisateurs.
+La présente Licence Publique Générale s'applique à la plupart des logiciels de la Free Software Foundation, ainsi qu'à tout autre programme pour lequel ses auteurs s'engagent à l'utiliser.
+(Certains autres logiciels de la Free Software Foundation sont couverts par la GNU Lesser General Public License à la place.) Vous pouvez aussi l'appliquer aux programmes qui sont les vôtres.</para>
+
+    <para>Quand nous parlons de logiciels libres, nous parlons de liberté, non de prix.
+Nos licences publiques générales sont conçues pour vous donner l'assurance d'être libres de distribuer des copies des logiciels libres (et de facturer ce service, si vous le souhaitez), de recevoir le code source ou de pouvoir l'obtenir si vous le souhaitez, de pouvoir modifier les logiciels ou en utiliser des éléments dans de nouveaux programmes libres et de savoir que vous pouvez le faire. </para>
+
+    <para>Pour protéger vos droits, il nous est nécessaire d'imposer des limitations qui interdisent à quiconque de vous refuser ces droits ou de vous demander d'y renoncer.
+Certaines responsabilités vous incombent en raison de ces limitations si vous distribuez des copies de ces logiciels, ou si vous les modifiez.</para>
+
+    <para>Par exemple, si vous distribuez des copies d'un tel programme, à titre gratuit ou contre une rémunération, vous devez accorder aux destinataires tous les droits dont vous disposez.
+Vous devez vous assurer qu'eux aussi reçoivent ou puissent disposer du code source.
+Et vous devez leur montrer les présentes conditions afin qu'ils aient connaissance de leurs droits.</para>
+
+    <para>Nous protégeons vos droits en deux étapes : <orderedlist>
+        <listitem>
+          <para>(1) nous sommes titulaires des droits d'auteur du logiciel, et </para>
+        </listitem>
+        <listitem>
+          <para>(2) nous vous délivrons cette licence, qui vous donne l'autorisation légale de copier, distribuer et/ou modifier le logiciel.</para>
+        </listitem>
+      </orderedlist></para>
+
+    <para>En outre, pour la protection de chaque auteur ainsi que la nôtre, nous voulons nous assurer que chacun comprenne que ce logiciel libre ne fait l'objet d'aucune garantie.
+Si le logiciel est modifié par quelqu'un d'autre puis transmis à des tiers, nous voulons que les destinataires soient mis au courant que ce qu'ils ont reçu n'est pas le logiciel d'origine, de sorte que tout problème introduit par d'autres ne puisse entacher la réputation de l'auteur originel.</para>
+
+    <para>En définitive, un programme libre restera à la merci des brevets de logiciels.
+Nous souhaitons éviter le risque que les redistributeurs d'un programme libre fassent des demandes individuelles de licence de brevet, ceci ayant pour effet de rendre le programme propriétaire. 
+Pour éviter cela, nous établissons clairement que toute licence de brevet doit être concédée de façon à ce que l'usage en soit libre pour tous ou bien qu'aucune licence ne soit concédée.</para>
+
+    <para>Les termes exacts et les conditions de copie, distribution et modification sont les suivants:</para>
+  </section>
+  <section id="gpl-2">
+    <title>Conditions de copie, distribution et modification de la Licence Publique Générale GNU.</title>
+    <section id="gpl-2-0">
+      <title>Article 0</title>
+      <para>La présente Licence s'applique à tout programme ou tout autre ouvrage contenant un avis, apposé par le titulaire des droits d'auteur, stipulant qu'il peut être distribué au titre des conditions de la présente Licence Publique Générale.
+Ci-après, le <quote>Programme</quote> désigne l'un quelconque de ces programmes ou ouvrages, et un <quote>ouvrage fondé sur le Programme</quote> désigne soit le Programme, soit un ouvrage qui en dérive au titre des lois sur le droit d'auteur : en d'autres termes, un ouvrage contenant le Programme ou une partie de ce dernier, soit à l'identique, soit avec des modifications et/ou traduit dans un autre langage.
+(Ci-après, le terme <quote>modification</quote> implique, sans s'y réduire, le terme traduction)
+Chaque concessionaire sera désigné par <quote>vous</quote>.</para>
+
+      <para>Les activités autres que la copie, la distribution et la modification ne sont pas couvertes par la présente Licence ; elles sont hors de son champ d'application.
+L'opération consistant à exécuter le Programme n'est soumise à aucune limitation et les sorties du programme ne sont couvertes que si leur contenu constitue un ouvrage fondé sur le Programme (indépendamment du fait qu'il ait été réalisé par l'exécution du Programme).
+La validité de ce qui précède dépend de ce que fait le Programme.</para>
+    </section>
+    <section id="gpl-2-1">
+      <title>Article 1</title>
+      <para>Vous pouvez copier et distribuer des copies à l'identique du code source du Programme tel que vous l'avez reçu, sur n'importe quel support, du moment que vous apposiez sur chaque copie, de manière ad hoc et parfaitement visible, l'avis de droit d'auteur adéquat et une exonération de garantie ; que vous gardiez intacts tous les avis faisant référence à la présente Licence et à l'absence de toute garantie ; et que vous fournissiez à tout destinataire du Programme autre que vous-même un exemplaire de la présente Licence en même temps que le Programme.</para>
+
+      <para>Vous pouvez faire payer l'acte physique de transmission d'une copie, et vous pouvez, à votre discrétion, proposer une garantie contre rémunération.</para>
+    </section>
+    <section id="gpl-2-2">
+      <title>Article 2</title>
+      <para>Vous pouvez modifier votre copie ou des copies du Programme ou n'importe quelle partie de celui-ci, créant ainsi un ouvrage fondé sur le Programme, et copier et distribuer de telles modifications ou ouvrage selon les termes de l'<link linkend="gpl-2-1">Article 1</link> ci-dessus, à condition de vous conformer également à chacune des obligations suivantes : <orderedlist numeration="loweralpha">
+          <listitem>
+            <para>a) Vous devez munir les fichiers modifiés d'avis bien visibles stipulants que vous avez modifié ces fichiers, ainsi que la date de chaque modification ;</para>
+          </listitem>
+          <listitem>
+            <para>b) Vous devez prendre les dispositions nécessaires pour que tout ouvrage que vous distribuez ou publiez, et qui, en totalité ou en partie, contient ou est fondé sur le Programme - ou une partie quelconque de ce dernier - soit concédé comme un tout, à titre gratuit, à n'importe quel tiers, au titre des conditions de la présente Licence.</para>
+          </listitem>
+          <listitem>
+            <para>c) Si le programme modifié lit habituellement des instructions de façon interactive lorsqu'on l'exécute, vous devez, quand il commence son exécution pour ladite utilisation interactive de la manière la plus usuelle, faire en sorte qu'il imprime ou affiche une annonce comprenant un avis de droit d'auteur ad hoc, et un avis stipulant qu'il n'y a pas de garantie (ou bien indiquant que c'est vous qui fournissez la garantie), et que les utilisateurs peuvent redistribuer le programme en respectant les présentes obligations, et expliquant à l'utilisateur comment voir une copie de la présente Licence.
+Exception : si le Programme est lui-même interactif mais n'imprime pas habituellement une telle annonce, votre ouvrage fondé sur le Programme n'est pas obligé d'imprimer une annonce).</para>
+          </listitem>
+        </orderedlist></para>
+
+      <para>Ces obligations s'appliquent à l'ouvrage modifié pris comme un tout.
+Si des éléments identifiables de cet ouvrage ne sont pas fondés sur le Programme et peuvent raisonnablement être considérés comme des ouvrages indépendants distincts en eux mêmes, alors la présente Licence et ses conditions ne s'appliquent pas à ces éléments lorsque vous les distribuez en tant qu'ouvrages distincts.
+Mais lorsque vous distribuez ces mêmes éléments comme partie d'un tout, lequel constitue un ouvrage fondé sur le Programme, la distribution de ce tout doit être soumise aux conditions de la présente Licence, et les autorisations qu'elle octroie aux autres concessionnaires s'étendent à l'ensemble de l'ouvrage et par conséquent à chaque et toute partie indifférement de qui l'a écrite. </para>
+
+      <para>Par conséquent, l'objet du présent article n'est pas de revendiquer des droits ou de contester vos droits sur un ouvrage entièrement écrit par vous; son objet est plutôt d'exercer le droit de contrôler la distribution d'ouvrages dérivés ou d'ouvrages collectifs fondés sur le Programme. </para>
+
+      <para>De plus, la simple proximité du Programme avec un autre ouvrage qui n'est pas fondé sur le Programme (ou un ouvrage fondé sur le Programme) sur une partition d'un espace de stockage ou un support de distribution ne place pas cet autre ouvrage dans le champ d'application de la présente Licence. </para>
+    </section>
+    <section id="gpl-2-3">
+      <title>Article 3</title>
+      <para>Vous pouvez copier et distribuer le Programme (ou un ouvrage fondé sur lui, selon l'<link linkend="gpl-2-2">Article 2</link>) sous forme de code objet ou d'exécutable, selon les termes des <link linkend="gpl-2-1">Articles </link>1 et <link linkend="gpl-2-2">2</link> ci-dessus, à condition que vous accomplissiez l'un des points suivants :</para>
+
+      <para>Le code source d'un ouvrage désigne la forme favorite pour travailler à des modifications de cet ouvrage. Pour un ouvrage exécutable, le code source intégral désigne la totalité du code source de la totalité des modules qu'il contient, ainsi que les éventuels fichiers de définition des interfaces qui y sont associés, ainsi que les scripts utilisés pour contrôler la compilation et l'installation de l'exécutable. Cependant, par exception spéciale, le code source distribué n'est pas censé inclure quoi que ce soit de normalement distribué (que ce soit sous forme source ou binaire) avec les composants principaux (compilateur, noyau, et autre) du système d'exploitation sur lequel l'exécutable tourne, à moins que ce composant lui-même n'accompagne l'exécutable. </para>
+
+      <para> Si distribuer un exécutable ou un code objet consiste à offrir un accès permettant leur copie depuis un endroit particulier, alors l'offre d'un accès équivalent pour copier le code source depuis le même endroit compte comme une distribution du code source - même si les tiers ne sont pas contraints de copier le source en même temps que le code objet.</para>
+    </section>
+    <section id="gpl-2-4">
+      <title>Article 4</title>
+      <para>Vous ne pouvez copier, modifier, concéder en sous-licence, ou distribuer le Programme, sauf tel qu'expressément prévu par la présente Licence. Toute tentative de copier, modifier, concéder en sous-licence, ou distribuer le Programme d'une autre manière est réputée non valable, et met immédiatement fin à vos droits au titre de la présente Licence. Toutefois, les tiers ayant reçu de vous des copies, ou des droits, au titre de la présente Licence ne verront pas leurs autorisations résiliées aussi longtemps que ledits tiers se conforment pleinement à elle. </para>
+    </section>
+    <section id="gpl-2-5">
+      <title>Article 5</title>
+      <para>Vous n'êtes pas obligé d'accepter la présente Licence étant donné que vous ne l'avez pas signée. Cependant, rien d'autre ne vous accorde l'autorisation de modifier ou distribuer le Programme ou les ouvrages fondés sur lui. Ces actions sont interdites par la loi si vous n'acceptez pas la présente Licence. En conséquence, en modifiant ou distribuant le Programme (ou un ouvrage quelconque fondé sur le Programme), vous signifiez votre acceptation de la présente Licence en le faisant, et de toutes ses conditions concernant la copie, la distribution ou la modification du Programme ou d'ouvrages fondés sur lui.</para>
+    </section>
+    <section id="gpl-2-6">
+      <title>Article 6</title>
+      <para>Chaque fois que vous redistribuez le Programme (ou n'importe quel ouvrage fondé sur le Programme), une licence est automatiquement concédée au destinataire par le concédant originel de la licence, l'autorisant à copier, distribuer ou modifier le Programme, sous réserve des présentes conditions. Vous ne pouvez imposer une quelconque limitation supplémentaire à l'exercice des droits octroyés au titre des présentes par le destinataire. Vous n'avez pas la responsabilité d'imposer le respect de la présente Licence à des tiers.</para>
+    </section>
+    <section id="gpl-2-7">
+      <title>Article 7</title>
+      <para>Si, conséquement à une décision de justice ou l'allégation d'une transgression de brevet ou pour toute autre raison (non limitée à un probleme de brevet), des obligations vous sont imposées (que ce soit par jugement, conciliation ou autre) qui contredisent les conditions de la présente Licence, elles ne vous excusent pas des conditions de la présente Licence. Si vous ne pouvez distribuer de manière à satisfaire simultanément vos obligations au titre de la présente Licence et toute autre obligation pertinente, alors il en découle que vous ne pouvez pas du tout distribuer le Programme. Par exemple, si une licence de brevet ne permettait pas une redistribution sans redevance du Programme par tous ceux qui reçoivent une copie directement ou indirectement par votre intermédiaire, alors la seule façon pour vous de satisfaire à la fois à la licence du brevet et à la présente Licence serait de vous abstenir totalement de toute distribution du Programme.</para>
+
+      <para>Si une partie quelconque de cet article est tenue pour nulle ou inopposable dans une circonstance particulière quelconque, l'intention est que le reste de l'article s'applique. La totalité de la section s'appliquera dans toutes les autres circonstances.</para>
+
+      <para>Cet article n'a pas pour but de vous induire à transgresser un quelconque brevet ou d'autres revendications à un droit de propriété ou à contester la validité de la moindre de ces revendications ; cet article a pour seul objectif de protéger l'intégrité du système de distribution du logiciel libre, qui est mis en oeuvre par la pratique des licenses publiques. De nombreuses personnes ont fait de généreuses contributions au large spectre de logiciels distribués par ce système en se fiant à l'application cohérente de ce système ; il appartient à chaque auteur/donateur de décider si il ou elle veut distribuer du logiciel par l'intermédiaire d'un quelconque autre système et un concessionaire ne peut imposer ce choix. </para>
+
+      <para>Cet article a pour but de rendre totalement limpide ce que l'on pense être une conséquence du reste de la présente Licence.</para>
+    </section>
+    <section id="gpl-2-8">
+      <title>Article 8</title>
+      <para>Si la distribution et/ou l'utilisation du Programme est limitée dans certains pays que ce soit par des brevets ou par des interfaces soumises au droit d'auteur, le titulaire originel des droits d'auteur qui décide de couvrir le Programme par la présente Licence peut ajouter une limitation géographique de distribution explicite qui exclue ces pays afin que la distribution soit permise seulement dans ou entre les pays qui ne sont pas ainsi exclus. Dans ce cas, la présente Licence incorpore la limitation comme si elle était écrite dans le corps de la présente Licence. </para>
+    </section>
+    <section id="gpl-2-9">
+      <title>Article 9</title>
+      <para>La Free Software Foundation peut, de temps à autre, publier des versions révisées et/ou nouvelles de la Licence Publique Générale. De telles nouvelles versions seront similaires à la présente version dans l'esprit mais pourront différer dans le détail pour prendre en compte de nouvelles problématiques ou inquiétudes. </para>
+
+      <para>Chaque version possède un numéro de version la distinguant. Si le Programme précise le numéro de version de la présente Licence qui s'y applique et "une version ultérieure quelconque", vous avez le choix de suivre les conditions de la présente version ou de toute autre version ultérieure publiée par la Free Software Foundation. Si le Programme ne spécifie aucun numéro de version de la présente Licence, vous pouvez choisir une version quelconque publiée par la Free Software Foundation à quelque moment que ce soit.</para>
+    </section>
+    <section id="gpl-2-10">
+      <title>Article 10</title>
+      <para>Si vous souhaitez incorporer des parties du Programme dans d'autres programmes libres dont les conditions de distribution sont différentes, écrivez à l'auteur pour lui en demander l'autorisation. Pour les logiciels dont la Free Software Foundation est titulaire des droits d'auteur, écrivez à la Free Software Foundation ; nous faisons parfois des exceptions dans ce sens. Notre décision sera guidée par le double objectif de préserver le statut libre de tous les dérivés de nos logiciels libres et de promouvoir le partage et la réutilisation des logiciels en général. </para>
+    </section>
+    <section id="gpl-2-11">
+      <title>ABSENCE DE GARANTIE Article 11</title>
+      <para>COMME LA LICENCE DU PROGRAMME EST CONCEDEE A TITRE GRATUIT, AUCUNE GARANTIE NE S'APPLIQUE AU PROGRAMME, DANS LES LIMITES AUTORISEES PAR LA LOI APPLICABLE. SAUF MENTION CONTRAIRE ECRITE, LES TITULAIRES DU DROIT D'AUTEUR ET/OU LES AUTRES PARTIES FOURNISSENT LE PROGRAMME "EN L'ETAT", SANS AUCUNE GARANTIE DE QUELQUE NATURE QUE CE SOIT, EXPRESSE OU IMPLICITE, Y COMPRIS, MAIS SANS Y ETRE LIMITE, LES GARANTIES IMPLICITES DE COMMERCIABILITE ET DE LA CONFORMITE A UNE UTILISATION PARTICULIERE. VOUS ASSUMEZ LA TOTALITE DES RISQUES LIES A LA QUALITE ET AUX PERFORMANCES DU PROGRAMME. SI LE PROGRAMME SE REVELAIT DEFECTUEUX, LE COUT DE L'ENTRETIEN, DES REPARATIONS OU DES CORRECTIONS NECESSAIRES VOUS INCOMBENT INTEGRALEMENT.</para>
+    </section>
+    <section id="gpl-2-12">
+      <title>Article 12</title>
+      <para>EN AUCUN CAS, SAUF LORSQUE LA LOI APPLICABLE OU UNE CONVENTION ECRITE L'EXIGE, UN TITULAIRE DE DROIT D'AUTEUR QUEL QU'IL SOIT, OU TOUTE PARTIE QUI POURRAIT MODIFIER ET/OU REDISTRIBUER LE PROGRAMME COMME PERMIS CI-DESSUS, NE POURRAIT ETRE TENU POUR RESPONSABLE A VOTRE EGARD DES DOMMAGES, INCLUANT LES DOMMAGES GENERIQUES, SPECIFIQUES, SECONDAIRES OU CONSECUTIFS, RESULTANT DE L'UTILISATION OU DE L'INCAPACITE D'UTILISER LE PROGRAMME (Y COMPRIS, MAIS SANS Y ETRE LIMITE, LA PERTE DE DONNEES, OU LE FAIT QUE DES DONNEES SOIENT RENDUES IMPRECISES, OU LES PERTES EPROUVEES PAR VOUS OU PAR DES TIERS, OU LE FAIT QUE LE PROGRAMME ECHOUE A INTEROPERER AVEC UN AUTRE PROGRAMME QUEL QU'IL SOIT) MEME SI LE DIT TITULAIRE DU DROIT D'AUTEUR OU LE PARTIE CONCERNEE A ETE AVERTI DE L'EVENTUALITE DE TELS DOMMAGES. </para>
+
+      <para>FIN DES CONDITIONS</para>
+    </section>
+  </section>
+  <section id="gpl-3">
+    <title>Comment appliquer ces conditions à vos nouveaux programmes</title>
+    <para>Si vous développez un nouveau programme, et si vous voulez qu'il soit de la plus grande utilité possible pour le public, le meilleur moyen d'y parvenir est d'en faire un logiciel libre que chacun peut redistribuer et modifier au titre des présentes conditions.</para>
+
+    <para>Pour ce faire, munissez le programme des avis qui suivent. Le plus sûr est de les ajouter au début de chaque fichier source pour véhiculer le plus efficacement possible l'absence de toute garantie ; chaque fichier devrait aussi contenir au moins la ligne <quote>copyright</quote> et une indication de l'endroit où se trouve l'avis complet. </para>
+
+    <para>[Une ligne donnant le nom du programme et une courte idée de ce qu'il fait.] 
+Copyright (C) [année] [nom de l'auteur] </para>
+
+    <para>Ce programme est un logiciel libre ; vous pouvez le redistribuer et/ou le modifier au titre des clauses de la Licence Publique Générale GNU, telle que publiée par la Free Software Foundation ; soit la version 2 de la Licence, ou (à votre discrétion) une version ultérieure quelconque. </para>
+
+    <para>Ce programme est distribué dans l'espoir qu'il sera utile, mais SANS AUCUNE GARANTIE ; sans même une garantie implicite de COMMERCIABILITE ou DE CONFORMITE A UNE UTILISATION PARTICULIERE. Voir la Licence Publique Générale GNU pour plus de détails.</para>
+
+    <para>Vous devriez avoir reçu un exemplaire de la Licence Publique Générale GNU avec ce programme ; si ce n'est pas le cas, écrivez à la Free Software Foundation Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</para>
+
+    <para>Ajoutez aussi des informations sur la manière de vous contacter par courrier électronique et courrier postal.</para>
+
+    <para>Si le programme est interactif, faites en sorte qu'il affiche un court avis tel que celui-ci lorsqu'il démarre en mode interactif : </para>
+
+    <para>Gnomovision version 69, Copyright (C) année nom de l'auteur Gnomovision n'est accompagné d'ABSOLUMENT AUCUNE GARANTIE ; pour plus de détails tapez <quote>show w</quote>. Ceci est un logiciel libre et vous êtes invité à le redistribuer en respectant certaines obligations ; pour plus de détails tapez <quote>show c</quote>.</para>
+
+    <para>Les instructions hypothétiques <quote>show w</quote> et <quote>show c</quote> sont supposées montrer les parties ad hoc de la Licence Publique Générale. Bien entendu, les instructions que vous utilisez peuvent porter d'autres noms que <quote>show w</quote> et <quote>show c</quote> ; elles peuvent même être des clics de souris ou des éléments d'un menu ou tout ce qui convient à votre programme.</para>
+
+    <para>Vous devriez aussi obtenir de votre employeur (si vous travaillez en tant que développeur) ou de votre école, si c'est le cas, qu'il (ou elle) signe une <quote>renonciation aux droits d'auteur</quote> concernant le programme, si nécessaire. Voici un exemple (changez les noms) : </para>
+
+    <para>Yoyodyne, Inc., déclare par la présente renoncer à toute prétention sur les droits d'auteur du programme <quote>Gnomovision</quote> (qui fait des avances aux compilateurs) écrit par James Hacker.</para>
+
+    <para>[signature de Ty Coon], 1er avril 1989 Ty Coon, Président du Vice</para>
+
+    <para>La présente Licence Publique Générale n'autorise pas l'incorporation de votre programme dans des programmes propriétaires. Si votre programme est une bibliothèque de sous-programmes, vous pouvez considérer plus utile d'autoriser l'édition de liens d'applications propriétaires avec la bibliothèque. Si c'est ce que vous voulez faire, utilisez la GNU Lesser General Public License au lieu de la présente Licence. </para>
+  </section>
+</appendix>
 
     <!-- This file  contains link to license for the documentation (GNU FDL), and
     other legal stuff such as "NO WARRANTY" statement. Please do not change
@@ -536,9 +288,9 @@ Template last modified Apr 11, 2002
 	<firstname>Dominique</firstname>
 	<surname>Corbex</surname>
 	<affiliation>
-	  <orgname>Xiphos Development team</orgname>
+	  <orgname>L'équipe de développement Xiphos</orgname>
 	</affiliation>
-	<contrib>French translation</contrib>
+	<contrib>Traduction française</contrib>
       </othercredit>
 
 
@@ -572,9 +324,19 @@ Template last modified Apr 11, 2002
     <!-- When the desktop release version changes to V3.x, the revision number of the manual changes -->
     <!-- to V3.0, and so on. -->
 
-    <releaseinfo>This manual describes version 3.1 of Xiphos.
+    <releaseinfo>This manual describes version 3.1.2 of Xiphos.
     </releaseinfo>
-    <legalnotice>
+     <revhistory> 
+	<revision> 
+          <revnumber>Xiphos Manual V3.1.2</revnumber> 
+          <date>Août 2009</date> 
+          <revdescription> 
+             <para role="author">L'équipe de développement Xiphos</para>
+             <para role="publisher">L'équipe de développement Xiphos</para>
+          </revdescription> 
+        </revision>
+     </revhistory> 
+     <legalnotice>
       <title>Votre avis</title>
       <para>Les rapports de bogue ou les suggestions à propos de Xiphos ou de ce manuel d'aide sont à envoyer au <ulink type="http" url="http://sourceforge.net/tracker/?group_id=5528">Tracker de SourceForge</ulink>  ou aux listes de diffusion.</para>
       <!-- Translators may also add here feedback address for translations -->
@@ -611,7 +373,7 @@ Template last modified Apr 11, 2002
 <!-- Use the Introduction section to give a brief overview of what
      the application is and what it does. -->
  
-    <para><application>&appname;</application> est un logiciel d'étude biblique utilisant l'architecture logicielle du Projet&nbsp;SWORD et l'environnement de bureau «­­&nbsp;GNOME&nbsp;». <application>&appname;</application> permet d'effectuer les tâches suivantes :</para>
+    <para><application>&appname;</application> est un logiciel d'étude biblique utilisant l'architecture logicielle du Projet SWORD et l'environnement de bureau «­­ GNOME ». <application>&appname;</application> permet d'effectuer les tâches suivantes :</para>
     <itemizedlist>
        <listitem>
           <para>Rechercher un verset particulier de l'Écriture </para>
@@ -652,7 +414,7 @@ Template last modified Apr 11, 2002
       </screenshot>
       </figure>
 
-      <para>Le Projet­­&nbsp;SWORD est hébergé à <ulink type="http" url="http://www.crosswire.org"> http://www.crosswire.org</ulink>. D'autres applications utilisant l'architecture logicielle du Projet­­&nbsp;SWORD sont&nbsp;: <application>The SWORD Project for Windows</application> (<application>BibleCS</application> ou <application>WinSword</application>), <application>MacSword</application> pour Macintosh, <application>BibleDesktop</application>, une application Java et <application>BibleTime</application> sous environnement KDE pour Linux.</para>
+      <para>Le Projet­­ SWORD est hébergé à <ulink type="http" url="http://www.crosswire.org"> http://www.crosswire.org</ulink>. D'autres applications utilisant l'architecture logicielle du Projet­­ SWORD sont : <application>The SWORD Project for Windows</application> (<application>BibleCS</application> ou <application>WinSword</application>), <application>MacSword</application> pour Macintosh, <application>BibleDesktop</application>, une application Java et <application>BibleTime</application> sous environnement KDE pour Linux.</para>
 
       <para>
       <figure id="main-screenshot">
@@ -951,11 +713,7 @@ Template last modified Apr 11, 2002
 	   </screenshot>
 
 	    	</figure>
-		<para>
-	     	On the left hand side of <application>Xiphos</application> there is the Sidebar. Here the
-	     	user can switch between the different Sword modules, view bookmarks, do simple searches and view verse lists.
-		To switch between all Sidebar functions, buttons have been placed at the top of the Sidebar.
-		</para>
+		<para>Le <interface>volet latéral</interface> est situé sur la partie gauche de la fenêtre principale de <application>&appname;</application>. Le <interface>volet latéral</interface> permet de choisir les modules Sword, de gérer et utiliser les signets,d' effectuer des recherches basiques ou d'afficher les listes de versets. Les boutons du <interface>volet latéral</interface> permettent d'activer ces différentes fonctions.</para>
 		<figure id="shortcut_figure">
 			<title>Raccourcis du volet latéral</title>
 	  		<screenshot> 
@@ -1170,12 +928,7 @@ Template last modified Apr 11, 2002
 					<para><guimenuitem>Onglets liés</guimenuitem> - Par défaut, quand plus d'un onglet est ouvert, chacun permet de naviguer séparément dans les textes bibliques. Quand cette option est activée, tous les onglets sont liés ensemble, et affichent le même verset.</para>
 				</listitem>
 				<listitem>	
-					<para>
-					Read Aloud - If you enable this, then <application>Xiphos</application> will funnel all selected verses
-					through the <application>festival</application> text-to-speech system.  <application>Festival</application> is
-					a widely-available TTS, often installed by default in Linux distributions. Reading aloud is not currently
-					supported on Windows.
-					</para>
+					<para><guimenuitem>Synthèse vocale</guimenuitem> - Quand cette option est activée, <application>&appname;</application> lit à voix haute les textes sélectionnés à l'aide du logiciel de synthèse vocale <application>Festival</application>. <application>Festival</application> est souvent installé par défaut dans les distributions Linux. (NDT: En général, les résultats sont meilleurs en anglais ) Non disponible sous Windows.</para>
 					<para>De même, la synthèse vocale peut être utilisée sur des portions de textes bibliques, commentaires ou livres. Une fois le texte désiré mis en surbrillance, sélectionner  <guimenuitem>Synthèse vocale du texte sélectionné</guimenuitem> dans le menu contextuel obtenu à l'aide du clic droit de la souris.</para>
 
 				</listitem>
@@ -1189,34 +942,16 @@ Template last modified Apr 11, 2002
 		</sect3>
 		
 		<sect3 id="xiphos-user-annotation">
-			<title>User Annotation</title>
-			<para>
-			Many users wish to make personal annotations on individual verses, without the need to put a full "personal commentary" module
-			to use.  <application>Xiphos</application> provides this in the right-click context menu in the Bible pane.
-			This brings up a dialog showing the current verse reference and offering a text box into which to enter a brief personal note.
-			Once the user closes the dialog with "Mark," the verse will be displayed in reverse-highlight (default, blue on yellow) and a
-			marker <guibutton>*u</guibutton> will be inserted at the verse's beginning.  This is metaphorically similar for users who mark
-			verses in paper Bibles with a yellow highlighter and write personal notes in the margins.
-			</para>
-			<para>
-			Selecting an already-annotated verse will (in the usual case) bring up the existing content for re-editing.  An
-			already-annotated verse can be unmarked; the verse will cease to show in reverse-highlight.
-			</para>
-			<para>
-			If the user deletes the module name from the reference at the top of the dialog, then the annotation will apply to any Bible
-			module at the selected verse.  However, in this case, re-selecting the annotated verse will not initialize with the existing
-			content, because the dialog is created based on the specific module reference.
-			</para>
+			<title>Annotation personnelle</title>
+			<para>De nombreux utilisateurs souhaitent ajouter des annotations personnelles à des versets individuels, sans éprouver pour autant le besoin d'employer un module complet de commentaire personnel.
+<application>Xiphos</application> offre accès à cette fonctionnalité par le menu contextuel du volet biblique obtenu par un clic-droit. Une boite de dialogue s'affiche indiquant la référence du verset en cours et offrant une zone de saisie où entrer une brève annotaion personnelle. Dès que l'utilisateur ferme la boite de dialogue avec <guibutton>Annoter</guibutton>, le verset est surligné (par défaut bleu sur jaune) et une marque <guibutton>*u</guibutton> est insérée au début du verset. Ceci est métaphoriquement similaire aux utilisateurs qui marquent les versets dans leurs Bibles papier avec un surligneur jaune, et écrivent des notes personnelles dans les marges. </para>
+			<para>La sélection d'un verset déjà annoté, fait apparaître (dans le cas habituel) le contenu existant prêt pour être re-édité. L'annotation d'un verset peut être retirée; le verset cesse alors d'être affiché en surbrillance.</para>
+			<para>Si l'utilisateur retire le nom du module de la référence affichée en haut de la boite de dialogue, l'annotation s'applique alors à n'importe quel module Biblique pour le verset sélectionné. Toutefois, dans ce cas, re-sélectionner le verset annoté ne fait pas afficher le contenu existant, car le contenu est lié à la référence du module original.</para>
 		</sect3>
 		
 		<sect3 id="xiphos-geography-support">
-			<title>Geography Support</title>
-			<para>
-			A connection to browsing BibleMap.org is available by mouse-selecting a place name in any text.  Use the right-click context
-			menu to select <menuchoice><guimenuitem>Lookup Selection</guimenuitem><guimenuitem>Browse in
-			BibleMap.org</guimenuitem></menuchoice>.  A web browser will be brought up to show the selected name's geography via
-			BibleMap, which provides Biblical detail overlaid on a Google Maps interface.
-			</para>
+			<title>Support de la géographie</title>
+			<para>Une connection pour naviguer sur le site BibleMap.org est fournie lors de la sélection d'un lieu par la souris dans n'importe quel texte. Sélectionner <menuchoice><guimenuitem>Définition du mot sélectionné</guimenuitem><guimenuitem>Recherche sur BibleMap.org</guimenuitem></menuchoice> par un clic-droit dans le menu contextuel. Un navigateur web est alors lancé pour montrer la géographie du nom sélectionné via BibleMap qui affiche le détail biblique superposé sur une interface Google Maps.</para>
 			<para>
 			</para>
 		</sect3>
@@ -1259,19 +994,10 @@ Template last modified Apr 11, 2002
 		      	</screenshot>
 		</figure>
 		<para>Le volet Aperçu est l'endroit où sont affichés les nombres de Strong, les étiquettes morphologiques et les références croisées présentées dans le volet des <interface>textes bibliques</interface>.</para>
-		<para>
-		Footnote content is displayed in the Previewer when you hover over the indicator <guibutton>*n</guibutton> in the Bible text;
-		it remains visible until your mouse moves over another indicator, Strong's number, etc. Sometimes you may want the text to
-		remain anchored until you can move the mouse to the previewer to click on a link or to read large footnotes. To anchor the text so
-		that you can scroll it in the Previewer, middle-click the indicator (or hold down the <guibutton>Shift key</guibutton>)
-		and move to the Previewer.
-		</para>
+		<para>Les notes de bas de page s'affichent dans le volet <interface>Aperçu</interface> quand un indicateur de type <guimenuitem>*n</guimenuitem> est survolé par la souris dans un texte biblique; Elles restent visibles jusqu'à ce que le curseur de la souris survole un autre indicateur. Cependant, dans certains cas, il peut être souhaitable de figer le texte pour déplacer ensuite le curseur de la souris dans le volet <interface>Aperçu</interface> pour sélectionner un lien ou lire une longue note. Dans ce cas, un clic sur le de bouton du milieu à l'aide de la souris (ou un appui sur la touche <guibutton>Majuscule</guibutton>) fige l'affichage de la note de bas de page et permet de se déplacer ensuite dans le volet <interface>aperçu</interface>.</para>
 		<para>Les références croisées <guimenuitem>*x</guimenuitem> fonctionnent sensiblement de la même façon. Un clic à l'aide du bouton de la souris sur l'indicateur <guimenuitem>*x</guimenuitem> provoque l'affichage des références croisées dans la liste de <guimenuitem>Versets</guimenuitem> du <interface>volet latéral</interface>, où ensuite sélectionnés un par un, ils pourront être affichés dans le volet <interface>aperçu</interface>.</para>
-		<para>
-		Any verses shown in reverse-highlight have personal annotation associated with them, and such verses will include
-		<guibutton>*u</guibutton> at the beginning of the verse.  Hovering on this marker will show the annotation in the previewer, just as
-		for publisher's footnotes.
-		</para>
+		<para>N'importe quel verset surligné indique une annotation personnelle associée avec lui, ces versets incluent une marque <guibutton>*u</guibutton> au début. Survoler cette marque permet d'afficher l'annotation dans le volet Aperçu, de la même façon que les notes de bas de page.</para>
+		<para>Si un calendrier biblique a été défini dans les Préférences, alors la méditation biblique du jour est affichée dans le volet Aperçu, soit au démarrage du programme ou soit lorsque l'utilisateur le demande via le menu <guimenuitem>Affichage</guimenuitem>.</para>
 	</sect2>	
 <!-- ============= Commentary Pane  ============--> 
 	<sect2 id="xiphos-commentaries">
@@ -1313,7 +1039,7 @@ Template last modified Apr 11, 2002
 
 		<sect3 id="xiphos-commentary-headings">
 			<title>Entêtes des commentaires</title>
-			<para>De nombreux commentaires incorporent des entêtes avec une note d'introduction sur le livre ou le chapitre en cours d'utilisation dans le volet des<interface> textes bibliques</interface>. Pour obtenir l'affichage de l'entête&nbsp;:</para>
+			<para>De nombreux commentaires incorporent des entêtes avec une note d'introduction sur le livre ou le chapitre en cours d'utilisation dans le volet des<interface> textes bibliques</interface>. Pour obtenir l'affichage de l'entête :</para>
 			<itemizedlist>
 				<listitem>
 					<para>Faire un clic du bouton droit à l'aide de la souris dans le volet d'affichage des <interface>commentaires</interface>. Dans le menu contextuel qui se présente, choisir <guimenuitem>Afficher l'entête du livre</guimenuitem> ou <guimenuitem>Afficher l'entête du chapitre</guimenuitem>.</para>
@@ -1364,7 +1090,7 @@ Template last modified Apr 11, 2002
 				<para><guibutton>F4</guibutton> :·ouvre·le·<guibutton>Gestionnaire de modules</guibutton>.</para>
 			</listitem>
 			<listitem>
-				<para><guibutton>Ctrl-L</guibutton> sélectionne la zone de saisie de référence biblique. Il est ainsi possible de saisir directement une nouvelle référence de verset. Il est à noter que <placeholder-2/>, comme d'autres applications Sword, accepte de nombreuses abréviations. «­­&nbsp;G&nbsp;»  correspond à Genèse par exemple, et n'importe quel nom de livre saisi seul implique chapitre 1, verset 1.</para>
+				<para><guibutton>Ctrl-L</guibutton> sélectionne la zone de saisie de référence biblique. Il est ainsi possible de saisir directement une nouvelle référence de verset. Il est à noter que <placeholder-2/>, comme d'autres applications Sword, accepte de nombreuses abréviations. «­­ G »  correspond à Genèse par exemple, et n'importe quel nom de livre saisi seul implique chapitre 1, verset 1.</para>
 			</listitem>
 			<listitem>
 				<para><guibutton>Ctrl-F</guibutton> ouvre la fenêtre de recherche. Le volet sur lequel elle est exécutée dépend desquels d'entre eux sont visibles. Le volet biblique a la première préférence, puis le volet des commentaires ou le livre et enfin le dictionnaire. Ainsi un onglet peut être dédié à n'afficher que le volet livre et la recherche initiée par <placeholder-1/> ne sera effectuée que dans les limites de ce volet.</para>
@@ -1408,25 +1134,25 @@ Template last modified Apr 11, 2002
 
 	<sect2 id="xiphos-differences">
 		<title>Différences d'affichage dans <application>&appname;</application> :</title>
-		<para>L'application <application>&appname;</application> a évolué au niveau des possibilités d'affichage. <application>&appname;</application> peut être compilé avec l'une des 2 bibliothèques suivantes au choix. La plus ancienne, moins complète se nomme «&nbsp;gtkhtml3&nbsp;», et la nouvelle offrant plus de possibilités est «&nbsp;MozEmbed&nbsp;».</para>
+		<para>L'application <application>&appname;</application> a évolué au niveau des possibilités d'affichage. <application>&appname;</application> peut être compilé avec l'une des 2 bibliothèques suivantes au choix. La plus ancienne, moins complète se nomme « gtkhtml3 », et la nouvelle offrant plus de possibilités est « MozEmbed ».</para>
 
-		<para>Un certain nombre de fonctionalités de <application>&appname;</application> ne sont pas supportées par «&nbsp;gtkhtml3&nbsp;». Bien que <application>&appname;</application> soit écrit pour tirer parti des possibilités de «&nbsp;MozEmbed&nbsp;», il est possible que la version installée sur votre système ait été construite avec «&nbsp;gtkhtml3&nbsp;», soit parceque la version de MozEmbed n'est pas suffisamment récente soit tout simplement parce qu'elle n'existe pas. (Note: «&nbsp;MozEmbed&nbsp;» n'est passupporté par Window pour le moment). Les différences suivantes se feront observer selon l'utilisation de «&nbsp;gtkhtml3&nbsp;» ou «&nbsp;MozEmbed&nbsp;» comme moteur d'affichage :</para>
+		<para>Un certain nombre de fonctionalités de <application>&appname;</application> ne sont pas supportées par « gtkhtml3 ». Bien que <application>&appname;</application> soit écrit pour tirer parti des possibilités de « MozEmbed », il est possible que la version installée sur votre système ait été construite avec « gtkhtml3 », soit parceque la version de MozEmbed n'est pas suffisamment récente soit tout simplement parce qu'elle n'existe pas. (Note: « MozEmbed » n'est passupporté par Window pour le moment). Les différences suivantes se feront observer selon l'utilisation de « gtkhtml3 » ou « MozEmbed » comme moteur d'affichage :</para>
 
 		<itemizedlist>
 			<listitem>
-				<para>Les étiquettes morphologiques ainsi que les références de Strong, activées via un menu contextuel dans certains modules, sont affichées dans le corps du texte avec  «&nbsp;gtkhtml3&nbsp;». Avec «&nbsp;MozEmbed&nbsp;», ces références sont alignées au-dessous du mot auxquelles elles se rapportent de façon à procurer un affichage plus aéré et plus lisible.</para>
+				<para>Les étiquettes morphologiques ainsi que les références de Strong, activées via un menu contextuel dans certains modules, sont affichées dans le corps du texte avec  « gtkhtml3 ». Avec « MozEmbed », ces références sont alignées au-dessous du mot auxquelles elles se rapportent de façon à procurer un affichage plus aéré et plus lisible.</para>
 			</listitem>
 			<listitem>
-				<para>Les notes de pied de page et les références croisées (<guibutton>*n</guibutton>,·<guibutton>*x</guibutton>) s'affichent en mode exposant avec «&nbsp;MozEmbed&nbsp;».</para>
+				<para>Les notes de pied de page et les références croisées (<guibutton>*n</guibutton>,·<guibutton>*x</guibutton>) s'affichent en mode exposant avec « MozEmbed ».</para>
 			</listitem>
 			<listitem>
-				<para>Les liens avec «&nbsp;gtkhtml3&nbsp;» sont à la fois colorés et soulignés. Ils ne sont pas soulignés avec «&nbsp;MozEmbed&nbsp;».</para>
+				<para>Les liens avec « gtkhtml3 » sont à la fois colorés et soulignés. Ils ne sont pas soulignés avec « MozEmbed ».</para>
 			</listitem>
 			<listitem>
-				<para>Avec «&nbsp;MozEmbed&nbsp;», l'affichage en double espacement du texte est activable à l'aide du menu <guimenuitem>Affichage</guimenuitem>, cette option est indisponible avec «&nbsp;gtkhtml3&nbsp;».</para>
+				<para>Avec « MozEmbed », l'affichage en double espacement du texte est activable à l'aide du menu <guimenuitem>Affichage</guimenuitem>, cette option est indisponible avec « gtkhtml3 ».</para>
 			</listitem>
 			<listitem>
-				<para>Gtkhtml3 ne sait pas interpréter les directives de polices multiples dans une même fenêtre, c'est pourquoi la fenêtre détachée «&nbsp;Vue parallèle&nbsp;» ne permet pas une sélection de police par module.</para>	
+				<para>Gtkhtml3 ne sait pas interpréter les directives de polices multiples dans une même fenêtre, c'est pourquoi la fenêtre détachée « Vue parallèle » ne permet pas une sélection de police par module.</para>	
 			</listitem>
 		</itemizedlist>
 
@@ -1579,7 +1305,7 @@ Template last modified Apr 11, 2002
                         </screenshot>
 
                 </figure>
-		<para>Les <guilabel>Calendriers bibliques</guilabel> sont des modules dictionnaires spécifiques dont les entrées sont de la forme numérique "Mois:Jour" (ex&nbsp;: 12:25). Si un module de ce type a été installé puis déclaré comme Calendrier biblique dans les préférences diverses des modules, <application>&appname;</application> peut présenter le texte du jour lors du démarrage.</para>
+		<para>Les <guilabel>Calendriers bibliques</guilabel> sont des modules dictionnaires spécifiques dont les entrées sont de la forme numérique "Mois:Jour" (ex : 12:25). Si un module de ce type a été installé puis déclaré comme Calendrier biblique dans les préférences diverses des modules, <application>&appname;</application> peut présenter le texte du jour lors du démarrage.</para>
 		<para>Le <guilabel>Style verset</guilabel> indique que chaque verset doit commencer sur une nouvelle ligne ou (si cette option est désactivée) que les versets sont regroupés par paragraphes suivant l'encodage du module de texte biblique. (Les modules de textes bibliques ne sont pas tous encodés de cette façon).</para>
 		<para>Si l'option <guilabel>Défilement des chapitres</guilabel> est activée, le défilement au début ou à la fin d'un chapitre à l'aide de la souris  permet également de changer de chapitre.</para>
 		<para>Si l'option <guilabel>Réduction des images</guilabel> est activée, <application>&appname;</application> retaille automatiquement les images des commentaires, dictionnaires, livres de façon à ce qu'elles s'adaptent à la taille de la fenêtre où elles sont affichées.</para>
@@ -1664,7 +1390,7 @@ Template last modified Apr 11, 2002
 <!-- Introduction To Module Manager -->
 	<sect2 id="module-introduction">
   		<title>Introduction à la gestion des modules</title>
-		<para>Le «­­&nbsp;module&nbsp;» est un bloc de contenu dans <application>&appname;</application> et plus généralement dans toute application basée sur Sword. Un module de Sword est une ressource destinée à être affichée dans une application Sword. Les modules sont de plusieurs types dont, en premier, les textes bibliques, puis les commentaires, les dictionnaires et lexiques, les livres ordinaires, ceux offrant un contenu graphique (Atlas). Ils sont à installer depuis un dépot local (distribution par CDROM) ou par téléchargement ftp depuis un dépot distant comme celui de Crosswire, site de Sword, où tous les modules certiifiés par Crosswire sont disponibles. Des modules sont également disponibles auprès d'autres sources.</para>
+		<para>Le «­­ module » est un bloc de contenu dans <application>&appname;</application> et plus généralement dans toute application basée sur Sword. Un module de Sword est une ressource destinée à être affichée dans une application Sword. Les modules sont de plusieurs types dont, en premier, les textes bibliques, puis les commentaires, les dictionnaires et lexiques, les livres ordinaires, ceux offrant un contenu graphique (Atlas). Ils sont à installer depuis un dépot local (distribution par CDROM) ou par téléchargement ftp depuis un dépot distant comme celui de Crosswire, site de Sword, où tous les modules certiifiés par Crosswire sont disponibles. Des modules sont également disponibles auprès d'autres sources.</para>
 		<para>Si d'autres applications basées sur Sword sont installées, elles ont accès aux modules installés par le gestionnaire de modules.</para>
 		<figure>
 			<title>La fenêtre de gestion des modules</title>
@@ -1690,9 +1416,9 @@ Template last modified Apr 11, 2002
 	<sect2 id="sword-config">
 	<title>Configuration des modules de Sword</title>
 		<sect3 id="sword-sources">
-			<title>Configurer les dépots Sword</title>
+			<title>Configurer les dépots de modules</title>
 			<figure>
-				<title>Configurer les dépots Sword</title>
+				<title>Configurer les dépots de modules</title>
 	        	<screenshot> 
 	  <mediaobject> 
 	    <imageobject><imagedata fileref="figures/sword_sources.png" format="PNG"/>
@@ -1710,7 +1436,8 @@ Template last modified Apr 11, 2002
                         	</screenshot>
 
 			</figure>
-		<para>D'autres dépots non liés à Crosswire proposent des modules Sword, bien que les modules offerts par ces autres dépots ne présentent pas un contenu officiellement certifié par Crosswire. La page web <ulink url="http://www.crosswire.org/wiki/index.php/Module_Repositories">http://www.crosswire.org/wiki/index.php/Module_Repositories</ulink> recense les dépots connus.</para>
+		<para>Il y a d'autres dépots disponibles en plus de ceux de Crosswire, bien que les modules offerts par ces autres dépots ne présentent pas un contenu officiellement certifié par Crosswire. Sur le web, cette page recense les dépots connus : <ulink url="http://www.crosswire.org/wiki/Module_Repositories">http://www.crosswire.org/wiki/Module_Repositories</ulink>.</para>
+		<para>La liste des dépots standard est maintenue par Crosswire. Xiphos s'auto-synchronise une fois avec cette liste, quand l'utilisateur se sert de la première fois du gestionnaire de modules. La liste peut changer, au fur et à mesure que de nouveaux dépots viennent à existence; une resynchronisation occasionnelle avec cette liste est suggérée, ce qui est accompli en cliquant the <guibutton>Charger standard</guibutton>.</para>
 		</sect3>
 		<sect3 id="installation">
 			<title>Destination des modules Sword</title>
@@ -1743,12 +1470,12 @@ Template last modified Apr 11, 2002
 			
 			<sect4 id="destination-xp">
 				<title>Windows XP</title>
-				<para>Les modules peuvent être installés dans un dossier partagé de façon à permettre l'accès à ces modules par tous les utilisateurs. Si le logiciel «&nbsp;The·Sword Project for Windows&nbsp;» a été utilisé précédemment, ce répertoire est «&nbsp;C:\Program Files\Crosswire\The Sword Project\Sword&nbsp;», sinon c'est «&nbsp;C:\Documents and Settings\All Users\Application Data\Sword&nbsp;». Les modules peuvent être également installés dans un compte d'utilisateur spécifique et seront accessibles à lui seul, ce dossier est «&nbsp;C:\Documents and Settings\{Nom du compte d'utilisateur}\Application Data\Sword&nbsp;»</para>
+				<para>Les modules peuvent être installés dans un dossier partagé de façon à permettre l'accès à ces modules par tous les utilisateurs. Si le logiciel « The·Sword Project for Windows » a été utilisé précédemment, ce répertoire est « C:\Program Files\Crosswire\The Sword Project\Sword », sinon c'est « C:\Documents and Settings\All Users\Application Data\Sword ». Les modules peuvent être également installés dans un compte d'utilisateur spécifique et seront accessibles à lui seul, ce dossier est « C:\Documents and Settings\{Nom du compte d'utilisateur}\Application Data\Sword »</para>
 			</sect4>
 			
 			<sect4 id="destination-vista">
 				<title>Windows Vista</title>
-				<para>Windows Vista fonctionne sensiblement de la même façon que Windows XP, les dossiers sont cependant différents. L'espace du compte utilisateur se trouve dans «&nbsp;C:\Utilisateurs\{Nom du compte utilisateur}\AppData\Roaming\Sword&nbsp;» et l'espace partagé dans «&nbsp;C:\ProgramData\Sword&nbsp;».(Ce répertoire fait partie des répertoires cachés).</para>
+				<para>Windows Vista fonctionne sensiblement de la même façon que Windows XP, les dossiers sont cependant différents. L'espace du compte utilisateur se trouve dans « C:\Utilisateurs\{Nom du compte utilisateur}\AppData\Roaming\Sword » et l'espace partagé dans « C:\ProgramData\Sword ».(Ce répertoire fait partie des répertoires cachés).</para>
 			</sect4>
 			
 		</sect3>
@@ -1779,7 +1506,7 @@ Template last modified Apr 11, 2002
                         </screenshot>
 			</figure>
 		<para>Le gestionnaire de modules génére à la fois une liste de modules classés par type et une liste de modules ordonnés par disponibilité. Cette dernière est destinée à rendre plus rapide la recherche de nouveaux éléments sans avoir à balayer la liste des modules classés par type. Les modules non encore installés ou pour lesquels existe une mise à jour apparaissent dans cette liste.</para>
-		<para>Une coche indique les modules déjà installés. Si un index de recherche optimisée ("Lucène") a été créé, un symbole représentant une loupe est affiché, sinon un «&nbsp;X&nbsp;» est présenté. La création d'un index de recherche optimisée se fait dans l'onglet <guimenuitem>Maintenance</guimenuitem>. Les modules verrouillés, nécessitant l'achat d'une clé de déverrouillage auprès du détenteur des droits d'un module sous copyright sont mentionnés par un symbole en forme de verrou. S'il existe une version plus récente des modules déjà installés, un symbole de rafraîchissement apparaît entre les deux références de version du module. La taille approximative du module est affichée à condition que le dépot de modules fournisse cette information, sinon un point d'interrogation («&nbsp;?&nbsp;») est présenté..</para>
+		<para>Une coche indique les modules déjà installés. Si un index de recherche optimisée ("Lucène") a été créé, un symbole représentant une loupe est affiché, sinon un « X » est présenté. La création d'un index de recherche optimisée se fait dans l'onglet <guimenuitem>Maintenance</guimenuitem>. Les modules verrouillés, nécessitant l'achat d'une clé de déverrouillage auprès du détenteur des droits d'un module sous copyright sont mentionnés par un symbole en forme de verrou. S'il existe une version plus récente des modules déjà installés, un symbole de rafraîchissement apparaît entre les deux références de version du module. La taille approximative du module est affichée à condition que le dépot de modules fournisse cette information, sinon un point d'interrogation (« ? ») est présenté..</para>
 		<para>Pour installer de nouveaux modules il suffit de sélectionner la case à cocher des modules à installer, puis de valider à l'aide du bouton <guibutton>Installer</guibutton>. Plusieurs modules peuvent être installés simultanément.</para>
 		<para>Suite à l'acquisition d'un module crypté et de la clé de déverrouillage associée, le module doit ensuite être déverrouillé. Il suffit simplement d'ouvrir le module dans la fenêtre principale, où il ne s'affiche probablement pas, puis dans le menu contextuel affiché à l'aide du clic droit de la souris, de sélectionner <guimenu>Déverrouiller ce module</guimenu> et de saisir la clé.</para>
 		</sect3>
@@ -1815,7 +1542,7 @@ Template last modified Apr 11, 2002
 	<sect2 id="non-standard-modules">
 		<title>Installer des modules manuellement</title>
 		<para>Des modules au format du Projet SWORD sont disponibles auprès d'autres sources que Crosswire mais pas sous la forme d'un dépot à configurer avec le gestionnaire de modules. Il est donc nécessaire de les installer manuellement.</para>
-		<para>Ces modules sont ordinairement compressés au format zip. Ils contiennent un fichier de configuration ainsi qu'un certain nombre de fichiers de données. Installer un module présenté sous cette forme implique de se placer dans le répertoire de configuration Sword personnel. Ce répertoire se nomme ~/.sword, et se trouve dans votre répertoire personnel (ce n'est pas celui de <application>&app;</application>) puis de décompresser le fichier zip à cet endroit. Le fichier de configuration sera placé dans le répertoire «­­&nbsp;mods.d&nbsp;»,et les fichiers de données dans les sous-répertoires de «­­&nbsp;modules&nbsp;». Si vous avez les droits en écriture du répertoire général de Sword usr/share/sword, vous pouvez aussi décompresser le fichier zip dans ce répertoire, ce module sera alors accessible à tous les utilisateurs.</para>
+		<para>Ces modules sont ordinairement compressés au format zip. Ils contiennent un fichier de configuration ainsi qu'un certain nombre de fichiers de données. Installer un module présenté sous cette forme implique de se placer dans le répertoire de configuration Sword personnel. Ce répertoire se nomme ~/.sword, et se trouve dans votre répertoire personnel (ce n'est pas celui de <application>&app;</application>) puis de décompresser le fichier zip à cet endroit. Le fichier de configuration sera placé dans le répertoire «­­ mods.d »,et les fichiers de données dans les sous-répertoires de «­­ modules ». Si vous avez les droits en écriture du répertoire général de Sword usr/share/sword, vous pouvez aussi décompresser le fichier zip dans ce répertoire, ce module sera alors accessible à tous les utilisateurs.</para>
 		<para>Il est nécessaire de redémarrer <application>&appname;</application> après avoir installé un module non-standard de façon à ce que le logiciel détecte le nouveau module en place.</para>
 	</sect2>
 
@@ -1892,12 +1619,12 @@ Template last modified Apr 11, 2002
 				</varlistentry>
 				<varlistentry>
 					<term><guibutton>Expression rationnelle</guibutton></term> 
-					<listitem><para>L'expression à rechercher est une expression rationnelle. Une expression rationnelle est basée sur un langage et une syntaxe spécifiques permettant de retrouver un mot, une phrase à l'aide de combinaisons complexes. Par exemple l'expression rationnelle <userinput>\ A[a-z]*iah </userinput> permet de retrouver les passages qui contiennent les mots Aiah, Ahaziah, Athaliah et Amariah.</para>
+					<listitem><para>Cette requête utilise une expression rationnelle comme clé de recherche. Une expression rationnelle est basée sur un langage et une syntaxe spécifiques permettant de retrouver un mot, une phrase à l'aide de combinaisons complexes. Par exemple l'expression rationnelle <userinput>\ A[a-z]*iah </userinput> permet de retrouver les passages qui contiennent les mots Aiah, Ahaziah, Athaliah et Amariah.</para>
 					<para>Un exposé complet de l'emploi des expressions rationnelles dépasse le cadre de ce manuel, mais cependant plus d'informations à ce sujet peuvent être obtenues en parcourant le manuel de <command>grep</command>.</para></listitem>
 				</varlistentry>
 				<varlistentry>
 					<term><guibutton>Phrase exacte</guibutton></term> 
-					<listitem><para>La requête recherche la phrase exacte contenue dans l'expression à rechercher. Si la phrase à rechercher est <userinput>en vérité</userinput>, les passages obtenus contiendront «­­&nbsp;<emphasis>en vérité</emphasis>&nbsp;», mais pas «­­&nbsp;<emphasis>en</emphasis> toute  <emphasis>vérité</emphasis>&nbsp;».</para></listitem>
+					<listitem><para>La requête recherche la phrase exacte contenue dans l'expression à rechercher. Si la phrase à rechercher est <userinput>en vérité</userinput>, les passages obtenus contiendront «­­ <emphasis>en vérité</emphasis> », mais pas «­­ <emphasis>en</emphasis> toute  <emphasis>vérité</emphasis> ».</para></listitem>
 				</varlistentry>
 			</variablelist>
  		</sect3>
@@ -1980,19 +1707,19 @@ Template last modified Apr 11, 2002
 
 	   <para>La requête par défaut est de type multi-mots, une recherche quelque peu lente et rustique. Une requête optimisée basée sur Lucene, un moteur de recherche libre qui permet d'indexer et de rechercher du texte est également disponible. Avant d'utiliser les requêtes optimisées, il est cependant nécessaire d'indexer les modules, comme indiqué dans la section « Gérer les modules » de ce manuel. Quelques exemples suivent démontrant la puissance des requêtes optimisées Lucene (Les références de la syntaxe Lucene sont disponible sur internet) :</para>
 	   
-	   <para>Requêtes simples : saisir simplement les mots recherchés. Pour obtenir seulement les versets contenant tous les mots, il suffit de faire précéder les mots du signe «­­&nbsp;<emphasis>+</emphasis>&nbsp;». Ainsi la requête «&nbsp;<emphasis>+L'Eternel +mon +berger</emphasis>&nbsp;» trouve le Psaume 23. Pour rechercher une phrase entière, il suffit de l'entourer de guillemets, comme dans "&nbsp;<emphasis>Il me fait reposer dans de verts pâturages</emphasis>&nbsp;".</para>
+	   <para>Requêtes simples : saisir simplement les mots recherchés. Pour obtenir seulement les versets contenant tous les mots, il suffit de faire précéder les mots du signe «­­ <emphasis>+</emphasis> ». Ainsi la requête « <emphasis>+L'Eternel +mon +berger</emphasis> » trouve le Psaume 23. Pour rechercher une phrase entière, il suffit de l'entourer de guillemets, comme dans " <emphasis>Il me fait reposer dans de verts pâturages</emphasis> ".</para>
 	   
-	   <para>Caractère de substitution unique (&nbsp;?&nbsp;) : Le «­­&nbsp;?&nbsp;» représente un caractère quelconque. Par exemple, «­­&nbsp;<emphasis>cri?</emphasis>&nbsp;» permet de rechercher «­­&nbsp;<emphasis>cris</emphasis>&nbsp;», «­­&nbsp;<emphasis>crie</emphasis>&nbsp;»,·«­­&nbsp;<emphasis>crié</emphasis>&nbsp;» etc.. Ceci est pratique pour retrouver les noms qui peuvent avoir plusieurs écritures ainsi, «­­&nbsp;<emphasis>?saïe</emphasis>&nbsp;» retrouvera «­­&nbsp;Esaïe&nbsp;» ou «­­&nbsp;Isaïe&nbsp;»</para>
+	   <para>Caractère de substitution unique ( ? ) : Le «­­ ? » représente un caractère quelconque. Par exemple, «­­ <emphasis>cri?</emphasis> » permet de rechercher «­­ <emphasis>cris</emphasis> », «­­ <emphasis>crie</emphasis> »,·«­­ <emphasis>crié</emphasis> » etc.. Ceci est pratique pour retrouver les noms qui peuvent avoir plusieurs écritures ainsi, «­­ <emphasis>?saïe</emphasis> » retrouvera «­­ Esaïe » ou «­­ Isaïe »</para>
 
-	   <para>Caractère de substitution multiple (&nbsp;*&nbsp;) : «&nbsp;*&nbsp;» remplace toute une série de caractères. Ainsi «&nbsp;<emphasis>proph*</emphasis>&nbsp;» retrouve «&nbsp;prophète&nbsp;», «&nbsp;prophétiser&nbsp;», «&nbsp;prophétie&nbsp;» etc..</para>
+	   <para>Caractère de substitution multiple ( * ) : « * » remplace toute une série de caractères. Ainsi « <emphasis>proph*</emphasis> » retrouve « prophète », « prophétiser », « prophétie » etc..</para>
 
-	  <para>Syntaxe AND : Dans la recherche avancée, pour retourner les résultats pour tous les termes d'une requête, il est nécessaire de placer l'opérateur logique «&nbsp;<emphasis>AND</emphasis>&nbsp;» entre les termes. Ainsi pour retrouver les occurences de «&nbsp;Isaïe&nbsp;» ou «&nbsp;Esaïe&nbsp;» qui font mention également de «&nbsp;prophète&nbsp;» ou «&nbsp;prophétie&nbsp;», la requête appropriée est «&nbsp;<emphasis>?saïe AND proph*</emphasis>&nbsp;».</para>
+	  <para>Syntaxe AND : Dans la recherche avancée, pour retourner les résultats pour tous les termes d'une requête, il est nécessaire de placer l'opérateur logique « <emphasis>AND</emphasis> » entre les termes. Ainsi pour retrouver les occurences de « Isaïe » ou « Esaïe » qui font mention également de « prophète » ou « prophétie », la requête appropriée est « <emphasis>?saïe AND proph*</emphasis> ».</para>
 
-	   <para>Par défaut, deux plages de versets sont définies, correspondant à l'Ancien Testament et au Nouveau Testament. D'autres limites peuvent être définies à volonté par l'utilisateur comme par exemple les «­­&nbsp;Évangiles&nbsp;» ou les «­­&nbsp;Épîtres de Paul&nbsp;». Une liste des modules contenant seulement le premier module de texte biblique installé est définie par défaut. Si besoin, de nouvelles requêtes peuvent être réalisés sur la plage des versets obtenu par la requête précédente. Des listes de modules peuvent être crées en incluant tout module, ce qui permet d'exécuter des requêtes sur les livres ou les dictionnaires, dans n'importe quelle combinaison.</para>
+	   <para>Par défaut, deux plages de versets sont définies, correspondant à l'Ancien Testament et au Nouveau Testament. D'autres limites peuvent être définies à volonté par l'utilisateur comme par exemple les «­­ Évangiles » ou les «­­ Épîtres de Paul ». Une liste des modules contenant seulement le premier module de texte biblique installé est définie par défaut. Si besoin, de nouvelles requêtes peuvent être réalisés sur la plage des versets obtenu par la requête précédente. Des listes de modules peuvent être crées en incluant tout module, ce qui permet d'exécuter des requêtes sur les livres ou les dictionnaires, dans n'importe quelle combinaison.</para>
 
-	   <para>Noter la bulle d'aide dans la capture d'écran ci-dessus, Cette option est utilisée pour exécuter des requêtes sur les attributs relatifs à des versets et non sur le contenu des versets. Les attributs sont par exemple les notes de bas de page ou les nombres de Strong grec et hébreu. Si cette option est sélectionnée, les qualificatifs d'attribut doivent être saisis dans  l'onglet Attribut, situé à droite des autres onglets. Les références de Strong  sont identifiées par le nombre de Strong précédé par la lettre H (Hébreu) ou la lettre G (Grec). Ainsi une requête sur le nombre de Strong grec n° 140, en utilisant «­­&nbsp;G140&nbsp;», retourne  Matthieu 12:18 comme résultat.</para>
+	   <para>Noter la bulle d'aide dans la capture d'écran ci-dessus, Cette option est utilisée pour exécuter des requêtes sur les attributs relatifs à des versets et non sur le contenu des versets. Les attributs sont par exemple les notes de bas de page ou les nombres de Strong grec et hébreu. Si cette option est sélectionnée, les qualificatifs d'attribut doivent être saisis dans  l'onglet Attribut, situé à droite des autres onglets. Les références de Strong  sont identifiées par le nombre de Strong précédé par la lettre H (Hébreu) ou la lettre G (Grec). Ainsi une requête sur le nombre de Strong grec n° 140, en utilisant «­­ G140 », retourne  Matthieu 12:18 comme résultat.</para>
 		
-	   <para>Si vos modules sont indexés, il existe un moyen beaucoup plus rapide pour rechercher des références de Strong. Une requête doit être précédée du mot «&nbsp;<emphasis>lemma</emphasis>&nbsp;», par exemple pour rechercher le nombre de Strong grec 140, saisir «&nbsp;<emphasis>lemma:G140</emphasis>&nbsp;». Le bouton radio <guibutton>Optimisée Lucene</guibutton> doit être sélectionné pour que cette requête fonctionne.</para>
+	   <para>Si vos modules sont indexés, il existe un moyen beaucoup plus rapide pour rechercher des références de Strong. Une requête doit être précédée du mot « <emphasis>lemma</emphasis> », par exemple pour rechercher le nombre de Strong grec 140, saisir « <emphasis>lemma:G140</emphasis> ». Le bouton radio <guibutton>Optimisée Lucene</guibutton> doit être sélectionné pour que cette requête fonctionne.</para>
 
 	   <para>Comme spécifié dans l'infobulle, le bouton <button>Rechercher</button> stoppe aussi une requête en cours d'exécution.</para>
 
@@ -2006,100 +1733,100 @@ Template last modified Apr 11, 2002
 	<sect2 id="hdbk-op-search-dialog-text-regexp">
 		<title>Syntaxe des expressions rationnelles utilisées en clé de recherche</title>
 
-		<para>La recherche au moyen d'expressions rationnelles permet d'effectuer des recherches simples ou complexes sur des chaînes de caractères qui correspondent à un motif ou un ensemble de motifs séparés par une barre verticale «­­&nbsp;|&nbsp;». Alors qu'un motif peut être crée pour rechercher un mot ou une phrase, un motif simple composé d'un seul mot ne permettra pas de rechercher seulement ce mot, mais toute séquence de caractères contenant ce mot. Une recherche du mot «­­&nbsp;droit&nbsp;» ne retournera pas seulement la liste des versets contenant le mot «­­&nbsp;<emphasis>droit</emphasis>&nbsp;»  mais aussi ceux contenant les mots «­­&nbsp;a<emphasis>droit</emphasis>&nbsp;», «­­&nbsp;<emphasis>droit</emphasis>e&nbsp;». La recherche de «­­&nbsp;ne pas&nbsp;» ne retournera pas les versets contenant les mots «­­&nbsp;ne&nbsp;» ET «­­&nbsp;pas&nbsp;» mais les versets contenant la séquence «­­&nbsp;ne pas&nbsp;» avec une espace entre les deux mots. Une recherche de «­­&nbsp;ne pas&nbsp;» trouvera aussi les versets contenant «­­&nbsp;<emphasis>ne pas</emphasis>se&nbsp;».</para>
-		<para>La puissance des expressions rationnelles provient des motifs utilisés pour définir une recherche. Un motif est constitué de caractères ordinaires  et de quelques caractères  spéciaux qui sont interprétés suivant des règles précises. Les caractères spéciaux sont \[^*$?+. Les autres caractères sont des caractères ordinaires. L'antislash «­­&nbsp;\&nbsp;», est utilisé pour convertir les caractères spéciaux en caractères ordinaires et inversement les caractères ordinaires en caractères spéciaux.</para>
-		<para>Exemple : le motif «­­&nbsp;<emphasis>.amour\.</emphasis>&nbsp;» retournera les phrases qui se terminent par «­­&nbsp;s<emphasis>o</emphasis>n <emphasis>amour</emphasis>&nbsp;» ou «­­&nbsp;<emphasis>l</emphasis>'<emphasis>amour</emphasis>&nbsp;» ou «­­&nbsp;<emphasis>d</emphasis>'<emphasis>amour</emphasis>&nbsp;» suivi d'un point. Le premier point dans <emphasis>.amour\.</emphasis> est un caractère spécial dont la signification est de remplacer n'importe quel caractère à cette position. L'antislash dans <emphasis>.amour\.</emphasis> indique que le point  suivant ne doit pas être considéré comme un caractère spécial, mais comme un point ordinaire.</para>
+		<para>La recherche au moyen d'expressions rationnelles permet d'effectuer des recherches simples ou complexes sur des chaînes de caractères qui correspondent à un motif ou un ensemble de motifs séparés par une barre verticale «­­ | ». Alors qu'un motif peut être crée pour rechercher un mot ou une phrase, un motif simple composé d'un seul mot ne permettra pas de rechercher seulement ce mot, mais toute séquence de caractères contenant ce mot. Une recherche du mot «­­ droit » ne retournera pas seulement la liste des versets contenant le mot «­­ <emphasis>droit</emphasis> »  mais aussi ceux contenant les mots «­­ a<emphasis>droit</emphasis> », «­­ <emphasis>droit</emphasis>e ». La recherche de «­­ ne pas » ne retournera pas les versets contenant les mots «­­ ne » ET «­­ pas » mais les versets contenant la séquence «­­ ne pas » avec une espace entre les deux mots. Une recherche de «­­ ne pas » trouvera aussi les versets contenant «­­ <emphasis>ne pas</emphasis>se ».</para>
+		<para>La puissance des expressions rationnelles provient des motifs utilisés pour définir une recherche. Un motif est constitué de caractères ordinaires  et de quelques caractères  spéciaux qui sont interprétés suivant des règles précises. Les caractères spéciaux sont \[^*$?+. Les autres caractères sont des caractères ordinaires. L'antislash «­­ \ », est utilisé pour convertir les caractères spéciaux en caractères ordinaires et inversement les caractères ordinaires en caractères spéciaux.</para>
+		<para>Exemple : le motif «­­ <emphasis>.amour\.</emphasis> » retournera les phrases qui se terminent par «­­ s<emphasis>o</emphasis>n <emphasis>amour</emphasis> » ou «­­ <emphasis>l</emphasis>'<emphasis>amour</emphasis> » ou «­­ <emphasis>d</emphasis>'<emphasis>amour</emphasis> » suivi d'un point. Le premier point dans <emphasis>.amour\.</emphasis> est un caractère spécial dont la signification est de remplacer n'importe quel caractère à cette position. L'antislash dans <emphasis>.amour\.</emphasis> indique que le point  suivant ne doit pas être considéré comme un caractère spécial, mais comme un point ordinaire.</para>
 
 		<sect3 id="hdbk-op-search-dialog-text-regexp-rules">
 			<title>Règles des requêtes de recherche à l'aide des expressions rationnelles</title>
 			<itemizedlist>
-<listitem><para>«­­&nbsp;.&nbsp;» Le point remplace n'importe quel caractère.</para></listitem>
-<listitem><para>«­­&nbsp;*&nbsp;» L'astérisque correspond à toute répétition de caractères d'une chaîne ou d'une expression rationnelle la précédant, incluant zéro caractère.</para></listitem>
-<listitem><para>«­­&nbsp;+&nbsp;» Le signe plus correspond à une répétition ou plus de la précédente expression régulière. Il joue un rôle similaire à «­­&nbsp;*&nbsp;» (astérisque), mais ne correspond pas à zéro occurrence.</para></listitem>
-<listitem><para>«­­&nbsp;?&nbsp;» Le point d'interrogation correspond à aucune ou une instance de la précédente expression rationnelle. Il est généralement utilisé pour correspondre à des caractères uniques.</para></listitem>
-<listitem><para>«­­&nbsp;[...]&nbsp;» Les crochets englobent un ensemble de caractères pour réaliser une correspondance dans une seule expression rationnelle.</para></listitem>
-<listitem><para>«­­&nbsp;^&nbsp;» La puissance comme premier caractère à l'intérieur d'accolades inverse la signification de l'ensemble des caractères de  l'expression rationnelle.</para></listitem>
-<listitem><para>«­­&nbsp;^&nbsp;» La puissance en dehors d'accolades correspond au début d'une ligne.</para></listitem>
-<listitem><para>«­­&nbsp;$&nbsp;» Le signe dollar à la fin d'une expression rationnelle correspond à la fin d'une ligne.</para></listitem>
-<listitem><para>«­­&nbsp;|&nbsp;» La barre verticale signifie OU logique</para></listitem>
-<listitem><para>«­­&nbsp;()&nbsp;» Les parenthèses servent à regrouper des expressions. <emphasis>Non supporté dans <application>&appname;</application></emphasis></para></listitem>
-<listitem><para>«­­&nbsp;\&nbsp;» L'antislash échappe un caractère spécial, ce qui signifie que le caractère est interprété littéralement.</para></listitem>
-<listitem><para>«­­&nbsp;\&nbsp;» L'antislash utilisé devant un caractère ordinaire, le transforme en caractère spécial..</para></listitem>
+<listitem><para>«­­ . » Le point remplace n'importe quel caractère.</para></listitem>
+<listitem><para>«­­ * » L'astérisque correspond à toute répétition de caractères d'une chaîne ou d'une expression rationnelle la précédant, incluant zéro caractère.</para></listitem>
+<listitem><para>«­­ + » Le signe plus correspond à une répétition ou plus de la précédente expression régulière. Il joue un rôle similaire à «­­ * » (astérisque), mais ne correspond pas à zéro occurrence.</para></listitem>
+<listitem><para>«­­ ? » Le point d'interrogation correspond à aucune ou une instance de la précédente expression rationnelle. Il est généralement utilisé pour correspondre à des caractères uniques.</para></listitem>
+<listitem><para>«­­ [...] » Les crochets englobent un ensemble de caractères pour réaliser une correspondance dans une seule expression rationnelle.</para></listitem>
+<listitem><para>«­­ ^ » La puissance comme premier caractère à l'intérieur d'accolades inverse la signification de l'ensemble des caractères de  l'expression rationnelle.</para></listitem>
+<listitem><para>«­­ ^ » La puissance en dehors d'accolades correspond au début d'une ligne.</para></listitem>
+<listitem><para>«­­ $ » Le signe dollar à la fin d'une expression rationnelle correspond à la fin d'une ligne.</para></listitem>
+<listitem><para>«­­ | » La barre verticale signifie OU logique</para></listitem>
+<listitem><para>«­­ () » Les parenthèses servent à regrouper des expressions. <emphasis>Non supporté dans <application>&appname;</application></emphasis></para></listitem>
+<listitem><para>«­­ \ » L'antislash échappe un caractère spécial, ce qui signifie que le caractère est interprété littéralement.</para></listitem>
+<listitem><para>«­­ \ » L'antislash utilisé devant un caractère ordinaire, le transforme en caractère spécial..</para></listitem>
 </itemizedlist>
 
 <sect4 id="period">
 <title>Le point</title>
 
-<para>Le point «­­&nbsp;.&nbsp;» remplace n'importe quel caractère y compris l'espace et d'autres caractères non alphabétiques. Par exemple : «­­&nbsp;13.&nbsp;» correspond à 13 plus au moins un caractère (incluant une espace), ce qui retourne 1133, 11333 mais pas 13 (un caractère supplémentaire est manquant).</para>
+<para>Le point «­­ . » remplace n'importe quel caractère y compris l'espace et d'autres caractères non alphabétiques. Par exemple : «­­ 13. » correspond à 13 plus au moins un caractère (incluant une espace), ce qui retourne 1133, 11333 mais pas 13 (un caractère supplémentaire est manquant).</para>
 </sect4>
 
 
 <sect4 id="asterisk">
 <title>L'astérisque</title>
 
-<para>L'astérisque «­­&nbsp;*&nbsp;» correspond à toute répétition de caractères d'une chaîne ou d'une expression rationnelle la précédant, incluant zéro caractère. Par exemple : «­­&nbsp;1133*&nbsp;» correspond à 11 plus un ou plus de 3 ainsi que d'autres caractères : 113, 1133, 111312 et ainsi de suite.</para>
+<para>L'astérisque «­­ * » correspond à toute répétition de caractères d'une chaîne ou d'une expression rationnelle la précédant, incluant zéro caractère. Par exemple : «­­ 1133* » correspond à 11 plus un ou plus de 3 ainsi que d'autres caractères : 113, 1133, 111312 et ainsi de suite.</para>
 </sect4>
 
 
 <sect4 id="plus">
 <title>Le signe plus</title>
-<para>Le signe plus «­­&nbsp;+&nbsp;» correspond à une répétition ou plus de la précédente expression rationnelle. Il joue un rôle similaire à «­­&nbsp;*&nbsp;» (astérisque), mais ne correspond pas à zéro occurrence.</para>
+<para>Le signe plus «­­ + » correspond à une répétition ou plus de la précédente expression rationnelle. Il joue un rôle similaire à «­­ * » (astérisque), mais ne correspond pas à zéro occurrence.</para>
 </sect4>
 
 
 <sect4 id="question">
 <title>Le point d'interrogation.</title>
-<para>Le point d'interrogation «­­&nbsp;?&nbsp;» correspond à aucune ou à une instance au·plus·de la précédente expression rationnelle. Il est généralement utilisé pour correspondre à des caractères uniques.</para>
+<para>Le point d'interrogation «­­ ? » correspond à aucune ou à une instance au·plus·de la précédente expression rationnelle. Il est généralement utilisé pour correspondre à des caractères uniques.</para>
 </sect4>
 
 
 <sect4 id="bracket">
 <title>Les crochets</title>
-<para>Les crochets «­­&nbsp;[...]&nbsp;» englobent un ensemble de caractères pour réaliser une correspondance dans une seule expression rationnelle. «­­&nbsp;[xyz]&nbsp;» correspond aux caractères x, y ou z. «­­&nbsp;[c-n]&nbsp;» correspond à tout caractère compris entre c et n. «­­&nbsp;[B-Pk-y]&nbsp;» correspond à tout caractère compris entre B et P et entre k et y. «­­&nbsp;[a-z0-9]&nbsp;» correspond à toute lettre en minuscule et à tout chiffre. «­­&nbsp;[^b-d]&nbsp;» correspond à tous les caractères sauf ceux compris entre b et d. Ceci est un exemple de l'inversion de la signification de l'expression rationnelle suivante grâce à l'opérateur «­­&nbsp;^&nbsp;» (prenant le même rôle que «­­&nbsp;!&nbsp;» dans un contexte différent). Les séquences combinées de caractères entre crochets correspondent à des modèles de mots communs. «­­&nbsp;[Oo][Uu][Ii]&nbsp;» correspond à oui, Oui, OUI, oUi et ainsi de suite. </para>
+<para>Les crochets «­­ [...] » englobent un ensemble de caractères pour réaliser une correspondance dans une seule expression rationnelle. «­­ [xyz] » correspond aux caractères x, y ou z. «­­ [c-n] » correspond à tout caractère compris entre c et n. «­­ [B-Pk-y] » correspond à tout caractère compris entre B et P et entre k et y. «­­ [a-z0-9] » correspond à toute lettre en minuscule et à tout chiffre. «­­ [^b-d] » correspond à tous les caractères sauf ceux compris entre b et d. Ceci est un exemple de l'inversion de la signification de l'expression rationnelle suivante grâce à l'opérateur «­­ ^ » (prenant le même rôle que «­­ ! » dans un contexte différent). Les séquences combinées de caractères entre crochets correspondent à des modèles de mots communs. «­­ [Oo][Uu][Ii] » correspond à oui, Oui, OUI, oUi et ainsi de suite. </para>
 </sect4>
 
 
 <sect4 id="caret">
 <title>La puissance en premier caractère entre des crochets</title>
-<para>Si la puissance «­­&nbsp;^&nbsp;» est le premier caractère d'une expression entre crochets, il  inverse la signification de l'ensemble des caractères de l'expression rationnelle.</para>
+<para>Si la puissance «­­ ^ » est le premier caractère d'une expression entre crochets, il  inverse la signification de l'ensemble des caractères de l'expression rationnelle.</para>
 </sect4>
 
 <sect4 id="caret-s">
 <title>La puissance correspond au début d'une ligne</title>
-<para>La puissance «­­&nbsp;^&nbsp;» correspond au début d'une ligne. Toutes les réponses correspondront au début d'une ligne comportant la séquence recherchée. Cependant, comme certains modules de textes contiennent des caractères non filtrés en début de ligne, cette fonction ne retourne pas toujours les résultats escomptés. Ajouter quelques points après la puissance, permet de contourner le défaut de format de certains textes. «­­&nbsp;<emphasis>^Au commencement</emphasis>&nbsp;» recherche les phrases commençant par «­­&nbsp;<emphasis>Au commencement</emphasis>&nbsp;». (Mais il est préférable d'utiliser : «­­&nbsp;<emphasis>^....Au commencement</emphasis>&nbsp;»).</para>
+<para>La puissance «­­ ^ » correspond au début d'une ligne. Toutes les réponses correspondront au début d'une ligne comportant la séquence recherchée. Cependant, comme certains modules de textes contiennent des caractères non filtrés en début de ligne, cette fonction ne retourne pas toujours les résultats escomptés. Ajouter quelques points après la puissance, permet de contourner le défaut de format de certains textes. «­­ <emphasis>^Au commencement</emphasis> » recherche les phrases commençant par «­­ <emphasis>Au commencement</emphasis> ». (Mais il est préférable d'utiliser : «­­ <emphasis>^....Au commencement</emphasis> »).</para>
 </sect4>
 
 
 <sect4 id="dollar">
 <title>Le signe dollar recherche en fin de ligne</title>
-<para>Le signe dollar «­­&nbsp;$&nbsp;» à la fin d'une expression régulière correspond à la fin d'une ligne. «­­&nbsp;XXX$&nbsp;» correspond à XXX à la fin d'une ligne. «­­&nbsp;^$&nbsp;» correspond à des lignes blanches. Cependant, comme certains modules de textes contiennent des caractères non filtrés en fin de ligne, cette fonction ne retourne pas toujours les résultats escomptés. Ajouter quelques points après le dollar, permet de contourner ce défaut de format de certains textes. «­­&nbsp;<emphasis>Amen\.$</emphasis>&nbsp;» retourne les phrases qui se terminent par «­­&nbsp;<emphasis>Amen.</emphasis>&nbsp;» (Il est préférable d'utiliser «­­&nbsp;Amen\....$&nbsp;», «Amen\..........$&nbsp;», ou même «­­&nbsp;Amen\....................$&nbsp;»).</para>
+<para>Le signe dollar «­­ $ » à la fin d'une expression régulière correspond à la fin d'une ligne. «­­ XXX$ » correspond à XXX à la fin d'une ligne. «­­ ^$ » correspond à des lignes blanches. Cependant, comme certains modules de textes contiennent des caractères non filtrés en fin de ligne, cette fonction ne retourne pas toujours les résultats escomptés. Ajouter quelques points après le dollar, permet de contourner ce défaut de format de certains textes. «­­ <emphasis>Amen\.$</emphasis> » retourne les phrases qui se terminent par «­­ <emphasis>Amen.</emphasis> » (Il est préférable d'utiliser «­­ Amen\....$ », «Amen\..........$ », ou même «­­ Amen\....................$ »).</para>
 </sect4>
 
 
 <sect4 id="bar">
 <title>La barre verticale</title>
-<para>La barre verticale «­­&nbsp;|&nbsp;» correspond à l'opérateur logique OU et permet donc de définir une alternative. «­­&nbsp;<emphasis>Jean | Pierre</emphasis>&nbsp;» retrouve les phrases contenant «­­&nbsp;<emphasis>Jean</emphasis>&nbsp;» ou «­­&nbsp;<emphasis>Pierre</emphasis>&nbsp;». De même, «­­&nbsp;<emphasis> Jean.*Pierre | Pierre.*Jean</emphasis>&nbsp;» retourne «­­&nbsp;<emphasis>Jean</emphasis> ... <emphasis>Pierre</emphasis>&nbsp;» ou «­­&nbsp;<emphasis>Pierre</emphasis> ... <emphasis>Jean</emphasis>&nbsp;». (* ralentit la recherche). «­­&nbsp;<emphasis>douleur | souffrance | tourment</emphasis>&nbsp;» retourne <emphasis>douleur</emphasis> ou <emphasis>souffrance</emphasis> ou <emphasis>tourment</emphasis>.</para>
+<para>La barre verticale «­­ | » correspond à l'opérateur logique OU et permet donc de définir une alternative. «­­ <emphasis>Jean | Pierre</emphasis> » retrouve les phrases contenant «­­ <emphasis>Jean</emphasis> » ou «­­ <emphasis>Pierre</emphasis> ». De même, «­­ <emphasis> Jean.*Pierre | Pierre.*Jean</emphasis> » retourne «­­ <emphasis>Jean</emphasis> ... <emphasis>Pierre</emphasis> » ou «­­ <emphasis>Pierre</emphasis> ... <emphasis>Jean</emphasis> ». (* ralentit la recherche). «­­ <emphasis>douleur | souffrance | tourment</emphasis> » retourne <emphasis>douleur</emphasis> ou <emphasis>souffrance</emphasis> ou <emphasis>tourment</emphasis>.</para>
 </sect4>
 
 
 <sect4 id="parenth">
 <title>Les parenthèses</title>
-<para><emphasis>L'usage des parenthèses «­­&nbsp;()&nbsp;» n'est pas prévu.</emphasis></para>
+<para><emphasis>L'usage des parenthèses «­­ () » n'est pas prévu.</emphasis></para>
 </sect4>
 
 
 <sect4 id="backslash">
 <title>L'antislash précédant un caractère spécial</title>
-<para>L'antislash précédant un caractère spécial «­­&nbsp;\*&nbsp;» indique que ce caractère n'a plus de signification spéciale, mais devient un caractère ordinaire. <emphasis>amen\.</emphasis> retourne <emphasis>amen.</emphasis> mais pas <emphasis>amen</emphasis>t et ne trouvera donc pas firm<emphasis>amen</emphasis>t.</para>
+<para>L'antislash précédant un caractère spécial «­­ \* » indique que ce caractère n'a plus de signification spéciale, mais devient un caractère ordinaire. <emphasis>amen\.</emphasis> retourne <emphasis>amen.</emphasis> mais pas <emphasis>amen</emphasis>t et ne trouvera donc pas firm<emphasis>amen</emphasis>t.</para>
 </sect4>
 
 <sect4 id="backslash-o">
 <title>L'antislash précédant un caractère ordinaire</title>
 
-<para>L'antislash précédant un caractère ordinaire «­­&nbsp;\o&nbsp;» indique que ce caractère n'est plus utilisé comme tel mais prend une signification spéciale.</para>
+<para>L'antislash précédant un caractère ordinaire «­­ \o » indique que ce caractère n'est plus utilisé comme tel mais prend une signification spéciale.</para>
 
 <itemizedlist>
-<listitem><para>\b ce symbole d'ancrage indique une limite de mot obligatoire, à l'endroit où il est inséré dans le motif. Par contre, s'il est utilisé entre crochets, il correspond au caractère «­­&nbsp;retour arrière&nbsp;». <emphasis>\bjuste\b</emphasis> retourne <emphasis>juste</emphasis> mais pas in<emphasis>juste</emphasis> ou <emphasis>juste</emphasis>sse.</para></listitem>
+<listitem><para>\b ce symbole d'ancrage indique une limite de mot obligatoire, à l'endroit où il est inséré dans le motif. Par contre, s'il est utilisé entre crochets, il correspond au caractère «­­ retour arrière ». <emphasis>\bjuste\b</emphasis> retourne <emphasis>juste</emphasis> mais pas in<emphasis>juste</emphasis> ou <emphasis>juste</emphasis>sse.</para></listitem>
 <listitem><para>\B indique qu'il n'y a pas de limite de mot <emphasis>\Bleur\B</emphasis> trouve cha<emphasis>leur</emphasis>euse mais pas cha<emphasis>leur</emphasis> ou <emphasis>leur</emphasis>re.</para></listitem>
 <listitem><para>\d représente un chiffre, identique à [0-9].</para></listitem>
 <listitem><para>\D signifie non-numérique, identique à [^0-9].</para></listitem>
@@ -2175,7 +1902,7 @@ Template last modified Apr 11, 2002
     <title>Commentaires personnels</title>
     <!-- Personal Commentary-->
 
-		<para>Écrire son propre commentaire personnel nécessite l'utilisation du module Sword «­­&nbsp;Personal&nbsp;». Pour utiliser ce module, sélectionner le bouton <guibutton>Modules</guibutton> du volet latéral, puis choisir ensuite <menuchoice><guimenuitem>Commentaires</guimenuitem><guimenuitem>English</guimenuitem><guimenuitem>+*Personal*+</guimenuitem></menuchoice>. Pour modifier ses commentaires, faire un clic du bouton droit à l'aide de la souris sur la fenêtre des commentaires, puis sélectionner <menuchoice><guimenuitem>Éditer</guimenuitem><guimenuitem>Note</guimenuitem><guimenuitem>+*Personal*+</guimenuitem></menuchoice>.</para>
+		<para>Écrire son propre commentaire personnel nécessite l'utilisation du module Sword «­­ Personal ». Pour utiliser ce module, sélectionner le bouton <guibutton>Modules</guibutton> du volet latéral, puis choisir ensuite <menuchoice><guimenuitem>Commentaires</guimenuitem><guimenuitem>English</guimenuitem><guimenuitem>+*Personal*+</guimenuitem></menuchoice>. Pour modifier ses commentaires, faire un clic du bouton droit à l'aide de la souris sur la fenêtre des commentaires, puis sélectionner <menuchoice><guimenuitem>Éditer</guimenuitem><guimenuitem>Note</guimenuitem><guimenuitem>+*Personal*+</guimenuitem></menuchoice>.</para>
 
 		<para>Un éditeur semblable au<guimenuitem> bloc-notes </guimenuitem> va apparaître. Votre commentaire est à éditer puis à enregistrer. Il apparaîtra plus tard comme commentaire personnel au verset correspondant.</para>
 		<figure>
@@ -2246,7 +1973,7 @@ Template last modified Apr 11, 2002
 
 		<para><application>Xiphos</application> accepte la création et l'édition par l'utilisateur de modules contenant du texte. Originellement conçus pour l'édition de simples listes de prières, ces modules incluent désormais des journaux quotidiens et des notes structurées. Il est ainsi possible de tenir à jour des listes de prières, de préparer des sermons, ou d'écrire n'importe quel contenu structuré.</para>
 
-		<para>Pour activer le support des journaux et listes de prières, ouvrir la boite de dialogue des <interface>Préférences</interface>. Dans le menu <menuchoice><guimenuitem>Général</guimenuitem><guimenuitem>Divers</guimenuitem></menuchoice>, sélectionner l'élément indiquant <guimenuitem>Activer les listes de prières</guimenuitem>. Une nouvelle entrée <guimenuitem>Liste de prières&nbsp;/&nbsp;Journal</guimenuitem> apparaît dès cet instant dans la liste de modules du <interface>volet latéral</interface>.</para>
+		<para>Pour activer le support des journaux et listes de prières, ouvrir la boite de dialogue des <interface>Préférences</interface>. Dans le menu <menuchoice><guimenuitem>Général</guimenuitem><guimenuitem>Divers</guimenuitem></menuchoice>, sélectionner l'élément indiquant <guimenuitem>Activer les listes de prières</guimenuitem>. Une nouvelle entrée <guimenuitem>Liste de prières / Journal</guimenuitem> apparaît dès cet instant dans la liste de modules du <interface>volet latéral</interface>.</para>
 
 		<para>Un clic droit de la souris sur cette entrée présente un menu contextuel permettant de créer de nouveaux modules. Toutes les options présentées sont du même type mais avec des modèles différents à partir desquels travailler. Il existe 5 modèles pour le moment.</para>
 
@@ -2289,7 +2016,7 @@ Template last modified Apr 11, 2002
  
 	<sect2 id="xiphos-live-chat">
 		<title>Discussion en ligne</title>
-		<para>Une autre façon d'obtenir de l'aide est d'utiliser le chat en ligne. <application>&appname;</application> a un canal IRC ouvert sur freenode, #xiphos;. Un moyen simple de se connecter est de sélectionner <ulink url="http://embed.mibbit.com/?server=irc.freenode.net&amp;channel=%23xiphos">ce lien</ulink>. (Ceci ouvre la fenêtre du navigateur Internet). Ensuite, saisir un pseudo ou accepter celui par defaut, et sélectionner «&nbsp;Click to join chatroom&nbsp;». Ceci ouvre l'accès au salon où les développeurs et d'autres utilisateurs sont prêts à discuter des problèmes rencontrés. Généralement, les réponses aux questions sont immédiates, mais parfois cela peut prendre quelques minutes voire plus longtemps.<para>[NDT : Le chat en ligne est en langue anglaise]</para></para>
+		<para>Une autre façon d'obtenir de l'aide est d'utiliser le chat en ligne. <application>&appname;</application> a un canal IRC ouvert sur freenode, #xiphos;. Un moyen simple de se connecter est de sélectionner <ulink url="http://webchat.freenode.net/?randomnick=1&amp;channels=xiphos&amp;prompt=1">ce lien</ulink>. (Ceci ouvre la fenêtre du navigateur Internet). Ensuite, saisir un pseudo ou accepter celui par defaut, et sélectionner « Click to join chatroom ». Ceci ouvre l'accès au salon où les développeurs et d'autres utilisateurs sont prêts à discuter des problèmes rencontrés. Généralement, les réponses aux questions sont immédiates, mais parfois cela peut prendre quelques minutes voire plus longtemps.<para>[NDT : Le chat en ligne est en langue anglaise]</para></para>
 	</sect2>
 
   </sect1>
@@ -2338,7 +2065,7 @@ Template last modified Apr 11, 2002
 
 	<sect2 id="orig-lang-search">
 		<title>Rechercher des Nombres de Strong</title>
-		<para>Ouvrir la fenêtre <interface>Recherche avancée</interface> par <menuchoice><guisubmenu>Éditer</guisubmenu><guimenuitem>Recherche avancée</guimenuitem></menuchoice> ou·en pressant·<keycap>F3</keycap>. Dans <interface>Type de requête</interface>, choisir <guibutton>Optimisée Lucene</guibutton>. Ensuite sélectionner l'onglet <interface>Attributs</interface>, et cocher la case <guibutton>Nombres de Strong</guibutton>. Il est maintenant possible de rechercher un nombre de Strong dans la zone de saisie en le faisant précéder de «&nbsp;<emphasis>lemma:</emphasis>&nbsp;» accompagné de «&nbsp;<emphasis>G</emphasis>&nbsp;» pour la langue grecque et «&nbsp;<emphasis>H</emphasis>&nbsp;» pour la langue hébraïque. Ainsi pour rechercher le mot hébreu <emphasis>tsad-deek (6662)</emphasis>, entrer : «&nbsp;<emphasis>lemma:G662</emphasis>&nbsp;». Une fois la recherche terminée et les résultats affichés, un clic sur un résultat fait afficher le contenu dans la zone <interface>Aperçu</interface> ainsi que les nombres de Strong suivant immédiatement les mots associés. Noter que survoler ces nombres avec la souris fait apparaitre la définition dans le volet <interface>Aperçu</interface> de la fenêtre principale.</para>
+		<para>Ouvrir la fenêtre <interface>Recherche avancée</interface> par <menuchoice><guisubmenu>Éditer</guisubmenu><guimenuitem>Recherche avancée</guimenuitem></menuchoice> ou·en pressant·<keycap>F3</keycap>. Dans <interface>Type de requête</interface>, choisir <guibutton>Optimisée Lucene</guibutton>. Ensuite sélectionner l'onglet <interface>Attributs</interface>, et cocher la case <guibutton>Nombres de Strong</guibutton>. Il est maintenant possible de rechercher un nombre de Strong dans la zone de saisie en le faisant précéder de « <emphasis>lemma:</emphasis> » accompagné de « <emphasis>G</emphasis> » pour la langue grecque et « <emphasis>H</emphasis> » pour la langue hébraïque. Ainsi pour rechercher le mot hébreu <emphasis>tsad-deek (6662)</emphasis>, entrer : « <emphasis>lemma:G662</emphasis> ». Une fois la recherche terminée et les résultats affichés, un clic sur un résultat fait afficher le contenu dans la zone <interface>Aperçu</interface> ainsi que les nombres de Strong suivant immédiatement les mots associés. Noter que survoler ces nombres avec la souris fait apparaitre la définition dans le volet <interface>Aperçu</interface> de la fenêtre principale.</para>
 	</sect2>
 	
 	<sect2 id="orig-lang-additional">
@@ -2415,11 +2142,7 @@ Template last modified Apr 11, 2002
   <sect1 id="license">
     <title>Licence</title>
     
-   		<para>
-    	This program is free software; you can redistribute it and/or
-    	modify it under the terms of the <ulink type="ghelp" url="gnome-help:gpl">GNU General Public
-    	License</ulink> version 2 or any later version as published by the Free Software Foundation.
-   		</para>
+   		<para>Ce programme est libre, vous pouvez le redistribuer et/ou le modifier selon les termes de la <ulink type="ghelp" url="gnome-help:gpl">Licence Publique Générale GNU</ulink> publiée par la Free Software Foundation (version 2).</para>
    		<para>Ce programme est distribué car potentiellement utile, mais SANS AUCUNE GARANTIE, ni explicite ni implicite, y compris les garanties de commercialisation ou d'adaptation dans un but spécifique. Reportez-vous à la <citetitle>Licence Publique Générale GNU</citetitle> pour plus de détails.</para>
    		<para>Le texte complet de la <citetitle>Licence Publique Générale GNU</citetitle>  peut être consulté en annexe du <citetitle>GNOME Users Guide</citetitle> ou sur le site Internet de la <ulink type="http" url="http://www.fsf.org">Free  Software Foundation</ulink>, ou encore en écrivant à : <address>Free Software Foundation, Inc.<street> 51 Franklin St</street> - Fifth Floor <city>Boston</city>, <state>MA</state><postcode>02110-1301</postcode> <country>USA</country></address></para>
 
diff --git a/help/xiphos.omf.in b/help/xiphos.omf.in
new file mode 100644
index 0000000..e796583
--- /dev/null
+++ b/help/xiphos.omf.in
@@ -0,0 +1,9 @@
+<?xml version="1.0" standalone="no"?>
+<omf>
+  <resource>
+    <subject category="GNOME|Applications"/>
+    <type>manual</type>
+    <relation seriesid="3376140e-2a26-11d8-9eab-83cf5b4f5f4e"/>
+    <rights type="GNU FDL" license.version="1.1" holder="Pierre Benz"/>
+  </resource>
+</omf>
diff --git a/help/xiphos.pdf b/help/xiphos.pdf
deleted file mode 100644
index 63e7e6d..0000000
--- a/help/xiphos.pdf
+++ /dev/null
diff --git a/install-sh b/install-sh
index 4fbbae7..6781b98 100755
--- a/install-sh
+++ b/install-sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2006-10-14.15
+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
@@ -48,7 +48,7 @@ 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-}"
+doit=${DOITPROG-}
 if test -z "$doit"; then
   doit_exec=exec
 else
@@ -58,34 +58,49 @@ fi
 # Put in absolute file names if you don't have them in your path;
 # or use environment vars.
 
-mvprog="${MVPROG-mv}"
-cpprog="${CPPROG-cp}"
-chmodprog="${CHMODPROG-chmod}"
-chownprog="${CHOWNPROG-chown}"
-chgrpprog="${CHGRPPROG-chgrp}"
-stripprog="${STRIPPROG-strip}"
-rmprog="${RMPROG-rm}"
-mkdirprog="${MKDIRPROG-mkdir}"
+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_glob=
 posix_mkdir=
 
 # Desired mode of installed file.
 mode=0755
 
+chgrpcmd=
 chmodcmd=$chmodprog
 chowncmd=
-chgrpcmd=
-stripcmd=
+mvcmd=$mvprog
 rmcmd="$rmprog -f"
-mvcmd="$mvprog"
+stripcmd=
+
 src=
 dst=
 dir_arg=
-dstarg=
+dst_arg=
+
+copy_on_change=false
 no_target_directory=
 
-usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
+usage="\
+Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
    or: $0 [OPTION]... SRCFILES... DIRECTORY
    or: $0 [OPTION]... -t DIRECTORY SRCFILES...
    or: $0 [OPTION]... -d DIRECTORIES...
@@ -95,65 +110,55 @@ In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
 In the 4th, create DIRECTORIES.
 
 Options:
--c         (ignored)
--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.
---help     display this help and exit.
---version  display version info and exit.
+     --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 CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
+  CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
+  RMPROG STRIPPROG
 "
 
 while test $# -ne 0; do
   case $1 in
-    -c) shift
-        continue;;
+    -c) ;;
+
+    -C) copy_on_change=true;;
 
-    -d) dir_arg=true
-        shift
-        continue;;
+    -d) dir_arg=true;;
 
     -g) chgrpcmd="$chgrpprog $2"
-        shift
-        shift
-        continue;;
+	shift;;
 
     --help) echo "$usage"; exit $?;;
 
     -m) mode=$2
-        shift
-        shift
 	case $mode in
 	  *' '* | *'	'* | *'
 '*	  | *'*'* | *'?'* | *'['*)
 	    echo "$0: invalid mode: $mode" >&2
 	    exit 1;;
 	esac
-        continue;;
+	shift;;
 
     -o) chowncmd="$chownprog $2"
-        shift
-        shift
-        continue;;
+	shift;;
 
-    -s) stripcmd=$stripprog
-        shift
-        continue;;
+    -s) stripcmd=$stripprog;;
 
-    -t) dstarg=$2
-	shift
-	shift
-	continue;;
+    -t) dst_arg=$2
+	shift;;
 
-    -T) no_target_directory=true
-	shift
-	continue;;
+    -T) no_target_directory=true;;
 
     --version) echo "$0 $scriptversion"; exit $?;;
 
@@ -165,21 +170,22 @@ while test $# -ne 0; do
 
     *)  break;;
   esac
+  shift
 done
 
-if test $# -ne 0 && test -z "$dir_arg$dstarg"; then
+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 "$dstarg"; then
+    if test -n "$dst_arg"; then
       # $@ is not empty: it contains at least $arg.
-      set fnord "$@" "$dstarg"
+      set fnord "$@" "$dst_arg"
       shift # fnord
     fi
     shift # arg
-    dstarg=$arg
+    dst_arg=$arg
   done
 fi
 
@@ -224,7 +230,7 @@ for src
 do
   # Protect names starting with `-'.
   case $src in
-    -*) src=./$src ;;
+    -*) src=./$src;;
   esac
 
   if test -n "$dir_arg"; then
@@ -242,22 +248,22 @@ do
       exit 1
     fi
 
-    if test -z "$dstarg"; then
+    if test -z "$dst_arg"; then
       echo "$0: no destination specified." >&2
       exit 1
     fi
 
-    dst=$dstarg
+    dst=$dst_arg
     # Protect names starting with `-'.
     case $dst in
-      -*) dst=./$dst ;;
+      -*) 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: $dstarg: Is a directory" >&2
+	echo "$0: $dst_arg: Is a directory" >&2
 	exit 1
       fi
       dstdir=$dst
@@ -378,26 +384,19 @@ do
       # directory the slow way, step by step, checking for races as we go.
 
       case $dstdir in
-	/*) prefix=/ ;;
-	-*) prefix=./ ;;
-	*)  prefix= ;;
+	/*) prefix='/';;
+	-*) prefix='./';;
+	*)  prefix='';;
       esac
 
-      case $posix_glob in
-        '')
-	  if (set -f) 2>/dev/null; then
-	    posix_glob=true
-	  else
-	    posix_glob=false
-	  fi ;;
-      esac
+      eval "$initialize_posix_glob"
 
       oIFS=$IFS
       IFS=/
-      $posix_glob && set -f
+      $posix_glob set -f
       set fnord $dstdir
       shift
-      $posix_glob && set +f
+      $posix_glob set +f
       IFS=$oIFS
 
       prefixes=
@@ -459,41 +458,54 @@ do
     # 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"; } &&
-
-    # Now 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.
-	   {
-	     if test -f "$dst"; then
-	       $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
-	       }
-	     else
-	       :
-	     fi
-	   } &&
-
-	   # Now rename the file to the real destination.
-	   $doit $mvcmd "$dsttmp" "$dst"
-	 }
-    } || exit 1
+    { 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
@@ -503,5 +515,6 @@ done
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
 # End:
diff --git a/intltool-extract.in b/intltool-extract.in
index b81e9b4..e69de29 100644
--- a/intltool-extract.in
+++ b/intltool-extract.in
@@ -1,861 +0,0 @@
-#!@INTLTOOL_PERL@ -w 
-# -*- Mode: perl; indent-tabs-mode: nil; c-basic-offset: 4  -*-
-
-#
-#  The Intltool Message Extractor
-#
-#  Copyright (C) 2000-2001, 2003 Free Software Foundation.
-#
-#  Intltool 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.
-#
-#  Intltool 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., 675 Mass Ave, Cambridge, MA 02139, 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.
-#
-#  Authors: Kenneth Christiansen <kenneth@gnu.org>
-#           Darin Adler <darin@bentspoon.com>
-#
-
-## Release information
-my $PROGRAM      = "intltool-extract";
-my $PACKAGE      = "intltool";
-my $VERSION      = "0.35.5";
-
-## Loaded modules
-use strict; 
-use File::Basename;
-use Getopt::Long;
-
-## Scalars used by the option stuff
-my $TYPE_ARG	= "0";
-my $LOCAL_ARG	= "0";
-my $HELP_ARG 	= "0";
-my $VERSION_ARG = "0";
-my $UPDATE_ARG  = "0";
-my $QUIET_ARG   = "0";
-my $SRCDIR_ARG	= ".";
-
-my $FILE;
-my $OUTFILE;
-
-my $gettext_type = "";
-my $input;
-my %messages = ();
-my %loc = ();
-my %count = ();
-my %comments = ();
-my $strcount = 0;
-
-my $XMLCOMMENT = "";
-
-## Use this instead of \w for XML files to handle more possible characters.
-my $w = "[-A-Za-z0-9._:]";
-
-## Always print first
-$| = 1;
-
-## Handle options
-GetOptions (
-	    "type=s"     => \$TYPE_ARG,
-            "local|l"    => \$LOCAL_ARG,
-            "help|h"     => \$HELP_ARG,
-            "version|v"  => \$VERSION_ARG,
-            "update"     => \$UPDATE_ARG,
-	    "quiet|q"    => \$QUIET_ARG,
-	    "srcdir=s"	 => \$SRCDIR_ARG,
-            ) or &error;
-
-&split_on_argument;
-
-
-## Check for options. 
-## This section will check for the different options.
-
-sub split_on_argument {
-
-    if ($VERSION_ARG) {
-        &version;
-
-    } elsif ($HELP_ARG) {
-	&help;
-        
-    } elsif ($LOCAL_ARG) {
-        &place_local;
-        &extract;
-
-    } elsif ($UPDATE_ARG) {
-	&place_normal;
-	&extract;
-
-    } elsif (@ARGV > 0) {
-	&place_normal;
-	&message;
-	&extract;
-
-    } else {
-	&help;
-
-    }  
-}    
-
-sub place_normal {
-    $FILE	 = $ARGV[0];
-    $OUTFILE     = "$FILE.h";
-
-    my $dirname = dirname ($OUTFILE);
-    if (! -d "$dirname" && $dirname ne "") {
-        system ("mkdir -p $dirname");
-    }
-}   
-
-sub place_local {
-    $FILE	 = $ARGV[0];
-    $OUTFILE     = fileparse($FILE, ());
-    if (!-e "tmp/") { 
-        system("mkdir tmp/"); 
-    }
-    $OUTFILE     = "./tmp/$OUTFILE.h"
-}
-
-sub determine_type {
-   if ($TYPE_ARG =~ /^gettext\/(.*)/) {
-	$gettext_type=$1
-   }
-}
-
-## Sub for printing release information
-sub version{
-    print <<_EOF_;
-${PROGRAM} (${PACKAGE}) $VERSION
-Copyright (C) 2000, 2003 Free Software Foundation, Inc.
-Written by Kenneth Christiansen, 2000.
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-_EOF_
-    exit;
-}
-
-## Sub for printing usage information
-sub help {
-    print <<_EOF_;
-Usage: ${PROGRAM} [OPTION]... [FILENAME]
-Generates a header file from an XML source file.
-
-It grabs all strings between <_translatable_node> and its end tag in
-XML files. Read manpage (man ${PROGRAM}) for more info.
-
-      --type=TYPE   Specify the file type of FILENAME. Currently supports:
-                    "gettext/glade", "gettext/ini", "gettext/keys"
-                    "gettext/rfc822deb", "gettext/schemas",
-                    "gettext/scheme", "gettext/xml", "gettext/quoted"
-  -l, --local       Writes output into current working directory
-                    (conflicts with --update)
-      --update      Writes output into the same directory the source file 
-                    reside (conflicts with --local)
-      --srcdir      Root of the source tree
-  -v, --version     Output version information and exit
-  -h, --help        Display this help and exit
-  -q, --quiet       Quiet mode
-
-Report bugs to http://bugzilla.gnome.org/ (product name "$PACKAGE")
-or send email to <xml-i18n-tools\@gnome.org>.
-_EOF_
-    exit;
-}
-
-## Sub for printing error messages
-sub error{
-    print STDERR "Try `${PROGRAM} --help' for more information.\n";
-    exit;
-}
-
-sub message {
-    print "Generating C format header file for translation.\n" unless $QUIET_ARG;
-}
-
-sub extract {
-    &determine_type;
-
-    &convert;
-
-    open OUT, ">$OUTFILE";
-    binmode (OUT) if $^O eq 'MSWin32';
-    &msg_write;
-    close OUT;
-
-    print "Wrote $OUTFILE\n" unless $QUIET_ARG;
-}
-
-sub convert {
-
-    ## Reading the file
-    {
-	local (*IN);
-	local $/; #slurp mode
-	open (IN, "<$SRCDIR_ARG/$FILE") || die "can't open $SRCDIR_ARG/$FILE: $!";
-	$input = <IN>;
-    }
-
-    &type_ini if $gettext_type eq "ini";
-    &type_keys if $gettext_type eq "keys";
-    &type_xml if $gettext_type eq "xml";
-    &type_glade if $gettext_type eq "glade";
-    &type_scheme if $gettext_type eq "scheme";
-    &type_schemas  if $gettext_type eq "schemas";
-    &type_rfc822deb  if $gettext_type eq "rfc822deb";
-    &type_quoted if $gettext_type eq "quoted";
-}
-
-sub entity_decode_minimal
-{
-    local ($_) = @_;
-
-    s/&apos;/'/g; # '
-    s/&quot;/"/g; # "
-    s/&amp;/&/g;
-
-    return $_;
-}
-
-sub entity_decode
-{
-    local ($_) = @_;
-
-    s/&apos;/'/g; # '
-    s/&quot;/"/g; # "
-    s/&amp;/&/g;
-    s/&lt;/</g;
-    s/&gt;/>/g;
-
-    return $_;
-}
-
-sub escape_char
-{
-    return '\"' if $_ eq '"';
-    return '\n' if $_ eq "\n";
-    return '\\\\' if $_ eq '\\';
-
-    return $_;
-}
-
-sub escape
-{
-    my ($string) = @_;
-    return join "", map &escape_char, split //, $string;
-}
-
-sub type_ini {
-    ### For generic translatable desktop files ###
-    while ($input =~ /^(#(.+)\n)?^_.*=(.*)$/mg) {
-        if (defined($2))  {
-            $comments{$3} = $2;
-        }
-        $messages{$3} = [];
-    }
-}
-
-sub type_keys {
-    ### For generic translatable mime/keys files ###
-    while ($input =~ /^\s*_\w+=(.*)$/mg) {
-        $messages{$1} = [];
-    }
-}
-
-sub type_xml {
-    ### For generic translatable XML files ###
-    my $tree = readXml($input);
-    parseTree(0, $tree);
-}
-
-sub print_var {
-    my $var = shift;
-    my $vartype = ref $var;
-    
-    if ($vartype =~ /ARRAY/) {
-        my @arr = @{$var};
-        print "[ ";
-        foreach my $el (@arr) {
-            print_var($el);
-            print ", ";
-        }
-        print "] ";
-    } elsif ($vartype =~ /HASH/) {
-        my %hash = %{$var};
-        print "{ ";
-        foreach my $key (keys %hash) {
-            print "$key => ";
-            print_var($hash{$key});
-            print ", ";
-        }
-        print "} ";
-    } else {
-        print $var;
-    }
-}
-
-# Same syntax as getAttributeString in intltool-merge.in.in, similar logic (look for ## differences comment)
-sub getAttributeString
-{
-    my $sub = shift;
-    my $do_translate = shift || 1;
-    my $language = shift || "";
-    my $translate = shift;
-    my $result = "";
-    foreach my $e (reverse(sort(keys %{ $sub }))) {
-	my $key    = $e;
-	my $string = $sub->{$e};
-	my $quote = '"';
-	
-	$string =~ s/^[\s]+//;
-	$string =~ s/[\s]+$//;
-	
-	if ($string =~ /^'.*'$/)
-	{
-	    $quote = "'";
-	}
-	$string =~ s/^['"]//g;
-	$string =~ s/['"]$//g;
-
-        ## differences from intltool-merge.in.in
-	if ($key =~ /^_/) {
-            $comments{entity_decode($string)} = $XMLCOMMENT if $XMLCOMMENT;
-            $messages{entity_decode($string)} = [];
-            $$translate = 2;
-	}
-        ## differences end here from intltool-merge.in.in
-	$result .= " $key=$quote$string$quote";
-    }
-    return $result;
-}
-
-# Verbatim copy from intltool-merge.in.in
-sub getXMLstring
-{
-    my $ref = shift;
-    my $spacepreserve = shift || 0;
-    my @list = @{ $ref };
-    my $result = "";
-
-    my $count = scalar(@list);
-    my $attrs = $list[0];
-    my $index = 1;
-
-    $spacepreserve = 1 if ((exists $attrs->{"xml:space"}) && ($attrs->{"xml:space"} =~ /^["']?preserve["']?$/));
-    $spacepreserve = 0 if ((exists $attrs->{"xml:space"}) && ($attrs->{"xml:space"} =~ /^["']?default["']?$/));
-
-    while ($index < $count) {
-	my $type = $list[$index];
-	my $content = $list[$index+1];
-        if (! $type ) {
-	    # We've got CDATA
-	    if ($content) {
-		# lets strip the whitespace here, and *ONLY* here
-                $content =~ s/\s+/ /gs if (!$spacepreserve);
-		$result .= $content;
-	    }
-	} elsif ( "$type" ne "1" ) {
-	    # We've got another element
-	    $result .= "<$type";
-	    $result .= getAttributeString(@{$content}[0], 0); # no nested translatable elements
-	    if ($content) {
-		my $subresult = getXMLstring($content, $spacepreserve);
-		if ($subresult) {
-		    $result .= ">".$subresult . "</$type>";
-		} else {
-		    $result .= "/>";
-		}
-	    } else {
-		$result .= "/>";
-	    }
-	}
-	$index += 2;
-    }
-    return $result;
-}
-
-# Verbatim copy from intltool-merge.in.in, except for MULTIPLE_OUTPUT handling removed
-# Translate list of nodes if necessary
-sub translate_subnodes
-{
-    my $fh = shift;
-    my $content = shift;
-    my $language = shift || "";
-    my $singlelang = shift || 0;
-    my $spacepreserve = shift || 0;
-
-    my @nodes = @{ $content };
-
-    my $count = scalar(@nodes);
-    my $index = 0;
-    while ($index < $count) {
-        my $type = $nodes[$index];
-        my $rest = $nodes[$index+1];
-        traverse($fh, $type, $rest, $language, $spacepreserve);
-        $index += 2;
-    }
-}
-
-# Based on traverse() in intltool-merge.in.in
-sub traverse
-{
-    my $fh = shift; # unused, to allow us to sync code between -merge and -extract
-    my $nodename = shift;
-    my $content = shift;
-    my $language = shift || "";
-    my $spacepreserve = shift || 0;
-
-    if ($nodename && "$nodename" eq "1") {
-        $XMLCOMMENT = $content;
-    } elsif ($nodename) {
-	# element
-	my @all = @{ $content };
-	my $attrs = shift @all;
-	my $translate = 0;
-	my $outattr = getAttributeString($attrs, 1, $language, \$translate);
-
-	if ($nodename =~ /^_/) {
-	    $translate = 1;
-	    $nodename =~ s/^_//;
-	}
-	my $lookup = '';
-
-        $spacepreserve = 0 if ((exists $attrs->{"xml:space"}) && ($attrs->{"xml:space"} =~ /^["']?default["']?$/));
-        $spacepreserve = 1 if ((exists $attrs->{"xml:space"}) && ($attrs->{"xml:space"} =~ /^["']?preserve["']?$/));
-
-	if ($translate) {
-	    $lookup = getXMLstring($content, $spacepreserve);
-            if (!$spacepreserve) {
-                $lookup =~ s/^\s+//s;
-                $lookup =~ s/\s+$//s;
-            }
-
-	    if ($lookup && $translate != 2) {
-                $comments{$lookup} = $XMLCOMMENT if $XMLCOMMENT;
-                $messages{$lookup} = [];
-            } elsif ($translate == 2) {
-                translate_subnodes($fh, \@all, $language, 1, $spacepreserve);
-	    }
-	} else {
-            $XMLCOMMENT = "";
-	    my $count = scalar(@all);
-	    if ($count > 0) {
-                my $index = 0;
-                while ($index < $count) {
-                    my $type = $all[$index];
-                    my $rest = $all[$index+1];
-                    traverse($fh, $type, $rest, $language, $spacepreserve);
-                    $index += 2;
-                }
-	    }
-	}
-        $XMLCOMMENT = "";
-    }
-}
-
-
-# Verbatim copy from intltool-merge.in.in, $fh for compatibility
-sub parseTree
-{
-    my $fh        = shift;
-    my $ref       = shift;
-    my $language  = shift || "";
-
-    my $name = shift @{ $ref };
-    my $cont = shift @{ $ref };
-
-    while (!$name || "$name" eq "1") {
-        $name = shift @{ $ref };
-        $cont = shift @{ $ref };
-    }
-
-    my $spacepreserve = 0;
-    my $attrs = @{$cont}[0];
-    $spacepreserve = 1 if ((exists $attrs->{"xml:space"}) && ($attrs->{"xml:space"} =~ /^["']?preserve["']?$/));
-
-    traverse($fh, $name, $cont, $language, $spacepreserve);
-}
-
-# Verbatim copy from intltool-merge.in.in
-sub intltool_tree_comment
-{
-    my $expat = shift;
-    my $data  = $expat->original_string();
-    my $clist = $expat->{Curlist};
-    my $pos   = $#$clist;
-
-    $data =~ s/^<!--//s;
-    $data =~ s/-->$//s;
-    push @$clist, 1 => $data;
-}
-
-# Verbatim copy from intltool-merge.in.in
-sub intltool_tree_cdatastart
-{
-    my $expat    = shift;
-    my $clist = $expat->{Curlist};
-    my $pos   = $#$clist;
-
-    push @$clist, 0 => $expat->original_string();
-}
-
-# Verbatim copy from intltool-merge.in.in
-sub intltool_tree_cdataend
-{
-    my $expat    = shift;
-    my $clist = $expat->{Curlist};
-    my $pos   = $#$clist;
-
-    $clist->[$pos] .= $expat->original_string();
-}
-
-# Verbatim copy from intltool-merge.in.in
-sub intltool_tree_char
-{
-    my $expat = shift;
-    my $text  = shift;
-    my $clist = $expat->{Curlist};
-    my $pos   = $#$clist;
-
-    # Use original_string so that we retain escaped entities
-    # in CDATA sections.
-    #
-    if ($pos > 0 and $clist->[$pos - 1] eq '0') {
-        $clist->[$pos] .= $expat->original_string();
-    } else {
-        push @$clist, 0 => $expat->original_string();
-    }
-}
-
-# Verbatim copy from intltool-merge.in.in
-sub intltool_tree_start
-{
-    my $expat    = shift;
-    my $tag      = shift;
-    my @origlist = ();
-
-    # Use original_string so that we retain escaped entities
-    # in attribute values.  We must convert the string to an
-    # @origlist array to conform to the structure of the Tree
-    # Style.
-    #
-    my @original_array = split /\x/, $expat->original_string();
-    my $source         = $expat->original_string();
-
-    # Remove leading tag.
-    #
-    $source =~ s|^\s*<\s*(\S+)||s;
-
-    # Grab attribute key/value pairs and push onto @origlist array.
-    #
-    while ($source)
-    {
-       if ($source =~ /^\s*([\w:-]+)\s*[=]\s*["]/)
-       {
-           $source =~ s|^\s*([\w:-]+)\s*[=]\s*["]([^"]*)["]||s;
-           push @origlist, $1;
-           push @origlist, '"' . $2 . '"';
-       }
-       elsif ($source =~ /^\s*([\w:-]+)\s*[=]\s*[']/)
-       {
-           $source =~ s|^\s*([\w:-]+)\s*[=]\s*[']([^']*)[']||s;
-           push @origlist, $1;
-           push @origlist, "'" . $2 . "'";
-       }
-       else
-       {
-           last;
-       }
-    }
-
-    my $ol = [ { @origlist } ];
-
-    push @{ $expat->{Lists} }, $expat->{Curlist};
-    push @{ $expat->{Curlist} }, $tag => $ol;
-    $expat->{Curlist} = $ol;
-}
-
-# Copied from intltool-merge.in.in and added comment handler.
-sub readXml
-{
-    my $xmldoc = shift || return;
-    my $ret = eval 'require XML::Parser';
-    if(!$ret) {
-        die "You must have XML::Parser installed to run $0\n\n";
-    }
-    my $xp = new XML::Parser(Style => 'Tree');
-    $xp->setHandlers(Char => \&intltool_tree_char);
-    $xp->setHandlers(Start => \&intltool_tree_start);
-    $xp->setHandlers(CdataStart => \&intltool_tree_cdatastart);
-    $xp->setHandlers(CdataEnd => \&intltool_tree_cdataend);
-
-    ## differences from intltool-merge.in.in
-    $xp->setHandlers(Comment => \&intltool_tree_comment);
-    ## differences end here from intltool-merge.in.in
-
-    my $tree = $xp->parse($xmldoc);
-    #print_var($tree);
-
-# <foo><!-- comment --><head id="a">Hello <em>there</em></head><bar>Howdy<ref/></bar>do</foo>
-# would be:
-# [foo, [{}, 1, "comment", head, [{id => "a"}, 0, "Hello ",  em, [{}, 0, "there"]], bar, 
-# [{}, 0, "Howdy",  ref, [{}]], 0, "do" ] ]
-
-    return $tree;
-}
-
-sub type_schemas {
-    ### For schemas XML files ###
-         
-    # FIXME: We should handle escaped < (less than)
-    while ($input =~ /
-                      <locale\ name="C">\s*
-                          (<default>\s*(?:<!--([^>]*?)-->\s*)?(.*?)\s*<\/default>\s*)?
-                          (<short>\s*(?:<!--([^>]*?)-->\s*)?(.*?)\s*<\/short>\s*)?
-                          (<long>\s*(?:<!--([^>]*?)-->\s*)?(.*?)\s*<\/long>\s*)?
-                      <\/locale>
-                     /sgx) {
-        my @totranslate = ($3,$6,$9);
-        my @eachcomment = ($2,$5,$8);
-        foreach (@totranslate) {
-            my $currentcomment = shift @eachcomment;
-            next if !$_;
-            s/\s+/ /g;
-            $messages{entity_decode_minimal($_)} = [];
-            $comments{entity_decode_minimal($_)} = $currentcomment if (defined($currentcomment));
-        }
-    }
-}
-
-sub type_rfc822deb {
-    ### For rfc822-style Debian configuration files ###
-
-    my $lineno = 1;
-    my $type = '';
-    while ($input =~ /\G(.*?)(^|\n)(_+)([^:]+):[ \t]*(.*?)(?=\n\S|$)/sg)
-    {
-        my ($pre, $newline, $underscore, $tag, $text) = ($1, $2, $3, $4, $5);
-        while ($pre =~ m/\n/g)
-        {
-            $lineno ++;
-        }
-        $lineno += length($newline);
-        my @str_list = rfc822deb_split(length($underscore), $text);
-        for my $str (@str_list)
-        {
-            $strcount++;
-            $messages{$str} = [];
-            $loc{$str} = $lineno;
-            $count{$str} = $strcount;
-            my $usercomment = '';
-            while($pre =~ s/(^|\n)#([^\n]*)$//s)
-            {
-                $usercomment = "\n" . $2 . $usercomment;
-            }
-            $comments{$str} = $tag . $usercomment;
-        }
-        $lineno += ($text =~ s/\n//g);
-    }
-}
-
-sub rfc822deb_split {
-    # Debian defines a special way to deal with rfc822-style files:
-    # when a value contain newlines, it consists of
-    #   1.  a short form (first line)
-    #   2.  a long description, all lines begin with a space,
-    #       and paragraphs are separated by a single dot on a line
-    # This routine returns an array of all paragraphs, and reformat
-    # them.
-    # When first argument is 2, the string is a comma separated list of
-    # values.
-    my $type = shift;
-    my $text = shift;
-    $text =~ s/^[ \t]//mg;
-    return (split(/, */, $text, 0)) if $type ne 1;
-    return ($text) if $text !~ /\n/;
-
-    $text =~ s/([^\n]*)\n//;
-    my @list = ($1);
-    my $str = '';
-    for my $line (split (/\n/, $text))
-    {
-        chomp $line;
-        if ($line =~ /^\.\s*$/)
-        {
-            #  New paragraph
-            $str =~ s/\s*$//;
-            push(@list, $str);
-            $str = '';
-        }
-        elsif ($line =~ /^\s/)
-        {
-            #  Line which must not be reformatted
-            $str .= "\n" if length ($str) && $str !~ /\n$/;
-            $line =~ s/\s+$//;
-            $str .= $line."\n";
-        }
-        else
-        {
-            #  Continuation line, remove newline
-            $str .= " " if length ($str) && $str !~ /\n$/;
-            $str .= $line;
-        }
-    }
-    $str =~ s/\s*$//;
-    push(@list, $str) if length ($str);
-    return @list;
-}
-
-sub type_quoted {
-    while ($input =~ /\"(([^\"]|\\\")*[^\\\"])\"/g) {
-        my $message = $1;
-        my $before = $`;
-        $message =~ s/\\\"/\"/g;
-        $before =~ s/[^\n]//g;
-        $messages{$message} = [];
-        $loc{$message} = length ($before) + 2;
-    }
-}
-
-sub type_glade {
-    ### For translatable Glade XML files ###
-
-    my $tags = "label|title|text|format|copyright|comments|preview_text|tooltip|message";
-
-    while ($input =~ /<($tags)>([^<]+)<\/($tags)>/sg) {
-	# Glade sometimes uses tags that normally mark translatable things for
-        # little bits of non-translatable content. We work around this by not
-        # translating strings that only includes something like label4 or window1.
-	$messages{entity_decode($2)} = [] unless $2 =~ /^(window|label|dialog)[0-9]+$/;
-    }
-    
-    while ($input =~ /<items>(..[^<]*)<\/items>/sg) {
-	for my $item (split (/\n/, $1)) {
-	    $messages{entity_decode($item)} = [];
-	}
-    }
-
-    ## handle new glade files
-    while ($input =~ /<(property|atkproperty)\s+[^>]*translatable\s*=\s*"yes"(?:\s+[^>]*comments\s*=\s*"([^"]*)")?[^>]*>([^<]+)<\/\1>/sg) {
-	$messages{entity_decode($3)} = [] unless $3 =~ /^(window|label)[0-9]+$/;
-        if (defined($2) and !($3 =~ /^(window|label)[0-9]+$/)) {
-	   $comments{entity_decode($3)} = entity_decode($2) ;
-        }
-    }
-    while ($input =~ /<atkaction\s+action_name="([^>]*)"\s+description="([^>]+)"\/>/sg) {
-        $messages{entity_decode_minimal($2)} = [];
-    }
-}
-
-sub type_scheme {
-    my ($line, $i, $state, $str, $trcomment, $char);
-    for $line (split(/\n/, $input)) {
-        $i = 0;
-        $state = 0; # 0 - nothing, 1 - string, 2 - translatable string
-        while ($i < length($line)) {
-            if (substr($line,$i,1) eq "\"") {
-                if ($state == 2) {
-                    $comments{$str} = $trcomment if ($trcomment);
-                    $messages{$str} = [];
-                    $str = '';
-                    $state = 0; $trcomment = "";
-                } elsif ($state == 1) {
-                    $str = '';
-                    $state = 0; $trcomment = "";
-                } else {
-                    $state = 1;
-                    $str = '';
-                    if ($i>0 && substr($line,$i-1,1) eq '_') {
-                        $state = 2;
-                    }
-                }
-            } elsif (!$state) {
-                if (substr($line,$i,1) eq ";") {
-                    $trcomment = substr($line,$i+1);
-                    $trcomment =~ s/^;*\s*//;
-                    $i = length($line);
-                } elsif ($trcomment && substr($line,$i,1) !~ /\s|\(|\)|_/) {
-                    $trcomment = "";
-                }
-            } else {
-                if (substr($line,$i,1) eq "\\") {
-                    $char = substr($line,$i+1,1);
-                    if ($char ne "\"" && $char ne "\\") {
-                       $str = $str . "\\";
-                    }
-                    $i++;
-                }
-                $str = $str . substr($line,$i,1);
-            }
-            $i++;
-        }
-    }
-}
-
-sub msg_write {
-    my @msgids;
-    if (%count)
-    {
-        @msgids = sort { $count{$a} <=> $count{$b} } keys %count;
-    }
-    else
-    {
-        @msgids = sort keys %messages;
-    }
-    for my $message (@msgids)
-    {
-	my $offsetlines = 1;
-	$offsetlines++ if $message =~ /%/;
-	if (defined ($comments{$message}))
-	{
-		while ($comments{$message} =~ m/\n/g)
-		{
-		    $offsetlines++;
-		}
-	}
-	print OUT "# ".($loc{$message} - $offsetlines).  " \"$FILE\"\n"
-	        if defined $loc{$message};
-   	print OUT "/* ".$comments{$message}." */\n"
-                if defined $comments{$message};
-   	print OUT "/* xgettext:no-c-format */\n" if $message =~ /%/;
-        
-    	my @lines = split (/\n/, $message, -1);
-    	for (my $n = 0; $n < @lines; $n++)
-	{
-            if ($n == 0)
-            {
- 		print OUT "char *s = N_(\""; 
-            }
-            else
-            {  
-                print OUT "             \""; 
-            }
-
-            print OUT escape($lines[$n]);
-
-            if ($n < @lines - 1)
-            {
-                print OUT "\\n\"\n"; 
-            }
-            else
-            {
-                print OUT "\");\n";  
-	    }
-        }
-    }
-}
-
diff --git a/intltool-merge.in b/intltool-merge.in
index 58a292d..e69de29 100644
--- a/intltool-merge.in
+++ b/intltool-merge.in
@@ -1,1403 +0,0 @@
-#!@INTLTOOL_PERL@ -w
-# -*- Mode: perl; indent-tabs-mode: nil; c-basic-offset: 4  -*-
-
-#
-#  The Intltool Message Merger
-#
-#  Copyright (C) 2000, 2003 Free Software Foundation.
-#  Copyright (C) 2000, 2001 Eazel, Inc
-#
-#  Intltool is free software; you can redistribute it and/or
-#  modify it under the terms of the GNU General Public License 
-#  version 2 published by the Free Software Foundation.
-#
-#  Intltool 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., 675 Mass Ave, Cambridge, MA 02139, 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.
-#
-#  Authors:  Maciej Stachowiak <mjs@noisehavoc.org>
-#            Kenneth Christiansen <kenneth@gnu.org>
-#            Darin Adler <darin@bentspoon.com>
-#
-#  Proper XML UTF-8'ification written by Cyrille Chepelov <chepelov@calixo.net>
-#
-
-## Release information
-my $PROGRAM = "intltool-merge";
-my $PACKAGE = "intltool";
-my $VERSION = "0.35.5";
-
-## Loaded modules
-use strict; 
-use Getopt::Long;
-use Text::Wrap;
-use File::Basename;
-
-my $must_end_tag      = -1;
-my $last_depth        = -1;
-my $translation_depth = -1;
-my @tag_stack = ();
-my @entered_tag = ();
-my @translation_strings = ();
-my $leading_space = "";
-
-## Scalars used by the option stuff
-my $HELP_ARG = 0;
-my $VERSION_ARG = 0;
-my $BA_STYLE_ARG = 0;
-my $XML_STYLE_ARG = 0;
-my $KEYS_STYLE_ARG = 0;
-my $DESKTOP_STYLE_ARG = 0;
-my $SCHEMAS_STYLE_ARG = 0;
-my $RFC822DEB_STYLE_ARG = 0;
-my $QUOTED_STYLE_ARG = 0;
-my $QUIET_ARG = 0;
-my $PASS_THROUGH_ARG = 0;
-my $UTF8_ARG = 0;
-my $MULTIPLE_OUTPUT = 0;
-my $cache_file;
-
-## Handle options
-GetOptions 
-(
- "help" => \$HELP_ARG,
- "version" => \$VERSION_ARG,
- "quiet|q" => \$QUIET_ARG,
- "oaf-style|o" => \$BA_STYLE_ARG, ## for compatibility
- "ba-style|b" => \$BA_STYLE_ARG,
- "xml-style|x" => \$XML_STYLE_ARG,
- "keys-style|k" => \$KEYS_STYLE_ARG,
- "desktop-style|d" => \$DESKTOP_STYLE_ARG,
- "schemas-style|s" => \$SCHEMAS_STYLE_ARG,
- "rfc822deb-style|r" => \$RFC822DEB_STYLE_ARG,
- "quoted-style" => \$QUOTED_STYLE_ARG,
- "pass-through|p" => \$PASS_THROUGH_ARG,
- "utf8|u" => \$UTF8_ARG,
- "multiple-output|m" => \$MULTIPLE_OUTPUT,
- "cache|c=s" => \$cache_file
- ) or &error;
-
-my $PO_DIR;
-my $FILE;
-my $OUTFILE;
-
-my %po_files_by_lang = ();
-my %translations = ();
-my $iconv = $ENV{"ICONV"} || $ENV{"INTLTOOL_ICONV"} || "@INTLTOOL_ICONV@";
-my $devnull = ($^O eq 'MSWin32' ? 'NUL:' : '/dev/null');
-
-# Use this instead of \w for XML files to handle more possible characters.
-my $w = "[-A-Za-z0-9._:]";
-
-# XML quoted string contents
-my $q = "[^\\\"]*";
-
-## Check for options. 
-
-if ($VERSION_ARG) 
-{
-	&print_version;
-} 
-elsif ($HELP_ARG) 
-{
-	&print_help;
-} 
-elsif ($BA_STYLE_ARG && @ARGV > 2) 
-{
-	&utf8_sanity_check;
-	&preparation;
-	&print_message;
-	&ba_merge_translations;
-	&finalize;
-} 
-elsif ($XML_STYLE_ARG && @ARGV > 2) 
-{
-	&utf8_sanity_check;
-	&preparation;
-	&print_message;
-	&xml_merge_output;
-	&finalize;
-} 
-elsif ($KEYS_STYLE_ARG && @ARGV > 2) 
-{
-	&utf8_sanity_check;
-	&preparation;
-	&print_message;
-	&keys_merge_translations;
-	&finalize;
-} 
-elsif ($DESKTOP_STYLE_ARG && @ARGV > 2) 
-{
-	&utf8_sanity_check;
-	&preparation;
-	&print_message;
-	&desktop_merge_translations;
-	&finalize;
-} 
-elsif ($SCHEMAS_STYLE_ARG && @ARGV > 2) 
-{
-	&utf8_sanity_check;
-	&preparation;
-	&print_message;
-	&schemas_merge_translations;
-	&finalize;
-} 
-elsif ($RFC822DEB_STYLE_ARG && @ARGV > 2) 
-{
-	&preparation;
-	&print_message;
-	&rfc822deb_merge_translations;
-	&finalize;
-} 
-elsif ($QUOTED_STYLE_ARG && @ARGV > 2) 
-{
-	&utf8_sanity_check;
-	&preparation;
-	&print_message;
-	&quoted_merge_translations;
-	&finalize;
-} 
-else 
-{
-	&print_help;
-}
-
-exit;
-
-## Sub for printing release information
-sub print_version
-{
-    print <<_EOF_;
-${PROGRAM} (${PACKAGE}) ${VERSION}
-Written by Maciej Stachowiak, Darin Adler and Kenneth Christiansen.
-
-Copyright (C) 2000-2003 Free Software Foundation, Inc.
-Copyright (C) 2000-2001 Eazel, Inc.
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-_EOF_
-    exit;
-}
-
-## Sub for printing usage information
-sub print_help
-{
-    print <<_EOF_;
-Usage: ${PROGRAM} [OPTION]... PO_DIRECTORY FILENAME OUTPUT_FILE
-Generates an output file that includes some localized attributes from an
-untranslated source file.
-
-Mandatory options: (exactly one must be specified)
-  -b, --ba-style         includes translations in the bonobo-activation style
-  -d, --desktop-style    includes translations in the desktop style
-  -k, --keys-style       includes translations in the keys style
-  -s, --schemas-style    includes translations in the schemas style
-  -r, --rfc822deb-style  includes translations in the RFC822 style
-      --quoted-style     includes translations in the quoted string style
-  -x, --xml-style        includes translations in the standard xml style
-
-Other options:
-  -u, --utf8             convert all strings to UTF-8 before merging 
-                         (default for everything except RFC822 style)
-  -p, --pass-through     deprecated, does nothing and issues a warning
-  -m, --multiple-output  output one localized file per locale, instead of 
-	                 a single file containing all localized elements
-  -c, --cache=FILE       specify cache file name
-                         (usually \$top_builddir/po/.intltool-merge-cache)
-  -q, --quiet            suppress most messages
-      --help             display this help and exit
-      --version          output version information and exit
-
-Report bugs to http://bugzilla.gnome.org/ (product name "$PACKAGE")
-or send email to <xml-i18n-tools\@gnome.org>.
-_EOF_
-    exit;
-}
-
-
-## Sub for printing error messages
-sub print_error
-{
-    print STDERR "Try `${PROGRAM} --help' for more information.\n";
-    exit;
-}
-
-
-sub print_message 
-{
-    print "Merging translations into $OUTFILE.\n" unless $QUIET_ARG;
-}
-
-
-sub preparation 
-{
-    $PO_DIR = $ARGV[0];
-    $FILE = $ARGV[1];
-    $OUTFILE = $ARGV[2];
-
-    &gather_po_files;
-    &get_translation_database;
-}
-
-# General-purpose code for looking up translations in .po files
-
-sub po_file2lang
-{
-    my ($tmp) = @_; 
-    $tmp =~ s/^.*\/(.*)\.po$/$1/; 
-    return $tmp; 
-}
-
-sub gather_po_files
-{
-    for my $po_file (glob "$PO_DIR/*.po") {
-	$po_files_by_lang{po_file2lang($po_file)} = $po_file;
-    }
-}
-
-sub get_local_charset
-{
-    my ($encoding) = @_;
-    my $alias_file = $ENV{"G_CHARSET_ALIAS"} || "@INTLTOOL_LIBDIR@/charset.alias";
-
-    # seek character encoding aliases in charset.alias (glib)
-
-    if (open CHARSET_ALIAS, $alias_file) 
-    {
-	while (<CHARSET_ALIAS>) 
-        {
-            next if /^\#/;
-            return $1 if (/^\s*([-._a-zA-Z0-9]+)\s+$encoding\b/i)
-        }
-
-        close CHARSET_ALIAS;
-    }
-
-    # if not found, return input string
-
-    return $encoding;
-}
-
-sub get_po_encoding
-{
-    my ($in_po_file) = @_;
-    my $encoding = "";
-
-    open IN_PO_FILE, $in_po_file or die;
-    while (<IN_PO_FILE>) 
-    {
-        ## example: "Content-Type: text/plain; charset=ISO-8859-1\n"
-        if (/Content-Type\:.*charset=([-a-zA-Z0-9]+)\\n/) 
-        {
-            $encoding = $1; 
-            last;
-        }
-    }
-    close IN_PO_FILE;
-
-    if (!$encoding) 
-    {
-        print STDERR "Warning: no encoding found in $in_po_file. Assuming ISO-8859-1\n" unless $QUIET_ARG;
-        $encoding = "ISO-8859-1";
-    }
-
-    system ("$iconv -f $encoding -t UTF-8 <$devnull 2>$devnull");
-    if ($?) {
-	$encoding = get_local_charset($encoding);
-    }
-
-    return $encoding
-}
-
-sub utf8_sanity_check 
-{
-    print STDERR "Warning: option --pass-through has been removed.\n" if $PASS_THROUGH_ARG;
-    $UTF8_ARG = 1;
-}
-
-sub get_translation_database
-{
-    if ($cache_file) {
-	&get_cached_translation_database;
-    } else {
-        &create_translation_database;
-    }
-}
-
-sub get_newest_po_age
-{
-    my $newest_age;
-
-    foreach my $file (values %po_files_by_lang) 
-    {
-	my $file_age = -M $file;
-	$newest_age = $file_age if !$newest_age || $file_age < $newest_age;
-    }
-
-    $newest_age = 0 if !$newest_age;
-
-    return $newest_age;
-}
-
-sub create_cache
-{
-    print "Generating and caching the translation database\n" unless $QUIET_ARG;
-
-    &create_translation_database;
-
-    open CACHE, ">$cache_file" || die;
-    print CACHE join "\x01", %translations;
-    close CACHE;
-}
-
-sub load_cache 
-{
-    print "Found cached translation database\n" unless $QUIET_ARG;
-
-    my $contents;
-    open CACHE, "<$cache_file" || die;
-    {
-        local $/;
-        $contents = <CACHE>;
-    }
-    close CACHE;
-    %translations = split "\x01", $contents;
-}
-
-sub get_cached_translation_database
-{
-    my $cache_file_age = -M $cache_file;
-    if (defined $cache_file_age) 
-    {
-        if ($cache_file_age <= &get_newest_po_age) 
-        {
-            &load_cache;
-            return;
-        }
-        print "Found too-old cached translation database\n" unless $QUIET_ARG;
-    }
-
-    &create_cache;
-}
-
-sub create_translation_database
-{
-    for my $lang (keys %po_files_by_lang) 
-    {
-    	my $po_file = $po_files_by_lang{$lang};
-
-        if ($UTF8_ARG) 
-        {
-            my $encoding = get_po_encoding ($po_file);
-
-            if (lc $encoding eq "utf-8") 
-            {
-                open PO_FILE, "<$po_file";	
-            } 
-            else 
-            {
-		print "NOTICE: $po_file is not in UTF-8 but $encoding, converting...\n" unless $QUIET_ARG;;
-
-                open PO_FILE, "$iconv -f $encoding -t UTF-8 $po_file|";	
-            }
-        } 
-        else 
-        {
-            open PO_FILE, "<$po_file";	
-        }
-
-	my $nextfuzzy = 0;
-	my $inmsgid = 0;
-	my $inmsgstr = 0;
-	my $msgid = "";
-	my $msgstr = "";
-
-        while (<PO_FILE>) 
-        {
-	    $nextfuzzy = 1 if /^#, fuzzy/;
-       
-	    if (/^msgid "((\\.|[^\\]+)*)"/ ) 
-            {
-		$translations{$lang, $msgid} = $msgstr if $inmsgstr && $msgid && $msgstr && $msgid ne $msgstr;
-		$msgid = "";
-		$msgstr = "";
-
-		if ($nextfuzzy) {
-		    $inmsgid = 0;
-		} else {
-		    $msgid = unescape_po_string($1);
-		    $inmsgid = 1;
-		}
-		$inmsgstr = 0;
-		$nextfuzzy = 0;
-	    }
-
-	    if (/^msgstr "((\\.|[^\\]+)*)"/) 
-            {
-	        $msgstr = unescape_po_string($1);
-		$inmsgstr = 1;
-		$inmsgid = 0;
-	    }
-
-	    if (/^"((\\.|[^\\]+)*)"/) 
-            {
-	        $msgid .= unescape_po_string($1) if $inmsgid;
-	        $msgstr .= unescape_po_string($1) if $inmsgstr;
-	    }
-	}
-	$translations{$lang, $msgid} = $msgstr if $inmsgstr && $msgid && $msgstr && $msgstr ne $msgid;
-    }
-}
-
-sub finalize
-{
-}
-
-sub unescape_one_sequence
-{
-    my ($sequence) = @_;
-
-    return "\\" if $sequence eq "\\\\";
-    return "\"" if $sequence eq "\\\"";
-    return "\n" if $sequence eq "\\n";
-    return "\r" if $sequence eq "\\r";
-    return "\t" if $sequence eq "\\t";
-    return "\b" if $sequence eq "\\b";
-    return "\f" if $sequence eq "\\f";
-    return "\a" if $sequence eq "\\a";
-    return chr(11) if $sequence eq "\\v"; # vertical tab, see ascii(7)
-
-    return chr(hex($1)) if ($sequence =~ /\\x([0-9a-fA-F]{2})/);
-    return chr(oct($1)) if ($sequence =~ /\\([0-7]{3})/);
-
-    # FIXME: Is \0 supported as well? Kenneth and Rodney don't want it, see bug #48489
-
-    return $sequence;
-}
-
-sub unescape_po_string
-{
-    my ($string) = @_;
-
-    $string =~ s/(\\x[0-9a-fA-F]{2}|\\[0-7]{3}|\\.)/unescape_one_sequence($1)/eg;
-
-    return $string;
-}
-
-## NOTE: deal with < - &lt; but not > - &gt;  because it seems its ok to have 
-## > in the entity. For further info please look at #84738.
-sub entity_decode
-{
-    local ($_) = @_;
-
-    s/&apos;/'/g; # '
-    s/&quot;/"/g; # "
-    s/&amp;/&/g;
-    s/&lt;/</g;
-
-    return $_;
-}
- 
-# entity_encode: (string)
-#
-# Encode the given string to XML format (encode '<' etc).
-
-sub entity_encode
-{
-    my ($pre_encoded) = @_;
-
-    my @list_of_chars = unpack ('C*', $pre_encoded);
-
-    # with UTF-8 we only encode minimalistic
-    return join ('', map (&entity_encode_int_minimalist, @list_of_chars));
-}
-
-sub entity_encode_int_minimalist
-{
-    return "&quot;" if $_ == 34;
-    return "&amp;" if $_ == 38;
-    return "&apos;" if $_ == 39;
-    return "&lt;" if $_ == 60;
-    return chr $_;
-}
-
-sub entity_encoded_translation
-{
-    my ($lang, $string) = @_;
-
-    my $translation = $translations{$lang, $string};
-    return $string if !$translation;
-    return entity_encode ($translation);
-}
-
-## XML (bonobo-activation specific) merge code
-
-sub ba_merge_translations
-{
-    my $source;
-
-    {
-       local $/; # slurp mode
-       open INPUT, "<$FILE" or die "can't open $FILE: $!";
-       $source = <INPUT>;
-       close INPUT;
-    }
-
-    open OUTPUT, ">$OUTFILE" or die "can't open $OUTFILE: $!";
-    # Binmode so that selftest works ok if using a native Win32 Perl...
-    binmode (OUTPUT) if $^O eq 'MSWin32';
-
-    while ($source =~ s|^(.*?)([ \t]*<\s*$w+\s+($w+\s*=\s*"$q"\s*)+/?>)([ \t]*\n)?||s) 
-    {
-        print OUTPUT $1;
-
-        my $node = $2 . "\n";
-
-        my @strings = ();
-        $_ = $node;
-	while (s/(\s)_($w+\s*=\s*"($q)")/$1$2/s) {
-             push @strings, entity_decode($3);
-        }
-	print OUTPUT;
-
-	my %langs;
-	for my $string (@strings) 
-        {
-	    for my $lang (keys %po_files_by_lang) 
-            {
-                $langs{$lang} = 1 if $translations{$lang, $string};
-	    }
-	}
-	
-	for my $lang (sort keys %langs) 
-        {
-	    $_ = $node;
-	    s/(\sname\s*=\s*)"($q)"/$1"$2-$lang"/s;
-	    s/(\s)_($w+\s*=\s*")($q)"/$1 . $2 . entity_encoded_translation($lang, $3) . '"'/seg;
-	    print OUTPUT;
-        }
-    }
-
-    print OUTPUT $source;
-
-    close OUTPUT;
-}
-
-
-## XML (non-bonobo-activation) merge code
-
-
-# Process tag attributes
-#   Only parameter is a HASH containing attributes -> values mapping
-sub getAttributeString
-{
-    my $sub = shift;
-    my $do_translate = shift || 0;
-    my $language = shift || "";
-    my $result = "";
-    my $translate = shift;
-    foreach my $e (reverse(sort(keys %{ $sub }))) {
-	my $key    = $e;
-	my $string = $sub->{$e};
-	my $quote = '"';
-	
-	$string =~ s/^[\s]+//;
-	$string =~ s/[\s]+$//;
-	
-	if ($string =~ /^'.*'$/)
-	{
-	    $quote = "'";
-	}
-	$string =~ s/^['"]//g;
-	$string =~ s/['"]$//g;
-
-	if ($do_translate && $key =~ /^_/) {
-	    $key =~ s|^_||g;
-	    if ($language) {
-		# Handle translation
-		my $decode_string = entity_decode($string);
-		my $translation = $translations{$language, $decode_string};
-		if ($translation) {
-		    $translation = entity_encode($translation);
-		    $string = $translation;
-                }
-                $$translate = 2;
-            } else {
-                 $$translate = 2 if ($translate && (!$$translate)); # watch not to "overwrite" $translate
-            }
-	}
-	
-	$result .= " $key=$quote$string$quote";
-    }
-    return $result;
-}
-
-# Returns a translatable string from XML node, it works on contents of every node in XML::Parser tree
-sub getXMLstring
-{
-    my $ref = shift;
-    my $spacepreserve = shift || 0;
-    my @list = @{ $ref };
-    my $result = "";
-
-    my $count = scalar(@list);
-    my $attrs = $list[0];
-    my $index = 1;
-
-    $spacepreserve = 1 if ((exists $attrs->{"xml:space"}) && ($attrs->{"xml:space"} =~ /^["']?preserve["']?$/));
-    $spacepreserve = 0 if ((exists $attrs->{"xml:space"}) && ($attrs->{"xml:space"} =~ /^["']?default["']?$/));
-
-    while ($index < $count) {
-	my $type = $list[$index];
-	my $content = $list[$index+1];
-        if (! $type ) {
-	    # We've got CDATA
-	    if ($content) {
-		# lets strip the whitespace here, and *ONLY* here
-                $content =~ s/\s+/ /gs if (!$spacepreserve);
-		$result .= $content;
-	    }
-	} elsif ( "$type" ne "1" ) {
-	    # We've got another element
-	    $result .= "<$type";
-	    $result .= getAttributeString(@{$content}[0], 0); # no nested translatable elements
-	    if ($content) {
-		my $subresult = getXMLstring($content, $spacepreserve);
-		if ($subresult) {
-		    $result .= ">".$subresult . "</$type>";
-		} else {
-		    $result .= "/>";
-		}
-	    } else {
-		$result .= "/>";
-	    }
-	}
-	$index += 2;
-    }
-    return $result;
-}
-
-# Translate list of nodes if necessary
-sub translate_subnodes
-{
-    my $fh = shift;
-    my $content = shift;
-    my $language = shift || "";
-    my $singlelang = shift || 0;
-    my $spacepreserve = shift || 0;
-
-    my @nodes = @{ $content };
-
-    my $count = scalar(@nodes);
-    my $index = 0;
-    while ($index < $count) {
-        my $type = $nodes[$index];
-        my $rest = $nodes[$index+1];
-        if ($singlelang) {
-            my $oldMO = $MULTIPLE_OUTPUT;
-            $MULTIPLE_OUTPUT = 1;
-            traverse($fh, $type, $rest, $language, $spacepreserve);
-            $MULTIPLE_OUTPUT = $oldMO;
-        } else {
-            traverse($fh, $type, $rest, $language, $spacepreserve);
-        }
-        $index += 2;
-    }
-}
-
-sub isWellFormedXmlFragment
-{
-    my $ret = eval 'require XML::Parser';
-    if(!$ret) {
-        die "You must have XML::Parser installed to run $0\n\n";
-    } 
-
-    my $fragment = shift;
-    return 0 if (!$fragment);
-
-    $fragment = "<root>$fragment</root>";
-    my $xp = new XML::Parser(Style => 'Tree');
-    my $tree = 0;
-    eval { $tree = $xp->parse($fragment); };
-    return $tree;
-}
-
-sub traverse
-{
-    my $fh = shift; 
-    my $nodename = shift;
-    my $content = shift;
-    my $language = shift || "";
-    my $spacepreserve = shift || 0;
-
-    if (!$nodename) {
-	if ($content =~ /^[\s]*$/) {
-	    $leading_space .= $content;
-	}
-	print $fh $content;
-    } else {
-	# element
-	my @all = @{ $content };
-	my $attrs = shift @all;
-	my $translate = 0;
-	my $outattr = getAttributeString($attrs, 1, $language, \$translate);
-
-	if ($nodename =~ /^_/) {
-	    $translate = 1;
-	    $nodename =~ s/^_//;
-	}
-	my $lookup = '';
-
-        $spacepreserve = 0 if ((exists $attrs->{"xml:space"}) && ($attrs->{"xml:space"} =~ /^["']?default["']?$/));
-        $spacepreserve = 1 if ((exists $attrs->{"xml:space"}) && ($attrs->{"xml:space"} =~ /^["']?preserve["']?$/));
-
-	print $fh "<$nodename", $outattr;
-	if ($translate) {
-	    $lookup = getXMLstring($content, $spacepreserve);
-            if (!$spacepreserve) {
-                $lookup =~ s/^\s+//s;
-                $lookup =~ s/\s+$//s;
-            }
-
-	    if ($lookup || $translate == 2) {
-                my $translation = $translations{$language, $lookup} if isWellFormedXmlFragment($translations{$language, $lookup});
-                if ($MULTIPLE_OUTPUT && ($translation || $translate == 2)) {
-                    $translation = $lookup if (!$translation);
-                    print $fh " xml:lang=\"", $language, "\"" if $language;
-                    print $fh ">";
-                    if ($translate == 2) {
-                        translate_subnodes($fh, \@all, $language, 1, $spacepreserve);
-                    } else {
-                        print $fh $translation;
-                    }
-                    print $fh "</$nodename>";
-
-                    return; # this means there will be no same translation with xml:lang="$language"...
-                            # if we want them both, just remove this "return"
-                } else {
-                    print $fh ">";
-                    if ($translate == 2) {
-                        translate_subnodes($fh, \@all, $language, 1, $spacepreserve);
-                    } else {
-                        print $fh $lookup;
-                    }
-                    print $fh "</$nodename>";
-                }
-	    } else {
-		print $fh "/>";
-	    }
-
-	    for my $lang (sort keys %po_files_by_lang) {
-                    if ($MULTIPLE_OUTPUT && $lang ne "$language") {
-                        next;
-                    }
-		    if ($lang) {
-                        # Handle translation
-                        #
-                        my $translate = 0;
-                        my $localattrs = getAttributeString($attrs, 1, $lang, \$translate);
-                        my $translation = $translations{$lang, $lookup} if isWellFormedXmlFragment($translations{$lang, $lookup});
-                        if ($translate && !$translation) {
-                            $translation = $lookup;
-                        }
-
-                        if ($translation || $translate) {
-			    print $fh "\n";
-			    $leading_space =~ s/.*\n//g;
-			    print $fh $leading_space;
- 			    print $fh "<", $nodename, " xml:lang=\"", $lang, "\"", $localattrs, ">";
-                            if ($translate == 2) {
-                               translate_subnodes($fh, \@all, $lang, 1, $spacepreserve);
-                            } else {
-                                print $fh $translation;
-                            }
-                            print $fh "</$nodename>";
-			}
-                    }
-	    }
-
-	} else {
-	    my $count = scalar(@all);
-	    if ($count > 0) {
-		print $fh ">";
-                my $index = 0;
-                while ($index < $count) {
-                    my $type = $all[$index];
-                    my $rest = $all[$index+1];
-                    traverse($fh, $type, $rest, $language, $spacepreserve);
-                    $index += 2;
-                }
-		print $fh "</$nodename>";
-	    } else {
-		print $fh "/>";
-	    }
-	}
-    }
-}
-
-sub intltool_tree_comment
-{
-    my $expat = shift;
-    my $data  = shift;
-    my $clist = $expat->{Curlist};
-    my $pos   = $#$clist;
-
-    push @$clist, 1 => $data;
-}
-
-sub intltool_tree_cdatastart
-{
-    my $expat    = shift;
-    my $clist = $expat->{Curlist};
-    my $pos   = $#$clist;
-
-    push @$clist, 0 => $expat->original_string();
-}
-
-sub intltool_tree_cdataend
-{
-    my $expat    = shift;
-    my $clist = $expat->{Curlist};
-    my $pos   = $#$clist;
-
-    $clist->[$pos] .= $expat->original_string();
-}
-
-sub intltool_tree_char
-{
-    my $expat = shift;
-    my $text  = shift;
-    my $clist = $expat->{Curlist};
-    my $pos   = $#$clist;
-
-    # Use original_string so that we retain escaped entities
-    # in CDATA sections.
-    #
-    if ($pos > 0 and $clist->[$pos - 1] eq '0') {
-        $clist->[$pos] .= $expat->original_string();
-    } else {
-        push @$clist, 0 => $expat->original_string();
-    }
-}
-
-sub intltool_tree_start
-{
-    my $expat    = shift;
-    my $tag      = shift;
-    my @origlist = ();
-
-    # Use original_string so that we retain escaped entities
-    # in attribute values.  We must convert the string to an
-    # @origlist array to conform to the structure of the Tree
-    # Style.
-    #
-    my @original_array = split /\x/, $expat->original_string();
-    my $source         = $expat->original_string();
-
-    # Remove leading tag.
-    #
-    $source =~ s|^\s*<\s*(\S+)||s;
-
-    # Grab attribute key/value pairs and push onto @origlist array.
-    #
-    while ($source)
-    {
-       if ($source =~ /^\s*([\w:-]+)\s*[=]\s*["]/)
-       {
-           $source =~ s|^\s*([\w:-]+)\s*[=]\s*["]([^"]*)["]||s;
-           push @origlist, $1;
-           push @origlist, '"' . $2 . '"';
-       }
-       elsif ($source =~ /^\s*([\w:-]+)\s*[=]\s*[']/)
-       {
-           $source =~ s|^\s*([\w:-]+)\s*[=]\s*[']([^']*)[']||s;
-           push @origlist, $1;
-           push @origlist, "'" . $2 . "'";
-       }
-       else
-       {
-           last;
-       }
-    }
-
-    my $ol = [ { @origlist } ];
-
-    push @{ $expat->{Lists} }, $expat->{Curlist};
-    push @{ $expat->{Curlist} }, $tag => $ol;
-    $expat->{Curlist} = $ol;
-}
-
-sub readXml
-{
-    my $filename = shift || return;
-    if(!-f $filename) {
-        die "ERROR Cannot find filename: $filename\n";
-    }
-
-    my $ret = eval 'require XML::Parser';
-    if(!$ret) {
-        die "You must have XML::Parser installed to run $0\n\n";
-    } 
-    my $xp = new XML::Parser(Style => 'Tree');
-    $xp->setHandlers(Char => \&intltool_tree_char);
-    $xp->setHandlers(Start => \&intltool_tree_start);
-    $xp->setHandlers(CdataStart => \&intltool_tree_cdatastart);
-    $xp->setHandlers(CdataEnd => \&intltool_tree_cdataend);
-    my $tree = $xp->parsefile($filename);
-
-# <foo><head id="a">Hello <em>there</em></head><bar>Howdy<ref/></bar>do</foo>
-# would be:
-# [foo, [{}, head, [{id => "a"}, 0, "Hello ",  em, [{}, 0, "there"]], bar, [{},
-# 0, "Howdy",  ref, [{}]], 0, "do" ] ]
-
-    return $tree;
-}
-
-sub print_header
-{
-    my $infile = shift;
-    my $fh = shift;
-    my $source;
-
-    if(!-f $infile) {
-        die "ERROR Cannot find filename: $infile\n";
-    }
-
-    print $fh qq{<?xml version="1.0" encoding="UTF-8"?>\n};
-    {
-        local $/;
-        open DOCINPUT, "<${FILE}" or die;
-        $source = <DOCINPUT>;
-        close DOCINPUT;
-    }
-    if ($source =~ /(<!DOCTYPE.*\[.*\]\s*>)/s)
-    {
-        print $fh "$1\n";
-    }
-    elsif ($source =~ /(<!DOCTYPE[^>]*>)/s)
-    {
-        print $fh "$1\n";
-    }
-}
-
-sub parseTree
-{
-    my $fh        = shift;
-    my $ref       = shift;
-    my $language  = shift || "";
-
-    my $name = shift @{ $ref };
-    my $cont = shift @{ $ref };
-    
-    while (!$name || "$name" eq "1") {
-        $name = shift @{ $ref };
-        $cont = shift @{ $ref };
-    }
-
-    my $spacepreserve = 0;
-    my $attrs = @{$cont}[0];
-    $spacepreserve = 1 if ((exists $attrs->{"xml:space"}) && ($attrs->{"xml:space"} =~ /^["']?preserve["']?$/));
-
-    traverse($fh, $name, $cont, $language, $spacepreserve);
-}
-
-sub xml_merge_output
-{
-    my $source;
-
-    if ($MULTIPLE_OUTPUT) {
-        for my $lang (sort keys %po_files_by_lang) {
-	    if ( ! -d $lang ) {
-	        mkdir $lang or -d $lang or die "Cannot create subdirectory $lang: $!\n";
-            }
-            open OUTPUT, ">$lang/$OUTFILE" or die "Cannot open $lang/$OUTFILE: $!\n";
-            binmode (OUTPUT) if $^O eq 'MSWin32';
-            my $tree = readXml($FILE);
-            print_header($FILE, \*OUTPUT);
-            parseTree(\*OUTPUT, $tree, $lang);
-            close OUTPUT;
-            print "CREATED $lang/$OUTFILE\n" unless $QUIET_ARG;
-        }
-    } 
-    open OUTPUT, ">$OUTFILE" or die "Cannot open $OUTFILE: $!\n";
-    binmode (OUTPUT) if $^O eq 'MSWin32';
-    my $tree = readXml($FILE);
-    print_header($FILE, \*OUTPUT);
-    parseTree(\*OUTPUT, $tree);
-    close OUTPUT;
-    print "CREATED $OUTFILE\n" unless $QUIET_ARG;
-}
-
-sub keys_merge_translations
-{
-    open INPUT, "<${FILE}" or die;
-    open OUTPUT, ">${OUTFILE}" or die;
-    binmode (OUTPUT) if $^O eq 'MSWin32';
-
-    while (<INPUT>) 
-    {
-        if (s/^(\s*)_(\w+=(.*))/$1$2/)  
-        {
-	    my $string = $3;
-
-            print OUTPUT;
-
-	    my $non_translated_line = $_;
-
-            for my $lang (sort keys %po_files_by_lang) 
-            {
-		my $translation = $translations{$lang, $string};
-                next if !$translation;
-
-                $_ = $non_translated_line;
-		s/(\w+)=.*/[$lang]$1=$translation/;
-                print OUTPUT;
-            }
-	} 
-        else 
-        {
-            print OUTPUT;
-        }
-    }
-
-    close OUTPUT;
-    close INPUT;
-}
-
-sub desktop_merge_translations
-{
-    open INPUT, "<${FILE}" or die;
-    open OUTPUT, ">${OUTFILE}" or die;
-    binmode (OUTPUT) if $^O eq 'MSWin32';
-
-    while (<INPUT>) 
-    {
-        if (s/^(\s*)_(\w+=(.*))/$1$2/)  
-        {
-	    my $string = $3;
-
-            print OUTPUT;
-
-	    my $non_translated_line = $_;
-
-            for my $lang (sort keys %po_files_by_lang) 
-            {
-                my $translation = $translations{$lang, $string};
-                next if !$translation;
-
-                $_ = $non_translated_line;
-                s/(\w+)=.*/${1}[$lang]=$translation/;
-                print OUTPUT;
-            }
-	} 
-        else 
-        {
-            print OUTPUT;
-        }
-    }
-
-    close OUTPUT;
-    close INPUT;
-}
-
-sub schemas_merge_translations
-{
-    my $source;
-
-    {
-       local $/; # slurp mode
-       open INPUT, "<$FILE" or die "can't open $FILE: $!";
-       $source = <INPUT>;
-       close INPUT;
-    }
-
-    open OUTPUT, ">$OUTFILE" or die;
-    binmode (OUTPUT) if $^O eq 'MSWin32';
-
-    # FIXME: support attribute translations
-
-    # Empty nodes never need translation, so unmark all of them.
-    # For example, <_foo/> is just replaced by <foo/>.
-    $source =~ s|<\s*_($w+)\s*/>|<$1/>|g;
-
-    while ($source =~ s/
-                        (.*?)
-                        (\s+)(<locale\ name="C">(\s*)
-                            (<default>\s*(?:<!--[^>]*?-->\s*)?(.*?)\s*<\/default>)?(\s*)
-                            (<short>\s*(?:<!--[^>]*?-->\s*)?(.*?)\s*<\/short>)?(\s*)
-                            (<long>\s*(?:<!--[^>]*?-->\s*)?(.*?)\s*<\/long>)?(\s*)
-                        <\/locale>)
-                       //sx) 
-    {
-        print OUTPUT $1;
-
-	my $locale_start_spaces = $2 ? $2 : '';
-	my $default_spaces = $4 ? $4 : '';
-	my $short_spaces = $7 ? $7 : '';
-	my $long_spaces = $10 ? $10 : '';
-	my $locale_end_spaces = $13 ? $13 : '';
-	my $c_default_block = $3 ? $3 : '';
-	my $default_string = $6 ? $6 : '';
-	my $short_string = $9 ? $9 : '';
-	my $long_string = $12 ? $12 : '';
-
-	print OUTPUT "$locale_start_spaces$c_default_block";
-
-        $default_string =~ s/\s+/ /g;
-        $default_string = entity_decode($default_string);
-	$short_string =~ s/\s+/ /g;
-	$short_string = entity_decode($short_string);
-	$long_string =~ s/\s+/ /g;
-	$long_string = entity_decode($long_string);
-
-	for my $lang (sort keys %po_files_by_lang) 
-        {
-	    my $default_translation = $translations{$lang, $default_string};
-	    my $short_translation = $translations{$lang, $short_string};
-	    my $long_translation  = $translations{$lang, $long_string};
-
-	    next if (!$default_translation && !$short_translation && 
-                     !$long_translation);
-
-	    print OUTPUT "\n$locale_start_spaces<locale name=\"$lang\">";
-
-        print OUTPUT "$default_spaces";    
-
-        if ($default_translation)
-        {
-            $default_translation = entity_encode($default_translation);
-            print OUTPUT "<default>$default_translation</default>";
-        }
-
-	    print OUTPUT "$short_spaces";
-
-	    if ($short_translation)
-	    {
-			$short_translation = entity_encode($short_translation);
-			print OUTPUT "<short>$short_translation</short>";
-	    }
-
-	    print OUTPUT "$long_spaces";
-
-	    if ($long_translation)
-	    {
-			$long_translation = entity_encode($long_translation);
-			print OUTPUT "<long>$long_translation</long>";
-	    }	    
-
-	    print OUTPUT "$locale_end_spaces</locale>";
-        }
-    }
-
-    print OUTPUT $source;
-
-    close OUTPUT;
-}
-
-sub rfc822deb_merge_translations
-{
-    my %encodings = ();
-    for my $lang (keys %po_files_by_lang) {
-        $encodings{$lang} = ($UTF8_ARG ? 'UTF-8' : get_po_encoding($po_files_by_lang{$lang}));
-    }
-
-    my $source;
-
-    $Text::Wrap::huge = 'overflow';
-    $Text::Wrap::break = qr/\n|\s(?=\S)/;
-
-    {
-       local $/; # slurp mode
-       open INPUT, "<$FILE" or die "can't open $FILE: $!";
-       $source = <INPUT>;
-       close INPUT;
-    }
-
-    open OUTPUT, ">${OUTFILE}" or die;
-    binmode (OUTPUT) if $^O eq 'MSWin32';
-
-    while ($source =~ /(^|\n+)(_*)([^:\s]+)(:[ \t]*)(.*?)(?=\n[\S\n]|$)/sg)
-    {
-	    my $sep = $1;
-	    my $non_translated_line = $3.$4;
-	    my $string = $5;
-	    my $underscore = length($2);
-	    next if $underscore eq 0 && $non_translated_line =~ /^#/;
-	    #  Remove [] dummy strings
-	    my $stripped = $string;
-	    $stripped =~ s/\[\s[^\[\]]*\],/,/g if $underscore eq 2;
-	    $stripped =~ s/\[\s[^\[\]]*\]$//;
-	    $non_translated_line .= $stripped;
-
-	    print OUTPUT $sep.$non_translated_line;
-    
-	    if ($underscore) 
-	    {
-	        my @str_list = rfc822deb_split($underscore, $string);
-
-	        for my $lang (sort keys %po_files_by_lang) 
-                {
-                    my $is_translated = 1;
-                    my $str_translated = '';
-                    my $first = 1;
-                
-                    for my $str (@str_list) 
-                    {
-                        my $translation = $translations{$lang, $str};
-                    
-                        if (!$translation) 
-                        {
-                            $is_translated = 0;
-                            last;
-                        }
-
-	                #  $translation may also contain [] dummy
-                        #  strings, mostly to indicate an empty string
-	                $translation =~ s/\[\s[^\[\]]*\]$//;
-                        
-                        if ($first) 
-                        {
-                            if ($underscore eq 2)
-                            {
-                                $str_translated .= $translation;
-                            }
-                            else
-                            {
-                                $str_translated .=
-                                    Text::Tabs::expand($translation) .
-                                    "\n";
-                            }
-                        } 
-                        else 
-                        {
-                            if ($underscore eq 2)
-                            {
-                                $str_translated .= ', ' . $translation;
-                            }
-                            else
-                            {
-                                $str_translated .= Text::Tabs::expand(
-                                    Text::Wrap::wrap(' ', ' ', $translation)) .
-                                    "\n .\n";
-                            }
-                        }
-                        $first = 0;
-
-                        #  To fix some problems with Text::Wrap::wrap
-                        $str_translated =~ s/(\n )+\n/\n .\n/g;
-                    }
-                    next unless $is_translated;
-
-                    $str_translated =~ s/\n \.\n$//;
-                    $str_translated =~ s/\s+$//;
-
-                    $_ = $non_translated_line;
-                    s/^(\w+):\s*.*/$sep${1}-$lang.$encodings{$lang}: $str_translated/s;
-                    print OUTPUT;
-                }
-	    }
-    }
-    print OUTPUT "\n";
-
-    close OUTPUT;
-    close INPUT;
-}
-
-sub rfc822deb_split 
-{
-    # Debian defines a special way to deal with rfc822-style files:
-    # when a value contain newlines, it consists of
-    #   1.  a short form (first line)
-    #   2.  a long description, all lines begin with a space,
-    #       and paragraphs are separated by a single dot on a line
-    # This routine returns an array of all paragraphs, and reformat
-    # them.
-    # When first argument is 2, the string is a comma separated list of
-    # values.
-    my $type = shift;
-    my $text = shift;
-    $text =~ s/^[ \t]//mg;
-    return (split(/, */, $text, 0)) if $type ne 1;
-    return ($text) if $text !~ /\n/;
-
-    $text =~ s/([^\n]*)\n//;
-    my @list = ($1);
-    my $str = '';
-
-    for my $line (split (/\n/, $text)) 
-    {
-        chomp $line;
-        if ($line =~ /^\.\s*$/)
-        {
-            #  New paragraph
-            $str =~ s/\s*$//;
-            push(@list, $str);
-            $str = '';
-        } 
-        elsif ($line =~ /^\s/) 
-        {
-            #  Line which must not be reformatted
-            $str .= "\n" if length ($str) && $str !~ /\n$/;
-            $line =~ s/\s+$//;
-            $str .= $line."\n";
-        } 
-        else 
-        {
-            #  Continuation line, remove newline
-            $str .= " " if length ($str) && $str !~ /\n$/;
-            $str .= $line;
-        }
-    }
-
-    $str =~ s/\s*$//;
-    push(@list, $str) if length ($str);
-
-    return @list;
-}
-
-sub quoted_translation
-{
-    my ($lang, $string) = @_;
-
-    $string =~ s/\\\"/\"/g;
-
-    my $translation = $translations{$lang, $string};
-    $translation = $string if !$translation;
-
-    $translation =~ s/\"/\\\"/g;
-    return $translation
-}
-
-sub quoted_merge_translations
-{
-    if (!$MULTIPLE_OUTPUT) {
-        print "Quoted only supports Multiple Output.\n";
-        exit(1);
-    }
-
-    for my $lang (sort keys %po_files_by_lang) {
-        if ( ! -d $lang ) {
-            mkdir $lang or -d $lang or die "Cannot create subdirectory $lang: $!\n";
-        }
-        open INPUT, "<${FILE}" or die;
-        open OUTPUT, ">$lang/$OUTFILE" or die "Cannot open $lang/$OUTFILE: $!\n";
-        binmode (OUTPUT) if $^O eq 'MSWin32';
-        while (<INPUT>) 
-        {
-            s/\"(([^\"]|\\\")*[^\\\"])\"/"\"" . &quoted_translation($lang, $1) . "\""/ge;
-            print OUTPUT;
-        }
-        close OUTPUT;
-        close INPUT;
-    }
-}
diff --git a/intltool-update.in b/intltool-update.in
index 78fa869..e69de29 100644
--- a/intltool-update.in
+++ b/intltool-update.in
@@ -1,1098 +0,0 @@
-#!@INTLTOOL_PERL@ -w
-# -*- Mode: perl; indent-tabs-mode: nil; c-basic-offset: 4  -*-
-
-#
-#  The Intltool Message Updater
-#
-#  Copyright (C) 2000-2003 Free Software Foundation.
-#
-#  Intltool is free software; you can redistribute it and/or
-#  modify it under the terms of the GNU General Public License 
-#  version 2 published by the Free Software Foundation.
-#
-#  Intltool 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., 675 Mass Ave, Cambridge, MA 02139, 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.
-#
-#  Authors: Kenneth Christiansen <kenneth@gnu.org>
-#           Maciej Stachowiak
-#           Darin Adler <darin@bentspoon.com>
-
-## Release information
-my $PROGRAM = "intltool-update";
-my $VERSION = "0.35.5";
-my $PACKAGE = "intltool";
-
-## Loaded modules
-use strict;
-use Getopt::Long;
-use Cwd;
-use File::Copy;
-use File::Find;
-
-## Scalars used by the option stuff
-my $HELP_ARG 	   = 0;
-my $VERSION_ARG    = 0;
-my $DIST_ARG	   = 0;
-my $POT_ARG	   = 0;
-my $HEADERS_ARG    = 0;
-my $MAINTAIN_ARG   = 0;
-my $REPORT_ARG     = 0;
-my $VERBOSE	   = 0;
-my $GETTEXT_PACKAGE = "";
-my $OUTPUT_FILE    = "";
-
-my @languages;
-my %varhash = ();
-my %po_files_by_lang = ();
-
-# Regular expressions to categorize file types.
-# FIXME: Please check if the following is correct
-
-my $xml_support =
-"xml(?:\\.in)*|".	# http://www.w3.org/XML/ (Note: .in is not required)
-"ui|".			# Bonobo specific - User Interface desc. files
-"lang|".		# ?
-"glade2?(?:\\.in)*|".	# Glade specific - User Interface desc. files (Note: .in is not required)
-"scm(?:\\.in)*|".	# ? (Note: .in is not required)
-"oaf(?:\\.in)+|".	# DEPRECATED: Replaces by Bonobo .server files 
-"etspec|".		# ?
-"server(?:\\.in)+|".	# Bonobo specific
-"sheet(?:\\.in)+|".	# ?
-"schemas(?:\\.in)+|".	# GConf specific
-"pong(?:\\.in)+|".	# DEPRECATED: PONG is not used [by GNOME] any longer.
-"kbd(?:\\.in)+";	# GOK specific. 
-
-my $ini_support =
-"icon(?:\\.in)+|".	# http://www.freedesktop.org/Standards/icon-theme-spec
-"desktop(?:\\.in)+|".	# http://www.freedesktop.org/Standards/menu-spec
-"caves(?:\\.in)+|".	# GNOME Games specific
-"directory(?:\\.in)+|".	# http://www.freedesktop.org/Standards/menu-spec
-"soundlist(?:\\.in)+|".	# GNOME specific
-"keys(?:\\.in)+|".	# GNOME Mime database specific
-"theme(?:\\.in)+|".	# http://www.freedesktop.org/Standards/icon-theme-spec
-"service(?:\\.in)+";    # DBus specific
-
-my $buildin_gettext_support = 
-"c|y|cs|cc|cpp|c\\+\\+|h|hh|gob|py";
-
-## Always flush buffer when printing
-$| = 1;
-
-## Sometimes the source tree will be rooted somewhere else.
-my $SRCDIR = $ENV{"srcdir"} || ".";
-my $POTFILES_in;
-
-$POTFILES_in = "<$SRCDIR/POTFILES.in";
-
-my $devnull = ($^O eq 'MSWin32' ? 'NUL:' : '/dev/null');
-
-## Handle options
-GetOptions 
-(
- "help" 	       => \$HELP_ARG,
- "version" 	       => \$VERSION_ARG,
- "dist|d"	       => \$DIST_ARG,
- "pot|p"	       => \$POT_ARG,
- "headers|s"	       => \$HEADERS_ARG,
- "maintain|m"	       => \$MAINTAIN_ARG,
- "report|r"	       => \$REPORT_ARG,
- "verbose|x"	       => \$VERBOSE,
- "gettext-package|g=s" => \$GETTEXT_PACKAGE,
- "output-file|o=s"     => \$OUTPUT_FILE,
- ) or &Console_WriteError_InvalidOption;
-
-&Console_Write_IntltoolHelp if $HELP_ARG;
-&Console_Write_IntltoolVersion if $VERSION_ARG;
-
-my $arg_count = ($DIST_ARG > 0)
-    + ($POT_ARG > 0)
-    + ($HEADERS_ARG > 0)
-    + ($MAINTAIN_ARG > 0)
-    + ($REPORT_ARG > 0);
-
-&Console_Write_IntltoolHelp if $arg_count > 1;
-
-my $PKGNAME = FindPackageName ();
-
-# --version and --help don't require a module name
-my $MODULE = $GETTEXT_PACKAGE || $PKGNAME || "unknown";
-
-if ($POT_ARG)
-{
-    &GenerateHeaders;
-    &GeneratePOTemplate;
-}
-elsif ($HEADERS_ARG)
-{
-    &GenerateHeaders;
-}
-elsif ($MAINTAIN_ARG)
-{
-    &FindLeftoutFiles;
-}
-elsif ($REPORT_ARG)
-{
-    &GenerateHeaders;
-    &GeneratePOTemplate;
-    &Console_Write_CoverageReport;
-}
-elsif ((defined $ARGV[0]) && $ARGV[0] =~ /^[a-z]/)
-{
-    my $lang = $ARGV[0];
-
-    ## Report error if the language file supplied
-    ## to the command line is non-existent
-    &Console_WriteError_NotExisting("$SRCDIR/$lang.po")
-        if ! -s "$SRCDIR/$lang.po";
-
-    if (!$DIST_ARG)
-    {
-	print "Working, please wait..." if $VERBOSE;
-	&GenerateHeaders;
-	&GeneratePOTemplate;
-    }
-    &POFile_Update ($lang, $OUTPUT_FILE);
-    &Console_Write_TranslationStatus ($lang, $OUTPUT_FILE);
-} 
-else 
-{
-    &Console_Write_IntltoolHelp;
-}
-
-exit;
-
-#########
-
-sub Console_Write_IntltoolVersion
-{
-    print <<_EOF_;
-${PROGRAM} (${PACKAGE}) $VERSION
-Written by Kenneth Christiansen, Maciej Stachowiak, and Darin Adler.
-
-Copyright (C) 2000-2003 Free Software Foundation, Inc.
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-_EOF_
-    exit;
-}
-
-sub Console_Write_IntltoolHelp
-{
-    print <<_EOF_;
-Usage: ${PROGRAM} [OPTION]... LANGCODE
-Updates PO template files and merge them with the translations.
-
-Mode of operation (only one is allowed):
-  -p, --pot                   generate the PO template only
-  -s, --headers               generate the header files in POTFILES.in
-  -m, --maintain              search for left out files from POTFILES.in
-  -r, --report                display a status report for the module
-  -d, --dist                  merge LANGCODE.po with existing PO template
-
-Extra options:
-  -g, --gettext-package=NAME  override PO template name, useful with --pot
-  -o, --output-file=FILE      write merged translation to FILE
-  -x, --verbose               display lots of feedback
-      --help                  display this help and exit
-      --version               output version information and exit
-
-Examples of use:
-${PROGRAM} --pot    just create a new PO template
-${PROGRAM} xy       create new PO template and merge xy.po with it
-
-Report bugs to http://bugzilla.gnome.org/ (product name "$PACKAGE")
-or send email to <xml-i18n-tools\@gnome.org>.
-_EOF_
-    exit;
-}
-
-sub echo_n
-{
-    my $str = shift;
-    my $ret = `echo "$str"`;
-
-    $ret =~ s/\n$//; # do we need the "s" flag?
-
-    return $ret;
-}
-
-sub POFile_DetermineType ($) 
-{
-   my $type = $_;
-   my $gettext_type;
-
-   my $xml_regex     = "(?:" . $xml_support . ")";
-   my $ini_regex     = "(?:" . $ini_support . ")";
-   my $buildin_regex = "(?:" . $buildin_gettext_support . ")";
-
-   if ($type =~ /\[type: gettext\/([^\]].*)]/) 
-   {
-	$gettext_type=$1;
-   }
-   elsif ($type =~ /schemas(\.in)+$/) 
-   {
-	$gettext_type="schemas";
-   }
-   elsif ($type =~ /glade2?(\.in)*$/) 
-   {
-       $gettext_type="glade";
-   }
-   elsif ($type =~ /scm(\.in)*$/) 
-   {
-       $gettext_type="scheme";
-   }
-   elsif ($type =~ /keys(\.in)+$/) 
-   {
-       $gettext_type="keys";
-   }
-
-   # bucket types
-
-   elsif ($type =~ /$xml_regex$/) 
-   {
-       $gettext_type="xml";
-   }
-   elsif ($type =~ /$ini_regex$/) 
-   { 
-       $gettext_type="ini";
-   }
-   elsif ($type =~ /$buildin_regex$/) 
-   {
-       $gettext_type="buildin";
-   }
-   else
-   { 
-       $gettext_type="unknown"; 
-   }
-
-   return "gettext\/$gettext_type";
-}
-
-sub TextFile_DetermineEncoding ($) 
-{
-    my $gettext_code="ASCII"; # All files are ASCII by default
-    my $filetype=`file $_ | cut -d ' ' -f 2`;
-
-    if ($? eq "0")
-    {
-	if ($filetype =~ /^(ISO|UTF)/)
-	{
-	    chomp ($gettext_code = $filetype);
-	}
-	elsif ($filetype =~ /^XML/)
-	{
-	    $gettext_code="UTF-8"; # We asume that .glade and other .xml files are UTF-8
-	}
-    }
-
-    return $gettext_code;
-}
-
-sub isNotValidMissing
-{
-    my ($file) = @_;
-
-    return if $file =~ /^\{arch\}\/.*$/;
-    return if $file =~ /^$varhash{"PACKAGE"}-$varhash{"VERSION"}\/.*$/;
-}
-
-sub FindLeftoutFiles
-{
-    my (@buf_i18n_plain,
-	@buf_i18n_xml,
-	@buf_i18n_xml_unmarked,
-	@buf_i18n_ini,
-	@buf_potfiles,
-	@buf_potfiles_ignore,
-	@buf_allfiles,
-	@buf_allfiles_sorted,
-	@buf_potfiles_sorted,
-        @buf_potfiles_ignore_sorted
-    );
-
-    ## Search and find all translatable files
-    find sub { 
-	push @buf_i18n_plain,        "$File::Find::name" if /\.($buildin_gettext_support)$/;
-	push @buf_i18n_xml,          "$File::Find::name" if /\.($xml_support)$/;
-	push @buf_i18n_ini,          "$File::Find::name" if /\.($ini_support)$/;
-	push @buf_i18n_xml_unmarked, "$File::Find::name" if /\.(schemas(\.in)+)$/;
-	}, "..";
-
-
-    open POTFILES, $POTFILES_in or die "$PROGRAM:  there's no POTFILES.in!\n";
-    @buf_potfiles = grep !/^(#|\s*$)/, <POTFILES>;
-    close POTFILES;
-
-    foreach (@buf_potfiles) {
-	s/^\[.*]\s*//;
-    }
-
-    print "Searching for missing translatable files...\n" if $VERBOSE;
-
-    ## Check if we should ignore some found files, when
-    ## comparing with POTFILES.in
-    foreach my $ignore ("POTFILES.skip", "POTFILES.ignore")
-    {
-	(-s "$SRCDIR/$ignore") or next;
-
-	if ("$ignore" eq "POTFILES.ignore")
-	{
-	    print "The usage of POTFILES.ignore is deprecated. Please consider moving the\n".
-		  "content of this file to POTFILES.skip.\n";
-	}
-
-	print "Found $ignore: Ignoring files...\n" if $VERBOSE;
-	open FILE, "<$SRCDIR/$ignore" or die "ERROR: Failed to open $SRCDIR/$ignore!\n";
-	    
-	while (<FILE>)
-	{
-	    push @buf_potfiles_ignore, $_ unless /^(#|\s*$)/;
-	}
-	close FILE;
-
-	@buf_potfiles_ignore_sorted = sort (@buf_potfiles_ignore);
-    }
-
-    foreach my $file (@buf_i18n_plain)
-    {
-	my $in_comment = 0;
-	my $in_macro = 0;
-
-	open FILE, "<$file";
-	while (<FILE>)
-	{
-	    # Handle continued multi-line comment.
-	    if ($in_comment)
-	    {
-		next unless s-.*\*/--;
-		$in_comment = 0;
-	    }
-
-	    # Handle continued macro.
-	    if ($in_macro)
-	    {
-		$in_macro = 0 unless /\\$/;
-		next;
-	    }
-
-	    # Handle start of macro (or any preprocessor directive).
-	    if (/^\s*\#/)
-	    {
-		$in_macro = 1 if /^([^\\]|\\.)*\\$/;
-		next;
-	    }
-
-	    # Handle comments and quoted text.
-	    while (m-(/\*|//|\'|\")-) # \' and \" keep emacs perl mode happy
-	    {
-		my $match = $1;
-		if ($match eq "/*")
-		{
-		    if (!s-/\*.*?\*/--)
-		    {
-			s-/\*.*--;
-			$in_comment = 1;
-		    }
-		}
-		elsif ($match eq "//")
-		{
-		    s-//.*--;
-		}
-		else # ' or "
-		{
-		    if (!s-$match([^\\]|\\.)*?$match-QUOTEDTEXT-)
-		    {
-			warn "mismatched quotes at line $. in $file\n";
-			s-$match.*--;
-		    }
-		}
-	    }	    
-
-	    if (/\w\.GetString *\(QUOTEDTEXT/)
-	    {
-                if (defined isNotValidMissing (unpack("x3 A*", $file))) {
-                    ## Remove the first 3 chars and add newline
-                    push @buf_allfiles, unpack("x3 A*", $file) . "\n";
-                }
-		last;
-	    }
-
-            ## N_ Q_ and _ are the three macros defined in gi8n.h
-	    if (/[NQ]?_ *\(QUOTEDTEXT/)
-	    {
-                if (defined isNotValidMissing (unpack("x3 A*", $file))) {
-                    ## Remove the first 3 chars and add newline
-                    push @buf_allfiles, unpack("x3 A*", $file) . "\n";
-                }
-		last;
-	    }
-	}
-	close FILE;
-    }
-
-    foreach my $file (@buf_i18n_xml) 
-    {
-	open FILE, "<$file";
-	
-	while (<FILE>) 
-	{
-	    # FIXME: share the pattern matching code with intltool-extract
-	    if (/\s_[-A-Za-z0-9._:]+\s*=\s*\"([^"]+)\"/ || /<_[^>]+>/ || /translatable=\"yes\"/)
-	    {
-                if (defined isNotValidMissing (unpack("x3 A*", $file))) {
-                    push @buf_allfiles, unpack("x3 A*", $file) . "\n";
-                }
-		last;
-	    }
-	}
-	close FILE;
-    }
-
-    foreach my $file (@buf_i18n_ini)
-    {
-	open FILE, "<$file";
-	while (<FILE>) 
-	{
-	    if (/_(.*)=/)
-	    {
-                if (defined isNotValidMissing (unpack("x3 A*", $file))) {
-                    push @buf_allfiles, unpack("x3 A*", $file) . "\n";
-                }
-		last;
-	    }
-	}
-	close FILE;
-    }
-
-    foreach my $file (@buf_i18n_xml_unmarked)
-    {
-        if (defined isNotValidMissing (unpack("x3 A*", $file))) {
-            push @buf_allfiles, unpack("x3 A*", $file) . "\n";
-        }
-    }
-
-
-    @buf_allfiles_sorted = sort (@buf_allfiles);
-    @buf_potfiles_sorted = sort (@buf_potfiles);
-
-    my %in2;
-    foreach (@buf_potfiles_sorted) 
-    {
-	$in2{$_} = 1;
-    }
-
-    foreach (@buf_potfiles_ignore_sorted) 
-    {
-	$in2{$_} = 1;
-    }
-
-    my @result;
-
-    foreach (@buf_allfiles_sorted)
-    {
-	if (!exists($in2{$_}))
-	{
-	    push @result, $_
-	}
-    }
-
-    my @buf_potfiles_notexist;
-
-    foreach (@buf_potfiles_sorted)
-    {
-	chomp (my $dummy = $_);
-	if ("$dummy" ne "" and !(-f "$SRCDIR/../$dummy" or -f "../$dummy"))
-	{
-	    push @buf_potfiles_notexist, $_;
-	}
-    }
-
-    ## Save file with information about the files missing
-    ## if any, and give information about this procedure.
-    if (@result + @buf_potfiles_notexist > 0)
-    {
-	if (@result) 
-	{
-	    print "\n" if $VERBOSE;
-	    unlink "missing";
-	    open OUT, ">missing";
-	    print OUT @result;
-	    close OUT;
-	    warn "\e[1mThe following files contain translations and are currently not in use. Please\e[0m\n".
-	         "\e[1mconsider adding these to the POTFILES.in file, located in the po/ directory.\e[0m\n\n";
-	    print STDERR @result, "\n";
-	    warn "If some of these files are left out on purpose then please add them to\n".
-		 "POTFILES.skip instead of POTFILES.in. A file \e[1m'missing'\e[0m containing this list\n".
-		 "of left out files has been written in the current directory.\n";
-	}
-	if (@buf_potfiles_notexist)
-	{
-	    unlink "notexist";
-	    open OUT, ">notexist";
-	    print OUT @buf_potfiles_notexist;
-	    close OUT;
-	    warn "\n" if ($VERBOSE or @result);
-	    warn "\e[1mThe following files do not exist anymore:\e[0m\n\n";
-	    warn @buf_potfiles_notexist, "\n";
-	    warn "Please remove them from POTFILES.in. A file \e[1m'notexist'\e[0m\n".
-		 "containing this list of absent files has been written in the current directory.\n";
-	}
-    }
-
-    ## If there is nothing to complain about, notify the user
-    else {
-	print "\nAll files containing translations are present in POTFILES.in.\n" if $VERBOSE;
-    }
-}
-
-sub Console_WriteError_InvalidOption
-{
-    ## Handle invalid arguments
-    print STDERR "Try `${PROGRAM} --help' for more information.\n";
-    exit 1;
-}
-
-sub isIntltoolExtractInPath
-{
-    my ($file) = @_;
-    # If either a file exists, or when run it returns 0 exit status
-    return 1 if ((-x $file) or (system("$file >/dev/null") == 0));
-    return 0;
-}
-
-sub GenerateHeaders
-{
-    my $EXTRACT = $ENV{"INTLTOOL_EXTRACT"} || "intltool-extract";
-
-    ## Generate the .h header files, so we can allow glade and
-    ## xml translation support
-    if (! isIntltoolExtractInPath("$EXTRACT"))
-    {
-	print STDERR "\n *** The intltool-extract script wasn't found!"
-	     ."\n *** Without it, intltool-update can not generate files.\n";
-	exit;
-    }
-    else
-    {
-	open (FILE, $POTFILES_in) or die "$PROGRAM: POTFILES.in not found.\n";
-	
-	while (<FILE>) 
-	{
-	   chomp;
-	   next if /^\[\s*encoding/;
-
-	   ## Find xml files in POTFILES.in and generate the
-	   ## files with help from the extract script
-
-	   my $gettext_type= &POFile_DetermineType ($1);
-
-	   if (/\.($xml_support|$ini_support)$/ || /^\[/)
-	   {
-	       s/^\[[^\[].*]\s*//;
-
-	       my $filename = "../$_";
-
-	       if ($VERBOSE)
-	       {
-		   system ($EXTRACT, "--update", "--srcdir=$SRCDIR",
-			   "--type=$gettext_type", $filename);
-	       } 
-	       else 
-	       {
-	 	   system ($EXTRACT, "--update", "--type=$gettext_type", 
-			   "--srcdir=$SRCDIR", "--quiet", $filename);
-	       }
-	   }
-       }
-       close FILE;
-   }
-}
-
-#
-# Generate .pot file from POTFILES.in
-#
-sub GeneratePOTemplate
-{
-    my $XGETTEXT = $ENV{"XGETTEXT"} || "@INTLTOOL_XGETTEXT@";
-    my $XGETTEXT_ARGS = $ENV{"XGETTEXT_ARGS"} || '';
-    chomp $XGETTEXT;
-
-    if (! -x $XGETTEXT)
-    {
-	print STDERR " *** xgettext is not found on this system!\n".
-		     " *** Without it, intltool-update can not extract strings.\n";
-	exit;
-    }
-
-    print "Building $MODULE.pot...\n" if $VERBOSE;
-
-    open INFILE, $POTFILES_in;
-    unlink "POTFILES.in.temp";
-    open OUTFILE, ">POTFILES.in.temp" or die("Cannot open POTFILES.in.temp for writing");
-
-    my $gettext_support_nonascii = 0;
-
-    # checks for GNU gettext >= 0.12
-    my $dummy = `$XGETTEXT --version --from-code=UTF-8 >$devnull 2>$devnull`;
-    if ($? == 0)
-    {
-	$gettext_support_nonascii = 1;
-    }
-    else
-    {
-	# urge everybody to upgrade gettext
-	print STDERR "WARNING: This version of gettext does not support extracting non-ASCII\n".
-		     "         strings. That means you should install a version of gettext\n".
-		     "         that supports non-ASCII strings (such as GNU gettext >= 0.12),\n".
-		     "         or have to let non-ASCII strings untranslated. (If there is any)\n";
-    }
-
-    my $encoding = "ASCII";
-    my $forced_gettext_code;
-    my @temp_headers;
-    my $encoding_problem_is_reported = 0;
-
-    while (<INFILE>) 
-    {
-	next if (/^#/ or /^\s*$/);
-
-	chomp;
-
-	my $gettext_code;
-
-	if (/^\[\s*encoding:\s*(.*)\s*\]/)
-	{
-	    $forced_gettext_code=$1;
-	}
-	elsif (/\.($xml_support|$ini_support)$/ || /^\[/)
-	{
-	    s/^\[.*]\s*//;
-            print OUTFILE "../$_.h\n";
-	    push @temp_headers, "../$_.h";
-	    $gettext_code = &TextFile_DetermineEncoding ("../$_.h") if ($gettext_support_nonascii and not defined $forced_gettext_code);
-	} 
-	else 
-	{
-            print OUTFILE "$SRCDIR/../$_\n";
-	    $gettext_code = &TextFile_DetermineEncoding ("$SRCDIR/../$_") if ($gettext_support_nonascii and not defined $forced_gettext_code);
-	}
-
-	next if (! $gettext_support_nonascii);
-
-	if (defined $forced_gettext_code)
-	{
-	    $encoding=$forced_gettext_code;
-	}
-	elsif (defined $gettext_code and "$encoding" ne "$gettext_code")
-	{
-	    if ($encoding eq "ASCII")
-	    {
-		$encoding=$gettext_code;
-	    }
-	    elsif ($gettext_code ne "ASCII")
-	    {
-		# Only report once because the message is quite long
-		if (! $encoding_problem_is_reported)
-		{
-		    print STDERR "WARNING: You should use the same file encoding for all your project files,\n".
-				 "         but $PROGRAM thinks that most of the source files are in\n".
-				 "         $encoding encoding, while \"$_\" is (likely) in\n".
-		       		 "         $gettext_code encoding. If you are sure that all translatable strings\n".
-				 "         are in same encoding (say UTF-8), please \e[1m*prepend*\e[0m the following\n".
-				 "         line to POTFILES.in:\n\n".
-				 "                 [encoding: UTF-8]\n\n".
-				 "         and make sure that configure.in/ac checks for $PACKAGE >= 0.27 .\n".
-				 "(such warning message will only be reported once.)\n";
-		    $encoding_problem_is_reported = 1;
-		}
-	    }
-	}
-    }
-
-    close OUTFILE;
-    close INFILE;
-
-    unlink "$MODULE.pot";
-    my @xgettext_argument=("$XGETTEXT",
-			   "--add-comments",
-			   "--directory\=\.",
-			   "--output\=$MODULE\.pot",
-			   "--files-from\=\.\/POTFILES\.in\.temp");
-    my $XGETTEXT_KEYWORDS = &FindPOTKeywords;
-    push @xgettext_argument, $XGETTEXT_KEYWORDS;
-    my $MSGID_BUGS_ADDRESS = &FindMakevarsBugAddress;
-    push @xgettext_argument, "--msgid-bugs-address\=$MSGID_BUGS_ADDRESS" if $MSGID_BUGS_ADDRESS;
-    push @xgettext_argument, "--from-code\=$encoding" if ($gettext_support_nonascii);
-    push @xgettext_argument, $XGETTEXT_ARGS if $XGETTEXT_ARGS;
-    my $xgettext_command = join ' ', @xgettext_argument;
-
-    # intercept xgettext error message
-    print "Running $xgettext_command\n" if $VERBOSE;
-    my $xgettext_error_msg = `$xgettext_command 2>\&1`;
-    my $command_failed = $?;
-
-    unlink "POTFILES.in.temp";
-
-    print "Removing generated header (.h) files..." if $VERBOSE;
-    unlink foreach (@temp_headers);
-    print "done.\n" if $VERBOSE;
-
-    if (! $command_failed)
-    {
-	if (! -e "$MODULE.pot")
-	{
-	    print "None of the files in POTFILES.in contain strings marked for translation.\n" if $VERBOSE;
-	}
-	else
-	{
-	    print "Wrote $MODULE.pot\n" if $VERBOSE;
-	}
-    }
-    else
-    {
-	if ($xgettext_error_msg =~ /--from-code/)
-	{
-	    # replace non-ASCII error message with a more useful one.
-	    print STDERR "ERROR: xgettext failed to generate PO template file because there is non-ASCII\n".
-			 "       string marked for translation. Please make sure that all strings marked\n".
-			 "       for translation are in uniform encoding (say UTF-8), then \e[1m*prepend*\e[0m the\n".
-			 "       following line to POTFILES.in and rerun $PROGRAM:\n\n".
-			 "           [encoding: UTF-8]\n\n";
-	}
-	else
-	{
-	    print STDERR "$xgettext_error_msg";
-	    if (-e "$MODULE.pot")
-	    {
-		# is this possible?
-		print STDERR "ERROR: xgettext failed but still managed to generate PO template file.\n".
-			     "       Please consult error message above if there is any.\n";
-	    }
-	    else
-	    {
-		print STDERR "ERROR: xgettext failed to generate PO template file. Please consult\n".
-			     "       error message above if there is any.\n";
-	    }
-	}
-	exit (1);
-    }
-}
-
-sub POFile_Update
-{
-    -f "$MODULE.pot" or die "$PROGRAM: $MODULE.pot does not exist.\n";
-
-    my $MSGMERGE = $ENV{"MSGMERGE"} || "@INTLTOOL_MSGMERGE@";
-    my ($lang, $outfile) = @_;
-
-    print "Merging $SRCDIR/$lang.po with $MODULE.pot..." if $VERBOSE;
-
-    my $infile = "$SRCDIR/$lang.po";
-    $outfile = "$SRCDIR/$lang.po" if ($outfile eq "");
-
-    # I think msgmerge won't overwrite old file if merge is not successful
-    system ("$MSGMERGE", "-o", $outfile, $infile, "$MODULE.pot");
-}
-
-sub Console_WriteError_NotExisting
-{
-    my ($file) = @_;
-
-    ## Report error if supplied language file is non-existing
-    print STDERR "$PROGRAM: $file does not exist!\n";
-    print STDERR "Try '$PROGRAM --help' for more information.\n";
-    exit;
-}
-
-sub GatherPOFiles
-{
-    my @po_files = glob ("./*.po");
-
-    @languages = map (&POFile_GetLanguage, @po_files);
-
-    foreach my $lang (@languages) 
-    {
-	$po_files_by_lang{$lang} = shift (@po_files);
-    }
-}
-
-sub POFile_GetLanguage ($)
-{
-    s/^(.*\/)?(.+)\.po$/$2/;
-    return $_;
-}
-
-sub Console_Write_TranslationStatus
-{
-    my ($lang, $output_file) = @_;
-    my $MSGFMT = $ENV{"MSGFMT"} || "@INTLTOOL_MSGFMT@";
-
-    $output_file = "$SRCDIR/$lang.po" if ($output_file eq "");
-
-    system ("$MSGFMT", "-o", "$devnull", "--verbose", $output_file);
-}
-
-sub Console_Write_CoverageReport
-{
-    my $MSGFMT = $ENV{"MSGFMT"} || "@INTLTOOL_MSGFMT@";
-
-    &GatherPOFiles;
-
-    foreach my $lang (@languages) 
-    {
-	print "$lang: ";
-	&POFile_Update ($lang, "");
-    }
-
-    print "\n\n * Current translation support in $MODULE \n\n";
-
-    foreach my $lang (@languages)
-    {
-	print "$lang: ";
-	system ("$MSGFMT", "-o", "$devnull", "--verbose", "$SRCDIR/$lang.po");
-    }
-}
-
-sub SubstituteVariable
-{
-    my ($str) = @_;
-    
-    # always need to rewind file whenever it has been accessed
-    seek (CONF, 0, 0);
-
-    # cache each variable. varhash is global to we can add
-    # variables elsewhere.
-    while (<CONF>)
-    {
-	if (/^(\w+)=(.*)$/)
-	{
-	    ($varhash{$1} = $2) =~  s/^["'](.*)["']$/$1/;
-	}
-    }
-    
-    if ($str =~ /^(.*)\${?([A-Z_]+)}?(.*)$/)
-    {
-	my $rest = $3;
-	my $untouched = $1;
-	my $sub = "";
-        # Ignore recursive definitions of variables
-        $sub = $varhash{$2} if defined $varhash{$2} and $varhash{$2} !~ /\${?$2}?/;
-
-	return SubstituteVariable ("$untouched$sub$rest");
-    }
-    
-    # We're using Perl backticks ` and "echo -n" here in order to 
-    # expand any shell escapes (such as backticks themselves) in every variable
-    return echo_n ($str);
-}
-
-sub CONF_Handle_Open
-{
-    my $base_dirname = getcwd();
-    $base_dirname =~ s@.*/@@;
-
-    my ($conf_in, $src_dir);
-
-    if ($base_dirname =~ /^po(-.+)?$/) 
-    {
-	if (-f "Makevars") 
-	{
-	    my $makefile_source;
-
-	    local (*IN);
-	    open (IN, "<Makevars") || die "can't open Makevars: $!";
-
-	    while (<IN>) 
-	    {
-		if (/^top_builddir[ \t]*=/) 
-		{
-		    $src_dir = $_;
-		    $src_dir =~ s/^top_builddir[ \t]*=[ \t]*([^ \t\n\r]*)/$1/;
-
-		    chomp $src_dir;
-                    if (-f "$src_dir" . "/configure.ac") {
-                        $conf_in = "$src_dir" . "/configure.ac" . "\n";
-                    } else {
-                        $conf_in = "$src_dir" . "/configure.in" . "\n";
-                    }
-		    last;
-		}
-	    }
-	    close IN;
-
-	    $conf_in || die "Cannot find top_builddir in Makevars.";
-	}
-	elsif (-f "../configure.ac") 
-	{
-	    $conf_in = "../configure.ac";
-	} 
-	elsif (-f "../configure.in") 
-	{
-	    $conf_in = "../configure.in";
-	} 
-	else 
-	{
-	    my $makefile_source;
-
-	    local (*IN);
-	    open (IN, "<Makefile") || return;
-
-	    while (<IN>) 
-	    {
-		if (/^top_srcdir[ \t]*=/) 
-		{
-		    $src_dir = $_;		    
-		    $src_dir =~ s/^top_srcdir[ \t]*=[ \t]*([^ \t\n\r]*)/$1/;
-
-		    chomp $src_dir;
-		    $conf_in = "$src_dir" . "/configure.in" . "\n";
-
-		    last;
-		}
-	    }
-	    close IN;
-
-	    $conf_in || die "Cannot find top_srcdir in Makefile.";
-	}
-
-	open (CONF, "<$conf_in");
-    }
-    else
-    {
-	print STDERR "$PROGRAM: Unable to proceed.\n" .
-		     "Make sure to run this script inside the po directory.\n";
-	exit;
-    }
-}
-
-sub FindPackageName
-{
-    my $version;
-    my $domain = &FindMakevarsDomain;
-    my $name = $domain || "untitled";
-
-    &CONF_Handle_Open;
-
-    my $conf_source; {
-	local (*IN);
-	open (IN, "<&CONF") || return $name;
-	seek (IN, 0, 0);
-	local $/; # slurp mode
-	$conf_source = <IN>;
-	close IN;
-    }
-
-    # priority for getting package name:
-    # 1. GETTEXT_PACKAGE
-    # 2. first argument of AC_INIT (with >= 2 arguments)
-    # 3. first argument of AM_INIT_AUTOMAKE (with >= 2 argument)
-
-    # /^AM_INIT_AUTOMAKE\([\s\[]*([^,\)\s\]]+)/m 
-    # the \s makes this not work, why?
-    if ($conf_source =~ /^AM_INIT_AUTOMAKE\(([^,\)]+),([^,\)]+)/m)
-    {
-	($name, $version) = ($1, $2);
-	$name    =~ s/[\[\]\s]//g;
-	$version =~ s/[\[\]\s]//g;
-	$varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/);
-	$varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/);
-	$varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/);
-	$varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/);
-    }
-    
-    if ($conf_source =~ /^AC_INIT\(([^,\)]+),([^,\)]+)/m) 
-    {
-	($name, $version) = ($1, $2);
-	$name    =~ s/[\[\]\s]//g;
-	$version =~ s/[\[\]\s]//g;
-	$varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/);
-	$varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/);
-	$varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/);
-	$varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/);
-    }
-
-    # \s makes this not work, why?
-    $name = $1 if $conf_source =~ /^GETTEXT_PACKAGE=\[?([^\n\]]+)/m;
-    
-    # m4 macros AC_PACKAGE_NAME, AC_PACKAGE_VERSION etc. have same value
-    # as corresponding $PACKAGE_NAME, $PACKAGE_VERSION etc. shell variables.
-    $name =~ s/\bAC_PACKAGE_/\$PACKAGE_/g;
-
-    $name = $domain if $domain;
-
-    $name = SubstituteVariable ($name);
-    $name =~ s/^["'](.*)["']$/$1/;
-
-    return $name if $name;
-}
-
-
-sub FindPOTKeywords
-{
-
-    my $keywords = "--keyword\=\_ --keyword\=N\_ --keyword\=U\_ --keyword\=Q\_";
-    my $varname = "XGETTEXT_OPTIONS";
-    my $make_source; {
-	local (*IN);
-	open (IN, "<Makevars") || (open(IN, "<Makefile.in.in") && ($varname = "XGETTEXT_KEYWORDS")) || return $keywords;
-	seek (IN, 0, 0);
-	local $/; # slurp mode
-	$make_source = <IN>;
-	close IN;
-    }
-
-    $keywords = $1 if $make_source =~ /^$varname[ ]*=\[?([^\n\]]+)/m;
-    
-    return $keywords;
-}
-
-sub FindMakevarsDomain
-{
-
-    my $domain = "";
-    my $makevars_source; { 
-	local (*IN);
-	open (IN, "<Makevars") || return $domain;
-	seek (IN, 0, 0);
-	local $/; # slurp mode
-	$makevars_source = <IN>;
-	close IN;
-    }
-
-    $domain = $1 if $makevars_source =~ /^DOMAIN[ ]*=\[?([^\n\]\$]+)/m;
-    $domain =~ s/^\s+//;
-    $domain =~ s/\s+$//;
-    
-    return $domain;
-}
-
-sub FindMakevarsBugAddress
-{
-
-    my $address = "";
-    my $makevars_source; { 
-	local (*IN);
-	open (IN, "<Makevars") || return undef;
-	seek (IN, 0, 0);
-	local $/; # slurp mode
-	$makevars_source = <IN>;
-	close IN;
-    }
-
-    $address = $1 if $makevars_source =~ /^MSGID_BUGS_ADDRESS[ ]*=\[?([^\n\]\$]+)/m;
-    $address =~ s/^\s+//;
-    $address =~ s/\s+$//;
-    
-    return $address;
-}
diff --git a/ltmain.sh b/ltmain.sh
index d70dc75..a72f2fd 100644..100755
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -1,52 +1,83 @@
-# ltmain.sh - Provide generalized library-building support services.
-# NOTE: Changing this file will not affect anything until you rerun configure.
-#
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005
-# Free Software Foundation, Inc.
-# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-#
-# This program is free software; you can redistribute it and/or modify
+# Generated from ltmain.m4sh.
+
+# ltmain.sh (GNU libtool) 2.2.6b
+# Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
+
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc.
+# This is free software; see the source for copying conditions.  There is NO
+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+# GNU Libtool 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
+# As a special exception to the GNU General Public License,
+# if you distribute this file as part of a program or library that
+# is built using GNU Libtool, you may include this file under the
+# same distribution terms that you use for the rest of that program.
+#
+# GNU Libtool 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 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.
-
-basename="s,^.*/,,g"
-
-# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
-# is ksh but when the shell is invoked as "sh" and the current value of
-# the _XPG environment variable is not equal to 1 (one), the special
-# positional parameter $0, within a function call, is the name of the
-# function.
-progpath="$0"
+# along with GNU Libtool; see the file COPYING.  If not, a copy
+# can be downloaded from http://www.gnu.org/licenses/gpl.html,
+# or obtained by writing to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
-# The name of this program:
-progname=`echo "$progpath" | $SED $basename`
-modename="$progname"
-
-# Global variables:
-EXIT_SUCCESS=0
-EXIT_FAILURE=1
+# Usage: $progname [OPTION]... [MODE-ARG]...
+#
+# Provide generalized library-building support services.
+#
+#     --config             show all configuration variables
+#     --debug              enable verbose shell tracing
+# -n, --dry-run            display commands without modifying any files
+#     --features           display basic configuration information and exit
+#     --mode=MODE          use operation mode MODE
+#     --preserve-dup-deps  don't remove duplicate dependency libraries
+#     --quiet, --silent    don't print informational messages
+#     --tag=TAG            use configuration variables from tag TAG
+# -v, --verbose            print informational messages (default)
+#     --version            print version information
+# -h, --help               print short or long help message
+#
+# MODE must be one of the following:
+#
+#       clean              remove files from the build directory
+#       compile            compile a source file into a libtool object
+#       execute            automatically set library path, then run a program
+#       finish             complete the installation of libtool libraries
+#       install            install libraries or executables
+#       link               create a library or an executable
+#       uninstall          remove libraries from an installed directory
+#
+# MODE-ARGS vary depending on the MODE.
+# Try `$progname --help --mode=MODE' for a more detailed description of MODE.
+#
+# When reporting a bug, please describe a test case to reproduce it and
+# include the following information:
+#
+#       host-triplet:	$host
+#       shell:		$SHELL
+#       compiler:		$LTCC
+#       compiler flags:		$LTCFLAGS
+#       linker:		$LD (gnu? $with_gnu_ld)
+#       $progname:		(GNU libtool) 2.2.6b
+#       automake:		$automake_version
+#       autoconf:		$autoconf_version
+#
+# Report bugs to <bug-libtool@gnu.org>.
 
 PROGRAM=ltmain.sh
 PACKAGE=libtool
-VERSION=1.5.22
-TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
+VERSION=2.2.6b
+TIMESTAMP=""
+package_revision=1.3017
 
-# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
+# Be Bourne compatible
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
@@ -57,99 +88,264 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
 else
   case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
 fi
+BIN_SH=xpg4; export BIN_SH # for Tru64
+DUALCASE=1; export DUALCASE # for MKS sh
 
-# Check that we have a working $echo.
-if test "X$1" = X--no-reexec; then
-  # Discard the --no-reexec flag, and continue.
-  shift
-elif test "X$1" = X--fallback-echo; then
-  # Avoid inline document here, it may be left over
-  :
-elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
-  # Yippee, $echo works!
-  :
-else
-  # Restart under the correct shell, and then maybe $echo will work.
-  exec $SHELL "$progpath" --no-reexec ${1+"$@"}
-fi
-
-if test "X$1" = X--fallback-echo; then
-  # used as fallback echo
-  shift
-  cat <<EOF
-$*
-EOF
-  exit $EXIT_SUCCESS
-fi
-
-default_mode=
-help="Try \`$progname --help' for more information."
-magic="%%%MAGIC variable%%%"
-mkdir="mkdir"
-mv="mv -f"
-rm="rm -f"
-
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed="${SED}"' -e 1s/^X//'
-sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
-# test EBCDIC or ASCII
-case `echo X|tr X '\101'` in
- A) # ASCII based system
-    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
-  SP2NL='tr \040 \012'
-  NL2SP='tr \015\012 \040\040'
-  ;;
- *) # EBCDIC based system
-  SP2NL='tr \100 \n'
-  NL2SP='tr \r\n \100\100'
-  ;;
-esac
-
-# NLS nuisances.
+# NLS nuisances: We save the old values to restore during execute mode.
 # Only set LANG and LC_ALL to C if already set.
 # These must not be set unconditionally because not all systems understand
 # e.g. LANG=C (notably SCO).
-# We save the old values to restore during execute mode.
-for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+lt_user_locale=
+lt_safe_locale=
+for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
 do
   eval "if test \"\${$lt_var+set}\" = set; then
-         save_$lt_var=\$$lt_var
-         $lt_var=C
-         export $lt_var
-       fi"
+          save_$lt_var=\$$lt_var
+          $lt_var=C
+	  export $lt_var
+	  lt_user_locale=\"$lt_var=\\\$save_\$lt_var; \$lt_user_locale\"
+	  lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
+	fi"
 done
 
+$lt_unset CDPATH
+
+
+
+
+
+: ${CP="cp -f"}
+: ${ECHO="echo"}
+: ${EGREP="/bin/grep -E"}
+: ${FGREP="/bin/grep -F"}
+: ${GREP="/bin/grep"}
+: ${LN_S="ln -s"}
+: ${MAKE="make"}
+: ${MKDIR="mkdir"}
+: ${MV="mv -f"}
+: ${RM="rm -f"}
+: ${SED="/bin/sed"}
+: ${SHELL="${CONFIG_SHELL-/bin/sh}"}
+: ${Xsed="$SED -e 1s/^X//"}
+
+# Global variables:
+EXIT_SUCCESS=0
+EXIT_FAILURE=1
+EXIT_MISMATCH=63  # $? = 63 is used to indicate version mismatch to missing.
+EXIT_SKIP=77	  # $? = 77 is used to indicate a skipped test to automake.
+
+exit_status=$EXIT_SUCCESS
+
 # Make sure IFS has a sensible default
 lt_nl='
 '
 IFS=" 	$lt_nl"
 
-if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
-  $echo "$modename: not configured to build any kind of library" 1>&2
-  $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
-  exit $EXIT_FAILURE
-fi
+dirname="s,/[^/]*$,,"
+basename="s,^.*/,,"
+
+# func_dirname_and_basename file append nondir_replacement
+# perform func_basename and func_dirname in a single function
+# call:
+#   dirname:  Compute the dirname of FILE.  If nonempty,
+#             add APPEND to the result, otherwise set result
+#             to NONDIR_REPLACEMENT.
+#             value returned in "$func_dirname_result"
+#   basename: Compute filename of FILE.
+#             value retuned in "$func_basename_result"
+# Implementation must be kept synchronized with func_dirname
+# and func_basename. For efficiency, we do not delegate to
+# those functions but instead duplicate the functionality here.
+func_dirname_and_basename ()
+{
+  # Extract subdirectory from the argument.
+  func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
+  if test "X$func_dirname_result" = "X${1}"; then
+    func_dirname_result="${3}"
+  else
+    func_dirname_result="$func_dirname_result${2}"
+  fi
+  func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
+}
 
-# Global variables.
-mode=$default_mode
-nonopt=
-prev=
-prevopt=
-run=
-show="$echo"
-show_help=
-execute_dlfiles=
-duplicate_deps=no
-preserve_args=
-lo2o="s/\\.lo\$/.${objext}/"
-o2lo="s/\\.${objext}\$/.lo/"
-extracted_archives=
-extracted_serial=0
+# Generated shell functions inserted here.
+
+# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
+# is ksh but when the shell is invoked as "sh" and the current value of
+# the _XPG environment variable is not equal to 1 (one), the special
+# positional parameter $0, within a function call, is the name of the
+# function.
+progpath="$0"
+
+# The name of this program:
+# In the unlikely event $progname began with a '-', it would play havoc with
+# func_echo (imagine progname=-n), so we prepend ./ in that case:
+func_dirname_and_basename "$progpath"
+progname=$func_basename_result
+case $progname in
+  -*) progname=./$progname ;;
+esac
+
+# Make sure we have an absolute path for reexecution:
+case $progpath in
+  [\\/]*|[A-Za-z]:\\*) ;;
+  *[\\/]*)
+     progdir=$func_dirname_result
+     progdir=`cd "$progdir" && pwd`
+     progpath="$progdir/$progname"
+     ;;
+  *)
+     save_IFS="$IFS"
+     IFS=:
+     for progdir in $PATH; do
+       IFS="$save_IFS"
+       test -x "$progdir/$progname" && break
+     done
+     IFS="$save_IFS"
+     test -n "$progdir" || progdir=`pwd`
+     progpath="$progdir/$progname"
+     ;;
+esac
+
+# Sed substitution that helps us do robust quoting.  It backslashifies
+# metacharacters that are still active within double-quoted strings.
+Xsed="${SED}"' -e 1s/^X//'
+sed_quote_subst='s/\([`"$\\]\)/\\\1/g'
+
+# Same as above, but do not quote variable references.
+double_quote_subst='s/\(["`\\]\)/\\\1/g'
+
+# Re-`\' parameter expansions in output of double_quote_subst that were
+# `\'-ed in input to the same.  If an odd number of `\' preceded a '$'
+# in input to double_quote_subst, that '$' was protected from expansion.
+# Since each input `\' is now two `\'s, look for any number of runs of
+# four `\'s followed by two `\'s and then a '$'.  `\' that '$'.
+bs='\\'
+bs2='\\\\'
+bs4='\\\\\\\\'
+dollar='\$'
+sed_double_backslash="\
+  s/$bs4/&\\
+/g
+  s/^$bs2$dollar/$bs&/
+  s/\\([^$bs]\\)$bs2$dollar/\\1$bs2$bs$dollar/g
+  s/\n//g"
+
+# Standard options:
+opt_dry_run=false
+opt_help=false
+opt_quiet=false
+opt_verbose=false
+opt_warning=:
+
+# func_echo arg...
+# Echo program name prefixed message, along with the current mode
+# name if it has been set yet.
+func_echo ()
+{
+    $ECHO "$progname${mode+: }$mode: $*"
+}
+
+# func_verbose arg...
+# Echo program name prefixed message in verbose mode only.
+func_verbose ()
+{
+    $opt_verbose && func_echo ${1+"$@"}
+
+    # A bug in bash halts the script if the last line of a function
+    # fails when set -e is in force, so we need another command to
+    # work around that:
+    :
+}
+
+# func_error arg...
+# Echo program name prefixed message to standard error.
+func_error ()
+{
+    $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2
+}
+
+# func_warning arg...
+# Echo program name prefixed warning message to standard error.
+func_warning ()
+{
+    $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2
+
+    # bash bug again:
+    :
+}
+
+# func_fatal_error arg...
+# Echo program name prefixed message to standard error, and exit.
+func_fatal_error ()
+{
+    func_error ${1+"$@"}
+    exit $EXIT_FAILURE
+}
+
+# func_fatal_help arg...
+# Echo program name prefixed message to standard error, followed by
+# a help hint, and exit.
+func_fatal_help ()
+{
+    func_error ${1+"$@"}
+    func_fatal_error "$help"
+}
+help="Try \`$progname --help' for more information."  ## default
+
+
+# func_grep expression filename
+# Check whether EXPRESSION matches any line of FILENAME, without output.
+func_grep ()
+{
+    $GREP "$1" "$2" >/dev/null 2>&1
+}
+
+
+# func_mkdir_p directory-path
+# Make sure the entire path to DIRECTORY-PATH is available.
+func_mkdir_p ()
+{
+    my_directory_path="$1"
+    my_dir_list=
+
+    if test -n "$my_directory_path" && test "$opt_dry_run" != ":"; then
+
+      # Protect directory names starting with `-'
+      case $my_directory_path in
+        -*) my_directory_path="./$my_directory_path" ;;
+      esac
+
+      # While some portion of DIR does not yet exist...
+      while test ! -d "$my_directory_path"; do
+        # ...make a list in topmost first order.  Use a colon delimited
+	# list incase some portion of path contains whitespace.
+        my_dir_list="$my_directory_path:$my_dir_list"
+
+        # If the last portion added has no slash in it, the list is done
+        case $my_directory_path in */*) ;; *) break ;; esac
+
+        # ...otherwise throw away the child directory and loop
+        my_directory_path=`$ECHO "X$my_directory_path" | $Xsed -e "$dirname"`
+      done
+      my_dir_list=`$ECHO "X$my_dir_list" | $Xsed -e 's,:*$,,'`
+
+      save_mkdir_p_IFS="$IFS"; IFS=':'
+      for my_dir in $my_dir_list; do
+	IFS="$save_mkdir_p_IFS"
+        # mkdir can fail with a `File exist' error if two processes
+        # try to create one of the directories concurrently.  Don't
+        # stop in that case!
+        $MKDIR "$my_dir" 2>/dev/null || :
+      done
+      IFS="$save_mkdir_p_IFS"
+
+      # Bail out if we (or some other process) failed to create a directory.
+      test -d "$my_directory_path" || \
+        func_fatal_error "Failed to create \`$1'"
+    fi
+}
 
-#####################################
-# Shell function definitions:
-# This seems to be the best place for them
 
 # func_mktempdir [string]
 # Make a temporary directory that won't clash with other running
@@ -159,7 +355,7 @@ func_mktempdir ()
 {
     my_template="${TMPDIR-/tmp}/${1-$progname}"
 
-    if test "$run" = ":"; then
+    if test "$opt_dry_run" = ":"; then
       # Return a directory name, but don't create it in dry-run mode
       my_tmpdir="${my_template}-$$"
     else
@@ -168,479 +364,743 @@ func_mktempdir ()
       my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null`
 
       if test ! -d "$my_tmpdir"; then
-	# Failing that, at least try and use $RANDOM to avoid a race
-	my_tmpdir="${my_template}-${RANDOM-0}$$"
+        # Failing that, at least try and use $RANDOM to avoid a race
+        my_tmpdir="${my_template}-${RANDOM-0}$$"
 
-	save_mktempdir_umask=`umask`
-	umask 0077
-	$mkdir "$my_tmpdir"
-	umask $save_mktempdir_umask
+        save_mktempdir_umask=`umask`
+        umask 0077
+        $MKDIR "$my_tmpdir"
+        umask $save_mktempdir_umask
       fi
 
       # If we're not in dry-run mode, bomb out on failure
-      test -d "$my_tmpdir" || {
-        $echo "cannot create temporary directory \`$my_tmpdir'" 1>&2
-	exit $EXIT_FAILURE
-      }
+      test -d "$my_tmpdir" || \
+        func_fatal_error "cannot create temporary directory \`$my_tmpdir'"
     fi
 
-    $echo "X$my_tmpdir" | $Xsed
+    $ECHO "X$my_tmpdir" | $Xsed
 }
 
 
-# func_win32_libid arg
-# return the library type of file 'arg'
-#
-# Need a lot of goo to handle *both* DLLs and import libs
-# Has to be a shell function in order to 'eat' the argument
-# that is supplied when $file_magic_command is called.
-func_win32_libid ()
+# func_quote_for_eval arg
+# Aesthetically quote ARG to be evaled later.
+# This function returns two values: FUNC_QUOTE_FOR_EVAL_RESULT
+# is double-quoted, suitable for a subsequent eval, whereas
+# FUNC_QUOTE_FOR_EVAL_UNQUOTED_RESULT has merely all characters
+# which are still active within double quotes backslashified.
+func_quote_for_eval ()
 {
-  win32_libid_type="unknown"
-  win32_fileres=`file -L $1 2>/dev/null`
-  case $win32_fileres in
-  *ar\ archive\ import\ library*) # definitely import
-    win32_libid_type="x86 archive import"
-    ;;
-  *ar\ archive*) # could be an import, or static
-    if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
-      $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
-      win32_nmres=`eval $NM -f posix -A $1 | \
-	$SED -n -e '1,100{/ I /{s,.*,import,;p;q;};}'`
-      case $win32_nmres in
-      import*)  win32_libid_type="x86 archive import";;
-      *)        win32_libid_type="x86 archive static";;
-      esac
-    fi
-    ;;
-  *DLL*)
-    win32_libid_type="x86 DLL"
-    ;;
-  *executable*) # but shell scripts are "executable" too...
-    case $win32_fileres in
-    *MS\ Windows\ PE\ Intel*)
-      win32_libid_type="x86 DLL"
-      ;;
+    case $1 in
+      *[\\\`\"\$]*)
+	func_quote_for_eval_unquoted_result=`$ECHO "X$1" | $Xsed -e "$sed_quote_subst"` ;;
+      *)
+        func_quote_for_eval_unquoted_result="$1" ;;
+    esac
+
+    case $func_quote_for_eval_unquoted_result in
+      # Double-quote args containing shell metacharacters to delay
+      # word splitting, command substitution and and variable
+      # expansion for a subsequent eval.
+      # Many Bourne shells cannot handle close brackets correctly
+      # in scan sets, so we specify it separately.
+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+        func_quote_for_eval_result="\"$func_quote_for_eval_unquoted_result\""
+        ;;
+      *)
+        func_quote_for_eval_result="$func_quote_for_eval_unquoted_result"
     esac
-    ;;
-  esac
-  $echo $win32_libid_type
 }
 
 
-# func_infer_tag arg
-# Infer tagged configuration to use if any are available and
-# if one wasn't chosen via the "--tag" command line option.
-# Only attempt this if the compiler in the base compile
-# command doesn't match the default compiler.
-# arg is usually of the form 'gcc ...'
-func_infer_tag ()
+# func_quote_for_expand arg
+# Aesthetically quote ARG to be evaled later; same as above,
+# but do not quote variable references.
+func_quote_for_expand ()
 {
-    if test -n "$available_tags" && test -z "$tagname"; then
-      CC_quoted=
-      for arg in $CC; do
-	case $arg in
-	  *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	  arg="\"$arg\""
-	  ;;
-	esac
-	CC_quoted="$CC_quoted $arg"
-      done
-      case $@ in
-      # Blanks in the command may have been stripped by the calling shell,
-      # but not from the CC environment variable when configure was run.
-      " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*) ;;
-      # Blanks at the start of $base_compile will cause this to fail
-      # if we don't check for them as well.
+    case $1 in
+      *[\\\`\"]*)
+	my_arg=`$ECHO "X$1" | $Xsed \
+	    -e "$double_quote_subst" -e "$sed_double_backslash"` ;;
       *)
-	for z in $available_tags; do
-	  if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
-	    # Evaluate the configuration.
-	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
-	    CC_quoted=
-	    for arg in $CC; do
-	    # Double-quote args containing other shell metacharacters.
-	    case $arg in
-	      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	      arg="\"$arg\""
-	      ;;
-	    esac
-	    CC_quoted="$CC_quoted $arg"
-	  done
-	    case "$@ " in
-	      " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*)
-	      # The compiler in the base compile command matches
-	      # the one in the tagged configuration.
-	      # Assume this is the tagged configuration we want.
-	      tagname=$z
-	      break
-	      ;;
-	    esac
-	  fi
-	done
-	# If $tagname still isn't set, then no tagged configuration
-	# was found and let the user know that the "--tag" command
-	# line option must be used.
-	if test -z "$tagname"; then
-	  $echo "$modename: unable to infer tagged configuration"
-	  $echo "$modename: specify a tag with \`--tag'" 1>&2
-	  exit $EXIT_FAILURE
-#        else
-#          $echo "$modename: using $tagname tagged configuration"
-	fi
-	;;
-      esac
-    fi
+        my_arg="$1" ;;
+    esac
+
+    case $my_arg in
+      # Double-quote args containing shell metacharacters to delay
+      # word splitting and command substitution for a subsequent eval.
+      # Many Bourne shells cannot handle close brackets correctly
+      # in scan sets, so we specify it separately.
+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+        my_arg="\"$my_arg\""
+        ;;
+    esac
+
+    func_quote_for_expand_result="$my_arg"
 }
 
 
-# func_extract_an_archive dir oldlib
-func_extract_an_archive ()
+# func_show_eval cmd [fail_exp]
+# Unless opt_silent is true, then output CMD.  Then, if opt_dryrun is
+# not true, evaluate CMD.  If the evaluation of CMD fails, and FAIL_EXP
+# is given, then evaluate it.
+func_show_eval ()
 {
-    f_ex_an_ar_dir="$1"; shift
-    f_ex_an_ar_oldlib="$1"
+    my_cmd="$1"
+    my_fail_exp="${2-:}"
 
-    $show "(cd $f_ex_an_ar_dir && $AR x $f_ex_an_ar_oldlib)"
-    $run eval "(cd \$f_ex_an_ar_dir && $AR x \$f_ex_an_ar_oldlib)" || exit $?
-    if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
-     :
-    else
-      $echo "$modename: ERROR: object name conflicts: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib" 1>&2
-      exit $EXIT_FAILURE
+    ${opt_silent-false} || {
+      func_quote_for_expand "$my_cmd"
+      eval "func_echo $func_quote_for_expand_result"
+    }
+
+    if ${opt_dry_run-false}; then :; else
+      eval "$my_cmd"
+      my_status=$?
+      if test "$my_status" -eq 0; then :; else
+	eval "(exit $my_status); $my_fail_exp"
+      fi
     fi
 }
 
-# func_extract_archives gentop oldlib ...
-func_extract_archives ()
+
+# func_show_eval_locale cmd [fail_exp]
+# Unless opt_silent is true, then output CMD.  Then, if opt_dryrun is
+# not true, evaluate CMD.  If the evaluation of CMD fails, and FAIL_EXP
+# is given, then evaluate it.  Use the saved locale for evaluation.
+func_show_eval_locale ()
 {
-    my_gentop="$1"; shift
-    my_oldlibs=${1+"$@"}
-    my_oldobjs=""
-    my_xlib=""
-    my_xabs=""
-    my_xdir=""
-    my_status=""
-
-    $show "${rm}r $my_gentop"
-    $run ${rm}r "$my_gentop"
-    $show "$mkdir $my_gentop"
-    $run $mkdir "$my_gentop"
-    my_status=$?
-    if test "$my_status" -ne 0 && test ! -d "$my_gentop"; then
-      exit $my_status
-    fi
+    my_cmd="$1"
+    my_fail_exp="${2-:}"
 
-    for my_xlib in $my_oldlibs; do
-      # Extract the objects.
-      case $my_xlib in
-	[\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;;
-	*) my_xabs=`pwd`"/$my_xlib" ;;
-      esac
-      my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
-      my_xlib_u=$my_xlib
-      while :; do
-        case " $extracted_archives " in
-       *" $my_xlib_u "*)
-         extracted_serial=`expr $extracted_serial + 1`
-         my_xlib_u=lt$extracted_serial-$my_xlib ;;
-       *) break ;;
-       esac
-      done
-      extracted_archives="$extracted_archives $my_xlib_u"
-      my_xdir="$my_gentop/$my_xlib_u"
+    ${opt_silent-false} || {
+      func_quote_for_expand "$my_cmd"
+      eval "func_echo $func_quote_for_expand_result"
+    }
 
-      $show "${rm}r $my_xdir"
-      $run ${rm}r "$my_xdir"
-      $show "$mkdir $my_xdir"
-      $run $mkdir "$my_xdir"
-      exit_status=$?
-      if test "$exit_status" -ne 0 && test ! -d "$my_xdir"; then
-	exit $exit_status
+    if ${opt_dry_run-false}; then :; else
+      eval "$lt_user_locale
+	    $my_cmd"
+      my_status=$?
+      eval "$lt_safe_locale"
+      if test "$my_status" -eq 0; then :; else
+	eval "(exit $my_status); $my_fail_exp"
       fi
-      case $host in
-      *-darwin*)
-	$show "Extracting $my_xabs"
-	# Do not bother doing anything if just a dry run
-	if test -z "$run"; then
-	  darwin_orig_dir=`pwd`
-	  cd $my_xdir || exit $?
-	  darwin_archive=$my_xabs
-	  darwin_curdir=`pwd`
-	  darwin_base_archive=`$echo "X$darwin_archive" | $Xsed -e 's%^.*/%%'`
-	  darwin_arches=`lipo -info "$darwin_archive" 2>/dev/null | $EGREP Architectures 2>/dev/null`
-	  if test -n "$darwin_arches"; then 
-	    darwin_arches=`echo "$darwin_arches" | $SED -e 's/.*are://'`
-	    darwin_arch=
-	    $show "$darwin_base_archive has multiple architectures $darwin_arches"
-	    for darwin_arch in  $darwin_arches ; do
-	      mkdir -p "unfat-$$/${darwin_base_archive}-${darwin_arch}"
-	      lipo -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}"
-	      cd "unfat-$$/${darwin_base_archive}-${darwin_arch}"
-	      func_extract_an_archive "`pwd`" "${darwin_base_archive}"
-	      cd "$darwin_curdir"
-	      $rm "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}"
-	    done # $darwin_arches
-      ## Okay now we have a bunch of thin objects, gotta fatten them up :)
-	    darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print| xargs basename | sort -u | $NL2SP`
-	    darwin_file=
-	    darwin_files=
-	    for darwin_file in $darwin_filelist; do
-	      darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
-	      lipo -create -output "$darwin_file" $darwin_files
-	    done # $darwin_filelist
-	    ${rm}r unfat-$$
-	    cd "$darwin_orig_dir"
-	  else
-	    cd "$darwin_orig_dir"
- 	    func_extract_an_archive "$my_xdir" "$my_xabs"
-	  fi # $darwin_arches
-	fi # $run
-	;;
-      *)
-        func_extract_an_archive "$my_xdir" "$my_xabs"
-        ;;
-      esac
-      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
-    done
-    func_extract_archives_result="$my_oldobjs"
+    fi
 }
-# End of Shell function definitions
-#####################################
 
-# Darwin sucks
-eval std_shrext=\"$shrext_cmds\"
 
-disable_libs=no
 
-# Parse our command line options once, thoroughly.
-while test "$#" -gt 0
-do
-  arg="$1"
+
+
+# func_version
+# Echo version message to standard output and exit.
+func_version ()
+{
+    $SED -n '/^# '$PROGRAM' (GNU /,/# warranty; / {
+        s/^# //
+	s/^# *$//
+        s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/
+        p
+     }' < "$progpath"
+     exit $?
+}
+
+# func_usage
+# Echo short help message to standard output and exit.
+func_usage ()
+{
+    $SED -n '/^# Usage:/,/# -h/ {
+        s/^# //
+	s/^# *$//
+	s/\$progname/'$progname'/
+	p
+    }' < "$progpath"
+    $ECHO
+    $ECHO "run \`$progname --help | more' for full usage"
+    exit $?
+}
+
+# func_help
+# Echo long help message to standard output and exit.
+func_help ()
+{
+    $SED -n '/^# Usage:/,/# Report bugs to/ {
+        s/^# //
+	s/^# *$//
+	s*\$progname*'$progname'*
+	s*\$host*'"$host"'*
+	s*\$SHELL*'"$SHELL"'*
+	s*\$LTCC*'"$LTCC"'*
+	s*\$LTCFLAGS*'"$LTCFLAGS"'*
+	s*\$LD*'"$LD"'*
+	s/\$with_gnu_ld/'"$with_gnu_ld"'/
+	s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/
+	s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
+	p
+     }' < "$progpath"
+    exit $?
+}
+
+# func_missing_arg argname
+# Echo program name prefixed message to standard error and set global
+# exit_cmd.
+func_missing_arg ()
+{
+    func_error "missing argument for $1"
+    exit_cmd=exit
+}
+
+exit_cmd=:
+
+
+
+
+
+# Check that we have a working $ECHO.
+if test "X$1" = X--no-reexec; then
+  # Discard the --no-reexec flag, and continue.
   shift
+elif test "X$1" = X--fallback-echo; then
+  # Avoid inline document here, it may be left over
+  :
+elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t'; then
+  # Yippee, $ECHO works!
+  :
+else
+  # Restart under the correct shell, and then maybe $ECHO will work.
+  exec $SHELL "$progpath" --no-reexec ${1+"$@"}
+fi
 
-  case $arg in
-  -*=*) optarg=`$echo "X$arg" | $Xsed -e 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) optarg= ;;
-  esac
+if test "X$1" = X--fallback-echo; then
+  # used as fallback echo
+  shift
+  cat <<EOF
+$*
+EOF
+  exit $EXIT_SUCCESS
+fi
 
-  # If the previous option needs an argument, assign it.
-  if test -n "$prev"; then
-    case $prev in
-    execute_dlfiles)
-      execute_dlfiles="$execute_dlfiles $arg"
-      ;;
-    tag)
-      tagname="$arg"
-      preserve_args="${preserve_args}=$arg"
-
-      # Check whether tagname contains only valid characters
-      case $tagname in
-      *[!-_A-Za-z0-9,/]*)
-	$echo "$progname: invalid tag name: $tagname" 1>&2
-	exit $EXIT_FAILURE
-	;;
-      esac
+magic="%%%MAGIC variable%%%"
+magic_exe="%%%MAGIC EXE variable%%%"
 
-      case $tagname in
-      CC)
-	# Don't test for the "default" C tag, as we know, it's there, but
-	# not specially marked.
-	;;
-      *)
-	if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$progpath" > /dev/null; then
-	  taglist="$taglist $tagname"
-	  # Evaluate the configuration.
-	  eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $progpath`"
-	else
-	  $echo "$progname: ignoring unknown tag $tagname" 1>&2
-	fi
-	;;
-      esac
-      ;;
-    *)
-      eval "$prev=\$arg"
-      ;;
-    esac
+# Global variables.
+# $mode is unset
+nonopt=
+execute_dlfiles=
+preserve_args=
+lo2o="s/\\.lo\$/.${objext}/"
+o2lo="s/\\.${objext}\$/.lo/"
+extracted_archives=
+extracted_serial=0
 
-    prev=
-    prevopt=
-    continue
-  fi
+opt_dry_run=false
+opt_duplicate_deps=false
+opt_silent=false
+opt_debug=:
 
-  # Have we seen a non-optional argument yet?
-  case $arg in
-  --help)
-    show_help=yes
-    ;;
+# If this variable is set in any of the actions, the command in it
+# will be execed at the end.  This prevents here-documents from being
+# left over by shells.
+exec_cmd=
 
-  --version)
-    $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
-    $echo
-    $echo "Copyright (C) 2005  Free Software Foundation, Inc."
-    $echo "This is free software; see the source for copying conditions.  There is NO"
-    $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-    exit $?
-    ;;
+# func_fatal_configuration arg...
+# Echo program name prefixed message to standard error, followed by
+# a configuration failure hint, and exit.
+func_fatal_configuration ()
+{
+    func_error ${1+"$@"}
+    func_error "See the $PACKAGE documentation for more information."
+    func_fatal_error "Fatal configuration error."
+}
+
+
+# func_config
+# Display the configuration for all the tags in this script.
+func_config ()
+{
+    re_begincf='^# ### BEGIN LIBTOOL'
+    re_endcf='^# ### END LIBTOOL'
+
+    # Default configuration.
+    $SED "1,/$re_begincf CONFIG/d;/$re_endcf CONFIG/,\$d" < "$progpath"
 
-  --config)
-    ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $progpath
     # Now print the configurations for the tags.
     for tagname in $taglist; do
-      ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$progpath"
+      $SED -n "/$re_begincf TAG CONFIG: $tagname\$/,/$re_endcf TAG CONFIG: $tagname\$/p" < "$progpath"
     done
-    exit $?
-    ;;
 
-  --debug)
-    $echo "$progname: enabling shell trace mode"
-    set -x
-    preserve_args="$preserve_args $arg"
-    ;;
-
-  --dry-run | -n)
-    run=:
-    ;;
+    exit $?
+}
 
-  --features)
-    $echo "host: $host"
+# func_features
+# Display the features supported by this script.
+func_features ()
+{
+    $ECHO "host: $host"
     if test "$build_libtool_libs" = yes; then
-      $echo "enable shared libraries"
+      $ECHO "enable shared libraries"
     else
-      $echo "disable shared libraries"
+      $ECHO "disable shared libraries"
     fi
     if test "$build_old_libs" = yes; then
-      $echo "enable static libraries"
+      $ECHO "enable static libraries"
     else
-      $echo "disable static libraries"
+      $ECHO "disable static libraries"
     fi
+
     exit $?
-    ;;
+}
 
-  --finish) mode="finish" ;;
+# func_enable_tag tagname
+# Verify that TAGNAME is valid, and either flag an error and exit, or
+# enable the TAGNAME tag.  We also add TAGNAME to the global $taglist
+# variable here.
+func_enable_tag ()
+{
+  # Global variable:
+  tagname="$1"
 
-  --mode) prevopt="--mode" prev=mode ;;
-  --mode=*) mode="$optarg" ;;
+  re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$"
+  re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$"
+  sed_extractcf="/$re_begincf/,/$re_endcf/p"
 
-  --preserve-dup-deps) duplicate_deps="yes" ;;
+  # Validate tagname.
+  case $tagname in
+    *[!-_A-Za-z0-9,/]*)
+      func_fatal_error "invalid tag name: $tagname"
+      ;;
+  esac
 
-  --quiet | --silent)
-    show=:
-    preserve_args="$preserve_args $arg"
-    ;;
+  # Don't test for the "default" C tag, as we know it's
+  # there but not specially marked.
+  case $tagname in
+    CC) ;;
+    *)
+      if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then
+	taglist="$taglist $tagname"
+
+	# Evaluate the configuration.  Be careful to quote the path
+	# and the sed script, to avoid splitting on whitespace, but
+	# also don't use non-portable quotes within backquotes within
+	# quotes we have to do it in 2 steps:
+	extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"`
+	eval "$extractedcf"
+      else
+	func_error "ignoring unknown tag $tagname"
+      fi
+      ;;
+  esac
+}
 
-  --tag)
-    prevopt="--tag"
-    prev=tag
-    preserve_args="$preserve_args --tag"
+# Parse options once, thoroughly.  This comes as soon as possible in
+# the script to make things like `libtool --version' happen quickly.
+{
+
+  # Shorthand for --mode=foo, only valid as the first argument
+  case $1 in
+  clean|clea|cle|cl)
+    shift; set dummy --mode clean ${1+"$@"}; shift
     ;;
-  --tag=*)
-    set tag "$optarg" ${1+"$@"}
-    shift
-    prev=tag
-    preserve_args="$preserve_args --tag"
+  compile|compil|compi|comp|com|co|c)
+    shift; set dummy --mode compile ${1+"$@"}; shift
     ;;
-
-  -dlopen)
-    prevopt="-dlopen"
-    prev=execute_dlfiles
+  execute|execut|execu|exec|exe|ex|e)
+    shift; set dummy --mode execute ${1+"$@"}; shift
     ;;
-
-  -*)
-    $echo "$modename: unrecognized option \`$arg'" 1>&2
-    $echo "$help" 1>&2
-    exit $EXIT_FAILURE
+  finish|finis|fini|fin|fi|f)
+    shift; set dummy --mode finish ${1+"$@"}; shift
     ;;
-
-  *)
-    nonopt="$arg"
-    break
+  install|instal|insta|inst|ins|in|i)
+    shift; set dummy --mode install ${1+"$@"}; shift
+    ;;
+  link|lin|li|l)
+    shift; set dummy --mode link ${1+"$@"}; shift
+    ;;
+  uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
+    shift; set dummy --mode uninstall ${1+"$@"}; shift
     ;;
   esac
-done
 
-if test -n "$prevopt"; then
-  $echo "$modename: option \`$prevopt' requires an argument" 1>&2
-  $echo "$help" 1>&2
-  exit $EXIT_FAILURE
-fi
+  # Parse non-mode specific arguments:
+  while test "$#" -gt 0; do
+    opt="$1"
+    shift
 
-case $disable_libs in
-no) 
-  ;;
-shared)
-  build_libtool_libs=no
-  build_old_libs=yes
-  ;;
-static)
-  build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`
-  ;;
-esac
+    case $opt in
+      --config)		func_config					;;
 
-# If this variable is set in any of the actions, the command in it
-# will be execed at the end.  This prevents here-documents from being
-# left over by shells.
-exec_cmd=
+      --debug)		preserve_args="$preserve_args $opt"
+			func_echo "enabling shell trace mode"
+			opt_debug='set -x'
+			$opt_debug
+			;;
 
-if test -z "$show_help"; then
+      -dlopen)		test "$#" -eq 0 && func_missing_arg "$opt" && break
+			execute_dlfiles="$execute_dlfiles $1"
+			shift
+			;;
 
-  # Infer the operation mode.
-  if test -z "$mode"; then
-    $echo "*** Warning: inferring the mode of operation is deprecated." 1>&2
-    $echo "*** Future versions of Libtool will require --mode=MODE be specified." 1>&2
-    case $nonopt in
-    *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*)
-      mode=link
-      for arg
-      do
-	case $arg in
-	-c)
-	   mode=compile
-	   break
-	   ;;
-	esac
-      done
-      ;;
-    *db | *dbx | *strace | *truss)
-      mode=execute
-      ;;
-    *install*|cp|mv)
-      mode=install
-      ;;
-    *rm)
-      mode=uninstall
+      --dry-run | -n)	opt_dry_run=:					;;
+      --features)       func_features					;;
+      --finish)		mode="finish"					;;
+
+      --mode)		test "$#" -eq 0 && func_missing_arg "$opt" && break
+			case $1 in
+			  # Valid mode arguments:
+			  clean)	;;
+			  compile)	;;
+			  execute)	;;
+			  finish)	;;
+			  install)	;;
+			  link)		;;
+			  relink)	;;
+			  uninstall)	;;
+
+			  # Catch anything else as an error
+			  *) func_error "invalid argument for $opt"
+			     exit_cmd=exit
+			     break
+			     ;;
+		        esac
+
+			mode="$1"
+			shift
+			;;
+
+      --preserve-dup-deps)
+			opt_duplicate_deps=:				;;
+
+      --quiet|--silent)	preserve_args="$preserve_args $opt"
+			opt_silent=:
+			;;
+
+      --verbose| -v)	preserve_args="$preserve_args $opt"
+			opt_silent=false
+			;;
+
+      --tag)		test "$#" -eq 0 && func_missing_arg "$opt" && break
+			preserve_args="$preserve_args $opt $1"
+			func_enable_tag "$1"	# tagname is set here
+			shift
+			;;
+
+      # Separate optargs to long options:
+      -dlopen=*|--mode=*|--tag=*)
+			func_opt_split "$opt"
+			set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"}
+			shift
+			;;
+
+      -\?|-h)		func_usage					;;
+      --help)		opt_help=:					;;
+      --version)	func_version					;;
+
+      -*)		func_fatal_help "unrecognized option \`$opt'"	;;
+
+      *)		nonopt="$opt"
+			break
+			;;
+    esac
+  done
+
+
+  case $host in
+    *cygwin* | *mingw* | *pw32* | *cegcc*)
+      # don't eliminate duplications in $postdeps and $predeps
+      opt_duplicate_compiler_generated_deps=:
       ;;
     *)
-      # If we have no mode, but dlfiles were specified, then do execute mode.
-      test -n "$execute_dlfiles" && mode=execute
+      opt_duplicate_compiler_generated_deps=$opt_duplicate_deps
+      ;;
+  esac
 
-      # Just use the default operation mode.
-      if test -z "$mode"; then
-	if test -n "$nonopt"; then
-	  $echo "$modename: warning: cannot infer operation mode from \`$nonopt'" 1>&2
-	else
-	  $echo "$modename: warning: cannot infer operation mode without MODE-ARGS" 1>&2
-	fi
+  # Having warned about all mis-specified options, bail out if
+  # anything was wrong.
+  $exit_cmd $EXIT_FAILURE
+}
+
+# func_check_version_match
+# Ensure that we are using m4 macros, and libtool script from the same
+# release of libtool.
+func_check_version_match ()
+{
+  if test "$package_revision" != "$macro_revision"; then
+    if test "$VERSION" != "$macro_version"; then
+      if test -z "$macro_version"; then
+        cat >&2 <<_LT_EOF
+$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
+$progname: definition of this LT_INIT comes from an older release.
+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
+$progname: and run autoconf again.
+_LT_EOF
+      else
+        cat >&2 <<_LT_EOF
+$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
+$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
+$progname: and run autoconf again.
+_LT_EOF
       fi
-      ;;
-    esac
+    else
+      cat >&2 <<_LT_EOF
+$progname: Version mismatch error.  This is $PACKAGE $VERSION, revision $package_revision,
+$progname: but the definition of this LT_INIT comes from revision $macro_revision.
+$progname: You should recreate aclocal.m4 with macros from revision $package_revision
+$progname: of $PACKAGE $VERSION and run autoconf again.
+_LT_EOF
+    fi
+
+    exit $EXIT_MISMATCH
+  fi
+}
+
+
+## ----------- ##
+##    Main.    ##
+## ----------- ##
+
+$opt_help || {
+  # Sanity checks first:
+  func_check_version_match
+
+  if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
+    func_fatal_configuration "not configured to build any kind of library"
   fi
 
+  test -z "$mode" && func_fatal_error "error: you must specify a MODE."
+
+
+  # Darwin sucks
+  eval std_shrext=\"$shrext_cmds\"
+
+
   # Only execute mode is allowed to have -dlopen flags.
   if test -n "$execute_dlfiles" && test "$mode" != execute; then
-    $echo "$modename: unrecognized option \`-dlopen'" 1>&2
-    $echo "$help" 1>&2
+    func_error "unrecognized option \`-dlopen'"
+    $ECHO "$help" 1>&2
     exit $EXIT_FAILURE
   fi
 
   # Change the help message to a mode-specific one.
   generic_help="$help"
-  help="Try \`$modename --help --mode=$mode' for more information."
+  help="Try \`$progname --help --mode=$mode' for more information."
+}
+
+
+# func_lalib_p file
+# True iff FILE is a libtool `.la' library or `.lo' object file.
+# This function is only a basic sanity check; it will hardly flush out
+# determined imposters.
+func_lalib_p ()
+{
+    test -f "$1" &&
+      $SED -e 4q "$1" 2>/dev/null \
+        | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1
+}
+
+# func_lalib_unsafe_p file
+# True iff FILE is a libtool `.la' library or `.lo' object file.
+# This function implements the same check as func_lalib_p without
+# resorting to external programs.  To this end, it redirects stdin and
+# closes it afterwards, without saving the original file descriptor.
+# As a safety measure, use it only where a negative result would be
+# fatal anyway.  Works if `file' does not exist.
+func_lalib_unsafe_p ()
+{
+    lalib_p=no
+    if test -f "$1" && test -r "$1" && exec 5<&0 <"$1"; then
+	for lalib_p_l in 1 2 3 4
+	do
+	    read lalib_p_line
+	    case "$lalib_p_line" in
+		\#\ Generated\ by\ *$PACKAGE* ) lalib_p=yes; break;;
+	    esac
+	done
+	exec 0<&5 5<&-
+    fi
+    test "$lalib_p" = yes
+}
+
+# func_ltwrapper_script_p file
+# True iff FILE is a libtool wrapper script
+# This function is only a basic sanity check; it will hardly flush out
+# determined imposters.
+func_ltwrapper_script_p ()
+{
+    func_lalib_p "$1"
+}
+
+# func_ltwrapper_executable_p file
+# True iff FILE is a libtool wrapper executable
+# This function is only a basic sanity check; it will hardly flush out
+# determined imposters.
+func_ltwrapper_executable_p ()
+{
+    func_ltwrapper_exec_suffix=
+    case $1 in
+    *.exe) ;;
+    *) func_ltwrapper_exec_suffix=.exe ;;
+    esac
+    $GREP "$magic_exe" "$1$func_ltwrapper_exec_suffix" >/dev/null 2>&1
+}
+
+# func_ltwrapper_scriptname file
+# Assumes file is an ltwrapper_executable
+# uses $file to determine the appropriate filename for a
+# temporary ltwrapper_script.
+func_ltwrapper_scriptname ()
+{
+    func_ltwrapper_scriptname_result=""
+    if func_ltwrapper_executable_p "$1"; then
+	func_dirname_and_basename "$1" "" "."
+	func_stripname '' '.exe' "$func_basename_result"
+	func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
+    fi
+}
+
+# func_ltwrapper_p file
+# True iff FILE is a libtool wrapper script or wrapper executable
+# This function is only a basic sanity check; it will hardly flush out
+# determined imposters.
+func_ltwrapper_p ()
+{
+    func_ltwrapper_script_p "$1" || func_ltwrapper_executable_p "$1"
+}
+
+
+# func_execute_cmds commands fail_cmd
+# Execute tilde-delimited COMMANDS.
+# If FAIL_CMD is given, eval that upon failure.
+# FAIL_CMD may read-access the current command in variable CMD!
+func_execute_cmds ()
+{
+    $opt_debug
+    save_ifs=$IFS; IFS='~'
+    for cmd in $1; do
+      IFS=$save_ifs
+      eval cmd=\"$cmd\"
+      func_show_eval "$cmd" "${2-:}"
+    done
+    IFS=$save_ifs
+}
 
-  # These modes are in order of execution frequency so that they run quickly.
-  case $mode in
-  # libtool compile mode
-  compile)
-    modename="$modename: compile"
+
+# func_source file
+# Source FILE, adding directory component if necessary.
+# Note that it is not necessary on cygwin/mingw to append a dot to
+# FILE even if both FILE and FILE.exe exist: automatic-append-.exe
+# behavior happens only for exec(3), not for open(2)!  Also, sourcing
+# `FILE.' does not work on cygwin managed mounts.
+func_source ()
+{
+    $opt_debug
+    case $1 in
+    */* | *\\*)	. "$1" ;;
+    *)		. "./$1" ;;
+    esac
+}
+
+
+# func_infer_tag arg
+# Infer tagged configuration to use if any are available and
+# if one wasn't chosen via the "--tag" command line option.
+# Only attempt this if the compiler in the base compile
+# command doesn't match the default compiler.
+# arg is usually of the form 'gcc ...'
+func_infer_tag ()
+{
+    $opt_debug
+    if test -n "$available_tags" && test -z "$tagname"; then
+      CC_quoted=
+      for arg in $CC; do
+        func_quote_for_eval "$arg"
+	CC_quoted="$CC_quoted $func_quote_for_eval_result"
+      done
+      case $@ in
+      # Blanks in the command may have been stripped by the calling shell,
+      # but not from the CC environment variable when configure was run.
+      " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*) ;;
+      # Blanks at the start of $base_compile will cause this to fail
+      # if we don't check for them as well.
+      *)
+	for z in $available_tags; do
+	  if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
+	    # Evaluate the configuration.
+	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
+	    CC_quoted=
+	    for arg in $CC; do
+	      # Double-quote args containing other shell metacharacters.
+	      func_quote_for_eval "$arg"
+	      CC_quoted="$CC_quoted $func_quote_for_eval_result"
+	    done
+	    case "$@ " in
+	      " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*)
+	      # The compiler in the base compile command matches
+	      # the one in the tagged configuration.
+	      # Assume this is the tagged configuration we want.
+	      tagname=$z
+	      break
+	      ;;
+	    esac
+	  fi
+	done
+	# If $tagname still isn't set, then no tagged configuration
+	# was found and let the user know that the "--tag" command
+	# line option must be used.
+	if test -z "$tagname"; then
+	  func_echo "unable to infer tagged configuration"
+	  func_fatal_error "specify a tag with \`--tag'"
+#	else
+#	  func_verbose "using $tagname tagged configuration"
+	fi
+	;;
+      esac
+    fi
+}
+
+
+
+# func_write_libtool_object output_name pic_name nonpic_name
+# Create a libtool object file (analogous to a ".la" file),
+# but don't create it if we're doing a dry run.
+func_write_libtool_object ()
+{
+    write_libobj=${1}
+    if test "$build_libtool_libs" = yes; then
+      write_lobj=\'${2}\'
+    else
+      write_lobj=none
+    fi
+
+    if test "$build_old_libs" = yes; then
+      write_oldobj=\'${3}\'
+    else
+      write_oldobj=none
+    fi
+
+    $opt_dry_run || {
+      cat >${write_libobj}T <<EOF
+# $write_libobj - a libtool object file
+# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+#
+# Please DO NOT delete this file!
+# It is necessary for linking the library.
+
+# Name of the PIC object.
+pic_object=$write_lobj
+
+# Name of the non-PIC object
+non_pic_object=$write_oldobj
+
+EOF
+      $MV "${write_libobj}T" "${write_libobj}"
+    }
+}
+
+# func_mode_compile arg...
+func_mode_compile ()
+{
+    $opt_debug
     # Get the compilation command and the source file.
     base_compile=
     srcfile="$nonopt"  #  always keep a non-empty value in "srcfile"
@@ -649,6 +1109,7 @@ if test -z "$show_help"; then
     arg_mode=normal
     libobj=
     later=
+    pie_flag=
 
     for arg
     do
@@ -669,15 +1130,18 @@ if test -z "$show_help"; then
 	# Accept any command-line options.
 	case $arg in
 	-o)
-	  if test -n "$libobj" ; then
-	    $echo "$modename: you cannot specify \`-o' more than once" 1>&2
-	    exit $EXIT_FAILURE
-	  fi
+	  test -n "$libobj" && \
+	    func_fatal_error "you cannot specify \`-o' more than once"
 	  arg_mode=target
 	  continue
 	  ;;
 
-	-static | -prefer-pic | -prefer-non-pic)
+	-pie | -fpie | -fPIE)
+          pie_flag="$pie_flag $arg"
+	  continue
+	  ;;
+
+	-shared | -static | -prefer-pic | -prefer-non-pic)
 	  later="$later $arg"
 	  continue
 	  ;;
@@ -693,31 +1157,25 @@ if test -z "$show_help"; then
 	  ;;            #  replaced later.  I would guess that would be a bug.
 
 	-Wc,*)
-	  args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"`
+	  func_stripname '-Wc,' '' "$arg"
+	  args=$func_stripname_result
 	  lastarg=
 	  save_ifs="$IFS"; IFS=','
- 	  for arg in $args; do
+	  for arg in $args; do
 	    IFS="$save_ifs"
-
-	    # Double-quote args containing other shell metacharacters.
-	    # Many Bourne shells cannot handle close brackets correctly
-	    # in scan sets, so we specify it separately.
-	    case $arg in
-	      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	      arg="\"$arg\""
-	      ;;
-	    esac
-	    lastarg="$lastarg $arg"
+	    func_quote_for_eval "$arg"
+	    lastarg="$lastarg $func_quote_for_eval_result"
 	  done
 	  IFS="$save_ifs"
-	  lastarg=`$echo "X$lastarg" | $Xsed -e "s/^ //"`
+	  func_stripname ' ' '' "$lastarg"
+	  lastarg=$func_stripname_result
 
 	  # Add the arguments to base_compile.
 	  base_compile="$base_compile $lastarg"
 	  continue
 	  ;;
 
-	* )
+	*)
 	  # Accept the current argument as the source file.
 	  # The previous "srcfile" becomes the current argument.
 	  #
@@ -729,65 +1187,42 @@ if test -z "$show_help"; then
       esac    #  case $arg_mode
 
       # Aesthetically quote the previous argument.
-      lastarg=`$echo "X$lastarg" | $Xsed -e "$sed_quote_subst"`
-
-      case $lastarg in
-      # Double-quote args containing other shell metacharacters.
-      # Many Bourne shells cannot handle close brackets correctly
-      # in scan sets, and some SunOS ksh mistreat backslash-escaping
-      # in scan sets (worked around with variable expansion),
-      # and furthermore cannot handle '|' '&' '(' ')' in scan sets 
-      # at all, so we specify them separately.
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	lastarg="\"$lastarg\""
-	;;
-      esac
-
-      base_compile="$base_compile $lastarg"
+      func_quote_for_eval "$lastarg"
+      base_compile="$base_compile $func_quote_for_eval_result"
     done # for arg
 
     case $arg_mode in
     arg)
-      $echo "$modename: you must specify an argument for -Xcompile"
-      exit $EXIT_FAILURE
+      func_fatal_error "you must specify an argument for -Xcompile"
       ;;
     target)
-      $echo "$modename: you must specify a target with \`-o'" 1>&2
-      exit $EXIT_FAILURE
+      func_fatal_error "you must specify a target with \`-o'"
       ;;
     *)
       # Get the name of the library object.
-      [ -z "$libobj" ] && libobj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%'`
+      test -z "$libobj" && {
+	func_basename "$srcfile"
+	libobj="$func_basename_result"
+      }
       ;;
     esac
 
     # Recognize several different file suffixes.
     # If the user specifies -o file.o, it is replaced with file.lo
-    xform='[cCFSifmso]'
     case $libobj in
-    *.ada) xform=ada ;;
-    *.adb) xform=adb ;;
-    *.ads) xform=ads ;;
-    *.asm) xform=asm ;;
-    *.c++) xform=c++ ;;
-    *.cc) xform=cc ;;
-    *.ii) xform=ii ;;
-    *.class) xform=class ;;
-    *.cpp) xform=cpp ;;
-    *.cxx) xform=cxx ;;
-    *.f90) xform=f90 ;;
-    *.for) xform=for ;;
-    *.java) xform=java ;;
-    *.obj) xform=obj ;;
+    *.[cCFSifmso] | \
+    *.ada | *.adb | *.ads | *.asm | \
+    *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
+    *.[fF][09]? | *.for | *.java | *.obj | *.sx)
+      func_xform "$libobj"
+      libobj=$func_xform_result
+      ;;
     esac
 
-    libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
-
     case $libobj in
-    *.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;;
+    *.lo) func_lo2o "$libobj"; obj=$func_lo2o_result ;;
     *)
-      $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2
-      exit $EXIT_FAILURE
+      func_fatal_error "cannot determine name of library object from \`$libobj'"
       ;;
     esac
 
@@ -795,7 +1230,15 @@ if test -z "$show_help"; then
 
     for arg in $later; do
       case $arg in
+      -shared)
+	test "$build_libtool_libs" != yes && \
+	  func_fatal_configuration "can not build a shared library"
+	build_old_libs=no
+	continue
+	;;
+
       -static)
+	build_libtool_libs=no
 	build_old_libs=yes
 	continue
 	;;
@@ -812,28 +1255,17 @@ if test -z "$show_help"; then
       esac
     done
 
-    qlibobj=`$echo "X$libobj" | $Xsed -e "$sed_quote_subst"`
-    case $qlibobj in
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	qlibobj="\"$qlibobj\"" ;;
-    esac
-    test "X$libobj" != "X$qlibobj" \
-	&& $echo "X$libobj" | grep '[]~#^*{};<>?"'"'"' 	&()|`$[]' \
-	&& $echo "$modename: libobj name \`$libobj' may not contain shell special characters."
-    objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
-    xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
-    if test "X$xdir" = "X$obj"; then
-      xdir=
-    else
-      xdir=$xdir/
-    fi
+    func_quote_for_eval "$libobj"
+    test "X$libobj" != "X$func_quote_for_eval_result" \
+      && $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"'	 &()|`$[]' \
+      && func_warning "libobj name \`$libobj' may not contain shell special characters."
+    func_dirname_and_basename "$obj" "/" ""
+    objname="$func_basename_result"
+    xdir="$func_dirname_result"
     lobj=${xdir}$objdir/$objname
 
-    if test -z "$base_compile"; then
-      $echo "$modename: you must specify a compilation command" 1>&2
-      $echo "$help" 1>&2
-      exit $EXIT_FAILURE
-    fi
+    test -z "$base_compile" && \
+      func_fatal_help "you must specify a compilation command"
 
     # Delete any leftover library objects.
     if test "$build_old_libs" = yes; then
@@ -842,12 +1274,9 @@ if test -z "$show_help"; then
       removelist="$lobj $libobj ${libobj}T"
     fi
 
-    $run $rm $removelist
-    trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15
-
     # On Cygwin there's no "real" PIC flag so we must build both object types
     case $host_os in
-    cygwin* | mingw* | pw32* | os2*)
+    cygwin* | mingw* | pw32* | os2* | cegcc*)
       pic_mode=default
       ;;
     esac
@@ -859,10 +1288,8 @@ if test -z "$show_help"; then
     # Calculate the filename of the output object if compiler does
     # not support -o with -c
     if test "$compiler_c_o" = no; then
-      output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
+      output_obj=`$ECHO "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
       lockfile="$output_obj.lock"
-      removelist="$removelist $output_obj $lockfile"
-      trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15
     else
       output_obj=
       need_locks=no
@@ -872,13 +1299,13 @@ if test -z "$show_help"; then
     # Lock this critical section if it is needed
     # We use this script file to make the link, it avoids creating a new file
     if test "$need_locks" = yes; then
-      until $run ln "$progpath" "$lockfile" 2>/dev/null; do
-	$show "Waiting for $lockfile to be removed"
+      until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
+	func_echo "Waiting for $lockfile to be removed"
 	sleep 2
       done
     elif test "$need_locks" = warn; then
       if test -f "$lockfile"; then
-	$echo "\
+	$ECHO "\
 *** ERROR, $lockfile exists and contains:
 `cat $lockfile 2>/dev/null`
 
@@ -889,34 +1316,22 @@ repeat this compilation, it may succeed, by chance, but you had better
 avoid parallel builds (make -j) in this platform, or get a better
 compiler."
 
-	$run $rm $removelist
+	$opt_dry_run || $RM $removelist
 	exit $EXIT_FAILURE
       fi
-      $echo "$srcfile" > "$lockfile"
+      removelist="$removelist $output_obj"
+      $ECHO "$srcfile" > "$lockfile"
     fi
 
+    $opt_dry_run || $RM $removelist
+    removelist="$removelist $lockfile"
+    trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15
+
     if test -n "$fix_srcfile_path"; then
       eval srcfile=\"$fix_srcfile_path\"
     fi
-    qsrcfile=`$echo "X$srcfile" | $Xsed -e "$sed_quote_subst"`
-    case $qsrcfile in
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-      qsrcfile="\"$qsrcfile\"" ;;
-    esac
-
-    $run $rm "$libobj" "${libobj}T"
-
-    # Create a libtool object file (analogous to a ".la" file),
-    # but don't create it if we're doing a dry run.
-    test -z "$run" && cat > ${libobj}T <<EOF
-# $libobj - a libtool object file
-# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# Name of the PIC object.
-EOF
+    func_quote_for_eval "$srcfile"
+    qsrcfile=$func_quote_for_eval_result
 
     # Only build a PIC object if we are building libtool libraries.
     if test "$build_libtool_libs" = yes; then
@@ -930,32 +1345,19 @@ EOF
 	command="$base_compile $qsrcfile"
       fi
 
-      if test ! -d "${xdir}$objdir"; then
-	$show "$mkdir ${xdir}$objdir"
-	$run $mkdir ${xdir}$objdir
-	exit_status=$?
-	if test "$exit_status" -ne 0 && test ! -d "${xdir}$objdir"; then
-	  exit $exit_status
-	fi
-      fi
+      func_mkdir_p "$xdir$objdir"
 
       if test -z "$output_obj"; then
 	# Place PIC objects in $objdir
 	command="$command -o $lobj"
       fi
 
-      $run $rm "$lobj" "$output_obj"
-
-      $show "$command"
-      if $run eval "$command"; then :
-      else
-	test -n "$output_obj" && $run $rm $removelist
-	exit $EXIT_FAILURE
-      fi
+      func_show_eval_locale "$command"	\
+          'test -n "$output_obj" && $RM $removelist; exit $EXIT_FAILURE'
 
       if test "$need_locks" = warn &&
 	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
-	$echo "\
+	$ECHO "\
 *** ERROR, $lockfile contains:
 `cat $lockfile 2>/dev/null`
 
@@ -969,45 +1371,27 @@ repeat this compilation, it may succeed, by chance, but you had better
 avoid parallel builds (make -j) in this platform, or get a better
 compiler."
 
-	$run $rm $removelist
+	$opt_dry_run || $RM $removelist
 	exit $EXIT_FAILURE
       fi
 
       # Just move the object if needed, then go on to compile the next one
       if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then
-	$show "$mv $output_obj $lobj"
-	if $run $mv $output_obj $lobj; then :
-	else
-	  error=$?
-	  $run $rm $removelist
-	  exit $error
-	fi
+	func_show_eval '$MV "$output_obj" "$lobj"' \
+	  'error=$?; $opt_dry_run || $RM $removelist; exit $error'
       fi
 
-      # Append the name of the PIC object to the libtool object file.
-      test -z "$run" && cat >> ${libobj}T <<EOF
-pic_object='$objdir/$objname'
-
-EOF
-
       # Allow error messages only from the first compilation.
       if test "$suppress_opt" = yes; then
-        suppress_output=' >/dev/null 2>&1'
+	suppress_output=' >/dev/null 2>&1'
       fi
-    else
-      # No PIC object so indicate it doesn't exist in the libtool
-      # object file.
-      test -z "$run" && cat >> ${libobj}T <<EOF
-pic_object=none
-
-EOF
     fi
 
     # Only build a position-dependent object if we build old libraries.
     if test "$build_old_libs" = yes; then
       if test "$pic_mode" != yes; then
 	# Don't build PIC code
-	command="$base_compile $qsrcfile"
+	command="$base_compile $qsrcfile$pie_flag"
       else
 	command="$base_compile $qsrcfile $pic_flag"
       fi
@@ -1017,17 +1401,12 @@ EOF
 
       # Suppress compiler output if we already did a PIC compilation.
       command="$command$suppress_output"
-      $run $rm "$obj" "$output_obj"
-      $show "$command"
-      if $run eval "$command"; then :
-      else
-	$run $rm $removelist
-	exit $EXIT_FAILURE
-      fi
+      func_show_eval_locale "$command" \
+        '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
 
       if test "$need_locks" = warn &&
 	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
-	$echo "\
+	$ECHO "\
 *** ERROR, $lockfile contains:
 `cat $lockfile 2>/dev/null`
 
@@ -1041,53 +1420,2620 @@ repeat this compilation, it may succeed, by chance, but you had better
 avoid parallel builds (make -j) in this platform, or get a better
 compiler."
 
-	$run $rm $removelist
+	$opt_dry_run || $RM $removelist
 	exit $EXIT_FAILURE
       fi
 
       # Just move the object if needed
       if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then
-	$show "$mv $output_obj $obj"
-	if $run $mv $output_obj $obj; then :
+	func_show_eval '$MV "$output_obj" "$obj"' \
+	  'error=$?; $opt_dry_run || $RM $removelist; exit $error'
+      fi
+    fi
+
+    $opt_dry_run || {
+      func_write_libtool_object "$libobj" "$objdir/$objname" "$objname"
+
+      # Unlock the critical section if it was locked
+      if test "$need_locks" != no; then
+	removelist=$lockfile
+        $RM "$lockfile"
+      fi
+    }
+
+    exit $EXIT_SUCCESS
+}
+
+$opt_help || {
+test "$mode" = compile && func_mode_compile ${1+"$@"}
+}
+
+func_mode_help ()
+{
+    # We need to display help for each of the modes.
+    case $mode in
+      "")
+        # Generic help is extracted from the usage comments
+        # at the start of this file.
+        func_help
+        ;;
+
+      clean)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=clean RM [RM-OPTION]... FILE...
+
+Remove files from the build directory.
+
+RM is the name of the program to use to delete files associated with each FILE
+(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
+to RM.
+
+If FILE is a libtool library, object or program, all the files associated
+with it are deleted. Otherwise, only FILE itself is deleted using RM."
+        ;;
+
+      compile)
+      $ECHO \
+"Usage: $progname [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE
+
+Compile a source file into a libtool library object.
+
+This mode accepts the following additional options:
+
+  -o OUTPUT-FILE    set the output file name to OUTPUT-FILE
+  -no-suppress      do not suppress compiler output for multiple passes
+  -prefer-pic       try to building PIC objects only
+  -prefer-non-pic   try to building non-PIC objects only
+  -shared           do not build a \`.o' file suitable for static linking
+  -static           only build a \`.o' file suitable for static linking
+
+COMPILE-COMMAND is a command to be used in creating a \`standard' object file
+from the given SOURCEFILE.
+
+The output file name is determined by removing the directory component from
+SOURCEFILE, then substituting the C source code suffix \`.c' with the
+library object suffix, \`.lo'."
+        ;;
+
+      execute)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=execute COMMAND [ARGS]...
+
+Automatically set library path, then run a program.
+
+This mode accepts the following additional options:
+
+  -dlopen FILE      add the directory containing FILE to the library path
+
+This mode sets the library path environment variable according to \`-dlopen'
+flags.
+
+If any of the ARGS are libtool executable wrappers, then they are translated
+into their corresponding uninstalled binary, and any of their required library
+directories are added to the library path.
+
+Then, COMMAND is executed, with ARGS as arguments."
+        ;;
+
+      finish)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=finish [LIBDIR]...
+
+Complete the installation of libtool libraries.
+
+Each LIBDIR is a directory that contains libtool libraries.
+
+The commands that this mode executes may require superuser privileges.  Use
+the \`--dry-run' option if you just want to see what would be executed."
+        ;;
+
+      install)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=install INSTALL-COMMAND...
+
+Install executables or libraries.
+
+INSTALL-COMMAND is the installation command.  The first component should be
+either the \`install' or \`cp' program.
+
+The following components of INSTALL-COMMAND are treated specially:
+
+  -inst-prefix PREFIX-DIR  Use PREFIX-DIR as a staging area for installation
+
+The rest of the components are interpreted as arguments to that command (only
+BSD-compatible install options are recognized)."
+        ;;
+
+      link)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=link LINK-COMMAND...
+
+Link object files or libraries together to form another library, or to
+create an executable program.
+
+LINK-COMMAND is a command using the C compiler that you would use to create
+a program from several object files.
+
+The following components of LINK-COMMAND are treated specially:
+
+  -all-static       do not do any dynamic linking at all
+  -avoid-version    do not add a version suffix if possible
+  -dlopen FILE      \`-dlpreopen' FILE if it cannot be dlopened at runtime
+  -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
+  -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
+  -export-symbols SYMFILE
+                    try to export only the symbols listed in SYMFILE
+  -export-symbols-regex REGEX
+                    try to export only the symbols matching REGEX
+  -LLIBDIR          search LIBDIR for required installed libraries
+  -lNAME            OUTPUT-FILE requires the installed library libNAME
+  -module           build a library that can dlopened
+  -no-fast-install  disable the fast-install mode
+  -no-install       link a not-installable executable
+  -no-undefined     declare that a library does not refer to external symbols
+  -o OUTPUT-FILE    create OUTPUT-FILE from the specified objects
+  -objectlist FILE  Use a list of object files found in FILE to specify objects
+  -precious-files-regex REGEX
+                    don't remove output files matching REGEX
+  -release RELEASE  specify package release information
+  -rpath LIBDIR     the created library will eventually be installed in LIBDIR
+  -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
+  -shared           only do dynamic linking of libtool libraries
+  -shrext SUFFIX    override the standard shared library file extension
+  -static           do not do any dynamic linking of uninstalled libtool libraries
+  -static-libtool-libs
+                    do not do any dynamic linking of libtool libraries
+  -version-info CURRENT[:REVISION[:AGE]]
+                    specify library version info [each variable defaults to 0]
+  -weak LIBNAME     declare that the target provides the LIBNAME interface
+
+All other options (arguments beginning with \`-') are ignored.
+
+Every other argument is treated as a filename.  Files ending in \`.la' are
+treated as uninstalled libtool libraries, other files are standard or library
+object files.
+
+If the OUTPUT-FILE ends in \`.la', then a libtool library is created,
+only library objects (\`.lo' files) may be specified, and \`-rpath' is
+required, except when creating a convenience library.
+
+If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created
+using \`ar' and \`ranlib', or on Windows using \`lib'.
+
+If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file
+is created, otherwise an executable program is created."
+        ;;
+
+      uninstall)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE...
+
+Remove libraries from an installation directory.
+
+RM is the name of the program to use to delete files associated with each FILE
+(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
+to RM.
+
+If FILE is a libtool library, all the files associated with it are deleted.
+Otherwise, only FILE itself is deleted using RM."
+        ;;
+
+      *)
+        func_fatal_help "invalid operation mode \`$mode'"
+        ;;
+    esac
+
+    $ECHO
+    $ECHO "Try \`$progname --help' for more information about other modes."
+
+    exit $?
+}
+
+  # Now that we've collected a possible --mode arg, show help if necessary
+  $opt_help && func_mode_help
+
+
+# func_mode_execute arg...
+func_mode_execute ()
+{
+    $opt_debug
+    # The first argument is the command name.
+    cmd="$nonopt"
+    test -z "$cmd" && \
+      func_fatal_help "you must specify a COMMAND"
+
+    # Handle -dlopen flags immediately.
+    for file in $execute_dlfiles; do
+      test -f "$file" \
+	|| func_fatal_help "\`$file' is not a file"
+
+      dir=
+      case $file in
+      *.la)
+	# Check to see that this really is a libtool archive.
+	func_lalib_unsafe_p "$file" \
+	  || func_fatal_help "\`$lib' is not a valid libtool archive"
+
+	# Read the libtool library.
+	dlname=
+	library_names=
+	func_source "$file"
+
+	# Skip this library if it cannot be dlopened.
+	if test -z "$dlname"; then
+	  # Warn if it was a shared library.
+	  test -n "$library_names" && \
+	    func_warning "\`$file' was not linked with \`-export-dynamic'"
+	  continue
+	fi
+
+	func_dirname "$file" "" "."
+	dir="$func_dirname_result"
+
+	if test -f "$dir/$objdir/$dlname"; then
+	  dir="$dir/$objdir"
 	else
-	  error=$?
-	  $run $rm $removelist
-	  exit $error
+	  if test ! -f "$dir/$dlname"; then
+	    func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'"
+	  fi
 	fi
+	;;
+
+      *.lo)
+	# Just add the directory containing the .lo file.
+	func_dirname "$file" "" "."
+	dir="$func_dirname_result"
+	;;
+
+      *)
+	func_warning "\`-dlopen' is ignored for non-libtool libraries and objects"
+	continue
+	;;
+      esac
+
+      # Get the absolute pathname.
+      absdir=`cd "$dir" && pwd`
+      test -n "$absdir" && dir="$absdir"
+
+      # Now add the directory to shlibpath_var.
+      if eval "test -z \"\$$shlibpath_var\""; then
+	eval "$shlibpath_var=\"\$dir\""
+      else
+	eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\""
       fi
+    done
 
-      # Append the name of the non-PIC object the libtool object file.
-      # Only append if the libtool object file exists.
-      test -z "$run" && cat >> ${libobj}T <<EOF
-# Name of the non-PIC object.
-non_pic_object='$objname'
+    # This variable tells wrapper scripts just to set shlibpath_var
+    # rather than running their programs.
+    libtool_execute_magic="$magic"
 
-EOF
+    # Check if any of the arguments is a wrapper script.
+    args=
+    for file
+    do
+      case $file in
+      -*) ;;
+      *)
+	# Do a test to see if this is really a libtool program.
+	if func_ltwrapper_script_p "$file"; then
+	  func_source "$file"
+	  # Transform arg to wrapped name.
+	  file="$progdir/$program"
+	elif func_ltwrapper_executable_p "$file"; then
+	  func_ltwrapper_scriptname "$file"
+	  func_source "$func_ltwrapper_scriptname_result"
+	  # Transform arg to wrapped name.
+	  file="$progdir/$program"
+	fi
+	;;
+      esac
+      # Quote arguments (to preserve shell metacharacters).
+      func_quote_for_eval "$file"
+      args="$args $func_quote_for_eval_result"
+    done
+
+    if test "X$opt_dry_run" = Xfalse; then
+      if test -n "$shlibpath_var"; then
+	# Export the shlibpath_var.
+	eval "export $shlibpath_var"
+      fi
+
+      # Restore saved environment variables
+      for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+      do
+	eval "if test \"\${save_$lt_var+set}\" = set; then
+                $lt_var=\$save_$lt_var; export $lt_var
+	      else
+		$lt_unset $lt_var
+	      fi"
+      done
+
+      # Now prepare to actually exec the command.
+      exec_cmd="\$cmd$args"
     else
-      # Append the name of the non-PIC object the libtool object file.
-      # Only append if the libtool object file exists.
-      test -z "$run" && cat >> ${libobj}T <<EOF
-# Name of the non-PIC object.
-non_pic_object=none
+      # Display what would be done.
+      if test -n "$shlibpath_var"; then
+	eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
+	$ECHO "export $shlibpath_var"
+      fi
+      $ECHO "$cmd$args"
+      exit $EXIT_SUCCESS
+    fi
+}
 
-EOF
+test "$mode" = execute && func_mode_execute ${1+"$@"}
+
+
+# func_mode_finish arg...
+func_mode_finish ()
+{
+    $opt_debug
+    libdirs="$nonopt"
+    admincmds=
+
+    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
+      for dir
+      do
+	libdirs="$libdirs $dir"
+      done
+
+      for libdir in $libdirs; do
+	if test -n "$finish_cmds"; then
+	  # Do each command in the finish commands.
+	  func_execute_cmds "$finish_cmds" 'admincmds="$admincmds
+'"$cmd"'"'
+	fi
+	if test -n "$finish_eval"; then
+	  # Do the single finish_eval.
+	  eval cmds=\"$finish_eval\"
+	  $opt_dry_run || eval "$cmds" || admincmds="$admincmds
+       $cmds"
+	fi
+      done
     fi
 
-    $run $mv "${libobj}T" "${libobj}"
+    # Exit here if they wanted silent mode.
+    $opt_silent && exit $EXIT_SUCCESS
+
+    $ECHO "X----------------------------------------------------------------------" | $Xsed
+    $ECHO "Libraries have been installed in:"
+    for libdir in $libdirs; do
+      $ECHO "   $libdir"
+    done
+    $ECHO
+    $ECHO "If you ever happen to want to link against installed libraries"
+    $ECHO "in a given directory, LIBDIR, you must either use libtool, and"
+    $ECHO "specify the full pathname of the library, or use the \`-LLIBDIR'"
+    $ECHO "flag during linking and do at least one of the following:"
+    if test -n "$shlibpath_var"; then
+      $ECHO "   - add LIBDIR to the \`$shlibpath_var' environment variable"
+      $ECHO "     during execution"
+    fi
+    if test -n "$runpath_var"; then
+      $ECHO "   - add LIBDIR to the \`$runpath_var' environment variable"
+      $ECHO "     during linking"
+    fi
+    if test -n "$hardcode_libdir_flag_spec"; then
+      libdir=LIBDIR
+      eval flag=\"$hardcode_libdir_flag_spec\"
 
-    # Unlock the critical section if it was locked
-    if test "$need_locks" != no; then
-      $run $rm "$lockfile"
+      $ECHO "   - use the \`$flag' linker flag"
+    fi
+    if test -n "$admincmds"; then
+      $ECHO "   - have your system administrator run these commands:$admincmds"
     fi
+    if test -f /etc/ld.so.conf; then
+      $ECHO "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
+    fi
+    $ECHO
 
+    $ECHO "See any operating system documentation about shared libraries for"
+    case $host in
+      solaris2.[6789]|solaris2.1[0-9])
+        $ECHO "more information, such as the ld(1), crle(1) and ld.so(8) manual"
+	$ECHO "pages."
+	;;
+      *)
+        $ECHO "more information, such as the ld(1) and ld.so(8) manual pages."
+        ;;
+    esac
+    $ECHO "X----------------------------------------------------------------------" | $Xsed
     exit $EXIT_SUCCESS
+}
+
+test "$mode" = finish && func_mode_finish ${1+"$@"}
+
+
+# func_mode_install arg...
+func_mode_install ()
+{
+    $opt_debug
+    # There may be an optional sh(1) argument at the beginning of
+    # install_prog (especially on Windows NT).
+    if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
+       # Allow the use of GNU shtool's install command.
+       $ECHO "X$nonopt" | $GREP shtool >/dev/null; then
+      # Aesthetically quote it.
+      func_quote_for_eval "$nonopt"
+      install_prog="$func_quote_for_eval_result "
+      arg=$1
+      shift
+    else
+      install_prog=
+      arg=$nonopt
+    fi
+
+    # The real first argument should be the name of the installation program.
+    # Aesthetically quote it.
+    func_quote_for_eval "$arg"
+    install_prog="$install_prog$func_quote_for_eval_result"
+
+    # We need to accept at least all the BSD install flags.
+    dest=
+    files=
+    opts=
+    prev=
+    install_type=
+    isdir=no
+    stripme=
+    for arg
+    do
+      if test -n "$dest"; then
+	files="$files $dest"
+	dest=$arg
+	continue
+      fi
+
+      case $arg in
+      -d) isdir=yes ;;
+      -f)
+	case " $install_prog " in
+	*[\\\ /]cp\ *) ;;
+	*) prev=$arg ;;
+	esac
+	;;
+      -g | -m | -o)
+	prev=$arg
+	;;
+      -s)
+	stripme=" -s"
+	continue
+	;;
+      -*)
+	;;
+      *)
+	# If the previous option needed an argument, then skip it.
+	if test -n "$prev"; then
+	  prev=
+	else
+	  dest=$arg
+	  continue
+	fi
+	;;
+      esac
+
+      # Aesthetically quote the argument.
+      func_quote_for_eval "$arg"
+      install_prog="$install_prog $func_quote_for_eval_result"
+    done
+
+    test -z "$install_prog" && \
+      func_fatal_help "you must specify an install program"
+
+    test -n "$prev" && \
+      func_fatal_help "the \`$prev' option requires an argument"
+
+    if test -z "$files"; then
+      if test -z "$dest"; then
+	func_fatal_help "no file or destination specified"
+      else
+	func_fatal_help "you must specify a destination"
+      fi
+    fi
+
+    # Strip any trailing slash from the destination.
+    func_stripname '' '/' "$dest"
+    dest=$func_stripname_result
+
+    # Check to see that the destination is a directory.
+    test -d "$dest" && isdir=yes
+    if test "$isdir" = yes; then
+      destdir="$dest"
+      destname=
+    else
+      func_dirname_and_basename "$dest" "" "."
+      destdir="$func_dirname_result"
+      destname="$func_basename_result"
+
+      # Not a directory, so check to see that there is only one file specified.
+      set dummy $files; shift
+      test "$#" -gt 1 && \
+	func_fatal_help "\`$dest' is not a directory"
+    fi
+    case $destdir in
+    [\\/]* | [A-Za-z]:[\\/]*) ;;
+    *)
+      for file in $files; do
+	case $file in
+	*.lo) ;;
+	*)
+	  func_fatal_help "\`$destdir' must be an absolute directory name"
+	  ;;
+	esac
+      done
+      ;;
+    esac
+
+    # This variable tells wrapper scripts just to set variables rather
+    # than running their programs.
+    libtool_install_magic="$magic"
+
+    staticlibs=
+    future_libdirs=
+    current_libdirs=
+    for file in $files; do
+
+      # Do each installation.
+      case $file in
+      *.$libext)
+	# Do the static libraries later.
+	staticlibs="$staticlibs $file"
+	;;
+
+      *.la)
+	# Check to see that this really is a libtool archive.
+	func_lalib_unsafe_p "$file" \
+	  || func_fatal_help "\`$file' is not a valid libtool archive"
+
+	library_names=
+	old_library=
+	relink_command=
+	func_source "$file"
+
+	# Add the libdir to current_libdirs if it is the destination.
+	if test "X$destdir" = "X$libdir"; then
+	  case "$current_libdirs " in
+	  *" $libdir "*) ;;
+	  *) current_libdirs="$current_libdirs $libdir" ;;
+	  esac
+	else
+	  # Note the libdir as a future libdir.
+	  case "$future_libdirs " in
+	  *" $libdir "*) ;;
+	  *) future_libdirs="$future_libdirs $libdir" ;;
+	  esac
+	fi
+
+	func_dirname "$file" "/" ""
+	dir="$func_dirname_result"
+	dir="$dir$objdir"
+
+	if test -n "$relink_command"; then
+	  # Determine the prefix the user has applied to our future dir.
+	  inst_prefix_dir=`$ECHO "X$destdir" | $Xsed -e "s%$libdir\$%%"`
+
+	  # Don't allow the user to place us outside of our expected
+	  # location b/c this prevents finding dependent libraries that
+	  # are installed to the same prefix.
+	  # At present, this check doesn't affect windows .dll's that
+	  # are installed into $libdir/../bin (currently, that works fine)
+	  # but it's something to keep an eye on.
+	  test "$inst_prefix_dir" = "$destdir" && \
+	    func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir"
+
+	  if test -n "$inst_prefix_dir"; then
+	    # Stick the inst_prefix_dir data into the link command.
+	    relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
+	  else
+	    relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%%"`
+	  fi
+
+	  func_warning "relinking \`$file'"
+	  func_show_eval "$relink_command" \
+	    'func_fatal_error "error: relink \`$file'\'' with the above command before installing it"'
+	fi
+
+	# See the names of the shared library.
+	set dummy $library_names; shift
+	if test -n "$1"; then
+	  realname="$1"
+	  shift
+
+	  srcname="$realname"
+	  test -n "$relink_command" && srcname="$realname"T
+
+	  # Install the shared library and build the symlinks.
+	  func_show_eval "$install_prog $dir/$srcname $destdir/$realname" \
+	      'exit $?'
+	  tstripme="$stripme"
+	  case $host_os in
+	  cygwin* | mingw* | pw32* | cegcc*)
+	    case $realname in
+	    *.dll.a)
+	      tstripme=""
+	      ;;
+	    esac
+	    ;;
+	  esac
+	  if test -n "$tstripme" && test -n "$striplib"; then
+	    func_show_eval "$striplib $destdir/$realname" 'exit $?'
+	  fi
+
+	  if test "$#" -gt 0; then
+	    # Delete the old symlinks, and create new ones.
+	    # Try `ln -sf' first, because the `ln' binary might depend on
+	    # the symlink we replace!  Solaris /bin/ln does not understand -f,
+	    # so we also need to try rm && ln -s.
+	    for linkname
+	    do
+	      test "$linkname" != "$realname" \
+		&& func_show_eval "(cd $destdir && { $LN_S -f $realname $linkname || { $RM $linkname && $LN_S $realname $linkname; }; })"
+	    done
+	  fi
+
+	  # Do each command in the postinstall commands.
+	  lib="$destdir/$realname"
+	  func_execute_cmds "$postinstall_cmds" 'exit $?'
+	fi
+
+	# Install the pseudo-library for information purposes.
+	func_basename "$file"
+	name="$func_basename_result"
+	instname="$dir/$name"i
+	func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
+
+	# Maybe install the static library, too.
+	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
+	;;
+
+      *.lo)
+	# Install (i.e. copy) a libtool object.
+
+	# Figure out destination file name, if it wasn't already specified.
+	if test -n "$destname"; then
+	  destfile="$destdir/$destname"
+	else
+	  func_basename "$file"
+	  destfile="$func_basename_result"
+	  destfile="$destdir/$destfile"
+	fi
+
+	# Deduce the name of the destination old-style object file.
+	case $destfile in
+	*.lo)
+	  func_lo2o "$destfile"
+	  staticdest=$func_lo2o_result
+	  ;;
+	*.$objext)
+	  staticdest="$destfile"
+	  destfile=
+	  ;;
+	*)
+	  func_fatal_help "cannot copy a libtool object to \`$destfile'"
+	  ;;
+	esac
+
+	# Install the libtool object if requested.
+	test -n "$destfile" && \
+	  func_show_eval "$install_prog $file $destfile" 'exit $?'
+
+	# Install the old object if enabled.
+	if test "$build_old_libs" = yes; then
+	  # Deduce the name of the old-style object file.
+	  func_lo2o "$file"
+	  staticobj=$func_lo2o_result
+	  func_show_eval "$install_prog \$staticobj \$staticdest" 'exit $?'
+	fi
+	exit $EXIT_SUCCESS
+	;;
+
+      *)
+	# Figure out destination file name, if it wasn't already specified.
+	if test -n "$destname"; then
+	  destfile="$destdir/$destname"
+	else
+	  func_basename "$file"
+	  destfile="$func_basename_result"
+	  destfile="$destdir/$destfile"
+	fi
+
+	# If the file is missing, and there is a .exe on the end, strip it
+	# because it is most likely a libtool script we actually want to
+	# install
+	stripped_ext=""
+	case $file in
+	  *.exe)
+	    if test ! -f "$file"; then
+	      func_stripname '' '.exe' "$file"
+	      file=$func_stripname_result
+	      stripped_ext=".exe"
+	    fi
+	    ;;
+	esac
+
+	# Do a test to see if this is really a libtool program.
+	case $host in
+	*cygwin* | *mingw*)
+	    if func_ltwrapper_executable_p "$file"; then
+	      func_ltwrapper_scriptname "$file"
+	      wrapper=$func_ltwrapper_scriptname_result
+	    else
+	      func_stripname '' '.exe' "$file"
+	      wrapper=$func_stripname_result
+	    fi
+	    ;;
+	*)
+	    wrapper=$file
+	    ;;
+	esac
+	if func_ltwrapper_script_p "$wrapper"; then
+	  notinst_deplibs=
+	  relink_command=
+
+	  func_source "$wrapper"
+
+	  # Check the variables that should have been set.
+	  test -z "$generated_by_libtool_version" && \
+	    func_fatal_error "invalid libtool wrapper script \`$wrapper'"
+
+	  finalize=yes
+	  for lib in $notinst_deplibs; do
+	    # Check to see that each library is installed.
+	    libdir=
+	    if test -f "$lib"; then
+	      func_source "$lib"
+	    fi
+	    libfile="$libdir/"`$ECHO "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test
+	    if test -n "$libdir" && test ! -f "$libfile"; then
+	      func_warning "\`$lib' has not been installed in \`$libdir'"
+	      finalize=no
+	    fi
+	  done
+
+	  relink_command=
+	  func_source "$wrapper"
+
+	  outputname=
+	  if test "$fast_install" = no && test -n "$relink_command"; then
+	    $opt_dry_run || {
+	      if test "$finalize" = yes; then
+	        tmpdir=`func_mktempdir`
+		func_basename "$file$stripped_ext"
+		file="$func_basename_result"
+	        outputname="$tmpdir/$file"
+	        # Replace the output file specification.
+	        relink_command=`$ECHO "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
+
+	        $opt_silent || {
+	          func_quote_for_expand "$relink_command"
+		  eval "func_echo $func_quote_for_expand_result"
+	        }
+	        if eval "$relink_command"; then :
+	          else
+		  func_error "error: relink \`$file' with the above command before installing it"
+		  $opt_dry_run || ${RM}r "$tmpdir"
+		  continue
+	        fi
+	        file="$outputname"
+	      else
+	        func_warning "cannot relink \`$file'"
+	      fi
+	    }
+	  else
+	    # Install the binary that we compiled earlier.
+	    file=`$ECHO "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"`
+	  fi
+	fi
+
+	# remove .exe since cygwin /usr/bin/install will append another
+	# one anyway
+	case $install_prog,$host in
+	*/usr/bin/install*,*cygwin*)
+	  case $file:$destfile in
+	  *.exe:*.exe)
+	    # this is ok
+	    ;;
+	  *.exe:*)
+	    destfile=$destfile.exe
+	    ;;
+	  *:*.exe)
+	    func_stripname '' '.exe' "$destfile"
+	    destfile=$func_stripname_result
+	    ;;
+	  esac
+	  ;;
+	esac
+	func_show_eval "$install_prog\$stripme \$file \$destfile" 'exit $?'
+	$opt_dry_run || if test -n "$outputname"; then
+	  ${RM}r "$tmpdir"
+	fi
+	;;
+      esac
+    done
+
+    for file in $staticlibs; do
+      func_basename "$file"
+      name="$func_basename_result"
+
+      # Set up the ranlib parameters.
+      oldlib="$destdir/$name"
+
+      func_show_eval "$install_prog \$file \$oldlib" 'exit $?'
+
+      if test -n "$stripme" && test -n "$old_striplib"; then
+	func_show_eval "$old_striplib $oldlib" 'exit $?'
+      fi
+
+      # Do each command in the postinstall commands.
+      func_execute_cmds "$old_postinstall_cmds" 'exit $?'
+    done
+
+    test -n "$future_libdirs" && \
+      func_warning "remember to run \`$progname --finish$future_libdirs'"
+
+    if test -n "$current_libdirs"; then
+      # Maybe just do a dry run.
+      $opt_dry_run && current_libdirs=" -n$current_libdirs"
+      exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
+    else
+      exit $EXIT_SUCCESS
+    fi
+}
+
+test "$mode" = install && func_mode_install ${1+"$@"}
+
+
+# func_generate_dlsyms outputname originator pic_p
+# Extract symbols from dlprefiles and create ${outputname}S.o with
+# a dlpreopen symbol table.
+func_generate_dlsyms ()
+{
+    $opt_debug
+    my_outputname="$1"
+    my_originator="$2"
+    my_pic_p="${3-no}"
+    my_prefix=`$ECHO "$my_originator" | sed 's%[^a-zA-Z0-9]%_%g'`
+    my_dlsyms=
+
+    if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+      if test -n "$NM" && test -n "$global_symbol_pipe"; then
+	my_dlsyms="${my_outputname}S.c"
+      else
+	func_error "not configured to extract global symbols from dlpreopened files"
+      fi
+    fi
+
+    if test -n "$my_dlsyms"; then
+      case $my_dlsyms in
+      "") ;;
+      *.c)
+	# Discover the nlist of each of the dlfiles.
+	nlist="$output_objdir/${my_outputname}.nm"
+
+	func_show_eval "$RM $nlist ${nlist}S ${nlist}T"
+
+	# Parse the name list into a source file.
+	func_verbose "creating $output_objdir/$my_dlsyms"
+
+	$opt_dry_run || $ECHO > "$output_objdir/$my_dlsyms" "\
+/* $my_dlsyms - symbol resolution table for \`$my_outputname' dlsym emulation. */
+/* Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION */
+
+#ifdef __cplusplus
+extern \"C\" {
+#endif
+
+/* External symbol declarations for the compiler. */\
+"
+
+	if test "$dlself" = yes; then
+	  func_verbose "generating symbol list for \`$output'"
+
+	  $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist"
+
+	  # Add our own program objects to the symbol list.
+	  progfiles=`$ECHO "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+	  for progfile in $progfiles; do
+	    func_verbose "extracting global C symbols from \`$progfile'"
+	    $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'"
+	  done
+
+	  if test -n "$exclude_expsyms"; then
+	    $opt_dry_run || {
+	      eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
+	      eval '$MV "$nlist"T "$nlist"'
+	    }
+	  fi
+
+	  if test -n "$export_symbols_regex"; then
+	    $opt_dry_run || {
+	      eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T'
+	      eval '$MV "$nlist"T "$nlist"'
+	    }
+	  fi
+
+	  # Prepare the list of exported symbols
+	  if test -z "$export_symbols"; then
+	    export_symbols="$output_objdir/$outputname.exp"
+	    $opt_dry_run || {
+	      $RM $export_symbols
+	      eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
+	      case $host in
+	      *cygwin* | *mingw* | *cegcc* )
+                eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
+                eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
+	        ;;
+	      esac
+	    }
+	  else
+	    $opt_dry_run || {
+	      eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
+	      eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
+	      eval '$MV "$nlist"T "$nlist"'
+	      case $host in
+	        *cygwin | *mingw* | *cegcc* )
+	          eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
+	          eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
+	          ;;
+	      esac
+	    }
+	  fi
+	fi
+
+	for dlprefile in $dlprefiles; do
+	  func_verbose "extracting global C symbols from \`$dlprefile'"
+	  func_basename "$dlprefile"
+	  name="$func_basename_result"
+	  $opt_dry_run || {
+	    eval '$ECHO ": $name " >> "$nlist"'
+	    eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'"
+	  }
+	done
+
+	$opt_dry_run || {
+	  # Make sure we have at least an empty file.
+	  test -f "$nlist" || : > "$nlist"
+
+	  if test -n "$exclude_expsyms"; then
+	    $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
+	    $MV "$nlist"T "$nlist"
+	  fi
+
+	  # Try sorting and uniquifying the output.
+	  if $GREP -v "^: " < "$nlist" |
+	      if sort -k 3 </dev/null >/dev/null 2>&1; then
+		sort -k 3
+	      else
+		sort +2
+	      fi |
+	      uniq > "$nlist"S; then
+	    :
+	  else
+	    $GREP -v "^: " < "$nlist" > "$nlist"S
+	  fi
+
+	  if test -f "$nlist"S; then
+	    eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"'
+	  else
+	    $ECHO '/* NONE */' >> "$output_objdir/$my_dlsyms"
+	  fi
+
+	  $ECHO >> "$output_objdir/$my_dlsyms" "\
+
+/* The mapping between symbol names and symbols.  */
+typedef struct {
+  const char *name;
+  void *address;
+} lt_dlsymlist;
+"
+	  case $host in
+	  *cygwin* | *mingw* | *cegcc* )
+	    $ECHO >> "$output_objdir/$my_dlsyms" "\
+/* DATA imports from DLLs on WIN32 con't be const, because
+   runtime relocations are performed -- see ld's documentation
+   on pseudo-relocs.  */"
+	    lt_dlsym_const= ;;
+	  *osf5*)
+	    echo >> "$output_objdir/$my_dlsyms" "\
+/* This system does not cope well with relocations in const data */"
+	    lt_dlsym_const= ;;
+	  *)
+	    lt_dlsym_const=const ;;
+	  esac
+
+	  $ECHO >> "$output_objdir/$my_dlsyms" "\
+extern $lt_dlsym_const lt_dlsymlist
+lt_${my_prefix}_LTX_preloaded_symbols[];
+$lt_dlsym_const lt_dlsymlist
+lt_${my_prefix}_LTX_preloaded_symbols[] =
+{\
+  { \"$my_originator\", (void *) 0 },"
+
+	  case $need_lib_prefix in
+	  no)
+	    eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$my_dlsyms"
+	    ;;
+	  *)
+	    eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms"
+	    ;;
+	  esac
+	  $ECHO >> "$output_objdir/$my_dlsyms" "\
+  {0, (void *) 0}
+};
+
+/* This works around a problem in FreeBSD linker */
+#ifdef FREEBSD_WORKAROUND
+static const void *lt_preloaded_setup() {
+  return lt_${my_prefix}_LTX_preloaded_symbols;
+}
+#endif
+
+#ifdef __cplusplus
+}
+#endif\
+"
+	} # !$opt_dry_run
+
+	pic_flag_for_symtable=
+	case "$compile_command " in
+	*" -static "*) ;;
+	*)
+	  case $host in
+	  # compiling the symbol table file with pic_flag works around
+	  # a FreeBSD bug that causes programs to crash when -lm is
+	  # linked before any other PIC object.  But we must not use
+	  # pic_flag when linking with -static.  The problem exists in
+	  # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
+	  *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
+	    pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;;
+	  *-*-hpux*)
+	    pic_flag_for_symtable=" $pic_flag"  ;;
+	  *)
+	    if test "X$my_pic_p" != Xno; then
+	      pic_flag_for_symtable=" $pic_flag"
+	    fi
+	    ;;
+	  esac
+	  ;;
+	esac
+	symtab_cflags=
+	for arg in $LTCFLAGS; do
+	  case $arg in
+	  -pie | -fpie | -fPIE) ;;
+	  *) symtab_cflags="$symtab_cflags $arg" ;;
+	  esac
+	done
+
+	# Now compile the dynamic symbol file.
+	func_show_eval '(cd $output_objdir && $LTCC$symtab_cflags -c$no_builtin_flag$pic_flag_for_symtable "$my_dlsyms")' 'exit $?'
+
+	# Clean up the generated files.
+	func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T"'
+
+	# Transform the symbol file into the correct name.
+	symfileobj="$output_objdir/${my_outputname}S.$objext"
+	case $host in
+	*cygwin* | *mingw* | *cegcc* )
+	  if test -f "$output_objdir/$my_outputname.def"; then
+	    compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
+	    finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
+	  else
+	    compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
+	    finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
+	  fi
+	  ;;
+	*)
+	  compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
+	  finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
+	  ;;
+	esac
+	;;
+      *)
+	func_fatal_error "unknown suffix for \`$my_dlsyms'"
+	;;
+      esac
+    else
+      # We keep going just in case the user didn't refer to
+      # lt_preloaded_symbols.  The linker will fail if global_symbol_pipe
+      # really was required.
+
+      # Nullify the symbol file.
+      compile_command=`$ECHO "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
+      finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
+    fi
+}
+
+# func_win32_libid arg
+# return the library type of file 'arg'
+#
+# Need a lot of goo to handle *both* DLLs and import libs
+# Has to be a shell function in order to 'eat' the argument
+# that is supplied when $file_magic_command is called.
+func_win32_libid ()
+{
+  $opt_debug
+  win32_libid_type="unknown"
+  win32_fileres=`file -L $1 2>/dev/null`
+  case $win32_fileres in
+  *ar\ archive\ import\ library*) # definitely import
+    win32_libid_type="x86 archive import"
+    ;;
+  *ar\ archive*) # could be an import, or static
+    if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
+       $EGREP 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
+      win32_nmres=`eval $NM -f posix -A $1 |
+	$SED -n -e '
+	    1,100{
+		/ I /{
+		    s,.*,import,
+		    p
+		    q
+		}
+	    }'`
+      case $win32_nmres in
+      import*)  win32_libid_type="x86 archive import";;
+      *)        win32_libid_type="x86 archive static";;
+      esac
+    fi
+    ;;
+  *DLL*)
+    win32_libid_type="x86 DLL"
+    ;;
+  *executable*) # but shell scripts are "executable" too...
+    case $win32_fileres in
+    *MS\ Windows\ PE\ Intel*)
+      win32_libid_type="x86 DLL"
+      ;;
+    esac
     ;;
+  esac
+  $ECHO "$win32_libid_type"
+}
+
+
+
+# func_extract_an_archive dir oldlib
+func_extract_an_archive ()
+{
+    $opt_debug
+    f_ex_an_ar_dir="$1"; shift
+    f_ex_an_ar_oldlib="$1"
+    func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" 'exit $?'
+    if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
+     :
+    else
+      func_fatal_error "object name conflicts in archive: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib"
+    fi
+}
+
+
+# func_extract_archives gentop oldlib ...
+func_extract_archives ()
+{
+    $opt_debug
+    my_gentop="$1"; shift
+    my_oldlibs=${1+"$@"}
+    my_oldobjs=""
+    my_xlib=""
+    my_xabs=""
+    my_xdir=""
+
+    for my_xlib in $my_oldlibs; do
+      # Extract the objects.
+      case $my_xlib in
+	[\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;;
+	*) my_xabs=`pwd`"/$my_xlib" ;;
+      esac
+      func_basename "$my_xlib"
+      my_xlib="$func_basename_result"
+      my_xlib_u=$my_xlib
+      while :; do
+        case " $extracted_archives " in
+	*" $my_xlib_u "*)
+	  func_arith $extracted_serial + 1
+	  extracted_serial=$func_arith_result
+	  my_xlib_u=lt$extracted_serial-$my_xlib ;;
+	*) break ;;
+	esac
+      done
+      extracted_archives="$extracted_archives $my_xlib_u"
+      my_xdir="$my_gentop/$my_xlib_u"
+
+      func_mkdir_p "$my_xdir"
+
+      case $host in
+      *-darwin*)
+	func_verbose "Extracting $my_xabs"
+	# Do not bother doing anything if just a dry run
+	$opt_dry_run || {
+	  darwin_orig_dir=`pwd`
+	  cd $my_xdir || exit $?
+	  darwin_archive=$my_xabs
+	  darwin_curdir=`pwd`
+	  darwin_base_archive=`basename "$darwin_archive"`
+	  darwin_arches=`$LIPO -info "$darwin_archive" 2>/dev/null | $GREP Architectures 2>/dev/null || true`
+	  if test -n "$darwin_arches"; then
+	    darwin_arches=`$ECHO "$darwin_arches" | $SED -e 's/.*are://'`
+	    darwin_arch=
+	    func_verbose "$darwin_base_archive has multiple architectures $darwin_arches"
+	    for darwin_arch in  $darwin_arches ; do
+	      func_mkdir_p "unfat-$$/${darwin_base_archive}-${darwin_arch}"
+	      $LIPO -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}"
+	      cd "unfat-$$/${darwin_base_archive}-${darwin_arch}"
+	      func_extract_an_archive "`pwd`" "${darwin_base_archive}"
+	      cd "$darwin_curdir"
+	      $RM "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}"
+	    done # $darwin_arches
+            ## Okay now we've a bunch of thin objects, gotta fatten them up :)
+	    darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$basename" | sort -u`
+	    darwin_file=
+	    darwin_files=
+	    for darwin_file in $darwin_filelist; do
+	      darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
+	      $LIPO -create -output "$darwin_file" $darwin_files
+	    done # $darwin_filelist
+	    $RM -rf unfat-$$
+	    cd "$darwin_orig_dir"
+	  else
+	    cd $darwin_orig_dir
+	    func_extract_an_archive "$my_xdir" "$my_xabs"
+	  fi # $darwin_arches
+	} # !$opt_dry_run
+	;;
+      *)
+        func_extract_an_archive "$my_xdir" "$my_xabs"
+	;;
+      esac
+      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
+    done
+
+    func_extract_archives_result="$my_oldobjs"
+}
+
+
+
+# func_emit_wrapper_part1 [arg=no]
+#
+# Emit the first part of a libtool wrapper script on stdout.
+# For more information, see the description associated with
+# func_emit_wrapper(), below.
+func_emit_wrapper_part1 ()
+{
+	func_emit_wrapper_part1_arg1=no
+	if test -n "$1" ; then
+	  func_emit_wrapper_part1_arg1=$1
+	fi
+
+	$ECHO "\
+#! $SHELL
+
+# $output - temporary wrapper script for $objdir/$outputname
+# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+#
+# The $output program cannot be directly executed until all the libtool
+# libraries that it depends on are installed.
+#
+# This wrapper script should never be moved out of the build directory.
+# If it is, it will not operate correctly.
+
+# Sed substitution that helps us do robust quoting.  It backslashifies
+# metacharacters that are still active within double-quoted strings.
+Xsed='${SED} -e 1s/^X//'
+sed_quote_subst='$sed_quote_subst'
+
+# Be Bourne compatible
+if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Zsh 3.x and 4.x performs 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
+BIN_SH=xpg4; export BIN_SH # for Tru64
+DUALCASE=1; export DUALCASE # for MKS sh
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+relink_command=\"$relink_command\"
+
+# This environment variable determines our operation mode.
+if test \"\$libtool_install_magic\" = \"$magic\"; then
+  # install mode needs the following variables:
+  generated_by_libtool_version='$macro_version'
+  notinst_deplibs='$notinst_deplibs'
+else
+  # When we are sourced in execute mode, \$file and \$ECHO are already set.
+  if test \"\$libtool_execute_magic\" != \"$magic\"; then
+    ECHO=\"$qecho\"
+    file=\"\$0\"
+    # Make sure echo works.
+    if test \"X\$1\" = X--no-reexec; then
+      # Discard the --no-reexec flag, and continue.
+      shift
+    elif test \"X\`{ \$ECHO '\t'; } 2>/dev/null\`\" = 'X\t'; then
+      # Yippee, \$ECHO works!
+      :
+    else
+      # Restart under the correct shell, and then maybe \$ECHO will work.
+      exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"}
+    fi
+  fi\
+"
+	$ECHO "\
+
+  # Find the directory that this script lives in.
+  thisdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\`
+  test \"x\$thisdir\" = \"x\$file\" && thisdir=.
+
+  # Follow symbolic links until we get to the real thisdir.
+  file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\`
+  while test -n \"\$file\"; do
+    destdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
+
+    # If there was a directory component, then change thisdir.
+    if test \"x\$destdir\" != \"x\$file\"; then
+      case \"\$destdir\" in
+      [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;;
+      *) thisdir=\"\$thisdir/\$destdir\" ;;
+      esac
+    fi
+
+    file=\`\$ECHO \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
+    file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
+  done
+"
+}
+# end: func_emit_wrapper_part1
+
+# func_emit_wrapper_part2 [arg=no]
+#
+# Emit the second part of a libtool wrapper script on stdout.
+# For more information, see the description associated with
+# func_emit_wrapper(), below.
+func_emit_wrapper_part2 ()
+{
+	func_emit_wrapper_part2_arg1=no
+	if test -n "$1" ; then
+	  func_emit_wrapper_part2_arg1=$1
+	fi
+
+	$ECHO "\
+
+  # Usually 'no', except on cygwin/mingw when embedded into
+  # the cwrapper.
+  WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_part2_arg1
+  if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then
+    # special case for '.'
+    if test \"\$thisdir\" = \".\"; then
+      thisdir=\`pwd\`
+    fi
+    # remove .libs from thisdir
+    case \"\$thisdir\" in
+    *[\\\\/]$objdir ) thisdir=\`\$ECHO \"X\$thisdir\" | \$Xsed -e 's%[\\\\/][^\\\\/]*$%%'\` ;;
+    $objdir )   thisdir=. ;;
+    esac
+  fi
+
+  # Try to get the absolute directory name.
+  absdir=\`cd \"\$thisdir\" && pwd\`
+  test -n \"\$absdir\" && thisdir=\"\$absdir\"
+"
+
+	if test "$fast_install" = yes; then
+	  $ECHO "\
+  program=lt-'$outputname'$exeext
+  progdir=\"\$thisdir/$objdir\"
+
+  if test ! -f \"\$progdir/\$program\" ||
+     { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\
+       test \"X\$file\" != \"X\$progdir/\$program\"; }; then
+
+    file=\"\$\$-\$program\"
+
+    if test ! -d \"\$progdir\"; then
+      $MKDIR \"\$progdir\"
+    else
+      $RM \"\$progdir/\$file\"
+    fi"
+
+	  $ECHO "\
+
+    # relink executable if necessary
+    if test -n \"\$relink_command\"; then
+      if relink_command_output=\`eval \$relink_command 2>&1\`; then :
+      else
+	$ECHO \"\$relink_command_output\" >&2
+	$RM \"\$progdir/\$file\"
+	exit 1
+      fi
+    fi
+
+    $MV \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null ||
+    { $RM \"\$progdir/\$program\";
+      $MV \"\$progdir/\$file\" \"\$progdir/\$program\"; }
+    $RM \"\$progdir/\$file\"
+  fi"
+	else
+	  $ECHO "\
+  program='$outputname'
+  progdir=\"\$thisdir/$objdir\"
+"
+	fi
+
+	$ECHO "\
+
+  if test -f \"\$progdir/\$program\"; then"
+
+	# Export our shlibpath_var if we have one.
+	if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
+	  $ECHO "\
+    # Add our own library path to $shlibpath_var
+    $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
+
+    # Some systems cannot cope with colon-terminated $shlibpath_var
+    # The second colon is a workaround for a bug in BeOS R4 sed
+    $shlibpath_var=\`\$ECHO \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\`
+
+    export $shlibpath_var
+"
+	fi
+
+	# fixup the dll searchpath if we need to.
+	if test -n "$dllsearchpath"; then
+	  $ECHO "\
+    # Add the dll search path components to the executable PATH
+    PATH=$dllsearchpath:\$PATH
+"
+	fi
+
+	$ECHO "\
+    if test \"\$libtool_execute_magic\" != \"$magic\"; then
+      # Run the actual program with our arguments.
+"
+	case $host in
+	# Backslashes separate directories on plain windows
+	*-*-mingw | *-*-os2* | *-cegcc*)
+	  $ECHO "\
+      exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
+"
+	  ;;
+
+	*)
+	  $ECHO "\
+      exec \"\$progdir/\$program\" \${1+\"\$@\"}
+"
+	  ;;
+	esac
+	$ECHO "\
+      \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
+      exit 1
+    fi
+  else
+    # The program doesn't exist.
+    \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
+    \$ECHO \"This script is just a wrapper for \$program.\" 1>&2
+    $ECHO \"See the $PACKAGE documentation for more information.\" 1>&2
+    exit 1
+  fi
+fi\
+"
+}
+# end: func_emit_wrapper_part2
+
+
+# func_emit_wrapper [arg=no]
+#
+# Emit a libtool wrapper script on stdout.
+# Don't directly open a file because we may want to
+# incorporate the script contents within a cygwin/mingw
+# wrapper executable.  Must ONLY be called from within
+# func_mode_link because it depends on a number of variables
+# set therein.
+#
+# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
+# variable will take.  If 'yes', then the emitted script
+# will assume that the directory in which it is stored is
+# the $objdir directory.  This is a cygwin/mingw-specific
+# behavior.
+func_emit_wrapper ()
+{
+	func_emit_wrapper_arg1=no
+	if test -n "$1" ; then
+	  func_emit_wrapper_arg1=$1
+	fi
+
+	# split this up so that func_emit_cwrapperexe_src
+	# can call each part independently.
+	func_emit_wrapper_part1 "${func_emit_wrapper_arg1}"
+	func_emit_wrapper_part2 "${func_emit_wrapper_arg1}"
+}
+
+
+# func_to_host_path arg
+#
+# Convert paths to host format when used with build tools.
+# Intended for use with "native" mingw (where libtool itself
+# is running under the msys shell), or in the following cross-
+# build environments:
+#    $build          $host
+#    mingw (msys)    mingw  [e.g. native]
+#    cygwin          mingw
+#    *nix + wine     mingw
+# where wine is equipped with the `winepath' executable.
+# In the native mingw case, the (msys) shell automatically
+# converts paths for any non-msys applications it launches,
+# but that facility isn't available from inside the cwrapper.
+# Similar accommodations are necessary for $host mingw and
+# $build cygwin.  Calling this function does no harm for other
+# $host/$build combinations not listed above.
+#
+# ARG is the path (on $build) that should be converted to
+# the proper representation for $host. The result is stored
+# in $func_to_host_path_result.
+func_to_host_path ()
+{
+  func_to_host_path_result="$1"
+  if test -n "$1" ; then
+    case $host in
+      *mingw* )
+        lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
+        case $build in
+          *mingw* ) # actually, msys
+            # awkward: cmd appends spaces to result
+            lt_sed_strip_trailing_spaces="s/[ ]*\$//"
+            func_to_host_path_tmp1=`( cmd //c echo "$1" |\
+              $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""`
+            func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
+              $SED -e "$lt_sed_naive_backslashify"`
+            ;;
+          *cygwin* )
+            func_to_host_path_tmp1=`cygpath -w "$1"`
+            func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
+              $SED -e "$lt_sed_naive_backslashify"`
+            ;;
+          * )
+            # Unfortunately, winepath does not exit with a non-zero
+            # error code, so we are forced to check the contents of
+            # stdout. On the other hand, if the command is not
+            # found, the shell will set an exit code of 127 and print
+            # *an error message* to stdout. So we must check for both
+            # error code of zero AND non-empty stdout, which explains
+            # the odd construction:
+            func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null`
+            if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then
+              func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
+                $SED -e "$lt_sed_naive_backslashify"`
+            else
+              # Allow warning below.
+              func_to_host_path_result=""
+            fi
+            ;;
+        esac
+        if test -z "$func_to_host_path_result" ; then
+          func_error "Could not determine host path corresponding to"
+          func_error "  '$1'"
+          func_error "Continuing, but uninstalled executables may not work."
+          # Fallback:
+          func_to_host_path_result="$1"
+        fi
+        ;;
+    esac
+  fi
+}
+# end: func_to_host_path
+
+# func_to_host_pathlist arg
+#
+# Convert pathlists to host format when used with build tools.
+# See func_to_host_path(), above. This function supports the
+# following $build/$host combinations (but does no harm for
+# combinations not listed here):
+#    $build          $host
+#    mingw (msys)    mingw  [e.g. native]
+#    cygwin          mingw
+#    *nix + wine     mingw
+#
+# Path separators are also converted from $build format to
+# $host format. If ARG begins or ends with a path separator
+# character, it is preserved (but converted to $host format)
+# on output.
+#
+# ARG is a pathlist (on $build) that should be converted to
+# the proper representation on $host. The result is stored
+# in $func_to_host_pathlist_result.
+func_to_host_pathlist ()
+{
+  func_to_host_pathlist_result="$1"
+  if test -n "$1" ; then
+    case $host in
+      *mingw* )
+        lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
+        # Remove leading and trailing path separator characters from
+        # ARG. msys behavior is inconsistent here, cygpath turns them
+        # into '.;' and ';.', and winepath ignores them completely.
+        func_to_host_pathlist_tmp2="$1"
+        # Once set for this call, this variable should not be
+        # reassigned. It is used in tha fallback case.
+        func_to_host_pathlist_tmp1=`echo "$func_to_host_pathlist_tmp2" |\
+          $SED -e 's|^:*||' -e 's|:*$||'`
+        case $build in
+          *mingw* ) # Actually, msys.
+            # Awkward: cmd appends spaces to result.
+            lt_sed_strip_trailing_spaces="s/[ ]*\$//"
+            func_to_host_pathlist_tmp2=`( cmd //c echo "$func_to_host_pathlist_tmp1" |\
+              $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""`
+            func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\
+              $SED -e "$lt_sed_naive_backslashify"`
+            ;;
+          *cygwin* )
+            func_to_host_pathlist_tmp2=`cygpath -w -p "$func_to_host_pathlist_tmp1"`
+            func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\
+              $SED -e "$lt_sed_naive_backslashify"`
+            ;;
+          * )
+            # unfortunately, winepath doesn't convert pathlists
+            func_to_host_pathlist_result=""
+            func_to_host_pathlist_oldIFS=$IFS
+            IFS=:
+            for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do
+              IFS=$func_to_host_pathlist_oldIFS
+              if test -n "$func_to_host_pathlist_f" ; then
+                func_to_host_path "$func_to_host_pathlist_f"
+                if test -n "$func_to_host_path_result" ; then
+                  if test -z "$func_to_host_pathlist_result" ; then
+                    func_to_host_pathlist_result="$func_to_host_path_result"
+                  else
+                    func_to_host_pathlist_result="$func_to_host_pathlist_result;$func_to_host_path_result"
+                  fi
+                fi
+              fi
+              IFS=:
+            done
+            IFS=$func_to_host_pathlist_oldIFS
+            ;;
+        esac
+        if test -z "$func_to_host_pathlist_result" ; then
+          func_error "Could not determine the host path(s) corresponding to"
+          func_error "  '$1'"
+          func_error "Continuing, but uninstalled executables may not work."
+          # Fallback. This may break if $1 contains DOS-style drive
+          # specifications. The fix is not to complicate the expression
+          # below, but for the user to provide a working wine installation
+          # with winepath so that path translation in the cross-to-mingw
+          # case works properly.
+          lt_replace_pathsep_nix_to_dos="s|:|;|g"
+          func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\
+            $SED -e "$lt_replace_pathsep_nix_to_dos"`
+        fi
+        # Now, add the leading and trailing path separators back
+        case "$1" in
+          :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result"
+            ;;
+        esac
+        case "$1" in
+          *: ) func_to_host_pathlist_result="$func_to_host_pathlist_result;"
+            ;;
+        esac
+        ;;
+    esac
+  fi
+}
+# end: func_to_host_pathlist
+
+# func_emit_cwrapperexe_src
+# emit the source code for a wrapper executable on stdout
+# Must ONLY be called from within func_mode_link because
+# it depends on a number of variable set therein.
+func_emit_cwrapperexe_src ()
+{
+	cat <<EOF
+
+/* $cwrappersource - temporary wrapper executable for $objdir/$outputname
+   Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+
+   The $output program cannot be directly executed until all the libtool
+   libraries that it depends on are installed.
+
+   This wrapper executable should never be moved out of the build directory.
+   If it is, it will not operate correctly.
+
+   Currently, it simply execs the wrapper *script* "$SHELL $output",
+   but could eventually absorb all of the scripts functionality and
+   exec $objdir/$outputname directly.
+*/
+EOF
+	    cat <<"EOF"
+#include <stdio.h>
+#include <stdlib.h>
+#ifdef _MSC_VER
+# include <direct.h>
+# include <process.h>
+# include <io.h>
+# define setmode _setmode
+#else
+# include <unistd.h>
+# include <stdint.h>
+# ifdef __CYGWIN__
+#  include <io.h>
+#  define HAVE_SETENV
+#  ifdef __STRICT_ANSI__
+char *realpath (const char *, char *);
+int putenv (char *);
+int setenv (const char *, const char *, int);
+#  endif
+# endif
+#endif
+#include <malloc.h>
+#include <stdarg.h>
+#include <assert.h>
+#include <string.h>
+#include <ctype.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <sys/stat.h>
+
+#if defined(PATH_MAX)
+# define LT_PATHMAX PATH_MAX
+#elif defined(MAXPATHLEN)
+# define LT_PATHMAX MAXPATHLEN
+#else
+# define LT_PATHMAX 1024
+#endif
+
+#ifndef S_IXOTH
+# define S_IXOTH 0
+#endif
+#ifndef S_IXGRP
+# define S_IXGRP 0
+#endif
+
+#ifdef _MSC_VER
+# define S_IXUSR _S_IEXEC
+# define stat _stat
+# ifndef _INTPTR_T_DEFINED
+#  define intptr_t int
+# endif
+#endif
+
+#ifndef DIR_SEPARATOR
+# define DIR_SEPARATOR '/'
+# define PATH_SEPARATOR ':'
+#endif
+
+#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
+  defined (__OS2__)
+# define HAVE_DOS_BASED_FILE_SYSTEM
+# define FOPEN_WB "wb"
+# ifndef DIR_SEPARATOR_2
+#  define DIR_SEPARATOR_2 '\\'
+# endif
+# ifndef PATH_SEPARATOR_2
+#  define PATH_SEPARATOR_2 ';'
+# endif
+#endif
+
+#ifndef DIR_SEPARATOR_2
+# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR)
+#else /* DIR_SEPARATOR_2 */
+# define IS_DIR_SEPARATOR(ch) \
+	(((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
+#endif /* DIR_SEPARATOR_2 */
+
+#ifndef PATH_SEPARATOR_2
+# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR)
+#else /* PATH_SEPARATOR_2 */
+# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
+#endif /* PATH_SEPARATOR_2 */
+
+#ifdef __CYGWIN__
+# define FOPEN_WB "wb"
+#endif
+
+#ifndef FOPEN_WB
+# define FOPEN_WB "w"
+#endif
+#ifndef _O_BINARY
+# define _O_BINARY 0
+#endif
+
+#define XMALLOC(type, num)      ((type *) xmalloc ((num) * sizeof(type)))
+#define XFREE(stale) do { \
+  if (stale) { free ((void *) stale); stale = 0; } \
+} while (0)
+
+#undef LTWRAPPER_DEBUGPRINTF
+#if defined DEBUGWRAPPER
+# define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args
+static void
+ltwrapper_debugprintf (const char *fmt, ...)
+{
+    va_list args;
+    va_start (args, fmt);
+    (void) vfprintf (stderr, fmt, args);
+    va_end (args);
+}
+#else
+# define LTWRAPPER_DEBUGPRINTF(args)
+#endif
+
+const char *program_name = NULL;
+
+void *xmalloc (size_t num);
+char *xstrdup (const char *string);
+const char *base_name (const char *name);
+char *find_executable (const char *wrapper);
+char *chase_symlinks (const char *pathspec);
+int make_executable (const char *path);
+int check_executable (const char *path);
+char *strendzap (char *str, const char *pat);
+void lt_fatal (const char *message, ...);
+void lt_setenv (const char *name, const char *value);
+char *lt_extend_str (const char *orig_value, const char *add, int to_end);
+void lt_opt_process_env_set (const char *arg);
+void lt_opt_process_env_prepend (const char *arg);
+void lt_opt_process_env_append (const char *arg);
+int lt_split_name_value (const char *arg, char** name, char** value);
+void lt_update_exe_path (const char *name, const char *value);
+void lt_update_lib_path (const char *name, const char *value);
+
+static const char *script_text_part1 =
+EOF
+
+	    func_emit_wrapper_part1 yes |
+	        $SED -e 's/\([\\"]\)/\\\1/g' \
+	             -e 's/^/  "/' -e 's/$/\\n"/'
+	    echo ";"
+	    cat <<EOF
+
+static const char *script_text_part2 =
+EOF
+	    func_emit_wrapper_part2 yes |
+	        $SED -e 's/\([\\"]\)/\\\1/g' \
+	             -e 's/^/  "/' -e 's/$/\\n"/'
+	    echo ";"
+
+	    cat <<EOF
+const char * MAGIC_EXE = "$magic_exe";
+const char * LIB_PATH_VARNAME = "$shlibpath_var";
+EOF
+
+	    if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
+              func_to_host_pathlist "$temp_rpath"
+	      cat <<EOF
+const char * LIB_PATH_VALUE   = "$func_to_host_pathlist_result";
+EOF
+	    else
+	      cat <<"EOF"
+const char * LIB_PATH_VALUE   = "";
+EOF
+	    fi
+
+	    if test -n "$dllsearchpath"; then
+              func_to_host_pathlist "$dllsearchpath:"
+	      cat <<EOF
+const char * EXE_PATH_VARNAME = "PATH";
+const char * EXE_PATH_VALUE   = "$func_to_host_pathlist_result";
+EOF
+	    else
+	      cat <<"EOF"
+const char * EXE_PATH_VARNAME = "";
+const char * EXE_PATH_VALUE   = "";
+EOF
+	    fi
+
+	    if test "$fast_install" = yes; then
+	      cat <<EOF
+const char * TARGET_PROGRAM_NAME = "lt-$outputname"; /* hopefully, no .exe */
+EOF
+	    else
+	      cat <<EOF
+const char * TARGET_PROGRAM_NAME = "$outputname"; /* hopefully, no .exe */
+EOF
+	    fi
+
+
+	    cat <<"EOF"
+
+#define LTWRAPPER_OPTION_PREFIX         "--lt-"
+#define LTWRAPPER_OPTION_PREFIX_LENGTH  5
+
+static const size_t opt_prefix_len         = LTWRAPPER_OPTION_PREFIX_LENGTH;
+static const char *ltwrapper_option_prefix = LTWRAPPER_OPTION_PREFIX;
+
+static const char *dumpscript_opt       = LTWRAPPER_OPTION_PREFIX "dump-script";
+
+static const size_t env_set_opt_len     = LTWRAPPER_OPTION_PREFIX_LENGTH + 7;
+static const char *env_set_opt          = LTWRAPPER_OPTION_PREFIX "env-set";
+  /* argument is putenv-style "foo=bar", value of foo is set to bar */
+
+static const size_t env_prepend_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 11;
+static const char *env_prepend_opt      = LTWRAPPER_OPTION_PREFIX "env-prepend";
+  /* argument is putenv-style "foo=bar", new value of foo is bar${foo} */
+
+static const size_t env_append_opt_len  = LTWRAPPER_OPTION_PREFIX_LENGTH + 10;
+static const char *env_append_opt       = LTWRAPPER_OPTION_PREFIX "env-append";
+  /* argument is putenv-style "foo=bar", new value of foo is ${foo}bar */
+
+int
+main (int argc, char *argv[])
+{
+  char **newargz;
+  int  newargc;
+  char *tmp_pathspec;
+  char *actual_cwrapper_path;
+  char *actual_cwrapper_name;
+  char *target_name;
+  char *lt_argv_zero;
+  intptr_t rval = 127;
+
+  int i;
+
+  program_name = (char *) xstrdup (base_name (argv[0]));
+  LTWRAPPER_DEBUGPRINTF (("(main) argv[0]      : %s\n", argv[0]));
+  LTWRAPPER_DEBUGPRINTF (("(main) program_name : %s\n", program_name));
+
+  /* very simple arg parsing; don't want to rely on getopt */
+  for (i = 1; i < argc; i++)
+    {
+      if (strcmp (argv[i], dumpscript_opt) == 0)
+	{
+EOF
+	    case "$host" in
+	      *mingw* | *cygwin* )
+		# make stdout use "unix" line endings
+		echo "          setmode(1,_O_BINARY);"
+		;;
+	      esac
+
+	    cat <<"EOF"
+	  printf ("%s", script_text_part1);
+	  printf ("%s", script_text_part2);
+	  return 0;
+	}
+    }
+
+  newargz = XMALLOC (char *, argc + 1);
+  tmp_pathspec = find_executable (argv[0]);
+  if (tmp_pathspec == NULL)
+    lt_fatal ("Couldn't find %s", argv[0]);
+  LTWRAPPER_DEBUGPRINTF (("(main) found exe (before symlink chase) at : %s\n",
+			  tmp_pathspec));
+
+  actual_cwrapper_path = chase_symlinks (tmp_pathspec);
+  LTWRAPPER_DEBUGPRINTF (("(main) found exe (after symlink chase) at : %s\n",
+			  actual_cwrapper_path));
+  XFREE (tmp_pathspec);
+
+  actual_cwrapper_name = xstrdup( base_name (actual_cwrapper_path));
+  strendzap (actual_cwrapper_path, actual_cwrapper_name);
+
+  /* wrapper name transforms */
+  strendzap (actual_cwrapper_name, ".exe");
+  tmp_pathspec = lt_extend_str (actual_cwrapper_name, ".exe", 1);
+  XFREE (actual_cwrapper_name);
+  actual_cwrapper_name = tmp_pathspec;
+  tmp_pathspec = 0;
+
+  /* target_name transforms -- use actual target program name; might have lt- prefix */
+  target_name = xstrdup (base_name (TARGET_PROGRAM_NAME));
+  strendzap (target_name, ".exe");
+  tmp_pathspec = lt_extend_str (target_name, ".exe", 1);
+  XFREE (target_name);
+  target_name = tmp_pathspec;
+  tmp_pathspec = 0;
+
+  LTWRAPPER_DEBUGPRINTF (("(main) libtool target name: %s\n",
+			  target_name));
+EOF
+
+	    cat <<EOF
+  newargz[0] =
+    XMALLOC (char, (strlen (actual_cwrapper_path) +
+		    strlen ("$objdir") + 1 + strlen (actual_cwrapper_name) + 1));
+  strcpy (newargz[0], actual_cwrapper_path);
+  strcat (newargz[0], "$objdir");
+  strcat (newargz[0], "/");
+EOF
+
+	    cat <<"EOF"
+  /* stop here, and copy so we don't have to do this twice */
+  tmp_pathspec = xstrdup (newargz[0]);
+
+  /* do NOT want the lt- prefix here, so use actual_cwrapper_name */
+  strcat (newargz[0], actual_cwrapper_name);
+
+  /* DO want the lt- prefix here if it exists, so use target_name */
+  lt_argv_zero = lt_extend_str (tmp_pathspec, target_name, 1);
+  XFREE (tmp_pathspec);
+  tmp_pathspec = NULL;
+EOF
+
+	    case $host_os in
+	      mingw*)
+	    cat <<"EOF"
+  {
+    char* p;
+    while ((p = strchr (newargz[0], '\\')) != NULL)
+      {
+	*p = '/';
+      }
+    while ((p = strchr (lt_argv_zero, '\\')) != NULL)
+      {
+	*p = '/';
+      }
+  }
+EOF
+	    ;;
+	    esac
+
+	    cat <<"EOF"
+  XFREE (target_name);
+  XFREE (actual_cwrapper_path);
+  XFREE (actual_cwrapper_name);
+
+  lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */
+  lt_setenv ("DUALCASE", "1");  /* for MSK sh */
+  lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
+  lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE);
+
+  newargc=0;
+  for (i = 1; i < argc; i++)
+    {
+      if (strncmp (argv[i], env_set_opt, env_set_opt_len) == 0)
+        {
+          if (argv[i][env_set_opt_len] == '=')
+            {
+              const char *p = argv[i] + env_set_opt_len + 1;
+              lt_opt_process_env_set (p);
+            }
+          else if (argv[i][env_set_opt_len] == '\0' && i + 1 < argc)
+            {
+              lt_opt_process_env_set (argv[++i]); /* don't copy */
+            }
+          else
+            lt_fatal ("%s missing required argument", env_set_opt);
+          continue;
+        }
+      if (strncmp (argv[i], env_prepend_opt, env_prepend_opt_len) == 0)
+        {
+          if (argv[i][env_prepend_opt_len] == '=')
+            {
+              const char *p = argv[i] + env_prepend_opt_len + 1;
+              lt_opt_process_env_prepend (p);
+            }
+          else if (argv[i][env_prepend_opt_len] == '\0' && i + 1 < argc)
+            {
+              lt_opt_process_env_prepend (argv[++i]); /* don't copy */
+            }
+          else
+            lt_fatal ("%s missing required argument", env_prepend_opt);
+          continue;
+        }
+      if (strncmp (argv[i], env_append_opt, env_append_opt_len) == 0)
+        {
+          if (argv[i][env_append_opt_len] == '=')
+            {
+              const char *p = argv[i] + env_append_opt_len + 1;
+              lt_opt_process_env_append (p);
+            }
+          else if (argv[i][env_append_opt_len] == '\0' && i + 1 < argc)
+            {
+              lt_opt_process_env_append (argv[++i]); /* don't copy */
+            }
+          else
+            lt_fatal ("%s missing required argument", env_append_opt);
+          continue;
+        }
+      if (strncmp (argv[i], ltwrapper_option_prefix, opt_prefix_len) == 0)
+        {
+          /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
+             namespace, but it is not one of the ones we know about and
+             have already dealt with, above (inluding dump-script), then
+             report an error. Otherwise, targets might begin to believe
+             they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
+             namespace. The first time any user complains about this, we'll
+             need to make LTWRAPPER_OPTION_PREFIX a configure-time option
+             or a configure.ac-settable value.
+           */
+          lt_fatal ("Unrecognized option in %s namespace: '%s'",
+                    ltwrapper_option_prefix, argv[i]);
+        }
+      /* otherwise ... */
+      newargz[++newargc] = xstrdup (argv[i]);
+    }
+  newargz[++newargc] = NULL;
+
+  LTWRAPPER_DEBUGPRINTF     (("(main) lt_argv_zero : %s\n", (lt_argv_zero ? lt_argv_zero : "<NULL>")));
+  for (i = 0; i < newargc; i++)
+    {
+      LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d]   : %s\n", i, (newargz[i] ? newargz[i] : "<NULL>")));
+    }
+
+EOF
+
+	    case $host_os in
+	      mingw*)
+		cat <<"EOF"
+  /* execv doesn't actually work on mingw as expected on unix */
+  rval = _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz);
+  if (rval == -1)
+    {
+      /* failed to start process */
+      LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno));
+      return 127;
+    }
+  return rval;
+EOF
+		;;
+	      *)
+		cat <<"EOF"
+  execv (lt_argv_zero, newargz);
+  return rval; /* =127, but avoids unused variable warning */
+EOF
+		;;
+	    esac
 
-  # libtool link mode
-  link | relink)
-    modename="$modename: link"
+	    cat <<"EOF"
+}
+
+void *
+xmalloc (size_t num)
+{
+  void *p = (void *) malloc (num);
+  if (!p)
+    lt_fatal ("Memory exhausted");
+
+  return p;
+}
+
+char *
+xstrdup (const char *string)
+{
+  return string ? strcpy ((char *) xmalloc (strlen (string) + 1),
+			  string) : NULL;
+}
+
+const char *
+base_name (const char *name)
+{
+  const char *base;
+
+#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+  /* Skip over the disk name in MSDOS pathnames. */
+  if (isalpha ((unsigned char) name[0]) && name[1] == ':')
+    name += 2;
+#endif
+
+  for (base = name; *name; name++)
+    if (IS_DIR_SEPARATOR (*name))
+      base = name + 1;
+  return base;
+}
+
+int
+check_executable (const char *path)
+{
+  struct stat st;
+
+  LTWRAPPER_DEBUGPRINTF (("(check_executable)  : %s\n",
+			  path ? (*path ? path : "EMPTY!") : "NULL!"));
+  if ((!path) || (!*path))
+    return 0;
+
+  if ((stat (path, &st) >= 0)
+      && (st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH)))
+    return 1;
+  else
+    return 0;
+}
+
+int
+make_executable (const char *path)
+{
+  int rval = 0;
+  struct stat st;
+
+  LTWRAPPER_DEBUGPRINTF (("(make_executable)   : %s\n",
+			  path ? (*path ? path : "EMPTY!") : "NULL!"));
+  if ((!path) || (!*path))
+    return 0;
+
+  if (stat (path, &st) >= 0)
+    {
+      rval = chmod (path, st.st_mode | S_IXOTH | S_IXGRP | S_IXUSR);
+    }
+  return rval;
+}
+
+/* Searches for the full path of the wrapper.  Returns
+   newly allocated full path name if found, NULL otherwise
+   Does not chase symlinks, even on platforms that support them.
+*/
+char *
+find_executable (const char *wrapper)
+{
+  int has_slash = 0;
+  const char *p;
+  const char *p_next;
+  /* static buffer for getcwd */
+  char tmp[LT_PATHMAX + 1];
+  int tmp_len;
+  char *concat_name;
+
+  LTWRAPPER_DEBUGPRINTF (("(find_executable)   : %s\n",
+			  wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!"));
+
+  if ((wrapper == NULL) || (*wrapper == '\0'))
+    return NULL;
+
+  /* Absolute path? */
+#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+  if (isalpha ((unsigned char) wrapper[0]) && wrapper[1] == ':')
+    {
+      concat_name = xstrdup (wrapper);
+      if (check_executable (concat_name))
+	return concat_name;
+      XFREE (concat_name);
+    }
+  else
+    {
+#endif
+      if (IS_DIR_SEPARATOR (wrapper[0]))
+	{
+	  concat_name = xstrdup (wrapper);
+	  if (check_executable (concat_name))
+	    return concat_name;
+	  XFREE (concat_name);
+	}
+#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+    }
+#endif
+
+  for (p = wrapper; *p; p++)
+    if (*p == '/')
+      {
+	has_slash = 1;
+	break;
+      }
+  if (!has_slash)
+    {
+      /* no slashes; search PATH */
+      const char *path = getenv ("PATH");
+      if (path != NULL)
+	{
+	  for (p = path; *p; p = p_next)
+	    {
+	      const char *q;
+	      size_t p_len;
+	      for (q = p; *q; q++)
+		if (IS_PATH_SEPARATOR (*q))
+		  break;
+	      p_len = q - p;
+	      p_next = (*q == '\0' ? q : q + 1);
+	      if (p_len == 0)
+		{
+		  /* empty path: current directory */
+		  if (getcwd (tmp, LT_PATHMAX) == NULL)
+		    lt_fatal ("getcwd failed");
+		  tmp_len = strlen (tmp);
+		  concat_name =
+		    XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
+		  memcpy (concat_name, tmp, tmp_len);
+		  concat_name[tmp_len] = '/';
+		  strcpy (concat_name + tmp_len + 1, wrapper);
+		}
+	      else
+		{
+		  concat_name =
+		    XMALLOC (char, p_len + 1 + strlen (wrapper) + 1);
+		  memcpy (concat_name, p, p_len);
+		  concat_name[p_len] = '/';
+		  strcpy (concat_name + p_len + 1, wrapper);
+		}
+	      if (check_executable (concat_name))
+		return concat_name;
+	      XFREE (concat_name);
+	    }
+	}
+      /* not found in PATH; assume curdir */
+    }
+  /* Relative path | not found in path: prepend cwd */
+  if (getcwd (tmp, LT_PATHMAX) == NULL)
+    lt_fatal ("getcwd failed");
+  tmp_len = strlen (tmp);
+  concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
+  memcpy (concat_name, tmp, tmp_len);
+  concat_name[tmp_len] = '/';
+  strcpy (concat_name + tmp_len + 1, wrapper);
+
+  if (check_executable (concat_name))
+    return concat_name;
+  XFREE (concat_name);
+  return NULL;
+}
+
+char *
+chase_symlinks (const char *pathspec)
+{
+#ifndef S_ISLNK
+  return xstrdup (pathspec);
+#else
+  char buf[LT_PATHMAX];
+  struct stat s;
+  char *tmp_pathspec = xstrdup (pathspec);
+  char *p;
+  int has_symlinks = 0;
+  while (strlen (tmp_pathspec) && !has_symlinks)
+    {
+      LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n",
+			      tmp_pathspec));
+      if (lstat (tmp_pathspec, &s) == 0)
+	{
+	  if (S_ISLNK (s.st_mode) != 0)
+	    {
+	      has_symlinks = 1;
+	      break;
+	    }
+
+	  /* search backwards for last DIR_SEPARATOR */
+	  p = tmp_pathspec + strlen (tmp_pathspec) - 1;
+	  while ((p > tmp_pathspec) && (!IS_DIR_SEPARATOR (*p)))
+	    p--;
+	  if ((p == tmp_pathspec) && (!IS_DIR_SEPARATOR (*p)))
+	    {
+	      /* no more DIR_SEPARATORS left */
+	      break;
+	    }
+	  *p = '\0';
+	}
+      else
+	{
+	  char *errstr = strerror (errno);
+	  lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr);
+	}
+    }
+  XFREE (tmp_pathspec);
+
+  if (!has_symlinks)
+    {
+      return xstrdup (pathspec);
+    }
+
+  tmp_pathspec = realpath (pathspec, buf);
+  if (tmp_pathspec == 0)
+    {
+      lt_fatal ("Could not follow symlinks for %s", pathspec);
+    }
+  return xstrdup (tmp_pathspec);
+#endif
+}
+
+char *
+strendzap (char *str, const char *pat)
+{
+  size_t len, patlen;
+
+  assert (str != NULL);
+  assert (pat != NULL);
+
+  len = strlen (str);
+  patlen = strlen (pat);
+
+  if (patlen <= len)
+    {
+      str += len - patlen;
+      if (strcmp (str, pat) == 0)
+	*str = '\0';
+    }
+  return str;
+}
+
+static void
+lt_error_core (int exit_status, const char *mode,
+	       const char *message, va_list ap)
+{
+  fprintf (stderr, "%s: %s: ", program_name, mode);
+  vfprintf (stderr, message, ap);
+  fprintf (stderr, ".\n");
+
+  if (exit_status >= 0)
+    exit (exit_status);
+}
+
+void
+lt_fatal (const char *message, ...)
+{
+  va_list ap;
+  va_start (ap, message);
+  lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
+  va_end (ap);
+}
+
+void
+lt_setenv (const char *name, const char *value)
+{
+  LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n",
+                          (name ? name : "<NULL>"),
+                          (value ? value : "<NULL>")));
+  {
+#ifdef HAVE_SETENV
+    /* always make a copy, for consistency with !HAVE_SETENV */
+    char *str = xstrdup (value);
+    setenv (name, str, 1);
+#else
+    int len = strlen (name) + 1 + strlen (value) + 1;
+    char *str = XMALLOC (char, len);
+    sprintf (str, "%s=%s", name, value);
+    if (putenv (str) != EXIT_SUCCESS)
+      {
+        XFREE (str);
+      }
+#endif
+  }
+}
+
+char *
+lt_extend_str (const char *orig_value, const char *add, int to_end)
+{
+  char *new_value;
+  if (orig_value && *orig_value)
+    {
+      int orig_value_len = strlen (orig_value);
+      int add_len = strlen (add);
+      new_value = XMALLOC (char, add_len + orig_value_len + 1);
+      if (to_end)
+        {
+          strcpy (new_value, orig_value);
+          strcpy (new_value + orig_value_len, add);
+        }
+      else
+        {
+          strcpy (new_value, add);
+          strcpy (new_value + add_len, orig_value);
+        }
+    }
+  else
+    {
+      new_value = xstrdup (add);
+    }
+  return new_value;
+}
+
+int
+lt_split_name_value (const char *arg, char** name, char** value)
+{
+  const char *p;
+  int len;
+  if (!arg || !*arg)
+    return 1;
+
+  p = strchr (arg, (int)'=');
+
+  if (!p)
+    return 1;
+
+  *value = xstrdup (++p);
+
+  len = strlen (arg) - strlen (*value);
+  *name = XMALLOC (char, len);
+  strncpy (*name, arg, len-1);
+  (*name)[len - 1] = '\0';
+
+  return 0;
+}
+
+void
+lt_opt_process_env_set (const char *arg)
+{
+  char *name = NULL;
+  char *value = NULL;
+
+  if (lt_split_name_value (arg, &name, &value) != 0)
+    {
+      XFREE (name);
+      XFREE (value);
+      lt_fatal ("bad argument for %s: '%s'", env_set_opt, arg);
+    }
+
+  lt_setenv (name, value);
+  XFREE (name);
+  XFREE (value);
+}
+
+void
+lt_opt_process_env_prepend (const char *arg)
+{
+  char *name = NULL;
+  char *value = NULL;
+  char *new_value = NULL;
+
+  if (lt_split_name_value (arg, &name, &value) != 0)
+    {
+      XFREE (name);
+      XFREE (value);
+      lt_fatal ("bad argument for %s: '%s'", env_prepend_opt, arg);
+    }
+
+  new_value = lt_extend_str (getenv (name), value, 0);
+  lt_setenv (name, new_value);
+  XFREE (new_value);
+  XFREE (name);
+  XFREE (value);
+}
+
+void
+lt_opt_process_env_append (const char *arg)
+{
+  char *name = NULL;
+  char *value = NULL;
+  char *new_value = NULL;
+
+  if (lt_split_name_value (arg, &name, &value) != 0)
+    {
+      XFREE (name);
+      XFREE (value);
+      lt_fatal ("bad argument for %s: '%s'", env_append_opt, arg);
+    }
+
+  new_value = lt_extend_str (getenv (name), value, 1);
+  lt_setenv (name, new_value);
+  XFREE (new_value);
+  XFREE (name);
+  XFREE (value);
+}
+
+void
+lt_update_exe_path (const char *name, const char *value)
+{
+  LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
+                          (name ? name : "<NULL>"),
+                          (value ? value : "<NULL>")));
+
+  if (name && *name && value && *value)
+    {
+      char *new_value = lt_extend_str (getenv (name), value, 0);
+      /* some systems can't cope with a ':'-terminated path #' */
+      int len = strlen (new_value);
+      while (((len = strlen (new_value)) > 0) && IS_PATH_SEPARATOR (new_value[len-1]))
+        {
+          new_value[len-1] = '\0';
+        }
+      lt_setenv (name, new_value);
+      XFREE (new_value);
+    }
+}
+
+void
+lt_update_lib_path (const char *name, const char *value)
+{
+  LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
+                          (name ? name : "<NULL>"),
+                          (value ? value : "<NULL>")));
+
+  if (name && *name && value && *value)
+    {
+      char *new_value = lt_extend_str (getenv (name), value, 0);
+      lt_setenv (name, new_value);
+      XFREE (new_value);
+    }
+}
+
+
+EOF
+}
+# end: func_emit_cwrapperexe_src
+
+# func_mode_link arg...
+func_mode_link ()
+{
+    $opt_debug
     case $host in
-    *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
+    *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
       # It is impossible to link a dll without this setting, and
       # we shouldn't force the makefile maintainer to figure out
       # which system we are compiling for in order to pass an extra
@@ -1105,10 +4051,10 @@ EOF
       allow_undefined=yes
       ;;
     esac
-    libtool_args="$nonopt"
+    libtool_args=$nonopt
     base_compile="$nonopt $@"
-    compile_command="$nonopt"
-    finalize_command="$nonopt"
+    compile_command=$nonopt
+    finalize_command=$nonopt
 
     compile_rpath=
     finalize_rpath=
@@ -1123,6 +4069,7 @@ EOF
     dllsearchpath=
     lib_search_path=`pwd`
     inst_prefix_dir=
+    new_inherited_linker_flags=
 
     avoid_version=no
     dlfiles=
@@ -1138,7 +4085,6 @@ EOF
     no_install=no
     objs=
     non_pic_objects=
-    notinst_path= # paths that contain not-installed libtool libraries
     precious_files_regex=
     prefer_static_libs=no
     preload=no
@@ -1152,37 +4098,44 @@ EOF
     thread_safe=no
     vinfo=
     vinfo_number=no
-
+    weak_libs=
+    single_module="${wl}-single_module"
     func_infer_tag $base_compile
 
     # We need to know -static, to get the right output filenames.
     for arg
     do
       case $arg in
+      -shared)
+	test "$build_libtool_libs" != yes && \
+	  func_fatal_configuration "can not build a shared library"
+	build_old_libs=no
+	break
+	;;
       -all-static | -static | -static-libtool-libs)
-    case $arg in
-    -all-static)
+	case $arg in
+	-all-static)
 	  if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
-	    $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
+	    func_warning "complete static linking is impossible in this configuration"
 	  fi
 	  if test -n "$link_static_flag"; then
 	    dlopen_self=$dlopen_self_static
 	  fi
 	  prefer_static_libs=yes
 	  ;;
-    -static)
+	-static)
 	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
 	    dlopen_self=$dlopen_self_static
 	  fi
 	  prefer_static_libs=built
 	  ;;
-    -static-libtool-libs)
-      if test -z "$pic_flag" && test -n "$link_static_flag"; then
-        dlopen_self=$dlopen_self_static
-      fi
-      prefer_static_libs=yes
-      ;;
-    esac
+	-static-libtool-libs)
+	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
+	    dlopen_self=$dlopen_self_static
+	  fi
+	  prefer_static_libs=yes
+	  ;;
+	esac
 	build_libtool_libs=no
 	build_old_libs=yes
 	break
@@ -1197,20 +4150,16 @@ EOF
     while test "$#" -gt 0; do
       arg="$1"
       shift
-      case $arg in
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	qarg=\"`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`\" ### testsuite: skip nested quoting test
-	;;
-      *) qarg=$arg ;;
-      esac
-      libtool_args="$libtool_args $qarg"
+      func_quote_for_eval "$arg"
+      qarg=$func_quote_for_eval_unquoted_result
+      func_append libtool_args " $func_quote_for_eval_result"
 
       # If the previous option needs an argument, assign it.
       if test -n "$prev"; then
 	case $prev in
 	output)
-	  compile_command="$compile_command @OUTPUT@"
-	  finalize_command="$finalize_command @OUTPUT@"
+	  func_append compile_command " @OUTPUT@"
+	  func_append finalize_command " @OUTPUT@"
 	  ;;
 	esac
 
@@ -1218,8 +4167,8 @@ EOF
 	dlfiles|dlprefiles)
 	  if test "$preload" = no; then
 	    # Add the symbol object into the linking commands.
-	    compile_command="$compile_command @SYMFILE@"
-	    finalize_command="$finalize_command @SYMFILE@"
+	    func_append compile_command " @SYMFILE@"
+	    func_append finalize_command " @SYMFILE@"
 	    preload=yes
 	  fi
 	  case $arg in
@@ -1257,10 +4206,8 @@ EOF
 	  ;;
 	expsyms)
 	  export_symbols="$arg"
-	  if test ! -f "$arg"; then
-	    $echo "$modename: symbol file \`$arg' does not exist"
-	    exit $EXIT_FAILURE
-	  fi
+	  test -f "$arg" \
+	    || func_fatal_error "symbol file \`$arg' does not exist"
 	  prev=
 	  continue
 	  ;;
@@ -1269,18 +4216,21 @@ EOF
 	  prev=
 	  continue
 	  ;;
-	inst_prefix)
-	  inst_prefix_dir="$arg"
-	  prev=
-	  continue
-	  ;;
-	precious_regex)
-	  precious_files_regex="$arg"
+	framework)
+	  case $host in
+	    *-*-darwin*)
+	      case "$deplibs " in
+		*" $qarg.ltframework "*) ;;
+		*) deplibs="$deplibs $qarg.ltframework" # this is fixed later
+		   ;;
+	      esac
+	      ;;
+	  esac
 	  prev=
 	  continue
 	  ;;
-	release)
-	  release="-$arg"
+	inst_prefix)
+	  inst_prefix_dir="$arg"
 	  prev=
 	  continue
 	  ;;
@@ -1288,39 +4238,30 @@ EOF
 	  if test -f "$arg"; then
 	    save_arg=$arg
 	    moreargs=
-	    for fil in `cat $save_arg`
+	    for fil in `cat "$save_arg"`
 	    do
 #	      moreargs="$moreargs $fil"
 	      arg=$fil
 	      # A libtool-controlled object.
 
 	      # Check to see that this really is a libtool object.
-	      if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+	      if func_lalib_unsafe_p "$arg"; then
 		pic_object=
 		non_pic_object=
 
 		# Read the .lo file
-		# If there is no directory component, then add one.
-		case $arg in
-		*/* | *\\*) . $arg ;;
-		*) . ./$arg ;;
-		esac
+		func_source "$arg"
 
-		if test -z "$pic_object" || \
+		if test -z "$pic_object" ||
 		   test -z "$non_pic_object" ||
-		   test "$pic_object" = none && \
+		   test "$pic_object" = none &&
 		   test "$non_pic_object" = none; then
-		  $echo "$modename: cannot find name of object for \`$arg'" 1>&2
-		  exit $EXIT_FAILURE
+		  func_fatal_error "cannot find name of object for \`$arg'"
 		fi
 
 		# Extract subdirectory from the argument.
-		xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
-		if test "X$xdir" = "X$arg"; then
-		  xdir=
-		else
-		  xdir="$xdir/"
-		fi
+		func_dirname "$arg" "/" ""
+		xdir="$func_dirname_result"
 
 		if test "$pic_object" != none; then
 		  # Prepend the subdirectory the object is found in.
@@ -1345,7 +4286,7 @@ EOF
 		  fi
 
 		  # A PIC object.
-		  libobjs="$libobjs $pic_object"
+		  func_append libobjs " $pic_object"
 		  arg="$pic_object"
 		fi
 
@@ -1355,7 +4296,7 @@ EOF
 		  non_pic_object="$xdir$non_pic_object"
 
 		  # A standard non-PIC object
-		  non_pic_objects="$non_pic_objects $non_pic_object"
+		  func_append non_pic_objects " $non_pic_object"
 		  if test -z "$pic_object" || test "$pic_object" = none ; then
 		    arg="$non_pic_object"
 		  fi
@@ -1363,46 +4304,48 @@ EOF
 		  # If the PIC object exists, use it instead.
 		  # $xdir was prepended to $pic_object above.
 		  non_pic_object="$pic_object"
-		  non_pic_objects="$non_pic_objects $non_pic_object"
+		  func_append non_pic_objects " $non_pic_object"
 		fi
 	      else
 		# Only an error if not doing a dry-run.
-		if test -z "$run"; then
-		  $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
-		  exit $EXIT_FAILURE
-		else
-		  # Dry-run case.
-
+		if $opt_dry_run; then
 		  # Extract subdirectory from the argument.
-		  xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
-		  if test "X$xdir" = "X$arg"; then
-		    xdir=
-		  else
-		    xdir="$xdir/"
-		  fi
-
-		  pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"`
-		  non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"`
-		  libobjs="$libobjs $pic_object"
-		  non_pic_objects="$non_pic_objects $non_pic_object"
+		  func_dirname "$arg" "/" ""
+		  xdir="$func_dirname_result"
+
+		  func_lo2o "$arg"
+		  pic_object=$xdir$objdir/$func_lo2o_result
+		  non_pic_object=$xdir$func_lo2o_result
+		  func_append libobjs " $pic_object"
+		  func_append non_pic_objects " $non_pic_object"
+	        else
+		  func_fatal_error "\`$arg' is not a valid libtool object"
 		fi
 	      fi
 	    done
 	  else
-	    $echo "$modename: link input file \`$save_arg' does not exist"
-	    exit $EXIT_FAILURE
+	    func_fatal_error "link input file \`$arg' does not exist"
 	  fi
 	  arg=$save_arg
 	  prev=
 	  continue
 	  ;;
+	precious_regex)
+	  precious_files_regex="$arg"
+	  prev=
+	  continue
+	  ;;
+	release)
+	  release="-$arg"
+	  prev=
+	  continue
+	  ;;
 	rpath | xrpath)
 	  # We need an absolute path.
 	  case $arg in
 	  [\\/]* | [A-Za-z]:[\\/]*) ;;
 	  *)
-	    $echo "$modename: only absolute run-paths are allowed" 1>&2
-	    exit $EXIT_FAILURE
+	    func_fatal_error "only absolute run-paths are allowed"
 	    ;;
 	  esac
 	  if test "$prev" = rpath; then
@@ -1419,39 +4362,37 @@ EOF
 	  prev=
 	  continue
 	  ;;
-	xcompiler)
-	  compiler_flags="$compiler_flags $qarg"
+	shrext)
+	  shrext_cmds="$arg"
 	  prev=
-	  compile_command="$compile_command $qarg"
-	  finalize_command="$finalize_command $qarg"
 	  continue
 	  ;;
-	xlinker)
-	  linker_flags="$linker_flags $qarg"
-	  compiler_flags="$compiler_flags $wl$qarg"
+	weak)
+	  weak_libs="$weak_libs $arg"
 	  prev=
-	  compile_command="$compile_command $wl$qarg"
-	  finalize_command="$finalize_command $wl$qarg"
 	  continue
 	  ;;
 	xcclinker)
 	  linker_flags="$linker_flags $qarg"
 	  compiler_flags="$compiler_flags $qarg"
 	  prev=
-	  compile_command="$compile_command $qarg"
-	  finalize_command="$finalize_command $qarg"
+	  func_append compile_command " $qarg"
+	  func_append finalize_command " $qarg"
 	  continue
 	  ;;
-	shrext)
-  	  shrext_cmds="$arg"
+	xcompiler)
+	  compiler_flags="$compiler_flags $qarg"
 	  prev=
+	  func_append compile_command " $qarg"
+	  func_append finalize_command " $qarg"
 	  continue
 	  ;;
-	darwin_framework|darwin_framework_skip)
-	  test "$prev" = "darwin_framework" && compiler_flags="$compiler_flags $arg"
-	  compile_command="$compile_command $arg"
-	  finalize_command="$finalize_command $arg"
+	xlinker)
+	  linker_flags="$linker_flags $qarg"
+	  compiler_flags="$compiler_flags $wl$qarg"
 	  prev=
+	  func_append compile_command " $wl$qarg"
+	  func_append finalize_command " $wl$qarg"
 	  continue
 	  ;;
 	*)
@@ -1467,16 +4408,16 @@ EOF
       case $arg in
       -all-static)
 	if test -n "$link_static_flag"; then
-	  compile_command="$compile_command $link_static_flag"
-	  finalize_command="$finalize_command $link_static_flag"
+	  # See comment for -static flag below, for more details.
+	  func_append compile_command " $link_static_flag"
+	  func_append finalize_command " $link_static_flag"
 	fi
 	continue
 	;;
 
       -allow-undefined)
 	# FIXME: remove this flag sometime in the future.
-	$echo "$modename: \`-allow-undefined' is deprecated because it is the default" 1>&2
-	continue
+	func_fatal_error "\`-allow-undefined' must not be used because it is the default"
 	;;
 
       -avoid-version)
@@ -1501,8 +4442,7 @@ EOF
 
       -export-symbols | -export-symbols-regex)
 	if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
-	  $echo "$modename: more than one -exported-symbols argument is not allowed"
-	  exit $EXIT_FAILURE
+	  func_fatal_error "more than one -exported-symbols argument is not allowed"
 	fi
 	if test "X$arg" = "X-export-symbols"; then
 	  prev=expsyms
@@ -1512,15 +4452,8 @@ EOF
 	continue
 	;;
 
-      -framework|-arch|-isysroot)
-	case " $CC " in
-	  *" ${arg} ${1} "* | *" ${arg}	${1} "*) 
-		prev=darwin_framework_skip ;;
-	  *) compiler_flags="$compiler_flags $arg"
-	     prev=darwin_framework ;;
-	esac
-	compile_command="$compile_command $arg"
-	finalize_command="$finalize_command $arg"
+      -framework)
+	prev=framework
 	continue
 	;;
 
@@ -1534,25 +4467,30 @@ EOF
       -L[A-Z][A-Z]*:*)
 	case $with_gcc/$host in
 	no/*-*-irix* | /*-*-irix*)
-	  compile_command="$compile_command $arg"
-	  finalize_command="$finalize_command $arg"
+	  func_append compile_command " $arg"
+	  func_append finalize_command " $arg"
 	  ;;
 	esac
 	continue
 	;;
 
       -L*)
-	dir=`$echo "X$arg" | $Xsed -e 's/^-L//'`
+	func_stripname '-L' '' "$arg"
+	dir=$func_stripname_result
+	if test -z "$dir"; then
+	  if test "$#" -gt 0; then
+	    func_fatal_error "require no space between \`-L' and \`$1'"
+	  else
+	    func_fatal_error "need path for \`-L' option"
+	  fi
+	fi
 	# We need an absolute path.
 	case $dir in
 	[\\/]* | [A-Za-z]:[\\/]*) ;;
 	*)
 	  absdir=`cd "$dir" && pwd`
-	  if test -z "$absdir"; then
-	    $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
-	    absdir="$dir"
-	    notinst_path="$notinst_path $dir"
-	  fi
+	  test -z "$absdir" && \
+	    func_fatal_error "cannot determine absolute directory name of \`$dir'"
 	  dir="$absdir"
 	  ;;
 	esac
@@ -1564,14 +4502,16 @@ EOF
 	  ;;
 	esac
 	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-	  testbindir=`$echo "X$dir" | $Xsed -e 's*/lib$*/bin*'`
+	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
+	  testbindir=`$ECHO "X$dir" | $Xsed -e 's*/lib$*/bin*'`
 	  case :$dllsearchpath: in
 	  *":$dir:"*) ;;
+	  ::) dllsearchpath=$dir;;
 	  *) dllsearchpath="$dllsearchpath:$dir";;
 	  esac
 	  case :$dllsearchpath: in
 	  *":$testbindir:"*) ;;
+	  ::) dllsearchpath=$testbindir;;
 	  *) dllsearchpath="$dllsearchpath:$testbindir";;
 	  esac
 	  ;;
@@ -1582,7 +4522,7 @@ EOF
       -l*)
 	if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
 	  case $host in
-	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos*)
+	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc*)
 	    # These systems don't actually have a C or math library (as such)
 	    continue
 	    ;;
@@ -1596,7 +4536,7 @@ EOF
 	    ;;
 	  *-*-rhapsody* | *-*-darwin1.[012])
 	    # Rhapsody C and math libraries are in the System framework
-	    deplibs="$deplibs -framework System"
+	    deplibs="$deplibs System.ltframework"
 	    continue
 	    ;;
 	  *-*-sco3.2v5* | *-*-sco5v6*)
@@ -1620,57 +4560,35 @@ EOF
 	continue
 	;;
 
+      -module)
+	module=yes
+	continue
+	;;
+
       # Tru64 UNIX uses -model [arg] to determine the layout of C++
       # classes, name mangling, and exception handling.
-      -model)
-	compile_command="$compile_command $arg"
+      # Darwin uses the -arch flag to determine output architecture.
+      -model|-arch|-isysroot)
 	compiler_flags="$compiler_flags $arg"
-	finalize_command="$finalize_command $arg"
+	func_append compile_command " $arg"
+	func_append finalize_command " $arg"
 	prev=xcompiler
 	continue
 	;;
 
-     -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
+      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
 	compiler_flags="$compiler_flags $arg"
-	compile_command="$compile_command $arg"
-	finalize_command="$finalize_command $arg"
+	func_append compile_command " $arg"
+	func_append finalize_command " $arg"
+	case "$new_inherited_linker_flags " in
+	    *" $arg "*) ;;
+	    * ) new_inherited_linker_flags="$new_inherited_linker_flags $arg" ;;
+	esac
 	continue
 	;;
 
-      -module)
-	module=yes
-	continue
-	;;
-
-      # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
-      # -r[0-9][0-9]* specifies the processor on the SGI compiler
-      # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
-      # +DA*, +DD* enable 64-bit mode on the HP compiler
-      # -q* pass through compiler args for the IBM compiler
-      # -m* pass through architecture-specific compiler args for GCC
-      # -m*, -t[45]*, -txscale* pass through architecture-specific
-      # compiler args for GCC
-      # -pg pass through profiling flag for GCC
-      # @file GCC response files
-      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \
-      -t[45]*|-txscale*|@*)
-
-	# Unknown arguments in both finalize_command and compile_command need
-	# to be aesthetically quoted because they are evaled later.
-	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-	case $arg in
-	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	  arg="\"$arg\""
-	  ;;
-	esac
-        compile_command="$compile_command $arg"
-        finalize_command="$finalize_command $arg"
-        compiler_flags="$compiler_flags $arg"
-        continue
-        ;;
-
-      -shrext)
-	prev=shrext
+      -multi_module)
+	single_module="${wl}-multi_module"
 	continue
 	;;
 
@@ -1681,11 +4599,11 @@ EOF
 
       -no-install)
 	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
+	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*)
 	  # The PATH hackery in wrapper scripts is required on Windows
-	  # in order for the loader to find any dlls it needs.
-	  $echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2
-	  $echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2
+	  # and Darwin in order for the loader to find any dlls it needs.
+	  func_warning "\`-no-install' is ignored for $host"
+	  func_warning "assuming \`-no-fast-install' instead"
 	  fast_install=no
 	  ;;
 	*) no_install=yes ;;
@@ -1726,13 +4644,13 @@ EOF
 	;;
 
       -R*)
-	dir=`$echo "X$arg" | $Xsed -e 's/^-R//'`
+	func_stripname '-R' '' "$arg"
+	dir=$func_stripname_result
 	# We need an absolute path.
 	case $dir in
 	[\\/]* | [A-Za-z]:[\\/]*) ;;
 	*)
-	  $echo "$modename: only absolute run-paths are allowed" 1>&2
-	  exit $EXIT_FAILURE
+	  func_fatal_error "only absolute run-paths are allowed"
 	  ;;
 	esac
 	case "$xrpath " in
@@ -1742,6 +4660,16 @@ EOF
 	continue
 	;;
 
+      -shared)
+	# The effects of -shared are defined in a previous loop.
+	continue
+	;;
+
+      -shrext)
+	prev=shrext
+	continue
+	;;
+
       -static | -static-libtool-libs)
 	# The effects of -static are defined in a previous loop.
 	# We used to do the same as -all-static on platforms that
@@ -1760,47 +4688,49 @@ EOF
 	prev=vinfo
 	continue
 	;;
+
       -version-number)
 	prev=vinfo
 	vinfo_number=yes
 	continue
 	;;
 
+      -weak)
+        prev=weak
+	continue
+	;;
+
       -Wc,*)
-	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wc,//'`
+	func_stripname '-Wc,' '' "$arg"
+	args=$func_stripname_result
 	arg=
 	save_ifs="$IFS"; IFS=','
 	for flag in $args; do
 	  IFS="$save_ifs"
-	  case $flag in
-	    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	    flag="\"$flag\""
-	    ;;
-	  esac
-	  arg="$arg $wl$flag"
-	  compiler_flags="$compiler_flags $flag"
+          func_quote_for_eval "$flag"
+	  arg="$arg $wl$func_quote_for_eval_result"
+	  compiler_flags="$compiler_flags $func_quote_for_eval_result"
 	done
 	IFS="$save_ifs"
-	arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
+	func_stripname ' ' '' "$arg"
+	arg=$func_stripname_result
 	;;
 
       -Wl,*)
-	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'`
+	func_stripname '-Wl,' '' "$arg"
+	args=$func_stripname_result
 	arg=
 	save_ifs="$IFS"; IFS=','
 	for flag in $args; do
 	  IFS="$save_ifs"
-	  case $flag in
-	    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	    flag="\"$flag\""
-	    ;;
-	  esac
-	  arg="$arg $wl$flag"
-	  compiler_flags="$compiler_flags $wl$flag"
-	  linker_flags="$linker_flags $flag"
+          func_quote_for_eval "$flag"
+	  arg="$arg $wl$func_quote_for_eval_result"
+	  compiler_flags="$compiler_flags $wl$func_quote_for_eval_result"
+	  linker_flags="$linker_flags $func_quote_for_eval_result"
 	done
 	IFS="$save_ifs"
-	arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
+	func_stripname ' ' '' "$arg"
+	arg=$func_stripname_result
 	;;
 
       -Xcompiler)
@@ -1818,16 +4748,36 @@ EOF
 	continue
 	;;
 
+      # -msg_* for osf cc
+      -msg_*)
+	func_quote_for_eval "$arg"
+	arg="$func_quote_for_eval_result"
+	;;
+
+      # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
+      # -r[0-9][0-9]* specifies the processor on the SGI compiler
+      # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
+      # +DA*, +DD* enable 64-bit mode on the HP compiler
+      # -q* pass through compiler args for the IBM compiler
+      # -m*, -t[45]*, -txscale* pass through architecture-specific
+      # compiler args for GCC
+      # -F/path gives path to uninstalled frameworks, gcc on darwin
+      # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
+      # @file GCC response files
+      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
+      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
+        func_quote_for_eval "$arg"
+	arg="$func_quote_for_eval_result"
+        func_append compile_command " $arg"
+        func_append finalize_command " $arg"
+        compiler_flags="$compiler_flags $arg"
+        continue
+        ;;
+
       # Some other compiler flag.
       -* | +*)
-	# Unknown arguments in both finalize_command and compile_command need
-	# to be aesthetically quoted because they are evaled later.
-	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-	case $arg in
-	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	  arg="\"$arg\""
-	  ;;
-	esac
+        func_quote_for_eval "$arg"
+	arg="$func_quote_for_eval_result"
 	;;
 
       *.$objext)
@@ -1839,32 +4789,23 @@ EOF
 	# A libtool-controlled object.
 
 	# Check to see that this really is a libtool object.
-	if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+	if func_lalib_unsafe_p "$arg"; then
 	  pic_object=
 	  non_pic_object=
 
 	  # Read the .lo file
-	  # If there is no directory component, then add one.
-	  case $arg in
-	  */* | *\\*) . $arg ;;
-	  *) . ./$arg ;;
-	  esac
+	  func_source "$arg"
 
-	  if test -z "$pic_object" || \
+	  if test -z "$pic_object" ||
 	     test -z "$non_pic_object" ||
-	     test "$pic_object" = none && \
+	     test "$pic_object" = none &&
 	     test "$non_pic_object" = none; then
-	    $echo "$modename: cannot find name of object for \`$arg'" 1>&2
-	    exit $EXIT_FAILURE
+	    func_fatal_error "cannot find name of object for \`$arg'"
 	  fi
 
 	  # Extract subdirectory from the argument.
-	  xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
-	  if test "X$xdir" = "X$arg"; then
-	    xdir=
- 	  else
-	    xdir="$xdir/"
-	  fi
+	  func_dirname "$arg" "/" ""
+	  xdir="$func_dirname_result"
 
 	  if test "$pic_object" != none; then
 	    # Prepend the subdirectory the object is found in.
@@ -1889,7 +4830,7 @@ EOF
 	    fi
 
 	    # A PIC object.
-	    libobjs="$libobjs $pic_object"
+	    func_append libobjs " $pic_object"
 	    arg="$pic_object"
 	  fi
 
@@ -1899,7 +4840,7 @@ EOF
 	    non_pic_object="$xdir$non_pic_object"
 
 	    # A standard non-PIC object
-	    non_pic_objects="$non_pic_objects $non_pic_object"
+	    func_append non_pic_objects " $non_pic_object"
 	    if test -z "$pic_object" || test "$pic_object" = none ; then
 	      arg="$non_pic_object"
 	    fi
@@ -1907,28 +4848,22 @@ EOF
 	    # If the PIC object exists, use it instead.
 	    # $xdir was prepended to $pic_object above.
 	    non_pic_object="$pic_object"
-	    non_pic_objects="$non_pic_objects $non_pic_object"
+	    func_append non_pic_objects " $non_pic_object"
 	  fi
 	else
 	  # Only an error if not doing a dry-run.
-	  if test -z "$run"; then
-	    $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
-	    exit $EXIT_FAILURE
-	  else
-	    # Dry-run case.
-
+	  if $opt_dry_run; then
 	    # Extract subdirectory from the argument.
-	    xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
-	    if test "X$xdir" = "X$arg"; then
-	      xdir=
-	    else
-	      xdir="$xdir/"
-	    fi
-
-	    pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"`
-	    non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"`
-	    libobjs="$libobjs $pic_object"
-	    non_pic_objects="$non_pic_objects $non_pic_object"
+	    func_dirname "$arg" "/" ""
+	    xdir="$func_dirname_result"
+
+	    func_lo2o "$arg"
+	    pic_object=$xdir$objdir/$func_lo2o_result
+	    non_pic_object=$xdir$func_lo2o_result
+	    func_append libobjs " $pic_object"
+	    func_append non_pic_objects " $non_pic_object"
+	  else
+	    func_fatal_error "\`$arg' is not a valid libtool object"
 	  fi
 	fi
 	;;
@@ -1961,70 +4896,51 @@ EOF
       *)
 	# Unknown arguments in both finalize_command and compile_command need
 	# to be aesthetically quoted because they are evaled later.
-	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-	case $arg in
-	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	  arg="\"$arg\""
-	  ;;
-	esac
+	func_quote_for_eval "$arg"
+	arg="$func_quote_for_eval_result"
 	;;
       esac # arg
 
       # Now actually substitute the argument into the commands.
       if test -n "$arg"; then
-	compile_command="$compile_command $arg"
-	finalize_command="$finalize_command $arg"
+	func_append compile_command " $arg"
+	func_append finalize_command " $arg"
       fi
     done # argument parsing loop
 
-    if test -n "$prev"; then
-      $echo "$modename: the \`$prevarg' option requires an argument" 1>&2
-      $echo "$help" 1>&2
-      exit $EXIT_FAILURE
-    fi
+    test -n "$prev" && \
+      func_fatal_help "the \`$prevarg' option requires an argument"
 
     if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
       eval arg=\"$export_dynamic_flag_spec\"
-      compile_command="$compile_command $arg"
-      finalize_command="$finalize_command $arg"
+      func_append compile_command " $arg"
+      func_append finalize_command " $arg"
     fi
 
     oldlibs=
     # calculate the name of the file, without its directory
-    outputname=`$echo "X$output" | $Xsed -e 's%^.*/%%'`
+    func_basename "$output"
+    outputname="$func_basename_result"
     libobjs_save="$libobjs"
 
     if test -n "$shlibpath_var"; then
       # get the directories listed in $shlibpath_var
-      eval shlib_search_path=\`\$echo \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\`
+      eval shlib_search_path=\`\$ECHO \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\`
     else
       shlib_search_path=
     fi
     eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
     eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
 
-    output_objdir=`$echo "X$output" | $Xsed -e 's%/[^/]*$%%'`
-    if test "X$output_objdir" = "X$output"; then
-      output_objdir="$objdir"
-    else
-      output_objdir="$output_objdir/$objdir"
-    fi
+    func_dirname "$output" "/" ""
+    output_objdir="$func_dirname_result$objdir"
     # Create the object directory.
-    if test ! -d "$output_objdir"; then
-      $show "$mkdir $output_objdir"
-      $run $mkdir $output_objdir
-      exit_status=$?
-      if test "$exit_status" -ne 0 && test ! -d "$output_objdir"; then
-	exit $exit_status
-      fi
-    fi
+    func_mkdir_p "$output_objdir"
 
     # Determine the type of output
     case $output in
     "")
-      $echo "$modename: you must specify an output file" 1>&2
-      $echo "$help" 1>&2
-      exit $EXIT_FAILURE
+      func_fatal_help "you must specify an output file"
       ;;
     *.$libext) linkmode=oldlib ;;
     *.lo | *.$objext) linkmode=obj ;;
@@ -2032,22 +4948,13 @@ EOF
     *) linkmode=prog ;; # Anything else should be a program.
     esac
 
-    case $host in
-    *cygwin* | *mingw* | *pw32*)
-      # don't eliminate duplications in $postdeps and $predeps
-      duplicate_compiler_generated_deps=yes
-      ;;
-    *)
-      duplicate_compiler_generated_deps=$duplicate_deps
-      ;;
-    esac
     specialdeplibs=
 
     libs=
     # Find all interdependent deplibs by searching for libraries
     # that are linked more than once (e.g. -la -lb -la)
     for deplib in $deplibs; do
-      if test "X$duplicate_deps" = "Xyes" ; then
+      if $opt_duplicate_deps ; then
 	case "$libs " in
 	*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
 	esac
@@ -2062,7 +4969,7 @@ EOF
       # $postdeps and mark them as special (i.e., whose duplicates are
       # not to be eliminated).
       pre_post_deps=
-      if test "X$duplicate_compiler_generated_deps" = "Xyes" ; then
+      if $opt_duplicate_compiler_generated_deps; then
 	for pre_post_dep in $predeps $postdeps; do
 	  case "$pre_post_deps " in
 	  *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
@@ -2078,15 +4985,16 @@ EOF
     newlib_search_path=
     need_relink=no # whether we're linking any uninstalled libtool libraries
     notinst_deplibs= # not-installed libtool libraries
+    notinst_path= # paths that contain not-installed libtool libraries
+
     case $linkmode in
     lib)
-	passes="conv link"
+	passes="conv dlpreopen link"
 	for file in $dlfiles $dlprefiles; do
 	  case $file in
 	  *.la) ;;
 	  *)
-	    $echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2
-	    exit $EXIT_FAILURE
+	    func_fatal_help "libraries can \`-dlopen' only libtool libraries: $file"
 	    ;;
 	  esac
 	done
@@ -2102,7 +5010,20 @@ EOF
     *)  passes="conv"
 	;;
     esac
+
     for pass in $passes; do
+      # The preopen pass in lib mode reverses $deplibs; put it back here
+      # so that -L comes before libs that need it for instance...
+      if test "$linkmode,$pass" = "lib,link"; then
+	## FIXME: Find the place where the list is rebuilt in the wrong
+	##        order, and fix it there properly
+        tmp_deplibs=
+	for deplib in $deplibs; do
+	  tmp_deplibs="$deplib $tmp_deplibs"
+	done
+	deplibs="$tmp_deplibs"
+      fi
+
       if test "$linkmode,$pass" = "lib,link" ||
 	 test "$linkmode,$pass" = "prog,scan"; then
 	libs="$deplibs"
@@ -2115,31 +5036,65 @@ EOF
 	link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
 	esac
       fi
+      if test "$linkmode,$pass" = "lib,dlpreopen"; then
+	# Collect and forward deplibs of preopened libtool libs
+	for lib in $dlprefiles; do
+	  # Ignore non-libtool-libs
+	  dependency_libs=
+	  case $lib in
+	  *.la)	func_source "$lib" ;;
+	  esac
+
+	  # Collect preopened libtool deplibs, except any this library
+	  # has declared as weak libs
+	  for deplib in $dependency_libs; do
+            deplib_base=`$ECHO "X$deplib" | $Xsed -e "$basename"`
+	    case " $weak_libs " in
+	    *" $deplib_base "*) ;;
+	    *) deplibs="$deplibs $deplib" ;;
+	    esac
+	  done
+	done
+	libs="$dlprefiles"
+      fi
       if test "$pass" = dlopen; then
 	# Collect dlpreopened libraries
 	save_deplibs="$deplibs"
 	deplibs=
       fi
+
       for deplib in $libs; do
 	lib=
 	found=no
 	case $deplib in
-	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
+	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
 	  if test "$linkmode,$pass" = "prog,link"; then
 	    compile_deplibs="$deplib $compile_deplibs"
 	    finalize_deplibs="$deplib $finalize_deplibs"
 	  else
 	    compiler_flags="$compiler_flags $deplib"
+	    if test "$linkmode" = lib ; then
+		case "$new_inherited_linker_flags " in
+		    *" $deplib "*) ;;
+		    * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
+		esac
+	    fi
 	  fi
 	  continue
 	  ;;
 	-l*)
 	  if test "$linkmode" != lib && test "$linkmode" != prog; then
-	    $echo "$modename: warning: \`-l' is ignored for archives/objects" 1>&2
+	    func_warning "\`-l' is ignored for archives/objects"
 	    continue
 	  fi
-	  name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
-	  for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do
+	  func_stripname '-l' '' "$deplib"
+	  name=$func_stripname_result
+	  if test "$linkmode" = lib; then
+	    searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path"
+	  else
+	    searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path"
+	  fi
+	  for searchdir in $searchdirs; do
 	    for search_ext in .la $std_shrext .so .a; do
 	      # Search the libtool library
 	      lib="$searchdir/lib${name}${search_ext}"
@@ -2169,21 +5124,17 @@ EOF
 	    if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
 	      case " $predeps $postdeps " in
 	      *" $deplib "*)
-		if (${SED} -e '2q' $lib |
-                    grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+		if func_lalib_p "$lib"; then
 		  library_names=
 		  old_library=
-		  case $lib in
-		  */* | *\\*) . $lib ;;
-		  *) . ./$lib ;;
-		  esac
+		  func_source "$lib"
 		  for l in $old_library $library_names; do
 		    ll="$l"
 		  done
 		  if test "X$ll" = "X$old_library" ; then # only static version available
 		    found=no
-		    ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
-		    test "X$ladir" = "X$lib" && ladir="."
+		    func_dirname "$lib" "" "."
+		    ladir="$func_dirname_result"
 		    lib=$ladir/$old_library
 		    if test "$linkmode,$pass" = "prog,link"; then
 		      compile_deplibs="$deplib $compile_deplibs"
@@ -2195,19 +5146,35 @@ EOF
 		    continue
 		  fi
 		fi
-	        ;;
+		;;
 	      *) ;;
 	      esac
 	    fi
 	  fi
 	  ;; # -l
+	*.ltframework)
+	  if test "$linkmode,$pass" = "prog,link"; then
+	    compile_deplibs="$deplib $compile_deplibs"
+	    finalize_deplibs="$deplib $finalize_deplibs"
+	  else
+	    deplibs="$deplib $deplibs"
+	    if test "$linkmode" = lib ; then
+		case "$new_inherited_linker_flags " in
+		    *" $deplib "*) ;;
+		    * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
+		esac
+	    fi
+	  fi
+	  continue
+	  ;;
 	-L*)
 	  case $linkmode in
 	  lib)
 	    deplibs="$deplib $deplibs"
 	    test "$pass" = conv && continue
 	    newdependency_libs="$deplib $newdependency_libs"
-	    newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
+	    func_stripname '-L' '' "$deplib"
+	    newlib_search_path="$newlib_search_path $func_stripname_result"
 	    ;;
 	  prog)
 	    if test "$pass" = conv; then
@@ -2220,17 +5187,19 @@ EOF
 	      compile_deplibs="$deplib $compile_deplibs"
 	      finalize_deplibs="$deplib $finalize_deplibs"
 	    fi
-	    newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
+	    func_stripname '-L' '' "$deplib"
+	    newlib_search_path="$newlib_search_path $func_stripname_result"
 	    ;;
 	  *)
-	    $echo "$modename: warning: \`-L' is ignored for archives/objects" 1>&2
+	    func_warning "\`-L' is ignored for archives/objects"
 	    ;;
 	  esac # linkmode
 	  continue
 	  ;; # -L
 	-R*)
 	  if test "$pass" = link; then
-	    dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'`
+	    func_stripname '-R' '' "$deplib"
+	    dir=$func_stripname_result
 	    # Make sure the xrpath contains only unique directories.
 	    case "$xrpath " in
 	    *" $dir "*) ;;
@@ -2248,35 +5217,41 @@ EOF
 	  fi
 	  case $linkmode in
 	  lib)
-	    valid_a_lib=no
-	    case $deplibs_check_method in
-	      match_pattern*)
-		set dummy $deplibs_check_method
-	        match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
-		if eval $echo \"$deplib\" 2>/dev/null \
-		    | $SED 10q \
+	    # Linking convenience modules into shared libraries is allowed,
+	    # but linking other static libraries is non-portable.
+	    case " $dlpreconveniencelibs " in
+	    *" $deplib "*) ;;
+	    *)
+	      valid_a_lib=no
+	      case $deplibs_check_method in
+		match_pattern*)
+		  set dummy $deplibs_check_method; shift
+		  match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
+		  if eval "\$ECHO \"X$deplib\"" 2>/dev/null | $Xsed -e 10q \
 		    | $EGREP "$match_pattern_regex" > /dev/null; then
-		  valid_a_lib=yes
-		fi
+		    valid_a_lib=yes
+		  fi
 		;;
-	      pass_all)
-		valid_a_lib=yes
+		pass_all)
+		  valid_a_lib=yes
 		;;
-            esac
-	    if test "$valid_a_lib" != yes; then
-	      $echo
-	      $echo "*** Warning: Trying to link with static lib archive $deplib."
-	      $echo "*** I have the capability to make that library automatically link in when"
-	      $echo "*** you link to this library.  But I can only do this if you have a"
-	      $echo "*** shared version of the library, which you do not appear to have"
-	      $echo "*** because the file extensions .$libext of this argument makes me believe"
-	      $echo "*** that it is just a static archive that I should not used here."
-	    else
-	      $echo
-	      $echo "*** Warning: Linking the shared library $output against the"
-	      $echo "*** static library $deplib is not portable!"
-	      deplibs="$deplib $deplibs"
-	    fi
+	      esac
+	      if test "$valid_a_lib" != yes; then
+		$ECHO
+		$ECHO "*** Warning: Trying to link with static lib archive $deplib."
+		$ECHO "*** I have the capability to make that library automatically link in when"
+		$ECHO "*** you link to this library.  But I can only do this if you have a"
+		$ECHO "*** shared version of the library, which you do not appear to have"
+		$ECHO "*** because the file extensions .$libext of this argument makes me believe"
+		$ECHO "*** that it is just a static archive that I should not use here."
+	      else
+		$ECHO
+		$ECHO "*** Warning: Linking the shared library $output against the"
+		$ECHO "*** static library $deplib is not portable!"
+		deplibs="$deplib $deplibs"
+	      fi
+	      ;;
+	    esac
 	    continue
 	    ;;
 	  prog)
@@ -2311,21 +5286,18 @@ EOF
 	  continue
 	  ;;
 	esac # case $deplib
+
 	if test "$found" = yes || test -f "$lib"; then :
 	else
-	  $echo "$modename: cannot find the library \`$lib' or unhandled argument \`$deplib'" 1>&2
-	  exit $EXIT_FAILURE
+	  func_fatal_error "cannot find the library \`$lib' or unhandled argument \`$deplib'"
 	fi
 
 	# Check to see that this really is a libtool archive.
-	if (${SED} -e '2q' $lib | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
-	else
-	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-	  exit $EXIT_FAILURE
-	fi
+	func_lalib_unsafe_p "$lib" \
+	  || func_fatal_error "\`$lib' is not a valid libtool archive"
 
-	ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
-	test "X$ladir" = "X$lib" && ladir="."
+	func_dirname "$lib" "" "."
+	ladir="$func_dirname_result"
 
 	dlname=
 	dlopen=
@@ -2333,6 +5305,7 @@ EOF
 	libdir=
 	library_names=
 	old_library=
+	inherited_linker_flags=
 	# If the library was installed with an old release of libtool,
 	# it will not redefine variables installed, or shouldnotlink
 	installed=yes
@@ -2341,11 +5314,19 @@ EOF
 
 
 	# Read the .la file
-	case $lib in
-	*/* | *\\*) . $lib ;;
-	*) . ./$lib ;;
-	esac
-
+	func_source "$lib"
+
+	# Convert "-framework foo" to "foo.ltframework"
+	if test -n "$inherited_linker_flags"; then
+	  tmp_inherited_linker_flags=`$ECHO "X$inherited_linker_flags" | $Xsed -e 's/-framework \([^ $]*\)/\1.ltframework/g'`
+	  for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do
+	    case " $new_inherited_linker_flags " in
+	      *" $tmp_inherited_linker_flag "*) ;;
+	      *) new_inherited_linker_flags="$new_inherited_linker_flags $tmp_inherited_linker_flag";;
+	    esac
+	  done
+	fi
+	dependency_libs=`$ECHO "X $dependency_libs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
 	if test "$linkmode,$pass" = "lib,link" ||
 	   test "$linkmode,$pass" = "prog,scan" ||
 	   { test "$linkmode" != prog && test "$linkmode" != lib; }; then
@@ -2358,26 +5339,24 @@ EOF
 	  deplibs="$lib $deplibs"
 	  if test -z "$libdir"; then
 	    if test -z "$old_library"; then
-	      $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
-	      exit $EXIT_FAILURE
+	      func_fatal_error "cannot find name of link library for \`$lib'"
 	    fi
 	    # It is a libtool convenience library, so add in its objects.
 	    convenience="$convenience $ladir/$objdir/$old_library"
 	    old_convenience="$old_convenience $ladir/$objdir/$old_library"
-	    tmp_libs=
-	    for deplib in $dependency_libs; do
-	      deplibs="$deplib $deplibs"
-              if test "X$duplicate_deps" = "Xyes" ; then
-	        case "$tmp_libs " in
-	        *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-	        esac
-              fi
-	      tmp_libs="$tmp_libs $deplib"
-	    done
 	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
-	    $echo "$modename: \`$lib' is not a convenience library" 1>&2
-	    exit $EXIT_FAILURE
+	    func_fatal_error "\`$lib' is not a convenience library"
 	  fi
+	  tmp_libs=
+	  for deplib in $dependency_libs; do
+	    deplibs="$deplib $deplibs"
+	    if $opt_duplicate_deps ; then
+	      case "$tmp_libs " in
+	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+	      esac
+	    fi
+	    tmp_libs="$tmp_libs $deplib"
+	  done
 	  continue
 	fi # $pass = conv
 
@@ -2388,15 +5367,13 @@ EOF
 	  linklib="$l"
 	done
 	if test -z "$linklib"; then
-	  $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
-	  exit $EXIT_FAILURE
+	  func_fatal_error "cannot find name of link library for \`$lib'"
 	fi
 
 	# This library was specified with -dlopen.
 	if test "$pass" = dlopen; then
 	  if test -z "$libdir"; then
-	    $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2
-	    exit $EXIT_FAILURE
+	    func_fatal_error "cannot -dlopen a convenience library: \`$lib'"
 	  fi
 	  if test -z "$dlname" ||
 	     test "$dlopen_support" != yes ||
@@ -2418,18 +5395,19 @@ EOF
 	*)
 	  abs_ladir=`cd "$ladir" && pwd`
 	  if test -z "$abs_ladir"; then
-	    $echo "$modename: warning: cannot determine absolute directory name of \`$ladir'" 1>&2
-	    $echo "$modename: passing it literally to the linker, although it might fail" 1>&2
+	    func_warning "cannot determine absolute directory name of \`$ladir'"
+	    func_warning "passing it literally to the linker, although it might fail"
 	    abs_ladir="$ladir"
 	  fi
 	  ;;
 	esac
-	laname=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
+	func_basename "$lib"
+	laname="$func_basename_result"
 
 	# Find the relevant object directory and library name.
 	if test "X$installed" = Xyes; then
 	  if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
-	    $echo "$modename: warning: library \`$lib' was moved." 1>&2
+	    func_warning "library \`$lib' was moved."
 	    dir="$ladir"
 	    absdir="$abs_ladir"
 	    libdir="$abs_ladir"
@@ -2451,18 +5429,22 @@ EOF
 	    notinst_path="$notinst_path $abs_ladir"
 	  fi
 	fi # $installed = yes
-	name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
+	func_stripname 'lib' '.la' "$laname"
+	name=$func_stripname_result
 
 	# This library was specified with -dlpreopen.
 	if test "$pass" = dlpreopen; then
-	  if test -z "$libdir"; then
-	    $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2
-	    exit $EXIT_FAILURE
+	  if test -z "$libdir" && test "$linkmode" = prog; then
+	    func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'"
 	  fi
 	  # Prefer using a static library (so that no silly _DYNAMIC symbols
 	  # are required to link).
 	  if test -n "$old_library"; then
 	    newdlprefiles="$newdlprefiles $dir/$old_library"
+	    # Keep a list of preopened convenience libraries to check
+	    # that they are being used correctly in the link pass.
+	    test -z "$libdir" && \
+		dlpreconveniencelibs="$dlpreconveniencelibs $dir/$old_library"
 	  # Otherwise, use the dlname, so that lt_dlopen finds it.
 	  elif test -n "$dlname"; then
 	    newdlprefiles="$newdlprefiles $dir/$dlname"
@@ -2498,7 +5480,9 @@ EOF
 	  tmp_libs=
 	  for deplib in $dependency_libs; do
 	    case $deplib in
-	    -L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test
+	    -L*) func_stripname '-L' '' "$deplib"
+	         newlib_search_path="$newlib_search_path $func_stripname_result"
+		 ;;
 	    esac
 	    # Need to link against all dependency_libs?
 	    if test "$linkalldeplibs" = yes; then
@@ -2508,7 +5492,7 @@ EOF
 	      # or/and link against static libraries
 	      newdependency_libs="$deplib $newdependency_libs"
 	    fi
-	    if test "X$duplicate_deps" = "Xyes" ; then
+	    if $opt_duplicate_deps ; then
 	      case "$tmp_libs " in
 	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
 	      esac
@@ -2520,16 +5504,15 @@ EOF
 
 	if test "$linkmode,$pass" = "prog,link"; then
 	  if test -n "$library_names" &&
-         { { test "$prefer_static_libs" = no ||
-             test "$prefer_static_libs,$installed" = "built,yes"; } ||
-           test -z "$old_library"; }; then
+	     { { test "$prefer_static_libs" = no ||
+	         test "$prefer_static_libs,$installed" = "built,yes"; } ||
+	       test -z "$old_library"; }; then
 	    # We need to hardcode the library path
 	    if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
 	      # Make sure the rpath contains only unique directories.
-	      case "$temp_rpath " in
-	      *" $dir "*) ;;
-	      *" $absdir "*) ;;
-	      *) temp_rpath="$temp_rpath $absdir" ;;
+	      case "$temp_rpath:" in
+	      *"$absdir:"*) ;;
+	      *) temp_rpath="$temp_rpath$absdir:" ;;
 	      esac
 	    fi
 
@@ -2567,27 +5550,43 @@ EOF
 
 	link_static=no # Whether the deplib will be linked statically
 	use_static_libs=$prefer_static_libs
-	if test "$use_static_libs" = built && test "$installed" = yes ; then
+	if test "$use_static_libs" = built && test "$installed" = yes; then
 	  use_static_libs=no
 	fi
 	if test -n "$library_names" &&
 	   { test "$use_static_libs" = no || test -z "$old_library"; }; then
-	  if test "$installed" = no; then
-	    notinst_deplibs="$notinst_deplibs $lib"
-	    need_relink=yes
-	  fi
+	  case $host in
+	  *cygwin* | *mingw* | *cegcc*)
+	      # No point in relinking DLLs because paths are not encoded
+	      notinst_deplibs="$notinst_deplibs $lib"
+	      need_relink=no
+	    ;;
+	  *)
+	    if test "$installed" = no; then
+	      notinst_deplibs="$notinst_deplibs $lib"
+	      need_relink=yes
+	    fi
+	    ;;
+	  esac
 	  # This is a shared library
 
-	  # Warn about portability, can't link against -module's on
-	  # some systems (darwin)
-	  if test "$shouldnotlink" = yes && test "$pass" = link ; then
-	    $echo
+	  # Warn about portability, can't link against -module's on some
+	  # systems (darwin).  Don't bleat about dlopened modules though!
+	  dlopenmodule=""
+	  for dlpremoduletest in $dlprefiles; do
+	    if test "X$dlpremoduletest" = "X$lib"; then
+	      dlopenmodule="$dlpremoduletest"
+	      break
+	    fi
+	  done
+	  if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then
+	    $ECHO
 	    if test "$linkmode" = prog; then
-	      $echo "*** Warning: Linking the executable $output against the loadable module"
+	      $ECHO "*** Warning: Linking the executable $output against the loadable module"
 	    else
-	      $echo "*** Warning: Linking the shared library $output against the loadable module"
+	      $ECHO "*** Warning: Linking the shared library $output against the loadable module"
 	    fi
-	    $echo "*** $linklib is not portable!"
+	    $ECHO "*** $linklib is not portable!"
 	  fi
 	  if test "$linkmode" = lib &&
 	     test "$hardcode_into_libs" = yes; then
@@ -2617,17 +5616,19 @@ EOF
 	  if test -n "$old_archive_from_expsyms_cmds"; then
 	    # figure out the soname
 	    set dummy $library_names
-	    realname="$2"
-	    shift; shift
-	    libname=`eval \\$echo \"$libname_spec\"`
+	    shift
+	    realname="$1"
+	    shift
+	    libname=`eval "\\$ECHO \"$libname_spec\""`
 	    # use dlname if we got it. it's perfectly good, no?
 	    if test -n "$dlname"; then
 	      soname="$dlname"
 	    elif test -n "$soname_spec"; then
 	      # bleh windows
 	      case $host in
-	      *cygwin* | mingw*)
-		major=`expr $current - $age`
+	      *cygwin* | mingw* | *cegcc*)
+	        func_arith $current - $age
+		major=$func_arith_result
 		versuffix="-$major"
 		;;
 	      esac
@@ -2638,36 +5639,22 @@ EOF
 
 	    # Make a new name for the extract_expsyms_cmds to use
 	    soroot="$soname"
-	    soname=`$echo $soroot | ${SED} -e 's/^.*\///'`
-	    newlib="libimp-`$echo $soname | ${SED} 's/^lib//;s/\.dll$//'`.a"
+	    func_basename "$soroot"
+	    soname="$func_basename_result"
+	    func_stripname 'lib' '.dll' "$soname"
+	    newlib=libimp-$func_stripname_result.a
 
 	    # If the library has no export list, then create one now
 	    if test -f "$output_objdir/$soname-def"; then :
 	    else
-	      $show "extracting exported symbol list from \`$soname'"
-	      save_ifs="$IFS"; IFS='~'
-	      cmds=$extract_expsyms_cmds
-	      for cmd in $cmds; do
-		IFS="$save_ifs"
-		eval cmd=\"$cmd\"
-		$show "$cmd"
-		$run eval "$cmd" || exit $?
-	      done
-	      IFS="$save_ifs"
+	      func_verbose "extracting exported symbol list from \`$soname'"
+	      func_execute_cmds "$extract_expsyms_cmds" 'exit $?'
 	    fi
 
 	    # Create $newlib
 	    if test -f "$output_objdir/$newlib"; then :; else
-	      $show "generating import library for \`$soname'"
-	      save_ifs="$IFS"; IFS='~'
-	      cmds=$old_archive_from_expsyms_cmds
-	      for cmd in $cmds; do
-		IFS="$save_ifs"
-		eval cmd=\"$cmd\"
-		$show "$cmd"
-		$run eval "$cmd" || exit $?
-	      done
-	      IFS="$save_ifs"
+	      func_verbose "generating import library for \`$soname'"
+	      func_execute_cmds "$old_archive_from_expsyms_cmds" 'exit $?'
 	    fi
 	    # make sure the library variables are pointing to the new library
 	    dir=$output_objdir
@@ -2689,17 +5676,21 @@ EOF
 		  *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \
 		    *-*-unixware7*) add_dir="-L$dir" ;;
 		  *-*-darwin* )
-		    # if the lib is a module then we can not link against
-		    # it, someone is ignoring the new warnings I added
+		    # if the lib is a (non-dlopened) module then we can not
+		    # link against it, someone is ignoring the earlier warnings
 		    if /usr/bin/file -L $add 2> /dev/null |
-                      $EGREP ": [^:]* bundle" >/dev/null ; then
-		      $echo "** Warning, lib $linklib is a module, not a shared library"
-		      if test -z "$old_library" ; then
-		        $echo
-		        $echo "** And there doesn't seem to be a static archive available"
-		        $echo "** The link will probably fail, sorry"
-		      else
-		        add="$dir/$old_library"
+			 $GREP ": [^:]* bundle" >/dev/null ; then
+		      if test "X$dlopenmodule" != "X$lib"; then
+			$ECHO "*** Warning: lib $linklib is a module, not a shared library"
+			if test -z "$old_library" ; then
+			  $ECHO
+			  $ECHO "*** And there doesn't seem to be a static archive available"
+			  $ECHO "*** The link will probably fail, sorry"
+			else
+			  add="$dir/$old_library"
+			fi
+		      elif test -n "$old_library"; then
+			add="$dir/$old_library"
 		      fi
 		    fi
 		esac
@@ -2717,7 +5708,8 @@ EOF
 	      fi
 	      ;;
 	    relink)
-	      if test "$hardcode_direct" = yes; then
+	      if test "$hardcode_direct" = yes &&
+	         test "$hardcode_direct_absolute" = no; then
 		add="$dir/$linklib"
 	      elif test "$hardcode_minus_L" = yes; then
 		add_dir="-L$dir"
@@ -2741,8 +5733,7 @@ EOF
 	    esac
 
 	    if test "$lib_linked" != yes; then
-	      $echo "$modename: configuration error: unsupported hardcode properties"
-	      exit $EXIT_FAILURE
+	      func_fatal_configuration "unsupported hardcode properties"
 	    fi
 
 	    if test -n "$add_shlibpath"; then
@@ -2757,8 +5748,8 @@ EOF
 	    else
 	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
 	      test -n "$add" && deplibs="$add $deplibs"
-	      if test "$hardcode_direct" != yes && \
-		 test "$hardcode_minus_L" != yes && \
+	      if test "$hardcode_direct" != yes &&
+		 test "$hardcode_minus_L" != yes &&
 		 test "$hardcode_shlibpath_var" = yes; then
 		case :$finalize_shlibpath: in
 		*":$libdir:"*) ;;
@@ -2773,7 +5764,8 @@ EOF
 	    add_dir=
 	    add=
 	    # Finalize command for both is simple: just hardcode it.
-	    if test "$hardcode_direct" = yes; then
+	    if test "$hardcode_direct" = yes &&
+	       test "$hardcode_direct_absolute" = no; then
 	      add="$libdir/$linklib"
 	    elif test "$hardcode_minus_L" = yes; then
 	      add_dir="-L$libdir"
@@ -2787,9 +5779,9 @@ EOF
 	    elif test "$hardcode_automatic" = yes; then
 	      if test -n "$inst_prefix_dir" &&
 		 test -f "$inst_prefix_dir$libdir/$linklib" ; then
-	        add="$inst_prefix_dir$libdir/$linklib"
+		add="$inst_prefix_dir$libdir/$linklib"
 	      else
-	        add="$libdir/$linklib"
+		add="$libdir/$linklib"
 	      fi
 	    else
 	      # We cannot seem to hardcode it, guess we'll fake it.
@@ -2833,21 +5825,21 @@ EOF
 
 	    # Just print a warning and add the library to dependency_libs so
 	    # that the program can be linked against the static library.
-	    $echo
-	    $echo "*** Warning: This system can not link to static lib archive $lib."
-	    $echo "*** I have the capability to make that library automatically link in when"
-	    $echo "*** you link to this library.  But I can only do this if you have a"
-	    $echo "*** shared version of the library, which you do not appear to have."
+	    $ECHO
+	    $ECHO "*** Warning: This system can not link to static lib archive $lib."
+	    $ECHO "*** I have the capability to make that library automatically link in when"
+	    $ECHO "*** you link to this library.  But I can only do this if you have a"
+	    $ECHO "*** shared version of the library, which you do not appear to have."
 	    if test "$module" = yes; then
-	      $echo "*** But as you try to build a module library, libtool will still create "
-	      $echo "*** a static module, that should work as long as the dlopening application"
-	      $echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
+	      $ECHO "*** But as you try to build a module library, libtool will still create "
+	      $ECHO "*** a static module, that should work as long as the dlopening application"
+	      $ECHO "*** is linked with the -dlopen flag to resolve symbols at runtime."
 	      if test -z "$global_symbol_pipe"; then
-		$echo
-		$echo "*** However, this would only work if libtool was able to extract symbol"
-		$echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
-		$echo "*** not find such a program.  So, this module is probably useless."
-		$echo "*** \`nm' from GNU binutils and a full rebuild may help."
+		$ECHO
+		$ECHO "*** However, this would only work if libtool was able to extract symbol"
+		$ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could"
+		$ECHO "*** not find such a program.  So, this module is probably useless."
+		$ECHO "*** \`nm' from GNU binutils and a full rebuild may help."
 	      fi
 	      if test "$build_old_libs" = no; then
 		build_libtool_libs=module
@@ -2871,7 +5863,8 @@ EOF
 	    temp_deplibs=
 	    for libdir in $dependency_libs; do
 	      case $libdir in
-	      -R*) temp_xrpath=`$echo "X$libdir" | $Xsed -e 's/^-R//'`
+	      -R*) func_stripname '-R' '' "$libdir"
+	           temp_xrpath=$func_stripname_result
 		   case " $xrpath " in
 		   *" $temp_xrpath "*) ;;
 		   *) xrpath="$xrpath $temp_xrpath";;
@@ -2889,7 +5882,7 @@ EOF
 	  tmp_libs=
 	  for deplib in $dependency_libs; do
 	    newdependency_libs="$deplib $newdependency_libs"
-	    if test "X$duplicate_deps" = "Xyes" ; then
+	    if $opt_duplicate_deps ; then
 	      case "$tmp_libs " in
 	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
 	      esac
@@ -2903,88 +5896,71 @@ EOF
 	      case $deplib in
 	      -L*) path="$deplib" ;;
 	      *.la)
-		dir=`$echo "X$deplib" | $Xsed -e 's%/[^/]*$%%'`
-		test "X$dir" = "X$deplib" && dir="."
+	        func_dirname "$deplib" "" "."
+		dir="$func_dirname_result"
 		# We need an absolute path.
 		case $dir in
 		[\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
 		*)
 		  absdir=`cd "$dir" && pwd`
 		  if test -z "$absdir"; then
-		    $echo "$modename: warning: cannot determine absolute directory name of \`$dir'" 1>&2
+		    func_warning "cannot determine absolute directory name of \`$dir'"
 		    absdir="$dir"
 		  fi
 		  ;;
 		esac
-		if grep "^installed=no" $deplib > /dev/null; then
-		  path="$absdir/$objdir"
-		else
-		  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
-		  if test -z "$libdir"; then
-		    $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
-		    exit $EXIT_FAILURE
-		  fi
-		  if test "$absdir" != "$libdir"; then
-		    $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
-		  fi
-		  path="$absdir"
-		fi
-		depdepl=
+		if $GREP "^installed=no" $deplib > /dev/null; then
 		case $host in
 		*-*-darwin*)
-		  # we do not want to link against static libs,
-		  # but need to link against shared
+		  depdepl=
 		  eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
 		  if test -n "$deplibrary_names" ; then
 		    for tmp in $deplibrary_names ; do
 		      depdepl=$tmp
 		    done
-		    if test -f "$path/$depdepl" ; then
-		      depdepl="$path/$depdepl"
+		    if test -f "$absdir/$objdir/$depdepl" ; then
+		      depdepl="$absdir/$objdir/$depdepl"
+		      darwin_install_name=`${OTOOL} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
+                      if test -z "$darwin_install_name"; then
+                          darwin_install_name=`${OTOOL64} -L $depdepl  | awk '{if (NR == 2) {print $1;exit}}'`
+                      fi
+		      compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
+		      linker_flags="$linker_flags -dylib_file ${darwin_install_name}:${depdepl}"
+		      path=
 		    fi
-		    # do not add paths which are already there
-		    case " $newlib_search_path " in
-		    *" $path "*) ;;
-		    *) newlib_search_path="$newlib_search_path $path";;
-		    esac
 		  fi
-		  path=""
 		  ;;
 		*)
-		  path="-L$path"
-		  ;;
-		esac
-		;;
-	      -l*)
-		case $host in
-		*-*-darwin*)
-		  # Again, we only want to link against shared libraries
-		  eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"`
-		  for tmp in $newlib_search_path ; do
-		    if test -f "$tmp/lib$tmp_libs.dylib" ; then
-		      eval depdepl="$tmp/lib$tmp_libs.dylib"
-		      break
-		    fi
-		  done
-		  path=""
+		  path="-L$absdir/$objdir"
 		  ;;
-		*) continue ;;
 		esac
+		else
+		  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+		  test -z "$libdir" && \
+		    func_fatal_error "\`$deplib' is not a valid libtool archive"
+		  test "$absdir" != "$libdir" && \
+		    func_warning "\`$deplib' seems to be moved"
+
+		  path="-L$absdir"
+		fi
 		;;
-	      *) continue ;;
 	      esac
 	      case " $deplibs " in
 	      *" $path "*) ;;
 	      *) deplibs="$path $deplibs" ;;
 	      esac
-	      case " $deplibs " in
-	      *" $depdepl "*) ;;
-	      *) deplibs="$depdepl $deplibs" ;;
-	      esac
 	    done
 	  fi # link_all_deplibs != no
 	fi # linkmode = lib
       done # for deplib in $libs
+      if test "$pass" = link; then
+	if test "$linkmode" = "prog"; then
+	  compile_deplibs="$new_inherited_linker_flags $compile_deplibs"
+	  finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs"
+	else
+	  compiler_flags="$compiler_flags "`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+	fi
+      fi
       dependency_libs="$newdependency_libs"
       if test "$pass" = dlpreopen; then
 	# Link the dlpreopened libraries before other libraries
@@ -3083,38 +6059,36 @@ EOF
     done # for pass
     if test "$linkmode" = prog; then
       dlfiles="$newdlfiles"
+    fi
+    if test "$linkmode" = prog || test "$linkmode" = lib; then
       dlprefiles="$newdlprefiles"
     fi
 
     case $linkmode in
     oldlib)
-      if test -n "$deplibs"; then
-	$echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2
-      fi
-
       if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-	$echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2
+	func_warning "\`-dlopen' is ignored for archives"
       fi
 
-      if test -n "$rpath"; then
-	$echo "$modename: warning: \`-rpath' is ignored for archives" 1>&2
-      fi
+      case " $deplibs" in
+      *\ -l* | *\ -L*)
+	func_warning "\`-l' and \`-L' are ignored for archives" ;;
+      esac
 
-      if test -n "$xrpath"; then
-	$echo "$modename: warning: \`-R' is ignored for archives" 1>&2
-      fi
+      test -n "$rpath" && \
+	func_warning "\`-rpath' is ignored for archives"
 
-      if test -n "$vinfo"; then
-	$echo "$modename: warning: \`-version-info/-version-number' is ignored for archives" 1>&2
-      fi
+      test -n "$xrpath" && \
+	func_warning "\`-R' is ignored for archives"
 
-      if test -n "$release"; then
-	$echo "$modename: warning: \`-release' is ignored for archives" 1>&2
-      fi
+      test -n "$vinfo" && \
+	func_warning "\`-version-info/-version-number' is ignored for archives"
 
-      if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
-	$echo "$modename: warning: \`-export-symbols' is ignored for archives" 1>&2
-      fi
+      test -n "$release" && \
+	func_warning "\`-release' is ignored for archives"
+
+      test -n "$export_symbols$export_symbols_regex" && \
+	func_warning "\`-export-symbols' is ignored for archives"
 
       # Now set the variables for building old libraries.
       build_libtool_libs=no
@@ -3126,48 +6100,48 @@ EOF
       # Make sure we only generate libraries of the form `libNAME.la'.
       case $outputname in
       lib*)
-	name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
+	func_stripname 'lib' '.la' "$outputname"
+	name=$func_stripname_result
 	eval shared_ext=\"$shrext_cmds\"
 	eval libname=\"$libname_spec\"
 	;;
       *)
-	if test "$module" = no; then
-	  $echo "$modename: libtool library \`$output' must begin with \`lib'" 1>&2
-	  $echo "$help" 1>&2
-	  exit $EXIT_FAILURE
-	fi
+	test "$module" = no && \
+	  func_fatal_help "libtool library \`$output' must begin with \`lib'"
+
 	if test "$need_lib_prefix" != no; then
 	  # Add the "lib" prefix for modules if required
-	  name=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
+	  func_stripname '' '.la' "$outputname"
+	  name=$func_stripname_result
 	  eval shared_ext=\"$shrext_cmds\"
 	  eval libname=\"$libname_spec\"
 	else
-	  libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
+	  func_stripname '' '.la' "$outputname"
+	  libname=$func_stripname_result
 	fi
 	;;
       esac
 
       if test -n "$objs"; then
 	if test "$deplibs_check_method" != pass_all; then
-	  $echo "$modename: cannot build libtool library \`$output' from non-libtool objects on this host:$objs" 2>&1
-	  exit $EXIT_FAILURE
+	  func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs"
 	else
-	  $echo
-	  $echo "*** Warning: Linking the shared library $output against the non-libtool"
-	  $echo "*** objects $objs is not portable!"
+	  $ECHO
+	  $ECHO "*** Warning: Linking the shared library $output against the non-libtool"
+	  $ECHO "*** objects $objs is not portable!"
 	  libobjs="$libobjs $objs"
 	fi
       fi
 
-      if test "$dlself" != no; then
-	$echo "$modename: warning: \`-dlopen self' is ignored for libtool libraries" 1>&2
-      fi
+      test "$dlself" != no && \
+	func_warning "\`-dlopen self' is ignored for libtool libraries"
 
       set dummy $rpath
-      if test "$#" -gt 2; then
-	$echo "$modename: warning: ignoring multiple \`-rpath's for a libtool library" 1>&2
-      fi
-      install_libdir="$2"
+      shift
+      test "$#" -gt 1 && \
+	func_warning "ignoring multiple \`-rpath's for a libtool library"
+
+      install_libdir="$1"
 
       oldlibs=
       if test -z "$rpath"; then
@@ -3181,25 +6155,21 @@ EOF
 	  build_old_libs=yes
 	fi
 
-	if test -n "$vinfo"; then
-	  $echo "$modename: warning: \`-version-info/-version-number' is ignored for convenience libraries" 1>&2
-	fi
+	test -n "$vinfo" && \
+	  func_warning "\`-version-info/-version-number' is ignored for convenience libraries"
 
-	if test -n "$release"; then
-	  $echo "$modename: warning: \`-release' is ignored for convenience libraries" 1>&2
-	fi
+	test -n "$release" && \
+	  func_warning "\`-release' is ignored for convenience libraries"
       else
 
 	# Parse the version information argument.
 	save_ifs="$IFS"; IFS=':'
 	set dummy $vinfo 0 0 0
+	shift
 	IFS="$save_ifs"
 
-	if test -n "$8"; then
-	  $echo "$modename: too many parameters to \`-version-info'" 1>&2
-	  $echo "$help" 1>&2
-	  exit $EXIT_FAILURE
-	fi
+	test -n "$7" && \
+	  func_fatal_help "too many parameters to \`-version-info'"
 
 	# convert absolute version numbers to libtool ages
 	# this retains compatibility with .la files and attempts
@@ -3207,9 +6177,9 @@ EOF
 
 	case $vinfo_number in
 	yes)
-	  number_major="$2"
-	  number_minor="$3"
-	  number_revision="$4"
+	  number_major="$1"
+	  number_minor="$2"
+	  number_revision="$3"
 	  #
 	  # There are really only two kinds -- those that
 	  # use the current revision as the major version
@@ -3219,7 +6189,8 @@ EOF
 	  #
 	  case $version_type in
 	  darwin|linux|osf|windows|none)
-	    current=`expr $number_major + $number_minor`
+	    func_arith $number_major + $number_minor
+	    current=$func_arith_result
 	    age="$number_minor"
 	    revision="$number_revision"
 	    ;;
@@ -3229,16 +6200,18 @@ EOF
 	    age="0"
 	    ;;
 	  irix|nonstopux)
-	    current=`expr $number_major + $number_minor - 1`
+	    func_arith $number_major + $number_minor
+	    current=$func_arith_result
 	    age="$number_minor"
 	    revision="$number_minor"
+	    lt_irix_increment=no
 	    ;;
 	  esac
 	  ;;
 	no)
-	  current="$2"
-	  revision="$3"
-	  age="$4"
+	  current="$1"
+	  revision="$2"
+	  age="$3"
 	  ;;
 	esac
 
@@ -3246,34 +6219,30 @@ EOF
 	case $current in
 	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
 	*)
-	  $echo "$modename: CURRENT \`$current' must be a nonnegative integer" 1>&2
-	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-	  exit $EXIT_FAILURE
+	  func_error "CURRENT \`$current' must be a nonnegative integer"
+	  func_fatal_error "\`$vinfo' is not valid version information"
 	  ;;
 	esac
 
 	case $revision in
 	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
 	*)
-	  $echo "$modename: REVISION \`$revision' must be a nonnegative integer" 1>&2
-	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-	  exit $EXIT_FAILURE
+	  func_error "REVISION \`$revision' must be a nonnegative integer"
+	  func_fatal_error "\`$vinfo' is not valid version information"
 	  ;;
 	esac
 
 	case $age in
 	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
 	*)
-	  $echo "$modename: AGE \`$age' must be a nonnegative integer" 1>&2
-	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-	  exit $EXIT_FAILURE
+	  func_error "AGE \`$age' must be a nonnegative integer"
+	  func_fatal_error "\`$vinfo' is not valid version information"
 	  ;;
 	esac
 
 	if test "$age" -gt "$current"; then
-	  $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2
-	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-	  exit $EXIT_FAILURE
+	  func_error "AGE \`$age' is greater than the current interface number \`$current'"
+	  func_fatal_error "\`$vinfo' is not valid version information"
 	fi
 
 	# Calculate the version variables.
@@ -3286,11 +6255,14 @@ EOF
 	darwin)
 	  # Like Linux, but with the current version available in
 	  # verstring for coding it into the library header
-	  major=.`expr $current - $age`
+	  func_arith $current - $age
+	  major=.$func_arith_result
 	  versuffix="$major.$age.$revision"
 	  # Darwin ld doesn't like 0 for these options...
-	  minor_current=`expr $current + 1`
-	  verstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
+	  func_arith $current + 1
+	  minor_current=$func_arith_result
+	  xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
+	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
 	  ;;
 
 	freebsd-aout)
@@ -3300,11 +6272,16 @@ EOF
 
 	freebsd-elf)
 	  major=".$current"
-	  versuffix=".$current";
+	  versuffix=".$current"
 	  ;;
 
 	irix | nonstopux)
-	  major=`expr $current - $age + 1`
+	  if test "X$lt_irix_increment" = "Xno"; then
+	    func_arith $current - $age
+	  else
+	    func_arith $current - $age + 1
+	  fi
+	  major=$func_arith_result
 
 	  case $version_type in
 	    nonstopux) verstring_prefix=nonstopux ;;
@@ -3315,8 +6292,10 @@ EOF
 	  # Add in all the interfaces that we are compatible with.
 	  loop=$revision
 	  while test "$loop" -ne 0; do
-	    iface=`expr $revision - $loop`
-	    loop=`expr $loop - 1`
+	    func_arith $revision - $loop
+	    iface=$func_arith_result
+	    func_arith $loop - 1
+	    loop=$func_arith_result
 	    verstring="$verstring_prefix$major.$iface:$verstring"
 	  done
 
@@ -3326,20 +6305,24 @@ EOF
 	  ;;
 
 	linux)
-	  major=.`expr $current - $age`
+	  func_arith $current - $age
+	  major=.$func_arith_result
 	  versuffix="$major.$age.$revision"
 	  ;;
 
 	osf)
-	  major=.`expr $current - $age`
+	  func_arith $current - $age
+	  major=.$func_arith_result
 	  versuffix=".$current.$age.$revision"
 	  verstring="$current.$age.$revision"
 
 	  # Add in all the interfaces that we are compatible with.
 	  loop=$age
 	  while test "$loop" -ne 0; do
-	    iface=`expr $current - $loop`
-	    loop=`expr $loop - 1`
+	    func_arith $current - $loop
+	    iface=$func_arith_result
+	    func_arith $loop - 1
+	    loop=$func_arith_result
 	    verstring="$verstring:${iface}.0"
 	  done
 
@@ -3347,6 +6330,11 @@ EOF
 	  verstring="$verstring:${current}.0"
 	  ;;
 
+	qnx)
+	  major=".$current"
+	  versuffix=".$current"
+	  ;;
+
 	sunos)
 	  major=".$current"
 	  versuffix=".$current.$revision"
@@ -3355,14 +6343,13 @@ EOF
 	windows)
 	  # Use '-' rather than '.', since we only want one
 	  # extension on DOS 8.3 filesystems.
-	  major=`expr $current - $age`
+	  func_arith $current - $age
+	  major=$func_arith_result
 	  versuffix="-$major"
 	  ;;
 
 	*)
-	  $echo "$modename: unknown library version type \`$version_type'" 1>&2
-	  $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
-	  exit $EXIT_FAILURE
+	  func_fatal_configuration "unknown library version type \`$version_type'"
 	  ;;
 	esac
 
@@ -3396,7 +6383,7 @@ EOF
 	# Check to see if the archive will have undefined symbols.
 	if test "$allow_undefined" = yes; then
 	  if test "$allow_undefined_flag" = unsupported; then
-	    $echo "$modename: warning: undefined symbols not allowed in $host shared libraries" 1>&2
+	    func_warning "undefined symbols not allowed in $host shared libraries"
 	    build_libtool_libs=no
 	    build_old_libs=yes
 	  fi
@@ -3404,21 +6391,26 @@ EOF
 	  # Don't allow undefined symbols.
 	  allow_undefined_flag="$no_undefined_flag"
 	fi
+
       fi
 
+      func_generate_dlsyms "$libname" "$libname" "yes"
+      libobjs="$libobjs $symfileobj"
+      test "X$libobjs" = "X " && libobjs=
+
       if test "$mode" != relink; then
 	# Remove our outputs, but don't remove object files since they
 	# may have been created when compiling PIC objects.
 	removelist=
-	tempremovelist=`$echo "$output_objdir/*"`
+	tempremovelist=`$ECHO "$output_objdir/*"`
 	for p in $tempremovelist; do
 	  case $p in
-	    *.$objext)
+	    *.$objext | *.gcno)
 	       ;;
 	    $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
 	       if test "X$precious_files_regex" != "X"; then
-	         if echo $p | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
-	         then
+		 if $ECHO "$p" | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
+		 then
 		   continue
 		 fi
 	       fi
@@ -3427,10 +6419,8 @@ EOF
 	    *) ;;
 	  esac
 	done
-	if test -n "$removelist"; then
-	  $show "${rm}r $removelist"
-	  $run ${rm}r $removelist
-	fi
+	test -n "$removelist" && \
+	  func_show_eval "${RM}r \$removelist"
       fi
 
       # Now set the variables for building old libraries.
@@ -3438,15 +6428,15 @@ EOF
 	oldlibs="$oldlibs $output_objdir/$libname.$libext"
 
 	# Transform .lo files to .o files.
-	oldobjs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
+	oldobjs="$objs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
       fi
 
       # Eliminate all temporary directories.
-#      for path in $notinst_path; do
-#	lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
-#	deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
-#	dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
-#      done
+      #for path in $notinst_path; do
+      #	lib_search_path=`$ECHO "X$lib_search_path " | $Xsed -e "s% $path % %g"`
+      #	deplibs=`$ECHO "X$deplibs " | $Xsed -e "s% -L$path % %g"`
+      #	dependency_libs=`$ECHO "X$dependency_libs " | $Xsed -e "s% -L$path % %g"`
+      #done
 
       if test -n "$xrpath"; then
 	# If the user specified any rpath flags, then add them.
@@ -3486,12 +6476,12 @@ EOF
       if test "$build_libtool_libs" = yes; then
 	if test -n "$rpath"; then
 	  case $host in
-	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*)
+	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc*)
 	    # these systems don't actually have a c library (as such)!
 	    ;;
 	  *-*-rhapsody* | *-*-darwin1.[012])
 	    # Rhapsody C library is in the System framework
-	    deplibs="$deplibs -framework System"
+	    deplibs="$deplibs System.ltframework"
 	    ;;
 	  *-*-netbsd*)
 	    # Don't link with libc until the a.out ld.so is fixed.
@@ -3505,7 +6495,7 @@ EOF
 	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
 	    # Compiler inserts libc in the correct place for threads to work
 	    ;;
- 	  *)
+	  *)
 	    # Add libc to deplibs on all other systems if necessary.
 	    if test "$build_libtool_need_lc" = "yes"; then
 	      deplibs="$deplibs -lc"
@@ -3542,17 +6532,18 @@ EOF
 	  # limits. Maybe even breaks it.  We compile a program, linking it
 	  # against the deplibs as a proxy for the library.  Then we can check
 	  # whether they linked in statically or dynamically with ldd.
-	  $rm conftest.c
+	  $opt_dry_run || $RM conftest.c
 	  cat > conftest.c <<EOF
 	  int main() { return 0; }
 EOF
-	  $rm conftest
-      if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
+	  $opt_dry_run || $RM conftest
+	  if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
 	    ldd_output=`ldd conftest`
 	    for i in $deplibs; do
-	      name=`expr $i : '-l\(.*\)'`
-	      # If $name is empty we are operating on a -L argument.
-              if test "$name" != "" && test "$name" != "0"; then
+	      case $i in
+	      -l*)
+		func_stripname -l '' "$i"
+		name=$func_stripname_result
 		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
 		  case " $predeps $postdeps " in
 		  *" $i "*)
@@ -3560,37 +6551,40 @@ EOF
 		    i=""
 		    ;;
 		  esac
-	        fi
+		fi
 		if test -n "$i" ; then
-		  libname=`eval \\$echo \"$libname_spec\"`
-		  deplib_matches=`eval \\$echo \"$library_names_spec\"`
-		  set dummy $deplib_matches
-		  deplib_match=$2
+		  libname=`eval "\\$ECHO \"$libname_spec\""`
+		  deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
+		  set dummy $deplib_matches; shift
+		  deplib_match=$1
 		  if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
 		    newdeplibs="$newdeplibs $i"
 		  else
 		    droppeddeps=yes
-		    $echo
-		    $echo "*** Warning: dynamic linker does not accept needed library $i."
-		    $echo "*** I have the capability to make that library automatically link in when"
-		    $echo "*** you link to this library.  But I can only do this if you have a"
-		    $echo "*** shared version of the library, which I believe you do not have"
-		    $echo "*** because a test_compile did reveal that the linker did not use it for"
-		    $echo "*** its dynamic dependency list that programs get resolved with at runtime."
+		    $ECHO
+		    $ECHO "*** Warning: dynamic linker does not accept needed library $i."
+		    $ECHO "*** I have the capability to make that library automatically link in when"
+		    $ECHO "*** you link to this library.  But I can only do this if you have a"
+		    $ECHO "*** shared version of the library, which I believe you do not have"
+		    $ECHO "*** because a test_compile did reveal that the linker did not use it for"
+		    $ECHO "*** its dynamic dependency list that programs get resolved with at runtime."
 		  fi
 		fi
-	      else
+		;;
+	      *)
 		newdeplibs="$newdeplibs $i"
-	      fi
+		;;
+	      esac
 	    done
 	  else
 	    # Error occurred in the first compile.  Let's try to salvage
 	    # the situation: Compile a separate program for each library.
 	    for i in $deplibs; do
-	      name=`expr $i : '-l\(.*\)'`
-	      # If $name is empty we are operating on a -L argument.
-              if test "$name" != "" && test "$name" != "0"; then
-		$rm conftest
+	      case $i in
+	      -l*)
+		func_stripname -l '' "$i"
+		name=$func_stripname_result
+		$opt_dry_run || $RM conftest
 		if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
 		  ldd_output=`ldd conftest`
 		  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
@@ -3602,44 +6596,47 @@ EOF
 		    esac
 		  fi
 		  if test -n "$i" ; then
-		    libname=`eval \\$echo \"$libname_spec\"`
-		    deplib_matches=`eval \\$echo \"$library_names_spec\"`
-		    set dummy $deplib_matches
-		    deplib_match=$2
+		    libname=`eval "\\$ECHO \"$libname_spec\""`
+		    deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
+		    set dummy $deplib_matches; shift
+		    deplib_match=$1
 		    if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
 		      newdeplibs="$newdeplibs $i"
 		    else
 		      droppeddeps=yes
-		      $echo
-		      $echo "*** Warning: dynamic linker does not accept needed library $i."
-		      $echo "*** I have the capability to make that library automatically link in when"
-		      $echo "*** you link to this library.  But I can only do this if you have a"
-		      $echo "*** shared version of the library, which you do not appear to have"
-		      $echo "*** because a test_compile did reveal that the linker did not use this one"
-		      $echo "*** as a dynamic dependency that programs can get resolved with at runtime."
+		      $ECHO
+		      $ECHO "*** Warning: dynamic linker does not accept needed library $i."
+		      $ECHO "*** I have the capability to make that library automatically link in when"
+		      $ECHO "*** you link to this library.  But I can only do this if you have a"
+		      $ECHO "*** shared version of the library, which you do not appear to have"
+		      $ECHO "*** because a test_compile did reveal that the linker did not use this one"
+		      $ECHO "*** as a dynamic dependency that programs can get resolved with at runtime."
 		    fi
 		  fi
 		else
 		  droppeddeps=yes
-		  $echo
-		  $echo "*** Warning!  Library $i is needed by this library but I was not able to"
-		  $echo "*** make it link in!  You will probably need to install it or some"
-		  $echo "*** library that it depends on before this library will be fully"
-		  $echo "*** functional.  Installing it before continuing would be even better."
+		  $ECHO
+		  $ECHO "*** Warning!  Library $i is needed by this library but I was not able to"
+		  $ECHO "*** make it link in!  You will probably need to install it or some"
+		  $ECHO "*** library that it depends on before this library will be fully"
+		  $ECHO "*** functional.  Installing it before continuing would be even better."
 		fi
-	      else
+		;;
+	      *)
 		newdeplibs="$newdeplibs $i"
-	      fi
+		;;
+	      esac
 	    done
 	  fi
 	  ;;
 	file_magic*)
-	  set dummy $deplibs_check_method
-	  file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
+	  set dummy $deplibs_check_method; shift
+	  file_magic_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
 	  for a_deplib in $deplibs; do
-	    name=`expr $a_deplib : '-l\(.*\)'`
-	    # If $name is empty we are operating on a -L argument.
-            if test "$name" != "" && test  "$name" != "0"; then
+	    case $a_deplib in
+	    -l*)
+	      func_stripname -l '' "$a_deplib"
+	      name=$func_stripname_result
 	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
 		case " $predeps $postdeps " in
 		*" $a_deplib "*)
@@ -3649,13 +6646,13 @@ EOF
 		esac
 	      fi
 	      if test -n "$a_deplib" ; then
-		libname=`eval \\$echo \"$libname_spec\"`
+		libname=`eval "\\$ECHO \"$libname_spec\""`
 		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
 		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
 		  for potent_lib in $potential_libs; do
 		      # Follow soft links.
-		      if ls -lLd "$potent_lib" 2>/dev/null \
-			 | grep " -> " >/dev/null; then
+		      if ls -lLd "$potent_lib" 2>/dev/null |
+			 $GREP " -> " >/dev/null; then
 			continue
 		      fi
 		      # The statement above tries to avoid entering an
@@ -3668,12 +6665,12 @@ EOF
 			potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
 			case $potliblink in
 			[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
-			*) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
+			*) potlib=`$ECHO "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
 			esac
 		      done
-		      if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \
-			 | ${SED} 10q \
-			 | $EGREP "$file_magic_regex" > /dev/null; then
+		      if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
+			 $SED -e 10q |
+			 $EGREP "$file_magic_regex" > /dev/null; then
 			newdeplibs="$newdeplibs $a_deplib"
 			a_deplib=""
 			break 2
@@ -3683,32 +6680,35 @@ EOF
 	      fi
 	      if test -n "$a_deplib" ; then
 		droppeddeps=yes
-		$echo
-		$echo "*** Warning: linker path does not have real file for library $a_deplib."
-		$echo "*** I have the capability to make that library automatically link in when"
-		$echo "*** you link to this library.  But I can only do this if you have a"
-		$echo "*** shared version of the library, which you do not appear to have"
-		$echo "*** because I did check the linker path looking for a file starting"
+		$ECHO
+		$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
+		$ECHO "*** I have the capability to make that library automatically link in when"
+		$ECHO "*** you link to this library.  But I can only do this if you have a"
+		$ECHO "*** shared version of the library, which you do not appear to have"
+		$ECHO "*** because I did check the linker path looking for a file starting"
 		if test -z "$potlib" ; then
-		  $echo "*** with $libname but no candidates were found. (...for file magic test)"
+		  $ECHO "*** with $libname but no candidates were found. (...for file magic test)"
 		else
-		  $echo "*** with $libname and none of the candidates passed a file format test"
-		  $echo "*** using a file magic. Last file checked: $potlib"
+		  $ECHO "*** with $libname and none of the candidates passed a file format test"
+		  $ECHO "*** using a file magic. Last file checked: $potlib"
 		fi
 	      fi
-	    else
+	      ;;
+	    *)
 	      # Add a -L argument.
 	      newdeplibs="$newdeplibs $a_deplib"
-	    fi
+	      ;;
+	    esac
 	  done # Gone through all deplibs.
 	  ;;
 	match_pattern*)
-	  set dummy $deplibs_check_method
-	  match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
+	  set dummy $deplibs_check_method; shift
+	  match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
 	  for a_deplib in $deplibs; do
-	    name=`expr $a_deplib : '-l\(.*\)'`
-	    # If $name is empty we are operating on a -L argument.
-	    if test -n "$name" && test "$name" != "0"; then
+	    case $a_deplib in
+	    -l*)
+	      func_stripname -l '' "$a_deplib"
+	      name=$func_stripname_result
 	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
 		case " $predeps $postdeps " in
 		*" $a_deplib "*)
@@ -3718,14 +6718,13 @@ EOF
 		esac
 	      fi
 	      if test -n "$a_deplib" ; then
-		libname=`eval \\$echo \"$libname_spec\"`
+		libname=`eval "\\$ECHO \"$libname_spec\""`
 		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
 		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
 		  for potent_lib in $potential_libs; do
 		    potlib="$potent_lib" # see symlink-check above in file_magic test
-		    if eval $echo \"$potent_lib\" 2>/dev/null \
-		        | ${SED} 10q \
-		        | $EGREP "$match_pattern_regex" > /dev/null; then
+		    if eval "\$ECHO \"X$potent_lib\"" 2>/dev/null | $Xsed -e 10q | \
+		       $EGREP "$match_pattern_regex" > /dev/null; then
 		      newdeplibs="$newdeplibs $a_deplib"
 		      a_deplib=""
 		      break 2
@@ -3735,44 +6734,46 @@ EOF
 	      fi
 	      if test -n "$a_deplib" ; then
 		droppeddeps=yes
-		$echo
-		$echo "*** Warning: linker path does not have real file for library $a_deplib."
-		$echo "*** I have the capability to make that library automatically link in when"
-		$echo "*** you link to this library.  But I can only do this if you have a"
-		$echo "*** shared version of the library, which you do not appear to have"
-		$echo "*** because I did check the linker path looking for a file starting"
+		$ECHO
+		$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
+		$ECHO "*** I have the capability to make that library automatically link in when"
+		$ECHO "*** you link to this library.  But I can only do this if you have a"
+		$ECHO "*** shared version of the library, which you do not appear to have"
+		$ECHO "*** because I did check the linker path looking for a file starting"
 		if test -z "$potlib" ; then
-		  $echo "*** with $libname but no candidates were found. (...for regex pattern test)"
+		  $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)"
 		else
-		  $echo "*** with $libname and none of the candidates passed a file format test"
-		  $echo "*** using a regex pattern. Last file checked: $potlib"
+		  $ECHO "*** with $libname and none of the candidates passed a file format test"
+		  $ECHO "*** using a regex pattern. Last file checked: $potlib"
 		fi
 	      fi
-	    else
+	      ;;
+	    *)
 	      # Add a -L argument.
 	      newdeplibs="$newdeplibs $a_deplib"
-	    fi
+	      ;;
+	    esac
 	  done # Gone through all deplibs.
 	  ;;
 	none | unknown | *)
 	  newdeplibs=""
-	  tmp_deplibs=`$echo "X $deplibs" | $Xsed -e 's/ -lc$//' \
-	    -e 's/ -[LR][^ ]*//g'`
+	  tmp_deplibs=`$ECHO "X $deplibs" | $Xsed \
+	      -e 's/ -lc$//' -e 's/ -[LR][^ ]*//g'`
 	  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
 	    for i in $predeps $postdeps ; do
 	      # can't use Xsed below, because $i might contain '/'
-	      tmp_deplibs=`$echo "X $tmp_deplibs" | ${SED} -e "1s,^X,," -e "s,$i,,"`
+	      tmp_deplibs=`$ECHO "X $tmp_deplibs" | $Xsed -e "s,$i,,"`
 	    done
 	  fi
-	  if $echo "X $tmp_deplibs" | $Xsed -e 's/[ 	]//g' \
-	    | grep . >/dev/null; then
-	    $echo
+	  if $ECHO "X $tmp_deplibs" | $Xsed -e 's/[	 ]//g' |
+	     $GREP . >/dev/null; then
+	    $ECHO
 	    if test "X$deplibs_check_method" = "Xnone"; then
-	      $echo "*** Warning: inter-library dependencies are not supported in this platform."
+	      $ECHO "*** Warning: inter-library dependencies are not supported in this platform."
 	    else
-	      $echo "*** Warning: inter-library dependencies are not known to be supported."
+	      $ECHO "*** Warning: inter-library dependencies are not known to be supported."
 	    fi
-	    $echo "*** All declared inter-library dependencies are being dropped."
+	    $ECHO "*** All declared inter-library dependencies are being dropped."
 	    droppeddeps=yes
 	  fi
 	  ;;
@@ -3785,24 +6786,24 @@ EOF
 
 	case $host in
 	*-*-rhapsody* | *-*-darwin1.[012])
-	  # On Rhapsody replace the C library is the System framework
-	  newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's/ -lc / -framework System /'`
+	  # On Rhapsody replace the C library with the System framework
+	  newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
 	  ;;
 	esac
 
 	if test "$droppeddeps" = yes; then
 	  if test "$module" = yes; then
-	    $echo
-	    $echo "*** Warning: libtool could not satisfy all declared inter-library"
-	    $echo "*** dependencies of module $libname.  Therefore, libtool will create"
-	    $echo "*** a static module, that should work as long as the dlopening"
-	    $echo "*** application is linked with the -dlopen flag."
+	    $ECHO
+	    $ECHO "*** Warning: libtool could not satisfy all declared inter-library"
+	    $ECHO "*** dependencies of module $libname.  Therefore, libtool will create"
+	    $ECHO "*** a static module, that should work as long as the dlopening"
+	    $ECHO "*** application is linked with the -dlopen flag."
 	    if test -z "$global_symbol_pipe"; then
-	      $echo
-	      $echo "*** However, this would only work if libtool was able to extract symbol"
-	      $echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
-	      $echo "*** not find such a program.  So, this module is probably useless."
-	      $echo "*** \`nm' from GNU binutils and a full rebuild may help."
+	      $ECHO
+	      $ECHO "*** However, this would only work if libtool was able to extract symbol"
+	      $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could"
+	      $ECHO "*** not find such a program.  So, this module is probably useless."
+	      $ECHO "*** \`nm' from GNU binutils and a full rebuild may help."
 	    fi
 	    if test "$build_old_libs" = no; then
 	      oldlibs="$output_objdir/$libname.$libext"
@@ -3812,16 +6813,16 @@ EOF
 	      build_libtool_libs=no
 	    fi
 	  else
-	    $echo "*** The inter-library dependencies that have been dropped here will be"
-	    $echo "*** automatically added whenever a program is linked with this library"
-	    $echo "*** or is declared to -dlopen it."
+	    $ECHO "*** The inter-library dependencies that have been dropped here will be"
+	    $ECHO "*** automatically added whenever a program is linked with this library"
+	    $ECHO "*** or is declared to -dlopen it."
 
 	    if test "$allow_undefined" = no; then
-	      $echo
-	      $echo "*** Since this library must not contain undefined symbols,"
-	      $echo "*** because either the platform does not support them or"
-	      $echo "*** it was explicitly requested with -no-undefined,"
-	      $echo "*** libtool will only create a static version of it."
+	      $ECHO
+	      $ECHO "*** Since this library must not contain undefined symbols,"
+	      $ECHO "*** because either the platform does not support them or"
+	      $ECHO "*** it was explicitly requested with -no-undefined,"
+	      $ECHO "*** libtool will only create a static version of it."
 	      if test "$build_old_libs" = no; then
 		oldlibs="$output_objdir/$libname.$libext"
 		build_libtool_libs=module
@@ -3835,7 +6836,14 @@ EOF
 	# Done checking deplibs!
 	deplibs=$newdeplibs
       fi
-
+      # Time to change all our "foo.ltframework" stuff back to "-framework foo"
+      case $host in
+	*-*-darwin*)
+	  newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+	  new_inherited_linker_flags=`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+	  deplibs=`$ECHO "X $deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+	  ;;
+      esac
 
       # move library search paths that coincide with paths to not yet
       # installed libraries to the beginning of the library search list
@@ -3864,7 +6872,6 @@ EOF
       done
       deplibs="$new_libs"
 
-
       # All the library-specific variables (install_libdir is set above).
       library_names=
       old_library=
@@ -3935,8 +6942,9 @@ EOF
 	eval shared_ext=\"$shrext_cmds\"
 	eval library_names=\"$library_names_spec\"
 	set dummy $library_names
-	realname="$2"
-	shift; shift
+	shift
+	realname="$1"
+	shift
 
 	if test -n "$soname_spec"; then
 	  eval soname=\"$soname_spec\"
@@ -3955,71 +6963,122 @@ EOF
 	done
 
 	# Use standard objects if they are pic
-	test -z "$pic_flag" && libobjs=`$echo "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+	test -z "$pic_flag" && libobjs=`$ECHO "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+	test "X$libobjs" = "X " && libobjs=
+
+	delfiles=
+	if test -n "$export_symbols" && test -n "$include_expsyms"; then
+	  $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp"
+	  export_symbols="$output_objdir/$libname.uexp"
+	  delfiles="$delfiles $export_symbols"
+	fi
+
+	orig_export_symbols=
+	case $host_os in
+	cygwin* | mingw* | cegcc*)
+	  if test -n "$export_symbols" && test -z "$export_symbols_regex"; then
+	    # exporting using user supplied symfile
+	    if test "x`$SED 1q $export_symbols`" != xEXPORTS; then
+	      # and it's NOT already a .def file. Must figure out
+	      # which of the given symbols are data symbols and tag
+	      # them as such. So, trigger use of export_symbols_cmds.
+	      # export_symbols gets reassigned inside the "prepare
+	      # the list of exported symbols" if statement, so the
+	      # include_expsyms logic still works.
+	      orig_export_symbols="$export_symbols"
+	      export_symbols=
+	      always_export_symbols=yes
+	    fi
+	  fi
+	  ;;
+	esac
 
 	# Prepare the list of exported symbols
 	if test -z "$export_symbols"; then
 	  if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then
-	    $show "generating symbol list for \`$libname.la'"
+	    func_verbose "generating symbol list for \`$libname.la'"
 	    export_symbols="$output_objdir/$libname.exp"
-	    $run $rm $export_symbols
+	    $opt_dry_run || $RM $export_symbols
 	    cmds=$export_symbols_cmds
 	    save_ifs="$IFS"; IFS='~'
 	    for cmd in $cmds; do
 	      IFS="$save_ifs"
 	      eval cmd=\"$cmd\"
-	      if len=`expr "X$cmd" : ".*"` &&
-	       test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
-	        $show "$cmd"
-	        $run eval "$cmd" || exit $?
-	        skipped_export=false
+	      func_len " $cmd"
+	      len=$func_len_result
+	      if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+		func_show_eval "$cmd" 'exit $?'
+		skipped_export=false
 	      else
-	        # The command line is too long to execute in one step.
-	        $show "using reloadable object file for export list..."
-	        skipped_export=:
+		# The command line is too long to execute in one step.
+		func_verbose "using reloadable object file for export list..."
+		skipped_export=:
 		# Break out early, otherwise skipped_export may be
 		# set to false by a later but shorter cmd.
 		break
 	      fi
 	    done
 	    IFS="$save_ifs"
-	    if test -n "$export_symbols_regex"; then
-	      $show "$EGREP -e \"$export_symbols_regex\" \"$export_symbols\" > \"${export_symbols}T\""
-	      $run eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
-	      $show "$mv \"${export_symbols}T\" \"$export_symbols\""
-	      $run eval '$mv "${export_symbols}T" "$export_symbols"'
+	    if test -n "$export_symbols_regex" && test "X$skipped_export" != "X:"; then
+	      func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
+	      func_show_eval '$MV "${export_symbols}T" "$export_symbols"'
 	    fi
 	  fi
 	fi
 
 	if test -n "$export_symbols" && test -n "$include_expsyms"; then
-	  $run eval '$echo "X$include_expsyms" | $SP2NL >> "$export_symbols"'
+	  tmp_export_symbols="$export_symbols"
+	  test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
+	  $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"'
+	fi
+
+	if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then
+	  # The given exports_symbols file has to be filtered, so filter it.
+	  func_verbose "filter symbol list for \`$libname.la' to tag DATA exports"
+	  # FIXME: $output_objdir/$libname.filter potentially contains lots of
+	  # 's' commands which not all seds can handle. GNU sed should be fine
+	  # though. Also, the filter scales superlinearly with the number of
+	  # global variables. join(1) would be nice here, but unfortunately
+	  # isn't a blessed tool.
+	  $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
+	  delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
+	  export_symbols=$output_objdir/$libname.def
+	  $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
 	fi
 
 	tmp_deplibs=
 	for test_deplib in $deplibs; do
-		case " $convenience " in
-		*" $test_deplib "*) ;;
-		*)
-			tmp_deplibs="$tmp_deplibs $test_deplib"
-			;;
-		esac
+	  case " $convenience " in
+	  *" $test_deplib "*) ;;
+	  *)
+	    tmp_deplibs="$tmp_deplibs $test_deplib"
+	    ;;
+	  esac
 	done
 	deplibs="$tmp_deplibs"
 
 	if test -n "$convenience"; then
+	  if test -n "$whole_archive_flag_spec" &&
+	    test "$compiler_needs_object" = yes &&
+	    test -z "$libobjs"; then
+	    # extract the archives, so we have objects to list.
+	    # TODO: could optimize this to just extract one archive.
+	    whole_archive_flag_spec=
+	  fi
 	  if test -n "$whole_archive_flag_spec"; then
 	    save_libobjs=$libobjs
 	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
+	    test "X$libobjs" = "X " && libobjs=
 	  else
 	    gentop="$output_objdir/${outputname}x"
 	    generated="$generated $gentop"
 
 	    func_extract_archives $gentop $convenience
 	    libobjs="$libobjs $func_extract_archives_result"
+	    test "X$libobjs" = "X " && libobjs=
 	  fi
 	fi
-	
+
 	if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
 	  eval flag=\"$thread_safe_flag_spec\"
 	  linker_flags="$linker_flags $flag"
@@ -4027,7 +7086,7 @@ EOF
 
 	# Make a backup of the uninstalled library when relinking
 	if test "$mode" = relink; then
-	  $run eval '(cd $output_objdir && $rm ${realname}U && $mv $realname ${realname}U)' || exit $?
+	  $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $?
 	fi
 
 	# Do each of the archive commands.
@@ -4040,22 +7099,24 @@ EOF
 	    cmds=$module_cmds
 	  fi
 	else
-	if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
-	  eval test_cmds=\"$archive_expsym_cmds\"
-	  cmds=$archive_expsym_cmds
-	else
-	  eval test_cmds=\"$archive_cmds\"
-	  cmds=$archive_cmds
+	  if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
+	    eval test_cmds=\"$archive_expsym_cmds\"
+	    cmds=$archive_expsym_cmds
+	  else
+	    eval test_cmds=\"$archive_cmds\"
+	    cmds=$archive_cmds
 	  fi
 	fi
 
 	if test "X$skipped_export" != "X:" &&
-	   len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
-	   test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+	   func_len " $test_cmds" &&
+	   len=$func_len_result &&
+	   test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
 	  :
 	else
-	  # The command line is too long to link in one step, link piecewise.
-	  $echo "creating reloadable object files..."
+	  # The command line is too long to link in one step, link piecewise
+	  # or, if using GNU ld and skipped_export is not :, use a linker
+	  # script.
 
 	  # Save the value of $output and $libobjs because we want to
 	  # use them later.  If we have whole_archive_flag_spec, we
@@ -4069,77 +7130,162 @@ EOF
 	    save_libobjs=$libobjs
 	  fi
 	  save_output=$output
-	  output_la=`$echo "X$output" | $Xsed -e "$basename"`
+	  output_la=`$ECHO "X$output" | $Xsed -e "$basename"`
 
 	  # Clear the reloadable object creation command queue and
 	  # initialize k to one.
 	  test_cmds=
 	  concat_cmds=
 	  objlist=
-	  delfiles=
 	  last_robj=
 	  k=1
-	  output=$output_objdir/$output_la-${k}.$objext
-	  # Loop over the list of objects to be linked.
-	  for obj in $save_libobjs
-	  do
-	    eval test_cmds=\"$reload_cmds $objlist $last_robj\"
-	    if test "X$objlist" = X ||
-	       { len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
-		 test "$len" -le "$max_cmd_len"; }; then
-	      objlist="$objlist $obj"
+
+	  if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then
+	    output=${output_objdir}/${output_la}.lnkscript
+	    func_verbose "creating GNU ld script: $output"
+	    $ECHO 'INPUT (' > $output
+	    for obj in $save_libobjs
+	    do
+	      $ECHO "$obj" >> $output
+	    done
+	    $ECHO ')' >> $output
+	    delfiles="$delfiles $output"
+	  elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then
+	    output=${output_objdir}/${output_la}.lnk
+	    func_verbose "creating linker input file list: $output"
+	    : > $output
+	    set x $save_libobjs
+	    shift
+	    firstobj=
+	    if test "$compiler_needs_object" = yes; then
+	      firstobj="$1 "
+	      shift
+	    fi
+	    for obj
+	    do
+	      $ECHO "$obj" >> $output
+	    done
+	    delfiles="$delfiles $output"
+	    output=$firstobj\"$file_list_spec$output\"
+	  else
+	    if test -n "$save_libobjs"; then
+	      func_verbose "creating reloadable object files..."
+	      output=$output_objdir/$output_la-${k}.$objext
+	      eval test_cmds=\"$reload_cmds\"
+	      func_len " $test_cmds"
+	      len0=$func_len_result
+	      len=$len0
+
+	      # Loop over the list of objects to be linked.
+	      for obj in $save_libobjs
+	      do
+		func_len " $obj"
+		func_arith $len + $func_len_result
+		len=$func_arith_result
+		if test "X$objlist" = X ||
+		   test "$len" -lt "$max_cmd_len"; then
+		  func_append objlist " $obj"
+		else
+		  # The command $test_cmds is almost too long, add a
+		  # command to the queue.
+		  if test "$k" -eq 1 ; then
+		    # The first file doesn't have a previous command to add.
+		    eval concat_cmds=\"$reload_cmds $objlist $last_robj\"
+		  else
+		    # All subsequent reloadable object files will link in
+		    # the last one created.
+		    eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj~\$RM $last_robj\"
+		  fi
+		  last_robj=$output_objdir/$output_la-${k}.$objext
+		  func_arith $k + 1
+		  k=$func_arith_result
+		  output=$output_objdir/$output_la-${k}.$objext
+		  objlist=$obj
+		  func_len " $last_robj"
+		  func_arith $len0 + $func_len_result
+		  len=$func_arith_result
+		fi
+	      done
+	      # Handle the remaining objects by creating one last
+	      # reloadable object file.  All subsequent reloadable object
+	      # files will link in the last one created.
+	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
+	      eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\"
+	      if test -n "$last_robj"; then
+	        eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"
+	      fi
+	      delfiles="$delfiles $output"
+
 	    else
-	      # The command $test_cmds is almost too long, add a
-	      # command to the queue.
-	      if test "$k" -eq 1 ; then
-		# The first file doesn't have a previous command to add.
-		eval concat_cmds=\"$reload_cmds $objlist $last_robj\"
-	      else
-		# All subsequent reloadable object files will link in
-		# the last one created.
-		eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\"
+	      output=
+	    fi
+
+	    if ${skipped_export-false}; then
+	      func_verbose "generating symbol list for \`$libname.la'"
+	      export_symbols="$output_objdir/$libname.exp"
+	      $opt_dry_run || $RM $export_symbols
+	      libobjs=$output
+	      # Append the command to create the export file.
+	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
+	      eval concat_cmds=\"\$concat_cmds$export_symbols_cmds\"
+	      if test -n "$last_robj"; then
+		eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\"
 	      fi
-	      last_robj=$output_objdir/$output_la-${k}.$objext
-	      k=`expr $k + 1`
-	      output=$output_objdir/$output_la-${k}.$objext
-	      objlist=$obj
-	      len=1
 	    fi
-	  done
-	  # Handle the remaining objects by creating one last
-	  # reloadable object file.  All subsequent reloadable object
-	  # files will link in the last one created.
-	  test -z "$concat_cmds" || concat_cmds=$concat_cmds~
-	  eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\"
-
-	  if ${skipped_export-false}; then
-	    $show "generating symbol list for \`$libname.la'"
-	    export_symbols="$output_objdir/$libname.exp"
-	    $run $rm $export_symbols
-	    libobjs=$output
-	    # Append the command to create the export file.
-	    eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\"
-          fi
-
-	  # Set up a command to remove the reloadable object files
-	  # after they are used.
-	  i=0
-	  while test "$i" -lt "$k"
-	  do
-	    i=`expr $i + 1`
-	    delfiles="$delfiles $output_objdir/$output_la-${i}.$objext"
-	  done
 
-	  $echo "creating a temporary reloadable object file: $output"
+	    test -n "$save_libobjs" &&
+	      func_verbose "creating a temporary reloadable object file: $output"
 
-	  # Loop through the commands generated above and execute them.
-	  save_ifs="$IFS"; IFS='~'
-	  for cmd in $concat_cmds; do
+	    # Loop through the commands generated above and execute them.
+	    save_ifs="$IFS"; IFS='~'
+	    for cmd in $concat_cmds; do
+	      IFS="$save_ifs"
+	      $opt_silent || {
+		  func_quote_for_expand "$cmd"
+		  eval "func_echo $func_quote_for_expand_result"
+	      }
+	      $opt_dry_run || eval "$cmd" || {
+		lt_exit=$?
+
+		# Restore the uninstalled library and exit
+		if test "$mode" = relink; then
+		  ( cd "$output_objdir" && \
+		    $RM "${realname}T" && \
+		    $MV "${realname}U" "$realname" )
+		fi
+
+		exit $lt_exit
+	      }
+	    done
 	    IFS="$save_ifs"
-	    $show "$cmd"
-	    $run eval "$cmd" || exit $?
-	  done
-	  IFS="$save_ifs"
+
+	    if test -n "$export_symbols_regex" && ${skipped_export-false}; then
+	      func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
+	      func_show_eval '$MV "${export_symbols}T" "$export_symbols"'
+	    fi
+	  fi
+
+          if ${skipped_export-false}; then
+	    if test -n "$export_symbols" && test -n "$include_expsyms"; then
+	      tmp_export_symbols="$export_symbols"
+	      test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
+	      $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"'
+	    fi
+
+	    if test -n "$orig_export_symbols"; then
+	      # The given exports_symbols file has to be filtered, so filter it.
+	      func_verbose "filter symbol list for \`$libname.la' to tag DATA exports"
+	      # FIXME: $output_objdir/$libname.filter potentially contains lots of
+	      # 's' commands which not all seds can handle. GNU sed should be fine
+	      # though. Also, the filter scales superlinearly with the number of
+	      # global variables. join(1) would be nice here, but unfortunately
+	      # isn't a blessed tool.
+	      $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
+	      delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
+	      export_symbols=$output_objdir/$libname.def
+	      $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
+	    fi
+	  fi
 
 	  libobjs=$output
 	  # Restore the value of output.
@@ -4147,6 +7293,7 @@ EOF
 
 	  if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then
 	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
+	    test "X$libobjs" = "X " && libobjs=
 	  fi
 	  # Expand the library linking commands again to reset the
 	  # value of $libobjs for piecewise linking.
@@ -4159,28 +7306,45 @@ EOF
 	      cmds=$module_cmds
 	    fi
 	  else
-	  if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
-	    cmds=$archive_expsym_cmds
-	  else
-	    cmds=$archive_cmds
+	    if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
+	      cmds=$archive_expsym_cmds
+	    else
+	      cmds=$archive_cmds
 	    fi
 	  fi
+	fi
+
+	if test -n "$delfiles"; then
+	  # Append the command to remove temporary files to $cmds.
+	  eval cmds=\"\$cmds~\$RM $delfiles\"
+	fi
 
-	  # Append the command to remove the reloadable object files
-	  # to the just-reset $cmds.
-	  eval cmds=\"\$cmds~\$rm $delfiles\"
+	# Add any objects from preloaded convenience libraries
+	if test -n "$dlprefiles"; then
+	  gentop="$output_objdir/${outputname}x"
+	  generated="$generated $gentop"
+
+	  func_extract_archives $gentop $dlprefiles
+	  libobjs="$libobjs $func_extract_archives_result"
+	  test "X$libobjs" = "X " && libobjs=
 	fi
+
 	save_ifs="$IFS"; IFS='~'
 	for cmd in $cmds; do
 	  IFS="$save_ifs"
 	  eval cmd=\"$cmd\"
-	  $show "$cmd"
-	  $run eval "$cmd" || {
+	  $opt_silent || {
+	    func_quote_for_expand "$cmd"
+	    eval "func_echo $func_quote_for_expand_result"
+	  }
+	  $opt_dry_run || eval "$cmd" || {
 	    lt_exit=$?
 
 	    # Restore the uninstalled library and exit
 	    if test "$mode" = relink; then
-	      $run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)'
+	      ( cd "$output_objdir" && \
+	        $RM "${realname}T" && \
+		$MV "${realname}U" "$realname" )
 	    fi
 
 	    exit $lt_exit
@@ -4190,12 +7354,11 @@ EOF
 
 	# Restore the uninstalled library and exit
 	if test "$mode" = relink; then
-	  $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $?
+	  $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $?
 
 	  if test -n "$convenience"; then
 	    if test -z "$whole_archive_flag_spec"; then
-	      $show "${rm}r $gentop"
-	      $run ${rm}r "$gentop"
+	      func_show_eval '${RM}r "$gentop"'
 	    fi
 	  fi
 
@@ -4205,8 +7368,7 @@ EOF
 	# Create links to the real library.
 	for linkname in $linknames; do
 	  if test "$realname" != "$linkname"; then
-	    $show "(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)"
-	    $run eval '(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)' || exit $?
+	    func_show_eval '(cd "$output_objdir" && $RM "$linkname" && $LN_S "$realname" "$linkname")' 'exit $?'
 	  fi
 	done
 
@@ -4219,38 +7381,35 @@ EOF
       ;;
 
     obj)
-      if test -n "$deplibs"; then
-	$echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2
-      fi
-
       if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-	$echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2
+	func_warning "\`-dlopen' is ignored for objects"
       fi
 
-      if test -n "$rpath"; then
-	$echo "$modename: warning: \`-rpath' is ignored for objects" 1>&2
-      fi
+      case " $deplibs" in
+      *\ -l* | *\ -L*)
+	func_warning "\`-l' and \`-L' are ignored for objects" ;;
+      esac
 
-      if test -n "$xrpath"; then
-	$echo "$modename: warning: \`-R' is ignored for objects" 1>&2
-      fi
+      test -n "$rpath" && \
+	func_warning "\`-rpath' is ignored for objects"
 
-      if test -n "$vinfo"; then
-	$echo "$modename: warning: \`-version-info' is ignored for objects" 1>&2
-      fi
+      test -n "$xrpath" && \
+	func_warning "\`-R' is ignored for objects"
 
-      if test -n "$release"; then
-	$echo "$modename: warning: \`-release' is ignored for objects" 1>&2
-      fi
+      test -n "$vinfo" && \
+	func_warning "\`-version-info' is ignored for objects"
+
+      test -n "$release" && \
+	func_warning "\`-release' is ignored for objects"
 
       case $output in
       *.lo)
-	if test -n "$objs$old_deplibs"; then
-	  $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2
-	  exit $EXIT_FAILURE
-	fi
-	libobj="$output"
-	obj=`$echo "X$output" | $Xsed -e "$lo2o"`
+	test -n "$objs$old_deplibs" && \
+	  func_fatal_error "cannot build library object \`$output' from non-libtool objects"
+
+	libobj=$output
+	func_lo2o "$libobj"
+	obj=$func_lo2o_result
 	;;
       *)
 	libobj=
@@ -4259,7 +7418,7 @@ EOF
       esac
 
       # Delete the old objects.
-      $run $rm $obj $libobj
+      $opt_dry_run || $RM $obj $libobj
 
       # Objects from convenience libraries.  This assumes
       # single-version convenience libraries.  Whenever we create
@@ -4275,7 +7434,7 @@ EOF
       if test -n "$convenience"; then
 	if test -n "$whole_archive_flag_spec"; then
 	  eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
-      reload_conv_objs=$reload_objs\ `$echo "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
+	  reload_conv_objs=$reload_objs\ `$ECHO "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
 	else
 	  gentop="$output_objdir/${obj}x"
 	  generated="$generated $gentop"
@@ -4286,24 +7445,15 @@ EOF
       fi
 
       # Create the old-style object.
-      reload_objs="$objs$old_deplibs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
+      reload_objs="$objs$old_deplibs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
 
       output="$obj"
-      cmds=$reload_cmds
-      save_ifs="$IFS"; IFS='~'
-      for cmd in $cmds; do
-	IFS="$save_ifs"
-	eval cmd=\"$cmd\"
-	$show "$cmd"
-	$run eval "$cmd" || exit $?
-      done
-      IFS="$save_ifs"
+      func_execute_cmds "$reload_cmds" 'exit $?'
 
       # Exit if we aren't doing a library object file.
       if test -z "$libobj"; then
 	if test -n "$gentop"; then
-	  $show "${rm}r $gentop"
-	  $run ${rm}r $gentop
+	  func_show_eval '${RM}r "$gentop"'
 	fi
 
 	exit $EXIT_SUCCESS
@@ -4311,14 +7461,13 @@ EOF
 
       if test "$build_libtool_libs" != yes; then
 	if test -n "$gentop"; then
-	  $show "${rm}r $gentop"
-	  $run ${rm}r $gentop
+	  func_show_eval '${RM}r "$gentop"'
 	fi
 
 	# Create an invalid libtool object if no PIC, so that we don't
 	# accidentally link it into a program.
 	# $show "echo timestamp > $libobj"
-	# $run eval "echo timestamp > $libobj" || exit $?
+	# $opt_dry_run || eval "echo timestamp > $libobj" || exit $?
 	exit $EXIT_SUCCESS
       fi
 
@@ -4326,20 +7475,11 @@ EOF
 	# Only do commands if we really have different PIC objects.
 	reload_objs="$libobjs $reload_conv_objs"
 	output="$libobj"
-	cmds=$reload_cmds
-	save_ifs="$IFS"; IFS='~'
-	for cmd in $cmds; do
-	  IFS="$save_ifs"
-	  eval cmd=\"$cmd\"
-	  $show "$cmd"
-	  $run eval "$cmd" || exit $?
-	done
-	IFS="$save_ifs"
+	func_execute_cmds "$reload_cmds" 'exit $?'
       fi
 
       if test -n "$gentop"; then
-	$show "${rm}r $gentop"
-	$run ${rm}r $gentop
+	func_show_eval '${RM}r "$gentop"'
       fi
 
       exit $EXIT_SUCCESS
@@ -4347,39 +7487,45 @@ EOF
 
     prog)
       case $host in
-	*cygwin*) output=`$echo $output | ${SED} -e 's,.exe$,,;s,$,.exe,'` ;;
+	*cygwin*) func_stripname '' '.exe' "$output"
+	          output=$func_stripname_result.exe;;
       esac
-      if test -n "$vinfo"; then
-	$echo "$modename: warning: \`-version-info' is ignored for programs" 1>&2
-      fi
+      test -n "$vinfo" && \
+	func_warning "\`-version-info' is ignored for programs"
 
-      if test -n "$release"; then
-	$echo "$modename: warning: \`-release' is ignored for programs" 1>&2
-      fi
+      test -n "$release" && \
+	func_warning "\`-release' is ignored for programs"
 
-      if test "$preload" = yes; then
-	if test "$dlopen_support" = unknown && test "$dlopen_self" = unknown &&
-	   test "$dlopen_self_static" = unknown; then
-	  $echo "$modename: warning: \`AC_LIBTOOL_DLOPEN' not used. Assuming no dlopen support."
-	fi
-      fi
+      test "$preload" = yes \
+        && test "$dlopen_support" = unknown \
+	&& test "$dlopen_self" = unknown \
+	&& test "$dlopen_self_static" = unknown && \
+	  func_warning "\`LT_INIT([dlopen])' not used. Assuming no dlopen support."
 
       case $host in
       *-*-rhapsody* | *-*-darwin1.[012])
 	# On Rhapsody replace the C library is the System framework
-	compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
-	finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
+	compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
+	finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
 	;;
       esac
 
       case $host in
-      *darwin*)
-        # Don't allow lazy linking, it breaks C++ global constructors
-        if test "$tagname" = CXX ; then
-        compile_command="$compile_command ${wl}-bind_at_load"
-        finalize_command="$finalize_command ${wl}-bind_at_load"
-        fi
-        ;;
+      *-*-darwin*)
+	# Don't allow lazy linking, it breaks C++ global constructors
+	# But is supposedly fixed on 10.4 or later (yay!).
+	if test "$tagname" = CXX ; then
+	  case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
+	    10.[0123])
+	      compile_command="$compile_command ${wl}-bind_at_load"
+	      finalize_command="$finalize_command ${wl}-bind_at_load"
+	    ;;
+	  esac
+	fi
+	# Time to change all our "foo.ltframework" stuff back to "-framework foo"
+	compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+	finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+	;;
       esac
 
 
@@ -4454,14 +7600,16 @@ EOF
 	  esac
 	fi
 	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-	  testbindir=`$echo "X$libdir" | $Xsed -e 's*/lib$*/bin*'`
+	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
+	  testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'`
 	  case :$dllsearchpath: in
 	  *":$libdir:"*) ;;
+	  ::) dllsearchpath=$libdir;;
 	  *) dllsearchpath="$dllsearchpath:$libdir";;
 	  esac
 	  case :$dllsearchpath: in
 	  *":$testbindir:"*) ;;
+	  ::) dllsearchpath=$testbindir;;
 	  *) dllsearchpath="$dllsearchpath:$testbindir";;
 	  esac
 	  ;;
@@ -4513,281 +7661,51 @@ EOF
 
       if test -n "$libobjs" && test "$build_old_libs" = yes; then
 	# Transform all the library objects into standard objects.
-	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-	finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+	compile_command=`$ECHO "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+	finalize_command=`$ECHO "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
       fi
 
-      dlsyms=
-      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-	if test -n "$NM" && test -n "$global_symbol_pipe"; then
-	  dlsyms="${outputname}S.c"
-	else
-	  $echo "$modename: not configured to extract global symbols from dlpreopened files" 1>&2
-	fi
-      fi
-
-      if test -n "$dlsyms"; then
-	case $dlsyms in
-	"") ;;
-	*.c)
-	  # Discover the nlist of each of the dlfiles.
-	  nlist="$output_objdir/${outputname}.nm"
-
-	  $show "$rm $nlist ${nlist}S ${nlist}T"
-	  $run $rm "$nlist" "${nlist}S" "${nlist}T"
-
-	  # Parse the name list into a source file.
-	  $show "creating $output_objdir/$dlsyms"
-
-	  test -z "$run" && $echo > "$output_objdir/$dlsyms" "\
-/* $dlsyms - symbol resolution table for \`$outputname' dlsym emulation. */
-/* Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP */
-
-#ifdef __cplusplus
-extern \"C\" {
-#endif
-
-/* Prevent the only kind of declaration conflicts we can make. */
-#define lt_preloaded_symbols some_other_symbol
-
-/* External symbol declarations for the compiler. */\
-"
-
-	  if test "$dlself" = yes; then
-	    $show "generating symbol list for \`$output'"
-
-	    test -z "$run" && $echo ': @PROGRAM@ ' > "$nlist"
-
-	    # Add our own program objects to the symbol list.
-	    progfiles=`$echo "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-	    for arg in $progfiles; do
-	      $show "extracting global C symbols from \`$arg'"
-	      $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
-	    done
+      func_generate_dlsyms "$outputname" "@PROGRAM@" "no"
 
-	    if test -n "$exclude_expsyms"; then
-	      $run eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
-	      $run eval '$mv "$nlist"T "$nlist"'
-	    fi
-
-	    if test -n "$export_symbols_regex"; then
-	      $run eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T'
-	      $run eval '$mv "$nlist"T "$nlist"'
-	    fi
-
-	    # Prepare the list of exported symbols
-	    if test -z "$export_symbols"; then
-	      export_symbols="$output_objdir/$outputname.exp"
-	      $run $rm $export_symbols
-	      $run eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
-              case $host in
-              *cygwin* | *mingw* )
-	        $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
-		$run eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
-                ;;
-              esac
-	    else
-	      $run eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
-	      $run eval 'grep -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
-	      $run eval 'mv "$nlist"T "$nlist"'
-              case $host in
-              *cygwin* | *mingw* )
-	        $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
-		$run eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
-                ;;
-              esac
-	    fi
-	  fi
-
-	  for arg in $dlprefiles; do
-	    $show "extracting global C symbols from \`$arg'"
-	    name=`$echo "$arg" | ${SED} -e 's%^.*/%%'`
-	    $run eval '$echo ": $name " >> "$nlist"'
-	    $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
-	  done
-
-	  if test -z "$run"; then
-	    # Make sure we have at least an empty file.
-	    test -f "$nlist" || : > "$nlist"
-
-	    if test -n "$exclude_expsyms"; then
-	      $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
-	      $mv "$nlist"T "$nlist"
-	    fi
-
-	    # Try sorting and uniquifying the output.
-	    if grep -v "^: " < "$nlist" |
-		if sort -k 3 </dev/null >/dev/null 2>&1; then
-		  sort -k 3
-		else
-		  sort +2
-		fi |
-		uniq > "$nlist"S; then
-	      :
-	    else
-	      grep -v "^: " < "$nlist" > "$nlist"S
-	    fi
-
-	    if test -f "$nlist"S; then
-	      eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$dlsyms"'
-	    else
-	      $echo '/* NONE */' >> "$output_objdir/$dlsyms"
-	    fi
-
-	    $echo >> "$output_objdir/$dlsyms" "\
-
-#undef lt_preloaded_symbols
-
-#if defined (__STDC__) && __STDC__
-# define lt_ptr void *
-#else
-# define lt_ptr char *
-# define const
-#endif
-
-/* The mapping between symbol names and symbols. */
-"
-
-	    case $host in
-	    *cygwin* | *mingw* )
-	  $echo >> "$output_objdir/$dlsyms" "\
-/* DATA imports from DLLs on WIN32 can't be const, because
-   runtime relocations are performed -- see ld's documentation
-   on pseudo-relocs */
-struct {
-"
-	      ;;
-	    * )
-	  $echo >> "$output_objdir/$dlsyms" "\
-const struct {
-"
-	      ;;
-	    esac
-
-
-	  $echo >> "$output_objdir/$dlsyms" "\
-  const char *name;
-  lt_ptr address;
-}
-lt_preloaded_symbols[] =
-{\
-"
-
-	    eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$dlsyms"
-
-	    $echo >> "$output_objdir/$dlsyms" "\
-  {0, (lt_ptr) 0}
-};
-
-/* This works around a problem in FreeBSD linker */
-#ifdef FREEBSD_WORKAROUND
-static const void *lt_preloaded_setup() {
-  return lt_preloaded_symbols;
-}
-#endif
-
-#ifdef __cplusplus
-}
-#endif\
-"
-	  fi
-
-	  pic_flag_for_symtable=
-	  case $host in
-	  # compiling the symbol table file with pic_flag works around
-	  # a FreeBSD bug that causes programs to crash when -lm is
-	  # linked before any other PIC object.  But we must not use
-	  # pic_flag when linking with -static.  The problem exists in
-	  # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
-	  *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
-	    case "$compile_command " in
-	    *" -static "*) ;;
-	    *) pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND";;
-	    esac;;
-	  *-*-hpux*)
-	    case "$compile_command " in
-	    *" -static "*) ;;
-	    *) pic_flag_for_symtable=" $pic_flag";;
-	    esac
-	  esac
-
-	  # Now compile the dynamic symbol file.
-	  $show "(cd $output_objdir && $LTCC  $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")"
-	  $run eval '(cd $output_objdir && $LTCC  $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $?
-
-	  # Clean up the generated files.
-	  $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T"
-	  $run $rm "$output_objdir/$dlsyms" "$nlist" "${nlist}S" "${nlist}T"
-
-	  # Transform the symbol file into the correct name.
-          case $host in
-          *cygwin* | *mingw* )
-            if test -f "$output_objdir/${outputname}.def" ; then
-              compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
-              finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
-            else
-              compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
-              finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
-             fi
-            ;;
-          * )
-            compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
-            finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
-            ;;
-          esac
-	  ;;
-	*)
-	  $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2
-	  exit $EXIT_FAILURE
-	  ;;
-	esac
-      else
-	# We keep going just in case the user didn't refer to
-	# lt_preloaded_symbols.  The linker will fail if global_symbol_pipe
-	# really was required.
-
-	# Nullify the symbol file.
-	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
-	finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
+      # template prelinking step
+      if test -n "$prelink_cmds"; then
+	func_execute_cmds "$prelink_cmds" 'exit $?'
       fi
 
-      if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
+      wrappers_required=yes
+      case $host in
+      *cygwin* | *mingw* )
+        if test "$build_libtool_libs" != yes; then
+          wrappers_required=no
+        fi
+        ;;
+      *cegcc)
+        # Disable wrappers for cegcc, we are cross compiling anyway.
+        wrappers_required=no
+        ;;
+      *)
+        if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
+          wrappers_required=no
+        fi
+        ;;
+      esac
+      if test "$wrappers_required" = no; then
 	# Replace the output file specification.
-	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$output"'%g' | $NL2SP`
+	compile_command=`$ECHO "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
 	link_command="$compile_command$compile_rpath"
 
 	# We have no uninstalled library dependencies, so finalize right now.
-	$show "$link_command"
-	$run eval "$link_command"
-	exit_status=$?
+	exit_status=0
+	func_show_eval "$link_command" 'exit_status=$?'
 
 	# Delete the generated files.
-	if test -n "$dlsyms"; then
-	  $show "$rm $output_objdir/${outputname}S.${objext}"
-	  $run $rm "$output_objdir/${outputname}S.${objext}"
+	if test -f "$output_objdir/${outputname}S.${objext}"; then
+	  func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"'
 	fi
 
 	exit $exit_status
       fi
 
-      if test -n "$shlibpath_var"; then
-	# We should set the shlibpath_var
-	rpath=
-	for dir in $temp_rpath; do
-	  case $dir in
-	  [\\/]* | [A-Za-z]:[\\/]*)
-	    # Absolute path.
-	    rpath="$rpath$dir:"
-	    ;;
-	  *)
-	    # Relative path: add a thisdir entry.
-	    rpath="$rpath\$thisdir/$dir:"
-	    ;;
-	  esac
-	done
-	temp_rpath="$rpath"
-      fi
-
       if test -n "$compile_shlibpath$finalize_shlibpath"; then
 	compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command"
       fi
@@ -4820,12 +7738,11 @@ static const void *lt_preloaded_setup() {
 	# We don't need to create a wrapper script.
 	link_command="$compile_var$compile_command$compile_rpath"
 	# Replace the output file specification.
-	link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
+	link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
 	# Delete the old output file.
-	$run $rm $output
+	$opt_dry_run || $RM $output
 	# Link the executable and exit
-	$show "$link_command"
-	$run eval "$link_command" || exit $?
+	func_show_eval "$link_command" 'exit $?'
 	exit $EXIT_SUCCESS
       fi
 
@@ -4834,13 +7751,13 @@ static const void *lt_preloaded_setup() {
 	link_command="$compile_var$compile_command$compile_rpath"
 	relink_command="$finalize_var$finalize_command$finalize_rpath"
 
-	$echo "$modename: warning: this platform does not like uninstalled shared libraries" 1>&2
-	$echo "$modename: \`$output' will be relinked during installation" 1>&2
+	func_warning "this platform does not like uninstalled shared libraries"
+	func_warning "\`$output' will be relinked during installation"
       else
 	if test "$fast_install" != no; then
 	  link_command="$finalize_var$compile_command$finalize_rpath"
 	  if test "$fast_install" = yes; then
-	    relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $SP2NL | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g' | $NL2SP`
+	    relink_command=`$ECHO "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
 	  else
 	    # fast_install is set to needless
 	    relink_command=
@@ -4852,606 +7769,103 @@ static const void *lt_preloaded_setup() {
       fi
 
       # Replace the output file specification.
-      link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
+      link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
 
       # Delete the old output files.
-      $run $rm $output $output_objdir/$outputname $output_objdir/lt-$outputname
+      $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname
 
-      $show "$link_command"
-      $run eval "$link_command" || exit $?
+      func_show_eval "$link_command" 'exit $?'
 
       # Now create the wrapper script.
-      $show "creating $output"
+      func_verbose "creating $output"
 
       # Quote the relink command for shipping.
       if test -n "$relink_command"; then
 	# Preserve any variables that may affect compiler behavior
 	for var in $variables_saved_for_relink; do
 	  if eval test -z \"\${$var+set}\"; then
-	    relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command"
+	    relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command"
 	  elif eval var_value=\$$var; test -z "$var_value"; then
 	    relink_command="$var=; export $var; $relink_command"
 	  else
-	    var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"`
-	    relink_command="$var=\"$var_value\"; export $var; $relink_command"
+	    func_quote_for_eval "$var_value"
+	    relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
 	  fi
 	done
 	relink_command="(cd `pwd`; $relink_command)"
-	relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
+	relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"`
       fi
 
-      # Quote $echo for shipping.
-      if test "X$echo" = "X$SHELL $progpath --fallback-echo"; then
+      # Quote $ECHO for shipping.
+      if test "X$ECHO" = "X$SHELL $progpath --fallback-echo"; then
 	case $progpath in
 	[\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";;
 	*) qecho="$SHELL `pwd`/$progpath --fallback-echo";;
 	esac
-	qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"`
+	qecho=`$ECHO "X$qecho" | $Xsed -e "$sed_quote_subst"`
       else
-	qecho=`$echo "X$echo" | $Xsed -e "$sed_quote_subst"`
+	qecho=`$ECHO "X$ECHO" | $Xsed -e "$sed_quote_subst"`
       fi
 
-      # Only actually do things if our run command is non-null.
-      if test -z "$run"; then
+      # Only actually do things if not in dry run mode.
+      $opt_dry_run || {
 	# win32 will think the script is a binary if it has
 	# a .exe suffix, so we strip it off here.
 	case $output in
-	  *.exe) output=`$echo $output|${SED} 's,.exe$,,'` ;;
+	  *.exe) func_stripname '' '.exe' "$output"
+	         output=$func_stripname_result ;;
 	esac
 	# test for cygwin because mv fails w/o .exe extensions
 	case $host in
 	  *cygwin*)
 	    exeext=.exe
-	    outputname=`$echo $outputname|${SED} 's,.exe$,,'` ;;
+	    func_stripname '' '.exe' "$outputname"
+	    outputname=$func_stripname_result ;;
 	  *) exeext= ;;
 	esac
 	case $host in
 	  *cygwin* | *mingw* )
-            output_name=`basename $output`
-            output_path=`dirname $output`
-            cwrappersource="$output_path/$objdir/lt-$output_name.c"
-            cwrapper="$output_path/$output_name.exe"
-            $rm $cwrappersource $cwrapper
-            trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
-
-	    cat > $cwrappersource <<EOF
-
-/* $cwrappersource - temporary wrapper executable for $objdir/$outputname
-   Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
-
-   The $output program cannot be directly executed until all the libtool
-   libraries that it depends on are installed.
-
-   This wrapper executable should never be moved out of the build directory.
-   If it is, it will not operate correctly.
-
-   Currently, it simply execs the wrapper *script* "/bin/sh $output",
-   but could eventually absorb all of the scripts functionality and
-   exec $objdir/$outputname directly.
-*/
-EOF
-	    cat >> $cwrappersource<<"EOF"
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <malloc.h>
-#include <stdarg.h>
-#include <assert.h>
-#include <string.h>
-#include <ctype.h>
-#include <sys/stat.h>
-
-#if defined(PATH_MAX)
-# define LT_PATHMAX PATH_MAX
-#elif defined(MAXPATHLEN)
-# define LT_PATHMAX MAXPATHLEN
-#else
-# define LT_PATHMAX 1024
-#endif
-
-#ifndef DIR_SEPARATOR
-# define DIR_SEPARATOR '/'
-# define PATH_SEPARATOR ':'
-#endif
-
-#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
-  defined (__OS2__)
-# define HAVE_DOS_BASED_FILE_SYSTEM
-# ifndef DIR_SEPARATOR_2
-#  define DIR_SEPARATOR_2 '\\'
-# endif
-# ifndef PATH_SEPARATOR_2
-#  define PATH_SEPARATOR_2 ';'
-# endif
-#endif
-
-#ifndef DIR_SEPARATOR_2
-# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR)
-#else /* DIR_SEPARATOR_2 */
-# define IS_DIR_SEPARATOR(ch) \
-        (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
-#endif /* DIR_SEPARATOR_2 */
-
-#ifndef PATH_SEPARATOR_2
-# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR)
-#else /* PATH_SEPARATOR_2 */
-# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
-#endif /* PATH_SEPARATOR_2 */
-
-#define XMALLOC(type, num)      ((type *) xmalloc ((num) * sizeof(type)))
-#define XFREE(stale) do { \
-  if (stale) { free ((void *) stale); stale = 0; } \
-} while (0)
-
-/* -DDEBUG is fairly common in CFLAGS.  */
-#undef DEBUG
-#if defined DEBUGWRAPPER
-# define DEBUG(format, ...) fprintf(stderr, format, __VA_ARGS__)
-#else
-# define DEBUG(format, ...)
-#endif
-
-const char *program_name = NULL;
-
-void * xmalloc (size_t num);
-char * xstrdup (const char *string);
-const char * base_name (const char *name);
-char * find_executable(const char *wrapper);
-int    check_executable(const char *path);
-char * strendzap(char *str, const char *pat);
-void lt_fatal (const char *message, ...);
-
-int
-main (int argc, char *argv[])
-{
-  char **newargz;
-  int i;
-
-  program_name = (char *) xstrdup (base_name (argv[0]));
-  DEBUG("(main) argv[0]      : %s\n",argv[0]);
-  DEBUG("(main) program_name : %s\n",program_name);
-  newargz = XMALLOC(char *, argc+2);
-EOF
-
-            cat >> $cwrappersource <<EOF
-  newargz[0] = (char *) xstrdup("$SHELL");
-EOF
-
-            cat >> $cwrappersource <<"EOF"
-  newargz[1] = find_executable(argv[0]);
-  if (newargz[1] == NULL)
-    lt_fatal("Couldn't find %s", argv[0]);
-  DEBUG("(main) found exe at : %s\n",newargz[1]);
-  /* we know the script has the same name, without the .exe */
-  /* so make sure newargz[1] doesn't end in .exe */
-  strendzap(newargz[1],".exe");
-  for (i = 1; i < argc; i++)
-    newargz[i+1] = xstrdup(argv[i]);
-  newargz[argc+1] = NULL;
-
-  for (i=0; i<argc+1; i++)
-  {
-    DEBUG("(main) newargz[%d]   : %s\n",i,newargz[i]);
-    ;
-  }
-
-EOF
-
-            case $host_os in
-              mingw*)
-                cat >> $cwrappersource <<EOF
-  execv("$SHELL",(char const **)newargz);
-EOF
-              ;;
-              *)
-                cat >> $cwrappersource <<EOF
-  execv("$SHELL",newargz);
-EOF
-              ;;
-            esac
-
-            cat >> $cwrappersource <<"EOF"
-  return 127;
-}
-
-void *
-xmalloc (size_t num)
-{
-  void * p = (void *) malloc (num);
-  if (!p)
-    lt_fatal ("Memory exhausted");
-
-  return p;
-}
-
-char *
-xstrdup (const char *string)
-{
-  return string ? strcpy ((char *) xmalloc (strlen (string) + 1), string) : NULL
-;
-}
-
-const char *
-base_name (const char *name)
-{
-  const char *base;
-
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
-  /* Skip over the disk name in MSDOS pathnames. */
-  if (isalpha ((unsigned char)name[0]) && name[1] == ':')
-    name += 2;
-#endif
-
-  for (base = name; *name; name++)
-    if (IS_DIR_SEPARATOR (*name))
-      base = name + 1;
-  return base;
-}
-
-int
-check_executable(const char * path)
-{
-  struct stat st;
-
-  DEBUG("(check_executable)  : %s\n", path ? (*path ? path : "EMPTY!") : "NULL!");
-  if ((!path) || (!*path))
-    return 0;
-
-  if ((stat (path, &st) >= 0) &&
-      (
-        /* MinGW & native WIN32 do not support S_IXOTH or S_IXGRP */
-#if defined (S_IXOTH)
-       ((st.st_mode & S_IXOTH) == S_IXOTH) ||
-#endif
-#if defined (S_IXGRP)
-       ((st.st_mode & S_IXGRP) == S_IXGRP) ||
-#endif
-       ((st.st_mode & S_IXUSR) == S_IXUSR))
-      )
-    return 1;
-  else
-    return 0;
-}
-
-/* Searches for the full path of the wrapper.  Returns
-   newly allocated full path name if found, NULL otherwise */
-char *
-find_executable (const char* wrapper)
-{
-  int has_slash = 0;
-  const char* p;
-  const char* p_next;
-  /* static buffer for getcwd */
-  char tmp[LT_PATHMAX + 1];
-  int tmp_len;
-  char* concat_name;
-
-  DEBUG("(find_executable)  : %s\n", wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!");
-
-  if ((wrapper == NULL) || (*wrapper == '\0'))
-    return NULL;
-
-  /* Absolute path? */
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
-  if (isalpha ((unsigned char)wrapper[0]) && wrapper[1] == ':')
-  {
-    concat_name = xstrdup (wrapper);
-    if (check_executable(concat_name))
-      return concat_name;
-    XFREE(concat_name);
-  }
-  else
-  {
-#endif
-    if (IS_DIR_SEPARATOR (wrapper[0]))
-    {
-      concat_name = xstrdup (wrapper);
-      if (check_executable(concat_name))
-        return concat_name;
-      XFREE(concat_name);
-    }
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
-  }
-#endif
-
-  for (p = wrapper; *p; p++)
-    if (*p == '/')
-    {
-      has_slash = 1;
-      break;
-    }
-  if (!has_slash)
-  {
-    /* no slashes; search PATH */
-    const char* path = getenv ("PATH");
-    if (path != NULL)
-    {
-      for (p = path; *p; p = p_next)
-      {
-        const char* q;
-        size_t p_len;
-        for (q = p; *q; q++)
-          if (IS_PATH_SEPARATOR(*q))
-            break;
-        p_len = q - p;
-        p_next = (*q == '\0' ? q : q + 1);
-        if (p_len == 0)
-        {
-          /* empty path: current directory */
-          if (getcwd (tmp, LT_PATHMAX) == NULL)
-            lt_fatal ("getcwd failed");
-          tmp_len = strlen(tmp);
-          concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1);
-          memcpy (concat_name, tmp, tmp_len);
-          concat_name[tmp_len] = '/';
-          strcpy (concat_name + tmp_len + 1, wrapper);
-        }
-        else
-        {
-          concat_name = XMALLOC(char, p_len + 1 + strlen(wrapper) + 1);
-          memcpy (concat_name, p, p_len);
-          concat_name[p_len] = '/';
-          strcpy (concat_name + p_len + 1, wrapper);
-        }
-        if (check_executable(concat_name))
-          return concat_name;
-        XFREE(concat_name);
-      }
-    }
-    /* not found in PATH; assume curdir */
-  }
-  /* Relative path | not found in path: prepend cwd */
-  if (getcwd (tmp, LT_PATHMAX) == NULL)
-    lt_fatal ("getcwd failed");
-  tmp_len = strlen(tmp);
-  concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1);
-  memcpy (concat_name, tmp, tmp_len);
-  concat_name[tmp_len] = '/';
-  strcpy (concat_name + tmp_len + 1, wrapper);
-
-  if (check_executable(concat_name))
-    return concat_name;
-  XFREE(concat_name);
-  return NULL;
-}
-
-char *
-strendzap(char *str, const char *pat)
-{
-  size_t len, patlen;
-
-  assert(str != NULL);
-  assert(pat != NULL);
-
-  len = strlen(str);
-  patlen = strlen(pat);
-
-  if (patlen <= len)
-  {
-    str += len - patlen;
-    if (strcmp(str, pat) == 0)
-      *str = '\0';
-  }
-  return str;
-}
-
-static void
-lt_error_core (int exit_status, const char * mode,
-          const char * message, va_list ap)
-{
-  fprintf (stderr, "%s: %s: ", program_name, mode);
-  vfprintf (stderr, message, ap);
-  fprintf (stderr, ".\n");
-
-  if (exit_status >= 0)
-    exit (exit_status);
-}
-
-void
-lt_fatal (const char *message, ...)
-{
-  va_list ap;
-  va_start (ap, message);
-  lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
-  va_end (ap);
-}
-EOF
-          # we should really use a build-platform specific compiler
-          # here, but OTOH, the wrappers (shell script and this C one)
-          # are only useful if you want to execute the "real" binary.
-          # Since the "real" binary is built for $host, then this
-          # wrapper might as well be built for $host, too.
-          $run $LTCC $LTCFLAGS -s -o $cwrapper $cwrappersource
-          ;;
-        esac
-        $rm $output
-        trap "$rm $output; exit $EXIT_FAILURE" 1 2 15
-
-	$echo > $output "\
-#! $SHELL
-
-# $output - temporary wrapper script for $objdir/$outputname
-# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
-#
-# The $output program cannot be directly executed until all the libtool
-# libraries that it depends on are installed.
-#
-# This wrapper script should never be moved out of the build directory.
-# If it is, it will not operate correctly.
-
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed='${SED} -e 1s/^X//'
-sed_quote_subst='$sed_quote_subst'
-
-# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
-if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs 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
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-relink_command=\"$relink_command\"
-
-# This environment variable determines our operation mode.
-if test \"\$libtool_install_magic\" = \"$magic\"; then
-  # install mode needs the following variable:
-  notinst_deplibs='$notinst_deplibs'
-else
-  # When we are sourced in execute mode, \$file and \$echo are already set.
-  if test \"\$libtool_execute_magic\" != \"$magic\"; then
-    echo=\"$qecho\"
-    file=\"\$0\"
-    # Make sure echo works.
-    if test \"X\$1\" = X--no-reexec; then
-      # Discard the --no-reexec flag, and continue.
-      shift
-    elif test \"X\`(\$echo '\t') 2>/dev/null\`\" = 'X\t'; then
-      # Yippee, \$echo works!
-      :
-    else
-      # Restart under the correct shell, and then maybe \$echo will work.
-      exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"}
-    fi
-  fi\
-"
-	$echo >> $output "\
-
-  # Find the directory that this script lives in.
-  thisdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\`
-  test \"x\$thisdir\" = \"x\$file\" && thisdir=.
-
-  # Follow symbolic links until we get to the real thisdir.
-  file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\`
-  while test -n \"\$file\"; do
-    destdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
-
-    # If there was a directory component, then change thisdir.
-    if test \"x\$destdir\" != \"x\$file\"; then
-      case \"\$destdir\" in
-      [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;;
-      *) thisdir=\"\$thisdir/\$destdir\" ;;
-      esac
-    fi
-
-    file=\`\$echo \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
-    file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
-  done
-
-  # Try to get the absolute directory name.
-  absdir=\`cd \"\$thisdir\" && pwd\`
-  test -n \"\$absdir\" && thisdir=\"\$absdir\"
-"
-
-	if test "$fast_install" = yes; then
-	  $echo >> $output "\
-  program=lt-'$outputname'$exeext
-  progdir=\"\$thisdir/$objdir\"
-
-  if test ! -f \"\$progdir/\$program\" || \\
-     { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\
-       test \"X\$file\" != \"X\$progdir/\$program\"; }; then
-
-    file=\"\$\$-\$program\"
-
-    if test ! -d \"\$progdir\"; then
-      $mkdir \"\$progdir\"
-    else
-      $rm \"\$progdir/\$file\"
-    fi"
-
-	  $echo >> $output "\
-
-    # relink executable if necessary
-    if test -n \"\$relink_command\"; then
-      if relink_command_output=\`eval \$relink_command 2>&1\`; then :
-      else
-	$echo \"\$relink_command_output\" >&2
-	$rm \"\$progdir/\$file\"
-	exit $EXIT_FAILURE
-      fi
-    fi
-
-    $mv \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null ||
-    { $rm \"\$progdir/\$program\";
-      $mv \"\$progdir/\$file\" \"\$progdir/\$program\"; }
-    $rm \"\$progdir/\$file\"
-  fi"
-	else
-	  $echo >> $output "\
-  program='$outputname'
-  progdir=\"\$thisdir/$objdir\"
-"
-	fi
-
-	$echo >> $output "\
-
-  if test -f \"\$progdir/\$program\"; then"
-
-	# Export our shlibpath_var if we have one.
-	if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
-	  $echo >> $output "\
-    # Add our own library path to $shlibpath_var
-    $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
-
-    # Some systems cannot cope with colon-terminated $shlibpath_var
-    # The second colon is a workaround for a bug in BeOS R4 sed
-    $shlibpath_var=\`\$echo \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\`
-
-    export $shlibpath_var
-"
-	fi
-
-	# fixup the dll searchpath if we need to.
-	if test -n "$dllsearchpath"; then
-	  $echo >> $output "\
-    # Add the dll search path components to the executable PATH
-    PATH=$dllsearchpath:\$PATH
-"
-	fi
+	    func_dirname_and_basename "$output" "" "."
+	    output_name=$func_basename_result
+	    output_path=$func_dirname_result
+	    cwrappersource="$output_path/$objdir/lt-$output_name.c"
+	    cwrapper="$output_path/$output_name.exe"
+	    $RM $cwrappersource $cwrapper
+	    trap "$RM $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
+
+	    func_emit_cwrapperexe_src > $cwrappersource
+
+	    # The wrapper executable is built using the $host compiler,
+	    # because it contains $host paths and files. If cross-
+	    # compiling, it, like the target executable, must be
+	    # executed on the $host or under an emulation environment.
+	    $opt_dry_run || {
+	      $LTCC $LTCFLAGS -o $cwrapper $cwrappersource
+	      $STRIP $cwrapper
+	    }
 
-	$echo >> $output "\
-    if test \"\$libtool_execute_magic\" != \"$magic\"; then
-      # Run the actual program with our arguments.
-"
-	case $host in
-	# Backslashes separate directories on plain windows
-	*-*-mingw | *-*-os2*)
-	  $echo >> $output "\
-      exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
-"
+	    # Now, create the wrapper script for func_source use:
+	    func_ltwrapper_scriptname $cwrapper
+	    $RM $func_ltwrapper_scriptname_result
+	    trap "$RM $func_ltwrapper_scriptname_result; exit $EXIT_FAILURE" 1 2 15
+	    $opt_dry_run || {
+	      # note: this script will not be executed, so do not chmod.
+	      if test "x$build" = "x$host" ; then
+		$cwrapper --lt-dump-script > $func_ltwrapper_scriptname_result
+	      else
+		func_emit_wrapper no > $func_ltwrapper_scriptname_result
+	      fi
+	    }
 	  ;;
+	  * )
+	    $RM $output
+	    trap "$RM $output; exit $EXIT_FAILURE" 1 2 15
 
-	*)
-	  $echo >> $output "\
-      exec \"\$progdir/\$program\" \${1+\"\$@\"}
-"
+	    func_emit_wrapper no > $output
+	    chmod +x $output
 	  ;;
 	esac
-	$echo >> $output "\
-      \$echo \"\$0: cannot exec \$program \$*\"
-      exit $EXIT_FAILURE
-    fi
-  else
-    # The program doesn't exist.
-    \$echo \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
-    \$echo \"This script is just a wrapper for \$program.\" 1>&2
-    $echo \"See the $PACKAGE documentation for more information.\" 1>&2
-    exit $EXIT_FAILURE
-  fi
-fi\
-"
-	chmod +x $output
-      fi
+      }
       exit $EXIT_SUCCESS
       ;;
     esac
@@ -5460,7 +7874,7 @@ fi\
     for oldlib in $oldlibs; do
 
       if test "$build_libtool_libs" = convenience; then
-	oldobjs="$libobjs_save"
+	oldobjs="$libobjs_save $symfileobj"
 	addlibs="$convenience"
 	build_libtool_libs=no
       else
@@ -5469,6 +7883,9 @@ fi\
 	  build_libtool_libs=no
 	else
 	  oldobjs="$old_deplibs $non_pic_objects"
+	  if test "$preload" = yes && test -f "$symfileobj"; then
+	    oldobjs="$oldobjs $symfileobj"
+	  fi
 	fi
 	addlibs="$old_convenience"
       fi
@@ -5483,8 +7900,18 @@ fi\
 
       # Do each command in the archive commands.
       if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
-       cmds=$old_archive_from_new_cmds
+	cmds=$old_archive_from_new_cmds
       else
+
+	# Add any objects from preloaded convenience libraries
+	if test -n "$dlprefiles"; then
+	  gentop="$output_objdir/${outputname}x"
+	  generated="$generated $gentop"
+
+	  func_extract_archives $gentop $dlprefiles
+	  oldobjs="$oldobjs $func_extract_archives_result"
+	fi
+
 	# POSIX demands no paths to be encoded in archives.  We have
 	# to avoid creating archives with duplicate basenames if we
 	# might have to extract them afterwards, e.g., when creating a
@@ -5493,32 +7920,22 @@ fi\
 	# not supported by libtool).
 	if (for obj in $oldobjs
 	    do
-	      $echo "X$obj" | $Xsed -e 's%^.*/%%'
+	      func_basename "$obj"
+	      $ECHO "$func_basename_result"
 	    done | sort | sort -uc >/dev/null 2>&1); then
 	  :
 	else
-	  $echo "copying selected object files to avoid basename conflicts..."
-
-	  if test -z "$gentop"; then
-	    gentop="$output_objdir/${outputname}x"
-	    generated="$generated $gentop"
-
-	    $show "${rm}r $gentop"
-	    $run ${rm}r "$gentop"
-	    $show "$mkdir $gentop"
-	    $run $mkdir "$gentop"
-	    exit_status=$?
-	    if test "$exit_status" -ne 0 && test ! -d "$gentop"; then
-	      exit $exit_status
-	    fi
-	  fi
-
+	  $ECHO "copying selected object files to avoid basename conflicts..."
+	  gentop="$output_objdir/${outputname}x"
+	  generated="$generated $gentop"
+	  func_mkdir_p "$gentop"
 	  save_oldobjs=$oldobjs
 	  oldobjs=
 	  counter=1
 	  for obj in $save_oldobjs
 	  do
-	    objbase=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
+	    func_basename "$obj"
+	    objbase="$func_basename_result"
 	    case " $oldobjs " in
 	    " ") oldobjs=$obj ;;
 	    *[\ /]"$objbase "*)
@@ -5526,58 +7943,62 @@ fi\
 		# Make sure we don't pick an alternate name that also
 		# overlaps.
 		newobj=lt$counter-$objbase
-		counter=`expr $counter + 1`
+		func_arith $counter + 1
+		counter=$func_arith_result
 		case " $oldobjs " in
 		*[\ /]"$newobj "*) ;;
 		*) if test ! -f "$gentop/$newobj"; then break; fi ;;
 		esac
 	      done
-	      $show "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
-	      $run ln "$obj" "$gentop/$newobj" ||
-	      $run cp "$obj" "$gentop/$newobj"
+	      func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
 	      oldobjs="$oldobjs $gentop/$newobj"
 	      ;;
 	    *) oldobjs="$oldobjs $obj" ;;
 	    esac
 	  done
 	fi
-
 	eval cmds=\"$old_archive_cmds\"
 
-	if len=`expr "X$cmds" : ".*"` &&
-	     test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+	func_len " $cmds"
+	len=$func_len_result
+	if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
 	  cmds=$old_archive_cmds
 	else
 	  # the command line is too long to link in one step, link in parts
-	  $echo "using piecewise archive linking..."
+	  func_verbose "using piecewise archive linking..."
 	  save_RANLIB=$RANLIB
 	  RANLIB=:
 	  objlist=
 	  concat_cmds=
 	  save_oldobjs=$oldobjs
-
+	  oldobjs=
 	  # Is there a better way of finding the last object in the list?
 	  for obj in $save_oldobjs
 	  do
 	    last_oldobj=$obj
 	  done
+	  eval test_cmds=\"$old_archive_cmds\"
+	  func_len " $test_cmds"
+	  len0=$func_len_result
+	  len=$len0
 	  for obj in $save_oldobjs
 	  do
-	    oldobjs="$objlist $obj"
-	    objlist="$objlist $obj"
-	    eval test_cmds=\"$old_archive_cmds\"
-	    if len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
-	       test "$len" -le "$max_cmd_len"; then
+	    func_len " $obj"
+	    func_arith $len + $func_len_result
+	    len=$func_arith_result
+	    func_append objlist " $obj"
+	    if test "$len" -lt "$max_cmd_len"; then
 	      :
 	    else
 	      # the above command should be used before it gets too long
 	      oldobjs=$objlist
 	      if test "$obj" = "$last_oldobj" ; then
-	        RANLIB=$save_RANLIB
+		RANLIB=$save_RANLIB
 	      fi
 	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
 	      eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
 	      objlist=
+	      len=$len0
 	    fi
 	  done
 	  RANLIB=$save_RANLIB
@@ -5589,49 +8010,39 @@ fi\
 	  fi
 	fi
       fi
-      save_ifs="$IFS"; IFS='~'
-      for cmd in $cmds; do
-        eval cmd=\"$cmd\"
-	IFS="$save_ifs"
-	$show "$cmd"
-	$run eval "$cmd" || exit $?
-      done
-      IFS="$save_ifs"
+      func_execute_cmds "$cmds" 'exit $?'
     done
 
-    if test -n "$generated"; then
-      $show "${rm}r$generated"
-      $run ${rm}r$generated
-    fi
+    test -n "$generated" && \
+      func_show_eval "${RM}r$generated"
 
     # Now create the libtool archive.
     case $output in
     *.la)
       old_library=
       test "$build_old_libs" = yes && old_library="$libname.$libext"
-      $show "creating $output"
+      func_verbose "creating $output"
 
       # Preserve any variables that may affect compiler behavior
       for var in $variables_saved_for_relink; do
 	if eval test -z \"\${$var+set}\"; then
-	  relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command"
+	  relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command"
 	elif eval var_value=\$$var; test -z "$var_value"; then
 	  relink_command="$var=; export $var; $relink_command"
 	else
-	  var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"`
-	  relink_command="$var=\"$var_value\"; export $var; $relink_command"
+	  func_quote_for_eval "$var_value"
+	  relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
 	fi
       done
       # Quote the link command for shipping.
       relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
-      relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
+      relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"`
       if test "$hardcode_automatic" = yes ; then
 	relink_command=
       fi
 
-
       # Only create the output if not a dry run.
-      if test -z "$run"; then
+      $opt_dry_run || {
 	for installed in no yes; do
 	  if test "$installed" = yes; then
 	    if test -z "$install_libdir"; then
@@ -5643,12 +8054,11 @@ fi\
 	    for deplib in $dependency_libs; do
 	      case $deplib in
 	      *.la)
-		name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'`
+		func_basename "$deplib"
+		name="$func_basename_result"
 		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
-		if test -z "$libdir"; then
-		  $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
-		  exit $EXIT_FAILURE
-		fi
+		test -z "$libdir" && \
+		  func_fatal_error "\`$deplib' is not a valid libtool archive"
 		newdependency_libs="$newdependency_libs $libdir/$name"
 		;;
 	      *) newdependency_libs="$newdependency_libs $deplib" ;;
@@ -5656,25 +8066,37 @@ fi\
 	    done
 	    dependency_libs="$newdependency_libs"
 	    newdlfiles=
+
 	    for lib in $dlfiles; do
-	      name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
-	      eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
-	      if test -z "$libdir"; then
-		$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-		exit $EXIT_FAILURE
-	      fi
-	      newdlfiles="$newdlfiles $libdir/$name"
+	      case $lib in
+	      *.la)
+	        func_basename "$lib"
+		name="$func_basename_result"
+		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+		test -z "$libdir" && \
+		  func_fatal_error "\`$lib' is not a valid libtool archive"
+		newdlfiles="$newdlfiles $libdir/$name"
+		;;
+	      *) newdlfiles="$newdlfiles $lib" ;;
+	      esac
 	    done
 	    dlfiles="$newdlfiles"
 	    newdlprefiles=
 	    for lib in $dlprefiles; do
-	      name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
-	      eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
-	      if test -z "$libdir"; then
-		$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-		exit $EXIT_FAILURE
-	      fi
-	      newdlprefiles="$newdlprefiles $libdir/$name"
+	      case $lib in
+	      *.la)
+		# Only pass preopened files to the pseudo-archive (for
+		# eventual linking with the app. that links it) if we
+		# didn't already link the preopened objects directly into
+		# the library:
+		func_basename "$lib"
+		name="$func_basename_result"
+		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+		test -z "$libdir" && \
+		  func_fatal_error "\`$lib' is not a valid libtool archive"
+		newdlprefiles="$newdlprefiles $libdir/$name"
+		;;
+	      esac
 	    done
 	    dlprefiles="$newdlprefiles"
 	  else
@@ -5697,15 +8119,15 @@ fi\
 	    done
 	    dlprefiles="$newdlprefiles"
 	  fi
-	  $rm $output
+	  $RM $output
 	  # place dlname in correct position for cygwin
 	  tdlname=$dlname
 	  case $host,$output,$installed,$module,$dlname in
-	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
+	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
 	  esac
-	  $echo > $output "\
+	  $ECHO > $output "\
 # $outputname - a libtool library file
-# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
+# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
 #
 # Please DO NOT delete this file!
 # It is necessary for linking the library.
@@ -5719,9 +8141,15 @@ library_names='$library_names'
 # The name of the static archive.
 old_library='$old_library'
 
+# Linker flags that can not go in dependency_libs.
+inherited_linker_flags='$new_inherited_linker_flags'
+
 # Libraries that this one depends upon.
 dependency_libs='$dependency_libs'
 
+# Names of additional weak libraries provided by this library
+weak_library_names='$weak_libs'
+
 # Version information for $libname.
 current=$current
 age=$age
@@ -5740,747 +8168,29 @@ dlpreopen='$dlprefiles'
 # Directory that this library needs to be installed in:
 libdir='$install_libdir'"
 	  if test "$installed" = no && test "$need_relink" = yes; then
-	    $echo >> $output "\
+	    $ECHO >> $output "\
 relink_command=\"$relink_command\""
 	  fi
 	done
-      fi
+      }
 
       # Do a symbolic link so that the libtool archive can be found in
       # LD_LIBRARY_PATH before the program is installed.
-      $show "(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)"
-      $run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $?
-      ;;
-    esac
-    exit $EXIT_SUCCESS
-    ;;
-
-  # libtool install mode
-  install)
-    modename="$modename: install"
-
-    # There may be an optional sh(1) argument at the beginning of
-    # install_prog (especially on Windows NT).
-    if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
-       # Allow the use of GNU shtool's install command.
-       $echo "X$nonopt" | grep shtool > /dev/null; then
-      # Aesthetically quote it.
-      arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"`
-      case $arg in
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	arg="\"$arg\""
-	;;
-      esac
-      install_prog="$arg "
-      arg="$1"
-      shift
-    else
-      install_prog=
-      arg=$nonopt
-    fi
-
-    # The real first argument should be the name of the installation program.
-    # Aesthetically quote it.
-    arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-    case $arg in
-    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-      arg="\"$arg\""
-      ;;
-    esac
-    install_prog="$install_prog$arg"
-
-    # We need to accept at least all the BSD install flags.
-    dest=
-    files=
-    opts=
-    prev=
-    install_type=
-    isdir=no
-    stripme=
-    for arg
-    do
-      if test -n "$dest"; then
-	files="$files $dest"
-	dest=$arg
-	continue
-      fi
-
-      case $arg in
-      -d) isdir=yes ;;
-      -f) 
-      	case " $install_prog " in
-	*[\\\ /]cp\ *) ;;
-	*) prev=$arg ;;
-	esac
-	;;
-      -g | -m | -o) prev=$arg ;;
-      -s)
-	stripme=" -s"
-	continue
-	;;
-      -*)
-	;;
-      *)
-	# If the previous option needed an argument, then skip it.
-	if test -n "$prev"; then
-	  prev=
-	else
-	  dest=$arg
-	  continue
-	fi
-	;;
-      esac
-
-      # Aesthetically quote the argument.
-      arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-      case $arg in
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	arg="\"$arg\""
-	;;
-      esac
-      install_prog="$install_prog $arg"
-    done
-
-    if test -z "$install_prog"; then
-      $echo "$modename: you must specify an install program" 1>&2
-      $echo "$help" 1>&2
-      exit $EXIT_FAILURE
-    fi
-
-    if test -n "$prev"; then
-      $echo "$modename: the \`$prev' option requires an argument" 1>&2
-      $echo "$help" 1>&2
-      exit $EXIT_FAILURE
-    fi
-
-    if test -z "$files"; then
-      if test -z "$dest"; then
-	$echo "$modename: no file or destination specified" 1>&2
-      else
-	$echo "$modename: you must specify a destination" 1>&2
-      fi
-      $echo "$help" 1>&2
-      exit $EXIT_FAILURE
-    fi
-
-    # Strip any trailing slash from the destination.
-    dest=`$echo "X$dest" | $Xsed -e 's%/$%%'`
-
-    # Check to see that the destination is a directory.
-    test -d "$dest" && isdir=yes
-    if test "$isdir" = yes; then
-      destdir="$dest"
-      destname=
-    else
-      destdir=`$echo "X$dest" | $Xsed -e 's%/[^/]*$%%'`
-      test "X$destdir" = "X$dest" && destdir=.
-      destname=`$echo "X$dest" | $Xsed -e 's%^.*/%%'`
-
-      # Not a directory, so check to see that there is only one file specified.
-      set dummy $files
-      if test "$#" -gt 2; then
-	$echo "$modename: \`$dest' is not a directory" 1>&2
-	$echo "$help" 1>&2
-	exit $EXIT_FAILURE
-      fi
-    fi
-    case $destdir in
-    [\\/]* | [A-Za-z]:[\\/]*) ;;
-    *)
-      for file in $files; do
-	case $file in
-	*.lo) ;;
-	*)
-	  $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2
-	  $echo "$help" 1>&2
-	  exit $EXIT_FAILURE
-	  ;;
-	esac
-      done
+      func_show_eval '( cd "$output_objdir" && $RM "$outputname" && $LN_S "../$outputname" "$outputname" )' 'exit $?'
       ;;
     esac
-
-    # This variable tells wrapper scripts just to set variables rather
-    # than running their programs.
-    libtool_install_magic="$magic"
-
-    staticlibs=
-    future_libdirs=
-    current_libdirs=
-    for file in $files; do
-
-      # Do each installation.
-      case $file in
-      *.$libext)
-	# Do the static libraries later.
-	staticlibs="$staticlibs $file"
-	;;
-
-      *.la)
-	# Check to see that this really is a libtool archive.
-	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
-	else
-	  $echo "$modename: \`$file' is not a valid libtool archive" 1>&2
-	  $echo "$help" 1>&2
-	  exit $EXIT_FAILURE
-	fi
-
-	library_names=
-	old_library=
-	relink_command=
-	# If there is no directory component, then add one.
-	case $file in
-	*/* | *\\*) . $file ;;
-	*) . ./$file ;;
-	esac
-
-	# Add the libdir to current_libdirs if it is the destination.
-	if test "X$destdir" = "X$libdir"; then
-	  case "$current_libdirs " in
-	  *" $libdir "*) ;;
-	  *) current_libdirs="$current_libdirs $libdir" ;;
-	  esac
-	else
-	  # Note the libdir as a future libdir.
-	  case "$future_libdirs " in
-	  *" $libdir "*) ;;
-	  *) future_libdirs="$future_libdirs $libdir" ;;
-	  esac
-	fi
-
-	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`/
-	test "X$dir" = "X$file/" && dir=
-	dir="$dir$objdir"
-
-	if test -n "$relink_command"; then
-	  # Determine the prefix the user has applied to our future dir.
-	  inst_prefix_dir=`$echo "$destdir" | $SED "s%$libdir\$%%"`
-
-	  # Don't allow the user to place us outside of our expected
-	  # location b/c this prevents finding dependent libraries that
-	  # are installed to the same prefix.
-	  # At present, this check doesn't affect windows .dll's that
-	  # are installed into $libdir/../bin (currently, that works fine)
-	  # but it's something to keep an eye on.
-	  if test "$inst_prefix_dir" = "$destdir"; then
-	    $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
-	    exit $EXIT_FAILURE
-	  fi
-
-	  if test -n "$inst_prefix_dir"; then
-	    # Stick the inst_prefix_dir data into the link command.
-	    relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%" | $NL2SP`
-	  else
-	    relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%%" | $NL2SP`
-	  fi
-
-	  $echo "$modename: warning: relinking \`$file'" 1>&2
-	  $show "$relink_command"
-	  if $run eval "$relink_command"; then :
-	  else
-	    $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
-	    exit $EXIT_FAILURE
-	  fi
-	fi
-
-	# See the names of the shared library.
-	set dummy $library_names
-	if test -n "$2"; then
-	  realname="$2"
-	  shift
-	  shift
-
-	  srcname="$realname"
-	  test -n "$relink_command" && srcname="$realname"T
-
-	  # Install the shared library and build the symlinks.
-	  $show "$install_prog $dir/$srcname $destdir/$realname"
-	  $run eval "$install_prog $dir/$srcname $destdir/$realname" || exit $?
-	  if test -n "$stripme" && test -n "$striplib"; then
-	    $show "$striplib $destdir/$realname"
-	    $run eval "$striplib $destdir/$realname" || exit $?
-	  fi
-
-	  if test "$#" -gt 0; then
-	    # Delete the old symlinks, and create new ones.
-	    # Try `ln -sf' first, because the `ln' binary might depend on
-	    # the symlink we replace!  Solaris /bin/ln does not understand -f,
-	    # so we also need to try rm && ln -s.
-	    for linkname
-	    do
-	      if test "$linkname" != "$realname"; then
-                $show "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })"
-                $run eval "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })"
-	      fi
-	    done
-	  fi
-
-	  # Do each command in the postinstall commands.
-	  lib="$destdir/$realname"
-	  cmds=$postinstall_cmds
-	  save_ifs="$IFS"; IFS='~'
-	  for cmd in $cmds; do
-	    IFS="$save_ifs"
-	    eval cmd=\"$cmd\"
-	    $show "$cmd"
-	    $run eval "$cmd" || {
-	      lt_exit=$?
-
-	      # Restore the uninstalled library and exit
-	      if test "$mode" = relink; then
-		$run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)'
-	      fi
-
-	      exit $lt_exit
-	    }
-	  done
-	  IFS="$save_ifs"
-	fi
-
-	# Install the pseudo-library for information purposes.
-	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-	instname="$dir/$name"i
-	$show "$install_prog $instname $destdir/$name"
-	$run eval "$install_prog $instname $destdir/$name" || exit $?
-
-	# Maybe install the static library, too.
-	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
-	;;
-
-      *.lo)
-	# Install (i.e. copy) a libtool object.
-
-	# Figure out destination file name, if it wasn't already specified.
-	if test -n "$destname"; then
-	  destfile="$destdir/$destname"
-	else
-	  destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-	  destfile="$destdir/$destfile"
-	fi
-
-	# Deduce the name of the destination old-style object file.
-	case $destfile in
-	*.lo)
-	  staticdest=`$echo "X$destfile" | $Xsed -e "$lo2o"`
-	  ;;
-	*.$objext)
-	  staticdest="$destfile"
-	  destfile=
-	  ;;
-	*)
-	  $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2
-	  $echo "$help" 1>&2
-	  exit $EXIT_FAILURE
-	  ;;
-	esac
-
-	# Install the libtool object if requested.
-	if test -n "$destfile"; then
-	  $show "$install_prog $file $destfile"
-	  $run eval "$install_prog $file $destfile" || exit $?
-	fi
-
-	# Install the old object if enabled.
-	if test "$build_old_libs" = yes; then
-	  # Deduce the name of the old-style object file.
-	  staticobj=`$echo "X$file" | $Xsed -e "$lo2o"`
-
-	  $show "$install_prog $staticobj $staticdest"
-	  $run eval "$install_prog \$staticobj \$staticdest" || exit $?
-	fi
-	exit $EXIT_SUCCESS
-	;;
-
-      *)
-	# Figure out destination file name, if it wasn't already specified.
-	if test -n "$destname"; then
-	  destfile="$destdir/$destname"
-	else
-	  destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-	  destfile="$destdir/$destfile"
-	fi
-
-	# If the file is missing, and there is a .exe on the end, strip it
-	# because it is most likely a libtool script we actually want to
-	# install
-	stripped_ext=""
-	case $file in
-	  *.exe)
-	    if test ! -f "$file"; then
-	      file=`$echo $file|${SED} 's,.exe$,,'`
-	      stripped_ext=".exe"
-	    fi
-	    ;;
-	esac
-
-	# Do a test to see if this is really a libtool program.
-	case $host in
-	*cygwin*|*mingw*)
-	    wrapper=`$echo $file | ${SED} -e 's,.exe$,,'`
-	    ;;
-	*)
-	    wrapper=$file
-	    ;;
-	esac
-	if (${SED} -e '4q' $wrapper | grep "^# Generated by .*$PACKAGE")>/dev/null 2>&1; then
-	  notinst_deplibs=
-	  relink_command=
-
-	  # Note that it is not necessary on cygwin/mingw to append a dot to
-	  # foo even if both foo and FILE.exe exist: automatic-append-.exe
-	  # behavior happens only for exec(3), not for open(2)!  Also, sourcing
-	  # `FILE.' does not work on cygwin managed mounts.
-	  #
-	  # If there is no directory component, then add one.
-	  case $wrapper in
-	  */* | *\\*) . ${wrapper} ;;
-	  *) . ./${wrapper} ;;
-	  esac
-
-	  # Check the variables that should have been set.
-	  if test -z "$notinst_deplibs"; then
-	    $echo "$modename: invalid libtool wrapper script \`$wrapper'" 1>&2
-	    exit $EXIT_FAILURE
-	  fi
-
-	  finalize=yes
-	  for lib in $notinst_deplibs; do
-	    # Check to see that each library is installed.
-	    libdir=
-	    if test -f "$lib"; then
-	      # If there is no directory component, then add one.
-	      case $lib in
-	      */* | *\\*) . $lib ;;
-	      *) . ./$lib ;;
-	      esac
-	    fi
-	    libfile="$libdir/"`$echo "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test
-	    if test -n "$libdir" && test ! -f "$libfile"; then
-	      $echo "$modename: warning: \`$lib' has not been installed in \`$libdir'" 1>&2
-	      finalize=no
-	    fi
-	  done
-
-	  relink_command=
-	  # Note that it is not necessary on cygwin/mingw to append a dot to
-	  # foo even if both foo and FILE.exe exist: automatic-append-.exe
-	  # behavior happens only for exec(3), not for open(2)!  Also, sourcing
-	  # `FILE.' does not work on cygwin managed mounts.
-	  #
-	  # If there is no directory component, then add one.
-	  case $wrapper in
-	  */* | *\\*) . ${wrapper} ;;
-	  *) . ./${wrapper} ;;
-	  esac
-
-	  outputname=
-	  if test "$fast_install" = no && test -n "$relink_command"; then
-	    if test "$finalize" = yes && test -z "$run"; then
-	      tmpdir=`func_mktempdir`
-	      file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
-	      outputname="$tmpdir/$file"
-	      # Replace the output file specification.
-	      relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g' | $NL2SP`
-
-	      $show "$relink_command"
-	      if $run eval "$relink_command"; then :
-	      else
-		$echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
-		${rm}r "$tmpdir"
-		continue
-	      fi
-	      file="$outputname"
-	    else
-	      $echo "$modename: warning: cannot relink \`$file'" 1>&2
-	    fi
-	  else
-	    # Install the binary that we compiled earlier.
-	    file=`$echo "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"`
-	  fi
-	fi
-
-	# remove .exe since cygwin /usr/bin/install will append another
-	# one anyway 
-	case $install_prog,$host in
-	*/usr/bin/install*,*cygwin*)
-	  case $file:$destfile in
-	  *.exe:*.exe)
-	    # this is ok
-	    ;;
-	  *.exe:*)
-	    destfile=$destfile.exe
-	    ;;
-	  *:*.exe)
-	    destfile=`$echo $destfile | ${SED} -e 's,.exe$,,'`
-	    ;;
-	  esac
-	  ;;
-	esac
-	$show "$install_prog$stripme $file $destfile"
-	$run eval "$install_prog\$stripme \$file \$destfile" || exit $?
-	test -n "$outputname" && ${rm}r "$tmpdir"
-	;;
-      esac
-    done
-
-    for file in $staticlibs; do
-      name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-
-      # Set up the ranlib parameters.
-      oldlib="$destdir/$name"
-
-      $show "$install_prog $file $oldlib"
-      $run eval "$install_prog \$file \$oldlib" || exit $?
-
-      if test -n "$stripme" && test -n "$old_striplib"; then
-	$show "$old_striplib $oldlib"
-	$run eval "$old_striplib $oldlib" || exit $?
-      fi
-
-      # Do each command in the postinstall commands.
-      cmds=$old_postinstall_cmds
-      save_ifs="$IFS"; IFS='~'
-      for cmd in $cmds; do
-	IFS="$save_ifs"
-	eval cmd=\"$cmd\"
-	$show "$cmd"
-	$run eval "$cmd" || exit $?
-      done
-      IFS="$save_ifs"
-    done
-
-    if test -n "$future_libdirs"; then
-      $echo "$modename: warning: remember to run \`$progname --finish$future_libdirs'" 1>&2
-    fi
-
-    if test -n "$current_libdirs"; then
-      # Maybe just do a dry run.
-      test -n "$run" && current_libdirs=" -n$current_libdirs"
-      exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
-    else
-      exit $EXIT_SUCCESS
-    fi
-    ;;
-
-  # libtool finish mode
-  finish)
-    modename="$modename: finish"
-    libdirs="$nonopt"
-    admincmds=
-
-    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
-      for dir
-      do
-	libdirs="$libdirs $dir"
-      done
-
-      for libdir in $libdirs; do
-	if test -n "$finish_cmds"; then
-	  # Do each command in the finish commands.
-	  cmds=$finish_cmds
-	  save_ifs="$IFS"; IFS='~'
-	  for cmd in $cmds; do
-	    IFS="$save_ifs"
-	    eval cmd=\"$cmd\"
-	    $show "$cmd"
-	    $run eval "$cmd" || admincmds="$admincmds
-       $cmd"
-	  done
-	  IFS="$save_ifs"
-	fi
-	if test -n "$finish_eval"; then
-	  # Do the single finish_eval.
-	  eval cmds=\"$finish_eval\"
-	  $run eval "$cmds" || admincmds="$admincmds
-       $cmds"
-	fi
-      done
-    fi
-
-    # Exit here if they wanted silent mode.
-    test "$show" = : && exit $EXIT_SUCCESS
-
-    $echo "X----------------------------------------------------------------------" | $Xsed
-    $echo "Libraries have been installed in:"
-    for libdir in $libdirs; do
-      $echo "   $libdir"
-    done
-    $echo
-    $echo "If you ever happen to want to link against installed libraries"
-    $echo "in a given directory, LIBDIR, you must either use libtool, and"
-    $echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
-    $echo "flag during linking and do at least one of the following:"
-    if test -n "$shlibpath_var"; then
-      $echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
-      $echo "     during execution"
-    fi
-    if test -n "$runpath_var"; then
-      $echo "   - add LIBDIR to the \`$runpath_var' environment variable"
-      $echo "     during linking"
-    fi
-    if test -n "$hardcode_libdir_flag_spec"; then
-      libdir=LIBDIR
-      eval flag=\"$hardcode_libdir_flag_spec\"
-
-      $echo "   - use the \`$flag' linker flag"
-    fi
-    if test -n "$admincmds"; then
-      $echo "   - have your system administrator run these commands:$admincmds"
-    fi
-    if test -f /etc/ld.so.conf; then
-      $echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
-    fi
-    $echo
-    $echo "See any operating system documentation about shared libraries for"
-    $echo "more information, such as the ld(1) and ld.so(8) manual pages."
-    $echo "X----------------------------------------------------------------------" | $Xsed
     exit $EXIT_SUCCESS
-    ;;
-
-  # libtool execute mode
-  execute)
-    modename="$modename: execute"
-
-    # The first argument is the command name.
-    cmd="$nonopt"
-    if test -z "$cmd"; then
-      $echo "$modename: you must specify a COMMAND" 1>&2
-      $echo "$help"
-      exit $EXIT_FAILURE
-    fi
-
-    # Handle -dlopen flags immediately.
-    for file in $execute_dlfiles; do
-      if test ! -f "$file"; then
-	$echo "$modename: \`$file' is not a file" 1>&2
-	$echo "$help" 1>&2
-	exit $EXIT_FAILURE
-      fi
-
-      dir=
-      case $file in
-      *.la)
-	# Check to see that this really is a libtool archive.
-	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
-	else
-	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-	  $echo "$help" 1>&2
-	  exit $EXIT_FAILURE
-	fi
-
-	# Read the libtool library.
-	dlname=
-	library_names=
-
-	# If there is no directory component, then add one.
-	case $file in
-	*/* | *\\*) . $file ;;
-	*) . ./$file ;;
-	esac
-
-	# Skip this library if it cannot be dlopened.
-	if test -z "$dlname"; then
-	  # Warn if it was a shared library.
-	  test -n "$library_names" && $echo "$modename: warning: \`$file' was not linked with \`-export-dynamic'"
-	  continue
-	fi
-
-	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
-	test "X$dir" = "X$file" && dir=.
-
-	if test -f "$dir/$objdir/$dlname"; then
-	  dir="$dir/$objdir"
-	else
-	  $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
-	  exit $EXIT_FAILURE
-	fi
-	;;
-
-      *.lo)
-	# Just add the directory containing the .lo file.
-	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
-	test "X$dir" = "X$file" && dir=.
-	;;
-
-      *)
-	$echo "$modename: warning \`-dlopen' is ignored for non-libtool libraries and objects" 1>&2
-	continue
-	;;
-      esac
-
-      # Get the absolute pathname.
-      absdir=`cd "$dir" && pwd`
-      test -n "$absdir" && dir="$absdir"
-
-      # Now add the directory to shlibpath_var.
-      if eval "test -z \"\$$shlibpath_var\""; then
-	eval "$shlibpath_var=\"\$dir\""
-      else
-	eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\""
-      fi
-    done
-
-    # This variable tells wrapper scripts just to set shlibpath_var
-    # rather than running their programs.
-    libtool_execute_magic="$magic"
-
-    # Check if any of the arguments is a wrapper script.
-    args=
-    for file
-    do
-      case $file in
-      -*) ;;
-      *)
-	# Do a test to see if this is really a libtool program.
-	if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-	  # If there is no directory component, then add one.
-	  case $file in
-	  */* | *\\*) . $file ;;
-	  *) . ./$file ;;
-	  esac
-
-	  # Transform arg to wrapped name.
-	  file="$progdir/$program"
-	fi
-	;;
-      esac
-      # Quote arguments (to preserve shell metacharacters).
-      file=`$echo "X$file" | $Xsed -e "$sed_quote_subst"`
-      args="$args \"$file\""
-    done
-
-    if test -z "$run"; then
-      if test -n "$shlibpath_var"; then
-	# Export the shlibpath_var.
-	eval "export $shlibpath_var"
-      fi
+}
 
-      # Restore saved environment variables
-      for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
-      do
-       eval "if test \"\${save_$lt_var+set}\" = set; then
-               $lt_var=\$save_$lt_var; export $lt_var
-             fi"
-      done
+{ test "$mode" = link || test "$mode" = relink; } &&
+    func_mode_link ${1+"$@"}
 
 
-      # Now prepare to actually exec the command.
-      exec_cmd="\$cmd$args"
-    else
-      # Display what would be done.
-      if test -n "$shlibpath_var"; then
-	eval "\$echo \"\$shlibpath_var=\$$shlibpath_var\""
-	$echo "export $shlibpath_var"
-      fi
-      $echo "$cmd$args"
-      exit $EXIT_SUCCESS
-    fi
-    ;;
-
-  # libtool clean and uninstall mode
-  clean | uninstall)
-    modename="$modename: $mode"
-    rm="$nonopt"
+# func_mode_uninstall arg...
+func_mode_uninstall ()
+{
+    $opt_debug
+    RM="$nonopt"
     files=
     rmforce=
     exit_status=0
@@ -6492,30 +8202,28 @@ relink_command=\"$relink_command\""
     for arg
     do
       case $arg in
-      -f) rm="$rm $arg"; rmforce=yes ;;
-      -*) rm="$rm $arg" ;;
+      -f) RM="$RM $arg"; rmforce=yes ;;
+      -*) RM="$RM $arg" ;;
       *) files="$files $arg" ;;
       esac
     done
 
-    if test -z "$rm"; then
-      $echo "$modename: you must specify an RM program" 1>&2
-      $echo "$help" 1>&2
-      exit $EXIT_FAILURE
-    fi
+    test -z "$RM" && \
+      func_fatal_help "you must specify an RM program"
 
     rmdirs=
 
     origobjdir="$objdir"
     for file in $files; do
-      dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
-      if test "X$dir" = "X$file"; then
-	dir=.
+      func_dirname "$file" "" "."
+      dir="$func_dirname_result"
+      if test "X$dir" = X.; then
 	objdir="$origobjdir"
       else
 	objdir="$dir/$origobjdir"
       fi
-      name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+      func_basename "$file"
+      name="$func_basename_result"
       test "$mode" = uninstall && objdir="$dir"
 
       # Remember objdir for removal later, being careful to avoid duplicates
@@ -6527,9 +8235,9 @@ relink_command=\"$relink_command\""
       fi
 
       # Don't error if the file doesn't exist and rm -f was used.
-      if (test -L "$file") >/dev/null 2>&1 \
-	|| (test -h "$file") >/dev/null 2>&1 \
-	|| test -f "$file"; then
+      if { test -L "$file"; } >/dev/null 2>&1 ||
+	 { test -h "$file"; } >/dev/null 2>&1 ||
+	 test -f "$file"; then
 	:
       elif test -d "$file"; then
 	exit_status=1
@@ -6543,8 +8251,8 @@ relink_command=\"$relink_command\""
       case $name in
       *.la)
 	# Possibly a libtool archive, so verify it.
-	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-	  . $dir/$name
+	if func_lalib_p "$file"; then
+	  func_source $dir/$name
 
 	  # Delete the libtool libraries and symlinks.
 	  for n in $library_names; do
@@ -6559,39 +8267,17 @@ relink_command=\"$relink_command\""
 	    *" $dlname "*) ;;
 	    *) rmfiles="$rmfiles $objdir/$dlname" ;;
 	    esac
-	     test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
+	    test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
 	    ;;
 	  uninstall)
 	    if test -n "$library_names"; then
 	      # Do each command in the postuninstall commands.
-	      cmds=$postuninstall_cmds
-	      save_ifs="$IFS"; IFS='~'
-	      for cmd in $cmds; do
-		IFS="$save_ifs"
-		eval cmd=\"$cmd\"
-		$show "$cmd"
-		$run eval "$cmd"
-		if test "$?" -ne 0 && test "$rmforce" != yes; then
-		  exit_status=1
-		fi
-	      done
-	      IFS="$save_ifs"
+	      func_execute_cmds "$postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1'
 	    fi
 
 	    if test -n "$old_library"; then
 	      # Do each command in the old_postuninstall commands.
-	      cmds=$old_postuninstall_cmds
-	      save_ifs="$IFS"; IFS='~'
-	      for cmd in $cmds; do
-		IFS="$save_ifs"
-		eval cmd=\"$cmd\"
-		$show "$cmd"
-		$run eval "$cmd"
-		if test "$?" -ne 0 && test "$rmforce" != yes; then
-		  exit_status=1
-		fi
-	      done
-	      IFS="$save_ifs"
+	      func_execute_cmds "$old_postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1'
 	    fi
 	    # FIXME: should reinstall the best remaining shared library.
 	    ;;
@@ -6601,20 +8287,20 @@ relink_command=\"$relink_command\""
 
       *.lo)
 	# Possibly a libtool object, so verify it.
-	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+	if func_lalib_p "$file"; then
 
 	  # Read the .lo file
-	  . $dir/$name
+	  func_source $dir/$name
 
 	  # Add PIC object to the list of files to remove.
-	  if test -n "$pic_object" \
-	     && test "$pic_object" != none; then
+	  if test -n "$pic_object" &&
+	     test "$pic_object" != none; then
 	    rmfiles="$rmfiles $dir/$pic_object"
 	  fi
 
 	  # Add non-PIC object to the list of files to remove.
-	  if test -n "$non_pic_object" \
-	     && test "$non_pic_object" != none; then
+	  if test -n "$non_pic_object" &&
+	     test "$non_pic_object" != none; then
 	    rmfiles="$rmfiles $dir/$non_pic_object"
 	  fi
 	fi
@@ -6625,17 +8311,26 @@ relink_command=\"$relink_command\""
 	  noexename=$name
 	  case $file in
 	  *.exe)
-	    file=`$echo $file|${SED} 's,.exe$,,'`
-	    noexename=`$echo $name|${SED} 's,.exe$,,'`
+	    func_stripname '' '.exe' "$file"
+	    file=$func_stripname_result
+	    func_stripname '' '.exe' "$name"
+	    noexename=$func_stripname_result
 	    # $file with .exe has already been added to rmfiles,
 	    # add $file without .exe
 	    rmfiles="$rmfiles $file"
 	    ;;
 	  esac
 	  # Do a test to see if this is a libtool program.
-	  if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-	    relink_command=
-	    . $dir/$noexename
+	  if func_ltwrapper_p "$file"; then
+	    if func_ltwrapper_executable_p "$file"; then
+	      func_ltwrapper_scriptname "$file"
+	      relink_command=
+	      func_source $func_ltwrapper_scriptname_result
+	      rmfiles="$rmfiles $func_ltwrapper_scriptname_result"
+	    else
+	      relink_command=
+	      func_source $dir/$noexename
+	    fi
 
 	    # note $name still contains .exe if it was in $file originally
 	    # as does the version of $file that was added into $rmfiles
@@ -6650,239 +8345,38 @@ relink_command=\"$relink_command\""
 	fi
 	;;
       esac
-      $show "$rm $rmfiles"
-      $run $rm $rmfiles || exit_status=1
+      func_show_eval "$RM $rmfiles" 'exit_status=1'
     done
     objdir="$origobjdir"
 
     # Try to remove the ${objdir}s in the directories where we deleted files
     for dir in $rmdirs; do
       if test -d "$dir"; then
-	$show "rmdir $dir"
-	$run rmdir $dir >/dev/null 2>&1
+	func_show_eval "rmdir $dir >/dev/null 2>&1"
       fi
     done
 
     exit $exit_status
-    ;;
+}
 
-  "")
-    $echo "$modename: you must specify a MODE" 1>&2
-    $echo "$generic_help" 1>&2
-    exit $EXIT_FAILURE
-    ;;
-  esac
+{ test "$mode" = uninstall || test "$mode" = clean; } &&
+    func_mode_uninstall ${1+"$@"}
 
-  if test -z "$exec_cmd"; then
-    $echo "$modename: invalid operation mode \`$mode'" 1>&2
-    $echo "$generic_help" 1>&2
-    exit $EXIT_FAILURE
-  fi
-fi # test -z "$show_help"
+test -z "$mode" && {
+  help="$generic_help"
+  func_fatal_help "you must specify a MODE"
+}
+
+test -z "$exec_cmd" && \
+  func_fatal_help "invalid operation mode \`$mode'"
 
 if test -n "$exec_cmd"; then
-  eval exec $exec_cmd
+  eval exec "$exec_cmd"
   exit $EXIT_FAILURE
 fi
 
-# We need to display help for each of the modes.
-case $mode in
-"") $echo \
-"Usage: $modename [OPTION]... [MODE-ARG]...
-
-Provide generalized library-building support services.
-
-    --config          show all configuration variables
-    --debug           enable verbose shell tracing
--n, --dry-run         display commands without modifying any files
-    --features        display basic configuration information and exit
-    --finish          same as \`--mode=finish'
-    --help            display this help message and exit
-    --mode=MODE       use operation mode MODE [default=inferred from MODE-ARGS]
-    --quiet           same as \`--silent'
-    --silent          don't print informational messages
-    --tag=TAG         use configuration variables from tag TAG
-    --version         print version information
-
-MODE must be one of the following:
-
-      clean           remove files from the build directory
-      compile         compile a source file into a libtool object
-      execute         automatically set library path, then run a program
-      finish          complete the installation of libtool libraries
-      install         install libraries or executables
-      link            create a library or an executable
-      uninstall       remove libraries from an installed directory
-
-MODE-ARGS vary depending on the MODE.  Try \`$modename --help --mode=MODE' for
-a more detailed description of MODE.
-
-Report bugs to <bug-libtool@gnu.org>."
-  exit $EXIT_SUCCESS
-  ;;
-
-clean)
-  $echo \
-"Usage: $modename [OPTION]... --mode=clean RM [RM-OPTION]... FILE...
-
-Remove files from the build directory.
-
-RM is the name of the program to use to delete files associated with each FILE
-(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
-to RM.
-
-If FILE is a libtool library, object or program, all the files associated
-with it are deleted. Otherwise, only FILE itself is deleted using RM."
-  ;;
-
-compile)
-  $echo \
-"Usage: $modename [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE
-
-Compile a source file into a libtool library object.
-
-This mode accepts the following additional options:
-
-  -o OUTPUT-FILE    set the output file name to OUTPUT-FILE
-  -prefer-pic       try to building PIC objects only
-  -prefer-non-pic   try to building non-PIC objects only
-  -static           always build a \`.o' file suitable for static linking
-
-COMPILE-COMMAND is a command to be used in creating a \`standard' object file
-from the given SOURCEFILE.
-
-The output file name is determined by removing the directory component from
-SOURCEFILE, then substituting the C source code suffix \`.c' with the
-library object suffix, \`.lo'."
-  ;;
-
-execute)
-  $echo \
-"Usage: $modename [OPTION]... --mode=execute COMMAND [ARGS]...
-
-Automatically set library path, then run a program.
-
-This mode accepts the following additional options:
-
-  -dlopen FILE      add the directory containing FILE to the library path
-
-This mode sets the library path environment variable according to \`-dlopen'
-flags.
-
-If any of the ARGS are libtool executable wrappers, then they are translated
-into their corresponding uninstalled binary, and any of their required library
-directories are added to the library path.
-
-Then, COMMAND is executed, with ARGS as arguments."
-  ;;
-
-finish)
-  $echo \
-"Usage: $modename [OPTION]... --mode=finish [LIBDIR]...
-
-Complete the installation of libtool libraries.
-
-Each LIBDIR is a directory that contains libtool libraries.
-
-The commands that this mode executes may require superuser privileges.  Use
-the \`--dry-run' option if you just want to see what would be executed."
-  ;;
-
-install)
-  $echo \
-"Usage: $modename [OPTION]... --mode=install INSTALL-COMMAND...
-
-Install executables or libraries.
-
-INSTALL-COMMAND is the installation command.  The first component should be
-either the \`install' or \`cp' program.
-
-The rest of the components are interpreted as arguments to that command (only
-BSD-compatible install options are recognized)."
-  ;;
-
-link)
-  $echo \
-"Usage: $modename [OPTION]... --mode=link LINK-COMMAND...
-
-Link object files or libraries together to form another library, or to
-create an executable program.
-
-LINK-COMMAND is a command using the C compiler that you would use to create
-a program from several object files.
-
-The following components of LINK-COMMAND are treated specially:
-
-  -all-static       do not do any dynamic linking at all
-  -avoid-version    do not add a version suffix if possible
-  -dlopen FILE      \`-dlpreopen' FILE if it cannot be dlopened at runtime
-  -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
-  -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
-  -export-symbols SYMFILE
-                    try to export only the symbols listed in SYMFILE
-  -export-symbols-regex REGEX
-                    try to export only the symbols matching REGEX
-  -LLIBDIR          search LIBDIR for required installed libraries
-  -lNAME            OUTPUT-FILE requires the installed library libNAME
-  -module           build a library that can dlopened
-  -no-fast-install  disable the fast-install mode
-  -no-install       link a not-installable executable
-  -no-undefined     declare that a library does not refer to external symbols
-  -o OUTPUT-FILE    create OUTPUT-FILE from the specified objects
-  -objectlist FILE  Use a list of object files found in FILE to specify objects
-  -precious-files-regex REGEX
-                    don't remove output files matching REGEX
-  -release RELEASE  specify package release information
-  -rpath LIBDIR     the created library will eventually be installed in LIBDIR
-  -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
-  -static           do not do any dynamic linking of uninstalled libtool libraries
-  -static-libtool-libs
-                    do not do any dynamic linking of libtool libraries
-  -version-info CURRENT[:REVISION[:AGE]]
-                    specify library version info [each variable defaults to 0]
-
-All other options (arguments beginning with \`-') are ignored.
+exit $exit_status
 
-Every other argument is treated as a filename.  Files ending in \`.la' are
-treated as uninstalled libtool libraries, other files are standard or library
-object files.
-
-If the OUTPUT-FILE ends in \`.la', then a libtool library is created,
-only library objects (\`.lo' files) may be specified, and \`-rpath' is
-required, except when creating a convenience library.
-
-If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created
-using \`ar' and \`ranlib', or on Windows using \`lib'.
-
-If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file
-is created, otherwise an executable program is created."
-  ;;
-
-uninstall)
-  $echo \
-"Usage: $modename [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE...
-
-Remove libraries from an installation directory.
-
-RM is the name of the program to use to delete files associated with each FILE
-(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
-to RM.
-
-If FILE is a libtool library, all the files associated with it are deleted.
-Otherwise, only FILE itself is deleted using RM."
-  ;;
-
-*)
-  $echo "$modename: invalid operation mode \`$mode'" 1>&2
-  $echo "$help" 1>&2
-  exit $EXIT_FAILURE
-  ;;
-esac
-
-$echo
-$echo "Try \`$modename --help' for more information about other modes."
-
-exit $?
 
 # The TAGs below are defined such that we never get into a situation
 # in which we disable both kinds of libraries.  Given conflicting
@@ -6896,14 +8390,17 @@ exit $?
 # configuration.  But we'll never go from static-only to shared-only.
 
 # ### BEGIN LIBTOOL TAG CONFIG: disable-shared
-disable_libs=shared
+build_libtool_libs=no
+build_old_libs=yes
 # ### END LIBTOOL TAG CONFIG: disable-shared
 
 # ### BEGIN LIBTOOL TAG CONFIG: disable-static
-disable_libs=static
+build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`
 # ### END LIBTOOL TAG CONFIG: disable-static
 
 # Local Variables:
 # mode:shell-script
 # sh-indentation:2
 # End:
+# vi:sw=2
+
diff --git a/m4/gecko.m4 b/m4/gecko.m4
index 6e6136e..1491843 100644
--- a/m4/gecko.m4
+++ b/m4/gecko.m4
@@ -67,6 +67,9 @@ if test -z "$gecko_cv_gecko"; then
 		if $PKG_CONFIG --exists $lizard-xpcom; then
 			gecko_cv_gecko=$lizard
 			break;
+		elif $PKG_CONFIG --exists $lizard; then
+			gecko_cv_gecko=$lizard
+			break;
 		elif $PKG_CONFIG --exists $lizard-unstable; then
 			gecko_cv_gecko=$lizard
 			break;
@@ -94,6 +97,8 @@ AC_ARG_WITH([gecko-home],
 
 gecko_cv_gecko_home=$with_gecko_home
 
+AC_MSG_RESULT([$with_gecko_home])
+
 # ****************
 # Define variables
 # ****************
@@ -346,6 +351,16 @@ if test "$gecko_cv_gecko_version_int" -ge "1009000"; then
 	gecko_cv_have_gecko_1_9=yes
 fi
 
+if test "${gecko_cv_gecko}" = "libxul-embedding" -o "${gecko_cv_gecko}" = "libxul"; then
+	PKG_CHECK_EXISTS([${gecko_cv_gecko} >= 1.9.1],[gecko_cv_have_gecko_1_9_1=yes gecko_cv_gecko_version="1.9.1" gecko_cv_gecko_version_int=1009001],[gecko_cv_have_gecko_1_9_1=no])
+else
+	gecko_cv_have_gecko_1_9_1=no
+fi
+
+if test "$gecko_cv_have_gecko_1_9_1" = "yes"; then
+        AC_DEFINE([HAVE_GECKO_1_9_1],[1],[Define if we have gecko 1.9.1])
+fi
+
 fi # if gecko_cv_have_gecko
 
 $1[]_VERSION=$gecko_cv_gecko_version
@@ -393,6 +408,7 @@ AM_CONDITIONAL([HAVE_GECKO_1_7],[test "$gecko_cv_have_gecko" = "yes" -a "$gecko_
 AM_CONDITIONAL([HAVE_GECKO_1_8],[test "$gecko_cv_have_gecko" = "yes" -a "$gecko_cv_gecko_version_int" -ge "1008000"])
 AM_CONDITIONAL([HAVE_GECKO_1_8_1],[test "$gecko_cv_have_gecko" = "yes" -a "$gecko_cv_gecko_version_int" -ge "1008001"])
 AM_CONDITIONAL([HAVE_GECKO_1_9],[test "$gecko_cv_have_gecko" = "yes" -a "$gecko_cv_gecko_version_int" -ge "1009000"])
+AM_CONDITIONAL([HAVE_GECKO_1_9_1],[test "$gecko_cv_have_gecko" = "yes" -a "$gecko_cv_have_gecko_1_9_1" = "yes"])
 AM_CONDITIONAL([HAVE_GECKO_HOME],[test "x$_GECKO_HOME" != "x"])
 AM_CONDITIONAL([HAVE_GECKO_DEBUG],[test "$gecko_cv_have_debug" = "yes"])
 AM_CONDITIONAL([HAVE_GECKO_XPCOM_GLUE],[test "$gecko_cv_have_xpcom_glue" = "yes"])
diff --git a/m4/gnome-doc-utils.m4 b/m4/gnome-doc-utils.m4
index 8dfb843..4aef712 100644
--- a/m4/gnome-doc-utils.m4
+++ b/m4/gnome-doc-utils.m4
@@ -26,13 +26,18 @@ AC_ARG_ENABLE([scrollkeeper],
 	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])
 
 PKG_CHECK_EXISTS([gnome-doc-utils >= $gdu_cv_version_required],
diff --git a/m4/intltool.m4 b/m4/intltool.m4
index 0269f8e..122d773 100644
--- a/m4/intltool.m4
+++ b/m4/intltool.m4
@@ -23,9 +23,10 @@
 ## the same distribution terms that you use for the rest of that program.
 
 dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
-# serial 35 IT_PROG_INTLTOOL
-AC_DEFUN([IT_PROG_INTLTOOL],
-[AC_PREREQ([2.50])dnl
+# 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])
@@ -36,17 +37,24 @@ case "$am__api_version" in
 esac
 
 if test -n "$1"; then
-    AC_MSG_CHECKING(for intltool >= $1)
+    AC_MSG_CHECKING([for intltool >= $1])
 
     INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
-    INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { print $ 2; }' ${ac_aux_dir}/intltool-update.in`
-    [INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split($ 2, VERSION, "."); print VERSION[1] * 1000 + VERSION[2] * 100 + VERSION[3];}' ${ac_aux_dir}/intltool-update.in`
+    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 $< [$]@' 
@@ -65,37 +73,54 @@ INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcar
   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 $< [$]@'
-
-AC_SUBST(INTLTOOL_DESKTOP_RULE)
-AC_SUBST(INTLTOOL_DIRECTORY_RULE)
-AC_SUBST(INTLTOOL_KEYS_RULE)
-AC_SUBST(INTLTOOL_PROP_RULE)
-AC_SUBST(INTLTOOL_OAF_RULE)
-AC_SUBST(INTLTOOL_PONG_RULE)
-AC_SUBST(INTLTOOL_SERVER_RULE)
-AC_SUBST(INTLTOOL_SHEET_RULE)
-AC_SUBST(INTLTOOL_SOUNDLIST_RULE)
-AC_SUBST(INTLTOOL_UI_RULE)
-AC_SUBST(INTLTOOL_XAM_RULE)
-AC_SUBST(INTLTOOL_KBD_RULE)
-AC_SUBST(INTLTOOL_XML_RULE)
-AC_SUBST(INTLTOOL_XML_NOMERGE_RULE)
-AC_SUBST(INTLTOOL_CAVES_RULE)
-AC_SUBST(INTLTOOL_SCHEMAS_RULE)
-AC_SUBST(INTLTOOL_THEME_RULE)
-AC_SUBST(INTLTOOL_SERVICE_RULE)
-
-# Use the tools built into the package, not the ones that are installed.
-AC_SUBST(INTLTOOL_EXTRACT, '$(top_builddir)/intltool-extract')
-AC_SUBST(INTLTOOL_MERGE, '$(top_builddir)/intltool-merge')
-AC_SUBST(INTLTOOL_UPDATE, '$(top_builddir)/intltool-update')
+   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; required for intltool])
+   AC_MSG_ERROR([perl not found])
 fi
-if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then
-   AC_MSG_ERROR([perl 5.x required for intltool])
+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])
@@ -106,19 +131,16 @@ if test "x$2" != "xno-xml"; then
    fi
 fi
 
-AC_PATH_PROG(INTLTOOL_ICONV, iconv, iconv)
-AC_PATH_PROG(INTLTOOL_MSGFMT, msgfmt, msgfmt)
-AC_PATH_PROG(INTLTOOL_MSGMERGE, msgmerge, msgmerge)
-AC_PATH_PROG(INTLTOOL_XGETTEXT, xgettext, xgettext)
-
 # 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_TRY_LINK(, [extern int _nl_msg_cat_cntr;
-                 return _nl_msg_cat_cntr],
+  AC_LINK_IFELSE(
+    [AC_LANG_PROGRAM([[]],
+                     [[extern int _nl_msg_cat_cntr;
+                       return _nl_msg_cat_cntr]])],
     [DATADIRNAME=share],
     [case $host in
     *-*-solaris*)
@@ -139,48 +161,6 @@ AC_SUBST(DATADIRNAME)
 
 IT_PO_SUBDIR([po])
 
-dnl The following is very similar to
-dnl
-dnl	AC_CONFIG_FILES([intltool-extract intltool-merge intltool-update])
-dnl
-dnl with the following slight differences:
-dnl  - the *.in files are in ac_aux_dir,
-dnl  - if the file haven't changed upon reconfigure, it's not touched,
-dnl  - the evaluation of the third parameter enables a hack which computes
-dnl    the actual value of $libdir,
-dnl  - the user sees "executing intltool commands", instead of
-dnl    "creating intltool-extract" and such.
-dnl
-dnl Nothing crucial here, and we could use AC_CONFIG_FILES, if there were
-dnl a reason for it.
-
-AC_CONFIG_COMMANDS([intltool], [
-
-for file in intltool-extract intltool-merge intltool-update; do
-  sed -e "s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g" \
-      -e "s|@INTLTOOL_LIBDIR@|${INTLTOOL_LIBDIR}|g" \
-      -e "s|@INTLTOOL_ICONV@|${INTLTOOL_ICONV}|g" \
-      -e "s|@INTLTOOL_MSGFMT@|${INTLTOOL_MSGFMT}|g" \
-      -e "s|@INTLTOOL_MSGMERGE@|${INTLTOOL_MSGMERGE}|g" \
-      -e "s|@INTLTOOL_XGETTEXT@|${INTLTOOL_XGETTEXT}|g" \
-      -e "s|@INTLTOOL_PERL@|${INTLTOOL_PERL}|g" \
-	< ${ac_aux_dir}/${file}.in > ${file}.out
-  if cmp -s ${file} ${file}.out 2>/dev/null; then
-    rm -f ${file}.out
-  else
-    mv -f ${file}.out ${file}
-  fi
-  chmod ugo+x ${file}
-  chmod u+w ${file}
-done
-
-],
-[INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}'
-prefix="$prefix" exec_prefix="$exec_prefix" INTLTOOL_LIBDIR="$libdir" 
-INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}' INTLTOOL_ICONV='${INTLTOOL_ICONV}'
-INTLTOOL_MSGFMT='${INTLTOOL_MSGFMT}' INTLTOOL_MSGMERGE='${INTLTOOL_MSGMERGE}'
-INTLTOOL_XGETTEXT='${INTLTOOL_XGETTEXT}'])
-
 ])
 
 
@@ -196,6 +176,9 @@ 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
@@ -204,21 +187,27 @@ AC_CONFIG_COMMANDS_PRE([
 	'"s|^|	$ac_top_srcdir/|" \
       "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES"
     ]
-    if test ! -f "$1/Makefile"; then
-      AC_MSG_ERROR([$1/Makefile is not ready.])
-    fi
-    mv "$1/Makefile" "$1/Makefile.tmp"
     [sed '/^POTFILES =/,/[^\\]$/ {
 		/^POTFILES =/!d
 		r $1/POTFILES
 	  }
-	 ' "$1/Makefile.tmp" >"$1/Makefile"]
+	 ' "$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])
diff --git a/m4/libtool.m4 b/m4/libtool.m4
new file mode 100644
index 0000000..671cde1
--- /dev/null
+++ b/m4/libtool.m4
@@ -0,0 +1,7360 @@
+# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+#
+#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
+#                 2006, 2007, 2008 Free Software Foundation, Inc.
+#   Written by Gordon Matzigkeit, 1996
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+
+m4_define([_LT_COPYING], [dnl
+#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
+#                 2006, 2007, 2008 Free Software Foundation, Inc.
+#   Written by Gordon Matzigkeit, 1996
+#
+#   This file is part of GNU Libtool.
+#
+# GNU Libtool 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.
+#
+# As a special exception to the GNU General Public License,
+# if you distribute this file as part of a program or library that
+# is built using GNU Libtool, you may include this file under the
+# same distribution terms that you use for the rest of that program.
+#
+# GNU Libtool 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 GNU Libtool; see the file COPYING.  If not, a copy
+# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
+# obtained by writing to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+])
+
+# serial 56 LT_INIT
+
+
+# LT_PREREQ(VERSION)
+# ------------------
+# Complain and exit if this libtool version is less that VERSION.
+m4_defun([LT_PREREQ],
+[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1,
+       [m4_default([$3],
+		   [m4_fatal([Libtool version $1 or higher is required],
+		             63)])],
+       [$2])])
+
+
+# _LT_CHECK_BUILDDIR
+# ------------------
+# Complain if the absolute build directory name contains unusual characters
+m4_defun([_LT_CHECK_BUILDDIR],
+[case `pwd` in
+  *\ * | *\	*)
+    AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;;
+esac
+])
+
+
+# LT_INIT([OPTIONS])
+# ------------------
+AC_DEFUN([LT_INIT],
+[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
+AC_BEFORE([$0], [LT_LANG])dnl
+AC_BEFORE([$0], [LT_OUTPUT])dnl
+AC_BEFORE([$0], [LTDL_INIT])dnl
+m4_require([_LT_CHECK_BUILDDIR])dnl
+
+dnl Autoconf doesn't catch unexpanded LT_ macros by default:
+m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl
+m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl
+dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4
+dnl unless we require an AC_DEFUNed macro:
+AC_REQUIRE([LTOPTIONS_VERSION])dnl
+AC_REQUIRE([LTSUGAR_VERSION])dnl
+AC_REQUIRE([LTVERSION_VERSION])dnl
+AC_REQUIRE([LTOBSOLETE_VERSION])dnl
+m4_require([_LT_PROG_LTMAIN])dnl
+
+dnl Parse OPTIONS
+_LT_SET_OPTIONS([$0], [$1])
+
+# This can be used to rebuild libtool when needed
+LIBTOOL_DEPS="$ltmain"
+
+# Always use our own libtool.
+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+AC_SUBST(LIBTOOL)dnl
+
+_LT_SETUP
+
+# Only expand once:
+m4_define([LT_INIT])
+])# LT_INIT
+
+# Old names:
+AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT])
+AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_PROG_LIBTOOL], [])
+dnl AC_DEFUN([AM_PROG_LIBTOOL], [])
+
+
+# _LT_CC_BASENAME(CC)
+# -------------------
+# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
+m4_defun([_LT_CC_BASENAME],
+[for cc_temp in $1""; do
+  case $cc_temp in
+    compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
+    distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
+    \-*) ;;
+    *) break;;
+  esac
+done
+cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+])
+
+
+# _LT_FILEUTILS_DEFAULTS
+# ----------------------
+# It is okay to use these file commands and assume they have been set
+# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'.
+m4_defun([_LT_FILEUTILS_DEFAULTS],
+[: ${CP="cp -f"}
+: ${MV="mv -f"}
+: ${RM="rm -f"}
+])# _LT_FILEUTILS_DEFAULTS
+
+
+# _LT_SETUP
+# ---------
+m4_defun([_LT_SETUP],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+_LT_DECL([], [host_alias], [0], [The host system])dnl
+_LT_DECL([], [host], [0])dnl
+_LT_DECL([], [host_os], [0])dnl
+dnl
+_LT_DECL([], [build_alias], [0], [The build system])dnl
+_LT_DECL([], [build], [0])dnl
+_LT_DECL([], [build_os], [0])dnl
+dnl
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([LT_PATH_LD])dnl
+AC_REQUIRE([LT_PATH_NM])dnl
+dnl
+AC_REQUIRE([AC_PROG_LN_S])dnl
+test -z "$LN_S" && LN_S="ln -s"
+_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl
+dnl
+AC_REQUIRE([LT_CMD_MAX_LEN])dnl
+_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl
+_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl
+dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_CHECK_SHELL_FEATURES])dnl
+m4_require([_LT_CMD_RELOAD])dnl
+m4_require([_LT_CHECK_MAGIC_METHOD])dnl
+m4_require([_LT_CMD_OLD_ARCHIVE])dnl
+m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
+
+_LT_CONFIG_LIBTOOL_INIT([
+# See if we are running on zsh, and set the options which allow our
+# commands through without removal of \ escapes INIT.
+if test -n "\${ZSH_VERSION+set}" ; then
+   setopt NO_GLOB_SUBST
+fi
+])
+if test -n "${ZSH_VERSION+set}" ; then
+   setopt NO_GLOB_SUBST
+fi
+
+_LT_CHECK_OBJDIR
+
+m4_require([_LT_TAG_COMPILER])dnl
+_LT_PROG_ECHO_BACKSLASH
+
+case $host_os in
+aix3*)
+  # AIX sometimes has problems with the GCC collect2 program.  For some
+  # reason, if we set the COLLECT_NAMES environment variable, the problems
+  # vanish in a puff of smoke.
+  if test "X${COLLECT_NAMES+set}" != Xset; then
+    COLLECT_NAMES=
+    export COLLECT_NAMES
+  fi
+  ;;
+esac
+
+# Sed substitution that helps us do robust quoting.  It backslashifies
+# metacharacters that are still active within double-quoted strings.
+sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
+
+# Same as above, but do not quote variable references.
+double_quote_subst='s/\([["`\\]]\)/\\\1/g'
+
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+# Sed substitution to delay expansion of an escaped single quote.
+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
+
+# Sed substitution to avoid accidental globbing in evaled expressions
+no_glob_subst='s/\*/\\\*/g'
+
+# Global variables:
+ofile=libtool
+can_build_shared=yes
+
+# All known linkers require a `.a' archive for static linking (except MSVC,
+# which needs '.lib').
+libext=a
+
+with_gnu_ld="$lt_cv_prog_gnu_ld"
+
+old_CC="$CC"
+old_CFLAGS="$CFLAGS"
+
+# Set sane defaults for various variables
+test -z "$CC" && CC=cc
+test -z "$LTCC" && LTCC=$CC
+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
+test -z "$LD" && LD=ld
+test -z "$ac_objext" && ac_objext=o
+
+_LT_CC_BASENAME([$compiler])
+
+# Only perform the check for file, if the check method requires it
+test -z "$MAGIC_CMD" && MAGIC_CMD=file
+case $deplibs_check_method in
+file_magic*)
+  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
+    _LT_PATH_MAGIC
+  fi
+  ;;
+esac
+
+# Use C for the default configuration in the libtool script
+LT_SUPPORTED_TAG([CC])
+_LT_LANG_C_CONFIG
+_LT_LANG_DEFAULT_CONFIG
+_LT_CONFIG_COMMANDS
+])# _LT_SETUP
+
+
+# _LT_PROG_LTMAIN
+# ---------------
+# Note that this code is called both from `configure', and `config.status'
+# now that we use AC_CONFIG_COMMANDS to generate libtool.  Notably,
+# `config.status' has no value for ac_aux_dir unless we are using Automake,
+# so we pass a copy along to make sure it has a sensible value anyway.
+m4_defun([_LT_PROG_LTMAIN],
+[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl
+_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir'])
+ltmain="$ac_aux_dir/ltmain.sh"
+])# _LT_PROG_LTMAIN
+
+
+## ------------------------------------- ##
+## Accumulate code for creating libtool. ##
+## ------------------------------------- ##
+
+# So that we can recreate a full libtool script including additional
+# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS
+# in macros and then make a single call at the end using the `libtool'
+# label.
+
+
+# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS])
+# ----------------------------------------
+# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later.
+m4_define([_LT_CONFIG_LIBTOOL_INIT],
+[m4_ifval([$1],
+          [m4_append([_LT_OUTPUT_LIBTOOL_INIT],
+                     [$1
+])])])
+
+# Initialize.
+m4_define([_LT_OUTPUT_LIBTOOL_INIT])
+
+
+# _LT_CONFIG_LIBTOOL([COMMANDS])
+# ------------------------------
+# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later.
+m4_define([_LT_CONFIG_LIBTOOL],
+[m4_ifval([$1],
+          [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS],
+                     [$1
+])])])
+
+# Initialize.
+m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS])
+
+
+# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS])
+# -----------------------------------------------------
+m4_defun([_LT_CONFIG_SAVE_COMMANDS],
+[_LT_CONFIG_LIBTOOL([$1])
+_LT_CONFIG_LIBTOOL_INIT([$2])
+])
+
+
+# _LT_FORMAT_COMMENT([COMMENT])
+# -----------------------------
+# Add leading comment marks to the start of each line, and a trailing
+# full-stop to the whole comment if one is not present already.
+m4_define([_LT_FORMAT_COMMENT],
+[m4_ifval([$1], [
+m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])],
+              [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.])
+)])
+
+
+
+## ------------------------ ##
+## FIXME: Eliminate VARNAME ##
+## ------------------------ ##
+
+
+# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?])
+# -------------------------------------------------------------------
+# CONFIGNAME is the name given to the value in the libtool script.
+# VARNAME is the (base) name used in the configure script.
+# VALUE may be 0, 1 or 2 for a computed quote escaped value based on
+# VARNAME.  Any other value will be used directly.
+m4_define([_LT_DECL],
+[lt_if_append_uniq([lt_decl_varnames], [$2], [, ],
+    [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name],
+	[m4_ifval([$1], [$1], [$2])])
+    lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3])
+    m4_ifval([$4],
+	[lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])])
+    lt_dict_add_subkey([lt_decl_dict], [$2],
+	[tagged?], [m4_ifval([$5], [yes], [no])])])
+])
+
+
+# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION])
+# --------------------------------------------------------
+m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])])
+
+
+# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...])
+# ------------------------------------------------
+m4_define([lt_decl_tag_varnames],
+[_lt_decl_filter([tagged?], [yes], $@)])
+
+
+# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..])
+# ---------------------------------------------------------
+m4_define([_lt_decl_filter],
+[m4_case([$#],
+  [0], [m4_fatal([$0: too few arguments: $#])],
+  [1], [m4_fatal([$0: too few arguments: $#: $1])],
+  [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)],
+  [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)],
+  [lt_dict_filter([lt_decl_dict], $@)])[]dnl
+])
+
+
+# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...])
+# --------------------------------------------------
+m4_define([lt_decl_quote_varnames],
+[_lt_decl_filter([value], [1], $@)])
+
+
+# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...])
+# ---------------------------------------------------
+m4_define([lt_decl_dquote_varnames],
+[_lt_decl_filter([value], [2], $@)])
+
+
+# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...])
+# ---------------------------------------------------
+m4_define([lt_decl_varnames_tagged],
+[m4_assert([$# <= 2])dnl
+_$0(m4_quote(m4_default([$1], [[, ]])),
+    m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]),
+    m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))])
+m4_define([_lt_decl_varnames_tagged],
+[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])])
+
+
+# lt_decl_all_varnames([SEPARATOR], [VARNAME1...])
+# ------------------------------------------------
+m4_define([lt_decl_all_varnames],
+[_$0(m4_quote(m4_default([$1], [[, ]])),
+     m4_if([$2], [],
+	   m4_quote(lt_decl_varnames),
+	m4_quote(m4_shift($@))))[]dnl
+])
+m4_define([_lt_decl_all_varnames],
+[lt_join($@, lt_decl_varnames_tagged([$1],
+			lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl
+])
+
+
+# _LT_CONFIG_STATUS_DECLARE([VARNAME])
+# ------------------------------------
+# Quote a variable value, and forward it to `config.status' so that its
+# declaration there will have the same value as in `configure'.  VARNAME
+# must have a single quote delimited value for this to work.
+m4_define([_LT_CONFIG_STATUS_DECLARE],
+[$1='`$ECHO "X$][$1" | $Xsed -e "$delay_single_quote_subst"`'])
+
+
+# _LT_CONFIG_STATUS_DECLARATIONS
+# ------------------------------
+# We delimit libtool config variables with single quotes, so when
+# we write them to config.status, we have to be sure to quote all
+# embedded single quotes properly.  In configure, this macro expands
+# each variable declared with _LT_DECL (and _LT_TAGDECL) into:
+#
+#    <var>='`$ECHO "X$<var>" | $Xsed -e "$delay_single_quote_subst"`'
+m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
+[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames),
+    [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])])
+
+
+# _LT_LIBTOOL_TAGS
+# ----------------
+# Output comment and list of tags supported by the script
+m4_defun([_LT_LIBTOOL_TAGS],
+[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl
+available_tags="_LT_TAGS"dnl
+])
+
+
+# _LT_LIBTOOL_DECLARE(VARNAME, [TAG])
+# -----------------------------------
+# Extract the dictionary values for VARNAME (optionally with TAG) and
+# expand to a commented shell variable setting:
+#
+#    # Some comment about what VAR is for.
+#    visible_name=$lt_internal_name
+m4_define([_LT_LIBTOOL_DECLARE],
+[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1],
+					   [description])))[]dnl
+m4_pushdef([_libtool_name],
+    m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl
+m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])),
+    [0], [_libtool_name=[$]$1],
+    [1], [_libtool_name=$lt_[]$1],
+    [2], [_libtool_name=$lt_[]$1],
+    [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl
+m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl
+])
+
+
+# _LT_LIBTOOL_CONFIG_VARS
+# -----------------------
+# Produce commented declarations of non-tagged libtool config variables
+# suitable for insertion in the LIBTOOL CONFIG section of the `libtool'
+# script.  Tagged libtool config variables (even for the LIBTOOL CONFIG
+# section) are produced by _LT_LIBTOOL_TAG_VARS.
+m4_defun([_LT_LIBTOOL_CONFIG_VARS],
+[m4_foreach([_lt_var],
+    m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)),
+    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])])
+
+
+# _LT_LIBTOOL_TAG_VARS(TAG)
+# -------------------------
+m4_define([_LT_LIBTOOL_TAG_VARS],
+[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames),
+    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])])
+
+
+# _LT_TAGVAR(VARNAME, [TAGNAME])
+# ------------------------------
+m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])])
+
+
+# _LT_CONFIG_COMMANDS
+# -------------------
+# Send accumulated output to $CONFIG_STATUS.  Thanks to the lists of
+# variables for single and double quote escaping we saved from calls
+# to _LT_DECL, we can put quote escaped variables declarations
+# into `config.status', and then the shell code to quote escape them in
+# for loops in `config.status'.  Finally, any additional code accumulated
+# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded.
+m4_defun([_LT_CONFIG_COMMANDS],
+[AC_PROVIDE_IFELSE([LT_OUTPUT],
+	dnl If the libtool generation code has been placed in $CONFIG_LT,
+	dnl instead of duplicating it all over again into config.status,
+	dnl then we will have config.status run $CONFIG_LT later, so it
+	dnl needs to know what name is stored there:
+        [AC_CONFIG_COMMANDS([libtool],
+            [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])],
+    dnl If the libtool generation code is destined for config.status,
+    dnl expand the accumulated commands and init code now:
+    [AC_CONFIG_COMMANDS([libtool],
+        [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])])
+])#_LT_CONFIG_COMMANDS
+
+
+# Initialize.
+m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT],
+[
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+sed_quote_subst='$sed_quote_subst'
+double_quote_subst='$double_quote_subst'
+delay_variable_subst='$delay_variable_subst'
+_LT_CONFIG_STATUS_DECLARATIONS
+LTCC='$LTCC'
+LTCFLAGS='$LTCFLAGS'
+compiler='$compiler_DEFAULT'
+
+# Quote evaled strings.
+for var in lt_decl_all_varnames([[ \
+]], lt_decl_quote_varnames); do
+    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
+    *[[\\\\\\\`\\"\\\$]]*)
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
+      ;;
+    *)
+      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+      ;;
+    esac
+done
+
+# Double-quote double-evaled strings.
+for var in lt_decl_all_varnames([[ \
+]], lt_decl_dquote_varnames); do
+    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
+    *[[\\\\\\\`\\"\\\$]]*)
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
+      ;;
+    *)
+      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+      ;;
+    esac
+done
+
+# Fix-up fallback echo if it was mangled by the above quoting rules.
+case \$lt_ECHO in
+*'\\\[$]0 --fallback-echo"')dnl "
+  lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\[$]0 --fallback-echo"\[$]/\[$]0 --fallback-echo"/'\`
+  ;;
+esac
+
+_LT_OUTPUT_LIBTOOL_INIT
+])
+
+
+# LT_OUTPUT
+# ---------
+# This macro allows early generation of the libtool script (before
+# AC_OUTPUT is called), incase it is used in configure for compilation
+# tests.
+AC_DEFUN([LT_OUTPUT],
+[: ${CONFIG_LT=./config.lt}
+AC_MSG_NOTICE([creating $CONFIG_LT])
+cat >"$CONFIG_LT" <<_LTEOF
+#! $SHELL
+# Generated by $as_me.
+# Run this file to recreate a libtool stub with the current configuration.
+
+lt_cl_silent=false
+SHELL=\${CONFIG_SHELL-$SHELL}
+_LTEOF
+
+cat >>"$CONFIG_LT" <<\_LTEOF
+AS_SHELL_SANITIZE
+_AS_PREPARE
+
+exec AS_MESSAGE_FD>&1
+exec AS_MESSAGE_LOG_FD>>config.log
+{
+  echo
+  AS_BOX([Running $as_me.])
+} >&AS_MESSAGE_LOG_FD
+
+lt_cl_help="\
+\`$as_me' creates a local libtool stub from the current configuration,
+for use in further configure time tests before the real libtool is
+generated.
+
+Usage: $[0] [[OPTIONS]]
+
+  -h, --help      print this help, then exit
+  -V, --version   print version number, then exit
+  -q, --quiet     do not print progress messages
+  -d, --debug     don't remove temporary files
+
+Report bugs to <bug-libtool@gnu.org>."
+
+lt_cl_version="\
+m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl
+m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
+configured by $[0], generated by m4_PACKAGE_STRING.
+
+Copyright (C) 2008 Free Software Foundation, Inc.
+This config.lt script is free software; the Free Software Foundation
+gives unlimited permision to copy, distribute and modify it."
+
+while test $[#] != 0
+do
+  case $[1] in
+    --version | --v* | -V )
+      echo "$lt_cl_version"; exit 0 ;;
+    --help | --h* | -h )
+      echo "$lt_cl_help"; exit 0 ;;
+    --debug | --d* | -d )
+      debug=: ;;
+    --quiet | --q* | --silent | --s* | -q )
+      lt_cl_silent=: ;;
+
+    -*) AC_MSG_ERROR([unrecognized option: $[1]
+Try \`$[0] --help' for more information.]) ;;
+
+    *) AC_MSG_ERROR([unrecognized argument: $[1]
+Try \`$[0] --help' for more information.]) ;;
+  esac
+  shift
+done
+
+if $lt_cl_silent; then
+  exec AS_MESSAGE_FD>/dev/null
+fi
+_LTEOF
+
+cat >>"$CONFIG_LT" <<_LTEOF
+_LT_OUTPUT_LIBTOOL_COMMANDS_INIT
+_LTEOF
+
+cat >>"$CONFIG_LT" <<\_LTEOF
+AC_MSG_NOTICE([creating $ofile])
+_LT_OUTPUT_LIBTOOL_COMMANDS
+AS_EXIT(0)
+_LTEOF
+chmod +x "$CONFIG_LT"
+
+# configure is writing to config.log, but config.lt does its own redirection,
+# appending to config.log, which fails on DOS, as config.log is still kept
+# open by configure.  Here we exec the FD to /dev/null, effectively closing
+# config.log, so it can be properly (re)opened and appended to by config.lt.
+if test "$no_create" != yes; then
+  lt_cl_success=:
+  test "$silent" = yes &&
+    lt_config_lt_args="$lt_config_lt_args --quiet"
+  exec AS_MESSAGE_LOG_FD>/dev/null
+  $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
+  exec AS_MESSAGE_LOG_FD>>config.log
+  $lt_cl_success || AS_EXIT(1)
+fi
+])# LT_OUTPUT
+
+
+# _LT_CONFIG(TAG)
+# ---------------
+# If TAG is the built-in tag, create an initial libtool script with a
+# default configuration from the untagged config vars.  Otherwise add code
+# to config.status for appending the configuration named by TAG from the
+# matching tagged config vars.
+m4_defun([_LT_CONFIG],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+_LT_CONFIG_SAVE_COMMANDS([
+  m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl
+  m4_if(_LT_TAG, [C], [
+    # See if we are running on zsh, and set the options which allow our
+    # commands through without removal of \ escapes.
+    if test -n "${ZSH_VERSION+set}" ; then
+      setopt NO_GLOB_SUBST
+    fi
+
+    cfgfile="${ofile}T"
+    trap "$RM \"$cfgfile\"; exit 1" 1 2 15
+    $RM "$cfgfile"
+
+    cat <<_LT_EOF >> "$cfgfile"
+#! $SHELL
+
+# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
+# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+# NOTE: Changes made to this file will be lost: look at ltmain.sh.
+#
+_LT_COPYING
+_LT_LIBTOOL_TAGS
+
+# ### BEGIN LIBTOOL CONFIG
+_LT_LIBTOOL_CONFIG_VARS
+_LT_LIBTOOL_TAG_VARS
+# ### END LIBTOOL CONFIG
+
+_LT_EOF
+
+  case $host_os in
+  aix3*)
+    cat <<\_LT_EOF >> "$cfgfile"
+# AIX sometimes has problems with the GCC collect2 program.  For some
+# reason, if we set the COLLECT_NAMES environment variable, the problems
+# vanish in a puff of smoke.
+if test "X${COLLECT_NAMES+set}" != Xset; then
+  COLLECT_NAMES=
+  export COLLECT_NAMES
+fi
+_LT_EOF
+    ;;
+  esac
+
+  _LT_PROG_LTMAIN
+
+  # We use sed instead of cat because bash on DJGPP gets confused if
+  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
+  # text mode, it properly converts lines to CR/LF.  This bash problem
+  # is reportedly fixed, but why not run on old versions too?
+  sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
+    || (rm -f "$cfgfile"; exit 1)
+
+  _LT_PROG_XSI_SHELLFNS
+
+  sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
+    || (rm -f "$cfgfile"; exit 1)
+
+  mv -f "$cfgfile" "$ofile" ||
+    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
+  chmod +x "$ofile"
+],
+[cat <<_LT_EOF >> "$ofile"
+
+dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded
+dnl in a comment (ie after a #).
+# ### BEGIN LIBTOOL TAG CONFIG: $1
+_LT_LIBTOOL_TAG_VARS(_LT_TAG)
+# ### END LIBTOOL TAG CONFIG: $1
+_LT_EOF
+])dnl /m4_if
+],
+[m4_if([$1], [], [
+    PACKAGE='$PACKAGE'
+    VERSION='$VERSION'
+    TIMESTAMP='$TIMESTAMP'
+    RM='$RM'
+    ofile='$ofile'], [])
+])dnl /_LT_CONFIG_SAVE_COMMANDS
+])# _LT_CONFIG
+
+
+# LT_SUPPORTED_TAG(TAG)
+# ---------------------
+# Trace this macro to discover what tags are supported by the libtool
+# --tag option, using:
+#    autoconf --trace 'LT_SUPPORTED_TAG:$1'
+AC_DEFUN([LT_SUPPORTED_TAG], [])
+
+
+# C support is built-in for now
+m4_define([_LT_LANG_C_enabled], [])
+m4_define([_LT_TAGS], [])
+
+
+# LT_LANG(LANG)
+# -------------
+# Enable libtool support for the given language if not already enabled.
+AC_DEFUN([LT_LANG],
+[AC_BEFORE([$0], [LT_OUTPUT])dnl
+m4_case([$1],
+  [C],			[_LT_LANG(C)],
+  [C++],		[_LT_LANG(CXX)],
+  [Java],		[_LT_LANG(GCJ)],
+  [Fortran 77],		[_LT_LANG(F77)],
+  [Fortran],		[_LT_LANG(FC)],
+  [Windows Resource],	[_LT_LANG(RC)],
+  [m4_ifdef([_LT_LANG_]$1[_CONFIG],
+    [_LT_LANG($1)],
+    [m4_fatal([$0: unsupported language: "$1"])])])dnl
+])# LT_LANG
+
+
+# _LT_LANG(LANGNAME)
+# ------------------
+m4_defun([_LT_LANG],
+[m4_ifdef([_LT_LANG_]$1[_enabled], [],
+  [LT_SUPPORTED_TAG([$1])dnl
+  m4_append([_LT_TAGS], [$1 ])dnl
+  m4_define([_LT_LANG_]$1[_enabled], [])dnl
+  _LT_LANG_$1_CONFIG($1)])dnl
+])# _LT_LANG
+
+
+# _LT_LANG_DEFAULT_CONFIG
+# -----------------------
+m4_defun([_LT_LANG_DEFAULT_CONFIG],
+[AC_PROVIDE_IFELSE([AC_PROG_CXX],
+  [LT_LANG(CXX)],
+  [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[LT_LANG(CXX)])])
+
+AC_PROVIDE_IFELSE([AC_PROG_F77],
+  [LT_LANG(F77)],
+  [m4_define([AC_PROG_F77], defn([AC_PROG_F77])[LT_LANG(F77)])])
+
+AC_PROVIDE_IFELSE([AC_PROG_FC],
+  [LT_LANG(FC)],
+  [m4_define([AC_PROG_FC], defn([AC_PROG_FC])[LT_LANG(FC)])])
+
+dnl The call to [A][M_PROG_GCJ] is quoted like that to stop aclocal
+dnl pulling things in needlessly.
+AC_PROVIDE_IFELSE([AC_PROG_GCJ],
+  [LT_LANG(GCJ)],
+  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
+    [LT_LANG(GCJ)],
+    [AC_PROVIDE_IFELSE([LT_PROG_GCJ],
+      [LT_LANG(GCJ)],
+      [m4_ifdef([AC_PROG_GCJ],
+	[m4_define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[LT_LANG(GCJ)])])
+       m4_ifdef([A][M_PROG_GCJ],
+	[m4_define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[LT_LANG(GCJ)])])
+       m4_ifdef([LT_PROG_GCJ],
+	[m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])])
+
+AC_PROVIDE_IFELSE([LT_PROG_RC],
+  [LT_LANG(RC)],
+  [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])])
+])# _LT_LANG_DEFAULT_CONFIG
+
+# Obsolete macros:
+AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)])
+AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)])
+AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)])
+AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_CXX], [])
+dnl AC_DEFUN([AC_LIBTOOL_F77], [])
+dnl AC_DEFUN([AC_LIBTOOL_FC], [])
+dnl AC_DEFUN([AC_LIBTOOL_GCJ], [])
+
+
+# _LT_TAG_COMPILER
+# ----------------
+m4_defun([_LT_TAG_COMPILER],
+[AC_REQUIRE([AC_PROG_CC])dnl
+
+_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl
+_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl
+_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl
+_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl
+
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
+
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
+# Allow CC to be a program name with arguments.
+compiler=$CC
+])# _LT_TAG_COMPILER
+
+
+# _LT_COMPILER_BOILERPLATE
+# ------------------------
+# Check for compiler boilerplate output or warnings with
+# the simple compiler test code.
+m4_defun([_LT_COMPILER_BOILERPLATE],
+[m4_require([_LT_DECL_SED])dnl
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$RM conftest*
+])# _LT_COMPILER_BOILERPLATE
+
+
+# _LT_LINKER_BOILERPLATE
+# ----------------------
+# Check for linker boilerplate output or warnings with
+# the simple link test code.
+m4_defun([_LT_LINKER_BOILERPLATE],
+[m4_require([_LT_DECL_SED])dnl
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$RM -r conftest*
+])# _LT_LINKER_BOILERPLATE
+
+# _LT_REQUIRED_DARWIN_CHECKS
+# -------------------------
+m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
+  case $host_os in
+    rhapsody* | darwin*)
+    AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
+    AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
+    AC_CHECK_TOOL([LIPO], [lipo], [:])
+    AC_CHECK_TOOL([OTOOL], [otool], [:])
+    AC_CHECK_TOOL([OTOOL64], [otool64], [:])
+    _LT_DECL([], [DSYMUTIL], [1],
+      [Tool to manipulate archived DWARF debug symbol files on Mac OS X])
+    _LT_DECL([], [NMEDIT], [1],
+      [Tool to change global to local symbols on Mac OS X])
+    _LT_DECL([], [LIPO], [1],
+      [Tool to manipulate fat objects and archives on Mac OS X])
+    _LT_DECL([], [OTOOL], [1],
+      [ldd/readelf like tool for Mach-O binaries on Mac OS X])
+    _LT_DECL([], [OTOOL64], [1],
+      [ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4])
+
+    AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
+      [lt_cv_apple_cc_single_mod=no
+      if test -z "${LT_MULTI_MODULE}"; then
+	# By default we will add the -single_module flag. You can override
+	# by either setting the environment variable LT_MULTI_MODULE
+	# non-empty at configure time, or by adding -multi_module to the
+	# link flags.
+	rm -rf libconftest.dylib*
+	echo "int foo(void){return 1;}" > conftest.c
+	echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+-dynamiclib -Wl,-single_module conftest.c" >&AS_MESSAGE_LOG_FD
+	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
+        _lt_result=$?
+	if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
+	  lt_cv_apple_cc_single_mod=yes
+	else
+	  cat conftest.err >&AS_MESSAGE_LOG_FD
+	fi
+	rm -rf libconftest.dylib*
+	rm -f conftest.*
+      fi])
+    AC_CACHE_CHECK([for -exported_symbols_list linker flag],
+      [lt_cv_ld_exported_symbols_list],
+      [lt_cv_ld_exported_symbols_list=no
+      save_LDFLAGS=$LDFLAGS
+      echo "_main" > conftest.sym
+      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
+      AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
+	[lt_cv_ld_exported_symbols_list=yes],
+	[lt_cv_ld_exported_symbols_list=no])
+	LDFLAGS="$save_LDFLAGS"
+    ])
+    case $host_os in
+    rhapsody* | darwin1.[[012]])
+      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
+    darwin1.*)
+      _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+    darwin*) # darwin 5.x on
+      # if running on 10.5 or later, the deployment target defaults
+      # to the OS version, if on x86, and 10.4, the deployment
+      # target defaults to 10.4. Don't you love it?
+      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
+	10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
+	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+	10.[[012]]*)
+	  _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+	10.*)
+	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+      esac
+    ;;
+  esac
+    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
+      _lt_dar_single_mod='$single_module'
+    fi
+    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
+      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
+    else
+      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
+    fi
+    if test "$DSYMUTIL" != ":"; then
+      _lt_dsymutil='~$DSYMUTIL $lib || :'
+    else
+      _lt_dsymutil=
+    fi
+    ;;
+  esac
+])
+
+
+# _LT_DARWIN_LINKER_FEATURES
+# --------------------------
+# Checks for linker and compiler features on darwin
+m4_defun([_LT_DARWIN_LINKER_FEATURES],
+[
+  m4_require([_LT_REQUIRED_DARWIN_CHECKS])
+  _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+  _LT_TAGVAR(hardcode_direct, $1)=no
+  _LT_TAGVAR(hardcode_automatic, $1)=yes
+  _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+  _LT_TAGVAR(whole_archive_flag_spec, $1)=''
+  _LT_TAGVAR(link_all_deplibs, $1)=yes
+  _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
+  case $cc_basename in
+     ifort*) _lt_dar_can_shared=yes ;;
+     *) _lt_dar_can_shared=$GCC ;;
+  esac
+  if test "$_lt_dar_can_shared" = "yes"; then
+    output_verbose_link_cmd=echo
+    _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+    _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+    _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+    _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+    m4_if([$1], [CXX],
+[   if test "$lt_cv_apple_cc_single_mod" != "yes"; then
+      _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
+      _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
+    fi
+],[])
+  else
+  _LT_TAGVAR(ld_shlibs, $1)=no
+  fi
+])
+
+# _LT_SYS_MODULE_PATH_AIX
+# -----------------------
+# Links a minimal program and checks the executable
+# for the system default hardcoded library path. In most cases,
+# this is /usr/lib:/lib, but when the MPI compilers are used
+# the location of the communication and MPI libs are included too.
+# If we don't find anything, use the default library path according
+# to the aix ld manual.
+m4_defun([_LT_SYS_MODULE_PATH_AIX],
+[m4_require([_LT_DECL_SED])dnl
+AC_LINK_IFELSE(AC_LANG_PROGRAM,[
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+# Check for a 64-bit object if we didn't find anything.
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi],[])
+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+])# _LT_SYS_MODULE_PATH_AIX
+
+
+# _LT_SHELL_INIT(ARG)
+# -------------------
+m4_define([_LT_SHELL_INIT],
+[ifdef([AC_DIVERSION_NOTICE],
+	     [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
+	 [AC_DIVERT_PUSH(NOTICE)])
+$1
+AC_DIVERT_POP
+])# _LT_SHELL_INIT
+
+
+# _LT_PROG_ECHO_BACKSLASH
+# -----------------------
+# Add some code to the start of the generated configure script which
+# will find an echo command which doesn't interpret backslashes.
+m4_defun([_LT_PROG_ECHO_BACKSLASH],
+[_LT_SHELL_INIT([
+# Check that we are running under the correct shell.
+SHELL=${CONFIG_SHELL-/bin/sh}
+
+case X$lt_ECHO in
+X*--fallback-echo)
+  # Remove one level of quotation (which was required for Make).
+  ECHO=`echo "$lt_ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
+  ;;
+esac
+
+ECHO=${lt_ECHO-echo}
+if test "X[$]1" = X--no-reexec; then
+  # Discard the --no-reexec flag, and continue.
+  shift
+elif test "X[$]1" = X--fallback-echo; then
+  # Avoid inline document here, it may be left over
+  :
+elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then
+  # Yippee, $ECHO works!
+  :
+else
+  # Restart under the correct shell.
+  exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
+fi
+
+if test "X[$]1" = X--fallback-echo; then
+  # used as fallback echo
+  shift
+  cat <<_LT_EOF
+[$]*
+_LT_EOF
+  exit 0
+fi
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+if test -z "$lt_ECHO"; then
+  if test "X${echo_test_string+set}" != Xset; then
+    # find a string as large as possible, as long as the shell can cope with it
+    for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
+      # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
+      if { echo_test_string=`eval $cmd`; } 2>/dev/null &&
+	 { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null
+      then
+        break
+      fi
+    done
+  fi
+
+  if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
+     echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
+     test "X$echo_testing_string" = "X$echo_test_string"; then
+    :
+  else
+    # The Solaris, AIX, and Digital Unix default echo programs unquote
+    # backslashes.  This makes it impossible to quote backslashes using
+    #   echo "$something" | sed 's/\\/\\\\/g'
+    #
+    # So, first we look for a working echo in the user's PATH.
+
+    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+    for dir in $PATH /usr/ucb; do
+      IFS="$lt_save_ifs"
+      if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
+         test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
+         echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
+         test "X$echo_testing_string" = "X$echo_test_string"; then
+        ECHO="$dir/echo"
+        break
+      fi
+    done
+    IFS="$lt_save_ifs"
+
+    if test "X$ECHO" = Xecho; then
+      # We didn't find a better echo, so look for alternatives.
+      if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' &&
+         echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` &&
+         test "X$echo_testing_string" = "X$echo_test_string"; then
+        # This shell has a builtin print -r that does the trick.
+        ECHO='print -r'
+      elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &&
+	   test "X$CONFIG_SHELL" != X/bin/ksh; then
+        # If we have ksh, try running configure again with it.
+        ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
+        export ORIGINAL_CONFIG_SHELL
+        CONFIG_SHELL=/bin/ksh
+        export CONFIG_SHELL
+        exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
+      else
+        # Try using printf.
+        ECHO='printf %s\n'
+        if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
+	   echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
+	   test "X$echo_testing_string" = "X$echo_test_string"; then
+	  # Cool, printf works
+	  :
+        elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
+	     test "X$echo_testing_string" = 'X\t' &&
+	     echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
+	     test "X$echo_testing_string" = "X$echo_test_string"; then
+	  CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
+	  export CONFIG_SHELL
+	  SHELL="$CONFIG_SHELL"
+	  export SHELL
+	  ECHO="$CONFIG_SHELL [$]0 --fallback-echo"
+        elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
+	     test "X$echo_testing_string" = 'X\t' &&
+	     echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
+	     test "X$echo_testing_string" = "X$echo_test_string"; then
+	  ECHO="$CONFIG_SHELL [$]0 --fallback-echo"
+        else
+	  # maybe with a smaller string...
+	  prev=:
+
+	  for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
+	    if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null
+	    then
+	      break
+	    fi
+	    prev="$cmd"
+	  done
+
+	  if test "$prev" != 'sed 50q "[$]0"'; then
+	    echo_test_string=`eval $prev`
+	    export echo_test_string
+	    exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
+	  else
+	    # Oops.  We lost completely, so just stick with echo.
+	    ECHO=echo
+	  fi
+        fi
+      fi
+    fi
+  fi
+fi
+
+# Copy echo and quote the copy suitably for passing to libtool from
+# the Makefile, instead of quoting the original, which is used later.
+lt_ECHO=$ECHO
+if test "X$lt_ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
+   lt_ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
+fi
+
+AC_SUBST(lt_ECHO)
+])
+_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts])
+_LT_DECL([], [ECHO], [1],
+    [An echo program that does not interpret backslashes])
+])# _LT_PROG_ECHO_BACKSLASH
+
+
+# _LT_ENABLE_LOCK
+# ---------------
+m4_defun([_LT_ENABLE_LOCK],
+[AC_ARG_ENABLE([libtool-lock],
+  [AS_HELP_STRING([--disable-libtool-lock],
+    [avoid locking (might break parallel builds)])])
+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+
+# Some flags need to be propagated to the compiler or linker for good
+# libtool support.
+case $host in
+ia64-*-hpux*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    case `/usr/bin/file conftest.$ac_objext` in
+      *ELF-32*)
+	HPUX_IA64_MODE="32"
+	;;
+      *ELF-64*)
+	HPUX_IA64_MODE="64"
+	;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+*-*-irix6*)
+  # Find out which ABI we are using.
+  echo '[#]line __oline__ "configure"' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    if test "$lt_cv_prog_gnu_ld" = yes; then
+      case `/usr/bin/file conftest.$ac_objext` in
+	*32-bit*)
+	  LD="${LD-ld} -melf32bsmip"
+	  ;;
+	*N32*)
+	  LD="${LD-ld} -melf32bmipn32"
+	  ;;
+	*64-bit*)
+	  LD="${LD-ld} -melf64bmip"
+	;;
+      esac
+    else
+      case `/usr/bin/file conftest.$ac_objext` in
+	*32-bit*)
+	  LD="${LD-ld} -32"
+	  ;;
+	*N32*)
+	  LD="${LD-ld} -n32"
+	  ;;
+	*64-bit*)
+	  LD="${LD-ld} -64"
+	  ;;
+      esac
+    fi
+  fi
+  rm -rf conftest*
+  ;;
+
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    case `/usr/bin/file conftest.o` in
+      *32-bit*)
+	case $host in
+	  x86_64-*kfreebsd*-gnu)
+	    LD="${LD-ld} -m elf_i386_fbsd"
+	    ;;
+	  x86_64-*linux*)
+	    LD="${LD-ld} -m elf_i386"
+	    ;;
+	  ppc64-*linux*|powerpc64-*linux*)
+	    LD="${LD-ld} -m elf32ppclinux"
+	    ;;
+	  s390x-*linux*)
+	    LD="${LD-ld} -m elf_s390"
+	    ;;
+	  sparc64-*linux*)
+	    LD="${LD-ld} -m elf32_sparc"
+	    ;;
+	esac
+	;;
+      *64-bit*)
+	case $host in
+	  x86_64-*kfreebsd*-gnu)
+	    LD="${LD-ld} -m elf_x86_64_fbsd"
+	    ;;
+	  x86_64-*linux*)
+	    LD="${LD-ld} -m elf_x86_64"
+	    ;;
+	  ppc*-*linux*|powerpc*-*linux*)
+	    LD="${LD-ld} -m elf64ppc"
+	    ;;
+	  s390*-*linux*|s390*-*tpf*)
+	    LD="${LD-ld} -m elf64_s390"
+	    ;;
+	  sparc*-*linux*)
+	    LD="${LD-ld} -m elf64_sparc"
+	    ;;
+	esac
+	;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+
+*-*-sco3.2v5*)
+  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+  SAVE_CFLAGS="$CFLAGS"
+  CFLAGS="$CFLAGS -belf"
+  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
+    [AC_LANG_PUSH(C)
+     AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
+     AC_LANG_POP])
+  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
+    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
+    CFLAGS="$SAVE_CFLAGS"
+  fi
+  ;;
+sparc*-*solaris*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    case `/usr/bin/file conftest.o` in
+    *64-bit*)
+      case $lt_cv_prog_gnu_ld in
+      yes*) LD="${LD-ld} -m elf64_sparc" ;;
+      *)
+	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
+	  LD="${LD-ld} -64"
+	fi
+	;;
+      esac
+      ;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+esac
+
+need_locks="$enable_libtool_lock"
+])# _LT_ENABLE_LOCK
+
+
+# _LT_CMD_OLD_ARCHIVE
+# -------------------
+m4_defun([_LT_CMD_OLD_ARCHIVE],
+[AC_CHECK_TOOL(AR, ar, false)
+test -z "$AR" && AR=ar
+test -z "$AR_FLAGS" && AR_FLAGS=cru
+_LT_DECL([], [AR], [1], [The archiver])
+_LT_DECL([], [AR_FLAGS], [1])
+
+AC_CHECK_TOOL(STRIP, strip, :)
+test -z "$STRIP" && STRIP=:
+_LT_DECL([], [STRIP], [1], [A symbol stripping program])
+
+AC_CHECK_TOOL(RANLIB, ranlib, :)
+test -z "$RANLIB" && RANLIB=:
+_LT_DECL([], [RANLIB], [1],
+    [Commands used to install an old-style archive])
+
+# Determine commands to create old-style static archives.
+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
+old_postinstall_cmds='chmod 644 $oldlib'
+old_postuninstall_cmds=
+
+if test -n "$RANLIB"; then
+  case $host_os in
+  openbsd*)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+    ;;
+  *)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+    ;;
+  esac
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+fi
+_LT_DECL([], [old_postinstall_cmds], [2])
+_LT_DECL([], [old_postuninstall_cmds], [2])
+_LT_TAGDECL([], [old_archive_cmds], [2],
+    [Commands used to build an old-style archive])
+])# _LT_CMD_OLD_ARCHIVE
+
+
+# _LT_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
+#		[OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
+# ----------------------------------------------------------------
+# Check whether the given compiler option works
+AC_DEFUN([_LT_COMPILER_OPTION],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_SED])dnl
+AC_CACHE_CHECK([$1], [$2],
+  [$2=no
+   m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+   lt_compiler_flag="$3"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   # The option is referenced via a variable to avoid confusing sed.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+   (eval "$lt_compile" 2>conftest.err)
+   ac_status=$?
+   cat conftest.err >&AS_MESSAGE_LOG_FD
+   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   if (exit $ac_status) && test -s "$ac_outfile"; then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings other than the usual output.
+     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+       $2=yes
+     fi
+   fi
+   $RM conftest*
+])
+
+if test x"[$]$2" = xyes; then
+    m4_if([$5], , :, [$5])
+else
+    m4_if([$6], , :, [$6])
+fi
+])# _LT_COMPILER_OPTION
+
+# Old name:
+AU_ALIAS([AC_LIBTOOL_COMPILER_OPTION], [_LT_COMPILER_OPTION])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], [])
+
+
+# _LT_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
+#                  [ACTION-SUCCESS], [ACTION-FAILURE])
+# ----------------------------------------------------
+# Check whether the given linker option works
+AC_DEFUN([_LT_LINKER_OPTION],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_SED])dnl
+AC_CACHE_CHECK([$1], [$2],
+  [$2=no
+   save_LDFLAGS="$LDFLAGS"
+   LDFLAGS="$LDFLAGS $3"
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+     # The linker can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test -s conftest.err; then
+       # Append any errors to the config.log.
+       cat conftest.err 1>&AS_MESSAGE_LOG_FD
+       $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+       if diff conftest.exp conftest.er2 >/dev/null; then
+         $2=yes
+       fi
+     else
+       $2=yes
+     fi
+   fi
+   $RM -r conftest*
+   LDFLAGS="$save_LDFLAGS"
+])
+
+if test x"[$]$2" = xyes; then
+    m4_if([$4], , :, [$4])
+else
+    m4_if([$5], , :, [$5])
+fi
+])# _LT_LINKER_OPTION
+
+# Old name:
+AU_ALIAS([AC_LIBTOOL_LINKER_OPTION], [_LT_LINKER_OPTION])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], [])
+
+
+# LT_CMD_MAX_LEN
+#---------------
+AC_DEFUN([LT_CMD_MAX_LEN],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+# find the maximum length of command line arguments
+AC_MSG_CHECKING([the maximum length of command line arguments])
+AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
+  i=0
+  teststring="ABCD"
+
+  case $build_os in
+  msdosdjgpp*)
+    # On DJGPP, this test can blow up pretty badly due to problems in libc
+    # (any single argument exceeding 2000 bytes causes a buffer overrun
+    # during glob expansion).  Even if it were fixed, the result of this
+    # check would be larger than it should be.
+    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
+    ;;
+
+  gnu*)
+    # Under GNU Hurd, this test is not required because there is
+    # no limit to the length of command line arguments.
+    # Libtool will interpret -1 as no limit whatsoever
+    lt_cv_sys_max_cmd_len=-1;
+    ;;
+
+  cygwin* | mingw* | cegcc*)
+    # On Win9x/ME, this test blows up -- it succeeds, but takes
+    # about 5 minutes as the teststring grows exponentially.
+    # Worse, since 9x/ME are not pre-emptively multitasking,
+    # you end up with a "frozen" computer, even though with patience
+    # the test eventually succeeds (with a max line length of 256k).
+    # Instead, let's just punt: use the minimum linelength reported by
+    # all of the supported platforms: 8192 (on NT/2K/XP).
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  amigaos*)
+    # On AmigaOS with pdksh, this test takes hours, literally.
+    # So we just punt and use a minimum line length of 8192.
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+    # This has been around since 386BSD, at least.  Likely further.
+    if test -x /sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
+    elif test -x /usr/sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
+    else
+      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
+    fi
+    # And add a safety zone
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    ;;
+
+  interix*)
+    # We know the value 262144 and hardcode it with a safety zone (like BSD)
+    lt_cv_sys_max_cmd_len=196608
+    ;;
+
+  osf*)
+    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
+    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
+    # nice to cause kernel panics so lets avoid the loop below.
+    # First set a reasonable default.
+    lt_cv_sys_max_cmd_len=16384
+    #
+    if test -x /sbin/sysconfig; then
+      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
+        *1*) lt_cv_sys_max_cmd_len=-1 ;;
+      esac
+    fi
+    ;;
+  sco3.2v5*)
+    lt_cv_sys_max_cmd_len=102400
+    ;;
+  sysv5* | sco5v6* | sysv4.2uw2*)
+    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
+    if test -n "$kargmax"; then
+      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[	 ]]//'`
+    else
+      lt_cv_sys_max_cmd_len=32768
+    fi
+    ;;
+  *)
+    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
+    if test -n "$lt_cv_sys_max_cmd_len"; then
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    else
+      # Make teststring a little bigger before we do anything with it.
+      # a 1K string should be a reasonable start.
+      for i in 1 2 3 4 5 6 7 8 ; do
+        teststring=$teststring$teststring
+      done
+      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+      # If test is not a shell built-in, we'll probably end up computing a
+      # maximum length that is only half of the actual maximum length, but
+      # we can't tell.
+      while { test "X"`$SHELL [$]0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \
+	         = "XX$teststring$teststring"; } >/dev/null 2>&1 &&
+	      test $i != 17 # 1/2 MB should be enough
+      do
+        i=`expr $i + 1`
+        teststring=$teststring$teststring
+      done
+      # Only check the string length outside the loop.
+      lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
+      teststring=
+      # Add a significant safety factor because C++ compilers can tack on
+      # massive amounts of additional arguments before passing them to the
+      # linker.  It appears as though 1/2 is a usable value.
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+    fi
+    ;;
+  esac
+])
+if test -n $lt_cv_sys_max_cmd_len ; then
+  AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
+else
+  AC_MSG_RESULT(none)
+fi
+max_cmd_len=$lt_cv_sys_max_cmd_len
+_LT_DECL([], [max_cmd_len], [0],
+    [What is the maximum length of a command?])
+])# LT_CMD_MAX_LEN
+
+# Old name:
+AU_ALIAS([AC_LIBTOOL_SYS_MAX_CMD_LEN], [LT_CMD_MAX_LEN])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], [])
+
+
+# _LT_HEADER_DLFCN
+# ----------------
+m4_defun([_LT_HEADER_DLFCN],
+[AC_CHECK_HEADERS([dlfcn.h], [], [], [AC_INCLUDES_DEFAULT])dnl
+])# _LT_HEADER_DLFCN
+
+
+# _LT_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
+#                      ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
+# ----------------------------------------------------------------
+m4_defun([_LT_TRY_DLOPEN_SELF],
+[m4_require([_LT_HEADER_DLFCN])dnl
+if test "$cross_compiling" = yes; then :
+  [$4]
+else
+  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+  lt_status=$lt_dlunknown
+  cat > conftest.$ac_ext <<_LT_EOF
+[#line __oline__ "configure"
+#include "confdefs.h"
+
+#if HAVE_DLFCN_H
+#include <dlfcn.h>
+#endif
+
+#include <stdio.h>
+
+#ifdef RTLD_GLOBAL
+#  define LT_DLGLOBAL		RTLD_GLOBAL
+#else
+#  ifdef DL_GLOBAL
+#    define LT_DLGLOBAL		DL_GLOBAL
+#  else
+#    define LT_DLGLOBAL		0
+#  endif
+#endif
+
+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+   find out it does not work in some platform. */
+#ifndef LT_DLLAZY_OR_NOW
+#  ifdef RTLD_LAZY
+#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
+#  else
+#    ifdef DL_LAZY
+#      define LT_DLLAZY_OR_NOW		DL_LAZY
+#    else
+#      ifdef RTLD_NOW
+#        define LT_DLLAZY_OR_NOW	RTLD_NOW
+#      else
+#        ifdef DL_NOW
+#          define LT_DLLAZY_OR_NOW	DL_NOW
+#        else
+#          define LT_DLLAZY_OR_NOW	0
+#        endif
+#      endif
+#    endif
+#  endif
+#endif
+
+void fnord() { int i=42;}
+int main ()
+{
+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+  int status = $lt_dlunknown;
+
+  if (self)
+    {
+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+      /* dlclose (self); */
+    }
+  else
+    puts (dlerror ());
+
+  return status;
+}]
+_LT_EOF
+  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
+    (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
+    lt_status=$?
+    case x$lt_status in
+      x$lt_dlno_uscore) $1 ;;
+      x$lt_dlneed_uscore) $2 ;;
+      x$lt_dlunknown|x*) $3 ;;
+    esac
+  else :
+    # compilation failed
+    $3
+  fi
+fi
+rm -fr conftest*
+])# _LT_TRY_DLOPEN_SELF
+
+
+# LT_SYS_DLOPEN_SELF
+# ------------------
+AC_DEFUN([LT_SYS_DLOPEN_SELF],
+[m4_require([_LT_HEADER_DLFCN])dnl
+if test "x$enable_dlopen" != xyes; then
+  enable_dlopen=unknown
+  enable_dlopen_self=unknown
+  enable_dlopen_self_static=unknown
+else
+  lt_cv_dlopen=no
+  lt_cv_dlopen_libs=
+
+  case $host_os in
+  beos*)
+    lt_cv_dlopen="load_add_on"
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+    ;;
+
+  mingw* | pw32* | cegcc*)
+    lt_cv_dlopen="LoadLibrary"
+    lt_cv_dlopen_libs=
+    ;;
+
+  cygwin*)
+    lt_cv_dlopen="dlopen"
+    lt_cv_dlopen_libs=
+    ;;
+
+  darwin*)
+  # if libdl is installed we need to link against it
+    AC_CHECK_LIB([dl], [dlopen],
+		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
+    lt_cv_dlopen="dyld"
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+    ])
+    ;;
+
+  *)
+    AC_CHECK_FUNC([shl_load],
+	  [lt_cv_dlopen="shl_load"],
+      [AC_CHECK_LIB([dld], [shl_load],
+	    [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
+	[AC_CHECK_FUNC([dlopen],
+	      [lt_cv_dlopen="dlopen"],
+	  [AC_CHECK_LIB([dl], [dlopen],
+		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
+	    [AC_CHECK_LIB([svld], [dlopen],
+		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
+	      [AC_CHECK_LIB([dld], [dld_link],
+		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
+	      ])
+	    ])
+	  ])
+	])
+      ])
+    ;;
+  esac
+
+  if test "x$lt_cv_dlopen" != xno; then
+    enable_dlopen=yes
+  else
+    enable_dlopen=no
+  fi
+
+  case $lt_cv_dlopen in
+  dlopen)
+    save_CPPFLAGS="$CPPFLAGS"
+    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+
+    save_LDFLAGS="$LDFLAGS"
+    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+
+    save_LIBS="$LIBS"
+    LIBS="$lt_cv_dlopen_libs $LIBS"
+
+    AC_CACHE_CHECK([whether a program can dlopen itself],
+	  lt_cv_dlopen_self, [dnl
+	  _LT_TRY_DLOPEN_SELF(
+	    lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
+	    lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
+    ])
+
+    if test "x$lt_cv_dlopen_self" = xyes; then
+      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
+      AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
+	  lt_cv_dlopen_self_static, [dnl
+	  _LT_TRY_DLOPEN_SELF(
+	    lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
+	    lt_cv_dlopen_self_static=no,  lt_cv_dlopen_self_static=cross)
+      ])
+    fi
+
+    CPPFLAGS="$save_CPPFLAGS"
+    LDFLAGS="$save_LDFLAGS"
+    LIBS="$save_LIBS"
+    ;;
+  esac
+
+  case $lt_cv_dlopen_self in
+  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
+  *) enable_dlopen_self=unknown ;;
+  esac
+
+  case $lt_cv_dlopen_self_static in
+  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
+  *) enable_dlopen_self_static=unknown ;;
+  esac
+fi
+_LT_DECL([dlopen_support], [enable_dlopen], [0],
+	 [Whether dlopen is supported])
+_LT_DECL([dlopen_self], [enable_dlopen_self], [0],
+	 [Whether dlopen of programs is supported])
+_LT_DECL([dlopen_self_static], [enable_dlopen_self_static], [0],
+	 [Whether dlopen of statically linked programs is supported])
+])# LT_SYS_DLOPEN_SELF
+
+# Old name:
+AU_ALIAS([AC_LIBTOOL_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], [])
+
+
+# _LT_COMPILER_C_O([TAGNAME])
+# ---------------------------
+# Check to see if options -c and -o are simultaneously supported by compiler.
+# This macro does not hard code the compiler like AC_PROG_CC_C_O.
+m4_defun([_LT_COMPILER_C_O],
+[m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_TAG_COMPILER])dnl
+AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
+  [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
+  [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
+   $RM -r conftest 2>/dev/null
+   mkdir conftest
+   cd conftest
+   mkdir out
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+   lt_compiler_flag="-o out/conftest2.$ac_objext"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+   (eval "$lt_compile" 2>out/conftest.err)
+   ac_status=$?
+   cat out/conftest.err >&AS_MESSAGE_LOG_FD
+   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
+   then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+       _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+     fi
+   fi
+   chmod u+w . 2>&AS_MESSAGE_LOG_FD
+   $RM conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
+   $RM out/* && rmdir out
+   cd ..
+   $RM -r conftest
+   $RM conftest*
+])
+_LT_TAGDECL([compiler_c_o], [lt_cv_prog_compiler_c_o], [1],
+	[Does compiler simultaneously support -c and -o options?])
+])# _LT_COMPILER_C_O
+
+
+# _LT_COMPILER_FILE_LOCKS([TAGNAME])
+# ----------------------------------
+# Check to see if we can do hard links to lock some files if needed
+m4_defun([_LT_COMPILER_FILE_LOCKS],
+[m4_require([_LT_ENABLE_LOCK])dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+_LT_COMPILER_C_O([$1])
+
+hard_links="nottested"
+if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
+  # do not overwrite the value of need_locks provided by the user
+  AC_MSG_CHECKING([if we can lock with hard links])
+  hard_links=yes
+  $RM conftest*
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  touch conftest.a
+  ln conftest.a conftest.b 2>&5 || hard_links=no
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  AC_MSG_RESULT([$hard_links])
+  if test "$hard_links" = no; then
+    AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
+    need_locks=warn
+  fi
+else
+  need_locks=no
+fi
+_LT_DECL([], [need_locks], [1], [Must we lock files when doing compilation?])
+])# _LT_COMPILER_FILE_LOCKS
+
+
+# _LT_CHECK_OBJDIR
+# ----------------
+m4_defun([_LT_CHECK_OBJDIR],
+[AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
+[rm -f .libs 2>/dev/null
+mkdir .libs 2>/dev/null
+if test -d .libs; then
+  lt_cv_objdir=.libs
+else
+  # MS-DOS does not allow filenames that begin with a dot.
+  lt_cv_objdir=_libs
+fi
+rmdir .libs 2>/dev/null])
+objdir=$lt_cv_objdir
+_LT_DECL([], [objdir], [0],
+         [The name of the directory that contains temporary libtool files])dnl
+m4_pattern_allow([LT_OBJDIR])dnl
+AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/",
+  [Define to the sub-directory in which libtool stores uninstalled libraries.])
+])# _LT_CHECK_OBJDIR
+
+
+# _LT_LINKER_HARDCODE_LIBPATH([TAGNAME])
+# --------------------------------------
+# Check hardcoding attributes.
+m4_defun([_LT_LINKER_HARDCODE_LIBPATH],
+[AC_MSG_CHECKING([how to hardcode library paths into programs])
+_LT_TAGVAR(hardcode_action, $1)=
+if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" ||
+   test -n "$_LT_TAGVAR(runpath_var, $1)" ||
+   test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
+
+  # We can hardcode non-existent directories.
+  if test "$_LT_TAGVAR(hardcode_direct, $1)" != no &&
+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
+     # have to relink, otherwise we might link with an installed library
+     # when we should be linking with a yet-to-be-installed one
+     ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
+     test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then
+    # Linking always hardcodes the temporary library directory.
+    _LT_TAGVAR(hardcode_action, $1)=relink
+  else
+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
+    _LT_TAGVAR(hardcode_action, $1)=immediate
+  fi
+else
+  # We cannot hardcode anything, or else we can only hardcode existing
+  # directories.
+  _LT_TAGVAR(hardcode_action, $1)=unsupported
+fi
+AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)])
+
+if test "$_LT_TAGVAR(hardcode_action, $1)" = relink ||
+   test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then
+  # Fast installation is not supported
+  enable_fast_install=no
+elif test "$shlibpath_overrides_runpath" = yes ||
+     test "$enable_shared" = no; then
+  # Fast installation is not necessary
+  enable_fast_install=needless
+fi
+_LT_TAGDECL([], [hardcode_action], [0],
+    [How to hardcode a shared library path into an executable])
+])# _LT_LINKER_HARDCODE_LIBPATH
+
+
+# _LT_CMD_STRIPLIB
+# ----------------
+m4_defun([_LT_CMD_STRIPLIB],
+[m4_require([_LT_DECL_EGREP])
+striplib=
+old_striplib=
+AC_MSG_CHECKING([whether stripping libraries is possible])
+if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
+  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+  AC_MSG_RESULT([yes])
+else
+# FIXME - insert some real tests, host_os isn't really good enough
+  case $host_os in
+  darwin*)
+    if test -n "$STRIP" ; then
+      striplib="$STRIP -x"
+      old_striplib="$STRIP -S"
+      AC_MSG_RESULT([yes])
+    else
+      AC_MSG_RESULT([no])
+    fi
+    ;;
+  *)
+    AC_MSG_RESULT([no])
+    ;;
+  esac
+fi
+_LT_DECL([], [old_striplib], [1], [Commands to strip libraries])
+_LT_DECL([], [striplib], [1])
+])# _LT_CMD_STRIPLIB
+
+
+# _LT_SYS_DYNAMIC_LINKER([TAG])
+# -----------------------------
+# PORTME Fill in your ld.so characteristics
+m4_defun([_LT_SYS_DYNAMIC_LINKER],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_OBJDUMP])dnl
+m4_require([_LT_DECL_SED])dnl
+AC_MSG_CHECKING([dynamic linker characteristics])
+m4_if([$1],
+	[], [
+if test "$GCC" = yes; then
+  case $host_os in
+    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
+    *) lt_awk_arg="/^libraries:/" ;;
+  esac
+  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+  if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then
+    # if the path contains ";" then we assume it to be the separator
+    # otherwise default to the standard path separator (i.e. ":") - it is
+    # assumed that no part of a normal pathname contains ";" but that should
+    # okay in the real world where ";" in dirpaths is itself problematic.
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'`
+  else
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+  fi
+  # Ok, now we have the path, separated by spaces, we can step through it
+  # and add multilib dir if necessary.
+  lt_tmp_lt_search_path_spec=
+  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+  for lt_sys_path in $lt_search_path_spec; do
+    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
+      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
+    else
+      test -d "$lt_sys_path" && \
+	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
+    fi
+  done
+  lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk '
+BEGIN {RS=" "; FS="/|\n";} {
+  lt_foo="";
+  lt_count=0;
+  for (lt_i = NF; lt_i > 0; lt_i--) {
+    if ($lt_i != "" && $lt_i != ".") {
+      if ($lt_i == "..") {
+        lt_count++;
+      } else {
+        if (lt_count == 0) {
+          lt_foo="/" $lt_i lt_foo;
+        } else {
+          lt_count--;
+        }
+      }
+    }
+  }
+  if (lt_foo != "") { lt_freq[[lt_foo]]++; }
+  if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
+}'`
+  sys_lib_search_path_spec=`$ECHO $lt_search_path_spec`
+else
+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+fi])
+library_names_spec=
+libname_spec='lib$name'
+soname_spec=
+shrext_cmds=".so"
+postinstall_cmds=
+postuninstall_cmds=
+finish_cmds=
+finish_eval=
+shlibpath_var=
+shlibpath_overrides_runpath=unknown
+version_type=none
+dynamic_linker="$host_os ld.so"
+sys_lib_dlsearch_path_spec="/lib /usr/lib"
+need_lib_prefix=unknown
+hardcode_into_libs=no
+
+# when you set need_version to no, make sure it does not cause -set_version
+# flags to be left without arguments
+need_version=unknown
+
+case $host_os in
+aix3*)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+  shlibpath_var=LIBPATH
+
+  # AIX 3 has no versioning support, so we append a major version to the name.
+  soname_spec='${libname}${release}${shared_ext}$major'
+  ;;
+
+aix[[4-9]]*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  hardcode_into_libs=yes
+  if test "$host_cpu" = ia64; then
+    # AIX 5 supports IA64
+    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
+    shlibpath_var=LD_LIBRARY_PATH
+  else
+    # With GCC up to 2.95.x, collect2 would create an import file
+    # for dependence libraries.  The import file would start with
+    # the line `#! .'.  This would cause the generated library to
+    # depend on `.', always an invalid library.  This was fixed in
+    # development snapshots of GCC prior to 3.0.
+    case $host_os in
+      aix4 | aix4.[[01]] | aix4.[[01]].*)
+      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
+	   echo ' yes '
+	   echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
+	:
+      else
+	can_build_shared=no
+      fi
+      ;;
+    esac
+    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
+    # soname into executable. Probably we can add versioning support to
+    # collect2, so additional links can be useful in future.
+    if test "$aix_use_runtimelinking" = yes; then
+      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
+      # instead of lib<name>.a to let people know that these are not
+      # typical AIX shared libraries.
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    else
+      # We preserve .a as extension for shared libraries through AIX4.2
+      # and later when we are not doing run time linking.
+      library_names_spec='${libname}${release}.a $libname.a'
+      soname_spec='${libname}${release}${shared_ext}$major'
+    fi
+    shlibpath_var=LIBPATH
+  fi
+  ;;
+
+amigaos*)
+  case $host_cpu in
+  powerpc)
+    # Since July 2007 AmigaOS4 officially supports .so libraries.
+    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    ;;
+  m68k)
+    library_names_spec='$libname.ixlibrary $libname.a'
+    # Create ${libname}_ixlibrary.a entries in /sys/libs.
+    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+    ;;
+  esac
+  ;;
+
+beos*)
+  library_names_spec='${libname}${shared_ext}'
+  dynamic_linker="$host_os ld.so"
+  shlibpath_var=LIBRARY_PATH
+  ;;
+
+bsdi[[45]]*)
+  version_type=linux
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
+  # the default ld.so.conf also contains /usr/contrib/lib and
+  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
+  # libtool to hard-code these into programs
+  ;;
+
+cygwin* | mingw* | pw32* | cegcc*)
+  version_type=windows
+  shrext_cmds=".dll"
+  need_version=no
+  need_lib_prefix=no
+
+  case $GCC,$host_os in
+  yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
+    library_names_spec='$libname.dll.a'
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \${file}`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname~
+      chmod a+x \$dldir/$dlname~
+      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+      fi'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
+
+    case $host_os in
+    cygwin*)
+      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
+      ;;
+    mingw* | cegcc*)
+      # MinGW DLLs use traditional 'lib' prefix
+      soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+      sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+      if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
+        # It is most probably a Windows format PATH printed by
+        # mingw gcc, but we are running on Cygwin. Gcc prints its search
+        # path with ; separators, and with drive letters. We can handle the
+        # drive letters (cygwin fileutils understands them), so leave them,
+        # especially as we might pass files found there to a mingw objdump,
+        # which wouldn't understand a cygwinified path. Ahh.
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+      else
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+      fi
+      ;;
+    pw32*)
+      # pw32 DLLs use 'pw' prefix rather than 'lib'
+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+      ;;
+    esac
+    ;;
+
+  *)
+    library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
+    ;;
+  esac
+  dynamic_linker='Win32 ld.exe'
+  # FIXME: first we should search . and the directory the executable is in
+  shlibpath_var=PATH
+  ;;
+
+darwin* | rhapsody*)
+  dynamic_linker="$host_os dyld"
+  version_type=darwin
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
+  soname_spec='${libname}${release}${major}$shared_ext'
+  shlibpath_overrides_runpath=yes
+  shlibpath_var=DYLD_LIBRARY_PATH
+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+m4_if([$1], [],[
+  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"])
+  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+  ;;
+
+dgux*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+freebsd1*)
+  dynamic_linker=no
+  ;;
+
+freebsd* | dragonfly*)
+  # DragonFly does not have aout.  When/if they implement a new
+  # versioning mechanism, adjust this.
+  if test -x /usr/bin/objformat; then
+    objformat=`/usr/bin/objformat`
+  else
+    case $host_os in
+    freebsd[[123]]*) objformat=aout ;;
+    *) objformat=elf ;;
+    esac
+  fi
+  version_type=freebsd-$objformat
+  case $version_type in
+    freebsd-elf*)
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+      need_version=no
+      need_lib_prefix=no
+      ;;
+    freebsd-*)
+      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+      need_version=yes
+      ;;
+  esac
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_os in
+  freebsd2*)
+    shlibpath_overrides_runpath=yes
+    ;;
+  freebsd3.[[01]]* | freebsdelf3.[[01]]*)
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \
+  freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1)
+    shlibpath_overrides_runpath=no
+    hardcode_into_libs=yes
+    ;;
+  *) # from 4.6 on, and DragonFly
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  esac
+  ;;
+
+gnu*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  hardcode_into_libs=yes
+  ;;
+
+hpux9* | hpux10* | hpux11*)
+  # Give a soname corresponding to the major version so that dld.sl refuses to
+  # link against other versions.
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  case $host_cpu in
+  ia64*)
+    shrext_cmds='.so'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.so"
+    shlibpath_var=LD_LIBRARY_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    if test "X$HPUX_IA64_MODE" = X32; then
+      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+    else
+      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+    fi
+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+    ;;
+  hppa*64*)
+    shrext_cmds='.sl'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+    ;;
+  *)
+    shrext_cmds='.sl'
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=SHLIB_PATH
+    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    ;;
+  esac
+  # HP-UX runs *really* slowly unless shared libraries are mode 555.
+  postinstall_cmds='chmod 555 $lib'
+  ;;
+
+interix[[3-9]]*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $host_os in
+    nonstopux*) version_type=nonstopux ;;
+    *)
+	if test "$lt_cv_prog_gnu_ld" = yes; then
+		version_type=linux
+	else
+		version_type=irix
+	fi ;;
+  esac
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
+  case $host_os in
+  irix5* | nonstopux*)
+    libsuff= shlibsuff=
+    ;;
+  *)
+    case $LD in # libtool.m4 will add one of these switches to LD
+    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
+      libsuff= shlibsuff= libmagic=32-bit;;
+    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
+      libsuff=32 shlibsuff=N32 libmagic=N32;;
+    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
+      libsuff=64 shlibsuff=64 libmagic=64-bit;;
+    *) libsuff= shlibsuff= libmagic=never-match;;
+    esac
+    ;;
+  esac
+  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
+  shlibpath_overrides_runpath=no
+  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+  hardcode_into_libs=yes
+  ;;
+
+# No shared lib support for Linux oldld, aout, or coff.
+linux*oldld* | linux*aout* | linux*coff*)
+  dynamic_linker=no
+  ;;
+
+# This must be Linux ELF.
+linux* | k*bsd*-gnu)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  # Some binutils ld are patched to set DT_RUNPATH
+  save_LDFLAGS=$LDFLAGS
+  save_libdir=$libdir
+  eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
+       LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
+  AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
+    [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],
+       [shlibpath_overrides_runpath=yes])])
+  LDFLAGS=$save_LDFLAGS
+  libdir=$save_libdir
+
+  # This implies no fast_install, which is unacceptable.
+  # Some rework will be needed to allow for fast_install
+  # before this can be enabled.
+  hardcode_into_libs=yes
+
+  # Add ABI-specific directories to the system library path.
+  sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
+
+  # Append ld.so.conf contents to the search path
+  if test -f /etc/ld.so.conf; then
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
+  fi
+
+  # We used to test for /lib/ld.so.1 and disable shared libraries on
+  # powerpc, because MkLinux only supported shared libraries with the
+  # GNU dynamic linker.  Since this was broken with cross compilers,
+  # most powerpc-linux boxes support dynamic linking these days and
+  # people can always --disable-shared, the test was removed, and we
+  # assume the GNU/Linux dynamic linker is in use.
+  dynamic_linker='GNU/Linux ld.so'
+  ;;
+
+netbsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+    dynamic_linker='NetBSD (a.out) ld.so'
+  else
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    dynamic_linker='NetBSD ld.elf_so'
+  fi
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  ;;
+
+newsos6)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
+*nto* | *qnx*)
+  version_type=qnx
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='ldqnx.so'
+  ;;
+
+openbsd*)
+  version_type=sunos
+  sys_lib_dlsearch_path_spec="/usr/lib"
+  need_lib_prefix=no
+  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
+  case $host_os in
+    openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
+    *)				need_version=no  ;;
+  esac
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+    case $host_os in
+      openbsd2.[[89]] | openbsd2.[[89]].*)
+	shlibpath_overrides_runpath=no
+	;;
+      *)
+	shlibpath_overrides_runpath=yes
+	;;
+      esac
+  else
+    shlibpath_overrides_runpath=yes
+  fi
+  ;;
+
+os2*)
+  libname_spec='$name'
+  shrext_cmds=".dll"
+  need_lib_prefix=no
+  library_names_spec='$libname${shared_ext} $libname.a'
+  dynamic_linker='OS/2 ld.exe'
+  shlibpath_var=LIBPATH
+  ;;
+
+osf3* | osf4* | osf5*)
+  version_type=osf
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+  ;;
+
+rdos*)
+  dynamic_linker=no
+  ;;
+
+solaris*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  # ldd complains unless libraries are executable
+  postinstall_cmds='chmod +x $lib'
+  ;;
+
+sunos4*)
+  version_type=sunos
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  if test "$with_gnu_ld" = yes; then
+    need_lib_prefix=no
+  fi
+  need_version=yes
+  ;;
+
+sysv4 | sysv4.3*)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_vendor in
+    sni)
+      shlibpath_overrides_runpath=no
+      need_lib_prefix=no
+      runpath_var=LD_RUN_PATH
+      ;;
+    siemens)
+      need_lib_prefix=no
+      ;;
+    motorola)
+      need_lib_prefix=no
+      need_version=no
+      shlibpath_overrides_runpath=no
+      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+      ;;
+  esac
+  ;;
+
+sysv4*MP*)
+  if test -d /usr/nec ;then
+    version_type=linux
+    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
+    soname_spec='$libname${shared_ext}.$major'
+    shlibpath_var=LD_LIBRARY_PATH
+  fi
+  ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  version_type=freebsd-elf
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  if test "$with_gnu_ld" = yes; then
+    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+  else
+    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+    case $host_os in
+      sco3.2v5*)
+        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+	;;
+    esac
+  fi
+  sys_lib_dlsearch_path_spec='/usr/lib'
+  ;;
+
+tpf*)
+  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+uts4*)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+*)
+  dynamic_linker=no
+  ;;
+esac
+AC_MSG_RESULT([$dynamic_linker])
+test "$dynamic_linker" = no && can_build_shared=no
+
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+fi
+
+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
+  sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+fi
+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
+  sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+fi
+
+_LT_DECL([], [variables_saved_for_relink], [1],
+    [Variables whose values should be saved in libtool wrapper scripts and
+    restored at link time])
+_LT_DECL([], [need_lib_prefix], [0],
+    [Do we need the "lib" prefix for modules?])
+_LT_DECL([], [need_version], [0], [Do we need a version for libraries?])
+_LT_DECL([], [version_type], [0], [Library versioning type])
+_LT_DECL([], [runpath_var], [0],  [Shared library runtime path variable])
+_LT_DECL([], [shlibpath_var], [0],[Shared library path variable])
+_LT_DECL([], [shlibpath_overrides_runpath], [0],
+    [Is shlibpath searched before the hard-coded library search path?])
+_LT_DECL([], [libname_spec], [1], [Format of library name prefix])
+_LT_DECL([], [library_names_spec], [1],
+    [[List of archive names.  First name is the real one, the rest are links.
+    The last name is the one that the linker finds with -lNAME]])
+_LT_DECL([], [soname_spec], [1],
+    [[The coded name of the library, if different from the real name]])
+_LT_DECL([], [postinstall_cmds], [2],
+    [Command to use after installation of a shared archive])
+_LT_DECL([], [postuninstall_cmds], [2],
+    [Command to use after uninstallation of a shared archive])
+_LT_DECL([], [finish_cmds], [2],
+    [Commands used to finish a libtool library installation in a directory])
+_LT_DECL([], [finish_eval], [1],
+    [[As "finish_cmds", except a single script fragment to be evaled but
+    not shown]])
+_LT_DECL([], [hardcode_into_libs], [0],
+    [Whether we should hardcode library paths into libraries])
+_LT_DECL([], [sys_lib_search_path_spec], [2],
+    [Compile-time system search path for libraries])
+_LT_DECL([], [sys_lib_dlsearch_path_spec], [2],
+    [Run-time system search path for libraries])
+])# _LT_SYS_DYNAMIC_LINKER
+
+
+# _LT_PATH_TOOL_PREFIX(TOOL)
+# --------------------------
+# find a file program which can recognize shared library
+AC_DEFUN([_LT_PATH_TOOL_PREFIX],
+[m4_require([_LT_DECL_EGREP])dnl
+AC_MSG_CHECKING([for $1])
+AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
+[case $MAGIC_CMD in
+[[\\/*] |  ?:[\\/]*])
+  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+  ;;
+*)
+  lt_save_MAGIC_CMD="$MAGIC_CMD"
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+dnl $ac_dummy forces splitting on constant user-supplied paths.
+dnl POSIX.2 word splitting is done only on the output of word expansions,
+dnl not every word.  This closes a longstanding sh security hole.
+  ac_dummy="m4_if([$2], , $PATH, [$2])"
+  for ac_dir in $ac_dummy; do
+    IFS="$lt_save_ifs"
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$1; then
+      lt_cv_path_MAGIC_CMD="$ac_dir/$1"
+      if test -n "$file_magic_test_file"; then
+	case $deplibs_check_method in
+	"file_magic "*)
+	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
+	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+	    $EGREP "$file_magic_regex" > /dev/null; then
+	    :
+	  else
+	    cat <<_LT_EOF 1>&2
+
+*** Warning: the command libtool uses to detect shared libraries,
+*** $file_magic_cmd, produces output that libtool cannot recognize.
+*** The result is that libtool may fail to recognize shared libraries
+*** as such.  This will affect the creation of libtool libraries that
+*** depend on shared libraries, but programs linked with such libtool
+*** libraries will work regardless of this problem.  Nevertheless, you
+*** may want to report the problem to your system manager and/or to
+*** bug-libtool@gnu.org
+
+_LT_EOF
+	  fi ;;
+	esac
+      fi
+      break
+    fi
+  done
+  IFS="$lt_save_ifs"
+  MAGIC_CMD="$lt_save_MAGIC_CMD"
+  ;;
+esac])
+MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+if test -n "$MAGIC_CMD"; then
+  AC_MSG_RESULT($MAGIC_CMD)
+else
+  AC_MSG_RESULT(no)
+fi
+_LT_DECL([], [MAGIC_CMD], [0],
+	 [Used to examine libraries when file_magic_cmd begins with "file"])dnl
+])# _LT_PATH_TOOL_PREFIX
+
+# Old name:
+AU_ALIAS([AC_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], [])
+
+
+# _LT_PATH_MAGIC
+# --------------
+# find a file program which can recognize a shared library
+m4_defun([_LT_PATH_MAGIC],
+[_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
+if test -z "$lt_cv_path_MAGIC_CMD"; then
+  if test -n "$ac_tool_prefix"; then
+    _LT_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
+  else
+    MAGIC_CMD=:
+  fi
+fi
+])# _LT_PATH_MAGIC
+
+
+# LT_PATH_LD
+# ----------
+# find the pathname to the GNU or non-GNU linker
+AC_DEFUN([LT_PATH_LD],
+[AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_DECL_EGREP])dnl
+
+AC_ARG_WITH([gnu-ld],
+    [AS_HELP_STRING([--with-gnu-ld],
+	[assume the C compiler uses GNU ld @<:@default=no@:>@])],
+    [test "$withval" = no || with_gnu_ld=yes],
+    [with_gnu_ld=no])dnl
+
+ac_prog=ld
+if test "$GCC" = yes; then
+  # Check if gcc -print-prog-name=ld gives a path.
+  AC_MSG_CHECKING([for ld used by $CC])
+  case $host in
+  *-*-mingw*)
+    # gcc leaves a trailing carriage return which upsets mingw
+    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+  *)
+    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+  esac
+  case $ac_prog in
+    # Accept absolute paths.
+    [[\\/]]* | ?:[[\\/]]*)
+      re_direlt='/[[^/]][[^/]]*/\.\./'
+      # Canonicalize the pathname of ld
+      ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
+      while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
+	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
+      done
+      test -z "$LD" && LD="$ac_prog"
+      ;;
+  "")
+    # If it fails, then pretend we aren't using GCC.
+    ac_prog=ld
+    ;;
+  *)
+    # If it is relative, then search for the first ld in PATH.
+    with_gnu_ld=unknown
+    ;;
+  esac
+elif test "$with_gnu_ld" = yes; then
+  AC_MSG_CHECKING([for GNU ld])
+else
+  AC_MSG_CHECKING([for non-GNU ld])
+fi
+AC_CACHE_VAL(lt_cv_path_LD,
+[if test -z "$LD"; then
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  for ac_dir in $PATH; do
+    IFS="$lt_save_ifs"
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+      lt_cv_path_LD="$ac_dir/$ac_prog"
+      # Check to see if the program is GNU ld.  I'd rather use --version,
+      # but apparently some variants of GNU ld only accept -v.
+      # Break only if it was the GNU/non-GNU ld that we prefer.
+      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+      *GNU* | *'with BFD'*)
+	test "$with_gnu_ld" != no && break
+	;;
+      *)
+	test "$with_gnu_ld" != yes && break
+	;;
+      esac
+    fi
+  done
+  IFS="$lt_save_ifs"
+else
+  lt_cv_path_LD="$LD" # Let the user override the test with a path.
+fi])
+LD="$lt_cv_path_LD"
+if test -n "$LD"; then
+  AC_MSG_RESULT($LD)
+else
+  AC_MSG_RESULT(no)
+fi
+test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
+_LT_PATH_LD_GNU
+AC_SUBST([LD])
+
+_LT_TAGDECL([], [LD], [1], [The linker used to build libraries])
+])# LT_PATH_LD
+
+# Old names:
+AU_ALIAS([AM_PROG_LD], [LT_PATH_LD])
+AU_ALIAS([AC_PROG_LD], [LT_PATH_LD])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AM_PROG_LD], [])
+dnl AC_DEFUN([AC_PROG_LD], [])
+
+
+# _LT_PATH_LD_GNU
+#- --------------
+m4_defun([_LT_PATH_LD_GNU],
+[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
+[# I'd rather use --version here, but apparently some GNU lds only accept -v.
+case `$LD -v 2>&1 </dev/null` in
+*GNU* | *'with BFD'*)
+  lt_cv_prog_gnu_ld=yes
+  ;;
+*)
+  lt_cv_prog_gnu_ld=no
+  ;;
+esac])
+with_gnu_ld=$lt_cv_prog_gnu_ld
+])# _LT_PATH_LD_GNU
+
+
+# _LT_CMD_RELOAD
+# --------------
+# find reload flag for linker
+#   -- PORTME Some linkers may need a different reload flag.
+m4_defun([_LT_CMD_RELOAD],
+[AC_CACHE_CHECK([for $LD option to reload object files],
+  lt_cv_ld_reload_flag,
+  [lt_cv_ld_reload_flag='-r'])
+reload_flag=$lt_cv_ld_reload_flag
+case $reload_flag in
+"" | " "*) ;;
+*) reload_flag=" $reload_flag" ;;
+esac
+reload_cmds='$LD$reload_flag -o $output$reload_objs'
+case $host_os in
+  darwin*)
+    if test "$GCC" = yes; then
+      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
+    else
+      reload_cmds='$LD$reload_flag -o $output$reload_objs'
+    fi
+    ;;
+esac
+_LT_DECL([], [reload_flag], [1], [How to create reloadable object files])dnl
+_LT_DECL([], [reload_cmds], [2])dnl
+])# _LT_CMD_RELOAD
+
+
+# _LT_CHECK_MAGIC_METHOD
+# ----------------------
+# how to check for library dependencies
+#  -- PORTME fill in with the dynamic library characteristics
+m4_defun([_LT_CHECK_MAGIC_METHOD],
+[m4_require([_LT_DECL_EGREP])
+m4_require([_LT_DECL_OBJDUMP])
+AC_CACHE_CHECK([how to recognize dependent libraries],
+lt_cv_deplibs_check_method,
+[lt_cv_file_magic_cmd='$MAGIC_CMD'
+lt_cv_file_magic_test_file=
+lt_cv_deplibs_check_method='unknown'
+# Need to set the preceding variable on all platforms that support
+# interlibrary dependencies.
+# 'none' -- dependencies not supported.
+# `unknown' -- same as none, but documents that we really don't know.
+# 'pass_all' -- all dependencies passed with no checks.
+# 'test_compile' -- check by making test program.
+# 'file_magic [[regex]]' -- check by looking for files in library path
+# which responds to the $file_magic_cmd with a given extended regex.
+# If you have `file' or equivalent on your system and you're not sure
+# whether `pass_all' will *always* work, you probably want this one.
+
+case $host_os in
+aix[[4-9]]*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+beos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+bsdi[[45]]*)
+  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
+  lt_cv_file_magic_cmd='/usr/bin/file -L'
+  lt_cv_file_magic_test_file=/shlib/libc.so
+  ;;
+
+cygwin*)
+  # func_win32_libid is a shell function defined in ltmain.sh
+  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+  lt_cv_file_magic_cmd='func_win32_libid'
+  ;;
+
+mingw* | pw32*)
+  # Base MSYS/MinGW do not provide the 'file' command needed by
+  # func_win32_libid shell function, so use a weaker test based on 'objdump',
+  # unless we find 'file', for example because we are cross-compiling.
+  if ( file / ) >/dev/null 2>&1; then
+    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+    lt_cv_file_magic_cmd='func_win32_libid'
+  else
+    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+    lt_cv_file_magic_cmd='$OBJDUMP -f'
+  fi
+  ;;
+
+cegcc)
+  # use the weaker test based on 'objdump'. See mingw*.
+  lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
+  lt_cv_file_magic_cmd='$OBJDUMP -f'
+  ;;
+
+darwin* | rhapsody*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+freebsd* | dragonfly*)
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+    case $host_cpu in
+    i*86 )
+      # Not sure whether the presence of OpenBSD here was a mistake.
+      # Let's accept both of them until this is cleared up.
+      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
+      lt_cv_file_magic_cmd=/usr/bin/file
+      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+      ;;
+    esac
+  else
+    lt_cv_deplibs_check_method=pass_all
+  fi
+  ;;
+
+gnu*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+hpux10.20* | hpux11*)
+  lt_cv_file_magic_cmd=/usr/bin/file
+  case $host_cpu in
+  ia64*)
+    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
+    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
+    ;;
+  hppa*64*)
+    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]']
+    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
+    ;;
+  *)
+    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
+    lt_cv_file_magic_test_file=/usr/lib/libc.sl
+    ;;
+  esac
+  ;;
+
+interix[[3-9]]*)
+  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
+  lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $LD in
+  *-32|*"-32 ") libmagic=32-bit;;
+  *-n32|*"-n32 ") libmagic=N32;;
+  *-64|*"-64 ") libmagic=64-bit;;
+  *) libmagic=never-match;;
+  esac
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+# This must be Linux ELF.
+linux* | k*bsd*-gnu)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+netbsd*)
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+  else
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
+  fi
+  ;;
+
+newos6*)
+  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
+  lt_cv_file_magic_cmd=/usr/bin/file
+  lt_cv_file_magic_test_file=/usr/lib/libnls.so
+  ;;
+
+*nto* | *qnx*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+openbsd*)
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
+  else
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+  fi
+  ;;
+
+osf3* | osf4* | osf5*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+rdos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+solaris*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+sysv4 | sysv4.3*)
+  case $host_vendor in
+  motorola)
+    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
+    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
+    ;;
+  ncr)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  sequent)
+    lt_cv_file_magic_cmd='/bin/file'
+    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
+    ;;
+  sni)
+    lt_cv_file_magic_cmd='/bin/file'
+    lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
+    lt_cv_file_magic_test_file=/lib/libc.so
+    ;;
+  siemens)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  pc)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  esac
+  ;;
+
+tpf*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+esac
+])
+file_magic_cmd=$lt_cv_file_magic_cmd
+deplibs_check_method=$lt_cv_deplibs_check_method
+test -z "$deplibs_check_method" && deplibs_check_method=unknown
+
+_LT_DECL([], [deplibs_check_method], [1],
+    [Method to check whether dependent libraries are shared objects])
+_LT_DECL([], [file_magic_cmd], [1],
+    [Command to use when deplibs_check_method == "file_magic"])
+])# _LT_CHECK_MAGIC_METHOD
+
+
+# LT_PATH_NM
+# ----------
+# find the pathname to a BSD- or MS-compatible name lister
+AC_DEFUN([LT_PATH_NM],
+[AC_REQUIRE([AC_PROG_CC])dnl
+AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM,
+[if test -n "$NM"; then
+  # Let the user override the test.
+  lt_cv_path_NM="$NM"
+else
+  lt_nm_to_check="${ac_tool_prefix}nm"
+  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
+    lt_nm_to_check="$lt_nm_to_check nm"
+  fi
+  for lt_tmp_nm in $lt_nm_to_check; do
+    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
+      IFS="$lt_save_ifs"
+      test -z "$ac_dir" && ac_dir=.
+      tmp_nm="$ac_dir/$lt_tmp_nm"
+      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
+	# Check to see if the nm accepts a BSD-compat flag.
+	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
+	#   nm: unknown option "B" ignored
+	# Tru64's nm complains that /dev/null is an invalid object file
+	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
+	*/dev/null* | *'Invalid file or object type'*)
+	  lt_cv_path_NM="$tmp_nm -B"
+	  break
+	  ;;
+	*)
+	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+	  */dev/null*)
+	    lt_cv_path_NM="$tmp_nm -p"
+	    break
+	    ;;
+	  *)
+	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+	    continue # so that we can try to find one that supports BSD flags
+	    ;;
+	  esac
+	  ;;
+	esac
+      fi
+    done
+    IFS="$lt_save_ifs"
+  done
+  : ${lt_cv_path_NM=no}
+fi])
+if test "$lt_cv_path_NM" != "no"; then
+  NM="$lt_cv_path_NM"
+else
+  # Didn't find any BSD compatible name lister, look for dumpbin.
+  AC_CHECK_TOOLS(DUMPBIN, ["dumpbin -symbols" "link -dump -symbols"], :)
+  AC_SUBST([DUMPBIN])
+  if test "$DUMPBIN" != ":"; then
+    NM="$DUMPBIN"
+  fi
+fi
+test -z "$NM" && NM=nm
+AC_SUBST([NM])
+_LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl
+
+AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface],
+  [lt_cv_nm_interface="BSD nm"
+  echo "int some_variable = 0;" > conftest.$ac_ext
+  (eval echo "\"\$as_me:__oline__: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
+  (eval "$ac_compile" 2>conftest.err)
+  cat conftest.err >&AS_MESSAGE_LOG_FD
+  (eval echo "\"\$as_me:__oline__: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
+  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
+  cat conftest.err >&AS_MESSAGE_LOG_FD
+  (eval echo "\"\$as_me:__oline__: output\"" >&AS_MESSAGE_LOG_FD)
+  cat conftest.out >&AS_MESSAGE_LOG_FD
+  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
+    lt_cv_nm_interface="MS dumpbin"
+  fi
+  rm -f conftest*])
+])# LT_PATH_NM
+
+# Old names:
+AU_ALIAS([AM_PROG_NM], [LT_PATH_NM])
+AU_ALIAS([AC_PROG_NM], [LT_PATH_NM])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AM_PROG_NM], [])
+dnl AC_DEFUN([AC_PROG_NM], [])
+
+
+# LT_LIB_M
+# --------
+# check for math library
+AC_DEFUN([LT_LIB_M],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+LIBM=
+case $host in
+*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
+  # These system don't have libm, or don't need it
+  ;;
+*-ncr-sysv4.3*)
+  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
+  AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
+  ;;
+*)
+  AC_CHECK_LIB(m, cos, LIBM="-lm")
+  ;;
+esac
+AC_SUBST([LIBM])
+])# LT_LIB_M
+
+# Old name:
+AU_ALIAS([AC_CHECK_LIBM], [LT_LIB_M])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_CHECK_LIBM], [])
+
+
+# _LT_COMPILER_NO_RTTI([TAGNAME])
+# -------------------------------
+m4_defun([_LT_COMPILER_NO_RTTI],
+[m4_require([_LT_TAG_COMPILER])dnl
+
+_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
+
+if test "$GCC" = yes; then
+  _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
+
+  _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
+    lt_cv_prog_compiler_rtti_exceptions,
+    [-fno-rtti -fno-exceptions], [],
+    [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
+fi
+_LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1],
+	[Compiler flag to turn off builtin functions])
+])# _LT_COMPILER_NO_RTTI
+
+
+# _LT_CMD_GLOBAL_SYMBOLS
+# ----------------------
+m4_defun([_LT_CMD_GLOBAL_SYMBOLS],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([LT_PATH_NM])dnl
+AC_REQUIRE([LT_PATH_LD])dnl
+m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_TAG_COMPILER])dnl
+
+# Check for command to grab the raw symbol name followed by C symbol from nm.
+AC_MSG_CHECKING([command to parse $NM output from $compiler object])
+AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],
+[
+# These are sane defaults that work on at least a few old systems.
+# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
+
+# Character class describing NM global symbol codes.
+symcode='[[BCDEGRST]]'
+
+# Regexp to match symbols that can be accessed directly from C.
+sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
+
+# Define system-specific variables.
+case $host_os in
+aix*)
+  symcode='[[BCDT]]'
+  ;;
+cygwin* | mingw* | pw32* | cegcc*)
+  symcode='[[ABCDGISTW]]'
+  ;;
+hpux*)
+  if test "$host_cpu" = ia64; then
+    symcode='[[ABCDEGRST]]'
+  fi
+  ;;
+irix* | nonstopux*)
+  symcode='[[BCDEGRST]]'
+  ;;
+osf*)
+  symcode='[[BCDEGQRST]]'
+  ;;
+solaris*)
+  symcode='[[BDRT]]'
+  ;;
+sco3.2v5*)
+  symcode='[[DT]]'
+  ;;
+sysv4.2uw2*)
+  symcode='[[DT]]'
+  ;;
+sysv5* | sco5v6* | unixware* | OpenUNIX*)
+  symcode='[[ABDT]]'
+  ;;
+sysv4)
+  symcode='[[DFNSTU]]'
+  ;;
+esac
+
+# If we're using GNU nm, then use its standard symbol codes.
+case `$NM -V 2>&1` in
+*GNU* | *'with BFD'*)
+  symcode='[[ABCDGIRSTW]]' ;;
+esac
+
+# Transform an extracted symbol line into a proper C declaration.
+# Some systems (esp. on ia64) link data and code symbols differently,
+# so use this general approach.
+lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+
+# Transform an extracted symbol line into symbol name and symbol address
+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p'"
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"lib\2\", (void *) \&\2},/p'"
+
+# Handle CRLF in mingw tool chain
+opt_cr=
+case $build_os in
+mingw*)
+  opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
+  ;;
+esac
+
+# Try without a prefix underscore, then with it.
+for ac_symprfx in "" "_"; do
+
+  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
+  symxfrm="\\1 $ac_symprfx\\2 \\2"
+
+  # Write the raw and C identifiers.
+  if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+    # Fake it for dumpbin and say T for any non-static function
+    # and D for any global variable.
+    # Also find C++ and __fastcall symbols from MSVC++,
+    # which start with @ or ?.
+    lt_cv_sys_global_symbol_pipe="$AWK ['"\
+"     {last_section=section; section=\$ 3};"\
+"     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
+"     \$ 0!~/External *\|/{next};"\
+"     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
+"     {if(hide[section]) next};"\
+"     {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
+"     {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
+"     s[1]~/^[@?]/{print s[1], s[1]; next};"\
+"     s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
+"     ' prfx=^$ac_symprfx]"
+  else
+    lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[	 ]]\($symcode$symcode*\)[[	 ]][[	 ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
+  fi
+
+  # Check to see that the pipe works correctly.
+  pipe_works=no
+
+  rm -f conftest*
+  cat > conftest.$ac_ext <<_LT_EOF
+#ifdef __cplusplus
+extern "C" {
+#endif
+char nm_test_var;
+void nm_test_func(void);
+void nm_test_func(void){}
+#ifdef __cplusplus
+}
+#endif
+int main(){nm_test_var='a';nm_test_func();return(0);}
+_LT_EOF
+
+  if AC_TRY_EVAL(ac_compile); then
+    # Now try to grab the symbols.
+    nlist=conftest.nm
+    if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
+      # Try sorting and uniquifying the output.
+      if sort "$nlist" | uniq > "$nlist"T; then
+	mv -f "$nlist"T "$nlist"
+      else
+	rm -f "$nlist"T
+      fi
+
+      # Make sure that we snagged all the symbols we need.
+      if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
+	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
+	  cat <<_LT_EOF > conftest.$ac_ext
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+_LT_EOF
+	  # Now generate the symbol file.
+	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
+
+	  cat <<_LT_EOF >> conftest.$ac_ext
+
+/* The mapping between symbol names and symbols.  */
+const struct {
+  const char *name;
+  void       *address;
+}
+lt__PROGRAM__LTX_preloaded_symbols[[]] =
+{
+  { "@PROGRAM@", (void *) 0 },
+_LT_EOF
+	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
+	  cat <<\_LT_EOF >> conftest.$ac_ext
+  {0, (void *) 0}
+};
+
+/* This works around a problem in FreeBSD linker */
+#ifdef FREEBSD_WORKAROUND
+static const void *lt_preloaded_setup() {
+  return lt__PROGRAM__LTX_preloaded_symbols;
+}
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+_LT_EOF
+	  # Now try linking the two files.
+	  mv conftest.$ac_objext conftstm.$ac_objext
+	  lt_save_LIBS="$LIBS"
+	  lt_save_CFLAGS="$CFLAGS"
+	  LIBS="conftstm.$ac_objext"
+	  CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
+	  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
+	    pipe_works=yes
+	  fi
+	  LIBS="$lt_save_LIBS"
+	  CFLAGS="$lt_save_CFLAGS"
+	else
+	  echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
+	fi
+      else
+	echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
+      fi
+    else
+      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
+    fi
+  else
+    echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
+    cat conftest.$ac_ext >&5
+  fi
+  rm -rf conftest* conftst*
+
+  # Do not use the global_symbol_pipe unless it works.
+  if test "$pipe_works" = yes; then
+    break
+  else
+    lt_cv_sys_global_symbol_pipe=
+  fi
+done
+])
+if test -z "$lt_cv_sys_global_symbol_pipe"; then
+  lt_cv_sys_global_symbol_to_cdecl=
+fi
+if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
+  AC_MSG_RESULT(failed)
+else
+  AC_MSG_RESULT(ok)
+fi
+
+_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
+    [Take the output of nm and produce a listing of raw symbols and C names])
+_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
+    [Transform the output of nm in a proper C declaration])
+_LT_DECL([global_symbol_to_c_name_address],
+    [lt_cv_sys_global_symbol_to_c_name_address], [1],
+    [Transform the output of nm in a C name address pair])
+_LT_DECL([global_symbol_to_c_name_address_lib_prefix],
+    [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
+    [Transform the output of nm in a C name address pair when lib prefix is needed])
+]) # _LT_CMD_GLOBAL_SYMBOLS
+
+
+# _LT_COMPILER_PIC([TAGNAME])
+# ---------------------------
+m4_defun([_LT_COMPILER_PIC],
+[m4_require([_LT_TAG_COMPILER])dnl
+_LT_TAGVAR(lt_prog_compiler_wl, $1)=
+_LT_TAGVAR(lt_prog_compiler_pic, $1)=
+_LT_TAGVAR(lt_prog_compiler_static, $1)=
+
+AC_MSG_CHECKING([for $compiler option to produce PIC])
+m4_if([$1], [CXX], [
+  # C++ specific cases for pic, static, wl, etc.
+  if test "$GXX" = yes; then
+    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+
+    case $host_os in
+    aix*)
+      # All AIX code is PIC.
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+        ;;
+      m68k)
+            # FIXME: we need at least 68020 code to build shared libraries, but
+            # adding the `-m68020' flag to GCC prevents building anything better,
+            # like `-m68040'.
+            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+        ;;
+      esac
+      ;;
+
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+      # PIC is the default for these OSes.
+      ;;
+    mingw* | cygwin* | os2* | pw32* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
+      m4_if([$1], [GCJ], [],
+	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+      ;;
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+      ;;
+    *djgpp*)
+      # DJGPP does not support shared libraries at all
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+      ;;
+    interix[[3-9]]*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
+      fi
+      ;;
+    hpux*)
+      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
+      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
+      # sets the default TLS model and affects inlining.
+      case $host_cpu in
+      hppa*64*)
+	;;
+      *)
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	;;
+      esac
+      ;;
+    *qnx* | *nto*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
+      ;;
+    *)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+      ;;
+    esac
+  else
+    case $host_os in
+      aix[[4-9]]*)
+	# All AIX code is PIC.
+	if test "$host_cpu" = ia64; then
+	  # AIX 5 now supports IA64 processor
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	else
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
+	fi
+	;;
+      chorus*)
+	case $cc_basename in
+	cxch68*)
+	  # Green Hills C++ Compiler
+	  # _LT_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
+	  ;;
+	esac
+	;;
+      dgux*)
+	case $cc_basename in
+	  ec++*)
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    ;;
+	  ghcx*)
+	    # Green Hills C++ Compiler
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      freebsd* | dragonfly*)
+	# FreeBSD uses GNU C++
+	;;
+      hpux9* | hpux10* | hpux11*)
+	case $cc_basename in
+	  CC*)
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+	    if test "$host_cpu" != ia64; then
+	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+	    fi
+	    ;;
+	  aCC*)
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+	    case $host_cpu in
+	    hppa*64*|ia64*)
+	      # +Z the default
+	      ;;
+	    *)
+	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+	      ;;
+	    esac
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      interix*)
+	# This is c89, which is MS Visual C++ (no shared libs)
+	# Anyone wants to do a port?
+	;;
+      irix5* | irix6* | nonstopux*)
+	case $cc_basename in
+	  CC*)
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+	    # CC pic flag -KPIC is the default.
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      linux* | k*bsd*-gnu)
+	case $cc_basename in
+	  KCC*)
+	    # KAI C++ Compiler
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	    ;;
+	  ecpc* )
+	    # old Intel C++ for x86_64 which still supported -KPIC.
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+	    ;;
+	  icpc* )
+	    # Intel C++, used to be incompatible with GCC.
+	    # ICC 10 doesn't accept -KPIC any more.
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+	    ;;
+	  pgCC* | pgcpp*)
+	    # Portland Group C++ compiler
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    ;;
+	  cxx*)
+	    # Compaq C++
+	    # Make sure the PIC flag is empty.  It appears that all Alpha
+	    # Linux and Compaq Tru64 Unix objects are PIC.
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+	    ;;
+	  xlc* | xlC*)
+	    # IBM XL 8.0 on PPC
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
+	    ;;
+	  *)
+	    case `$CC -V 2>&1 | sed 5q` in
+	    *Sun\ C*)
+	      # Sun C++ 5.9
+	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+	      ;;
+	    esac
+	    ;;
+	esac
+	;;
+      lynxos*)
+	;;
+      m88k*)
+	;;
+      mvs*)
+	case $cc_basename in
+	  cxx*)
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      netbsd*)
+	;;
+      *qnx* | *nto*)
+        # QNX uses GNU C++, but need to define -shared option too, otherwise
+        # it will coredump.
+        _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
+        ;;
+      osf3* | osf4* | osf5*)
+	case $cc_basename in
+	  KCC*)
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+	    ;;
+	  RCC*)
+	    # Rational C++ 2.4.1
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    ;;
+	  cxx*)
+	    # Digital/Compaq C++
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    # Make sure the PIC flag is empty.  It appears that all Alpha
+	    # Linux and Compaq Tru64 Unix objects are PIC.
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      psos*)
+	;;
+      solaris*)
+	case $cc_basename in
+	  CC*)
+	    # Sun C++ 4.2, 5.x and Centerline C++
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+	    ;;
+	  gcx*)
+	    # Green Hills C++ Compiler
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      sunos4*)
+	case $cc_basename in
+	  CC*)
+	    # Sun C++ 4.x
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    ;;
+	  lcc*)
+	    # Lucid
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+	case $cc_basename in
+	  CC*)
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    ;;
+	esac
+	;;
+      tandem*)
+	case $cc_basename in
+	  NCC*)
+	    # NonStop-UX NCC 3.20
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      vxworks*)
+	;;
+      *)
+	_LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+	;;
+    esac
+  fi
+],
+[
+  if test "$GCC" = yes; then
+    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+
+    case $host_os in
+      aix*)
+      # All AIX code is PIC.
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+        ;;
+      m68k)
+            # FIXME: we need at least 68020 code to build shared libraries, but
+            # adding the `-m68020' flag to GCC prevents building anything better,
+            # like `-m68040'.
+            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+        ;;
+      esac
+      ;;
+
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+      # PIC is the default for these OSes.
+      ;;
+
+    mingw* | cygwin* | pw32* | os2* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
+      m4_if([$1], [GCJ], [],
+	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+      ;;
+
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+      ;;
+
+    hpux*)
+      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
+      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
+      # sets the default TLS model and affects inlining.
+      case $host_cpu in
+      hppa*64*)
+	# +Z the default
+	;;
+      *)
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	;;
+      esac
+      ;;
+
+    interix[[3-9]]*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
+
+    msdosdjgpp*)
+      # Just because we use GCC doesn't mean we suddenly get shared libraries
+      # on systems that don't support them.
+      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+      enable_shared=no
+      ;;
+
+    *nto* | *qnx*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
+      fi
+      ;;
+
+    *)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+      ;;
+    esac
+  else
+    # PORTME Check for flag to pass linker flags through the system compiler.
+    case $host_os in
+    aix*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      else
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
+      fi
+      ;;
+
+    mingw* | cygwin* | pw32* | os2* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      m4_if([$1], [GCJ], [],
+	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+      ;;
+
+    hpux9* | hpux10* | hpux11*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+      # not for PA HP-UX.
+      case $host_cpu in
+      hppa*64*|ia64*)
+	# +Z the default
+	;;
+      *)
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+	;;
+      esac
+      # Is there a better lt_prog_compiler_static that works with the bundled CC?
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      # PIC (with -KPIC) is the default.
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+      ;;
+
+    linux* | k*bsd*-gnu)
+      case $cc_basename in
+      # old Intel for x86_64 which still supported -KPIC.
+      ecc*)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+        ;;
+      # icc used to be incompatible with GCC.
+      # ICC 10 doesn't accept -KPIC any more.
+      icc* | ifort*)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+        ;;
+      # Lahey Fortran 8.1.
+      lf95*)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
+	;;
+      pgcc* | pgf77* | pgf90* | pgf95*)
+        # Portland Group compilers (*not* the Pentium gcc compiler,
+	# which looks to be a dead project)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+        ;;
+      ccc*)
+        _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+        # All Alpha code is PIC.
+        _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+        ;;
+      xl*)
+	# IBM XL C 8.0/Fortran 10.1 on PPC
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
+	;;
+      *)
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)
+	  # Sun C 5.9
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	  ;;
+	*Sun\ F*)
+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
+	  ;;
+	esac
+	;;
+      esac
+      ;;
+
+    newsos6)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    *nto* | *qnx*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
+      ;;
+
+    osf3* | osf4* | osf5*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      # All OSF/1 code is PIC.
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+      ;;
+
+    rdos*)
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+      ;;
+
+    solaris*)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      case $cc_basename in
+      f77* | f90* | f95*)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
+      *)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
+      esac
+      ;;
+
+    sunos4*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    sysv4 | sysv4.2uw2* | sysv4.3*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec ;then
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      fi
+      ;;
+
+    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    unicos*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+      ;;
+
+    uts4*)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    *)
+      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+      ;;
+    esac
+  fi
+])
+case $host_os in
+  # For platforms which do not support PIC, -DPIC is meaningless:
+  *djgpp*)
+    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+    ;;
+  *)
+    _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])"
+    ;;
+esac
+AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
+_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
+	[How to pass a linker flag through the compiler])
+
+#
+# Check to make sure the PIC flag actually works.
+#
+if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
+  _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, $1) works],
+    [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, $1)],
+    [$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])], [],
+    [case $_LT_TAGVAR(lt_prog_compiler_pic, $1) in
+     "" | " "*) ;;
+     *) _LT_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_TAGVAR(lt_prog_compiler_pic, $1)" ;;
+     esac],
+    [_LT_TAGVAR(lt_prog_compiler_pic, $1)=
+     _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
+fi
+_LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],
+	[Additional compiler flags for building library objects])
+
+#
+# Check to make sure the static flag actually works.
+#
+wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_TAGVAR(lt_prog_compiler_static, $1)\"
+_LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
+  _LT_TAGVAR(lt_cv_prog_compiler_static_works, $1),
+  $lt_tmp_static_flag,
+  [],
+  [_LT_TAGVAR(lt_prog_compiler_static, $1)=])
+_LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1],
+	[Compiler flag to prevent dynamic linking])
+])# _LT_COMPILER_PIC
+
+
+# _LT_LINKER_SHLIBS([TAGNAME])
+# ----------------------------
+# See if the linker supports building shared libraries.
+m4_defun([_LT_LINKER_SHLIBS],
+[AC_REQUIRE([LT_PATH_LD])dnl
+AC_REQUIRE([LT_PATH_NM])dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
+m4_require([_LT_TAG_COMPILER])dnl
+AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+m4_if([$1], [CXX], [
+  _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  case $host_os in
+  aix[[4-9]]*)
+    # If we're using GNU nm, then we don't want the "-C" option.
+    # -C means demangle to AIX nm, but means don't demangle with GNU nm
+    if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+    else
+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+    fi
+    ;;
+  pw32*)
+    _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
+  ;;
+  cygwin* | mingw* | cegcc*)
+    _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
+  ;;
+  *)
+    _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  ;;
+  esac
+  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
+], [
+  runpath_var=
+  _LT_TAGVAR(allow_undefined_flag, $1)=
+  _LT_TAGVAR(always_export_symbols, $1)=no
+  _LT_TAGVAR(archive_cmds, $1)=
+  _LT_TAGVAR(archive_expsym_cmds, $1)=
+  _LT_TAGVAR(compiler_needs_object, $1)=no
+  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+  _LT_TAGVAR(export_dynamic_flag_spec, $1)=
+  _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  _LT_TAGVAR(hardcode_automatic, $1)=no
+  _LT_TAGVAR(hardcode_direct, $1)=no
+  _LT_TAGVAR(hardcode_direct_absolute, $1)=no
+  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+  _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
+  _LT_TAGVAR(hardcode_libdir_separator, $1)=
+  _LT_TAGVAR(hardcode_minus_L, $1)=no
+  _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+  _LT_TAGVAR(inherit_rpath, $1)=no
+  _LT_TAGVAR(link_all_deplibs, $1)=unknown
+  _LT_TAGVAR(module_cmds, $1)=
+  _LT_TAGVAR(module_expsym_cmds, $1)=
+  _LT_TAGVAR(old_archive_from_new_cmds, $1)=
+  _LT_TAGVAR(old_archive_from_expsyms_cmds, $1)=
+  _LT_TAGVAR(thread_safe_flag_spec, $1)=
+  _LT_TAGVAR(whole_archive_flag_spec, $1)=
+  # include_expsyms should be a list of space-separated symbols to be *always*
+  # included in the symbol list
+  _LT_TAGVAR(include_expsyms, $1)=
+  # exclude_expsyms can be an extended regexp of symbols to exclude
+  # it will be wrapped by ` (' and `)$', so one must not match beginning or
+  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
+  # as well as any symbol that contains `d'.
+  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
+  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+  # platforms (ab)use it in PIC code, but their linkers get confused if
+  # the symbol is explicitly referenced.  Since portable code cannot
+  # rely on this symbol name, it's probably fine to never include it in
+  # preloaded symbol tables.
+  # Exclude shared library initialization/finalization symbols.
+dnl Note also adjust exclude_expsyms for C++ above.
+  extract_expsyms_cmds=
+
+  case $host_os in
+  cygwin* | mingw* | pw32* | cegcc*)
+    # FIXME: the MSVC++ port hasn't been tested in a loooong time
+    # When not using gcc, we currently assume that we are using
+    # Microsoft Visual C++.
+    if test "$GCC" != yes; then
+      with_gnu_ld=no
+    fi
+    ;;
+  interix*)
+    # we just hope/assume this is gcc and not c89 (= MSVC++)
+    with_gnu_ld=yes
+    ;;
+  openbsd*)
+    with_gnu_ld=no
+    ;;
+  esac
+
+  _LT_TAGVAR(ld_shlibs, $1)=yes
+  if test "$with_gnu_ld" = yes; then
+    # If archive_cmds runs LD, not CC, wlarc should be empty
+    wlarc='${wl}'
+
+    # Set some defaults for GNU ld with shared library support. These
+    # are reset later if shared libraries are not supported. Putting them
+    # here allows them to be overridden if necessary.
+    runpath_var=LD_RUN_PATH
+    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+    # ancient GNU ld didn't support --whole-archive et. al.
+    if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
+      _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+    else
+      _LT_TAGVAR(whole_archive_flag_spec, $1)=
+    fi
+    supports_anon_versioning=no
+    case `$LD -v 2>&1` in
+      *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
+      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+      *\ 2.11.*) ;; # other 2.11 versions
+      *) supports_anon_versioning=yes ;;
+    esac
+
+    # See if GNU ld supports shared libraries.
+    case $host_os in
+    aix[[3-9]]*)
+      # On AIX/PPC, the GNU linker is very broken
+      if test "$host_cpu" != ia64; then
+	_LT_TAGVAR(ld_shlibs, $1)=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: the GNU linker, at least up to release 2.9.1, is reported
+*** to be unable to reliably create shared libraries on AIX.
+*** Therefore, libtool is disabling shared libraries support.  If you
+*** really care for shared libraries, you may want to modify your PATH
+*** so that a non-GNU linker is found, and then restart.
+
+_LT_EOF
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+            _LT_TAGVAR(archive_expsym_cmds, $1)=''
+        ;;
+      m68k)
+            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+            _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+            _LT_TAGVAR(hardcode_minus_L, $1)=yes
+        ;;
+      esac
+      ;;
+
+    beos*)
+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+	# support --undefined.  This deserves some investigation.  FIXME
+	_LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      else
+	_LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    cygwin* | mingw* | pw32* | cegcc*)
+      # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+      # as there is no search path for DLLs.
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+      _LT_TAGVAR(always_export_symbols, $1)=no
+      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
+
+      if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	# If the export-symbols file already is a .def file (1st line
+	# is EXPORTS), use it as is; otherwise, prepend...
+	_LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	  cp $export_symbols $output_objdir/$soname.def;
+	else
+	  echo EXPORTS > $output_objdir/$soname.def;
+	  cat $export_symbols >> $output_objdir/$soname.def;
+	fi~
+	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+      else
+	_LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    interix[[3-9]]*)
+      _LT_TAGVAR(hardcode_direct, $1)=no
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+      # Instead, shared libraries are loaded at an image base (0x10000000 by
+      # default) and relocated if they conflict, which is a slow very memory
+      # consuming and fragmenting process.  To avoid this, we pick a random,
+      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      ;;
+
+    gnu* | linux* | tpf* | k*bsd*-gnu)
+      tmp_diet=no
+      if test "$host_os" = linux-dietlibc; then
+	case $cc_basename in
+	  diet\ *) tmp_diet=yes;;	# linux-dietlibc with static linking (!diet-dyn)
+	esac
+      fi
+      if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
+	 && test "$tmp_diet" = no
+      then
+	tmp_addflag=
+	tmp_sharedflag='-shared'
+	case $cc_basename,$host_cpu in
+        pgcc*)				# Portland Group C compiler
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_addflag=' $pic_flag'
+	  ;;
+	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_addflag=' $pic_flag -Mnomain' ;;
+	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
+	  tmp_addflag=' -i_dynamic' ;;
+	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
+	  tmp_addflag=' -i_dynamic -nofor_main' ;;
+	ifc* | ifort*)			# Intel Fortran compiler
+	  tmp_addflag=' -nofor_main' ;;
+	lf95*)				# Lahey Fortran 8.1
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)=
+	  tmp_sharedflag='--shared' ;;
+	xl[[cC]]*)			# IBM XL C 8.0 on PPC (deal with xlf below)
+	  tmp_sharedflag='-qmkshrobj'
+	  tmp_addflag= ;;
+	esac
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)			# Sun C 5.9
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+	  _LT_TAGVAR(compiler_needs_object, $1)=yes
+	  tmp_sharedflag='-G' ;;
+	*Sun\ F*)			# Sun Fortran 8.3
+	  tmp_sharedflag='-G' ;;
+	esac
+	_LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+
+        if test "x$supports_anon_versioning" = xyes; then
+          _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
+	    cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+	    echo "local: *; };" >> $output_objdir/$libname.ver~
+	    $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+        fi
+
+	case $cc_basename in
+	xlf*)
+	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+	  _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
+	  if test "x$supports_anon_versioning" = xyes; then
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
+	      cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+	      echo "local: *; };" >> $output_objdir/$libname.ver~
+	      $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+	  fi
+	  ;;
+	esac
+      else
+        _LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    netbsd*)
+      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+	wlarc=
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      fi
+      ;;
+
+    solaris*)
+      if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
+	_LT_TAGVAR(ld_shlibs, $1)=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: The releases 2.8.* of the GNU linker cannot reliably
+*** create shared libraries on Solaris systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.9.1 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+      elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+	_LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+      case `$LD -v 2>&1` in
+        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
+	_LT_TAGVAR(ld_shlibs, $1)=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
+*** reliably create shared libraries on SCO systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+	;;
+	*)
+	  # For security reasons, it is highly recommended that you always
+	  # use absolute paths for naming shared libraries, and exclude the
+	  # DT_RUNPATH tag from executables and libraries.  But doing so
+	  # requires that you compile everything twice, which is a pain.
+	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	  else
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	  fi
+	;;
+      esac
+      ;;
+
+    sunos4*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      wlarc=
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    *)
+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+	_LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+    esac
+
+    if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then
+      runpath_var=
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)=
+      _LT_TAGVAR(whole_archive_flag_spec, $1)=
+    fi
+  else
+    # PORTME fill in a description of your system's linker (not GNU ld)
+    case $host_os in
+    aix3*)
+      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+      _LT_TAGVAR(always_export_symbols, $1)=yes
+      _LT_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
+      # Note: this linker hardcodes the directories in LIBPATH if there
+      # are no directories specified by -L.
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
+	# Neither direct hardcoding nor static linking is supported with a
+	# broken collect2.
+	_LT_TAGVAR(hardcode_direct, $1)=unsupported
+      fi
+      ;;
+
+    aix[[4-9]]*)
+      if test "$host_cpu" = ia64; then
+	# On IA64, the linker does run time linking by default, so we don't
+	# have to do anything special.
+	aix_use_runtimelinking=no
+	exp_sym_flag='-Bexport'
+	no_entry_flag=""
+      else
+	# If we're using GNU nm, then we don't want the "-C" option.
+	# -C means demangle to AIX nm, but means don't demangle with GNU nm
+	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+	else
+	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+	fi
+	aix_use_runtimelinking=no
+
+	# Test if we are trying to use run time linking or normal
+	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
+	# need to do runtime linking.
+	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
+	  for ld_flag in $LDFLAGS; do
+	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+	    aix_use_runtimelinking=yes
+	    break
+	  fi
+	  done
+	  ;;
+	esac
+
+	exp_sym_flag='-bexport'
+	no_entry_flag='-bnoentry'
+      fi
+
+      # When large executables or shared objects are built, AIX ld can
+      # have problems creating the table of contents.  If linking a library
+      # or program results in "error TOC overflow" add -mminimal-toc to
+      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+      _LT_TAGVAR(archive_cmds, $1)=''
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
+
+      if test "$GCC" = yes; then
+	case $host_os in aix4.[[012]]|aix4.[[012]].*)
+	# We only want to do this on AIX 4.2 and lower, the check
+	# below for broken collect2 doesn't work under 4.3+
+	  collect2name=`${CC} -print-prog-name=collect2`
+	  if test -f "$collect2name" &&
+	   strings "$collect2name" | $GREP resolve_lib_name >/dev/null
+	  then
+	  # We have reworked collect2
+	  :
+	  else
+	  # We have old collect2
+	  _LT_TAGVAR(hardcode_direct, $1)=unsupported
+	  # It fails to find uninstalled libraries when the uninstalled
+	  # path is not listed in the libpath.  Setting hardcode_minus_L
+	  # to unsupported forces relinking
+	  _LT_TAGVAR(hardcode_minus_L, $1)=yes
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+	  _LT_TAGVAR(hardcode_libdir_separator, $1)=
+	  fi
+	  ;;
+	esac
+	shared_flag='-shared'
+	if test "$aix_use_runtimelinking" = yes; then
+	  shared_flag="$shared_flag "'${wl}-G'
+	fi
+      else
+	# not using gcc
+	if test "$host_cpu" = ia64; then
+	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+	# chokes on -Wl,-G. The following line is correct:
+	  shared_flag='-G'
+	else
+	  if test "$aix_use_runtimelinking" = yes; then
+	    shared_flag='${wl}-G'
+	  else
+	    shared_flag='${wl}-bM:SRE'
+	  fi
+	fi
+      fi
+
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
+      # It seems that -bexpall does not export symbols beginning with
+      # underscore (_), so it is better to generate a list of symbols to export.
+      _LT_TAGVAR(always_export_symbols, $1)=yes
+      if test "$aix_use_runtimelinking" = yes; then
+	# Warning - without using the other runtime loading flags (-brtl),
+	# -berok will link without error, but may produce a broken library.
+	_LT_TAGVAR(allow_undefined_flag, $1)='-berok'
+        # Determine the default libpath from the value encoded in an
+        # empty executable.
+        _LT_SYS_MODULE_PATH_AIX
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+      else
+	if test "$host_cpu" = ia64; then
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+	  _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+	  _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+	else
+	 # Determine the default libpath from the value encoded in an
+	 # empty executable.
+	 _LT_SYS_MODULE_PATH_AIX
+	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+	  # Warning - without using the other run time loading flags,
+	  # -berok will link without error, but may produce a broken library.
+	  _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
+	  _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
+	  # Exported symbols can be pulled into shared objects from archives
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+	  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+	  # This is similar to how AIX traditionally builds its shared libraries.
+	  _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+	fi
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+            _LT_TAGVAR(archive_expsym_cmds, $1)=''
+        ;;
+      m68k)
+            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+            _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+            _LT_TAGVAR(hardcode_minus_L, $1)=yes
+        ;;
+      esac
+      ;;
+
+    bsdi[[45]]*)
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
+      ;;
+
+    cygwin* | mingw* | pw32* | cegcc*)
+      # When not using gcc, we currently assume that we are using
+      # Microsoft Visual C++.
+      # hardcode_libdir_flag_spec is actually meaningless, as there is
+      # no search path for DLLs.
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+      # Tell ltmain to make .lib files, not .a files.
+      libext=lib
+      # Tell ltmain to make .dll files, not .so files.
+      shrext_cmds=".dll"
+      # FIXME: Setting linknames here is a bad hack.
+      _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames='
+      # The linker will automatically build a .lib file if we build a DLL.
+      _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
+      # FIXME: Should let the user specify the lib program.
+      _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
+      _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
+      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+      ;;
+
+    darwin* | rhapsody*)
+      _LT_DARWIN_LINKER_FEATURES($1)
+      ;;
+
+    dgux*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    freebsd1*)
+      _LT_TAGVAR(ld_shlibs, $1)=no
+      ;;
+
+    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
+    # support.  Future versions do this automatically, but an explicit c++rt0.o
+    # does not break anything, and helps significantly (at the cost of a little
+    # extra space).
+    freebsd2.2*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+    freebsd2*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+    freebsd* | dragonfly*)
+      _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    hpux9*)
+      if test "$GCC" = yes; then
+	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      fi
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+
+      # hardcode_minus_L: Not really in the search PATH,
+      # but as the default location of the library.
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+      ;;
+
+    hpux10*)
+      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      if test "$with_gnu_ld" = no; then
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+	_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
+	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
+	_LT_TAGVAR(hardcode_direct, $1)=yes
+	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+	# hardcode_minus_L: Not really in the search PATH,
+	# but as the default location of the library.
+	_LT_TAGVAR(hardcode_minus_L, $1)=yes
+      fi
+      ;;
+
+    hpux11*)
+      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+	case $host_cpu in
+	hppa*64*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	ia64*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	esac
+      else
+	case $host_cpu in
+	hppa*64*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	ia64*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	esac
+      fi
+      if test "$with_gnu_ld" = no; then
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	case $host_cpu in
+	hppa*64*|ia64*)
+	  _LT_TAGVAR(hardcode_direct, $1)=no
+	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	  ;;
+	*)
+	  _LT_TAGVAR(hardcode_direct, $1)=yes
+	  _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+
+	  # hardcode_minus_L: Not really in the search PATH,
+	  # but as the default location of the library.
+	  _LT_TAGVAR(hardcode_minus_L, $1)=yes
+	  ;;
+	esac
+      fi
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      if test "$GCC" = yes; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	# Try to use the -exported_symbol ld option, if it does not
+	# work, assume that -exports_file does not work either and
+	# implicitly export all symbols.
+        save_LDFLAGS="$LDFLAGS"
+        LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
+        AC_LINK_IFELSE(int foo(void) {},
+          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
+        )
+        LDFLAGS="$save_LDFLAGS"
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
+      fi
+      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      _LT_TAGVAR(inherit_rpath, $1)=yes
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      ;;
+
+    netbsd*)
+      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
+      fi
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    newsos6)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    *nto* | *qnx*)
+      ;;
+
+    openbsd*)
+      if test -f /usr/libexec/ld.so; then
+	_LT_TAGVAR(hardcode_direct, $1)=yes
+	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+	else
+	  case $host_os in
+	   openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
+	     _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+	     _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	     ;;
+	   *)
+	     _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	     _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	     ;;
+	  esac
+	fi
+      else
+	_LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    os2*)
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+      _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+      ;;
+
+    osf3*)
+      if test "$GCC" = yes; then
+	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+      else
+	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+      fi
+      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      ;;
+
+    osf4* | osf5*)	# as osf3* with the addition of -msym flag
+      if test "$GCC" = yes; then
+	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      else
+	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
+	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
+
+	# Both c and cxx compiler support -rpath directly
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+      fi
+      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      ;;
+
+    solaris*)
+      _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
+      if test "$GCC" = yes; then
+	wlarc='${wl}'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+	  $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+      else
+	case `$CC -V 2>&1` in
+	*"Compilers 5.0"*)
+	  wlarc=''
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+	  $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
+	  ;;
+	*)
+	  wlarc='${wl}'
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+	  $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+	  ;;
+	esac
+      fi
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      case $host_os in
+      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+      *)
+	# The compiler driver will combine and reorder linker options,
+	# but understands `-z linker_flag'.  GCC discards it without `$wl',
+	# but is careful enough not to reorder.
+	# Supported since Solaris 2.6 (maybe 2.5.1?)
+	if test "$GCC" = yes; then
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+	else
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
+	fi
+	;;
+      esac
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      ;;
+
+    sunos4*)
+      if test "x$host_vendor" = xsequent; then
+	# Use $CC to link under sequent, because it throws in some extra .o
+	# files that make .init and .fini sections work.
+	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    sysv4)
+      case $host_vendor in
+	sni)
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_TAGVAR(hardcode_direct, $1)=yes # is this really true???
+	;;
+	siemens)
+	  ## LD is ld it makes a PLAMLIB
+	  ## CC just makes a GrossModule.
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
+	  _LT_TAGVAR(hardcode_direct, $1)=no
+        ;;
+	motorola)
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
+	;;
+      esac
+      runpath_var='LD_RUN_PATH'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    sysv4.3*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	_LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	runpath_var=LD_RUN_PATH
+	hardcode_runpath_var=yes
+	_LT_TAGVAR(ld_shlibs, $1)=yes
+      fi
+      ;;
+
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
+      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      runpath_var='LD_RUN_PATH'
+
+      if test "$GCC" = yes; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      ;;
+
+    sysv5* | sco3.2v5* | sco5v6*)
+      # Note: We can NOT use -z defs as we might desire, because we do not
+      # link with -lc, and that would cause any symbols used from libc to
+      # always be unresolved, which means just about no library would
+      # ever link correctly.  If we're not using GNU ld we use -z text
+      # though, which does catch some bad symbols but isn't as heavy-handed
+      # as -z defs.
+      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+      _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
+      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+      runpath_var='LD_RUN_PATH'
+
+      if test "$GCC" = yes; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      ;;
+
+    uts4*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    *)
+      _LT_TAGVAR(ld_shlibs, $1)=no
+      ;;
+    esac
+
+    if test x$host_vendor = xsni; then
+      case $host in
+      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym'
+	;;
+      esac
+    fi
+  fi
+])
+AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
+test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+
+_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld
+
+_LT_DECL([], [libext], [0], [Old archive suffix (normally "a")])dnl
+_LT_DECL([], [shrext_cmds], [1], [Shared library suffix (normally ".so")])dnl
+_LT_DECL([], [extract_expsyms_cmds], [2],
+    [The commands to extract the exported symbol list from a shared archive])
+
+#
+# Do we need to explicitly link libc?
+#
+case "x$_LT_TAGVAR(archive_cmds_need_lc, $1)" in
+x|xyes)
+  # Assume -lc should be added
+  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+
+  if test "$enable_shared" = yes && test "$GCC" = yes; then
+    case $_LT_TAGVAR(archive_cmds, $1) in
+    *'~'*)
+      # FIXME: we may have to deal with multi-command sequences.
+      ;;
+    '$CC '*)
+      # Test whether the compiler implicitly links with -lc since on some
+      # systems, -lgcc has to come before -lc. If gcc already passes -lc
+      # to ld, don't add -lc before -lgcc.
+      AC_MSG_CHECKING([whether -lc should be explicitly linked in])
+      $RM conftest*
+      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+      if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
+        soname=conftest
+        lib=conftest
+        libobjs=conftest.$ac_objext
+        deplibs=
+        wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)
+	pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
+        compiler_flags=-v
+        linker_flags=-v
+        verstring=
+        output_objdir=.
+        libname=conftest
+        lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
+        _LT_TAGVAR(allow_undefined_flag, $1)=
+        if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
+        then
+	  _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+        else
+	  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+        fi
+        _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
+      else
+        cat conftest.err 1>&5
+      fi
+      $RM conftest*
+      AC_MSG_RESULT([$_LT_TAGVAR(archive_cmds_need_lc, $1)])
+      ;;
+    esac
+  fi
+  ;;
+esac
+
+_LT_TAGDECL([build_libtool_need_lc], [archive_cmds_need_lc], [0],
+    [Whether or not to add -lc for building shared libraries])
+_LT_TAGDECL([allow_libtool_libs_with_static_runtimes],
+    [enable_shared_with_static_runtimes], [0],
+    [Whether or not to disallow shared libs when runtime libs are static])
+_LT_TAGDECL([], [export_dynamic_flag_spec], [1],
+    [Compiler flag to allow reflexive dlopens])
+_LT_TAGDECL([], [whole_archive_flag_spec], [1],
+    [Compiler flag to generate shared objects directly from archives])
+_LT_TAGDECL([], [compiler_needs_object], [1],
+    [Whether the compiler copes with passing no objects directly])
+_LT_TAGDECL([], [old_archive_from_new_cmds], [2],
+    [Create an old-style archive from a shared archive])
+_LT_TAGDECL([], [old_archive_from_expsyms_cmds], [2],
+    [Create a temporary old-style archive to link instead of a shared archive])
+_LT_TAGDECL([], [archive_cmds], [2], [Commands used to build a shared archive])
+_LT_TAGDECL([], [archive_expsym_cmds], [2])
+_LT_TAGDECL([], [module_cmds], [2],
+    [Commands used to build a loadable module if different from building
+    a shared archive.])
+_LT_TAGDECL([], [module_expsym_cmds], [2])
+_LT_TAGDECL([], [with_gnu_ld], [1],
+    [Whether we are building with GNU ld or not])
+_LT_TAGDECL([], [allow_undefined_flag], [1],
+    [Flag that allows shared libraries with undefined symbols to be built])
+_LT_TAGDECL([], [no_undefined_flag], [1],
+    [Flag that enforces no undefined symbols])
+_LT_TAGDECL([], [hardcode_libdir_flag_spec], [1],
+    [Flag to hardcode $libdir into a binary during linking.
+    This must work even if $libdir does not exist])
+_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1],
+    [[If ld is used when linking, flag to hardcode $libdir into a binary
+    during linking.  This must work even if $libdir does not exist]])
+_LT_TAGDECL([], [hardcode_libdir_separator], [1],
+    [Whether we need a single "-rpath" flag with a separated argument])
+_LT_TAGDECL([], [hardcode_direct], [0],
+    [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
+    DIR into the resulting binary])
+_LT_TAGDECL([], [hardcode_direct_absolute], [0],
+    [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
+    DIR into the resulting binary and the resulting library dependency is
+    "absolute", i.e impossible to change by setting ${shlibpath_var} if the
+    library is relocated])
+_LT_TAGDECL([], [hardcode_minus_L], [0],
+    [Set to "yes" if using the -LDIR flag during linking hardcodes DIR
+    into the resulting binary])
+_LT_TAGDECL([], [hardcode_shlibpath_var], [0],
+    [Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
+    into the resulting binary])
+_LT_TAGDECL([], [hardcode_automatic], [0],
+    [Set to "yes" if building a shared library automatically hardcodes DIR
+    into the library and all subsequent libraries and executables linked
+    against it])
+_LT_TAGDECL([], [inherit_rpath], [0],
+    [Set to yes if linker adds runtime paths of dependent libraries
+    to runtime path list])
+_LT_TAGDECL([], [link_all_deplibs], [0],
+    [Whether libtool must link a program against all its dependency libraries])
+_LT_TAGDECL([], [fix_srcfile_path], [1],
+    [Fix the shell variable $srcfile for the compiler])
+_LT_TAGDECL([], [always_export_symbols], [0],
+    [Set to "yes" if exported symbols are required])
+_LT_TAGDECL([], [export_symbols_cmds], [2],
+    [The commands to list exported symbols])
+_LT_TAGDECL([], [exclude_expsyms], [1],
+    [Symbols that should not be listed in the preloaded symbols])
+_LT_TAGDECL([], [include_expsyms], [1],
+    [Symbols that must always be exported])
+_LT_TAGDECL([], [prelink_cmds], [2],
+    [Commands necessary for linking programs (against libraries) with templates])
+_LT_TAGDECL([], [file_list_spec], [1],
+    [Specify filename containing input files])
+dnl FIXME: Not yet implemented
+dnl _LT_TAGDECL([], [thread_safe_flag_spec], [1],
+dnl    [Compiler flag to generate thread safe objects])
+])# _LT_LINKER_SHLIBS
+
+
+# _LT_LANG_C_CONFIG([TAG])
+# ------------------------
+# Ensure that the configuration variables for a C compiler are suitably
+# defined.  These variables are subsequently used by _LT_CONFIG to write
+# the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_C_CONFIG],
+[m4_require([_LT_DECL_EGREP])dnl
+lt_save_CC="$CC"
+AC_LANG_PUSH(C)
+
+# Source file extension for C test sources.
+ac_ext=c
+
+# Object file extension for compiled C test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="int some_variable = 0;"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='int main(){return(0);}'
+
+_LT_TAG_COMPILER
+# Save the default compiler, since it gets overwritten when the other
+# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP.
+compiler_DEFAULT=$CC
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+## CAVEAT EMPTOR:
+## There is no encapsulation within the following macros, do not change
+## the running order or otherwise move them around unless you know exactly
+## what you are doing...
+if test -n "$compiler"; then
+  _LT_COMPILER_NO_RTTI($1)
+  _LT_COMPILER_PIC($1)
+  _LT_COMPILER_C_O($1)
+  _LT_COMPILER_FILE_LOCKS($1)
+  _LT_LINKER_SHLIBS($1)
+  _LT_SYS_DYNAMIC_LINKER($1)
+  _LT_LINKER_HARDCODE_LIBPATH($1)
+  LT_SYS_DLOPEN_SELF
+  _LT_CMD_STRIPLIB
+
+  # Report which library types will actually be built
+  AC_MSG_CHECKING([if libtool supports shared libraries])
+  AC_MSG_RESULT([$can_build_shared])
+
+  AC_MSG_CHECKING([whether to build shared libraries])
+  test "$can_build_shared" = "no" && enable_shared=no
+
+  # On AIX, shared libraries and static libraries use the same namespace, and
+  # are all built from PIC.
+  case $host_os in
+  aix3*)
+    test "$enable_shared" = yes && enable_static=no
+    if test -n "$RANLIB"; then
+      archive_cmds="$archive_cmds~\$RANLIB \$lib"
+      postinstall_cmds='$RANLIB $lib'
+    fi
+    ;;
+
+  aix[[4-9]]*)
+    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+      test "$enable_shared" = yes && enable_static=no
+    fi
+    ;;
+  esac
+  AC_MSG_RESULT([$enable_shared])
+
+  AC_MSG_CHECKING([whether to build static libraries])
+  # Make sure either enable_shared or enable_static is yes.
+  test "$enable_shared" = yes || enable_static=yes
+  AC_MSG_RESULT([$enable_static])
+
+  _LT_CONFIG($1)
+fi
+AC_LANG_POP
+CC="$lt_save_CC"
+])# _LT_LANG_C_CONFIG
+
+
+# _LT_PROG_CXX
+# ------------
+# Since AC_PROG_CXX is broken, in that it returns g++ if there is no c++
+# compiler, we have our own version here.
+m4_defun([_LT_PROG_CXX],
+[
+pushdef([AC_MSG_ERROR], [_lt_caught_CXX_error=yes])
+AC_PROG_CXX
+if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
+    (test "X$CXX" != "Xg++"))) ; then
+  AC_PROG_CXXCPP
+else
+  _lt_caught_CXX_error=yes
+fi
+popdef([AC_MSG_ERROR])
+])# _LT_PROG_CXX
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([_LT_PROG_CXX], [])
+
+
+# _LT_LANG_CXX_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for a C++ compiler are suitably
+# defined.  These variables are subsequently used by _LT_CONFIG to write
+# the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_CXX_CONFIG],
+[AC_REQUIRE([_LT_PROG_CXX])dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_EGREP])dnl
+
+AC_LANG_PUSH(C++)
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+_LT_TAGVAR(allow_undefined_flag, $1)=
+_LT_TAGVAR(always_export_symbols, $1)=no
+_LT_TAGVAR(archive_expsym_cmds, $1)=
+_LT_TAGVAR(compiler_needs_object, $1)=no
+_LT_TAGVAR(export_dynamic_flag_spec, $1)=
+_LT_TAGVAR(hardcode_direct, $1)=no
+_LT_TAGVAR(hardcode_direct_absolute, $1)=no
+_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
+_LT_TAGVAR(hardcode_libdir_separator, $1)=
+_LT_TAGVAR(hardcode_minus_L, $1)=no
+_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+_LT_TAGVAR(hardcode_automatic, $1)=no
+_LT_TAGVAR(inherit_rpath, $1)=no
+_LT_TAGVAR(module_cmds, $1)=
+_LT_TAGVAR(module_expsym_cmds, $1)=
+_LT_TAGVAR(link_all_deplibs, $1)=unknown
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(no_undefined_flag, $1)=
+_LT_TAGVAR(whole_archive_flag_spec, $1)=
+_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+
+# Source file extension for C++ test sources.
+ac_ext=cpp
+
+# Object file extension for compiled C++ test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# No sense in running all these tests if we already determined that
+# the CXX compiler isn't working.  Some variables (like enable_shared)
+# are currently assumed to apply to all compilers on this platform,
+# and will be corrupted by setting them based on a non-working compiler.
+if test "$_lt_caught_CXX_error" != yes; then
+  # Code to be used in simple compile tests
+  lt_simple_compile_test_code="int some_variable = 0;"
+
+  # Code to be used in simple link tests
+  lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'
+
+  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+  _LT_TAG_COMPILER
+
+  # save warnings/boilerplate of simple test code
+  _LT_COMPILER_BOILERPLATE
+  _LT_LINKER_BOILERPLATE
+
+  # Allow CC to be a program name with arguments.
+  lt_save_CC=$CC
+  lt_save_LD=$LD
+  lt_save_GCC=$GCC
+  GCC=$GXX
+  lt_save_with_gnu_ld=$with_gnu_ld
+  lt_save_path_LD=$lt_cv_path_LD
+  if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
+    lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
+  else
+    $as_unset lt_cv_prog_gnu_ld
+  fi
+  if test -n "${lt_cv_path_LDCXX+set}"; then
+    lt_cv_path_LD=$lt_cv_path_LDCXX
+  else
+    $as_unset lt_cv_path_LD
+  fi
+  test -z "${LDCXX+set}" || LD=$LDCXX
+  CC=${CXX-"c++"}
+  compiler=$CC
+  _LT_TAGVAR(compiler, $1)=$CC
+  _LT_CC_BASENAME([$compiler])
+
+  if test -n "$compiler"; then
+    # We don't want -fno-exception when compiling C++ code, so set the
+    # no_builtin_flag separately
+    if test "$GXX" = yes; then
+      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
+    else
+      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
+    fi
+
+    if test "$GXX" = yes; then
+      # Set up default GNU C++ configuration
+
+      LT_PATH_LD
+
+      # Check if GNU C++ uses GNU ld as the underlying linker, since the
+      # archiving commands below assume that GNU ld is being used.
+      if test "$with_gnu_ld" = yes; then
+        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+
+        # If archive_cmds runs LD, not CC, wlarc should be empty
+        # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
+        #     investigate it a little bit more. (MM)
+        wlarc='${wl}'
+
+        # ancient GNU ld didn't support --whole-archive et. al.
+        if eval "`$CC -print-prog-name=ld` --help 2>&1" |
+	  $GREP 'no-whole-archive' > /dev/null; then
+          _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+        else
+          _LT_TAGVAR(whole_archive_flag_spec, $1)=
+        fi
+      else
+        with_gnu_ld=no
+        wlarc=
+
+        # A generic and very simple default shared library creation
+        # command for GNU C++ for the case where it uses the native
+        # linker, instead of GNU ld.  If possible, this setting should
+        # overridden to take advantage of the native linker features on
+        # the platform it is being used on.
+        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+      fi
+
+      # Commands to make compiler produce verbose output that lists
+      # what "hidden" libraries, object files and flags are used when
+      # linking a shared library.
+      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+
+    else
+      GXX=no
+      with_gnu_ld=no
+      wlarc=
+    fi
+
+    # PORTME: fill in a description of your system's C++ link characteristics
+    AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+    _LT_TAGVAR(ld_shlibs, $1)=yes
+    case $host_os in
+      aix3*)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+      aix[[4-9]]*)
+        if test "$host_cpu" = ia64; then
+          # On IA64, the linker does run time linking by default, so we don't
+          # have to do anything special.
+          aix_use_runtimelinking=no
+          exp_sym_flag='-Bexport'
+          no_entry_flag=""
+        else
+          aix_use_runtimelinking=no
+
+          # Test if we are trying to use run time linking or normal
+          # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+          # need to do runtime linking.
+          case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
+	    for ld_flag in $LDFLAGS; do
+	      case $ld_flag in
+	      *-brtl*)
+	        aix_use_runtimelinking=yes
+	        break
+	        ;;
+	      esac
+	    done
+	    ;;
+          esac
+
+          exp_sym_flag='-bexport'
+          no_entry_flag='-bnoentry'
+        fi
+
+        # When large executables or shared objects are built, AIX ld can
+        # have problems creating the table of contents.  If linking a library
+        # or program results in "error TOC overflow" add -mminimal-toc to
+        # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+        # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+        _LT_TAGVAR(archive_cmds, $1)=''
+        _LT_TAGVAR(hardcode_direct, $1)=yes
+        _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+        _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+        _LT_TAGVAR(link_all_deplibs, $1)=yes
+        _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
+
+        if test "$GXX" = yes; then
+          case $host_os in aix4.[[012]]|aix4.[[012]].*)
+          # We only want to do this on AIX 4.2 and lower, the check
+          # below for broken collect2 doesn't work under 4.3+
+	  collect2name=`${CC} -print-prog-name=collect2`
+	  if test -f "$collect2name" &&
+	     strings "$collect2name" | $GREP resolve_lib_name >/dev/null
+	  then
+	    # We have reworked collect2
+	    :
+	  else
+	    # We have old collect2
+	    _LT_TAGVAR(hardcode_direct, $1)=unsupported
+	    # It fails to find uninstalled libraries when the uninstalled
+	    # path is not listed in the libpath.  Setting hardcode_minus_L
+	    # to unsupported forces relinking
+	    _LT_TAGVAR(hardcode_minus_L, $1)=yes
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+	    _LT_TAGVAR(hardcode_libdir_separator, $1)=
+	  fi
+          esac
+          shared_flag='-shared'
+	  if test "$aix_use_runtimelinking" = yes; then
+	    shared_flag="$shared_flag "'${wl}-G'
+	  fi
+        else
+          # not using gcc
+          if test "$host_cpu" = ia64; then
+	  # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+	  # chokes on -Wl,-G. The following line is correct:
+	  shared_flag='-G'
+          else
+	    if test "$aix_use_runtimelinking" = yes; then
+	      shared_flag='${wl}-G'
+	    else
+	      shared_flag='${wl}-bM:SRE'
+	    fi
+          fi
+        fi
+
+        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
+        # It seems that -bexpall does not export symbols beginning with
+        # underscore (_), so it is better to generate a list of symbols to
+	# export.
+        _LT_TAGVAR(always_export_symbols, $1)=yes
+        if test "$aix_use_runtimelinking" = yes; then
+          # Warning - without using the other runtime loading flags (-brtl),
+          # -berok will link without error, but may produce a broken library.
+          _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
+          # Determine the default libpath from the value encoded in an empty
+          # executable.
+          _LT_SYS_MODULE_PATH_AIX
+          _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+
+          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+        else
+          if test "$host_cpu" = ia64; then
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+	    _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+	    _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+          else
+	    # Determine the default libpath from the value encoded in an
+	    # empty executable.
+	    _LT_SYS_MODULE_PATH_AIX
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+	    # Warning - without using the other run time loading flags,
+	    # -berok will link without error, but may produce a broken library.
+	    _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
+	    _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
+	    # Exported symbols can be pulled into shared objects from archives
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+	    _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+	    # This is similar to how AIX traditionally builds its shared
+	    # libraries.
+	    _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+          fi
+        fi
+        ;;
+
+      beos*)
+	if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	  # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+	  # support --undefined.  This deserves some investigation.  FIXME
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	else
+	  _LT_TAGVAR(ld_shlibs, $1)=no
+	fi
+	;;
+
+      chorus*)
+        case $cc_basename in
+          *)
+	  # FIXME: insert proper C++ library support
+	  _LT_TAGVAR(ld_shlibs, $1)=no
+	  ;;
+        esac
+        ;;
+
+      cygwin* | mingw* | pw32* | cegcc*)
+        # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+        # as there is no search path for DLLs.
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+        _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+        _LT_TAGVAR(always_export_symbols, $1)=no
+        _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+
+        if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+          # If the export-symbols file already is a .def file (1st line
+          # is EXPORTS), use it as is; otherwise, prepend...
+          _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	    cp $export_symbols $output_objdir/$soname.def;
+          else
+	    echo EXPORTS > $output_objdir/$soname.def;
+	    cat $export_symbols >> $output_objdir/$soname.def;
+          fi~
+          $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+        else
+          _LT_TAGVAR(ld_shlibs, $1)=no
+        fi
+        ;;
+      darwin* | rhapsody*)
+        _LT_DARWIN_LINKER_FEATURES($1)
+	;;
+
+      dgux*)
+        case $cc_basename in
+          ec++*)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          ghcx*)
+	    # Green Hills C++ Compiler
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          *)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+        esac
+        ;;
+
+      freebsd[[12]]*)
+        # C++ shared libraries reported to be fairly broken before
+	# switch to ELF
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+
+      freebsd-elf*)
+        _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+        ;;
+
+      freebsd* | dragonfly*)
+        # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
+        # conventions
+        _LT_TAGVAR(ld_shlibs, $1)=yes
+        ;;
+
+      gnu*)
+        ;;
+
+      hpux9*)
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+        _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+        _LT_TAGVAR(hardcode_direct, $1)=yes
+        _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+				             # but as the default
+				             # location of the library.
+
+        case $cc_basename in
+          CC*)
+            # FIXME: insert proper C++ library support
+            _LT_TAGVAR(ld_shlibs, $1)=no
+            ;;
+          aCC*)
+            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+            # Commands to make compiler produce verbose output that lists
+            # what "hidden" libraries, object files and flags are used when
+            # linking a shared library.
+            #
+            # There doesn't appear to be a way to prevent this compiler from
+            # explicitly linking system object files so we need to strip them
+            # from the output so that they don't get included in the library
+            # dependencies.
+            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+            ;;
+          *)
+            if test "$GXX" = yes; then
+              _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+            else
+              # FIXME: insert proper C++ library support
+              _LT_TAGVAR(ld_shlibs, $1)=no
+            fi
+            ;;
+        esac
+        ;;
+
+      hpux10*|hpux11*)
+        if test $with_gnu_ld = no; then
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+	  _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+          case $host_cpu in
+            hppa*64*|ia64*)
+              ;;
+            *)
+	      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+              ;;
+          esac
+        fi
+        case $host_cpu in
+          hppa*64*|ia64*)
+            _LT_TAGVAR(hardcode_direct, $1)=no
+            _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+            ;;
+          *)
+            _LT_TAGVAR(hardcode_direct, $1)=yes
+            _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+            _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+					         # but as the default
+					         # location of the library.
+            ;;
+        esac
+
+        case $cc_basename in
+          CC*)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          aCC*)
+	    case $host_cpu in
+	      hppa*64*)
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	        ;;
+	      ia64*)
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	        ;;
+	      *)
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	        ;;
+	    esac
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+	    ;;
+          *)
+	    if test "$GXX" = yes; then
+	      if test $with_gnu_ld = no; then
+	        case $host_cpu in
+	          hppa*64*)
+	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            ;;
+	          ia64*)
+	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            ;;
+	          *)
+	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            ;;
+	        esac
+	      fi
+	    else
+	      # FIXME: insert proper C++ library support
+	      _LT_TAGVAR(ld_shlibs, $1)=no
+	    fi
+	    ;;
+        esac
+        ;;
+
+      interix[[3-9]]*)
+	_LT_TAGVAR(hardcode_direct, $1)=no
+	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+	# Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+	# Instead, shared libraries are loaded at an image base (0x10000000 by
+	# default) and relocated if they conflict, which is a slow very memory
+	# consuming and fragmenting process.  To avoid this, we pick a random,
+	# 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+	# time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+	;;
+      irix5* | irix6*)
+        case $cc_basename in
+          CC*)
+	    # SGI C++
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+
+	    # Archives containing C++ object files must be created using
+	    # "CC -ar", where "CC" is the IRIX C++ compiler.  This is
+	    # necessary to make sure instantiated templates are included
+	    # in the archive.
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
+	    ;;
+          *)
+	    if test "$GXX" = yes; then
+	      if test "$with_gnu_ld" = no; then
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	      else
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib'
+	      fi
+	    fi
+	    _LT_TAGVAR(link_all_deplibs, $1)=yes
+	    ;;
+        esac
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+        _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+        _LT_TAGVAR(inherit_rpath, $1)=yes
+        ;;
+
+      linux* | k*bsd*-gnu)
+        case $cc_basename in
+          KCC*)
+	    # Kuck and Associates, Inc. (KAI) C++ Compiler
+
+	    # KCC will only create a shared library if the output file
+	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
+	    # to its proper name (with version) after linking.
+	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+
+	    # Archives containing C++ object files must be created using
+	    # "CC -Bstatic", where "CC" is the KAI C++ compiler.
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
+	    ;;
+	  icpc* | ecpc* )
+	    # Intel C++
+	    with_gnu_ld=yes
+	    # version 8.0 and above of icpc choke on multiply defined symbols
+	    # if we add $predep_objects and $postdep_objects, however 7.1 and
+	    # earlier do not add the objects themselves.
+	    case `$CC -V 2>&1` in
+	      *"Version 7."*)
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+		;;
+	      *)  # Version 8.0 or newer
+	        tmp_idyn=
+	        case $host_cpu in
+		  ia64*) tmp_idyn=' -i_dynamic';;
+		esac
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+		;;
+	    esac
+	    _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+	    ;;
+          pgCC* | pgcpp*)
+            # Portland Group C++ compiler
+	    case `$CC -V` in
+	    *pgCC\ [[1-5]]* | *pgcpp\ [[1-5]]*)
+	      _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
+		rm -rf $tpldir~
+		$CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
+		compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
+	      _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
+		rm -rf $tpldir~
+		$CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
+		$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
+		$RANLIB $oldlib'
+	      _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
+		rm -rf $tpldir~
+		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+	      _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
+		rm -rf $tpldir~
+		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+	      ;;
+	    *) # Version 6 will use weak symbols
+	      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+	      ;;
+	    esac
+
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+            ;;
+	  cxx*)
+	    # Compaq C++
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
+
+	    runpath_var=LD_RUN_PATH
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+	    ;;
+	  xl*)
+	    # IBM XL 8.0 on PPC, with GNU ld
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	    if test "x$supports_anon_versioning" = xyes; then
+	      _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
+		cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+		echo "local: *; };" >> $output_objdir/$libname.ver~
+		$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+	    fi
+	    ;;
+	  *)
+	    case `$CC -V 2>&1 | sed 5q` in
+	    *Sun\ C*)
+	      # Sun C++ 5.9
+	      _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+	      _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
+	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	      _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+	      _LT_TAGVAR(compiler_needs_object, $1)=yes
+
+	      # Not sure whether something based on
+	      # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
+	      # would be better.
+	      output_verbose_link_cmd='echo'
+
+	      # Archives containing C++ object files must be created using
+	      # "CC -xar", where "CC" is the Sun C++ compiler.  This is
+	      # necessary to make sure instantiated templates are included
+	      # in the archive.
+	      _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
+	      ;;
+	    esac
+	    ;;
+	esac
+	;;
+
+      lynxos*)
+        # FIXME: insert proper C++ library support
+	_LT_TAGVAR(ld_shlibs, $1)=no
+	;;
+
+      m88k*)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+	;;
+
+      mvs*)
+        case $cc_basename in
+          cxx*)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+	  *)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+	esac
+	;;
+
+      netbsd*)
+        if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
+	  wlarc=
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	  _LT_TAGVAR(hardcode_direct, $1)=yes
+	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	fi
+	# Workaround some broken pre-1.5 toolchains
+	output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
+	;;
+
+      *nto* | *qnx*)
+        _LT_TAGVAR(ld_shlibs, $1)=yes
+	;;
+
+      openbsd2*)
+        # C++ shared libraries are fairly broken
+	_LT_TAGVAR(ld_shlibs, $1)=no
+	;;
+
+      openbsd*)
+	if test -f /usr/libexec/ld.so; then
+	  _LT_TAGVAR(hardcode_direct, $1)=yes
+	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	  _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+	  fi
+	  output_verbose_link_cmd=echo
+	else
+	  _LT_TAGVAR(ld_shlibs, $1)=no
+	fi
+	;;
+
+      osf3* | osf4* | osf5*)
+        case $cc_basename in
+          KCC*)
+	    # Kuck and Associates, Inc. (KAI) C++ Compiler
+
+	    # KCC will only create a shared library if the output file
+	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
+	    # to its proper name (with version) after linking.
+	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	    # Archives containing C++ object files must be created using
+	    # the KAI C++ compiler.
+	    case $host in
+	      osf3*) _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;;
+	      *) _LT_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ;;
+	    esac
+	    ;;
+          RCC*)
+	    # Rational C++ 2.4.1
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          cxx*)
+	    case $host in
+	      osf3*)
+	        _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+		;;
+	      *)
+	        _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+	        _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
+	          echo "-hidden">> $lib.exp~
+	          $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp  `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~
+	          $RM $lib.exp'
+	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+		;;
+	    esac
+
+	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+	    ;;
+	  *)
+	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+	      _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+	      case $host in
+	        osf3*)
+	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+		  ;;
+	        *)
+	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+		  ;;
+	      esac
+
+	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+	      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	      # Commands to make compiler produce verbose output that lists
+	      # what "hidden" libraries, object files and flags are used when
+	      # linking a shared library.
+	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+
+	    else
+	      # FIXME: insert proper C++ library support
+	      _LT_TAGVAR(ld_shlibs, $1)=no
+	    fi
+	    ;;
+        esac
+        ;;
+
+      psos*)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+
+      sunos4*)
+        case $cc_basename in
+          CC*)
+	    # Sun C++ 4.x
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          lcc*)
+	    # Lucid
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          *)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+        esac
+        ;;
+
+      solaris*)
+        case $cc_basename in
+          CC*)
+	    # Sun C++ 4.2, 5.x and Centerline C++
+            _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
+	    _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+	      $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	    _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	    case $host_os in
+	      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+	      *)
+		# The compiler driver will combine and reorder linker options,
+		# but understands `-z linker_flag'.
+	        # Supported since Solaris 2.6 (maybe 2.5.1?)
+		_LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
+	        ;;
+	    esac
+	    _LT_TAGVAR(link_all_deplibs, $1)=yes
+
+	    output_verbose_link_cmd='echo'
+
+	    # Archives containing C++ object files must be created using
+	    # "CC -xar", where "CC" is the Sun C++ compiler.  This is
+	    # necessary to make sure instantiated templates are included
+	    # in the archive.
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
+	    ;;
+          gcx*)
+	    # Green Hills C++ Compiler
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+
+	    # The C++ compiler must be used to create the archive.
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
+	    ;;
+          *)
+	    # GNU C++ compiler with Solaris linker
+	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+	      _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
+	      if $CC --version | $GREP -v '^2\.7' > /dev/null; then
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+		  $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+	        # Commands to make compiler produce verbose output that lists
+	        # what "hidden" libraries, object files and flags are used when
+	        # linking a shared library.
+	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+	      else
+	        # g++ 2.7 appears to require `-G' NOT `-shared' on this
+	        # platform.
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+		  $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+	        # Commands to make compiler produce verbose output that lists
+	        # what "hidden" libraries, object files and flags are used when
+	        # linking a shared library.
+	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+	      fi
+
+	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
+	      case $host_os in
+		solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+		*)
+		  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+		  ;;
+	      esac
+	    fi
+	    ;;
+        esac
+        ;;
+
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
+      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      runpath_var='LD_RUN_PATH'
+
+      case $cc_basename in
+        CC*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+      esac
+      ;;
+
+      sysv5* | sco3.2v5* | sco5v6*)
+	# Note: We can NOT use -z defs as we might desire, because we do not
+	# link with -lc, and that would cause any symbols used from libc to
+	# always be unresolved, which means just about no library would
+	# ever link correctly.  If we're not using GNU ld we use -z text
+	# though, which does catch some bad symbols but isn't as heavy-handed
+	# as -z defs.
+	_LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+	_LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
+	_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
+	_LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+	_LT_TAGVAR(link_all_deplibs, $1)=yes
+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+	runpath_var='LD_RUN_PATH'
+
+	case $cc_basename in
+          CC*)
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    ;;
+	  *)
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    ;;
+	esac
+      ;;
+
+      tandem*)
+        case $cc_basename in
+          NCC*)
+	    # NonStop-UX NCC 3.20
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          *)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+        esac
+        ;;
+
+      vxworks*)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+
+      *)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+    esac
+
+    AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
+    test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+
+    _LT_TAGVAR(GCC, $1)="$GXX"
+    _LT_TAGVAR(LD, $1)="$LD"
+
+    ## CAVEAT EMPTOR:
+    ## There is no encapsulation within the following macros, do not change
+    ## the running order or otherwise move them around unless you know exactly
+    ## what you are doing...
+    _LT_SYS_HIDDEN_LIBDEPS($1)
+    _LT_COMPILER_PIC($1)
+    _LT_COMPILER_C_O($1)
+    _LT_COMPILER_FILE_LOCKS($1)
+    _LT_LINKER_SHLIBS($1)
+    _LT_SYS_DYNAMIC_LINKER($1)
+    _LT_LINKER_HARDCODE_LIBPATH($1)
+
+    _LT_CONFIG($1)
+  fi # test -n "$compiler"
+
+  CC=$lt_save_CC
+  LDCXX=$LD
+  LD=$lt_save_LD
+  GCC=$lt_save_GCC
+  with_gnu_ld=$lt_save_with_gnu_ld
+  lt_cv_path_LDCXX=$lt_cv_path_LD
+  lt_cv_path_LD=$lt_save_path_LD
+  lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
+  lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
+fi # test "$_lt_caught_CXX_error" != yes
+
+AC_LANG_POP
+])# _LT_LANG_CXX_CONFIG
+
+
+# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
+# ---------------------------------
+# Figure out "hidden" library dependencies from verbose
+# compiler output when linking a shared library.
+# Parse the compiler output and extract the necessary
+# objects, libraries and library flags.
+m4_defun([_LT_SYS_HIDDEN_LIBDEPS],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+# Dependencies to place before and after the object being linked:
+_LT_TAGVAR(predep_objects, $1)=
+_LT_TAGVAR(postdep_objects, $1)=
+_LT_TAGVAR(predeps, $1)=
+_LT_TAGVAR(postdeps, $1)=
+_LT_TAGVAR(compiler_lib_search_path, $1)=
+
+dnl we can't use the lt_simple_compile_test_code here,
+dnl because it contains code intended for an executable,
+dnl not a library.  It's possible we should let each
+dnl tag define a new lt_????_link_test_code variable,
+dnl but it's only used here...
+m4_if([$1], [], [cat > conftest.$ac_ext <<_LT_EOF
+int a;
+void foo (void) { a = 0; }
+_LT_EOF
+], [$1], [CXX], [cat > conftest.$ac_ext <<_LT_EOF
+class Foo
+{
+public:
+  Foo (void) { a = 0; }
+private:
+  int a;
+};
+_LT_EOF
+], [$1], [F77], [cat > conftest.$ac_ext <<_LT_EOF
+      subroutine foo
+      implicit none
+      integer*4 a
+      a=0
+      return
+      end
+_LT_EOF
+], [$1], [FC], [cat > conftest.$ac_ext <<_LT_EOF
+      subroutine foo
+      implicit none
+      integer a
+      a=0
+      return
+      end
+_LT_EOF
+], [$1], [GCJ], [cat > conftest.$ac_ext <<_LT_EOF
+public class foo {
+  private int a;
+  public void bar (void) {
+    a = 0;
+  }
+};
+_LT_EOF
+])
+dnl Parse the compiler output and extract the necessary
+dnl objects, libraries and library flags.
+if AC_TRY_EVAL(ac_compile); then
+  # Parse the compiler output and extract the necessary
+  # objects, libraries and library flags.
+
+  # Sentinel used to keep track of whether or not we are before
+  # the conftest object file.
+  pre_test_object_deps_done=no
+
+  for p in `eval "$output_verbose_link_cmd"`; do
+    case $p in
+
+    -L* | -R* | -l*)
+       # Some compilers place space between "-{L,R}" and the path.
+       # Remove the space.
+       if test $p = "-L" ||
+          test $p = "-R"; then
+	 prev=$p
+	 continue
+       else
+	 prev=
+       fi
+
+       if test "$pre_test_object_deps_done" = no; then
+	 case $p in
+	 -L* | -R*)
+	   # Internal compiler library paths should come after those
+	   # provided the user.  The postdeps already come after the
+	   # user supplied libs so there is no need to process them.
+	   if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then
+	     _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
+	   else
+	     _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
+	   fi
+	   ;;
+	 # The "-l" case would never come before the object being
+	 # linked, so don't bother handling this case.
+	 esac
+       else
+	 if test -z "$_LT_TAGVAR(postdeps, $1)"; then
+	   _LT_TAGVAR(postdeps, $1)="${prev}${p}"
+	 else
+	   _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
+	 fi
+       fi
+       ;;
+
+    *.$objext)
+       # This assumes that the test object file only shows up
+       # once in the compiler output.
+       if test "$p" = "conftest.$objext"; then
+	 pre_test_object_deps_done=yes
+	 continue
+       fi
+
+       if test "$pre_test_object_deps_done" = no; then
+	 if test -z "$_LT_TAGVAR(predep_objects, $1)"; then
+	   _LT_TAGVAR(predep_objects, $1)="$p"
+	 else
+	   _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p"
+	 fi
+       else
+	 if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then
+	   _LT_TAGVAR(postdep_objects, $1)="$p"
+	 else
+	   _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p"
+	 fi
+       fi
+       ;;
+
+    *) ;; # Ignore the rest.
+
+    esac
+  done
+
+  # Clean up.
+  rm -f a.out a.exe
+else
+  echo "libtool.m4: error: problem compiling $1 test program"
+fi
+
+$RM -f confest.$objext
+
+# PORTME: override above test on systems where it is broken
+m4_if([$1], [CXX],
+[case $host_os in
+interix[[3-9]]*)
+  # Interix 3.5 installs completely hosed .la files for C++, so rather than
+  # hack all around it, let's just trust "g++" to DTRT.
+  _LT_TAGVAR(predep_objects,$1)=
+  _LT_TAGVAR(postdep_objects,$1)=
+  _LT_TAGVAR(postdeps,$1)=
+  ;;
+
+linux*)
+  case `$CC -V 2>&1 | sed 5q` in
+  *Sun\ C*)
+    # Sun C++ 5.9
+
+    # The more standards-conforming stlport4 library is
+    # incompatible with the Cstd library. Avoid specifying
+    # it if it's in CXXFLAGS. Ignore libCrun as
+    # -library=stlport4 depends on it.
+    case " $CXX $CXXFLAGS " in
+    *" -library=stlport4 "*)
+      solaris_use_stlport4=yes
+      ;;
+    esac
+
+    if test "$solaris_use_stlport4" != yes; then
+      _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
+    fi
+    ;;
+  esac
+  ;;
+
+solaris*)
+  case $cc_basename in
+  CC*)
+    # The more standards-conforming stlport4 library is
+    # incompatible with the Cstd library. Avoid specifying
+    # it if it's in CXXFLAGS. Ignore libCrun as
+    # -library=stlport4 depends on it.
+    case " $CXX $CXXFLAGS " in
+    *" -library=stlport4 "*)
+      solaris_use_stlport4=yes
+      ;;
+    esac
+
+    # Adding this requires a known-good setup of shared libraries for
+    # Sun compiler versions before 5.6, else PIC objects from an old
+    # archive will be linked into the output, leading to subtle bugs.
+    if test "$solaris_use_stlport4" != yes; then
+      _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
+    fi
+    ;;
+  esac
+  ;;
+esac
+])
+
+case " $_LT_TAGVAR(postdeps, $1) " in
+*" -lc "*) _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;;
+esac
+ _LT_TAGVAR(compiler_lib_search_dirs, $1)=
+if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then
+ _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
+fi
+_LT_TAGDECL([], [compiler_lib_search_dirs], [1],
+    [The directories searched by this compiler when creating a shared library])
+_LT_TAGDECL([], [predep_objects], [1],
+    [Dependencies to place before and after the objects being linked to
+    create a shared library])
+_LT_TAGDECL([], [postdep_objects], [1])
+_LT_TAGDECL([], [predeps], [1])
+_LT_TAGDECL([], [postdeps], [1])
+_LT_TAGDECL([], [compiler_lib_search_path], [1],
+    [The library search path used internally by the compiler when linking
+    a shared library])
+])# _LT_SYS_HIDDEN_LIBDEPS
+
+
+# _LT_PROG_F77
+# ------------
+# Since AC_PROG_F77 is broken, in that it returns the empty string
+# if there is no fortran compiler, we have our own version here.
+m4_defun([_LT_PROG_F77],
+[
+pushdef([AC_MSG_ERROR], [_lt_disable_F77=yes])
+AC_PROG_F77
+if test -z "$F77" || test "X$F77" = "Xno"; then
+  _lt_disable_F77=yes
+fi
+popdef([AC_MSG_ERROR])
+])# _LT_PROG_F77
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([_LT_PROG_F77], [])
+
+
+# _LT_LANG_F77_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for a Fortran 77 compiler are
+# suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_F77_CONFIG],
+[AC_REQUIRE([_LT_PROG_F77])dnl
+AC_LANG_PUSH(Fortran 77)
+
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+_LT_TAGVAR(allow_undefined_flag, $1)=
+_LT_TAGVAR(always_export_symbols, $1)=no
+_LT_TAGVAR(archive_expsym_cmds, $1)=
+_LT_TAGVAR(export_dynamic_flag_spec, $1)=
+_LT_TAGVAR(hardcode_direct, $1)=no
+_LT_TAGVAR(hardcode_direct_absolute, $1)=no
+_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
+_LT_TAGVAR(hardcode_libdir_separator, $1)=
+_LT_TAGVAR(hardcode_minus_L, $1)=no
+_LT_TAGVAR(hardcode_automatic, $1)=no
+_LT_TAGVAR(inherit_rpath, $1)=no
+_LT_TAGVAR(module_cmds, $1)=
+_LT_TAGVAR(module_expsym_cmds, $1)=
+_LT_TAGVAR(link_all_deplibs, $1)=unknown
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(no_undefined_flag, $1)=
+_LT_TAGVAR(whole_archive_flag_spec, $1)=
+_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+
+# Source file extension for f77 test sources.
+ac_ext=f
+
+# Object file extension for compiled f77 test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# No sense in running all these tests if we already determined that
+# the F77 compiler isn't working.  Some variables (like enable_shared)
+# are currently assumed to apply to all compilers on this platform,
+# and will be corrupted by setting them based on a non-working compiler.
+if test "$_lt_disable_F77" != yes; then
+  # Code to be used in simple compile tests
+  lt_simple_compile_test_code="\
+      subroutine t
+      return
+      end
+"
+
+  # Code to be used in simple link tests
+  lt_simple_link_test_code="\
+      program t
+      end
+"
+
+  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+  _LT_TAG_COMPILER
+
+  # save warnings/boilerplate of simple test code
+  _LT_COMPILER_BOILERPLATE
+  _LT_LINKER_BOILERPLATE
+
+  # Allow CC to be a program name with arguments.
+  lt_save_CC="$CC"
+  lt_save_GCC=$GCC
+  CC=${F77-"f77"}
+  compiler=$CC
+  _LT_TAGVAR(compiler, $1)=$CC
+  _LT_CC_BASENAME([$compiler])
+  GCC=$G77
+  if test -n "$compiler"; then
+    AC_MSG_CHECKING([if libtool supports shared libraries])
+    AC_MSG_RESULT([$can_build_shared])
+
+    AC_MSG_CHECKING([whether to build shared libraries])
+    test "$can_build_shared" = "no" && enable_shared=no
+
+    # On AIX, shared libraries and static libraries use the same namespace, and
+    # are all built from PIC.
+    case $host_os in
+      aix3*)
+        test "$enable_shared" = yes && enable_static=no
+        if test -n "$RANLIB"; then
+          archive_cmds="$archive_cmds~\$RANLIB \$lib"
+          postinstall_cmds='$RANLIB $lib'
+        fi
+        ;;
+      aix[[4-9]]*)
+	if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+	  test "$enable_shared" = yes && enable_static=no
+	fi
+        ;;
+    esac
+    AC_MSG_RESULT([$enable_shared])
+
+    AC_MSG_CHECKING([whether to build static libraries])
+    # Make sure either enable_shared or enable_static is yes.
+    test "$enable_shared" = yes || enable_static=yes
+    AC_MSG_RESULT([$enable_static])
+
+    _LT_TAGVAR(GCC, $1)="$G77"
+    _LT_TAGVAR(LD, $1)="$LD"
+
+    ## CAVEAT EMPTOR:
+    ## There is no encapsulation within the following macros, do not change
+    ## the running order or otherwise move them around unless you know exactly
+    ## what you are doing...
+    _LT_COMPILER_PIC($1)
+    _LT_COMPILER_C_O($1)
+    _LT_COMPILER_FILE_LOCKS($1)
+    _LT_LINKER_SHLIBS($1)
+    _LT_SYS_DYNAMIC_LINKER($1)
+    _LT_LINKER_HARDCODE_LIBPATH($1)
+
+    _LT_CONFIG($1)
+  fi # test -n "$compiler"
+
+  GCC=$lt_save_GCC
+  CC="$lt_save_CC"
+fi # test "$_lt_disable_F77" != yes
+
+AC_LANG_POP
+])# _LT_LANG_F77_CONFIG
+
+
+# _LT_PROG_FC
+# -----------
+# Since AC_PROG_FC is broken, in that it returns the empty string
+# if there is no fortran compiler, we have our own version here.
+m4_defun([_LT_PROG_FC],
+[
+pushdef([AC_MSG_ERROR], [_lt_disable_FC=yes])
+AC_PROG_FC
+if test -z "$FC" || test "X$FC" = "Xno"; then
+  _lt_disable_FC=yes
+fi
+popdef([AC_MSG_ERROR])
+])# _LT_PROG_FC
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([_LT_PROG_FC], [])
+
+
+# _LT_LANG_FC_CONFIG([TAG])
+# -------------------------
+# Ensure that the configuration variables for a Fortran compiler are
+# suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_FC_CONFIG],
+[AC_REQUIRE([_LT_PROG_FC])dnl
+AC_LANG_PUSH(Fortran)
+
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+_LT_TAGVAR(allow_undefined_flag, $1)=
+_LT_TAGVAR(always_export_symbols, $1)=no
+_LT_TAGVAR(archive_expsym_cmds, $1)=
+_LT_TAGVAR(export_dynamic_flag_spec, $1)=
+_LT_TAGVAR(hardcode_direct, $1)=no
+_LT_TAGVAR(hardcode_direct_absolute, $1)=no
+_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
+_LT_TAGVAR(hardcode_libdir_separator, $1)=
+_LT_TAGVAR(hardcode_minus_L, $1)=no
+_LT_TAGVAR(hardcode_automatic, $1)=no
+_LT_TAGVAR(inherit_rpath, $1)=no
+_LT_TAGVAR(module_cmds, $1)=
+_LT_TAGVAR(module_expsym_cmds, $1)=
+_LT_TAGVAR(link_all_deplibs, $1)=unknown
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(no_undefined_flag, $1)=
+_LT_TAGVAR(whole_archive_flag_spec, $1)=
+_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+
+# Source file extension for fc test sources.
+ac_ext=${ac_fc_srcext-f}
+
+# Object file extension for compiled fc test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# No sense in running all these tests if we already determined that
+# the FC compiler isn't working.  Some variables (like enable_shared)
+# are currently assumed to apply to all compilers on this platform,
+# and will be corrupted by setting them based on a non-working compiler.
+if test "$_lt_disable_FC" != yes; then
+  # Code to be used in simple compile tests
+  lt_simple_compile_test_code="\
+      subroutine t
+      return
+      end
+"
+
+  # Code to be used in simple link tests
+  lt_simple_link_test_code="\
+      program t
+      end
+"
+
+  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+  _LT_TAG_COMPILER
+
+  # save warnings/boilerplate of simple test code
+  _LT_COMPILER_BOILERPLATE
+  _LT_LINKER_BOILERPLATE
+
+  # Allow CC to be a program name with arguments.
+  lt_save_CC="$CC"
+  lt_save_GCC=$GCC
+  CC=${FC-"f95"}
+  compiler=$CC
+  GCC=$ac_cv_fc_compiler_gnu
+
+  _LT_TAGVAR(compiler, $1)=$CC
+  _LT_CC_BASENAME([$compiler])
+
+  if test -n "$compiler"; then
+    AC_MSG_CHECKING([if libtool supports shared libraries])
+    AC_MSG_RESULT([$can_build_shared])
+
+    AC_MSG_CHECKING([whether to build shared libraries])
+    test "$can_build_shared" = "no" && enable_shared=no
+
+    # On AIX, shared libraries and static libraries use the same namespace, and
+    # are all built from PIC.
+    case $host_os in
+      aix3*)
+        test "$enable_shared" = yes && enable_static=no
+        if test -n "$RANLIB"; then
+          archive_cmds="$archive_cmds~\$RANLIB \$lib"
+          postinstall_cmds='$RANLIB $lib'
+        fi
+        ;;
+      aix[[4-9]]*)
+	if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+	  test "$enable_shared" = yes && enable_static=no
+	fi
+        ;;
+    esac
+    AC_MSG_RESULT([$enable_shared])
+
+    AC_MSG_CHECKING([whether to build static libraries])
+    # Make sure either enable_shared or enable_static is yes.
+    test "$enable_shared" = yes || enable_static=yes
+    AC_MSG_RESULT([$enable_static])
+
+    _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu"
+    _LT_TAGVAR(LD, $1)="$LD"
+
+    ## CAVEAT EMPTOR:
+    ## There is no encapsulation within the following macros, do not change
+    ## the running order or otherwise move them around unless you know exactly
+    ## what you are doing...
+    _LT_SYS_HIDDEN_LIBDEPS($1)
+    _LT_COMPILER_PIC($1)
+    _LT_COMPILER_C_O($1)
+    _LT_COMPILER_FILE_LOCKS($1)
+    _LT_LINKER_SHLIBS($1)
+    _LT_SYS_DYNAMIC_LINKER($1)
+    _LT_LINKER_HARDCODE_LIBPATH($1)
+
+    _LT_CONFIG($1)
+  fi # test -n "$compiler"
+
+  GCC=$lt_save_GCC
+  CC="$lt_save_CC"
+fi # test "$_lt_disable_FC" != yes
+
+AC_LANG_POP
+])# _LT_LANG_FC_CONFIG
+
+
+# _LT_LANG_GCJ_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for the GNU Java Compiler compiler
+# are suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_GCJ_CONFIG],
+[AC_REQUIRE([LT_PROG_GCJ])dnl
+AC_LANG_SAVE
+
+# Source file extension for Java test sources.
+ac_ext=java
+
+# Object file extension for compiled Java test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="class foo {}"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_TAG_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC="$CC"
+lt_save_GCC=$GCC
+GCC=yes
+CC=${GCJ-"gcj"}
+compiler=$CC
+_LT_TAGVAR(compiler, $1)=$CC
+_LT_TAGVAR(LD, $1)="$LD"
+_LT_CC_BASENAME([$compiler])
+
+# GCJ did not exist at the time GCC didn't implicitly link libc in.
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+
+## CAVEAT EMPTOR:
+## There is no encapsulation within the following macros, do not change
+## the running order or otherwise move them around unless you know exactly
+## what you are doing...
+if test -n "$compiler"; then
+  _LT_COMPILER_NO_RTTI($1)
+  _LT_COMPILER_PIC($1)
+  _LT_COMPILER_C_O($1)
+  _LT_COMPILER_FILE_LOCKS($1)
+  _LT_LINKER_SHLIBS($1)
+  _LT_LINKER_HARDCODE_LIBPATH($1)
+
+  _LT_CONFIG($1)
+fi
+
+AC_LANG_RESTORE
+
+GCC=$lt_save_GCC
+CC="$lt_save_CC"
+])# _LT_LANG_GCJ_CONFIG
+
+
+# _LT_LANG_RC_CONFIG([TAG])
+# -------------------------
+# Ensure that the configuration variables for the Windows resource compiler
+# are suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_RC_CONFIG],
+[AC_REQUIRE([LT_PROG_RC])dnl
+AC_LANG_SAVE
+
+# Source file extension for RC test sources.
+ac_ext=rc
+
+# Object file extension for compiled RC test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
+
+# Code to be used in simple link tests
+lt_simple_link_test_code="$lt_simple_compile_test_code"
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_TAG_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC="$CC"
+lt_save_GCC=$GCC
+GCC=
+CC=${RC-"windres"}
+compiler=$CC
+_LT_TAGVAR(compiler, $1)=$CC
+_LT_CC_BASENAME([$compiler])
+_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+
+if test -n "$compiler"; then
+  :
+  _LT_CONFIG($1)
+fi
+
+GCC=$lt_save_GCC
+AC_LANG_RESTORE
+CC="$lt_save_CC"
+])# _LT_LANG_RC_CONFIG
+
+
+# LT_PROG_GCJ
+# -----------
+AC_DEFUN([LT_PROG_GCJ],
+[m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ],
+  [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ],
+    [AC_CHECK_TOOL(GCJ, gcj,)
+      test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
+      AC_SUBST(GCJFLAGS)])])[]dnl
+])
+
+# Old name:
+AU_ALIAS([LT_AC_PROG_GCJ], [LT_PROG_GCJ])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([LT_AC_PROG_GCJ], [])
+
+
+# LT_PROG_RC
+# ----------
+AC_DEFUN([LT_PROG_RC],
+[AC_CHECK_TOOL(RC, windres,)
+])
+
+# Old name:
+AU_ALIAS([LT_AC_PROG_RC], [LT_PROG_RC])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([LT_AC_PROG_RC], [])
+
+
+# _LT_DECL_EGREP
+# --------------
+# If we don't have a new enough Autoconf to choose the best grep
+# available, choose the one first in the user's PATH.
+m4_defun([_LT_DECL_EGREP],
+[AC_REQUIRE([AC_PROG_EGREP])dnl
+AC_REQUIRE([AC_PROG_FGREP])dnl
+test -z "$GREP" && GREP=grep
+_LT_DECL([], [GREP], [1], [A grep program that handles long lines])
+_LT_DECL([], [EGREP], [1], [An ERE matcher])
+_LT_DECL([], [FGREP], [1], [A literal string matcher])
+dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too
+AC_SUBST([GREP])
+])
+
+
+# _LT_DECL_OBJDUMP
+# --------------
+# If we don't have a new enough Autoconf to choose the best objdump
+# available, choose the one first in the user's PATH.
+m4_defun([_LT_DECL_OBJDUMP],
+[AC_CHECK_TOOL(OBJDUMP, objdump, false)
+test -z "$OBJDUMP" && OBJDUMP=objdump
+_LT_DECL([], [OBJDUMP], [1], [An object symbol dumper])
+AC_SUBST([OBJDUMP])
+])
+
+
+# _LT_DECL_SED
+# ------------
+# Check for a fully-functional sed program, that truncates
+# as few characters as possible.  Prefer GNU sed if found.
+m4_defun([_LT_DECL_SED],
+[AC_PROG_SED
+test -z "$SED" && SED=sed
+Xsed="$SED -e 1s/^X//"
+_LT_DECL([], [SED], [1], [A sed program that does not truncate output])
+_LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"],
+    [Sed that helps us avoid accidentally triggering echo(1) options like -n])
+])# _LT_DECL_SED
+
+m4_ifndef([AC_PROG_SED], [
+############################################################
+# NOTE: This macro has been submitted for inclusion into   #
+#  GNU Autoconf as AC_PROG_SED.  When it is available in   #
+#  a released version of Autoconf we should remove this    #
+#  macro and use it instead.                               #
+############################################################
+
+m4_defun([AC_PROG_SED],
+[AC_MSG_CHECKING([for a sed that does not truncate output])
+AC_CACHE_VAL(lt_cv_path_SED,
+[# Loop through the user's path and test for sed and gsed.
+# Then use that list of sed's as ones to test for truncation.
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for lt_ac_prog in sed gsed; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
+        lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
+      fi
+    done
+  done
+done
+IFS=$as_save_IFS
+lt_ac_max=0
+lt_ac_count=0
+# Add /usr/xpg4/bin/sed as it is typically found on Solaris
+# along with /bin/sed that truncates output.
+for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
+  test ! -f $lt_ac_sed && continue
+  cat /dev/null > conftest.in
+  lt_ac_count=0
+  echo $ECHO_N "0123456789$ECHO_C" >conftest.in
+  # Check for GNU sed and select it if it is found.
+  if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
+    lt_cv_path_SED=$lt_ac_sed
+    break
+  fi
+  while true; do
+    cat conftest.in conftest.in >conftest.tmp
+    mv conftest.tmp conftest.in
+    cp conftest.in conftest.nl
+    echo >>conftest.nl
+    $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
+    cmp -s conftest.out conftest.nl || break
+    # 10000 chars as input seems more than enough
+    test $lt_ac_count -gt 10 && break
+    lt_ac_count=`expr $lt_ac_count + 1`
+    if test $lt_ac_count -gt $lt_ac_max; then
+      lt_ac_max=$lt_ac_count
+      lt_cv_path_SED=$lt_ac_sed
+    fi
+  done
+done
+])
+SED=$lt_cv_path_SED
+AC_SUBST([SED])
+AC_MSG_RESULT([$SED])
+])#AC_PROG_SED
+])#m4_ifndef
+
+# Old name:
+AU_ALIAS([LT_AC_PROG_SED], [AC_PROG_SED])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([LT_AC_PROG_SED], [])
+
+
+# _LT_CHECK_SHELL_FEATURES
+# ------------------------
+# Find out whether the shell is Bourne or XSI compatible,
+# or has some other useful features.
+m4_defun([_LT_CHECK_SHELL_FEATURES],
+[AC_MSG_CHECKING([whether the shell understands some XSI constructs])
+# Try some XSI features
+xsi_shell=no
+( _lt_dummy="a/b/c"
+  test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
+      = c,a/b,, \
+    && eval 'test $(( 1 + 1 )) -eq 2 \
+    && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
+  && xsi_shell=yes
+AC_MSG_RESULT([$xsi_shell])
+_LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell'])
+
+AC_MSG_CHECKING([whether the shell understands "+="])
+lt_shell_append=no
+( foo=bar; set foo baz; eval "$[1]+=\$[2]" && test "$foo" = barbaz ) \
+    >/dev/null 2>&1 \
+  && lt_shell_append=yes
+AC_MSG_RESULT([$lt_shell_append])
+_LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append'])
+
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+  lt_unset=unset
+else
+  lt_unset=false
+fi
+_LT_DECL([], [lt_unset], [0], [whether the shell understands "unset"])dnl
+
+# test EBCDIC or ASCII
+case `echo X|tr X '\101'` in
+ A) # ASCII based system
+    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
+  lt_SP2NL='tr \040 \012'
+  lt_NL2SP='tr \015\012 \040\040'
+  ;;
+ *) # EBCDIC based system
+  lt_SP2NL='tr \100 \n'
+  lt_NL2SP='tr \r\n \100\100'
+  ;;
+esac
+_LT_DECL([SP2NL], [lt_SP2NL], [1], [turn spaces into newlines])dnl
+_LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl
+])# _LT_CHECK_SHELL_FEATURES
+
+
+# _LT_PROG_XSI_SHELLFNS
+# ---------------------
+# Bourne and XSI compatible variants of some useful shell functions.
+m4_defun([_LT_PROG_XSI_SHELLFNS],
+[case $xsi_shell in
+  yes)
+    cat << \_LT_EOF >> "$cfgfile"
+
+# func_dirname file append nondir_replacement
+# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
+# otherwise set result to NONDIR_REPLACEMENT.
+func_dirname ()
+{
+  case ${1} in
+    */*) func_dirname_result="${1%/*}${2}" ;;
+    *  ) func_dirname_result="${3}" ;;
+  esac
+}
+
+# func_basename file
+func_basename ()
+{
+  func_basename_result="${1##*/}"
+}
+
+# func_dirname_and_basename file append nondir_replacement
+# perform func_basename and func_dirname in a single function
+# call:
+#   dirname:  Compute the dirname of FILE.  If nonempty,
+#             add APPEND to the result, otherwise set result
+#             to NONDIR_REPLACEMENT.
+#             value returned in "$func_dirname_result"
+#   basename: Compute filename of FILE.
+#             value retuned in "$func_basename_result"
+# Implementation must be kept synchronized with func_dirname
+# and func_basename. For efficiency, we do not delegate to
+# those functions but instead duplicate the functionality here.
+func_dirname_and_basename ()
+{
+  case ${1} in
+    */*) func_dirname_result="${1%/*}${2}" ;;
+    *  ) func_dirname_result="${3}" ;;
+  esac
+  func_basename_result="${1##*/}"
+}
+
+# func_stripname prefix suffix name
+# strip PREFIX and SUFFIX off of NAME.
+# PREFIX and SUFFIX must not contain globbing or regex special
+# characters, hashes, percent signs, but SUFFIX may contain a leading
+# dot (in which case that matches only a dot).
+func_stripname ()
+{
+  # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
+  # positional parameters, so assign one to ordinary parameter first.
+  func_stripname_result=${3}
+  func_stripname_result=${func_stripname_result#"${1}"}
+  func_stripname_result=${func_stripname_result%"${2}"}
+}
+
+# func_opt_split
+func_opt_split ()
+{
+  func_opt_split_opt=${1%%=*}
+  func_opt_split_arg=${1#*=}
+}
+
+# func_lo2o object
+func_lo2o ()
+{
+  case ${1} in
+    *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
+    *)    func_lo2o_result=${1} ;;
+  esac
+}
+
+# func_xform libobj-or-source
+func_xform ()
+{
+  func_xform_result=${1%.*}.lo
+}
+
+# func_arith arithmetic-term...
+func_arith ()
+{
+  func_arith_result=$(( $[*] ))
+}
+
+# func_len string
+# STRING may not start with a hyphen.
+func_len ()
+{
+  func_len_result=${#1}
+}
+
+_LT_EOF
+    ;;
+  *) # Bourne compatible functions.
+    cat << \_LT_EOF >> "$cfgfile"
+
+# func_dirname file append nondir_replacement
+# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
+# otherwise set result to NONDIR_REPLACEMENT.
+func_dirname ()
+{
+  # Extract subdirectory from the argument.
+  func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
+  if test "X$func_dirname_result" = "X${1}"; then
+    func_dirname_result="${3}"
+  else
+    func_dirname_result="$func_dirname_result${2}"
+  fi
+}
+
+# func_basename file
+func_basename ()
+{
+  func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
+}
+
+dnl func_dirname_and_basename
+dnl A portable version of this function is already defined in general.m4sh
+dnl so there is no need for it here.
+
+# func_stripname prefix suffix name
+# strip PREFIX and SUFFIX off of NAME.
+# PREFIX and SUFFIX must not contain globbing or regex special
+# characters, hashes, percent signs, but SUFFIX may contain a leading
+# dot (in which case that matches only a dot).
+# func_strip_suffix prefix name
+func_stripname ()
+{
+  case ${2} in
+    .*) func_stripname_result=`$ECHO "X${3}" \
+           | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;
+    *)  func_stripname_result=`$ECHO "X${3}" \
+           | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;
+  esac
+}
+
+# sed scripts:
+my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q'
+my_sed_long_arg='1s/^-[[^=]]*=//'
+
+# func_opt_split
+func_opt_split ()
+{
+  func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`
+  func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`
+}
+
+# func_lo2o object
+func_lo2o ()
+{
+  func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
+}
+
+# func_xform libobj-or-source
+func_xform ()
+{
+  func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[[^.]]*$/.lo/'`
+}
+
+# func_arith arithmetic-term...
+func_arith ()
+{
+  func_arith_result=`expr "$[@]"`
+}
+
+# func_len string
+# STRING may not start with a hyphen.
+func_len ()
+{
+  func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len`
+}
+
+_LT_EOF
+esac
+
+case $lt_shell_append in
+  yes)
+    cat << \_LT_EOF >> "$cfgfile"
+
+# func_append var value
+# Append VALUE to the end of shell variable VAR.
+func_append ()
+{
+  eval "$[1]+=\$[2]"
+}
+_LT_EOF
+    ;;
+  *)
+    cat << \_LT_EOF >> "$cfgfile"
+
+# func_append var value
+# Append VALUE to the end of shell variable VAR.
+func_append ()
+{
+  eval "$[1]=\$$[1]\$[2]"
+}
+
+_LT_EOF
+    ;;
+  esac
+])
diff --git a/m4/ltoptions.m4 b/m4/ltoptions.m4
new file mode 100644
index 0000000..34151a3
--- /dev/null
+++ b/m4/ltoptions.m4
@@ -0,0 +1,368 @@
+# Helper functions for option handling.                    -*- Autoconf -*-
+#
+#   Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
+#   Written by Gary V. Vaughan, 2004
+#
+# 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 ltoptions.m4
+
+# This is to help aclocal find these macros, as it can't see m4_define.
+AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
+
+
+# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME)
+# ------------------------------------------
+m4_define([_LT_MANGLE_OPTION],
+[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])])
+
+
+# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME)
+# ---------------------------------------
+# Set option OPTION-NAME for macro MACRO-NAME, and if there is a
+# matching handler defined, dispatch to it.  Other OPTION-NAMEs are
+# saved as a flag.
+m4_define([_LT_SET_OPTION],
+[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl
+m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]),
+        _LT_MANGLE_DEFUN([$1], [$2]),
+    [m4_warning([Unknown $1 option `$2'])])[]dnl
+])
+
+
+# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, [IF-NOT-SET])
+# ------------------------------------------------------------
+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
+m4_define([_LT_IF_OPTION],
+[m4_ifdef(_LT_MANGLE_OPTION([$1], [$2]), [$3], [$4])])
+
+
+# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET)
+# -------------------------------------------------------
+# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME
+# are set.
+m4_define([_LT_UNLESS_OPTIONS],
+[m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
+	    [m4_ifdef(_LT_MANGLE_OPTION([$1], _LT_Option),
+		      [m4_define([$0_found])])])[]dnl
+m4_ifdef([$0_found], [m4_undefine([$0_found])], [$3
+])[]dnl
+])
+
+
+# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST)
+# ----------------------------------------
+# OPTION-LIST is a space-separated list of Libtool options associated
+# with MACRO-NAME.  If any OPTION has a matching handler declared with
+# LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about
+# the unknown option and exit.
+m4_defun([_LT_SET_OPTIONS],
+[# Set options
+m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
+    [_LT_SET_OPTION([$1], _LT_Option)])
+
+m4_if([$1],[LT_INIT],[
+  dnl
+  dnl Simply set some default values (i.e off) if boolean options were not
+  dnl specified:
+  _LT_UNLESS_OPTIONS([LT_INIT], [dlopen], [enable_dlopen=no
+  ])
+  _LT_UNLESS_OPTIONS([LT_INIT], [win32-dll], [enable_win32_dll=no
+  ])
+  dnl
+  dnl If no reference was made to various pairs of opposing options, then
+  dnl we run the default mode handler for the pair.  For example, if neither
+  dnl `shared' nor `disable-shared' was passed, we enable building of shared
+  dnl archives by default:
+  _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED])
+  _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC])
+  _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC])
+  _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install],
+  		   [_LT_ENABLE_FAST_INSTALL])
+  ])
+])# _LT_SET_OPTIONS
+
+
+## --------------------------------- ##
+## Macros to handle LT_INIT options. ##
+## --------------------------------- ##
+
+# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME)
+# -----------------------------------------
+m4_define([_LT_MANGLE_DEFUN],
+[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])])
+
+
+# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE)
+# -----------------------------------------------
+m4_define([LT_OPTION_DEFINE],
+[m4_define(_LT_MANGLE_DEFUN([$1], [$2]), [$3])[]dnl
+])# LT_OPTION_DEFINE
+
+
+# dlopen
+# ------
+LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes
+])
+
+AU_DEFUN([AC_LIBTOOL_DLOPEN],
+[_LT_SET_OPTION([LT_INIT], [dlopen])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you
+put the `dlopen' option into LT_INIT's first parameter.])
+])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], [])
+
+
+# win32-dll
+# ---------
+# Declare package support for building win32 dll's.
+LT_OPTION_DEFINE([LT_INIT], [win32-dll],
+[enable_win32_dll=yes
+
+case $host in
+*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)
+  AC_CHECK_TOOL(AS, as, false)
+  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+  AC_CHECK_TOOL(OBJDUMP, objdump, false)
+  ;;
+esac
+
+test -z "$AS" && AS=as
+_LT_DECL([], [AS],      [0], [Assembler program])dnl
+
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl
+
+test -z "$OBJDUMP" && OBJDUMP=objdump
+_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl
+])# win32-dll
+
+AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+_LT_SET_OPTION([LT_INIT], [win32-dll])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you
+put the `win32-dll' option into LT_INIT's first parameter.])
+])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [])
+
+
+# _LT_ENABLE_SHARED([DEFAULT])
+# ----------------------------
+# implement the --enable-shared flag, and supports the `shared' and
+# `disable-shared' LT_INIT options.
+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+m4_define([_LT_ENABLE_SHARED],
+[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl
+AC_ARG_ENABLE([shared],
+    [AS_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
+	[build shared libraries @<:@default=]_LT_ENABLE_SHARED_DEFAULT[@:>@])],
+    [p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_shared=yes ;;
+    no) enable_shared=no ;;
+    *)
+      enable_shared=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_shared=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac],
+    [enable_shared=]_LT_ENABLE_SHARED_DEFAULT)
+
+    _LT_DECL([build_libtool_libs], [enable_shared], [0],
+	[Whether or not to build shared libraries])
+])# _LT_ENABLE_SHARED
+
+LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])])
+LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])])
+
+# Old names:
+AC_DEFUN([AC_ENABLE_SHARED],
+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared])
+])
+
+AC_DEFUN([AC_DISABLE_SHARED],
+[_LT_SET_OPTION([LT_INIT], [disable-shared])
+])
+
+AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)])
+AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AM_ENABLE_SHARED], [])
+dnl AC_DEFUN([AM_DISABLE_SHARED], [])
+
+
+
+# _LT_ENABLE_STATIC([DEFAULT])
+# ----------------------------
+# implement the --enable-static flag, and support the `static' and
+# `disable-static' LT_INIT options.
+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+m4_define([_LT_ENABLE_STATIC],
+[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl
+AC_ARG_ENABLE([static],
+    [AS_HELP_STRING([--enable-static@<:@=PKGS@:>@],
+	[build static libraries @<:@default=]_LT_ENABLE_STATIC_DEFAULT[@:>@])],
+    [p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_static=yes ;;
+    no) enable_static=no ;;
+    *)
+     enable_static=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_static=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac],
+    [enable_static=]_LT_ENABLE_STATIC_DEFAULT)
+
+    _LT_DECL([build_old_libs], [enable_static], [0],
+	[Whether or not to build static libraries])
+])# _LT_ENABLE_STATIC
+
+LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])])
+LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])])
+
+# Old names:
+AC_DEFUN([AC_ENABLE_STATIC],
+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static])
+])
+
+AC_DEFUN([AC_DISABLE_STATIC],
+[_LT_SET_OPTION([LT_INIT], [disable-static])
+])
+
+AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)])
+AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AM_ENABLE_STATIC], [])
+dnl AC_DEFUN([AM_DISABLE_STATIC], [])
+
+
+
+# _LT_ENABLE_FAST_INSTALL([DEFAULT])
+# ----------------------------------
+# implement the --enable-fast-install flag, and support the `fast-install'
+# and `disable-fast-install' LT_INIT options.
+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+m4_define([_LT_ENABLE_FAST_INSTALL],
+[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl
+AC_ARG_ENABLE([fast-install],
+    [AS_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
+    [optimize for fast installation @<:@default=]_LT_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
+    [p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_fast_install=yes ;;
+    no) enable_fast_install=no ;;
+    *)
+      enable_fast_install=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_fast_install=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac],
+    [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT)
+
+_LT_DECL([fast_install], [enable_fast_install], [0],
+	 [Whether or not to optimize for fast installation])dnl
+])# _LT_ENABLE_FAST_INSTALL
+
+LT_OPTION_DEFINE([LT_INIT], [fast-install], [_LT_ENABLE_FAST_INSTALL([yes])])
+LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no])])
+
+# Old names:
+AU_DEFUN([AC_ENABLE_FAST_INSTALL],
+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you put
+the `fast-install' option into LT_INIT's first parameter.])
+])
+
+AU_DEFUN([AC_DISABLE_FAST_INSTALL],
+[_LT_SET_OPTION([LT_INIT], [disable-fast-install])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you put
+the `disable-fast-install' option into LT_INIT's first parameter.])
+])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], [])
+dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])
+
+
+# _LT_WITH_PIC([MODE])
+# --------------------
+# implement the --with-pic flag, and support the `pic-only' and `no-pic'
+# LT_INIT options.
+# MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
+m4_define([_LT_WITH_PIC],
+[AC_ARG_WITH([pic],
+    [AS_HELP_STRING([--with-pic],
+	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
+    [pic_mode="$withval"],
+    [pic_mode=default])
+
+test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
+
+_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl
+])# _LT_WITH_PIC
+
+LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])])
+LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])])
+
+# Old name:
+AU_DEFUN([AC_LIBTOOL_PICMODE],
+[_LT_SET_OPTION([LT_INIT], [pic-only])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you
+put the `pic-only' option into LT_INIT's first parameter.])
+])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_PICMODE], [])
+
+## ----------------- ##
+## LTDL_INIT Options ##
+## ----------------- ##
+
+m4_define([_LTDL_MODE], [])
+LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive],
+		 [m4_define([_LTDL_MODE], [nonrecursive])])
+LT_OPTION_DEFINE([LTDL_INIT], [recursive],
+		 [m4_define([_LTDL_MODE], [recursive])])
+LT_OPTION_DEFINE([LTDL_INIT], [subproject],
+		 [m4_define([_LTDL_MODE], [subproject])])
+
+m4_define([_LTDL_TYPE], [])
+LT_OPTION_DEFINE([LTDL_INIT], [installable],
+		 [m4_define([_LTDL_TYPE], [installable])])
+LT_OPTION_DEFINE([LTDL_INIT], [convenience],
+		 [m4_define([_LTDL_TYPE], [convenience])])
diff --git a/m4/ltsugar.m4 b/m4/ltsugar.m4
new file mode 100644
index 0000000..9000a05
--- /dev/null
+++ b/m4/ltsugar.m4
@@ -0,0 +1,123 @@
+# ltsugar.m4 -- libtool m4 base layer.                         -*-Autoconf-*-
+#
+# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
+# Written by Gary V. Vaughan, 2004
+#
+# 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 ltsugar.m4
+
+# This is to help aclocal find these macros, as it can't see m4_define.
+AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])])
+
+
+# lt_join(SEP, ARG1, [ARG2...])
+# -----------------------------
+# Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their
+# associated separator.
+# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier
+# versions in m4sugar had bugs.
+m4_define([lt_join],
+[m4_if([$#], [1], [],
+       [$#], [2], [[$2]],
+       [m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift(m4_shift($@)))])])
+m4_define([_lt_join],
+[m4_if([$#$2], [2], [],
+       [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift(m4_shift($@)))])])
+
+
+# lt_car(LIST)
+# lt_cdr(LIST)
+# ------------
+# Manipulate m4 lists.
+# These macros are necessary as long as will still need to support
+# Autoconf-2.59 which quotes differently.
+m4_define([lt_car], [[$1]])
+m4_define([lt_cdr],
+[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])],
+       [$#], 1, [],
+       [m4_dquote(m4_shift($@))])])
+m4_define([lt_unquote], $1)
+
+
+# lt_append(MACRO-NAME, STRING, [SEPARATOR])
+# ------------------------------------------
+# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'.
+# Note that neither SEPARATOR nor STRING are expanded; they are appended
+# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked).
+# No SEPARATOR is output if MACRO-NAME was previously undefined (different
+# than defined and empty).
+#
+# This macro is needed until we can rely on Autoconf 2.62, since earlier
+# versions of m4sugar mistakenly expanded SEPARATOR but not STRING.
+m4_define([lt_append],
+[m4_define([$1],
+	   m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])])
+
+
+
+# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...])
+# ----------------------------------------------------------
+# Produce a SEP delimited list of all paired combinations of elements of
+# PREFIX-LIST with SUFFIX1 through SUFFIXn.  Each element of the list
+# has the form PREFIXmINFIXSUFFIXn.
+# Needed until we can rely on m4_combine added in Autoconf 2.62.
+m4_define([lt_combine],
+[m4_if(m4_eval([$# > 3]), [1],
+       [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl
+[[m4_foreach([_Lt_prefix], [$2],
+	     [m4_foreach([_Lt_suffix],
+		]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[,
+	[_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])])
+
+
+# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ])
+# -----------------------------------------------------------------------
+# Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited
+# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ.
+m4_define([lt_if_append_uniq],
+[m4_ifdef([$1],
+	  [m4_if(m4_index([$3]m4_defn([$1])[$3], [$3$2$3]), [-1],
+		 [lt_append([$1], [$2], [$3])$4],
+		 [$5])],
+	  [lt_append([$1], [$2], [$3])$4])])
+
+
+# lt_dict_add(DICT, KEY, VALUE)
+# -----------------------------
+m4_define([lt_dict_add],
+[m4_define([$1($2)], [$3])])
+
+
+# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE)
+# --------------------------------------------
+m4_define([lt_dict_add_subkey],
+[m4_define([$1($2:$3)], [$4])])
+
+
+# lt_dict_fetch(DICT, KEY, [SUBKEY])
+# ----------------------------------
+m4_define([lt_dict_fetch],
+[m4_ifval([$3],
+	m4_ifdef([$1($2:$3)], [m4_defn([$1($2:$3)])]),
+    m4_ifdef([$1($2)], [m4_defn([$1($2)])]))])
+
+
+# lt_if_dict_fetch(DICT, KEY, [SUBKEY], VALUE, IF-TRUE, [IF-FALSE])
+# -----------------------------------------------------------------
+m4_define([lt_if_dict_fetch],
+[m4_if(lt_dict_fetch([$1], [$2], [$3]), [$4],
+	[$5],
+    [$6])])
+
+
+# lt_dict_filter(DICT, [SUBKEY], VALUE, [SEPARATOR], KEY, [...])
+# --------------------------------------------------------------
+m4_define([lt_dict_filter],
+[m4_if([$5], [], [],
+  [lt_join(m4_quote(m4_default([$4], [[, ]])),
+           lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]),
+		      [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl
+])
diff --git a/m4/ltversion.m4 b/m4/ltversion.m4
new file mode 100644
index 0000000..f3c5309
--- /dev/null
+++ b/m4/ltversion.m4
@@ -0,0 +1,23 @@
+# ltversion.m4 -- version numbers			-*- Autoconf -*-
+#
+#   Copyright (C) 2004 Free Software Foundation, Inc.
+#   Written by Scott James Remnant, 2004
+#
+# 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.
+
+# Generated from ltversion.in.
+
+# serial 3017 ltversion.m4
+# This file is part of GNU Libtool
+
+m4_define([LT_PACKAGE_VERSION], [2.2.6b])
+m4_define([LT_PACKAGE_REVISION], [1.3017])
+
+AC_DEFUN([LTVERSION_VERSION],
+[macro_version='2.2.6b'
+macro_revision='1.3017'
+_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
+_LT_DECL(, macro_revision, 0)
+])
diff --git a/m4/lt~obsolete.m4 b/m4/lt~obsolete.m4
new file mode 100644
index 0000000..637bb20
--- /dev/null
+++ b/m4/lt~obsolete.m4
@@ -0,0 +1,92 @@
+# lt~obsolete.m4 -- aclocal satisfying obsolete definitions.    -*-Autoconf-*-
+#
+#   Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc.
+#   Written by Scott James Remnant, 2004.
+#
+# 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 lt~obsolete.m4
+
+# These exist entirely to fool aclocal when bootstrapping libtool.
+#
+# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN)
+# which have later been changed to m4_define as they aren't part of the
+# exported API, or moved to Autoconf or Automake where they belong.
+#
+# The trouble is, aclocal is a bit thick.  It'll see the old AC_DEFUN
+# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us
+# using a macro with the same name in our local m4/libtool.m4 it'll
+# pull the old libtool.m4 in (it doesn't see our shiny new m4_define
+# and doesn't know about Autoconf macros at all.)
+#
+# So we provide this file, which has a silly filename so it's always
+# included after everything else.  This provides aclocal with the
+# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything
+# because those macros already exist, or will be overwritten later.
+# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. 
+#
+# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here.
+# Yes, that means every name once taken will need to remain here until
+# we give up compatibility with versions before 1.7, at which point
+# we need to keep only those names which we still refer to.
+
+# This is to help aclocal find these macros, as it can't see m4_define.
+AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])])
+
+m4_ifndef([AC_LIBTOOL_LINKER_OPTION],	[AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])])
+m4_ifndef([AC_PROG_EGREP],		[AC_DEFUN([AC_PROG_EGREP])])
+m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH],	[AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])])
+m4_ifndef([_LT_AC_SHELL_INIT],		[AC_DEFUN([_LT_AC_SHELL_INIT])])
+m4_ifndef([_LT_AC_SYS_LIBPATH_AIX],	[AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])])
+m4_ifndef([_LT_PROG_LTMAIN],		[AC_DEFUN([_LT_PROG_LTMAIN])])
+m4_ifndef([_LT_AC_TAGVAR],		[AC_DEFUN([_LT_AC_TAGVAR])])
+m4_ifndef([AC_LTDL_ENABLE_INSTALL],	[AC_DEFUN([AC_LTDL_ENABLE_INSTALL])])
+m4_ifndef([AC_LTDL_PREOPEN],		[AC_DEFUN([AC_LTDL_PREOPEN])])
+m4_ifndef([_LT_AC_SYS_COMPILER],	[AC_DEFUN([_LT_AC_SYS_COMPILER])])
+m4_ifndef([_LT_AC_LOCK],		[AC_DEFUN([_LT_AC_LOCK])])
+m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE],	[AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])])
+m4_ifndef([_LT_AC_TRY_DLOPEN_SELF],	[AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])])
+m4_ifndef([AC_LIBTOOL_PROG_CC_C_O],	[AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])])
+m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])])
+m4_ifndef([AC_LIBTOOL_OBJDIR],		[AC_DEFUN([AC_LIBTOOL_OBJDIR])])
+m4_ifndef([AC_LTDL_OBJDIR],		[AC_DEFUN([AC_LTDL_OBJDIR])])
+m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])])
+m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP],	[AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])])
+m4_ifndef([AC_PATH_MAGIC],		[AC_DEFUN([AC_PATH_MAGIC])])
+m4_ifndef([AC_PROG_LD_GNU],		[AC_DEFUN([AC_PROG_LD_GNU])])
+m4_ifndef([AC_PROG_LD_RELOAD_FLAG],	[AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])])
+m4_ifndef([AC_DEPLIBS_CHECK_METHOD],	[AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])])
+m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])])
+m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])])
+m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])])
+m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS],	[AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])])
+m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP],	[AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])])
+m4_ifndef([LT_AC_PROG_EGREP],		[AC_DEFUN([LT_AC_PROG_EGREP])])
+m4_ifndef([LT_AC_PROG_SED],		[AC_DEFUN([LT_AC_PROG_SED])])
+m4_ifndef([_LT_CC_BASENAME],		[AC_DEFUN([_LT_CC_BASENAME])])
+m4_ifndef([_LT_COMPILER_BOILERPLATE],	[AC_DEFUN([_LT_COMPILER_BOILERPLATE])])
+m4_ifndef([_LT_LINKER_BOILERPLATE],	[AC_DEFUN([_LT_LINKER_BOILERPLATE])])
+m4_ifndef([_AC_PROG_LIBTOOL],		[AC_DEFUN([_AC_PROG_LIBTOOL])])
+m4_ifndef([AC_LIBTOOL_SETUP],		[AC_DEFUN([AC_LIBTOOL_SETUP])])
+m4_ifndef([_LT_AC_CHECK_DLFCN],		[AC_DEFUN([_LT_AC_CHECK_DLFCN])])
+m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER],	[AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])])
+m4_ifndef([_LT_AC_TAGCONFIG],		[AC_DEFUN([_LT_AC_TAGCONFIG])])
+m4_ifndef([AC_DISABLE_FAST_INSTALL],	[AC_DEFUN([AC_DISABLE_FAST_INSTALL])])
+m4_ifndef([_LT_AC_LANG_CXX],		[AC_DEFUN([_LT_AC_LANG_CXX])])
+m4_ifndef([_LT_AC_LANG_F77],		[AC_DEFUN([_LT_AC_LANG_F77])])
+m4_ifndef([_LT_AC_LANG_GCJ],		[AC_DEFUN([_LT_AC_LANG_GCJ])])
+m4_ifndef([AC_LIBTOOL_RC],		[AC_DEFUN([AC_LIBTOOL_RC])])
+m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])])
+m4_ifndef([_LT_AC_LANG_C_CONFIG],	[AC_DEFUN([_LT_AC_LANG_C_CONFIG])])
+m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])])
+m4_ifndef([_LT_AC_LANG_CXX_CONFIG],	[AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])])
+m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])])
+m4_ifndef([_LT_AC_LANG_F77_CONFIG],	[AC_DEFUN([_LT_AC_LANG_F77_CONFIG])])
+m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])])
+m4_ifndef([_LT_AC_LANG_GCJ_CONFIG],	[AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])])
+m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])])
+m4_ifndef([_LT_AC_LANG_RC_CONFIG],	[AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
+m4_ifndef([AC_LIBTOOL_CONFIG],		[AC_DEFUN([AC_LIBTOOL_CONFIG])])
+m4_ifndef([_LT_AC_FILE_LTDLL_C],	[AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
diff --git a/m4/nls.m4 b/m4/nls.m4
new file mode 100644
index 0000000..7967cc2
--- /dev/null
+++ b/m4/nls.m4
@@ -0,0 +1,31 @@
+# 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)
+])
diff --git a/missing b/missing
index 1c8ff70..28055d2 100755
--- a/missing
+++ b/missing
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Common stub for a few missing GNU programs while installing.
 
-scriptversion=2006-05-10.23
+scriptversion=2009-04-28.21; # UTC
 
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
-#   Free Software Foundation, Inc.
+# 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
@@ -18,9 +18,7 @@ scriptversion=2006-05-10.23
 # 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., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# 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
@@ -89,6 +87,9 @@ Supported PROGRAM values:
   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 $?
     ;;
@@ -106,15 +107,22 @@ Send bug reports to <bug-automake@gnu.org>."
 
 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).
+# the program).  This is about non-GNU programs, so use $1 not
+# $program.
 case $1 in
-  lex|yacc)
+  lex*|yacc*)
     # Not GNU programs, they don't have --version.
     ;;
 
-  tar)
+  tar*)
     if test -n "$run"; then
        echo 1>&2 "ERROR: \`tar' requires --run"
        exit 1
@@ -138,7 +146,7 @@ esac
 
 # If it does not exist, or fails to run (possibly an outdated version),
 # try to emulate it.
-case $1 in
+case $program in
   aclocal*)
     echo 1>&2 "\
 WARNING: \`$1' is $msg.  You should only need it if
@@ -148,7 +156,7 @@ WARNING: \`$1' is $msg.  You should only need it if
     touch aclocal.m4
     ;;
 
-  autoconf)
+  autoconf*)
     echo 1>&2 "\
 WARNING: \`$1' is $msg.  You should only need it if
          you modified \`${configure_ac}'.  You might want to install the
@@ -157,7 +165,7 @@ WARNING: \`$1' is $msg.  You should only need it if
     touch configure
     ;;
 
-  autoheader)
+  autoheader*)
     echo 1>&2 "\
 WARNING: \`$1' is $msg.  You should only need it if
          you modified \`acconfig.h' or \`${configure_ac}'.  You might want
@@ -187,7 +195,7 @@ WARNING: \`$1' is $msg.  You should only need it if
 	   while read f; do touch "$f"; done
     ;;
 
-  autom4te)
+  autom4te*)
     echo 1>&2 "\
 WARNING: \`$1' is needed, but is $msg.
          You might have modified some files without having the
@@ -210,7 +218,7 @@ WARNING: \`$1' is needed, but is $msg.
     fi
     ;;
 
-  bison|yacc)
+  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
@@ -240,7 +248,7 @@ WARNING: \`$1' $msg.  You should only need it if
     fi
     ;;
 
-  lex|flex)
+  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
@@ -263,7 +271,7 @@ WARNING: \`$1' is $msg.  You should only need it if
     fi
     ;;
 
-  help2man)
+  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
@@ -277,11 +285,11 @@ WARNING: \`$1' is $msg.  You should only need it if
     else
 	test -z "$file" || exec >$file
 	echo ".ab help2man is required to generate this page"
-	exit 1
+	exit $?
     fi
     ;;
 
-  makeinfo)
+  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
@@ -310,7 +318,7 @@ WARNING: \`$1' is $msg.  You should only need it if
     touch $file
     ;;
 
-  tar)
+  tar*)
     shift
 
     # We have already tried tar in the generic part.
@@ -363,5 +371,6 @@ exit 0
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
 # End:
diff --git a/mkinstalldirs b/mkinstalldirs
index ef7e16f..4191a45 100755
--- a/mkinstalldirs
+++ b/mkinstalldirs
@@ -1,7 +1,7 @@
 #! /bin/sh
 # mkinstalldirs --- make directory hierarchy
 
-scriptversion=2006-05-11.19
+scriptversion=2009-04-28.21; # UTC
 
 # Original author: Noah Friedman <friedman@prep.ai.mit.edu>
 # Created: 1993-05-16
@@ -157,5 +157,6 @@ exit $errstatus
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
 # End:
diff --git a/pixmaps/Makefile.am b/pixmaps/Makefile.am
new file mode 100644
index 0000000..769802c
--- /dev/null
+++ b/pixmaps/Makefile.am
@@ -0,0 +1,58 @@
+pkgicondir=@datadir@/icons/hicolor/scalable/apps
+pkgicon_DATA=xiphos.svg
+
+pixmapdir=@datadir@/pixmaps/xiphos
+pixmap_DATA= \
+	about.png \
+	book_closed.png \
+	book_closed_rtol.png \
+	book_open.png \
+	book_open_rtol.png \
+	chat_icon-16.png \
+	dlg-un-16.png \
+	dlg-un.png \
+	epiphany-bookmark-page.png \
+	epiphany-bookmarks.png \
+	epiphany-secure.png \
+	epiphany-unsecure.png \
+	gnome-session.png \
+	gnome-window-manager.png \
+	gnome-windows.png \
+	gs2-48x48.ico \
+	gs2-48x48-old.ico \
+	gs2-48x48-old.png \
+	gs2-48x48.png \
+	gs2.xpm \
+	indexed-16.png \
+	indexed.png \
+	init-settings.png \
+	logo.png \
+	mailing_list_icon-16.png \
+	mozilla-icon.png \
+	new_tab_button.png \
+	silk-edit-bookmarks.png \
+	splash.png \
+	sword3.png \
+	sword_icon-16.png \
+	sword.png \
+	translation_icon-16.png \
+	tt.png \
+	window-close.png \
+	xiphos-x-16.png \
+	xiphos.xpm
+
+EXTRA_DIST=$(pkgicon_DATA) $(pixmap_DATA)
+
+gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
+
+install-data-hook: update-icon-cache
+uninstall-hook: update-icon-cache
+
+update-icon-cache:
+	@-if test -z "$(DESTDIR)"; then \
+		echo "Updating Gtk icon cache."; \
+		$(gtk_update_icon_cache); \
+	else \
+		echo "*** Icon cache not updated.  After (un)install, run this:"; \
+		echo "***   $(gtk_update_icon_cache)"; \
+	fi
diff --git a/pixmaps/Makefile.in b/pixmaps/Makefile.in
new file mode 100644
index 0000000..c5c2353
--- /dev/null
+++ b/pixmaps/Makefile.in
@@ -0,0 +1,539 @@
+# Makefile.in generated by automake 1.11 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 = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = pixmaps
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/gecko.m4 \
+	$(top_srcdir)/m4/gnome-doc-utils.m4 \
+	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+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 =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__installdirs = "$(DESTDIR)$(pixmapdir)" "$(DESTDIR)$(pkgicondir)"
+DATA = $(pixmap_DATA) $(pkgicon_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
+ALL_LINGUAS = @ALL_LINGUAS@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AM_LDFLAGS = @AM_LDFLAGS@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BONOBO_IDL_INCLUDES = @BONOBO_IDL_INCLUDES@
+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@
+DIRS = @DIRS@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+DOC_USER_FORMATS = @DOC_USER_FORMATS@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GECKO = @GECKO@
+GECKO_COMPONENT_CFLAGS = @GECKO_COMPONENT_CFLAGS@
+GECKO_COMPONENT_LIBS = @GECKO_COMPONENT_LIBS@
+GECKO_EXTRA_LIBS = @GECKO_EXTRA_LIBS@
+GECKO_FLAVOUR = @GECKO_FLAVOUR@
+GECKO_GLUE_LIBS = @GECKO_GLUE_LIBS@
+GECKO_HOME = @GECKO_HOME@
+GECKO_INCLUDE_ROOT = @GECKO_INCLUDE_ROOT@
+GECKO_PREFIX = @GECKO_PREFIX@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GREP = @GREP@
+GTKHTML_DATA_DIR = @GTKHTML_DATA_DIR@
+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@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OMF_DIR = @OMF_DIR@
+ORBIT_IDL = @ORBIT_IDL@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+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@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+WARN_CFLAGS = @WARN_CFLAGS@
+WARN_CXXFLAGS = @WARN_CXXFLAGS@
+XGETTEXT = @XGETTEXT@
+XIPHOS_CFLAGS = @XIPHOS_CFLAGS@
+XIPHOS_LIBS = @XIPHOS_LIBS@
+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@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+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 = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+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@
+xiphos_exec = @xiphos_exec@
+pkgicondir = @datadir@/icons/hicolor/scalable/apps
+pkgicon_DATA = xiphos.svg
+pixmapdir = @datadir@/pixmaps/xiphos
+pixmap_DATA = \
+	about.png \
+	book_closed.png \
+	book_closed_rtol.png \
+	book_open.png \
+	book_open_rtol.png \
+	chat_icon-16.png \
+	dlg-un-16.png \
+	dlg-un.png \
+	epiphany-bookmark-page.png \
+	epiphany-bookmarks.png \
+	epiphany-secure.png \
+	epiphany-unsecure.png \
+	gnome-session.png \
+	gnome-window-manager.png \
+	gnome-windows.png \
+	gs2-48x48.ico \
+	gs2-48x48-old.ico \
+	gs2-48x48-old.png \
+	gs2-48x48.png \
+	gs2.xpm \
+	indexed-16.png \
+	indexed.png \
+	init-settings.png \
+	logo.png \
+	mailing_list_icon-16.png \
+	mozilla-icon.png \
+	new_tab_button.png \
+	silk-edit-bookmarks.png \
+	splash.png \
+	sword3.png \
+	sword_icon-16.png \
+	sword.png \
+	translation_icon-16.png \
+	tt.png \
+	window-close.png \
+	xiphos-x-16.png \
+	xiphos.xpm
+
+EXTRA_DIST = $(pkgicon_DATA) $(pixmap_DATA)
+gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign pixmaps/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign pixmaps/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):
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+install-pixmapDATA: $(pixmap_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(pixmapdir)" || $(MKDIR_P) "$(DESTDIR)$(pixmapdir)"
+	@list='$(pixmap_DATA)'; test -n "$(pixmapdir)" || 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)$(pixmapdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(pixmapdir)" || exit $$?; \
+	done
+
+uninstall-pixmapDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(pixmap_DATA)'; test -n "$(pixmapdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(pixmapdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(pixmapdir)" && rm -f $$files
+install-pkgiconDATA: $(pkgicon_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(pkgicondir)" || $(MKDIR_P) "$(DESTDIR)$(pkgicondir)"
+	@list='$(pkgicon_DATA)'; test -n "$(pkgicondir)" || 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)$(pkgicondir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgicondir)" || exit $$?; \
+	done
+
+uninstall-pkgiconDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(pkgicon_DATA)'; test -n "$(pkgicondir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(pkgicondir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(pkgicondir)" && rm -f $$files
+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 $(DATA)
+installdirs:
+	for dir in "$(DESTDIR)$(pixmapdir)" "$(DESTDIR)$(pkgicondir)"; 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)
+
+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-libtool 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-pixmapDATA install-pkgiconDATA
+	@$(NORMAL_INSTALL)
+	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
+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 mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-pixmapDATA uninstall-pkgiconDATA
+	@$(NORMAL_INSTALL)
+	$(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+.MAKE: install-am install-data-am install-strip uninstall-am
+
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+	distclean distclean-generic distclean-libtool distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-data-hook 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-pixmapDATA \
+	install-pkgiconDATA install-ps install-ps-am 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-hook uninstall-pixmapDATA uninstall-pkgiconDATA
+
+
+install-data-hook: update-icon-cache
+uninstall-hook: update-icon-cache
+
+update-icon-cache:
+	@-if test -z "$(DESTDIR)"; then \
+		echo "Updating Gtk icon cache."; \
+		$(gtk_update_icon_cache); \
+	else \
+		echo "*** Icon cache not updated.  After (un)install, run this:"; \
+		echo "***   $(gtk_update_icon_cache)"; \
+	fi
+
+# 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/pixmaps/book_closed.png b/pixmaps/book_closed.png
new file mode 100644
index 0000000..74a1698
--- /dev/null
+++ b/pixmaps/book_closed.png
diff --git a/pixmaps/book_closed_rtol.png b/pixmaps/book_closed_rtol.png
new file mode 100644
index 0000000..089335a
--- /dev/null
+++ b/pixmaps/book_closed_rtol.png
diff --git a/pixmaps/book_open.png b/pixmaps/book_open.png
new file mode 100644
index 0000000..2060895
--- /dev/null
+++ b/pixmaps/book_open.png
diff --git a/pixmaps/book_open_rtol.png b/pixmaps/book_open_rtol.png
new file mode 100644
index 0000000..64aa0ee
--- /dev/null
+++ b/pixmaps/book_open_rtol.png
diff --git a/po/ChangeLog b/po/ChangeLog
index a638ee4..db72791 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,8 @@
+2009-08-10 refdoc@crosswire.org
+
+	* ru.po moved out of retired and committed changes submitted by
+	kalemas@mail.ru
+
 2008-04-25  dom  <domcox@users.sourceforge.net>
 
 	* fr.po: Updated French translation.
diff --git a/po/LINGUAS b/po/LINGUAS
index cc0f650..0fa528f 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -1 +1 @@
-cs cy de en_GB fa fi fr he_IL nb_NO nl pt pt_PT sk sv_SE
+cs cy de en_GB es fa fi fr he_IL nb_NO nl pt ro ru sk sv zh
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index 40c8833..cc8a222 100644
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -1,10 +1,10 @@
 # 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 file be copied and used freely without restrictions.  It can
-# be used in projects which are not available under the GNU Public License
+# 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.
-# Please note that the actual code is *not* freely available.
 #
 # - Modified by Owen Taylor <otaylor@redhat.com> to use GETTEXT_PACKAGE
 #   instead of PACKAGE and to look for po2tbl in ./ not in intl/
@@ -12,7 +12,7 @@
 # - 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@novell.com> for use with intltool
+# - Modified by Rodney Dawes <dobey.pwns@gmail.com> for use with intltool
 #
 # We have the following line for use by intltoolize:
 # INTLTOOL_MAKEFILE
@@ -21,7 +21,7 @@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 PACKAGE = @PACKAGE@
 VERSION = @VERSION@
 
-SHELL = /bin/sh
+SHELL = @SHELL@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
@@ -54,16 +54,16 @@ GENPOT   = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDA
 
 ALL_LINGUAS = @ALL_LINGUAS@
 
-PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; fi)
+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`" -o -n "`echo $$ALINGUAS|grep ' ?$$lang ?'`"; then printf "$$lang "; fi; done; 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)"; 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)
+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="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done)
+POFILES=$(shell LINGUAS="$(PO_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done)
 
-DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(POFILES)
-EXTRA_DISTFILES = POTFILES.skip Makevars LINGUAS
+DISTFILES = Makefile.in.in POTFILES.in $(POFILES)
+EXTRA_DISTFILES = ChangeLog POTFILES.skip Makevars LINGUAS
 
 POTFILES = \
 # This comment gets stripped out
@@ -101,7 +101,6 @@ install: install-data
 install-data: install-data-@USE_NLS@
 install-data-no: all
 install-data-yes: all
-	$(mkdir_p) $(DESTDIR)$(itlocaledir)
 	linguas="$(USE_LINGUAS)"; \
 	for lang in $$linguas; do \
 	  dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \
@@ -130,10 +129,10 @@ install-data-yes: all
 	done
 
 # Empty stubs to satisfy archaic automake needs
-dvi info tags TAGS ID:
+dvi info ctags tags CTAGS TAGS ID:
 
 # Define this as empty until I found a useful application.
-installcheck:
+install-exec installcheck:
 
 uninstall:
 	linguas="$(USE_LINGUAS)"; \
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 0178315..f7ed68e 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -48,11 +48,10 @@ src/gnome2/navbar_versekey_editor.c
 src/gnome2/navbar_versekey_parallel.c
 src/gnome2/parallel_dialog.c
 src/gnome2/parallel_view.c
-src/gnome2/preferences_cell_renderer.c
+#src/gnome2/preferences_cell_renderer.c
 src/gnome2/preferences_dialog.c
 src/gnome2/search_dialog.c
 src/gnome2/search_sidebar.c
-src/gnome2/session.c
 src/gnome2/sidebar.c
 src/gnome2/sidebar_dialog.c
 src/gnome2/splash.c
@@ -88,6 +87,7 @@ src/main/url.cc
 src/main/xml.c
 ## Glade files
 ui/bookmarks.glade
+ui/editor_link_dialog.xml
 ui/editor_note.xml
 ui/editor_studypad.xml
 ui/editor.xml
diff --git a/po/cs.po b/po/cs.po
index 03d3250..468f24b 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -46,345 +46,353 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Xiphos 3.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-02 22:07+0200\n"
-"PO-Revision-Date: 2009-08-02 22:45+0100\n"
-"Last-Translator: Martin Zibricky <matysek03@users.sourceforge.net>\n"
+"POT-Creation-Date: 2009-12-14 23:45+0000\n"
+"PO-Revision-Date: 2009-12-10 21:43+0000\n"
+"Last-Translator: matysek <Unknown>\n"
 "Language-Team: Xiphos Translation Team\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Czech\n"
+"X-Launchpad-Export-Date: 2009-12-11 04:39+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: CZECH REPUBLIC\n"
+"X-Poedit-Language: Czech\n"
 
-#: ../src/backend/sword_main.cc:1153
+#: ../src/backend/sword_main.cc:1083
 msgid "Configuration not found"
 msgstr "Konfigurace nebyla nenalezena"
 
-#: ../src/editor/bonobo-editor.c:252
-#: ../src/editor/slib-editor.c:228
-#: ../src/gnome2/html.c:633
+#: ../src/editor/bonobo-editor.c:254 ../src/editor/slib-editor.c:234
+#: ../src/gnome2/html.c:637
 #, c-format
 msgid "Page %d of %d"
 msgstr "Strana %d z %d"
 
-#: ../src/editor/bonobo-editor.c:351
+#: ../src/editor/bonobo-editor.c:353 ../src/editor/slib-editor.c:659
 msgid "Are you sure you want to delete the note for"
 msgstr "Jste si jist, že chcete odstranit poznámku k"
 
-#: ../src/editor/bonobo-editor.c:963
-#: ../src/editor/bonobo-editor.c:996
-#: ../src/editor/slib-editor.c:1161
-#: ../src/editor/slib-editor.c:1198
+#: ../src/editor/bonobo-editor.c:965 ../src/editor/bonobo-editor.c:998
+#: ../src/editor/slib-editor.c:1308 ../src/editor/slib-editor.c:1345
 msgid "Save the changes to document"
 msgstr "Uložit změny do dokumentu"
 
-#: ../src/editor/bonobo-editor.c:964
-#: ../src/editor/bonobo-editor.c:997
-#: ../src/editor/slib-editor.c:1162
-#: ../src/editor/slib-editor.c:1199
+#: ../src/editor/bonobo-editor.c:966 ../src/editor/bonobo-editor.c:999
+#: ../src/editor/slib-editor.c:1309 ../src/editor/slib-editor.c:1346
 msgid "before closing?"
 msgstr "před uzavřením?"
 
-#: ../src/editor/bonobo-editor.c:971
-#: ../src/editor/bonobo-editor.c:1004
-#: ../src/editor/slib-editor.c:1169
-#: ../src/editor/slib-editor.c:1206
+#: ../src/editor/bonobo-editor.c:973 ../src/editor/bonobo-editor.c:1006
+#: ../src/editor/slib-editor.c:1316 ../src/editor/slib-editor.c:1353
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Pokud neprovedete uložení, změny budou trvale ztraceny."
 
-#: ../src/editor/bonobo-editor.c:995
-#: ../src/editor/slib-editor.c:1197
-#: ../ui/xi-menus.glade.h:26
+#: ../src/editor/bonobo-editor.c:997 ../src/editor/slib-editor.c:1344
+#: ../ui/xi-menus.glade.h:39
 msgid "File"
 msgstr "Soubor"
 
-#: ../src/editor/bonobo-editor.c:1222
-#: ../src/editor/slib-editor.c:1254
+#: ../src/editor/bonobo-editor.c:1224 ../src/editor/slib-editor.c:1401
 msgid "StudyPad"
 msgstr "Poznámkový blok"
 
-#: ../src/editor/bonobo-editor.c:1235
-#: ../src/editor/slib-editor.c:1268
+#: ../src/editor/bonobo-editor.c:1237 ../src/editor/slib-editor.c:1415
 msgid "Note Editor"
 msgstr "Editor poznámek"
 
-#: ../src/editor/bonobo-editor.c:1244
-#: ../src/editor/slib-editor.c:1282
+#: ../src/editor/bonobo-editor.c:1246 ../src/editor/slib-editor.c:1429
 msgid "Prayer List/Journal Editor"
 msgstr "Editor pro Modlitební seznam/deník"
 
-#: ../src/editor/slib-editor.c:382
-#: ../src/editor/slib-editor.c:429
+#: ../src/editor/slib-editor.c:401 ../src/editor/slib-editor.c:448
 msgid "Save As"
 msgstr "Uložit jako"
 
-#: ../src/editor/slib-editor.c:400
-#: ../src/editor/slib-editor.c:447
+#: ../src/editor/slib-editor.c:419 ../src/editor/slib-editor.c:466
+#: ../src/editor/slib-editor.c:634
 msgid "Untitled document"
 msgstr "Dokument bez názvu"
 
-#: ../src/editor/slib-editor.c:612
+#: ../src/editor/slib-editor.c:702
 msgid "HTML Output"
 msgstr "HTML výstup"
 
-#: ../src/editor/slib-editor.c:619
+#: ../src/editor/slib-editor.c:709
 msgid "HTML Source"
 msgstr "HTML zdroj"
 
-#: ../src/editor/slib-editor.c:626
+#: ../src/editor/slib-editor.c:716
 msgid "Plain Source"
 msgstr "Prostý zdroj"
 
-#: ../src/editor/slib-editor.c:633
-#: ../ui/editor_note.xml.h:15
+#: ../src/editor/slib-editor.c:726 ../ui/editor_note.xml.h:15
 #: ../ui/editor_studypad.xml.h:21
 msgid "_Print..."
 msgstr "_Tisk..."
 
-#: ../src/editor/slib-editor.c:640
-#: ../ui/editor_note.xml.h:9
+#: ../src/editor/slib-editor.c:733 ../ui/editor_note.xml.h:9
 #: ../ui/editor_studypad.xml.h:14
 msgid "Print Pre_view"
 msgstr "_Náhled tisku"
 
-#: ../src/editor/slib-editor.c:647
+#: ../src/editor/slib-editor.c:740
 msgid "_Quit"
 msgstr "U_končit"
 
-#: ../src/editor/slib-editor.c:654
+#: ../src/editor/slib-editor.c:747
 msgid "_Open"
 msgstr "_Otevřít"
 
-#: ../src/editor/slib-editor.c:661
+#: ../src/editor/slib-editor.c:754
 msgid "_Save"
 msgstr "_Uložit"
 
-#: ../src/editor/slib-editor.c:668
+#: ../src/editor/slib-editor.c:761
 msgid "Save _As..."
 msgstr "Uložit _jako..."
 
-#: ../src/editor/slib-editor.c:675
-#: ../ui/editor_note.xml.h:14
-#: ../ui/editor_studypad.xml.h:20
-#: ../ui/editor.xml.h:13
-#: ../ui/xi-menus.glade.h:85
+#: ../src/editor/slib-editor.c:767
+msgid "New"
+msgstr "Nový"
+
+#: ../src/editor/slib-editor.c:769
+msgid "Open new document"
+msgstr "Otevřít dokument"
+
+#: ../src/editor/slib-editor.c:773
+msgid "Delete"
+msgstr "Smazat"
+
+#: ../src/editor/slib-editor.c:775
+msgid "Delete current note"
+msgstr "Smazat aktuální poznámku"
+
+#: ../src/editor/slib-editor.c:780 ../ui/editor_note.xml.h:14
+#: ../ui/editor_studypad.xml.h:20 ../ui/editor.xml.h:13
+#: ../ui/xi-menus.glade.h:106
 msgid "_File"
 msgstr "_Soubor"
 
-#: ../src/editor/slib-editor.c:730
+#: ../src/editor/slib-editor.c:835
 msgid "HTML _Output"
 msgstr "HTML _výstup"
 
-#: ../src/editor/slib-editor.c:737
+#: ../src/editor/slib-editor.c:842
 msgid "_HTML Source"
 msgstr "_HTML zdroj"
 
-#: ../src/editor/slib-editor.c:744
+#: ../src/editor/slib-editor.c:849
 msgid "_Plain Source"
 msgstr "_Prostý zdroj"
 
-#: ../src/editor/slib-editor.c:751
-#: ../ui/xi-menus.glade.h:100
+#: ../src/editor/slib-editor.c:856 ../ui/xi-menus.glade.h:121
 msgid "_View"
 msgstr "_Zobrazit"
 
-#: ../src/editor/slib-editor.c:762
-#: ../ui/editor_note.xml.h:11
-#: ../ui/editor_studypad.xml.h:16
-#: ../ui/editor.xml.h:11
+#: ../src/editor/slib-editor.c:867 ../ui/editor_note.xml.h:11
+#: ../ui/editor_studypad.xml.h:16 ../ui/editor.xml.h:11
 msgid "Save"
 msgstr "Uložit"
 
-#: ../src/gecko/gecko-html.cpp:178
-#: ../src/gnome2/html.c:161
+#: ../src/editor/slib-editor.c:878 ../src/editor/slib-editor.c:885
+msgid "Insert Link"
+msgstr "Vložit odkaz"
+
+#: ../src/gecko/gecko-html.cpp:177 ../src/gnome2/html.c:165
 msgid "Unlock "
-msgstr "Odemknout"
+msgstr "Odemknout "
 
-#: ../src/gecko/gecko-print.c:171
+#: ../src/gecko/gecko-print.c:172
 msgid "Preparing to print"
 msgstr "Příprava k tisku"
 
-#: ../src/gecko/gecko-print.c:265
+#: ../src/gecko/gecko-print.c:266
 msgid "Printing is not supported on this printer"
 msgstr "Tisk není na této tiskárně podporován"
 
-#: ../src/gecko/gecko-print.c:268
+#: ../src/gecko/gecko-print.c:269
 #, c-format
 msgid "Printer %s does not support PostScript printing."
 msgstr "Tiskárna %s nepodporuje tisk technologií PostScript."
 
-#: ../src/gecko/gecko-print.c:341
-#: ../src/gecko/gecko-print.c:369
+#: ../src/gecko/gecko-print.c:342 ../src/gecko/gecko-print.c:370
 msgid "Printing"
 msgstr "Tisk"
 
-#: ../src/gecko/gecko-print.c:371
+#: ../src/gecko/gecko-print.c:372
 msgid "Waiting to print"
 msgstr "Čekání na tisk"
 
-#: ../src/gecko/gecko-print.c:583
+#: ../src/gecko/gecko-print.c:584
 msgid "An error occurred while printing"
 msgstr "Vznika chyba během tisku"
 
-#: ../src/gecko/gecko-print.c:587
+#: ../src/gecko/gecko-print.c:588
 #, c-format
 msgid "It was not possible to print your document: %s"
 msgstr "Nezdařil se tisk vašeho dokumentu: %s"
 
-#: ../src/gnome2/about_modules.c:189
+#: ../src/gnome2/about_modules.c:195
 msgid "About Sword Module"
 msgstr "O Sword modulu"
 
-#: ../src/gnome2/about_modules.c:383
-#: ../src/gnome2/mod_mgr.c:204
+#: ../src/gnome2/about_modules.c:389 ../src/gnome2/mod_mgr.c:252
 msgid "The module has no About information."
 msgstr "Informace o modulu nejsou k dispozici."
 
 #: ../src/gnome2/about_sword.c:88
-msgid "The SWORD Project is an effort to create an ever-expanding software package for research and study of God and His Word. The SWORD Project framework allows easy use and study of Bible texts, commentaries, lexicons, dictionaries, and other books. Many frontends are built using this framework. An installed set of books may be shared among all frontends using the framework."
-msgstr "The SWORD Project je snaha o vytvoření programového vybavení pro zkoumání a studium Božího slova. The SWORD Project Framework umožňuje lehké ovládání biblických textů, komentářů, slovníků a dalších knih. Několik aplikací využívá toto programové vybavení. Nainstalované knihy lze sdílet mezi více aplikacemi, využívající toto programové vybavení."
+msgid ""
+"The SWORD Project is an effort to create an ever-expanding software package "
+"for research and study of God and His Word. The SWORD Project framework "
+"allows easy use and study of Bible texts, commentaries, lexicons, "
+"dictionaries, and other books. Many frontends are built using this "
+"framework. An installed set of books may be shared among all frontends using "
+"the framework."
+msgstr ""
+"The SWORD Project je snaha o vytvoření programového vybavení pro zkoumání a "
+"studium Božího slova. The SWORD Project Framework umožňuje lehké ovládání "
+"biblických textů, komentářů, slovníků a dalších knih. Několik aplikací "
+"využívá toto programové vybavení. Nainstalované knihy lze sdílet mezi více "
+"aplikacemi, využívající toto programové vybavení."
 
 #: ../src/gnome2/about_sword.c:106
 msgid "About the SWORD Project"
 msgstr "O aplikaci SWORD Project"
 
-#: ../src/gnome2/about_sword.c:123
+#: ../src/gnome2/about_sword.c:124
 msgid "Sword Version"
 msgstr "Verze Sword"
 
-#: ../src/gnome2/about_sword.c:154
+#: ../src/gnome2/about_sword.c:155
 msgid "Books can be downloaded from the SWORD Project"
 msgstr "Knihy lze stáhnout ze stránek aplikace SWORD Project"
 
-#: ../src/gnome2/about_sword.c:160
+#: ../src/gnome2/about_sword.c:161
 msgid "The SWORD Project"
 msgstr "SWORD Project"
 
 #: ../src/gnome2/about_trans.c:84
 msgid ""
-"Do you like using Xiphos to study the Bible? Would you like to see its display using your native language? You could translate Xiphos! \n"
+"Do you like using Xiphos to study the Bible? Would you like to see its "
+"display using your native language? You could translate Xiphos! \n"
 "\n"
-"We are always looking for contributions of new translations of Xiphos into other languages. If you are able to translate for us, please see the link below, contact us, and get involved with our efforts."
+"We are always looking for contributions of new translations of Xiphos into "
+"other languages. If you are able to translate for us, please see the link "
+"below, contact us, and get involved with our efforts."
 msgstr ""
-"Používáte rád(a) Xiphos při studiu Bible? Chtěl(a) byste vidět Xiphos ve svém rodném jazyce? Můžete vytvořit překlad aplikace Xiphos! \n"
+"Používáte rád(a) Xiphos při studiu Bible? Chtěl(a) byste vidět Xiphos ve "
+"svém rodném jazyce? Můžete vytvořit překlad aplikace Xiphos! \n"
 "\n"
-"Rádi uvítáme překlady aplikace Xiphos do dalších jazyků. Pokud jste schopen (schopna) vytvořit překlad, podívejte se na odkaz níže, kontaktujte nás a připojte se k našemu úsilí."
+"Rádi uvítáme překlady aplikace Xiphos do dalších jazyků. Pokud jste schopen "
+"(schopna) vytvořit překlad, podívejte se na odkaz níže, kontaktujte nás a "
+"připojte se k našemu úsilí."
 
 #: ../src/gnome2/about_trans.c:98
 msgid "About Xiphos Translation"
 msgstr "O překladu aplikace Xiphos"
 
-#: ../src/gnome2/about_trans.c:139
+#: ../src/gnome2/about_trans.c:140
 msgid "See TRANSLATION-HOWTO in Xiphos source"
 msgstr "Viz TRANSLATION-HOWTO u zdrojového kódu Xiphos"
 
-#: ../src/gnome2/about_trans.c:145
+#: ../src/gnome2/about_trans.c:146
 msgid "Xiphos development"
 msgstr "Vývoj aplikace Xiphos"
 
-#: ../src/gnome2/about_xiphos.c:132
+#: ../src/gnome2/about_xiphos.c:131
 msgid "Copyright 2000-2009 The Xiphos Development Team"
 msgstr "Copyright 2000-2009 The Xiphos Development Team"
 
-#: ../src/gnome2/about_xiphos.c:135
+#: ../src/gnome2/about_xiphos.c:134
 msgid ""
 "(formerly known as GnomeSword)\n"
 "\n"
 "Powered by The SWORD Project.\n"
-"We would like to thank Troy Griffitts and all the other folks who have given us The SWORD Project."
+"We would like to thank Troy Griffitts and all the other folks who have given "
+"us The SWORD Project."
 msgstr ""
 "(dříve znám jako GnomeSword)\n"
 "\n"
 "Využívá The SWORD Project.\n"
-"Děkujeme Troy Griffittsovi a všem ostatním, kdo vytvořili programové vybavení The SWORD Project."
+"Děkujeme Troy Griffittsovi a všem ostatním, kdo vytvořili programové "
+"vybavení The SWORD Project."
 
-#: ../src/gnome2/bibletext_dialog.c:525
+#: ../src/gnome2/bibletext_dialog.c:358
 msgid "Go to "
-msgstr "Přejít na"
+msgstr "Přejít na "
 
 #. info->stock_icon = GTK_STOCK_OPEN;
-#: ../src/gnome2/bookmark_dialog.c:167
-#: ../src/gnome2/bookmarks_menu.c:471
-#: ../src/gnome2/bookmarks_menu.c:897
-#: ../src/gnome2/bookmarks_menu.c:995
-#: ../src/gnome2/bookmarks_treeview.c:131
-#: ../ui/editor_studypad.xml.h:2
-#: ../ui/xi-menus.glade.h:9
+#: ../src/gnome2/bookmark_dialog.c:171 ../src/gnome2/bookmarks_menu.c:358
+#: ../src/gnome2/bookmarks_menu.c:765 ../src/gnome2/bookmarks_menu.c:863
+#: ../src/gnome2/bookmarks_treeview.c:133 ../ui/editor_studypad.xml.h:2
+#: ../ui/xi-menus.glade.h:13
 msgid "Bookmark"
 msgstr "Záložka"
 
-#: ../src/gnome2/bookmark_dialog.c:169
-#: ../src/gnome2/bookmarks_menu.c:997
-#: ../src/gnome2/bookmarks_treeview.c:132
+#: ../src/gnome2/bookmark_dialog.c:173 ../src/gnome2/bookmarks_menu.c:865
+#: ../src/gnome2/bookmarks_treeview.c:134
 msgid "Enter Folder Name"
 msgstr "Vložte jméno složky"
 
-#: ../src/gnome2/bookmark_dialog.c:171
-#: ../src/gnome2/bookmarks_menu.c:999
+#: ../src/gnome2/bookmark_dialog.c:175 ../src/gnome2/bookmarks_menu.c:867
 msgid "Folder Name"
 msgstr "Jméno složky"
 
-#: ../src/gnome2/bookmark_dialog.c:172
-#: ../src/gnome2/bookmarks_menu.c:1000
-#: ../src/gnome2/bookmarks_treeview.c:134
+#: ../src/gnome2/bookmark_dialog.c:176 ../src/gnome2/bookmarks_menu.c:868
+#: ../src/gnome2/bookmarks_treeview.c:136
 msgid "Folder: "
 msgstr "Složka: "
 
-#: ../src/gnome2/bookmarks_menu.c:457
-#: ../src/gnome2/treekey-editor.c:322
-#: ../ui/xi-menus.glade.h:22
+#: ../src/gnome2/bookmarks_menu.c:344 ../ui/xi-menus.glade.h:32
 msgid "Edit"
 msgstr "Upravit"
 
-#: ../src/gnome2/bookmarks_menu.c:474
+#: ../src/gnome2/bookmarks_menu.c:361
 msgid "Folder name: "
 msgstr "Jméno složky: "
 
-#: ../src/gnome2/bookmarks_menu.c:477
+#: ../src/gnome2/bookmarks_menu.c:364
 msgid "Bookmark name: "
 msgstr "Jméno záložky: "
 
-#: ../src/gnome2/bookmarks_menu.c:480
-#: ../src/gnome2/bookmarks_menu.c:905
+#: ../src/gnome2/bookmarks_menu.c:367 ../src/gnome2/bookmarks_menu.c:773
 msgid "Verse: "
 msgstr "Verš: "
 
-#: ../src/gnome2/bookmarks_menu.c:481
-#: ../src/gnome2/bookmarks_menu.c:906
+#: ../src/gnome2/bookmarks_menu.c:368 ../src/gnome2/bookmarks_menu.c:774
 msgid "Module: "
 msgstr "Modul: "
 
-#: ../src/gnome2/bookmarks_menu.c:665
+#: ../src/gnome2/bookmarks_menu.c:533
 msgid "Restore Bookmark Folder"
 msgstr "Obnovit složku záložek"
 
-#: ../src/gnome2/bookmarks_menu.c:734
+#: ../src/gnome2/bookmarks_menu.c:602
 msgid "Remove the selected folder"
 msgstr "Odstranit vybranou složku"
 
-#: ../src/gnome2/bookmarks_menu.c:736
+#: ../src/gnome2/bookmarks_menu.c:604
 msgid "(and all its contents)?"
 msgstr "(a všechno, co obsahuje)?"
 
-#: ../src/gnome2/bookmarks_menu.c:739
+#: ../src/gnome2/bookmarks_menu.c:607
 msgid "Remove the selected bookmark"
 msgstr "Odstranit vybranou záložku"
 
-#: ../src/gnome2/bookmarks_menu.c:898
+#: ../src/gnome2/bookmarks_menu.c:766
 msgid "Add"
 msgstr "Přidat"
 
-#: ../src/gnome2/bookmarks_menu.c:904
+#: ../src/gnome2/bookmarks_menu.c:772
 msgid "Label: "
 msgstr "Jmenovka: "
 
-#: ../src/gnome2/bookmarks_treeview.c:105
+#: ../src/gnome2/bookmarks_treeview.c:107
 #, c-format
 msgid "Search result: %s"
 msgstr "Výsledky hledání: %s"
 
-#: ../src/gnome2/bookmarks_treeview.c:934
-#: ../src/gnome2/sidebar.c:1459
+#: ../src/gnome2/bookmarks_treeview.c:943 ../src/gnome2/sidebar.c:1389
 msgid "Bookmarks"
 msgstr "Záložky"
 
@@ -398,109 +406,174 @@ msgstr "pro:"
 
 #: ../src/gnome2/cipher_key_dialog.c:66
 msgid "Enter Cipher Key: "
-msgstr "Vložte šifrovací klíč"
+msgstr "Vložte šifrovací klíč "
 
-#: ../src/gnome2/dialog.c:241
+#: ../src/gnome2/dialog.c:265
 msgid "Close without Saving"
 msgstr "Zavřít bez uložení"
 
-#: ../src/gnome2/dialog.c:569
+#: ../src/gnome2/dialog.c:596
 msgid "Xiphos:"
 msgstr "Xiphos:"
 
-#: ../src/gnome2/dialog.c:670
+#: ../src/gnome2/dialog.c:697
 msgid "Close _without Saving"
 msgstr "Zavřít _bez uložení"
 
-#: ../src/gnome2/export_dialog.c:265
-#: ../ui/export-dialog.glade.h:20
+#: ../src/gnome2/export_dialog.c:267 ../ui/export-dialog.glade.h:20
 msgid "Please check copyright before exporting!"
 msgstr "Před exportováním prosím prověřte autorská práva!"
 
-#: ../src/gnome2/find_dialog.c:200
-#: ../src/gnome2/find_dialog.c:369
+#: ../src/gnome2/find_dialog.c:204 ../src/gnome2/find_dialog.c:373
 msgid "Find"
 msgstr "Hledat"
 
-#: ../src/gnome2/find_dialog.c:218
+#: ../src/gnome2/find_dialog.c:222
 msgid "Enter Word or Phrase"
 msgstr "Zadejte slovo nebo výraz"
 
-#: ../src/gnome2/find_dialog.c:234
-#: ../src/gnome2/search_sidebar.c:303
-#: ../ui/search-dialog.glade.h:57
+#: ../src/gnome2/find_dialog.c:238 ../src/gnome2/search_sidebar.c:306
+#: ../ui/search-dialog.glade.h:59
 msgid "Match case"
 msgstr "Velikost písmen"
 
-#: ../src/gnome2/find_dialog.c:241
+#: ../src/gnome2/find_dialog.c:245
 msgid "Search backwards"
 msgstr "Hledat pozpátku"
 
-#: ../src/gnome2/find_dialog.c:250
-#: ../src/gnome2/search_sidebar.c:268
-#: ../ui/search-dialog.glade.h:74
+#: ../src/gnome2/find_dialog.c:254 ../src/gnome2/search_sidebar.c:271
+#: ../ui/search-dialog.glade.h:76
 msgid "Regular expression"
 msgstr "Regulární výraz"
 
-#: ../src/gnome2/find_dialog.c:291
+#: ../src/gnome2/find_dialog.c:295
 msgid "Find Next"
 msgstr "Najít další"
 
-#: ../src/gnome2/font_dialog.c:301
+#: ../src/gnome2/font_dialog.c:303
 msgid "Set Module Font"
 msgstr "Nastavit písmo modulu"
 
-#: ../src/gnome2/font_dialog.c:331
+#: ../src/gnome2/font_dialog.c:333
 msgid "Change font for"
 msgstr "Změnit písmo pro"
 
-#: ../src/gnome2/font_dialog.c:335
+#: ../src/gnome2/font_dialog.c:337
 msgid "Module"
 msgstr "Modul"
 
-#: ../src/gnome2/font_dialog.c:339
+#: ../src/gnome2/font_dialog.c:341
 msgid "Current font: "
 msgstr "Aktuální písmo: "
 
-#: ../src/gnome2/font_dialog.c:376
+#: ../src/gnome2/font_dialog.c:378
 msgid "+0"
 msgstr "+0"
 
-#: ../src/gnome2/font_dialog.c:380
+#: ../src/gnome2/font_dialog.c:382
 msgid "Use the default font for this module"
 msgstr "Použít výchozí písmo pro modul"
 
-#: ../src/gnome2/main_window.c:758
+#. *****************************************************************************
+#. * Name
+#. *    gconf_setup
+#. *
+#. * Synopsis
+#. *   #include "main/settings.h"
+#. *
+#. *   void gconf_setup()
+#. *
+#. * Description
+#. *   verifies and initializes the GConf subsystem, so that "sword://" and
+#. *   similar can be handled by url-comprehending programs such as browsers.
+#. *   dialogs for permission/success/failure => conditional on debug build.
+#. *
+#. * Return value
+#. *   void
+#.
+#: ../src/gnome2/gui.c:110
+msgid ""
+"URL references using \"sword://\" (similar to web page\n"
+"references) can be used by programs to look up\n"
+"scripture references. Your system currently has no\n"
+"program set to handle these references.\n"
+"\n"
+"Would you like Xiphos to set itself as the\n"
+"program to handle these references?"
+msgstr ""
+"URL odkazy, používající \"sword://\" (podobné odkazům\n"
+"u www stránek), mohou aplikace využít pro hledání odkazů\n"
+"v Bibli. Ve Vašem systému není v současné době\n"
+"program, který by se staral o.\n"
+"\n"
+"Přejete si, aby aplikace Xiphos nastavila sebe pro\n"
+"obsluhu těchto odkazů?"
+
+#: ../src/gnome2/gui.c:112
+msgid ""
+"Xiphos has successfully set itself\n"
+"as the handler of sword:// and bible:// URLs.\n"
+"\n"
+"You may wish to run the program \"gconf-editor\"\n"
+"to examine keys under /desktop/gnome/url-handlers,\n"
+"if you need to change these."
+msgstr ""
+"Xiphos úspěšně nastavil sebe\n"
+"pro obsluhu URL sword:// a bible://.\n"
+"\n"
+"Možná budete potřeba spustit program \"gconf-editor\"\n"
+"pro prohlížení klíčů v /desktop/gnome/url-handlers,\n"
+"pokud je potřeba klíče změnit."
+
+#: ../src/gnome2/gui.c:166
+#, c-format
+msgid ""
+"Xiphos failed to complete handler init for key #%d:\n"
+"%s"
+msgstr ""
+"Xiphos selhal při nastavení obsluhy pro klíč #%d:\n"
+"%s"
+
+#: ../src/gnome2/gui.c:212
+msgid "BUG! Xiphos is about to crash due to a \"STRDUP\" error."
+msgstr "CHYBA! Aplikace Xiphos havarovala chybou typu \"STRDUP\"."
+
+#: ../src/gnome2/gui.c:213 ../src/gnome2/gui.c:248
+msgid "Please report this error to the Xiphos team with:"
+msgstr "Prosím nahlašte tuto chybu týmu Xiphos společně s následujícím:"
+
+#: ../src/gnome2/gui.c:247
+msgid "BUG! Xiphos is about to crash due to a \"STRING\" error."
+msgstr "CHYBA! Aplikace Xiphos havarovala chybou typu \"STRING\"."
+
+#: ../src/gnome2/main_window.c:789
 msgid "Xiphos - Bible Study Software"
 msgstr "Xiphos - software pro studium Bible"
 
-#: ../src/gnome2/main_window.c:814
+#: ../src/gnome2/main_window.c:844
 msgid "Open a new tab"
 msgstr "Otevřít nový panel"
 
-#: ../src/gnome2/main_window.c:894
-#: ../src/gnome2/sidebar.c:621
-#: ../src/gnome2/sidebar.c:627
-#: ../src/main/sidebar.cc:643
-#: ../src/main/sidebar.cc:964
-#: ../src/main/sidebar.cc:965
-#: ../src/main/sidebar.cc:966
+#: ../src/gnome2/main_window.c:923 ../src/gnome2/sidebar.c:627
+#: ../src/gnome2/sidebar.c:633 ../src/main/sidebar.cc:666
+#: ../src/main/sidebar.cc:1015 ../src/main/sidebar.cc:1016
+#: ../src/main/sidebar.cc:1017
 msgid "Standard View"
 msgstr "Standardní pohled"
 
-#: ../src/gnome2/main_window.c:971
+#: ../src/gnome2/main_window.c:1004
 msgid "Commentary View"
 msgstr "Komentář/Výklad"
 
-#: ../src/gnome2/main_window.c:987
+#: ../src/gnome2/main_window.c:1020
 msgid "Book View"
 msgstr "Kniha"
 
-#: ../src/gnome2/main_window.c:1012
+#: ../src/gnome2/main_window.c:1045
 msgid "Welcome to Xiphos"
 msgstr "Vítá vás Xiphos"
 
-#: ../src/gnome2/menu_popup.c:1163
+#: ../src/gnome2/menu_popup.c:1168
 msgid ""
 "Renaming is not available in Windows.\n"
 "\n"
@@ -519,37 +592,33 @@ msgstr ""
 "tohoto komentáře. Proto přejmenování osobního\n"
 "komentáře není dostupné v prostředí Windows."
 
-#: ../src/gnome2/menu_popup.c:1182
+#: ../src/gnome2/menu_popup.c:1187
 msgid "Rename Commentary"
 msgstr "Přejmenovat komentář"
 
-#: ../src/gnome2/menu_popup.c:1185
+#: ../src/gnome2/menu_popup.c:1190
 msgid "Choose Commentary Name"
 msgstr "Vybrat jméno komentáře"
 
-#: ../src/gnome2/menu_popup.c:1187
+#: ../src/gnome2/menu_popup.c:1192
 msgid "New Name"
 msgstr "Nové jméno"
 
-#: ../src/gnome2/menu_popup.c:1188
-#: ../src/gnome2/treekey-editor.c:132
-#: ../src/gnome2/treekey-editor.c:191
-#: ../src/gnome2/treekey-editor.c:277
-#: ../src/main/prayerlists.cc:240
+#: ../src/gnome2/menu_popup.c:1193 ../src/gnome2/treekey-editor.c:139
+#: ../src/gnome2/treekey-editor.c:198 ../src/gnome2/treekey-editor.c:284
+#: ../src/main/prayerlists.cc:243
 msgid "Name: "
 msgstr "Jméno: "
 
-#: ../src/gnome2/menu_popup.c:1198
-#: ../src/main/prayerlists.cc:254
+#: ../src/gnome2/menu_popup.c:1203 ../src/main/prayerlists.cc:257
 msgid "Module names must contain [A-Za-z0-9_] only."
 msgstr "Jméno smí obsahovat jen znaky [A-Za-z0-9_]."
 
-#: ../src/gnome2/menu_popup.c:1205
-#: ../src/main/prayerlists.cc:261
+#: ../src/gnome2/menu_popup.c:1210 ../src/main/prayerlists.cc:264
 msgid "Xiphos already knows a module by that name."
 msgstr "Modul s tímto jménem už exituje."
 
-#: ../src/gnome2/menu_popup.c:1248
+#: ../src/gnome2/menu_popup.c:1253
 #, c-format
 msgid ""
 "Failed to create new configuration:\n"
@@ -558,7 +627,7 @@ msgstr ""
 "Nepodařilo se vytvořit novou konfiguraci:\n"
 "%s"
 
-#: ../src/gnome2/menu_popup.c:1257
+#: ../src/gnome2/menu_popup.c:1262
 msgid ""
 "Configuration build error:\n"
 "\n"
@@ -566,19 +635,56 @@ msgstr ""
 "Chyba během vytváření konfigurace:\n"
 "\n"
 
-#: ../src/gnome2/mod_mgr.c:339
+#: ../src/gnome2/mod_mgr.c:169
+msgid "Remove these modules?"
+msgstr "Odstranit následující moduly?"
+
+#: ../src/gnome2/mod_mgr.c:170
+msgid "Preparing to remove"
+msgstr "Příprava pro odstranění"
+
+#: ../src/gnome2/mod_mgr.c:171
+msgid "Removing"
+msgstr "Odstranění"
+
+#: ../src/gnome2/mod_mgr.c:172 ../ui/xi-menus.glade.h:72
+msgid "Remove"
+msgstr "Odstranit"
+
+#: ../src/gnome2/mod_mgr.c:175
 msgid "Install these modules?"
 msgstr "Přidat následujících moduly?"
 
-#: ../src/gnome2/mod_mgr.c:341
-msgid "Remove these modules?"
-msgstr "Odstranit následující moduly?"
+#: ../src/gnome2/mod_mgr.c:176
+msgid "Preparing to install"
+msgstr "Příprava pro přidání"
+
+#: ../src/gnome2/mod_mgr.c:177
+msgid "Installing"
+msgstr "Přidávání"
 
-#: ../src/gnome2/mod_mgr.c:343
+#: ../src/gnome2/mod_mgr.c:178 ../src/gnome2/mod_mgr.c:2964
+#: ../ui/module-manager.glade.h:18
+msgid "Install"
+msgstr "Přidat"
+
+#: ../src/gnome2/mod_mgr.c:181
 msgid "Archive these modules?"
 msgstr "Vytvořit archiv z následujících modulů?"
 
-#: ../src/gnome2/mod_mgr.c:345
+#: ../src/gnome2/mod_mgr.c:182
+msgid "Preparing to archive"
+msgstr "Příprava pro vytvoření archivu"
+
+#: ../src/gnome2/mod_mgr.c:183
+msgid "Archiving"
+msgstr "Archivování"
+
+#: ../src/gnome2/mod_mgr.c:184 ../ui/module-manager.glade.h:11
+msgid "Archive"
+msgstr "Zabalit"
+
+#: ../src/gnome2/mod_mgr.c:187
 msgid ""
 "Build fast-search index for these\n"
 "modules (may take minutes/module)?"
@@ -586,132 +692,130 @@ msgstr ""
 "Vytvořit rejstřík pro rychlé vyhledávání\n"
 "u následujících modulů (může trvat minuty/modul)?"
 
-#: ../src/gnome2/mod_mgr.c:347
-msgid "Delete fast-search index for these modules?"
-msgstr "Smazat rejstřík pro rychlé vyhledávání u následujících modulů?"
-
-#: ../src/gnome2/mod_mgr.c:367
-msgid "Preparing to install"
-msgstr "Příprava pro přidání"
+#: ../src/gnome2/mod_mgr.c:188
+msgid "Preparing to index"
+msgstr "Příprava pro vytvoření rejstříku"
 
-#: ../src/gnome2/mod_mgr.c:369
-msgid "Preparing to remove"
-msgstr "Příprava pro odstranění"
+#: ../src/gnome2/mod_mgr.c:189
+msgid "Indexing"
+msgstr "Tvorba rejstříku"
 
-#: ../src/gnome2/mod_mgr.c:371
-msgid "Preparing to archive"
-msgstr "Příprava pro vytvoření archivu"
+#: ../src/gnome2/mod_mgr.c:190 ../ui/module-manager.glade.h:17
+msgid "Index"
+msgstr "Rejstřík"
 
-#: ../src/gnome2/mod_mgr.c:373
-msgid "Preparing to index"
-msgstr "Příprava pro vytvoření rejstříku"
+#: ../src/gnome2/mod_mgr.c:193
+msgid "Delete fast-search index for these modules?"
+msgstr "Smazat rejstřík pro rychlé vyhledávání u následujících modulů?"
 
-#: ../src/gnome2/mod_mgr.c:375
+#: ../src/gnome2/mod_mgr.c:194
 msgid "Preparing to delete index"
 msgstr "Příprava pro odstranění rejstříku"
 
-#: ../src/gnome2/mod_mgr.c:401
-msgid "Installing"
-msgstr "Přidávání"
+#: ../src/gnome2/mod_mgr.c:195
+msgid "Deleting index"
+msgstr "Mazání rejstříku"
 
-#: ../src/gnome2/mod_mgr.c:403
-msgid "Removing"
-msgstr "Odstranění"
+#: ../src/gnome2/mod_mgr.c:196
+msgid "Deletion"
+msgstr "Smazání"
 
-#: ../src/gnome2/mod_mgr.c:405
-msgid "Archiving"
-msgstr "Archivování"
+#: ../src/gnome2/mod_mgr.c:427
+msgid "Module Name"
+msgstr "Jméno modulu"
 
-#: ../src/gnome2/mod_mgr.c:407
-msgid "Indexing"
-msgstr "Tvorba rejstříku"
+#: ../src/gnome2/mod_mgr.c:448
+msgid "A checkmark means this module is already installed"
+msgstr "Odškrtnutá fajfka znamená, ze modul je již nainstalován"
 
-#: ../src/gnome2/mod_mgr.c:409
-msgid "Deleting index"
-msgstr "Mazání rejstříku"
+#: ../src/gnome2/mod_mgr.c:470
+msgid "Click the box to work on this module"
+msgstr "Pro práci s tímto modulem klepněte na rámeček"
 
-#: ../src/gnome2/mod_mgr.c:432
-#, c-format
+#: ../src/gnome2/mod_mgr.c:471
+msgid "Click the box to select this module for install/update"
+msgstr "Klepněte na pole pro výběr modulu k instalaci/aktualizaci"
+
+#: ../src/gnome2/mod_mgr.c:490
+msgid "Installed"
+msgstr "Instalovaný"
+
+#: ../src/gnome2/mod_mgr.c:500
 msgid ""
-"`mkdir %s' failed:\n"
-"%s."
+"The index icon means you have built an optimized ('lucene') index for this "
+"module for fast searching (see the Maintenance pane for this function)"
 msgstr ""
-"`mkdir %s' se nezdařilo:\n"
-"%s."
-
-#: ../src/gnome2/mod_mgr.c:463
-msgid "Xiphos could not execute archiver"
-msgstr "Xiphos nemůže spustit archivátor"
+"Ikona rejstříku značí, že jste vytvořily optimalizovaný ('lucene') index pro "
+"tento modul. To umožňuje rychlé vyhledávání (viz \" -"
 
-#: ../src/gnome2/mod_mgr.c:468
+#: ../src/gnome2/mod_mgr.c:518
 msgid ""
-" archival result:\n"
-"\n"
+"The lock icon means this module is encrypted, and requires that you purchase "
+"an unlock key from the content owner"
 msgstr ""
-" výsledek vytváření archivu:\n"
-"\n"
+"Ikona se zámkem znamená, že tento modul je šifrován, a je potřeba pořídit si "
+"klíč pro odemčení od vlastníka tohoto modulu"
 
-#: ../src/gnome2/mod_mgr.c:472
+#: ../src/gnome2/mod_mgr.c:535 ../ui/xi-menus.glade.h:1
+msgid "About"
+msgstr "O modulu"
+
+#: ../src/gnome2/mod_mgr.c:555
 msgid ""
-"\n"
-"Archive in "
+"The refresh icon means the Installed module is older than the newer "
+"Available module: You should update the module"
 msgstr ""
-"\n"
-"Archivovat do "
+"Ikona pro obnovení značí, že instalovaný modul je starší, než nejnovější "
+"dostupná verze: Měl byste modul aktualizovat"
 
-#: ../src/gnome2/mod_mgr.c:526
-msgid "Journals and prayer lists cannot be indexed."
-msgstr "Pro Deník a Modlitební seznam není možno vytvořit rejstřík."
+#: ../src/gnome2/mod_mgr.c:567
+msgid "Available"
+msgstr "Dostupný"
 
-#: ../src/gnome2/mod_mgr.c:547
-#: ../src/gnome2/mod_mgr.c:2902
-#: ../ui/module-manager.glade.h:15
-msgid "Install"
-msgstr "Přidat"
+#: ../src/gnome2/mod_mgr.c:576
+msgid "Size"
+msgstr "Velikost"
 
-#: ../src/gnome2/mod_mgr.c:549
-#: ../src/gnome2/treekey-editor.c:316
-msgid "Remove"
-msgstr "Odstranit"
+#: ../src/gnome2/mod_mgr.c:585
+msgid "Description"
+msgstr "Popis"
 
-#: ../src/gnome2/mod_mgr.c:551
-msgid "Archive"
-msgstr "Zabalit"
+#: ../src/gnome2/mod_mgr.c:736
+#, c-format
+msgid ""
+"`mkdir %s' failed:\n"
+"%s."
+msgstr ""
+"`mkdir %s' se nezdařilo:\n"
+"%s."
 
-#: ../src/gnome2/mod_mgr.c:553
-msgid "Index"
-msgstr "Rejstřík"
+#: ../src/gnome2/mod_mgr.c:759
+msgid " archived in: \n"
+msgstr " archivováno v: \n"
 
-#: ../src/gnome2/mod_mgr.c:555
-msgid "Deletion"
-msgstr "Smazání"
+#: ../src/gnome2/mod_mgr.c:815
+msgid "Journals and prayer lists cannot be indexed."
+msgstr "Pro Deník a Modlitební seznam není možno vytvořit rejstřík."
 
-#: ../src/gnome2/mod_mgr.c:557
+#: ../src/gnome2/mod_mgr.c:833
 #, c-format
 msgid "%s failed"
 msgstr "%s se nezdařilo"
 
-#: ../src/gnome2/mod_mgr.c:559
-#: ../src/gnome2/mod_mgr.c:1285
+#: ../src/gnome2/mod_mgr.c:836 ../src/gnome2/mod_mgr.c:1562
 msgid "Finished"
 msgstr "Dokončeno"
 
-#: ../src/gnome2/mod_mgr.c:726
-#: ../src/gnome2/mod_mgr.c:728
-#: ../src/gnome2/mod_mgr.c:830
-#: ../src/gnome2/mod_mgr.c:865
-#: ../src/gnome2/mod_mgr.c:867
-#: ../src/gnome2/utilities.c:346
-#: ../src/gnome2/utilities.c:411
-#: ../src/gnome2/utilities.c:413
-#: ../src/gnome2/utilities.c:1032
-#: ../src/main/sidebar.cc:801
-#: ../src/main/sidebar.cc:873
-#: ../src/main/sidebar.cc:875
+#: ../src/gnome2/mod_mgr.c:1003 ../src/gnome2/mod_mgr.c:1005
+#: ../src/gnome2/mod_mgr.c:1107 ../src/gnome2/mod_mgr.c:1142
+#: ../src/gnome2/mod_mgr.c:1144 ../src/gnome2/utilities.c:435
+#: ../src/gnome2/utilities.c:500 ../src/gnome2/utilities.c:502
+#: ../src/gnome2/utilities.c:986 ../src/main/sidebar.cc:852
+#: ../src/main/sidebar.cc:924 ../src/main/sidebar.cc:926
 msgid "Unknown"
 msgstr "Neznámé"
 
-#: ../src/gnome2/mod_mgr.c:1029
+#: ../src/gnome2/mod_mgr.c:1301
 #, c-format
 msgid ""
 "Repository:\n"
@@ -720,7 +824,7 @@ msgstr ""
 "Zdroj:\n"
 "%s"
 
-#: ../src/gnome2/mod_mgr.c:1041
+#: ../src/gnome2/mod_mgr.c:1313
 msgid ""
 "Categorized by\n"
 "Module Type"
@@ -728,59 +832,44 @@ msgstr ""
 "Tříděné podle\n"
 "typu modulu"
 
-#: ../src/gnome2/mod_mgr.c:1046
-#: ../src/gnome2/utilities.c:472
-#: ../src/main/sidebar.cc:948
-#: ../src/main/sidebar.cc:950
+#: ../src/gnome2/mod_mgr.c:1318 ../src/gnome2/utilities.c:561
+#: ../src/main/sidebar.cc:999 ../src/main/sidebar.cc:1001
 msgid "Biblical Texts"
 msgstr "Biblické texty"
 
-#: ../src/gnome2/mod_mgr.c:1050
-#: ../src/gnome2/utilities.c:476
-#: ../src/main/sidebar.cc:655
-#: ../src/main/sidebar.cc:973
-#: ../src/main/sidebar.cc:975
-#: ../ui/prefs.glade.h:33
+#: ../src/gnome2/mod_mgr.c:1322 ../src/gnome2/utilities.c:565
+#: ../src/main/sidebar.cc:678 ../src/main/sidebar.cc:1024
+#: ../src/main/sidebar.cc:1026 ../ui/prefs.glade.h:33
 msgid "Commentaries"
 msgstr "Komentáře/Výklady"
 
-#: ../src/gnome2/mod_mgr.c:1054
-#: ../src/gnome2/utilities.c:480
-#: ../src/main/sidebar.cc:982
-#: ../src/main/sidebar.cc:984
+#: ../src/gnome2/mod_mgr.c:1326 ../src/gnome2/utilities.c:569
+#: ../src/main/sidebar.cc:1033 ../src/main/sidebar.cc:1035
 msgid "Dictionaries"
 msgstr "Slovníky"
 
-#: ../src/gnome2/mod_mgr.c:1058
-#: ../src/gnome2/utilities.c:484
-#: ../src/main/sidebar.cc:991
-#: ../src/main/sidebar.cc:993
+#: ../src/gnome2/mod_mgr.c:1330 ../src/gnome2/utilities.c:573
+#: ../src/main/sidebar.cc:1042 ../src/main/sidebar.cc:1044
 msgid "Daily Devotionals"
 msgstr "Čtení na každý den"
 
-#: ../src/gnome2/mod_mgr.c:1062
-#: ../src/gnome2/utilities.c:488
-#: ../src/main/sidebar.cc:665
-#: ../src/main/sidebar.cc:1000
-#: ../src/main/sidebar.cc:1002
+#: ../src/gnome2/mod_mgr.c:1334 ../src/gnome2/utilities.c:577
+#: ../src/main/sidebar.cc:688 ../src/main/sidebar.cc:1051
+#: ../src/main/sidebar.cc:1053
 msgid "General Books"
 msgstr "Knihy obecně"
 
-#: ../src/gnome2/mod_mgr.c:1066
-#: ../src/gnome2/utilities.c:492
-#: ../src/main/sidebar.cc:1009
-#: ../src/main/sidebar.cc:1011
+#: ../src/gnome2/mod_mgr.c:1338 ../src/gnome2/utilities.c:581
+#: ../src/main/sidebar.cc:1060 ../src/main/sidebar.cc:1062
 msgid "Maps"
 msgstr "Mapy"
 
-#: ../src/gnome2/mod_mgr.c:1070
-#: ../src/gnome2/utilities.c:496
-#: ../src/main/sidebar.cc:1018
-#: ../src/main/sidebar.cc:1020
+#: ../src/gnome2/mod_mgr.c:1342 ../src/gnome2/utilities.c:585
+#: ../src/main/sidebar.cc:1069 ../src/main/sidebar.cc:1071
 msgid "Images"
 msgstr "Obrazy"
 
-#: ../src/gnome2/mod_mgr.c:1078
+#: ../src/gnome2/mod_mgr.c:1350
 msgid ""
 "Categorized by\n"
 "Availability"
@@ -788,378 +877,386 @@ msgstr ""
 "Tříděné podle\n"
 "dostupnosti"
 
-#: ../src/gnome2/mod_mgr.c:1083
+#: ../src/gnome2/mod_mgr.c:1355
 msgid "Updates"
 msgstr "Aktualizace"
 
-#: ../src/gnome2/mod_mgr.c:1087
+#: ../src/gnome2/mod_mgr.c:1359
 msgid "Uninstalled"
 msgstr "Odinstalováno"
 
-#: ../src/gnome2/mod_mgr.c:1091
-#: ../src/gnome2/sidebar.c:637
-#: ../src/gnome2/utilities.c:501
-#: ../src/main/prayerlists.cc:238
-#: ../src/main/sidebar.cc:1028
-#: ../src/main/sidebar.cc:1030
+#: ../src/gnome2/mod_mgr.c:1363 ../src/gnome2/sidebar.c:643
+#: ../src/gnome2/utilities.c:590 ../src/main/prayerlists.cc:241
+#: ../src/main/sidebar.cc:1079 ../src/main/sidebar.cc:1081
 msgid "Prayer List/Journal"
-msgstr "Modlitební seznam/Deník"
+msgstr "Modlitební seznam/Žurnál"
 
-#: ../src/gnome2/mod_mgr.c:1268
+#: ../src/gnome2/mod_mgr.c:1545
 msgid "Refreshing from remote source"
 msgstr "Obnovit ze vzdáleného zdroje"
 
-#: ../src/gnome2/mod_mgr.c:1279
+#: ../src/gnome2/mod_mgr.c:1556
 msgid "Remote source not found"
 msgstr "Vzdálený zdroj nebyl nalezen"
 
-#: ../src/gnome2/mod_mgr.c:1412
-msgid "Module Name"
-msgstr "Jméno modulu"
-
-#: ../src/gnome2/mod_mgr.c:1433
-msgid "A checkmark means this module is already installed"
-msgstr "Odškrtnutá fajfka znamená, ze modul je již nainstalován"
-
-#: ../src/gnome2/mod_mgr.c:1455
-msgid "Click the box to work on this module"
-msgstr "Pro práci s tímto modulem klepněte na rámeček"
-
-#: ../src/gnome2/mod_mgr.c:1456
-msgid "Click the box to select this module for install/update"
-msgstr "Klepněte na pole pro výběr modulu k instalaci/aktualizaci"
-
-#: ../src/gnome2/mod_mgr.c:1475
-msgid "Installed"
-msgstr "Instalovaný"
-
-#: ../src/gnome2/mod_mgr.c:1485
-msgid "The index icon means you have built an optimized ('lucene') index for this module for fast searching (see the Maintenance pane for this function)"
-msgstr "Ikona rejstříku značí, že jste vytvořily optimalizovaný ('lucene') index pro tento modul. To umožňuje rychlé vyhledávání (viz \" -"
-
-#: ../src/gnome2/mod_mgr.c:1503
-msgid "The lock icon means this module is encrypted, and requires that you purchase an unlock key from the content owner"
-msgstr "Ikona se zámkem znamená, že tento modul je šifrován, a je potřeba pořídit si klíč pro odemčení od vlastníka tohoto modulu"
-
-#. 2
-#: ../src/gnome2/mod_mgr.c:1520
-#: ../src/gnome2/sidebar.c:975
-#: ../src/gnome2/sidebar.c:1143
-#: ../ui/xi-menus.glade.h:1
-msgid "About"
-msgstr "O modulu"
-
-#: ../src/gnome2/mod_mgr.c:1540
-msgid "The refresh icon means the Installed module is older than the newer Available module: You should update the module"
-msgstr "Ikona pro obnovení značí, že instalovaný modul je starší, než nejnovější dostupná verze: Měl byste modul aktualizovat"
-
-#: ../src/gnome2/mod_mgr.c:1552
-msgid "Available"
-msgstr "Dostupný"
-
-#: ../src/gnome2/mod_mgr.c:1561
-msgid "Size"
-msgstr "Velikost"
-
-#: ../src/gnome2/mod_mgr.c:1570
-msgid "Description"
-msgstr "Popis"
-
-#: ../src/gnome2/mod_mgr.c:1602
-#: ../src/gnome2/mod_mgr.c:1702
+#: ../src/gnome2/mod_mgr.c:1670
 msgid "Configure"
 msgstr "Nastavení"
 
-#: ../src/gnome2/mod_mgr.c:1633
+#: ../src/gnome2/mod_mgr.c:1701
 msgid "Type"
 msgstr "Druh"
 
-#: ../src/gnome2/mod_mgr.c:1640
+#: ../src/gnome2/mod_mgr.c:1708
 msgid "Caption"
 msgstr "Titulek"
 
-#: ../src/gnome2/mod_mgr.c:1648
+#: ../src/gnome2/mod_mgr.c:1716
 msgid "Source"
 msgstr "Zdroj"
 
-#: ../src/gnome2/mod_mgr.c:1656
+#: ../src/gnome2/mod_mgr.c:1724
 msgid "Directory"
 msgstr "Adresář"
 
-#: ../src/gnome2/mod_mgr.c:1664
+#: ../src/gnome2/mod_mgr.c:1732
 msgid "User"
 msgstr "Uživatel"
 
-#: ../src/gnome2/mod_mgr.c:1672
+#: ../src/gnome2/mod_mgr.c:1740
 msgid "Password"
 msgstr "Heslo"
 
-#: ../src/gnome2/mod_mgr.c:1680
+#: ../src/gnome2/mod_mgr.c:1748
 msgid "UID"
 msgstr "UID"
 
-#: ../src/gnome2/mod_mgr.c:1700
-msgid "Sources"
-msgstr "Zdroje"
+#: ../src/gnome2/mod_mgr.c:1765
+msgid "Module Sources"
+msgstr "Zdroje modulů"
 
-#: ../src/gnome2/mod_mgr.c:1706
-#: ../src/gnome2/preferences_dialog.c:1784
-#: ../src/gnome2/sidebar.c:1483
+#: ../src/gnome2/mod_mgr.c:1768
+msgid "Add/Remove"
+msgstr "Přidat/Odstranit"
+
+#: ../src/gnome2/mod_mgr.c:1770
+msgid "Choose"
+msgstr "Vybrat"
+
+#: ../src/gnome2/mod_mgr.c:1774 ../src/gnome2/preferences_dialog.c:1793
+#: ../src/gnome2/sidebar.c:1413
 msgid "Modules"
 msgstr "Moduly"
 
-#: ../src/gnome2/mod_mgr.c:1708
+#: ../src/gnome2/mod_mgr.c:1776
 msgid "Install/Update"
 msgstr "Přidat/Aktualizovat"
 
-#: ../src/gnome2/mod_mgr.c:1710
+#: ../src/gnome2/mod_mgr.c:1778
 msgid "Maintenance"
 msgstr "Udržování"
 
-#: ../src/gnome2/mod_mgr.c:1930
+#: ../src/gnome2/mod_mgr.c:1999
 msgid "Please Refresh"
 msgstr "Prosím obnovit"
 
-#: ../src/gnome2/mod_mgr.c:1931
+#: ../src/gnome2/mod_mgr.c:2000
 msgid "Your module list is not up to date!"
 msgstr "Váš seznam modulů není aktuální!"
 
+#. Zero Bibles is just not workable in Xiphos.
 #: ../src/gnome2/mod_mgr.c:2282
+msgid ""
+"You have uninstalled your last Bible.\n"
+"Xiphos requires at least one."
+msgstr ""
+"Byla odinstalovány zbývající Bible.\n"
+"Xiphos vyžaduje alespoň jednu."
+
+#: ../src/gnome2/mod_mgr.c:2288
+msgid ""
+"There are still no Bibles installed.\n"
+"Xiphos cannot continue without one."
+msgstr ""
+"Pořád není žádná Bible nainstalována.\n"
+"Xiphos nemůže bez žádné pokračovat\n"
+"v činnosti."
+
+#: ../src/gnome2/mod_mgr.c:2353
 msgid "Standard remote sources have been loaded."
 msgstr "Standardní vzdálené zdroje jsou načteny."
 
-#: ../src/gnome2/mod_mgr.c:2283
+#: ../src/gnome2/mod_mgr.c:2359
 msgid "Could not load standard sources from CrossWire."
 msgstr "Nedaří se načít standardní zdroje z CrossWire."
 
-#: ../src/gnome2/mod_mgr.c:2435
-#: ../src/gnome2/mod_mgr.c:2684
+#: ../src/gnome2/mod_mgr.c:2510 ../src/gnome2/mod_mgr.c:2759
 msgid "Remove the selected source"
 msgstr "Odstranit vybraný zdroj"
 
-#: ../src/gnome2/mod_mgr.c:2495
+#: ../src/gnome2/mod_mgr.c:2570
 msgid "Enter a remote source"
 msgstr "Zadat vzdálený zdroj"
 
-#: ../src/gnome2/mod_mgr.c:2499
+#: ../src/gnome2/mod_mgr.c:2574
 msgid "Caption:"
 msgstr "Titulek:"
 
-#: ../src/gnome2/mod_mgr.c:2500
+#: ../src/gnome2/mod_mgr.c:2575
 msgid "Type:"
 msgstr "Druh:"
 
-#: ../src/gnome2/mod_mgr.c:2501
+#: ../src/gnome2/mod_mgr.c:2576
 msgid "Host:"
 msgstr "URL:"
 
-#: ../src/gnome2/mod_mgr.c:2502
+#: ../src/gnome2/mod_mgr.c:2577
 msgid "Directory:"
 msgstr "Adresář:"
 
-#: ../src/gnome2/mod_mgr.c:2504
+#: ../src/gnome2/mod_mgr.c:2579
 msgid "User (optional):"
 msgstr "Uživatel (volitelné)"
 
-#: ../src/gnome2/mod_mgr.c:2505
+#: ../src/gnome2/mod_mgr.c:2580
 msgid "Password (optional):"
 msgstr "Heslo (volitelné)"
 
 #. this can happen at most once
-#: ../src/gnome2/mod_mgr.c:2533
+#: ../src/gnome2/mod_mgr.c:2608
 msgid "A source by that name already exists."
 msgstr "Zdroj s tímto jménem už existuje."
 
-#: ../src/gnome2/mod_mgr.c:2681
+#: ../src/gnome2/mod_mgr.c:2756
 msgid "Delete a remote source"
 msgstr "Smazat vzdálený zdroj"
 
-#: ../src/gnome2/navbar_book.c:359
-#: ../src/gnome2/navbar_book_dialog.c:299
+#. *****************************************************************************
+#. * Name
+#. *   gui_open_mod_mgr
+#. *
+#. * Synopsis
+#. *   #include "gui/mod_mgr.h"
+#. *
+#. *   void gui_open_mod_mgr(void)
+#. *
+#. * Description
+#. *
+#. *
+#. * Return value
+#. *   void
+#.
+#: ../src/gnome2/mod_mgr.c:3244
+msgid ""
+"<b>Welcome to the Module Manager.</b>\n"
+"\n"
+"This is Xiphos' mechanism to get new and updated content.\n"
+"It appears you have never been here before, so please take a moment to look "
+"it over.\n"
+"(You will see this information box just once.)\n"
+"\n"
+"Modules come from different <u>repositories</u>.  <b>Module Sources: Add/"
+"Remove</b> will show you what repositories are currently known.\n"
+"\n"
+"<b>Module Sources: Choose</b> is for deciding from where modules should "
+"come, that is, from which repository Xiphos should obtain them, as well as "
+"where they should be placed on your system. Set <i>Install Source</i> and "
+"<i>Install Destination</i>, then click <i>Refresh</i>.\n"
+"\n"
+"<b>Modules: Install/Update</b> is for selecting and obtaining modules after "
+"choosing source and destination.\n"
+"\n"
+"<b>Modules: Maintenance</b> is for archive and index creation.\n"
+"\n"
+"See section 5 of our manual for Module Manager detail, or ask for help via "
+"Live Chat, or (if no one is responsive in chat) send mail to our users' "
+"mailing list.\n"
+msgstr ""
+"<b>Správce modulů Vás vítá.</b>\n"
+"\n"
+"Tohle je způsob, kterým aplikace Xiphos získává nový a aktualizuje obsah..\n"
+"\n"
+"Vypadá to, že tu jste poprvé. Prosím udělejte si čas na přečtení "
+"následujících věcí.\n"
+"(Toto informační okno se zobrazí jen jednou.)\n"
+"\n"
+"Moduly pochází z různých <u>míst</u>.  <b>Zdroje modulů: Přidat/Odstranit</"
+"b> zobrazuje známá umístění modulů.\n"
+"\n"
+"<b>Zdroje modulů: Vybrat</b> je k určení, kam mají moduly přijít. To "
+"znamená, odkud moduly stahovat a také kam je ukládat v systému. Nastavte "
+"<i>Install Source</i> a <i>Install Destination</i>, poté klepněte na "
+"<i>Refresh</i>.\n"
+"\n"
+"<b>Moduly: Přidat/Aktualizovat</b> se používá po výběru zdroje a  cíle pro "
+"výběr a stažení modulů.\n"
+"\n"
+"<b>Moduly: Udržování</b> se používá pro archivaci a tvorby rejstříku.\n"
+"\n"
+"Podrobnosti o Správci modulů najdete v nápovědě, v sekci 5. Také můžete "
+"využít Online komunikace nebo (pokud se stane, že nikdo neodpoví) poslat "
+"mail do naší mailové konference pro uživatele.\n"
+
+#: ../src/gnome2/navbar_book.c:359 ../src/gnome2/navbar_book_dialog.c:300
 msgid "Go outward, to the section containing this one"
 msgstr "Jít ven, na sekci obsahující tuto položku"
 
-#: ../src/gnome2/navbar_book.c:375
-#: ../src/gnome2/navbar_book_dialog.c:315
+#: ../src/gnome2/navbar_book.c:375 ../src/gnome2/navbar_book_dialog.c:316
 msgid "Go to previous item"
 msgstr "Jdi na předchozí položku"
 
-#: ../src/gnome2/navbar_book.c:390
-#: ../src/gnome2/navbar_book_dialog.c:330
+#: ../src/gnome2/navbar_book.c:390 ../src/gnome2/navbar_book_dialog.c:331
 msgid "Go to next item"
 msgstr "Jdi na následující položku"
 
-#: ../src/gnome2/navbar_book.c:406
-#: ../src/gnome2/navbar_book_dialog.c:346
+#: ../src/gnome2/navbar_book.c:406 ../src/gnome2/navbar_book_dialog.c:347
 msgid "Go inward, to the first subsection"
 msgstr "Jít dovnitř, na první podsekci"
 
-#: ../src/gnome2/navbar_versekey_dialog.c:887
-#: ../src/gnome2/navbar_versekey_editor.c:877
-#: ../src/gnome2/navbar_versekey_parallel.c:800
+#: ../src/gnome2/navbar_versekey_dialog.c:864
+#: ../src/gnome2/navbar_versekey_editor.c:879
+#: ../src/gnome2/navbar_versekey_parallel.c:810
 msgid "Synchronize this window from main window"
 msgstr "Synchronizace okna z hlavního okna aplikace"
 
-#: ../src/gnome2/parallel_dialog.c:324
-#: ../src/gnome2/preferences_dialog.c:1790
+#: ../src/gnome2/parallel_dialog.c:328 ../src/gnome2/preferences_dialog.c:1799
 msgid "Parallel"
 msgstr "Souběžně"
 
-#: ../src/gnome2/parallel_view.c:271
+#: ../src/gnome2/parallel_view.c:275
 msgid "Copy"
 msgstr "Kopírovat"
 
-#: ../src/gnome2/parallel_view.c:281
+#: ../src/gnome2/parallel_view.c:285
 msgid "Detach/Attach"
 msgstr "Uvolnit/Ukotvit"
 
-#: ../src/gnome2/parallel_view.c:287
-#: ../ui/xi-menus.glade.h:40
+#: ../src/gnome2/parallel_view.c:291 ../ui/xi-menus.glade.h:53
 msgid "Module Options"
 msgstr "Nastavení modulů"
 
 #. build change parallel modules submenu
-#: ../src/gnome2/parallel_view.c:302
+#: ../src/gnome2/parallel_view.c:306
 msgid "Change parallel 1"
 msgstr "Změnit souběžně 1"
 
-#: ../src/gnome2/parallel_view.c:304
+#: ../src/gnome2/parallel_view.c:308
 msgid "Change parallel 2"
 msgstr "Změnit souběžně 2"
 
-#: ../src/gnome2/parallel_view.c:306
+#: ../src/gnome2/parallel_view.c:310
 msgid "Change parallel 3"
 msgstr "Změnit souběžně 3"
 
-#: ../src/gnome2/parallel_view.c:308
+#: ../src/gnome2/parallel_view.c:312
 msgid "Change parallel 4"
 msgstr "Změnit souběžně 4"
 
-#: ../src/gnome2/parallel_view.c:310
+#: ../src/gnome2/parallel_view.c:314
 msgid "Change parallel 5"
 msgstr "Změnit souběžně 5"
 
-#: ../src/gnome2/parallel_view.c:467
-#: ../src/gnome2/sidebar.c:620
-#: ../src/gnome2/sidebar.c:626
-#: ../src/gnome2/tabbed_browser.c:231
-#: ../src/main/sidebar.cc:623
-#: ../src/main/sidebar.cc:956
-#: ../src/main/sidebar.cc:957
-#: ../src/main/sidebar.cc:958
+#: ../src/gnome2/parallel_view.c:471 ../src/gnome2/sidebar.c:626
+#: ../src/gnome2/sidebar.c:632 ../src/gnome2/tabbed_browser.c:262
+#: ../src/main/sidebar.cc:646 ../src/main/sidebar.cc:1007
+#: ../src/main/sidebar.cc:1008 ../src/main/sidebar.cc:1009
 msgid "Parallel View"
 msgstr "Souběžný pohled"
 
-#: ../src/gnome2/preferences_cell_renderer.c:398
-msgid "Text"
-msgstr "Text"
-
-#: ../src/gnome2/preferences_cell_renderer.c:400
-msgid "Text to render"
-msgstr "Text k vykreslení"
-
-#: ../src/gnome2/preferences_cell_renderer.c:406
-msgid "Pixbuf Object"
-msgstr "Pixbuf objekt"
-
-#: ../src/gnome2/preferences_cell_renderer.c:408
-msgid "The pixbuf to render."
-msgstr "Poskytnutý pixbuf."
-
-#: ../src/gnome2/preferences_dialog.c:1231
-#: ../src/gnome2/preferences_dialog.c:1269
-#: ../src/gnome2/preferences_dialog.c:1306
-#: ../src/gnome2/preferences_dialog.c:1341
-#: ../src/gnome2/preferences_dialog.c:1375
-#: ../src/gnome2/preferences_dialog.c:1408
-#: ../src/gnome2/preferences_dialog.c:1440
-#: ../src/gnome2/preferences_dialog.c:1473
-#: ../src/gnome2/preferences_dialog.c:1505
-#: ../src/gnome2/preferences_dialog.c:1539
-#: ../src/gnome2/preferences_dialog.c:1574
-#: ../src/gnome2/preferences_dialog.c:1609
-#: ../src/gnome2/preferences_dialog.c:1645
-#: ../src/gnome2/preferences_dialog.c:2045
+#: ../src/gnome2/preferences_dialog.c:1179
+#: ../src/gnome2/preferences_dialog.c:1217
+#: ../src/gnome2/preferences_dialog.c:1254
+#: ../src/gnome2/preferences_dialog.c:1289
+#: ../src/gnome2/preferences_dialog.c:1323
+#: ../src/gnome2/preferences_dialog.c:1356
+#: ../src/gnome2/preferences_dialog.c:1388
+#: ../src/gnome2/preferences_dialog.c:1421
+#: ../src/gnome2/preferences_dialog.c:1453
+#: ../src/gnome2/preferences_dialog.c:1487
+#: ../src/gnome2/preferences_dialog.c:1522
+#: ../src/gnome2/preferences_dialog.c:1557
+#: ../src/gnome2/preferences_dialog.c:1593
+#: ../src/gnome2/preferences_dialog.c:1631
+#: ../src/gnome2/preferences_dialog.c:2052
 msgid "-- Select --"
 msgstr "-- Vybrat --"
 
-#: ../src/gnome2/preferences_dialog.c:1678
-#: ../ui/prefs.glade.h:74
+#: ../src/gnome2/preferences_dialog.c:1652
+msgid "Locale will take effect after restart."
+msgstr "Změna jazyka se projeví až po opětovném spuštění."
+
+#: ../src/gnome2/preferences_dialog.c:1687 ../ui/prefs.glade.h:74
 msgid "Preferences"
 msgstr "Nastavení"
 
-#: ../src/gnome2/preferences_dialog.c:1760
+#: ../src/gnome2/preferences_dialog.c:1769
 msgid "Fonts"
 msgstr "Písma"
 
-#: ../src/gnome2/preferences_dialog.c:1763
+#: ../src/gnome2/preferences_dialog.c:1772
 msgid "Color"
 msgstr "Barva"
 
-#: ../src/gnome2/preferences_dialog.c:1766
+#: ../src/gnome2/preferences_dialog.c:1775
 msgid "Sizes"
 msgstr "Velikosti"
 
-#: ../src/gnome2/preferences_dialog.c:1770
+#: ../src/gnome2/preferences_dialog.c:1779
 msgid "General"
 msgstr "Obecné"
 
-#: ../src/gnome2/preferences_dialog.c:1773
-#: ../ui/prefs.glade.h:85
+#: ../src/gnome2/preferences_dialog.c:1782 ../ui/prefs.glade.h:87
 msgid "Tabs and Panes"
 msgstr "Panely a pole"
 
-#: ../src/gnome2/preferences_dialog.c:1780
+#: ../src/gnome2/preferences_dialog.c:1789
 msgid "Options"
 msgstr "Nastavení"
 
-#: ../src/gnome2/preferences_dialog.c:1787
+#: ../src/gnome2/preferences_dialog.c:1796
 msgid "Main"
 msgstr "Hlavní"
 
-#: ../src/gnome2/preferences_dialog.c:1793
+#: ../src/gnome2/preferences_dialog.c:1802
 msgid "Special"
 msgstr "Zvláštní"
 
-#: ../src/gnome2/search_dialog.c:61
-#: ../src/main/search_dialog.cc:60
-#: ../src/main/search_sidebar.cc:54
+#: ../src/gnome2/search_dialog.c:68 ../src/main/search_dialog.cc:66
+#: ../src/main/search_sidebar.cc:61
 msgid "Searching the "
-msgstr "Prohledávání"
+msgstr "Prohledávání "
 
-#: ../src/gnome2/search_dialog.c:62
-#: ../src/main/search_dialog.cc:61
-#: ../src/main/search_sidebar.cc:55
+#: ../src/gnome2/search_dialog.c:69 ../src/main/search_dialog.cc:67
+#: ../src/main/search_sidebar.cc:62
 msgid " Module"
 msgstr " Modul"
 
-#: ../src/gnome2/search_dialog.c:63
-#: ../src/main/search_dialog.cc:62
-#: ../src/main/search_sidebar.cc:56
+#: ../src/gnome2/search_dialog.c:70 ../src/main/search_dialog.cc:68
+#: ../src/main/search_sidebar.cc:63
 msgid "found in "
-msgstr "nalezeno v"
+msgstr "nalezeno v "
 
-#: ../src/gnome2/search_dialog.c:498
+#: ../src/gnome2/search_dialog.c:527
 msgid "Clear List?"
 msgstr "Vyprázdnit seznam?"
 
-#: ../src/gnome2/search_dialog.c:499
+#: ../src/gnome2/search_dialog.c:528
 msgid "Are you sure you want to clear the module list?"
 msgstr "Jste si jist, že chcete vyprázdnit seznam modulů?"
 
-#: ../src/gnome2/search_dialog.c:679
+#: ../src/gnome2/search_dialog.c:708
 msgid "The last module list may not be deleted"
 msgstr "Poslední seznam modulů nesmí být smazán"
 
-#: ../src/gnome2/search_dialog.c:697
+#: ../src/gnome2/search_dialog.c:726
 msgid "Delete list?"
 msgstr "Odstranit seznam?"
 
-#: ../src/gnome2/search_dialog.c:698
+#: ../src/gnome2/search_dialog.c:727
 msgid "Are you sure you want to delete:"
 msgstr "Jste si jist, že chcete odstranit:"
 
-#: ../src/gnome2/search_sidebar.c:189
+#: ../src/gnome2/search_sidebar.c:192
 msgid ""
 "This is an inclusive (\"AND\") search:\n"
 "Find matches showing all words."
@@ -1167,185 +1264,93 @@ msgstr ""
 "Toto je hledání zahrnující (\"AND\"):\n"
 "Najít výskyty, obsahující všechna slova."
 
-#: ../src/gnome2/search_sidebar.c:206
+#: ../src/gnome2/search_sidebar.c:209
 msgid "Search Module"
 msgstr "Hledat modul"
 
-#: ../src/gnome2/search_sidebar.c:220
+#: ../src/gnome2/search_sidebar.c:223
 msgid "Bible"
 msgstr "Bible"
 
-#: ../src/gnome2/search_sidebar.c:229
-#: ../ui/prefs.glade.h:35
+#: ../src/gnome2/search_sidebar.c:232 ../ui/prefs.glade.h:35
 msgid "Commentary"
 msgstr "Komentář/Výklad"
 
-#: ../src/gnome2/search_sidebar.c:243
+#: ../src/gnome2/search_sidebar.c:246
 msgid "Search Type"
 msgstr "Typ hledání"
 
-#: ../src/gnome2/search_sidebar.c:257
-#: ../ui/search-dialog.glade.h:64
+#: ../src/gnome2/search_sidebar.c:260 ../ui/search-dialog.glade.h:66
 msgid "Multi word"
 msgstr "Více slov"
 
-#: ../src/gnome2/search_sidebar.c:276
-#: ../ui/search-dialog.glade.h:44
+#: ../src/gnome2/search_sidebar.c:279 ../ui/search-dialog.glade.h:44
 msgid "Exact phrase"
 msgstr "Přesný výraz"
 
-#: ../src/gnome2/search_sidebar.c:290
+#: ../src/gnome2/search_sidebar.c:293
 msgid "Search Options"
 msgstr "Volby hledání"
 
-#: ../src/gnome2/search_sidebar.c:318
+#: ../src/gnome2/search_sidebar.c:321
 msgid "Search Scope"
 msgstr "Volnost hledání"
 
-#: ../src/gnome2/search_sidebar.c:331
+#: ../src/gnome2/search_sidebar.c:334
 msgid "No scope"
 msgstr "Žádná volnost"
 
-#: ../src/gnome2/search_sidebar.c:341
+#: ../src/gnome2/search_sidebar.c:344
 msgid "Use bounds"
 msgstr "Použít meze"
 
-#: ../src/gnome2/search_sidebar.c:350
+#: ../src/gnome2/search_sidebar.c:353
 msgid "Last search"
 msgstr "Poslední hledání"
 
-#: ../src/gnome2/search_sidebar.c:365
+#: ../src/gnome2/search_sidebar.c:368
 msgid "Bounds"
 msgstr "Meze"
 
-#: ../src/gnome2/search_sidebar.c:379
+#: ../src/gnome2/search_sidebar.c:382
 msgid "Lower"
 msgstr "Dolní"
 
-#: ../src/gnome2/search_sidebar.c:386
+#: ../src/gnome2/search_sidebar.c:389
 msgid "Upper"
 msgstr "Horní"
 
-#. 0
-#: ../src/gnome2/sidebar.c:963
-#: ../src/gnome2/sidebar.c:1131
-msgid "Open in a new tab"
-msgstr "Otevřít v novém panelu"
-
-#: ../src/gnome2/sidebar.c:964
-#: ../src/gnome2/sidebar.c:1132
-msgid "Open selected module in a new tab"
-msgstr "Otevřít vybraný modul v novém panelu"
-
-#. 1
-#: ../src/gnome2/sidebar.c:969
-msgid "Open in a separate window"
-msgstr "Otevřít v samostatném okně"
-
-#: ../src/gnome2/sidebar.c:970
-msgid "Open selected module in a separate ['dialog'] window"
-msgstr "Otevřít vybraný modul v samostatném dialogovém okně"
-
-#: ../src/gnome2/sidebar.c:976
-#: ../src/gnome2/sidebar.c:1144
-msgid "View information about the selected dialog"
-msgstr "Zobrazit informace o vybraném dialogovém okně"
-
-#: ../src/gnome2/sidebar.c:1067
-msgid "Simple"
-msgstr "Jednoduchý"
-
-#: ../src/gnome2/sidebar.c:1068
-msgid "Create a new simple prayer list"
-msgstr "Nový jednoduchý modlitební seznam"
-
-#: ../src/gnome2/sidebar.c:1074
-msgid "Subject"
-msgstr "Předmět"
-
-#: ../src/gnome2/sidebar.c:1081
-msgid "Monthly"
-msgstr "Měsíčně"
-
-#: ../src/gnome2/sidebar.c:1082
-#: ../src/gnome2/sidebar.c:1089
-#: ../src/gnome2/sidebar.c:1096
-msgid "Create a new prayer list"
-msgstr "Vytvořit nový modlitební seznam"
-
-#: ../src/gnome2/sidebar.c:1088
-msgid "Daily Journal"
-msgstr "Deník"
-
-#: ../src/gnome2/sidebar.c:1095
-msgid "Outlined Topic"
-msgstr "Navržené téma"
-
-#. 1
-#: ../src/gnome2/sidebar.c:1137
-#: ../ui/xi-menus.glade.h:47
-msgid "Open in editor"
-msgstr "Otevřít v editoru"
-
-#: ../src/gnome2/sidebar.c:1138
-msgid "Open selected module in a dialog"
-msgstr "Otevřít vybraný modul v dialogovém okně"
-
-#: ../src/gnome2/sidebar.c:1467
+#: ../src/gnome2/sidebar.c:1397
 msgid "Search"
 msgstr "Hledat"
 
-#: ../src/gnome2/sidebar.c:1475
+#: ../src/gnome2/sidebar.c:1405
 msgid "Verse List"
 msgstr "Verše"
 
-#: ../src/gnome2/sidebar_dialog.c:136
-#: ../src/gnome2/sidebar_dialog.c:145
+#: ../src/gnome2/sidebar_dialog.c:139 ../src/gnome2/sidebar_dialog.c:148
 msgid "Sidebar"
 msgstr "Postranní lišta"
 
-#: ../src/gnome2/splash.c:363
+#: ../src/gnome2/splash.c:396
 msgid "Powered by the SWORD Project"
 msgstr "Powered by the SWORD Project"
 
-#: ../src/gnome2/treekey-editor.c:130
-#: ../src/gnome2/treekey-editor.c:189
-#: ../src/gnome2/treekey-editor.c:275
+#: ../src/gnome2/treekey-editor.c:137 ../src/gnome2/treekey-editor.c:196
+#: ../src/gnome2/treekey-editor.c:282
 msgid "Prayer List/Journal Item"
-msgstr "Položka Modlitebního seznamu/Deníku"
+msgstr "Položka Modlitebního seznamu/Žurnálu"
 
-#: ../src/gnome2/treekey-editor.c:131
-#: ../src/gnome2/treekey-editor.c:190
-#: ../src/gnome2/treekey-editor.c:276
+#: ../src/gnome2/treekey-editor.c:138 ../src/gnome2/treekey-editor.c:197
+#: ../src/gnome2/treekey-editor.c:283
 msgid "New name"
 msgstr "Nové jméno"
 
-#: ../src/gnome2/treekey-editor.c:246
+#: ../src/gnome2/treekey-editor.c:253
 msgid "Remove the selected item"
 msgstr "Odstranit vybranou složku"
 
-#: ../src/gnome2/treekey-editor.c:304
-msgid "Add Child"
-msgstr "Přidat potomka"
-
-#: ../src/gnome2/treekey-editor.c:305
-#: ../src/gnome2/treekey-editor.c:311
-msgid "Add an item"
-msgstr "Přidat položku"
-
-#: ../src/gnome2/treekey-editor.c:310
-msgid "Add Sibling"
-msgstr "Přidat souseda"
-
-#: ../src/gnome2/treekey-editor.c:317
-msgid "Remove this item"
-msgstr "Odstranit tuto položku"
-
-#: ../src/gnome2/treekey-editor.c:323
-msgid "Edit this item"
-msgstr "Upravit tuto položku"
-
-#: ../src/main/display.cc:301
+#: ../src/main/display.cc:259
 #, c-format
 msgid ""
 "Improperly encoded personal annotation label:\n"
@@ -1354,7 +1359,7 @@ msgstr ""
 "Improperly encoded personal annotation label:\n"
 "'%s'"
 
-#: ../src/main/display.cc:427
+#: ../src/main/display.cc:386
 msgid ""
 "An image file's size could not be determined.\n"
 "Is ImageMagick's 'identify' not installed?\n"
@@ -1366,317 +1371,283 @@ msgstr ""
 "(Nebo možná typ obrázku je jiný než bmp/gif/jpg/png.)\n"
 "Xiphos není schopen přizpůsobit obrázek velikosti okna."
 
-#: ../src/main/display.cc:1084
-#: ../src/main/display.cc:1146
-#: ../src/main/display.cc:1234
-#: ../src/main/display.cc:1242
-#: ../ui/export-dialog.glade.h:7
+#: ../src/main/display.cc:1043 ../src/main/display.cc:1095
+#: ../src/main/display.cc:1172 ../ui/export-dialog.glade.h:7
 msgid "Chapter"
 msgstr "Kapitola"
 
-#: ../src/main/main.c:110
+#: ../src/main/main.c:119
 msgid "Xiphos does not understand more than one argument."
 msgstr "Xiphos nerozezná více než jeden argument."
 
-#: ../src/main/main.c:150
+#: ../src/main/main.c:161
 msgid "Initiating Gecko"
 msgstr "Inicializuji Gecko"
 
-#: ../src/main/main.c:156
+#: ../src/main/main.c:167
 msgid "Building Interface"
 msgstr "Vytvářím rozhraní"
 
-#: ../src/main/main.c:160
+#: ../src/main/main.c:171
 msgid "Starting Sword"
 msgstr "Spouštím Sword"
 
-#: ../src/main/main.c:164
+#: ../src/main/main.c:175
 msgid "Loading Settings"
 msgstr "Načítám nastavení"
 
-#: ../src/main/main.c:168
+#: ../src/main/main.c:179
 msgid "Displaying Xiphos"
 msgstr "Zobrazuji Xiphos"
 
-#: ../src/main/module_dialogs.cc:232
-#: ../src/main/previewer.cc:122
-#: ../ui/prefs.glade.h:75
+#: ../src/main/module_dialogs.cc:227 ../src/main/previewer.cc:127
+#: ../src/main/previewer.cc:194 ../ui/prefs.glade.h:75
 msgid "Previewer"
 msgstr "Náhled"
 
-#: ../src/main/module_dialogs.cc:298
-#: ../src/main/module_dialogs.cc:424
-#: ../src/main/previewer.cc:197
+#: ../src/main/module_dialogs.cc:292 ../src/main/module_dialogs.cc:416
+#: ../src/main/previewer.cc:269
 msgid "Footnote"
 msgstr "Vysvětlivka"
 
-#: ../src/main/module_dialogs.cc:304
-#: ../src/main/module_dialogs.cc:429
-#: ../src/main/previewer.cc:209
+#: ../src/main/module_dialogs.cc:298 ../src/main/module_dialogs.cc:421
+#: ../src/main/previewer.cc:281
 msgid "Cross Reference"
 msgstr "Odkaz"
 
-#: ../src/main/module_dialogs.cc:310
-#: ../src/main/module_dialogs.cc:324
-#: ../src/main/module_dialogs.cc:434
-#: ../src/main/module_dialogs.cc:446
-#: ../src/main/previewer.cc:215
-#: ../src/main/previewer.cc:234
+#: ../src/main/module_dialogs.cc:304 ../src/main/module_dialogs.cc:318
+#: ../src/main/module_dialogs.cc:426 ../src/main/module_dialogs.cc:438
+#: ../src/main/previewer.cc:287 ../src/main/previewer.cc:306
 msgid "Strongs"
 msgstr "Strongův"
 
-#: ../src/main/module_dialogs.cc:316
-#: ../src/main/module_dialogs.cc:335
-#: ../src/main/module_dialogs.cc:439
-#: ../src/main/module_dialogs.cc:456
-#: ../src/main/previewer.cc:221
-#: ../src/main/previewer.cc:247
+#: ../src/main/module_dialogs.cc:310 ../src/main/module_dialogs.cc:329
+#: ../src/main/module_dialogs.cc:431 ../src/main/module_dialogs.cc:448
+#: ../src/main/previewer.cc:293 ../src/main/previewer.cc:319
 msgid "Morphology"
 msgstr "Morfologie"
 
-#: ../src/main/module_dialogs.cc:1089
-#: ../src/main/url.cc:537
+#: ../src/main/module_dialogs.cc:1081 ../src/main/url.cc:530
 msgid "Back to "
-msgstr "Zpět k"
+msgstr "Zpět k "
 
-#: ../src/main/parallel_view.cc:398
-#: ../ui/xi-menus.glade.h:69
+#: ../src/main/parallel_view.cc:404 ../ui/xi-menus.glade.h:89
 msgid "Strong's Numbers"
 msgstr "Strongova čísla"
 
-#: ../src/main/parallel_view.cc:408
-#: ../ui/search-dialog.glade.h:50
-#: ../ui/xi-menus.glade.h:27
+#: ../src/main/parallel_view.cc:414 ../ui/search-dialog.glade.h:52
+#: ../ui/xi-menus.glade.h:40
 msgid "Footnotes"
 msgstr "Poznámky pod čarou"
 
-#: ../src/main/parallel_view.cc:418
-#: ../ui/search-dialog.glade.h:62
-#: ../ui/xi-menus.glade.h:41
+#: ../src/main/parallel_view.cc:424 ../ui/search-dialog.glade.h:64
+#: ../ui/xi-menus.glade.h:55
 msgid "Morphological Tags"
 msgstr "Morfologické značky"
 
-#: ../src/main/parallel_view.cc:428
-#: ../ui/xi-menus.glade.h:31
+#: ../src/main/parallel_view.cc:434 ../ui/xi-menus.glade.h:44
 msgid "Hebrew Vowel Points"
 msgstr "Punktuace hebrejských samohlásek"
 
-#: ../src/main/parallel_view.cc:438
-#: ../ui/xi-menus.glade.h:30
+#: ../src/main/parallel_view.cc:444 ../ui/xi-menus.glade.h:43
 msgid "Hebrew Cantillation"
 msgstr "Hebrejská vokalizace"
 
-#: ../src/main/parallel_view.cc:448
-#: ../ui/xi-menus.glade.h:28
+#: ../src/main/parallel_view.cc:454 ../ui/xi-menus.glade.h:41
 msgid "Greek Accents"
 msgstr "Řecké přízvuky"
 
-#: ../src/main/parallel_view.cc:458
+#: ../src/main/parallel_view.cc:464
 msgid "Cross-references"
 msgstr "Křížové odkazy"
 
-#: ../src/main/parallel_view.cc:468
-#: ../ui/xi-menus.glade.h:37
+#: ../src/main/parallel_view.cc:474 ../ui/xi-menus.glade.h:50
 msgid "Lemmas"
 msgstr "Lemmata"
 
-#: ../src/main/parallel_view.cc:478
-#: ../ui/xi-menus.glade.h:29
+#: ../src/main/parallel_view.cc:484 ../ui/xi-menus.glade.h:42
 msgid "Headings"
 msgstr "Nadpisy"
 
-#: ../src/main/parallel_view.cc:488
+#: ../src/main/parallel_view.cc:494
 msgid "Morpheme Segmentation"
 msgstr "Členění morfémů"
 
-#: ../src/main/parallel_view.cc:498
-#: ../ui/xi-menus.glade.h:75
+#: ../src/main/parallel_view.cc:504 ../ui/xi-menus.glade.h:96
 msgid "Words of Christ in Red"
 msgstr "Ježíšova slova v červené barvě"
 
-#: ../src/main/parallel_view.cc:508
-#: ../ui/xi-menus.glade.h:70
+#: ../src/main/parallel_view.cc:514 ../ui/xi-menus.glade.h:91
 msgid "Transliteration"
 msgstr "Přepis"
 
-#: ../src/main/parallel_view.cc:518
+#: ../src/main/parallel_view.cc:524
 msgid "Textual Variants"
 msgstr "Varianty textu"
 
-#: ../src/main/parallel_view.cc:526
-#: ../ui/xi-menus.glade.h:51
+#: ../src/main/parallel_view.cc:532 ../ui/xi-menus.glade.h:70
 msgid "Primary Reading"
 msgstr "Prvořadé čtení"
 
-#: ../src/main/parallel_view.cc:535
-#: ../ui/xi-menus.glade.h:65
+#: ../src/main/parallel_view.cc:541 ../ui/xi-menus.glade.h:84
 msgid "Secondary Reading"
 msgstr "Pomocné čtení"
 
-#: ../src/main/parallel_view.cc:544
-#: ../ui/xi-menus.glade.h:5
+#: ../src/main/parallel_view.cc:550 ../ui/xi-menus.glade.h:9
 msgid "All Readings"
 msgstr "Všechna čtení"
 
-#: ../src/main/parallel_view.cc:878
-#: ../src/main/parallel_view.cc:1130
+#: ../src/main/parallel_view.cc:884 ../src/main/parallel_view.cc:1136
 msgid "view context"
 msgstr "zobrazit souvislosti"
 
-#: ../src/main/prayerlists.cc:71
+#: ../src/main/prayerlists.cc:74
 msgid "January"
 msgstr "Leden"
 
-#: ../src/main/prayerlists.cc:72
+#: ../src/main/prayerlists.cc:75
 msgid "February"
 msgstr "Únor"
 
-#: ../src/main/prayerlists.cc:73
+#: ../src/main/prayerlists.cc:76
 msgid "March"
 msgstr "Březen"
 
-#: ../src/main/prayerlists.cc:74
+#: ../src/main/prayerlists.cc:77
 msgid "April"
 msgstr "Duben"
 
-#: ../src/main/prayerlists.cc:75
+#: ../src/main/prayerlists.cc:78
 msgid "May"
 msgstr "Květen"
 
-#: ../src/main/prayerlists.cc:76
+#: ../src/main/prayerlists.cc:79
 msgid "June"
 msgstr "Červen"
 
-#: ../src/main/prayerlists.cc:77
+#: ../src/main/prayerlists.cc:80
 msgid "July"
 msgstr "Červenec"
 
-#: ../src/main/prayerlists.cc:78
+#: ../src/main/prayerlists.cc:81
 msgid "August"
 msgstr "Srpen"
 
-#: ../src/main/prayerlists.cc:79
+#: ../src/main/prayerlists.cc:82
 msgid "September"
 msgstr "Září"
 
-#: ../src/main/prayerlists.cc:80
+#: ../src/main/prayerlists.cc:83
 msgid "October"
 msgstr "Říjen"
 
-#: ../src/main/prayerlists.cc:81
+#: ../src/main/prayerlists.cc:84
 msgid "November"
 msgstr "Listopad"
 
-#: ../src/main/prayerlists.cc:82
+#: ../src/main/prayerlists.cc:85
 msgid "December"
 msgstr "Prosinec"
 
-#: ../src/main/prayerlists.cc:121
-#: ../src/main/sword_treekey.cc:332
+#: ../src/main/prayerlists.cc:124 ../src/main/sword_treekey.cc:332
 msgid "Growth"
 msgstr "Růst"
 
-#: ../src/main/prayerlists.cc:122
-#: ../src/main/sword_treekey.cc:333
+#: ../src/main/prayerlists.cc:125 ../src/main/sword_treekey.cc:333
 msgid "<b>For Growth</b><br>"
 msgstr "<b>Za růst</b><br>"
 
-#: ../src/main/prayerlists.cc:123
-#: ../src/main/prayerlists.cc:380
+#: ../src/main/prayerlists.cc:126 ../src/main/prayerlists.cc:383
 #: ../src/main/sword_treekey.cc:334
 msgid "Salvation"
 msgstr "Spasení"
 
-#: ../src/main/prayerlists.cc:124
-#: ../src/main/sword_treekey.cc:335
+#: ../src/main/prayerlists.cc:127 ../src/main/sword_treekey.cc:335
 msgid "<b>For Salvation</b><br>"
 msgstr "<b>Za spasení</b><br>"
 
-#: ../src/main/prayerlists.cc:125
-#: ../src/main/prayerlists.cc:384
+#: ../src/main/prayerlists.cc:128 ../src/main/prayerlists.cc:387
 #: ../src/main/sword_treekey.cc:336
 msgid "Health"
 msgstr "Zdraví"
 
-#: ../src/main/prayerlists.cc:126
-#: ../src/main/sword_treekey.cc:337
+#: ../src/main/prayerlists.cc:129 ../src/main/sword_treekey.cc:337
 msgid "<b>For Health</b><br>"
 msgstr "<b>Za zdraví</b><br>"
 
-#: ../src/main/prayerlists.cc:127
+#: ../src/main/prayerlists.cc:130
 msgid "Misc"
 msgstr "Ostatní"
 
-#: ../src/main/prayerlists.cc:128
-#: ../src/main/sword_treekey.cc:339
+#: ../src/main/prayerlists.cc:131 ../src/main/sword_treekey.cc:339
 msgid "<b>Miscellaneous</b><br>"
 msgstr "<b>Různé</b><br>"
 
-#: ../src/main/prayerlists.cc:136
+#: ../src/main/prayerlists.cc:139
 msgid "Point x"
 msgstr "Bod x"
 
-#: ../src/main/prayerlists.cc:137
+#: ../src/main/prayerlists.cc:140
 msgid "<b>(x)</b><br>"
 msgstr "<b>(x)</b><br>"
 
-#: ../src/main/prayerlists.cc:138
+#: ../src/main/prayerlists.cc:141
 msgid "Point y"
 msgstr "Bod y"
 
-#: ../src/main/prayerlists.cc:139
+#: ../src/main/prayerlists.cc:142
 msgid "<b>(y)</b><br>"
 msgstr "<b>(y)</b><br>"
 
-#: ../src/main/prayerlists.cc:140
+#: ../src/main/prayerlists.cc:143
 msgid "Point z"
 msgstr "Bod z"
 
-#: ../src/main/prayerlists.cc:141
+#: ../src/main/prayerlists.cc:144
 msgid "<b>(z)</b><br>"
 msgstr "<b>(z)</b><br>"
 
-#: ../src/main/prayerlists.cc:149
+#: ../src/main/prayerlists.cc:152
 msgid "Minor Topic 1"
 msgstr "Vedlejší téma 1"
 
-#: ../src/main/prayerlists.cc:150
+#: ../src/main/prayerlists.cc:153
 msgid "<b>Subtopic 1</b><br>"
 msgstr "<b>Podtéma 1</b><br>"
 
-#: ../src/main/prayerlists.cc:152
+#: ../src/main/prayerlists.cc:155
 msgid "Minor Topic 2"
 msgstr "Vedlejší téma 2"
 
-#: ../src/main/prayerlists.cc:153
+#: ../src/main/prayerlists.cc:156
 msgid "<b>Subtopic 2</b><br>"
 msgstr "<b>Podtéma 2</b><br>"
 
-#: ../src/main/prayerlists.cc:155
+#: ../src/main/prayerlists.cc:158
 msgid "Minor Topic 3"
 msgstr "Vedlejší téma 3"
 
-#: ../src/main/prayerlists.cc:156
+#: ../src/main/prayerlists.cc:159
 msgid "<b>Subtopic 3</b><br>"
 msgstr "<b>Podtéma 3</b><br>"
 
-#: ../src/main/prayerlists.cc:158
+#: ../src/main/prayerlists.cc:161
 msgid "Minor Topic 4"
 msgstr "Vedlejší téma 4"
 
-#: ../src/main/prayerlists.cc:159
+#: ../src/main/prayerlists.cc:162
 msgid "<b>Subtopic 4</b><br>"
 msgstr "<b>Podtéma 4</b><br>"
 
-#: ../src/main/prayerlists.cc:239
+#: ../src/main/prayerlists.cc:242
 msgid "Name for new prayer list or journal"
-msgstr "Jméno pro nový modlitební seznam nebo deník"
+msgstr "Jméno pro nový modlitební seznam nebo žurnál"
 
-#: ../src/main/prayerlists.cc:270
+#: ../src/main/prayerlists.cc:273
 msgid "Xiphos finds that prayer list already."
 msgstr "Xiphos už takový modlitební seznam našel."
 
-#: ../src/main/prayerlists.cc:283
+#: ../src/main/prayerlists.cc:286
 #, c-format
 msgid ""
 "Xiphos cannot create module's path:\n"
@@ -1685,128 +1656,130 @@ msgstr ""
 "Xiphos nemůže vytvořit pro moduly cest:\n"
 "%s"
 
-#: ../src/main/prayerlists.cc:323
+#: ../src/main/prayerlists.cc:326
 msgid "A basic prayer list. \\par\\par Module created by Xiphos."
 msgstr "Základní modlitební seznam. \\par\\par Modul vytvořil Xiphos."
 
-#: ../src/main/prayerlists.cc:324
+#: ../src/main/prayerlists.cc:327
 msgid "BasicPrayerList"
 msgstr "ZakladniSeznam"
 
-#: ../src/main/prayerlists.cc:338
+#: ../src/main/prayerlists.cc:341
 msgid "MyPrayerList"
 msgstr "MujModlitebniSeznam"
 
-#: ../src/main/prayerlists.cc:339
-msgid "<b>People:</b><br>Bob<br>Sam<br>Sue<br><br><b>Church:</b><br>pews<br>fellowship<br>Bibles for missionaries<br><br><br>"
-msgstr "<b>Lidé:</b><br>Bob<br>Sam<br>Sue<br><br><b>Sbor:</b><br>lavice<br>společenství<br>Bible pro misionáře<br><br><br>"
+#: ../src/main/prayerlists.cc:342
+msgid ""
+"<b>People:</b><br>Bob<br>Sam<br>Sue<br><br><b>Church:</"
+"b><br>pews<br>fellowship<br>Bibles for missionaries<br><br><br>"
+msgstr ""
+"<b>Lidé:</b><br>Bob<br>Sam<br>Sue<br><br><b>Sbor:</"
+"b><br>lavice<br>společenství<br>Bible pro misionáře<br><br><br>"
 
-#: ../src/main/prayerlists.cc:365
+#: ../src/main/prayerlists.cc:368
 msgid "A subject-based prayer list. \\par\\par Module created by Xiphos."
-msgstr "Modlitební seznam s náměty. \\par\\par Modul vytvořil Xiphos."
+msgstr "Modlitební seznam s předměty. \\par\\par Modul vytvořil Xiphos."
 
-#: ../src/main/prayerlists.cc:366
+#: ../src/main/prayerlists.cc:369
 msgid "SubjectPrayerList"
 msgstr "PredmetovySeznam"
 
-#: ../src/main/prayerlists.cc:381
+#: ../src/main/prayerlists.cc:384
 msgid "Bob<br>Sam<br>Sue<br>John<br>"
 msgstr "Bob<br>Sam<br>Sue<br>John<br>"
 
-#: ../src/main/prayerlists.cc:382
+#: ../src/main/prayerlists.cc:385
 msgid "Spiritual Growth"
 msgstr "Duchovní růst"
 
-#: ../src/main/prayerlists.cc:383
+#: ../src/main/prayerlists.cc:386
 msgid "Mike<br>Steve<br>"
 msgstr "Mike<br>Steve<br>"
 
-#: ../src/main/prayerlists.cc:385
+#: ../src/main/prayerlists.cc:388
 msgid "Sue<br>John<br>"
 msgstr "Sue<br>John<br>"
 
-#: ../src/main/prayerlists.cc:411
+#: ../src/main/prayerlists.cc:414
 msgid "A monthly prayer list. \\par\\par Module created by Xiphos."
 msgstr "Měsíční modlitební seznam. \\par\\par Modul vytvořil Xiphos."
 
-#: ../src/main/prayerlists.cc:412
+#: ../src/main/prayerlists.cc:415
 msgid "MonthlyPrayerList"
 msgstr "MesicniSeznam"
 
-#: ../src/main/prayerlists.cc:463
+#: ../src/main/prayerlists.cc:466
 msgid "A daily journal. \\par\\par Module created by Xiphos."
 msgstr "Deník. \\par\\par Modul vytvořil Xiphos."
 
-#: ../src/main/prayerlists.cc:464
+#: ../src/main/prayerlists.cc:467
 msgid "DailyJournal"
 msgstr "Denik"
 
-#: ../src/main/prayerlists.cc:528
+#: ../src/main/prayerlists.cc:531
 msgid "An outlined topic (e.g. sermon). \\par\\par Module created by Xiphos."
 msgstr "Navržené (např. kázání). \\par\\par Modul vytvořil Xiphos."
 
-#: ../src/main/prayerlists.cc:529
+#: ../src/main/prayerlists.cc:532
 msgid "OutlinedTopic"
 msgstr "NastineneTema"
 
-#: ../src/main/prayerlists.cc:543
+#: ../src/main/prayerlists.cc:546
 msgid "Major Topic A"
 msgstr "Hlavní téma A"
 
-#: ../src/main/prayerlists.cc:544
+#: ../src/main/prayerlists.cc:547
 msgid "<b>Major Topic A</b><br>"
 msgstr "<b>Hlavní téma A</b><br>"
 
-#: ../src/main/prayerlists.cc:546
+#: ../src/main/prayerlists.cc:549
 msgid "Major Topic B"
 msgstr "Hlavní téma B"
 
-#: ../src/main/prayerlists.cc:547
+#: ../src/main/prayerlists.cc:550
 msgid "<b>Major Topic B</b><br>"
 msgstr "<b>Hlavní téma B</b><br>"
 
-#: ../src/main/prayerlists.cc:549
+#: ../src/main/prayerlists.cc:552
 msgid "Major Topic C"
 msgstr "Hlavní téma C"
 
-#: ../src/main/prayerlists.cc:550
+#: ../src/main/prayerlists.cc:553
 msgid "<b>Major Topic C</b><br>"
 msgstr "<b>Hlavní téma C</b><br>"
 
-#: ../src/main/previewer.cc:203
+#: ../src/main/previewer.cc:275
 msgid "User Annotation"
 msgstr "Komentáře uživatele"
 
-#: ../src/main/search_dialog.cc:129
+#: ../src/main/search_dialog.cc:212
 #, c-format
 msgid "Search result %s: %s"
 msgstr "Výsledky hledání %s: %s"
 
-#: ../src/main/search_dialog.cc:361
+#: ../src/main/search_dialog.cc:444
 msgid "Delete Range?"
 msgstr "Smazat rozsah?"
 
-#: ../src/main/search_dialog.cc:362
+#: ../src/main/search_dialog.cc:445
 msgid "Are you sure you want to delete this range?"
 msgstr "Jste si jist, že chcete odstranit tento rozsah?"
 
-#: ../src/main/search_dialog.cc:576
-#: ../src/main/search_dialog.cc:1047
-#: ../src/main/search_dialog.cc:1050
-#: ../src/main/search_dialog.cc:1072
-#: ../src/main/search_dialog.cc:1075
+#: ../src/main/search_dialog.cc:659 ../src/main/search_dialog.cc:1130
+#: ../src/main/search_dialog.cc:1133 ../src/main/search_dialog.cc:1155
+#: ../src/main/search_dialog.cc:1158
 msgid "Search: "
-msgstr "Hledat:"
+msgstr "Hledat: "
 
-#: ../src/main/search_dialog.cc:621
+#: ../src/main/search_dialog.cc:704
 msgid "Remove Module?"
 msgstr "Smazat modul?"
 
-#: ../src/main/search_dialog.cc:622
+#: ../src/main/search_dialog.cc:705
 msgid "Are you sure you want to remove the selected module?"
 msgstr "Jste si jist, že chcete smazat vybraný modul?"
 
-#: ../src/main/search_dialog.cc:1471
+#: ../src/main/search_dialog.cc:1560
 #, c-format
 msgid ""
 "%s:\n"
@@ -1817,16 +1790,16 @@ msgstr ""
 "Takový modul není k dispozici.\n"
 "%s"
 
-#: ../src/main/search_dialog.cc:1473
+#: ../src/main/search_dialog.cc:1562
 msgid "Please adjust the module list."
 msgstr "Prosím nastavte seznam modulů."
 
-#: ../src/main/search_dialog.cc:1489
+#: ../src/main/search_dialog.cc:1578
 #, c-format
 msgid "No fast-search index exists for %s.%s%s"
 msgstr "Rejstříky pro rychlé vyhledávání neexistují u %s. %s%s"
 
-#: ../src/main/search_dialog.cc:1491
+#: ../src/main/search_dialog.cc:1580
 msgid ""
 "\n"
 "Search on this module is now `multi word'."
@@ -1834,7 +1807,7 @@ msgstr ""
 "\n"
 "Hledání v modulu je nyní víceslovné."
 
-#: ../src/main/search_dialog.cc:1492
+#: ../src/main/search_dialog.cc:1581
 msgid ""
 "\n"
 "See the Module Manager, Maintenance pane."
@@ -1842,21 +1815,23 @@ msgstr ""
 "\n"
 "Viz Správce modulů, panel Udržování"
 
-#: ../src/main/search_dialog.cc:1553
+#: ../src/main/search_dialog.cc:1644
 msgid "Search finished"
 msgstr "Hledání dokončeno"
 
-#: ../src/main/search_sidebar.cc:93
+#: ../src/main/search_sidebar.cc:100
 msgid "matches"
 msgstr "výsledky(ů)"
 
-#: ../src/main/settings.c:56
+#: ../src/main/settings.c:60
 msgid ""
 "Welcome to Xiphos.\n"
 "\n"
-"There are no Bible modules installed. In order to initialize, Xiphos needs you to install at least one Bible.\n"
+"There are no Bible modules installed. In order to initialize, Xiphos needs "
+"you to install at least one Bible.\n"
 "\n"
-"With your permission, Xiphos will invoke the Module Manager so that you may install from Crosswire:\n"
+"With your permission, Xiphos will invoke the Module Manager so that you may "
+"install from Crosswire:\n"
 "1. Configure remote install.\n"
 "2. Connect.\n"
 "3. Select a Bible text of your language preference.\n"
@@ -1869,9 +1844,11 @@ msgid ""
 msgstr ""
 "Vítá vás Xiphos.\n"
 "\n"
-"Nemáte nainstalovaný žádný modul s Biblickými texty. Xiphos potřebuje pro správnou funkčnost alespoň jeden takový modul.\n"
+"Nemáte nainstalovaný žádný modul s Biblickými texty. Xiphos potřebuje pro "
+"správnou funkčnost alespoň jeden takový modul.\n"
 "\n"
-"S vaším svolením, Xiphos spustí Správce modulů, aby bylo možno instalovat Crosswire moduly:\n"
+"S vaším svolením, Xiphos spustí Správce modulů, aby bylo možno instalovat "
+"Crosswire moduly:\n"
 "1. Nastavení vzdálené instalace.\n"
 "2. Obnovit.\n"
 "3. Vyberte si Bibli v požadovaném jazyce.\n"
@@ -1882,28 +1859,11 @@ msgstr ""
 "\n"
 "Smí Xiphos spustit Správce modulů, aby jste mohl přidat Bible?"
 
-#: ../src/main/settings.c:109
+#: ../src/main/settings.c:105
 msgid "$HOME is not set!"
 msgstr "$HOME není nastaveno!"
 
-#: ../src/main/settings.c:124
-msgid "Xiphos has renamed .xiphos-2.0 to .xiphos"
-msgstr "Xiphos přejmenoval .xiphos-2.0 na .xiphos"
-
-#: ../src/main/settings.c:127
-#, c-format
-msgid ""
-"Xiphos can not rename  .xiphos-2.0 to .xiphos:\n"
-"%s\n"
-"\n"
-"Xiphos cannot continue."
-msgstr ""
-"Xiphos nemůže přejmenovat  .xiphos-2.0 na .xiphos:\n"
-"%s\n"
-"\n"
-"Xiphos nemůže pokračovat."
-
-#: ../src/main/settings.c:135
+#: ../src/main/settings.c:120
 #, c-format
 msgid ""
 "Xiphos can not create  .xiphos:\n"
@@ -1916,13 +1876,12 @@ msgstr ""
 "\n"
 "Xiphos nemůže pokračovat."
 
-#: ../src/main/settings.c:148
-#: ../src/main/settings.c:156
-#: ../src/main/settings.c:164
+#: ../src/main/settings.c:133 ../src/main/settings.c:142
+#: ../src/main/settings.c:151
 msgid "can not create "
 msgstr "nemohu vytvořit "
 
-#: ../src/main/settings.c:196
+#: ../src/main/settings.c:194
 msgid ""
 "There are still no Bibles installed.\n"
 "Evidently, you declined to install any.\n"
@@ -1938,11 +1897,11 @@ msgstr ""
 "Xiphos nemůže pokračovat\n"
 "ve své činnosti a proto se ukončí."
 
-#: ../src/main/settings.c:200
+#: ../src/main/settings.c:198
 msgid "Bible module installation complete."
 msgstr "Přidávání modulů s Biblemi je hotové."
 
-#: ../src/main/settings.c:203
+#: ../src/main/settings.c:201
 msgid ""
 "Without any Bible modules to display,\n"
 "Xiphos cannot proceed,\n"
@@ -1952,75 +1911,15 @@ msgstr ""
 "Xiphos nemůže pokračovat\n"
 "ve své činnosti a proto se ukončí."
 
-#. *****************************************************************************
-#. * Name
-#. *    gconf_setup
-#. *
-#. * Synopsis
-#. *   #include "main/settings.h"
-#. *
-#. *   void gconf_setup()
-#. *
-#. * Description
-#. *   verifies and initializes the GConf subsystem, so that "sword://" and
-#. *   similar can be handled by url-comprehending programs such as browsers.
-#. *   dialogs for permission/success/failure => conditional on debug build.
-#. *
-#. * Return value
-#. *   void
-#.
-#: ../src/main/settings.c:794
-msgid ""
-"URL references using \"sword://\" (similar to web page\n"
-"references) can be used by programs to look up\n"
-"scripture references. Your system currently has no\n"
-"program set to handle these references.\n"
-"\n"
-"Would you like Xiphos to set itself as the\n"
-"program to handle these references?"
-msgstr ""
-"URL odkazy, používající \"sword://\" (podobné odkazům\n"
-"u www stránek), mohou aplikace využít pro hledání odkazů\n"
-"v Bibli. Ve Vašem systému není v současné době\n"
-"program, který by se staral o.\n"
-"\n"
-"Přejete si, aby aplikace Xiphos nastavila sebe pro\n"
-"obsluhu těchto odkazů?"
-
-#: ../src/main/settings.c:796
-msgid ""
-"Xiphos has successfully set itself\n"
-"as the handler of sword:// and bible:// URLs.\n"
-"\n"
-"You may wish to run the program \"gconf-editor\"\n"
-"to examine keys under /desktop/gnome/url-handlers,\n"
-"if you need to change these."
-msgstr ""
-"Xiphos úspěšně nastavil sebe\n"
-"pro obsluhu URL sword:// a bible://.\n"
-"\n"
-"Možná budete potřeba spustit program \"gconf-editor\"\n"
-"pro prohlížení klíčů v /desktop/gnome/url-handlers,\n"
-"pokud je potřeba klíče změnit."
-
-#: ../src/main/settings.c:849
-#, c-format
-msgid ""
-"Xiphos failed to complete handler init for key #%d:\n"
-"%s"
-msgstr ""
-"Xiphos selhal při nastavení obsluhy pro klíč #%d:\n"
-"%s"
-
-#: ../src/main/sidebar.cc:376
+#: ../src/main/sidebar.cc:399
 msgid "verse"
 msgstr "verš"
 
-#: ../src/main/sidebar.cc:438
+#: ../src/main/sidebar.cc:461
 msgid "chapter"
 msgstr "kapitola"
 
-#: ../src/main/sword.cc:546
+#: ../src/main/sword.cc:537
 msgid ""
 "Xiphos's file for language\n"
 "abbreviations is missing."
@@ -2028,7 +1927,7 @@ msgstr ""
 "Schází soubor se zkratkami\n"
 "jazyků pro Xiphos."
 
-#: ../src/main/sword.cc:553
+#: ../src/main/sword.cc:544
 msgid ""
 "Xiphos's language abbreviation\n"
 "file cannot be opened."
@@ -2036,7 +1935,7 @@ msgstr ""
 "Nelze otevřít soubor se zkratkami\n"
 "jazyků pro Xiphos."
 
-#: ../src/main/sword.cc:566
+#: ../src/main/sword.cc:557
 msgid ""
 "Xiphos cannot allocate space\n"
 "for language abbreviations."
@@ -2044,7 +1943,7 @@ msgstr ""
 "Aplikace Xiphos nemůže přidělit\n"
 "místo pro zkratky jazyků."
 
-#: ../src/main/sword.cc:573
+#: ../src/main/sword.cc:564
 msgid ""
 "Xiphos cannot read the\n"
 "language abbreviation file."
@@ -2052,42 +1951,41 @@ msgstr ""
 "Aplikace Xiphos nemůže přečíst\n"
 "soubor se zkratkami jazyků."
 
-#: ../src/main/sword.cc:1191
-msgid "Daily devotional was requested, but there are none installed."
-msgstr "Čtení na každý den bylo požadováno, ale žádné není nainstalované."
+#: ../src/main/sword.cc:642
+msgid "No matching locale found for"
+msgstr "Nenalezeny potřebné soubory pro jazyk"
 
-#: ../src/main/tab_history.c:92
-msgid "H_istory/<Separator>"
-msgstr "H_istorie/<Separator>"
+#: ../src/main/sword.cc:644
+msgid "Book names and menus may not be translated"
+msgstr "Je možné, že jména knih a nabídky nebudou přeloženy."
 
-#: ../src/main/tab_history.c:94
-msgid "H_istory/C_lear"
-msgstr "H_istorie/V_yčistit"
+#: ../src/main/sword.cc:1232
+msgid "Daily devotional was requested, but there are none installed."
+msgstr "Čtení na každý den bylo požadováno, ale žádné není nainstalované."
 
 #: ../src/main/tab_history.c:219
 msgid "Clear History"
 msgstr "Vymazat historii"
 
-#: ../src/main/url.cc:99
+#: ../src/main/url.cc:101
 msgid "URL not found:"
 msgstr "URL nenalezeno:"
 
-#: ../src/main/url.cc:194
+#: ../src/main/url.cc:191
 #, c-format
 msgid "Xiphos could not execute %s"
 msgstr "Xiphos nemůže spustit %s"
 
-#: ../src/main/url.cc:202
+#: ../src/main/url.cc:199
 msgid "Viewer error:\n"
 msgstr "Chyba prohlížeče:\n"
 
-#: ../src/main/url.cc:278
+#: ../src/main/url.cc:272
 #, c-format
 msgid "Show %s in main window"
 msgstr "Zobrazit %s hlavním okně"
 
-#: ../src/main/xml.c:80
-#: ../src/main/xml.c:464
+#: ../src/main/xml.c:80 ../src/main/xml.c:464
 #, c-format
 msgid "Document not created successfully. \n"
 msgstr "Dokument nebyl správně vytvořen. \n"
@@ -2100,18 +1998,15 @@ msgstr "Osobní"
 msgid "What must I do to be saved?"
 msgstr "Co musím udělat, abych byl zachráněn?"
 
-#: ../src/main/xml.c:92
-#: ../src/main/xml.c:93
+#: ../src/main/xml.c:92 ../src/main/xml.c:93
 msgid "Acts 16:31"
 msgstr "Skutky 16:31"
 
-#: ../src/main/xml.c:97
-#: ../src/main/xml.c:98
+#: ../src/main/xml.c:97 ../src/main/xml.c:98
 msgid "Eph 2:8,9"
 msgstr "Ef 2:8,9"
 
-#: ../src/main/xml.c:102
-#: ../src/main/xml.c:103
+#: ../src/main/xml.c:102 ../src/main/xml.c:103
 msgid "Romans 1:16"
 msgstr "Římanům 1:16"
 
@@ -2119,21 +2014,17 @@ msgstr "Římanům 1:16"
 msgid "What is the Gospel?"
 msgstr "Co je to evangelium?"
 
-#: ../src/main/xml.c:108
-#: ../src/main/xml.c:109
+#: ../src/main/xml.c:108 ../src/main/xml.c:109
 msgid "1 Cor 15:1-4"
 msgstr "1. Korintským 15:1-4"
 
-#: ../src/main/xml.c:413
-#: ../src/main/xml.c:1071
+#: ../src/main/xml.c:413 ../src/main/xml.c:1144
 #, c-format
 msgid "Document not parsed successfully. \n"
 msgstr "Dokument nebyl správně rozparsován. \n"
 
-#: ../src/main/xml.c:419
-#: ../src/main/xml.c:674
-#: ../src/main/xml.c:952
-#: ../src/main/xml.c:1131
+#: ../src/main/xml.c:419 ../src/main/xml.c:747 ../src/main/xml.c:1025
+#: ../src/main/xml.c:1204
 #, c-format
 msgid "empty document \n"
 msgstr "prázdný dokument \n"
@@ -2163,8 +2054,7 @@ msgstr "Mt - Zj"
 msgid "Sample Module List"
 msgstr "Příklad seznamu modulů"
 
-#: ../src/main/xml.c:680
-#: ../src/main/xml.c:958
+#: ../src/main/xml.c:753 ../src/main/xml.c:1031
 #, c-format
 msgid "wrong type, root node != %s\n"
 msgstr "chybný typ, root node != %s\n"
@@ -2173,8 +2063,7 @@ msgstr "chybný typ, root node != %s\n"
 msgid "Add Bookmark"
 msgstr "Přidat záložku"
 
-#: ../ui/bookmarks.glade.h:2
-#: ../ui/markverse.glade.h:1
+#: ../ui/bookmarks.glade.h:2 ../ui/markverse.glade.h:1
 msgid "Bookmark Dialog"
 msgstr "Okno se záložkami"
 
@@ -2182,13 +2071,11 @@ msgstr "Okno se záložkami"
 msgid "Bookmark Folder Treeview"
 msgstr "Stromový pohled Složku záložek"
 
-#: ../ui/bookmarks.glade.h:4
-#: ../ui/markverse.glade.h:2
+#: ../ui/bookmarks.glade.h:4 ../ui/markverse.glade.h:2
 msgid "Cancel Bookmark"
 msgstr "Zrušit záložku"
 
-#: ../ui/bookmarks.glade.h:5
-#: ../ui/markverse.glade.h:3
+#: ../ui/bookmarks.glade.h:5 ../ui/markverse.glade.h:3
 msgid "Create new folder"
 msgstr "Vytvořit novou složku"
 
@@ -2200,13 +2087,11 @@ msgstr "Položka Popisek"
 msgid "Label:"
 msgstr "Popisek:"
 
-#: ../ui/bookmarks.glade.h:8
-#: ../ui/markverse.glade.h:6
+#: ../ui/bookmarks.glade.h:8 ../ui/markverse.glade.h:6
 msgid "Module Entry"
 msgstr "Položka Modul"
 
-#: ../ui/bookmarks.glade.h:9
-#: ../ui/markverse.glade.h:7
+#: ../ui/bookmarks.glade.h:9 ../ui/markverse.glade.h:7
 msgid "Module:"
 msgstr "Modul:"
 
@@ -2214,19 +2099,16 @@ msgstr "Modul:"
 msgid "New ..."
 msgstr "Nová ..."
 
-#: ../ui/bookmarks.glade.h:11
-#: ../ui/markverse.glade.h:8
-#: ../ui/xi-menus.glade.h:42
+#: ../ui/bookmarks.glade.h:11 ../ui/markverse.glade.h:8
+#: ../ui/xi-menus.glade.h:56
 msgid "New Folder"
 msgstr "Nová složka"
 
-#: ../ui/bookmarks.glade.h:12
-#: ../ui/markverse.glade.h:10
+#: ../ui/bookmarks.glade.h:12 ../ui/markverse.glade.h:10
 msgid "Verse Entry"
 msgstr "Položka Verš"
 
-#: ../ui/bookmarks.glade.h:13
-#: ../ui/markverse.glade.h:11
+#: ../ui/bookmarks.glade.h:13 ../ui/markverse.glade.h:11
 msgid "Verse:"
 msgstr "Verš:"
 
@@ -2234,38 +2116,32 @@ msgstr "Verš:"
 msgid "Delete the current note"
 msgstr "Odstranit aktuálni poznámku"
 
-#: ../ui/editor_note.xml.h:2
-#: ../ui/editor_studypad.xml.h:4
+#: ../ui/editor_note.xml.h:2 ../ui/editor_studypad.xml.h:4
 #: ../ui/editor.xml.h:2
 msgid "E_xit"
 msgstr "U_končit"
 
-#: ../ui/editor_note.xml.h:3
-#: ../ui/editor_studypad.xml.h:5
+#: ../ui/editor_note.xml.h:3 ../ui/editor_studypad.xml.h:5
 #: ../ui/editor.xml.h:3
 msgid "Exit"
 msgstr "Ukončit"
 
-#: ../ui/editor_note.xml.h:4
-#: ../ui/editor_studypad.xml.h:6
+#: ../ui/editor_note.xml.h:4 ../ui/editor_studypad.xml.h:6
 #: ../ui/editor.xml.h:4
 msgid "Exit the program"
 msgstr "Ukončit program"
 
-#: ../ui/editor_note.xml.h:5
-#: ../ui/editor_studypad.xml.h:7
+#: ../ui/editor_note.xml.h:5 ../ui/editor_studypad.xml.h:7
 #: ../ui/editor.xml.h:5
 msgid "For_mat"
 msgstr "_Formát"
 
-#: ../ui/editor_note.xml.h:6
-#: ../ui/editor_studypad.xml.h:8
+#: ../ui/editor_note.xml.h:6 ../ui/editor_studypad.xml.h:8
 #: ../ui/editor.xml.h:6
 msgid "HTML Format switch"
 msgstr "HTML formát přepínače"
 
-#: ../ui/editor_note.xml.h:7
-#: ../ui/editor_studypad.xml.h:9
+#: ../ui/editor_note.xml.h:7 ../ui/editor_studypad.xml.h:9
 #: ../ui/editor.xml.h:7
 msgid "HTML mode"
 msgstr "HTML režim"
@@ -2294,18 +2170,15 @@ msgstr "_Uložit (Osobní komentář)"
 msgid "Add this file to your bookmarks"
 msgstr "Přidat soubor mezi záložky"
 
-#: ../ui/editor_studypad.xml.h:3
-#: ../ui/editor.xml.h:1
+#: ../ui/editor_studypad.xml.h:3 ../ui/editor.xml.h:1
 msgid "Create a new document"
 msgstr "Vytvořit nový dokument"
 
-#: ../ui/editor_studypad.xml.h:10
-#: ../ui/editor.xml.h:8
+#: ../ui/editor_studypad.xml.h:10 ../ui/editor.xml.h:8
 msgid "New Document"
 msgstr "Nový dokument"
 
-#: ../ui/editor_studypad.xml.h:11
-#: ../ui/editor.xml.h:9
+#: ../ui/editor_studypad.xml.h:11 ../ui/editor.xml.h:9
 msgid "Open"
 msgstr "Otevřít"
 
@@ -2325,8 +2198,7 @@ msgstr "Tiskt dokumentu"
 msgid "Save AS"
 msgstr "Uložit jako..."
 
-#: ../ui/editor_studypad.xml.h:18
-#: ../ui/editor.xml.h:12
+#: ../ui/editor_studypad.xml.h:18 ../ui/editor.xml.h:12
 msgid "Save the current file"
 msgstr "Uložit aktuální soubor"
 
@@ -2354,8 +2226,7 @@ msgstr "<b>Export</b>"
 msgid "<b>Format</b>"
 msgstr "<b>Formát</b>"
 
-#: ../ui/export-dialog.glade.h:5
-#: ../ui/prefs.glade.h:25
+#: ../ui/export-dialog.glade.h:5 ../ui/prefs.glade.h:25
 msgid "Book"
 msgstr "Kniha"
 
@@ -2367,8 +2238,7 @@ msgstr "Výběrové pole Kniha"
 msgid "Chapter Radio Button"
 msgstr "Výběrové pole Kapitola"
 
-#: ../ui/export-dialog.glade.h:9
-#: ../ui/xi-menus.glade.h:14
+#: ../ui/export-dialog.glade.h:9 ../ui/xi-menus.glade.h:18
 msgid "Copy/Export Passage"
 msgstr "Kopírovat/Exportovat pasáž"
 
@@ -2472,8 +2342,12 @@ msgstr ""
 "používejte obezřetně."
 
 #: ../ui/module-manager.glade.h:8
-msgid "<b>Warning:</b> If you live in a persecuted country and do not wish to risk detection you should NOT use  the remote installation feature! "
-msgstr "<b>Varování:</b> Pokud nežijete ve svobodné zemi a nepřejete si riskovat odhalení, NEMĚLI byste používat instalaci modulů přes Internet! "
+msgid ""
+"<b>Warning:</b> If you live in a persecuted country and do not wish to risk "
+"detection you should NOT use  the remote installation feature! "
+msgstr ""
+"<b>Varování:</b> Pokud nežijete ve svobodné zemi a nepřejete si riskovat "
+"odhalení, NEMĚLI byste používat instalaci modulů přes Internet! "
 
 #: ../ui/module-manager.glade.h:9
 msgid "<i>Personal area, for your use only:</i>"
@@ -2483,43 +2357,47 @@ msgstr "<i>Osobní oblast, jen pro Vás:</i>"
 msgid "<i>System area, for all users:</i>"
 msgstr "<i>Systémová oblast, pro všechny uživatele:</i>"
 
-#: ../ui/module-manager.glade.h:11
+#: ../ui/module-manager.glade.h:12
 msgid "Continue"
 msgstr "Pokračovat"
 
-#: ../ui/module-manager.glade.h:12
+#: ../ui/module-manager.glade.h:13
 msgid "Current Remote Sources"
 msgstr "Současné vzdálené zdroje"
 
-#: ../ui/module-manager.glade.h:13
+#: ../ui/module-manager.glade.h:14
 msgid "Current local sources"
 msgstr "Současné lokální zdroje"
 
-#: ../ui/module-manager.glade.h:14
+#: ../ui/module-manager.glade.h:15
+msgid "Delete Index"
+msgstr "Odstranit rejstřík"
+
+#: ../ui/module-manager.glade.h:16
 msgid "Home dir"
 msgstr "Domovský adresář"
 
-#: ../ui/module-manager.glade.h:16
+#: ../ui/module-manager.glade.h:19
 msgid "Load Standard"
 msgstr "Načíst standardní"
 
-#: ../ui/module-manager.glade.h:17
+#: ../ui/module-manager.glade.h:20
 msgid "Local"
 msgstr "Místní"
 
-#: ../ui/module-manager.glade.h:18
+#: ../ui/module-manager.glade.h:21
 msgid "Local Install Folder"
 msgstr "Adresář lokální instalace"
 
-#: ../ui/module-manager.glade.h:19
+#: ../ui/module-manager.glade.h:22
 msgid "Module Manager"
 msgstr "Správce modulů"
 
-#: ../ui/module-manager.glade.h:20
+#: ../ui/module-manager.glade.h:23
 msgid "Remote"
 msgstr "Vzdálený"
 
-#: ../ui/module-manager.glade.h:21
+#: ../ui/module-manager.glade.h:24
 msgid "Sword sys dir"
 msgstr "Systémový adresář pro Sword"
 
@@ -2616,8 +2494,12 @@ msgid "Apply high-contrast highlight to current verse"
 msgstr "Použít zvýšený kontrast pro zvýraznění aktuálního verše"
 
 #: ../ui/prefs.glade.h:19
-msgid "Automatically resize commentary, book, and dictionary image content to fit subwindow"
-msgstr "Automaticky přizpůsobit velikost podoken u komentářů, knih a slovníků pro vyplnění hlavního okna."
+msgid ""
+"Automatically resize commentary, book, and dictionary image content to fit "
+"subwindow"
+msgstr ""
+"Automaticky přizpůsobit velikost podoken u komentářů, knih a slovníků pro "
+"vyplnění hlavního okna."
 
 #: ../ui/prefs.glade.h:20
 msgid "Background"
@@ -2665,7 +2547,7 @@ msgstr "Roletové menu Změnit osobní poznámky"
 
 #: ../ui/prefs.glade.h:32
 msgid "Choose to enable Prayer lists "
-msgstr "Zaškrtnout pro zapnutí Modlitební seznamy"
+msgstr "Zaškrtnout pro zapnutí Modlitební seznamy "
 
 #: ../ui/prefs.glade.h:34
 msgid "Commentaries Checkbox"
@@ -2856,38 +2738,52 @@ msgid "Show splash screen at start up"
 msgstr "Zobrazit úvodní obrazovku při spouštění"
 
 #: ../ui/prefs.glade.h:84
+msgid "Special Locale (requires restart)"
+msgstr "Jazyk (vyžadován restart)"
+
+#: ../ui/prefs.glade.h:85
+msgid "Special Locale Combo"
+msgstr ""
+
+#: ../ui/prefs.glade.h:86
 msgid "StudyPad default directory combo"
 msgstr "Roletové menu Výchozí adresář pro Poznámkový blok"
 
-#: ../ui/prefs.glade.h:86
+#: ../ui/prefs.glade.h:88
 msgid "Use Bible Text scroll bar to scroll to previous or next chapter"
-msgstr "Použít rolovací lištu u Biblické texty pro posun na předchozí nebo další kapitolu."
+msgstr ""
+"Použít rolovací lištu u Biblické texty pro posun na předchozí nebo další "
+"kapitolu."
 
-#: ../ui/prefs.glade.h:87
+#: ../ui/prefs.glade.h:89
 msgid "Use Verse Per Line"
 msgstr "Zobrazovat každý verš na samostatný řádek"
 
-#: ../ui/prefs.glade.h:88
+#: ../ui/prefs.glade.h:90
 msgid "Use Verse Per Line Checkbox"
 msgstr "Zaškrtávací pole Použít jeden verš na řádek"
 
-#: ../ui/prefs.glade.h:89
+#: ../ui/prefs.glade.h:91
 msgid "Use default Dictionary"
 msgstr "Použít výchozí slovník"
 
-#: ../ui/prefs.glade.h:90
+#: ../ui/prefs.glade.h:92
 msgid "Use default Dictionary Checkbox"
 msgstr "Zaškrtávací pole Použít výchozí slovník"
 
-#: ../ui/prefs.glade.h:91
+#: ../ui/prefs.glade.h:93
 msgid "Use tabbed browsing"
 msgstr "Použít panelové prohlížení"
 
-#: ../ui/prefs.glade.h:92
+#: ../ui/prefs.glade.h:94
 msgid "Use tabbed browsing Checkbox"
 msgstr "Zaškrtávací pole Použít panelové prohlížení"
 
-#: ../ui/prefs.glade.h:93
+#: ../ui/prefs.glade.h:95
+msgid "Verse Number"
+msgstr "Číslo verše"
+
+#: ../ui/prefs.glade.h:96
 msgid "Verse number size"
 msgstr "Velikost čísla u verše"
 
@@ -3068,6 +2964,14 @@ msgid "Exact phrase radiobutton"
 msgstr "Výběrové pole Přesný výraz"
 
 #: ../ui/search-dialog.glade.h:46
+msgid "Export"
+msgstr "Export"
+
+#: ../ui/search-dialog.glade.h:47
+msgid "Export current search results"
+msgstr "Exportovat aktuální výsledky hledání"
+
+#: ../ui/search-dialog.glade.h:48
 msgid ""
 "Fast, featureful, index-based search\n"
 "Indexes must have been built beforehand:\n"
@@ -3077,227 +2981,227 @@ msgstr ""
 "Rejstříky musí být ale vytvořené předem:\n"
 "Viz funkce ve Správci modulů pro udržování"
 
-#: ../ui/search-dialog.glade.h:49
+#: ../ui/search-dialog.glade.h:51
 msgid "Find Button"
 msgstr "Tlačítko Najít"
 
-#: ../ui/search-dialog.glade.h:51
+#: ../ui/search-dialog.glade.h:53
 msgid "Footnotes radiobutton"
 msgstr "Výběrové pole Poznámky pod čarou"
 
-#: ../ui/search-dialog.glade.h:52
+#: ../ui/search-dialog.glade.h:54
 msgid "In modules that have Footnotes"
 msgstr "V modulech, co obsahují poznámky pod čarou"
 
-#: ../ui/search-dialog.glade.h:53
+#: ../ui/search-dialog.glade.h:55
 msgid "In modules that have Morphological Tags"
 msgstr "V modulech, co obsahují morfologické značky"
 
-#: ../ui/search-dialog.glade.h:54
+#: ../ui/search-dialog.glade.h:56
 msgid "In modules that have Strong's Numbers"
 msgstr "V modulech, co obsahují Strongova čísla"
 
-#: ../ui/search-dialog.glade.h:55
+#: ../ui/search-dialog.glade.h:57
 msgid "Main Search Entry"
 msgstr "Položka Hlavní hledání"
 
-#: ../ui/search-dialog.glade.h:56
+#: ../ui/search-dialog.glade.h:58
 msgid "Make selections on the Attribute Search tab"
 msgstr "Vytvořit výběry nad vlastnostmi panelu Hledat"
 
-#: ../ui/search-dialog.glade.h:58
+#: ../ui/search-dialog.glade.h:60
 msgid "Match case checkbox"
 msgstr "Zaškrtávací pole Velikost písmen"
 
-#: ../ui/search-dialog.glade.h:59
+#: ../ui/search-dialog.glade.h:61
 msgid "Module Selection"
 msgstr "Výběr modulu"
 
-#: ../ui/search-dialog.glade.h:60
+#: ../ui/search-dialog.glade.h:62
 msgid "Module list"
 msgstr "Seznam modulů"
 
-#: ../ui/search-dialog.glade.h:61
+#: ../ui/search-dialog.glade.h:63
 msgid "Module list radiobutton"
 msgstr "Výběrové pole Seznam modulů"
 
-#: ../ui/search-dialog.glade.h:63
+#: ../ui/search-dialog.glade.h:65
 msgid "Morphological Tags radiobutton"
 msgstr "Výběrové pole Morfologické značky"
 
-#: ../ui/search-dialog.glade.h:65
+#: ../ui/search-dialog.glade.h:67
 msgid "Multi word radiobutton"
 msgstr "Výběrové pole Více slov"
 
-#: ../ui/search-dialog.glade.h:66
+#: ../ui/search-dialog.glade.h:68
 msgid "New Custom Module List Button"
 msgstr "Tlačítko Nový uživ. seznam modulů"
 
-#: ../ui/search-dialog.glade.h:67
+#: ../ui/search-dialog.glade.h:69
 msgid "New Range Button"
 msgstr "Tlačítko Nový Rozsah"
 
-#: ../ui/search-dialog.glade.h:68
+#: ../ui/search-dialog.glade.h:70
 msgid "Open Selection Dialog Button"
 msgstr "Tlačítko Otevřít dialog pro výběr"
 
-#: ../ui/search-dialog.glade.h:69
+#: ../ui/search-dialog.glade.h:71
 msgid "Open a dialog to select modules to add to the list"
 msgstr "Otevřít okno pro přidání vybraného modulu do seznamu"
 
-#: ../ui/search-dialog.glade.h:70
+#: ../ui/search-dialog.glade.h:72
 msgid "Optimized (\"Lucene\")"
 msgstr "Optimalizované (\"Lucene\")"
 
-#: ../ui/search-dialog.glade.h:71
+#: ../ui/search-dialog.glade.h:73
 msgid "Optimized (\"Lucene\") radiobutton"
 msgstr "Výběrové pole Optimalizované (\"Lucene\")"
 
-#: ../ui/search-dialog.glade.h:72
+#: ../ui/search-dialog.glade.h:74
 msgid "Range Definition Entry"
 msgstr "Položka Definice rozsahu"
 
-#: ../ui/search-dialog.glade.h:73
+#: ../ui/search-dialog.glade.h:75
 msgid "Range Name Entry"
 msgstr "Položka Jméno rozsahu"
 
-#: ../ui/search-dialog.glade.h:75
+#: ../ui/search-dialog.glade.h:77
 msgid "Regular expression radiobutton"
 msgstr "Výběrové pole Regulární výraz"
 
-#: ../ui/search-dialog.glade.h:76
+#: ../ui/search-dialog.glade.h:78
 msgid "Remove the selected module from the list"
 msgstr "Odstranit vybraný modul ze seznamu"
 
-#: ../ui/search-dialog.glade.h:77
+#: ../ui/search-dialog.glade.h:79
 msgid "Result Summary Table"
 msgstr "Tabulka Souhrnné výsledky"
 
-#: ../ui/search-dialog.glade.h:78
+#: ../ui/search-dialog.glade.h:80
 msgid "Result Summary Window"
 msgstr "Okno Souhrnné výsledky"
 
-#: ../ui/search-dialog.glade.h:79
+#: ../ui/search-dialog.glade.h:81
 msgid "Results"
 msgstr "Výsledky"
 
-#: ../ui/search-dialog.glade.h:80
+#: ../ui/search-dialog.glade.h:82
 msgid "Save Custom Module List Button"
 msgstr "Tlačítko Uložit uživ. seznam modulů"
 
-#: ../ui/search-dialog.glade.h:81
+#: ../ui/search-dialog.glade.h:83
 msgid "Save Range Button"
 msgstr "Tlačítko Uložit Rozsah"
 
-#: ../ui/search-dialog.glade.h:82
+#: ../ui/search-dialog.glade.h:84
 msgid "Save custom range"
 msgstr "Uložit uživatelský rozsah"
 
-#: ../ui/search-dialog.glade.h:83
+#: ../ui/search-dialog.glade.h:85
 msgid "Save search results as bookmarks"
 msgstr "Uložit výsledky hledání jako záložky"
 
-#: ../ui/search-dialog.glade.h:84
+#: ../ui/search-dialog.glade.h:86
 msgid "Save the module list"
 msgstr "Uložit seznam modulu"
 
-#: ../ui/search-dialog.glade.h:85
+#: ../ui/search-dialog.glade.h:87
 msgid "Search  Criteria"
 msgstr "Hledat podle kritérií"
 
-#: ../ui/search-dialog.glade.h:86
+#: ../ui/search-dialog.glade.h:88
 msgid "Search Criteria Treeview"
 msgstr "Stromový pohled Hledat podle kritérií"
 
-#: ../ui/search-dialog.glade.h:87
+#: ../ui/search-dialog.glade.h:89
 msgid "Search entire module"
 msgstr "Prohledat modul úplně"
 
-#: ../ui/search-dialog.glade.h:88
+#: ../ui/search-dialog.glade.h:90
 msgid "Search for Morphological tags"
 msgstr "Hledat morfologické značky"
 
-#: ../ui/search-dialog.glade.h:89
+#: ../ui/search-dialog.glade.h:91
 msgid "Search for Strongs Numbers like G4442 or H1121"
 msgstr "Hledat Strongova čísla, něco jako G4442 nebo H1121"
 
-#: ../ui/search-dialog.glade.h:90
+#: ../ui/search-dialog.glade.h:92
 msgid "Search in footnotes"
 msgstr "Hledat v poznámkách pod čarou"
 
-#: ../ui/search-dialog.glade.h:91
+#: ../ui/search-dialog.glade.h:93
 msgid "Show Footnotes"
 msgstr "Ukázat poznámky pod čarou"
 
-#: ../ui/search-dialog.glade.h:92
+#: ../ui/search-dialog.glade.h:94
 msgid "Show Footnotes checkbox"
 msgstr "Zaškrtávací pole Ukázat poznámky pod čarou"
 
-#: ../ui/search-dialog.glade.h:93
+#: ../ui/search-dialog.glade.h:95
 msgid "Show Morphological Tags"
 msgstr "Ukázat morfologické značky"
 
-#: ../ui/search-dialog.glade.h:94
+#: ../ui/search-dialog.glade.h:96
 msgid "Show Morphological Tags checkbox"
 msgstr "Zaškrtávací pole Ukázat morfologické značky"
 
-#: ../ui/search-dialog.glade.h:95
+#: ../ui/search-dialog.glade.h:97
 msgid "Show Strong's Numbers"
 msgstr "Ukázat Strongova čísla"
 
-#: ../ui/search-dialog.glade.h:96
+#: ../ui/search-dialog.glade.h:98
 msgid "Show Strong's Numbers checkbox"
 msgstr "Zaškrtávací pole Ukázat Strongova čísla"
 
-#: ../ui/search-dialog.glade.h:97
+#: ../ui/search-dialog.glade.h:99
 msgid "Show in main window"
 msgstr "Ukázat v hlavním okně"
 
-#: ../ui/search-dialog.glade.h:98
+#: ../ui/search-dialog.glade.h:100
 msgid "Single module"
 msgstr "Samotný modul"
 
-#: ../ui/search-dialog.glade.h:99
+#: ../ui/search-dialog.glade.h:101
 msgid "Single module radiobutton"
 msgstr "Výběrové pole Samotný modul"
 
-#: ../ui/search-dialog.glade.h:100
+#: ../ui/search-dialog.glade.h:102
 msgid "Start/stop searching"
 msgstr "Spustit/Zastavit hledání"
 
-#: ../ui/search-dialog.glade.h:101
+#: ../ui/search-dialog.glade.h:103
 msgid "Strongs Numbers"
 msgstr "Strongova čísla"
 
-#: ../ui/search-dialog.glade.h:102
+#: ../ui/search-dialog.glade.h:104
 msgid "Strongs Numbers radiobutton"
 msgstr "Výběrové pole Strongova čísla"
 
-#: ../ui/search-dialog.glade.h:103
+#: ../ui/search-dialog.glade.h:105
 msgid "Use a custom module list for the search"
 msgstr "Použít uživatelký seznam modulu pří hledání"
 
-#: ../ui/search-dialog.glade.h:104
+#: ../ui/search-dialog.glade.h:106
 msgid "Use a custom range for the scope of the search"
 msgstr "Použít uživatelský rozsah pro rozsah hledání"
 
-#: ../ui/search-dialog.glade.h:105
+#: ../ui/search-dialog.glade.h:107
 msgid "Use a single module for the search"
 msgstr "Použít samostatný modul pro hledání"
 
-#: ../ui/search-dialog.glade.h:106
+#: ../ui/search-dialog.glade.h:108
 msgid "Use the current module list for the search"
 msgstr "Použít aktuální seznam modulů při hledání"
 
-#: ../ui/search-dialog.glade.h:107
+#: ../ui/search-dialog.glade.h:109
 msgid "Use the results of the last search as the scope of the search"
 msgstr "Použít výsledky posledního hledání jako prostor pro hledání"
 
-#: ../ui/search-dialog.glade.h:108
+#: ../ui/search-dialog.glade.h:110
 msgid "e.g. Matt-John;Rev4"
 msgstr "e.g. Matt-John;Rev4"
 
-#: ../ui/search-dialog.glade.h:109
+#: ../ui/search-dialog.glade.h:111
 msgid "for "
 msgstr "na "
 
@@ -3310,302 +3214,386 @@ msgid "About _Xiphos"
 msgstr "O aplikaci _Xiphos"
 
 #: ../ui/xi-menus.glade.h:4
+msgid "Add Item"
+msgstr "Přidat položku"
+
+#: ../ui/xi-menus.glade.h:5
+msgid "Add Sub-Item"
+msgstr "Přidat podpoložku"
+
+#: ../ui/xi-menus.glade.h:6
+msgid "Add a sub-item"
+msgstr "Přidá podpoložku"
+
+#: ../ui/xi-menus.glade.h:7
+msgid "Add an item"
+msgstr "Přidat položku"
+
+#: ../ui/xi-menus.glade.h:8
 msgid "Add new folder to selected folder"
 msgstr "Přidat novou složku do vybrané složky"
 
-#: ../ui/xi-menus.glade.h:6
+#: ../ui/xi-menus.glade.h:10
 msgid "Allow Reordering"
 msgstr "Povolit přeuspořádání"
 
-#: ../ui/xi-menus.glade.h:7
+#: ../ui/xi-menus.glade.h:11
 msgid "Allow items to be moved from one folder to another"
 msgstr "Povolit přesun položek z jedné složky do druhé"
 
-#: ../ui/xi-menus.glade.h:8
+#: ../ui/xi-menus.glade.h:12
 msgid "Annotate Verse"
 msgstr "Přidat komentář k verši"
 
-#: ../ui/xi-menus.glade.h:10
+#: ../ui/xi-menus.glade.h:14
 msgid "Browse in BibleMap.org"
 msgstr "Prohlížet na BibleMap.org"
 
-#: ../ui/xi-menus.glade.h:11
+#: ../ui/xi-menus.glade.h:15
 msgid "Collapse All"
 msgstr "Zasunout vše"
 
-#: ../ui/xi-menus.glade.h:12
+#: ../ui/xi-menus.glade.h:16
 msgid "Collapse all Bookmarks groups"
 msgstr "Zasunout všechny skupiny záložek"
 
-#: ../ui/xi-menus.glade.h:13
+#: ../ui/xi-menus.glade.h:17
 msgid "Commentary by Chapter"
 msgstr "Komentář/Výklad podle kapitol"
 
-#: ../ui/xi-menus.glade.h:15
+#: ../ui/xi-menus.glade.h:19
+msgid "Create a new daily journal"
+msgstr "Vytvoří nový deník"
+
+#: ../ui/xi-menus.glade.h:20
+msgid "Create a new monthly journal"
+msgstr "Vytvoří nový měsíčník"
+
+#: ../ui/xi-menus.glade.h:21
+msgid "Create a new outlined topic"
+msgstr "Vytvoří nové souhrnné téma"
+
+#: ../ui/xi-menus.glade.h:22
+msgid "Create a new simple prayer list"
+msgstr "Vytvoří nový jednoduchý modlitební seznam"
+
+#: ../ui/xi-menus.glade.h:23
+msgid "Create a new subject prayer list"
+msgstr "Vytvoří nový modlitební seznam s předměty"
+
+#: ../ui/xi-menus.glade.h:24
 msgid "D_ouble-Space Text"
 msgstr "Větší _odřádkování textu"
 
-#: ../ui/xi-menus.glade.h:16
+#: ../ui/xi-menus.glade.h:25
+msgid "Daily"
+msgstr "Denní"
+
+#: ../ui/xi-menus.glade.h:26
 msgid "Delete Item"
 msgstr "Odstranit položku"
 
-#: ../ui/xi-menus.glade.h:17
+#: ../ui/xi-menus.glade.h:27
 msgid "Delete item"
 msgstr "Odstranit položku"
 
-#: ../ui/xi-menus.glade.h:18
+#: ../ui/xi-menus.glade.h:28
 msgid "Dictionar_y"
 msgstr "_Slovník"
 
-#: ../ui/xi-menus.glade.h:19
+#: ../ui/xi-menus.glade.h:29
 msgid "Display Book Heading"
 msgstr "Zobraz nadpis knihy"
 
-#: ../ui/xi-menus.glade.h:20
+#: ../ui/xi-menus.glade.h:30
 msgid "Display Chapter Heading"
 msgstr "Zobraz nadpis kapitoly"
 
-#: ../ui/xi-menus.glade.h:21
+#: ../ui/xi-menus.glade.h:31
 msgid "Dump Pers.Comm."
 msgstr "Exportovat osobní komentáře"
 
-#: ../ui/xi-menus.glade.h:23
+#: ../ui/xi-menus.glade.h:33
 msgid "Edit bookmark item"
 msgstr "Upravit položku v záložkách"
 
-#: ../ui/xi-menus.glade.h:24
+#: ../ui/xi-menus.glade.h:34
+msgid "Edit this item"
+msgstr "Upravit tuto položku"
+
+#: ../ui/xi-menus.glade.h:35
 msgid "Expand All"
 msgstr "Rozvinout vše"
 
-#: ../ui/xi-menus.glade.h:25
+#: ../ui/xi-menus.glade.h:36
 msgid "Expand all Bookmarks groups"
 msgstr "Rozvinout všechny skupiny záložek"
 
-#: ../ui/xi-menus.glade.h:32
+#: ../ui/xi-menus.glade.h:37
+msgid "Export Folder"
+msgstr "Exportní složka"
+
+#: ../ui/xi-menus.glade.h:38
+msgid "Export List"
+msgstr "Exportovat seznam"
+
+#: ../ui/xi-menus.glade.h:45
 msgid "Image Content"
 msgstr "Obsah obrazu"
 
-#: ../ui/xi-menus.glade.h:33
+#: ../ui/xi-menus.glade.h:46
 msgid "Import Bibletime Bookmarks"
 msgstr "Import záložek z Bibletime"
 
-#: ../ui/xi-menus.glade.h:34
+#: ../ui/xi-menus.glade.h:47
 msgid "Insert Bookmark"
 msgstr "Vložit záložku"
 
-#: ../ui/xi-menus.glade.h:35
+#: ../ui/xi-menus.glade.h:48
 msgid "Insert new bookmark here"
 msgstr "Vložit zde novou záložku"
 
-#: ../ui/xi-menus.glade.h:36
+#: ../ui/xi-menus.glade.h:49
 msgid "L_ink Tabs"
 msgstr "Stejný _verš v panelech"
 
-#: ../ui/xi-menus.glade.h:38
+#: ../ui/xi-menus.glade.h:51
 msgid "Load Bookmarks from Bibletime"
 msgstr "Načíst záložky z programu Bibletime"
 
-#: ../ui/xi-menus.glade.h:39
+#: ../ui/xi-menus.glade.h:52
 msgid "Lookup Selection"
 msgstr "Výběr vyhledávání"
 
-#: ../ui/xi-menus.glade.h:43
+#: ../ui/xi-menus.glade.h:54
+msgid "Monthly"
+msgstr "Měsíční"
+
+#: ../ui/xi-menus.glade.h:57
 msgid "Note"
 msgstr "Poznamenat"
 
-#: ../ui/xi-menus.glade.h:44
+#: ../ui/xi-menus.glade.h:58
 msgid "Open Module"
 msgstr "Otevřít modul"
 
-#: ../ui/xi-menus.glade.h:45
+#: ../ui/xi-menus.glade.h:59
 msgid "Open Study_pad"
 msgstr "Otevřít Poznámkový _blok"
 
-#: ../ui/xi-menus.glade.h:46
+#: ../ui/xi-menus.glade.h:60
 msgid "Open in a dialog"
 msgstr "Otevřít v okně"
 
-#: ../ui/xi-menus.glade.h:48
+#: ../ui/xi-menus.glade.h:61
+msgid "Open in a separate window"
+msgstr "Otevřít v samostatném okně"
+
+#: ../ui/xi-menus.glade.h:62
+msgid "Open in editor"
+msgstr "Otevřít v editoru"
+
+#: ../ui/xi-menus.glade.h:63
 msgid "Open in new tab"
 msgstr "Otevřít v novém panelu"
 
-#: ../ui/xi-menus.glade.h:49
+#: ../ui/xi-menus.glade.h:64
+msgid ""
+"Open selected module in a\n"
+"\tseparate ['dialog'] window"
+msgstr ""
+"Otevře vybraný modul v samostatném\n"
+"\t ['dialogovém'] okně."
+
+#: ../ui/xi-menus.glade.h:66
+msgid "Open selected module in a new tab"
+msgstr "Otevřít vybraný modul v novém panelu"
+
+#: ../ui/xi-menus.glade.h:67
 msgid "Open this bookmark in a dialog"
 msgstr "Otevřít tuto záložku v okně"
 
-#: ../ui/xi-menus.glade.h:50
+#: ../ui/xi-menus.glade.h:68
 msgid "Open this bookmark in a new tab"
 msgstr "Otevřít tuto záložku v novém okně"
 
-#: ../ui/xi-menus.glade.h:52
+#: ../ui/xi-menus.glade.h:69
+msgid "Outlined"
+msgstr "Souhrnný"
+
+#: ../ui/xi-menus.glade.h:71
 msgid "Read Selection Aloud"
 msgstr "Číst výběr na_hlas"
 
-#: ../ui/xi-menus.glade.h:53
-msgid "Remove - Restore"
-msgstr "Odstranit - Obnovit"
-
-#: ../ui/xi-menus.glade.h:54
-msgid "Remove Folder"
-msgstr "Odstranit složku"
-
-#: ../ui/xi-menus.glade.h:55
+#: ../ui/xi-menus.glade.h:73
 msgid "Remove folder and save it"
 msgstr "Odstranit složku a uložit ji"
 
-#: ../ui/xi-menus.glade.h:56
+#: ../ui/xi-menus.glade.h:74
+msgid "Remove this item"
+msgstr "Odstranit tuto položku"
+
+#: ../ui/xi-menus.glade.h:75
 msgid "Rename Pers.Comm."
 msgstr "Přejmenovat Osobní komentáře"
 
-#: ../ui/xi-menus.glade.h:57
+#: ../ui/xi-menus.glade.h:76
 msgid "Respect Font Faces"
 msgstr "Respektovat písma"
 
-#: ../ui/xi-menus.glade.h:58
+#: ../ui/xi-menus.glade.h:77
 msgid "Restore Folder"
 msgstr "Obnovit složku"
 
-#: ../ui/xi-menus.glade.h:59
+#: ../ui/xi-menus.glade.h:78
 msgid "Restore saved folder"
 msgstr "Obnovit uloženou složku"
 
-#: ../ui/xi-menus.glade.h:60
+#: ../ui/xi-menus.glade.h:79
 msgid "Save list as a series of bookmarks"
 msgstr "Uložit seznam jako sérii záložek"
 
-#: ../ui/xi-menus.glade.h:61
+#: ../ui/xi-menus.glade.h:80
 msgid "Save list as a single bookmark"
 msgstr "Uložit seznam jako záložku"
 
-#: ../ui/xi-menus.glade.h:62
+#: ../ui/xi-menus.glade.h:81
 msgid "Save these results as a series of bookmarks in their own folder"
 msgstr "Uložit výsledky do vlastní složky jako série záložek"
 
-#: ../ui/xi-menus.glade.h:63
+#: ../ui/xi-menus.glade.h:82
 msgid "Save these results as a single bookmark"
 msgstr "Uložit výsledky jako záložku"
 
-#: ../ui/xi-menus.glade.h:64
+#: ../ui/xi-menus.glade.h:83
 msgid "Scripture Cross-references"
 msgstr "Odkazy do písma"
 
-#: ../ui/xi-menus.glade.h:66
+#: ../ui/xi-menus.glade.h:85
 msgid "Show Parallel View in a _Tab"
 msgstr "Zobrazit S_ouběžný pohled v novém panelu"
 
-#: ../ui/xi-menus.glade.h:67
+#: ../ui/xi-menus.glade.h:86
 msgid "Show Previe_wer in the Sidebar"
 msgstr "Zobrazit Náhl_ed v postranní liště"
 
-#: ../ui/xi-menus.glade.h:68
+#: ../ui/xi-menus.glade.h:87
 msgid "Show Verse _Numbers"
 msgstr "Čísla ve_ršů"
 
-#: ../ui/xi-menus.glade.h:71
+#: ../ui/xi-menus.glade.h:88
+msgid "Simple"
+msgstr "Jednoduchý"
+
+#: ../ui/xi-menus.glade.h:90
+msgid "Subject"
+msgstr "Předmět"
+
+#: ../ui/xi-menus.glade.h:92
 msgid "Unlock This Module"
 msgstr "Odemknout tento modul"
 
-#: ../ui/xi-menus.glade.h:72
+#: ../ui/xi-menus.glade.h:93
 msgid "Use Current Dictionary"
 msgstr "Použít aktuální slovník"
 
-#: ../ui/xi-menus.glade.h:73
+#: ../ui/xi-menus.glade.h:94
 msgid "Use module manager to install and remove Sword modules"
 msgstr "Použít správce modulů pro přidání a odstranění modulů Sword."
 
-#: ../ui/xi-menus.glade.h:74
+#: ../ui/xi-menus.glade.h:95
 msgid "Variants"
 msgstr "Varianty"
 
-#: ../ui/xi-menus.glade.h:76
+#: ../ui/xi-menus.glade.h:97
 msgid "_About The SWORD Project"
 msgstr "O aplikaci _SWORD Project"
 
-#: ../ui/xi-menus.glade.h:77
+#: ../ui/xi-menus.glade.h:98
 msgid "_Advanced Search"
 msgstr "_Pokročilé hledání"
 
-#: ../ui/xi-menus.glade.h:78
+#: ../ui/xi-menus.glade.h:99
 msgid "_Attach/Detach Sidebar"
 msgstr "_Ukotvit/Uvolnit postranní lištu"
 
-#: ../ui/xi-menus.glade.h:79
+#: ../ui/xi-menus.glade.h:100
 msgid "_Bible"
 msgstr "_Bible"
 
-#: ../ui/xi-menus.glade.h:80
+#: ../ui/xi-menus.glade.h:101
 msgid "_Commentary/Book"
 msgstr "_Komentář/Kniha"
 
-#: ../ui/xi-menus.glade.h:81
+#: ../ui/xi-menus.glade.h:102
 msgid "_Contents"
 msgstr "_Obsah"
 
-#: ../ui/xi-menus.glade.h:82
+#: ../ui/xi-menus.glade.h:103
 msgid "_Daily Devotion"
 msgstr "_Dnešní čtení"
 
-#: ../ui/xi-menus.glade.h:83
+#: ../ui/xi-menus.glade.h:104
 msgid "_Edit"
 msgstr "Úpr_avy"
 
-#: ../ui/xi-menus.glade.h:84
+#: ../ui/xi-menus.glade.h:105
 msgid "_Edit Item"
 msgstr "_Upravit položku"
 
-#: ../ui/xi-menus.glade.h:86
+#: ../ui/xi-menus.glade.h:107
 msgid "_Help"
 msgstr "_Nápověda"
 
-#: ../ui/xi-menus.glade.h:87
+#: ../ui/xi-menus.glade.h:108
 msgid "_Highlight Current Verse"
 msgstr "Zvýraznit _aktuální verš"
 
-#: ../ui/xi-menus.glade.h:88
+#: ../ui/xi-menus.glade.h:109
 msgid "_Live Chat"
 msgstr "Online komunikace"
 
-#: ../ui/xi-menus.glade.h:89
+#: ../ui/xi-menus.glade.h:110
 msgid "_Mailing List"
 msgstr "_E-mailová konference"
 
-#: ../ui/xi-menus.glade.h:90
+#: ../ui/xi-menus.glade.h:111
 msgid "_Module Manager"
 msgstr "_Správce modulů"
 
-#: ../ui/xi-menus.glade.h:91
+#: ../ui/xi-menus.glade.h:112
 msgid "_Open Session"
 msgstr "_Otevřít sezení"
 
-#: ../ui/xi-menus.glade.h:92
+#: ../ui/xi-menus.glade.h:113
 msgid "_Preferences"
 msgstr "_Nastavení"
 
-#: ../ui/xi-menus.glade.h:93
+#: ../ui/xi-menus.glade.h:114
 msgid "_Preview"
 msgstr "_Náhled"
 
-#: ../ui/xi-menus.glade.h:94
+#: ../ui/xi-menus.glade.h:115
 msgid "_Read Aloud"
 msgstr "Čtení na_hlas"
 
-#: ../ui/xi-menus.glade.h:95
+#: ../ui/xi-menus.glade.h:116
 msgid "_Report Bug"
 msgstr "Nahlásit chybu"
 
-#: ../ui/xi-menus.glade.h:96
+#: ../ui/xi-menus.glade.h:117
 msgid "_Save Session"
 msgstr "_Uložit sezení"
 
-#: ../ui/xi-menus.glade.h:97
+#: ../ui/xi-menus.glade.h:118
 msgid "_Search"
 msgstr "_Hledat"
 
-#: ../ui/xi-menus.glade.h:98
-msgid "_Show/Hide Sidebar"
+#: ../ui/xi-menus.glade.h:119
+msgid "_Show/Hide Attached Sidebar"
 msgstr "_Zobrazit/Skrýt postranní lištu"
 
-#: ../ui/xi-menus.glade.h:99
+#: ../ui/xi-menus.glade.h:120
 msgid "_Verse Per Line"
 msgstr "_Jeden verš na řádek"
 
@@ -3617,196 +3605,372 @@ msgstr "Studium Bible"
 msgid "Xiphos Bible Guide"
 msgstr "Xiphos Průvodce Biblí"
 
+#~ msgid "Xiphos could not execute archiver"
+#~ msgstr "Xiphos nemůže spustit archivátor"
+
+#~ msgid ""
+#~ " archival result:\n"
+#~ "\n"
+#~ msgstr ""
+#~ " výsledek vytváření archivu:\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Archive in "
+#~ msgstr ""
+#~ "\n"
+#~ "Archivovat do "
+
+#~ msgid "Sources"
+#~ msgstr "Zdroje"
+
+#~ msgid "Text"
+#~ msgstr "Text"
+
+#~ msgid "Text to render"
+#~ msgstr "Text k vykreslení"
+
+#~ msgid "Pixbuf Object"
+#~ msgstr "Pixbuf objekt"
+
+#~ msgid "The pixbuf to render."
+#~ msgstr "Poskytnutý pixbuf."
+
+#~ msgid "Open in a new tab"
+#~ msgstr "Otevřít v novém panelu"
+
+#~ msgid "Open selected module in a separate ['dialog'] window"
+#~ msgstr "Otevřít vybraný modul v samostatném dialogovém okně"
+
+#~ msgid "View information about the selected dialog"
+#~ msgstr "Zobrazit informace o vybraném dialogovém okně"
+
+#~ msgid "Create a new prayer list"
+#~ msgstr "Vytvořit nový modlitební seznam"
+
+#~ msgid "Daily Journal"
+#~ msgstr "Deník"
+
+#~ msgid "Outlined Topic"
+#~ msgstr "Navržené téma"
+
+#~ msgid "Open selected module in a dialog"
+#~ msgstr "Otevřít vybraný modul v dialogovém okně"
+
+#~ msgid "Add Child"
+#~ msgstr "Přidat potomka"
+
+#~ msgid "Add Sibling"
+#~ msgstr "Přidat souseda"
+
+#~ msgid "Xiphos has renamed .xiphos-2.0 to .xiphos"
+#~ msgstr "Xiphos přejmenoval .xiphos-2.0 na .xiphos"
+
+#~ msgid ""
+#~ "Xiphos can not rename  .xiphos-2.0 to .xiphos:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Xiphos cannot continue."
+#~ msgstr ""
+#~ "Xiphos nemůže přejmenovat  .xiphos-2.0 na .xiphos:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Xiphos nemůže pokračovat."
+
+#~ msgid "H_istory/<Separator>"
+#~ msgstr "H_istorie/<Separator>"
+
+#~ msgid "H_istory/C_lear"
+#~ msgstr "H_istorie/V_yčistit"
+
+#~ msgid "Remove - Restore"
+#~ msgstr "Odstranit - Obnovit"
+
+#~ msgid "Remove Folder"
+#~ msgstr "Odstranit složku"
+
+#~ msgid "_Show/Hide Sidebar"
+#~ msgstr "_Zobrazit/Skrýt postranní lištu"
+
 #~ msgid "Move backwards through history"
 #~ msgstr "Pohyb v historii pozpátku"
+
 #~ msgid "Move foward through history"
 #~ msgstr "Pohyb v historii dopředu"
+
 #~ msgid "Select a Book of the Bible"
 #~ msgstr "Výběr knihy z Bible"
+
 #~ msgid "Change Chapter"
 #~ msgstr "Změna kapitoly"
+
 #~ msgid "Enter a Verse reference in Book 1:1 format and press Return"
 #~ msgstr "Zadej odkaz na verš ve formátu  Kniha 1:1  a stiskni Enter"
+
 #~ msgid "Dictionary/_Lexicon"
 #~ msgstr "Slovník/_Lexikon"
+
 #~ msgid "_Bible Text"
 #~ msgstr "_Biblické texty"
+
 #~ msgid "Open StudyPad File"
 #~ msgstr "Otevřít soubor pro Poznámkový blok"
+
 #~ msgid "Save StudyPad File"
 #~ msgstr "Uložit soubor pro Poznámkový blok"
+
 #~ msgid "item1"
 #~ msgstr "položka1"
+
 #~ msgid "item2"
 #~ msgstr "položka2"
+
 #~ msgid "_Module Options"
 #~ msgstr "_Volby modulu"
+
 #~ msgid "Sync with main"
 #~ msgstr "Synchronizovat s hlavním oknem"
+
 #~ msgid "Stay in sync"
 #~ msgstr "Zůstat při synchronizaci"
+
 #~ msgid "Print"
 #~ msgstr "Tisk"
+
 #~ msgid "Print Preview"
 #~ msgstr "Náhled tisku"
+
 #~ msgid "Failed to print the document"
 #~ msgstr "Nezdařil se tisk dokumentu"
+
 #~ msgid "Save List"
 #~ msgstr "Uložit seznam"
+
 #~ msgid "_Modules"
 #~ msgstr "_Moduly"
+
 #~ msgid "_Bookmarks"
 #~ msgstr "_Záložky"
+
 #~ msgid "Verse _List"
 #~ msgstr "Seznam _veršů"
+
 #~ msgid "%s not found"
 #~ msgstr "%s nenalezeno"
+
 #~ msgid "has been modified. Do you wish to save it?"
 #~ msgstr "byl změněm. Přejete si změny uložit?"
+
 #~ msgid "not loaded"
 #~ msgstr "nenačten"
+
 #~ msgid "Open the StudyPad editor"
 #~ msgstr "Otevřít Poznámkový blok"
+
 #~ msgid "Open a saved session"
 #~ msgstr "Otevřít uložené sezení"
+
 #~ msgid "Save the current session to a file"
 #~ msgstr "Uložit současné sezení do souboru"
+
 #~ msgid "_Copy"
 #~ msgstr "_Kopírovat"
+
 #~ msgid "Copy highlighted text from main window"
 #~ msgstr "Kopírovat zvýrazněný text z hlavního okna"
+
 #~ msgid "Search using the shortcut bar"
 #~ msgstr "Hledat s použitím tabulky zkratek"
+
 #~ msgid "Advanced search using the search dialog"
 #~ msgstr "Pokročilé hledání s použitím tabulky zkratek"
+
 #~ msgid "Set user preferences"
 #~ msgstr "Nastavit volby uživatele"
+
 #~ msgid "C_lear"
 #~ msgstr "_Vymazat"
+
 #~ msgid "Clear history list"
 #~ msgstr "Vymazat historii"
+
 #~ msgid "Show the Daily Devotion for today"
 #~ msgstr "Zobrazit Dnešní čtení pro dnešní datum"
+
 #~ msgid "Show or hide Bible texts window"
 #~ msgstr "Zobrazit/Skrýt okno Biblické texty"
+
 #~ msgid "Show or hide Preview window"
 #~ msgstr "Zobrazit/Skrýt okno Náhled"
+
 #~ msgid "Show or hide commentaries"
 #~ msgstr "Zobrazit/Skrýt komentáře/výklady"
+
 #~ msgid "Show or hide - dictionaries and lexicons"
 #~ msgstr "Zobrazit/Skrýt - slovníky a lexikony"
+
 #~ msgid "Open the Xiphos manual"
 #~ msgstr "Otevřít příručku pro Xiphos"
+
 #~ msgid "Sign up for the users' mailing list"
 #~ msgstr "Přihlásit se do e-mailové konference pro uživatele"
+
 #~ msgid "Chat with other users and developers"
 #~ msgstr "Komunikace s dalšími uživateli a vývojáři"
+
 #~ msgid "Report bug to SourceForge"
 #~ msgstr "Nahlásit chybu na SourceForge"
+
 #~ msgid "Translating Xiphos to other languages"
 #~ msgstr "Překládání aplikace Xiphos do dalších jazyků"
+
 #~ msgid "More information about the SWORD Project"
 #~ msgstr "Více informací o aplikace The SWORD Project"
+
 #~ msgid "About this application"
 #~ msgstr "O této aplikaci"
+
 #~ msgid "Hi_story"
 #~ msgstr "_Historie"
+
 #~ msgid "1 Cor 15:1"
 #~ msgstr "1. Korintským 15:1"
+
 #~ msgid "Name for new prayer list"
 #~ msgstr "Jméno nového modlitebního seznamu"
+
 #~ msgid "can not create path\n"
 #~ msgstr "nemohu vytvořit cestu\n"
+
 #~ msgid "Prayer list already exist\n"
 #~ msgstr "Modlitební seznam už existuje\n"
+
 #~ msgid "\\par\\par My prayer list \\par\\par Module created in Xiphos"
 #~ msgstr "\\par\\par Můj modlitební seznam \\par\\par Modul vytvořil Xiphos"
-#~ msgid "Delete Index"
-#~ msgstr "Odstranit rejstřík"
+
 #~ msgid "+5"
 #~ msgstr "+5"
+
 #~ msgid "+4"
 #~ msgstr "+4"
+
 #~ msgid "+3"
 #~ msgstr "+3"
+
 #~ msgid "+2"
 #~ msgstr "+2"
+
 #~ msgid "+1"
 #~ msgstr "+1"
+
 #~ msgid "-1"
 #~ msgstr "-1"
+
 #~ msgid "-2"
 #~ msgstr "-2"
+
 #~ msgid "-3"
 #~ msgstr "-3"
+
 #~ msgid "Starting"
 #~ msgstr "Startuji"
+
 #~ msgid "Building Xiphos interface"
 #~ msgstr "Vytvářím rozhraní Xiphos"
+
 #~ msgid "Initiating Xiphos"
 #~ msgstr "Inicializuji Xiphos"
+
 #~ msgid "done"
 #~ msgstr "hotovo"
+
 #~ msgid "Xiphos is shutdown"
 #~ msgstr "Xiphos je zastaven"
+
 #~ msgid "Initiating SWORD"
 #~ msgstr "Zavádím SWORD"
+
 #~ msgid "path to sword"
 #~ msgstr "cesta k sword"
+
 #~ msgid "System locale is"
 #~ msgstr "Systémová lokalizace je"
+
 #~ msgid "SWORD locale is"
 #~ msgstr "SWORD lokalizace je"
+
 #~ msgid "Checking for SWORD Modules"
 #~ msgstr "Kontrola SWORD modulů"
+
 #~ msgid "SWORD is shutdown"
 #~ msgstr "SWORD je zastaven"
+
 #~ msgid "Number of Text modules"
 #~ msgstr "Počet modulů Biblické texty"
+
 #~ msgid "Number of Commentary modules"
 #~ msgstr "Počet modulů Komentáře/Výklady"
+
 #~ msgid "Number of Dict/lex modules"
 #~ msgstr "Počet modulů Slovníky"
+
 #~ msgid "Number of Book modules"
 #~ msgstr "Počet modulů Knihy"
+
 #~ msgid "Number of Percomm modules"
 #~ msgstr "Počet modulů Osobní komentáře"
+
 #~ msgid "Number of Devotion modules"
 #~ msgstr "Počet modulů Čtení na každý den"
+
 #~ msgid "Number of Prayer modules"
 #~ msgstr "Počet modulů s Modlitbami"
+
 #~ msgid ""
 #~ "\n"
 #~ "First Run: need to create settings!\n"
 #~ msgstr ""
 #~ "\n"
 #~ "První spuštění: potřeba vytvořit nastavení!\n"
+
 #~ msgid "can not create  .sword"
 #~ msgstr "nelze vytvořit  .sword"
+
 #~ msgid "can not create  .sword/mods.d"
 #~ msgstr "nelze vytvořit  .sword/mods.d"
+
 #~ msgid "can not create  .sword/modules"
 #~ msgstr "nelze vytvořit  .sword/modules"
+
 #~ msgid "Select Local Source"
 #~ msgstr "Vybrat lokální zdroj"
+
 #~ msgid "It will be lost permanently!"
 #~ msgstr "Bude trvale ztracen!"
+
 #~ msgid "Open file..."
 #~ msgstr "Otevřít soubor..."
+
 #~ msgid "Save file as..."
 #~ msgstr "Uložit jako..."
+
 #~ msgid "Open in dialog"
 #~ msgstr "Otevřít v samostatném okně"
+
 #~ msgid ""
 #~ "For multi-word search, use\n"
 #~ "+FirstWord +SecondWord"
 #~ msgstr ""
 #~ "Pro víceslovné hledání použijte\n"
 #~ "+PrvníSlovo +DruhéSlovo"
+
 #~ msgid "_About the SWORD Project ..."
 #~ msgstr "O aplikaci _SWORD Project ..."
+
 #~ msgid "Select the modules you want"
 #~ msgstr "Vyberte modul, který chcete"
+
 #~ msgid ""
 #~ "There is currently no program set as your\n"
 #~ "handler for \"sword://\" and similar URLs.\n"
@@ -3817,8 +3981,9 @@ msgstr "Xiphos Průvodce Biblí"
 #~ "pro obsluhu URL \"sword://\" a podobných.\n"
 #~ "Přejete si, aby se Xiphos používal\n"
 #~ "pro obsluhu těchto URL?"
+
 #~ msgid "<b>Font Miscellaneous</b>"
 #~ msgstr "<b>Písmo - různé</b>"
+
 #~ msgid "Bible text"
 #~ msgstr "Biblický text"
-
diff --git a/po/cy.po b/po/cy.po
index e22690a..3926575 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -8,169 +8,195 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Xiphos 3.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-01 11:13+0200\n"
-"PO-Revision-Date: 2009-05-15 21:11+0100\n"
-"Last-Translator: Arfon Jones <gig.cymru@btinternet.com>\n"
+"POT-Creation-Date: 2009-12-14 23:45+0000\n"
+"PO-Revision-Date: 2009-12-09 22:36+0000\n"
+"Last-Translator: Dmitrijs Ledkovs <dmitrij.ledkov@gmail.com>\n"
 "Language-Team: Gnomesword-developers <gnomesword-developers@lists>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-12-10 04:39+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 
-#: ../src/backend/sword_main.cc:1154
+#: ../src/backend/sword_main.cc:1083
 msgid "Configuration not found"
 msgstr "Methu ffeindio’r ffurfweddiad"
 
-#: ../src/editor/bonobo-editor.c:252 ../src/editor/slib-editor.c:228
-#: ../src/gnome2/html.c:629
+#: ../src/editor/bonobo-editor.c:254 ../src/editor/slib-editor.c:234
+#: ../src/gnome2/html.c:637
+#, c-format
 msgid "Page %d of %d"
 msgstr "Tud %d o %d"
 
-#: ../src/editor/bonobo-editor.c:351
+#: ../src/editor/bonobo-editor.c:353 ../src/editor/slib-editor.c:659
 msgid "Are you sure you want to delete the note for"
 msgstr "Ydych chi’n siwr eich bod eisiau dileu’r nodyn"
 
-#: ../src/editor/bonobo-editor.c:963 ../src/editor/bonobo-editor.c:996
-#: ../src/editor/slib-editor.c:1161 ../src/editor/slib-editor.c:1198
+#: ../src/editor/bonobo-editor.c:965 ../src/editor/bonobo-editor.c:998
+#: ../src/editor/slib-editor.c:1308 ../src/editor/slib-editor.c:1345
 msgid "Save the changes to document"
 msgstr "Cadw’r newidiadau"
 
-#: ../src/editor/bonobo-editor.c:964 ../src/editor/bonobo-editor.c:997
-#: ../src/editor/slib-editor.c:1162 ../src/editor/slib-editor.c:1199
+#: ../src/editor/bonobo-editor.c:966 ../src/editor/bonobo-editor.c:999
+#: ../src/editor/slib-editor.c:1309 ../src/editor/slib-editor.c:1346
 msgid "before closing?"
 msgstr "cyn cau?"
 
-#: ../src/editor/bonobo-editor.c:971 ../src/editor/bonobo-editor.c:1004
-#: ../src/editor/slib-editor.c:1169 ../src/editor/slib-editor.c:1206
+#: ../src/editor/bonobo-editor.c:973 ../src/editor/bonobo-editor.c:1006
+#: ../src/editor/slib-editor.c:1316 ../src/editor/slib-editor.c:1353
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Os na gadwch y newidiadau, byddwch yn eu colli’n barhaol."
 
-#: ../src/editor/bonobo-editor.c:995 ../src/editor/slib-editor.c:1197
-#: ../ui/xi-menus.glade.h:24
+#: ../src/editor/bonobo-editor.c:997 ../src/editor/slib-editor.c:1344
+#: ../ui/xi-menus.glade.h:39
 msgid "File"
 msgstr "Ffeil"
 
-#: ../src/editor/bonobo-editor.c:1222 ../src/editor/slib-editor.c:1254
+#: ../src/editor/bonobo-editor.c:1224 ../src/editor/slib-editor.c:1401
 msgid "StudyPad"
 msgstr "PadAstudio"
 
-#: ../src/editor/bonobo-editor.c:1235 ../src/editor/slib-editor.c:1268
+#: ../src/editor/bonobo-editor.c:1237 ../src/editor/slib-editor.c:1415
 msgid "Note Editor"
 msgstr "Golygydd Nodiadau"
 
-#: ../src/editor/bonobo-editor.c:1244 ../src/editor/slib-editor.c:1282
+#: ../src/editor/bonobo-editor.c:1246 ../src/editor/slib-editor.c:1429
 msgid "Prayer List/Journal Editor"
 msgstr "Golygydd Dyddlyfr/ Rhestr Weddi"
 
-#: ../src/editor/slib-editor.c:382 ../src/editor/slib-editor.c:429
+#: ../src/editor/slib-editor.c:401 ../src/editor/slib-editor.c:448
 msgid "Save As"
 msgstr "Cadw fel"
 
-#: ../src/editor/slib-editor.c:400 ../src/editor/slib-editor.c:447
+#: ../src/editor/slib-editor.c:419 ../src/editor/slib-editor.c:466
+#: ../src/editor/slib-editor.c:634
 msgid "Untitled document"
 msgstr "Dogfen ddi-deitl"
 
-#: ../src/editor/slib-editor.c:612
+#: ../src/editor/slib-editor.c:702
 msgid "HTML Output"
 msgstr "Allbwn HTML"
 
-#: ../src/editor/slib-editor.c:619
+#: ../src/editor/slib-editor.c:709
 msgid "HTML Source"
 msgstr "Côd HTML"
 
-#: ../src/editor/slib-editor.c:626
+#: ../src/editor/slib-editor.c:716
 msgid "Plain Source"
 msgstr "Côd plaen"
 
-#: ../src/editor/slib-editor.c:633 ../ui/editor_note.xml.h:15
+#: ../src/editor/slib-editor.c:726 ../ui/editor_note.xml.h:15
 #: ../ui/editor_studypad.xml.h:21
 msgid "_Print..."
 msgstr "_Argraffu..."
 
-#: ../src/editor/slib-editor.c:640 ../ui/editor_note.xml.h:9
+#: ../src/editor/slib-editor.c:733 ../ui/editor_note.xml.h:9
 #: ../ui/editor_studypad.xml.h:14
 msgid "Print Pre_view"
 msgstr "Rhagolwg Argraffu"
 
-#: ../src/editor/slib-editor.c:647
+#: ../src/editor/slib-editor.c:740
 msgid "_Quit"
 msgstr "_Ymadael"
 
-#: ../src/editor/slib-editor.c:654
+#: ../src/editor/slib-editor.c:747
 msgid "_Open"
 msgstr "_Agor"
 
-#: ../src/editor/slib-editor.c:661
+#: ../src/editor/slib-editor.c:754
 msgid "_Save"
 msgstr "_Cadw"
 
-#: ../src/editor/slib-editor.c:668
+#: ../src/editor/slib-editor.c:761
 msgid "Save _As..."
 msgstr "Cadw_fel..."
 
-#: ../src/editor/slib-editor.c:675 ../ui/editor_note.xml.h:14
+#: ../src/editor/slib-editor.c:767
+msgid "New"
+msgstr "Newydd"
+
+#: ../src/editor/slib-editor.c:769
+msgid "Open new document"
+msgstr ""
+
+#: ../src/editor/slib-editor.c:773
+msgid "Delete"
+msgstr ""
+
+#: ../src/editor/slib-editor.c:775
+msgid "Delete current note"
+msgstr ""
+
+#: ../src/editor/slib-editor.c:780 ../ui/editor_note.xml.h:14
 #: ../ui/editor_studypad.xml.h:20 ../ui/editor.xml.h:13
-#: ../ui/xi-menus.glade.h:83
+#: ../ui/xi-menus.glade.h:106
 msgid "_File"
 msgstr "_Ffeil"
 
-#: ../src/editor/slib-editor.c:730
+#: ../src/editor/slib-editor.c:835
 msgid "HTML _Output"
 msgstr "Allbwn _HTML"
 
-#: ../src/editor/slib-editor.c:737
+#: ../src/editor/slib-editor.c:842
 msgid "_HTML Source"
 msgstr "_Cod HTML"
 
-#: ../src/editor/slib-editor.c:744
+#: ../src/editor/slib-editor.c:849
 msgid "_Plain Source"
 msgstr "_Cod plaen"
 
-#: ../src/editor/slib-editor.c:751 ../ui/xi-menus.glade.h:98
+#: ../src/editor/slib-editor.c:856 ../ui/xi-menus.glade.h:121
 msgid "_View"
 msgstr "_Gweld"
 
-#: ../src/editor/slib-editor.c:762 ../ui/editor_note.xml.h:11
+#: ../src/editor/slib-editor.c:867 ../ui/editor_note.xml.h:11
 #: ../ui/editor_studypad.xml.h:16 ../ui/editor.xml.h:11
 msgid "Save"
 msgstr "Cadw"
 
-#: ../src/gecko/gecko-html.cpp:178 ../src/gnome2/html.c:161
+#: ../src/editor/slib-editor.c:878 ../src/editor/slib-editor.c:885
+msgid "Insert Link"
+msgstr "Mewnosod Dolen"
+
+#: ../src/gecko/gecko-html.cpp:177 ../src/gnome2/html.c:165
 msgid "Unlock "
-msgstr "Datgloi"
+msgstr "Datgloi "
 
-#: ../src/gecko/gecko-print.c:171
+#: ../src/gecko/gecko-print.c:172
 msgid "Preparing to print"
 msgstr "Paratoi i argraffu"
 
-#: ../src/gecko/gecko-print.c:265
+#: ../src/gecko/gecko-print.c:266
 msgid "Printing is not supported on this printer"
 msgstr "Yr argraffydd hwn ddim yn gymwys i argraffu"
 
-#: ../src/gecko/gecko-print.c:268
+#: ../src/gecko/gecko-print.c:269
+#, c-format
 msgid "Printer %s does not support PostScript printing."
-msgstr "% Argraffydd ddim yn gallu argraffu ôl-nodiadau."
+msgstr "%s Argraffydd ddim yn gallu argraffu ôl-nodiadau."
 
-#: ../src/gecko/gecko-print.c:341 ../src/gecko/gecko-print.c:369
+#: ../src/gecko/gecko-print.c:342 ../src/gecko/gecko-print.c:370
 msgid "Printing"
 msgstr "Argraffu"
 
-#: ../src/gecko/gecko-print.c:371
+#: ../src/gecko/gecko-print.c:372
 msgid "Waiting to print"
 msgstr "Disgwyl i argraffu"
 
-#: ../src/gecko/gecko-print.c:583
+#: ../src/gecko/gecko-print.c:584
 msgid "An error occurred while printing"
 msgstr "Bu gwall wrth argraffu"
 
-#: ../src/gecko/gecko-print.c:587
+#: ../src/gecko/gecko-print.c:588
+#, c-format
 msgid "It was not possible to print your document: %s"
 msgstr "Ni fu’n bosibl argraffu eich dogfen: %s"
 
-#: ../src/gnome2/about_modules.c:189
+#: ../src/gnome2/about_modules.c:195
 msgid "About Sword Module"
 msgstr "Am y Modiwl SWORD"
 
-#: ../src/gnome2/about_modules.c:383 ../src/gnome2/mod_mgr.c:198
+#: ../src/gnome2/about_modules.c:389 ../src/gnome2/mod_mgr.c:252
 msgid "The module has no About information."
 msgstr "Does gan y modiwl ddim gwybodaeth Amdani"
 
@@ -194,15 +220,15 @@ msgstr ""
 msgid "About the SWORD Project"
 msgstr "Gwybodaeth am brosiect SWORD"
 
-#: ../src/gnome2/about_sword.c:123
+#: ../src/gnome2/about_sword.c:124
 msgid "Sword Version"
 msgstr "Fersiwn SWORD"
 
-#: ../src/gnome2/about_sword.c:154
+#: ../src/gnome2/about_sword.c:155
 msgid "Books can be downloaded from the SWORD Project"
 msgstr "Gellir lawrlwytho llyfrau o’r Prosiect SWORD"
 
-#: ../src/gnome2/about_sword.c:160
+#: ../src/gnome2/about_sword.c:161
 msgid "The SWORD Project"
 msgstr "Prosiect SWORD"
 
@@ -222,19 +248,19 @@ msgstr ""
 msgid "About Xiphos Translation"
 msgstr "Am Gyfieithu Xiphos"
 
-#: ../src/gnome2/about_trans.c:139
+#: ../src/gnome2/about_trans.c:140
 msgid "See TRANSLATION-HOWTO in Xiphos source"
 msgstr "gw. SUT_I-GYFIEITHU yn ffynhonnell Xiphos"
 
-#: ../src/gnome2/about_trans.c:145
+#: ../src/gnome2/about_trans.c:146
 msgid "Xiphos development"
 msgstr "Datblygiad Xiphos"
 
-#: ../src/gnome2/about_xiphos.c:132
+#: ../src/gnome2/about_xiphos.c:131
 msgid "Copyright 2000-2009 The Xiphos Development Team"
 msgstr "Hawlfraint 2000-2009 Tîm Datblygu Xiphos"
 
-#: ../src/gnome2/about_xiphos.c:135
+#: ../src/gnome2/about_xiphos.c:134
 msgid ""
 "(formerly known as GnomeSword)\n"
 "\n"
@@ -248,82 +274,82 @@ msgstr ""
 "Carem ddiolch i Troy Griffits a phawb arall sydd wedi rhoi prosiect SWORD i "
 "ni."
 
-#: ../src/gnome2/bibletext_dialog.c:525
+#: ../src/gnome2/bibletext_dialog.c:358
 msgid "Go to "
 msgstr "Mynd i "
 
 #. info->stock_icon = GTK_STOCK_OPEN;
-#: ../src/gnome2/bookmark_dialog.c:145 ../src/gnome2/bookmarks_menu.c:471
-#: ../src/gnome2/bookmarks_menu.c:897 ../src/gnome2/bookmarks_menu.c:995
-#: ../src/gnome2/bookmarks_treeview.c:131 ../ui/editor_studypad.xml.h:2
-#: ../ui/xi-menus.glade.h:8
+#: ../src/gnome2/bookmark_dialog.c:171 ../src/gnome2/bookmarks_menu.c:358
+#: ../src/gnome2/bookmarks_menu.c:765 ../src/gnome2/bookmarks_menu.c:863
+#: ../src/gnome2/bookmarks_treeview.c:133 ../ui/editor_studypad.xml.h:2
+#: ../ui/xi-menus.glade.h:13
 msgid "Bookmark"
 msgstr "Nod Tudalen"
 
-#: ../src/gnome2/bookmark_dialog.c:147 ../src/gnome2/bookmarks_menu.c:997
-#: ../src/gnome2/bookmarks_treeview.c:132
+#: ../src/gnome2/bookmark_dialog.c:173 ../src/gnome2/bookmarks_menu.c:865
+#: ../src/gnome2/bookmarks_treeview.c:134
 msgid "Enter Folder Name"
 msgstr "Teipiwch Enw’r Ffolder"
 
-#: ../src/gnome2/bookmark_dialog.c:149 ../src/gnome2/bookmarks_menu.c:999
+#: ../src/gnome2/bookmark_dialog.c:175 ../src/gnome2/bookmarks_menu.c:867
 msgid "Folder Name"
 msgstr "Enw’r Ffolder"
 
-#: ../src/gnome2/bookmark_dialog.c:150 ../src/gnome2/bookmarks_menu.c:1000
-#: ../src/gnome2/bookmarks_treeview.c:134
+#: ../src/gnome2/bookmark_dialog.c:176 ../src/gnome2/bookmarks_menu.c:868
+#: ../src/gnome2/bookmarks_treeview.c:136
 msgid "Folder: "
-msgstr "Ffolder:"
+msgstr "Ffolder: "
 
-#: ../src/gnome2/bookmarks_menu.c:457 ../src/gnome2/treekey-editor.c:321
-#: ../ui/xi-menus.glade.h:20
+#: ../src/gnome2/bookmarks_menu.c:344 ../ui/xi-menus.glade.h:32
 msgid "Edit"
 msgstr "Golygu"
 
-#: ../src/gnome2/bookmarks_menu.c:474
+#: ../src/gnome2/bookmarks_menu.c:361
 msgid "Folder name: "
-msgstr "Enw Ffolder:"
+msgstr "Enw Ffolder: "
 
-#: ../src/gnome2/bookmarks_menu.c:477
+#: ../src/gnome2/bookmarks_menu.c:364
 msgid "Bookmark name: "
-msgstr "Enw Nod Tudalen:"
+msgstr "Enw Nod Tudalen: "
 
-#: ../src/gnome2/bookmarks_menu.c:480 ../src/gnome2/bookmarks_menu.c:905
+#: ../src/gnome2/bookmarks_menu.c:367 ../src/gnome2/bookmarks_menu.c:773
 msgid "Verse: "
-msgstr "Adnod:"
+msgstr "Adnod: "
 
-#: ../src/gnome2/bookmarks_menu.c:481 ../src/gnome2/bookmarks_menu.c:906
+#: ../src/gnome2/bookmarks_menu.c:368 ../src/gnome2/bookmarks_menu.c:774
 msgid "Module: "
 msgstr "Modiwl: "
 
-#: ../src/gnome2/bookmarks_menu.c:665
+#: ../src/gnome2/bookmarks_menu.c:533
 msgid "Restore Bookmark Folder"
 msgstr "Adfer Ffolder Nod Tudalen"
 
-#: ../src/gnome2/bookmarks_menu.c:734
+#: ../src/gnome2/bookmarks_menu.c:602
 msgid "Remove the selected folder"
 msgstr "Diddymu’r ffolder ddewiswyd"
 
-#: ../src/gnome2/bookmarks_menu.c:736
+#: ../src/gnome2/bookmarks_menu.c:604
 msgid "(and all its contents)?"
 msgstr "(a’i holl gynnwys)?"
 
-#: ../src/gnome2/bookmarks_menu.c:739
+#: ../src/gnome2/bookmarks_menu.c:607
 msgid "Remove the selected bookmark"
 msgstr "Diddymu’r Nod Tudalen a ddewiswyd"
 
-#: ../src/gnome2/bookmarks_menu.c:898
+#: ../src/gnome2/bookmarks_menu.c:766
 msgid "Add"
 msgstr "Ychwanegu"
 
-#: ../src/gnome2/bookmarks_menu.c:904
+#: ../src/gnome2/bookmarks_menu.c:772
 msgid "Label: "
 msgstr "Label: "
 
-#: ../src/gnome2/bookmarks_treeview.c:105
+#: ../src/gnome2/bookmarks_treeview.c:107
+#, c-format
 msgid "Search result: %s"
 msgstr "Canlyniadau’r Chwiliad: %s"
 
-#: ../src/gnome2/bookmarks_treeview.c:934 ../src/gnome2/sidebar.c:1438
+#: ../src/gnome2/bookmarks_treeview.c:943 ../src/gnome2/sidebar.c:1389
 msgid "Bookmarks"
 msgstr "Nodau Tudalen"
 
@@ -339,101 +365,172 @@ msgstr "i:"
 msgid "Enter Cipher Key: "
 msgstr "Teipio Allwedd Seiffr: "
 
-#: ../src/gnome2/dialog.c:241
+#: ../src/gnome2/dialog.c:265
 msgid "Close without Saving"
 msgstr "Cau heb Gadw"
 
-#: ../src/gnome2/dialog.c:730
+#: ../src/gnome2/dialog.c:596
 msgid "Xiphos:"
 msgstr "Xiphos:"
 
-#: ../src/gnome2/dialog.c:831
+#: ../src/gnome2/dialog.c:697
 msgid "Close _without Saving"
 msgstr "Cau _heb gadw"
 
-#: ../src/gnome2/export_dialog.c:265 ../ui/export-dialog.glade.h:20
-#, fuzzy
+#: ../src/gnome2/export_dialog.c:267 ../ui/export-dialog.glade.h:20
 msgid "Please check copyright before exporting!"
-msgstr "Gwiriwch yr hawlfraint cyn ei allforio!"
+msgstr ""
 
-#: ../src/gnome2/find_dialog.c:200 ../src/gnome2/find_dialog.c:369
+#: ../src/gnome2/find_dialog.c:204 ../src/gnome2/find_dialog.c:373
 msgid "Find"
 msgstr "Darganfod"
 
-#: ../src/gnome2/find_dialog.c:218
+#: ../src/gnome2/find_dialog.c:222
 msgid "Enter Word or Phrase"
 msgstr "Teipio Gair neu Gymal"
 
-#: ../src/gnome2/find_dialog.c:234 ../src/gnome2/search_sidebar.c:303
-#: ../ui/search-dialog.glade.h:57
+#: ../src/gnome2/find_dialog.c:238 ../src/gnome2/search_sidebar.c:306
+#: ../ui/search-dialog.glade.h:59
 msgid "Match case"
 msgstr "Cydweddu"
 
-#: ../src/gnome2/find_dialog.c:241
+#: ../src/gnome2/find_dialog.c:245
 msgid "Search backwards"
 msgstr "Chwilio yn ôl"
 
-#: ../src/gnome2/find_dialog.c:250 ../src/gnome2/search_sidebar.c:268
-#: ../ui/search-dialog.glade.h:74
+#: ../src/gnome2/find_dialog.c:254 ../src/gnome2/search_sidebar.c:271
+#: ../ui/search-dialog.glade.h:76
 msgid "Regular expression"
 msgstr "Ymadrodd cyson"
 
-#: ../src/gnome2/find_dialog.c:291
+#: ../src/gnome2/find_dialog.c:295
 msgid "Find Next"
 msgstr "Darganfod Nesaf"
 
-#: ../src/gnome2/font_dialog.c:301
+#: ../src/gnome2/font_dialog.c:303
 msgid "Set Module Font"
 msgstr "Gosod ffont y Modiwl"
 
-#: ../src/gnome2/font_dialog.c:331
+#: ../src/gnome2/font_dialog.c:333
 msgid "Change font for"
 msgstr "Newid ffont i"
 
-#: ../src/gnome2/font_dialog.c:335
+#: ../src/gnome2/font_dialog.c:337
 msgid "Module"
 msgstr "Modiwl"
 
-#: ../src/gnome2/font_dialog.c:339
+#: ../src/gnome2/font_dialog.c:341
 msgid "Current font: "
 msgstr "Ffont cyfredol: "
 
-#: ../src/gnome2/font_dialog.c:376
+#: ../src/gnome2/font_dialog.c:378
 msgid "+0"
 msgstr "+0"
 
-#: ../src/gnome2/font_dialog.c:380
+#: ../src/gnome2/font_dialog.c:382
 msgid "Use the default font for this module"
 msgstr "Defnyddio’r ffont diofyn i’r modiwl"
 
-#: ../src/gnome2/main_window.c:740
+#. *****************************************************************************
+#. * Name
+#. *    gconf_setup
+#. *
+#. * Synopsis
+#. *   #include "main/settings.h"
+#. *
+#. *   void gconf_setup()
+#. *
+#. * Description
+#. *   verifies and initializes the GConf subsystem, so that "sword://" and
+#. *   similar can be handled by url-comprehending programs such as browsers.
+#. *   dialogs for permission/success/failure => conditional on debug build.
+#. *
+#. * Return value
+#. *   void
+#.
+#: ../src/gnome2/gui.c:110
+msgid ""
+"URL references using \"sword://\" (similar to web page\n"
+"references) can be used by programs to look up\n"
+"scripture references. Your system currently has no\n"
+"program set to handle these references.\n"
+"\n"
+"Would you like Xiphos to set itself as the\n"
+"program to handle these references?"
+msgstr ""
+"Gellir defnyddio cyfeirnodau URL yn defnyddio \"sword://\" \n"
+"(tebyg i gyfeirnodau tudalen we) gan raglenni i edrych ar\n"
+"gyfeiriadau ysgrythyrol. Ar hyn o bryd nid yw eich rhaglen\n"
+"wedi ei osod i reoli y cyfeirnodau hyn.\n"
+"\n"
+"Garech chi i Xiphos osod ei hun fel y rhaglen\n"
+"i reoli y cyfeirnodau hyn?"
+
+#: ../src/gnome2/gui.c:112
+msgid ""
+"Xiphos has successfully set itself\n"
+"as the handler of sword:// and bible:// URLs.\n"
+"\n"
+"You may wish to run the program \"gconf-editor\"\n"
+"to examine keys under /desktop/gnome/url-handlers,\n"
+"if you need to change these."
+msgstr ""
+"Mae Xiphos wedi llwyddo i osod ei hun\n"
+"fel rheolydd URLiau sword:// a bible://.\n"
+"\n"
+"Efallai y carech redeg y rhaglen \"gconf-editor\"\n"
+"i edrych ar allweddau dan /bwrdd gwaith/gnome/rheolwyr-url\n"
+"os oes angen eu newid."
+
+#: ../src/gnome2/gui.c:166
+#, c-format
+msgid ""
+"Xiphos failed to complete handler init for key #%d:\n"
+"%s"
+msgstr ""
+"Methodd Xiphos ymgychwyn y rheolwr i allwedd #%d:\n"
+"%s is mislukt"
+
+#: ../src/gnome2/gui.c:212
+msgid "BUG! Xiphos is about to crash due to a \"STRDUP\" error."
+msgstr ""
+
+#: ../src/gnome2/gui.c:213 ../src/gnome2/gui.c:248
+msgid "Please report this error to the Xiphos team with:"
+msgstr ""
+
+#: ../src/gnome2/gui.c:247
+msgid "BUG! Xiphos is about to crash due to a \"STRING\" error."
+msgstr ""
+
+#: ../src/gnome2/main_window.c:789
 msgid "Xiphos - Bible Study Software"
 msgstr "Xiphos – Meddalwedd Astudio’r Beibl"
 
-#: ../src/gnome2/main_window.c:794
+#: ../src/gnome2/main_window.c:844
 msgid "Open a new tab"
 msgstr "Agor tab newydd"
 
-#: ../src/gnome2/main_window.c:880 ../src/gnome2/sidebar.c:600
-#: ../src/gnome2/sidebar.c:606 ../src/main/sidebar.cc:638
-#: ../src/main/sidebar.cc:964 ../src/main/sidebar.cc:965
-#: ../src/main/sidebar.cc:966
+#: ../src/gnome2/main_window.c:923 ../src/gnome2/sidebar.c:627
+#: ../src/gnome2/sidebar.c:633 ../src/main/sidebar.cc:666
+#: ../src/main/sidebar.cc:1015 ../src/main/sidebar.cc:1016
+#: ../src/main/sidebar.cc:1017
 msgid "Standard View"
 msgstr "Golwg Safonol"
 
-#: ../src/gnome2/main_window.c:957
+#: ../src/gnome2/main_window.c:1004
 msgid "Commentary View"
 msgstr "Golwg Esboniad"
 
-#: ../src/gnome2/main_window.c:973
+#: ../src/gnome2/main_window.c:1020
 msgid "Book View"
 msgstr "Golwg Llyfr"
 
-#: ../src/gnome2/main_window.c:998
+#: ../src/gnome2/main_window.c:1045
 msgid "Welcome to Xiphos"
 msgstr "Croeso i Xiphos"
 
-#: ../src/gnome2/menu_popup.c:1126
+#: ../src/gnome2/menu_popup.c:1168
 msgid ""
 "Renaming is not available in Windows.\n"
 "\n"
@@ -453,33 +550,34 @@ msgstr ""
 "Felly, ni ellir ailenwi esboniad personol\n"
 "yn amgylchedd Windows."
 
-#: ../src/gnome2/menu_popup.c:1145
+#: ../src/gnome2/menu_popup.c:1187
 msgid "Rename Commentary"
 msgstr "Ailenwi’r Esboniad"
 
-#: ../src/gnome2/menu_popup.c:1148
+#: ../src/gnome2/menu_popup.c:1190
 msgid "Choose Commentary Name"
 msgstr "Dewis enw i’r Esboniad"
 
-#: ../src/gnome2/menu_popup.c:1150
+#: ../src/gnome2/menu_popup.c:1192
 msgid "New Name"
 msgstr "Enw Newydd"
 
-#: ../src/gnome2/menu_popup.c:1151 ../src/gnome2/treekey-editor.c:131
-#: ../src/gnome2/treekey-editor.c:190 ../src/gnome2/treekey-editor.c:276
-#: ../src/main/prayerlists.cc:240
+#: ../src/gnome2/menu_popup.c:1193 ../src/gnome2/treekey-editor.c:139
+#: ../src/gnome2/treekey-editor.c:198 ../src/gnome2/treekey-editor.c:284
+#: ../src/main/prayerlists.cc:243
 msgid "Name: "
 msgstr "Enw: "
 
-#: ../src/gnome2/menu_popup.c:1161 ../src/main/prayerlists.cc:254
+#: ../src/gnome2/menu_popup.c:1203 ../src/main/prayerlists.cc:257
 msgid "Module names must contain [A-Za-z0-9_] only."
 msgstr "Dylai enwau Modiwlau gynnwys llythrennau a rhifau yn unig."
 
-#: ../src/gnome2/menu_popup.c:1168 ../src/main/prayerlists.cc:261
+#: ../src/gnome2/menu_popup.c:1210 ../src/main/prayerlists.cc:264
 msgid "Xiphos already knows a module by that name."
 msgstr "Mae Xiphos eisoes yn gwybod am Fodiwl gyda’r enw yna."
 
-#: ../src/gnome2/menu_popup.c:1211
+#: ../src/gnome2/menu_popup.c:1253
+#, c-format
 msgid ""
 "Failed to create new configuration:\n"
 "%s"
@@ -487,7 +585,7 @@ msgstr ""
 "Methwyd creu ffurfwedd newydd:\n"
 "%s"
 
-#: ../src/gnome2/menu_popup.c:1220
+#: ../src/gnome2/menu_popup.c:1262
 msgid ""
 "Configuration build error:\n"
 "\n"
@@ -495,147 +593,193 @@ msgstr ""
 "Gwall creu ffurfwedd:\n"
 "\n"
 
-#: ../src/gnome2/mod_mgr.c:333
-msgid "Install these modules:"
-msgstr "Gosod y Modiwlau hyn:"
+#: ../src/gnome2/mod_mgr.c:169
+msgid "Remove these modules?"
+msgstr ""
 
-#: ../src/gnome2/mod_mgr.c:335
-msgid "Remove these modules:"
-msgstr "Dileu y Modiwlau hyn:"
+#: ../src/gnome2/mod_mgr.c:170
+msgid "Preparing to remove"
+msgstr "Paratoi i ddileu"
 
-#: ../src/gnome2/mod_mgr.c:337
-msgid "Archive these modules:"
-msgstr "Archifo’r Modiwlau hyn:"
+#: ../src/gnome2/mod_mgr.c:171
+msgid "Removing"
+msgstr "Dileu"
 
-#: ../src/gnome2/mod_mgr.c:339
-msgid ""
-"Build fast-search index for these\n"
-"modules (may take minutes/module):"
-msgstr ""
-"Creu mynegai  chwilio cyflym i’r \n"
-"modiwlau hyn (gall gymryd sawl munud y modiwl):"
+#: ../src/gnome2/mod_mgr.c:172 ../ui/xi-menus.glade.h:72
+msgid "Remove"
+msgstr "Dileu"
 
-#: ../src/gnome2/mod_mgr.c:341
-msgid "Delete fast-search index for these modules:"
-msgstr "Dileu’r mynegai chwilio cyflym i’r modiwlau hyn:"
+#: ../src/gnome2/mod_mgr.c:175
+msgid "Install these modules?"
+msgstr ""
 
-#: ../src/gnome2/mod_mgr.c:361
+#: ../src/gnome2/mod_mgr.c:176
 msgid "Preparing to install"
 msgstr "Paratoi i osod"
 
-#: ../src/gnome2/mod_mgr.c:363
-msgid "Preparing to remove"
-msgstr "Paratoi i ddileu"
+#: ../src/gnome2/mod_mgr.c:177
+msgid "Installing"
+msgstr "Gosod"
+
+#: ../src/gnome2/mod_mgr.c:178 ../src/gnome2/mod_mgr.c:2964
+#: ../ui/module-manager.glade.h:18
+msgid "Install"
+msgstr "Gosod"
 
-#: ../src/gnome2/mod_mgr.c:365
+#: ../src/gnome2/mod_mgr.c:181
+msgid "Archive these modules?"
+msgstr ""
+
+#: ../src/gnome2/mod_mgr.c:182
 msgid "Preparing to archive"
 msgstr "Paratoi i archifo"
 
-#: ../src/gnome2/mod_mgr.c:367
+#: ../src/gnome2/mod_mgr.c:183
+msgid "Archiving"
+msgstr "Archifo"
+
+#: ../src/gnome2/mod_mgr.c:184 ../ui/module-manager.glade.h:11
+msgid "Archive"
+msgstr "Archifo"
+
+#: ../src/gnome2/mod_mgr.c:187
+msgid ""
+"Build fast-search index for these\n"
+"modules (may take minutes/module)?"
+msgstr ""
+
+#: ../src/gnome2/mod_mgr.c:188
 msgid "Preparing to index"
 msgstr "Paratoi i greu mynegai"
 
-#: ../src/gnome2/mod_mgr.c:369
+#: ../src/gnome2/mod_mgr.c:189
+msgid "Indexing"
+msgstr "Creu Mynegai"
+
+#: ../src/gnome2/mod_mgr.c:190 ../ui/module-manager.glade.h:17
+msgid "Index"
+msgstr "Mynegai"
+
+#: ../src/gnome2/mod_mgr.c:193
+msgid "Delete fast-search index for these modules?"
+msgstr ""
+
+#: ../src/gnome2/mod_mgr.c:194
 msgid "Preparing to delete index"
 msgstr "Paratoi i ddileu mynegai"
 
-#: ../src/gnome2/mod_mgr.c:394
-msgid "Installing"
-msgstr "Gosod"
+#: ../src/gnome2/mod_mgr.c:195
+msgid "Deleting index"
+msgstr "Dileu Mynegai"
 
-#: ../src/gnome2/mod_mgr.c:396
-msgid "Removing"
-msgstr "Dileu"
+#: ../src/gnome2/mod_mgr.c:196
+msgid "Deletion"
+msgstr "Dilewyd"
 
-#: ../src/gnome2/mod_mgr.c:398
-msgid "Archiving"
-msgstr "Archifo"
+#: ../src/gnome2/mod_mgr.c:427
+msgid "Module Name"
+msgstr "Enw’r Modiwl"
 
-#: ../src/gnome2/mod_mgr.c:400
-msgid "Indexing"
-msgstr "Creu Mynegai"
+#: ../src/gnome2/mod_mgr.c:448
+msgid "A checkmark means this module is already installed"
+msgstr "Mae marc gwiro yn golygu fod y modiwl hwn wedi ei osod eisoes"
 
-#: ../src/gnome2/mod_mgr.c:402
-msgid "Deleting index"
-msgstr "Dileu Mynegai"
+#: ../src/gnome2/mod_mgr.c:470
+msgid "Click the box to work on this module"
+msgstr "Clicio'r bocs i weithio ar y modiwl"
+
+#: ../src/gnome2/mod_mgr.c:471
+msgid "Click the box to select this module for install/update"
+msgstr "Clicio'r bocs i ddewis y modiwl hwn i'w osod/ddiweddaru"
+
+#: ../src/gnome2/mod_mgr.c:490
+msgid "Installed"
+msgstr "Gosodwyd"
 
-#: ../src/gnome2/mod_mgr.c:422
+#: ../src/gnome2/mod_mgr.c:500
 msgid ""
-"`mkdir %s' failed:\n"
-"%s."
+"The index icon means you have built an optimized ('lucene') index for this "
+"module for fast searching (see the Maintenance pane for this function)"
 msgstr ""
-"`mkdir %s' wedi methu:\n"
-"%s."
-
-#: ../src/gnome2/mod_mgr.c:448
-msgid "Xiphos could not execute archiver"
-msgstr "Allai Xiphos ddim dechrau’r archifwr"
+"mae eicon y mynegai yn golygu eich bod wedi adeiladu mynegai ('lucene')llawn "
+"wedi ei optimeiddio i'r modiwl hwn ar gyfer chwilio cyflym (gweler y cwarel "
+"Cynnal a Chadw ar gyfe y swyddogaeth yma)"
 
-#: ../src/gnome2/mod_mgr.c:453
+#: ../src/gnome2/mod_mgr.c:518
 msgid ""
-" archival result:\n"
-"\n"
+"The lock icon means this module is encrypted, and requires that you purchase "
+"an unlock key from the content owner"
 msgstr ""
-"canlyniad archifol:\n"
-"\n"
+"Mae'r eicon clo yn golygu fod y modiwl hwn wedi ei amgryptio, a bod angen i "
+"chi brynu allwedd gan berchennog y cynnwys"
 
-#: ../src/gnome2/mod_mgr.c:457
+#: ../src/gnome2/mod_mgr.c:535 ../ui/xi-menus.glade.h:1
+msgid "About"
+msgstr "Am"
+
+#: ../src/gnome2/mod_mgr.c:555
 msgid ""
-"\n"
-"Archive in "
+"The refresh icon means the Installed module is older than the newer "
+"Available module: You should update the module"
 msgstr ""
-"\n"
-"Archifo yn "
+"Mae'r eicon adnewyddu yn golygu fod y modiwl yn hyn na'r modiwl newydd sydd "
+"ar gael: Mae angen diweddaru'r modiwl"
 
-#: ../src/gnome2/mod_mgr.c:514
-msgid "Journals and prayer lists cannot be indexed."
-msgstr "Ni ellir creu mynegai i Ddyddlyfrau a rhestrau gweddi"
+#: ../src/gnome2/mod_mgr.c:567
+msgid "Available"
+msgstr "Ar gael"
 
-#: ../src/gnome2/mod_mgr.c:535 ../src/gnome2/mod_mgr.c:2753
-#: ../ui/module-manager.glade.h:15
-msgid "Install"
-msgstr "Gosod"
+#: ../src/gnome2/mod_mgr.c:576
+msgid "Size"
+msgstr "Maint"
 
-#: ../src/gnome2/mod_mgr.c:537 ../src/gnome2/treekey-editor.c:315
-msgid "Remove"
-msgstr "Dileu"
+#: ../src/gnome2/mod_mgr.c:585
+msgid "Description"
+msgstr "Disgrifiad"
 
-#: ../src/gnome2/mod_mgr.c:539
-msgid "Archive"
-msgstr "Archifo"
+#: ../src/gnome2/mod_mgr.c:736
+#, c-format
+msgid ""
+"`mkdir %s' failed:\n"
+"%s."
+msgstr ""
+"`mkdir %s' wedi methu:\n"
+"%s."
 
-#: ../src/gnome2/mod_mgr.c:541
-msgid "Index"
-msgstr "Mynegai"
+#: ../src/gnome2/mod_mgr.c:759
+msgid " archived in: \n"
+msgstr ""
 
-#: ../src/gnome2/mod_mgr.c:543
-msgid "Deletion"
-msgstr "Dilewyd"
+#: ../src/gnome2/mod_mgr.c:815
+msgid "Journals and prayer lists cannot be indexed."
+msgstr "Ni ellir creu mynegai i Ddyddlyfrau a rhestrau gweddi"
 
-#: ../src/gnome2/mod_mgr.c:545
+#: ../src/gnome2/mod_mgr.c:833
+#, c-format
 msgid "%s failed"
 msgstr "%s wedi methu"
 
-#: ../src/gnome2/mod_mgr.c:547 ../src/gnome2/mod_mgr.c:1267
+#: ../src/gnome2/mod_mgr.c:836 ../src/gnome2/mod_mgr.c:1562
 msgid "Finished"
 msgstr "Wedi gorffen"
 
-#: ../src/gnome2/mod_mgr.c:712 ../src/gnome2/mod_mgr.c:714
-#: ../src/gnome2/mod_mgr.c:816 ../src/gnome2/mod_mgr.c:851
-#: ../src/gnome2/mod_mgr.c:853 ../src/gnome2/utilities.c:346
-#: ../src/gnome2/utilities.c:411 ../src/gnome2/utilities.c:413
-#: ../src/gnome2/utilities.c:1031 ../src/main/sidebar.cc:801
-#: ../src/main/sidebar.cc:873 ../src/main/sidebar.cc:875
+#: ../src/gnome2/mod_mgr.c:1003 ../src/gnome2/mod_mgr.c:1005
+#: ../src/gnome2/mod_mgr.c:1107 ../src/gnome2/mod_mgr.c:1142
+#: ../src/gnome2/mod_mgr.c:1144 ../src/gnome2/utilities.c:435
+#: ../src/gnome2/utilities.c:500 ../src/gnome2/utilities.c:502
+#: ../src/gnome2/utilities.c:986 ../src/main/sidebar.cc:852
+#: ../src/main/sidebar.cc:924 ../src/main/sidebar.cc:926
 msgid "Unknown"
 msgstr "Anhysbys"
 
-#: ../src/gnome2/mod_mgr.c:1012
+#: ../src/gnome2/mod_mgr.c:1301
+#, c-format
 msgid ""
 "Repository:\n"
 "%s"
 msgstr ""
 
-#: ../src/gnome2/mod_mgr.c:1024
+#: ../src/gnome2/mod_mgr.c:1313
 msgid ""
 "Categorized by\n"
 "Module Type"
@@ -643,386 +787,402 @@ msgstr ""
 "Dosbarthwyd yn ôl\n"
 "Math o Fodiwl"
 
-#: ../src/gnome2/mod_mgr.c:1029 ../src/gnome2/utilities.c:472
-#: ../src/main/sidebar.cc:948 ../src/main/sidebar.cc:950
+#: ../src/gnome2/mod_mgr.c:1318 ../src/gnome2/utilities.c:561
+#: ../src/main/sidebar.cc:999 ../src/main/sidebar.cc:1001
 msgid "Biblical Texts"
 msgstr "Testunau Beiblaidd"
 
-#: ../src/gnome2/mod_mgr.c:1033 ../src/gnome2/utilities.c:476
-#: ../src/main/sidebar.cc:650 ../src/main/sidebar.cc:973
-#: ../src/main/sidebar.cc:975 ../ui/prefs.glade.h:33
+#: ../src/gnome2/mod_mgr.c:1322 ../src/gnome2/utilities.c:565
+#: ../src/main/sidebar.cc:678 ../src/main/sidebar.cc:1024
+#: ../src/main/sidebar.cc:1026 ../ui/prefs.glade.h:33
 msgid "Commentaries"
 msgstr "Esboniadau"
 
-#: ../src/gnome2/mod_mgr.c:1037 ../src/gnome2/utilities.c:480
-#: ../src/main/sidebar.cc:982 ../src/main/sidebar.cc:984
+#: ../src/gnome2/mod_mgr.c:1326 ../src/gnome2/utilities.c:569
+#: ../src/main/sidebar.cc:1033 ../src/main/sidebar.cc:1035
 msgid "Dictionaries"
 msgstr "Geiriaduron"
 
-#: ../src/gnome2/mod_mgr.c:1041 ../src/gnome2/utilities.c:484
-#: ../src/main/sidebar.cc:991 ../src/main/sidebar.cc:993
+#: ../src/gnome2/mod_mgr.c:1330 ../src/gnome2/utilities.c:573
+#: ../src/main/sidebar.cc:1042 ../src/main/sidebar.cc:1044
 msgid "Daily Devotionals"
 msgstr "Defosiwn Dyddiol"
 
-#: ../src/gnome2/mod_mgr.c:1045 ../src/gnome2/utilities.c:488
-#: ../src/main/sidebar.cc:660 ../src/main/sidebar.cc:1000
-#: ../src/main/sidebar.cc:1002
+#: ../src/gnome2/mod_mgr.c:1334 ../src/gnome2/utilities.c:577
+#: ../src/main/sidebar.cc:688 ../src/main/sidebar.cc:1051
+#: ../src/main/sidebar.cc:1053
 msgid "General Books"
 msgstr "Llyfrau"
 
-#: ../src/gnome2/mod_mgr.c:1049 ../src/gnome2/utilities.c:492
-#: ../src/main/sidebar.cc:1009 ../src/main/sidebar.cc:1011
+#: ../src/gnome2/mod_mgr.c:1338 ../src/gnome2/utilities.c:581
+#: ../src/main/sidebar.cc:1060 ../src/main/sidebar.cc:1062
 msgid "Maps"
 msgstr "Mapiau"
 
-#: ../src/gnome2/mod_mgr.c:1053 ../src/gnome2/utilities.c:496
-#: ../src/main/sidebar.cc:1018 ../src/main/sidebar.cc:1020
+#: ../src/gnome2/mod_mgr.c:1342 ../src/gnome2/utilities.c:585
+#: ../src/main/sidebar.cc:1069 ../src/main/sidebar.cc:1071
 msgid "Images"
 msgstr "Lluniau"
 
-#: ../src/gnome2/mod_mgr.c:1061
+#: ../src/gnome2/mod_mgr.c:1350
 msgid ""
 "Categorized by\n"
 "Availability"
 msgstr ""
-" Dosbarthwyd yn ôl\n"
+"Dosbarthwyd yn ôl\n"
 "Argaeledd"
 
-#: ../src/gnome2/mod_mgr.c:1066
+#: ../src/gnome2/mod_mgr.c:1355
 msgid "Updates"
 msgstr "Diweddariadau"
 
-#: ../src/gnome2/mod_mgr.c:1070
+#: ../src/gnome2/mod_mgr.c:1359
 msgid "Uninstalled"
 msgstr "Dadosodwyd"
 
-#: ../src/gnome2/mod_mgr.c:1074 ../src/gnome2/sidebar.c:616
-#: ../src/gnome2/utilities.c:501 ../src/main/prayerlists.cc:238
-#: ../src/main/sidebar.cc:1028 ../src/main/sidebar.cc:1030
+#: ../src/gnome2/mod_mgr.c:1363 ../src/gnome2/sidebar.c:643
+#: ../src/gnome2/utilities.c:590 ../src/main/prayerlists.cc:241
+#: ../src/main/sidebar.cc:1079 ../src/main/sidebar.cc:1081
 msgid "Prayer List/Journal"
 msgstr "Rhestr Weddi/Dyddlyfr"
 
-#: ../src/gnome2/mod_mgr.c:1250
-msgid "Refreshing remote"
-msgstr "Adnewyddu’r cyrchiad  pell"
-
-#: ../src/gnome2/mod_mgr.c:1261
-msgid "Remote not found"
-msgstr "Methu canfod cyrchiad pell"
-
-#: ../src/gnome2/mod_mgr.c:1393
-msgid "Module Name"
-msgstr "Enw’r Modiwl"
-
-#: ../src/gnome2/mod_mgr.c:1414
-msgid "A checkmark means this module is already installed"
-msgstr "Mae marc gwiro yn golygu fod y modiwl hwn wedi ei osod eisoes"
-
-#: ../src/gnome2/mod_mgr.c:1436
-msgid "Click the box to work on this module"
-msgstr "Clicio'r bocs i weithio ar y modiwl"
-
-#: ../src/gnome2/mod_mgr.c:1437
-msgid "Click the box to select this module for install/update"
-msgstr "Clicio'r bocs i ddewis y modiwl hwn i'w osod/ddiweddaru"
-
-#: ../src/gnome2/mod_mgr.c:1456
-msgid "Installed"
-msgstr "Gosodwyd"
-
-#: ../src/gnome2/mod_mgr.c:1466
-msgid ""
-"The index icon means you have built an optimized ('lucene') index for this "
-"module for fast searching (see the Maintenance pane for this function)"
-msgstr ""
-"mae eicon y mynegai yn golygu eich bod wedi adeiladu mynegai ('lucene')llawn "
-"wedi ei optimeiddio i'r modiwl hwn ar gyfer chwilio cyflym (gweler y cwarel "
-"Cynnal a Chadw ar gyfe y swyddogaeth yma)"
-
-#: ../src/gnome2/mod_mgr.c:1484
-msgid ""
-"The lock icon means this module is encrypted, and requires that you purchase "
-"an unlock key from the content owner"
+#: ../src/gnome2/mod_mgr.c:1545
+msgid "Refreshing from remote source"
 msgstr ""
-"Mae'r eicon clo yn golygu fod y modiwl hwn wedi ei amgryptio, a bod angen i "
-"chi brynu allwedd gan berchennog y cynnwys"
 
-#. 2
-#: ../src/gnome2/mod_mgr.c:1501 ../src/gnome2/sidebar.c:954
-#: ../src/gnome2/sidebar.c:1122 ../ui/xi-menus.glade.h:1
-msgid "About"
-msgstr "Am"
-
-#: ../src/gnome2/mod_mgr.c:1521
-msgid ""
-"The refresh icon means the Installed module is older than the newer "
-"Available module: You should update the module"
+#: ../src/gnome2/mod_mgr.c:1556
+msgid "Remote source not found"
 msgstr ""
-"Mae'r eicon adnewyddu yn golygu fod y modiwl yn hyn na'r modiwl newydd sydd "
-"ar gael: Mae angen diweddaru'r modiwl"
 
-#: ../src/gnome2/mod_mgr.c:1533
-msgid "Available"
-msgstr "Ar gael"
-
-#: ../src/gnome2/mod_mgr.c:1542
-msgid "Size"
-msgstr "Maint"
-
-#: ../src/gnome2/mod_mgr.c:1551
-msgid "Description"
-msgstr "Disgrifiad"
-
-#: ../src/gnome2/mod_mgr.c:1583 ../src/gnome2/mod_mgr.c:1660
+#: ../src/gnome2/mod_mgr.c:1670
 msgid "Configure"
 msgstr "Ffurfweddu"
 
-#: ../src/gnome2/mod_mgr.c:1614
+#: ../src/gnome2/mod_mgr.c:1701
 msgid "Type"
 msgstr "Teip"
 
-#: ../src/gnome2/mod_mgr.c:1621
+#: ../src/gnome2/mod_mgr.c:1708
 msgid "Caption"
 msgstr "Pennawd"
 
-#: ../src/gnome2/mod_mgr.c:1629
+#: ../src/gnome2/mod_mgr.c:1716
 msgid "Source"
 msgstr "Ffynhonnell"
 
-#: ../src/gnome2/mod_mgr.c:1637
+#: ../src/gnome2/mod_mgr.c:1724
 msgid "Directory"
 msgstr "Cyfeiriadur"
 
-#: ../src/gnome2/mod_mgr.c:1658
-msgid "Sources"
-msgstr "Ffeiliau tarddiad"
+#: ../src/gnome2/mod_mgr.c:1732
+msgid "User"
+msgstr ""
+
+#: ../src/gnome2/mod_mgr.c:1740
+msgid "Password"
+msgstr ""
+
+#: ../src/gnome2/mod_mgr.c:1748
+msgid "UID"
+msgstr ""
 
-#: ../src/gnome2/mod_mgr.c:1664 ../src/gnome2/preferences_dialog.c:1784
-#: ../src/gnome2/sidebar.c:1462
+#: ../src/gnome2/mod_mgr.c:1765
+msgid "Module Sources"
+msgstr ""
+
+#: ../src/gnome2/mod_mgr.c:1768
+msgid "Add/Remove"
+msgstr ""
+
+#: ../src/gnome2/mod_mgr.c:1770
+msgid "Choose"
+msgstr ""
+
+#: ../src/gnome2/mod_mgr.c:1774 ../src/gnome2/preferences_dialog.c:1793
+#: ../src/gnome2/sidebar.c:1413
 msgid "Modules"
 msgstr "Modiwlau"
 
-#: ../src/gnome2/mod_mgr.c:1666
+#: ../src/gnome2/mod_mgr.c:1776
 msgid "Install/Update"
 msgstr "Gosod/Diweddariad"
 
-#: ../src/gnome2/mod_mgr.c:1668
+#: ../src/gnome2/mod_mgr.c:1778
 msgid "Maintenance"
 msgstr "Cynhaliaeth"
 
-#: ../src/gnome2/mod_mgr.c:1872
+#: ../src/gnome2/mod_mgr.c:1999
 msgid "Please Refresh"
 msgstr "Adnewyddwch"
 
-#: ../src/gnome2/mod_mgr.c:1873
+#: ../src/gnome2/mod_mgr.c:2000
 msgid "Your module list is not up to date!"
 msgstr "Nid yw eich rhestr modiwlau wedi’i diweddaru!"
 
-#: ../src/gnome2/mod_mgr.c:2336 ../src/gnome2/mod_mgr.c:2542
+#. Zero Bibles is just not workable in Xiphos.
+#: ../src/gnome2/mod_mgr.c:2282
+msgid ""
+"You have uninstalled your last Bible.\n"
+"Xiphos requires at least one."
+msgstr ""
+
+#: ../src/gnome2/mod_mgr.c:2288
+msgid ""
+"There are still no Bibles installed.\n"
+"Xiphos cannot continue without one."
+msgstr ""
+
+#: ../src/gnome2/mod_mgr.c:2353
+msgid "Standard remote sources have been loaded."
+msgstr ""
+
+#: ../src/gnome2/mod_mgr.c:2359
+msgid "Could not load standard sources from CrossWire."
+msgstr ""
+
+#: ../src/gnome2/mod_mgr.c:2510 ../src/gnome2/mod_mgr.c:2759
 msgid "Remove the selected source"
 msgstr "Diddymu’r Ffynhonnell ddewiswyd"
 
-#: ../src/gnome2/mod_mgr.c:2393
+#: ../src/gnome2/mod_mgr.c:2570
 msgid "Enter a remote source"
 msgstr "Agor ffynhonell cyrchiad pell"
 
-#: ../src/gnome2/mod_mgr.c:2397
+#: ../src/gnome2/mod_mgr.c:2574
 msgid "Caption:"
 msgstr "Pennawd:"
 
-#: ../src/gnome2/mod_mgr.c:2398
+#: ../src/gnome2/mod_mgr.c:2575
 msgid "Type:"
 msgstr "Teip:"
 
-#: ../src/gnome2/mod_mgr.c:2399
+#: ../src/gnome2/mod_mgr.c:2576
 msgid "Host:"
 msgstr "Gwesteiwr:"
 
-#: ../src/gnome2/mod_mgr.c:2400
+#: ../src/gnome2/mod_mgr.c:2577
 msgid "Directory:"
 msgstr "Cyfeiriadur:"
 
+#: ../src/gnome2/mod_mgr.c:2579
+msgid "User (optional):"
+msgstr ""
+
+#: ../src/gnome2/mod_mgr.c:2580
+msgid "Password (optional):"
+msgstr ""
+
 #. this can happen at most once
-#: ../src/gnome2/mod_mgr.c:2425
+#: ../src/gnome2/mod_mgr.c:2608
 msgid "A source by that name already exists."
 msgstr "Mae ffynhonell o’r enw hwnnw yn bod eisoes."
 
-#: ../src/gnome2/mod_mgr.c:2539
-#, fuzzy
+#: ../src/gnome2/mod_mgr.c:2756
 msgid "Delete a remote source"
-msgstr "Agor ffynhonell cyrchiad pell"
+msgstr ""
+
+#. *****************************************************************************
+#. * Name
+#. *   gui_open_mod_mgr
+#. *
+#. * Synopsis
+#. *   #include "gui/mod_mgr.h"
+#. *
+#. *   void gui_open_mod_mgr(void)
+#. *
+#. * Description
+#. *
+#. *
+#. * Return value
+#. *   void
+#.
+#: ../src/gnome2/mod_mgr.c:3244
+msgid ""
+"<b>Welcome to the Module Manager.</b>\n"
+"\n"
+"This is Xiphos' mechanism to get new and updated content.\n"
+"It appears you have never been here before, so please take a moment to look "
+"it over.\n"
+"(You will see this information box just once.)\n"
+"\n"
+"Modules come from different <u>repositories</u>.  <b>Module Sources: Add/"
+"Remove</b> will show you what repositories are currently known.\n"
+"\n"
+"<b>Module Sources: Choose</b> is for deciding from where modules should "
+"come, that is, from which repository Xiphos should obtain them, as well as "
+"where they should be placed on your system. Set <i>Install Source</i> and "
+"<i>Install Destination</i>, then click <i>Refresh</i>.\n"
+"\n"
+"<b>Modules: Install/Update</b> is for selecting and obtaining modules after "
+"choosing source and destination.\n"
+"\n"
+"<b>Modules: Maintenance</b> is for archive and index creation.\n"
+"\n"
+"See section 5 of our manual for Module Manager detail, or ask for help via "
+"Live Chat, or (if no one is responsive in chat) send mail to our users' "
+"mailing list.\n"
+msgstr ""
 
-#: ../src/gnome2/navbar_book.c:359 ../src/gnome2/navbar_book_dialog.c:299
+#: ../src/gnome2/navbar_book.c:359 ../src/gnome2/navbar_book_dialog.c:300
 msgid "Go outward, to the section containing this one"
 msgstr "Mynd allan, i’r adran sy’n cynnwys hwn."
 
-#: ../src/gnome2/navbar_book.c:375 ../src/gnome2/navbar_book_dialog.c:315
+#: ../src/gnome2/navbar_book.c:375 ../src/gnome2/navbar_book_dialog.c:316
 msgid "Go to previous item"
 msgstr "I’r eitem flaenorol"
 
-#: ../src/gnome2/navbar_book.c:390 ../src/gnome2/navbar_book_dialog.c:330
+#: ../src/gnome2/navbar_book.c:390 ../src/gnome2/navbar_book_dialog.c:331
 msgid "Go to next item"
 msgstr "I’r eitem nesaf"
 
-#: ../src/gnome2/navbar_book.c:406 ../src/gnome2/navbar_book_dialog.c:346
+#: ../src/gnome2/navbar_book.c:406 ../src/gnome2/navbar_book_dialog.c:347
 msgid "Go inward, to the first subsection"
 msgstr "Mynd i mewn, i’r isadran gyntaf"
 
-#: ../src/gnome2/navbar_versekey_dialog.c:887
-#: ../src/gnome2/navbar_versekey_editor.c:877
-#: ../src/gnome2/navbar_versekey_parallel.c:801
+#: ../src/gnome2/navbar_versekey_dialog.c:864
+#: ../src/gnome2/navbar_versekey_editor.c:879
+#: ../src/gnome2/navbar_versekey_parallel.c:810
 msgid "Synchronize this window from main window"
 msgstr "Cydamseru'r ffenestr hon o'r prif ffenestr"
 
-#: ../src/gnome2/parallel_dialog.c:635 ../src/gnome2/preferences_dialog.c:1790
+#: ../src/gnome2/parallel_dialog.c:328 ../src/gnome2/preferences_dialog.c:1799
 msgid "Parallel"
 msgstr "Paralel"
 
-#: ../src/gnome2/parallel_view.c:271
+#: ../src/gnome2/parallel_view.c:275
 msgid "Copy"
 msgstr "Copio"
 
-#: ../src/gnome2/parallel_view.c:281
+#: ../src/gnome2/parallel_view.c:285
 msgid "Detach/Attach"
 msgstr "Gwahanu/Atodi"
 
-#: ../src/gnome2/parallel_view.c:287 ../ui/xi-menus.glade.h:38
+#: ../src/gnome2/parallel_view.c:291 ../ui/xi-menus.glade.h:53
 msgid "Module Options"
 msgstr "Dewis Modiwl"
 
 #. build change parallel modules submenu
-#: ../src/gnome2/parallel_view.c:302
+#: ../src/gnome2/parallel_view.c:306
 msgid "Change parallel 1"
 msgstr "Newid paralel 1"
 
-#: ../src/gnome2/parallel_view.c:304
+#: ../src/gnome2/parallel_view.c:308
 msgid "Change parallel 2"
 msgstr "Newid paralel 2"
 
-#: ../src/gnome2/parallel_view.c:306
+#: ../src/gnome2/parallel_view.c:310
 msgid "Change parallel 3"
 msgstr "Newid paralel 3"
 
-#: ../src/gnome2/parallel_view.c:308
+#: ../src/gnome2/parallel_view.c:312
 msgid "Change parallel 4"
 msgstr "Newid paralel 4"
 
-#: ../src/gnome2/parallel_view.c:310
+#: ../src/gnome2/parallel_view.c:314
 msgid "Change parallel 5"
 msgstr "Newid paralel 5"
 
-#: ../src/gnome2/parallel_view.c:467 ../src/gnome2/sidebar.c:599
-#: ../src/gnome2/sidebar.c:605 ../src/gnome2/tabbed_browser.c:231
-#: ../src/main/sidebar.cc:618 ../src/main/sidebar.cc:956
-#: ../src/main/sidebar.cc:957 ../src/main/sidebar.cc:958
+#: ../src/gnome2/parallel_view.c:471 ../src/gnome2/sidebar.c:626
+#: ../src/gnome2/sidebar.c:632 ../src/gnome2/tabbed_browser.c:262
+#: ../src/main/sidebar.cc:646 ../src/main/sidebar.cc:1007
+#: ../src/main/sidebar.cc:1008 ../src/main/sidebar.cc:1009
 msgid "Parallel View"
 msgstr "Golwg Paralel"
 
-#: ../src/gnome2/preferences_cell_renderer.c:398
-msgid "Text"
-msgstr "Testun"
-
-#: ../src/gnome2/preferences_cell_renderer.c:400
-msgid "Text to render"
-msgstr "Testun i’w gyflwyno"
-
-#: ../src/gnome2/preferences_cell_renderer.c:406
-msgid "Pixbuf Object"
-msgstr "Gwrthrych Pixbwf"
-
-#: ../src/gnome2/preferences_cell_renderer.c:408
-msgid "The pixbuf to render."
-msgstr "Y pixbwf i’w gyflwyno."
-
-#: ../src/gnome2/preferences_dialog.c:1231
-#: ../src/gnome2/preferences_dialog.c:1269
-#: ../src/gnome2/preferences_dialog.c:1306
-#: ../src/gnome2/preferences_dialog.c:1341
-#: ../src/gnome2/preferences_dialog.c:1375
-#: ../src/gnome2/preferences_dialog.c:1408
-#: ../src/gnome2/preferences_dialog.c:1440
-#: ../src/gnome2/preferences_dialog.c:1473
-#: ../src/gnome2/preferences_dialog.c:1505
-#: ../src/gnome2/preferences_dialog.c:1539
-#: ../src/gnome2/preferences_dialog.c:1574
-#: ../src/gnome2/preferences_dialog.c:1609
-#: ../src/gnome2/preferences_dialog.c:1645
-#: ../src/gnome2/preferences_dialog.c:2045
+#: ../src/gnome2/preferences_dialog.c:1179
+#: ../src/gnome2/preferences_dialog.c:1217
+#: ../src/gnome2/preferences_dialog.c:1254
+#: ../src/gnome2/preferences_dialog.c:1289
+#: ../src/gnome2/preferences_dialog.c:1323
+#: ../src/gnome2/preferences_dialog.c:1356
+#: ../src/gnome2/preferences_dialog.c:1388
+#: ../src/gnome2/preferences_dialog.c:1421
+#: ../src/gnome2/preferences_dialog.c:1453
+#: ../src/gnome2/preferences_dialog.c:1487
+#: ../src/gnome2/preferences_dialog.c:1522
+#: ../src/gnome2/preferences_dialog.c:1557
+#: ../src/gnome2/preferences_dialog.c:1593
+#: ../src/gnome2/preferences_dialog.c:1631
+#: ../src/gnome2/preferences_dialog.c:2052
 msgid "-- Select --"
 msgstr "-- Dewis --"
 
-#: ../src/gnome2/preferences_dialog.c:1678 ../ui/prefs.glade.h:74
+#: ../src/gnome2/preferences_dialog.c:1652
+msgid "Locale will take effect after restart."
+msgstr ""
+
+#: ../src/gnome2/preferences_dialog.c:1687 ../ui/prefs.glade.h:74
 msgid "Preferences"
 msgstr "Dewisiadau"
 
-#: ../src/gnome2/preferences_dialog.c:1760
+#: ../src/gnome2/preferences_dialog.c:1769
 msgid "Fonts"
 msgstr "Ffontiau"
 
-#: ../src/gnome2/preferences_dialog.c:1763
+#: ../src/gnome2/preferences_dialog.c:1772
 msgid "Color"
 msgstr "Lliw"
 
-#: ../src/gnome2/preferences_dialog.c:1766
+#: ../src/gnome2/preferences_dialog.c:1775
 msgid "Sizes"
 msgstr "Maint"
 
-#: ../src/gnome2/preferences_dialog.c:1770
+#: ../src/gnome2/preferences_dialog.c:1779
 msgid "General"
 msgstr "Cyffredinol"
 
-#: ../src/gnome2/preferences_dialog.c:1773 ../ui/prefs.glade.h:85
+#: ../src/gnome2/preferences_dialog.c:1782 ../ui/prefs.glade.h:87
 msgid "Tabs and Panes"
 msgstr "Tabiau a cwareli"
 
-#: ../src/gnome2/preferences_dialog.c:1780
+#: ../src/gnome2/preferences_dialog.c:1789
 msgid "Options"
 msgstr "Dewisiadau"
 
-#: ../src/gnome2/preferences_dialog.c:1787
+#: ../src/gnome2/preferences_dialog.c:1796
 msgid "Main"
 msgstr "Prif"
 
-#: ../src/gnome2/preferences_dialog.c:1793
+#: ../src/gnome2/preferences_dialog.c:1802
 msgid "Special"
 msgstr "Arbennig"
 
-#: ../src/gnome2/search_dialog.c:61 ../src/main/search_dialog.cc:60
-#: ../src/main/search_sidebar.cc:54
+#: ../src/gnome2/search_dialog.c:68 ../src/main/search_dialog.cc:66
+#: ../src/main/search_sidebar.cc:61
 msgid "Searching the "
 msgstr "Chwilio’r "
 
-#: ../src/gnome2/search_dialog.c:62 ../src/main/search_dialog.cc:61
-#: ../src/main/search_sidebar.cc:55
+#: ../src/gnome2/search_dialog.c:69 ../src/main/search_dialog.cc:67
+#: ../src/main/search_sidebar.cc:62
 msgid " Module"
 msgstr " Modiwl"
 
-#: ../src/gnome2/search_dialog.c:63 ../src/main/search_dialog.cc:62
-#: ../src/main/search_sidebar.cc:56
+#: ../src/gnome2/search_dialog.c:70 ../src/main/search_dialog.cc:68
+#: ../src/main/search_sidebar.cc:63
 msgid "found in "
 msgstr "darganfuwyd yn "
 
-#: ../src/gnome2/search_dialog.c:498
+#: ../src/gnome2/search_dialog.c:527
 msgid "Clear List?"
 msgstr "Clirio Rhestr?"
 
-#: ../src/gnome2/search_dialog.c:499
+#: ../src/gnome2/search_dialog.c:528
 msgid "Are you sure you want to clear the module list?"
 msgstr "Ydych chi’n siŵr eich bod am glirio’r rhestr?"
 
-#: ../src/gnome2/search_dialog.c:682
+#: ../src/gnome2/search_dialog.c:708
 msgid "The last module list may not be deleted"
 msgstr "Ni ellir diddymu'r rhestr modiwlau diwethaf"
 
-#: ../src/gnome2/search_dialog.c:699
+#: ../src/gnome2/search_dialog.c:726
 msgid "Delete list?"
 msgstr "Dileu’r rhestr?"
 
-#: ../src/gnome2/search_dialog.c:700
+#: ../src/gnome2/search_dialog.c:727
 msgid "Are you sure you want to delete:"
 msgstr "Ydych chi’n siŵr eich bod am ddileu:"
 
-#: ../src/gnome2/search_sidebar.c:189
+#: ../src/gnome2/search_sidebar.c:192
 msgid ""
 "This is an inclusive (\"AND\") search:\n"
 "Find matches showing all words."
@@ -1030,217 +1190,100 @@ msgstr ""
 "Mae hon yn chwiliad cynhwysol (\"A\"):\n"
 "Darganfod y rhai sy'n dangos pob gair."
 
-#: ../src/gnome2/search_sidebar.c:206
+#: ../src/gnome2/search_sidebar.c:209
 msgid "Search Module"
 msgstr "Chwilio Modiwl"
 
-#: ../src/gnome2/search_sidebar.c:220
+#: ../src/gnome2/search_sidebar.c:223
 msgid "Bible"
 msgstr "Beibl"
 
-#: ../src/gnome2/search_sidebar.c:229 ../ui/prefs.glade.h:35
+#: ../src/gnome2/search_sidebar.c:232 ../ui/prefs.glade.h:35
 msgid "Commentary"
 msgstr "Esboniad"
 
-#: ../src/gnome2/search_sidebar.c:243
+#: ../src/gnome2/search_sidebar.c:246
 msgid "Search Type"
 msgstr "Chwilio Teip"
 
-#: ../src/gnome2/search_sidebar.c:257 ../ui/search-dialog.glade.h:64
+#: ../src/gnome2/search_sidebar.c:260 ../ui/search-dialog.glade.h:66
 msgid "Multi word"
 msgstr "Aml-eiriau"
 
-#: ../src/gnome2/search_sidebar.c:276 ../ui/search-dialog.glade.h:44
+#: ../src/gnome2/search_sidebar.c:279 ../ui/search-dialog.glade.h:44
 msgid "Exact phrase"
 msgstr "Union gymal"
 
-#: ../src/gnome2/search_sidebar.c:290
+#: ../src/gnome2/search_sidebar.c:293
 msgid "Search Options"
 msgstr "Dewisiadau Chwilio"
 
-#: ../src/gnome2/search_sidebar.c:318
+#: ../src/gnome2/search_sidebar.c:321
 msgid "Search Scope"
 msgstr "Cwmpas y Chwilio"
 
-#: ../src/gnome2/search_sidebar.c:331
+#: ../src/gnome2/search_sidebar.c:334
 msgid "No scope"
 msgstr "Dim Cwmpas"
 
-#: ../src/gnome2/search_sidebar.c:341
+#: ../src/gnome2/search_sidebar.c:344
 msgid "Use bounds"
 msgstr "Defnyddio ffiniau"
 
-#: ../src/gnome2/search_sidebar.c:350
+#: ../src/gnome2/search_sidebar.c:353
 msgid "Last search"
 msgstr "Chwiliad diwethaf"
 
-#: ../src/gnome2/search_sidebar.c:365
+#: ../src/gnome2/search_sidebar.c:368
 msgid "Bounds"
 msgstr "Ffiniau"
 
-#: ../src/gnome2/search_sidebar.c:379
+#: ../src/gnome2/search_sidebar.c:382
 msgid "Lower"
 msgstr "Isaf"
 
-#: ../src/gnome2/search_sidebar.c:386
+#: ../src/gnome2/search_sidebar.c:389
 msgid "Upper"
 msgstr "Uchaf"
 
-#. 0
-#: ../src/gnome2/sidebar.c:942 ../src/gnome2/sidebar.c:1110
-msgid "Open in a new tab"
-msgstr "Agor mewn  tab newydd"
-
-#: ../src/gnome2/sidebar.c:943 ../src/gnome2/sidebar.c:1111
-msgid "Open selected module in a new tab"
-msgstr "Agor i modiwl ddewiswyd mewn tab newydd"
-
-#. 1
-#: ../src/gnome2/sidebar.c:948
-msgid "Open in a separate window"
-msgstr "Agor mewn ffenestr arall"
-
-#: ../src/gnome2/sidebar.c:949
-msgid "Open selected module in a separate ['dialog'] window"
-msgstr "Agor y modiwl ddewiswyd mewn deialog"
-
-#: ../src/gnome2/sidebar.c:955 ../src/gnome2/sidebar.c:1123
-msgid "View information about the selected dialog"
-msgstr "Edrych ar y wybodaeth am y deialog ddewiswyd"
-
-#: ../src/gnome2/sidebar.c:1046
-msgid "Simple"
-msgstr "Syml"
-
-#: ../src/gnome2/sidebar.c:1047
-msgid "Create a new simple prayer list"
-msgstr "Creu rhestr weddi syml newydd"
-
-#: ../src/gnome2/sidebar.c:1053
-msgid "Subject"
-msgstr "Pwnc"
-
-#: ../src/gnome2/sidebar.c:1060
-msgid "Monthly"
-msgstr "Misol"
-
-#: ../src/gnome2/sidebar.c:1061 ../src/gnome2/sidebar.c:1068
-#: ../src/gnome2/sidebar.c:1075
-msgid "Create a new prayer list"
-msgstr "Creu rhestr weddi newydd"
-
-#: ../src/gnome2/sidebar.c:1067
-msgid "Daily Journal"
-msgstr "Dyddlyfr"
-
-#: ../src/gnome2/sidebar.c:1074
-msgid "Outlined Topic"
-msgstr "Pwnc Amlinellwyd"
-
-#. 1
-#: ../src/gnome2/sidebar.c:1116 ../ui/xi-menus.glade.h:45
-msgid "Open in editor"
-msgstr "Agor yn Golygydd"
-
-#: ../src/gnome2/sidebar.c:1117
-msgid "Open selected module in a dialog"
-msgstr "Agor y modiwl ddewiswyd mewn deialog"
-
-#: ../src/gnome2/sidebar.c:1446
+#: ../src/gnome2/sidebar.c:1397
 msgid "Search"
 msgstr "Chwilio"
 
-#: ../src/gnome2/sidebar.c:1454
+#: ../src/gnome2/sidebar.c:1405
 msgid "Verse List"
 msgstr "Rhestr Adnodau"
 
-#: ../src/gnome2/sidebar_dialog.c:135
+#: ../src/gnome2/sidebar_dialog.c:139 ../src/gnome2/sidebar_dialog.c:148
 msgid "Sidebar"
 msgstr "Bar ochr"
 
-#: ../src/gnome2/splash.c:363
+#: ../src/gnome2/splash.c:396
 msgid "Powered by the SWORD Project"
 msgstr "Gyrrir gan Brosiect SWORD"
 
-#: ../src/gnome2/splash.c:563
-msgid "Initiating Gecko"
-msgstr "Dechrau Gecko"
-
-#: ../src/gnome2/splash.c:580
-msgid "Loading settings"
-msgstr "Llwytho Gosodiadau"
-
-#: ../src/gnome2/splash.c:598
-msgid "Building Interface"
-msgstr "Adeiladu Rhyngwyneb"
-
-#: ../src/gnome2/splash.c:615
-msgid "Starting Sword"
-msgstr "Dechrau Sword"
-
-#: ../src/gnome2/splash.c:632
-msgid "Displaying Xiphos"
-msgstr "Arddangos Xiphos "
-
-#: ../src/gnome2/toolbar_nav.c:416
-msgid "Move backwards through history"
-msgstr "Yn ôl drwy'r hanes"
-
-#: ../src/gnome2/toolbar_nav.c:437
-msgid "Move foward through history"
-msgstr "Ymlaen drwy'r hanes"
-
-#: ../src/gnome2/toolbar_nav.c:458
-msgid "Select a Book of the Bible"
-msgstr "Dewis Llyfr o’r Beibl"
-
-#: ../src/gnome2/toolbar_nav.c:523
-msgid "Change Chapter"
-msgstr "Pennod Newydd"
-
-#: ../src/gnome2/toolbar_nav.c:593
-msgid "Change Verse"
-msgstr "Adnod Newydd"
-
-#: ../src/gnome2/toolbar_nav.c:661
-msgid "Enter a Verse reference in Book 1:1 format and press Return"
-msgstr "Teipiwch gyfeirnod adnod yn y fformat Llyfr 1:1 a phwyso’r Dychwelwr"
-
-#: ../src/gnome2/treekey-editor.c:129 ../src/gnome2/treekey-editor.c:188
-#: ../src/gnome2/treekey-editor.c:274
+#: ../src/gnome2/treekey-editor.c:137 ../src/gnome2/treekey-editor.c:196
+#: ../src/gnome2/treekey-editor.c:282
 msgid "Prayer List/Journal Item"
 msgstr "Eitem Rhestr Weddi/Dyddlyfr"
 
-#: ../src/gnome2/treekey-editor.c:130 ../src/gnome2/treekey-editor.c:189
-#: ../src/gnome2/treekey-editor.c:275
+#: ../src/gnome2/treekey-editor.c:138 ../src/gnome2/treekey-editor.c:197
+#: ../src/gnome2/treekey-editor.c:283
 msgid "New name"
 msgstr "Enw Newydd"
 
-#: ../src/gnome2/treekey-editor.c:245
+#: ../src/gnome2/treekey-editor.c:253
 msgid "Remove the selected item"
 msgstr "Diddymu’r eitem ddewiswyd"
 
-#: ../src/gnome2/treekey-editor.c:303
-msgid "Add Child"
-msgstr "Ychwanegu Plentyn"
-
-#: ../src/gnome2/treekey-editor.c:304 ../src/gnome2/treekey-editor.c:310
-msgid "Add an item"
-msgstr "Ychwanegu Eitem"
-
-#: ../src/gnome2/treekey-editor.c:309
-msgid "Add Sibling"
-msgstr "Ychwanegu Sibling"
-
-#: ../src/gnome2/treekey-editor.c:316
-msgid "Remove this item"
-msgstr "Diddymu’r eitem hon"
-
-#: ../src/gnome2/treekey-editor.c:322
-msgid "Edit this item"
-msgstr "Golygu’r eitem hon"
+#: ../src/main/display.cc:259
+#, c-format
+msgid ""
+"Improperly encoded personal annotation label:\n"
+"'%s'"
+msgstr ""
 
-#: ../src/main/display.cc:278
+#: ../src/main/display.cc:386
 msgid ""
 "An image file's size could not be determined.\n"
 "Is ImageMagick's 'identify' not installed?\n"
@@ -1252,282 +1295,302 @@ msgstr ""
 "(Neu efallai fod y ddelwedd yn fath gwahanol i bmp/gif/jpg/png.)\n"
 "All Xiphos ddim newid maint delweddau i ffitio’r ffenestr."
 
-#: ../src/main/display.cc:931 ../src/main/display.cc:993
-#: ../src/main/display.cc:1081 ../src/main/display.cc:1089
-#: ../ui/export-dialog.glade.h:7
+#: ../src/main/display.cc:1043 ../src/main/display.cc:1095
+#: ../src/main/display.cc:1172 ../ui/export-dialog.glade.h:7
 msgid "Chapter"
 msgstr "Pennod"
 
-#: ../src/main/main.c:109
+#: ../src/main/main.c:119
 msgid "Xiphos does not understand more than one argument."
 msgstr "Nid yw Xiphos yn deall mwy nag un ddadl."
 
-#: ../src/main/module_dialogs.cc:231 ../src/main/previewer.cc:122
-#: ../ui/prefs.glade.h:75
+#: ../src/main/main.c:161
+msgid "Initiating Gecko"
+msgstr "Dechrau Gecko"
+
+#: ../src/main/main.c:167
+msgid "Building Interface"
+msgstr "Adeiladu Rhyngwyneb"
+
+#: ../src/main/main.c:171
+msgid "Starting Sword"
+msgstr "Dechrau Sword"
+
+#: ../src/main/main.c:175
+msgid "Loading Settings"
+msgstr "Llwytho Gosodiadau"
+
+#: ../src/main/main.c:179
+msgid "Displaying Xiphos"
+msgstr "Arddangos Xiphos"
+
+#: ../src/main/module_dialogs.cc:227 ../src/main/previewer.cc:127
+#: ../src/main/previewer.cc:194 ../ui/prefs.glade.h:75
 msgid "Previewer"
 msgstr "Rhagolygwr"
 
-#: ../src/main/module_dialogs.cc:297 ../src/main/module_dialogs.cc:423
-#: ../src/main/previewer.cc:197
+#: ../src/main/module_dialogs.cc:292 ../src/main/module_dialogs.cc:416
+#: ../src/main/previewer.cc:269
 msgid "Footnote"
 msgstr "Troednodyn"
 
-#: ../src/main/module_dialogs.cc:303 ../src/main/module_dialogs.cc:428
-#: ../src/main/previewer.cc:203
+#: ../src/main/module_dialogs.cc:298 ../src/main/module_dialogs.cc:421
+#: ../src/main/previewer.cc:281
 msgid "Cross Reference"
 msgstr "Croesgyfeiriad"
 
-#: ../src/main/module_dialogs.cc:309 ../src/main/module_dialogs.cc:323
-#: ../src/main/module_dialogs.cc:433 ../src/main/module_dialogs.cc:445
-#: ../src/main/previewer.cc:209 ../src/main/previewer.cc:228
+#: ../src/main/module_dialogs.cc:304 ../src/main/module_dialogs.cc:318
+#: ../src/main/module_dialogs.cc:426 ../src/main/module_dialogs.cc:438
+#: ../src/main/previewer.cc:287 ../src/main/previewer.cc:306
 msgid "Strongs"
 msgstr "Strongs"
 
-#: ../src/main/module_dialogs.cc:315 ../src/main/module_dialogs.cc:334
-#: ../src/main/module_dialogs.cc:438 ../src/main/module_dialogs.cc:455
-#: ../src/main/previewer.cc:215 ../src/main/previewer.cc:241
+#: ../src/main/module_dialogs.cc:310 ../src/main/module_dialogs.cc:329
+#: ../src/main/module_dialogs.cc:431 ../src/main/module_dialogs.cc:448
+#: ../src/main/previewer.cc:293 ../src/main/previewer.cc:319
 msgid "Morphology"
 msgstr "Morffoleg"
 
-#: ../src/main/module_dialogs.cc:1104 ../src/main/url.cc:543
+#: ../src/main/module_dialogs.cc:1081 ../src/main/url.cc:530
 msgid "Back to "
 msgstr "Yn ôl i "
 
-#: ../src/main/parallel_view.cc:398 ../ui/xi-menus.glade.h:67
+#: ../src/main/parallel_view.cc:404 ../ui/xi-menus.glade.h:89
 msgid "Strong's Numbers"
 msgstr "Rhifau Strong"
 
-#: ../src/main/parallel_view.cc:408 ../ui/search-dialog.glade.h:50
-#: ../ui/xi-menus.glade.h:25
+#: ../src/main/parallel_view.cc:414 ../ui/search-dialog.glade.h:52
+#: ../ui/xi-menus.glade.h:40
 msgid "Footnotes"
 msgstr "Troednodiadau"
 
-#: ../src/main/parallel_view.cc:418 ../ui/search-dialog.glade.h:62
-#: ../ui/xi-menus.glade.h:39
+#: ../src/main/parallel_view.cc:424 ../ui/search-dialog.glade.h:64
+#: ../ui/xi-menus.glade.h:55
 msgid "Morphological Tags"
 msgstr "Tagiau Morffolegol"
 
-#: ../src/main/parallel_view.cc:428 ../ui/xi-menus.glade.h:29
+#: ../src/main/parallel_view.cc:434 ../ui/xi-menus.glade.h:44
 msgid "Hebrew Vowel Points"
 msgstr "Llafarnodau Hebraeg"
 
-#: ../src/main/parallel_view.cc:438 ../ui/xi-menus.glade.h:28
+#: ../src/main/parallel_view.cc:444 ../ui/xi-menus.glade.h:43
 msgid "Hebrew Cantillation"
 msgstr "Llafarganu Hebraeg"
 
-#: ../src/main/parallel_view.cc:448 ../ui/xi-menus.glade.h:26
+#: ../src/main/parallel_view.cc:454 ../ui/xi-menus.glade.h:41
 msgid "Greek Accents"
 msgstr "Acenion y Roeg"
 
-#: ../src/main/parallel_view.cc:458
+#: ../src/main/parallel_view.cc:464
 msgid "Cross-references"
 msgstr "Croesgyfeiriadau"
 
-#: ../src/main/parallel_view.cc:468 ../ui/xi-menus.glade.h:35
+#: ../src/main/parallel_view.cc:474 ../ui/xi-menus.glade.h:50
 msgid "Lemmas"
 msgstr "Lemata"
 
-#: ../src/main/parallel_view.cc:478 ../ui/xi-menus.glade.h:27
+#: ../src/main/parallel_view.cc:484 ../ui/xi-menus.glade.h:42
 msgid "Headings"
 msgstr "Teitlau"
 
-#: ../src/main/parallel_view.cc:488
+#: ../src/main/parallel_view.cc:494
 msgid "Morpheme Segmentation"
 msgstr "Segmentiad Morffemau"
 
-#: ../src/main/parallel_view.cc:498 ../ui/xi-menus.glade.h:73
+#: ../src/main/parallel_view.cc:504 ../ui/xi-menus.glade.h:96
 msgid "Words of Christ in Red"
 msgstr "Geiriau Iesu mewn coch"
 
-#: ../src/main/parallel_view.cc:508 ../ui/xi-menus.glade.h:68
+#: ../src/main/parallel_view.cc:514 ../ui/xi-menus.glade.h:91
 msgid "Transliteration"
 msgstr "Trawslythreniad"
 
-#: ../src/main/parallel_view.cc:518
+#: ../src/main/parallel_view.cc:524
 msgid "Textual Variants"
 msgstr "Amrywiadau Testunol"
 
-#: ../src/main/parallel_view.cc:526 ../ui/xi-menus.glade.h:49
+#: ../src/main/parallel_view.cc:532 ../ui/xi-menus.glade.h:70
 msgid "Primary Reading"
 msgstr "Prif Ddarlleniad"
 
-#: ../src/main/parallel_view.cc:535 ../ui/xi-menus.glade.h:63
+#: ../src/main/parallel_view.cc:541 ../ui/xi-menus.glade.h:84
 msgid "Secondary Reading"
 msgstr "Darlleniad eilradd"
 
-#: ../src/main/parallel_view.cc:544 ../ui/xi-menus.glade.h:5
+#: ../src/main/parallel_view.cc:550 ../ui/xi-menus.glade.h:9
 msgid "All Readings"
 msgstr "Pob darlleniad"
 
-#: ../src/main/parallel_view.cc:878 ../src/main/parallel_view.cc:1130
+#: ../src/main/parallel_view.cc:884 ../src/main/parallel_view.cc:1136
 msgid "view context"
 msgstr "gweld cyd-destun"
 
-#: ../src/main/prayerlists.cc:71
+#: ../src/main/prayerlists.cc:74
 msgid "January"
 msgstr "Ionawr"
 
-#: ../src/main/prayerlists.cc:72
+#: ../src/main/prayerlists.cc:75
 msgid "February"
 msgstr "Chwefror"
 
-#: ../src/main/prayerlists.cc:73
+#: ../src/main/prayerlists.cc:76
 msgid "March"
 msgstr "Mawrth"
 
-#: ../src/main/prayerlists.cc:74
+#: ../src/main/prayerlists.cc:77
 msgid "April"
 msgstr "Ebrill"
 
-#: ../src/main/prayerlists.cc:75
+#: ../src/main/prayerlists.cc:78
 msgid "May"
 msgstr "Mai"
 
-#: ../src/main/prayerlists.cc:76
+#: ../src/main/prayerlists.cc:79
 msgid "June"
 msgstr "Mehefin"
 
-#: ../src/main/prayerlists.cc:77
+#: ../src/main/prayerlists.cc:80
 msgid "July"
 msgstr "Gorffennaf"
 
-#: ../src/main/prayerlists.cc:78
+#: ../src/main/prayerlists.cc:81
 msgid "August"
 msgstr "Awst"
 
-#: ../src/main/prayerlists.cc:79
+#: ../src/main/prayerlists.cc:82
 msgid "September"
 msgstr "Medi"
 
-#: ../src/main/prayerlists.cc:80
+#: ../src/main/prayerlists.cc:83
 msgid "October"
 msgstr "Hydref"
 
-#: ../src/main/prayerlists.cc:81
+#: ../src/main/prayerlists.cc:84
 msgid "November"
 msgstr "Tachwedd"
 
-#: ../src/main/prayerlists.cc:82
+#: ../src/main/prayerlists.cc:85
 msgid "December"
 msgstr "Rhagfyr"
 
-#: ../src/main/prayerlists.cc:121 ../src/main/sword_treekey.cc:332
+#: ../src/main/prayerlists.cc:124 ../src/main/sword_treekey.cc:332
 msgid "Growth"
 msgstr "Tyfiant"
 
-#: ../src/main/prayerlists.cc:122 ../src/main/sword_treekey.cc:333
+#: ../src/main/prayerlists.cc:125 ../src/main/sword_treekey.cc:333
 msgid "<b>For Growth</b><br>"
 msgstr "<b>I Dyfu</b><br>"
 
-#: ../src/main/prayerlists.cc:123 ../src/main/prayerlists.cc:380
+#: ../src/main/prayerlists.cc:126 ../src/main/prayerlists.cc:383
 #: ../src/main/sword_treekey.cc:334
 msgid "Salvation"
 msgstr "Achubiaeth"
 
-#: ../src/main/prayerlists.cc:124 ../src/main/sword_treekey.cc:335
+#: ../src/main/prayerlists.cc:127 ../src/main/sword_treekey.cc:335
 msgid "<b>For Salvation</b><br>"
 msgstr "<b>I Achub</b><br>"
 
-#: ../src/main/prayerlists.cc:125 ../src/main/prayerlists.cc:384
+#: ../src/main/prayerlists.cc:128 ../src/main/prayerlists.cc:387
 #: ../src/main/sword_treekey.cc:336
 msgid "Health"
 msgstr "Iechyd"
 
-#: ../src/main/prayerlists.cc:126 ../src/main/sword_treekey.cc:337
+#: ../src/main/prayerlists.cc:129 ../src/main/sword_treekey.cc:337
 msgid "<b>For Health</b><br>"
 msgstr "<b>I fod yn Iach</b><br>"
 
-#: ../src/main/prayerlists.cc:127
+#: ../src/main/prayerlists.cc:130
 msgid "Misc"
 msgstr "Amryw"
 
-#: ../src/main/prayerlists.cc:128 ../src/main/sword_treekey.cc:339
+#: ../src/main/prayerlists.cc:131 ../src/main/sword_treekey.cc:339
 msgid "<b>Miscellaneous</b><br>"
 msgstr "<b>Amrywiol</b><br>"
 
-#: ../src/main/prayerlists.cc:136
+#: ../src/main/prayerlists.cc:139
 msgid "Point x"
 msgstr "Pwynt x"
 
-#: ../src/main/prayerlists.cc:137
+#: ../src/main/prayerlists.cc:140
 msgid "<b>(x)</b><br>"
 msgstr "<b>(x)</b><br>"
 
-#: ../src/main/prayerlists.cc:138
+#: ../src/main/prayerlists.cc:141
 msgid "Point y"
-msgstr " Pwynt y"
+msgstr "Pwynt y"
 
-#: ../src/main/prayerlists.cc:139
+#: ../src/main/prayerlists.cc:142
 msgid "<b>(y)</b><br>"
 msgstr "<b>(y)</b><br>"
 
-#: ../src/main/prayerlists.cc:140
+#: ../src/main/prayerlists.cc:143
 msgid "Point z"
-msgstr " Pwynt z"
+msgstr "Pwynt z"
 
-#: ../src/main/prayerlists.cc:141
+#: ../src/main/prayerlists.cc:144
 msgid "<b>(z)</b><br>"
 msgstr "<b>(z)</b><br>"
 
-#: ../src/main/prayerlists.cc:149
+#: ../src/main/prayerlists.cc:152
 msgid "Minor Topic 1"
 msgstr "Pwnc bach 1"
 
-#: ../src/main/prayerlists.cc:150
+#: ../src/main/prayerlists.cc:153
 msgid "<b>Subtopic 1</b><br>"
 msgstr "<b>Is-bwnc 1</b><br>"
 
-#: ../src/main/prayerlists.cc:152
+#: ../src/main/prayerlists.cc:155
 msgid "Minor Topic 2"
 msgstr "Pwnc bach 2"
 
-#: ../src/main/prayerlists.cc:153
+#: ../src/main/prayerlists.cc:156
 msgid "<b>Subtopic 2</b><br>"
 msgstr "<b> Is-bwnc 2</b><br>"
 
-#: ../src/main/prayerlists.cc:155
+#: ../src/main/prayerlists.cc:158
 msgid "Minor Topic 3"
-msgstr " Pwnc bach 3"
+msgstr "Pwnc bach 3"
 
-#: ../src/main/prayerlists.cc:156
+#: ../src/main/prayerlists.cc:159
 msgid "<b>Subtopic 3</b><br>"
 msgstr "<b> Is-bwnc 3</b><br>"
 
-#: ../src/main/prayerlists.cc:158
+#: ../src/main/prayerlists.cc:161
 msgid "Minor Topic 4"
-msgstr " Pwnc bach 4"
+msgstr "Pwnc bach 4"
 
-#: ../src/main/prayerlists.cc:159
+#: ../src/main/prayerlists.cc:162
 msgid "<b>Subtopic 4</b><br>"
 msgstr "<b> Is-bwnc 4</b><br>"
 
-#: ../src/main/prayerlists.cc:239
+#: ../src/main/prayerlists.cc:242
 msgid "Name for new prayer list or journal"
 msgstr "Enw rhestr weddi neu ddyddlyfr newydd"
 
-#: ../src/main/prayerlists.cc:270
+#: ../src/main/prayerlists.cc:273
 msgid "Xiphos finds that prayer list already."
 msgstr "Mae Xiphos wedi darganfod y rhestr weddi yna eisoes."
 
-#: ../src/main/prayerlists.cc:283
+#: ../src/main/prayerlists.cc:286
+#, c-format
 msgid ""
 "Xiphos cannot create module's path:\n"
 "%s"
 msgstr "Xiphos yn methu creu’r llwybr modiwl.%s"
 
-#: ../src/main/prayerlists.cc:323
+#: ../src/main/prayerlists.cc:326
 msgid "A basic prayer list. \\par\\par Module created by Xiphos."
 msgstr "Rhestr weddi sylfaenol. \\par\\par Modiwl wedi ei greu gan Xiphos."
 
-#: ../src/main/prayerlists.cc:324
+#: ../src/main/prayerlists.cc:327
 msgid "BasicPrayerList"
 msgstr "RhestrWeddiSylfaenol"
 
-#: ../src/main/prayerlists.cc:338
+#: ../src/main/prayerlists.cc:341
 msgid "MyPrayerList"
 msgstr "FyRhestrWeddi"
 
-#: ../src/main/prayerlists.cc:339
+#: ../src/main/prayerlists.cc:342
 msgid ""
 "<b>People:</b><br>Bob<br>Sam<br>Sue<br><br><b>Church:</"
 "b><br>pews<br>fellowship<br>Bibles for missionaries<br><br><br>"
@@ -1535,106 +1598,112 @@ msgstr ""
 "<b>Pobl:</b><br>Bob<br>Sam<br>Sue<br><br><b>Eglwys:</"
 "b><br>seddi<br>cymdeithas<br>Beiblau i genhadon<br><br><br>"
 
-#: ../src/main/prayerlists.cc:365
+#: ../src/main/prayerlists.cc:368
 msgid "A subject-based prayer list. \\par\\par Module created by Xiphos."
 msgstr "Rhestr pynciau gweddi. \\par\\par Modiwl wedi ei greu gan Xiphos."
 
-#: ../src/main/prayerlists.cc:366
+#: ../src/main/prayerlists.cc:369
 msgid "SubjectPrayerList"
 msgstr "RhestrPynciauGweddi"
 
-#: ../src/main/prayerlists.cc:381
+#: ../src/main/prayerlists.cc:384
 msgid "Bob<br>Sam<br>Sue<br>John<br>"
 msgstr "Bob<br>Sam<br>Sue<br>John<br>"
 
-#: ../src/main/prayerlists.cc:382
+#: ../src/main/prayerlists.cc:385
 msgid "Spiritual Growth"
 msgstr "Tyfiant Ysbrydol"
 
-#: ../src/main/prayerlists.cc:383
+#: ../src/main/prayerlists.cc:386
 msgid "Mike<br>Steve<br>"
 msgstr "Mike<br>Steve<br>"
 
-#: ../src/main/prayerlists.cc:385
+#: ../src/main/prayerlists.cc:388
 msgid "Sue<br>John<br>"
 msgstr "Sue<br>John<br>"
 
-#: ../src/main/prayerlists.cc:411
+#: ../src/main/prayerlists.cc:414
 msgid "A monthly prayer list. \\par\\par Module created by Xiphos."
 msgstr "Rhestr weddi fisol. \\par\\par Modiwl wedi ei greu gan Xiphos."
 
-#: ../src/main/prayerlists.cc:412
+#: ../src/main/prayerlists.cc:415
 msgid "MonthlyPrayerList"
 msgstr "RhestrWeddiFisol"
 
-#: ../src/main/prayerlists.cc:463
+#: ../src/main/prayerlists.cc:466
 msgid "A daily journal. \\par\\par Module created by Xiphos."
 msgstr "Dyddlyfr. \\par\\par Modiwl wedi ei greu gan Xiphos."
 
-#: ../src/main/prayerlists.cc:464
+#: ../src/main/prayerlists.cc:467
 msgid "DailyJournal"
 msgstr "Dyddlyfr"
 
-#: ../src/main/prayerlists.cc:528
+#: ../src/main/prayerlists.cc:531
 msgid "An outlined topic (e.g. sermon). \\par\\par Module created by Xiphos."
 msgstr ""
 "Amlinelliad o bwnc (e.g. pregeth). \\par\\par Modiwl wedi ei greu gan Xiphos."
 
-#: ../src/main/prayerlists.cc:529
+#: ../src/main/prayerlists.cc:532
 msgid "OutlinedTopic"
 msgstr "AmlinelliadPwnc"
 
-#: ../src/main/prayerlists.cc:543
+#: ../src/main/prayerlists.cc:546
 msgid "Major Topic A"
 msgstr "Prif Bwnc A"
 
-#: ../src/main/prayerlists.cc:544
+#: ../src/main/prayerlists.cc:547
 msgid "<b>Major Topic A</b><br>"
 msgstr "<b> Prif Bwnc A</b><br>"
 
-#: ../src/main/prayerlists.cc:546
+#: ../src/main/prayerlists.cc:549
 msgid "Major Topic B"
-msgstr " Prif Bwnc B"
+msgstr "Prif Bwnc B"
 
-#: ../src/main/prayerlists.cc:547
+#: ../src/main/prayerlists.cc:550
 msgid "<b>Major Topic B</b><br>"
 msgstr "<b> Prif Bwnc B</b><br>"
 
-#: ../src/main/prayerlists.cc:549
+#: ../src/main/prayerlists.cc:552
 msgid "Major Topic C"
-msgstr " Prif Bwnc C"
+msgstr "Prif Bwnc C"
 
-#: ../src/main/prayerlists.cc:550
+#: ../src/main/prayerlists.cc:553
 msgid "<b>Major Topic C</b><br>"
 msgstr "<b> Prif Bwnc C</b><br>"
 
-#: ../src/main/search_dialog.cc:129
+#: ../src/main/previewer.cc:275
+msgid "User Annotation"
+msgstr ""
+
+#: ../src/main/search_dialog.cc:212
+#, c-format
 msgid "Search result %s: %s"
 msgstr "Canlyniad chwiliad %s: %s"
 
-#: ../src/main/search_dialog.cc:363
+#: ../src/main/search_dialog.cc:444
 msgid "Delete Range?"
 msgstr "Dileu Amrediad?"
 
-#: ../src/main/search_dialog.cc:364
+#: ../src/main/search_dialog.cc:445
 msgid "Are you sure you want to delete this range?"
 msgstr "Ydych chi’n siwr eich bod am ddileu’r amrediad hwn?"
 
-#: ../src/main/search_dialog.cc:578 ../src/main/search_dialog.cc:1049
-#: ../src/main/search_dialog.cc:1052 ../src/main/search_dialog.cc:1074
-#: ../src/main/search_dialog.cc:1077
+#: ../src/main/search_dialog.cc:659 ../src/main/search_dialog.cc:1130
+#: ../src/main/search_dialog.cc:1133 ../src/main/search_dialog.cc:1155
+#: ../src/main/search_dialog.cc:1158
 msgid "Search: "
 msgstr "Chwilio: "
 
-#: ../src/main/search_dialog.cc:623
+#: ../src/main/search_dialog.cc:704
 msgid "Remove Module?"
 msgstr "Dileu’r Modiwl?"
 
-#: ../src/main/search_dialog.cc:624
+#: ../src/main/search_dialog.cc:705
 msgid "Are you sure you want to remove the selected module?"
 msgstr "Ydych chi’n siwr eich bod am ddileu y modiwl a ddewiswyd?"
 
-#: ../src/main/search_dialog.cc:1473
+#: ../src/main/search_dialog.cc:1560
+#, c-format
 msgid ""
 "%s:\n"
 "No such module is installed.\n"
@@ -1644,15 +1713,16 @@ msgstr ""
 "Y modiwl heb ei osod.\n"
 "%s"
 
-#: ../src/main/search_dialog.cc:1475
+#: ../src/main/search_dialog.cc:1562
 msgid "Please adjust the module list."
 msgstr "Newidiwch y rhestr modiwlau."
 
-#: ../src/main/search_dialog.cc:1491
+#: ../src/main/search_dialog.cc:1578
+#, c-format
 msgid "No fast-search index exists for %s.%s%s"
 msgstr "Nid oes mynegai chwilio cyflym i %s.%s%s"
 
-#: ../src/main/search_dialog.cc:1493
+#: ../src/main/search_dialog.cc:1580
 msgid ""
 "\n"
 "Search on this module is now `multi word'."
@@ -1660,7 +1730,7 @@ msgstr ""
 "\n"
 "Mae'r chwiliad ar y modiwl hwn yn `aml-air'."
 
-#: ../src/main/search_dialog.cc:1494
+#: ../src/main/search_dialog.cc:1581
 msgid ""
 "\n"
 "See the Module Manager, Maintenance pane."
@@ -1668,15 +1738,15 @@ msgstr ""
 "\n"
 "Gweler y Rheolydd Modiwlau, Cwarel Cynnal a Chadw."
 
-#: ../src/main/search_dialog.cc:1555
+#: ../src/main/search_dialog.cc:1644
 msgid "Search finished"
 msgstr "Chwilio ar ben"
 
-#: ../src/main/search_sidebar.cc:93
+#: ../src/main/search_sidebar.cc:100
 msgid "matches"
 msgstr "canlyniadau"
 
-#: ../src/main/settings.c:56
+#: ../src/main/settings.c:60
 msgid ""
 "Welcome to Xiphos.\n"
 "\n"
@@ -1712,27 +1782,12 @@ msgstr ""
 "\n"
 "Gaiff Xiphos ofyn i’r Rheolydd Modiwlau osod  Beibl i chi?"
 
-#: ../src/main/settings.c:109
+#: ../src/main/settings.c:105
 msgid "$HOME is not set!"
 msgstr "$HOME heb ei osod!"
 
-#: ../src/main/settings.c:124
-msgid "Xiphos has renamed .xiphos-2.0 to .xiphos"
-msgstr "Mae Xiphos wedi ail-enwi .xiphos-2.0 yn .xiphos"
-
-#: ../src/main/settings.c:127
-msgid ""
-"Xiphos can not rename  .xiphos-2.0 to .xiphos:\n"
-"%s\n"
-"\n"
-"Xiphos cannot continue."
-msgstr ""
-"Ni all Xiphos ail-enwi .xiphos-2.0 yn .xiphos:\n"
-"%s\n"
-"\n"
-"All Xiphos ddim parhau."
-
-#: ../src/main/settings.c:135
+#: ../src/main/settings.c:120
+#, c-format
 msgid ""
 "Xiphos can not create  .xiphos:\n"
 "%s\n"
@@ -1740,15 +1795,16 @@ msgid ""
 "Xiphos cannot continue."
 msgstr ""
 "All Xiphos ddim creu .xiphos:\n"
+"%s\n"
 "\n"
 "All Xiphos ddim parhau."
 
-#: ../src/main/settings.c:148 ../src/main/settings.c:156
-#: ../src/main/settings.c:164
+#: ../src/main/settings.c:133 ../src/main/settings.c:142
+#: ../src/main/settings.c:151
 msgid "can not create "
-msgstr "methu creu"
+msgstr "methu creu "
 
-#: ../src/main/settings.c:196
+#: ../src/main/settings.c:194
 msgid ""
 "There are still no Bibles installed.\n"
 "Evidently, you declined to install any.\n"
@@ -1761,13 +1817,13 @@ msgstr ""
 "Mae’n ymddangos eich bod wedi dewis peidio gosod rhai\n"
 "Heb fodiwlau Beibl i’w dangos\n"
 "All Xiphos ddim mynd ymlaen\n"
-"a bydd yn allanu. "
+"a bydd yn allanu."
 
-#: ../src/main/settings.c:200
+#: ../src/main/settings.c:198
 msgid "Bible module installation complete."
 msgstr "Gosod Modiwl Beibl wedi ei gwblhau."
 
-#: ../src/main/settings.c:203
+#: ../src/main/settings.c:201
 msgid ""
 "Without any Bible modules to display,\n"
 "Xiphos cannot proceed,\n"
@@ -1775,76 +1831,17 @@ msgid ""
 msgstr ""
 "Heb fodiwlau Beibl i’w dangos\n"
 "All Xiphos ddim mynd ymlaen\n"
-"a bydd yn allanu. "
+"a bydd yn allanu."
 
-#. *****************************************************************************
-#. * Name
-#. *    gconf_setup
-#. *
-#. * Synopsis
-#. *   #include "main/settings.h"
-#. *
-#. *   void gconf_setup()
-#. *
-#. * Description
-#. *   verifies and initializes the GConf subsystem, so that "sword://" and
-#. *   similar can be handled by url-comprehending programs such as browsers.
-#. *   dialogs for permission/success/failure => conditional on debug build.
-#. *
-#. * Return value
-#. *   void
-#.
-#: ../src/main/settings.c:816
-msgid ""
-"URL references using \"sword://\" (similar to web page\n"
-"references) can be used by programs to look up\n"
-"scripture references. Your system currently has no\n"
-"program set to handle these references.\n"
-"\n"
-"Would you like Xiphos to set itself as the\n"
-"program to handle these references?"
-msgstr ""
-"Gellir defnyddio cyfeirnodau URL yn defnyddio \"sword://\" \n"
-"(tebyg i gyfeirnodau tudalen we) gan raglenni i edrych ar\n"
-"gyfeiriadau ysgrythyrol. Ar hyn o bryd nid yw eich rhaglen\n"
-"wedi ei osod i reoli y cyfeirnodau hyn.\n"
-"\n"
-"Garech chi i Xiphos osod ei hun fel y rhaglen\n"
-"i reoli y cyfeirnodau hyn?"
-
-#: ../src/main/settings.c:818
-msgid ""
-"Xiphos has successfully set itself\n"
-"as the handler of sword:// and bible:// URLs.\n"
-"\n"
-"You may wish to run the program \"gconf-editor\"\n"
-"to examine keys under /desktop/gnome/url-handlers,\n"
-"if you need to change these."
-msgstr ""
-"Mae Xiphos wedi llwyddo i osod ei hun\n"
-"fel rheolydd URLiau sword:// a bible://.\n"
-"\n"
-"Efallai y carech redeg y rhaglen \"gconf-editor\"\n"
-"i edrych ar allweddau dan /bwrdd gwaith/gnome/rheolwyr-url\n"
-"os oes angen eu newid."
-
-#: ../src/main/settings.c:871
-msgid ""
-"Xiphos failed to complete handler init for key #%d:\n"
-"%s"
-msgstr ""
-"Methodd Xiphos ymgychwyn y rheolwr i allwedd #%d:\n"
-"%s is mislukt"
-
-#: ../src/main/sidebar.cc:375
+#: ../src/main/sidebar.cc:399
 msgid "verse"
 msgstr "adnod"
 
-#: ../src/main/sidebar.cc:437
+#: ../src/main/sidebar.cc:461
 msgid "chapter"
 msgstr "pennod"
 
-#: ../src/main/sword.cc:549
+#: ../src/main/sword.cc:537
 msgid ""
 "Xiphos's file for language\n"
 "abbreviations is missing."
@@ -1852,13 +1849,13 @@ msgstr ""
 "Ffeil Xiphos i’r talfyriadau\n"
 "iaith yn eisiau."
 
-#: ../src/main/sword.cc:556
+#: ../src/main/sword.cc:544
 msgid ""
 "Xiphos's language abbreviation\n"
 "file cannot be opened."
 msgstr ""
 
-#: ../src/main/sword.cc:567
+#: ../src/main/sword.cc:557
 msgid ""
 "Xiphos cannot allocate space\n"
 "for language abbreviations."
@@ -1866,7 +1863,7 @@ msgstr ""
 "Ni all Xiphos fapio’r\n"
 "ffeil talfyriadau iaith."
 
-#: ../src/main/sword.cc:574
+#: ../src/main/sword.cc:564
 msgid ""
 "Xiphos cannot read the\n"
 "language abbreviation file."
@@ -1874,41 +1871,44 @@ msgstr ""
 "Ni all Xiphos fapio’r\n"
 "ffeil talfyriadau iaith."
 
-#: ../src/main/sword.cc:1199
-msgid "Daily devotional was requested, but there are none installed."
-msgstr "Gofynnwyd am y defosiwn dyddiol, ond does dim wedi eu gosod."
+#: ../src/main/sword.cc:642
+msgid "No matching locale found for"
+msgstr ""
 
-#: ../src/main/tab_history.c:97
-msgid "H_istory/<Separator>"
-msgstr "H_anes/<Separator"
+#: ../src/main/sword.cc:644
+msgid "Book names and menus may not be translated"
+msgstr ""
 
-#: ../src/main/tab_history.c:99
-msgid "H_istory/C_lear"
-msgstr " H_anes /C_lirio"
+#: ../src/main/sword.cc:1232
+msgid "Daily devotional was requested, but there are none installed."
+msgstr "Gofynnwyd am y defosiwn dyddiol, ond does dim wedi eu gosod."
 
-#: ../src/main/tab_history.c:224
+#: ../src/main/tab_history.c:219
 msgid "Clear History"
 msgstr "Clirio Hanes"
 
-#: ../src/main/url.cc:99
+#: ../src/main/url.cc:101
 msgid "URL not found:"
 msgstr "methu dod o hyd i’r URL:"
 
-#: ../src/main/url.cc:194
+#: ../src/main/url.cc:191
+#, c-format
 msgid "Xiphos could not execute %s"
-msgstr "Xiphos yn methu gweithredu %au"
+msgstr "Xiphos yn methu gweithredu %s"
 
-#: ../src/main/url.cc:202
+#: ../src/main/url.cc:199
 msgid "Viewer error:\n"
 msgstr "Gwall gweld:\n"
 
-#: ../src/main/url.cc:278
+#: ../src/main/url.cc:272
+#, c-format
 msgid "Show %s in main window"
-msgstr "Dangos %au yn y prif ffenestr"
+msgstr "Dangos %s yn y prif ffenestr"
 
-#: ../src/main/xml.c:80 ../src/main/xml.c:465
+#: ../src/main/xml.c:80 ../src/main/xml.c:464
+#, c-format
 msgid "Document not created successfully. \n"
-msgstr "Methu creu’r ddogfen.\n"
+msgstr "Methu creu’r ddogfen. \n"
 
 #: ../src/main/xml.c:89
 msgid "Personal"
@@ -1923,8 +1923,8 @@ msgid "Acts 16:31"
 msgstr "Actau 16:31"
 
 #: ../src/main/xml.c:97 ../src/main/xml.c:98
-msgid "Eph 2:8"
-msgstr "Eff 2:8"
+msgid "Eph 2:8,9"
+msgstr ""
 
 #: ../src/main/xml.c:102 ../src/main/xml.c:103
 msgid "Romans 1:16"
@@ -1938,40 +1938,44 @@ msgstr "Beth ydy’r Efengyl?"
 msgid "1 Cor 15:1-4"
 msgstr "1 Cor 15:1-4"
 
-#: ../src/main/xml.c:413 ../src/main/xml.c:1078
+#: ../src/main/xml.c:413 ../src/main/xml.c:1144
+#, c-format
 msgid "Document not parsed successfully. \n"
-msgstr "Methu dosrannu’r ddogfen.\n"
+msgstr "Methu dosrannu’r ddogfen. \n"
 
-#: ../src/main/xml.c:419 ../src/main/xml.c:681 ../src/main/xml.c:959
-#: ../src/main/xml.c:1138
+#: ../src/main/xml.c:419 ../src/main/xml.c:747 ../src/main/xml.c:1025
+#: ../src/main/xml.c:1204
+#, c-format
 msgid "empty document \n"
 msgstr "dogfen wag \n"
 
 #: ../src/main/xml.c:425
+#, c-format
 msgid "wrong type, root node != SwordBookmarks\n"
 msgstr "math anghywir, cwgn gwreiddyn != DalennodauSword\n"
 
-#: ../src/main/xml.c:479
+#: ../src/main/xml.c:476
 msgid "Old Testament"
 msgstr "Hen Destament"
 
-#: ../src/main/xml.c:481
+#: ../src/main/xml.c:477
 msgid "Gen - Mal"
 msgstr "Gen - Mal"
 
-#: ../src/main/xml.c:487
+#: ../src/main/xml.c:482
 msgid "New Testament"
 msgstr "Testament Newydd"
 
-#: ../src/main/xml.c:489
+#: ../src/main/xml.c:483
 msgid "Mat - Rev"
 msgstr "Math - Dat"
 
-#: ../src/main/xml.c:497
+#: ../src/main/xml.c:489
 msgid "Sample Module List"
 msgstr "Sampl o Restr Modiwlau"
 
-#: ../src/main/xml.c:687 ../src/main/xml.c:965
+#: ../src/main/xml.c:753 ../src/main/xml.c:1031
+#, c-format
 msgid "wrong type, root node != %s\n"
 msgstr "math anghywir, cwgn gwreiddyn != %s\n"
 
@@ -1979,7 +1983,7 @@ msgstr "math anghywir, cwgn gwreiddyn != %s\n"
 msgid "Add Bookmark"
 msgstr "Ychwanegu Nod Llyfr"
 
-#: ../ui/bookmarks.glade.h:2
+#: ../ui/bookmarks.glade.h:2 ../ui/markverse.glade.h:1
 msgid "Bookmark Dialog"
 msgstr "Deialog Nod Tudalen"
 
@@ -1987,27 +1991,27 @@ msgstr "Deialog Nod Tudalen"
 msgid "Bookmark Folder Treeview"
 msgstr "Canghennau Ffolder Nod Tudalen"
 
-#: ../ui/bookmarks.glade.h:4
+#: ../ui/bookmarks.glade.h:4 ../ui/markverse.glade.h:2
 msgid "Cancel Bookmark"
 msgstr "Canslo Nod Tudalen"
 
-#: ../ui/bookmarks.glade.h:5
+#: ../ui/bookmarks.glade.h:5 ../ui/markverse.glade.h:3
 msgid "Create new folder"
 msgstr "Creu Ffolder Newydd"
 
 #: ../ui/bookmarks.glade.h:6
 msgid "Label Entry"
-msgstr "Cofnod Label: "
+msgstr "Cofnod Label:"
 
 #: ../ui/bookmarks.glade.h:7
 msgid "Label:"
 msgstr "Label:"
 
-#: ../ui/bookmarks.glade.h:8
+#: ../ui/bookmarks.glade.h:8 ../ui/markverse.glade.h:6
 msgid "Module Entry"
-msgstr "Cofnod Modiwl: "
+msgstr "Cofnod Modiwl:"
 
-#: ../ui/bookmarks.glade.h:9
+#: ../ui/bookmarks.glade.h:9 ../ui/markverse.glade.h:7
 msgid "Module:"
 msgstr "Modiwl:"
 
@@ -2015,15 +2019,16 @@ msgstr "Modiwl:"
 msgid "New ..."
 msgstr "Newydd ..."
 
-#: ../ui/bookmarks.glade.h:11 ../ui/xi-menus.glade.h:40
+#: ../ui/bookmarks.glade.h:11 ../ui/markverse.glade.h:8
+#: ../ui/xi-menus.glade.h:56
 msgid "New Folder"
 msgstr "Ffolder Newydd"
 
-#: ../ui/bookmarks.glade.h:12
+#: ../ui/bookmarks.glade.h:12 ../ui/markverse.glade.h:10
 msgid "Verse Entry"
 msgstr "_Cofnod Adnod"
 
-#: ../ui/bookmarks.glade.h:13
+#: ../ui/bookmarks.glade.h:13 ../ui/markverse.glade.h:11
 msgid "Verse:"
 msgstr "Adnod:"
 
@@ -2075,7 +2080,7 @@ msgstr "Cadw’r nodyn cyfredol"
 
 #: ../ui/editor_note.xml.h:13
 msgid "_Delete Personal Comment"
-msgstr "_Dileu’r Sylw Personol "
+msgstr "_Dileu’r Sylw Personol"
 
 #: ../ui/editor_note.xml.h:16
 msgid "_Save (Personal Comment)"
@@ -2153,7 +2158,7 @@ msgstr "Botwm Dewis Llyfr"
 msgid "Chapter Radio Button"
 msgstr "Botwm Dewis Pennod"
 
-#: ../ui/export-dialog.glade.h:9 ../ui/xi-menus.glade.h:12
+#: ../ui/export-dialog.glade.h:9 ../ui/xi-menus.glade.h:18
 msgid "Copy/Export Passage"
 msgstr "Copio/Allfudo’r darn"
 
@@ -2217,6 +2222,18 @@ msgstr "amrediad adnodau"
 msgid "Version"
 msgstr "Fersiwn"
 
+#: ../ui/markverse.glade.h:4
+msgid "Mark"
+msgstr ""
+
+#: ../ui/markverse.glade.h:5
+msgid "Mark/Unmark Verse"
+msgstr ""
+
+#: ../ui/markverse.glade.h:9
+msgid "Unmark"
+msgstr ""
+
 #: ../ui/module-manager.glade.h:1
 msgid "<b>Add and Remove Sources</b>"
 msgstr "<b>Ychwanegu a diddymu ffynonellau</b>"
@@ -2260,39 +2277,47 @@ msgstr "<i>Adran bersonol, i'ch defnydd chi yn unig:</i>"
 msgid "<i>System area, for all users:</i>"
 msgstr "<i>Adran y System, at ddefnydd pawb:</i>"
 
-#: ../ui/module-manager.glade.h:11
+#: ../ui/module-manager.glade.h:12
 msgid "Continue"
 msgstr "Parhau"
 
-#: ../ui/module-manager.glade.h:12
+#: ../ui/module-manager.glade.h:13
 msgid "Current Remote Sources"
 msgstr "Ffynnonellau Pell Cyfredol"
 
-#: ../ui/module-manager.glade.h:13
+#: ../ui/module-manager.glade.h:14
 msgid "Current local sources"
 msgstr "Ffynnonellau Lleol Cyfredol"
 
-#: ../ui/module-manager.glade.h:14
+#: ../ui/module-manager.glade.h:15
+msgid "Delete Index"
+msgstr "Dileu Mynegai"
+
+#: ../ui/module-manager.glade.h:16
 msgid "Home dir"
 msgstr "Cyfeiriadur Cartref"
 
-#: ../ui/module-manager.glade.h:16
+#: ../ui/module-manager.glade.h:19
+msgid "Load Standard"
+msgstr ""
+
+#: ../ui/module-manager.glade.h:20
 msgid "Local"
 msgstr "Lleol"
 
-#: ../ui/module-manager.glade.h:17
+#: ../ui/module-manager.glade.h:21
 msgid "Local Install Folder"
 msgstr "Gosod Ffolder Lleol"
 
-#: ../ui/module-manager.glade.h:18
+#: ../ui/module-manager.glade.h:22
 msgid "Module Manager"
 msgstr "Rheolwr Modiwlau"
 
-#: ../ui/module-manager.glade.h:19
+#: ../ui/module-manager.glade.h:23
 msgid "Remote"
 msgstr "Pell"
 
-#: ../ui/module-manager.glade.h:20
+#: ../ui/module-manager.glade.h:24
 msgid "Sword sys dir"
 msgstr "cyfeiriadur system SWORD"
 
@@ -2401,8 +2426,8 @@ msgid "Background"
 msgstr "Cefndir"
 
 #: ../ui/prefs.glade.h:21
-msgid "Base text size"
-msgstr "Maint ffont y bôn"
+msgid "Base font size"
+msgstr ""
 
 #: ../ui/prefs.glade.h:22
 msgid "Bible Texts"
@@ -2442,7 +2467,7 @@ msgstr "Newid Nodiadau Personol"
 
 #: ../ui/prefs.glade.h:32
 msgid "Choose to enable Prayer lists "
-msgstr "Dethol i alluogi rhestrau gweddi"
+msgstr "Dethol i alluogi rhestrau gweddi "
 
 #: ../ui/prefs.glade.h:34
 msgid "Commentaries Checkbox"
@@ -2633,40 +2658,52 @@ msgid "Show splash screen at start up"
 msgstr "Dangoswch y sgrin sblasio ar y cychwyn"
 
 #: ../ui/prefs.glade.h:84
+msgid "Special Locale (requires restart)"
+msgstr ""
+
+#: ../ui/prefs.glade.h:85
+msgid "Special Locale Combo"
+msgstr ""
+
+#: ../ui/prefs.glade.h:86
 msgid "StudyPad default directory combo"
 msgstr "Cyfeiriadur diofyn PadAstudio"
 
-#: ../ui/prefs.glade.h:86
+#: ../ui/prefs.glade.h:88
 msgid "Use Bible Text scroll bar to scroll to previous or next chapter"
 msgstr ""
-" Defnyddiwch far sgrolio Testun y Beibl i sgrolio i’r bennod flaenorol/y "
+"Defnyddiwch far sgrolio Testun y Beibl i sgrolio i’r bennod flaenorol/y "
 "bennod nesaf"
 
-#: ../ui/prefs.glade.h:87
+#: ../ui/prefs.glade.h:89
 msgid "Use Verse Per Line"
 msgstr "Defnyddiwch adnod i bob llinnell"
 
-#: ../ui/prefs.glade.h:88
+#: ../ui/prefs.glade.h:90
 msgid "Use Verse Per Line Checkbox"
 msgstr "Defnyddio Bocs Ticio Adnod i bob Llinnell"
 
-#: ../ui/prefs.glade.h:89
+#: ../ui/prefs.glade.h:91
 msgid "Use default Dictionary"
 msgstr "Defnyddiwch y Geiriadur rhagosodedig"
 
-#: ../ui/prefs.glade.h:90
+#: ../ui/prefs.glade.h:92
 msgid "Use default Dictionary Checkbox"
 msgstr "Defnyddiwch Focs Gwiro y Geiriadur rhagosodedig"
 
-#: ../ui/prefs.glade.h:91
+#: ../ui/prefs.glade.h:93
 msgid "Use tabbed browsing"
 msgstr "Defnyddiwch y porwr sydd wedi ei dabio"
 
-#: ../ui/prefs.glade.h:92
+#: ../ui/prefs.glade.h:94
 msgid "Use tabbed browsing Checkbox"
 msgstr "Defnyddiwch focs Gwiro y porwr sydd wedi ei dabio"
 
-#: ../ui/prefs.glade.h:93
+#: ../ui/prefs.glade.h:95
+msgid "Verse Number"
+msgstr ""
+
+#: ../ui/prefs.glade.h:96
 msgid "Verse number size"
 msgstr "Maint ffont rhif yr adnod"
 
@@ -2819,14 +2856,12 @@ msgid "Custom verse range radiobutton"
 msgstr "Botwm Dewisiadau adnodau personol"
 
 #: ../ui/search-dialog.glade.h:38
-#, fuzzy
 msgid "Delete Range Button"
-msgstr "Dileu Amrediad?"
+msgstr ""
 
 #: ../ui/search-dialog.glade.h:39
-#, fuzzy
 msgid "Delete Selected Module From List Button"
-msgstr "Symudwch y modiwl dewisedig o’r rhestr"
+msgstr ""
 
 #: ../ui/search-dialog.glade.h:40
 msgid "Delete selected range"
@@ -2849,6 +2884,14 @@ msgid "Exact phrase radiobutton"
 msgstr "Botwm Dewis Union gymal"
 
 #: ../ui/search-dialog.glade.h:46
+msgid "Export"
+msgstr "Allforio"
+
+#: ../ui/search-dialog.glade.h:47
+msgid "Export current search results"
+msgstr ""
+
+#: ../ui/search-dialog.glade.h:48
 msgid ""
 "Fast, featureful, index-based search\n"
 "Indexes must have been built beforehand:\n"
@@ -2858,229 +2901,229 @@ msgstr ""
 "Rhaid llunio’r mynegeion ymlaen llaw:\n"
 "Gweler swyddogaethau cynnal a chadw Rheolydd y Modiwl"
 
-#: ../ui/search-dialog.glade.h:49
+#: ../ui/search-dialog.glade.h:51
 msgid "Find Button"
 msgstr "Botwm Darganfod"
 
-#: ../ui/search-dialog.glade.h:51
+#: ../ui/search-dialog.glade.h:53
 msgid "Footnotes radiobutton"
 msgstr "Botwm Dewis Troednodiadau"
 
-#: ../ui/search-dialog.glade.h:52
+#: ../ui/search-dialog.glade.h:54
 msgid "In modules that have Footnotes"
 msgstr "Mewn modiwlau sydd a troednodiadau"
 
-#: ../ui/search-dialog.glade.h:53
+#: ../ui/search-dialog.glade.h:55
 msgid "In modules that have Morphological Tags"
 msgstr "Mewn modiwlau sydd a Thagiau Morffologol"
 
-#: ../ui/search-dialog.glade.h:54
+#: ../ui/search-dialog.glade.h:56
 msgid "In modules that have Strong's Numbers"
 msgstr "Mewn modiwlau sydd a rhifau Strong"
 
-#: ../ui/search-dialog.glade.h:55
+#: ../ui/search-dialog.glade.h:57
 msgid "Main Search Entry"
 msgstr "Cofnod Prif Chwiliad"
 
-#: ../ui/search-dialog.glade.h:56
+#: ../ui/search-dialog.glade.h:58
 msgid "Make selections on the Attribute Search tab"
 msgstr "Dewisiwch gan ddefnyddio’r tab chwilio priodoleddau"
 
-#: ../ui/search-dialog.glade.h:58
+#: ../ui/search-dialog.glade.h:60
 msgid "Match case checkbox"
 msgstr "Bocs Ticio Cydweddu"
 
-#: ../ui/search-dialog.glade.h:59
+#: ../ui/search-dialog.glade.h:61
 msgid "Module Selection"
 msgstr "Dewisiad modiwlau"
 
-#: ../ui/search-dialog.glade.h:60
+#: ../ui/search-dialog.glade.h:62
 msgid "Module list"
 msgstr "Rhestr Modiwlau"
 
-#: ../ui/search-dialog.glade.h:61
+#: ../ui/search-dialog.glade.h:63
 msgid "Module list radiobutton"
 msgstr "Botwm Dewis Rhestr Modiwlau"
 
-#: ../ui/search-dialog.glade.h:63
+#: ../ui/search-dialog.glade.h:65
 msgid "Morphological Tags radiobutton"
 msgstr "Botwm Dewis Tagiau Morffolegol"
 
-#: ../ui/search-dialog.glade.h:65
+#: ../ui/search-dialog.glade.h:67
 msgid "Multi word radiobutton"
 msgstr "Botwm Dewis Aml-eiriau"
 
-#: ../ui/search-dialog.glade.h:66
+#: ../ui/search-dialog.glade.h:68
 msgid "New Custom Module List Button"
 msgstr "Botwm Rhestr Modiwlau Personol Newydd"
 
-#: ../ui/search-dialog.glade.h:67
+#: ../ui/search-dialog.glade.h:69
 msgid "New Range Button"
 msgstr "Botwm Amrediad Newydd"
 
-#: ../ui/search-dialog.glade.h:68
+#: ../ui/search-dialog.glade.h:70
 msgid "Open Selection Dialog Button"
 msgstr "botwm Agor Dewis Deialog"
 
-#: ../ui/search-dialog.glade.h:69
+#: ../ui/search-dialog.glade.h:71
 msgid "Open a dialog to select modules to add to the list"
 msgstr "Agorwch ddeialog i ddewis modiwlau i ychwanegu at y rhestr"
 
-#: ../ui/search-dialog.glade.h:70
+#: ../ui/search-dialog.glade.h:72
 msgid "Optimized (\"Lucene\")"
 msgstr "Wedi ei optimeiddio (\"Lucene\")"
 
-#: ../ui/search-dialog.glade.h:71
+#: ../ui/search-dialog.glade.h:73
 msgid "Optimized (\"Lucene\") radiobutton"
 msgstr "Botwm dewis optimeiddio (\"Lucene\")"
 
-#: ../ui/search-dialog.glade.h:72
+#: ../ui/search-dialog.glade.h:74
 msgid "Range Definition Entry"
 msgstr "Diffinio’r amrediad"
 
-#: ../ui/search-dialog.glade.h:73
+#: ../ui/search-dialog.glade.h:75
 msgid "Range Name Entry"
 msgstr "Ailenwi’r Amrediad"
 
-#: ../ui/search-dialog.glade.h:75
+#: ../ui/search-dialog.glade.h:77
 msgid "Regular expression radiobutton"
 msgstr "Botwm Dewis Ymadrodd cyson"
 
-#: ../ui/search-dialog.glade.h:76
+#: ../ui/search-dialog.glade.h:78
 msgid "Remove the selected module from the list"
 msgstr "Symudwch y modiwl dewisedig o’r rhestr"
 
-#: ../ui/search-dialog.glade.h:77
+#: ../ui/search-dialog.glade.h:79
 msgid "Result Summary Table"
 msgstr "Tabl Crynhoi'r Canlyniadau"
 
-#: ../ui/search-dialog.glade.h:78
+#: ../ui/search-dialog.glade.h:80
 msgid "Result Summary Window"
 msgstr "ffenestr Crynhoi'r Canlyniadau"
 
-#: ../ui/search-dialog.glade.h:79
+#: ../ui/search-dialog.glade.h:81
 msgid "Results"
 msgstr "Canlyniadau"
 
-#: ../ui/search-dialog.glade.h:80
+#: ../ui/search-dialog.glade.h:82
 msgid "Save Custom Module List Button"
 msgstr "Botwm Rhestrau Modiwlau Personol"
 
-#: ../ui/search-dialog.glade.h:81
+#: ../ui/search-dialog.glade.h:83
 msgid "Save Range Button"
 msgstr "Botwm Cadw Amrediad"
 
-#: ../ui/search-dialog.glade.h:82
+#: ../ui/search-dialog.glade.h:84
 msgid "Save custom range"
 msgstr "Cadw’r dewisiadau personol"
 
-#: ../ui/search-dialog.glade.h:83
+#: ../ui/search-dialog.glade.h:85
 msgid "Save search results as bookmarks"
 msgstr "Cadwch ganlyniadau’r chwiliad fel nod tudalen"
 
-#: ../ui/search-dialog.glade.h:84
+#: ../ui/search-dialog.glade.h:86
 msgid "Save the module list"
 msgstr "Cadwch y rhestr modwlau"
 
-#: ../ui/search-dialog.glade.h:85
+#: ../ui/search-dialog.glade.h:87
 msgid "Search  Criteria"
 msgstr "Meini prawf y chwiliad"
 
-#: ../ui/search-dialog.glade.h:86
+#: ../ui/search-dialog.glade.h:88
 msgid "Search Criteria Treeview"
 msgstr "Canghennau Meini prawf y chwiliad"
 
-#: ../ui/search-dialog.glade.h:87
+#: ../ui/search-dialog.glade.h:89
 msgid "Search entire module"
 msgstr "Chwiliwch y modiwl yn gyfan"
 
-#: ../ui/search-dialog.glade.h:88
+#: ../ui/search-dialog.glade.h:90
 msgid "Search for Morphological tags"
 msgstr "Chwiliwch am dagiau Morffolegol"
 
-#: ../ui/search-dialog.glade.h:89
+#: ../ui/search-dialog.glade.h:91
 msgid "Search for Strongs Numbers like G4442 or H1121"
 msgstr "Chwiliwch am rifau Strong megis G4422 neu H1121"
 
-#: ../ui/search-dialog.glade.h:90
+#: ../ui/search-dialog.glade.h:92
 msgid "Search in footnotes"
 msgstr "Chwiliwch mewn troed nodiadau"
 
-#: ../ui/search-dialog.glade.h:91
+#: ../ui/search-dialog.glade.h:93
 msgid "Show Footnotes"
 msgstr "Dangos Troednodiadau"
 
-#: ../ui/search-dialog.glade.h:92
+#: ../ui/search-dialog.glade.h:94
 msgid "Show Footnotes checkbox"
 msgstr "Bocs ticio Dangos Troednodiadau"
 
-#: ../ui/search-dialog.glade.h:93
+#: ../ui/search-dialog.glade.h:95
 msgid "Show Morphological Tags"
 msgstr "Dangos tagiau morffologol"
 
-#: ../ui/search-dialog.glade.h:94
+#: ../ui/search-dialog.glade.h:96
 msgid "Show Morphological Tags checkbox"
 msgstr "Dangos bocs ticio tagiau morffologol"
 
-#: ../ui/search-dialog.glade.h:95
+#: ../ui/search-dialog.glade.h:97
 msgid "Show Strong's Numbers"
 msgstr "Dangos rhifau Strong"
 
-#: ../ui/search-dialog.glade.h:96
+#: ../ui/search-dialog.glade.h:98
 msgid "Show Strong's Numbers checkbox"
 msgstr "Dangos bocs ticio rhifau Strong"
 
-#: ../ui/search-dialog.glade.h:97
+#: ../ui/search-dialog.glade.h:99
 msgid "Show in main window"
 msgstr "Dangos yn y prif ffenestr"
 
-#: ../ui/search-dialog.glade.h:98
+#: ../ui/search-dialog.glade.h:100
 msgid "Single module"
 msgstr "Modiwl unigol"
 
-#: ../ui/search-dialog.glade.h:99
+#: ../ui/search-dialog.glade.h:101
 msgid "Single module radiobutton"
 msgstr "Botwm Dewis Modiwl unigol"
 
-#: ../ui/search-dialog.glade.h:100
+#: ../ui/search-dialog.glade.h:102
 msgid "Start/stop searching"
 msgstr "Dechrau/gorffen chwilio"
 
-#: ../ui/search-dialog.glade.h:101
+#: ../ui/search-dialog.glade.h:103
 msgid "Strongs Numbers"
 msgstr "Rhifau Strong"
 
-#: ../ui/search-dialog.glade.h:102
+#: ../ui/search-dialog.glade.h:104
 msgid "Strongs Numbers radiobutton"
 msgstr "Botwm Dewis Rhifau Strong"
 
-#: ../ui/search-dialog.glade.h:103
+#: ../ui/search-dialog.glade.h:105
 msgid "Use a custom module list for the search"
 msgstr "Defnyddiwch rhestr modiwlau personol ar gyfer y chwiliad hwn"
 
-#: ../ui/search-dialog.glade.h:104
+#: ../ui/search-dialog.glade.h:106
 msgid "Use a custom range for the scope of the search"
 msgstr "Defnyddiwch amrediad personol am sgôp y chwiliad hwn"
 
-#: ../ui/search-dialog.glade.h:105
+#: ../ui/search-dialog.glade.h:107
 msgid "Use a single module for the search"
 msgstr "Defnyddiwch fodiwl unigol i chwilio"
 
-#: ../ui/search-dialog.glade.h:106
+#: ../ui/search-dialog.glade.h:108
 msgid "Use the current module list for the search"
 msgstr "Defnyddiwch restr modiwlau cyfredol ar gyfer y chwiliad hwn"
 
-#: ../ui/search-dialog.glade.h:107
+#: ../ui/search-dialog.glade.h:109
 msgid "Use the results of the last search as the scope of the search"
 msgstr "Defnyddiwch canlyniadau’r chwiliad diwethaf fel sgôp y chwiliad hwn"
 
-#: ../ui/search-dialog.glade.h:108
+#: ../ui/search-dialog.glade.h:110
 msgid "e.g. Matt-John;Rev4"
 msgstr "e.e. Math-Ioan;Dat4"
 
-#: ../ui/search-dialog.glade.h:109
+#: ../ui/search-dialog.glade.h:111
 msgid "for "
-msgstr "i  "
+msgstr "i "
 
 #: ../ui/xi-menus.glade.h:2
 msgid "About _Translation"
@@ -3091,294 +3134,384 @@ msgid "About _Xiphos"
 msgstr "Am _Xiphos"
 
 #: ../ui/xi-menus.glade.h:4
+msgid "Add Item"
+msgstr ""
+
+#: ../ui/xi-menus.glade.h:5
+msgid "Add Sub-Item"
+msgstr ""
+
+#: ../ui/xi-menus.glade.h:6
+msgid "Add a sub-item"
+msgstr ""
+
+#: ../ui/xi-menus.glade.h:7
+msgid "Add an item"
+msgstr "Ychwanegu Eitem"
+
+#: ../ui/xi-menus.glade.h:8
 msgid "Add new folder to selected folder"
 msgstr "Ychwanegu ffolder newyd i’r ffolder a ddewiswyd"
 
-#: ../ui/xi-menus.glade.h:6
+#: ../ui/xi-menus.glade.h:10
 msgid "Allow Reordering"
 msgstr "Caniatau Ad-drefnu"
 
-#: ../ui/xi-menus.glade.h:7
+#: ../ui/xi-menus.glade.h:11
 msgid "Allow items to be moved from one folder to another"
 msgstr "Caniatau symud eitemau o un ffolder i’r llall"
 
-#: ../ui/xi-menus.glade.h:9
+#: ../ui/xi-menus.glade.h:12
+msgid "Annotate Verse"
+msgstr ""
+
+#: ../ui/xi-menus.glade.h:14
+msgid "Browse in BibleMap.org"
+msgstr ""
+
+#: ../ui/xi-menus.glade.h:15
 msgid "Collapse All"
 msgstr "Dymchwel y cwbl"
 
-#: ../ui/xi-menus.glade.h:10
+#: ../ui/xi-menus.glade.h:16
 msgid "Collapse all Bookmarks groups"
 msgstr "Dymchwel pob grwp Nod Tudalen"
 
-#: ../ui/xi-menus.glade.h:11
+#: ../ui/xi-menus.glade.h:17
 msgid "Commentary by Chapter"
 msgstr "Esboniad bob yn bennod"
 
-#: ../ui/xi-menus.glade.h:13
+#: ../ui/xi-menus.glade.h:19
+msgid "Create a new daily journal"
+msgstr ""
+
+#: ../ui/xi-menus.glade.h:20
+msgid "Create a new monthly journal"
+msgstr ""
+
+#: ../ui/xi-menus.glade.h:21
+msgid "Create a new outlined topic"
+msgstr ""
+
+#: ../ui/xi-menus.glade.h:22
+msgid "Create a new simple prayer list"
+msgstr "Creu rhestr weddi syml newydd"
+
+#: ../ui/xi-menus.glade.h:23
+msgid "Create a new subject prayer list"
+msgstr ""
+
+#: ../ui/xi-menus.glade.h:24
 msgid "D_ouble-Space Text"
 msgstr "Testun Bylchu-Dwbl"
 
-#: ../ui/xi-menus.glade.h:14
+#: ../ui/xi-menus.glade.h:25
+msgid "Daily"
+msgstr ""
+
+#: ../ui/xi-menus.glade.h:26
 msgid "Delete Item"
 msgstr "Dileu Eitem"
 
-#: ../ui/xi-menus.glade.h:15
+#: ../ui/xi-menus.glade.h:27
 msgid "Delete item"
 msgstr "Dileu Eitem"
 
-#: ../ui/xi-menus.glade.h:16
-msgid "Dictionary/_Lexicon"
-msgstr "Geiriadur/_Geiriadur Groeg"
+#: ../ui/xi-menus.glade.h:28
+msgid "Dictionar_y"
+msgstr ""
 
-#: ../ui/xi-menus.glade.h:17
+#: ../ui/xi-menus.glade.h:29
 msgid "Display Book Heading"
 msgstr "Dangos Teitl y Llyfr"
 
-#: ../ui/xi-menus.glade.h:18
+#: ../ui/xi-menus.glade.h:30
 msgid "Display Chapter Heading"
 msgstr "Dangos Teitl y bennod"
 
-#: ../ui/xi-menus.glade.h:19
+#: ../ui/xi-menus.glade.h:31
 msgid "Dump Pers.Comm."
 msgstr "Dympio Esboniad Personol."
 
-#: ../ui/xi-menus.glade.h:21
+#: ../ui/xi-menus.glade.h:33
 msgid "Edit bookmark item"
 msgstr "Golygu Eitem Nod Tudalen"
 
-#: ../ui/xi-menus.glade.h:22
+#: ../ui/xi-menus.glade.h:34
+msgid "Edit this item"
+msgstr "Golygu’r eitem hon"
+
+#: ../ui/xi-menus.glade.h:35
 msgid "Expand All"
 msgstr "Ehangu’r cwbl"
 
-#: ../ui/xi-menus.glade.h:23
+#: ../ui/xi-menus.glade.h:36
 msgid "Expand all Bookmarks groups"
 msgstr "Ehangu pob grwp Nod Tudalen"
 
-#: ../ui/xi-menus.glade.h:30
+#: ../ui/xi-menus.glade.h:37
+msgid "Export Folder"
+msgstr ""
+
+#: ../ui/xi-menus.glade.h:38
+msgid "Export List"
+msgstr ""
+
+#: ../ui/xi-menus.glade.h:45
 msgid "Image Content"
 msgstr "Cynnwys y ddelwedd"
 
-#: ../ui/xi-menus.glade.h:31
+#: ../ui/xi-menus.glade.h:46
 msgid "Import Bibletime Bookmarks"
 msgstr "Mewnfudo Nodau Tudalen Bibletime"
 
-#: ../ui/xi-menus.glade.h:32
+#: ../ui/xi-menus.glade.h:47
 msgid "Insert Bookmark"
 msgstr "Mewnosod Nod Tudalen"
 
-#: ../ui/xi-menus.glade.h:33
+#: ../ui/xi-menus.glade.h:48
 msgid "Insert new bookmark here"
 msgstr "Mewnosod Nod Tudalen yma"
 
-#: ../ui/xi-menus.glade.h:34
+#: ../ui/xi-menus.glade.h:49
 msgid "L_ink Tabs"
 msgstr "Tabiau dolenni"
 
-#: ../ui/xi-menus.glade.h:36
+#: ../ui/xi-menus.glade.h:51
 msgid "Load Bookmarks from Bibletime"
 msgstr "Llwytho Nodau Tudalen o Bibletime"
 
-#: ../ui/xi-menus.glade.h:37
+#: ../ui/xi-menus.glade.h:52
 msgid "Lookup Selection"
 msgstr "Edrych ar y dewisiad"
 
-#: ../ui/xi-menus.glade.h:41
+#: ../ui/xi-menus.glade.h:54
+msgid "Monthly"
+msgstr "Misol"
+
+#: ../ui/xi-menus.glade.h:57
 msgid "Note"
 msgstr "Nodyn"
 
-#: ../ui/xi-menus.glade.h:42
+#: ../ui/xi-menus.glade.h:58
 msgid "Open Module"
 msgstr "Agor Modiwl"
 
-#: ../ui/xi-menus.glade.h:43
+#: ../ui/xi-menus.glade.h:59
 msgid "Open Study_pad"
 msgstr "Agor Pad_Astudio"
 
-#: ../ui/xi-menus.glade.h:44
+#: ../ui/xi-menus.glade.h:60
 msgid "Open in a dialog"
 msgstr "Agor mewn deialog"
 
-#: ../ui/xi-menus.glade.h:46
+#: ../ui/xi-menus.glade.h:61
+msgid "Open in a separate window"
+msgstr "Agor mewn ffenestr arall"
+
+#: ../ui/xi-menus.glade.h:62
+msgid "Open in editor"
+msgstr "Agor yn Golygydd"
+
+#: ../ui/xi-menus.glade.h:63
 msgid "Open in new tab"
 msgstr "Agor mewn  tab newydd"
 
-#: ../ui/xi-menus.glade.h:47
+#: ../ui/xi-menus.glade.h:64
+msgid ""
+"Open selected module in a\n"
+"\tseparate ['dialog'] window"
+msgstr ""
+
+#: ../ui/xi-menus.glade.h:66
+msgid "Open selected module in a new tab"
+msgstr "Agor i modiwl ddewiswyd mewn tab newydd"
+
+#: ../ui/xi-menus.glade.h:67
 msgid "Open this bookmark in a dialog"
 msgstr "Agor y Nod Tudalen mewn deialog"
 
-#: ../ui/xi-menus.glade.h:48
+#: ../ui/xi-menus.glade.h:68
 msgid "Open this bookmark in a new tab"
 msgstr "Agor y Nod Tudalen mewn tab newydd"
 
-#: ../ui/xi-menus.glade.h:50
+#: ../ui/xi-menus.glade.h:69
+msgid "Outlined"
+msgstr ""
+
+#: ../ui/xi-menus.glade.h:71
 msgid "Read Selection Aloud"
 msgstr "Darllen y dewisiad yn uchel"
 
-#: ../ui/xi-menus.glade.h:51
-msgid "Remove - Restore"
-msgstr "Diddymu - Adfer"
-
-#: ../ui/xi-menus.glade.h:52
-msgid "Remove Folder"
-msgstr "Diddymu Ffolder"
-
-#: ../ui/xi-menus.glade.h:53
+#: ../ui/xi-menus.glade.h:73
 msgid "Remove folder and save it"
 msgstr "Diddymu ffolder a’i gadw"
 
-#: ../ui/xi-menus.glade.h:54
+#: ../ui/xi-menus.glade.h:74
+msgid "Remove this item"
+msgstr "Diddymu’r eitem hon"
+
+#: ../ui/xi-menus.glade.h:75
 msgid "Rename Pers.Comm."
 msgstr "Ailenwi Esboniad Personol."
 
-#: ../ui/xi-menus.glade.h:55
+#: ../ui/xi-menus.glade.h:76
 msgid "Respect Font Faces"
 msgstr "Parchu Wyneb teip y ffont"
 
-#: ../ui/xi-menus.glade.h:56
+#: ../ui/xi-menus.glade.h:77
 msgid "Restore Folder"
 msgstr "Adfer Ffolder"
 
-#: ../ui/xi-menus.glade.h:57
+#: ../ui/xi-menus.glade.h:78
 msgid "Restore saved folder"
-msgstr "Adfer y Ffolder Gadwyd "
+msgstr "Adfer y Ffolder Gadwyd"
 
-#: ../ui/xi-menus.glade.h:58
+#: ../ui/xi-menus.glade.h:79
 msgid "Save list as a series of bookmarks"
 msgstr "Cadw’r rhestr fel nodau dalen"
 
-#: ../ui/xi-menus.glade.h:59
+#: ../ui/xi-menus.glade.h:80
 msgid "Save list as a single bookmark"
 msgstr "Cadwch y rhestr fel nod tudalen"
 
-#: ../ui/xi-menus.glade.h:60
+#: ../ui/xi-menus.glade.h:81
 msgid "Save these results as a series of bookmarks in their own folder"
 msgstr "Cadw’r canlyniadau chwilio fel nodau dalen yn eu ffolder eu hunain"
 
-#: ../ui/xi-menus.glade.h:61
+#: ../ui/xi-menus.glade.h:82
 msgid "Save these results as a single bookmark"
 msgstr "Cadw’r canlyniadau chwilio fel un nod dalen"
 
-#: ../ui/xi-menus.glade.h:62
+#: ../ui/xi-menus.glade.h:83
 msgid "Scripture Cross-references"
 msgstr "Croesgyfeiriadau"
 
-#: ../ui/xi-menus.glade.h:64
+#: ../ui/xi-menus.glade.h:85
 msgid "Show Parallel View in a _Tab"
 msgstr "Golwg Paralel mewn Tab"
 
-#: ../ui/xi-menus.glade.h:65
+#: ../ui/xi-menus.glade.h:86
 msgid "Show Previe_wer in the Sidebar"
 msgstr "Dangos Rhagolygwr yn y bar ochr"
 
-#: ../ui/xi-menus.glade.h:66
+#: ../ui/xi-menus.glade.h:87
 msgid "Show Verse _Numbers"
 msgstr "Dangos Rhifau_Adnodau"
 
-#: ../ui/xi-menus.glade.h:69
+#: ../ui/xi-menus.glade.h:88
+msgid "Simple"
+msgstr "Syml"
+
+#: ../ui/xi-menus.glade.h:90
+msgid "Subject"
+msgstr "Pwnc"
+
+#: ../ui/xi-menus.glade.h:92
 msgid "Unlock This Module"
 msgstr "Datgloi’r Modiwl"
 
-#: ../ui/xi-menus.glade.h:70
+#: ../ui/xi-menus.glade.h:93
 msgid "Use Current Dictionary"
 msgstr "Defnyddio’r Geiriadur Cyfredol"
 
-#: ../ui/xi-menus.glade.h:71
+#: ../ui/xi-menus.glade.h:94
 msgid "Use module manager to install and remove Sword modules"
 msgstr "Defnyddio’r rheolwr modiwl i osod a diddymu modiwlau SWORD"
 
-#: ../ui/xi-menus.glade.h:72
+#: ../ui/xi-menus.glade.h:95
 msgid "Variants"
 msgstr "Amrywiadau"
 
-#: ../ui/xi-menus.glade.h:74
+#: ../ui/xi-menus.glade.h:97
 msgid "_About The SWORD Project"
 msgstr "_am brosiect SWORD"
 
-#: ../ui/xi-menus.glade.h:75
+#: ../ui/xi-menus.glade.h:98
 msgid "_Advanced Search"
 msgstr "_Chwilio Manwl"
 
-#: ../ui/xi-menus.glade.h:76
+#: ../ui/xi-menus.glade.h:99
 msgid "_Attach/Detach Sidebar"
 msgstr "_Atodi/Gwahanu Bar ochr"
 
-#: ../ui/xi-menus.glade.h:77
-msgid "_Bible Text"
-msgstr "_Testun Beiblaidd"
+#: ../ui/xi-menus.glade.h:100
+msgid "_Bible"
+msgstr ""
 
-#: ../ui/xi-menus.glade.h:78
-msgid "_Commentary"
-msgstr "_Esboniad"
+#: ../ui/xi-menus.glade.h:101
+msgid "_Commentary/Book"
+msgstr ""
 
-#: ../ui/xi-menus.glade.h:79
+#: ../ui/xi-menus.glade.h:102
 msgid "_Contents"
 msgstr "_Cynnwys"
 
-#: ../ui/xi-menus.glade.h:80
+#: ../ui/xi-menus.glade.h:103
 msgid "_Daily Devotion"
 msgstr "_Defosiwn Dyddiol"
 
-#: ../ui/xi-menus.glade.h:81
+#: ../ui/xi-menus.glade.h:104
 msgid "_Edit"
 msgstr "_Golygu"
 
-#: ../ui/xi-menus.glade.h:82
+#: ../ui/xi-menus.glade.h:105
 msgid "_Edit Item"
 msgstr "_Golygu Eitem"
 
-#: ../ui/xi-menus.glade.h:84
+#: ../ui/xi-menus.glade.h:107
 msgid "_Help"
 msgstr "_Help"
 
-#: ../ui/xi-menus.glade.h:85
+#: ../ui/xi-menus.glade.h:108
 msgid "_Highlight Current Verse"
 msgstr "_Aroleuo’r Adnod Gyfredol"
 
-#: ../ui/xi-menus.glade.h:86
+#: ../ui/xi-menus.glade.h:109
 msgid "_Live Chat"
 msgstr "_Sgwrs Fyw"
 
-#: ../ui/xi-menus.glade.h:87
+#: ../ui/xi-menus.glade.h:110
 msgid "_Mailing List"
 msgstr "_Rhestr Bostio"
 
-#: ../ui/xi-menus.glade.h:88
+#: ../ui/xi-menus.glade.h:111
 msgid "_Module Manager"
 msgstr "_Rheolydd Modiwl"
 
-#: ../ui/xi-menus.glade.h:89
+#: ../ui/xi-menus.glade.h:112
 msgid "_Open Session"
 msgstr "_Agor Sesiwn"
 
-#: ../ui/xi-menus.glade.h:90
+#: ../ui/xi-menus.glade.h:113
 msgid "_Preferences"
 msgstr "Dewisiadau"
 
-#: ../ui/xi-menus.glade.h:91
+#: ../ui/xi-menus.glade.h:114
 msgid "_Preview"
 msgstr "_Rhagolwg"
 
-#: ../ui/xi-menus.glade.h:92
+#: ../ui/xi-menus.glade.h:115
 msgid "_Read Aloud"
 msgstr "_Darllen yn uchel"
 
-#: ../ui/xi-menus.glade.h:93
+#: ../ui/xi-menus.glade.h:116
 msgid "_Report Bug"
 msgstr "_Dweud am Nam"
 
-#: ../ui/xi-menus.glade.h:94
+#: ../ui/xi-menus.glade.h:117
 msgid "_Save Session"
 msgstr "_Cadw Sesiwn"
 
-#: ../ui/xi-menus.glade.h:95
+#: ../ui/xi-menus.glade.h:118
 msgid "_Search"
 msgstr "_Chwilio"
 
-#: ../ui/xi-menus.glade.h:96
-msgid "_Show/Hide Sidebar"
-msgstr "_Dangos/Cuddio Bar ochr"
+#: ../ui/xi-menus.glade.h:119
+msgid "_Show/Hide Attached Sidebar"
+msgstr ""
 
-#: ../ui/xi-menus.glade.h:97
+#: ../ui/xi-menus.glade.h:120
 msgid "_Verse Per Line"
 msgstr "_Adnod y llinnell"
 
@@ -3390,6 +3523,153 @@ msgstr "Astudio’r Beibl"
 msgid "Xiphos Bible Guide"
 msgstr "Canllaw Beibl Xiphos"
 
+#~ msgid "Install these modules:"
+#~ msgstr "Gosod y Modiwlau hyn:"
+
+#~ msgid "Remove these modules:"
+#~ msgstr "Dileu y Modiwlau hyn:"
+
+#~ msgid "Archive these modules:"
+#~ msgstr "Archifo’r Modiwlau hyn:"
+
+#~ msgid ""
+#~ "Build fast-search index for these\n"
+#~ "modules (may take minutes/module):"
+#~ msgstr ""
+#~ "Creu mynegai  chwilio cyflym i’r \n"
+#~ "modiwlau hyn (gall gymryd sawl munud y modiwl):"
+
+#~ msgid "Delete fast-search index for these modules:"
+#~ msgstr "Dileu’r mynegai chwilio cyflym i’r modiwlau hyn:"
+
+#~ msgid "Xiphos could not execute archiver"
+#~ msgstr "Allai Xiphos ddim dechrau’r archifwr"
+
+#~ msgid ""
+#~ " archival result:\n"
+#~ "\n"
+#~ msgstr ""
+#~ " canlyniad archifol:\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Archive in "
+#~ msgstr ""
+#~ "\n"
+#~ "Archifo yn "
+
+#~ msgid "Refreshing remote"
+#~ msgstr "Adnewyddu’r cyrchiad  pell"
+
+#~ msgid "Remote not found"
+#~ msgstr "Methu canfod cyrchiad pell"
+
+#~ msgid "Sources"
+#~ msgstr "Ffeiliau tarddiad"
+
+#~ msgid "Text"
+#~ msgstr "Testun"
+
+#~ msgid "Text to render"
+#~ msgstr "Testun i’w gyflwyno"
+
+#~ msgid "Pixbuf Object"
+#~ msgstr "Gwrthrych Pixbwf"
+
+#~ msgid "The pixbuf to render."
+#~ msgstr "Y pixbwf i’w gyflwyno."
+
+#~ msgid "Open in a new tab"
+#~ msgstr "Agor mewn  tab newydd"
+
+#~ msgid "Open selected module in a separate ['dialog'] window"
+#~ msgstr "Agor y modiwl ddewiswyd mewn deialog"
+
+#~ msgid "View information about the selected dialog"
+#~ msgstr "Edrych ar y wybodaeth am y deialog ddewiswyd"
+
+#~ msgid "Create a new prayer list"
+#~ msgstr "Creu rhestr weddi newydd"
+
+#~ msgid "Daily Journal"
+#~ msgstr "Dyddlyfr"
+
+#~ msgid "Outlined Topic"
+#~ msgstr "Pwnc Amlinellwyd"
+
+#~ msgid "Open selected module in a dialog"
+#~ msgstr "Agor y modiwl ddewiswyd mewn deialog"
+
+#~ msgid "Move backwards through history"
+#~ msgstr "Yn ôl drwy'r hanes"
+
+#~ msgid "Move foward through history"
+#~ msgstr "Ymlaen drwy'r hanes"
+
+#~ msgid "Select a Book of the Bible"
+#~ msgstr "Dewis Llyfr o’r Beibl"
+
+#~ msgid "Change Chapter"
+#~ msgstr "Pennod Newydd"
+
+#~ msgid "Change Verse"
+#~ msgstr "Adnod Newydd"
+
+#~ msgid "Enter a Verse reference in Book 1:1 format and press Return"
+#~ msgstr ""
+#~ "Teipiwch gyfeirnod adnod yn y fformat Llyfr 1:1 a phwyso’r Dychwelwr"
+
+#~ msgid "Add Child"
+#~ msgstr "Ychwanegu Plentyn"
+
+#~ msgid "Add Sibling"
+#~ msgstr "Ychwanegu Sibling"
+
+#~ msgid "Xiphos has renamed .xiphos-2.0 to .xiphos"
+#~ msgstr "Mae Xiphos wedi ail-enwi .xiphos-2.0 yn .xiphos"
+
+#~ msgid ""
+#~ "Xiphos can not rename  .xiphos-2.0 to .xiphos:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Xiphos cannot continue."
+#~ msgstr ""
+#~ "Ni all Xiphos ail-enwi .xiphos-2.0 yn .xiphos:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "All Xiphos ddim parhau."
+
+#~ msgid "H_istory/<Separator>"
+#~ msgstr "H_anes/<Separator"
+
+#~ msgid "H_istory/C_lear"
+#~ msgstr "H_anes /C_lirio"
+
+#~ msgid "Eph 2:8"
+#~ msgstr "Eff 2:8"
+
+#~ msgid "Base text size"
+#~ msgstr "Maint ffont y bôn"
+
+#~ msgid "Dictionary/_Lexicon"
+#~ msgstr "Geiriadur/_Geiriadur Groeg"
+
+#~ msgid "Remove - Restore"
+#~ msgstr "Diddymu - Adfer"
+
+#~ msgid "Remove Folder"
+#~ msgstr "Diddymu Ffolder"
+
+#~ msgid "_Bible Text"
+#~ msgstr "_Testun Beiblaidd"
+
+#~ msgid "_Commentary"
+#~ msgstr "_Esboniad"
+
+#~ msgid "_Show/Hide Sidebar"
+#~ msgstr "_Dangos/Cuddio Bar ochr"
+
 #~ msgid "It will be lost permanently!"
 #~ msgstr "Bydd yn cael ei ddileu’n barhaol!"
 
@@ -3518,7 +3798,7 @@ msgstr "Canllaw Beibl Xiphos"
 #~ msgstr "_Copio"
 
 #~ msgid "Copy highlighted text from main window"
-#~ msgstr " Copio’r testun a amlygwyd o’r brif ffenestr "
+#~ msgstr "Copio’r testun a amlygwyd o’r brif ffenestr"
 
 #~ msgid "Search using the shortcut bar"
 #~ msgstr "Chwilio gyda’r bar llwybr byr"
@@ -3563,15 +3843,11 @@ msgstr "Canllaw Beibl Xiphos"
 #~ msgstr "Am_Xiphos ..."
 
 #~ msgid "About this application"
-#~ msgstr "Am y cymhwysiad  hwn "
+#~ msgstr "Am y cymhwysiad  hwn"
 
 #~ msgid "Hi_story"
 #~ msgstr "Hanes"
 
-#, fuzzy
-#~ msgid "About GnomeSword Translation"
-#~ msgstr "Am gyfieithu GnomeSword"
-
 #~ msgid "Initiating SWORD"
 #~ msgstr "Dechrau SWORD"
 
@@ -3657,9 +3933,6 @@ msgstr "Canllaw Beibl Xiphos"
 #~ "Hoffech chi i Xiphos osod ei hun\n"
 #~ "fel y rhaglen i reoli’r URLiau hyn?"
 
-#~ msgid "Delete Index"
-#~ msgstr "Dileu Mynegai"
-
 #~ msgid "<b>Font Miscellaneous</b>"
 #~ msgstr "<b>Ffont amrywiol</b>"
 
@@ -3676,7 +3949,7 @@ msgstr "Canllaw Beibl Xiphos"
 #~ msgstr "Arabeg"
 
 #~ msgid "Azerbaijani"
-#~ msgstr " Azerbaijani"
+#~ msgstr "Azerbaijani"
 
 #~ msgid "Belarusian"
 #~ msgstr "Belarwsaeg"
@@ -3961,7 +4234,7 @@ msgstr "Canllaw Beibl Xiphos"
 #~ "Unlink of old configuration failed:\n"
 #~ "%s"
 #~ msgstr ""
-#~ " Methu dadgysylltu’r hen ffurfweddiad:\n"
+#~ "Methu dadgysylltu’r hen ffurfweddiad:\n"
 #~ "%s"
 
 #~ msgid "Show Tabs"
@@ -3979,11 +4252,8 @@ msgstr "Canllaw Beibl Xiphos"
 #~ msgid "Old"
 #~ msgstr "Hen"
 
-#~ msgid "New"
-#~ msgstr "Newydd"
-
 #~ msgid "Remove/Archive"
-#~ msgstr " Symud/Archifo"
+#~ msgstr "Symud/Archifo"
 
 #~ msgid "URL:"
 #~ msgstr "URL:"
@@ -3992,25 +4262,25 @@ msgstr "Canllaw Beibl Xiphos"
 #~ msgstr "Ewch i’r rhiant"
 
 #~ msgid "Go to first child"
-#~ msgstr "Ewch i’r plentyn cyntaf "
+#~ msgstr "Ewch i’r plentyn cyntaf"
 
 #~ msgid "Save using the PersistStream interface"
 #~ msgstr "Cadwch gan ddefnyddio’r rhyngwyneb PersistStream"
 
 #~ msgid "Open (PersistFile)"
-#~ msgstr " Agorwch (PersistFile)"
+#~ msgstr "Agorwch (PersistFile)"
 
 #~ msgid "Open using the PersistFile interface"
-#~ msgstr " Agorwch gan ddefnyddio’r rhyngwyneb PersistFile"
+#~ msgstr "Agorwch gan ddefnyddio’r rhyngwyneb PersistFile"
 
 #~ msgid "Save (PersistFile)"
-#~ msgstr " Cadwch (PersistFile)"
+#~ msgstr "Cadwch (PersistFile)"
 
 #~ msgid "Save using the PersistFile interface"
 #~ msgstr "Cadwch gan ddefnyddio’r rhyngwyneb PersitFile"
 
 #~ msgid "Remove failed"
-#~ msgstr " Methu symud"
+#~ msgstr "Methu symud"
 
 #~ msgid "-untitled-"
 #~ msgstr "-di-deitl-"
@@ -4021,9 +4291,6 @@ msgstr "Canllaw Beibl Xiphos"
 #~ msgid "Link text: "
 #~ msgstr "Dolennu Testun: "
 
-#~ msgid "Export"
-#~ msgstr "Allforio"
-
 #~ msgid "Cut"
 #~ msgstr "Torri"
 
@@ -4057,9 +4324,6 @@ msgstr "Canllaw Beibl Xiphos"
 #~ msgid "Cell"
 #~ msgstr "Cell"
 
-#~ msgid "Insert Link"
-#~ msgstr "Mewnosod Dolen"
-
 #~ msgid "Remove Link"
 #~ msgstr "Symud Dolen"
 
@@ -4133,10 +4397,10 @@ msgstr "Canllaw Beibl Xiphos"
 #~ msgstr "Disodli’r cadarnhad"
 
 #~ msgid "Replace _All"
-#~ msgstr "Disodli’r _Cyfan "
+#~ msgstr "Disodli’r _Cyfan"
 
 #~ msgid "_Next"
-#~ msgstr "_Nesaf "
+#~ msgstr "_Nesaf"
 
 #~ msgid "_Replace"
 #~ msgstr "_Disodli"
@@ -4166,7 +4430,7 @@ msgstr "Canllaw Beibl Xiphos"
 #~ msgstr "Gwirydd sillafu"
 
 #~ msgid "Current _Languages"
-#~ msgstr " Ieithoedd _cyfredol "
+#~ msgstr "Ieithoedd _cyfredol"
 
 #~ msgid "Insert"
 #~ msgstr "Mewnosod"
@@ -4267,10 +4531,6 @@ msgstr "Canllaw Beibl Xiphos"
 #~ msgid "Typewriter"
 #~ msgstr "Teipiadur"
 
-#, fuzzy
-#~ msgid "Toggle typewriter font style"
-#~ msgstr "Toglo dull ffont teipiadur"
-
 #~ msgid "Bold"
 #~ msgstr "Trwm"
 
@@ -4329,7 +4589,7 @@ msgstr "Canllaw Beibl Xiphos"
 #~ "Gan eich bod yn rhedeg Xiphos am y tro cyntaf bydd y cynorthwydd yn eich "
 #~ "arwain i’w osod ar y cychwyn gan ofyn rhai cwestiynau syml ichi Ar ol "
 #~ "ichi gwblhau’r camau hyn gallwch newid y gosodiadau unrhyw bryd  nes "
-#~ "ymlaen gan ddefnyddio’r deialog dewisiadau personol."
+#~ "ymlaen gan ddefnyddio’r deialog dewisiadau personol. "
 
 #~ msgid "Xiphos Configuration - Page 2 of 5"
 #~ msgstr "Ffurfweddu Xiphos tud 2 o 5"
@@ -4406,7 +4666,7 @@ msgstr "Canllaw Beibl Xiphos"
 #~ "dolenneu air yn cael ei glicio"
 
 #~ msgid "Xiphos Configuration - Page 5 of 5"
-#~ msgstr " Ffurfweddu Xiphos 5o5"
+#~ msgstr "Ffurfweddu Xiphos 5o5"
 
 #~ msgid ""
 #~ "Thank you for using Xiphos.\n"
@@ -4414,7 +4674,7 @@ msgstr "Canllaw Beibl Xiphos"
 #~ "Click Apply to close this dialog and run Xiphos."
 #~ msgstr ""
 #~ "Diolch am ddefnyddio Xiphos.\n"
-#~ "Cliciwch Defnyddio i gau’r ddeialog hon "
+#~ "Cliciwch Defnyddio i gau’r ddeialog hon"
 
 #~ msgid "Greed Lexicon"
 #~ msgstr "Lexicon Groeg"
diff --git a/po/de.po b/po/de.po
index 668d383..f1e0cbd 100644
--- a/po/de.po
+++ b/po/de.po
@@ -11,332 +11,369 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Xiphos 3.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-14 21:17+0200\n"
-"PO-Revision-Date: 2009-07-14 21:17+0100\n"
+"POT-Creation-Date: 2009-12-23 14:46+0100\n"
+"PO-Revision-Date: 2009-12-23 15:06+0100\n"
 "Last-Translator: Eicke Godehardt <sf at godehardt.org>\n"
 "Language-Team: Xiphos Translation Team <farsi@lists.sharif.edu>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: German\n"
+"X-Launchpad-Export-Date: 2009-12-13 04:41+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GERMANY\n"
+"X-Poedit-Language: German\n"
 
-#: ../src/backend/sword_main.cc:1162
+#: ../src/backend/sword_main.cc:1083
 msgid "Configuration not found"
 msgstr "Konfiguration nicht gefunden"
 
-#: ../src/editor/bonobo-editor.c:252 ../src/editor/slib-editor.c:228
-#: ../src/gnome2/html.c:633
+#: ../src/editor/bonobo-editor.c:254
+#: ../src/editor/slib-editor.c:234
+#: ../src/gnome2/html.c:637
 #, c-format
 msgid "Page %d of %d"
 msgstr "Seite %d von %d"
 
-#: ../src/editor/bonobo-editor.c:351
+#: ../src/editor/bonobo-editor.c:353
+#: ../src/editor/slib-editor.c:659
 msgid "Are you sure you want to delete the note for"
 msgstr "Soll die Notiz zu folgendem Vers gelöscht werden"
 
-#: ../src/editor/bonobo-editor.c:963 ../src/editor/bonobo-editor.c:996
-#: ../src/editor/slib-editor.c:1161 ../src/editor/slib-editor.c:1198
+#: ../src/editor/bonobo-editor.c:965
+#: ../src/editor/bonobo-editor.c:998
+#: ../src/editor/slib-editor.c:1308
+#: ../src/editor/slib-editor.c:1345
 msgid "Save the changes to document"
 msgstr "Änderungen im Dokument speichern"
 
-#: ../src/editor/bonobo-editor.c:964 ../src/editor/bonobo-editor.c:997
-#: ../src/editor/slib-editor.c:1162 ../src/editor/slib-editor.c:1199
+#: ../src/editor/bonobo-editor.c:966
+#: ../src/editor/bonobo-editor.c:999
+#: ../src/editor/slib-editor.c:1309
+#: ../src/editor/slib-editor.c:1346
 msgid "before closing?"
 msgstr "vor dem Beenden?"
 
-#: ../src/editor/bonobo-editor.c:971 ../src/editor/bonobo-editor.c:1004
-#: ../src/editor/slib-editor.c:1169 ../src/editor/slib-editor.c:1206
+#: ../src/editor/bonobo-editor.c:973
+#: ../src/editor/bonobo-editor.c:1006
+#: ../src/editor/slib-editor.c:1316
+#: ../src/editor/slib-editor.c:1353
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Wenn sie nicht speichern, werden alle Änderungen verloren gehen."
 
-#: ../src/editor/bonobo-editor.c:995 ../src/editor/slib-editor.c:1197
-#: ../ui/xi-menus.glade.h:26
+#: ../src/editor/bonobo-editor.c:997
+#: ../src/editor/slib-editor.c:1344
+#: ../ui/xi-menus.glade.h:39
 msgid "File"
 msgstr "Datei"
 
-#: ../src/editor/bonobo-editor.c:1222 ../src/editor/slib-editor.c:1254
+#: ../src/editor/bonobo-editor.c:1224
+#: ../src/editor/slib-editor.c:1401
 msgid "StudyPad"
 msgstr "Notizbuch"
 
-#: ../src/editor/bonobo-editor.c:1235 ../src/editor/slib-editor.c:1268
+#: ../src/editor/bonobo-editor.c:1237
+#: ../src/editor/slib-editor.c:1415
 msgid "Note Editor"
 msgstr "Notiz-Editor"
 
-#: ../src/editor/bonobo-editor.c:1244 ../src/editor/slib-editor.c:1282
+#: ../src/editor/bonobo-editor.c:1246
+#: ../src/editor/slib-editor.c:1429
 msgid "Prayer List/Journal Editor"
 msgstr "Gebetsliste-/Tagebuch-Editor"
 
-#: ../src/editor/slib-editor.c:382 ../src/editor/slib-editor.c:429
+#: ../src/editor/slib-editor.c:401
+#: ../src/editor/slib-editor.c:448
 msgid "Save As"
 msgstr "Speichern unter"
 
-#: ../src/editor/slib-editor.c:400 ../src/editor/slib-editor.c:447
+#: ../src/editor/slib-editor.c:419
+#: ../src/editor/slib-editor.c:466
+#: ../src/editor/slib-editor.c:634
 msgid "Untitled document"
 msgstr "Unbenanntes Dokument"
 
-#: ../src/editor/slib-editor.c:612
+#: ../src/editor/slib-editor.c:702
 msgid "HTML Output"
 msgstr "HTML Ausgabe"
 
-#: ../src/editor/slib-editor.c:619
+#: ../src/editor/slib-editor.c:709
 msgid "HTML Source"
 msgstr "HTML Quelle"
 
-#: ../src/editor/slib-editor.c:626
+#: ../src/editor/slib-editor.c:716
 msgid "Plain Source"
 msgstr "Einfache Quelle"
 
-#: ../src/editor/slib-editor.c:633 ../ui/editor_note.xml.h:15
+#: ../src/editor/slib-editor.c:726
+#: ../ui/editor_note.xml.h:15
 #: ../ui/editor_studypad.xml.h:21
 msgid "_Print..."
 msgstr "_Drucken..."
 
-#: ../src/editor/slib-editor.c:640 ../ui/editor_note.xml.h:9
+#: ../src/editor/slib-editor.c:733
+#: ../ui/editor_note.xml.h:9
 #: ../ui/editor_studypad.xml.h:14
 msgid "Print Pre_view"
 msgstr "Druck_vorschau"
 
-#: ../src/editor/slib-editor.c:647
+#: ../src/editor/slib-editor.c:740
 msgid "_Quit"
 msgstr "_Beenden"
 
-#: ../src/editor/slib-editor.c:654
+#: ../src/editor/slib-editor.c:747
 msgid "_Open"
 msgstr "_Öffnen"
 
-#: ../src/editor/slib-editor.c:661
+#: ../src/editor/slib-editor.c:754
 msgid "_Save"
 msgstr "_Speichern"
 
-#: ../src/editor/slib-editor.c:668
+#: ../src/editor/slib-editor.c:761
 msgid "Save _As..."
 msgstr "Speichern _unter..."
 
-#: ../src/editor/slib-editor.c:675 ../ui/editor_note.xml.h:14
-#: ../ui/editor_studypad.xml.h:20 ../ui/editor.xml.h:13
-#: ../ui/xi-menus.glade.h:85
+#: ../src/editor/slib-editor.c:767
+msgid "New"
+msgstr "Neu"
+
+#: ../src/editor/slib-editor.c:769
+msgid "Open new document"
+msgstr "Neues Dokument öffnen"
+
+#: ../src/editor/slib-editor.c:773
+msgid "Delete"
+msgstr "Löschen"
+
+#: ../src/editor/slib-editor.c:775
+msgid "Delete current note"
+msgstr "Lösche aktuelle Notiz"
+
+#: ../src/editor/slib-editor.c:780
+#: ../ui/editor_note.xml.h:14
+#: ../ui/editor_studypad.xml.h:20
+#: ../ui/editor.xml.h:13
+#: ../ui/xi-menus.glade.h:106
 msgid "_File"
 msgstr "_Datei"
 
-#: ../src/editor/slib-editor.c:730
+#: ../src/editor/slib-editor.c:835
 msgid "HTML _Output"
 msgstr "HTML _Ausgabe"
 
-#: ../src/editor/slib-editor.c:737
+#: ../src/editor/slib-editor.c:842
 msgid "_HTML Source"
 msgstr "_HTML Quelle"
 
-#: ../src/editor/slib-editor.c:744
+#: ../src/editor/slib-editor.c:849
 msgid "_Plain Source"
 msgstr "_Einfache Quelle"
 
-#: ../src/editor/slib-editor.c:751 ../ui/xi-menus.glade.h:100
+#: ../src/editor/slib-editor.c:856
+#: ../ui/xi-menus.glade.h:121
 msgid "_View"
 msgstr "_Ansicht"
 
-#: ../src/editor/slib-editor.c:762 ../ui/editor_note.xml.h:11
-#: ../ui/editor_studypad.xml.h:16 ../ui/editor.xml.h:11
+#: ../src/editor/slib-editor.c:867
+#: ../ui/editor_note.xml.h:11
+#: ../ui/editor_studypad.xml.h:16
+#: ../ui/editor.xml.h:11
 msgid "Save"
 msgstr "Speichern"
 
-#: ../src/gecko/gecko-html.cpp:178 ../src/gnome2/html.c:161
+#: ../src/editor/slib-editor.c:878
+#: ../src/editor/slib-editor.c:885
+msgid "Insert Link"
+msgstr "Verweis einfügen"
+
+#: ../src/gecko/gecko-html.cpp:177
+#: ../src/gnome2/html.c:165
 msgid "Unlock "
 msgstr "Freischalten "
 
-#: ../src/gecko/gecko-print.c:171
+#: ../src/gecko/gecko-print.c:172
 msgid "Preparing to print"
 msgstr "Bereite drucken vor"
 
-#: ../src/gecko/gecko-print.c:265
+#: ../src/gecko/gecko-print.c:266
 msgid "Printing is not supported on this printer"
 msgstr "Auf diesem Drucker ist drucken nicht unterstützt"
 
-#: ../src/gecko/gecko-print.c:268
+#: ../src/gecko/gecko-print.c:269
 #, c-format
 msgid "Printer %s does not support PostScript printing."
 msgstr "Drucker %s unterstützt kein Postscript-drucken."
 
-#: ../src/gecko/gecko-print.c:341 ../src/gecko/gecko-print.c:369
+#: ../src/gecko/gecko-print.c:342
+#: ../src/gecko/gecko-print.c:370
 msgid "Printing"
 msgstr "Drucken"
 
-#: ../src/gecko/gecko-print.c:371
+#: ../src/gecko/gecko-print.c:372
 msgid "Waiting to print"
 msgstr "Bereite Druck vor"
 
-#: ../src/gecko/gecko-print.c:583
+#: ../src/gecko/gecko-print.c:584
 msgid "An error occurred while printing"
 msgstr "Beim Drucken trat ein Fehler auf"
 
-#: ../src/gecko/gecko-print.c:587
+#: ../src/gecko/gecko-print.c:588
 #, c-format
 msgid "It was not possible to print your document: %s"
 msgstr "Druck des Dokuments fehlgeschlagen: %s"
 
-#: ../src/gnome2/about_modules.c:189
+#: ../src/gnome2/about_modules.c:195
 msgid "About Sword Module"
 msgstr "Über das Sword-Modul"
 
-#: ../src/gnome2/about_modules.c:383 ../src/gnome2/mod_mgr.c:204
+#: ../src/gnome2/about_modules.c:389
+#: ../src/gnome2/mod_mgr.c:252
 msgid "The module has no About information."
 msgstr "Das Modul hat keine Informationen."
 
 #: ../src/gnome2/about_sword.c:88
-msgid ""
-"The SWORD Project is an effort to create an ever-expanding software package "
-"for research and study of God and His Word. The SWORD Project framework "
-"allows easy use and study of Bible texts, commentaries, lexicons, "
-"dictionaries, and other books. Many frontends are built using this "
-"framework. An installed set of books may be shared among all frontends using "
-"the framework."
-msgstr ""
-"Das SWORD-Projekt ist das Vorhaben, ein ständig erweitertes Softwarepaket zu "
-"erstellen, mit dem Gott und Sein Wort erforscht und studiert werden kann. "
-"Das SWORD Projekt Bibel-Framework ermöglicht eine einfache Verwendung und "
-"Studium von Bibeltexten, Kommentaren, Lexika, Wörterbüchern und anderen "
-"Büchern. Die installierten Bücher können von allen Frontends des SWORD-"
-"Frameworks genutzt werden."
+msgid "The SWORD Project is an effort to create an ever-expanding software package for research and study of God and His Word. The SWORD Project framework allows easy use and study of Bible texts, commentaries, lexicons, dictionaries, and other books. Many frontends are built using this framework. An installed set of books may be shared among all frontends using the framework."
+msgstr "Das SWORD-Projekt ist das Vorhaben, ein ständig erweitertes Softwarepaket zu erstellen, mit dem Gott und Sein Wort erforscht und studiert werden kann. Das SWORD Projekt Bibel-Framework ermöglicht eine einfache Verwendung und Studium von Bibeltexten, Kommentaren, Lexika, Wörterbüchern und anderen Büchern. Die installierten Bücher können von allen Frontends des SWORD-Frameworks genutzt werden."
 
 #: ../src/gnome2/about_sword.c:106
 msgid "About the SWORD Project"
 msgstr "Über das SWORD-Projekt"
 
-#: ../src/gnome2/about_sword.c:123
+#: ../src/gnome2/about_sword.c:124
 msgid "Sword Version"
 msgstr "Sword Version"
 
-#: ../src/gnome2/about_sword.c:154
+#: ../src/gnome2/about_sword.c:155
 msgid "Books can be downloaded from the SWORD Project"
 msgstr "Bücher können von dem SWORD-Projekt heruntergeladen werden."
 
-#: ../src/gnome2/about_sword.c:160
+#: ../src/gnome2/about_sword.c:161
 msgid "The SWORD Project"
 msgstr "Das SWORD-Projekt"
 
 #: ../src/gnome2/about_trans.c:84
 msgid ""
-"Do you like using Xiphos to study the Bible? Would you like to see its "
-"display using your native language? You could translate Xiphos! \n"
+"Do you like using Xiphos to study the Bible? Would you like to see its display using your native language? You could translate Xiphos! \n"
 "\n"
-"We are always looking for contributions of new translations of Xiphos into "
-"other languages. If you are able to translate for us, please see the link "
-"below, contact us, and get involved with our efforts."
+"We are always looking for contributions of new translations of Xiphos into other languages. If you are able to translate for us, please see the link below, contact us, and get involved with our efforts."
 msgstr ""
-"Magst Du Xiphos, um damit die Bibel zu studieren? Möchtest Du es in Deiner "
-"Sprache sehen? Du kannst Xiphos übersetzen! \n"
+"Magst Du Xiphos, um damit die Bibel zu studieren? Möchtest Du es in Deiner Sprache sehen? Du kannst Xiphos übersetzen! \n"
 "\n"
-"Wir suchen immer nach Beiträgen zu neuen Übersetzungen von Xiphos in andere "
-"Sprachen. Wenn Du für uns übersetzen kannst, verwende bitte den Link weiter "
-"unten, um uns zu kontaktieren und unterstütze damit unsere Arbeit."
+"Wir suchen immer nach Beiträgen zu neuen Übersetzungen von Xiphos in andere Sprachen. Wenn Du für uns übersetzen kannst, verwende bitte den Link weiter unten, um uns zu kontaktieren und unterstütze damit unsere Arbeit."
 
 #: ../src/gnome2/about_trans.c:98
 msgid "About Xiphos Translation"
 msgstr "Info zum Übersetzen von Xiphos"
 
-#: ../src/gnome2/about_trans.c:139
+#: ../src/gnome2/about_trans.c:140
 msgid "See TRANSLATION-HOWTO in Xiphos source"
 msgstr "Siehe TRANSLATION-HOWTO in den Xiphos Quellen"
 
-#: ../src/gnome2/about_trans.c:145
+#: ../src/gnome2/about_trans.c:146
 msgid "Xiphos development"
-msgstr "Xiphos Entwicklung "
+msgstr "Xiphos Entwicklung"
 
-#: ../src/gnome2/about_xiphos.c:132
+#: ../src/gnome2/about_xiphos.c:131
 msgid "Copyright 2000-2009 The Xiphos Development Team"
 msgstr "Copyright 2000-2008 Das Xiphos Entwickler-Team"
 
-#: ../src/gnome2/about_xiphos.c:135
+#: ../src/gnome2/about_xiphos.c:134
 msgid ""
 "(formerly known as GnomeSword)\n"
 "\n"
 "Powered by The SWORD Project.\n"
-"We would like to thank Troy Griffitts and all the other folks who have given "
-"us The SWORD Project."
+"We would like to thank Troy Griffitts and all the other folks who have given us The SWORD Project."
 msgstr ""
 "(Ursprünglich als GnomeSword bekannt) \n"
 "\n"
 "Auf der Basis von dem SWORD Projekt.\n"
-"Unser Dank gilt Troy Griffitts und allen anderen, die uns das SWORD-Projekt "
-"gegeben haben."
+"Unser Dank gilt Troy Griffitts und allen anderen, die uns das SWORD-Projekt gegeben haben."
 
-#: ../src/gnome2/bibletext_dialog.c:525
+#: ../src/gnome2/bibletext_dialog.c:358
 msgid "Go to "
-msgstr "Gehe zu"
+msgstr "Gehe zu "
 
 #. info->stock_icon = GTK_STOCK_OPEN;
-#: ../src/gnome2/bookmark_dialog.c:167 ../src/gnome2/bookmarks_menu.c:471
-#: ../src/gnome2/bookmarks_menu.c:897 ../src/gnome2/bookmarks_menu.c:995
-#: ../src/gnome2/bookmarks_treeview.c:131 ../ui/editor_studypad.xml.h:2
-#: ../ui/xi-menus.glade.h:9
+#: ../src/gnome2/bookmark_dialog.c:171
+#: ../src/gnome2/bookmarks_menu.c:358
+#: ../src/gnome2/bookmarks_menu.c:765
+#: ../src/gnome2/bookmarks_menu.c:863
+#: ../src/gnome2/bookmarks_treeview.c:133
+#: ../ui/editor_studypad.xml.h:2
+#: ../ui/xi-menus.glade.h:13
 msgid "Bookmark"
 msgstr "Lesezeichen"
 
-#: ../src/gnome2/bookmark_dialog.c:169 ../src/gnome2/bookmarks_menu.c:997
-#: ../src/gnome2/bookmarks_treeview.c:132
+#: ../src/gnome2/bookmark_dialog.c:173
+#: ../src/gnome2/bookmarks_menu.c:865
+#: ../src/gnome2/bookmarks_treeview.c:134
 msgid "Enter Folder Name"
 msgstr "Ordnername eingeben"
 
-#: ../src/gnome2/bookmark_dialog.c:171 ../src/gnome2/bookmarks_menu.c:999
+#: ../src/gnome2/bookmark_dialog.c:175
+#: ../src/gnome2/bookmarks_menu.c:867
 msgid "Folder Name"
 msgstr "Ordnername"
 
-#: ../src/gnome2/bookmark_dialog.c:172 ../src/gnome2/bookmarks_menu.c:1000
-#: ../src/gnome2/bookmarks_treeview.c:134
+#: ../src/gnome2/bookmark_dialog.c:176
+#: ../src/gnome2/bookmarks_menu.c:868
+#: ../src/gnome2/bookmarks_treeview.c:136
 msgid "Folder: "
 msgstr "Ordner: "
 
-#: ../src/gnome2/bookmarks_menu.c:457 ../src/gnome2/treekey-editor.c:322
-#: ../ui/xi-menus.glade.h:22
+#: ../src/gnome2/bookmarks_menu.c:344
+#: ../ui/xi-menus.glade.h:32
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: ../src/gnome2/bookmarks_menu.c:474
+#: ../src/gnome2/bookmarks_menu.c:361
 msgid "Folder name: "
 msgstr "Ordnername: "
 
-#: ../src/gnome2/bookmarks_menu.c:477
+#: ../src/gnome2/bookmarks_menu.c:364
 msgid "Bookmark name: "
 msgstr "Lesezeichenname: "
 
-#: ../src/gnome2/bookmarks_menu.c:480 ../src/gnome2/bookmarks_menu.c:905
+#: ../src/gnome2/bookmarks_menu.c:367
+#: ../src/gnome2/bookmarks_menu.c:773
 msgid "Verse: "
 msgstr "Vers: "
 
-#: ../src/gnome2/bookmarks_menu.c:481 ../src/gnome2/bookmarks_menu.c:906
+#: ../src/gnome2/bookmarks_menu.c:368
+#: ../src/gnome2/bookmarks_menu.c:774
 msgid "Module: "
 msgstr "Modul: "
 
-#: ../src/gnome2/bookmarks_menu.c:665
+#: ../src/gnome2/bookmarks_menu.c:533
 msgid "Restore Bookmark Folder"
 msgstr "Lesezeichen wiederherstellen"
 
-#: ../src/gnome2/bookmarks_menu.c:734
+#: ../src/gnome2/bookmarks_menu.c:602
 msgid "Remove the selected folder"
-msgstr "Ausgewählten Ordner entfernen "
+msgstr "Ausgewählten Ordner entfernen"
 
-#: ../src/gnome2/bookmarks_menu.c:736
+#: ../src/gnome2/bookmarks_menu.c:604
 msgid "(and all its contents)?"
 msgstr "(und den gesamten Inhalt)?"
 
-#: ../src/gnome2/bookmarks_menu.c:739
+#: ../src/gnome2/bookmarks_menu.c:607
 msgid "Remove the selected bookmark"
 msgstr "Auswähltes Lesezeichen entfernen"
 
-#: ../src/gnome2/bookmarks_menu.c:898
+#: ../src/gnome2/bookmarks_menu.c:766
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: ../src/gnome2/bookmarks_menu.c:904
+#: ../src/gnome2/bookmarks_menu.c:772
 msgid "Label: "
 msgstr "Beschriftung: "
 
-#: ../src/gnome2/bookmarks_treeview.c:105
+#: ../src/gnome2/bookmarks_treeview.c:107
 #, c-format
 msgid "Search result: %s"
 msgstr "Suchergebnis: %s"
 
-#: ../src/gnome2/bookmarks_treeview.c:934 ../src/gnome2/sidebar.c:1461
+#: ../src/gnome2/bookmarks_treeview.c:943
+#: ../src/gnome2/sidebar.c:1389
 msgid "Bookmarks"
 msgstr "Lesezeichen"
 
@@ -352,100 +389,180 @@ msgstr "nach:"
 msgid "Enter Cipher Key: "
 msgstr "Chiffrierschlüssel eingeben: "
 
-#: ../src/gnome2/dialog.c:241
+#: ../src/gnome2/dialog.c:265
 msgid "Close without Saving"
 msgstr "Schließen ohne zu Speichern"
 
-#: ../src/gnome2/dialog.c:569
+#: ../src/gnome2/dialog.c:596
 msgid "Xiphos:"
 msgstr "Xiphos:"
 
-#: ../src/gnome2/dialog.c:670
+#: ../src/gnome2/dialog.c:697
 msgid "Close _without Saving"
 msgstr "Schließen _ohne zu Speichern"
 
-#: ../src/gnome2/export_dialog.c:265 ../ui/export-dialog.glade.h:20
+#: ../src/gnome2/export_dialog.c:267
+#: ../ui/export-dialog.glade.h:20
 msgid "Please check copyright before exporting!"
 msgstr "Bitte überprüfe das Copyright vor dem Export!"
 
-#: ../src/gnome2/find_dialog.c:200 ../src/gnome2/find_dialog.c:369
+#: ../src/gnome2/find_dialog.c:204
+#: ../src/gnome2/find_dialog.c:373
 msgid "Find"
 msgstr "Suchen"
 
-#: ../src/gnome2/find_dialog.c:218
+#: ../src/gnome2/find_dialog.c:222
 msgid "Enter Word or Phrase"
 msgstr "Wort oder Phrase eingeben"
 
-#: ../src/gnome2/find_dialog.c:234 ../src/gnome2/search_sidebar.c:303
-#: ../ui/search-dialog.glade.h:57
+#: ../src/gnome2/find_dialog.c:238
+#: ../src/gnome2/search_sidebar.c:306
+#: ../ui/search-dialog.glade.h:59
 msgid "Match case"
 msgstr "Groß-/Kleinschreibung"
 
-#: ../src/gnome2/find_dialog.c:241
+#: ../src/gnome2/find_dialog.c:245
 msgid "Search backwards"
 msgstr "Rückwärts suchen"
 
-#: ../src/gnome2/find_dialog.c:250 ../src/gnome2/search_sidebar.c:268
-#: ../ui/search-dialog.glade.h:74
+#: ../src/gnome2/find_dialog.c:254
+#: ../src/gnome2/search_sidebar.c:271
+#: ../ui/search-dialog.glade.h:76
 msgid "Regular expression"
 msgstr "Regulärer Ausdruck"
 
-#: ../src/gnome2/find_dialog.c:291
+#: ../src/gnome2/find_dialog.c:295
 msgid "Find Next"
 msgstr "Weitersuchen"
 
-#: ../src/gnome2/font_dialog.c:301
+#: ../src/gnome2/font_dialog.c:303
 msgid "Set Module Font"
 msgstr "Schriftart wählen"
 
-#: ../src/gnome2/font_dialog.c:331
+#: ../src/gnome2/font_dialog.c:333
 msgid "Change font for"
 msgstr "Ändere Schriftart für"
 
-#: ../src/gnome2/font_dialog.c:335
+#: ../src/gnome2/font_dialog.c:337
 msgid "Module"
 msgstr "Module"
 
-#: ../src/gnome2/font_dialog.c:339
+#: ../src/gnome2/font_dialog.c:341
 msgid "Current font: "
 msgstr "Aktuelle Schriftart: "
 
-#: ../src/gnome2/font_dialog.c:376
+#: ../src/gnome2/font_dialog.c:378
 msgid "+0"
 msgstr "+0"
 
-#: ../src/gnome2/font_dialog.c:380
+#: ../src/gnome2/font_dialog.c:382
 msgid "Use the default font for this module"
 msgstr "Standardschriftart für dieses Modul verwenden"
 
-#: ../src/gnome2/main_window.c:756
+#. *****************************************************************************
+#. * Name
+#. *    gconf_setup
+#. *
+#. * Synopsis
+#. *   #include "main/settings.h"
+#. *
+#. *   void gconf_setup()
+#. *
+#. * Description
+#. *   verifies and initializes the GConf subsystem, so that "sword://" and
+#. *   similar can be handled by url-comprehending programs such as browsers.
+#. *   dialogs for permission/success/failure => conditional on debug build.
+#. *
+#. * Return value
+#. *   void
+#.
+#: ../src/gnome2/gui.c:110
+msgid ""
+"URL references using \"sword://\" (similar to web page\n"
+"references) can be used by programs to look up\n"
+"scripture references. Your system currently has no\n"
+"program set to handle these references.\n"
+"\n"
+"Would you like Xiphos to set itself as the\n"
+"program to handle these references?"
+msgstr ""
+"URL Verweise auf \"sword://\" (ähnlich zum Internet)\n"
+"können verwendet werden, um Schrift-Verweise\n"
+"nachzuschlagen. Dein System hat momentan kein\n"
+"Programm definiert, das diese Verweise verarbeitet.\n"
+"\n"
+"Soll Xiphos verwendet werden, um diese Verweise\n"
+"zu verarbeiten?"
+
+#: ../src/gnome2/gui.c:112
+msgid ""
+"Xiphos has successfully set itself\n"
+"as the handler of sword:// and bible:// URLs.\n"
+"\n"
+"You may wish to run the program \"gconf-editor\"\n"
+"to examine keys under /desktop/gnome/url-handlers,\n"
+"if you need to change these."
+msgstr ""
+"Xiphos hat sich erfolgreich als Anwendung\n"
+"für sword:// und bible:// URLs gesetzt.\n"
+"\n"
+"Sie können das Programm \"gconf-editor\"\n"
+"verwenden, um dies unter dem Schlüsselwort\n"
+"/desktop/gnome/url-handlers wieder zu ändern."
+
+#: ../src/gnome2/gui.c:166
+#, c-format
+msgid ""
+"Xiphos failed to complete handler init for key #%d:\n"
+"%s"
+msgstr ""
+"Xiphos konnte den Schlüssel #%d nicht anwenden:\n"
+"%s"
+
+#: ../src/gnome2/gui.c:212
+msgid "BUG! Xiphos is about to crash due to a \"STRDUP\" error."
+msgstr "BUG! Xiphos steht kurz vor dem Absturz Aufgrund eines \"STRDUP\" Fehlers."
+
+#: ../src/gnome2/gui.c:213
+#: ../src/gnome2/gui.c:248
+msgid "Please report this error to the Xiphos team with:"
+msgstr "Bitte melden Sie diesen Fehler dem Xiphos Team mit:"
+
+#: ../src/gnome2/gui.c:247
+msgid "BUG! Xiphos is about to crash due to a \"STRING\" error."
+msgstr "BUG! Xiphos steht kurz vor dem Absturz Aufgrund eines \"STRING\" Fehlers."
+
+#: ../src/gnome2/main_window.c:789
 msgid "Xiphos - Bible Study Software"
 msgstr "Xiphos - Software zum Bibelstudium"
 
-#: ../src/gnome2/main_window.c:812
+#: ../src/gnome2/main_window.c:844
 msgid "Open a new tab"
 msgstr "Neuen Reiter öffnen"
 
-#: ../src/gnome2/main_window.c:892 ../src/gnome2/sidebar.c:623
-#: ../src/gnome2/sidebar.c:629 ../src/main/sidebar.cc:642
-#: ../src/main/sidebar.cc:962 ../src/main/sidebar.cc:963
-#: ../src/main/sidebar.cc:964
+#: ../src/gnome2/main_window.c:923
+#: ../src/gnome2/sidebar.c:627
+#: ../src/gnome2/sidebar.c:633
+#: ../src/main/sidebar.cc:666
+#: ../src/main/sidebar.cc:1015
+#: ../src/main/sidebar.cc:1016
+#: ../src/main/sidebar.cc:1017
 msgid "Standard View"
 msgstr "Standardansicht"
 
-#: ../src/gnome2/main_window.c:969
+#: ../src/gnome2/main_window.c:1004
 msgid "Commentary View"
 msgstr "Kommentaransicht"
 
-#: ../src/gnome2/main_window.c:985
+#: ../src/gnome2/main_window.c:1020
 msgid "Book View"
 msgstr "Buchansicht"
 
-#: ../src/gnome2/main_window.c:1010
+#: ../src/gnome2/main_window.c:1045
 msgid "Welcome to Xiphos"
 msgstr "Willkommen bei Xiphos"
 
-#: ../src/gnome2/menu_popup.c:1163
+#: ../src/gnome2/menu_popup.c:1168
 msgid ""
 "Renaming is not available in Windows.\n"
 "\n"
@@ -464,33 +581,37 @@ msgstr ""
 "Darum ist es unmöglich den persönlichen Kommentar\n"
 "in Windows umzubennnen."
 
-#: ../src/gnome2/menu_popup.c:1182
+#: ../src/gnome2/menu_popup.c:1187
 msgid "Rename Commentary"
 msgstr "Kommentare umbenennen"
 
-#: ../src/gnome2/menu_popup.c:1185
+#: ../src/gnome2/menu_popup.c:1190
 msgid "Choose Commentary Name"
 msgstr "Kommentarname wählen"
 
-#: ../src/gnome2/menu_popup.c:1187
+#: ../src/gnome2/menu_popup.c:1192
 msgid "New Name"
 msgstr "Neuer Name"
 
-#: ../src/gnome2/menu_popup.c:1188 ../src/gnome2/treekey-editor.c:132
-#: ../src/gnome2/treekey-editor.c:191 ../src/gnome2/treekey-editor.c:277
-#: ../src/main/prayerlists.cc:240
+#: ../src/gnome2/menu_popup.c:1193
+#: ../src/gnome2/treekey-editor.c:139
+#: ../src/gnome2/treekey-editor.c:198
+#: ../src/gnome2/treekey-editor.c:284
+#: ../src/main/prayerlists.cc:243
 msgid "Name: "
 msgstr "Name: "
 
-#: ../src/gnome2/menu_popup.c:1198 ../src/main/prayerlists.cc:254
+#: ../src/gnome2/menu_popup.c:1203
+#: ../src/main/prayerlists.cc:257
 msgid "Module names must contain [A-Za-z0-9_] only."
 msgstr "Modulnamen dürfen nur aus [A-Za-z0-9_] bestehen."
 
-#: ../src/gnome2/menu_popup.c:1205 ../src/main/prayerlists.cc:261
+#: ../src/gnome2/menu_popup.c:1210
+#: ../src/main/prayerlists.cc:264
 msgid "Xiphos already knows a module by that name."
 msgstr "Xiphos kennt schon ein Modul mit diesem Namen."
 
-#: ../src/gnome2/menu_popup.c:1248
+#: ../src/gnome2/menu_popup.c:1253
 #, c-format
 msgid ""
 "Failed to create new configuration:\n"
@@ -499,7 +620,7 @@ msgstr ""
 "Erstellen der Konfiguration fehlgeschlagen:\n"
 "%s"
 
-#: ../src/gnome2/menu_popup.c:1257
+#: ../src/gnome2/menu_popup.c:1262
 msgid ""
 "Configuration build error:\n"
 "\n"
@@ -507,19 +628,59 @@ msgstr ""
 "Fehler beim Erstellen der Konfiguration:\n"
 "\n"
 
-#: ../src/gnome2/mod_mgr.c:339
+#: ../src/gnome2/mod_mgr.c:169
+msgid "Remove these modules?"
+msgstr "Entferne diese Module?"
+
+#: ../src/gnome2/mod_mgr.c:170
+msgid "Preparing to remove"
+msgstr "Bereite Entfernung vor"
+
+#: ../src/gnome2/mod_mgr.c:171
+msgid "Removing"
+msgstr "Entferne"
+
+#: ../src/gnome2/mod_mgr.c:172
+#: ../ui/xi-menus.glade.h:72
+msgid "Remove"
+msgstr "Entfernen"
+
+#: ../src/gnome2/mod_mgr.c:175
 msgid "Install these modules?"
 msgstr "Installiere diese Module?"
 
-#: ../src/gnome2/mod_mgr.c:341
-msgid "Remove these modules?"
-msgstr "Entferne diese Module?"
+#: ../src/gnome2/mod_mgr.c:176
+msgid "Preparing to install"
+msgstr "Bereite Installation vor"
 
-#: ../src/gnome2/mod_mgr.c:343
+#: ../src/gnome2/mod_mgr.c:177
+msgid "Installing"
+msgstr "Installiere"
+
+#: ../src/gnome2/mod_mgr.c:178
+#: ../src/gnome2/mod_mgr.c:2964
+#: ../ui/module-manager.glade.h:18
+msgid "Install"
+msgstr "Installieren"
+
+#: ../src/gnome2/mod_mgr.c:181
 msgid "Archive these modules?"
 msgstr "Archiviere diese Module?"
 
-#: ../src/gnome2/mod_mgr.c:345
+#: ../src/gnome2/mod_mgr.c:182
+msgid "Preparing to archive"
+msgstr "Bereite Archivierung vor"
+
+#: ../src/gnome2/mod_mgr.c:183
+msgid "Archiving"
+msgstr "Archiviere"
+
+#: ../src/gnome2/mod_mgr.c:184
+#: ../ui/module-manager.glade.h:11
+msgid "Archive"
+msgstr "Archiv"
+
+#: ../src/gnome2/mod_mgr.c:187
 msgid ""
 "Build fast-search index for these\n"
 "modules (may take minutes/module)?"
@@ -527,51 +688,85 @@ msgstr ""
 "Erstelle schnellen Such-Index für diese\n"
 "Module (kann einige Minuten/Modul dauern)?"
 
-#: ../src/gnome2/mod_mgr.c:347
+#: ../src/gnome2/mod_mgr.c:188
+msgid "Preparing to index"
+msgstr "Bereite Indexierung vor"
+
+#: ../src/gnome2/mod_mgr.c:189
+msgid "Indexing"
+msgstr "Indexierung"
+
+#: ../src/gnome2/mod_mgr.c:190
+#: ../ui/module-manager.glade.h:17
+msgid "Index"
+msgstr "Index"
+
+#: ../src/gnome2/mod_mgr.c:193
 msgid "Delete fast-search index for these modules?"
 msgstr "Lösche den Schnellsuch-Index für diese Module?"
 
-#: ../src/gnome2/mod_mgr.c:367
-msgid "Preparing to install"
-msgstr "Bereite Installation vor"
+#: ../src/gnome2/mod_mgr.c:194
+msgid "Preparing to delete index"
+msgstr "Bereite Entfernung des Index vor"
 
-#: ../src/gnome2/mod_mgr.c:369
-msgid "Preparing to remove"
-msgstr "Bereite Entfernung vor"
+#: ../src/gnome2/mod_mgr.c:195
+msgid "Deleting index"
+msgstr "Lösche Index"
 
-#: ../src/gnome2/mod_mgr.c:371
-msgid "Preparing to archive"
-msgstr "Bereite Archivierung vor"
+#: ../src/gnome2/mod_mgr.c:196
+msgid "Deletion"
+msgstr "Löschen"
 
-#: ../src/gnome2/mod_mgr.c:373
-msgid "Preparing to index"
-msgstr "Bereite Indexierung vor"
+#: ../src/gnome2/mod_mgr.c:427
+msgid "Module Name"
+msgstr "Modulname"
 
-#: ../src/gnome2/mod_mgr.c:375
-msgid "Preparing to delete index"
-msgstr "Bereite Entfernung des Index vor"
+#: ../src/gnome2/mod_mgr.c:448
+msgid "A checkmark means this module is already installed"
+msgstr "Ein Häkchen bedeutet, dass dieses Module bereits installiert ist"
 
-#: ../src/gnome2/mod_mgr.c:401
-msgid "Installing"
-msgstr "Installiere"
+#: ../src/gnome2/mod_mgr.c:470
+msgid "Click the box to work on this module"
+msgstr "Box ticken um dieses Modul auszuwählen"
 
-#: ../src/gnome2/mod_mgr.c:403
-msgid "Removing"
-msgstr "Entferne"
+#: ../src/gnome2/mod_mgr.c:471
+msgid "Click the box to select this module for install/update"
+msgstr "Klicke die Box, um dieses Modul zu installieren/aktualisieren"
 
-#: ../src/gnome2/mod_mgr.c:405
-msgid "Archiving"
-msgstr "Archiviere"
+#: ../src/gnome2/mod_mgr.c:490
+msgid "Installed"
+msgstr "Installiert"
 
-#: ../src/gnome2/mod_mgr.c:407
-msgid "Indexing"
-msgstr "Indexierung"
+#: ../src/gnome2/mod_mgr.c:500
+msgid "The index icon means you have built an optimized ('lucene') index for this module for fast searching (see the Maintenance pane for this function)"
+msgstr "Das Indexsymbol bedeutet, dass zum schnelleren Suchen ein optimierter ('lucene') Index des Moduls erstellt wurde (siehe Pflegeseite zu dieser Funktion)"
 
-#: ../src/gnome2/mod_mgr.c:409
-msgid "Deleting index"
-msgstr "Lösche Index"
+#: ../src/gnome2/mod_mgr.c:518
+msgid "The lock icon means this module is encrypted, and requires that you purchase an unlock key from the content owner"
+msgstr "Das Schlosssymbol bedeutet, dass das Modul verschlüsselt ist und der Schlüssel bei dem Rechtebesitzer erworben werden muss"
+
+#: ../src/gnome2/mod_mgr.c:535
+#: ../ui/xi-menus.glade.h:1
+msgid "About"
+msgstr "Über"
+
+#: ../src/gnome2/mod_mgr.c:555
+msgid "The refresh icon means the Installed module is older than the newer Available module: You should update the module"
+msgstr "Das Aktualisierungssymbol bedeutet, dass von dem installierten Modul eine neuere Version verfügbar ist: Sie sollten das Modul aktualisieren"
+
+#: ../src/gnome2/mod_mgr.c:567
+msgid "Available"
+msgstr "Verfügbar"
 
-#: ../src/gnome2/mod_mgr.c:432
+#: ../src/gnome2/mod_mgr.c:576
+msgid "Size"
+msgstr "Größe"
+
+#: ../src/gnome2/mod_mgr.c:585
+msgid "Description"
+msgstr "Beschreibung"
+
+#: ../src/gnome2/mod_mgr.c:736
 #, c-format
 msgid ""
 "`mkdir %s' failed:\n"
@@ -580,70 +775,40 @@ msgstr ""
 "`mkdir %s' fehlgeschlagen:\n"
 "%s."
 
-#: ../src/gnome2/mod_mgr.c:463
-msgid "Xiphos could not execute archiver"
-msgstr "Xiphos konnte den Archivierer nicht ausführen"
+#: ../src/gnome2/mod_mgr.c:759
+msgid " archived in: \n"
+msgstr " archiviert in: \n"
 
-#: ../src/gnome2/mod_mgr.c:468
-msgid ""
-" archival result:\n"
-"\n"
-msgstr ""
-" Archivierergebnis:\n"
-"\n"
-
-#: ../src/gnome2/mod_mgr.c:472
-msgid ""
-"\n"
-"Archive in "
-msgstr ""
-"\n"
-"Archiviere in "
-
-#: ../src/gnome2/mod_mgr.c:526
+#: ../src/gnome2/mod_mgr.c:815
 msgid "Journals and prayer lists cannot be indexed."
 msgstr "Tagebücher und Gebetslisten können nicht indexiert werden."
 
-#: ../src/gnome2/mod_mgr.c:547 ../src/gnome2/mod_mgr.c:2902
-#: ../ui/module-manager.glade.h:15
-msgid "Install"
-msgstr "Installieren"
-
-#: ../src/gnome2/mod_mgr.c:549 ../src/gnome2/treekey-editor.c:316
-msgid "Remove"
-msgstr "Entfernen"
-
-#: ../src/gnome2/mod_mgr.c:551
-msgid "Archive"
-msgstr "Archiv"
-
-#: ../src/gnome2/mod_mgr.c:553
-msgid "Index"
-msgstr "Index"
-
-#: ../src/gnome2/mod_mgr.c:555
-msgid "Deletion"
-msgstr "Löschen"
-
-#: ../src/gnome2/mod_mgr.c:557
+#: ../src/gnome2/mod_mgr.c:833
 #, c-format
 msgid "%s failed"
 msgstr "%s fehlgeschlagen"
 
-#: ../src/gnome2/mod_mgr.c:559 ../src/gnome2/mod_mgr.c:1285
+#: ../src/gnome2/mod_mgr.c:836
+#: ../src/gnome2/mod_mgr.c:1562
 msgid "Finished"
 msgstr "Fertig"
 
-#: ../src/gnome2/mod_mgr.c:726 ../src/gnome2/mod_mgr.c:728
-#: ../src/gnome2/mod_mgr.c:830 ../src/gnome2/mod_mgr.c:865
-#: ../src/gnome2/mod_mgr.c:867 ../src/gnome2/utilities.c:346
-#: ../src/gnome2/utilities.c:411 ../src/gnome2/utilities.c:413
-#: ../src/gnome2/utilities.c:1032 ../src/main/sidebar.cc:799
-#: ../src/main/sidebar.cc:871 ../src/main/sidebar.cc:873
+#: ../src/gnome2/mod_mgr.c:1003
+#: ../src/gnome2/mod_mgr.c:1005
+#: ../src/gnome2/mod_mgr.c:1107
+#: ../src/gnome2/mod_mgr.c:1142
+#: ../src/gnome2/mod_mgr.c:1144
+#: ../src/gnome2/utilities.c:435
+#: ../src/gnome2/utilities.c:500
+#: ../src/gnome2/utilities.c:502
+#: ../src/gnome2/utilities.c:986
+#: ../src/main/sidebar.cc:852
+#: ../src/main/sidebar.cc:924
+#: ../src/main/sidebar.cc:926
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: ../src/gnome2/mod_mgr.c:1029
+#: ../src/gnome2/mod_mgr.c:1301
 #, c-format
 msgid ""
 "Repository:\n"
@@ -652,7 +817,7 @@ msgstr ""
 "Quelle:\n"
 "%s"
 
-#: ../src/gnome2/mod_mgr.c:1041
+#: ../src/gnome2/mod_mgr.c:1313
 msgid ""
 "Categorized by\n"
 "Module Type"
@@ -660,44 +825,59 @@ msgstr ""
 "Kategorisiert nach\n"
 "Moduletyp"
 
-#: ../src/gnome2/mod_mgr.c:1046 ../src/gnome2/utilities.c:472
-#: ../src/main/sidebar.cc:946 ../src/main/sidebar.cc:948
+#: ../src/gnome2/mod_mgr.c:1318
+#: ../src/gnome2/utilities.c:561
+#: ../src/main/sidebar.cc:999
+#: ../src/main/sidebar.cc:1001
 msgid "Biblical Texts"
 msgstr "Bibeltexte"
 
-#: ../src/gnome2/mod_mgr.c:1050 ../src/gnome2/utilities.c:476
-#: ../src/main/sidebar.cc:654 ../src/main/sidebar.cc:971
-#: ../src/main/sidebar.cc:973 ../ui/prefs.glade.h:33
+#: ../src/gnome2/mod_mgr.c:1322
+#: ../src/gnome2/utilities.c:565
+#: ../src/main/sidebar.cc:678
+#: ../src/main/sidebar.cc:1024
+#: ../src/main/sidebar.cc:1026
+#: ../ui/prefs.glade.h:33
 msgid "Commentaries"
 msgstr "Kommentare"
 
-#: ../src/gnome2/mod_mgr.c:1054 ../src/gnome2/utilities.c:480
-#: ../src/main/sidebar.cc:980 ../src/main/sidebar.cc:982
+#: ../src/gnome2/mod_mgr.c:1326
+#: ../src/gnome2/utilities.c:569
+#: ../src/main/sidebar.cc:1033
+#: ../src/main/sidebar.cc:1035
 msgid "Dictionaries"
 msgstr "Wörterbücher"
 
-#: ../src/gnome2/mod_mgr.c:1058 ../src/gnome2/utilities.c:484
-#: ../src/main/sidebar.cc:989 ../src/main/sidebar.cc:991
+#: ../src/gnome2/mod_mgr.c:1330
+#: ../src/gnome2/utilities.c:573
+#: ../src/main/sidebar.cc:1042
+#: ../src/main/sidebar.cc:1044
 msgid "Daily Devotionals"
 msgstr "Tageslosungen"
 
-#: ../src/gnome2/mod_mgr.c:1062 ../src/gnome2/utilities.c:488
-#: ../src/main/sidebar.cc:664 ../src/main/sidebar.cc:998
-#: ../src/main/sidebar.cc:1000
+#: ../src/gnome2/mod_mgr.c:1334
+#: ../src/gnome2/utilities.c:577
+#: ../src/main/sidebar.cc:688
+#: ../src/main/sidebar.cc:1051
+#: ../src/main/sidebar.cc:1053
 msgid "General Books"
 msgstr "Allgemeine Bücher"
 
-#: ../src/gnome2/mod_mgr.c:1066 ../src/gnome2/utilities.c:492
-#: ../src/main/sidebar.cc:1007 ../src/main/sidebar.cc:1009
+#: ../src/gnome2/mod_mgr.c:1338
+#: ../src/gnome2/utilities.c:581
+#: ../src/main/sidebar.cc:1060
+#: ../src/main/sidebar.cc:1062
 msgid "Maps"
 msgstr "Karten"
 
-#: ../src/gnome2/mod_mgr.c:1070 ../src/gnome2/utilities.c:496
-#: ../src/main/sidebar.cc:1016 ../src/main/sidebar.cc:1018
+#: ../src/gnome2/mod_mgr.c:1342
+#: ../src/gnome2/utilities.c:585
+#: ../src/main/sidebar.cc:1069
+#: ../src/main/sidebar.cc:1071
 msgid "Images"
 msgstr "Bilder"
 
-#: ../src/gnome2/mod_mgr.c:1078
+#: ../src/gnome2/mod_mgr.c:1350
 msgid ""
 "Categorized by\n"
 "Availability"
@@ -705,368 +885,388 @@ msgstr ""
 "Kategorisiert nach\n"
 "Verfügbarkeit"
 
-#: ../src/gnome2/mod_mgr.c:1083
+#: ../src/gnome2/mod_mgr.c:1355
 msgid "Updates"
 msgstr "Aktualisierungen"
 
-#: ../src/gnome2/mod_mgr.c:1087
+#: ../src/gnome2/mod_mgr.c:1359
 msgid "Uninstalled"
 msgstr "Deinstalliert"
 
-#: ../src/gnome2/mod_mgr.c:1091 ../src/gnome2/sidebar.c:639
-#: ../src/gnome2/utilities.c:501 ../src/main/prayerlists.cc:238
-#: ../src/main/sidebar.cc:1026 ../src/main/sidebar.cc:1028
+#: ../src/gnome2/mod_mgr.c:1363
+#: ../src/gnome2/sidebar.c:643
+#: ../src/gnome2/utilities.c:590
+#: ../src/main/prayerlists.cc:241
+#: ../src/main/sidebar.cc:1079
+#: ../src/main/sidebar.cc:1081
 msgid "Prayer List/Journal"
 msgstr "Gebetsliste/Tagebuch"
 
-#: ../src/gnome2/mod_mgr.c:1268
+#: ../src/gnome2/mod_mgr.c:1545
 msgid "Refreshing from remote source"
 msgstr "Aktualisiere von ferner Quelle"
 
-#: ../src/gnome2/mod_mgr.c:1279
+#: ../src/gnome2/mod_mgr.c:1556
 msgid "Remote source not found"
 msgstr "Ferne Quelle nicht gefunden"
 
-#: ../src/gnome2/mod_mgr.c:1412
-msgid "Module Name"
-msgstr "Modulname"
-
-#: ../src/gnome2/mod_mgr.c:1433
-msgid "A checkmark means this module is already installed"
-msgstr "Ein Häkchen bedeutet, dass dieses Module bereits installiert ist"
-
-#: ../src/gnome2/mod_mgr.c:1455
-msgid "Click the box to work on this module"
-msgstr "Box ticken um dieses Modul auszuwählen"
-
-#: ../src/gnome2/mod_mgr.c:1456
-msgid "Click the box to select this module for install/update"
-msgstr "Klicke die Box, um dieses Modul zu installieren/aktualisieren"
-
-#: ../src/gnome2/mod_mgr.c:1475
-msgid "Installed"
-msgstr "Installiert"
-
-#: ../src/gnome2/mod_mgr.c:1485
-msgid ""
-"The index icon means you have built an optimized ('lucene') index for this "
-"module for fast searching (see the Maintenance pane for this function)"
-msgstr ""
-"Das Indexsymbol bedeutet, dass zum schnelleren Suchen ein optimierter "
-"('lucene') Index des Moduls erstellt wurde (siehe Pflegeseite zu dieser "
-"Funktion)"
-
-#: ../src/gnome2/mod_mgr.c:1503
-msgid ""
-"The lock icon means this module is encrypted, and requires that you purchase "
-"an unlock key from the content owner"
-msgstr ""
-"Das Schlosssymbol bedeutet, dass das Modul verschlüsselt ist und der "
-"Schlüssel bei dem Rechtebesitzer erworben werden muss"
-
-#. 2
-#: ../src/gnome2/mod_mgr.c:1520 ../src/gnome2/sidebar.c:977
-#: ../src/gnome2/sidebar.c:1145 ../ui/xi-menus.glade.h:1
-msgid "About"
-msgstr "Über"
-
-#: ../src/gnome2/mod_mgr.c:1540
-msgid ""
-"The refresh icon means the Installed module is older than the newer "
-"Available module: You should update the module"
-msgstr ""
-"Das Aktualisierungssymbol bedeutet, dass von dem installierten Modul eine "
-"neuere Version verfügbar ist: Sie sollten das Modul aktualisieren"
-
-#: ../src/gnome2/mod_mgr.c:1552
-msgid "Available"
-msgstr "Verfügbar"
-
-#: ../src/gnome2/mod_mgr.c:1561
-msgid "Size"
-msgstr "Größe"
-
-#: ../src/gnome2/mod_mgr.c:1570
-msgid "Description"
-msgstr "Beschreibung"
-
-#: ../src/gnome2/mod_mgr.c:1602 ../src/gnome2/mod_mgr.c:1702
+#: ../src/gnome2/mod_mgr.c:1670
 msgid "Configure"
 msgstr "Konfigurieren"
 
-#: ../src/gnome2/mod_mgr.c:1633
+#: ../src/gnome2/mod_mgr.c:1701
 msgid "Type"
 msgstr "Typ"
 
-#: ../src/gnome2/mod_mgr.c:1640
+#: ../src/gnome2/mod_mgr.c:1708
 msgid "Caption"
 msgstr "Überschrift"
 
-#: ../src/gnome2/mod_mgr.c:1648
+#: ../src/gnome2/mod_mgr.c:1716
 msgid "Source"
 msgstr "Quelle"
 
-#: ../src/gnome2/mod_mgr.c:1656
+#: ../src/gnome2/mod_mgr.c:1724
 msgid "Directory"
 msgstr "Verzeichnis"
 
-#: ../src/gnome2/mod_mgr.c:1664
+#: ../src/gnome2/mod_mgr.c:1732
 msgid "User"
 msgstr "Benutzer"
 
-#: ../src/gnome2/mod_mgr.c:1672
+#: ../src/gnome2/mod_mgr.c:1740
 msgid "Password"
 msgstr "Passwort"
 
-#: ../src/gnome2/mod_mgr.c:1680
+#: ../src/gnome2/mod_mgr.c:1748
 msgid "UID"
 msgstr "UID"
 
-#: ../src/gnome2/mod_mgr.c:1700
-msgid "Sources"
-msgstr "Quellen"
+#: ../src/gnome2/mod_mgr.c:1765
+msgid "Module Sources"
+msgstr "Modul-Quellen"
+
+#: ../src/gnome2/mod_mgr.c:1768
+msgid "Add/Remove"
+msgstr "Hinzufügen/Entfernen"
+
+#: ../src/gnome2/mod_mgr.c:1770
+msgid "Choose"
+msgstr "Auswählen"
 
-#: ../src/gnome2/mod_mgr.c:1706 ../src/gnome2/preferences_dialog.c:1784
-#: ../src/gnome2/sidebar.c:1485
+#: ../src/gnome2/mod_mgr.c:1774
+#: ../src/gnome2/preferences_dialog.c:1793
+#: ../src/gnome2/sidebar.c:1413
 msgid "Modules"
 msgstr "Module"
 
-#: ../src/gnome2/mod_mgr.c:1708
+#: ../src/gnome2/mod_mgr.c:1776
 msgid "Install/Update"
 msgstr "Installieren/Aktualisieren"
 
-#: ../src/gnome2/mod_mgr.c:1710
+#: ../src/gnome2/mod_mgr.c:1778
 msgid "Maintenance"
 msgstr "Pflege"
 
-#: ../src/gnome2/mod_mgr.c:1930
+#: ../src/gnome2/mod_mgr.c:1999
 msgid "Please Refresh"
 msgstr "Bitte aktualisieren"
 
-#: ../src/gnome2/mod_mgr.c:1931
+#: ../src/gnome2/mod_mgr.c:2000
 msgid "Your module list is not up to date!"
 msgstr "Ihre Moduleliste ist veraltet!"
 
+#. Zero Bibles is just not workable in Xiphos.
 #: ../src/gnome2/mod_mgr.c:2282
+msgid ""
+"You have uninstalled your last Bible.\n"
+"Xiphos requires at least one."
+msgstr ""
+"Du hast deine letzte Bibel deinstalliert.\n"
+"Xiphos benötigt mindestens eine."
+
+#: ../src/gnome2/mod_mgr.c:2288
+msgid ""
+"There are still no Bibles installed.\n"
+"Xiphos cannot continue without one."
+msgstr ""
+"Es sind noch immer keine Bibeln installiert.\n"
+"Xiphos kann ohne einer nicht fortgesetzt"
+
+#: ../src/gnome2/mod_mgr.c:2353
 msgid "Standard remote sources have been loaded."
 msgstr "Ferne Standardquellen wurde geladen."
 
-#: ../src/gnome2/mod_mgr.c:2283
+#: ../src/gnome2/mod_mgr.c:2359
 msgid "Could not load standard sources from CrossWire."
 msgstr "Konnte Standardquellen von CrossWire nicht laden."
 
-#: ../src/gnome2/mod_mgr.c:2435 ../src/gnome2/mod_mgr.c:2684
+#: ../src/gnome2/mod_mgr.c:2510
+#: ../src/gnome2/mod_mgr.c:2759
 msgid "Remove the selected source"
-msgstr "Ausgewählte Quelle entfernen "
+msgstr "Ausgewählte Quelle entfernen"
 
-#: ../src/gnome2/mod_mgr.c:2495
+#: ../src/gnome2/mod_mgr.c:2570
 msgid "Enter a remote source"
 msgstr "Geben sie eine ferne Quelle an"
 
-#: ../src/gnome2/mod_mgr.c:2499
+#: ../src/gnome2/mod_mgr.c:2574
 msgid "Caption:"
 msgstr "Überschrift:"
 
-#: ../src/gnome2/mod_mgr.c:2500
+#: ../src/gnome2/mod_mgr.c:2575
 msgid "Type:"
 msgstr "Typ:"
 
-#: ../src/gnome2/mod_mgr.c:2501
+#: ../src/gnome2/mod_mgr.c:2576
 msgid "Host:"
 msgstr "Host:"
 
-#: ../src/gnome2/mod_mgr.c:2502
+#: ../src/gnome2/mod_mgr.c:2577
 msgid "Directory:"
 msgstr "Verzeichnis:"
 
-#: ../src/gnome2/mod_mgr.c:2504
+#: ../src/gnome2/mod_mgr.c:2579
 msgid "User (optional):"
 msgstr "Benutzer (optional):"
 
-#: ../src/gnome2/mod_mgr.c:2505
+#: ../src/gnome2/mod_mgr.c:2580
 msgid "Password (optional):"
 msgstr "Passwort (optional):"
 
 #. this can happen at most once
-#: ../src/gnome2/mod_mgr.c:2533
+#: ../src/gnome2/mod_mgr.c:2608
 msgid "A source by that name already exists."
 msgstr "Quelle mit diesem Namen existiert bereits"
 
-#: ../src/gnome2/mod_mgr.c:2681
+#: ../src/gnome2/mod_mgr.c:2756
 msgid "Delete a remote source"
 msgstr "Geben sie eine Quelle im Internet an"
 
-#: ../src/gnome2/navbar_book.c:359 ../src/gnome2/navbar_book_dialog.c:299
+#. *****************************************************************************
+#. * Name
+#. *   gui_open_mod_mgr
+#. *
+#. * Synopsis
+#. *   #include "gui/mod_mgr.h"
+#. *
+#. *   void gui_open_mod_mgr(void)
+#. *
+#. * Description
+#. *
+#. *
+#. * Return value
+#. *   void
+#.
+#: ../src/gnome2/mod_mgr.c:3244
+msgid ""
+"<b>Welcome to the Module Manager.</b>\n"
+"\n"
+"This is Xiphos' mechanism to get new and updated content.\n"
+"It appears you have never been here before, so please take a moment to look it over.\n"
+"(You will see this information box just once.)\n"
+"\n"
+"Modules come from different <u>repositories</u>.  <b>Module Sources: Add/Remove</b> will show you what repositories are currently known.\n"
+"\n"
+"<b>Module Sources: Choose</b> is for deciding from where modules should come, that is, from which repository Xiphos should obtain them, as well as where they should be placed on your system. Set <i>Install Source</i> and <i>Install Destination</i>, then click <i>Refresh</i>.\n"
+"\n"
+"<b>Modules: Install/Update</b> is for selecting and obtaining modules after choosing source and destination.\n"
+"\n"
+"<b>Modules: Maintenance</b> is for archive and index creation.\n"
+"\n"
+"See section 5 of our manual for Module Manager detail, or ask for help via Live Chat, or (if no one is responsive in chat) send mail to our users' mailing list.\n"
+msgstr ""
+"<b>Willkommen beim Module Manager.</b>\n"
+"\n"
+"Dies ist Xiphos' Mechanismus, um neuen und aktuelleren Inhalt zu bekommen.\n"
+"Dies scheint das erste mal zu sein, das sie ihn benutzen. Bitte schauen sie sich etwas genauer um.\n"
+"(Diese Nachricht wird nur einmal angezeigt.)\n"
+"\n"
+"Module kommen von unterschiedlichen <u>Repositorien</u>.  <b>Modul Quellen: Hinzufügen/Löschen</b> zeigt aktuelle bekannte Repositorien.\n"
+"\n"
+"<b>Modul Quellen: Auswählen</b> ist um zu entscheiden, woher Module kommen sollen, das bedeutet, von welchem Repository Xiphos diese herunterladen soll, und wo diese im System abgelegt werden sollen. Setze <i>Installationsquelle</i> und <i>Installationsziel</i>, dann klicke <i>Aktualisieren</i>.\n"
+"\n"
+"<b>Module: Installieren/Aktualisieren</b> ist zum auswählen und herunterladen von Modulen nach der Auswahl von Quelle und Ziel.\n"
+"\n"
+"<b>Module: Verwaltung</b> ist für das Archivieren und die Indexerzeugung.\n"
+"\n"
+"Lesen sie Abschnitt 5 in unserem Handbuch zu den Details zum Module Manager oder fragen sie nach Hilfe im Live Chat oder (wenn im Chat niemand antwortet) senden sie eine E-Mail an unsere Benutzer-Mailingliste.\n"
+
+#: ../src/gnome2/navbar_book.c:359
+#: ../src/gnome2/navbar_book_dialog.c:300
 msgid "Go outward, to the section containing this one"
 msgstr "Nach außen, zum Abschnitt, der diesen enthält"
 
-#: ../src/gnome2/navbar_book.c:375 ../src/gnome2/navbar_book_dialog.c:315
+#: ../src/gnome2/navbar_book.c:375
+#: ../src/gnome2/navbar_book_dialog.c:316
 msgid "Go to previous item"
 msgstr "Gehe zu vorigem Eintrag"
 
-#: ../src/gnome2/navbar_book.c:390 ../src/gnome2/navbar_book_dialog.c:330
+#: ../src/gnome2/navbar_book.c:390
+#: ../src/gnome2/navbar_book_dialog.c:331
 msgid "Go to next item"
 msgstr "Gehe zu nächstem Eintrag"
 
-#: ../src/gnome2/navbar_book.c:406 ../src/gnome2/navbar_book_dialog.c:346
+#: ../src/gnome2/navbar_book.c:406
+#: ../src/gnome2/navbar_book_dialog.c:347
 msgid "Go inward, to the first subsection"
 msgstr "Nach innen, zum ersten Unterabschnitt"
 
-#: ../src/gnome2/navbar_versekey_dialog.c:887
-#: ../src/gnome2/navbar_versekey_editor.c:877
-#: ../src/gnome2/navbar_versekey_parallel.c:800
+#: ../src/gnome2/navbar_versekey_dialog.c:864
+#: ../src/gnome2/navbar_versekey_editor.c:879
+#: ../src/gnome2/navbar_versekey_parallel.c:810
 msgid "Synchronize this window from main window"
 msgstr "Synchronisiert dieses Fenster vom Hauptfenster"
 
-#: ../src/gnome2/parallel_dialog.c:324 ../src/gnome2/preferences_dialog.c:1790
+#: ../src/gnome2/parallel_dialog.c:328
+#: ../src/gnome2/preferences_dialog.c:1799
 msgid "Parallel"
 msgstr "Parallel"
 
-#: ../src/gnome2/parallel_view.c:271
+#: ../src/gnome2/parallel_view.c:275
 msgid "Copy"
 msgstr "Kopieren"
 
-#: ../src/gnome2/parallel_view.c:281
+#: ../src/gnome2/parallel_view.c:285
 msgid "Detach/Attach"
 msgstr "Anheften/Abtrennen"
 
-#: ../src/gnome2/parallel_view.c:287 ../ui/xi-menus.glade.h:40
+#: ../src/gnome2/parallel_view.c:291
+#: ../ui/xi-menus.glade.h:53
 msgid "Module Options"
 msgstr "Moduloptionen"
 
 #. build change parallel modules submenu
-#: ../src/gnome2/parallel_view.c:302
+#: ../src/gnome2/parallel_view.c:306
 msgid "Change parallel 1"
 msgstr "Parallelansicht 1 ändern"
 
-#: ../src/gnome2/parallel_view.c:304
+#: ../src/gnome2/parallel_view.c:308
 msgid "Change parallel 2"
 msgstr "Parallelansicht 2 ändern"
 
-#: ../src/gnome2/parallel_view.c:306
+#: ../src/gnome2/parallel_view.c:310
 msgid "Change parallel 3"
 msgstr "Parallelansicht 3 ändern"
 
-#: ../src/gnome2/parallel_view.c:308
+#: ../src/gnome2/parallel_view.c:312
 msgid "Change parallel 4"
 msgstr "Parallelansicht 4 ändern"
 
-#: ../src/gnome2/parallel_view.c:310
+#: ../src/gnome2/parallel_view.c:314
 msgid "Change parallel 5"
 msgstr "Parallelansicht 5 ändern"
 
-#: ../src/gnome2/parallel_view.c:467 ../src/gnome2/sidebar.c:622
-#: ../src/gnome2/sidebar.c:628 ../src/gnome2/tabbed_browser.c:231
-#: ../src/main/sidebar.cc:622 ../src/main/sidebar.cc:954
-#: ../src/main/sidebar.cc:955 ../src/main/sidebar.cc:956
+#: ../src/gnome2/parallel_view.c:471
+#: ../src/gnome2/sidebar.c:626
+#: ../src/gnome2/sidebar.c:632
+#: ../src/gnome2/tabbed_browser.c:262
+#: ../src/main/sidebar.cc:646
+#: ../src/main/sidebar.cc:1007
+#: ../src/main/sidebar.cc:1008
+#: ../src/main/sidebar.cc:1009
 msgid "Parallel View"
 msgstr "Parallelansicht"
 
-#: ../src/gnome2/preferences_cell_renderer.c:398
-msgid "Text"
-msgstr "Text"
-
-#: ../src/gnome2/preferences_cell_renderer.c:400
-msgid "Text to render"
-msgstr "Text, der dargestellt werden soll"
-
-#: ../src/gnome2/preferences_cell_renderer.c:406
-msgid "Pixbuf Object"
-msgstr "Pixbuf-Objekt"
-
-#: ../src/gnome2/preferences_cell_renderer.c:408
-msgid "The pixbuf to render."
-msgstr "Pixbuf, das dargestellt werden soll"
-
-#: ../src/gnome2/preferences_dialog.c:1231
-#: ../src/gnome2/preferences_dialog.c:1269
-#: ../src/gnome2/preferences_dialog.c:1306
-#: ../src/gnome2/preferences_dialog.c:1341
-#: ../src/gnome2/preferences_dialog.c:1375
-#: ../src/gnome2/preferences_dialog.c:1408
-#: ../src/gnome2/preferences_dialog.c:1440
-#: ../src/gnome2/preferences_dialog.c:1473
-#: ../src/gnome2/preferences_dialog.c:1505
-#: ../src/gnome2/preferences_dialog.c:1539
-#: ../src/gnome2/preferences_dialog.c:1574
-#: ../src/gnome2/preferences_dialog.c:1609
-#: ../src/gnome2/preferences_dialog.c:1645
-#: ../src/gnome2/preferences_dialog.c:2045
+#: ../src/gnome2/preferences_dialog.c:1179
+#: ../src/gnome2/preferences_dialog.c:1217
+#: ../src/gnome2/preferences_dialog.c:1254
+#: ../src/gnome2/preferences_dialog.c:1289
+#: ../src/gnome2/preferences_dialog.c:1323
+#: ../src/gnome2/preferences_dialog.c:1356
+#: ../src/gnome2/preferences_dialog.c:1388
+#: ../src/gnome2/preferences_dialog.c:1421
+#: ../src/gnome2/preferences_dialog.c:1453
+#: ../src/gnome2/preferences_dialog.c:1487
+#: ../src/gnome2/preferences_dialog.c:1522
+#: ../src/gnome2/preferences_dialog.c:1557
+#: ../src/gnome2/preferences_dialog.c:1593
+#: ../src/gnome2/preferences_dialog.c:1631
+#: ../src/gnome2/preferences_dialog.c:2052
 msgid "-- Select --"
 msgstr "-- Auswahl --"
 
-#: ../src/gnome2/preferences_dialog.c:1678 ../ui/prefs.glade.h:74
+#: ../src/gnome2/preferences_dialog.c:1652
+msgid "Locale will take effect after restart."
+msgstr "Lokalisierung wird nach einem Neustart wirksam."
+
+#: ../src/gnome2/preferences_dialog.c:1687
+#: ../ui/prefs.glade.h:74
 msgid "Preferences"
 msgstr "Einstellungen"
 
-#: ../src/gnome2/preferences_dialog.c:1760
+#: ../src/gnome2/preferences_dialog.c:1769
 msgid "Fonts"
 msgstr "Schriften"
 
-#: ../src/gnome2/preferences_dialog.c:1763
+#: ../src/gnome2/preferences_dialog.c:1772
 msgid "Color"
 msgstr "Farben"
 
-#: ../src/gnome2/preferences_dialog.c:1766
+#: ../src/gnome2/preferences_dialog.c:1775
 msgid "Sizes"
 msgstr "Größen"
 
-#: ../src/gnome2/preferences_dialog.c:1770
+#: ../src/gnome2/preferences_dialog.c:1779
 msgid "General"
 msgstr "Allgemein"
 
-#: ../src/gnome2/preferences_dialog.c:1773 ../ui/prefs.glade.h:85
+#: ../src/gnome2/preferences_dialog.c:1782
+#: ../ui/prefs.glade.h:87
 msgid "Tabs and Panes"
 msgstr "Reiter und Bereiche"
 
-#: ../src/gnome2/preferences_dialog.c:1780
+#: ../src/gnome2/preferences_dialog.c:1789
 msgid "Options"
 msgstr "Einstellungen"
 
-#: ../src/gnome2/preferences_dialog.c:1787
+#: ../src/gnome2/preferences_dialog.c:1796
 msgid "Main"
 msgstr "Hauptfenster"
 
-#: ../src/gnome2/preferences_dialog.c:1793
+#: ../src/gnome2/preferences_dialog.c:1802
 msgid "Special"
 msgstr "Spezial"
 
-#: ../src/gnome2/search_dialog.c:61 ../src/main/search_dialog.cc:60
-#: ../src/main/search_sidebar.cc:54
+#: ../src/gnome2/search_dialog.c:68
+#: ../src/main/search_dialog.cc:66
+#: ../src/main/search_sidebar.cc:61
 msgid "Searching the "
 msgstr "Durchsuche das "
 
-#: ../src/gnome2/search_dialog.c:62 ../src/main/search_dialog.cc:61
-#: ../src/main/search_sidebar.cc:55
+#: ../src/gnome2/search_dialog.c:69
+#: ../src/main/search_dialog.cc:67
+#: ../src/main/search_sidebar.cc:62
 msgid " Module"
 msgstr " Modul"
 
-#: ../src/gnome2/search_dialog.c:63 ../src/main/search_dialog.cc:62
-#: ../src/main/search_sidebar.cc:56
+#: ../src/gnome2/search_dialog.c:70
+#: ../src/main/search_dialog.cc:68
+#: ../src/main/search_sidebar.cc:63
 msgid "found in "
 msgstr "gefunden in "
 
-#: ../src/gnome2/search_dialog.c:498
+#: ../src/gnome2/search_dialog.c:527
 msgid "Clear List?"
 msgstr "Liste leeren?"
 
-#: ../src/gnome2/search_dialog.c:499
+#: ../src/gnome2/search_dialog.c:528
 msgid "Are you sure you want to clear the module list?"
 msgstr "Möchten Sie die Modulliste wirklich leeren?"
 
-#: ../src/gnome2/search_dialog.c:682
+#: ../src/gnome2/search_dialog.c:708
 msgid "The last module list may not be deleted"
 msgstr "Die letzte Modulliste wird eventuell nicht gelöscht"
 
-#: ../src/gnome2/search_dialog.c:699
+#: ../src/gnome2/search_dialog.c:726
 msgid "Delete list?"
 msgstr "Liste löschen?"
 
-#: ../src/gnome2/search_dialog.c:700
+#: ../src/gnome2/search_dialog.c:727
 msgid "Are you sure you want to delete:"
 msgstr "Möchten Sie Folgendes löschen:"
 
-#: ../src/gnome2/search_sidebar.c:189
+#: ../src/gnome2/search_sidebar.c:192
 msgid ""
 "This is an inclusive (\"AND\") search:\n"
 "Find matches showing all words."
@@ -1074,173 +1274,99 @@ msgstr ""
 "Die ist eine inklusive (\"UND\") Suche:\n"
 "Findet Treffer, die alle Worte enthalten."
 
-#: ../src/gnome2/search_sidebar.c:206
+#: ../src/gnome2/search_sidebar.c:209
 msgid "Search Module"
 msgstr "Suchmodul"
 
-#: ../src/gnome2/search_sidebar.c:220
+#: ../src/gnome2/search_sidebar.c:223
 msgid "Bible"
 msgstr "Bibel"
 
-#: ../src/gnome2/search_sidebar.c:229 ../ui/prefs.glade.h:35
+#: ../src/gnome2/search_sidebar.c:232
+#: ../ui/prefs.glade.h:35
 msgid "Commentary"
 msgstr "Kommentare"
 
-#: ../src/gnome2/search_sidebar.c:243
+#: ../src/gnome2/search_sidebar.c:246
 msgid "Search Type"
 msgstr "Suchtyp"
 
-#: ../src/gnome2/search_sidebar.c:257 ../ui/search-dialog.glade.h:64
+#: ../src/gnome2/search_sidebar.c:260
+#: ../ui/search-dialog.glade.h:66
 msgid "Multi word"
 msgstr "Mehrere Worte"
 
-#: ../src/gnome2/search_sidebar.c:276 ../ui/search-dialog.glade.h:44
+#: ../src/gnome2/search_sidebar.c:279
+#: ../ui/search-dialog.glade.h:44
 msgid "Exact phrase"
 msgstr "Genaue Phrase"
 
-#: ../src/gnome2/search_sidebar.c:290
+#: ../src/gnome2/search_sidebar.c:293
 msgid "Search Options"
 msgstr "Suchoptionen"
 
-#: ../src/gnome2/search_sidebar.c:318
+#: ../src/gnome2/search_sidebar.c:321
 msgid "Search Scope"
 msgstr "Suchbereich"
 
-#: ../src/gnome2/search_sidebar.c:331
+#: ../src/gnome2/search_sidebar.c:334
 msgid "No scope"
 msgstr "Kein Bereich"
 
-#: ../src/gnome2/search_sidebar.c:341
+#: ../src/gnome2/search_sidebar.c:344
 msgid "Use bounds"
 msgstr "Grenzen verwenden"
 
-#: ../src/gnome2/search_sidebar.c:350
+#: ../src/gnome2/search_sidebar.c:353
 msgid "Last search"
 msgstr "Letzte Suche"
 
-#: ../src/gnome2/search_sidebar.c:365
+#: ../src/gnome2/search_sidebar.c:368
 msgid "Bounds"
 msgstr "Grenzen"
 
-#: ../src/gnome2/search_sidebar.c:379
+#: ../src/gnome2/search_sidebar.c:382
 msgid "Lower"
 msgstr "Untere"
 
-#: ../src/gnome2/search_sidebar.c:386
+#: ../src/gnome2/search_sidebar.c:389
 msgid "Upper"
 msgstr "Obere"
 
-#. 0
-#: ../src/gnome2/sidebar.c:965 ../src/gnome2/sidebar.c:1133
-msgid "Open in a new tab"
-msgstr "In neuem Reiter öffnen"
-
-#: ../src/gnome2/sidebar.c:966 ../src/gnome2/sidebar.c:1134
-msgid "Open selected module in a new tab"
-msgstr "Ausgewähltes Modul in neuem Reiter öffnen"
-
-#. 1
-#: ../src/gnome2/sidebar.c:971
-msgid "Open in a separate window"
-msgstr "Öffne in separatem Fenster"
-
-#: ../src/gnome2/sidebar.c:972
-msgid "Open selected module in a separate ['dialog'] window"
-msgstr "Ausgewähltes Modul in einem Dialog öffnen"
-
-#: ../src/gnome2/sidebar.c:978 ../src/gnome2/sidebar.c:1146
-msgid "View information about the selected dialog"
-msgstr "Informationen über das ausgewählte Modul anzeigen"
-
-#: ../src/gnome2/sidebar.c:1069
-msgid "Simple"
-msgstr "Einfach"
-
-#: ../src/gnome2/sidebar.c:1070
-msgid "Create a new simple prayer list"
-msgstr "Erstelle eine neue einfache Gebetsliste"
-
-#: ../src/gnome2/sidebar.c:1076
-msgid "Subject"
-msgstr "Gegenstand"
-
-#: ../src/gnome2/sidebar.c:1083
-msgid "Monthly"
-msgstr "Monatlich"
-
-#: ../src/gnome2/sidebar.c:1084 ../src/gnome2/sidebar.c:1091
-#: ../src/gnome2/sidebar.c:1098
-msgid "Create a new prayer list"
-msgstr "Erstelle eine neue Gebetsliste"
-
-#: ../src/gnome2/sidebar.c:1090
-msgid "Daily Journal"
-msgstr "Tagebuch"
-
-#: ../src/gnome2/sidebar.c:1097
-msgid "Outlined Topic"
-msgstr "Untergliedertes Thema"
-
-#. 1
-#: ../src/gnome2/sidebar.c:1139 ../ui/xi-menus.glade.h:47
-msgid "Open in editor"
-msgstr "Im Editor öffnen"
-
-#: ../src/gnome2/sidebar.c:1140
-msgid "Open selected module in a dialog"
-msgstr "Ausgewähltes Modul in einem Dialog öffnen"
-
-#: ../src/gnome2/sidebar.c:1469
+#: ../src/gnome2/sidebar.c:1397
 msgid "Search"
 msgstr "Suchen"
 
-#: ../src/gnome2/sidebar.c:1477
+#: ../src/gnome2/sidebar.c:1405
 msgid "Verse List"
 msgstr "Versliste"
 
-#: ../src/gnome2/sidebar_dialog.c:136 ../src/gnome2/sidebar_dialog.c:145
+#: ../src/gnome2/sidebar_dialog.c:139
+#: ../src/gnome2/sidebar_dialog.c:148
 msgid "Sidebar"
 msgstr "Seitenleiste"
 
-#: ../src/gnome2/splash.c:363
+#: ../src/gnome2/splash.c:396
 msgid "Powered by the SWORD Project"
 msgstr "Benutzt das SWORD-Projekt"
 
-#: ../src/gnome2/treekey-editor.c:130 ../src/gnome2/treekey-editor.c:189
-#: ../src/gnome2/treekey-editor.c:275
+#: ../src/gnome2/treekey-editor.c:137
+#: ../src/gnome2/treekey-editor.c:196
+#: ../src/gnome2/treekey-editor.c:282
 msgid "Prayer List/Journal Item"
 msgstr "Gebetslisten-/Tagebucheintrag"
 
-#: ../src/gnome2/treekey-editor.c:131 ../src/gnome2/treekey-editor.c:190
-#: ../src/gnome2/treekey-editor.c:276
+#: ../src/gnome2/treekey-editor.c:138
+#: ../src/gnome2/treekey-editor.c:197
+#: ../src/gnome2/treekey-editor.c:283
 msgid "New name"
 msgstr "Neuer Name"
 
-#: ../src/gnome2/treekey-editor.c:246
+#: ../src/gnome2/treekey-editor.c:253
 msgid "Remove the selected item"
-msgstr "Ausgewählten Eintrag entfernen "
-
-#: ../src/gnome2/treekey-editor.c:304
-msgid "Add Child"
-msgstr "Kind hinzufügen"
-
-#: ../src/gnome2/treekey-editor.c:305 ../src/gnome2/treekey-editor.c:311
-msgid "Add an item"
-msgstr "Eintrag hinzufügen"
+msgstr "Ausgewählten Eintrag entfernen"
 
-#: ../src/gnome2/treekey-editor.c:310
-msgid "Add Sibling"
-msgstr "Nachbar hinzufügen"
-
-#: ../src/gnome2/treekey-editor.c:317
-msgid "Remove this item"
-msgstr "Diesen Eintrag entfernen"
-
-#: ../src/gnome2/treekey-editor.c:323
-msgid "Edit this item"
-msgstr "Diesen Eintrag editieren"
-
-#: ../src/main/display.cc:301
+#: ../src/main/display.cc:259
 #, c-format
 msgid ""
 "Improperly encoded personal annotation label:\n"
@@ -1249,7 +1375,7 @@ msgstr ""
 "Unzulässig kodierte persönliche Annotationsbeschriftung:\n"
 "'%s'"
 
-#: ../src/main/display.cc:427
+#: ../src/main/display.cc:386
 msgid ""
 "An image file's size could not be determined.\n"
 "Is ImageMagick's 'identify' not installed?\n"
@@ -1263,284 +1389,317 @@ msgstr ""
 "Xiphos kann die Bilder nicht an die\n"
 "Fenstergröße anpassen."
 
-#: ../src/main/display.cc:1083 ../src/main/display.cc:1145
-#: ../src/main/display.cc:1233 ../src/main/display.cc:1241
+#: ../src/main/display.cc:1042
+#: ../src/main/display.cc:1094
+#: ../src/main/display.cc:1171
 #: ../ui/export-dialog.glade.h:7
 msgid "Chapter"
 msgstr "Kapitel"
 
-#: ../src/main/main.c:110
+#: ../src/main/main.c:119
 msgid "Xiphos does not understand more than one argument."
 msgstr "Xiphos versteht nicht mehr als ein Argument."
 
-#: ../src/main/main.c:150
+#: ../src/main/main.c:161
 msgid "Initiating Gecko"
 msgstr "Initiiere Gecko"
 
-#: ../src/main/main.c:156
+#: ../src/main/main.c:167
 msgid "Building Interface"
 msgstr "Erstelle Schnittstelle"
 
-#: ../src/main/main.c:160
+#: ../src/main/main.c:171
 msgid "Starting Sword"
 msgstr "Starte Sword"
 
-#: ../src/main/main.c:164
+#: ../src/main/main.c:175
 msgid "Loading Settings"
 msgstr "Lade Einstellungen"
 
-#: ../src/main/main.c:168
+#: ../src/main/main.c:179
 msgid "Displaying Xiphos"
 msgstr "Zeige Xiphos"
 
-#: ../src/main/module_dialogs.cc:232 ../src/main/previewer.cc:122
+#: ../src/main/module_dialogs.cc:227
+#: ../src/main/previewer.cc:127
+#: ../src/main/previewer.cc:194
 #: ../ui/prefs.glade.h:75
 msgid "Previewer"
 msgstr "Vorschau"
 
-#: ../src/main/module_dialogs.cc:298 ../src/main/module_dialogs.cc:424
-#: ../src/main/previewer.cc:197
+#: ../src/main/module_dialogs.cc:292
+#: ../src/main/module_dialogs.cc:416
+#: ../src/main/previewer.cc:269
 msgid "Footnote"
 msgstr "Fußnote"
 
-#: ../src/main/module_dialogs.cc:304 ../src/main/module_dialogs.cc:429
-#: ../src/main/previewer.cc:209
+#: ../src/main/module_dialogs.cc:298
+#: ../src/main/module_dialogs.cc:421
+#: ../src/main/previewer.cc:281
 msgid "Cross Reference"
 msgstr "Referenz"
 
-#: ../src/main/module_dialogs.cc:310 ../src/main/module_dialogs.cc:324
-#: ../src/main/module_dialogs.cc:434 ../src/main/module_dialogs.cc:446
-#: ../src/main/previewer.cc:215 ../src/main/previewer.cc:234
+#: ../src/main/module_dialogs.cc:304
+#: ../src/main/module_dialogs.cc:318
+#: ../src/main/module_dialogs.cc:426
+#: ../src/main/module_dialogs.cc:438
+#: ../src/main/previewer.cc:287
+#: ../src/main/previewer.cc:306
 msgid "Strongs"
 msgstr "Strongs"
 
-#: ../src/main/module_dialogs.cc:316 ../src/main/module_dialogs.cc:335
-#: ../src/main/module_dialogs.cc:439 ../src/main/module_dialogs.cc:456
-#: ../src/main/previewer.cc:221 ../src/main/previewer.cc:247
+#: ../src/main/module_dialogs.cc:310
+#: ../src/main/module_dialogs.cc:329
+#: ../src/main/module_dialogs.cc:431
+#: ../src/main/module_dialogs.cc:448
+#: ../src/main/previewer.cc:293
+#: ../src/main/previewer.cc:319
 msgid "Morphology"
 msgstr "Morphologische Markierungen"
 
-#: ../src/main/module_dialogs.cc:1089 ../src/main/url.cc:537
+#: ../src/main/module_dialogs.cc:1081
+#: ../src/main/url.cc:530
 msgid "Back to "
-msgstr "Zurück zu"
+msgstr "Zurück zu "
 
-#: ../src/main/parallel_view.cc:398 ../ui/xi-menus.glade.h:69
+#: ../src/main/parallel_view.cc:404
+#: ../ui/xi-menus.glade.h:89
 msgid "Strong's Numbers"
 msgstr "Strongs Nummern"
 
-#: ../src/main/parallel_view.cc:408 ../ui/search-dialog.glade.h:50
-#: ../ui/xi-menus.glade.h:27
+#: ../src/main/parallel_view.cc:414
+#: ../ui/search-dialog.glade.h:52
+#: ../ui/xi-menus.glade.h:40
 msgid "Footnotes"
 msgstr "Fußnoten"
 
-#: ../src/main/parallel_view.cc:418 ../ui/search-dialog.glade.h:62
-#: ../ui/xi-menus.glade.h:41
+#: ../src/main/parallel_view.cc:424
+#: ../ui/search-dialog.glade.h:64
+#: ../ui/xi-menus.glade.h:55
 msgid "Morphological Tags"
 msgstr "Morphologische Markierungen"
 
-#: ../src/main/parallel_view.cc:428 ../ui/xi-menus.glade.h:31
+#: ../src/main/parallel_view.cc:434
+#: ../ui/xi-menus.glade.h:44
 msgid "Hebrew Vowel Points"
 msgstr "Hebräische Vokalpunkte"
 
-#: ../src/main/parallel_view.cc:438 ../ui/xi-menus.glade.h:30
+#: ../src/main/parallel_view.cc:444
+#: ../ui/xi-menus.glade.h:43
 msgid "Hebrew Cantillation"
 msgstr "Hebräische Kantillation"
 
-#: ../src/main/parallel_view.cc:448 ../ui/xi-menus.glade.h:28
+#: ../src/main/parallel_view.cc:454
+#: ../ui/xi-menus.glade.h:41
 msgid "Greek Accents"
 msgstr "Griechische Akzente"
 
-#: ../src/main/parallel_view.cc:458
+#: ../src/main/parallel_view.cc:464
 msgid "Cross-references"
 msgstr "Querverweise"
 
-#: ../src/main/parallel_view.cc:468 ../ui/xi-menus.glade.h:37
+#: ../src/main/parallel_view.cc:474
+#: ../ui/xi-menus.glade.h:50
 msgid "Lemmas"
 msgstr "Lemmata"
 
-#: ../src/main/parallel_view.cc:478 ../ui/xi-menus.glade.h:29
+#: ../src/main/parallel_view.cc:484
+#: ../ui/xi-menus.glade.h:42
 msgid "Headings"
 msgstr "Überschriften"
 
-#: ../src/main/parallel_view.cc:488
+#: ../src/main/parallel_view.cc:494
 msgid "Morpheme Segmentation"
 msgstr "Morphem-Zerlegung"
 
-#: ../src/main/parallel_view.cc:498 ../ui/xi-menus.glade.h:75
+#: ../src/main/parallel_view.cc:504
+#: ../ui/xi-menus.glade.h:96
 msgid "Words of Christ in Red"
 msgstr "Christi Worte in Rot"
 
-#: ../src/main/parallel_view.cc:508 ../ui/xi-menus.glade.h:70
+#: ../src/main/parallel_view.cc:514
+#: ../ui/xi-menus.glade.h:91
 msgid "Transliteration"
 msgstr "Transliteration"
 
-#: ../src/main/parallel_view.cc:518
+#: ../src/main/parallel_view.cc:524
 msgid "Textual Variants"
 msgstr "Textvarianten"
 
-#: ../src/main/parallel_view.cc:526 ../ui/xi-menus.glade.h:51
+#: ../src/main/parallel_view.cc:532
+#: ../ui/xi-menus.glade.h:70
 msgid "Primary Reading"
 msgstr "Primärtexte"
 
-#: ../src/main/parallel_view.cc:535 ../ui/xi-menus.glade.h:65
+#: ../src/main/parallel_view.cc:541
+#: ../ui/xi-menus.glade.h:84
 msgid "Secondary Reading"
 msgstr "Sekundärtexte"
 
-#: ../src/main/parallel_view.cc:544 ../ui/xi-menus.glade.h:5
+#: ../src/main/parallel_view.cc:550
+#: ../ui/xi-menus.glade.h:9
 msgid "All Readings"
 msgstr "Alle Texte"
 
-#: ../src/main/parallel_view.cc:878 ../src/main/parallel_view.cc:1130
+#: ../src/main/parallel_view.cc:884
+#: ../src/main/parallel_view.cc:1136
 msgid "view context"
 msgstr "Kontext anzeigen"
 
-#: ../src/main/prayerlists.cc:71
+#: ../src/main/prayerlists.cc:74
 msgid "January"
 msgstr "Januar"
 
-#: ../src/main/prayerlists.cc:72
+#: ../src/main/prayerlists.cc:75
 msgid "February"
 msgstr "Februar"
 
-#: ../src/main/prayerlists.cc:73
+#: ../src/main/prayerlists.cc:76
 msgid "March"
 msgstr "März"
 
-#: ../src/main/prayerlists.cc:74
+#: ../src/main/prayerlists.cc:77
 msgid "April"
 msgstr "April"
 
-#: ../src/main/prayerlists.cc:75
+#: ../src/main/prayerlists.cc:78
 msgid "May"
 msgstr "Mai"
 
-#: ../src/main/prayerlists.cc:76
+#: ../src/main/prayerlists.cc:79
 msgid "June"
 msgstr "Juni"
 
-#: ../src/main/prayerlists.cc:77
+#: ../src/main/prayerlists.cc:80
 msgid "July"
 msgstr "Juli"
 
-#: ../src/main/prayerlists.cc:78
+#: ../src/main/prayerlists.cc:81
 msgid "August"
 msgstr "August"
 
-#: ../src/main/prayerlists.cc:79
+#: ../src/main/prayerlists.cc:82
 msgid "September"
 msgstr "September"
 
-#: ../src/main/prayerlists.cc:80
+#: ../src/main/prayerlists.cc:83
 msgid "October"
 msgstr "Oktober"
 
-#: ../src/main/prayerlists.cc:81
+#: ../src/main/prayerlists.cc:84
 msgid "November"
 msgstr "November"
 
-#: ../src/main/prayerlists.cc:82
+#: ../src/main/prayerlists.cc:85
 msgid "December"
 msgstr "Dezember"
 
-#: ../src/main/prayerlists.cc:121 ../src/main/sword_treekey.cc:332
+#: ../src/main/prayerlists.cc:124
+#: ../src/main/sword_treekey.cc:332
 msgid "Growth"
 msgstr "Wachstum"
 
-#: ../src/main/prayerlists.cc:122 ../src/main/sword_treekey.cc:333
+#: ../src/main/prayerlists.cc:125
+#: ../src/main/sword_treekey.cc:333
 msgid "<b>For Growth</b><br>"
 msgstr "<b>Für Wachstum</b><br>"
 
-#: ../src/main/prayerlists.cc:123 ../src/main/prayerlists.cc:380
+#: ../src/main/prayerlists.cc:126
+#: ../src/main/prayerlists.cc:383
 #: ../src/main/sword_treekey.cc:334
 msgid "Salvation"
 msgstr "Erlösung"
 
-#: ../src/main/prayerlists.cc:124 ../src/main/sword_treekey.cc:335
+#: ../src/main/prayerlists.cc:127
+#: ../src/main/sword_treekey.cc:335
 msgid "<b>For Salvation</b><br>"
 msgstr "<b>Für Rettung</b><br>"
 
-#: ../src/main/prayerlists.cc:125 ../src/main/prayerlists.cc:384
+#: ../src/main/prayerlists.cc:128
+#: ../src/main/prayerlists.cc:387
 #: ../src/main/sword_treekey.cc:336
 msgid "Health"
 msgstr "Gesundheit"
 
-#: ../src/main/prayerlists.cc:126 ../src/main/sword_treekey.cc:337
+#: ../src/main/prayerlists.cc:129
+#: ../src/main/sword_treekey.cc:337
 msgid "<b>For Health</b><br>"
 msgstr "<b>Für Gesundheit</b><br>"
 
-#: ../src/main/prayerlists.cc:127
+#: ../src/main/prayerlists.cc:130
 msgid "Misc"
 msgstr "Verschiedenes"
 
-#: ../src/main/prayerlists.cc:128 ../src/main/sword_treekey.cc:339
+#: ../src/main/prayerlists.cc:131
+#: ../src/main/sword_treekey.cc:339
 msgid "<b>Miscellaneous</b><br>"
 msgstr "<b>Diverses</b><br>"
 
-#: ../src/main/prayerlists.cc:136
+#: ../src/main/prayerlists.cc:139
 msgid "Point x"
 msgstr "Punkt x"
 
-#: ../src/main/prayerlists.cc:137
+#: ../src/main/prayerlists.cc:140
 msgid "<b>(x)</b><br>"
 msgstr "<b>(x)</b><br>"
 
-#: ../src/main/prayerlists.cc:138
+#: ../src/main/prayerlists.cc:141
 msgid "Point y"
 msgstr "Punkt y"
 
-#: ../src/main/prayerlists.cc:139
+#: ../src/main/prayerlists.cc:142
 msgid "<b>(y)</b><br>"
 msgstr "<b>(y)</b><br>"
 
-#: ../src/main/prayerlists.cc:140
+#: ../src/main/prayerlists.cc:143
 msgid "Point z"
 msgstr "Punkt z"
 
-#: ../src/main/prayerlists.cc:141
+#: ../src/main/prayerlists.cc:144
 msgid "<b>(z)</b><br>"
 msgstr "<b>(z)</b><br>"
 
-#: ../src/main/prayerlists.cc:149
+#: ../src/main/prayerlists.cc:152
 msgid "Minor Topic 1"
 msgstr "Unterpunkt 1"
 
-#: ../src/main/prayerlists.cc:150
+#: ../src/main/prayerlists.cc:153
 msgid "<b>Subtopic 1</b><br>"
 msgstr "<b>Unterpunkt 1</b><br>"
 
-#: ../src/main/prayerlists.cc:152
+#: ../src/main/prayerlists.cc:155
 msgid "Minor Topic 2"
 msgstr "Unterpunkt 2"
 
-#: ../src/main/prayerlists.cc:153
+#: ../src/main/prayerlists.cc:156
 msgid "<b>Subtopic 2</b><br>"
 msgstr "<b>Unterpunkt 2</b><br>"
 
-#: ../src/main/prayerlists.cc:155
+#: ../src/main/prayerlists.cc:158
 msgid "Minor Topic 3"
 msgstr "Unterpunkt 3"
 
-#: ../src/main/prayerlists.cc:156
+#: ../src/main/prayerlists.cc:159
 msgid "<b>Subtopic 3</b><br>"
 msgstr "<b>Unterpunkt 3</b><br>"
 
-#: ../src/main/prayerlists.cc:158
+#: ../src/main/prayerlists.cc:161
 msgid "Minor Topic 4"
 msgstr "Unterpunkt 4"
 
-#: ../src/main/prayerlists.cc:159
+#: ../src/main/prayerlists.cc:162
 msgid "<b>Subtopic 4</b><br>"
 msgstr "<b>Unterpunkt 4</b><br>"
 
-#: ../src/main/prayerlists.cc:239
+#: ../src/main/prayerlists.cc:242
 msgid "Name for new prayer list or journal"
 msgstr "Name für neue Gebetsliste oder Tagebuch"
 
-#: ../src/main/prayerlists.cc:270
+#: ../src/main/prayerlists.cc:273
 msgid "Xiphos finds that prayer list already."
 msgstr "Xiphos hat diese Gebetsliste bereits gefunden."
 
-#: ../src/main/prayerlists.cc:283
+#: ../src/main/prayerlists.cc:286
 #, c-format
 msgid ""
 "Xiphos cannot create module's path:\n"
@@ -1549,134 +1708,128 @@ msgstr ""
 "Xiphos konnte den Modulpfad nicht erzeugen:\n"
 "%s"
 
-#: ../src/main/prayerlists.cc:323
+#: ../src/main/prayerlists.cc:326
 msgid "A basic prayer list. \\par\\par Module created by Xiphos."
 msgstr "Eine einfache Gebetsliste. \\par\\par Modul erzeugt durch Xiphos."
 
-#: ../src/main/prayerlists.cc:324
+#: ../src/main/prayerlists.cc:327
 msgid "BasicPrayerList"
 msgstr "HauptGebetsliste"
 
-#: ../src/main/prayerlists.cc:338
+#: ../src/main/prayerlists.cc:341
 msgid "MyPrayerList"
 msgstr "MeineGebetsliste"
 
-#: ../src/main/prayerlists.cc:339
-msgid ""
-"<b>People:</b><br>Bob<br>Sam<br>Sue<br><br><b>Church:</"
-"b><br>pews<br>fellowship<br>Bibles for missionaries<br><br><br>"
-msgstr ""
-"<b>Personen:</b><br>Robert<br>Samuel<br>Susanne<br><br><b>Gemeinde:</"
-"b><br>Kirchenbänke<br>Mitgliedschaft<br>Bibeln für Missionare<br><br><br>"
+#: ../src/main/prayerlists.cc:342
+msgid "<b>People:</b><br>Bob<br>Sam<br>Sue<br><br><b>Church:</b><br>pews<br>fellowship<br>Bibles for missionaries<br><br><br>"
+msgstr "<b>Personen:</b><br>Robert<br>Samuel<br>Susanne<br><br><b>Gemeinde:</b><br>Kirchenbänke<br>Mitgliedschaft<br>Bibeln für Missionare<br><br><br>"
 
-#: ../src/main/prayerlists.cc:365
+#: ../src/main/prayerlists.cc:368
 msgid "A subject-based prayer list. \\par\\par Module created by Xiphos."
-msgstr ""
-"Eine Gegenstands-basierte Gebetsliste.. \\par\\par Modul erzeugt durch "
-"Xiphos."
+msgstr "Eine Gegenstands-basierte Gebetsliste.. \\par\\par Modul erzeugt durch Xiphos."
 
-#: ../src/main/prayerlists.cc:366
+#: ../src/main/prayerlists.cc:369
 msgid "SubjectPrayerList"
 msgstr "ThemenGebetsliste"
 
-#: ../src/main/prayerlists.cc:381
+#: ../src/main/prayerlists.cc:384
 msgid "Bob<br>Sam<br>Sue<br>John<br>"
 msgstr "Robert<br>Samuel<br>Susanne<br>Johannes<br>"
 
-#: ../src/main/prayerlists.cc:382
+#: ../src/main/prayerlists.cc:385
 msgid "Spiritual Growth"
 msgstr "Geistliches Wachstum"
 
-#: ../src/main/prayerlists.cc:383
+#: ../src/main/prayerlists.cc:386
 msgid "Mike<br>Steve<br>"
 msgstr "Michael<br>Stefan<br>"
 
-#: ../src/main/prayerlists.cc:385
+#: ../src/main/prayerlists.cc:388
 msgid "Sue<br>John<br>"
 msgstr "Susanne<br>Johannes<br>"
 
-#: ../src/main/prayerlists.cc:411
+#: ../src/main/prayerlists.cc:414
 msgid "A monthly prayer list. \\par\\par Module created by Xiphos."
 msgstr "Eine Monats-Gebetsliste. \\par\\par Modul erzeugt durch Xiphos."
 
-#: ../src/main/prayerlists.cc:412
+#: ../src/main/prayerlists.cc:415
 msgid "MonthlyPrayerList"
 msgstr "MonantsGebetsliste"
 
-#: ../src/main/prayerlists.cc:463
+#: ../src/main/prayerlists.cc:466
 msgid "A daily journal. \\par\\par Module created by Xiphos."
 msgstr "Ein Tagebuch. \\par\\par Modul erzeugt durch Xiphos."
 
-#: ../src/main/prayerlists.cc:464
+#: ../src/main/prayerlists.cc:467
 msgid "DailyJournal"
 msgstr "Tagebuch"
 
-#: ../src/main/prayerlists.cc:528
+#: ../src/main/prayerlists.cc:531
 msgid "An outlined topic (e.g. sermon). \\par\\par Module created by Xiphos."
-msgstr ""
-"Eine untergliedertes Thema (z. B. einer Predigt). \\par\\par Modul erzeugt "
-"durch Xiphos."
+msgstr "Eine untergliedertes Thema (z. B. einer Predigt). \\par\\par Modul erzeugt durch Xiphos."
 
-#: ../src/main/prayerlists.cc:529
+#: ../src/main/prayerlists.cc:532
 msgid "OutlinedTopic"
 msgstr "UntergliedertesThema"
 
-#: ../src/main/prayerlists.cc:543
+#: ../src/main/prayerlists.cc:546
 msgid "Major Topic A"
 msgstr "Hauptpunkt A"
 
-#: ../src/main/prayerlists.cc:544
+#: ../src/main/prayerlists.cc:547
 msgid "<b>Major Topic A</b><br>"
 msgstr "<b>Hauptpunkt A</b><br>"
 
-#: ../src/main/prayerlists.cc:546
+#: ../src/main/prayerlists.cc:549
 msgid "Major Topic B"
 msgstr "Hauptpunkt B"
 
-#: ../src/main/prayerlists.cc:547
+#: ../src/main/prayerlists.cc:550
 msgid "<b>Major Topic B</b><br>"
 msgstr "<b>Hauptpunkt B</b><br>"
 
-#: ../src/main/prayerlists.cc:549
+#: ../src/main/prayerlists.cc:552
 msgid "Major Topic C"
 msgstr "Hauptpunkt C"
 
-#: ../src/main/prayerlists.cc:550
+#: ../src/main/prayerlists.cc:553
 msgid "<b>Major Topic C</b><br>"
 msgstr "<b>Hauptpunkt C</b><br>"
 
-#: ../src/main/previewer.cc:203
+#: ../src/main/previewer.cc:275
 msgid "User Annotation"
 msgstr "Benutzerannotierungen"
 
-#: ../src/main/search_dialog.cc:129
+#: ../src/main/search_dialog.cc:212
 #, c-format
 msgid "Search result %s: %s"
 msgstr "Suchergebnis %s: %s"
 
-#: ../src/main/search_dialog.cc:362
+#: ../src/main/search_dialog.cc:444
 msgid "Delete Range?"
 msgstr "Bereich löschen?"
 
-#: ../src/main/search_dialog.cc:363
+#: ../src/main/search_dialog.cc:445
 msgid "Are you sure you want to delete this range?"
 msgstr "Wollen Sie diesen Bereich löschen?"
 
-#: ../src/main/search_dialog.cc:577 ../src/main/search_dialog.cc:1048
-#: ../src/main/search_dialog.cc:1051 ../src/main/search_dialog.cc:1073
-#: ../src/main/search_dialog.cc:1076
+#: ../src/main/search_dialog.cc:659
+#: ../src/main/search_dialog.cc:1130
+#: ../src/main/search_dialog.cc:1133
+#: ../src/main/search_dialog.cc:1155
+#: ../src/main/search_dialog.cc:1158
 msgid "Search: "
 msgstr "Suchen: "
 
-#: ../src/main/search_dialog.cc:622
+#: ../src/main/search_dialog.cc:704
 msgid "Remove Module?"
 msgstr "Modul entfernen?"
 
-#: ../src/main/search_dialog.cc:623
+#: ../src/main/search_dialog.cc:705
 msgid "Are you sure you want to remove the selected module?"
 msgstr "Wollen Sie das ausgewählte Modul entfernen?"
 
-#: ../src/main/search_dialog.cc:1472
+#: ../src/main/search_dialog.cc:1560
 #, c-format
 msgid ""
 "%s:\n"
@@ -1687,16 +1840,16 @@ msgstr ""
 "Kein solches Module installiert.\n"
 "%s"
 
-#: ../src/main/search_dialog.cc:1474
+#: ../src/main/search_dialog.cc:1562
 msgid "Please adjust the module list."
 msgstr "Bitte die Modulliste anpassen."
 
-#: ../src/main/search_dialog.cc:1490
+#: ../src/main/search_dialog.cc:1578
 #, c-format
 msgid "No fast-search index exists for %s.%s%s"
 msgstr "Es existiert kein Schnellsuch-Index für %s.%s%s"
 
-#: ../src/main/search_dialog.cc:1492
+#: ../src/main/search_dialog.cc:1580
 msgid ""
 "\n"
 "Search on this module is now `multi word'."
@@ -1704,7 +1857,7 @@ msgstr ""
 "\n"
 "Suche auf diesem Modul jetzt `Mehrere Worte'."
 
-#: ../src/main/search_dialog.cc:1493
+#: ../src/main/search_dialog.cc:1581
 msgid ""
 "\n"
 "See the Module Manager, Maintenance pane."
@@ -1712,23 +1865,21 @@ msgstr ""
 "\n"
 "Siehe Modulverwaltung, Pflegeseite."
 
-#: ../src/main/search_dialog.cc:1554
+#: ../src/main/search_dialog.cc:1644
 msgid "Search finished"
 msgstr "Suche beendet"
 
-#: ../src/main/search_sidebar.cc:93
+#: ../src/main/search_sidebar.cc:100
 msgid "matches"
 msgstr "Treffer"
 
-#: ../src/main/settings.c:56
+#: ../src/main/settings.c:60
 msgid ""
 "Welcome to Xiphos.\n"
 "\n"
-"There are no Bible modules installed. In order to initialize, Xiphos needs "
-"you to install at least one Bible.\n"
+"There are no Bible modules installed. In order to initialize, Xiphos needs you to install at least one Bible.\n"
 "\n"
-"With your permission, Xiphos will invoke the Module Manager so that you may "
-"install from Crosswire:\n"
+"With your permission, Xiphos will invoke the Module Manager so that you may install from Crosswire:\n"
 "1. Configure remote install.\n"
 "2. Connect.\n"
 "3. Select a Bible text of your language preference.\n"
@@ -1741,44 +1892,24 @@ msgid ""
 msgstr ""
 "Willkommen zu Xiphos.\n"
 "\n"
-"Es sind keine Bibelmodule installiert. Zum Starten von Xiphos müssen sie "
-"mindestens ein Bibelmodul installieren.\n"
+"Es sind keine Bibelmodule installiert. Zum Starten von Xiphos müssen sie mindestens ein Bibelmodul installieren.\n"
 "\n"
-"Mit ihrer Erlaubnis wird Xiphos die Modulverwaltung starten, so dass sie "
-"direkt von Crosswire installieren können:\n"
+"Mit ihrer Erlaubnis wird Xiphos die Modulverwaltung starten, so dass sie direkt von Crosswire installieren können:\n"
 "1. Ferne Quelle konfigurieren.\n"
 "2. Verbinden.\n"
 "3. Bibel in der gewünschten Sprache auswählen.\n"
 "4. Auf `installieren' drücken.\n"
 "Am Ende den Module Manager schließen.\n"
 "\n"
-"Warnung: Wenn sie in ihrem Land wegen ihrer Religion verfolgt werden "
-"könnten, sollten sie dies mit Vorsicht benutzen.\n"
+"Warnung: Wenn sie in ihrem Land wegen ihrer Religion verfolgt werden könnten, sollten sie dies mit Vorsicht benutzen.\n"
 "\n"
 "Soll Xiphos den Module Manager starten, um ein Bibelmodul zu installieren?"
 
-#: ../src/main/settings.c:109
+#: ../src/main/settings.c:105
 msgid "$HOME is not set!"
 msgstr "$HOME ist nicht gesetzt!"
 
-#: ../src/main/settings.c:124
-msgid "Xiphos has renamed .xiphos-2.0 to .xiphos"
-msgstr "Xiphos hat .xiphos-2.0 in .xiphos umbenannt"
-
-#: ../src/main/settings.c:127
-#, c-format
-msgid ""
-"Xiphos can not rename  .xiphos-2.0 to .xiphos:\n"
-"%s\n"
-"\n"
-"Xiphos cannot continue."
-msgstr ""
-"Xiphos kann .xiphos-2.0 nicht in .xiphos umbenennen:\n"
-"%s\n"
-"\n"
-"Xiphos kann nicht fortfahren."
-
-#: ../src/main/settings.c:135
+#: ../src/main/settings.c:120
 #, c-format
 msgid ""
 "Xiphos can not create  .xiphos:\n"
@@ -1791,12 +1922,13 @@ msgstr ""
 "\n"
 "Xiphos kann nicht fortfahren."
 
-#: ../src/main/settings.c:148 ../src/main/settings.c:156
-#: ../src/main/settings.c:164
+#: ../src/main/settings.c:133
+#: ../src/main/settings.c:142
+#: ../src/main/settings.c:151
 msgid "can not create "
-msgstr "kann nicht erzeugen"
+msgstr "kann nicht erzeugen "
 
-#: ../src/main/settings.c:196
+#: ../src/main/settings.c:194
 msgid ""
 "There are still no Bibles installed.\n"
 "Evidently, you declined to install any.\n"
@@ -1811,11 +1943,11 @@ msgstr ""
 "Ohne Bibel-Module kann Xiphos\n"
 "jedoch nicht fortfahren und wird jetzt beendet."
 
-#: ../src/main/settings.c:200
+#: ../src/main/settings.c:198
 msgid "Bible module installation complete."
 msgstr "Installation der Bibel-Module abgeschlossen."
 
-#: ../src/main/settings.c:203
+#: ../src/main/settings.c:201
 msgid ""
 "Without any Bible modules to display,\n"
 "Xiphos cannot proceed,\n"
@@ -1824,75 +1956,15 @@ msgstr ""
 "Ohne Bibel-Module kann Xiphos\n"
 "jedoch nicht fortfahren und wird jetzt beendet."
 
-#. *****************************************************************************
-#. * Name
-#. *    gconf_setup
-#. *
-#. * Synopsis
-#. *   #include "main/settings.h"
-#. *
-#. *   void gconf_setup()
-#. *
-#. * Description
-#. *   verifies and initializes the GConf subsystem, so that "sword://" and
-#. *   similar can be handled by url-comprehending programs such as browsers.
-#. *   dialogs for permission/success/failure => conditional on debug build.
-#. *
-#. * Return value
-#. *   void
-#.
-#: ../src/main/settings.c:804
-msgid ""
-"URL references using \"sword://\" (similar to web page\n"
-"references) can be used by programs to look up\n"
-"scripture references. Your system currently has no\n"
-"program set to handle these references.\n"
-"\n"
-"Would you like Xiphos to set itself as the\n"
-"program to handle these references?"
-msgstr ""
-"URL Verweise auf \"sword://\" (ähnlich zum Internet)\n"
-"können verwendet werden, um Schrift-Verweise\n"
-"nachzuschlagen. Dein System hat momentan kein\n"
-"Programm definiert, das diese Verweise verarbeitet.\n"
-"\n"
-"Soll Xiphos verwendet werden, um diese Verweise\n"
-"zu verarbeiten?"
-
-#: ../src/main/settings.c:806
-msgid ""
-"Xiphos has successfully set itself\n"
-"as the handler of sword:// and bible:// URLs.\n"
-"\n"
-"You may wish to run the program \"gconf-editor\"\n"
-"to examine keys under /desktop/gnome/url-handlers,\n"
-"if you need to change these."
-msgstr ""
-"Xiphos hat sich erfolgreich als Anwendung\n"
-"für sword:// und bible:// URLs gesetzt.\n"
-"\n"
-"Sie können das Programm \"gconf-editor\"\n"
-"verwenden, um dies unter dem Schlüsselwort\n"
-"/desktop/gnome/url-handlers wieder zu ändern."
-
-#: ../src/main/settings.c:859
-#, c-format
-msgid ""
-"Xiphos failed to complete handler init for key #%d:\n"
-"%s"
-msgstr ""
-"Xiphos konnte den Schlüssel #%d nicht anwenden:\n"
-"%s"
-
-#: ../src/main/sidebar.cc:376
+#: ../src/main/sidebar.cc:399
 msgid "verse"
 msgstr "Vers"
 
-#: ../src/main/sidebar.cc:438
+#: ../src/main/sidebar.cc:461
 msgid "chapter"
 msgstr "Kapitel"
 
-#: ../src/main/sword.cc:546
+#: ../src/main/sword.cc:537
 msgid ""
 "Xiphos's file for language\n"
 "abbreviations is missing."
@@ -1900,7 +1972,7 @@ msgstr ""
 "Xiphoss Datei für\n"
 "Sprachabkürzungen nicht gefunden."
 
-#: ../src/main/sword.cc:553
+#: ../src/main/sword.cc:544
 msgid ""
 "Xiphos's language abbreviation\n"
 "file cannot be opened."
@@ -1908,7 +1980,7 @@ msgstr ""
 "Xiphoss Datei für Sprachabkürzungen\n"
 "konnte nicht geöffnet werden."
 
-#: ../src/main/sword.cc:566
+#: ../src/main/sword.cc:557
 msgid ""
 "Xiphos cannot allocate space\n"
 "for language abbreviations."
@@ -1916,7 +1988,7 @@ msgstr ""
 "Xiphos konnte keinen Speicher für\n"
 "Sprachabkürzungen anlegen."
 
-#: ../src/main/sword.cc:573
+#: ../src/main/sword.cc:564
 msgid ""
 "Xiphos cannot read the\n"
 "language abbreviation file."
@@ -1924,44 +1996,45 @@ msgstr ""
 "Xiphos konnte die Datei für\n"
 "Sprachabkürzungen nicht lesen."
 
-#: ../src/main/sword.cc:1191
-msgid "Daily devotional was requested, but there are none installed."
-msgstr "Es ist keine Tageslosung installiert, die angezeigt werden kann."
+#: ../src/main/sword.cc:642
+msgid "No matching locale found for"
+msgstr "Keine passende Lokalisierung gefunden für"
 
-#: ../src/main/tab_history.c:92
-msgid "H_istory/<Separator>"
-msgstr "Chron_ik/<Separator>"
+#: ../src/main/sword.cc:644
+msgid "Book names and menus may not be translated"
+msgstr "Bücher-Namen und Menüs können nicht übersetzt werden"
 
-#: ../src/main/tab_history.c:94
-msgid "H_istory/C_lear"
-msgstr "_Verlauf/_Leeren"
+#: ../src/main/sword.cc:1232
+msgid "Daily devotional was requested, but there are none installed."
+msgstr "Es ist keine Tageslosung installiert, die angezeigt werden kann."
 
 #: ../src/main/tab_history.c:219
 msgid "Clear History"
 msgstr "Verlauf leeren"
 
-#: ../src/main/url.cc:99
+#: ../src/main/url.cc:101
 msgid "URL not found:"
 msgstr "URL nicht gefunden:"
 
-#: ../src/main/url.cc:194
+#: ../src/main/url.cc:191
 #, c-format
 msgid "Xiphos could not execute %s"
 msgstr "Xiphos konnte %s nicht ausführen"
 
-#: ../src/main/url.cc:202
+#: ../src/main/url.cc:199
 msgid "Viewer error:\n"
 msgstr "Betrachter-Fehler:\n"
 
-#: ../src/main/url.cc:278
+#: ../src/main/url.cc:272
 #, c-format
 msgid "Show %s in main window"
 msgstr "%s in Hauptfenster anzeigen"
 
-#: ../src/main/xml.c:80 ../src/main/xml.c:464
+#: ../src/main/xml.c:80
+#: ../src/main/xml.c:464
 #, c-format
 msgid "Document not created successfully. \n"
-msgstr "Dokument nicht erfolgreich erzeugt.\n"
+msgstr "Dokument nicht erfolgreich erzeugt. \n"
 
 #: ../src/main/xml.c:89
 msgid "Personal"
@@ -1971,15 +2044,18 @@ msgstr "Persönlich"
 msgid "What must I do to be saved?"
 msgstr "Was muss ich tun, um gerettet zu sein?"
 
-#: ../src/main/xml.c:92 ../src/main/xml.c:93
+#: ../src/main/xml.c:92
+#: ../src/main/xml.c:93
 msgid "Acts 16:31"
 msgstr "Apg 16:31"
 
-#: ../src/main/xml.c:97 ../src/main/xml.c:98
+#: ../src/main/xml.c:97
+#: ../src/main/xml.c:98
 msgid "Eph 2:8,9"
 msgstr "Eph 2:8,9"
 
-#: ../src/main/xml.c:102 ../src/main/xml.c:103
+#: ../src/main/xml.c:102
+#: ../src/main/xml.c:103
 msgid "Romans 1:16"
 msgstr "Römer 1:16"
 
@@ -1987,17 +2063,21 @@ msgstr "Römer 1:16"
 msgid "What is the Gospel?"
 msgstr "Was ist die Gute Nachricht?"
 
-#: ../src/main/xml.c:108 ../src/main/xml.c:109
+#: ../src/main/xml.c:108
+#: ../src/main/xml.c:109
 msgid "1 Cor 15:1-4"
 msgstr "1 Kor 15:1-4"
 
-#: ../src/main/xml.c:413 ../src/main/xml.c:1071
+#: ../src/main/xml.c:413
+#: ../src/main/xml.c:1144
 #, c-format
 msgid "Document not parsed successfully. \n"
-msgstr "Dokument nicht erfolgreich eingelesen.\n"
+msgstr "Dokument nicht erfolgreich eingelesen. \n"
 
-#: ../src/main/xml.c:419 ../src/main/xml.c:674 ../src/main/xml.c:952
-#: ../src/main/xml.c:1131
+#: ../src/main/xml.c:419
+#: ../src/main/xml.c:747
+#: ../src/main/xml.c:1025
+#: ../src/main/xml.c:1204
 #, c-format
 msgid "empty document \n"
 msgstr "Leeres Dokument \n"
@@ -2027,7 +2107,8 @@ msgstr "Mt - Offb"
 msgid "Sample Module List"
 msgstr "Beispiel-Modulliste"
 
-#: ../src/main/xml.c:680 ../src/main/xml.c:958
+#: ../src/main/xml.c:753
+#: ../src/main/xml.c:1031
 #, c-format
 msgid "wrong type, root node != %s\n"
 msgstr "falscher Typ, Wurzelknoten != %s\n"
@@ -2036,7 +2117,8 @@ msgstr "falscher Typ, Wurzelknoten != %s\n"
 msgid "Add Bookmark"
 msgstr "Lesezeichen hinzufügen"
 
-#: ../ui/bookmarks.glade.h:2 ../ui/markverse.glade.h:1
+#: ../ui/bookmarks.glade.h:2
+#: ../ui/markverse.glade.h:1
 msgid "Bookmark Dialog"
 msgstr "Lesezeichendialog"
 
@@ -2044,11 +2126,13 @@ msgstr "Lesezeichendialog"
 msgid "Bookmark Folder Treeview"
 msgstr "Lesezeichen Baumansicht"
 
-#: ../ui/bookmarks.glade.h:4 ../ui/markverse.glade.h:2
+#: ../ui/bookmarks.glade.h:4
+#: ../ui/markverse.glade.h:2
 msgid "Cancel Bookmark"
 msgstr "Lesezeichen löschen"
 
-#: ../ui/bookmarks.glade.h:5 ../ui/markverse.glade.h:3
+#: ../ui/bookmarks.glade.h:5
+#: ../ui/markverse.glade.h:3
 msgid "Create new folder"
 msgstr "Neuen Ordner erstellen"
 
@@ -2060,11 +2144,13 @@ msgstr "Beschriftung Eingabe"
 msgid "Label:"
 msgstr "Beschriftung:"
 
-#: ../ui/bookmarks.glade.h:8 ../ui/markverse.glade.h:6
+#: ../ui/bookmarks.glade.h:8
+#: ../ui/markverse.glade.h:6
 msgid "Module Entry"
 msgstr "Modul Eintrag"
 
-#: ../ui/bookmarks.glade.h:9 ../ui/markverse.glade.h:7
+#: ../ui/bookmarks.glade.h:9
+#: ../ui/markverse.glade.h:7
 msgid "Module:"
 msgstr "Modul:"
 
@@ -2072,16 +2158,19 @@ msgstr "Modul:"
 msgid "New ..."
 msgstr "Neu ..."
 
-#: ../ui/bookmarks.glade.h:11 ../ui/markverse.glade.h:8
-#: ../ui/xi-menus.glade.h:42
+#: ../ui/bookmarks.glade.h:11
+#: ../ui/markverse.glade.h:8
+#: ../ui/xi-menus.glade.h:56
 msgid "New Folder"
 msgstr "Neuer Ordner"
 
-#: ../ui/bookmarks.glade.h:12 ../ui/markverse.glade.h:10
+#: ../ui/bookmarks.glade.h:12
+#: ../ui/markverse.glade.h:10
 msgid "Verse Entry"
 msgstr "Verseintrag"
 
-#: ../ui/bookmarks.glade.h:13 ../ui/markverse.glade.h:11
+#: ../ui/bookmarks.glade.h:13
+#: ../ui/markverse.glade.h:11
 msgid "Verse:"
 msgstr "Vers:"
 
@@ -2089,32 +2178,38 @@ msgstr "Vers:"
 msgid "Delete the current note"
 msgstr "Aktuelle Notiz löschen"
 
-#: ../ui/editor_note.xml.h:2 ../ui/editor_studypad.xml.h:4
+#: ../ui/editor_note.xml.h:2
+#: ../ui/editor_studypad.xml.h:4
 #: ../ui/editor.xml.h:2
 msgid "E_xit"
 msgstr "Be_enden"
 
-#: ../ui/editor_note.xml.h:3 ../ui/editor_studypad.xml.h:5
+#: ../ui/editor_note.xml.h:3
+#: ../ui/editor_studypad.xml.h:5
 #: ../ui/editor.xml.h:3
 msgid "Exit"
 msgstr "Beenden"
 
-#: ../ui/editor_note.xml.h:4 ../ui/editor_studypad.xml.h:6
+#: ../ui/editor_note.xml.h:4
+#: ../ui/editor_studypad.xml.h:6
 #: ../ui/editor.xml.h:4
 msgid "Exit the program"
 msgstr "Das Program beenden"
 
-#: ../ui/editor_note.xml.h:5 ../ui/editor_studypad.xml.h:7
+#: ../ui/editor_note.xml.h:5
+#: ../ui/editor_studypad.xml.h:7
 #: ../ui/editor.xml.h:5
 msgid "For_mat"
 msgstr "For_mat"
 
-#: ../ui/editor_note.xml.h:6 ../ui/editor_studypad.xml.h:8
+#: ../ui/editor_note.xml.h:6
+#: ../ui/editor_studypad.xml.h:8
 #: ../ui/editor.xml.h:6
 msgid "HTML Format switch"
 msgstr "HTML Format wechseln"
 
-#: ../ui/editor_note.xml.h:7 ../ui/editor_studypad.xml.h:9
+#: ../ui/editor_note.xml.h:7
+#: ../ui/editor_studypad.xml.h:9
 #: ../ui/editor.xml.h:7
 msgid "HTML mode"
 msgstr "HTML Modus"
@@ -2143,15 +2238,18 @@ msgstr "_Speichern (Persönlicher Kommentar)"
 msgid "Add this file to your bookmarks"
 msgstr "Diese Datei zu den Lesezeichen hinzufügen"
 
-#: ../ui/editor_studypad.xml.h:3 ../ui/editor.xml.h:1
+#: ../ui/editor_studypad.xml.h:3
+#: ../ui/editor.xml.h:1
 msgid "Create a new document"
 msgstr "Neues Dokument erstellen"
 
-#: ../ui/editor_studypad.xml.h:10 ../ui/editor.xml.h:8
+#: ../ui/editor_studypad.xml.h:10
+#: ../ui/editor.xml.h:8
 msgid "New Document"
 msgstr "Neues Dokument"
 
-#: ../ui/editor_studypad.xml.h:11 ../ui/editor.xml.h:9
+#: ../ui/editor_studypad.xml.h:11
+#: ../ui/editor.xml.h:9
 msgid "Open"
 msgstr "Öffnen"
 
@@ -2171,7 +2269,8 @@ msgstr "Dokument drucken"
 msgid "Save AS"
 msgstr "Speichern UNTER"
 
-#: ../ui/editor_studypad.xml.h:18 ../ui/editor.xml.h:12
+#: ../ui/editor_studypad.xml.h:18
+#: ../ui/editor.xml.h:12
 msgid "Save the current file"
 msgstr "Datei speichern"
 
@@ -2199,7 +2298,8 @@ msgstr "<b>Export</b>"
 msgid "<b>Format</b>"
 msgstr "<b>Format</b>"
 
-#: ../ui/export-dialog.glade.h:5 ../ui/prefs.glade.h:25
+#: ../ui/export-dialog.glade.h:5
+#: ../ui/prefs.glade.h:25
 msgid "Book"
 msgstr "Buch"
 
@@ -2211,13 +2311,14 @@ msgstr "Buch Optionsfeld"
 msgid "Chapter Radio Button"
 msgstr "Kapitel Optionsfeld"
 
-#: ../ui/export-dialog.glade.h:9 ../ui/xi-menus.glade.h:14
+#: ../ui/export-dialog.glade.h:9
+#: ../ui/xi-menus.glade.h:18
 msgid "Copy/Export Passage"
 msgstr "Textstelle kopieren/exportieren"
 
 #: ../ui/export-dialog.glade.h:10
 msgid "Export Passage Cancel"
-msgstr "Abbruch Textstelle exportieren "
+msgstr "Abbruch Textstelle exportieren"
 
 #: ../ui/export-dialog.glade.h:11
 msgid "Export Passage OK"
@@ -2313,13 +2414,8 @@ msgid "<b>WARNING:</b> If you live in a persecuted country use with care."
 msgstr "<b>WARNUNG:</b> Vorsicht, wenn es in ihrem Land Verfolgung gibt."
 
 #: ../ui/module-manager.glade.h:8
-msgid ""
-"<b>Warning:</b> If you live in a persecuted country and do not wish to risk "
-"detection you should NOT use  the remote installation feature! "
-msgstr ""
-"<b>Warnung:</b> Wenn sie in ihrem Land wegen ihrer Religion verfolgt werden "
-"könnten und nicht riskieren wollen, entdeckt zu werden, sollten sie KEINE "
-"fernen Quellen verwenden!"
+msgid "<b>Warning:</b> If you live in a persecuted country and do not wish to risk detection you should NOT use  the remote installation feature! "
+msgstr "<b>Warnung:</b> Wenn sie in ihrem Land wegen ihrer Religion verfolgt werden könnten und nicht riskieren wollen, entdeckt zu werden, sollten sie KEINE fernen Quellen verwenden! "
 
 #: ../ui/module-manager.glade.h:9
 msgid "<i>Personal area, for your use only:</i>"
@@ -2329,43 +2425,47 @@ msgstr "<i>Persönlicher Bereich, nur für eigenen Gebrauch:</i>"
 msgid "<i>System area, for all users:</i>"
 msgstr "<i>Systembereich, für alle Benutzer:</i>"
 
-#: ../ui/module-manager.glade.h:11
+#: ../ui/module-manager.glade.h:12
 msgid "Continue"
 msgstr "Fortfahren"
 
-#: ../ui/module-manager.glade.h:12
+#: ../ui/module-manager.glade.h:13
 msgid "Current Remote Sources"
 msgstr "Aktuelle ferne Quellen"
 
-#: ../ui/module-manager.glade.h:13
+#: ../ui/module-manager.glade.h:14
 msgid "Current local sources"
 msgstr "Aktuelle lokale Quellen"
 
-#: ../ui/module-manager.glade.h:14
+#: ../ui/module-manager.glade.h:15
+msgid "Delete Index"
+msgstr "Index löschen"
+
+#: ../ui/module-manager.glade.h:16
 msgid "Home dir"
 msgstr "Heimverzeichnis"
 
-#: ../ui/module-manager.glade.h:16
+#: ../ui/module-manager.glade.h:19
 msgid "Load Standard"
 msgstr "Lade Standard"
 
-#: ../ui/module-manager.glade.h:17
+#: ../ui/module-manager.glade.h:20
 msgid "Local"
 msgstr "Lokal"
 
-#: ../ui/module-manager.glade.h:18
+#: ../ui/module-manager.glade.h:21
 msgid "Local Install Folder"
 msgstr "Lokales Installationsverzeichnis"
 
-#: ../ui/module-manager.glade.h:19
+#: ../ui/module-manager.glade.h:22
 msgid "Module Manager"
 msgstr "Modulverwaltung"
 
-#: ../ui/module-manager.glade.h:20
+#: ../ui/module-manager.glade.h:23
 msgid "Remote"
 msgstr "Fern"
 
-#: ../ui/module-manager.glade.h:21
+#: ../ui/module-manager.glade.h:24
 msgid "Sword sys dir"
 msgstr "Sword Systemverzeichnis"
 
@@ -2462,9 +2562,7 @@ msgid "Apply high-contrast highlight to current verse"
 msgstr "Wende kontrastreiche Hervorhebung auf den aktuellen Vers an"
 
 #: ../ui/prefs.glade.h:19
-msgid ""
-"Automatically resize commentary, book, and dictionary image content to fit "
-"subwindow"
+msgid "Automatically resize commentary, book, and dictionary image content to fit subwindow"
 msgstr "Automatischen Anpassung von Bildern in Kommentar, Buch und Wörterbuch"
 
 #: ../ui/prefs.glade.h:20
@@ -2513,7 +2611,7 @@ msgstr "Ändere Persönliche Notizen Kombinationsfeld"
 
 #: ../ui/prefs.glade.h:32
 msgid "Choose to enable Prayer lists "
-msgstr "Gebetsliste aktivieren"
+msgstr "Gebetsliste aktivieren "
 
 #: ../ui/prefs.glade.h:34
 msgid "Commentaries Checkbox"
@@ -2605,7 +2703,7 @@ msgstr "aktuellen Vers hervorheben"
 
 #: ../ui/prefs.glade.h:57
 msgid "Highlight current verse check box"
-msgstr "Tickbox um aktuellen Vers hervorzuheben "
+msgstr "Tickbox um aktuellen Vers hervorzuheben"
 
 #: ../ui/prefs.glade.h:58
 msgid "Links"
@@ -2704,40 +2802,50 @@ msgid "Show splash screen at start up"
 msgstr "Startbildschirm anzeigen"
 
 #: ../ui/prefs.glade.h:84
+msgid "Special Locale (requires restart)"
+msgstr "Spezielle Lokalisierung (erfordert Neustart)"
+
+#: ../ui/prefs.glade.h:85
+msgid "Special Locale Combo"
+msgstr "Spezielle Lokalisierungskombination"
+
+#: ../ui/prefs.glade.h:86
 msgid "StudyPad default directory combo"
 msgstr "Vorgabeverzeichnis für das Notizbuch Kombinationsfeld"
 
-#: ../ui/prefs.glade.h:86
+#: ../ui/prefs.glade.h:88
 msgid "Use Bible Text scroll bar to scroll to previous or next chapter"
-msgstr ""
-"Bildlaufleiste des Bibeltextes verwenden, um zum vorigen oder nächsten "
-"Kapitel zu springen"
+msgstr "Bildlaufleiste des Bibeltextes verwenden, um zum vorigen oder nächsten Kapitel zu springen"
 
-#: ../ui/prefs.glade.h:87
+#: ../ui/prefs.glade.h:89
 msgid "Use Verse Per Line"
 msgstr "Verwende Vers pro Zeile"
 
-#: ../ui/prefs.glade.h:88
+#: ../ui/prefs.glade.h:90
 msgid "Use Verse Per Line Checkbox"
 msgstr "Verwende Vers pro Zeile Kontrollkästchen"
 
-#: ../ui/prefs.glade.h:89
+#: ../ui/prefs.glade.h:91
 msgid "Use default Dictionary"
 msgstr "Vorgabewörterbuch verwenden"
 
-#: ../ui/prefs.glade.h:90
+#: ../ui/prefs.glade.h:92
 msgid "Use default Dictionary Checkbox"
 msgstr "Vorgabewörterbuch verwenden Kontrollkästchen"
 
-#: ../ui/prefs.glade.h:91
+#: ../ui/prefs.glade.h:93
 msgid "Use tabbed browsing"
 msgstr "Benutze Reiter zur Anzeige"
 
-#: ../ui/prefs.glade.h:92
+#: ../ui/prefs.glade.h:94
 msgid "Use tabbed browsing Checkbox"
 msgstr "Benutze Reiter zur Anzeige Kontrollkästchen"
 
-#: ../ui/prefs.glade.h:93
+#: ../ui/prefs.glade.h:95
+msgid "Verse Number"
+msgstr "Vers Nummer"
+
+#: ../ui/prefs.glade.h:96
 msgid "Verse number size"
 msgstr "Größe der Versnummern"
 
@@ -2918,6 +3026,14 @@ msgid "Exact phrase radiobutton"
 msgstr "Genaue Phrase Optionsfeld"
 
 #: ../ui/search-dialog.glade.h:46
+msgid "Export"
+msgstr "Exportieren"
+
+#: ../ui/search-dialog.glade.h:47
+msgid "Export current search results"
+msgstr "Exportiere aktuelle Suchergebnisse"
+
+#: ../ui/search-dialog.glade.h:48
 msgid ""
 "Fast, featureful, index-based search\n"
 "Indexes must have been built beforehand:\n"
@@ -2927,227 +3043,227 @@ msgstr ""
 "Indexe müssen im Vorhinein erstellt werden:\n"
 "Siehe Pflegefunktion der Modulverwaltung"
 
-#: ../ui/search-dialog.glade.h:49
+#: ../ui/search-dialog.glade.h:51
 msgid "Find Button"
 msgstr "Suchen Knopf"
 
-#: ../ui/search-dialog.glade.h:51
+#: ../ui/search-dialog.glade.h:53
 msgid "Footnotes radiobutton"
 msgstr "Fußnoten Radioknopf"
 
-#: ../ui/search-dialog.glade.h:52
+#: ../ui/search-dialog.glade.h:54
 msgid "In modules that have Footnotes"
 msgstr "In Modulen mit Fußnoten"
 
-#: ../ui/search-dialog.glade.h:53
+#: ../ui/search-dialog.glade.h:55
 msgid "In modules that have Morphological Tags"
 msgstr "In Modulen mit morphologischen Markierungen"
 
-#: ../ui/search-dialog.glade.h:54
+#: ../ui/search-dialog.glade.h:56
 msgid "In modules that have Strong's Numbers"
 msgstr "In Modulen mit Strongs Nummern"
 
-#: ../ui/search-dialog.glade.h:55
+#: ../ui/search-dialog.glade.h:57
 msgid "Main Search Entry"
 msgstr "Hauptsuche Eingabe"
 
-#: ../ui/search-dialog.glade.h:56
+#: ../ui/search-dialog.glade.h:58
 msgid "Make selections on the Attribute Search tab"
 msgstr "Treffe Auswahl im Reiter Attribut-Suche"
 
-#: ../ui/search-dialog.glade.h:58
+#: ../ui/search-dialog.glade.h:60
 msgid "Match case checkbox"
 msgstr "Groß-/Kleinschreibung Kontrollkästchen"
 
-#: ../ui/search-dialog.glade.h:59
+#: ../ui/search-dialog.glade.h:61
 msgid "Module Selection"
 msgstr "Modulauswahl"
 
-#: ../ui/search-dialog.glade.h:60
+#: ../ui/search-dialog.glade.h:62
 msgid "Module list"
 msgstr "Modulliste"
 
-#: ../ui/search-dialog.glade.h:61
+#: ../ui/search-dialog.glade.h:63
 msgid "Module list radiobutton"
 msgstr "Modulliste Optionsfeld"
 
-#: ../ui/search-dialog.glade.h:63
+#: ../ui/search-dialog.glade.h:65
 msgid "Morphological Tags radiobutton"
 msgstr "Morphologische Markierungen Optionsfeld"
 
-#: ../ui/search-dialog.glade.h:65
+#: ../ui/search-dialog.glade.h:67
 msgid "Multi word radiobutton"
 msgstr "Mehrere Worte Optionsfeld"
 
-#: ../ui/search-dialog.glade.h:66
+#: ../ui/search-dialog.glade.h:68
 msgid "New Custom Module List Button"
 msgstr "Neue eigene Modulliste Knopf"
 
-#: ../ui/search-dialog.glade.h:67
+#: ../ui/search-dialog.glade.h:69
 msgid "New Range Button"
 msgstr "Neuer Bereich Knopf"
 
-#: ../ui/search-dialog.glade.h:68
+#: ../ui/search-dialog.glade.h:70
 msgid "Open Selection Dialog Button"
 msgstr "Öffne Auswahldialog Knopf"
 
-#: ../ui/search-dialog.glade.h:69
+#: ../ui/search-dialog.glade.h:71
 msgid "Open a dialog to select modules to add to the list"
 msgstr "Module in einem Dialog zur Liste hinzufügen"
 
-#: ../ui/search-dialog.glade.h:70
+#: ../ui/search-dialog.glade.h:72
 msgid "Optimized (\"Lucene\")"
 msgstr "Optimiert (\"Lucene\")"
 
-#: ../ui/search-dialog.glade.h:71
+#: ../ui/search-dialog.glade.h:73
 msgid "Optimized (\"Lucene\") radiobutton"
 msgstr "Optimiert (\"Lucene\") Optionsfeld"
 
-#: ../ui/search-dialog.glade.h:72
+#: ../ui/search-dialog.glade.h:74
 msgid "Range Definition Entry"
 msgstr "Bereichsdefinition Eintrag"
 
-#: ../ui/search-dialog.glade.h:73
+#: ../ui/search-dialog.glade.h:75
 msgid "Range Name Entry"
 msgstr "Bereichsname Eintrag"
 
-#: ../ui/search-dialog.glade.h:75
+#: ../ui/search-dialog.glade.h:77
 msgid "Regular expression radiobutton"
 msgstr "Regulärer Ausdruck Optionsfeld"
 
-#: ../ui/search-dialog.glade.h:76
+#: ../ui/search-dialog.glade.h:78
 msgid "Remove the selected module from the list"
 msgstr "Ausgewähltes Modul aus der Liste entfernen"
 
-#: ../ui/search-dialog.glade.h:77
+#: ../ui/search-dialog.glade.h:79
 msgid "Result Summary Table"
 msgstr "Ergebniszusammenfassung Tabelle"
 
-#: ../ui/search-dialog.glade.h:78
+#: ../ui/search-dialog.glade.h:80
 msgid "Result Summary Window"
 msgstr "Ergebniszusammenfassung Fenster"
 
-#: ../ui/search-dialog.glade.h:79
+#: ../ui/search-dialog.glade.h:81
 msgid "Results"
 msgstr "Ergebnisse"
 
-#: ../ui/search-dialog.glade.h:80
+#: ../ui/search-dialog.glade.h:82
 msgid "Save Custom Module List Button"
 msgstr "Eigene Modullisten speichern Knopf"
 
-#: ../ui/search-dialog.glade.h:81
+#: ../ui/search-dialog.glade.h:83
 msgid "Save Range Button"
 msgstr "Speichere Bereich Knopf"
 
-#: ../ui/search-dialog.glade.h:82
+#: ../ui/search-dialog.glade.h:84
 msgid "Save custom range"
 msgstr "Eigenen Bereich speichern"
 
-#: ../ui/search-dialog.glade.h:83
+#: ../ui/search-dialog.glade.h:85
 msgid "Save search results as bookmarks"
 msgstr "Suchergebnisse als Lesezeichen speichern"
 
-#: ../ui/search-dialog.glade.h:84
+#: ../ui/search-dialog.glade.h:86
 msgid "Save the module list"
 msgstr "Modulliste speichern"
 
-#: ../ui/search-dialog.glade.h:85
+#: ../ui/search-dialog.glade.h:87
 msgid "Search  Criteria"
 msgstr "Suchkriterien"
 
-#: ../ui/search-dialog.glade.h:86
+#: ../ui/search-dialog.glade.h:88
 msgid "Search Criteria Treeview"
 msgstr "Suchkriterien Baumansicht"
 
-#: ../ui/search-dialog.glade.h:87
+#: ../ui/search-dialog.glade.h:89
 msgid "Search entire module"
 msgstr "Ganzes Module durchsuchen"
 
-#: ../ui/search-dialog.glade.h:88
+#: ../ui/search-dialog.glade.h:90
 msgid "Search for Morphological tags"
 msgstr "Suche nach Morphologische Markierungen"
 
-#: ../ui/search-dialog.glade.h:89
+#: ../ui/search-dialog.glade.h:91
 msgid "Search for Strongs Numbers like G4442 or H1121"
 msgstr "Suche nach Strongs Zahlen mit G4442 oder H1121"
 
-#: ../ui/search-dialog.glade.h:90
+#: ../ui/search-dialog.glade.h:92
 msgid "Search in footnotes"
 msgstr "Suche in Fußnoten"
 
-#: ../ui/search-dialog.glade.h:91
+#: ../ui/search-dialog.glade.h:93
 msgid "Show Footnotes"
 msgstr "Fußnoten anzeigen"
 
-#: ../ui/search-dialog.glade.h:92
+#: ../ui/search-dialog.glade.h:94
 msgid "Show Footnotes checkbox"
 msgstr "Fußnoten anzeigen Kontrollkästchen"
 
-#: ../ui/search-dialog.glade.h:93
+#: ../ui/search-dialog.glade.h:95
 msgid "Show Morphological Tags"
 msgstr "Morphologische Markierungen anzeigen"
 
-#: ../ui/search-dialog.glade.h:94
+#: ../ui/search-dialog.glade.h:96
 msgid "Show Morphological Tags checkbox"
 msgstr "Morphologische Markierungen anzeigen Kontrollkästchen"
 
-#: ../ui/search-dialog.glade.h:95
+#: ../ui/search-dialog.glade.h:97
 msgid "Show Strong's Numbers"
 msgstr "Zeige Strongs Nummern"
 
-#: ../ui/search-dialog.glade.h:96
+#: ../ui/search-dialog.glade.h:98
 msgid "Show Strong's Numbers checkbox"
 msgstr "Zeige Strongs Nummern Tickbox"
 
-#: ../ui/search-dialog.glade.h:97
+#: ../ui/search-dialog.glade.h:99
 msgid "Show in main window"
 msgstr "Im Hauptfenster anzeigen"
 
-#: ../ui/search-dialog.glade.h:98
+#: ../ui/search-dialog.glade.h:100
 msgid "Single module"
 msgstr "Einzelnes Modul"
 
-#: ../ui/search-dialog.glade.h:99
+#: ../ui/search-dialog.glade.h:101
 msgid "Single module radiobutton"
 msgstr "Einzelnes Modul-Radioknopf"
 
-#: ../ui/search-dialog.glade.h:100
+#: ../ui/search-dialog.glade.h:102
 msgid "Start/stop searching"
 msgstr "Starte/Stoppe Suche"
 
-#: ../ui/search-dialog.glade.h:101
+#: ../ui/search-dialog.glade.h:103
 msgid "Strongs Numbers"
 msgstr "Strongs Nummern"
 
-#: ../ui/search-dialog.glade.h:102
+#: ../ui/search-dialog.glade.h:104
 msgid "Strongs Numbers radiobutton"
 msgstr "Strongzahlen Radioknopf"
 
-#: ../ui/search-dialog.glade.h:103
+#: ../ui/search-dialog.glade.h:105
 msgid "Use a custom module list for the search"
 msgstr "Eine eigene Modulliste für die Suche verwenden"
 
-#: ../ui/search-dialog.glade.h:104
+#: ../ui/search-dialog.glade.h:106
 msgid "Use a custom range for the scope of the search"
 msgstr "Eigenen Suchbereich verwenden"
 
-#: ../ui/search-dialog.glade.h:105
+#: ../ui/search-dialog.glade.h:107
 msgid "Use a single module for the search"
 msgstr "Ein einzelnen Modul für die Suche verwenden"
 
-#: ../ui/search-dialog.glade.h:106
+#: ../ui/search-dialog.glade.h:108
 msgid "Use the current module list for the search"
 msgstr "Die derzeitige Modulliste für die Suche verwenden"
 
-#: ../ui/search-dialog.glade.h:107
+#: ../ui/search-dialog.glade.h:109
 msgid "Use the results of the last search as the scope of the search"
 msgstr "Die Ergebnisse der letzten Suche als neuen Suchbereich verwenden"
 
-#: ../ui/search-dialog.glade.h:108
+#: ../ui/search-dialog.glade.h:110
 msgid "e.g. Matt-John;Rev4"
 msgstr "z. B. Mt-Joh;Offb4"
 
-#: ../ui/search-dialog.glade.h:109
+#: ../ui/search-dialog.glade.h:111
 msgid "for "
 msgstr "für "
 
@@ -3160,304 +3276,386 @@ msgid "About _Xiphos"
 msgstr "Info zu _Xiphos"
 
 #: ../ui/xi-menus.glade.h:4
+msgid "Add Item"
+msgstr "Eintrag hinzufügen"
+
+#: ../ui/xi-menus.glade.h:5
+msgid "Add Sub-Item"
+msgstr "Untereintrag hinzufügen"
+
+#: ../ui/xi-menus.glade.h:6
+msgid "Add a sub-item"
+msgstr "Einen Untereintrag hinzufügen"
+
+#: ../ui/xi-menus.glade.h:7
+msgid "Add an item"
+msgstr "Eintrag hinzufügen"
+
+#: ../ui/xi-menus.glade.h:8
 msgid "Add new folder to selected folder"
 msgstr "Neuen Ordner zu ausgewähltem Ordner hinzufügen"
 
-#: ../ui/xi-menus.glade.h:6
+#: ../ui/xi-menus.glade.h:10
 msgid "Allow Reordering"
 msgstr "Umsortierung erlauben"
 
-#: ../ui/xi-menus.glade.h:7
+#: ../ui/xi-menus.glade.h:11
 msgid "Allow items to be moved from one folder to another"
 msgstr "Einträge dürfen in andere Ordner verschoben werden"
 
-#: ../ui/xi-menus.glade.h:8
+#: ../ui/xi-menus.glade.h:12
 msgid "Annotate Verse"
 msgstr "Vers annotieren"
 
-#: ../ui/xi-menus.glade.h:10
+#: ../ui/xi-menus.glade.h:14
 msgid "Browse in BibleMap.org"
 msgstr "Browse in BibleMap.org"
 
-#: ../ui/xi-menus.glade.h:11
+#: ../ui/xi-menus.glade.h:15
 msgid "Collapse All"
 msgstr "Zusammenfalten"
 
-#: ../ui/xi-menus.glade.h:12
+#: ../ui/xi-menus.glade.h:16
 msgid "Collapse all Bookmarks groups"
 msgstr "Alle Lesezeichengruppen zusammenfalten"
 
-#: ../ui/xi-menus.glade.h:13
+#: ../ui/xi-menus.glade.h:17
 msgid "Commentary by Chapter"
 msgstr "Kommentarkapitelansicht"
 
-#: ../ui/xi-menus.glade.h:15
+#: ../ui/xi-menus.glade.h:19
+msgid "Create a new daily journal"
+msgstr "Erzeuge neues Tagebuch"
+
+#: ../ui/xi-menus.glade.h:20
+msgid "Create a new monthly journal"
+msgstr "Erzeuge neues monatliches Tagebuch"
+
+#: ../ui/xi-menus.glade.h:21
+msgid "Create a new outlined topic"
+msgstr "Erzeuge neues untergliedertes Thema"
+
+#: ../ui/xi-menus.glade.h:22
+msgid "Create a new simple prayer list"
+msgstr "Erstelle eine neue einfache Gebetsliste"
+
+#: ../ui/xi-menus.glade.h:23
+msgid "Create a new subject prayer list"
+msgstr "Erstelle eine neue Themen-Gebetsliste"
+
+#: ../ui/xi-menus.glade.h:24
 msgid "D_ouble-Space Text"
 msgstr "D_oppelter Zeilenabstand"
 
-#: ../ui/xi-menus.glade.h:16
+#: ../ui/xi-menus.glade.h:25
+msgid "Daily"
+msgstr "Täglich"
+
+#: ../ui/xi-menus.glade.h:26
 msgid "Delete Item"
 msgstr "Eintrag löschen"
 
-#: ../ui/xi-menus.glade.h:17
+#: ../ui/xi-menus.glade.h:27
 msgid "Delete item"
 msgstr "Eintrag löschen"
 
-#: ../ui/xi-menus.glade.h:18
+#: ../ui/xi-menus.glade.h:28
 msgid "Dictionar_y"
 msgstr "_Wörterbuch"
 
-#: ../ui/xi-menus.glade.h:19
+#: ../ui/xi-menus.glade.h:29
 msgid "Display Book Heading"
 msgstr "Zeige Buchtitel"
 
-#: ../ui/xi-menus.glade.h:20
+#: ../ui/xi-menus.glade.h:30
 msgid "Display Chapter Heading"
 msgstr "Zeige Kapitelüberschrift"
 
-#: ../ui/xi-menus.glade.h:21
+#: ../ui/xi-menus.glade.h:31
 msgid "Dump Pers.Comm."
 msgstr "Pers.Komm. ausgeben"
 
-#: ../ui/xi-menus.glade.h:23
+#: ../ui/xi-menus.glade.h:33
 msgid "Edit bookmark item"
 msgstr "Lesezeichen Eintrag bearbeiten"
 
-#: ../ui/xi-menus.glade.h:24
+#: ../ui/xi-menus.glade.h:34
+msgid "Edit this item"
+msgstr "Diesen Eintrag editieren"
+
+#: ../ui/xi-menus.glade.h:35
 msgid "Expand All"
 msgstr "Ausklappen"
 
-#: ../ui/xi-menus.glade.h:25
+#: ../ui/xi-menus.glade.h:36
 msgid "Expand all Bookmarks groups"
 msgstr "Alle Lesezeichengruppen ausklappen"
 
-#: ../ui/xi-menus.glade.h:32
+#: ../ui/xi-menus.glade.h:37
+msgid "Export Folder"
+msgstr "Ordner exportieren"
+
+#: ../ui/xi-menus.glade.h:38
+msgid "Export List"
+msgstr "Liste exportieren"
+
+#: ../ui/xi-menus.glade.h:45
 msgid "Image Content"
 msgstr "Bildinhalt"
 
-#: ../ui/xi-menus.glade.h:33
+#: ../ui/xi-menus.glade.h:46
 msgid "Import Bibletime Bookmarks"
 msgstr "Importiere Bibletime-Lesezeichen"
 
-#: ../ui/xi-menus.glade.h:34
+#: ../ui/xi-menus.glade.h:47
 msgid "Insert Bookmark"
 msgstr "Lesezeichen einfügen"
 
-#: ../ui/xi-menus.glade.h:35
+#: ../ui/xi-menus.glade.h:48
 msgid "Insert new bookmark here"
 msgstr "Hier neues Lesezeichen einfügen"
 
-#: ../ui/xi-menus.glade.h:36
+#: ../ui/xi-menus.glade.h:49
 msgid "L_ink Tabs"
 msgstr "_Reiter verbinden"
 
-#: ../ui/xi-menus.glade.h:38
+#: ../ui/xi-menus.glade.h:51
 msgid "Load Bookmarks from Bibletime"
 msgstr "Lesezeichen aus Bibletime laden"
 
-#: ../ui/xi-menus.glade.h:39
+#: ../ui/xi-menus.glade.h:52
 msgid "Lookup Selection"
 msgstr "Auswahl nachschlagen"
 
-#: ../ui/xi-menus.glade.h:43
+#: ../ui/xi-menus.glade.h:54
+msgid "Monthly"
+msgstr "Monatlich"
+
+#: ../ui/xi-menus.glade.h:57
 msgid "Note"
 msgstr "Notiz"
 
-#: ../ui/xi-menus.glade.h:44
+#: ../ui/xi-menus.glade.h:58
 msgid "Open Module"
 msgstr "Modul öffnen"
 
-#: ../ui/xi-menus.glade.h:45
+#: ../ui/xi-menus.glade.h:59
 msgid "Open Study_pad"
 msgstr "_Notizbuch öffnen"
 
-#: ../ui/xi-menus.glade.h:46
+#: ../ui/xi-menus.glade.h:60
 msgid "Open in a dialog"
 msgstr "In Dialogfenster öffnen"
 
-#: ../ui/xi-menus.glade.h:48
+#: ../ui/xi-menus.glade.h:61
+msgid "Open in a separate window"
+msgstr "Öffne in separatem Fenster"
+
+#: ../ui/xi-menus.glade.h:62
+msgid "Open in editor"
+msgstr "Im Editor öffnen"
+
+#: ../ui/xi-menus.glade.h:63
 msgid "Open in new tab"
 msgstr "In neuem Reiter öffnen"
 
-#: ../ui/xi-menus.glade.h:49
+#: ../ui/xi-menus.glade.h:64
+msgid ""
+"Open selected module in a\n"
+"\tseparate ['dialog'] window"
+msgstr ""
+"Öffne ausgewähltes Modul in einem\n"
+"\tseparaten ['Dialog'] Fenster"
+
+#: ../ui/xi-menus.glade.h:66
+msgid "Open selected module in a new tab"
+msgstr "Ausgewähltes Modul in neuem Reiter öffnen"
+
+#: ../ui/xi-menus.glade.h:67
 msgid "Open this bookmark in a dialog"
 msgstr "Dieses Lesezeichen in einem Dialogfenster öffnen"
 
-#: ../ui/xi-menus.glade.h:50
+#: ../ui/xi-menus.glade.h:68
 msgid "Open this bookmark in a new tab"
 msgstr "Dieses Lesezeichen in einem Dialogfenster öffnen"
 
-#: ../ui/xi-menus.glade.h:52
+#: ../ui/xi-menus.glade.h:69
+msgid "Outlined"
+msgstr "Skizziert"
+
+#: ../ui/xi-menus.glade.h:71
 msgid "Read Selection Aloud"
 msgstr "Auswahl laut vorlesen"
 
-#: ../ui/xi-menus.glade.h:53
-msgid "Remove - Restore"
-msgstr "Entfernen - Wiederherstellen"
-
-#: ../ui/xi-menus.glade.h:54
-msgid "Remove Folder"
-msgstr "Ordner entfernen"
-
-#: ../ui/xi-menus.glade.h:55
+#: ../ui/xi-menus.glade.h:73
 msgid "Remove folder and save it"
 msgstr "Ordner entfernen und speichern"
 
-#: ../ui/xi-menus.glade.h:56
+#: ../ui/xi-menus.glade.h:74
+msgid "Remove this item"
+msgstr "Diesen Eintrag entfernen"
+
+#: ../ui/xi-menus.glade.h:75
 msgid "Rename Pers.Comm."
 msgstr "Pers.Komm. Umbenennen"
 
-#: ../ui/xi-menus.glade.h:57
+#: ../ui/xi-menus.glade.h:76
 msgid "Respect Font Faces"
 msgstr "Respektiere Schriftarten"
 
-#: ../ui/xi-menus.glade.h:58
+#: ../ui/xi-menus.glade.h:77
 msgid "Restore Folder"
 msgstr "Ordner wiederherstellen"
 
-#: ../ui/xi-menus.glade.h:59
+#: ../ui/xi-menus.glade.h:78
 msgid "Restore saved folder"
 msgstr "Gespeicherte Ordner wiederherstellen"
 
-#: ../ui/xi-menus.glade.h:60
+#: ../ui/xi-menus.glade.h:79
 msgid "Save list as a series of bookmarks"
 msgstr "Liste als eine Reihe von Lesezeichen speichern"
 
-#: ../ui/xi-menus.glade.h:61
+#: ../ui/xi-menus.glade.h:80
 msgid "Save list as a single bookmark"
 msgstr "Liste als einzelnes Lesezeichen speichern"
 
-#: ../ui/xi-menus.glade.h:62
+#: ../ui/xi-menus.glade.h:81
 msgid "Save these results as a series of bookmarks in their own folder"
-msgstr ""
-"Speichere diese Ergebnisse als eine Reihe von Lesezeichen in einen eigenen "
-"Ordner"
+msgstr "Speichere diese Ergebnisse als eine Reihe von Lesezeichen in einen eigenen Ordner"
 
-#: ../ui/xi-menus.glade.h:63
+#: ../ui/xi-menus.glade.h:82
 msgid "Save these results as a single bookmark"
 msgstr "Speichere diese Ergebnisse als ein einzelnes Lesezeichen"
 
-#: ../ui/xi-menus.glade.h:64
+#: ../ui/xi-menus.glade.h:83
 msgid "Scripture Cross-references"
 msgstr "Schrift-Querverweise"
 
-#: ../ui/xi-menus.glade.h:66
+#: ../ui/xi-menus.glade.h:85
 msgid "Show Parallel View in a _Tab"
 msgstr "Parallelansicht in einem _Tab anzeigen"
 
-#: ../ui/xi-menus.glade.h:67
+#: ../ui/xi-menus.glade.h:86
 msgid "Show Previe_wer in the Sidebar"
 msgstr "Zeige Vor_schau in der Seitenleiste"
 
-#: ../ui/xi-menus.glade.h:68
+#: ../ui/xi-menus.glade.h:87
 msgid "Show Verse _Numbers"
 msgstr "Zeige Vers_nummern"
 
-#: ../ui/xi-menus.glade.h:71
+#: ../ui/xi-menus.glade.h:88
+msgid "Simple"
+msgstr "Einfach"
+
+#: ../ui/xi-menus.glade.h:90
+msgid "Subject"
+msgstr "Gegenstand"
+
+#: ../ui/xi-menus.glade.h:92
 msgid "Unlock This Module"
 msgstr "Dieses Modul freigeben"
 
-#: ../ui/xi-menus.glade.h:72
+#: ../ui/xi-menus.glade.h:93
 msgid "Use Current Dictionary"
 msgstr "Aktuelles Wörterbuch benutzen"
 
-#: ../ui/xi-menus.glade.h:73
+#: ../ui/xi-menus.glade.h:94
 msgid "Use module manager to install and remove Sword modules"
 msgstr "Mit der Modulverwaltung Sword Module installieren und deinstallieren"
 
-#: ../ui/xi-menus.glade.h:74
+#: ../ui/xi-menus.glade.h:95
 msgid "Variants"
 msgstr "Varianten"
 
-#: ../ui/xi-menus.glade.h:76
+#: ../ui/xi-menus.glade.h:97
 msgid "_About The SWORD Project"
 msgstr "_Über das SWORD-Projekt"
 
-#: ../ui/xi-menus.glade.h:77
+#: ../ui/xi-menus.glade.h:98
 msgid "_Advanced Search"
 msgstr "_Erweiterte Suche"
 
-#: ../ui/xi-menus.glade.h:78
+#: ../ui/xi-menus.glade.h:99
 msgid "_Attach/Detach Sidebar"
 msgstr "Seitenleiste an_heften/abtrennen"
 
-#: ../ui/xi-menus.glade.h:79
+#: ../ui/xi-menus.glade.h:100
 msgid "_Bible"
 msgstr "_Bibel"
 
-#: ../ui/xi-menus.glade.h:80
+#: ../ui/xi-menus.glade.h:101
 msgid "_Commentary/Book"
 msgstr "_Kommentar/Buch"
 
-#: ../ui/xi-menus.glade.h:81
+#: ../ui/xi-menus.glade.h:102
 msgid "_Contents"
 msgstr "_Inhalte"
 
-#: ../ui/xi-menus.glade.h:82
+#: ../ui/xi-menus.glade.h:103
 msgid "_Daily Devotion"
 msgstr "_Tageslosung"
 
-#: ../ui/xi-menus.glade.h:83
+#: ../ui/xi-menus.glade.h:104
 msgid "_Edit"
 msgstr "_Bearbeiten"
 
-#: ../ui/xi-menus.glade.h:84
+#: ../ui/xi-menus.glade.h:105
 msgid "_Edit Item"
 msgstr "Eintrag _bearbeiten"
 
-#: ../ui/xi-menus.glade.h:86
+#: ../ui/xi-menus.glade.h:107
 msgid "_Help"
 msgstr "_Hilfe"
 
-#: ../ui/xi-menus.glade.h:87
+#: ../ui/xi-menus.glade.h:108
 msgid "_Highlight Current Verse"
 msgstr "Aktuellen Vers _Hervorheben"
 
-#: ../ui/xi-menus.glade.h:88
+#: ../ui/xi-menus.glade.h:109
 msgid "_Live Chat"
 msgstr "_Live-Chat"
 
-#: ../ui/xi-menus.glade.h:89
+#: ../ui/xi-menus.glade.h:110
 msgid "_Mailing List"
 msgstr "_E-Mail Liste"
 
-#: ../ui/xi-menus.glade.h:90
+#: ../ui/xi-menus.glade.h:111
 msgid "_Module Manager"
 msgstr "_Modulverwaltung"
 
-#: ../ui/xi-menus.glade.h:91
+#: ../ui/xi-menus.glade.h:112
 msgid "_Open Session"
 msgstr "Sitzung _öffnen"
 
-#: ../ui/xi-menus.glade.h:92
+#: ../ui/xi-menus.glade.h:113
 msgid "_Preferences"
 msgstr "Einstellungen"
 
-#: ../ui/xi-menus.glade.h:93
+#: ../ui/xi-menus.glade.h:114
 msgid "_Preview"
 msgstr "_Vorschau"
 
-#: ../ui/xi-menus.glade.h:94
+#: ../ui/xi-menus.glade.h:115
 msgid "_Read Aloud"
 msgstr "Laut vor_lesen"
 
-#: ../ui/xi-menus.glade.h:95
+#: ../ui/xi-menus.glade.h:116
 msgid "_Report Bug"
 msgstr "_Programmfehler melden"
 
-#: ../ui/xi-menus.glade.h:96
+#: ../ui/xi-menus.glade.h:117
 msgid "_Save Session"
 msgstr "Sitzung _speichern"
 
-#: ../ui/xi-menus.glade.h:97
+#: ../ui/xi-menus.glade.h:118
 msgid "_Search"
 msgstr "_Suche"
 
-#: ../ui/xi-menus.glade.h:98
-msgid "_Show/Hide Sidebar"
-msgstr "Seitenleiste _anzeigen/verbergen"
+#: ../ui/xi-menus.glade.h:119
+msgid "_Show/Hide Attached Sidebar"
+msgstr "_Zeige/Verstecke angedockte Seitenleiste"
 
-#: ../ui/xi-menus.glade.h:99
+#: ../ui/xi-menus.glade.h:120
 msgid "_Verse Per Line"
 msgstr "_Vers pro Zeile"
 
@@ -3469,295 +3667,264 @@ msgstr "Studiere die Bibel"
 msgid "Xiphos Bible Guide"
 msgstr "Xiphos Bibelleitfaden"
 
+#~ msgid "Xiphos could not execute archiver"
+#~ msgstr "Xiphos konnte den Archivierer nicht ausführen"
+#~ msgid ""
+#~ " archival result:\n"
+#~ "\n"
+#~ msgstr ""
+#~ " Archivierergebnis:\n"
+#~ "\n"
+#~ msgid ""
+#~ "\n"
+#~ "Archive in "
+#~ msgstr ""
+#~ "\n"
+#~ "Archiviere in "
+#~ msgid "Sources"
+#~ msgstr "Quellen"
+#~ msgid "Text"
+#~ msgstr "Text"
+#~ msgid "Text to render"
+#~ msgstr "Text, der dargestellt werden soll"
+#~ msgid "Pixbuf Object"
+#~ msgstr "Pixbuf-Objekt"
+#~ msgid "The pixbuf to render."
+#~ msgstr "Pixbuf, das dargestellt werden soll"
+#~ msgid "Open in a new tab"
+#~ msgstr "In neuem Reiter öffnen"
+#~ msgid "Open selected module in a separate ['dialog'] window"
+#~ msgstr "Ausgewähltes Modul in einem Dialog öffnen"
+#~ msgid "View information about the selected dialog"
+#~ msgstr "Informationen über das ausgewählte Modul anzeigen"
+#~ msgid "Create a new prayer list"
+#~ msgstr "Erstelle eine neue Gebetsliste"
+#~ msgid "Daily Journal"
+#~ msgstr "Tagebuch"
+#~ msgid "Outlined Topic"
+#~ msgstr "Untergliedertes Thema"
+#~ msgid "Open selected module in a dialog"
+#~ msgstr "Ausgewähltes Modul in einem Dialog öffnen"
+#~ msgid "Add Child"
+#~ msgstr "Kind hinzufügen"
+#~ msgid "Add Sibling"
+#~ msgstr "Nachbar hinzufügen"
+#~ msgid "Xiphos has renamed .xiphos-2.0 to .xiphos"
+#~ msgstr "Xiphos hat .xiphos-2.0 in .xiphos umbenannt"
+#~ msgid ""
+#~ "Xiphos can not rename  .xiphos-2.0 to .xiphos:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Xiphos cannot continue."
+#~ msgstr ""
+#~ "Xiphos kann .xiphos-2.0 nicht in .xiphos umbenennen:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Xiphos kann nicht fortfahren."
+#~ msgid "H_istory/<Separator>"
+#~ msgstr "Chron_ik/<Separator>"
+#~ msgid "H_istory/C_lear"
+#~ msgstr "_Verlauf/_Leeren"
+#~ msgid "Remove - Restore"
+#~ msgstr "Entfernen - Wiederherstellen"
+#~ msgid "Remove Folder"
+#~ msgstr "Ordner entfernen"
+#~ msgid "_Show/Hide Sidebar"
+#~ msgstr "Seitenleiste _anzeigen/verbergen"
 #~ msgid "Move backwards through history"
 #~ msgstr "In Verlaufsliste zurück gehen"
-
 #~ msgid "Move foward through history"
 #~ msgstr "In Verlaufsliste vorwärts gehen"
-
 #~ msgid "Select a Book of the Bible"
 #~ msgstr "Wähle ein Buch der Bibel"
-
 #~ msgid "Change Chapter"
 #~ msgstr "Kapitel wechseln"
-
 #~ msgid "Enter a Verse reference in Book 1:1 format and press Return"
 #~ msgstr "Bitte einen Verse im Format 1:1 eingeben und Enter drücken"
-
 #~ msgid "Dictionary/_Lexicon"
 #~ msgstr "Wörterbücher/_Lexika"
-
 #~ msgid "_Bible Text"
 #~ msgstr "_Bibeltext"
-
 #~ msgid "Open StudyPad File"
 #~ msgstr "Notizbuch-Datei öffnen"
-
 #~ msgid "Save StudyPad File"
 #~ msgstr "Notizbuch-Datei speichern"
-
 #~ msgid "There is no About for that line."
 #~ msgstr "Für diese Zeile gibt es keine Info."
-
 #~ msgid "Print"
 #~ msgstr "Drucken"
-
 #~ msgid "Print Preview"
 #~ msgstr "Druckvorschau"
-
 #~ msgid "Failed to print the document"
 #~ msgstr "Druck fehlgeschlagen"
-
 #~ msgid "has been modified. Do you wish to save it?"
 #~ msgstr "wurde geändert. Möchten Sie diese speichern?"
-
 #~ msgid "not loaded"
 #~ msgstr "nicht geladen"
-
 #~ msgid "1 Cor 15:1"
 #~ msgstr "1 Kor 15:1"
-
-#~ msgid "Delete Index"
-#~ msgstr "Index löschen"
-
 #~ msgid "Save List"
 #~ msgstr "Liste speichern"
-
 #~ msgid "_Modules"
 #~ msgstr "_Module"
-
 #~ msgid "_Bookmarks"
 #~ msgstr "_Lesezeichen"
-
 #~ msgid "Verse _List"
 #~ msgstr "_Versliste"
-
 #~ msgid "Name for new prayer list"
 #~ msgstr "Name für die neue Gebetsliste"
-
 #~ msgid "can not create path\n"
 #~ msgstr "kann Pfad nicht erzeugen\n"
-
 #~ msgid "Prayer list already exist\n"
 #~ msgstr "Gebetsliste existiert bereits\n"
-
 #~ msgid "\\par\\par My prayer list \\par\\par Module created in Xiphos"
 #~ msgstr "\\par\\par Meine Gebetsliste \\par\\par Modul erzeugt in Xiphos"
-
 #~ msgid "Bible Text"
 #~ msgstr "Bibeltext"
-
 #~ msgid "item1"
 #~ msgstr "Eintrag1"
-
 #~ msgid "item2"
 #~ msgstr "Eintrag2"
-
 #~ msgid "_Module Options"
 #~ msgstr "_Moduloptionen"
-
 #~ msgid "Sync with main"
 #~ msgstr "Mit Hauptfenster synchronisieren"
-
 #~ msgid "Stay in sync"
 #~ msgstr "Synchronisiert bleiben"
-
 #~ msgid "Open the StudyPad editor"
 #~ msgstr "Notizbuch-Editor öffnen"
-
 #~ msgid "Open a saved session"
 #~ msgstr "Gespeicherte Sitzung öffnen"
-
 #~ msgid "Save the current session to a file"
 #~ msgstr "Aktuelle Sitzung in Datei speichern"
-
 #~ msgid "_Copy"
 #~ msgstr "_Kopieren"
-
 #~ msgid "Copy highlighted text from main window"
 #~ msgstr "Ausgewählten Text des Hauptfensters kopieren"
-
 #~ msgid "Search using the shortcut bar"
 #~ msgstr "In der Verknüpfungsleiste suchen"
-
 #~ msgid "Advanced search using the search dialog"
 #~ msgstr "Erweiterte Suche mit dem Suchdialog"
-
 #~ msgid "Set user preferences"
 #~ msgstr "Benutzervorlieben festlegen"
-
 #~ msgid "C_lear"
 #~ msgstr "_Leeren"
-
 #~ msgid "Clear history list"
 #~ msgstr "Verlauf leeren"
-
 #~ msgid "Show the Daily Devotion for today"
 #~ msgstr "Die heutige Tageslosung anzeigen"
-
 #~ msgid "Show or hide Bible texts window"
 #~ msgstr "Bibeltext-Fenster anzeigen oder verbergen"
-
 #~ msgid "Show or hide Preview window"
 #~ msgstr "Vorschau-Fenster anzeigen oder verbergen"
-
 #~ msgid "Show or hide commentaries"
 #~ msgstr "Kommentare anzeigen oder verbergen"
-
 #~ msgid "Show or hide - dictionaries and lexicons"
 #~ msgstr ""
 #~ "Unteren Arbeitsbereich anzeigen oder verbergen - Wörterbücher und andere "
 #~ "Texte"
-
 #~ msgid "Open the Xiphos manual"
 #~ msgstr "Xiphos-Handbuch öffnen"
-
 #~ msgid "Sign up for the users' mailing list"
 #~ msgstr "anmelden für die Benutzer Mailing-Liste"
-
 #~ msgid "Chat with other users and developers"
 #~ msgstr "Unterhalte dich mit anderen Benutzern und Entwicklern"
-
 #~ msgid "Report bug to SourceForge"
 #~ msgstr "Programmfehler an Sourceforge melden"
-
 #~ msgid "Translating Xiphos to other languages"
 #~ msgstr "Übersetze Xiphos in andere Sprachen"
-
 #~ msgid "More information about the SWORD Project"
 #~ msgstr "Mehr Informationen zum SWORD-Projekt anzeigen"
-
 #~ msgid "About this application"
 #~ msgstr "Info zu Xiphos"
-
 #~ msgid "Hi_story"
 #~ msgstr "_Chronik"
-
 #~ msgid "%s not found"
 #~ msgstr "%s nicht gefunden"
-
 #~ msgid "+5"
 #~ msgstr "+5"
-
 #~ msgid "+4"
 #~ msgstr "+4"
-
 #~ msgid "+3"
 #~ msgstr "+3"
-
 #~ msgid "+2"
 #~ msgstr "+2"
-
 #~ msgid "+1"
 #~ msgstr "+1"
-
 #~ msgid "-1"
 #~ msgstr "-1"
-
 #~ msgid "-2"
 #~ msgstr "-2"
-
 #~ msgid "-3"
 #~ msgstr "-3"
-
 #~ msgid "Starting"
 #~ msgstr "Starte"
-
 #~ msgid "Building Xiphos interface"
 #~ msgstr "Erstelle GnomeSwort Schnittstelle"
-
 #~ msgid "Initiating Xiphos"
 #~ msgstr "Starte Xiphos"
-
 #~ msgid "done"
 #~ msgstr "erledigt"
-
 #~ msgid "Xiphos is shutdown"
 #~ msgstr "Xiphos ist heruntergefahren"
-
 #~ msgid "Initiating SWORD"
 #~ msgstr "SWORD initiieren"
-
 #~ msgid "path to sword"
 #~ msgstr "Pfad zu sword"
-
 #~ msgid "System locale is"
 #~ msgstr "System locale ist"
-
 #~ msgid "SWORD locale is"
 #~ msgstr "SWORD locale ist"
-
 #~ msgid "Checking for SWORD Modules"
 #~ msgstr "Nach SWORD-Modulen suchen"
-
 #~ msgid "SWORD is shutdown"
 #~ msgstr "SWORD ist heruntergefahren"
-
 #~ msgid "Number of Text modules"
 #~ msgstr "Anzahl der Text-Module"
-
 #~ msgid "Number of Commentary modules"
 #~ msgstr "Anzahl der Kommantar-Module"
-
 #~ msgid "Number of Dict/lex modules"
 #~ msgstr "Anzahl der Wörterbuch/Lexikon-Module"
-
 #~ msgid "Number of Book modules"
 #~ msgstr "Anzahl der Bücher-Module"
-
 #~ msgid "Number of Percomm modules"
 #~ msgstr "Anzahl der PerKomm-Module"
-
 #~ msgid "Number of Devotion modules"
 #~ msgstr "Anzahl der Losung-Module"
-
 #~ msgid "Number of Prayer modules"
 #~ msgstr "Anzahl der Gebets-Module"
-
 #~ msgid ""
 #~ "\n"
 #~ "First Run: need to create settings!\n"
 #~ msgstr ""
 #~ "\n"
 #~ "Erster Start: Einstellungen müssen erzeugt werden!\n"
-
 #~ msgid "can not create  .sword"
 #~ msgstr "konnte .sword nicht erzeugen"
-
 #~ msgid "can not create  .sword/mods.d"
 #~ msgstr "konnte .sword/mods.d nicht erzeugen"
-
 #~ msgid "can not create  .sword/modules"
 #~ msgstr "konnte .sword/modules nicht erzeugen"
-
 #~ msgid "Select Local Source"
 #~ msgstr "Lokale Quelle Auswählen"
-
 #~ msgid "It will be lost permanently!"
 #~ msgstr "Es wird für immer verloren gehen!"
-
 #~ msgid "Open file..."
 #~ msgstr "Datei öffnen..."
-
 #~ msgid "Save file as..."
 #~ msgstr "Speichern unter..."
-
 #~ msgid "Open in dialog"
 #~ msgstr "In Dialog öffnen"
-
 #~ msgid ""
 #~ "For multi-word search, use\n"
 #~ "+FirstWord +SecondWord"
 #~ msgstr ""
 #~ "Für Mehr-Wort-Suche, benutze\n"
 #~ "+ErstesWort +ZweitesWort"
-
 #~ msgid "_About the SWORD Project ..."
 #~ msgstr "Info zum _SWORD-Projekt..."
-
 #~ msgid "Select the modules you want"
 #~ msgstr "Wähle die Module aus"
-
 #~ msgid ""
 #~ "There is currently no program set as your\n"
 #~ "handler for \"sword://\" and similar URLs.\n"
@@ -3768,652 +3935,418 @@ msgstr "Xiphos Bibelleitfaden"
 #~ "für \"sword://\" und ähnliche URLs definiert.\n"
 #~ "Möchten sie, dass Xiphos sich selbst als\n"
 #~ "Anwendung für diese URLs einrichtet?"
-
 #~ msgid "<b>Font Miscellaneous</b>"
 #~ msgstr "<b>Schriften Allgemein</b>"
-
 #~ msgid "Bible text"
 #~ msgstr "Bibeltext"
-
 #~ msgid "Afrikaans"
 #~ msgstr "Afrikaans"
-
 #~ msgid "English, Old (ca.450-1100)"
 #~ msgstr "Englisch, Alt (ca. 450-1100)"
-
 #~ msgid "Arabic"
 #~ msgstr "Arabisch"
-
 #~ msgid "Azerbaijani"
 #~ msgstr "Aserbeidschanisch"
-
 #~ msgid "Belarusian"
 #~ msgstr "Weißrussisch"
-
 #~ msgid "Bulgarian"
 #~ msgstr "Bulgarisch"
-
 #~ msgid "Breton"
 #~ msgstr "Bretonisch"
-
 #~ msgid "Bosnian"
 #~ msgstr "Bosnisch"
-
 #~ msgid "Catalan"
 #~ msgstr "Katalanisch"
-
 #~ msgid "Coptic"
 #~ msgstr "Koptisch"
-
 #~ msgid "Czech"
 #~ msgstr "Tschechisch"
-
 #~ msgid "Church Slavic"
 #~ msgstr "Kirchenslawisch"
-
 #~ msgid "Welsh"
 #~ msgstr "Walisisch"
-
 #~ msgid "Danish"
 #~ msgstr "Dänisch"
-
 #~ msgid "German"
 #~ msgstr "Deutsch"
-
 #~ msgid "Greek, Modern (1453-)"
 #~ msgstr "Griechisch, Modern (1453-)"
-
 #~ msgid "English"
 #~ msgstr "Englisch"
-
 #~ msgid "American English"
 #~ msgstr "Amerikanisches Englisch"
-
 #~ msgid "English, Middle (1100-1500)"
 #~ msgstr "Englisch, Mittel (1100-1500)"
-
 #~ msgid "Esperanto"
 #~ msgstr "Esperanto"
-
 #~ msgid "Spanish"
 #~ msgstr "Spanisch"
-
 #~ msgid "Estonian"
 #~ msgstr "Estnisch"
-
 #~ msgid "Basque"
 #~ msgstr "Baskisch"
-
 #~ msgid "Finnish"
 #~ msgstr "Finnisch"
-
 #~ msgid "French"
 #~ msgstr "Französisch"
-
 #~ msgid "Frisian"
 #~ msgstr "Friesisch"
-
 #~ msgid "Irish"
 #~ msgstr "Irisch"
-
 #~ msgid "Gaelic (Scots)"
 #~ msgstr "Gälisch (Schotten)"
-
 #~ msgid "Manx"
 #~ msgstr "Gälisch der Isle of Man"
-
 #~ msgid "Greek, Ancient (to 1453)"
 #~ msgstr "Griechisch, Alt (bis 1453)"
-
 #~ msgid "Hebrew"
 #~ msgstr "Hebräisch"
-
 #~ msgid "Hawaiian"
 #~ msgstr "Hawaiisch"
-
 #~ msgid "Croatian"
 #~ msgstr "Kroatisch"
-
 #~ msgid "Hungarian"
 #~ msgstr "Ungarisch"
-
 #~ msgid "Armenian"
 #~ msgstr "Armenisch"
-
 #~ msgid "Klingon"
 #~ msgstr "Klingonisch"
-
 #~ msgid "Indonesian"
 #~ msgstr "Indonesisch"
-
 #~ msgid "Icelandic"
 #~ msgstr "Isländisch"
-
 #~ msgid "Italian"
 #~ msgstr "Italienisch"
-
 #~ msgid "Japanese"
 #~ msgstr "Japanisch"
-
 #~ msgid "Georgian"
 #~ msgstr "Georgisch"
-
 #~ msgid "Korean"
 #~ msgstr "Koreanisch"
-
 #~ msgid "Kurdish"
 #~ msgstr "Kurdisch"
-
 #~ msgid "Kirghiz"
 #~ msgstr "Kirgisisch"
-
 #~ msgid "Latin"
 #~ msgstr "Latein"
-
 #~ msgid "Lithuanian"
 #~ msgstr "Litauisch"
-
 #~ msgid "Latvian"
 #~ msgstr "Lettisch"
-
 #~ msgid "Maori"
 #~ msgstr "Maorisch"
-
 #~ msgid "Macedonian"
 #~ msgstr "Mazedonisch"
-
 #~ msgid "Maltese"
 #~ msgstr "Maltesisch"
-
 #~ msgid "Low German; Low Saxon"
 #~ msgstr "Plattdeutsch; Niederdeutsch"
-
 #~ msgid "Dutch"
 #~ msgstr "Holländisch"
-
 #~ msgid "Norwegian"
 #~ msgstr "Norwegisch"
-
 #~ msgid "Polish"
 #~ msgstr "Polnisch"
-
 #~ msgid "Portuguese"
 #~ msgstr "Portugiesisch"
-
 #~ msgid "Romanian"
 #~ msgstr "Rumänisch"
-
 #~ msgid "Russian"
 #~ msgstr "Russisch"
-
 #~ msgid "Scots"
 #~ msgstr "Schottisch"
-
 #~ msgid "Slovak"
 #~ msgstr "Slowakisch"
-
 #~ msgid "Slovenian"
 #~ msgstr "Slowenisch"
-
 #~ msgid "Somali"
 #~ msgstr "Somalisch"
-
 #~ msgid "Albanian"
 #~ msgstr "Albanisch"
-
 #~ msgid "Swedish"
 #~ msgstr "Schwedisch"
-
 #~ msgid "Swahili"
 #~ msgstr "Suaheli"
-
 #~ msgid "Syriac"
 #~ msgstr "Syrisch"
-
 #~ msgid "Tamil"
 #~ msgstr "Tamilisch"
-
 #~ msgid "Thai"
 #~ msgstr "Thailändisch"
-
 #~ msgid "Turkish"
 #~ msgstr "Türkisch"
-
 #~ msgid "Tahitian"
 #~ msgstr "Tahitianisch"
-
 #~ msgid "Ukrainian"
 #~ msgstr "Ukrainisch"
-
 #~ msgid "Vietnamese"
 #~ msgstr "Vietnamesisch"
-
 #~ msgid "Bavarian"
 #~ msgstr "Bayerisch"
-
 #~ msgid "Alemannisch"
 #~ msgstr "Alemannisch"
-
 #~ msgid "Haitian Creole French"
 #~ msgstr "Haitisch Kreolisch Französisch"
-
 #~ msgid "Lombard"
 #~ msgstr "Lombardisch"
-
 #~ msgid "Chinese"
 #~ msgstr "Chinesisch"
-
 #~ msgid "found in"
-#~ msgstr "gefunden in "
-
+#~ msgstr "gefunden in"
 #~ msgid "The"
 #~ msgstr "Das"
-
 #~ msgid "module is locked."
 #~ msgstr "Modul ist gesperrt."
-
 #~ msgid "module has been unlocked."
 #~ msgstr "Modul wurde freigeschaltet."
-
 #~ msgid "If you have the cipher key you can"
 #~ msgstr "Wenn Sie den Chiffrierschlüssel haben, können Sie"
-
 #~ msgid "click here"
 #~ msgstr "Hier klicken"
-
 #~ msgid "to unlock the module"
 #~ msgstr "um das Modul freizuschalten"
-
 #~ msgid "You will need to restart Xiphos after you unlock it."
 #~ msgstr "Sie müssen Xiphos neu starten, nachdem Sie es freigegeben haben."
-
 #~ msgid "You need to restart Xiphos to view it"
 #~ msgstr "Sie müssen Xiphos neu starten, um es anzuzeigen."
-
 #~ msgid ""
 #~ "Unlink of old configuration failed:\n"
 #~ "%s"
 #~ msgstr ""
 #~ "Trennen der alten Konfiguration fehlgeschlagen:\n"
 #~ "%s"
-
 #~ msgid "Show Tabs"
 #~ msgstr "Reiter anzeigen"
-
 #~ msgid "Go to %s"
 #~ msgstr "Gehe zu %s"
-
 #~ msgid "The Setup Druid was cancelled."
 #~ msgstr "Der Setup-Druide wurde abgebrochen"
-
 #~ msgid "Do you wish to set preferences now?"
 #~ msgstr "Möchten Sie ihre Einstellungen jetzt festlegen?"
-
 #~ msgid "Old"
 #~ msgstr "Alt"
-
-#~ msgid "New"
-#~ msgstr "Neu"
-
 #~ msgid "Remove/Archive"
 #~ msgstr "Entfernen/Archivieren"
-
 #~ msgid "URL:"
 #~ msgstr "Adresse:"
-
 #~ msgid "Go to parent"
 #~ msgstr "Gehe zu Vorgänger"
-
-#, fuzzy
-#~ msgid "Go to first child"
-#~ msgstr "Gehe zu erstem Eintrag"
-
 #~ msgid "Save using the PersistStream interface"
 #~ msgstr "Mit Hilfe von PersistStream speichern"
-
 #~ msgid "Open (PersistFile)"
 #~ msgstr "Öffnen (PersistFile)"
-
 #~ msgid "Open using the PersistFile interface"
 #~ msgstr "Mit Hilfe von PersistFile öffnen"
-
 #~ msgid "Save (PersistFile)"
 #~ msgstr "Speicher (PersistFile)"
-
 #~ msgid "Save using the PersistFile interface"
 #~ msgstr "Mit Hilfe von PersistFile speichern"
-
 #~ msgid "Remove failed"
 #~ msgstr "Entfernung fehlgeschlagen"
-
 #~ msgid "-untitled-"
 #~ msgstr "-Ohne Titel-"
-
 #~ msgid "Add reference Link"
 #~ msgstr "Referenz-Verweise hinzufügen"
-
 #~ msgid "Link text: "
-#~ msgstr "Verweistext:"
-
-#~ msgid "Export"
-#~ msgstr "Exportieren"
-
+#~ msgstr "Verweistext: "
 #~ msgid "Cut"
 #~ msgstr "Ausschneiden"
-
 #~ msgid "Paste"
 #~ msgstr "Einfügen"
-
 #~ msgid "Spell Check"
 #~ msgstr "Rechtschreibprüfung"
-
 #~ msgid "Undo"
 #~ msgstr "Rückgängig"
-
 #~ msgid "Replace"
 #~ msgstr "E_rsetzen"
-
 #~ msgid "Link..."
 #~ msgstr "Verweis..."
-
 #~ msgid "Properties"
 #~ msgstr "Eigenschaften"
-
 #~ msgid "Link"
 #~ msgstr "Verweis"
-
 #~ msgid "Paragraph"
 #~ msgstr "Absatz"
-
 #~ msgid "Page"
 #~ msgstr "Seite"
-
 #~ msgid "Rule"
 #~ msgstr "Regel"
-
 #~ msgid "Table"
 #~ msgstr "Tabelle"
-
 #~ msgid "Cell"
 #~ msgstr "Zelle"
-
-#~ msgid "Insert Link"
-#~ msgstr "Verweis einfügen"
-
 #~ msgid "Remove Link"
 #~ msgstr "Verweis entfernen"
-
 #~ msgid "Style"
 #~ msgstr "_Versstil"
-
 #~ msgid "Text Style..."
 #~ msgstr "Textstil..."
-
 #~ msgid "Paragraph Style..."
 #~ msgstr "Absatzstil..."
-
 #~ msgid "Link Style..."
 #~ msgstr "Verweisstil..."
-
 #~ msgid "Rule Style..."
 #~ msgstr "Regelstil..."
-
 #~ msgid "Image Style..."
 #~ msgstr "Bildstil..."
-
 #~ msgid "Cell Style..."
 #~ msgstr "Zellstil..."
-
 #~ msgid "Table Style..."
 #~ msgstr "Tabellenstil..."
-
 #~ msgid "Page Style..."
 #~ msgstr "Seitenstil..."
-
-#, fuzzy
-#~ msgid "Table insert"
-#~ msgstr "Tabelle einfügen"
-
 #~ msgid "Row above"
 #~ msgstr "Zeile über"
-
 #~ msgid "Row below"
 #~ msgstr "Zeile unter"
-
 #~ msgid "Column before"
 #~ msgstr "Spalte davor"
-
 #~ msgid "Column after"
 #~ msgstr "Spalte dahinter"
-
 #~ msgid "Table delete"
 #~ msgstr "Tabelle löschen"
-
 #~ msgid "Row"
 #~ msgstr "Zeile"
-
 #~ msgid "Column"
 #~ msgstr "Spalte"
-
 #~ msgid "Cell contents"
 #~ msgstr "Zell_inhalt"
-
 #~ msgid "Check Word Spelling..."
 #~ msgstr "Rechtschreibung prüfen..."
-
 #~ msgid "Add Word to"
 #~ msgstr "Wort hinzufügen zu"
-
 #~ msgid "%s Dictionary"
 #~ msgstr "%s Wörterbuch"
-
 #~ msgid "Add Word to Dictionary"
 #~ msgstr "Wort zu Wörterbuch hinzufügen"
-
 #~ msgid "Ignore Misspelled Word"
 #~ msgstr "Falsch geschriebenes Wort ignorieren"
-
 #~ msgid "Input Methods"
 #~ msgstr "Eingabemethoden"
-
 #~ msgid "Replace confirmation"
 #~ msgstr "Ersetzung bestätigen"
-
 #~ msgid "Replace _All"
 #~ msgstr "_Alle ersetzen"
-
 #~ msgid "_Next"
 #~ msgstr "_Nächstes"
-
 #~ msgid "_Replace"
 #~ msgstr "E_rsetzen"
-
-#, fuzzy
-#~ msgid "Search _backward"
-#~ msgstr "Rückwärts suchen"
-
 #~ msgid "Case _sensitive"
 #~ msgstr "Groß- und Kleinschreibung beachten"
-
 #~ msgid "Replace:"
 #~ msgstr "Ersetzen:"
-
 #~ msgid "With:"
 #~ msgstr "mit:"
-
-#, fuzzy
-#~ msgid "_Backward"
-#~ msgstr "Zurück"
-
 #~ msgid "_Regular Expression"
 #~ msgstr "_Regulärer Ausdruck"
-
 #~ msgid "No misspelled word found"
 #~ msgstr "Keine Rechtschreibfehler gefunden"
-
 #~ msgid "Spell checker"
 #~ msgstr "Rechtschreibprüfung"
-
 #~ msgid "Current _Languages"
 #~ msgstr "Aktue_lle Sprache"
-
 #~ msgid "Insert"
 #~ msgstr "Einfügen"
-
 #~ msgid "Delete Note?"
 #~ msgstr "Notiz löschen?"
-
 #~ msgid "Create a new file"
 #~ msgstr "Neue Datei erstellen"
-
 #~ msgid "Delete note"
 #~ msgstr "Notiz löschen"
-
 #~ msgid "Print window contents"
 #~ msgstr "Drucken"
-
 #~ msgid "Find in this note"
 #~ msgstr "In dieser Notiz suchen"
-
 #~ msgid "Find and Replace"
 #~ msgstr "Suchen und Ersetzen"
-
 #~ msgid "Insert image at cursor"
 #~ msgstr "Bild bei Cursor einfügen"
-
 #~ msgid "Insert link"
 #~ msgstr "Lesezeichen einfügen"
-
 #~ msgid "Insert link at cursor"
 #~ msgstr "Lesezeichen bei Cursor einfügen"
-
 #~ msgid "Insert rule"
 #~ msgstr "Regel einfügen"
-
 #~ msgid "Insert rule at cursor"
 #~ msgstr "Regel bei Cursor einfügen"
-
 #~ msgid "Insert table"
 #~ msgstr "Tabelle einfügen"
-
 #~ msgid "Insert table at cursor"
 #~ msgstr "Tabelle bei Cursor einfügen"
-
 #~ msgid "Check spelling in this note"
 #~ msgstr "Rechtschreibung in dieser Notiz prüfen"
-
 #~ msgid "Normal"
 #~ msgstr "Normal"
-
 #~ msgid "Preformat"
 #~ msgstr "Vorformatiert"
-
-#, fuzzy
-#~ msgid "Bulleted List"
-#~ msgstr "Liste"
-
 #~ msgid "Numbered List"
 #~ msgstr "Nummerierte Liste"
-
 #~ msgid "Alphabetical List"
 #~ msgstr "Alphabetische Liste"
-
 #~ msgid "Header 1"
 #~ msgstr "Überschrift 1"
-
 #~ msgid "Header 2"
 #~ msgstr "Überschrift 2"
-
 #~ msgid "Header 3"
 #~ msgstr "Überschrift 3"
-
 #~ msgid "Header 4"
 #~ msgstr "Überschrift 4"
-
 #~ msgid "Header 5"
 #~ msgstr "Überschrift 5"
-
 #~ msgid "Header 6"
 #~ msgstr "Überschrift 6"
-
 #~ msgid "Address"
 #~ msgstr "Adresse"
-
 #~ msgid "Automatic"
 #~ msgstr "Automatisch"
-
 #~ msgid "Left align"
 #~ msgstr "Linksbündig"
-
 #~ msgid "Left justifies the paragraphs"
 #~ msgstr "Linksbündig mit Absätzen"
-
 #~ msgid "Center"
 #~ msgstr "Zentrieren"
-
 #~ msgid "Center justifies the paragraphs"
 #~ msgstr "Zentrieren mit Absätzen"
-
 #~ msgid "Right align"
 #~ msgstr "Rechtsbündig"
-
 #~ msgid "Right justifies the paragraphs"
 #~ msgstr "Rechtsbündig mit Absätzen"
-
 #~ msgid "Typewriter"
 #~ msgstr "Schreibmaschinenschrift"
-
 #~ msgid "Toggle typewriter font style"
 #~ msgstr "Schreibmaschinenschrift ein/aus"
-
 #~ msgid "Bold"
 #~ msgstr "Fett"
-
 #~ msgid "Makes the text bold"
 #~ msgstr "Macht die Schrift fett"
-
 #~ msgid "Italic"
 #~ msgstr "Kursiv"
-
 #~ msgid "Makes the text italic"
 #~ msgstr "Macht die Schrift kursiv"
-
 #~ msgid "Underline"
 #~ msgstr "Unterstreichen"
-
 #~ msgid "Underlines the text"
 #~ msgstr "Unterstreicht den Text"
-
 #~ msgid "Strikeout"
 #~ msgstr "Durchstreichen"
-
 #~ msgid "Strikes out the text"
 #~ msgstr "Streicht den Text durch"
-
 #~ msgid "Unindent"
 #~ msgstr "Einzug verringern"
-
 #~ msgid "Indents the paragraphs less"
 #~ msgstr "Einzug der Absätze verringern"
-
 #~ msgid "Indents the paragraphs more"
 #~ msgstr "Einzug der Absätze erhöhen"
-
 #~ msgid "Save Note"
 #~ msgstr "Notiz speichern"
-
 #~ msgid "Delete Note"
 #~ msgstr "Notiz löschen"
-
 #~ msgid "Genesis"
 #~ msgstr "Genesis"
-
 #~ msgid "Setup"
 #~ msgstr "Einrichtung"
-
 #~ msgid "Xiphos Configuration - Page 1 of 5"
 #~ msgstr "Xiphos Konfiguration - Seite 1 von 5"
-
 #~ msgid ""
 #~ "Since this is the first time you have run Xiphos, this assistant will "
 #~ "guide you through the initial setup by asking a few simple questions.\n"
@@ -4428,84 +4361,60 @@ msgstr "Xiphos Bibelleitfaden"
 #~ "Nachdem sie die folgenden Schritte durchgeführt haben, können diese "
 #~ "Einstellung später jederzeit ändern, indem Sie denentsprechenden Dialog "
 #~ "(Bearbeiten/Einstellungen) verwenden."
-
 #~ msgid "Xiphos Configuration - Page 2 of 5"
 #~ msgstr "Xiphos Konfiguration - Seite 2 von 5"
-
 #~ msgid "These values have been detected automatically"
 #~ msgstr "Diese Werte wurden automatisch entdeckt"
-
 #~ msgid "Your home directory:"
 #~ msgstr "Ihr Heimatverzeichnis"
-
 #~ msgid "SWORD version"
 #~ msgstr "SWORD-Version"
-
 #~ msgid "SWORD Directory:"
 #~ msgstr "SWORD-Verzeichnis"
-
 #~ msgid "Number of Bible text modules:"
 #~ msgstr "Anzahl der Bibeltext-Module"
-
 #~ msgid "Number of Commentary modules:"
 #~ msgstr "Anzahl der Kommantar-Module"
-
 #~ msgid "Number of Dictionary/Lexicon modules:"
 #~ msgstr "Anzahl der Wörterbuch/Lexikon-Module"
-
 #~ msgid "Xiphos Configuration - Page 3 of 5"
 #~ msgstr "Xiphos Konfiguration - Seite 3 von 5"
-
 #~ msgid "Settings to use when Xiphos starts"
 #~ msgstr "Einstellungen, die beim Start von Xiphos benutzt werden sollen"
-
 #~ msgid "Show Bible tabs"
 #~ msgstr "Bibelreiter anzeigen"
-
 #~ msgid "Show Bible window"
 #~ msgstr "Bibelfenster anzeigen"
-
 #~ msgid "Show upper workbook"
 #~ msgstr "Oberen Arbeitsbereich anzeigen"
-
 #~ msgid "Show Dictionary/Lexicon tabs"
 #~ msgstr "Wörterbücher/Lexika-Reiter anzeigen"
-
 #~ msgid "Show lower workbook"
 #~ msgstr "Unteren Arbeitsbereich anzeigen"
-
 #~ msgid "Show book tabs"
 #~ msgstr "Buchreiter anzeigen"
-
 #~ msgid "Xiphos Configuration - Page 4 of 5"
 #~ msgstr "Xiphos Konfiguration - Seite 4 von 5"
-
 #~ msgid "Choose default SWORD modules"
 #~ msgstr "Vorgabe SWORD-Modul verwenden"
-
 #~ msgid "Text Module       "
 #~ msgstr "Textmodul       "
-
 #~ msgid "Generic book"
 #~ msgstr "Allgemeines Buch"
-
 #~ msgid ""
 #~ "Which Greek Lexicon to display in Dictionary/Lexicon Window when a link "
 #~ "or word is clicked"
 #~ msgstr ""
 #~ "Welches Griechischlexikon angezeigt werden soll, wenn ein Verweis oder "
 #~ "Wort angeklickt wird"
-
 #~ msgid ""
 #~ "Which Hebrew Lexicon to display in Dictionary/Lexicon Window when a link "
 #~ "or word is clicked"
 #~ msgstr ""
 #~ "Welches Hebräischlexikon angezeigt werden soll, wenn ein Verweis oder "
 #~ "Wort angeklickt wird"
-
 #~ msgid "Xiphos Configuration - Page 5 of 5"
 #~ msgstr "Xiphos Konfiguration - Seite 5 von 5"
-
 #~ msgid ""
 #~ "Thank you for using Xiphos.\n"
 #~ "\n"
@@ -4515,222 +4424,132 @@ msgstr "Xiphos Bibelleitfaden"
 #~ "\n"
 #~ "Klicken Sie auf Anwenden, um den Dialog zu schließen und Xiphos zu "
 #~ "starten."
-
-#, fuzzy
-#~ msgid "Greed Lexicon"
-#~ msgstr "Griechischlexikon"
-
 #~ msgid "Include Footnotes"
 #~ msgstr "Fußnoten einschließen"
-
 #~ msgid "Include Morphological Tags"
 #~ msgstr "Morphologische Markierungen einschließen"
-
 #~ msgid "Include Strong's Numbers"
 #~ msgstr "Strongs Nummer einschließen"
-
-#, fuzzy
-#~ msgid "Remove selected module(s)"
-#~ msgstr "Ausgewählten Ordner entfernen "
-
 #~ msgid "Pick the background color"
 #~ msgstr "Wählen Sie die Hintergrundfarbe aus"
-
 #~ msgid "Pick the Bible text color"
 #~ msgstr "Wählen Sie die Farbe für die Bibeltexte aus"
-
 #~ msgid "Pick the current Verse color"
 #~ msgstr "Wählen Sie die Farbe für den aktuellen Vers"
-
 #~ msgid "Strong's Numbers & Morphological Tags"
 #~ msgstr "Strongs Nummern und Morphologische Markierungen"
-
 #~ msgid "Bible Text Window"
 #~ msgstr "Bibeltext-Fenster"
-
 #~ msgid "Zero is the base font size. Increase or decrease the size."
 #~ msgstr "Null ist die Basisgröße. Erhöhen oder verringern Sie die Größe."
-
 #~ msgid "Use Defaults When Starting Xiphos"
 #~ msgstr "Beim Starten Vorgaben verwenden"
-
 #~ msgid "Yes, use defaults"
 #~ msgstr "Ja, Vorgaben verwenden"
-
 #~ msgid "No, use settings saved the last time I used Xiphos"
 #~ msgstr "Nein, meine gespeicherten Einstellungen verwenden"
-
 #~ msgid "Bible texts"
 #~ msgstr "Bibeltexte"
-
 #~ msgid "Show"
 #~ msgstr "Anzeigen"
-
 #~ msgid "Display Bible text window"
 #~ msgstr "Bibeltext-Fenster anzeigen"
-
 #~ msgid "Show Daily Devotion if you have a Devotion module"
 #~ msgstr "Tageslosung anzeigen, wenn entsprechendes Modul installiert ist"
-
 #~ msgid "Show the splash screen when Xiphos starts"
 #~ msgstr "Startbildschirm anzeigen"
-
 #~ msgid "Show Dictionary / Lexicon"
 #~ msgstr "Wörterbuch / Lexikon anzeigen"
-
-#, fuzzy
-#~ msgid "In Sidebar viewer"
-#~ msgstr "In Verknüpfungsleiste"
-
 #~ msgid "In Dictionary/Lexicon window"
 #~ msgstr "Im Wörterbuch/Lexikon-Fenster"
-
 #~ msgid ""
 #~ "Which Greek Lexicon to display in Dictionary/Lexicon window when a link "
 #~ "or word is clicked"
 #~ msgstr ""
 #~ "Welches Griechischlexikon angezeigt werden soll, wenn ein Verweis oder "
 #~ "Wort angeklickt wird"
-
 #~ msgid "Hebrew Lexicon Viewer"
 #~ msgstr "Hebräischlexikon-Betrachter"
-
 #~ msgid ""
 #~ "Which Hebrew Lexicon to display in viewer when a link or word is clicked"
 #~ msgstr ""
 #~ "Welches Hebräischlexikon angezeigt werden soll, wenn ein Verweis oder "
 #~ "Wort angeklickt wird"
-
 #~ msgid "Greek Lexicon Viewer"
 #~ msgstr "Griechischlexikon-Betrachter"
-
 #~ msgid ""
 #~ "Which Greek Lexicon to display in viewer when a link or word is clicked"
 #~ msgstr ""
 #~ "Welches Griechischlexikon angezeigt werden soll, wenn ein Verweis oder "
 #~ "Wort angeklickt wird"
-
 #~ msgid "Scope"
 #~ msgstr "Bereich"
-
 #~ msgid "Clear"
 #~ msgstr "Leeren"
-
 #~ msgid "Found"
 #~ msgstr "Gefunden"
-
 #~ msgid "Goto verse"
 #~ msgstr "Gehe zu Vers"
-
 #~ msgid "Lower Workbook"
 #~ msgstr "_Unterer Arbeitsbereich"
-
 #~ msgid "Commentaries, Personal Comments and StudyPad"
 #~ msgstr "Kommentare, Persönliche Kommentare und StudyPad"
-
 #~ msgid "Lower workbook"
 #~ msgstr "Unterer Arbeitsbereich"
-
 #~ msgid "Dictionary/Lexicon and generic books"
 #~ msgstr "Wörterbuch/Lexikon und allgemeine Bücher"
-
 #~ msgid "Toggle sync with main window"
 #~ msgstr "Synchronisation mit Hauptfenster"
-
 #~ msgid "Load current key"
 #~ msgstr "Derzeitigen Chriffrierschlüssel laden"
-
 #~ msgid "Match Case"
 #~ msgstr "Groß-/Kleinschreibung berücksichtigen"
-
-#, fuzzy
-#~ msgid "Replace with"
-#~ msgstr "Ersetzen"
-
-#, fuzzy
-#~ msgid "Replace word"
-#~ msgstr ""
-#~ "Wort\n"
-#~ "ersetzen"
-
-#, fuzzy
-#~ msgid "Skip Word"
-#~ msgstr "Wort"
-
-#, fuzzy
-#~ msgid "Insert word into Personal Dictionary"
-#~ msgstr ""
-#~ "Zu persönlichem\n"
-#~ "Wörterbuch hinzufügen"
-
-#, fuzzy
-#~ msgid "Information Viewer"
-#~ msgstr "Informationen über Bibeltexte"
-
 #~ msgid "_Viewer"
 #~ msgstr "_Betrachter"
-
 #~ msgid "in a dialog"
 #~ msgstr "in einem Dialogfenster öffnen"
-
 #~ msgid "Keep in Sync"
 #~ msgstr "Ständig synchronisieren"
-
 #~ msgid "Open New Dialog"
 #~ msgstr "Dialogfenster öffnen"
-
 #~ msgid "Close"
 #~ msgstr "Schließen"
-
 #~ msgid "Navigate"
 #~ msgstr "Navigieren"
-
 #~ msgid "Sync with NavBar"
 #~ msgstr "Mit NavBar synchronisieren"
-
 #~ msgid "Previous Comment"
 #~ msgstr "Vorheriger Kommentar"
-
 #~ msgid "View Current Book"
 #~ msgstr "Aktuelles Buch anzeigen"
-
 #~ msgid "Language"
 #~ msgstr "Sprache"
-
 #~ msgid ""
 #~ "Accept word\n"
 #~ "in this section"
 #~ msgstr ""
 #~ "Wort in diesem\n"
 #~ "Abschnitt akzeptieren"
-
 #~ msgid "View Current Dict/Lex"
 #~ msgstr "Aktuelles Wörterbuch/Lexikon anzeigen"
-
 #~ msgid "Dictionaries-Lexicons"
 #~ msgstr "Wörterbücher-Lexika"
-
 #~ msgid "Dict/Lex"
 #~ msgstr "Wörterbuch/Lexikon"
-
 #~ msgid "Xiphos Preferences"
 #~ msgstr "Xiphos Einstellungen"
-
 #~ msgid "General Settings"
 #~ msgstr "Allgemeine Einstellungen"
-
 #~ msgid "Sword Modules"
 #~ msgstr "Sword-Module"
-
 #~ msgid "Main Text Module"
 #~ msgstr "Haupttext-Modul"
-
 #~ msgid ""
 #~ "Which Hebrew Lexicon to display in Dictionary/Lexicon window when a link "
 #~ "or word is clicked"
 #~ msgstr ""
 #~ "Welches Hebräischlexikon angezeigt werden soll, wenn ein Verweis oder "
 #~ "Wort angeklickt wird"
-
 #~ msgid "Toggle Dictionary View"
 #~ msgstr "Wörterbuchansicht ein/aus"
+
diff --git a/po/en_GB.po b/po/en_GB.po
index ae0d924..13630b2 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -1,429 +1,565 @@
-# translation of xiphos.po to
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
+# translation of xiphos.po to en_GB
+# Copyright (C) 2009
+# This file is distributed under the same license as the Xiphos package.
 #
 # Thomas Abthorpe <tabthorpe@FreeBSD.org>, 2009.
 msgid ""
 msgstr ""
 "Project-Id-Version: xiphos\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-02 22:07+0200\n"
-"PO-Revision-Date: 2009-08-03 00:46-0400\n"
+"POT-Creation-Date: 2009-12-17 11:39+0000\n"
+"PO-Revision-Date: 2009-12-17 12:57-0500\n"
 "Last-Translator: Thomas Abthorpe <tabthorpe@FreeBSD.org>\n"
-"Language-Team: \n"
+"Language-Team: British English <gnomesword-developers@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
+"X-Launchpad-Export-Date: 2009-12-10 04:39+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+"X-Language: en_GB\n"
+"X-Poedit-Language: English\n"
+"X-Poedit-Country: UNITED KINGDOM\n"
 
-#: ../src/backend/sword_main.cc:1153
+#: ../src/backend/sword_main.cc:1083
 msgid "Configuration not found"
-msgstr ""
+msgstr "Configuration not found"
 
-#: ../src/editor/bonobo-editor.c:252 ../src/editor/slib-editor.c:228
-#: ../src/gnome2/html.c:633
+#: ../src/editor/bonobo-editor.c:254
+#: ../src/editor/slib-editor.c:234
+#: ../src/gnome2/html.c:637
 #, c-format
 msgid "Page %d of %d"
 msgstr "Page %d of %d"
 
-#: ../src/editor/bonobo-editor.c:351
+#: ../src/editor/bonobo-editor.c:353
+#: ../src/editor/slib-editor.c:659
 msgid "Are you sure you want to delete the note for"
 msgstr "Are you sure you want to delete the note for"
 
-#: ../src/editor/bonobo-editor.c:963 ../src/editor/bonobo-editor.c:996
-#: ../src/editor/slib-editor.c:1161 ../src/editor/slib-editor.c:1198
+#: ../src/editor/bonobo-editor.c:965
+#: ../src/editor/bonobo-editor.c:998
+#: ../src/editor/slib-editor.c:1308
+#: ../src/editor/slib-editor.c:1345
 msgid "Save the changes to document"
-msgstr ""
+msgstr "Save the changes to document"
 
-#: ../src/editor/bonobo-editor.c:964 ../src/editor/bonobo-editor.c:997
-#: ../src/editor/slib-editor.c:1162 ../src/editor/slib-editor.c:1199
+#: ../src/editor/bonobo-editor.c:966
+#: ../src/editor/bonobo-editor.c:999
+#: ../src/editor/slib-editor.c:1309
+#: ../src/editor/slib-editor.c:1346
 msgid "before closing?"
-msgstr ""
+msgstr "before closing?"
 
-#: ../src/editor/bonobo-editor.c:971 ../src/editor/bonobo-editor.c:1004
-#: ../src/editor/slib-editor.c:1169 ../src/editor/slib-editor.c:1206
+#: ../src/editor/bonobo-editor.c:973
+#: ../src/editor/bonobo-editor.c:1006
+#: ../src/editor/slib-editor.c:1316
+#: ../src/editor/slib-editor.c:1353
 msgid "If you don't save, changes will be permanently lost."
-msgstr ""
+msgstr "If you don't save, changes will be permanently lost."
 
-#: ../src/editor/bonobo-editor.c:995 ../src/editor/slib-editor.c:1197
-#: ../ui/xi-menus.glade.h:26
+#: ../src/editor/bonobo-editor.c:997
+#: ../src/editor/slib-editor.c:1344
+#: ../ui/xi-menus.glade.h:39
 msgid "File"
-msgstr ""
+msgstr "File"
 
-#: ../src/editor/bonobo-editor.c:1222 ../src/editor/slib-editor.c:1254
+#: ../src/editor/bonobo-editor.c:1224
+#: ../src/editor/slib-editor.c:1401
 msgid "StudyPad"
-msgstr ""
+msgstr "StudyPad"
 
-#: ../src/editor/bonobo-editor.c:1235 ../src/editor/slib-editor.c:1268
+#: ../src/editor/bonobo-editor.c:1237
+#: ../src/editor/slib-editor.c:1415
 msgid "Note Editor"
-msgstr ""
+msgstr "Note Editor"
 
-#: ../src/editor/bonobo-editor.c:1244 ../src/editor/slib-editor.c:1282
+#: ../src/editor/bonobo-editor.c:1246
+#: ../src/editor/slib-editor.c:1429
 msgid "Prayer List/Journal Editor"
-msgstr ""
+msgstr "Prayer List/Journal Editor"
 
-#: ../src/editor/slib-editor.c:382 ../src/editor/slib-editor.c:429
+#: ../src/editor/slib-editor.c:401
+#: ../src/editor/slib-editor.c:448
 msgid "Save As"
-msgstr ""
+msgstr "Save As"
 
-#: ../src/editor/slib-editor.c:400 ../src/editor/slib-editor.c:447
+#: ../src/editor/slib-editor.c:419
+#: ../src/editor/slib-editor.c:466
+#: ../src/editor/slib-editor.c:634
 msgid "Untitled document"
-msgstr ""
+msgstr "Untitled document"
 
-#: ../src/editor/slib-editor.c:612
+#: ../src/editor/slib-editor.c:702
 msgid "HTML Output"
-msgstr ""
+msgstr "HTML Output"
 
-#: ../src/editor/slib-editor.c:619
+#: ../src/editor/slib-editor.c:709
 msgid "HTML Source"
-msgstr ""
+msgstr "HTML Source"
 
-#: ../src/editor/slib-editor.c:626
+#: ../src/editor/slib-editor.c:716
 msgid "Plain Source"
-msgstr ""
+msgstr "Plain Source"
 
-#: ../src/editor/slib-editor.c:633 ../ui/editor_note.xml.h:15
+#: ../src/editor/slib-editor.c:726
+#: ../ui/editor_note.xml.h:15
 #: ../ui/editor_studypad.xml.h:21
 msgid "_Print..."
-msgstr ""
+msgstr "_Print..."
 
-#: ../src/editor/slib-editor.c:640 ../ui/editor_note.xml.h:9
+#: ../src/editor/slib-editor.c:733
+#: ../ui/editor_note.xml.h:9
 #: ../ui/editor_studypad.xml.h:14
 msgid "Print Pre_view"
-msgstr ""
+msgstr "Print Pre_view"
 
-#: ../src/editor/slib-editor.c:647
+#: ../src/editor/slib-editor.c:740
 msgid "_Quit"
-msgstr ""
+msgstr "_Quit"
 
-#: ../src/editor/slib-editor.c:654
+#: ../src/editor/slib-editor.c:747
 msgid "_Open"
-msgstr ""
+msgstr "_Open"
 
-#: ../src/editor/slib-editor.c:661
+#: ../src/editor/slib-editor.c:754
 msgid "_Save"
-msgstr ""
+msgstr "_Save"
 
-#: ../src/editor/slib-editor.c:668
+#: ../src/editor/slib-editor.c:761
 msgid "Save _As..."
-msgstr ""
+msgstr "Save _As..."
 
-#: ../src/editor/slib-editor.c:675 ../ui/editor_note.xml.h:14
-#: ../ui/editor_studypad.xml.h:20 ../ui/editor.xml.h:13
-#: ../ui/xi-menus.glade.h:85
+#: ../src/editor/slib-editor.c:767
+msgid "New"
+msgstr "New"
+
+#: ../src/editor/slib-editor.c:769
+msgid "Open new document"
+msgstr "Open new document"
+
+#: ../src/editor/slib-editor.c:773
+msgid "Delete"
+msgstr "Delete"
+
+#: ../src/editor/slib-editor.c:775
+msgid "Delete current note"
+msgstr "Delete current note"
+
+#: ../src/editor/slib-editor.c:780
+#: ../ui/editor_note.xml.h:14
+#: ../ui/editor_studypad.xml.h:20
+#: ../ui/editor.xml.h:13
+#: ../ui/xi-menus.glade.h:106
 msgid "_File"
-msgstr ""
+msgstr "_File"
 
-#: ../src/editor/slib-editor.c:730
+#: ../src/editor/slib-editor.c:835
 msgid "HTML _Output"
-msgstr ""
+msgstr "HTML _Output"
 
-#: ../src/editor/slib-editor.c:737
+#: ../src/editor/slib-editor.c:842
 msgid "_HTML Source"
-msgstr ""
+msgstr "_HTML Source"
 
-#: ../src/editor/slib-editor.c:744
+#: ../src/editor/slib-editor.c:849
 msgid "_Plain Source"
-msgstr ""
+msgstr "_Plain Source"
 
-#: ../src/editor/slib-editor.c:751 ../ui/xi-menus.glade.h:100
+#: ../src/editor/slib-editor.c:856
+#: ../ui/xi-menus.glade.h:121
 msgid "_View"
-msgstr ""
+msgstr "_View"
 
-#: ../src/editor/slib-editor.c:762 ../ui/editor_note.xml.h:11
-#: ../ui/editor_studypad.xml.h:16 ../ui/editor.xml.h:11
+#: ../src/editor/slib-editor.c:867
+#: ../ui/editor_note.xml.h:11
+#: ../ui/editor_studypad.xml.h:16
+#: ../ui/editor.xml.h:11
 msgid "Save"
-msgstr ""
+msgstr "Save"
+
+#: ../src/editor/slib-editor.c:878
+#: ../src/editor/slib-editor.c:885
+msgid "Insert Link"
+msgstr "Insert Link"
 
-#: ../src/gecko/gecko-html.cpp:178 ../src/gnome2/html.c:161
+#: ../src/gecko/gecko-html.cpp:177
+#: ../src/gnome2/html.c:165
 msgid "Unlock "
-msgstr ""
+msgstr "Unlock "
 
-#: ../src/gecko/gecko-print.c:171
+#: ../src/gecko/gecko-print.c:172
 msgid "Preparing to print"
-msgstr ""
+msgstr "Preparing to print"
 
-#: ../src/gecko/gecko-print.c:265
+#: ../src/gecko/gecko-print.c:266
 msgid "Printing is not supported on this printer"
-msgstr ""
+msgstr "Printing is not supported on this printer"
 
-#: ../src/gecko/gecko-print.c:268
+#: ../src/gecko/gecko-print.c:269
 #, c-format
 msgid "Printer %s does not support PostScript printing."
-msgstr ""
+msgstr "Printer %s does not support PostScript printing."
 
-#: ../src/gecko/gecko-print.c:341 ../src/gecko/gecko-print.c:369
+#: ../src/gecko/gecko-print.c:342
+#: ../src/gecko/gecko-print.c:370
 msgid "Printing"
-msgstr ""
+msgstr "Printing"
 
-#: ../src/gecko/gecko-print.c:371
+#: ../src/gecko/gecko-print.c:372
 msgid "Waiting to print"
-msgstr ""
+msgstr "Waiting to print"
 
-#: ../src/gecko/gecko-print.c:583
+#: ../src/gecko/gecko-print.c:584
 msgid "An error occurred while printing"
-msgstr ""
+msgstr "An error occurred while printing"
 
-#: ../src/gecko/gecko-print.c:587
+#: ../src/gecko/gecko-print.c:588
 #, c-format
 msgid "It was not possible to print your document: %s"
-msgstr ""
+msgstr "It was not possible to print your document: %s"
 
-#: ../src/gnome2/about_modules.c:189
+#: ../src/gnome2/about_modules.c:195
 msgid "About Sword Module"
-msgstr ""
+msgstr "About Sword Module"
 
-#: ../src/gnome2/about_modules.c:383 ../src/gnome2/mod_mgr.c:204
+#: ../src/gnome2/about_modules.c:389
+#: ../src/gnome2/mod_mgr.c:252
 msgid "The module has no About information."
-msgstr ""
+msgstr "The module has no About information."
 
 #: ../src/gnome2/about_sword.c:88
-msgid ""
-"The SWORD Project is an effort to create an ever-expanding software package "
-"for research and study of God and His Word. The SWORD Project framework "
-"allows easy use and study of Bible texts, commentaries, lexicons, "
-"dictionaries, and other books. Many frontends are built using this "
-"framework. An installed set of books may be shared among all frontends using "
-"the framework."
-msgstr ""
+msgid "The SWORD Project is an effort to create an ever-expanding software package for research and study of God and His Word. The SWORD Project framework allows easy use and study of Bible texts, commentaries, lexicons, dictionaries, and other books. Many frontends are built using this framework. An installed set of books may be shared among all frontends using the framework."
+msgstr "The SWORD Project is an effort to create an ever-expanding software package for research and study of God and His Word. The SWORD Project framework allows easy use and study of Bible texts, commentaries, lexicons, dictionaries, and other books. Many front-ends are built using this framework. An installed set of books may be shared among all front-ends using the framework."
 
 #: ../src/gnome2/about_sword.c:106
 msgid "About the SWORD Project"
-msgstr ""
+msgstr "About the SWORD Project"
 
-#: ../src/gnome2/about_sword.c:123
+#: ../src/gnome2/about_sword.c:124
 msgid "Sword Version"
-msgstr ""
+msgstr "Sword Version"
 
-#: ../src/gnome2/about_sword.c:154
+#: ../src/gnome2/about_sword.c:155
 msgid "Books can be downloaded from the SWORD Project"
-msgstr ""
+msgstr "Books can be downloaded from the SWORD Project"
 
-#: ../src/gnome2/about_sword.c:160
+#: ../src/gnome2/about_sword.c:161
 msgid "The SWORD Project"
-msgstr ""
+msgstr "The SWORD Project"
 
 #: ../src/gnome2/about_trans.c:84
 msgid ""
-"Do you like using Xiphos to study the Bible? Would you like to see its "
-"display using your native language? You could translate Xiphos! \n"
+"Do you like using Xiphos to study the Bible? Would you like to see its display using your native language? You could translate Xiphos! \n"
 "\n"
-"We are always looking for contributions of new translations of Xiphos into "
-"other languages. If you are able to translate for us, please see the link "
-"below, contact us, and get involved with our efforts."
+"We are always looking for contributions of new translations of Xiphos into other languages. If you are able to translate for us, please see the link below, contact us, and get involved with our efforts."
 msgstr ""
+"Do you like using Xiphos to study the Bible? Would you like to see its display using your native language? You could translate Xiphos! \n"
+"\n"
+"We are always looking for contributions of new translations of Xiphos into other languages. If you are able to translate for us, please see the link below, contact us, and get involved with our efforts."
 
 #: ../src/gnome2/about_trans.c:98
 msgid "About Xiphos Translation"
 msgstr "About Xiphos Translation"
 
-#: ../src/gnome2/about_trans.c:139
+#: ../src/gnome2/about_trans.c:140
 msgid "See TRANSLATION-HOWTO in Xiphos source"
-msgstr ""
+msgstr "See TRANSLATION-HOWTO in Xiphos source"
 
-#: ../src/gnome2/about_trans.c:145
+#: ../src/gnome2/about_trans.c:146
 msgid "Xiphos development"
-msgstr ""
+msgstr "Xiphos development"
 
-#: ../src/gnome2/about_xiphos.c:132
+#: ../src/gnome2/about_xiphos.c:131
 msgid "Copyright 2000-2009 The Xiphos Development Team"
-msgstr ""
+msgstr "Copyright 2000-2009 The Xiphos Development Team"
 
-#: ../src/gnome2/about_xiphos.c:135
+#: ../src/gnome2/about_xiphos.c:134
 msgid ""
 "(formerly known as GnomeSword)\n"
 "\n"
 "Powered by The SWORD Project.\n"
-"We would like to thank Troy Griffitts and all the other folks who have given "
-"us The SWORD Project."
+"We would like to thank Troy Griffitts and all the other folks who have given us The SWORD Project."
 msgstr ""
+"(formerly known as GnomeSword)\n"
+"\n"
+"Powered by The SWORD Project.\n"
+"We would like to thank Troy Griffitts and all the other folks who have given us The SWORD Project."
 
-#: ../src/gnome2/bibletext_dialog.c:525
+#: ../src/gnome2/bibletext_dialog.c:358
 msgid "Go to "
-msgstr ""
+msgstr "Go to "
 
 #. info->stock_icon = GTK_STOCK_OPEN;
-#: ../src/gnome2/bookmark_dialog.c:167 ../src/gnome2/bookmarks_menu.c:471
-#: ../src/gnome2/bookmarks_menu.c:897 ../src/gnome2/bookmarks_menu.c:995
-#: ../src/gnome2/bookmarks_treeview.c:131 ../ui/editor_studypad.xml.h:2
-#: ../ui/xi-menus.glade.h:9
+#: ../src/gnome2/bookmark_dialog.c:171
+#: ../src/gnome2/bookmarks_menu.c:358
+#: ../src/gnome2/bookmarks_menu.c:765
+#: ../src/gnome2/bookmarks_menu.c:863
+#: ../src/gnome2/bookmarks_treeview.c:133
+#: ../ui/editor_studypad.xml.h:2
+#: ../ui/xi-menus.glade.h:13
 msgid "Bookmark"
-msgstr ""
+msgstr "Bookmark"
 
-#: ../src/gnome2/bookmark_dialog.c:169 ../src/gnome2/bookmarks_menu.c:997
-#: ../src/gnome2/bookmarks_treeview.c:132
+#: ../src/gnome2/bookmark_dialog.c:173
+#: ../src/gnome2/bookmarks_menu.c:865
+#: ../src/gnome2/bookmarks_treeview.c:134
 msgid "Enter Folder Name"
-msgstr ""
+msgstr "Enter Folder Name"
 
-#: ../src/gnome2/bookmark_dialog.c:171 ../src/gnome2/bookmarks_menu.c:999
+#: ../src/gnome2/bookmark_dialog.c:175
+#: ../src/gnome2/bookmarks_menu.c:867
 msgid "Folder Name"
-msgstr ""
+msgstr "Folder Name"
 
-#: ../src/gnome2/bookmark_dialog.c:172 ../src/gnome2/bookmarks_menu.c:1000
-#: ../src/gnome2/bookmarks_treeview.c:134
+#: ../src/gnome2/bookmark_dialog.c:176
+#: ../src/gnome2/bookmarks_menu.c:868
+#: ../src/gnome2/bookmarks_treeview.c:136
 msgid "Folder: "
-msgstr ""
+msgstr "Folder: "
 
-#: ../src/gnome2/bookmarks_menu.c:457 ../src/gnome2/treekey-editor.c:322
-#: ../ui/xi-menus.glade.h:22
+#: ../src/gnome2/bookmarks_menu.c:344
+#: ../ui/xi-menus.glade.h:32
 msgid "Edit"
-msgstr ""
+msgstr "Edit"
 
-#: ../src/gnome2/bookmarks_menu.c:474
+#: ../src/gnome2/bookmarks_menu.c:361
 msgid "Folder name: "
-msgstr ""
+msgstr "Folder name: "
 
-#: ../src/gnome2/bookmarks_menu.c:477
+#: ../src/gnome2/bookmarks_menu.c:364
 msgid "Bookmark name: "
-msgstr ""
+msgstr "Bookmark name: "
 
-#: ../src/gnome2/bookmarks_menu.c:480 ../src/gnome2/bookmarks_menu.c:905
+#: ../src/gnome2/bookmarks_menu.c:367
+#: ../src/gnome2/bookmarks_menu.c:773
 msgid "Verse: "
-msgstr ""
+msgstr "Verse: "
 
-#: ../src/gnome2/bookmarks_menu.c:481 ../src/gnome2/bookmarks_menu.c:906
+#: ../src/gnome2/bookmarks_menu.c:368
+#: ../src/gnome2/bookmarks_menu.c:774
 msgid "Module: "
-msgstr ""
+msgstr "Module: "
 
-#: ../src/gnome2/bookmarks_menu.c:665
+#: ../src/gnome2/bookmarks_menu.c:533
 msgid "Restore Bookmark Folder"
-msgstr ""
+msgstr "Restore Bookmark Folder"
 
-#: ../src/gnome2/bookmarks_menu.c:734
+#: ../src/gnome2/bookmarks_menu.c:602
 msgid "Remove the selected folder"
-msgstr ""
+msgstr "Remove the selected folder"
 
-#: ../src/gnome2/bookmarks_menu.c:736
+#: ../src/gnome2/bookmarks_menu.c:604
 msgid "(and all its contents)?"
-msgstr ""
+msgstr "(and all its contents)?"
 
-#: ../src/gnome2/bookmarks_menu.c:739
+#: ../src/gnome2/bookmarks_menu.c:607
 msgid "Remove the selected bookmark"
-msgstr ""
+msgstr "Remove the selected bookmark"
 
-#: ../src/gnome2/bookmarks_menu.c:898
+#: ../src/gnome2/bookmarks_menu.c:766
 msgid "Add"
-msgstr ""
+msgstr "Add"
 
-#: ../src/gnome2/bookmarks_menu.c:904
+#: ../src/gnome2/bookmarks_menu.c:772
 msgid "Label: "
-msgstr ""
+msgstr "Label: "
 
-#: ../src/gnome2/bookmarks_treeview.c:105
+#: ../src/gnome2/bookmarks_treeview.c:107
 #, c-format
 msgid "Search result: %s"
-msgstr ""
+msgstr "Search result: %s"
 
-#: ../src/gnome2/bookmarks_treeview.c:934 ../src/gnome2/sidebar.c:1459
+#: ../src/gnome2/bookmarks_treeview.c:943
+#: ../src/gnome2/sidebar.c:1389
 msgid "Bookmarks"
-msgstr ""
+msgstr "Bookmarks"
 
 #: ../src/gnome2/cipher_key_dialog.c:62
 msgid "Cipher Key?"
-msgstr ""
+msgstr "Cipher Key?"
 
 #: ../src/gnome2/cipher_key_dialog.c:63
 msgid "for:"
-msgstr ""
+msgstr "for:"
 
 #: ../src/gnome2/cipher_key_dialog.c:66
 msgid "Enter Cipher Key: "
-msgstr ""
+msgstr "Enter Cipher Key: "
 
-#: ../src/gnome2/dialog.c:241
+#: ../src/gnome2/dialog.c:265
 msgid "Close without Saving"
-msgstr ""
+msgstr "Close without Saving"
 
-#: ../src/gnome2/dialog.c:569
+#: ../src/gnome2/dialog.c:596
 msgid "Xiphos:"
-msgstr ""
+msgstr "Xiphos:"
 
-#: ../src/gnome2/dialog.c:670
+#: ../src/gnome2/dialog.c:697
 msgid "Close _without Saving"
-msgstr ""
+msgstr "Close _without Saving"
 
-#: ../src/gnome2/export_dialog.c:265 ../ui/export-dialog.glade.h:20
+#: ../src/gnome2/export_dialog.c:267
+#: ../ui/export-dialog.glade.h:20
 msgid "Please check copyright before exporting!"
-msgstr ""
+msgstr "Please check copyright before exporting!"
 
-#: ../src/gnome2/find_dialog.c:200 ../src/gnome2/find_dialog.c:369
+#: ../src/gnome2/find_dialog.c:204
+#: ../src/gnome2/find_dialog.c:373
 msgid "Find"
-msgstr ""
+msgstr "Find"
 
-#: ../src/gnome2/find_dialog.c:218
+#: ../src/gnome2/find_dialog.c:222
 msgid "Enter Word or Phrase"
-msgstr ""
+msgstr "Enter Word or Phrase"
 
-#: ../src/gnome2/find_dialog.c:234 ../src/gnome2/search_sidebar.c:303
-#: ../ui/search-dialog.glade.h:57
+#: ../src/gnome2/find_dialog.c:238
+#: ../src/gnome2/search_sidebar.c:306
+#: ../ui/search-dialog.glade.h:59
 msgid "Match case"
-msgstr ""
+msgstr "Match case"
 
-#: ../src/gnome2/find_dialog.c:241
+#: ../src/gnome2/find_dialog.c:245
 msgid "Search backwards"
-msgstr ""
+msgstr "Search backwards"
 
-#: ../src/gnome2/find_dialog.c:250 ../src/gnome2/search_sidebar.c:268
-#: ../ui/search-dialog.glade.h:74
+#: ../src/gnome2/find_dialog.c:254
+#: ../src/gnome2/search_sidebar.c:271
+#: ../ui/search-dialog.glade.h:76
 msgid "Regular expression"
-msgstr ""
+msgstr "Regular expression"
 
-#: ../src/gnome2/find_dialog.c:291
+#: ../src/gnome2/find_dialog.c:295
 msgid "Find Next"
-msgstr ""
+msgstr "Find Next"
 
-#: ../src/gnome2/font_dialog.c:301
+#: ../src/gnome2/font_dialog.c:303
 msgid "Set Module Font"
-msgstr ""
+msgstr "Set Module Font"
 
-#: ../src/gnome2/font_dialog.c:331
+#: ../src/gnome2/font_dialog.c:333
 msgid "Change font for"
-msgstr ""
+msgstr "Change font for"
 
-#: ../src/gnome2/font_dialog.c:335
+#: ../src/gnome2/font_dialog.c:337
 msgid "Module"
-msgstr ""
+msgstr "Module"
 
-#: ../src/gnome2/font_dialog.c:339
+#: ../src/gnome2/font_dialog.c:341
 msgid "Current font: "
-msgstr ""
+msgstr "Current font: "
 
-#: ../src/gnome2/font_dialog.c:376
+#: ../src/gnome2/font_dialog.c:378
 msgid "+0"
-msgstr ""
+msgstr "+0"
 
-#: ../src/gnome2/font_dialog.c:380
+#: ../src/gnome2/font_dialog.c:382
 msgid "Use the default font for this module"
+msgstr "Use the default font for this module"
+
+#. *****************************************************************************
+#. * Name
+#. *    gconf_setup
+#. *
+#. * Synopsis
+#. *   #include "main/settings.h"
+#. *
+#. *   void gconf_setup()
+#. *
+#. * Description
+#. *   verifies and initializes the GConf subsystem, so that "sword://" and
+#. *   similar can be handled by url-comprehending programs such as browsers.
+#. *   dialogs for permission/success/failure => conditional on debug build.
+#. *
+#. * Return value
+#. *   void
+#.
+#: ../src/gnome2/gui.c:110
+msgid ""
+"URL references using \"sword://\" (similar to web page\n"
+"references) can be used by programs to look up\n"
+"scripture references. Your system currently has no\n"
+"program set to handle these references.\n"
+"\n"
+"Would you like Xiphos to set itself as the\n"
+"program to handle these references?"
 msgstr ""
+"URL references using \"sword://\" (similar to web page\n"
+"references) can be used by programs to look up\n"
+"scripture references. Your system currently has no\n"
+"program set to handle these references.\n"
+"\n"
+"Would you like Xiphos to set itself as the\n"
+"program to handle these references?"
 
-#: ../src/gnome2/main_window.c:758
-msgid "Xiphos - Bible Study Software"
+#: ../src/gnome2/gui.c:112
+msgid ""
+"Xiphos has successfully set itself\n"
+"as the handler of sword:// and bible:// URLs.\n"
+"\n"
+"You may wish to run the program \"gconf-editor\"\n"
+"to examine keys under /desktop/gnome/url-handlers,\n"
+"if you need to change these."
 msgstr ""
+"Xiphos has successfully set itself\n"
+"as the handler of sword:// and bible:// URLs.\n"
+"\n"
+"You may wish to run the program \"gconf-editor\"\n"
+"to examine keys under /desktop/gnome/url-handlers,\n"
+"if you need to change these."
 
-#: ../src/gnome2/main_window.c:814
-msgid "Open a new tab"
+#: ../src/gnome2/gui.c:166
+#, c-format
+msgid ""
+"Xiphos failed to complete handler init for key #%d:\n"
+"%s"
 msgstr ""
+"Xiphos failed to complete handler init for key #%d:\n"
+"%s"
+
+#: ../src/gnome2/gui.c:212
+msgid "BUG! Xiphos is about to crash due to a \"STRDUP\" error."
+msgstr "BUG! Xiphos is about to crash due to a \"STRDUP\" error."
 
-#: ../src/gnome2/main_window.c:894 ../src/gnome2/sidebar.c:621
-#: ../src/gnome2/sidebar.c:627 ../src/main/sidebar.cc:643
-#: ../src/main/sidebar.cc:964 ../src/main/sidebar.cc:965
-#: ../src/main/sidebar.cc:966
+#: ../src/gnome2/gui.c:213
+#: ../src/gnome2/gui.c:248
+msgid "Please report this error to the Xiphos team with:"
+msgstr "Please report this error to the Xiphos team with:"
+
+#: ../src/gnome2/gui.c:247
+msgid "BUG! Xiphos is about to crash due to a \"STRING\" error."
+msgstr "BUG! Xiphos is about to crash due to a \"STRING\" error."
+
+#: ../src/gnome2/main_window.c:789
+msgid "Xiphos - Bible Study Software"
+msgstr "Xiphos - Bible Study Software"
+
+#: ../src/gnome2/main_window.c:844
+msgid "Open a new tab"
+msgstr "Open a new tab"
+
+#: ../src/gnome2/main_window.c:923
+#: ../src/gnome2/sidebar.c:627
+#: ../src/gnome2/sidebar.c:633
+#: ../src/main/sidebar.cc:666
+#: ../src/main/sidebar.cc:1015
+#: ../src/main/sidebar.cc:1016
+#: ../src/main/sidebar.cc:1017
 msgid "Standard View"
-msgstr ""
+msgstr "Standard View"
 
-#: ../src/gnome2/main_window.c:971
+#: ../src/gnome2/main_window.c:1004
 msgid "Commentary View"
-msgstr ""
+msgstr "Commentary View"
 
-#: ../src/gnome2/main_window.c:987
+#: ../src/gnome2/main_window.c:1020
 msgid "Book View"
-msgstr ""
+msgstr "Book View"
 
-#: ../src/gnome2/main_window.c:1012
+#: ../src/gnome2/main_window.c:1045
 msgid "Welcome to Xiphos"
-msgstr ""
+msgstr "Welcome to Xiphos"
 
-#: ../src/gnome2/menu_popup.c:1163
+#: ../src/gnome2/menu_popup.c:1168
 msgid ""
 "Renaming is not available in Windows.\n"
 "\n"
@@ -434,182 +570,252 @@ msgid ""
 "Therefore, personal commentary renaming is\n"
 "not available in the Windows environment."
 msgstr ""
+"Renaming is not available in Windows.\n"
+"\n"
+"Xiphos is limited by Windows' filesystem,\n"
+"because it disallows the renaming of filename\n"
+"components of currently-open files,\n"
+"such as the contents of this commentary.\n"
+"Therefore, personal commentary renaming is\n"
+"not available in the Windows environment."
 
-#: ../src/gnome2/menu_popup.c:1182
+#: ../src/gnome2/menu_popup.c:1187
 msgid "Rename Commentary"
-msgstr ""
+msgstr "Rename Commentary"
 
-#: ../src/gnome2/menu_popup.c:1185
+#: ../src/gnome2/menu_popup.c:1190
 msgid "Choose Commentary Name"
-msgstr ""
+msgstr "Choose Commentary Name"
 
-#: ../src/gnome2/menu_popup.c:1187
+#: ../src/gnome2/menu_popup.c:1192
 msgid "New Name"
-msgstr ""
+msgstr "New Name"
 
-#: ../src/gnome2/menu_popup.c:1188 ../src/gnome2/treekey-editor.c:132
-#: ../src/gnome2/treekey-editor.c:191 ../src/gnome2/treekey-editor.c:277
-#: ../src/main/prayerlists.cc:240
+#: ../src/gnome2/menu_popup.c:1193
+#: ../src/gnome2/treekey-editor.c:139
+#: ../src/gnome2/treekey-editor.c:198
+#: ../src/gnome2/treekey-editor.c:284
+#: ../src/main/prayerlists.cc:243
 msgid "Name: "
-msgstr ""
+msgstr "Name: "
 
-#: ../src/gnome2/menu_popup.c:1198 ../src/main/prayerlists.cc:254
+#: ../src/gnome2/menu_popup.c:1203
+#: ../src/main/prayerlists.cc:257
 msgid "Module names must contain [A-Za-z0-9_] only."
-msgstr ""
+msgstr "Module names must contain [A-Za-z0-9_] only."
 
-#: ../src/gnome2/menu_popup.c:1205 ../src/main/prayerlists.cc:261
+#: ../src/gnome2/menu_popup.c:1210
+#: ../src/main/prayerlists.cc:264
 msgid "Xiphos already knows a module by that name."
-msgstr ""
+msgstr "Xiphos already knows a module by that name."
 
-#: ../src/gnome2/menu_popup.c:1248
+#: ../src/gnome2/menu_popup.c:1253
 #, c-format
 msgid ""
 "Failed to create new configuration:\n"
 "%s"
 msgstr ""
+"Failed to create new configuration:\n"
+"%s"
 
-#: ../src/gnome2/menu_popup.c:1257
+#: ../src/gnome2/menu_popup.c:1262
 msgid ""
 "Configuration build error:\n"
 "\n"
 msgstr ""
+"Configuration build error:\n"
+"\n"
+
+#: ../src/gnome2/mod_mgr.c:169
+msgid "Remove these modules?"
+msgstr "Remove these modules?"
+
+#: ../src/gnome2/mod_mgr.c:170
+msgid "Preparing to remove"
+msgstr "Preparing to remove"
+
+#: ../src/gnome2/mod_mgr.c:171
+msgid "Removing"
+msgstr "Removing"
+
+#: ../src/gnome2/mod_mgr.c:172
+#: ../ui/xi-menus.glade.h:72
+msgid "Remove"
+msgstr "Remove"
 
-#: ../src/gnome2/mod_mgr.c:339
+#: ../src/gnome2/mod_mgr.c:175
 msgid "Install these modules?"
-msgstr ""
+msgstr "Install these modules?"
 
-#: ../src/gnome2/mod_mgr.c:341
-msgid "Remove these modules?"
-msgstr ""
+#: ../src/gnome2/mod_mgr.c:176
+msgid "Preparing to install"
+msgstr "Preparing to install"
+
+#: ../src/gnome2/mod_mgr.c:177
+msgid "Installing"
+msgstr "Installing"
 
-#: ../src/gnome2/mod_mgr.c:343
+#: ../src/gnome2/mod_mgr.c:178
+#: ../src/gnome2/mod_mgr.c:2964
+#: ../ui/module-manager.glade.h:18
+msgid "Install"
+msgstr "Install"
+
+#: ../src/gnome2/mod_mgr.c:181
 msgid "Archive these modules?"
-msgstr ""
+msgstr "Archive these modules?"
+
+#: ../src/gnome2/mod_mgr.c:182
+msgid "Preparing to archive"
+msgstr "Preparing to archive"
+
+#: ../src/gnome2/mod_mgr.c:183
+msgid "Archiving"
+msgstr "Archiving"
+
+#: ../src/gnome2/mod_mgr.c:184
+#: ../ui/module-manager.glade.h:11
+msgid "Archive"
+msgstr "Archive"
 
-#: ../src/gnome2/mod_mgr.c:345
+#: ../src/gnome2/mod_mgr.c:187
 msgid ""
 "Build fast-search index for these\n"
 "modules (may take minutes/module)?"
 msgstr ""
+"Build fast-search index for these\n"
+"modules (may take minutes/module)?"
 
-#: ../src/gnome2/mod_mgr.c:347
-msgid "Delete fast-search index for these modules?"
-msgstr ""
-
-#: ../src/gnome2/mod_mgr.c:367
-msgid "Preparing to install"
-msgstr ""
+#: ../src/gnome2/mod_mgr.c:188
+msgid "Preparing to index"
+msgstr "Preparing to index"
 
-#: ../src/gnome2/mod_mgr.c:369
-msgid "Preparing to remove"
-msgstr ""
+#: ../src/gnome2/mod_mgr.c:189
+msgid "Indexing"
+msgstr "Indexing"
 
-#: ../src/gnome2/mod_mgr.c:371
-msgid "Preparing to archive"
-msgstr ""
+#: ../src/gnome2/mod_mgr.c:190
+#: ../ui/module-manager.glade.h:17
+msgid "Index"
+msgstr "Index"
 
-#: ../src/gnome2/mod_mgr.c:373
-msgid "Preparing to index"
-msgstr ""
+#: ../src/gnome2/mod_mgr.c:193
+msgid "Delete fast-search index for these modules?"
+msgstr "Delete fast-search index for these modules?"
 
-#: ../src/gnome2/mod_mgr.c:375
+#: ../src/gnome2/mod_mgr.c:194
 msgid "Preparing to delete index"
-msgstr ""
+msgstr "Preparing to delete index"
 
-#: ../src/gnome2/mod_mgr.c:401
-msgid "Installing"
-msgstr ""
+#: ../src/gnome2/mod_mgr.c:195
+msgid "Deleting index"
+msgstr "Deleting index"
 
-#: ../src/gnome2/mod_mgr.c:403
-msgid "Removing"
-msgstr ""
+#: ../src/gnome2/mod_mgr.c:196
+msgid "Deletion"
+msgstr "Deletion"
 
-#: ../src/gnome2/mod_mgr.c:405
-msgid "Archiving"
-msgstr ""
+#: ../src/gnome2/mod_mgr.c:427
+msgid "Module Name"
+msgstr "Module Name"
 
-#: ../src/gnome2/mod_mgr.c:407
-msgid "Indexing"
-msgstr ""
+#: ../src/gnome2/mod_mgr.c:448
+msgid "A checkmark means this module is already installed"
+msgstr "A tickmark means this module is already installed"
 
-#: ../src/gnome2/mod_mgr.c:409
-msgid "Deleting index"
-msgstr ""
+#: ../src/gnome2/mod_mgr.c:470
+msgid "Click the box to work on this module"
+msgstr "Click the box to work on this module"
 
-#: ../src/gnome2/mod_mgr.c:432
-#, c-format
-msgid ""
-"`mkdir %s' failed:\n"
-"%s."
-msgstr ""
+#: ../src/gnome2/mod_mgr.c:471
+msgid "Click the box to select this module for install/update"
+msgstr "Click the box to select this module for install/update"
 
-#: ../src/gnome2/mod_mgr.c:463
-msgid "Xiphos could not execute archiver"
-msgstr ""
+#: ../src/gnome2/mod_mgr.c:490
+msgid "Installed"
+msgstr "Installed"
 
-#: ../src/gnome2/mod_mgr.c:468
-msgid ""
-" archival result:\n"
-"\n"
-msgstr ""
+#: ../src/gnome2/mod_mgr.c:500
+msgid "The index icon means you have built an optimized ('lucene') index for this module for fast searching (see the Maintenance pane for this function)"
+msgstr "The index icon means you have built an optimised ('lucene') index for this module for fast searching (see the Maintenance pane for this function)"
 
-#: ../src/gnome2/mod_mgr.c:472
-msgid ""
-"\n"
-"Archive in "
-msgstr ""
+#: ../src/gnome2/mod_mgr.c:518
+msgid "The lock icon means this module is encrypted, and requires that you purchase an unlock key from the content owner"
+msgstr "The lock icon means this module is encrypted, and requires that you purchase an unlock key from the content owner"
 
-#: ../src/gnome2/mod_mgr.c:526
-msgid "Journals and prayer lists cannot be indexed."
-msgstr ""
+#: ../src/gnome2/mod_mgr.c:535
+#: ../ui/xi-menus.glade.h:1
+msgid "About"
+msgstr "About"
 
-#: ../src/gnome2/mod_mgr.c:547 ../src/gnome2/mod_mgr.c:2902
-#: ../ui/module-manager.glade.h:15
-msgid "Install"
-msgstr ""
+#: ../src/gnome2/mod_mgr.c:555
+msgid "The refresh icon means the Installed module is older than the newer Available module: You should update the module"
+msgstr "The refresh icon means the Installed module is older than the newer Available module: You should update the module"
 
-#: ../src/gnome2/mod_mgr.c:549 ../src/gnome2/treekey-editor.c:316
-msgid "Remove"
-msgstr ""
+#: ../src/gnome2/mod_mgr.c:567
+msgid "Available"
+msgstr "Available"
 
-#: ../src/gnome2/mod_mgr.c:551
-msgid "Archive"
-msgstr ""
+#: ../src/gnome2/mod_mgr.c:576
+msgid "Size"
+msgstr "Size"
 
-#: ../src/gnome2/mod_mgr.c:553
-msgid "Index"
-msgstr ""
+#: ../src/gnome2/mod_mgr.c:585
+msgid "Description"
+msgstr "Description"
 
-#: ../src/gnome2/mod_mgr.c:555
-msgid "Deletion"
+#: ../src/gnome2/mod_mgr.c:736
+#, c-format
+msgid ""
+"`mkdir %s' failed:\n"
+"%s."
 msgstr ""
+"`mkdir %s' failed:\n"
+"%s."
+
+#: ../src/gnome2/mod_mgr.c:759
+msgid " archived in: \n"
+msgstr " archived in: \n"
 
-#: ../src/gnome2/mod_mgr.c:557
+#: ../src/gnome2/mod_mgr.c:815
+msgid "Journals and prayer lists cannot be indexed."
+msgstr "Journals and prayer lists cannot be indexed."
+
+#: ../src/gnome2/mod_mgr.c:833
 #, c-format
 msgid "%s failed"
-msgstr ""
+msgstr "%s failed"
 
-#: ../src/gnome2/mod_mgr.c:559 ../src/gnome2/mod_mgr.c:1285
+#: ../src/gnome2/mod_mgr.c:836
+#: ../src/gnome2/mod_mgr.c:1562
 msgid "Finished"
-msgstr ""
-
-#: ../src/gnome2/mod_mgr.c:726 ../src/gnome2/mod_mgr.c:728
-#: ../src/gnome2/mod_mgr.c:830 ../src/gnome2/mod_mgr.c:865
-#: ../src/gnome2/mod_mgr.c:867 ../src/gnome2/utilities.c:346
-#: ../src/gnome2/utilities.c:411 ../src/gnome2/utilities.c:413
-#: ../src/gnome2/utilities.c:1032 ../src/main/sidebar.cc:801
-#: ../src/main/sidebar.cc:873 ../src/main/sidebar.cc:875
+msgstr "Finished"
+
+#: ../src/gnome2/mod_mgr.c:1003
+#: ../src/gnome2/mod_mgr.c:1005
+#: ../src/gnome2/mod_mgr.c:1107
+#: ../src/gnome2/mod_mgr.c:1142
+#: ../src/gnome2/mod_mgr.c:1144
+#: ../src/gnome2/utilities.c:435
+#: ../src/gnome2/utilities.c:500
+#: ../src/gnome2/utilities.c:502
+#: ../src/gnome2/utilities.c:986
+#: ../src/main/sidebar.cc:852
+#: ../src/main/sidebar.cc:924
+#: ../src/main/sidebar.cc:926
 msgid "Unknown"
-msgstr ""
+msgstr "Unknown"
 
-#: ../src/gnome2/mod_mgr.c:1029
+#: ../src/gnome2/mod_mgr.c:1301
 #, c-format
 msgid ""
 "Repository:\n"
 "%s"
 msgstr ""
+"Repository:\n"
+"%s"
 
-#: ../src/gnome2/mod_mgr.c:1041
+#: ../src/gnome2/mod_mgr.c:1313
 msgid ""
 "Categorized by\n"
 "Module Type"
@@ -617,44 +823,59 @@ msgstr ""
 "Categorised by\n"
 "Module Type"
 
-#: ../src/gnome2/mod_mgr.c:1046 ../src/gnome2/utilities.c:472
-#: ../src/main/sidebar.cc:948 ../src/main/sidebar.cc:950
+#: ../src/gnome2/mod_mgr.c:1318
+#: ../src/gnome2/utilities.c:561
+#: ../src/main/sidebar.cc:999
+#: ../src/main/sidebar.cc:1001
 msgid "Biblical Texts"
-msgstr ""
-
-#: ../src/gnome2/mod_mgr.c:1050 ../src/gnome2/utilities.c:476
-#: ../src/main/sidebar.cc:655 ../src/main/sidebar.cc:973
-#: ../src/main/sidebar.cc:975 ../ui/prefs.glade.h:33
+msgstr "Biblical Texts"
+
+#: ../src/gnome2/mod_mgr.c:1322
+#: ../src/gnome2/utilities.c:565
+#: ../src/main/sidebar.cc:678
+#: ../src/main/sidebar.cc:1024
+#: ../src/main/sidebar.cc:1026
+#: ../ui/prefs.glade.h:33
 msgid "Commentaries"
-msgstr ""
+msgstr "Commentaries"
 
-#: ../src/gnome2/mod_mgr.c:1054 ../src/gnome2/utilities.c:480
-#: ../src/main/sidebar.cc:982 ../src/main/sidebar.cc:984
+#: ../src/gnome2/mod_mgr.c:1326
+#: ../src/gnome2/utilities.c:569
+#: ../src/main/sidebar.cc:1033
+#: ../src/main/sidebar.cc:1035
 msgid "Dictionaries"
-msgstr ""
+msgstr "Dictionaries"
 
-#: ../src/gnome2/mod_mgr.c:1058 ../src/gnome2/utilities.c:484
-#: ../src/main/sidebar.cc:991 ../src/main/sidebar.cc:993
+#: ../src/gnome2/mod_mgr.c:1330
+#: ../src/gnome2/utilities.c:573
+#: ../src/main/sidebar.cc:1042
+#: ../src/main/sidebar.cc:1044
 msgid "Daily Devotionals"
-msgstr ""
+msgstr "Daily Devotionals"
 
-#: ../src/gnome2/mod_mgr.c:1062 ../src/gnome2/utilities.c:488
-#: ../src/main/sidebar.cc:665 ../src/main/sidebar.cc:1000
-#: ../src/main/sidebar.cc:1002
+#: ../src/gnome2/mod_mgr.c:1334
+#: ../src/gnome2/utilities.c:577
+#: ../src/main/sidebar.cc:688
+#: ../src/main/sidebar.cc:1051
+#: ../src/main/sidebar.cc:1053
 msgid "General Books"
-msgstr ""
+msgstr "General Books"
 
-#: ../src/gnome2/mod_mgr.c:1066 ../src/gnome2/utilities.c:492
-#: ../src/main/sidebar.cc:1009 ../src/main/sidebar.cc:1011
+#: ../src/gnome2/mod_mgr.c:1338
+#: ../src/gnome2/utilities.c:581
+#: ../src/main/sidebar.cc:1060
+#: ../src/main/sidebar.cc:1062
 msgid "Maps"
-msgstr ""
+msgstr "Maps"
 
-#: ../src/gnome2/mod_mgr.c:1070 ../src/gnome2/utilities.c:496
-#: ../src/main/sidebar.cc:1018 ../src/main/sidebar.cc:1020
+#: ../src/gnome2/mod_mgr.c:1342
+#: ../src/gnome2/utilities.c:585
+#: ../src/main/sidebar.cc:1069
+#: ../src/main/sidebar.cc:1071
 msgid "Images"
-msgstr ""
+msgstr "Images"
 
-#: ../src/gnome2/mod_mgr.c:1078
+#: ../src/gnome2/mod_mgr.c:1350
 msgid ""
 "Categorized by\n"
 "Availability"
@@ -662,1000 +883,999 @@ msgstr ""
 "Categorised by\n"
 "Availability"
 
-#: ../src/gnome2/mod_mgr.c:1083
+#: ../src/gnome2/mod_mgr.c:1355
 msgid "Updates"
-msgstr ""
+msgstr "Updates"
 
-#: ../src/gnome2/mod_mgr.c:1087
+#: ../src/gnome2/mod_mgr.c:1359
 msgid "Uninstalled"
-msgstr ""
-
-#: ../src/gnome2/mod_mgr.c:1091 ../src/gnome2/sidebar.c:637
-#: ../src/gnome2/utilities.c:501 ../src/main/prayerlists.cc:238
-#: ../src/main/sidebar.cc:1028 ../src/main/sidebar.cc:1030
+msgstr "Uninstalled"
+
+#: ../src/gnome2/mod_mgr.c:1363
+#: ../src/gnome2/sidebar.c:643
+#: ../src/gnome2/utilities.c:590
+#: ../src/main/prayerlists.cc:241
+#: ../src/main/sidebar.cc:1079
+#: ../src/main/sidebar.cc:1081
 msgid "Prayer List/Journal"
-msgstr ""
+msgstr "Prayer List/Journal"
 
-#: ../src/gnome2/mod_mgr.c:1268
+#: ../src/gnome2/mod_mgr.c:1545
 msgid "Refreshing from remote source"
-msgstr ""
+msgstr "Refreshing from remote source"
 
-#: ../src/gnome2/mod_mgr.c:1279
+#: ../src/gnome2/mod_mgr.c:1556
 msgid "Remote source not found"
-msgstr ""
-
-#: ../src/gnome2/mod_mgr.c:1412
-msgid "Module Name"
-msgstr ""
-
-#: ../src/gnome2/mod_mgr.c:1433
-msgid "A checkmark means this module is already installed"
-msgstr "A tickmark means this module is already installed"
-
-#: ../src/gnome2/mod_mgr.c:1455
-msgid "Click the box to work on this module"
-msgstr ""
-
-#: ../src/gnome2/mod_mgr.c:1456
-msgid "Click the box to select this module for install/update"
-msgstr ""
-
-#: ../src/gnome2/mod_mgr.c:1475
-msgid "Installed"
-msgstr ""
+msgstr "Remote source not found"
 
-#: ../src/gnome2/mod_mgr.c:1485
-msgid ""
-"The index icon means you have built an optimized ('lucene') index for this "
-"module for fast searching (see the Maintenance pane for this function)"
-msgstr ""
-"The index icon means you have built an optimized ('lucene') index for this "
-"module for fast searching (see the Maintenance pane for this function)"
-
-#: ../src/gnome2/mod_mgr.c:1503
-msgid ""
-"The lock icon means this module is encrypted, and requires that you purchase "
-"an unlock key from the content owner"
-msgstr ""
-
-#. 2
-#: ../src/gnome2/mod_mgr.c:1520 ../src/gnome2/sidebar.c:975
-#: ../src/gnome2/sidebar.c:1143 ../ui/xi-menus.glade.h:1
-msgid "About"
-msgstr ""
-
-#: ../src/gnome2/mod_mgr.c:1540
-msgid ""
-"The refresh icon means the Installed module is older than the newer "
-"Available module: You should update the module"
-msgstr ""
-
-#: ../src/gnome2/mod_mgr.c:1552
-msgid "Available"
-msgstr ""
-
-#: ../src/gnome2/mod_mgr.c:1561
-msgid "Size"
-msgstr ""
-
-#: ../src/gnome2/mod_mgr.c:1570
-msgid "Description"
-msgstr ""
-
-#: ../src/gnome2/mod_mgr.c:1602 ../src/gnome2/mod_mgr.c:1702
+#: ../src/gnome2/mod_mgr.c:1670
 msgid "Configure"
-msgstr ""
+msgstr "Configure"
 
-#: ../src/gnome2/mod_mgr.c:1633
+#: ../src/gnome2/mod_mgr.c:1701
 msgid "Type"
-msgstr ""
+msgstr "Type"
 
-#: ../src/gnome2/mod_mgr.c:1640
+#: ../src/gnome2/mod_mgr.c:1708
 msgid "Caption"
-msgstr ""
+msgstr "Caption"
 
-#: ../src/gnome2/mod_mgr.c:1648
+#: ../src/gnome2/mod_mgr.c:1716
 msgid "Source"
-msgstr ""
+msgstr "Source"
 
-#: ../src/gnome2/mod_mgr.c:1656
+#: ../src/gnome2/mod_mgr.c:1724
 msgid "Directory"
-msgstr ""
+msgstr "Directory"
 
-#: ../src/gnome2/mod_mgr.c:1664
+#: ../src/gnome2/mod_mgr.c:1732
 msgid "User"
-msgstr ""
+msgstr "User"
 
-#: ../src/gnome2/mod_mgr.c:1672
+#: ../src/gnome2/mod_mgr.c:1740
 msgid "Password"
-msgstr ""
+msgstr "Password"
 
-#: ../src/gnome2/mod_mgr.c:1680
+#: ../src/gnome2/mod_mgr.c:1748
 msgid "UID"
-msgstr ""
+msgstr "UID"
 
-#: ../src/gnome2/mod_mgr.c:1700
-msgid "Sources"
-msgstr ""
+#: ../src/gnome2/mod_mgr.c:1765
+msgid "Module Sources"
+msgstr "Module Sources"
+
+#: ../src/gnome2/mod_mgr.c:1768
+msgid "Add/Remove"
+msgstr "Add/Remove"
 
-#: ../src/gnome2/mod_mgr.c:1706 ../src/gnome2/preferences_dialog.c:1784
-#: ../src/gnome2/sidebar.c:1483
+#: ../src/gnome2/mod_mgr.c:1770
+msgid "Choose"
+msgstr "Choose"
+
+#: ../src/gnome2/mod_mgr.c:1774
+#: ../src/gnome2/preferences_dialog.c:1793
+#: ../src/gnome2/sidebar.c:1413
 msgid "Modules"
-msgstr ""
+msgstr "Modules"
 
-#: ../src/gnome2/mod_mgr.c:1708
+#: ../src/gnome2/mod_mgr.c:1776
 msgid "Install/Update"
-msgstr ""
+msgstr "Install/Update"
 
-#: ../src/gnome2/mod_mgr.c:1710
+#: ../src/gnome2/mod_mgr.c:1778
 msgid "Maintenance"
-msgstr ""
+msgstr "Maintenance"
 
-#: ../src/gnome2/mod_mgr.c:1930
+#: ../src/gnome2/mod_mgr.c:1999
 msgid "Please Refresh"
-msgstr ""
+msgstr "Please Refresh"
 
-#: ../src/gnome2/mod_mgr.c:1931
+#: ../src/gnome2/mod_mgr.c:2000
 msgid "Your module list is not up to date!"
-msgstr ""
+msgstr "Your module list is not up to date!"
 
+#. Zero Bibles is just not workable in Xiphos.
 #: ../src/gnome2/mod_mgr.c:2282
-msgid "Standard remote sources have been loaded."
+msgid ""
+"You have uninstalled your last Bible.\n"
+"Xiphos requires at least one."
 msgstr ""
+"You have uninstalled your last Bible.\n"
+"Xiphos requires at least one."
 
-#: ../src/gnome2/mod_mgr.c:2283
-msgid "Could not load standard sources from CrossWire."
+#: ../src/gnome2/mod_mgr.c:2288
+msgid ""
+"There are still no Bibles installed.\n"
+"Xiphos cannot continue without one."
 msgstr ""
+"There are still no Bibles installed.\n"
+"Xiphos cannot continue without one."
 
-#: ../src/gnome2/mod_mgr.c:2435 ../src/gnome2/mod_mgr.c:2684
+#: ../src/gnome2/mod_mgr.c:2353
+msgid "Standard remote sources have been loaded."
+msgstr "Standard remote sources have been loaded."
+
+#: ../src/gnome2/mod_mgr.c:2359
+msgid "Could not load standard sources from CrossWire."
+msgstr "Could not load standard sources from CrossWire."
+
+#: ../src/gnome2/mod_mgr.c:2510
+#: ../src/gnome2/mod_mgr.c:2759
 msgid "Remove the selected source"
-msgstr ""
+msgstr "Remove the selected source"
 
-#: ../src/gnome2/mod_mgr.c:2495
+#: ../src/gnome2/mod_mgr.c:2570
 msgid "Enter a remote source"
-msgstr ""
+msgstr "Enter a remote source"
 
-#: ../src/gnome2/mod_mgr.c:2499
+#: ../src/gnome2/mod_mgr.c:2574
 msgid "Caption:"
-msgstr ""
+msgstr "Caption:"
 
-#: ../src/gnome2/mod_mgr.c:2500
+#: ../src/gnome2/mod_mgr.c:2575
 msgid "Type:"
-msgstr ""
+msgstr "Type:"
 
-#: ../src/gnome2/mod_mgr.c:2501
+#: ../src/gnome2/mod_mgr.c:2576
 msgid "Host:"
-msgstr ""
+msgstr "Host:"
 
-#: ../src/gnome2/mod_mgr.c:2502
+#: ../src/gnome2/mod_mgr.c:2577
 msgid "Directory:"
-msgstr ""
+msgstr "Directory:"
 
-#: ../src/gnome2/mod_mgr.c:2504
+#: ../src/gnome2/mod_mgr.c:2579
 msgid "User (optional):"
-msgstr ""
+msgstr "User (optional):"
 
-#: ../src/gnome2/mod_mgr.c:2505
+#: ../src/gnome2/mod_mgr.c:2580
 msgid "Password (optional):"
-msgstr ""
+msgstr "Password (optional):"
 
 #. this can happen at most once
-#: ../src/gnome2/mod_mgr.c:2533
+#: ../src/gnome2/mod_mgr.c:2608
 msgid "A source by that name already exists."
-msgstr ""
+msgstr "A source by that name already exists."
 
-#: ../src/gnome2/mod_mgr.c:2681
+#: ../src/gnome2/mod_mgr.c:2756
 msgid "Delete a remote source"
+msgstr "Delete a remote source"
+
+#. *****************************************************************************
+#. * Name
+#. *   gui_open_mod_mgr
+#. *
+#. * Synopsis
+#. *   #include "gui/mod_mgr.h"
+#. *
+#. *   void gui_open_mod_mgr(void)
+#. *
+#. * Description
+#. *
+#. *
+#. * Return value
+#. *   void
+#.
+#: ../src/gnome2/mod_mgr.c:3244
+msgid ""
+"<b>Welcome to the Module Manager.</b>\n"
+"\n"
+"This is Xiphos' mechanism to get new and updated content.\n"
+"It appears you have never been here before, so please take a moment to look it over.\n"
+"(You will see this information box just once.)\n"
+"\n"
+"Modules come from different <u>repositories</u>.  <b>Module Sources: Add/Remove</b> will show you what repositories are currently known.\n"
+"\n"
+"<b>Module Sources: Choose</b> is for deciding from where modules should come, that is, from which repository Xiphos should obtain them, as well as where they should be placed on your system. Set <i>Install Source</i> and <i>Install Destination</i>, then click <i>Refresh</i>.\n"
+"\n"
+"<b>Modules: Install/Update</b> is for selecting and obtaining modules after choosing source and destination.\n"
+"\n"
+"<b>Modules: Maintenance</b> is for archive and index creation.\n"
+"\n"
+"See section 5 of our manual for Module Manager detail, or ask for help via Live Chat, or (if no one is responsive in chat) send mail to our users' mailing list.\n"
 msgstr ""
+"<b>Welcome to the Module Manager.</b>\n"
+"\n"
+"This is Xiphos' mechanism to get new and updated content.\n"
+"It appears you have never been here before, so please take a moment to look it over.\n"
+"(You will see this information box just once.)\n"
+"\n"
+"Modules come from different <u>repositories</u>.  <b>Module Sources: Add/Remove</b> will show you what repositories are currently known.\n"
+"\n"
+"<b>Module Sources: Choose</b> is for deciding from where modules should come, that is, from which repository Xiphos should obtain them, as well as where they should be placed on your system. Set <i>Install Source</i> and <i>Install Destination</i>, then click <i>Refresh</i>.\n"
+"\n"
+"<b>Modules: Install/Update</b> is for selecting and obtaining modules after choosing source and destination.\n"
+"\n"
+"<b>Modules: Maintenance</b> is for archive and index creation.\n"
+"\n"
+"See section 5 of our manual for Module Manager detail, or ask for help via Live Chat, or (if no one is responsive in chat) send mail to our users' mailing list.\n"
 
-#: ../src/gnome2/navbar_book.c:359 ../src/gnome2/navbar_book_dialog.c:299
+#: ../src/gnome2/navbar_book.c:359
+#: ../src/gnome2/navbar_book_dialog.c:300
 msgid "Go outward, to the section containing this one"
-msgstr ""
+msgstr "Go outward, to the section containing this one"
 
-#: ../src/gnome2/navbar_book.c:375 ../src/gnome2/navbar_book_dialog.c:315
+#: ../src/gnome2/navbar_book.c:375
+#: ../src/gnome2/navbar_book_dialog.c:316
 msgid "Go to previous item"
-msgstr ""
+msgstr "Go to previous item"
 
-#: ../src/gnome2/navbar_book.c:390 ../src/gnome2/navbar_book_dialog.c:330
+#: ../src/gnome2/navbar_book.c:390
+#: ../src/gnome2/navbar_book_dialog.c:331
 msgid "Go to next item"
-msgstr ""
+msgstr "Go to next item"
 
-#: ../src/gnome2/navbar_book.c:406 ../src/gnome2/navbar_book_dialog.c:346
+#: ../src/gnome2/navbar_book.c:406
+#: ../src/gnome2/navbar_book_dialog.c:347
 msgid "Go inward, to the first subsection"
-msgstr ""
+msgstr "Go inward, to the first subsection"
 
-#: ../src/gnome2/navbar_versekey_dialog.c:887
-#: ../src/gnome2/navbar_versekey_editor.c:877
-#: ../src/gnome2/navbar_versekey_parallel.c:800
+#: ../src/gnome2/navbar_versekey_dialog.c:864
+#: ../src/gnome2/navbar_versekey_editor.c:879
+#: ../src/gnome2/navbar_versekey_parallel.c:810
 msgid "Synchronize this window from main window"
 msgstr "Synchronise this window from main window"
 
-#: ../src/gnome2/parallel_dialog.c:324 ../src/gnome2/preferences_dialog.c:1790
+#: ../src/gnome2/parallel_dialog.c:328
+#: ../src/gnome2/preferences_dialog.c:1799
 msgid "Parallel"
-msgstr ""
+msgstr "Parallel"
 
-#: ../src/gnome2/parallel_view.c:271
+#: ../src/gnome2/parallel_view.c:275
 msgid "Copy"
-msgstr ""
+msgstr "Copy"
 
-#: ../src/gnome2/parallel_view.c:281
+#: ../src/gnome2/parallel_view.c:285
 msgid "Detach/Attach"
-msgstr ""
+msgstr "Detach/Attach"
 
-#: ../src/gnome2/parallel_view.c:287 ../ui/xi-menus.glade.h:40
+#: ../src/gnome2/parallel_view.c:291
+#: ../ui/xi-menus.glade.h:53
 msgid "Module Options"
-msgstr ""
+msgstr "Module Options"
 
 #. build change parallel modules submenu
-#: ../src/gnome2/parallel_view.c:302
+#: ../src/gnome2/parallel_view.c:306
 msgid "Change parallel 1"
-msgstr ""
+msgstr "Change parallel 1"
 
-#: ../src/gnome2/parallel_view.c:304
+#: ../src/gnome2/parallel_view.c:308
 msgid "Change parallel 2"
-msgstr ""
+msgstr "Change parallel 2"
 
-#: ../src/gnome2/parallel_view.c:306
+#: ../src/gnome2/parallel_view.c:310
 msgid "Change parallel 3"
-msgstr ""
+msgstr "Change parallel 3"
 
-#: ../src/gnome2/parallel_view.c:308
+#: ../src/gnome2/parallel_view.c:312
 msgid "Change parallel 4"
-msgstr ""
+msgstr "Change parallel 4"
 
-#: ../src/gnome2/parallel_view.c:310
+#: ../src/gnome2/parallel_view.c:314
 msgid "Change parallel 5"
-msgstr ""
-
-#: ../src/gnome2/parallel_view.c:467 ../src/gnome2/sidebar.c:620
-#: ../src/gnome2/sidebar.c:626 ../src/gnome2/tabbed_browser.c:231
-#: ../src/main/sidebar.cc:623 ../src/main/sidebar.cc:956
-#: ../src/main/sidebar.cc:957 ../src/main/sidebar.cc:958
+msgstr "Change parallel 5"
+
+#: ../src/gnome2/parallel_view.c:471
+#: ../src/gnome2/sidebar.c:626
+#: ../src/gnome2/sidebar.c:632
+#: ../src/gnome2/tabbed_browser.c:262
+#: ../src/main/sidebar.cc:646
+#: ../src/main/sidebar.cc:1007
+#: ../src/main/sidebar.cc:1008
+#: ../src/main/sidebar.cc:1009
 msgid "Parallel View"
-msgstr ""
-
-#: ../src/gnome2/preferences_cell_renderer.c:398
-msgid "Text"
-msgstr ""
-
-#: ../src/gnome2/preferences_cell_renderer.c:400
-msgid "Text to render"
-msgstr ""
-
-#: ../src/gnome2/preferences_cell_renderer.c:406
-msgid "Pixbuf Object"
-msgstr ""
-
-#: ../src/gnome2/preferences_cell_renderer.c:408
-msgid "The pixbuf to render."
-msgstr ""
-
-#: ../src/gnome2/preferences_dialog.c:1231
-#: ../src/gnome2/preferences_dialog.c:1269
-#: ../src/gnome2/preferences_dialog.c:1306
-#: ../src/gnome2/preferences_dialog.c:1341
-#: ../src/gnome2/preferences_dialog.c:1375
-#: ../src/gnome2/preferences_dialog.c:1408
-#: ../src/gnome2/preferences_dialog.c:1440
-#: ../src/gnome2/preferences_dialog.c:1473
-#: ../src/gnome2/preferences_dialog.c:1505
-#: ../src/gnome2/preferences_dialog.c:1539
-#: ../src/gnome2/preferences_dialog.c:1574
-#: ../src/gnome2/preferences_dialog.c:1609
-#: ../src/gnome2/preferences_dialog.c:1645
-#: ../src/gnome2/preferences_dialog.c:2045
+msgstr "Parallel View"
+
+#: ../src/gnome2/preferences_dialog.c:1179
+#: ../src/gnome2/preferences_dialog.c:1217
+#: ../src/gnome2/preferences_dialog.c:1254
+#: ../src/gnome2/preferences_dialog.c:1289
+#: ../src/gnome2/preferences_dialog.c:1323
+#: ../src/gnome2/preferences_dialog.c:1356
+#: ../src/gnome2/preferences_dialog.c:1388
+#: ../src/gnome2/preferences_dialog.c:1421
+#: ../src/gnome2/preferences_dialog.c:1453
+#: ../src/gnome2/preferences_dialog.c:1487
+#: ../src/gnome2/preferences_dialog.c:1522
+#: ../src/gnome2/preferences_dialog.c:1557
+#: ../src/gnome2/preferences_dialog.c:1593
+#: ../src/gnome2/preferences_dialog.c:1631
+#: ../src/gnome2/preferences_dialog.c:2052
 msgid "-- Select --"
-msgstr ""
+msgstr "-- Select --"
+
+#: ../src/gnome2/preferences_dialog.c:1652
+msgid "Locale will take effect after restart."
+msgstr "Locale will take effect after restart."
 
-#: ../src/gnome2/preferences_dialog.c:1678 ../ui/prefs.glade.h:74
+#: ../src/gnome2/preferences_dialog.c:1687
+#: ../ui/prefs.glade.h:74
 msgid "Preferences"
-msgstr ""
+msgstr "Preferences"
 
-#: ../src/gnome2/preferences_dialog.c:1760
+#: ../src/gnome2/preferences_dialog.c:1769
 msgid "Fonts"
-msgstr ""
+msgstr "Fonts"
 
-#: ../src/gnome2/preferences_dialog.c:1763
+#: ../src/gnome2/preferences_dialog.c:1772
 msgid "Color"
 msgstr "Colour"
 
-#: ../src/gnome2/preferences_dialog.c:1766
+#: ../src/gnome2/preferences_dialog.c:1775
 msgid "Sizes"
-msgstr ""
+msgstr "Sizes"
 
-#: ../src/gnome2/preferences_dialog.c:1770
+#: ../src/gnome2/preferences_dialog.c:1779
 msgid "General"
-msgstr ""
+msgstr "General"
 
-#: ../src/gnome2/preferences_dialog.c:1773 ../ui/prefs.glade.h:85
+#: ../src/gnome2/preferences_dialog.c:1782
+#: ../ui/prefs.glade.h:87
 msgid "Tabs and Panes"
-msgstr ""
+msgstr "Tabs and Panes"
 
-#: ../src/gnome2/preferences_dialog.c:1780
+#: ../src/gnome2/preferences_dialog.c:1789
 msgid "Options"
-msgstr ""
+msgstr "Options"
 
-#: ../src/gnome2/preferences_dialog.c:1787
+#: ../src/gnome2/preferences_dialog.c:1796
 msgid "Main"
-msgstr ""
+msgstr "Main"
 
-#: ../src/gnome2/preferences_dialog.c:1793
+#: ../src/gnome2/preferences_dialog.c:1802
 msgid "Special"
-msgstr ""
+msgstr "Special"
 
-#: ../src/gnome2/search_dialog.c:61 ../src/main/search_dialog.cc:60
-#: ../src/main/search_sidebar.cc:54
+#: ../src/gnome2/search_dialog.c:68
+#: ../src/main/search_dialog.cc:66
+#: ../src/main/search_sidebar.cc:61
 msgid "Searching the "
-msgstr ""
+msgstr "Searching the "
 
-#: ../src/gnome2/search_dialog.c:62 ../src/main/search_dialog.cc:61
-#: ../src/main/search_sidebar.cc:55
+#: ../src/gnome2/search_dialog.c:69
+#: ../src/main/search_dialog.cc:67
+#: ../src/main/search_sidebar.cc:62
 msgid " Module"
-msgstr ""
+msgstr " Module"
 
-#: ../src/gnome2/search_dialog.c:63 ../src/main/search_dialog.cc:62
-#: ../src/main/search_sidebar.cc:56
+#: ../src/gnome2/search_dialog.c:70
+#: ../src/main/search_dialog.cc:68
+#: ../src/main/search_sidebar.cc:63
 msgid "found in "
-msgstr ""
+msgstr "found in "
 
-#: ../src/gnome2/search_dialog.c:498
+#: ../src/gnome2/search_dialog.c:527
 msgid "Clear List?"
-msgstr ""
+msgstr "Clear List?"
 
-#: ../src/gnome2/search_dialog.c:499
+#: ../src/gnome2/search_dialog.c:528
 msgid "Are you sure you want to clear the module list?"
-msgstr ""
+msgstr "Are you sure you want to clear the module list?"
 
-#: ../src/gnome2/search_dialog.c:679
+#: ../src/gnome2/search_dialog.c:708
 msgid "The last module list may not be deleted"
-msgstr ""
+msgstr "The last module list may not be deleted"
 
-#: ../src/gnome2/search_dialog.c:697
+#: ../src/gnome2/search_dialog.c:726
 msgid "Delete list?"
-msgstr ""
+msgstr "Delete list?"
 
-#: ../src/gnome2/search_dialog.c:698
+#: ../src/gnome2/search_dialog.c:727
 msgid "Are you sure you want to delete:"
-msgstr ""
+msgstr "Are you sure you want to delete:"
 
-#: ../src/gnome2/search_sidebar.c:189
+#: ../src/gnome2/search_sidebar.c:192
 msgid ""
 "This is an inclusive (\"AND\") search:\n"
 "Find matches showing all words."
 msgstr ""
+"This is an inclusive (\"AND\") search:\n"
+"Find matches showing all words."
 
-#: ../src/gnome2/search_sidebar.c:206
+#: ../src/gnome2/search_sidebar.c:209
 msgid "Search Module"
-msgstr ""
+msgstr "Search Module"
 
-#: ../src/gnome2/search_sidebar.c:220
+#: ../src/gnome2/search_sidebar.c:223
 msgid "Bible"
-msgstr ""
+msgstr "Bible"
 
-#: ../src/gnome2/search_sidebar.c:229 ../ui/prefs.glade.h:35
+#: ../src/gnome2/search_sidebar.c:232
+#: ../ui/prefs.glade.h:35
 msgid "Commentary"
-msgstr ""
+msgstr "Commentary"
 
-#: ../src/gnome2/search_sidebar.c:243
+#: ../src/gnome2/search_sidebar.c:246
 msgid "Search Type"
-msgstr ""
+msgstr "Search Type"
 
-#: ../src/gnome2/search_sidebar.c:257 ../ui/search-dialog.glade.h:64
+#: ../src/gnome2/search_sidebar.c:260
+#: ../ui/search-dialog.glade.h:66
 msgid "Multi word"
-msgstr ""
+msgstr "Multi word"
 
-#: ../src/gnome2/search_sidebar.c:276 ../ui/search-dialog.glade.h:44
+#: ../src/gnome2/search_sidebar.c:279
+#: ../ui/search-dialog.glade.h:44
 msgid "Exact phrase"
-msgstr ""
+msgstr "Exact phrase"
 
-#: ../src/gnome2/search_sidebar.c:290
+#: ../src/gnome2/search_sidebar.c:293
 msgid "Search Options"
-msgstr ""
+msgstr "Search Options"
 
-#: ../src/gnome2/search_sidebar.c:318
+#: ../src/gnome2/search_sidebar.c:321
 msgid "Search Scope"
-msgstr ""
+msgstr "Search Scope"
 
-#: ../src/gnome2/search_sidebar.c:331
+#: ../src/gnome2/search_sidebar.c:334
 msgid "No scope"
-msgstr ""
+msgstr "No scope"
 
-#: ../src/gnome2/search_sidebar.c:341
+#: ../src/gnome2/search_sidebar.c:344
 msgid "Use bounds"
-msgstr ""
+msgstr "Use bounds"
 
-#: ../src/gnome2/search_sidebar.c:350
+#: ../src/gnome2/search_sidebar.c:353
 msgid "Last search"
-msgstr ""
+msgstr "Last search"
 
-#: ../src/gnome2/search_sidebar.c:365
+#: ../src/gnome2/search_sidebar.c:368
 msgid "Bounds"
-msgstr ""
+msgstr "Bounds"
 
-#: ../src/gnome2/search_sidebar.c:379
+#: ../src/gnome2/search_sidebar.c:382
 msgid "Lower"
-msgstr ""
+msgstr "Lower"
 
-#: ../src/gnome2/search_sidebar.c:386
+#: ../src/gnome2/search_sidebar.c:389
 msgid "Upper"
-msgstr ""
-
-#. 0
-#: ../src/gnome2/sidebar.c:963 ../src/gnome2/sidebar.c:1131
-msgid "Open in a new tab"
-msgstr ""
-
-#: ../src/gnome2/sidebar.c:964 ../src/gnome2/sidebar.c:1132
-msgid "Open selected module in a new tab"
-msgstr ""
-
-#. 1
-#: ../src/gnome2/sidebar.c:969
-msgid "Open in a separate window"
-msgstr ""
-
-#: ../src/gnome2/sidebar.c:970
-msgid "Open selected module in a separate ['dialog'] window"
-msgstr "Open selected module in a separate ['dialog'] window"
-
-#: ../src/gnome2/sidebar.c:976 ../src/gnome2/sidebar.c:1144
-msgid "View information about the selected dialog"
-msgstr "View information about the selected dialogue"
-
-#: ../src/gnome2/sidebar.c:1067
-msgid "Simple"
-msgstr ""
-
-#: ../src/gnome2/sidebar.c:1068
-msgid "Create a new simple prayer list"
-msgstr ""
-
-#: ../src/gnome2/sidebar.c:1074
-msgid "Subject"
-msgstr ""
-
-#: ../src/gnome2/sidebar.c:1081
-msgid "Monthly"
-msgstr ""
-
-#: ../src/gnome2/sidebar.c:1082 ../src/gnome2/sidebar.c:1089
-#: ../src/gnome2/sidebar.c:1096
-msgid "Create a new prayer list"
-msgstr ""
-
-#: ../src/gnome2/sidebar.c:1088
-msgid "Daily Journal"
-msgstr ""
-
-#: ../src/gnome2/sidebar.c:1095
-msgid "Outlined Topic"
-msgstr ""
-
-#. 1
-#: ../src/gnome2/sidebar.c:1137 ../ui/xi-menus.glade.h:47
-msgid "Open in editor"
-msgstr ""
-
-#: ../src/gnome2/sidebar.c:1138
-msgid "Open selected module in a dialog"
-msgstr "Open selected module in a dialogue"
+msgstr "Upper"
 
-#: ../src/gnome2/sidebar.c:1467
+#: ../src/gnome2/sidebar.c:1397
 msgid "Search"
-msgstr ""
+msgstr "Search"
 
-#: ../src/gnome2/sidebar.c:1475
+#: ../src/gnome2/sidebar.c:1405
 msgid "Verse List"
-msgstr ""
+msgstr "Verse List"
 
-#: ../src/gnome2/sidebar_dialog.c:136 ../src/gnome2/sidebar_dialog.c:145
+#: ../src/gnome2/sidebar_dialog.c:139
+#: ../src/gnome2/sidebar_dialog.c:148
 msgid "Sidebar"
-msgstr ""
+msgstr "Sidebar"
 
-#: ../src/gnome2/splash.c:363
+#: ../src/gnome2/splash.c:396
 msgid "Powered by the SWORD Project"
-msgstr ""
+msgstr "Powered by the SWORD Project"
 
-#: ../src/gnome2/treekey-editor.c:130 ../src/gnome2/treekey-editor.c:189
-#: ../src/gnome2/treekey-editor.c:275
+#: ../src/gnome2/treekey-editor.c:137
+#: ../src/gnome2/treekey-editor.c:196
+#: ../src/gnome2/treekey-editor.c:282
 msgid "Prayer List/Journal Item"
-msgstr ""
+msgstr "Prayer List/Journal Item"
 
-#: ../src/gnome2/treekey-editor.c:131 ../src/gnome2/treekey-editor.c:190
-#: ../src/gnome2/treekey-editor.c:276
+#: ../src/gnome2/treekey-editor.c:138
+#: ../src/gnome2/treekey-editor.c:197
+#: ../src/gnome2/treekey-editor.c:283
 msgid "New name"
-msgstr ""
+msgstr "New name"
 
-#: ../src/gnome2/treekey-editor.c:246
+#: ../src/gnome2/treekey-editor.c:253
 msgid "Remove the selected item"
-msgstr ""
-
-#: ../src/gnome2/treekey-editor.c:304
-msgid "Add Child"
-msgstr ""
-
-#: ../src/gnome2/treekey-editor.c:305 ../src/gnome2/treekey-editor.c:311
-msgid "Add an item"
-msgstr ""
+msgstr "Remove the selected item"
 
-#: ../src/gnome2/treekey-editor.c:310
-msgid "Add Sibling"
-msgstr ""
-
-#: ../src/gnome2/treekey-editor.c:317
-msgid "Remove this item"
-msgstr ""
-
-#: ../src/gnome2/treekey-editor.c:323
-msgid "Edit this item"
-msgstr ""
-
-#: ../src/main/display.cc:301
+#: ../src/main/display.cc:259
 #, c-format
 msgid ""
 "Improperly encoded personal annotation label:\n"
 "'%s'"
 msgstr ""
+"Improperly encoded personal annotation label:\n"
+"'%s'"
 
-#: ../src/main/display.cc:427
+#: ../src/main/display.cc:386
 msgid ""
 "An image file's size could not be determined.\n"
 "Is ImageMagick's 'identify' not installed?\n"
 "(Or possibly the image is of type other than bmp/gif/jpg/png.)\n"
 "Xiphos cannot resize images to fit window."
 msgstr ""
+"An image file's size could not be determined.\n"
+"Is ImageMagick's 'identify' not installed?\n"
+"(Or possibly the image is of type other than bmp/gif/jpg/png.)\n"
+"Xiphos cannot resize images to fit window."
 
-#: ../src/main/display.cc:1084 ../src/main/display.cc:1146
-#: ../src/main/display.cc:1234 ../src/main/display.cc:1242
+#: ../src/main/display.cc:1042
+#: ../src/main/display.cc:1094
+#: ../src/main/display.cc:1171
 #: ../ui/export-dialog.glade.h:7
 msgid "Chapter"
-msgstr ""
+msgstr "Chapter"
 
-#: ../src/main/main.c:110
+#: ../src/main/main.c:119
 msgid "Xiphos does not understand more than one argument."
-msgstr ""
+msgstr "Xiphos does not understand more than one argument."
 
-#: ../src/main/main.c:150
+#: ../src/main/main.c:161
 msgid "Initiating Gecko"
-msgstr ""
+msgstr "Initiating Gecko"
 
-#: ../src/main/main.c:156
+#: ../src/main/main.c:167
 msgid "Building Interface"
-msgstr ""
+msgstr "Building Interface"
 
-#: ../src/main/main.c:160
+#: ../src/main/main.c:171
 msgid "Starting Sword"
-msgstr ""
+msgstr "Starting Sword"
 
-#: ../src/main/main.c:164
+#: ../src/main/main.c:175
 msgid "Loading Settings"
-msgstr ""
+msgstr "Loading Settings"
 
-#: ../src/main/main.c:168
+#: ../src/main/main.c:179
 msgid "Displaying Xiphos"
-msgstr ""
+msgstr "Displaying Xiphos"
 
-#: ../src/main/module_dialogs.cc:232 ../src/main/previewer.cc:122
+#: ../src/main/module_dialogs.cc:227
+#: ../src/main/previewer.cc:127
+#: ../src/main/previewer.cc:194
 #: ../ui/prefs.glade.h:75
 msgid "Previewer"
-msgstr ""
+msgstr "Previewer"
 
-#: ../src/main/module_dialogs.cc:298 ../src/main/module_dialogs.cc:424
-#: ../src/main/previewer.cc:197
+#: ../src/main/module_dialogs.cc:292
+#: ../src/main/module_dialogs.cc:416
+#: ../src/main/previewer.cc:269
 msgid "Footnote"
-msgstr ""
+msgstr "Footnote"
 
-#: ../src/main/module_dialogs.cc:304 ../src/main/module_dialogs.cc:429
-#: ../src/main/previewer.cc:209
+#: ../src/main/module_dialogs.cc:298
+#: ../src/main/module_dialogs.cc:421
+#: ../src/main/previewer.cc:281
 msgid "Cross Reference"
-msgstr ""
-
-#: ../src/main/module_dialogs.cc:310 ../src/main/module_dialogs.cc:324
-#: ../src/main/module_dialogs.cc:434 ../src/main/module_dialogs.cc:446
-#: ../src/main/previewer.cc:215 ../src/main/previewer.cc:234
+msgstr "Cross Reference"
+
+#: ../src/main/module_dialogs.cc:304
+#: ../src/main/module_dialogs.cc:318
+#: ../src/main/module_dialogs.cc:426
+#: ../src/main/module_dialogs.cc:438
+#: ../src/main/previewer.cc:287
+#: ../src/main/previewer.cc:306
 msgid "Strongs"
-msgstr ""
-
-#: ../src/main/module_dialogs.cc:316 ../src/main/module_dialogs.cc:335
-#: ../src/main/module_dialogs.cc:439 ../src/main/module_dialogs.cc:456
-#: ../src/main/previewer.cc:221 ../src/main/previewer.cc:247
+msgstr "Strongs"
+
+#: ../src/main/module_dialogs.cc:310
+#: ../src/main/module_dialogs.cc:329
+#: ../src/main/module_dialogs.cc:431
+#: ../src/main/module_dialogs.cc:448
+#: ../src/main/previewer.cc:293
+#: ../src/main/previewer.cc:319
 msgid "Morphology"
-msgstr ""
+msgstr "Morphology"
 
-#: ../src/main/module_dialogs.cc:1089 ../src/main/url.cc:537
+#: ../src/main/module_dialogs.cc:1081
+#: ../src/main/url.cc:530
 msgid "Back to "
-msgstr ""
+msgstr "Back to "
 
-#: ../src/main/parallel_view.cc:398 ../ui/xi-menus.glade.h:69
+#: ../src/main/parallel_view.cc:404
+#: ../ui/xi-menus.glade.h:89
 msgid "Strong's Numbers"
-msgstr ""
+msgstr "Strong's Numbers"
 
-#: ../src/main/parallel_view.cc:408 ../ui/search-dialog.glade.h:50
-#: ../ui/xi-menus.glade.h:27
+#: ../src/main/parallel_view.cc:414
+#: ../ui/search-dialog.glade.h:52
+#: ../ui/xi-menus.glade.h:40
 msgid "Footnotes"
-msgstr ""
+msgstr "Footnotes"
 
-#: ../src/main/parallel_view.cc:418 ../ui/search-dialog.glade.h:62
-#: ../ui/xi-menus.glade.h:41
+#: ../src/main/parallel_view.cc:424
+#: ../ui/search-dialog.glade.h:64
+#: ../ui/xi-menus.glade.h:55
 msgid "Morphological Tags"
-msgstr ""
+msgstr "Morphological Tags"
 
-#: ../src/main/parallel_view.cc:428 ../ui/xi-menus.glade.h:31
+#: ../src/main/parallel_view.cc:434
+#: ../ui/xi-menus.glade.h:44
 msgid "Hebrew Vowel Points"
-msgstr ""
+msgstr "Hebrew Vowel Points"
 
-#: ../src/main/parallel_view.cc:438 ../ui/xi-menus.glade.h:30
+#: ../src/main/parallel_view.cc:444
+#: ../ui/xi-menus.glade.h:43
 msgid "Hebrew Cantillation"
-msgstr ""
+msgstr "Hebrew Cantillation"
 
-#: ../src/main/parallel_view.cc:448 ../ui/xi-menus.glade.h:28
+#: ../src/main/parallel_view.cc:454
+#: ../ui/xi-menus.glade.h:41
 msgid "Greek Accents"
-msgstr ""
+msgstr "Greek Accents"
 
-#: ../src/main/parallel_view.cc:458
+#: ../src/main/parallel_view.cc:464
 msgid "Cross-references"
-msgstr ""
+msgstr "Cross-references"
 
-#: ../src/main/parallel_view.cc:468 ../ui/xi-menus.glade.h:37
+#: ../src/main/parallel_view.cc:474
+#: ../ui/xi-menus.glade.h:50
 msgid "Lemmas"
-msgstr ""
+msgstr "Lemmas"
 
-#: ../src/main/parallel_view.cc:478 ../ui/xi-menus.glade.h:29
+#: ../src/main/parallel_view.cc:484
+#: ../ui/xi-menus.glade.h:42
 msgid "Headings"
-msgstr ""
+msgstr "Headings"
 
-#: ../src/main/parallel_view.cc:488
+#: ../src/main/parallel_view.cc:494
 msgid "Morpheme Segmentation"
-msgstr ""
+msgstr "Morpheme Segmentation"
 
-#: ../src/main/parallel_view.cc:498 ../ui/xi-menus.glade.h:75
+#: ../src/main/parallel_view.cc:504
+#: ../ui/xi-menus.glade.h:96
 msgid "Words of Christ in Red"
-msgstr ""
+msgstr "Words of Christ in Red"
 
-#: ../src/main/parallel_view.cc:508 ../ui/xi-menus.glade.h:70
+#: ../src/main/parallel_view.cc:514
+#: ../ui/xi-menus.glade.h:91
 msgid "Transliteration"
-msgstr ""
+msgstr "Transliteration"
 
-#: ../src/main/parallel_view.cc:518
+#: ../src/main/parallel_view.cc:524
 msgid "Textual Variants"
-msgstr ""
+msgstr "Textual Variants"
 
-#: ../src/main/parallel_view.cc:526 ../ui/xi-menus.glade.h:51
+#: ../src/main/parallel_view.cc:532
+#: ../ui/xi-menus.glade.h:70
 msgid "Primary Reading"
-msgstr ""
+msgstr "Primary Reading"
 
-#: ../src/main/parallel_view.cc:535 ../ui/xi-menus.glade.h:65
+#: ../src/main/parallel_view.cc:541
+#: ../ui/xi-menus.glade.h:84
 msgid "Secondary Reading"
-msgstr ""
+msgstr "Secondary Reading"
 
-#: ../src/main/parallel_view.cc:544 ../ui/xi-menus.glade.h:5
+#: ../src/main/parallel_view.cc:550
+#: ../ui/xi-menus.glade.h:9
 msgid "All Readings"
-msgstr ""
+msgstr "All Readings"
 
-#: ../src/main/parallel_view.cc:878 ../src/main/parallel_view.cc:1130
+#: ../src/main/parallel_view.cc:884
+#: ../src/main/parallel_view.cc:1136
 msgid "view context"
-msgstr ""
+msgstr "view context"
 
-#: ../src/main/prayerlists.cc:71
+#: ../src/main/prayerlists.cc:74
 msgid "January"
-msgstr ""
+msgstr "January"
 
-#: ../src/main/prayerlists.cc:72
+#: ../src/main/prayerlists.cc:75
 msgid "February"
-msgstr ""
+msgstr "February"
 
-#: ../src/main/prayerlists.cc:73
+#: ../src/main/prayerlists.cc:76
 msgid "March"
-msgstr ""
+msgstr "March"
 
-#: ../src/main/prayerlists.cc:74
+#: ../src/main/prayerlists.cc:77
 msgid "April"
-msgstr ""
+msgstr "April"
 
-#: ../src/main/prayerlists.cc:75
+#: ../src/main/prayerlists.cc:78
 msgid "May"
-msgstr ""
+msgstr "May"
 
-#: ../src/main/prayerlists.cc:76
+#: ../src/main/prayerlists.cc:79
 msgid "June"
-msgstr ""
+msgstr "June"
 
-#: ../src/main/prayerlists.cc:77
+#: ../src/main/prayerlists.cc:80
 msgid "July"
-msgstr ""
+msgstr "July"
 
-#: ../src/main/prayerlists.cc:78
+#: ../src/main/prayerlists.cc:81
 msgid "August"
-msgstr ""
+msgstr "August"
 
-#: ../src/main/prayerlists.cc:79
+#: ../src/main/prayerlists.cc:82
 msgid "September"
-msgstr ""
+msgstr "September"
 
-#: ../src/main/prayerlists.cc:80
+#: ../src/main/prayerlists.cc:83
 msgid "October"
-msgstr ""
+msgstr "October"
 
-#: ../src/main/prayerlists.cc:81
+#: ../src/main/prayerlists.cc:84
 msgid "November"
-msgstr ""
+msgstr "November"
 
-#: ../src/main/prayerlists.cc:82
+#: ../src/main/prayerlists.cc:85
 msgid "December"
-msgstr ""
+msgstr "December"
 
-#: ../src/main/prayerlists.cc:121 ../src/main/sword_treekey.cc:332
+#: ../src/main/prayerlists.cc:124
+#: ../src/main/sword_treekey.cc:332
 msgid "Growth"
-msgstr ""
+msgstr "Growth"
 
-#: ../src/main/prayerlists.cc:122 ../src/main/sword_treekey.cc:333
+#: ../src/main/prayerlists.cc:125
+#: ../src/main/sword_treekey.cc:333
 msgid "<b>For Growth</b><br>"
-msgstr ""
+msgstr "<b>For Growth</b><br>"
 
-#: ../src/main/prayerlists.cc:123 ../src/main/prayerlists.cc:380
+#: ../src/main/prayerlists.cc:126
+#: ../src/main/prayerlists.cc:383
 #: ../src/main/sword_treekey.cc:334
 msgid "Salvation"
-msgstr ""
+msgstr "Salvation"
 
-#: ../src/main/prayerlists.cc:124 ../src/main/sword_treekey.cc:335
+#: ../src/main/prayerlists.cc:127
+#: ../src/main/sword_treekey.cc:335
 msgid "<b>For Salvation</b><br>"
-msgstr ""
+msgstr "<b>For Salvation</b><br>"
 
-#: ../src/main/prayerlists.cc:125 ../src/main/prayerlists.cc:384
+#: ../src/main/prayerlists.cc:128
+#: ../src/main/prayerlists.cc:387
 #: ../src/main/sword_treekey.cc:336
 msgid "Health"
-msgstr ""
+msgstr "Health"
 
-#: ../src/main/prayerlists.cc:126 ../src/main/sword_treekey.cc:337
+#: ../src/main/prayerlists.cc:129
+#: ../src/main/sword_treekey.cc:337
 msgid "<b>For Health</b><br>"
-msgstr ""
+msgstr "<b>For Health</b><br>"
 
-#: ../src/main/prayerlists.cc:127
+#: ../src/main/prayerlists.cc:130
 msgid "Misc"
-msgstr ""
+msgstr "Misc"
 
-#: ../src/main/prayerlists.cc:128 ../src/main/sword_treekey.cc:339
+#: ../src/main/prayerlists.cc:131
+#: ../src/main/sword_treekey.cc:339
 msgid "<b>Miscellaneous</b><br>"
-msgstr ""
+msgstr "<b>Miscellaneous</b><br>"
 
-#: ../src/main/prayerlists.cc:136
+#: ../src/main/prayerlists.cc:139
 msgid "Point x"
-msgstr ""
+msgstr "Point x"
 
-#: ../src/main/prayerlists.cc:137
+#: ../src/main/prayerlists.cc:140
 msgid "<b>(x)</b><br>"
-msgstr ""
+msgstr "<b>(x)</b><br>"
 
-#: ../src/main/prayerlists.cc:138
+#: ../src/main/prayerlists.cc:141
 msgid "Point y"
-msgstr ""
+msgstr "Point y"
 
-#: ../src/main/prayerlists.cc:139
+#: ../src/main/prayerlists.cc:142
 msgid "<b>(y)</b><br>"
-msgstr ""
+msgstr "<b>(y)</b><br>"
 
-#: ../src/main/prayerlists.cc:140
+#: ../src/main/prayerlists.cc:143
 msgid "Point z"
-msgstr ""
+msgstr "Point z"
 
-#: ../src/main/prayerlists.cc:141
+#: ../src/main/prayerlists.cc:144
 msgid "<b>(z)</b><br>"
-msgstr ""
+msgstr "<b>(z)</b><br>"
 
-#: ../src/main/prayerlists.cc:149
+#: ../src/main/prayerlists.cc:152
 msgid "Minor Topic 1"
-msgstr ""
+msgstr "Minor Topic 1"
 
-#: ../src/main/prayerlists.cc:150
+#: ../src/main/prayerlists.cc:153
 msgid "<b>Subtopic 1</b><br>"
-msgstr ""
+msgstr "<b>Subtopic 1</b><br>"
 
-#: ../src/main/prayerlists.cc:152
+#: ../src/main/prayerlists.cc:155
 msgid "Minor Topic 2"
-msgstr ""
+msgstr "Minor Topic 2"
 
-#: ../src/main/prayerlists.cc:153
+#: ../src/main/prayerlists.cc:156
 msgid "<b>Subtopic 2</b><br>"
-msgstr ""
+msgstr "<b>Subtopic 2</b><br>"
 
-#: ../src/main/prayerlists.cc:155
+#: ../src/main/prayerlists.cc:158
 msgid "Minor Topic 3"
-msgstr ""
+msgstr "Minor Topic 3"
 
-#: ../src/main/prayerlists.cc:156
+#: ../src/main/prayerlists.cc:159
 msgid "<b>Subtopic 3</b><br>"
-msgstr ""
+msgstr "<b>Subtopic 3</b><br>"
 
-#: ../src/main/prayerlists.cc:158
+#: ../src/main/prayerlists.cc:161
 msgid "Minor Topic 4"
-msgstr ""
+msgstr "Minor Topic 4"
 
-#: ../src/main/prayerlists.cc:159
+#: ../src/main/prayerlists.cc:162
 msgid "<b>Subtopic 4</b><br>"
-msgstr ""
+msgstr "<b>Subtopic 4</b><br>"
 
-#: ../src/main/prayerlists.cc:239
+#: ../src/main/prayerlists.cc:242
 msgid "Name for new prayer list or journal"
-msgstr ""
+msgstr "Name for new prayer list or journal"
 
-#: ../src/main/prayerlists.cc:270
+#: ../src/main/prayerlists.cc:273
 msgid "Xiphos finds that prayer list already."
-msgstr ""
+msgstr "Xiphos finds that prayer list already."
 
-#: ../src/main/prayerlists.cc:283
+#: ../src/main/prayerlists.cc:286
 #, c-format
 msgid ""
 "Xiphos cannot create module's path:\n"
 "%s"
 msgstr ""
+"Xiphos cannot create module's path:\n"
+"%s"
 
-#: ../src/main/prayerlists.cc:323
+#: ../src/main/prayerlists.cc:326
 msgid "A basic prayer list. \\par\\par Module created by Xiphos."
-msgstr ""
+msgstr "A basic prayer list. \\par\\par Module created by Xiphos."
 
-#: ../src/main/prayerlists.cc:324
+#: ../src/main/prayerlists.cc:327
 msgid "BasicPrayerList"
-msgstr ""
+msgstr "BasicPrayerList"
 
-#: ../src/main/prayerlists.cc:338
+#: ../src/main/prayerlists.cc:341
 msgid "MyPrayerList"
-msgstr ""
+msgstr "MyPrayerList"
 
-#: ../src/main/prayerlists.cc:339
-msgid ""
-"<b>People:</b><br>Bob<br>Sam<br>Sue<br><br><b>Church:</"
-"b><br>pews<br>fellowship<br>Bibles for missionaries<br><br><br>"
-msgstr ""
+#: ../src/main/prayerlists.cc:342
+msgid "<b>People:</b><br>Bob<br>Sam<br>Sue<br><br><b>Church:</b><br>pews<br>fellowship<br>Bibles for missionaries<br><br><br>"
+msgstr "<b>People:</b><br>Bob<br>Sam<br>Sue<br><br><b>Church:</b><br>pews<br>fellowship<br>Bibles for missionaries<br><br><br>"
 
-#: ../src/main/prayerlists.cc:365
+#: ../src/main/prayerlists.cc:368
 msgid "A subject-based prayer list. \\par\\par Module created by Xiphos."
-msgstr ""
+msgstr "A subject-based prayer list. \\par\\par Module created by Xiphos."
 
-#: ../src/main/prayerlists.cc:366
+#: ../src/main/prayerlists.cc:369
 msgid "SubjectPrayerList"
-msgstr ""
+msgstr "SubjectPrayerList"
 
-#: ../src/main/prayerlists.cc:381
+#: ../src/main/prayerlists.cc:384
 msgid "Bob<br>Sam<br>Sue<br>John<br>"
-msgstr ""
+msgstr "Bob<br>Sam<br>Sue<br>John<br>"
 
-#: ../src/main/prayerlists.cc:382
+#: ../src/main/prayerlists.cc:385
 msgid "Spiritual Growth"
-msgstr ""
+msgstr "Spiritual Growth"
 
-#: ../src/main/prayerlists.cc:383
+#: ../src/main/prayerlists.cc:386
 msgid "Mike<br>Steve<br>"
-msgstr ""
+msgstr "Mike<br>Steve<br>"
 
-#: ../src/main/prayerlists.cc:385
+#: ../src/main/prayerlists.cc:388
 msgid "Sue<br>John<br>"
-msgstr ""
+msgstr "Sue<br>John<br>"
 
-#: ../src/main/prayerlists.cc:411
+#: ../src/main/prayerlists.cc:414
 msgid "A monthly prayer list. \\par\\par Module created by Xiphos."
-msgstr ""
+msgstr "A monthly prayer list. \\par\\par Module created by Xiphos."
 
-#: ../src/main/prayerlists.cc:412
+#: ../src/main/prayerlists.cc:415
 msgid "MonthlyPrayerList"
-msgstr ""
+msgstr "MonthlyPrayerList"
 
-#: ../src/main/prayerlists.cc:463
+#: ../src/main/prayerlists.cc:466
 msgid "A daily journal. \\par\\par Module created by Xiphos."
-msgstr ""
+msgstr "A daily journal. \\par\\par Module created by Xiphos."
 
-#: ../src/main/prayerlists.cc:464
+#: ../src/main/prayerlists.cc:467
 msgid "DailyJournal"
-msgstr ""
+msgstr "DailyJournal"
 
-#: ../src/main/prayerlists.cc:528
+#: ../src/main/prayerlists.cc:531
 msgid "An outlined topic (e.g. sermon). \\par\\par Module created by Xiphos."
-msgstr ""
+msgstr "An outlined topic (e.g. sermon). \\par\\par Module created by Xiphos."
 
-#: ../src/main/prayerlists.cc:529
+#: ../src/main/prayerlists.cc:532
 msgid "OutlinedTopic"
-msgstr ""
+msgstr "OutlinedTopic"
 
-#: ../src/main/prayerlists.cc:543
+#: ../src/main/prayerlists.cc:546
 msgid "Major Topic A"
-msgstr ""
+msgstr "Major Topic A"
 
-#: ../src/main/prayerlists.cc:544
+#: ../src/main/prayerlists.cc:547
 msgid "<b>Major Topic A</b><br>"
-msgstr ""
+msgstr "<b>Major Topic A</b><br>"
 
-#: ../src/main/prayerlists.cc:546
+#: ../src/main/prayerlists.cc:549
 msgid "Major Topic B"
-msgstr ""
+msgstr "Major Topic B"
 
-#: ../src/main/prayerlists.cc:547
+#: ../src/main/prayerlists.cc:550
 msgid "<b>Major Topic B</b><br>"
-msgstr ""
+msgstr "<b>Major Topic B</b><br>"
 
-#: ../src/main/prayerlists.cc:549
+#: ../src/main/prayerlists.cc:552
 msgid "Major Topic C"
-msgstr ""
+msgstr "Major Topic C"
 
-#: ../src/main/prayerlists.cc:550
+#: ../src/main/prayerlists.cc:553
 msgid "<b>Major Topic C</b><br>"
-msgstr ""
+msgstr "<b>Major Topic C</b><br>"
 
-#: ../src/main/previewer.cc:203
+#: ../src/main/previewer.cc:275
 msgid "User Annotation"
-msgstr ""
+msgstr "User Annotation"
 
-#: ../src/main/search_dialog.cc:129
+#: ../src/main/search_dialog.cc:212
 #, c-format
 msgid "Search result %s: %s"
-msgstr ""
+msgstr "Search result %s: %s"
 
-#: ../src/main/search_dialog.cc:361
+#: ../src/main/search_dialog.cc:444
 msgid "Delete Range?"
-msgstr ""
+msgstr "Delete Range?"
 
-#: ../src/main/search_dialog.cc:362
+#: ../src/main/search_dialog.cc:445
 msgid "Are you sure you want to delete this range?"
-msgstr ""
+msgstr "Are you sure you want to delete this range?"
 
-#: ../src/main/search_dialog.cc:576 ../src/main/search_dialog.cc:1047
-#: ../src/main/search_dialog.cc:1050 ../src/main/search_dialog.cc:1072
-#: ../src/main/search_dialog.cc:1075
+#: ../src/main/search_dialog.cc:659
+#: ../src/main/search_dialog.cc:1130
+#: ../src/main/search_dialog.cc:1133
+#: ../src/main/search_dialog.cc:1155
+#: ../src/main/search_dialog.cc:1158
 msgid "Search: "
-msgstr ""
+msgstr "Search: "
 
-#: ../src/main/search_dialog.cc:621
+#: ../src/main/search_dialog.cc:704
 msgid "Remove Module?"
-msgstr ""
+msgstr "Remove Module?"
 
-#: ../src/main/search_dialog.cc:622
+#: ../src/main/search_dialog.cc:705
 msgid "Are you sure you want to remove the selected module?"
-msgstr ""
+msgstr "Are you sure you want to remove the selected module?"
 
-#: ../src/main/search_dialog.cc:1471
+#: ../src/main/search_dialog.cc:1560
 #, c-format
 msgid ""
 "%s:\n"
 "No such module is installed.\n"
 "%s"
 msgstr ""
+"%s:\n"
+"No such module is installed.\n"
+"%s"
 
-#: ../src/main/search_dialog.cc:1473
+#: ../src/main/search_dialog.cc:1562
 msgid "Please adjust the module list."
-msgstr ""
+msgstr "Please adjust the module list."
 
-#: ../src/main/search_dialog.cc:1489
+#: ../src/main/search_dialog.cc:1578
 #, c-format
 msgid "No fast-search index exists for %s.%s%s"
-msgstr ""
+msgstr "No fast-search index exists for %s.%s%s"
 
-#: ../src/main/search_dialog.cc:1491
+#: ../src/main/search_dialog.cc:1580
 msgid ""
 "\n"
 "Search on this module is now `multi word'."
 msgstr ""
+"\n"
+"Search on this module is now `multi word'."
 
-#: ../src/main/search_dialog.cc:1492
+#: ../src/main/search_dialog.cc:1581
 msgid ""
 "\n"
 "See the Module Manager, Maintenance pane."
 msgstr ""
+"\n"
+"See the Module Manager, Maintenance pane."
 
-#: ../src/main/search_dialog.cc:1553
+#: ../src/main/search_dialog.cc:1644
 msgid "Search finished"
-msgstr ""
+msgstr "Search finished"
 
-#: ../src/main/search_sidebar.cc:93
+#: ../src/main/search_sidebar.cc:100
 msgid "matches"
-msgstr ""
+msgstr "matches"
 
-#: ../src/main/settings.c:56
+#: ../src/main/settings.c:60
 msgid ""
 "Welcome to Xiphos.\n"
 "\n"
-"There are no Bible modules installed. In order to initialize, Xiphos needs "
-"you to install at least one Bible.\n"
+"There are no Bible modules installed. In order to initialize, Xiphos needs you to install at least one Bible.\n"
 "\n"
-"With your permission, Xiphos will invoke the Module Manager so that you may "
-"install from Crosswire:\n"
+"With your permission, Xiphos will invoke the Module Manager so that you may install from Crosswire:\n"
 "1. Configure remote install.\n"
 "2. Connect.\n"
 "3. Select a Bible text of your language preference.\n"
@@ -1668,11 +1888,9 @@ msgid ""
 msgstr ""
 "Welcome to Xiphos.\n"
 "\n"
-"There are no Bible modules installed. In order to initialize, Xiphos needs "
-"you to install at least one Bible.\n"
+"There are no Bible modules installed. In order to initialise, Xiphos needs you to install at least one Bible.\n"
 "\n"
-"With your permission, Xiphos will invoke the Module Manager so that you may "
-"install from Crosswire:\n"
+"With your permission, Xiphos will invoke the Module Manager so that you may install from Crosswire:\n"
 "1. Configure remote install.\n"
 "2. Connect.\n"
 "3. Select a Bible text of your language preference.\n"
@@ -1683,38 +1901,30 @@ msgstr ""
 "\n"
 "May Xiphos invoke the Module Manager so that you may install a Bible?"
 
-#: ../src/main/settings.c:109
+#: ../src/main/settings.c:105
 msgid "$HOME is not set!"
-msgstr ""
+msgstr "$HOME is not set!"
 
-#: ../src/main/settings.c:124
-msgid "Xiphos has renamed .xiphos-2.0 to .xiphos"
-msgstr ""
-
-#: ../src/main/settings.c:127
+#: ../src/main/settings.c:120
 #, c-format
 msgid ""
-"Xiphos can not rename  .xiphos-2.0 to .xiphos:\n"
+"Xiphos can not create  .xiphos:\n"
 "%s\n"
 "\n"
 "Xiphos cannot continue."
 msgstr ""
-
-#: ../src/main/settings.c:135
-#, c-format
-msgid ""
 "Xiphos can not create  .xiphos:\n"
 "%s\n"
 "\n"
 "Xiphos cannot continue."
-msgstr ""
 
-#: ../src/main/settings.c:148 ../src/main/settings.c:156
-#: ../src/main/settings.c:164
+#: ../src/main/settings.c:133
+#: ../src/main/settings.c:142
+#: ../src/main/settings.c:151
 msgid "can not create "
-msgstr ""
+msgstr "can not create "
 
-#: ../src/main/settings.c:196
+#: ../src/main/settings.c:194
 msgid ""
 "There are still no Bibles installed.\n"
 "Evidently, you declined to install any.\n"
@@ -1723,568 +1933,573 @@ msgid ""
 "Xiphos cannot proceed,\n"
 "and will now exit."
 msgstr ""
+"There are still no Bibles installed.\n"
+"Evidently, you declined to install any.\n"
+"\n"
+"Without any Bible modules to display,\n"
+"Xiphos cannot proceed,\n"
+"and will now exit."
 
-#: ../src/main/settings.c:200
+#: ../src/main/settings.c:198
 msgid "Bible module installation complete."
-msgstr ""
+msgstr "Bible module installation complete."
 
-#: ../src/main/settings.c:203
+#: ../src/main/settings.c:201
 msgid ""
 "Without any Bible modules to display,\n"
 "Xiphos cannot proceed,\n"
 "and will now exit."
 msgstr ""
+"Without any Bible modules to display,\n"
+"Xiphos cannot proceed,\n"
+"and will now exit."
 
-#. *****************************************************************************
-#. * Name
-#. *    gconf_setup
-#. *
-#. * Synopsis
-#. *   #include "main/settings.h"
-#. *
-#. *   void gconf_setup()
-#. *
-#. * Description
-#. *   verifies and initializes the GConf subsystem, so that "sword://" and
-#. *   similar can be handled by url-comprehending programs such as browsers.
-#. *   dialogs for permission/success/failure => conditional on debug build.
-#. *
-#. * Return value
-#. *   void
-#.
-#: ../src/main/settings.c:794
-msgid ""
-"URL references using \"sword://\" (similar to web page\n"
-"references) can be used by programs to look up\n"
-"scripture references. Your system currently has no\n"
-"program set to handle these references.\n"
-"\n"
-"Would you like Xiphos to set itself as the\n"
-"program to handle these references?"
-msgstr ""
-
-#: ../src/main/settings.c:796
-msgid ""
-"Xiphos has successfully set itself\n"
-"as the handler of sword:// and bible:// URLs.\n"
-"\n"
-"You may wish to run the program \"gconf-editor\"\n"
-"to examine keys under /desktop/gnome/url-handlers,\n"
-"if you need to change these."
-msgstr ""
-
-#: ../src/main/settings.c:849
-#, c-format
-msgid ""
-"Xiphos failed to complete handler init for key #%d:\n"
-"%s"
-msgstr ""
-
-#: ../src/main/sidebar.cc:376
+#: ../src/main/sidebar.cc:399
 msgid "verse"
-msgstr ""
+msgstr "verse"
 
-#: ../src/main/sidebar.cc:438
+#: ../src/main/sidebar.cc:461
 msgid "chapter"
-msgstr ""
+msgstr "chapter"
 
-#: ../src/main/sword.cc:546
+#: ../src/main/sword.cc:537
+#, fuzzy
 msgid ""
 "Xiphos's file for language\n"
 "abbreviations is missing."
 msgstr ""
+"Xiphos' file for language\n"
+"abbreviations is missing."
 
-#: ../src/main/sword.cc:553
+#: ../src/main/sword.cc:544
+#, fuzzy
 msgid ""
 "Xiphos's language abbreviation\n"
 "file cannot be opened."
 msgstr ""
+"Xiphos' language abbreviation\n"
+"file cannot be opened."
 
-#: ../src/main/sword.cc:566
+#: ../src/main/sword.cc:557
 msgid ""
 "Xiphos cannot allocate space\n"
 "for language abbreviations."
 msgstr ""
+"Xiphos cannot allocate space\n"
+"for language abbreviations."
 
-#: ../src/main/sword.cc:573
+#: ../src/main/sword.cc:564
 msgid ""
 "Xiphos cannot read the\n"
 "language abbreviation file."
 msgstr ""
+"Xiphos cannot read the\n"
+"language abbreviation file."
 
-#: ../src/main/sword.cc:1191
-msgid "Daily devotional was requested, but there are none installed."
-msgstr ""
+#: ../src/main/sword.cc:642
+msgid "No matching locale found for"
+msgstr "No matching locale found for"
 
-#: ../src/main/tab_history.c:92
-msgid "H_istory/<Separator>"
-msgstr ""
+#: ../src/main/sword.cc:644
+msgid "Book names and menus may not be translated"
+msgstr "Book names and menus may not be translated"
 
-#: ../src/main/tab_history.c:94
-msgid "H_istory/C_lear"
-msgstr ""
+#: ../src/main/sword.cc:1232
+msgid "Daily devotional was requested, but there are none installed."
+msgstr "Daily devotional was requested, but there are none installed."
 
 #: ../src/main/tab_history.c:219
 msgid "Clear History"
-msgstr ""
+msgstr "Clear History"
 
-#: ../src/main/url.cc:99
+#: ../src/main/url.cc:101
 msgid "URL not found:"
-msgstr ""
+msgstr "URL not found:"
 
-#: ../src/main/url.cc:194
+#: ../src/main/url.cc:191
 #, c-format
 msgid "Xiphos could not execute %s"
-msgstr ""
+msgstr "Xiphos could not execute %s"
 
-#: ../src/main/url.cc:202
+#: ../src/main/url.cc:199
 msgid "Viewer error:\n"
-msgstr ""
+msgstr "Viewer error:\n"
 
-#: ../src/main/url.cc:278
+#: ../src/main/url.cc:272
 #, c-format
 msgid "Show %s in main window"
-msgstr ""
+msgstr "Show %s in main window"
 
-#: ../src/main/xml.c:80 ../src/main/xml.c:464
+#: ../src/main/xml.c:80
+#: ../src/main/xml.c:464
 #, c-format
 msgid "Document not created successfully. \n"
-msgstr ""
+msgstr "Document not created successfully. \n"
 
 #: ../src/main/xml.c:89
 msgid "Personal"
-msgstr ""
+msgstr "Personal"
 
 #: ../src/main/xml.c:90
 msgid "What must I do to be saved?"
-msgstr ""
+msgstr "What must I do to be saved?"
 
-#: ../src/main/xml.c:92 ../src/main/xml.c:93
+#: ../src/main/xml.c:92
+#: ../src/main/xml.c:93
 msgid "Acts 16:31"
-msgstr ""
+msgstr "Acts 16:31"
 
-#: ../src/main/xml.c:97 ../src/main/xml.c:98
+#: ../src/main/xml.c:97
+#: ../src/main/xml.c:98
 msgid "Eph 2:8,9"
-msgstr ""
+msgstr "Eph 2:8,9"
 
-#: ../src/main/xml.c:102 ../src/main/xml.c:103
+#: ../src/main/xml.c:102
+#: ../src/main/xml.c:103
 msgid "Romans 1:16"
-msgstr ""
+msgstr "Romans 1:16"
 
 #: ../src/main/xml.c:106
 msgid "What is the Gospel?"
-msgstr ""
+msgstr "What is the Gospel?"
 
-#: ../src/main/xml.c:108 ../src/main/xml.c:109
+#: ../src/main/xml.c:108
+#: ../src/main/xml.c:109
 msgid "1 Cor 15:1-4"
-msgstr ""
+msgstr "1 Cor 15:1-4"
 
-#: ../src/main/xml.c:413 ../src/main/xml.c:1071
+#: ../src/main/xml.c:413
+#: ../src/main/xml.c:1144
 #, c-format
 msgid "Document not parsed successfully. \n"
-msgstr ""
+msgstr "Document not parsed successfully. \n"
 
-#: ../src/main/xml.c:419 ../src/main/xml.c:674 ../src/main/xml.c:952
-#: ../src/main/xml.c:1131
+#: ../src/main/xml.c:419
+#: ../src/main/xml.c:747
+#: ../src/main/xml.c:1025
+#: ../src/main/xml.c:1204
 #, c-format
 msgid "empty document \n"
-msgstr ""
+msgstr "empty document \n"
 
 #: ../src/main/xml.c:425
 #, c-format
 msgid "wrong type, root node != SwordBookmarks\n"
-msgstr ""
+msgstr "wrong type, root node != SwordBookmarks\n"
 
 #: ../src/main/xml.c:476
 msgid "Old Testament"
-msgstr ""
+msgstr "Old Testament"
 
 #: ../src/main/xml.c:477
 msgid "Gen - Mal"
-msgstr ""
+msgstr "Gen - Mal"
 
 #: ../src/main/xml.c:482
 msgid "New Testament"
-msgstr ""
+msgstr "New Testament"
 
 #: ../src/main/xml.c:483
 msgid "Mat - Rev"
-msgstr ""
+msgstr "Mat - Rev"
 
 #: ../src/main/xml.c:489
 msgid "Sample Module List"
-msgstr ""
+msgstr "Sample Module List"
 
-#: ../src/main/xml.c:680 ../src/main/xml.c:958
+#: ../src/main/xml.c:753
+#: ../src/main/xml.c:1031
 #, c-format
 msgid "wrong type, root node != %s\n"
-msgstr ""
+msgstr "wrong type, root node != %s\n"
 
 #: ../ui/bookmarks.glade.h:1
 msgid "Add Bookmark"
-msgstr ""
+msgstr "Add Bookmark"
 
-#: ../ui/bookmarks.glade.h:2 ../ui/markverse.glade.h:1
+#: ../ui/bookmarks.glade.h:2
+#: ../ui/markverse.glade.h:1
 msgid "Bookmark Dialog"
 msgstr "Bookmark Dialogue"
 
 #: ../ui/bookmarks.glade.h:3
 msgid "Bookmark Folder Treeview"
-msgstr ""
+msgstr "Bookmark Folder Treeview"
 
-#: ../ui/bookmarks.glade.h:4 ../ui/markverse.glade.h:2
+#: ../ui/bookmarks.glade.h:4
+#: ../ui/markverse.glade.h:2
 msgid "Cancel Bookmark"
-msgstr ""
+msgstr "Cancel Bookmark"
 
-#: ../ui/bookmarks.glade.h:5 ../ui/markverse.glade.h:3
+#: ../ui/bookmarks.glade.h:5
+#: ../ui/markverse.glade.h:3
 msgid "Create new folder"
-msgstr ""
+msgstr "Create new folder"
 
 #: ../ui/bookmarks.glade.h:6
 msgid "Label Entry"
-msgstr ""
+msgstr "Label Entry"
 
 #: ../ui/bookmarks.glade.h:7
 msgid "Label:"
-msgstr ""
+msgstr "Label:"
 
-#: ../ui/bookmarks.glade.h:8 ../ui/markverse.glade.h:6
+#: ../ui/bookmarks.glade.h:8
+#: ../ui/markverse.glade.h:6
 msgid "Module Entry"
-msgstr ""
+msgstr "Module Entry"
 
-#: ../ui/bookmarks.glade.h:9 ../ui/markverse.glade.h:7
+#: ../ui/bookmarks.glade.h:9
+#: ../ui/markverse.glade.h:7
 msgid "Module:"
-msgstr ""
+msgstr "Module:"
 
 #: ../ui/bookmarks.glade.h:10
 msgid "New ..."
-msgstr ""
+msgstr "New ..."
 
-#: ../ui/bookmarks.glade.h:11 ../ui/markverse.glade.h:8
-#: ../ui/xi-menus.glade.h:42
+#: ../ui/bookmarks.glade.h:11
+#: ../ui/markverse.glade.h:8
+#: ../ui/xi-menus.glade.h:56
 msgid "New Folder"
-msgstr ""
+msgstr "New Folder"
 
-#: ../ui/bookmarks.glade.h:12 ../ui/markverse.glade.h:10
+#: ../ui/bookmarks.glade.h:12
+#: ../ui/markverse.glade.h:10
 msgid "Verse Entry"
-msgstr ""
+msgstr "Verse Entry"
 
-#: ../ui/bookmarks.glade.h:13 ../ui/markverse.glade.h:11
+#: ../ui/bookmarks.glade.h:13
+#: ../ui/markverse.glade.h:11
 msgid "Verse:"
-msgstr ""
+msgstr "Verse:"
 
 #: ../ui/editor_note.xml.h:1
 msgid "Delete the current note"
-msgstr ""
+msgstr "Delete the current note"
 
-#: ../ui/editor_note.xml.h:2 ../ui/editor_studypad.xml.h:4
+#: ../ui/editor_note.xml.h:2
+#: ../ui/editor_studypad.xml.h:4
 #: ../ui/editor.xml.h:2
 msgid "E_xit"
-msgstr ""
+msgstr "E_xit"
 
-#: ../ui/editor_note.xml.h:3 ../ui/editor_studypad.xml.h:5
+#: ../ui/editor_note.xml.h:3
+#: ../ui/editor_studypad.xml.h:5
 #: ../ui/editor.xml.h:3
 msgid "Exit"
-msgstr ""
+msgstr "Exit"
 
-#: ../ui/editor_note.xml.h:4 ../ui/editor_studypad.xml.h:6
+#: ../ui/editor_note.xml.h:4
+#: ../ui/editor_studypad.xml.h:6
 #: ../ui/editor.xml.h:4
 msgid "Exit the program"
-msgstr ""
+msgstr "Exit the program"
 
-#: ../ui/editor_note.xml.h:5 ../ui/editor_studypad.xml.h:7
+#: ../ui/editor_note.xml.h:5
+#: ../ui/editor_studypad.xml.h:7
 #: ../ui/editor.xml.h:5
 msgid "For_mat"
-msgstr ""
+msgstr "For_mat"
 
-#: ../ui/editor_note.xml.h:6 ../ui/editor_studypad.xml.h:8
+#: ../ui/editor_note.xml.h:6
+#: ../ui/editor_studypad.xml.h:8
 #: ../ui/editor.xml.h:6
 msgid "HTML Format switch"
-msgstr ""
+msgstr "HTML Format switch"
 
-#: ../ui/editor_note.xml.h:7 ../ui/editor_studypad.xml.h:9
+#: ../ui/editor_note.xml.h:7
+#: ../ui/editor_studypad.xml.h:9
 #: ../ui/editor.xml.h:7
 msgid "HTML mode"
-msgstr ""
+msgstr "HTML mode"
 
 #: ../ui/editor_note.xml.h:8
 msgid "Preview the note to be printed"
-msgstr ""
+msgstr "Preview the note to be printed"
 
 #: ../ui/editor_note.xml.h:10
 msgid "Print this note"
-msgstr ""
+msgstr "Print this note"
 
 #: ../ui/editor_note.xml.h:12
 msgid "Save the current note"
-msgstr ""
+msgstr "Save the current note"
 
 #: ../ui/editor_note.xml.h:13
 msgid "_Delete Personal Comment"
-msgstr ""
+msgstr "_Delete Personal Comment"
 
 #: ../ui/editor_note.xml.h:16
 msgid "_Save (Personal Comment)"
-msgstr ""
+msgstr "_Save (Personal Comment)"
 
 #: ../ui/editor_studypad.xml.h:1
 msgid "Add this file to your bookmarks"
-msgstr ""
+msgstr "Add this file to your bookmarks"
 
-#: ../ui/editor_studypad.xml.h:3 ../ui/editor.xml.h:1
+#: ../ui/editor_studypad.xml.h:3
+#: ../ui/editor.xml.h:1
 msgid "Create a new document"
-msgstr ""
+msgstr "Create a new document"
 
-#: ../ui/editor_studypad.xml.h:10 ../ui/editor.xml.h:8
+#: ../ui/editor_studypad.xml.h:10
+#: ../ui/editor.xml.h:8
 msgid "New Document"
-msgstr ""
+msgstr "New Document"
 
-#: ../ui/editor_studypad.xml.h:11 ../ui/editor.xml.h:9
+#: ../ui/editor_studypad.xml.h:11
+#: ../ui/editor.xml.h:9
 msgid "Open"
-msgstr ""
+msgstr "Open"
 
 #: ../ui/editor_studypad.xml.h:12
 msgid "Open a file in Studypad"
-msgstr ""
+msgstr "Open a file in Studypad"
 
 #: ../ui/editor_studypad.xml.h:13
 msgid "Preview the document to be printed"
-msgstr ""
+msgstr "Preview the document to be printed"
 
 #: ../ui/editor_studypad.xml.h:15
 msgid "Print this document"
-msgstr ""
+msgstr "Print this document"
 
 #: ../ui/editor_studypad.xml.h:17
 msgid "Save AS"
-msgstr ""
+msgstr "Save AS"
 
-#: ../ui/editor_studypad.xml.h:18 ../ui/editor.xml.h:12
+#: ../ui/editor_studypad.xml.h:18
+#: ../ui/editor.xml.h:12
 msgid "Save the current file"
-msgstr ""
+msgstr "Save the current file"
 
 #: ../ui/editor_studypad.xml.h:19
 msgid "Save the current file as"
-msgstr ""
+msgstr "Save the current file as"
 
 #: ../ui/editor.xml.h:10
 msgid "Open the file in Studypad"
-msgstr ""
+msgstr "Open the file in Studypad"
 
 #: ../ui/export-dialog.glade.h:1
 msgid ": "
-msgstr ""
+msgstr ": "
 
 #: ../ui/export-dialog.glade.h:2
 msgid "<b>Copy</b>"
-msgstr ""
+msgstr "<b>Copy</b>"
 
 #: ../ui/export-dialog.glade.h:3
 msgid "<b>Export</b>"
-msgstr ""
+msgstr "<b>Export</b>"
 
 #: ../ui/export-dialog.glade.h:4
 msgid "<b>Format</b>"
-msgstr ""
+msgstr "<b>Format</b>"
 
-#: ../ui/export-dialog.glade.h:5 ../ui/prefs.glade.h:25
+#: ../ui/export-dialog.glade.h:5
+#: ../ui/prefs.glade.h:25
 msgid "Book"
-msgstr ""
+msgstr "Book"
 
 #: ../ui/export-dialog.glade.h:6
 msgid "Book Radio Button"
-msgstr ""
+msgstr "Book Radio Button"
 
 #: ../ui/export-dialog.glade.h:8
 msgid "Chapter Radio Button"
-msgstr ""
+msgstr "Chapter Radio Button"
 
-#: ../ui/export-dialog.glade.h:9 ../ui/xi-menus.glade.h:14
+#: ../ui/export-dialog.glade.h:9
+#: ../ui/xi-menus.glade.h:18
 msgid "Copy/Export Passage"
-msgstr ""
+msgstr "Copy/Export Passage"
 
 #: ../ui/export-dialog.glade.h:10
 msgid "Export Passage Cancel"
-msgstr ""
+msgstr "Export Passage Cancel"
 
 #: ../ui/export-dialog.glade.h:11
 msgid "Export Passage OK"
-msgstr ""
+msgstr "Export Passage OK"
 
 #: ../ui/export-dialog.glade.h:12
 msgid "Export complete book"
-msgstr ""
+msgstr "Export complete book"
 
 #: ../ui/export-dialog.glade.h:13
 msgid "Export complete chapter"
-msgstr ""
+msgstr "Export complete chapter"
 
 #: ../ui/export-dialog.glade.h:14
 msgid "Export single verse"
-msgstr ""
+msgstr "Export single verse"
 
 #: ../ui/export-dialog.glade.h:15
 msgid "HTML"
-msgstr ""
+msgstr "HTML"
 
 #: ../ui/export-dialog.glade.h:16
 msgid "HTML Radio Button"
-msgstr ""
+msgstr "HTML Radio Button"
 
 #: ../ui/export-dialog.glade.h:17
 msgid "Key"
-msgstr ""
+msgstr "Key"
 
 #: ../ui/export-dialog.glade.h:18
 msgid "Plain Text"
-msgstr ""
+msgstr "Plain Text"
 
 #: ../ui/export-dialog.glade.h:19
 msgid "Plain Text Radio Button"
-msgstr ""
+msgstr "Plain Text Radio Button"
 
 #: ../ui/export-dialog.glade.h:21
 msgid "Save Export As"
-msgstr ""
+msgstr "Save Export As"
 
 #: ../ui/export-dialog.glade.h:22
 msgid "Verse"
-msgstr ""
+msgstr "Verse"
 
 #: ../ui/export-dialog.glade.h:23
 msgid "Verse Radio Button"
-msgstr ""
+msgstr "Verse Radio Button"
 
 #: ../ui/export-dialog.glade.h:24
 msgid "Verse range"
-msgstr ""
+msgstr "Verse range"
 
 #: ../ui/export-dialog.glade.h:25
 msgid "Version"
-msgstr ""
+msgstr "Version"
 
 #: ../ui/markverse.glade.h:4
 msgid "Mark"
-msgstr ""
+msgstr "Mark"
 
 #: ../ui/markverse.glade.h:5
 msgid "Mark/Unmark Verse"
-msgstr ""
+msgstr "Mark/Unmark Verse"
 
 #: ../ui/markverse.glade.h:9
 msgid "Unmark"
-msgstr ""
+msgstr "Unmark"
 
 #: ../ui/module-manager.glade.h:1
 msgid "<b>Add and Remove Sources</b>"
-msgstr ""
+msgstr "<b>Add and Remove Sources</b>"
 
 #: ../ui/module-manager.glade.h:2
 msgid "<b>Install Destination</b>"
-msgstr ""
+msgstr "<b>Install Destination</b>"
 
 #: ../ui/module-manager.glade.h:3
 msgid "<b>Install Source</b>"
-msgstr ""
+msgstr "<b>Install Source</b>"
 
 #: ../ui/module-manager.glade.h:4
 msgid "<b>Module Manager</b>"
-msgstr ""
+msgstr "<b>Module Manager</b>"
 
 #. do not translate <b> and </b> they are html formating
 #: ../ui/module-manager.glade.h:6
 msgid "<b>Sword</b>"
-msgstr ""
+msgstr "<b>Sword</b>"
 
 #: ../ui/module-manager.glade.h:7
 msgid "<b>WARNING:</b> If you live in a persecuted country use with care."
-msgstr ""
+msgstr "<b>WARNING:</b> If you live in a persecuted country use with care."
 
 #: ../ui/module-manager.glade.h:8
-msgid ""
-"<b>Warning:</b> If you live in a persecuted country and do not wish to risk "
-"detection you should NOT use  the remote installation feature! "
-msgstr ""
+msgid "<b>Warning:</b> If you live in a persecuted country and do not wish to risk detection you should NOT use  the remote installation feature! "
+msgstr "<b>Warning:</b> If you live in a persecuted country and do not wish to risk detection you should NOT use  the remote installation feature! "
 
 #: ../ui/module-manager.glade.h:9
 msgid "<i>Personal area, for your use only:</i>"
-msgstr ""
+msgstr "<i>Personal area, for your use only:</i>"
 
 #: ../ui/module-manager.glade.h:10
 msgid "<i>System area, for all users:</i>"
-msgstr ""
+msgstr "<i>System area, for all users:</i>"
 
-#: ../ui/module-manager.glade.h:11
+#: ../ui/module-manager.glade.h:12
 msgid "Continue"
-msgstr ""
+msgstr "Continue"
 
-#: ../ui/module-manager.glade.h:12
+#: ../ui/module-manager.glade.h:13
 msgid "Current Remote Sources"
-msgstr ""
+msgstr "Current Remote Sources"
 
-#: ../ui/module-manager.glade.h:13
+#: ../ui/module-manager.glade.h:14
 msgid "Current local sources"
-msgstr ""
+msgstr "Current local sources"
 
-#: ../ui/module-manager.glade.h:14
-msgid "Home dir"
-msgstr ""
+#: ../ui/module-manager.glade.h:15
+msgid "Delete Index"
+msgstr "Delete Index"
 
 #: ../ui/module-manager.glade.h:16
+msgid "Home dir"
+msgstr "Home dir"
+
+#: ../ui/module-manager.glade.h:19
 msgid "Load Standard"
-msgstr ""
+msgstr "Load Standard"
 
-#: ../ui/module-manager.glade.h:17
+#: ../ui/module-manager.glade.h:20
 msgid "Local"
-msgstr ""
+msgstr "Local"
 
-#: ../ui/module-manager.glade.h:18
+#: ../ui/module-manager.glade.h:21
 msgid "Local Install Folder"
-msgstr ""
+msgstr "Local Install Folder"
 
-#: ../ui/module-manager.glade.h:19
+#: ../ui/module-manager.glade.h:22
 msgid "Module Manager"
-msgstr ""
+msgstr "Module Manager"
 
-#: ../ui/module-manager.glade.h:20
+#: ../ui/module-manager.glade.h:23
 msgid "Remote"
-msgstr ""
+msgstr "Remote"
 
-#: ../ui/module-manager.glade.h:21
+#: ../ui/module-manager.glade.h:24
 msgid "Sword sys dir"
-msgstr ""
+msgstr "Sword sys dir"
 
 #: ../ui/navbar_versekey.glade.h:1
 msgid "1"
-msgstr ""
+msgstr "1"
 
 #: ../ui/navbar_versekey.glade.h:2
 msgid "<b>Revelation of John</b>"
-msgstr ""
+msgstr "<b>Revelation of John</b>"
 
 #: ../ui/navbar_versekey.glade.h:3
 msgid "Book Selector Button"
-msgstr ""
+msgstr "Book Selector Button"
 
 #: ../ui/navbar_versekey.glade.h:4
 msgid "Choose book to display"
-msgstr ""
+msgstr "Choose book to display"
 
 #: ../ui/navbar_versekey.glade.h:5
 msgid "Drop down history list"
-msgstr ""
+msgstr "Drop down history list"
 
 #: ../ui/navbar_versekey.glade.h:6
 msgid "Reference Entry"
-msgstr ""
+msgstr "Reference Entry"
 
 #: ../ui/navbar_versekey.glade.h:7
 msgid "Toggle Chapter Button"
-msgstr ""
+msgstr "Toggle Chapter Button"
 
 #: ../ui/navbar_versekey.glade.h:8
 msgid "Toggle Verse Button"
-msgstr ""
+msgstr "Toggle Verse Button"
 
 #: ../ui/prefs.glade.h:1
 msgid ""
@@ -2297,6 +2512,14 @@ msgid ""
 "+4\n"
 "+5"
 msgstr ""
+"-2\n"
+"-1\n"
+"+0\n"
+"+1\n"
+"+2\n"
+"+3\n"
+"+4\n"
+"+5"
 
 #: ../ui/prefs.glade.h:9
 msgid "<b>Font Colors</b>"
@@ -2304,137 +2527,135 @@ msgstr "<b>Font Colours</b>"
 
 #: ../ui/prefs.glade.h:10
 msgid "<b>Font Sizes</b>"
-msgstr ""
+msgstr "<b>Font Sizes</b>"
 
 #: ../ui/prefs.glade.h:11
 msgid "<b>General</b>"
-msgstr ""
+msgstr "<b>General</b>"
 
 #: ../ui/prefs.glade.h:12
 msgid "<b>Main Window Modules</b>"
-msgstr ""
+msgstr "<b>Main Window Modules</b>"
 
 #: ../ui/prefs.glade.h:13
 msgid "<b>Parallel View</b>"
-msgstr ""
+msgstr "<b>Parallel View</b>"
 
 #: ../ui/prefs.glade.h:14
 msgid "<b>Show</b>"
-msgstr ""
+msgstr "<b>Show</b>"
 
 #: ../ui/prefs.glade.h:15
 msgid "<b>Special Purpose Modules</b>"
-msgstr ""
+msgstr "<b>Special Purpose Modules</b>"
 
 #: ../ui/prefs.glade.h:16
 msgid "<b>StudyPad default directory</b>"
-msgstr ""
+msgstr "<b>StudyPad default directory</b>"
 
 #: ../ui/prefs.glade.h:17
 msgid "<b>Tabs</b>"
-msgstr ""
+msgstr "<b>Tabs</b>"
 
 #: ../ui/prefs.glade.h:18
 msgid "Apply high-contrast highlight to current verse"
-msgstr ""
+msgstr "Apply high-contrast highlight to current verse"
 
 #: ../ui/prefs.glade.h:19
-msgid ""
-"Automatically resize commentary, book, and dictionary image content to fit "
-"subwindow"
-msgstr ""
+msgid "Automatically resize commentary, book, and dictionary image content to fit subwindow"
+msgstr "Automatically resize commentary, book, and dictionary image content to fit subwindow"
 
 #: ../ui/prefs.glade.h:20
 msgid "Background"
-msgstr ""
+msgstr "Background"
 
 #: ../ui/prefs.glade.h:21
 msgid "Base font size"
-msgstr ""
+msgstr "Base font size"
 
 #: ../ui/prefs.glade.h:22
 msgid "Bible Texts"
-msgstr ""
+msgstr "Bible Texts"
 
 #: ../ui/prefs.glade.h:23
 msgid "Bible Texts Checkbox"
-msgstr ""
+msgstr "Bible Texts Tickbox"
 
 #: ../ui/prefs.glade.h:24
 msgid "Biblical Text"
-msgstr ""
+msgstr "Biblical Text"
 
 #: ../ui/prefs.glade.h:26
 msgid "Change Biblical Text Combo"
-msgstr ""
+msgstr "Change Biblical Text Combo"
 
 #: ../ui/prefs.glade.h:27
 msgid "Change Book Combo"
-msgstr ""
+msgstr "Change Book Combo"
 
 #: ../ui/prefs.glade.h:28
 msgid "Change Commentary Combo"
-msgstr ""
+msgstr "Change Commentary Combo"
 
 #: ../ui/prefs.glade.h:29
 msgid "Change Default Dictionary Combo"
-msgstr ""
+msgstr "Change Default Dictionary Combo"
 
 #: ../ui/prefs.glade.h:30
 msgid "Change Dictionary Combo"
-msgstr ""
+msgstr "Change Dictionary Combo"
 
 #: ../ui/prefs.glade.h:31
 msgid "Change Personal Notes Combo"
-msgstr ""
+msgstr "Change Personal Notes Combo"
 
 #: ../ui/prefs.glade.h:32
 msgid "Choose to enable Prayer lists "
-msgstr ""
+msgstr "Choose to enable Prayer lists "
 
 #: ../ui/prefs.glade.h:34
 msgid "Commentaries Checkbox"
-msgstr ""
+msgstr "Commentaries Tickkbox"
 
 #: ../ui/prefs.glade.h:36
 msgid "Cover"
-msgstr ""
+msgstr "Cover"
 
 #: ../ui/prefs.glade.h:37
 msgid "Current Verse"
-msgstr ""
+msgstr "Current Verse"
 
 #: ../ui/prefs.glade.h:38
 msgid "Daily Devotional"
-msgstr ""
+msgstr "Daily Devotional"
 
 #: ../ui/prefs.glade.h:39
 msgid "Daily Devotional Combo"
-msgstr ""
+msgstr "Daily Devotional Combo"
 
 #: ../ui/prefs.glade.h:40
 msgid "Default Dictionary"
-msgstr ""
+msgstr "Default Dictionary"
 
 #: ../ui/prefs.glade.h:41
 msgid "Dictionary"
-msgstr ""
+msgstr "Dictionary"
 
 #: ../ui/prefs.glade.h:42
 msgid "Dictionary/Lexicon"
-msgstr ""
+msgstr "Dictionary/Lexicon"
 
 #: ../ui/prefs.glade.h:43
 msgid "Dictionary/Lexicon Checkbox"
-msgstr ""
+msgstr "Dictionary/Lexicon Tickkbox"
 
 #: ../ui/prefs.glade.h:44
 msgid "Enable Prayer Lists"
-msgstr ""
+msgstr "Enable Prayer Lists"
 
 #: ../ui/prefs.glade.h:45
 msgid "Enable Prayer Lists Checkbox"
-msgstr ""
+msgstr "Enable Prayer Lists Tickkbox"
 
 #: ../ui/prefs.glade.h:46
 msgid "Font Colors"
@@ -2442,586 +2663,609 @@ msgstr "Font Colours"
 
 #: ../ui/prefs.glade.h:47
 msgid "Font Misc"
-msgstr ""
+msgstr "Font Misc"
 
 #: ../ui/prefs.glade.h:48
 msgid "Foreground"
-msgstr ""
+msgstr "Foreground"
 
 #: ../ui/prefs.glade.h:49
 msgid "General Misc"
-msgstr ""
+msgstr "General Misc"
 
 #: ../ui/prefs.glade.h:50
 msgid "Greek Lexicon"
-msgstr ""
+msgstr "Greek Lexicon"
 
 #: ../ui/prefs.glade.h:51
 msgid "Greek Lexicon Combo"
-msgstr ""
+msgstr "Greek Lexicon Combo"
 
 #: ../ui/prefs.glade.h:52
 msgid "Hebrew Lexicon"
-msgstr ""
+msgstr "Hebrew Lexicon"
 
 #: ../ui/prefs.glade.h:53
 msgid "Hebrew Lexicon Combo"
-msgstr ""
+msgstr "Hebrew Lexicon Combo"
 
 #: ../ui/prefs.glade.h:54
 msgid "Highlight Background"
-msgstr ""
+msgstr "Highlight Background"
 
 #: ../ui/prefs.glade.h:55
 msgid "Highlight Foreground"
-msgstr ""
+msgstr "Highlight Foreground"
 
 #: ../ui/prefs.glade.h:56
 msgid "Highlight current verse"
-msgstr ""
+msgstr "Highlight current verse"
 
 #: ../ui/prefs.glade.h:57
 msgid "Highlight current verse check box"
-msgstr ""
+msgstr "Highlight current verse tick box"
 
 #: ../ui/prefs.glade.h:58
 msgid "Links"
-msgstr ""
+msgstr "Links"
 
 #: ../ui/prefs.glade.h:59
 msgid "Modules Main"
-msgstr ""
+msgstr "Modules Main"
 
 #: ../ui/prefs.glade.h:60
 msgid "Modules Misc"
-msgstr ""
+msgstr "Modules Misc"
 
 #: ../ui/prefs.glade.h:61
 msgid "Modules Parallel"
-msgstr ""
+msgstr "Modules Parallel"
 
 #: ../ui/prefs.glade.h:62
 msgid "Parallel 1"
-msgstr ""
+msgstr "Parallel 1"
 
 #: ../ui/prefs.glade.h:63
 msgid "Parallel 1 Combo"
-msgstr ""
+msgstr "Parallel 1 Combo"
 
 #: ../ui/prefs.glade.h:64
 msgid "Parallel 2"
-msgstr ""
+msgstr "Parallel 2"
 
 #: ../ui/prefs.glade.h:65
 msgid "Parallel 2 Combo"
-msgstr ""
+msgstr "Parallel 2 Combo"
 
 #: ../ui/prefs.glade.h:66
 msgid "Parallel 3"
-msgstr ""
+msgstr "Parallel 3"
 
 #: ../ui/prefs.glade.h:67
 msgid "Parallel 3 Combo"
-msgstr ""
+msgstr "Parallel 3 Combo"
 
 #: ../ui/prefs.glade.h:68
 msgid "Parallel 4"
-msgstr ""
+msgstr "Parallel 4"
 
 #: ../ui/prefs.glade.h:69
 msgid "Parallel 4 Combo"
-msgstr ""
+msgstr "Parallel 4 Combo"
 
 #: ../ui/prefs.glade.h:70
 msgid "Parallel 5"
-msgstr ""
+msgstr "Parallel 5"
 
 #: ../ui/prefs.glade.h:71
 msgid "Parallel 5 Combo"
-msgstr ""
+msgstr "Parallel 5 Combo"
 
 #: ../ui/prefs.glade.h:72
 msgid "Parallel View in a tab"
-msgstr ""
+msgstr "Parallel View in a tab"
 
 #: ../ui/prefs.glade.h:73
 msgid "Personal Notes"
-msgstr ""
+msgstr "Personal Notes"
 
 #: ../ui/prefs.glade.h:76
 msgid "Previewer Checkbox"
-msgstr ""
+msgstr "Previewer Tickbox"
 
 #: ../ui/prefs.glade.h:77
 msgid "Resize images"
-msgstr ""
+msgstr "Resize images"
 
 #: ../ui/prefs.glade.h:78
 msgid "Resize images checkbox"
-msgstr ""
+msgstr "Resize images tickbox"
 
 #: ../ui/prefs.glade.h:79
 msgid "Scroll to Previous/Next Chapter"
-msgstr ""
+msgstr "Scroll to Previous/Next Chapter"
 
 #: ../ui/prefs.glade.h:80
 msgid "Scroll to Previous/Next Chapter Checkbox"
-msgstr ""
+msgstr "Scroll to Previous/Next Chapter Tickbox"
 
 #: ../ui/prefs.glade.h:81
 msgid "Select A Directory"
-msgstr ""
+msgstr "Select A Directory"
 
 #: ../ui/prefs.glade.h:82
 msgid "Show Daily Devotion at start up"
-msgstr ""
+msgstr "Show Daily Devotion at start up"
 
 #: ../ui/prefs.glade.h:83
 msgid "Show splash screen at start up"
-msgstr ""
+msgstr "Show splash screen at start up"
 
 #: ../ui/prefs.glade.h:84
-msgid "StudyPad default directory combo"
-msgstr ""
+msgid "Special Locale (requires restart)"
+msgstr "Special Locale (requires restart)"
+
+#: ../ui/prefs.glade.h:85
+msgid "Special Locale Combo"
+msgstr "Special Locale Combo"
 
 #: ../ui/prefs.glade.h:86
+msgid "StudyPad default directory combo"
+msgstr "StudyPad default directory combo"
+
+#: ../ui/prefs.glade.h:88
 msgid "Use Bible Text scroll bar to scroll to previous or next chapter"
-msgstr ""
+msgstr "Use Bible Text scroll bar to scroll to previous or next chapter"
 
-#: ../ui/prefs.glade.h:87
+#: ../ui/prefs.glade.h:89
 msgid "Use Verse Per Line"
-msgstr ""
+msgstr "Use Verse Per Line"
 
-#: ../ui/prefs.glade.h:88
+#: ../ui/prefs.glade.h:90
 msgid "Use Verse Per Line Checkbox"
-msgstr ""
+msgstr "Use Verse Per Line Tickbox"
 
-#: ../ui/prefs.glade.h:89
+#: ../ui/prefs.glade.h:91
 msgid "Use default Dictionary"
-msgstr ""
+msgstr "Use default Dictionary"
 
-#: ../ui/prefs.glade.h:90
+#: ../ui/prefs.glade.h:92
 msgid "Use default Dictionary Checkbox"
-msgstr ""
+msgstr "Use default Dictionary Tickbox"
 
-#: ../ui/prefs.glade.h:91
+#: ../ui/prefs.glade.h:93
 msgid "Use tabbed browsing"
-msgstr ""
+msgstr "Use tabbed browsing"
 
-#: ../ui/prefs.glade.h:92
+#: ../ui/prefs.glade.h:94
 msgid "Use tabbed browsing Checkbox"
-msgstr ""
+msgstr "Use tabbed browsing Tickbox"
 
-#: ../ui/prefs.glade.h:93
+#: ../ui/prefs.glade.h:95
+msgid "Verse Number"
+msgstr "Verse Number"
+
+#: ../ui/prefs.glade.h:96
 msgid "Verse number size"
-msgstr ""
+msgstr "Verse number size"
 
 #: ../ui/search-dialog.glade.h:1
 msgid "<b>Attribute</b>"
-msgstr ""
+msgstr "<b>Attribute</b>"
 
 #: ../ui/search-dialog.glade.h:2
 msgid "<b>Found</b>"
-msgstr ""
+msgstr "<b>Found</b>"
 
 #: ../ui/search-dialog.glade.h:3
 msgid "<b>List Name</b>"
-msgstr ""
+msgstr "<b>List Name</b>"
 
 #: ../ui/search-dialog.glade.h:4
 msgid "<b>Module Lists</b>"
-msgstr ""
+msgstr "<b>Module Lists</b>"
 
 #: ../ui/search-dialog.glade.h:5
 msgid "<b>Modules</b>"
-msgstr ""
+msgstr "<b>Modules</b>"
 
 #: ../ui/search-dialog.glade.h:6
 msgid "<b>Options</b>"
-msgstr ""
+msgstr "<b>Options</b>"
 
 #: ../ui/search-dialog.glade.h:7
 msgid "<b>Preview</b>"
-msgstr ""
+msgstr "<b>Preview</b>"
 
 #: ../ui/search-dialog.glade.h:8
 msgid "<b>Range Definition</b>"
-msgstr ""
+msgstr "<b>Range Definition</b>"
 
 #: ../ui/search-dialog.glade.h:9
 msgid "<b>Range Name</b>"
-msgstr ""
+msgstr "<b>Range Name</b>"
 
 #: ../ui/search-dialog.glade.h:10
 msgid "<b>Ranges</b>"
-msgstr ""
+msgstr "<b>Ranges</b>"
 
 #: ../ui/search-dialog.glade.h:11
 msgid "<b>Results Display Options</b>"
-msgstr ""
+msgstr "<b>Results Display Options</b>"
 
 #: ../ui/search-dialog.glade.h:12
 msgid "<b>Scope</b>"
-msgstr ""
+msgstr "<b>Scope</b>"
 
 #: ../ui/search-dialog.glade.h:13
 msgid "<b>Search Results</b>"
-msgstr ""
+msgstr "<b>Search Results</b>"
 
 #: ../ui/search-dialog.glade.h:14
 msgid "<b>Search Type</b>"
-msgstr ""
+msgstr "<b>Search Type</b>"
 
 #: ../ui/search-dialog.glade.h:15
 msgid "Add Modules"
-msgstr ""
+msgstr "Add Modules"
 
 #: ../ui/search-dialog.glade.h:16
 msgid "Advanced Search"
-msgstr ""
+msgstr "Advanced Search"
 
 #: ../ui/search-dialog.glade.h:17
 msgid "Attribute Search"
-msgstr ""
+msgstr "Attribute Search"
 
 #: ../ui/search-dialog.glade.h:18
 msgid "Attributes"
-msgstr ""
+msgstr "Attributes"
 
 #: ../ui/search-dialog.glade.h:19
 msgid "Attributes radiobutton"
-msgstr ""
+msgstr "Attributes radiobutton"
 
 #: ../ui/search-dialog.glade.h:20
 msgid "Clear Custom Module List Button"
-msgstr ""
+msgstr "Clear Custom Module List Button"
 
 #: ../ui/search-dialog.glade.h:21
 msgid "Clear Modules from List Button"
-msgstr ""
+msgstr "Clear Modules from List Button"
 
 #: ../ui/search-dialog.glade.h:22
 msgid "Clear all modules from the list"
-msgstr ""
+msgstr "Clear all modules from the list"
 
 #: ../ui/search-dialog.glade.h:23
 msgid "Clear lists for new search"
-msgstr ""
+msgstr "Clear lists for new search"
 
 #: ../ui/search-dialog.glade.h:24
 msgid "Create a new module list"
-msgstr ""
+msgstr "Create a new module list"
 
 #: ../ui/search-dialog.glade.h:25
 msgid "Create new custom range"
-msgstr ""
+msgstr "Create new custom range"
 
 #: ../ui/search-dialog.glade.h:26
 msgid "Current results"
-msgstr ""
+msgstr "Current results"
 
 #: ../ui/search-dialog.glade.h:27
 msgid "Current results radiobutton"
-msgstr ""
+msgstr "Current results radiobutton"
 
 #: ../ui/search-dialog.glade.h:28
 msgid "Custom Module List Combo"
-msgstr ""
+msgstr "Custom Module List Combo"
 
 #: ../ui/search-dialog.glade.h:29
 msgid "Custom Module List Name Entry"
-msgstr ""
+msgstr "Custom Module List Name Entry"
 
 #: ../ui/search-dialog.glade.h:30
 msgid "Custom Module Lists"
-msgstr ""
+msgstr "Custom Module Lists"
 
 #: ../ui/search-dialog.glade.h:31
 msgid "Custom Range Preview"
-msgstr ""
+msgstr "Custom Range Preview"
 
 #: ../ui/search-dialog.glade.h:32
 msgid "Custom Range Selector Combo"
-msgstr ""
+msgstr "Custom Range Selector Combo"
 
 #: ../ui/search-dialog.glade.h:33
 msgid "Custom Verse Ranges"
-msgstr ""
+msgstr "Custom Verse Ranges"
 
 #: ../ui/search-dialog.glade.h:34
 msgid "Custom module list"
-msgstr ""
+msgstr "Custom module list"
 
 #: ../ui/search-dialog.glade.h:35
 msgid "Custom module list radiobutton"
-msgstr ""
+msgstr "Custom module list radiobutton"
 
 #: ../ui/search-dialog.glade.h:36
 msgid "Custom verse range"
-msgstr ""
+msgstr "Custom verse range"
 
 #: ../ui/search-dialog.glade.h:37
 msgid "Custom verse range radiobutton"
-msgstr ""
+msgstr "Custom verse range radiobutton"
 
 #: ../ui/search-dialog.glade.h:38
 msgid "Delete Range Button"
-msgstr ""
+msgstr "Delete Range Button"
 
 #: ../ui/search-dialog.glade.h:39
 msgid "Delete Selected Module From List Button"
-msgstr ""
+msgstr "Delete Selected Module From List Button"
 
 #: ../ui/search-dialog.glade.h:40
 msgid "Delete selected range"
-msgstr ""
+msgstr "Delete selected range"
 
 #: ../ui/search-dialog.glade.h:41
 msgid "Delete the selected list"
-msgstr ""
+msgstr "Delete the selected list"
 
 #: ../ui/search-dialog.glade.h:42
 msgid "Entire module"
-msgstr ""
+msgstr "Entire module"
 
 #: ../ui/search-dialog.glade.h:43
 msgid "Entire module radiobutton"
-msgstr ""
+msgstr "Entire module radiobutton"
 
 #: ../ui/search-dialog.glade.h:45
 msgid "Exact phrase radiobutton"
-msgstr ""
+msgstr "Exact phrase radiobutton"
 
 #: ../ui/search-dialog.glade.h:46
+msgid "Export"
+msgstr "Export"
+
+#: ../ui/search-dialog.glade.h:47
+msgid "Export current search results"
+msgstr "Export current search results"
+
+#: ../ui/search-dialog.glade.h:48
 msgid ""
 "Fast, featureful, index-based search\n"
 "Indexes must have been built beforehand:\n"
 "See Module Manager's maintenance functions"
 msgstr ""
+"Fast, feature rich, index-based search\n"
+"Indexes must have been built beforehand:\n"
+"See Module Manager's maintenance functions"
 
-#: ../ui/search-dialog.glade.h:49
+#: ../ui/search-dialog.glade.h:51
 msgid "Find Button"
-msgstr ""
+msgstr "Find Button"
 
-#: ../ui/search-dialog.glade.h:51
+#: ../ui/search-dialog.glade.h:53
 msgid "Footnotes radiobutton"
-msgstr ""
+msgstr "Footnotes radiobutton"
 
-#: ../ui/search-dialog.glade.h:52
+#: ../ui/search-dialog.glade.h:54
 msgid "In modules that have Footnotes"
-msgstr ""
+msgstr "In modules that have Footnotes"
 
-#: ../ui/search-dialog.glade.h:53
+#: ../ui/search-dialog.glade.h:55
 msgid "In modules that have Morphological Tags"
-msgstr ""
+msgstr "In modules that have Morphological Tags"
 
-#: ../ui/search-dialog.glade.h:54
+#: ../ui/search-dialog.glade.h:56
 msgid "In modules that have Strong's Numbers"
-msgstr ""
+msgstr "In modules that have Strong's Numbers"
 
-#: ../ui/search-dialog.glade.h:55
+#: ../ui/search-dialog.glade.h:57
 msgid "Main Search Entry"
-msgstr ""
+msgstr "Main Search Entry"
 
-#: ../ui/search-dialog.glade.h:56
+#: ../ui/search-dialog.glade.h:58
 msgid "Make selections on the Attribute Search tab"
-msgstr ""
+msgstr "Make selections on the Attribute Search tab"
 
-#: ../ui/search-dialog.glade.h:58
+#: ../ui/search-dialog.glade.h:60
 msgid "Match case checkbox"
-msgstr ""
+msgstr "Match case tickbox"
 
-#: ../ui/search-dialog.glade.h:59
+#: ../ui/search-dialog.glade.h:61
 msgid "Module Selection"
-msgstr ""
+msgstr "Module Selection"
 
-#: ../ui/search-dialog.glade.h:60
+#: ../ui/search-dialog.glade.h:62
 msgid "Module list"
-msgstr ""
+msgstr "Module list"
 
-#: ../ui/search-dialog.glade.h:61
+#: ../ui/search-dialog.glade.h:63
 msgid "Module list radiobutton"
-msgstr ""
+msgstr "Module list radiobutton"
 
-#: ../ui/search-dialog.glade.h:63
+#: ../ui/search-dialog.glade.h:65
 msgid "Morphological Tags radiobutton"
-msgstr ""
+msgstr "Morphological Tags radiobutton"
 
-#: ../ui/search-dialog.glade.h:65
+#: ../ui/search-dialog.glade.h:67
 msgid "Multi word radiobutton"
-msgstr ""
+msgstr "Multi word radiobutton"
 
-#: ../ui/search-dialog.glade.h:66
+#: ../ui/search-dialog.glade.h:68
 msgid "New Custom Module List Button"
-msgstr ""
+msgstr "New Custom Module List Button"
 
-#: ../ui/search-dialog.glade.h:67
+#: ../ui/search-dialog.glade.h:69
 msgid "New Range Button"
-msgstr ""
+msgstr "New Range Button"
 
-#: ../ui/search-dialog.glade.h:68
+#: ../ui/search-dialog.glade.h:70
 msgid "Open Selection Dialog Button"
 msgstr "Open Selection Dialogue Button"
 
-#: ../ui/search-dialog.glade.h:69
+#: ../ui/search-dialog.glade.h:71
 msgid "Open a dialog to select modules to add to the list"
 msgstr "Open a dialogue to select modules to add to the list"
 
-#: ../ui/search-dialog.glade.h:70
+#: ../ui/search-dialog.glade.h:72
 msgid "Optimized (\"Lucene\")"
 msgstr "Optimised (\"Lucene\")"
 
-#: ../ui/search-dialog.glade.h:71
+#: ../ui/search-dialog.glade.h:73
 msgid "Optimized (\"Lucene\") radiobutton"
 msgstr "Optimised (\"Lucene\") radiobutton"
 
-#: ../ui/search-dialog.glade.h:72
+#: ../ui/search-dialog.glade.h:74
 msgid "Range Definition Entry"
-msgstr ""
+msgstr "Range Definition Entry"
 
-#: ../ui/search-dialog.glade.h:73
+#: ../ui/search-dialog.glade.h:75
 msgid "Range Name Entry"
-msgstr ""
+msgstr "Range Name Entry"
 
-#: ../ui/search-dialog.glade.h:75
+#: ../ui/search-dialog.glade.h:77
 msgid "Regular expression radiobutton"
-msgstr ""
+msgstr "Regular expression radiobutton"
 
-#: ../ui/search-dialog.glade.h:76
+#: ../ui/search-dialog.glade.h:78
 msgid "Remove the selected module from the list"
-msgstr ""
+msgstr "Remove the selected module from the list"
 
-#: ../ui/search-dialog.glade.h:77
+#: ../ui/search-dialog.glade.h:79
 msgid "Result Summary Table"
-msgstr ""
+msgstr "Result Summary Table"
 
-#: ../ui/search-dialog.glade.h:78
+#: ../ui/search-dialog.glade.h:80
 msgid "Result Summary Window"
-msgstr ""
+msgstr "Result Summary Window"
 
-#: ../ui/search-dialog.glade.h:79
+#: ../ui/search-dialog.glade.h:81
 msgid "Results"
-msgstr ""
+msgstr "Results"
 
-#: ../ui/search-dialog.glade.h:80
+#: ../ui/search-dialog.glade.h:82
 msgid "Save Custom Module List Button"
-msgstr ""
+msgstr "Save Custom Module List Button"
 
-#: ../ui/search-dialog.glade.h:81
+#: ../ui/search-dialog.glade.h:83
 msgid "Save Range Button"
-msgstr ""
+msgstr "Save Range Button"
 
-#: ../ui/search-dialog.glade.h:82
+#: ../ui/search-dialog.glade.h:84
 msgid "Save custom range"
-msgstr ""
+msgstr "Save custom range"
 
-#: ../ui/search-dialog.glade.h:83
+#: ../ui/search-dialog.glade.h:85
 msgid "Save search results as bookmarks"
-msgstr ""
+msgstr "Save search results as bookmarks"
 
-#: ../ui/search-dialog.glade.h:84
+#: ../ui/search-dialog.glade.h:86
 msgid "Save the module list"
-msgstr ""
+msgstr "Save the module list"
 
-#: ../ui/search-dialog.glade.h:85
+#: ../ui/search-dialog.glade.h:87
 msgid "Search  Criteria"
-msgstr ""
+msgstr "Search  Criteria"
 
-#: ../ui/search-dialog.glade.h:86
+#: ../ui/search-dialog.glade.h:88
 msgid "Search Criteria Treeview"
-msgstr ""
+msgstr "Search Criteria Treeview"
 
-#: ../ui/search-dialog.glade.h:87
+#: ../ui/search-dialog.glade.h:89
 msgid "Search entire module"
-msgstr ""
+msgstr "Search entire module"
 
-#: ../ui/search-dialog.glade.h:88
+#: ../ui/search-dialog.glade.h:90
 msgid "Search for Morphological tags"
-msgstr ""
+msgstr "Search for Morphological tags"
 
-#: ../ui/search-dialog.glade.h:89
+#: ../ui/search-dialog.glade.h:91
 msgid "Search for Strongs Numbers like G4442 or H1121"
-msgstr ""
+msgstr "Search for Strong's Numbers like G4442 or H1121"
 
-#: ../ui/search-dialog.glade.h:90
+#: ../ui/search-dialog.glade.h:92
 msgid "Search in footnotes"
-msgstr ""
+msgstr "Search in footnotes"
 
-#: ../ui/search-dialog.glade.h:91
+#: ../ui/search-dialog.glade.h:93
 msgid "Show Footnotes"
-msgstr ""
+msgstr "Show Footnotes"
 
-#: ../ui/search-dialog.glade.h:92
+#: ../ui/search-dialog.glade.h:94
 msgid "Show Footnotes checkbox"
-msgstr ""
+msgstr "Show Footnotes tickbox"
 
-#: ../ui/search-dialog.glade.h:93
+#: ../ui/search-dialog.glade.h:95
 msgid "Show Morphological Tags"
-msgstr ""
+msgstr "Show Morphological Tags"
 
-#: ../ui/search-dialog.glade.h:94
+#: ../ui/search-dialog.glade.h:96
 msgid "Show Morphological Tags checkbox"
-msgstr ""
+msgstr "Show Morphological Tags tickbox"
 
-#: ../ui/search-dialog.glade.h:95
+#: ../ui/search-dialog.glade.h:97
 msgid "Show Strong's Numbers"
-msgstr ""
+msgstr "Show Strong's Numbers"
 
-#: ../ui/search-dialog.glade.h:96
+#: ../ui/search-dialog.glade.h:98
 msgid "Show Strong's Numbers checkbox"
-msgstr ""
+msgstr "Show Strong's Numbers tickbox"
 
-#: ../ui/search-dialog.glade.h:97
+#: ../ui/search-dialog.glade.h:99
 msgid "Show in main window"
-msgstr ""
+msgstr "Show in main window"
 
-#: ../ui/search-dialog.glade.h:98
+#: ../ui/search-dialog.glade.h:100
 msgid "Single module"
-msgstr ""
+msgstr "Single module"
 
-#: ../ui/search-dialog.glade.h:99
+#: ../ui/search-dialog.glade.h:101
 msgid "Single module radiobutton"
-msgstr ""
+msgstr "Single module radiobutton"
 
-#: ../ui/search-dialog.glade.h:100
+#: ../ui/search-dialog.glade.h:102
 msgid "Start/stop searching"
-msgstr ""
+msgstr "Start/stop searching"
 
-#: ../ui/search-dialog.glade.h:101
+#: ../ui/search-dialog.glade.h:103
 msgid "Strongs Numbers"
-msgstr ""
+msgstr "Strong's Numbers"
 
-#: ../ui/search-dialog.glade.h:102
+#: ../ui/search-dialog.glade.h:104
 msgid "Strongs Numbers radiobutton"
-msgstr ""
+msgstr "Strong's Numbers radiobutton"
 
-#: ../ui/search-dialog.glade.h:103
+#: ../ui/search-dialog.glade.h:105
 msgid "Use a custom module list for the search"
-msgstr ""
+msgstr "Use a custom module list for the search"
 
-#: ../ui/search-dialog.glade.h:104
+#: ../ui/search-dialog.glade.h:106
 msgid "Use a custom range for the scope of the search"
-msgstr ""
+msgstr "Use a custom range for the scope of the search"
 
-#: ../ui/search-dialog.glade.h:105
+#: ../ui/search-dialog.glade.h:107
 msgid "Use a single module for the search"
-msgstr ""
+msgstr "Use a single module for the search"
 
-#: ../ui/search-dialog.glade.h:106
+#: ../ui/search-dialog.glade.h:108
 msgid "Use the current module list for the search"
-msgstr ""
+msgstr "Use the current module list for the search"
 
-#: ../ui/search-dialog.glade.h:107
+#: ../ui/search-dialog.glade.h:109
 msgid "Use the results of the last search as the scope of the search"
-msgstr ""
+msgstr "Use the results of the last search as the scope of the search"
 
-#: ../ui/search-dialog.glade.h:108
+#: ../ui/search-dialog.glade.h:110
 msgid "e.g. Matt-John;Rev4"
-msgstr ""
+msgstr "e.g. Matt-John;Rev4"
 
-#: ../ui/search-dialog.glade.h:109
+#: ../ui/search-dialog.glade.h:111
 msgid "for "
-msgstr ""
+msgstr "for "
 
 #: ../ui/xi-menus.glade.h:2
 msgid "About _Translation"
@@ -3029,313 +3273,397 @@ msgstr "About _Translation"
 
 #: ../ui/xi-menus.glade.h:3
 msgid "About _Xiphos"
-msgstr ""
+msgstr "About _Xiphos"
 
 #: ../ui/xi-menus.glade.h:4
-msgid "Add new folder to selected folder"
-msgstr ""
+msgid "Add Item"
+msgstr "Add Item"
+
+#: ../ui/xi-menus.glade.h:5
+msgid "Add Sub-Item"
+msgstr "Add Sub-Item"
 
 #: ../ui/xi-menus.glade.h:6
-msgid "Allow Reordering"
-msgstr ""
+msgid "Add a sub-item"
+msgstr "Add a sub-item"
 
 #: ../ui/xi-menus.glade.h:7
-msgid "Allow items to be moved from one folder to another"
-msgstr ""
+msgid "Add an item"
+msgstr "Add an item"
 
 #: ../ui/xi-menus.glade.h:8
-msgid "Annotate Verse"
-msgstr ""
+msgid "Add new folder to selected folder"
+msgstr "Add new folder to selected folder"
 
 #: ../ui/xi-menus.glade.h:10
-msgid "Browse in BibleMap.org"
-msgstr ""
+msgid "Allow Reordering"
+msgstr "Allow Reordering"
 
 #: ../ui/xi-menus.glade.h:11
-msgid "Collapse All"
-msgstr ""
+msgid "Allow items to be moved from one folder to another"
+msgstr "Allow items to be moved from one folder to another"
 
 #: ../ui/xi-menus.glade.h:12
+msgid "Annotate Verse"
+msgstr "Annotate Verse"
+
+#: ../ui/xi-menus.glade.h:14
+msgid "Browse in BibleMap.org"
+msgstr "Browse in BibleMap.org"
+
+#: ../ui/xi-menus.glade.h:15
+msgid "Collapse All"
+msgstr "Collapse All"
+
+#: ../ui/xi-menus.glade.h:16
 msgid "Collapse all Bookmarks groups"
-msgstr ""
+msgstr "Collapse all Bookmarks groups"
 
-#: ../ui/xi-menus.glade.h:13
+#: ../ui/xi-menus.glade.h:17
 msgid "Commentary by Chapter"
-msgstr ""
+msgstr "Commentary by Chapter"
 
-#: ../ui/xi-menus.glade.h:15
+#: ../ui/xi-menus.glade.h:19
+msgid "Create a new daily journal"
+msgstr "Create a new daily journal"
+
+#: ../ui/xi-menus.glade.h:20
+msgid "Create a new monthly journal"
+msgstr "Create a new monthly journal"
+
+#: ../ui/xi-menus.glade.h:21
+msgid "Create a new outlined topic"
+msgstr "Create a new outlined topic"
+
+#: ../ui/xi-menus.glade.h:22
+msgid "Create a new simple prayer list"
+msgstr "Create a new simple prayer list"
+
+#: ../ui/xi-menus.glade.h:23
+msgid "Create a new subject prayer list"
+msgstr "Create a new subject prayer list"
+
+#: ../ui/xi-menus.glade.h:24
 msgid "D_ouble-Space Text"
-msgstr ""
+msgstr "D_ouble-Space Text"
 
-#: ../ui/xi-menus.glade.h:16
+#: ../ui/xi-menus.glade.h:25
+msgid "Daily"
+msgstr "Daily"
+
+#: ../ui/xi-menus.glade.h:26
 msgid "Delete Item"
-msgstr ""
+msgstr "Delete Item"
 
-#: ../ui/xi-menus.glade.h:17
+#: ../ui/xi-menus.glade.h:27
 msgid "Delete item"
-msgstr ""
+msgstr "Delete item"
 
-#: ../ui/xi-menus.glade.h:18
+#: ../ui/xi-menus.glade.h:28
 msgid "Dictionar_y"
-msgstr ""
+msgstr "Dictionar_y"
 
-#: ../ui/xi-menus.glade.h:19
+#: ../ui/xi-menus.glade.h:29
 msgid "Display Book Heading"
-msgstr ""
+msgstr "Display Book Heading"
 
-#: ../ui/xi-menus.glade.h:20
+#: ../ui/xi-menus.glade.h:30
 msgid "Display Chapter Heading"
-msgstr ""
+msgstr "Display Chapter Heading"
 
-#: ../ui/xi-menus.glade.h:21
+#: ../ui/xi-menus.glade.h:31
 msgid "Dump Pers.Comm."
-msgstr ""
+msgstr "Dump Pers.Comm."
 
-#: ../ui/xi-menus.glade.h:23
+#: ../ui/xi-menus.glade.h:33
 msgid "Edit bookmark item"
-msgstr ""
+msgstr "Edit bookmark item"
 
-#: ../ui/xi-menus.glade.h:24
+#: ../ui/xi-menus.glade.h:34
+msgid "Edit this item"
+msgstr "Edit this item"
+
+#: ../ui/xi-menus.glade.h:35
 msgid "Expand All"
-msgstr ""
+msgstr "Expand All"
 
-#: ../ui/xi-menus.glade.h:25
+#: ../ui/xi-menus.glade.h:36
 msgid "Expand all Bookmarks groups"
-msgstr ""
+msgstr "Expand all Bookmarks groups"
 
-#: ../ui/xi-menus.glade.h:32
+#: ../ui/xi-menus.glade.h:37
+msgid "Export Folder"
+msgstr "Export Folder"
+
+#: ../ui/xi-menus.glade.h:38
+msgid "Export List"
+msgstr "Export List"
+
+#: ../ui/xi-menus.glade.h:45
 msgid "Image Content"
-msgstr ""
+msgstr "Image Content"
 
-#: ../ui/xi-menus.glade.h:33
+#: ../ui/xi-menus.glade.h:46
 msgid "Import Bibletime Bookmarks"
-msgstr ""
+msgstr "Import Bibletime Bookmarks"
 
-#: ../ui/xi-menus.glade.h:34
+#: ../ui/xi-menus.glade.h:47
 msgid "Insert Bookmark"
-msgstr ""
+msgstr "Insert Bookmark"
 
-#: ../ui/xi-menus.glade.h:35
+#: ../ui/xi-menus.glade.h:48
 msgid "Insert new bookmark here"
-msgstr ""
+msgstr "Insert new bookmark here"
 
-#: ../ui/xi-menus.glade.h:36
+#: ../ui/xi-menus.glade.h:49
 msgid "L_ink Tabs"
-msgstr ""
+msgstr "L_ink Tabs"
 
-#: ../ui/xi-menus.glade.h:38
+#: ../ui/xi-menus.glade.h:51
 msgid "Load Bookmarks from Bibletime"
-msgstr ""
+msgstr "Load Bookmarks from Bibletime"
 
-#: ../ui/xi-menus.glade.h:39
+#: ../ui/xi-menus.glade.h:52
 msgid "Lookup Selection"
-msgstr ""
+msgstr "Lookup Selection"
 
-#: ../ui/xi-menus.glade.h:43
+#: ../ui/xi-menus.glade.h:54
+msgid "Monthly"
+msgstr "Monthly"
+
+#: ../ui/xi-menus.glade.h:57
 msgid "Note"
-msgstr ""
+msgstr "Note"
 
-#: ../ui/xi-menus.glade.h:44
+#: ../ui/xi-menus.glade.h:58
 msgid "Open Module"
-msgstr ""
+msgstr "Open Module"
 
-#: ../ui/xi-menus.glade.h:45
+#: ../ui/xi-menus.glade.h:59
 msgid "Open Study_pad"
-msgstr ""
+msgstr "Open Study_pad"
 
-#: ../ui/xi-menus.glade.h:46
+#: ../ui/xi-menus.glade.h:60
 msgid "Open in a dialog"
 msgstr "Open in a dialogue"
 
-#: ../ui/xi-menus.glade.h:48
+#: ../ui/xi-menus.glade.h:61
+msgid "Open in a separate window"
+msgstr "Open in a separate window"
+
+#: ../ui/xi-menus.glade.h:62
+msgid "Open in editor"
+msgstr "Open in editor"
+
+#: ../ui/xi-menus.glade.h:63
 msgid "Open in new tab"
+msgstr "Open in new tab"
+
+#: ../ui/xi-menus.glade.h:64
+msgid ""
+"Open selected module in a\n"
+"\tseparate ['dialog'] window"
 msgstr ""
+"Open selected module in a\n"
+"\tseparate ['dialogue'] window"
 
-#: ../ui/xi-menus.glade.h:49
+#: ../ui/xi-menus.glade.h:66
+msgid "Open selected module in a new tab"
+msgstr "Open selected module in a new tab"
+
+#: ../ui/xi-menus.glade.h:67
 msgid "Open this bookmark in a dialog"
 msgstr "Open this bookmark in a dialogue"
 
-#: ../ui/xi-menus.glade.h:50
+#: ../ui/xi-menus.glade.h:68
 msgid "Open this bookmark in a new tab"
-msgstr ""
+msgstr "Open this bookmark in a new tab"
 
-#: ../ui/xi-menus.glade.h:52
-msgid "Read Selection Aloud"
-msgstr ""
-
-#: ../ui/xi-menus.glade.h:53
-msgid "Remove - Restore"
-msgstr ""
+#: ../ui/xi-menus.glade.h:69
+msgid "Outlined"
+msgstr "Outlined"
 
-#: ../ui/xi-menus.glade.h:54
-msgid "Remove Folder"
-msgstr ""
+#: ../ui/xi-menus.glade.h:71
+msgid "Read Selection Aloud"
+msgstr "Read Selection Aloud"
 
-#: ../ui/xi-menus.glade.h:55
+#: ../ui/xi-menus.glade.h:73
 msgid "Remove folder and save it"
-msgstr ""
+msgstr "Remove folder and save it"
 
-#: ../ui/xi-menus.glade.h:56
+#: ../ui/xi-menus.glade.h:74
+msgid "Remove this item"
+msgstr "Remove this item"
+
+#: ../ui/xi-menus.glade.h:75
 msgid "Rename Pers.Comm."
-msgstr ""
+msgstr "Rename Pers.Comm."
 
-#: ../ui/xi-menus.glade.h:57
+#: ../ui/xi-menus.glade.h:76
 msgid "Respect Font Faces"
-msgstr ""
+msgstr "Respect Font Faces"
 
-#: ../ui/xi-menus.glade.h:58
+#: ../ui/xi-menus.glade.h:77
 msgid "Restore Folder"
-msgstr ""
+msgstr "Restore Folder"
 
-#: ../ui/xi-menus.glade.h:59
+#: ../ui/xi-menus.glade.h:78
 msgid "Restore saved folder"
-msgstr ""
+msgstr "Restore saved folder"
 
-#: ../ui/xi-menus.glade.h:60
+#: ../ui/xi-menus.glade.h:79
 msgid "Save list as a series of bookmarks"
-msgstr ""
+msgstr "Save list as a series of bookmarks"
 
-#: ../ui/xi-menus.glade.h:61
+#: ../ui/xi-menus.glade.h:80
 msgid "Save list as a single bookmark"
-msgstr ""
+msgstr "Save list as a single bookmark"
 
-#: ../ui/xi-menus.glade.h:62
+#: ../ui/xi-menus.glade.h:81
 msgid "Save these results as a series of bookmarks in their own folder"
-msgstr ""
+msgstr "Save these results as a series of bookmarks in their own folder"
 
-#: ../ui/xi-menus.glade.h:63
+#: ../ui/xi-menus.glade.h:82
 msgid "Save these results as a single bookmark"
-msgstr ""
+msgstr "Save these results as a single bookmark"
 
-#: ../ui/xi-menus.glade.h:64
+#: ../ui/xi-menus.glade.h:83
 msgid "Scripture Cross-references"
-msgstr ""
+msgstr "Scripture Cross-references"
 
-#: ../ui/xi-menus.glade.h:66
+#: ../ui/xi-menus.glade.h:85
 msgid "Show Parallel View in a _Tab"
-msgstr ""
+msgstr "Show Parallel View in a _Tab"
 
-#: ../ui/xi-menus.glade.h:67
+#: ../ui/xi-menus.glade.h:86
 msgid "Show Previe_wer in the Sidebar"
-msgstr ""
+msgstr "Show Previe_wer in the Sidebar"
 
-#: ../ui/xi-menus.glade.h:68
+#: ../ui/xi-menus.glade.h:87
 msgid "Show Verse _Numbers"
-msgstr ""
+msgstr "Show Verse _Numbers"
 
-#: ../ui/xi-menus.glade.h:71
+#: ../ui/xi-menus.glade.h:88
+msgid "Simple"
+msgstr "Simple"
+
+#: ../ui/xi-menus.glade.h:90
+msgid "Subject"
+msgstr "Subject"
+
+#: ../ui/xi-menus.glade.h:92
 msgid "Unlock This Module"
-msgstr ""
+msgstr "Unlock This Module"
 
-#: ../ui/xi-menus.glade.h:72
+#: ../ui/xi-menus.glade.h:93
 msgid "Use Current Dictionary"
-msgstr ""
+msgstr "Use Current Dictionary"
 
-#: ../ui/xi-menus.glade.h:73
+#: ../ui/xi-menus.glade.h:94
 msgid "Use module manager to install and remove Sword modules"
-msgstr ""
+msgstr "Use module manager to install and remove Sword modules"
 
-#: ../ui/xi-menus.glade.h:74
+#: ../ui/xi-menus.glade.h:95
 msgid "Variants"
-msgstr ""
+msgstr "Variants"
 
-#: ../ui/xi-menus.glade.h:76
+#: ../ui/xi-menus.glade.h:97
 msgid "_About The SWORD Project"
-msgstr ""
+msgstr "_About The SWORD Project"
 
-#: ../ui/xi-menus.glade.h:77
+#: ../ui/xi-menus.glade.h:98
 msgid "_Advanced Search"
-msgstr ""
+msgstr "_Advanced Search"
 
-#: ../ui/xi-menus.glade.h:78
+#: ../ui/xi-menus.glade.h:99
 msgid "_Attach/Detach Sidebar"
-msgstr ""
+msgstr "_Attach/Detach Sidebar"
 
-#: ../ui/xi-menus.glade.h:79
+#: ../ui/xi-menus.glade.h:100
 msgid "_Bible"
-msgstr ""
+msgstr "_Bible"
 
-#: ../ui/xi-menus.glade.h:80
+#: ../ui/xi-menus.glade.h:101
 msgid "_Commentary/Book"
-msgstr ""
+msgstr "_Commentary/Book"
 
-#: ../ui/xi-menus.glade.h:81
+#: ../ui/xi-menus.glade.h:102
 msgid "_Contents"
-msgstr ""
+msgstr "_Contents"
 
-#: ../ui/xi-menus.glade.h:82
+#: ../ui/xi-menus.glade.h:103
 msgid "_Daily Devotion"
-msgstr ""
+msgstr "_Daily Devotion"
 
-#: ../ui/xi-menus.glade.h:83
+#: ../ui/xi-menus.glade.h:104
 msgid "_Edit"
-msgstr ""
+msgstr "_Edit"
 
-#: ../ui/xi-menus.glade.h:84
+#: ../ui/xi-menus.glade.h:105
 msgid "_Edit Item"
-msgstr ""
+msgstr "_Edit Item"
 
-#: ../ui/xi-menus.glade.h:86
+#: ../ui/xi-menus.glade.h:107
 msgid "_Help"
-msgstr ""
+msgstr "_Help"
 
-#: ../ui/xi-menus.glade.h:87
+#: ../ui/xi-menus.glade.h:108
 msgid "_Highlight Current Verse"
-msgstr ""
+msgstr "_Highlight Current Verse"
 
-#: ../ui/xi-menus.glade.h:88
+#: ../ui/xi-menus.glade.h:109
 msgid "_Live Chat"
-msgstr ""
+msgstr "_Live Chat"
 
-#: ../ui/xi-menus.glade.h:89
+#: ../ui/xi-menus.glade.h:110
 msgid "_Mailing List"
-msgstr ""
+msgstr "_Mailing List"
 
-#: ../ui/xi-menus.glade.h:90
+#: ../ui/xi-menus.glade.h:111
 msgid "_Module Manager"
-msgstr ""
+msgstr "_Module Manager"
 
-#: ../ui/xi-menus.glade.h:91
+#: ../ui/xi-menus.glade.h:112
 msgid "_Open Session"
-msgstr ""
+msgstr "_Open Session"
 
-#: ../ui/xi-menus.glade.h:92
+#: ../ui/xi-menus.glade.h:113
 msgid "_Preferences"
-msgstr ""
+msgstr "_Preferences"
 
-#: ../ui/xi-menus.glade.h:93
+#: ../ui/xi-menus.glade.h:114
 msgid "_Preview"
-msgstr ""
+msgstr "_Preview"
 
-#: ../ui/xi-menus.glade.h:94
+#: ../ui/xi-menus.glade.h:115
 msgid "_Read Aloud"
-msgstr ""
+msgstr "_Read Aloud"
 
-#: ../ui/xi-menus.glade.h:95
+#: ../ui/xi-menus.glade.h:116
 msgid "_Report Bug"
-msgstr ""
+msgstr "_Report Bug"
 
-#: ../ui/xi-menus.glade.h:96
+#: ../ui/xi-menus.glade.h:117
 msgid "_Save Session"
-msgstr ""
+msgstr "_Save Session"
 
-#: ../ui/xi-menus.glade.h:97
+#: ../ui/xi-menus.glade.h:118
 msgid "_Search"
-msgstr ""
+msgstr "_Search"
 
-#: ../ui/xi-menus.glade.h:98
-msgid "_Show/Hide Sidebar"
-msgstr ""
+#: ../ui/xi-menus.glade.h:119
+msgid "_Show/Hide Attached Sidebar"
+msgstr "_Show/Hide Attached Sidebar"
 
-#: ../ui/xi-menus.glade.h:99
+#: ../ui/xi-menus.glade.h:120
 msgid "_Verse Per Line"
-msgstr ""
+msgstr "_Verse Per Line"
 
 #: ../xiphos.desktop.in.in.h:1
 msgid "Study the Bible"
-msgstr ""
+msgstr "Study the Bible"
 
 #: ../xiphos.desktop.in.in.h:2
 msgid "Xiphos Bible Guide"
-msgstr ""
+msgstr "Xiphos Bible Guide"
 
diff --git a/po/es.po b/po/es.po
new file mode 100644
index 0000000..2f9a284
--- /dev/null
+++ b/po/es.po
@@ -0,0 +1,3603 @@
+# XIPHOS, Traducción al español neutro.
+# Copyright (C) 2009
+# Este archivo se distribuye bajo la misma licencia que Xiphos.
+# Eduardo Rivas <jerivasmelgar@gmail.com>, 2009.
+msgid ""
+msgstr ""
+"Project-Id-Version: 1.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-12-14 23:45+0000\n"
+"PO-Revision-Date: 2009-12-12 13:23+0000\n"
+"Last-Translator: Eduardo Rivas <jerivasmelgar@gmail.com>\n"
+"Language-Team: Español <gnomesword-users@lists.sourceforge.net>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-12-13 04:42+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#: ../src/backend/sword_main.cc:1083
+msgid "Configuration not found"
+msgstr "Configuración no encontrada"
+
+#: ../src/editor/bonobo-editor.c:254 ../src/editor/slib-editor.c:234
+#: ../src/gnome2/html.c:637
+#, c-format
+msgid "Page %d of %d"
+msgstr "Página %d de %d"
+
+#: ../src/editor/bonobo-editor.c:353 ../src/editor/slib-editor.c:659
+msgid "Are you sure you want to delete the note for"
+msgstr "¿Desea eliminar la nota para"
+
+#: ../src/editor/bonobo-editor.c:965 ../src/editor/bonobo-editor.c:998
+#: ../src/editor/slib-editor.c:1308 ../src/editor/slib-editor.c:1345
+msgid "Save the changes to document"
+msgstr "¿Guardar los cambios al documento"
+
+#: ../src/editor/bonobo-editor.c:966 ../src/editor/bonobo-editor.c:999
+#: ../src/editor/slib-editor.c:1309 ../src/editor/slib-editor.c:1346
+msgid "before closing?"
+msgstr "antes de cerrar?"
+
+#: ../src/editor/bonobo-editor.c:973 ../src/editor/bonobo-editor.c:1006
+#: ../src/editor/slib-editor.c:1316 ../src/editor/slib-editor.c:1353
+msgid "If you don't save, changes will be permanently lost."
+msgstr "Si no guarda el archivo, los cambios se perderán permanentemente."
+
+#: ../src/editor/bonobo-editor.c:997 ../src/editor/slib-editor.c:1344
+#: ../ui/xi-menus.glade.h:39
+msgid "File"
+msgstr "Archivo"
+
+#: ../src/editor/bonobo-editor.c:1224 ../src/editor/slib-editor.c:1401
+msgid "StudyPad"
+msgstr "Cuaderno de Estudio"
+
+#: ../src/editor/bonobo-editor.c:1237 ../src/editor/slib-editor.c:1415
+msgid "Note Editor"
+msgstr "Editor de Notas"
+
+#: ../src/editor/bonobo-editor.c:1246 ../src/editor/slib-editor.c:1429
+msgid "Prayer List/Journal Editor"
+msgstr "Editor de Lista de oración/Diario"
+
+#: ../src/editor/slib-editor.c:401 ../src/editor/slib-editor.c:448
+msgid "Save As"
+msgstr "Guardar como"
+
+#: ../src/editor/slib-editor.c:419 ../src/editor/slib-editor.c:466
+#: ../src/editor/slib-editor.c:634
+msgid "Untitled document"
+msgstr "Documento sin título"
+
+#: ../src/editor/slib-editor.c:702
+msgid "HTML Output"
+msgstr "Salida en HTML"
+
+#: ../src/editor/slib-editor.c:709
+msgid "HTML Source"
+msgstr "Fuente en HTML"
+
+#: ../src/editor/slib-editor.c:716
+msgid "Plain Source"
+msgstr "Fuente simple"
+
+#: ../src/editor/slib-editor.c:726 ../ui/editor_note.xml.h:15
+#: ../ui/editor_studypad.xml.h:21
+msgid "_Print..."
+msgstr "Im_primir..."
+
+#: ../src/editor/slib-editor.c:733 ../ui/editor_note.xml.h:9
+#: ../ui/editor_studypad.xml.h:14
+msgid "Print Pre_view"
+msgstr "Vista Pre_via de Impresión"
+
+#: ../src/editor/slib-editor.c:740
+msgid "_Quit"
+msgstr "_Salir"
+
+#: ../src/editor/slib-editor.c:747
+msgid "_Open"
+msgstr "_Abrir"
+
+#: ../src/editor/slib-editor.c:754
+msgid "_Save"
+msgstr "_Guardar"
+
+#: ../src/editor/slib-editor.c:761
+msgid "Save _As..."
+msgstr "Guardar _como..."
+
+#: ../src/editor/slib-editor.c:767
+msgid "New"
+msgstr "Nuevo"
+
+#: ../src/editor/slib-editor.c:769
+msgid "Open new document"
+msgstr "Abrir un documento nuevo"
+
+#: ../src/editor/slib-editor.c:773
+msgid "Delete"
+msgstr "Borrar"
+
+#: ../src/editor/slib-editor.c:775
+msgid "Delete current note"
+msgstr "Borrar la nota actual"
+
+#: ../src/editor/slib-editor.c:780 ../ui/editor_note.xml.h:14
+#: ../ui/editor_studypad.xml.h:20 ../ui/editor.xml.h:13
+#: ../ui/xi-menus.glade.h:106
+msgid "_File"
+msgstr "_Archivo"
+
+#: ../src/editor/slib-editor.c:835
+msgid "HTML _Output"
+msgstr "_Salida en HTML"
+
+#: ../src/editor/slib-editor.c:842
+msgid "_HTML Source"
+msgstr "_Fuente en HTML"
+
+#: ../src/editor/slib-editor.c:849
+msgid "_Plain Source"
+msgstr "Fuente Sim_ple"
+
+#: ../src/editor/slib-editor.c:856 ../ui/xi-menus.glade.h:121
+msgid "_View"
+msgstr "_Ver"
+
+#: ../src/editor/slib-editor.c:867 ../ui/editor_note.xml.h:11
+#: ../ui/editor_studypad.xml.h:16 ../ui/editor.xml.h:11
+msgid "Save"
+msgstr "Guardar"
+
+#: ../src/editor/slib-editor.c:878 ../src/editor/slib-editor.c:885
+msgid "Insert Link"
+msgstr "Insertar enlace"
+
+#: ../src/gecko/gecko-html.cpp:177 ../src/gnome2/html.c:165
+msgid "Unlock "
+msgstr "Desbloquear "
+
+#: ../src/gecko/gecko-print.c:172
+msgid "Preparing to print"
+msgstr "Preparando para imprimir"
+
+#: ../src/gecko/gecko-print.c:266
+msgid "Printing is not supported on this printer"
+msgstr "Esta impresora no soporta impresión"
+
+#: ../src/gecko/gecko-print.c:269
+#, c-format
+msgid "Printer %s does not support PostScript printing."
+msgstr "La impresora %s no soporta impresión PostScript"
+
+#: ../src/gecko/gecko-print.c:342 ../src/gecko/gecko-print.c:370
+msgid "Printing"
+msgstr "Imprimiendo"
+
+#: ../src/gecko/gecko-print.c:372
+msgid "Waiting to print"
+msgstr "Esperando para imprimir"
+
+#: ../src/gecko/gecko-print.c:584
+msgid "An error occurred while printing"
+msgstr "Ocurrió un error mientras se imprimía"
+
+#: ../src/gecko/gecko-print.c:588
+#, c-format
+msgid "It was not possible to print your document: %s"
+msgstr "No se pudo imprimir su documento: %s"
+
+#: ../src/gnome2/about_modules.c:195
+msgid "About Sword Module"
+msgstr "Acerca del módulo Sword"
+
+#: ../src/gnome2/about_modules.c:389 ../src/gnome2/mod_mgr.c:252
+msgid "The module has no About information."
+msgstr "Este módulo no tiene información Acerca De."
+
+#: ../src/gnome2/about_sword.c:88
+msgid ""
+"The SWORD Project is an effort to create an ever-expanding software package "
+"for research and study of God and His Word. The SWORD Project framework "
+"allows easy use and study of Bible texts, commentaries, lexicons, "
+"dictionaries, and other books. Many frontends are built using this "
+"framework. An installed set of books may be shared among all frontends using "
+"the framework."
+msgstr ""
+"El proyecto SWORD es un esfuerzo para crear un paquete de software en "
+"constante crecimiento para la investigación y estudió de Dios y Su Palabra. "
+"La infraestructura del proyecto SWORD permite el fácil uso y estudio de de "
+"textos bíblicos, comentarios, léxicos, diccionarios y otros libros. Muchas "
+"interfaces se construyen usando esta infraestructura. Un conjunto de libros "
+"instalados puede ser compartido por varias interfaces a través de la "
+"infraestructura."
+
+#: ../src/gnome2/about_sword.c:106
+msgid "About the SWORD Project"
+msgstr "Acerca del Proyecto SWORD"
+
+#: ../src/gnome2/about_sword.c:124
+msgid "Sword Version"
+msgstr "Versión de SWORD"
+
+#: ../src/gnome2/about_sword.c:155
+msgid "Books can be downloaded from the SWORD Project"
+msgstr "Se pueden descargar libros del Proyecto SWORD"
+
+#: ../src/gnome2/about_sword.c:161
+msgid "The SWORD Project"
+msgstr "El Proyecto SWORD"
+
+#: ../src/gnome2/about_trans.c:84
+msgid ""
+"Do you like using Xiphos to study the Bible? Would you like to see its "
+"display using your native language? You could translate Xiphos! \n"
+"\n"
+"We are always looking for contributions of new translations of Xiphos into "
+"other languages. If you are able to translate for us, please see the link "
+"below, contact us, and get involved with our efforts."
+msgstr ""
+"¿Le gusta utilizar Xiphos para estudiar la Biblia? ¿Quisiera poder hacerlo "
+"en su propio idioma? ¡Usted puede traducir Xiphos!\n"
+"\n"
+"Siempre estamos en búsqueda de contribuyentes para llevar Xiphos a otros "
+"idiomas. Si usted es capaz de traducirlo, siga el enlace de abajo, póngase "
+"en contacto y forme parte de nuestro esfuerzo."
+
+#: ../src/gnome2/about_trans.c:98
+msgid "About Xiphos Translation"
+msgstr "Acerca de la traducción de Xiphos"
+
+#: ../src/gnome2/about_trans.c:140
+msgid "See TRANSLATION-HOWTO in Xiphos source"
+msgstr "Vea el TRANSLATION-HOWTO en el código fuente de Xiphos"
+
+#: ../src/gnome2/about_trans.c:146
+msgid "Xiphos development"
+msgstr "Desarrollo de Xiphos"
+
+#: ../src/gnome2/about_xiphos.c:131
+msgid "Copyright 2000-2009 The Xiphos Development Team"
+msgstr "Copyright 2000-2009 El Equipo de Desarrollo de Xiphos"
+
+#: ../src/gnome2/about_xiphos.c:134
+msgid ""
+"(formerly known as GnomeSword)\n"
+"\n"
+"Powered by The SWORD Project.\n"
+"We would like to thank Troy Griffitts and all the other folks who have given "
+"us The SWORD Project."
+msgstr ""
+"(antes conocido como GnomeSword)\n"
+"\n"
+"Gracias a: el Proyecto Sword\n"
+"Agradecemos a Troy Griffitts y todos aquellos que nos han dado el Proyecto "
+"SWORD."
+
+#: ../src/gnome2/bibletext_dialog.c:358
+msgid "Go to "
+msgstr "Ir a "
+
+#. info->stock_icon = GTK_STOCK_OPEN;
+#: ../src/gnome2/bookmark_dialog.c:171 ../src/gnome2/bookmarks_menu.c:358
+#: ../src/gnome2/bookmarks_menu.c:765 ../src/gnome2/bookmarks_menu.c:863
+#: ../src/gnome2/bookmarks_treeview.c:133 ../ui/editor_studypad.xml.h:2
+#: ../ui/xi-menus.glade.h:13
+msgid "Bookmark"
+msgstr "Marcador"
+
+#: ../src/gnome2/bookmark_dialog.c:173 ../src/gnome2/bookmarks_menu.c:865
+#: ../src/gnome2/bookmarks_treeview.c:134
+msgid "Enter Folder Name"
+msgstr "Introduzca el nombre de la carpeta"
+
+#: ../src/gnome2/bookmark_dialog.c:175 ../src/gnome2/bookmarks_menu.c:867
+msgid "Folder Name"
+msgstr "Nombre de la carpeta"
+
+#: ../src/gnome2/bookmark_dialog.c:176 ../src/gnome2/bookmarks_menu.c:868
+#: ../src/gnome2/bookmarks_treeview.c:136
+msgid "Folder: "
+msgstr "Carpeta: "
+
+#: ../src/gnome2/bookmarks_menu.c:344 ../ui/xi-menus.glade.h:32
+msgid "Edit"
+msgstr "Editar"
+
+#: ../src/gnome2/bookmarks_menu.c:361
+msgid "Folder name: "
+msgstr "Nombre de la carpeta: "
+
+#: ../src/gnome2/bookmarks_menu.c:364
+msgid "Bookmark name: "
+msgstr "Nombre del marcador: "
+
+#: ../src/gnome2/bookmarks_menu.c:367 ../src/gnome2/bookmarks_menu.c:773
+msgid "Verse: "
+msgstr "Versículo: "
+
+#: ../src/gnome2/bookmarks_menu.c:368 ../src/gnome2/bookmarks_menu.c:774
+msgid "Module: "
+msgstr "Módulo: "
+
+#: ../src/gnome2/bookmarks_menu.c:533
+msgid "Restore Bookmark Folder"
+msgstr "Restablecer la carpeta de marcadores"
+
+#: ../src/gnome2/bookmarks_menu.c:602
+msgid "Remove the selected folder"
+msgstr "¿Remover la carpeta seleccionada"
+
+#: ../src/gnome2/bookmarks_menu.c:604
+msgid "(and all its contents)?"
+msgstr "(y todos sus contenidos)?"
+
+#: ../src/gnome2/bookmarks_menu.c:607
+msgid "Remove the selected bookmark"
+msgstr "Remover el marcador seleccionado"
+
+#: ../src/gnome2/bookmarks_menu.c:766
+msgid "Add"
+msgstr "Añadir"
+
+#: ../src/gnome2/bookmarks_menu.c:772
+msgid "Label: "
+msgstr "Etiqueta: "
+
+#: ../src/gnome2/bookmarks_treeview.c:107
+#, c-format
+msgid "Search result: %s"
+msgstr "Resultados de la búsqueda: %s"
+
+#: ../src/gnome2/bookmarks_treeview.c:943 ../src/gnome2/sidebar.c:1389
+msgid "Bookmarks"
+msgstr "Marcadores"
+
+#: ../src/gnome2/cipher_key_dialog.c:62
+msgid "Cipher Key?"
+msgstr "¿Clave de cifrado?"
+
+#: ../src/gnome2/cipher_key_dialog.c:63
+msgid "for:"
+msgstr "para:"
+
+#: ../src/gnome2/cipher_key_dialog.c:66
+msgid "Enter Cipher Key: "
+msgstr "Introduzca la clave de cifraddo: "
+
+#: ../src/gnome2/dialog.c:265
+msgid "Close without Saving"
+msgstr "Cerrar sin guardar"
+
+#: ../src/gnome2/dialog.c:596
+msgid "Xiphos:"
+msgstr "Xiphos:"
+
+#: ../src/gnome2/dialog.c:697
+msgid "Close _without Saving"
+msgstr "Cerrar _sin guardar"
+
+#: ../src/gnome2/export_dialog.c:267 ../ui/export-dialog.glade.h:20
+msgid "Please check copyright before exporting!"
+msgstr "¡Verifique los derechos de autor antes de exportar!"
+
+#: ../src/gnome2/find_dialog.c:204 ../src/gnome2/find_dialog.c:373
+msgid "Find"
+msgstr "Buscar"
+
+#: ../src/gnome2/find_dialog.c:222
+msgid "Enter Word or Phrase"
+msgstr "Introduzca una palabra o frase"
+
+#: ../src/gnome2/find_dialog.c:238 ../src/gnome2/search_sidebar.c:306
+#: ../ui/search-dialog.glade.h:59
+msgid "Match case"
+msgstr "Coincidir mayúsculas"
+
+#: ../src/gnome2/find_dialog.c:245
+msgid "Search backwards"
+msgstr "Buscar hacia atrás"
+
+#: ../src/gnome2/find_dialog.c:254 ../src/gnome2/search_sidebar.c:271
+#: ../ui/search-dialog.glade.h:76
+msgid "Regular expression"
+msgstr "Expresión regular"
+
+#: ../src/gnome2/find_dialog.c:295
+msgid "Find Next"
+msgstr "Encontrar siguiente"
+
+#: ../src/gnome2/font_dialog.c:303
+msgid "Set Module Font"
+msgstr "Definir tipografía para el módulo"
+
+#: ../src/gnome2/font_dialog.c:333
+msgid "Change font for"
+msgstr "Cambiar tipografía para"
+
+#: ../src/gnome2/font_dialog.c:337
+msgid "Module"
+msgstr "Módulo"
+
+#: ../src/gnome2/font_dialog.c:341
+msgid "Current font: "
+msgstr "Tipografía actual: "
+
+#: ../src/gnome2/font_dialog.c:378
+msgid "+0"
+msgstr "+0"
+
+#: ../src/gnome2/font_dialog.c:382
+msgid "Use the default font for this module"
+msgstr "Utilizar la tipografía por defecto para este módulo"
+
+#. *****************************************************************************
+#. * Name
+#. *    gconf_setup
+#. *
+#. * Synopsis
+#. *   #include "main/settings.h"
+#. *
+#. *   void gconf_setup()
+#. *
+#. * Description
+#. *   verifies and initializes the GConf subsystem, so that "sword://" and
+#. *   similar can be handled by url-comprehending programs such as browsers.
+#. *   dialogs for permission/success/failure => conditional on debug build.
+#. *
+#. * Return value
+#. *   void
+#.
+#: ../src/gnome2/gui.c:110
+msgid ""
+"URL references using \"sword://\" (similar to web page\n"
+"references) can be used by programs to look up\n"
+"scripture references. Your system currently has no\n"
+"program set to handle these references.\n"
+"\n"
+"Would you like Xiphos to set itself as the\n"
+"program to handle these references?"
+msgstr ""
+"Las direcciones que usan \"sword://\" (similares a enlaces\n"
+"de Internet) pueden ser usadas por los programas para\n"
+"encontrar referencias bíblicas. Su sistema no tiene\n"
+"ningún programa establecido para manejar estas referencias.\n"
+"\n"
+"¿Le gustaría que Xiphos se estableciera come el\n"
+"programa para manejar estas referencias?"
+
+#: ../src/gnome2/gui.c:112
+msgid ""
+"Xiphos has successfully set itself\n"
+"as the handler of sword:// and bible:// URLs.\n"
+"\n"
+"You may wish to run the program \"gconf-editor\"\n"
+"to examine keys under /desktop/gnome/url-handlers,\n"
+"if you need to change these."
+msgstr ""
+"Xiphos se ha establecido con éxito\n"
+"como el gestor de URLs sword:// y bible://\n"
+"\n"
+"Puede ejecutar el programa \"gconf-editor\"\n"
+"para examinar las claves bajo /desktop/gnome/url-handlers,\n"
+"si desea cambiar alguna."
+
+#: ../src/gnome2/gui.c:166
+#, c-format
+msgid ""
+"Xiphos failed to complete handler init for key #%d:\n"
+"%s"
+msgstr ""
+"Xiphos no pudo completar la inicialización del handler para la llave #%d:\n"
+"%s"
+
+#: ../src/gnome2/gui.c:212
+msgid "BUG! Xiphos is about to crash due to a \"STRDUP\" error."
+msgstr "¡ERROR! Xiphos se colgará debido a un error \"STRDUP\"."
+
+#: ../src/gnome2/gui.c:213 ../src/gnome2/gui.c:248
+msgid "Please report this error to the Xiphos team with:"
+msgstr "Por favor, reporte este error al equipo Xiphos con:"
+
+#: ../src/gnome2/gui.c:247
+msgid "BUG! Xiphos is about to crash due to a \"STRING\" error."
+msgstr "¡ERROR! Xiphos se colgará debido a un error \"STRING\"."
+
+#: ../src/gnome2/main_window.c:789
+msgid "Xiphos - Bible Study Software"
+msgstr "Xiphos - Software de Estudo Bíblico"
+
+#: ../src/gnome2/main_window.c:844
+msgid "Open a new tab"
+msgstr "Abrir una nueva pestaña"
+
+#: ../src/gnome2/main_window.c:923 ../src/gnome2/sidebar.c:627
+#: ../src/gnome2/sidebar.c:633 ../src/main/sidebar.cc:666
+#: ../src/main/sidebar.cc:1015 ../src/main/sidebar.cc:1016
+#: ../src/main/sidebar.cc:1017
+msgid "Standard View"
+msgstr "Vista Normal"
+
+#: ../src/gnome2/main_window.c:1004
+msgid "Commentary View"
+msgstr "Vista de Comentario"
+
+#: ../src/gnome2/main_window.c:1020
+msgid "Book View"
+msgstr "Vista de Libro"
+
+#: ../src/gnome2/main_window.c:1045
+msgid "Welcome to Xiphos"
+msgstr "Bienvenido a Xiphos"
+
+#: ../src/gnome2/menu_popup.c:1168
+msgid ""
+"Renaming is not available in Windows.\n"
+"\n"
+"Xiphos is limited by Windows' filesystem,\n"
+"because it disallows the renaming of filename\n"
+"components of currently-open files,\n"
+"such as the contents of this commentary.\n"
+"Therefore, personal commentary renaming is\n"
+"not available in the Windows environment."
+msgstr ""
+"El renombrado no está disponible en Windows\n"
+"\n"
+"Xiphos está limitado por el sistema de archivos de Windows\n"
+"porque no permite el renombrado de archivos\n"
+"que se encuentran abiertos o en uso,\n"
+"como los contenidos de los comentarios.\n"
+"Por eso, el renombrado de los comentarios\n"
+"personales no está disponible en Windows."
+
+#: ../src/gnome2/menu_popup.c:1187
+msgid "Rename Commentary"
+msgstr "Renombrar el comentarior"
+
+#: ../src/gnome2/menu_popup.c:1190
+msgid "Choose Commentary Name"
+msgstr "Elija el nombre para el comentario"
+
+#: ../src/gnome2/menu_popup.c:1192
+msgid "New Name"
+msgstr "Nuevo nombre"
+
+#: ../src/gnome2/menu_popup.c:1193 ../src/gnome2/treekey-editor.c:139
+#: ../src/gnome2/treekey-editor.c:198 ../src/gnome2/treekey-editor.c:284
+#: ../src/main/prayerlists.cc:243
+msgid "Name: "
+msgstr "Nombre: "
+
+#: ../src/gnome2/menu_popup.c:1203 ../src/main/prayerlists.cc:257
+msgid "Module names must contain [A-Za-z0-9_] only."
+msgstr "Los nombres de los módulos sólo pueden contener [A-Z a-z 0-9]."
+
+#: ../src/gnome2/menu_popup.c:1210 ../src/main/prayerlists.cc:264
+msgid "Xiphos already knows a module by that name."
+msgstr "Xiphos ya detectó un módulo con ese nombre."
+
+#: ../src/gnome2/menu_popup.c:1253
+#, c-format
+msgid ""
+"Failed to create new configuration:\n"
+"%s"
+msgstr ""
+"Error al crear la nueva configuración:\n"
+"%s"
+
+#: ../src/gnome2/menu_popup.c:1262
+msgid ""
+"Configuration build error:\n"
+"\n"
+msgstr ""
+"Error de construcción de configuración:\n"
+"\n"
+
+#: ../src/gnome2/mod_mgr.c:169
+msgid "Remove these modules?"
+msgstr "¿Remover estos módulos?"
+
+#: ../src/gnome2/mod_mgr.c:170
+msgid "Preparing to remove"
+msgstr "Preparando para remover"
+
+#: ../src/gnome2/mod_mgr.c:171
+msgid "Removing"
+msgstr "Removiendo"
+
+#: ../src/gnome2/mod_mgr.c:172 ../ui/xi-menus.glade.h:72
+msgid "Remove"
+msgstr "Remover"
+
+#: ../src/gnome2/mod_mgr.c:175
+msgid "Install these modules?"
+msgstr "¿Instalar esto módulos?"
+
+#: ../src/gnome2/mod_mgr.c:176
+msgid "Preparing to install"
+msgstr "Preparando para instalar"
+
+#: ../src/gnome2/mod_mgr.c:177
+msgid "Installing"
+msgstr "Instalando"
+
+#: ../src/gnome2/mod_mgr.c:178 ../src/gnome2/mod_mgr.c:2964
+#: ../ui/module-manager.glade.h:18
+msgid "Install"
+msgstr "Instalar"
+
+#: ../src/gnome2/mod_mgr.c:181
+msgid "Archive these modules?"
+msgstr "¿Archivar esto módulos?"
+
+#: ../src/gnome2/mod_mgr.c:182
+msgid "Preparing to archive"
+msgstr "Preparando para archivar"
+
+#: ../src/gnome2/mod_mgr.c:183
+msgid "Archiving"
+msgstr "Archivando"
+
+#: ../src/gnome2/mod_mgr.c:184 ../ui/module-manager.glade.h:11
+msgid "Archive"
+msgstr "Archivar"
+
+#: ../src/gnome2/mod_mgr.c:187
+msgid ""
+"Build fast-search index for these\n"
+"modules (may take minutes/module)?"
+msgstr ""
+"¿Construir índice de búsqueda rápida para estos\n"
+"módulos (puede demorar varios minutos)?"
+
+#: ../src/gnome2/mod_mgr.c:188
+msgid "Preparing to index"
+msgstr "Preparando para indexar"
+
+#: ../src/gnome2/mod_mgr.c:189
+msgid "Indexing"
+msgstr "Indexando"
+
+#: ../src/gnome2/mod_mgr.c:190 ../ui/module-manager.glade.h:17
+msgid "Index"
+msgstr "Indice"
+
+#: ../src/gnome2/mod_mgr.c:193
+msgid "Delete fast-search index for these modules?"
+msgstr "¿Borrar índice de búsqueda rápida para estos módulos?"
+
+#: ../src/gnome2/mod_mgr.c:194
+msgid "Preparing to delete index"
+msgstr "Preparando para borrar índice"
+
+#: ../src/gnome2/mod_mgr.c:195
+msgid "Deleting index"
+msgstr "Borrando índice"
+
+#: ../src/gnome2/mod_mgr.c:196
+msgid "Deletion"
+msgstr "Borrado"
+
+#: ../src/gnome2/mod_mgr.c:427
+msgid "Module Name"
+msgstr "Nombre del módulo"
+
+#: ../src/gnome2/mod_mgr.c:448
+msgid "A checkmark means this module is already installed"
+msgstr "La marca significa que el módulo ya está instalado"
+
+#: ../src/gnome2/mod_mgr.c:470
+msgid "Click the box to work on this module"
+msgstr "Haga clic en la caja para trabajar en este módulo"
+
+#: ../src/gnome2/mod_mgr.c:471
+msgid "Click the box to select this module for install/update"
+msgstr ""
+"Haga clic en la caja para seleccionar este módulo para instalación/"
+"actualización"
+
+#: ../src/gnome2/mod_mgr.c:490
+msgid "Installed"
+msgstr "Instalado"
+
+#: ../src/gnome2/mod_mgr.c:500
+msgid ""
+"The index icon means you have built an optimized ('lucene') index for this "
+"module for fast searching (see the Maintenance pane for this function)"
+msgstr ""
+"Un icono de índice significa que tiene un índice optimizado ('lucene') para "
+"este módulo para búsqueda rápida (vea el panel de Mantenimiento para esta "
+"función)"
+
+#: ../src/gnome2/mod_mgr.c:518
+msgid ""
+"The lock icon means this module is encrypted, and requires that you purchase "
+"an unlock key from the content owner"
+msgstr ""
+"El icono de candado significa que el módulo está encriptado y requiere la "
+"compra de una clave de apertura del propietario del contenido."
+
+#: ../src/gnome2/mod_mgr.c:535 ../ui/xi-menus.glade.h:1
+msgid "About"
+msgstr "Acerca de"
+
+#: ../src/gnome2/mod_mgr.c:555
+msgid ""
+"The refresh icon means the Installed module is older than the newer "
+"Available module: You should update the module"
+msgstr ""
+"El icono de actualización significa que el módulo instalado es de una "
+"versión anterior a la disponible. Debe actualizar el módulo."
+
+#: ../src/gnome2/mod_mgr.c:567
+msgid "Available"
+msgstr "Disponible"
+
+#: ../src/gnome2/mod_mgr.c:576
+msgid "Size"
+msgstr "Tamaño"
+
+#: ../src/gnome2/mod_mgr.c:585
+msgid "Description"
+msgstr "Descripción"
+
+#: ../src/gnome2/mod_mgr.c:736
+#, c-format
+msgid ""
+"`mkdir %s' failed:\n"
+"%s."
+msgstr ""
+"Falló 'mkdir %s':\n"
+"%s."
+
+#: ../src/gnome2/mod_mgr.c:759
+msgid " archived in: \n"
+msgstr " archivado en: \n"
+
+#: ../src/gnome2/mod_mgr.c:815
+msgid "Journals and prayer lists cannot be indexed."
+msgstr "Los diarios y las listas de oración no pueden ser indexados."
+
+#: ../src/gnome2/mod_mgr.c:833
+#, c-format
+msgid "%s failed"
+msgstr "Fallaron %s"
+
+#: ../src/gnome2/mod_mgr.c:836 ../src/gnome2/mod_mgr.c:1562
+msgid "Finished"
+msgstr "Terminado"
+
+#: ../src/gnome2/mod_mgr.c:1003 ../src/gnome2/mod_mgr.c:1005
+#: ../src/gnome2/mod_mgr.c:1107 ../src/gnome2/mod_mgr.c:1142
+#: ../src/gnome2/mod_mgr.c:1144 ../src/gnome2/utilities.c:435
+#: ../src/gnome2/utilities.c:500 ../src/gnome2/utilities.c:502
+#: ../src/gnome2/utilities.c:986 ../src/main/sidebar.cc:852
+#: ../src/main/sidebar.cc:924 ../src/main/sidebar.cc:926
+msgid "Unknown"
+msgstr "Desconocido"
+
+#: ../src/gnome2/mod_mgr.c:1301
+#, c-format
+msgid ""
+"Repository:\n"
+"%s"
+msgstr ""
+"Repositorio:\n"
+"%s"
+
+#: ../src/gnome2/mod_mgr.c:1313
+msgid ""
+"Categorized by\n"
+"Module Type"
+msgstr ""
+"Categorizado por \n"
+"Tipo de Módulo"
+
+#: ../src/gnome2/mod_mgr.c:1318 ../src/gnome2/utilities.c:561
+#: ../src/main/sidebar.cc:999 ../src/main/sidebar.cc:1001
+msgid "Biblical Texts"
+msgstr "Textos Bíblicos"
+
+#: ../src/gnome2/mod_mgr.c:1322 ../src/gnome2/utilities.c:565
+#: ../src/main/sidebar.cc:678 ../src/main/sidebar.cc:1024
+#: ../src/main/sidebar.cc:1026 ../ui/prefs.glade.h:33
+msgid "Commentaries"
+msgstr "Comentarios"
+
+#: ../src/gnome2/mod_mgr.c:1326 ../src/gnome2/utilities.c:569
+#: ../src/main/sidebar.cc:1033 ../src/main/sidebar.cc:1035
+msgid "Dictionaries"
+msgstr "Diccionarios"
+
+#: ../src/gnome2/mod_mgr.c:1330 ../src/gnome2/utilities.c:573
+#: ../src/main/sidebar.cc:1042 ../src/main/sidebar.cc:1044
+msgid "Daily Devotionals"
+msgstr "Devocionales diarios"
+
+#: ../src/gnome2/mod_mgr.c:1334 ../src/gnome2/utilities.c:577
+#: ../src/main/sidebar.cc:688 ../src/main/sidebar.cc:1051
+#: ../src/main/sidebar.cc:1053
+msgid "General Books"
+msgstr "Libros generales"
+
+#: ../src/gnome2/mod_mgr.c:1338 ../src/gnome2/utilities.c:581
+#: ../src/main/sidebar.cc:1060 ../src/main/sidebar.cc:1062
+msgid "Maps"
+msgstr "Mapas"
+
+#: ../src/gnome2/mod_mgr.c:1342 ../src/gnome2/utilities.c:585
+#: ../src/main/sidebar.cc:1069 ../src/main/sidebar.cc:1071
+msgid "Images"
+msgstr "Imágenes"
+
+#: ../src/gnome2/mod_mgr.c:1350
+msgid ""
+"Categorized by\n"
+"Availability"
+msgstr ""
+"Categorizado por \n"
+"Disponibilidad"
+
+#: ../src/gnome2/mod_mgr.c:1355
+msgid "Updates"
+msgstr "Actualizaciones"
+
+#: ../src/gnome2/mod_mgr.c:1359
+msgid "Uninstalled"
+msgstr "Desinstalado"
+
+#: ../src/gnome2/mod_mgr.c:1363 ../src/gnome2/sidebar.c:643
+#: ../src/gnome2/utilities.c:590 ../src/main/prayerlists.cc:241
+#: ../src/main/sidebar.cc:1079 ../src/main/sidebar.cc:1081
+msgid "Prayer List/Journal"
+msgstr "Lista de oración/Diario"
+
+#: ../src/gnome2/mod_mgr.c:1545
+msgid "Refreshing from remote source"
+msgstr "Actualizando desde fuente remota"
+
+#: ../src/gnome2/mod_mgr.c:1556
+msgid "Remote source not found"
+msgstr "Fuente remota no encontrada"
+
+#: ../src/gnome2/mod_mgr.c:1670
+msgid "Configure"
+msgstr "Configurar"
+
+#: ../src/gnome2/mod_mgr.c:1701
+msgid "Type"
+msgstr "Tipo"
+
+#: ../src/gnome2/mod_mgr.c:1708
+msgid "Caption"
+msgstr "Leyenda"
+
+#: ../src/gnome2/mod_mgr.c:1716
+msgid "Source"
+msgstr "Fuente"
+
+#: ../src/gnome2/mod_mgr.c:1724
+msgid "Directory"
+msgstr "Directorio"
+
+#: ../src/gnome2/mod_mgr.c:1732
+msgid "User"
+msgstr "Usuario"
+
+#: ../src/gnome2/mod_mgr.c:1740
+msgid "Password"
+msgstr "Contraseña"
+
+#: ../src/gnome2/mod_mgr.c:1748
+msgid "UID"
+msgstr "UID"
+
+#: ../src/gnome2/mod_mgr.c:1765
+msgid "Module Sources"
+msgstr "Fuentes de módulos"
+
+#: ../src/gnome2/mod_mgr.c:1768
+msgid "Add/Remove"
+msgstr "Añadir/Quitar"
+
+#: ../src/gnome2/mod_mgr.c:1770
+msgid "Choose"
+msgstr "Escoger"
+
+#: ../src/gnome2/mod_mgr.c:1774 ../src/gnome2/preferences_dialog.c:1793
+#: ../src/gnome2/sidebar.c:1413
+msgid "Modules"
+msgstr "Módulos"
+
+#: ../src/gnome2/mod_mgr.c:1776
+msgid "Install/Update"
+msgstr "Instalar/Actualizar"
+
+#: ../src/gnome2/mod_mgr.c:1778
+msgid "Maintenance"
+msgstr "Mantenimiento"
+
+#: ../src/gnome2/mod_mgr.c:1999
+msgid "Please Refresh"
+msgstr "Por favor actualize"
+
+#: ../src/gnome2/mod_mgr.c:2000
+msgid "Your module list is not up to date!"
+msgstr "¡La lista de módulos no está actualizada!"
+
+#. Zero Bibles is just not workable in Xiphos.
+#: ../src/gnome2/mod_mgr.c:2282
+msgid ""
+"You have uninstalled your last Bible.\n"
+"Xiphos requires at least one."
+msgstr ""
+"Ha desinstalado la última Biblia.\n"
+"Xiphos requiere de por lo menos una."
+
+#: ../src/gnome2/mod_mgr.c:2288
+msgid ""
+"There are still no Bibles installed.\n"
+"Xiphos cannot continue without one."
+msgstr ""
+"Aun no hay Biblias instaladas.\n"
+"Xiphos no puede continuar sin una."
+
+#: ../src/gnome2/mod_mgr.c:2353
+msgid "Standard remote sources have been loaded."
+msgstr "Las fuentes remotas estándar fueron cargadas."
+
+#: ../src/gnome2/mod_mgr.c:2359
+msgid "Could not load standard sources from CrossWire."
+msgstr "No se pudieron cargar las fuentes estándar de Crosswire."
+
+#: ../src/gnome2/mod_mgr.c:2510 ../src/gnome2/mod_mgr.c:2759
+msgid "Remove the selected source"
+msgstr "Remover la fuente seleccionada"
+
+#: ../src/gnome2/mod_mgr.c:2570
+msgid "Enter a remote source"
+msgstr "Introducir una fuente remota"
+
+#: ../src/gnome2/mod_mgr.c:2574
+msgid "Caption:"
+msgstr "Leyenda"
+
+#: ../src/gnome2/mod_mgr.c:2575
+msgid "Type:"
+msgstr "Tipo:"
+
+#: ../src/gnome2/mod_mgr.c:2576
+msgid "Host:"
+msgstr "Anfitrión:"
+
+#: ../src/gnome2/mod_mgr.c:2577
+msgid "Directory:"
+msgstr "Directorio:"
+
+#: ../src/gnome2/mod_mgr.c:2579
+msgid "User (optional):"
+msgstr "Usuario (opcional):"
+
+#: ../src/gnome2/mod_mgr.c:2580
+msgid "Password (optional):"
+msgstr "Contraseña (opcional):"
+
+#. this can happen at most once
+#: ../src/gnome2/mod_mgr.c:2608
+msgid "A source by that name already exists."
+msgstr "Ya existe una fuente con ese nombre."
+
+#: ../src/gnome2/mod_mgr.c:2756
+msgid "Delete a remote source"
+msgstr "Borrar una fuente remota"
+
+#. *****************************************************************************
+#. * Name
+#. *   gui_open_mod_mgr
+#. *
+#. * Synopsis
+#. *   #include "gui/mod_mgr.h"
+#. *
+#. *   void gui_open_mod_mgr(void)
+#. *
+#. * Description
+#. *
+#. *
+#. * Return value
+#. *   void
+#.
+#: ../src/gnome2/mod_mgr.c:3244
+msgid ""
+"<b>Welcome to the Module Manager.</b>\n"
+"\n"
+"This is Xiphos' mechanism to get new and updated content.\n"
+"It appears you have never been here before, so please take a moment to look "
+"it over.\n"
+"(You will see this information box just once.)\n"
+"\n"
+"Modules come from different <u>repositories</u>.  <b>Module Sources: Add/"
+"Remove</b> will show you what repositories are currently known.\n"
+"\n"
+"<b>Module Sources: Choose</b> is for deciding from where modules should "
+"come, that is, from which repository Xiphos should obtain them, as well as "
+"where they should be placed on your system. Set <i>Install Source</i> and "
+"<i>Install Destination</i>, then click <i>Refresh</i>.\n"
+"\n"
+"<b>Modules: Install/Update</b> is for selecting and obtaining modules after "
+"choosing source and destination.\n"
+"\n"
+"<b>Modules: Maintenance</b> is for archive and index creation.\n"
+"\n"
+"See section 5 of our manual for Module Manager detail, or ask for help via "
+"Live Chat, or (if no one is responsive in chat) send mail to our users' "
+"mailing list.\n"
+msgstr ""
+"<b>Bienvenido al Gestor de Módulos.</b>\n"
+"\n"
+"Este es el mecanismo de Xiphos para obtener contenido nuevo y actualizado\n"
+"Al parecer nunca lo ha utilizado antes, así que tome un momento para "
+"familiarizarse.\n"
+"(Sólo verá este mensaje una vez).\n"
+"\n"
+"Los módulos vienen de distintos <u>repositorios</u>.  <b>Fuentes de Módulos: "
+"Añadir/Quitar</b> le mostrará los repositorios conocidos.\n"
+"\n"
+"<b>Fuentes de Módulos: Escoger</b> es para decidir de dónde vienen los "
+"módulos, esto es, de que repositorio los obtiene Xiphos, al igual que dónde "
+"deben ser guardados en su sistema. Seleccione la <i>Fuente de Instalación</"
+"i> y el <i>Destino de Instalación</i>, y haga clic en <i>Actualizar</i>.\n"
+"\n"
+"<b>Módulos: Instalar/Actualizar</b> es para seleccionar y actualizar módulos "
+"después de haber elegido las fuentes y destino.\n"
+"\n"
+"<b>Módulos: Mantenimiento</b> es para crear archivos e índices.\n"
+"\n"
+"Consulte la sección 5 del manual para detalles del Gestor de Módulos, o pida "
+"ayuda en el Chat , o (si nadie responde en el chat) envíe un email a nuestra "
+"lista de correo.\n"
+
+#: ../src/gnome2/navbar_book.c:359 ../src/gnome2/navbar_book_dialog.c:300
+msgid "Go outward, to the section containing this one"
+msgstr "Ir afuera, a la sección que contiene a esta"
+
+#: ../src/gnome2/navbar_book.c:375 ../src/gnome2/navbar_book_dialog.c:316
+msgid "Go to previous item"
+msgstr "Ir al elemento anterior"
+
+#: ../src/gnome2/navbar_book.c:390 ../src/gnome2/navbar_book_dialog.c:331
+msgid "Go to next item"
+msgstr "Ir al elemento siguiente"
+
+#: ../src/gnome2/navbar_book.c:406 ../src/gnome2/navbar_book_dialog.c:347
+msgid "Go inward, to the first subsection"
+msgstr "Ir adentro, a la primera subsección"
+
+#: ../src/gnome2/navbar_versekey_dialog.c:864
+#: ../src/gnome2/navbar_versekey_editor.c:879
+#: ../src/gnome2/navbar_versekey_parallel.c:810
+msgid "Synchronize this window from main window"
+msgstr "Sincronizar esta ventana desde la ventana principal"
+
+#: ../src/gnome2/parallel_dialog.c:328 ../src/gnome2/preferences_dialog.c:1799
+msgid "Parallel"
+msgstr "Paralelo"
+
+#: ../src/gnome2/parallel_view.c:275
+msgid "Copy"
+msgstr "Copiar"
+
+#: ../src/gnome2/parallel_view.c:285
+msgid "Detach/Attach"
+msgstr "Separar/Adjuntar"
+
+#: ../src/gnome2/parallel_view.c:291 ../ui/xi-menus.glade.h:53
+msgid "Module Options"
+msgstr "Opciones de módulo"
+
+#. build change parallel modules submenu
+#: ../src/gnome2/parallel_view.c:306
+msgid "Change parallel 1"
+msgstr "Cambiar el paralelo 1"
+
+#: ../src/gnome2/parallel_view.c:308
+msgid "Change parallel 2"
+msgstr "Cambiar el paralelo 2"
+
+#: ../src/gnome2/parallel_view.c:310
+msgid "Change parallel 3"
+msgstr "Cambiar el paralelo 3"
+
+#: ../src/gnome2/parallel_view.c:312
+msgid "Change parallel 4"
+msgstr "Cambiar el paralelo 4"
+
+#: ../src/gnome2/parallel_view.c:314
+msgid "Change parallel 5"
+msgstr "Cambiar el paralelo 5"
+
+#: ../src/gnome2/parallel_view.c:471 ../src/gnome2/sidebar.c:626
+#: ../src/gnome2/sidebar.c:632 ../src/gnome2/tabbed_browser.c:262
+#: ../src/main/sidebar.cc:646 ../src/main/sidebar.cc:1007
+#: ../src/main/sidebar.cc:1008 ../src/main/sidebar.cc:1009
+msgid "Parallel View"
+msgstr "Vista Paralela"
+
+#: ../src/gnome2/preferences_dialog.c:1179
+#: ../src/gnome2/preferences_dialog.c:1217
+#: ../src/gnome2/preferences_dialog.c:1254
+#: ../src/gnome2/preferences_dialog.c:1289
+#: ../src/gnome2/preferences_dialog.c:1323
+#: ../src/gnome2/preferences_dialog.c:1356
+#: ../src/gnome2/preferences_dialog.c:1388
+#: ../src/gnome2/preferences_dialog.c:1421
+#: ../src/gnome2/preferences_dialog.c:1453
+#: ../src/gnome2/preferences_dialog.c:1487
+#: ../src/gnome2/preferences_dialog.c:1522
+#: ../src/gnome2/preferences_dialog.c:1557
+#: ../src/gnome2/preferences_dialog.c:1593
+#: ../src/gnome2/preferences_dialog.c:1631
+#: ../src/gnome2/preferences_dialog.c:2052
+msgid "-- Select --"
+msgstr "-- Seleccionar --"
+
+#: ../src/gnome2/preferences_dialog.c:1652
+msgid "Locale will take effect after restart."
+msgstr "Los cambios de idioma tendrán efecto al reiniciar"
+
+#: ../src/gnome2/preferences_dialog.c:1687 ../ui/prefs.glade.h:74
+msgid "Preferences"
+msgstr "Preferencias"
+
+#: ../src/gnome2/preferences_dialog.c:1769
+msgid "Fonts"
+msgstr "Tipografías"
+
+#: ../src/gnome2/preferences_dialog.c:1772
+msgid "Color"
+msgstr "Color"
+
+#: ../src/gnome2/preferences_dialog.c:1775
+msgid "Sizes"
+msgstr "Tamaños"
+
+#: ../src/gnome2/preferences_dialog.c:1779
+msgid "General"
+msgstr "General"
+
+#: ../src/gnome2/preferences_dialog.c:1782 ../ui/prefs.glade.h:87
+msgid "Tabs and Panes"
+msgstr "Pestañas y paneles"
+
+#: ../src/gnome2/preferences_dialog.c:1789
+msgid "Options"
+msgstr "Opciones"
+
+#: ../src/gnome2/preferences_dialog.c:1796
+msgid "Main"
+msgstr "Principal"
+
+#: ../src/gnome2/preferences_dialog.c:1802
+msgid "Special"
+msgstr "Especial"
+
+#: ../src/gnome2/search_dialog.c:68 ../src/main/search_dialog.cc:66
+#: ../src/main/search_sidebar.cc:61
+msgid "Searching the "
+msgstr "Buscando el "
+
+#: ../src/gnome2/search_dialog.c:69 ../src/main/search_dialog.cc:67
+#: ../src/main/search_sidebar.cc:62
+msgid " Module"
+msgstr " Módulo"
+
+#: ../src/gnome2/search_dialog.c:70 ../src/main/search_dialog.cc:68
+#: ../src/main/search_sidebar.cc:63
+msgid "found in "
+msgstr "encotrado en "
+
+#: ../src/gnome2/search_dialog.c:527
+msgid "Clear List?"
+msgstr "¿Limpiar lista?"
+
+#: ../src/gnome2/search_dialog.c:528
+msgid "Are you sure you want to clear the module list?"
+msgstr "¿Desea limpiar la lista de módulos?"
+
+#: ../src/gnome2/search_dialog.c:708
+msgid "The last module list may not be deleted"
+msgstr "La última lista de módulos no puede ser eliminada"
+
+#: ../src/gnome2/search_dialog.c:726
+msgid "Delete list?"
+msgstr "¿Borrar lista?"
+
+#: ../src/gnome2/search_dialog.c:727
+msgid "Are you sure you want to delete:"
+msgstr "¿Está seguro de querer borrar:"
+
+#: ../src/gnome2/search_sidebar.c:192
+msgid ""
+"This is an inclusive (\"AND\") search:\n"
+"Find matches showing all words."
+msgstr ""
+"Esta es una búsqueda inclusiva (\"AND\"):\n"
+"Encuentre coincidencias mostrando todas las palabras."
+
+#: ../src/gnome2/search_sidebar.c:209
+msgid "Search Module"
+msgstr "Buscar en el módulo"
+
+#: ../src/gnome2/search_sidebar.c:223
+msgid "Bible"
+msgstr "Biblia"
+
+#: ../src/gnome2/search_sidebar.c:232 ../ui/prefs.glade.h:35
+msgid "Commentary"
+msgstr "Comentario"
+
+#: ../src/gnome2/search_sidebar.c:246
+msgid "Search Type"
+msgstr "Tipo de búsqueda"
+
+#: ../src/gnome2/search_sidebar.c:260 ../ui/search-dialog.glade.h:66
+msgid "Multi word"
+msgstr "Multi-palabra"
+
+#: ../src/gnome2/search_sidebar.c:279 ../ui/search-dialog.glade.h:44
+msgid "Exact phrase"
+msgstr "Frase exacta"
+
+#: ../src/gnome2/search_sidebar.c:293
+msgid "Search Options"
+msgstr "Opciones de búsqueda"
+
+#: ../src/gnome2/search_sidebar.c:321
+msgid "Search Scope"
+msgstr "Alcance de búsqueda"
+
+#: ../src/gnome2/search_sidebar.c:334
+msgid "No scope"
+msgstr "Sin rango"
+
+#: ../src/gnome2/search_sidebar.c:344
+msgid "Use bounds"
+msgstr "Utilizar límites"
+
+#: ../src/gnome2/search_sidebar.c:353
+msgid "Last search"
+msgstr "Última búsqueda"
+
+#: ../src/gnome2/search_sidebar.c:368
+msgid "Bounds"
+msgstr "Límites"
+
+#: ../src/gnome2/search_sidebar.c:382
+msgid "Lower"
+msgstr "Inferior"
+
+#: ../src/gnome2/search_sidebar.c:389
+msgid "Upper"
+msgstr "Superior"
+
+#: ../src/gnome2/sidebar.c:1397
+msgid "Search"
+msgstr "Búsqueda"
+
+#: ../src/gnome2/sidebar.c:1405
+msgid "Verse List"
+msgstr "Lista de versículos"
+
+#: ../src/gnome2/sidebar_dialog.c:139 ../src/gnome2/sidebar_dialog.c:148
+msgid "Sidebar"
+msgstr "Barra lateral"
+
+#: ../src/gnome2/splash.c:396
+msgid "Powered by the SWORD Project"
+msgstr "Gracias al Proyecto SWORD"
+
+#: ../src/gnome2/treekey-editor.c:137 ../src/gnome2/treekey-editor.c:196
+#: ../src/gnome2/treekey-editor.c:282
+msgid "Prayer List/Journal Item"
+msgstr "Elemento de la Lista de oración/Diario"
+
+#: ../src/gnome2/treekey-editor.c:138 ../src/gnome2/treekey-editor.c:197
+#: ../src/gnome2/treekey-editor.c:283
+msgid "New name"
+msgstr "Nuevo nombre"
+
+#: ../src/gnome2/treekey-editor.c:253
+msgid "Remove the selected item"
+msgstr "Remover el elemento seleccionado"
+
+#: ../src/main/display.cc:259
+#, c-format
+msgid ""
+"Improperly encoded personal annotation label:\n"
+"'%s'"
+msgstr ""
+"Etiqueta de anotación personal codificada inapropiadamente:\n"
+"'%s'"
+
+#: ../src/main/display.cc:386
+msgid ""
+"An image file's size could not be determined.\n"
+"Is ImageMagick's 'identify' not installed?\n"
+"(Or possibly the image is of type other than bmp/gif/jpg/png.)\n"
+"Xiphos cannot resize images to fit window."
+msgstr ""
+"No se puede determinar el tamaño de la imagen.\n"
+"¿Ha instalado 'identify' de ImageMagick?\n"
+"(O quizá la imagen no está en formato bmp/gif/jpg/png.)\n"
+"Xiphos no puede ajustar la imagen a la ventana."
+
+#: ../src/main/display.cc:1043 ../src/main/display.cc:1095
+#: ../src/main/display.cc:1172 ../ui/export-dialog.glade.h:7
+msgid "Chapter"
+msgstr "Capítulo"
+
+#: ../src/main/main.c:119
+msgid "Xiphos does not understand more than one argument."
+msgstr "Xiphos no puede entender más de un argumento."
+
+#: ../src/main/main.c:161
+msgid "Initiating Gecko"
+msgstr "Inicializando Gecko"
+
+#: ../src/main/main.c:167
+msgid "Building Interface"
+msgstr "Construyendo interfaz"
+
+#: ../src/main/main.c:171
+msgid "Starting Sword"
+msgstr "Inicializando SWORD"
+
+#: ../src/main/main.c:175
+msgid "Loading Settings"
+msgstr "Cargando preferencias"
+
+#: ../src/main/main.c:179
+msgid "Displaying Xiphos"
+msgstr "Mostrando Xiphos"
+
+#: ../src/main/module_dialogs.cc:227 ../src/main/previewer.cc:127
+#: ../src/main/previewer.cc:194 ../ui/prefs.glade.h:75
+msgid "Previewer"
+msgstr "Previsualizador"
+
+#: ../src/main/module_dialogs.cc:292 ../src/main/module_dialogs.cc:416
+#: ../src/main/previewer.cc:269
+msgid "Footnote"
+msgstr "Nota al pie"
+
+#: ../src/main/module_dialogs.cc:298 ../src/main/module_dialogs.cc:421
+#: ../src/main/previewer.cc:281
+msgid "Cross Reference"
+msgstr "Referencia cruzada"
+
+#: ../src/main/module_dialogs.cc:304 ../src/main/module_dialogs.cc:318
+#: ../src/main/module_dialogs.cc:426 ../src/main/module_dialogs.cc:438
+#: ../src/main/previewer.cc:287 ../src/main/previewer.cc:306
+msgid "Strongs"
+msgstr "Strongs"
+
+#: ../src/main/module_dialogs.cc:310 ../src/main/module_dialogs.cc:329
+#: ../src/main/module_dialogs.cc:431 ../src/main/module_dialogs.cc:448
+#: ../src/main/previewer.cc:293 ../src/main/previewer.cc:319
+msgid "Morphology"
+msgstr "Morfología"
+
+#: ../src/main/module_dialogs.cc:1081 ../src/main/url.cc:530
+msgid "Back to "
+msgstr "Regresar a "
+
+#: ../src/main/parallel_view.cc:404 ../ui/xi-menus.glade.h:89
+msgid "Strong's Numbers"
+msgstr "Números de Strong"
+
+#: ../src/main/parallel_view.cc:414 ../ui/search-dialog.glade.h:52
+#: ../ui/xi-menus.glade.h:40
+msgid "Footnotes"
+msgstr "Notas al pie"
+
+#: ../src/main/parallel_view.cc:424 ../ui/search-dialog.glade.h:64
+#: ../ui/xi-menus.glade.h:55
+msgid "Morphological Tags"
+msgstr "Etiquetas morfológicas"
+
+#: ../src/main/parallel_view.cc:434 ../ui/xi-menus.glade.h:44
+msgid "Hebrew Vowel Points"
+msgstr "Puntos de vocales hebreas"
+
+#: ../src/main/parallel_view.cc:444 ../ui/xi-menus.glade.h:43
+msgid "Hebrew Cantillation"
+msgstr "Cantilena hebrea"
+
+#: ../src/main/parallel_view.cc:454 ../ui/xi-menus.glade.h:41
+msgid "Greek Accents"
+msgstr "Acentos griegos"
+
+#: ../src/main/parallel_view.cc:464
+msgid "Cross-references"
+msgstr "Referencias cruzadas"
+
+#: ../src/main/parallel_view.cc:474 ../ui/xi-menus.glade.h:50
+msgid "Lemmas"
+msgstr "Lemas"
+
+#: ../src/main/parallel_view.cc:484 ../ui/xi-menus.glade.h:42
+msgid "Headings"
+msgstr "Encabezados"
+
+#: ../src/main/parallel_view.cc:494
+msgid "Morpheme Segmentation"
+msgstr "Segmentación del morfema"
+
+#: ../src/main/parallel_view.cc:504 ../ui/xi-menus.glade.h:96
+msgid "Words of Christ in Red"
+msgstr "Palabras de Cristo en rojo"
+
+#: ../src/main/parallel_view.cc:514 ../ui/xi-menus.glade.h:91
+msgid "Transliteration"
+msgstr "Transliteración"
+
+#: ../src/main/parallel_view.cc:524
+msgid "Textual Variants"
+msgstr "Variantes textuales"
+
+#: ../src/main/parallel_view.cc:532 ../ui/xi-menus.glade.h:70
+msgid "Primary Reading"
+msgstr "Lectura primaria"
+
+#: ../src/main/parallel_view.cc:541 ../ui/xi-menus.glade.h:84
+msgid "Secondary Reading"
+msgstr "Lectura secundaria"
+
+#: ../src/main/parallel_view.cc:550 ../ui/xi-menus.glade.h:9
+msgid "All Readings"
+msgstr "Todas las lecturas"
+
+#: ../src/main/parallel_view.cc:884 ../src/main/parallel_view.cc:1136
+msgid "view context"
+msgstr "ver contexto"
+
+#: ../src/main/prayerlists.cc:74
+msgid "January"
+msgstr "Enero"
+
+#: ../src/main/prayerlists.cc:75
+msgid "February"
+msgstr "Febrero"
+
+#: ../src/main/prayerlists.cc:76
+msgid "March"
+msgstr "Marzo"
+
+#: ../src/main/prayerlists.cc:77
+msgid "April"
+msgstr "Abril"
+
+#: ../src/main/prayerlists.cc:78
+msgid "May"
+msgstr "Mayo"
+
+#: ../src/main/prayerlists.cc:79
+msgid "June"
+msgstr "Junio"
+
+#: ../src/main/prayerlists.cc:80
+msgid "July"
+msgstr "Julio"
+
+#: ../src/main/prayerlists.cc:81
+msgid "August"
+msgstr "Agosto"
+
+#: ../src/main/prayerlists.cc:82
+msgid "September"
+msgstr "Septiembre"
+
+#: ../src/main/prayerlists.cc:83
+msgid "October"
+msgstr "Octubre"
+
+#: ../src/main/prayerlists.cc:84
+msgid "November"
+msgstr "Noviembre"
+
+#: ../src/main/prayerlists.cc:85
+msgid "December"
+msgstr "Diciembre"
+
+#: ../src/main/prayerlists.cc:124 ../src/main/sword_treekey.cc:332
+msgid "Growth"
+msgstr "Crecimiento"
+
+#: ../src/main/prayerlists.cc:125 ../src/main/sword_treekey.cc:333
+msgid "<b>For Growth</b><br>"
+msgstr "<b>Para crecimiento</b><br>"
+
+#: ../src/main/prayerlists.cc:126 ../src/main/prayerlists.cc:383
+#: ../src/main/sword_treekey.cc:334
+msgid "Salvation"
+msgstr "Salvación"
+
+#: ../src/main/prayerlists.cc:127 ../src/main/sword_treekey.cc:335
+msgid "<b>For Salvation</b><br>"
+msgstr "<b>Para salvación</b><br>"
+
+#: ../src/main/prayerlists.cc:128 ../src/main/prayerlists.cc:387
+#: ../src/main/sword_treekey.cc:336
+msgid "Health"
+msgstr "Salud"
+
+#: ../src/main/prayerlists.cc:129 ../src/main/sword_treekey.cc:337
+msgid "<b>For Health</b><br>"
+msgstr "<b>Para salud</b><br>"
+
+#: ../src/main/prayerlists.cc:130
+msgid "Misc"
+msgstr "Misc"
+
+#: ../src/main/prayerlists.cc:131 ../src/main/sword_treekey.cc:339
+msgid "<b>Miscellaneous</b><br>"
+msgstr "<b>Misceláneo</b><br>"
+
+#: ../src/main/prayerlists.cc:139
+msgid "Point x"
+msgstr "Punto x"
+
+#: ../src/main/prayerlists.cc:140
+msgid "<b>(x)</b><br>"
+msgstr "<b>(x)</b><br>"
+
+#: ../src/main/prayerlists.cc:141
+msgid "Point y"
+msgstr "Punto y"
+
+#: ../src/main/prayerlists.cc:142
+msgid "<b>(y)</b><br>"
+msgstr "<b>(y)</b><br>"
+
+#: ../src/main/prayerlists.cc:143
+msgid "Point z"
+msgstr "Punto z"
+
+#: ../src/main/prayerlists.cc:144
+msgid "<b>(z)</b><br>"
+msgstr "<b>(z)</b><br>"
+
+#: ../src/main/prayerlists.cc:152
+msgid "Minor Topic 1"
+msgstr "Tópico Menor 1"
+
+#: ../src/main/prayerlists.cc:153
+msgid "<b>Subtopic 1</b><br>"
+msgstr "<b>Subtópico 1</b><br>"
+
+#: ../src/main/prayerlists.cc:155
+msgid "Minor Topic 2"
+msgstr "Tópico Menor 2"
+
+#: ../src/main/prayerlists.cc:156
+msgid "<b>Subtopic 2</b><br>"
+msgstr "<b>Subtópico 2</b><br>"
+
+#: ../src/main/prayerlists.cc:158
+msgid "Minor Topic 3"
+msgstr "Tópico Menor 3"
+
+#: ../src/main/prayerlists.cc:159
+msgid "<b>Subtopic 3</b><br>"
+msgstr "<b>Subtópico 3</b><br>"
+
+#: ../src/main/prayerlists.cc:161
+msgid "Minor Topic 4"
+msgstr "Tópico Menor 4"
+
+#: ../src/main/prayerlists.cc:162
+msgid "<b>Subtopic 4</b><br>"
+msgstr "<b>Subtópico 4</b><br>"
+
+#: ../src/main/prayerlists.cc:242
+msgid "Name for new prayer list or journal"
+msgstr "Nombre de la nueva lista de oración o diario"
+
+#: ../src/main/prayerlists.cc:273
+msgid "Xiphos finds that prayer list already."
+msgstr "Xiphos ya encontró esa lista de oración."
+
+#: ../src/main/prayerlists.cc:286
+#, c-format
+msgid ""
+"Xiphos cannot create module's path:\n"
+"%s"
+msgstr ""
+"Xiphos no puede crear la ruta del módulo:\n"
+"%s"
+
+#: ../src/main/prayerlists.cc:326
+msgid "A basic prayer list. \\par\\par Module created by Xiphos."
+msgstr "Una lista de oración básica. \\par\\par Módulo creado por Xiphos."
+
+#: ../src/main/prayerlists.cc:327
+msgid "BasicPrayerList"
+msgstr "ListaDeOraciónBásica"
+
+#: ../src/main/prayerlists.cc:341
+msgid "MyPrayerList"
+msgstr "MiListaDeOración"
+
+#: ../src/main/prayerlists.cc:342
+msgid ""
+"<b>People:</b><br>Bob<br>Sam<br>Sue<br><br><b>Church:</"
+"b><br>pews<br>fellowship<br>Bibles for missionaries<br><br><br>"
+msgstr ""
+"<b>Gente:</b><br>Luis<br>Juan<br>Sara<br><br><b>Iglesia:</"
+"b><br>sillas<br>comunión<br>Biblias para los misioneros<br><br><br>"
+
+#: ../src/main/prayerlists.cc:368
+msgid "A subject-based prayer list. \\par\\par Module created by Xiphos."
+msgstr ""
+"Una lista de oración basada en los sujetos. \\par\\par Módulo creado por "
+"Xiphos."
+
+#: ../src/main/prayerlists.cc:369
+msgid "SubjectPrayerList"
+msgstr "ListaDeOraciónPorSujetos"
+
+#: ../src/main/prayerlists.cc:384
+msgid "Bob<br>Sam<br>Sue<br>John<br>"
+msgstr "Luis<br>Juan<br>Sara<br>Daniel<br>"
+
+#: ../src/main/prayerlists.cc:385
+msgid "Spiritual Growth"
+msgstr "Crecimiento espiritual"
+
+#: ../src/main/prayerlists.cc:386
+msgid "Mike<br>Steve<br>"
+msgstr "Miguel<br>Roberto<br>"
+
+#: ../src/main/prayerlists.cc:388
+msgid "Sue<br>John<br>"
+msgstr "Sara<br>Juan<br>"
+
+#: ../src/main/prayerlists.cc:414
+msgid "A monthly prayer list. \\par\\par Module created by Xiphos."
+msgstr "Un lista de oración mensual \\par\\par Módulo creado por Xiphos."
+
+#: ../src/main/prayerlists.cc:415
+msgid "MonthlyPrayerList"
+msgstr "ListaDeOraciónMensual"
+
+#: ../src/main/prayerlists.cc:466
+msgid "A daily journal. \\par\\par Module created by Xiphos."
+msgstr "Un diario. \\par\\par Módulo creado por Xiphos."
+
+#: ../src/main/prayerlists.cc:467
+msgid "DailyJournal"
+msgstr "Diario"
+
+#: ../src/main/prayerlists.cc:531
+msgid "An outlined topic (e.g. sermon). \\par\\par Module created by Xiphos."
+msgstr "Esbozo (ej. un sermón). \\par\\par Módulo creado por Xiphos."
+
+#: ../src/main/prayerlists.cc:532
+msgid "OutlinedTopic"
+msgstr "Esbozo"
+
+#: ../src/main/prayerlists.cc:546
+msgid "Major Topic A"
+msgstr "Tópico Mayor A"
+
+#: ../src/main/prayerlists.cc:547
+msgid "<b>Major Topic A</b><br>"
+msgstr "<b>Tópico Mayor A</b><br>"
+
+#: ../src/main/prayerlists.cc:549
+msgid "Major Topic B"
+msgstr "Tópico Mayor B"
+
+#: ../src/main/prayerlists.cc:550
+msgid "<b>Major Topic B</b><br>"
+msgstr "<b>Tópico Mayor B</b><br>"
+
+#: ../src/main/prayerlists.cc:552
+msgid "Major Topic C"
+msgstr "Tópico Mayor C"
+
+#: ../src/main/prayerlists.cc:553
+msgid "<b>Major Topic C</b><br>"
+msgstr "<b>Tópico Mayor C</b><br>"
+
+#: ../src/main/previewer.cc:275
+msgid "User Annotation"
+msgstr "Anotación del usuario"
+
+#: ../src/main/search_dialog.cc:212
+#, c-format
+msgid "Search result %s: %s"
+msgstr "Resultado de la búsqueda %s: %s"
+
+#: ../src/main/search_dialog.cc:444
+msgid "Delete Range?"
+msgstr "¿Borrar rango?"
+
+#: ../src/main/search_dialog.cc:445
+msgid "Are you sure you want to delete this range?"
+msgstr "¿Desea borrar este rango?"
+
+#: ../src/main/search_dialog.cc:659 ../src/main/search_dialog.cc:1130
+#: ../src/main/search_dialog.cc:1133 ../src/main/search_dialog.cc:1155
+#: ../src/main/search_dialog.cc:1158
+msgid "Search: "
+msgstr "Buscar: "
+
+#: ../src/main/search_dialog.cc:704
+msgid "Remove Module?"
+msgstr "¿Remover módulo?"
+
+#: ../src/main/search_dialog.cc:705
+msgid "Are you sure you want to remove the selected module?"
+msgstr "¿Desea remover este módulo?"
+
+#: ../src/main/search_dialog.cc:1560
+#, c-format
+msgid ""
+"%s:\n"
+"No such module is installed.\n"
+"%s"
+msgstr ""
+"%s:\n"
+"Este módulo no está instalado.\n"
+"%s"
+
+#: ../src/main/search_dialog.cc:1562
+msgid "Please adjust the module list."
+msgstr "Ajuste la lista de módulos."
+
+#: ../src/main/search_dialog.cc:1578
+#, c-format
+msgid "No fast-search index exists for %s.%s%s"
+msgstr "No existe un índice de búsqueda rápida para %s.%s%s"
+
+#: ../src/main/search_dialog.cc:1580
+msgid ""
+"\n"
+"Search on this module is now `multi word'."
+msgstr ""
+"\n"
+"La búsqueda en este módulo es ahora 'multi-palabra'"
+
+#: ../src/main/search_dialog.cc:1581
+msgid ""
+"\n"
+"See the Module Manager, Maintenance pane."
+msgstr ""
+"\n"
+"Vea el Gestor de Módulos en el panel de Mantenimiento."
+
+#: ../src/main/search_dialog.cc:1644
+msgid "Search finished"
+msgstr "Búsqueda finalizada"
+
+#: ../src/main/search_sidebar.cc:100
+msgid "matches"
+msgstr "coincidencias"
+
+#: ../src/main/settings.c:60
+msgid ""
+"Welcome to Xiphos.\n"
+"\n"
+"There are no Bible modules installed. In order to initialize, Xiphos needs "
+"you to install at least one Bible.\n"
+"\n"
+"With your permission, Xiphos will invoke the Module Manager so that you may "
+"install from Crosswire:\n"
+"1. Configure remote install.\n"
+"2. Connect.\n"
+"3. Select a Bible text of your language preference.\n"
+"4. Click `install'.\n"
+"Close the Module Manager when you are done.\n"
+"\n"
+"Warning: If you live in a persecuted country, use with care.\n"
+"\n"
+"May Xiphos invoke the Module Manager so that you may install a Bible?"
+msgstr ""
+"Bienvenido a Xiphos.\n"
+"\n"
+"No hay módulos bíblicos instalados. Para poder iniciar, Xiphos necesita que "
+"instale al menos una Biblia.\n"
+"\n"
+"Con su permiso, Xiphos llamará al Gestor de Módulos para instalar desde "
+"Crosswire:\n"
+"1. Configure la instalación remota.\n"
+"2. Conéctese.\n"
+"3. Seleccione el texto Bíblico en su idioma preferido.\n"
+"4. Haga clic en 'instalar'\n"
+"Cierre el Gestor de Módulos cuando termine.\n"
+"\n"
+"Advertencia: use con cuidado si vive en un país donde es perseguido.\n"
+"\n"
+"¿Le gustaría que Xiphos llame al Gestor de Módulos para instalar una Biblia?"
+
+#: ../src/main/settings.c:105
+msgid "$HOME is not set!"
+msgstr "¡$HOME no está definido!"
+
+#: ../src/main/settings.c:120
+#, c-format
+msgid ""
+"Xiphos can not create  .xiphos:\n"
+"%s\n"
+"\n"
+"Xiphos cannot continue."
+msgstr ""
+"Xiphos no pudo crear  .xiphos:\n"
+"%s\n"
+"\n"
+"Xiphos no puede continuar."
+
+#: ../src/main/settings.c:133 ../src/main/settings.c:142
+#: ../src/main/settings.c:151
+msgid "can not create "
+msgstr "no se puede crear "
+
+#: ../src/main/settings.c:194
+msgid ""
+"There are still no Bibles installed.\n"
+"Evidently, you declined to install any.\n"
+"\n"
+"Without any Bible modules to display,\n"
+"Xiphos cannot proceed,\n"
+"and will now exit."
+msgstr ""
+"Aun no ha instalado ninguna Biblia.\n"
+"Obviamente, usted ha rechazado instalarla.\n"
+"\n"
+"Sin ningún módulo bíblico que mostrar,\n"
+"Xiphos no puede continuar\n"
+"y se cerrará a continuación."
+
+#: ../src/main/settings.c:198
+msgid "Bible module installation complete."
+msgstr "Instalación del módulo bíblico terminada."
+
+#: ../src/main/settings.c:201
+msgid ""
+"Without any Bible modules to display,\n"
+"Xiphos cannot proceed,\n"
+"and will now exit."
+msgstr ""
+"Sin ningún módulo bíblico que mostrar,\n"
+"Xiphos no puede continuar\n"
+"y se cerrará a continuación."
+
+#: ../src/main/sidebar.cc:399
+msgid "verse"
+msgstr "versículo"
+
+#: ../src/main/sidebar.cc:461
+msgid "chapter"
+msgstr "capítulo"
+
+#: ../src/main/sword.cc:537
+msgid ""
+"Xiphos's file for language\n"
+"abbreviations is missing."
+msgstr ""
+"El archivo para abreviaturas de lenguaje\n"
+"de Xiphos no se encuentra."
+
+#: ../src/main/sword.cc:544
+msgid ""
+"Xiphos's language abbreviation\n"
+"file cannot be opened."
+msgstr ""
+"El archivo para abreviaturas de lenguaje\n"
+"de Xiphos no se puede abrir."
+
+#: ../src/main/sword.cc:557
+msgid ""
+"Xiphos cannot allocate space\n"
+"for language abbreviations."
+msgstr ""
+"Xiphos no puede hacer espacio\n"
+"para abreviaturas de lenguaje."
+
+#: ../src/main/sword.cc:564
+msgid ""
+"Xiphos cannot read the\n"
+"language abbreviation file."
+msgstr ""
+"Xiphos no puede leer el\n"
+"archivo de abreviaturas de lenguaje."
+
+#: ../src/main/sword.cc:642
+msgid "No matching locale found for"
+msgstr "No hay idiomas que coincidan con"
+
+#: ../src/main/sword.cc:644
+msgid "Book names and menus may not be translated"
+msgstr "Nombres de libros y menús no pueden ser traducidos"
+
+#: ../src/main/sword.cc:1232
+msgid "Daily devotional was requested, but there are none installed."
+msgstr "Se solicitó un devocional diario, pero no hay ninguno instalado."
+
+#: ../src/main/tab_history.c:219
+msgid "Clear History"
+msgstr "Limpiar el historial"
+
+#: ../src/main/url.cc:101
+msgid "URL not found:"
+msgstr "No se encuentra la URL:"
+
+#: ../src/main/url.cc:191
+#, c-format
+msgid "Xiphos could not execute %s"
+msgstr "Xiphos no pudo ejecutar %s"
+
+#: ../src/main/url.cc:199
+msgid "Viewer error:\n"
+msgstr "Error del visualizador:\n"
+
+#: ../src/main/url.cc:272
+#, c-format
+msgid "Show %s in main window"
+msgstr "Mostrar %s en la ventana principal"
+
+#: ../src/main/xml.c:80 ../src/main/xml.c:464
+#, c-format
+msgid "Document not created successfully. \n"
+msgstr "No se pudo crear el documento exitosamente. \n"
+
+#: ../src/main/xml.c:89
+msgid "Personal"
+msgstr "Personal"
+
+#: ../src/main/xml.c:90
+msgid "What must I do to be saved?"
+msgstr "¿Qué debo hacer para ser salvo?"
+
+#: ../src/main/xml.c:92 ../src/main/xml.c:93
+msgid "Acts 16:31"
+msgstr "Hechos 16:31"
+
+#: ../src/main/xml.c:97 ../src/main/xml.c:98
+msgid "Eph 2:8,9"
+msgstr "Efesios 2:8,9"
+
+#: ../src/main/xml.c:102 ../src/main/xml.c:103
+msgid "Romans 1:16"
+msgstr "Romanos 1:16"
+
+#: ../src/main/xml.c:106
+msgid "What is the Gospel?"
+msgstr "¿Qué es el Evangelio?"
+
+#: ../src/main/xml.c:108 ../src/main/xml.c:109
+msgid "1 Cor 15:1-4"
+msgstr "1 Cor 15:1-4"
+
+#: ../src/main/xml.c:413 ../src/main/xml.c:1144
+#, c-format
+msgid "Document not parsed successfully. \n"
+msgstr "No se pudo analizar el documento correctamente. \n"
+
+#: ../src/main/xml.c:419 ../src/main/xml.c:747 ../src/main/xml.c:1025
+#: ../src/main/xml.c:1204
+#, c-format
+msgid "empty document \n"
+msgstr "documento vacío \n"
+
+#: ../src/main/xml.c:425
+#, c-format
+msgid "wrong type, root node != SwordBookmarks\n"
+msgstr "tipo equivocado, nodo raíz != SwordBookmarks\n"
+
+#: ../src/main/xml.c:476
+msgid "Old Testament"
+msgstr "Antiguo Testamento"
+
+#: ../src/main/xml.c:477
+msgid "Gen - Mal"
+msgstr "Génesis - Malaquias"
+
+#: ../src/main/xml.c:482
+msgid "New Testament"
+msgstr "Nuevo Testamento"
+
+#: ../src/main/xml.c:483
+msgid "Mat - Rev"
+msgstr "Mateo - Apocalipsis"
+
+#: ../src/main/xml.c:489
+msgid "Sample Module List"
+msgstr "Lista de módulos de ejemplo"
+
+#: ../src/main/xml.c:753 ../src/main/xml.c:1031
+#, c-format
+msgid "wrong type, root node != %s\n"
+msgstr "tipo equivocado, nodo raíz != %s\n"
+
+#: ../ui/bookmarks.glade.h:1
+msgid "Add Bookmark"
+msgstr "Añadir marcador"
+
+#: ../ui/bookmarks.glade.h:2 ../ui/markverse.glade.h:1
+msgid "Bookmark Dialog"
+msgstr "Diálogo de marcadores"
+
+#: ../ui/bookmarks.glade.h:3
+msgid "Bookmark Folder Treeview"
+msgstr "Vista en árbol de la carpeta marcadores"
+
+#: ../ui/bookmarks.glade.h:4 ../ui/markverse.glade.h:2
+msgid "Cancel Bookmark"
+msgstr "Cancelar marcador"
+
+#: ../ui/bookmarks.glade.h:5 ../ui/markverse.glade.h:3
+msgid "Create new folder"
+msgstr "Crear nueva carpeta"
+
+#: ../ui/bookmarks.glade.h:6
+msgid "Label Entry"
+msgstr "Entrada de etiqueta"
+
+#: ../ui/bookmarks.glade.h:7
+msgid "Label:"
+msgstr "Etiqueta:"
+
+#: ../ui/bookmarks.glade.h:8 ../ui/markverse.glade.h:6
+msgid "Module Entry"
+msgstr "Entrada de módulo"
+
+#: ../ui/bookmarks.glade.h:9 ../ui/markverse.glade.h:7
+msgid "Module:"
+msgstr "Módulo:"
+
+#: ../ui/bookmarks.glade.h:10
+msgid "New ..."
+msgstr "Nuevo ..."
+
+#: ../ui/bookmarks.glade.h:11 ../ui/markverse.glade.h:8
+#: ../ui/xi-menus.glade.h:56
+msgid "New Folder"
+msgstr "Nueva carpeta"
+
+#: ../ui/bookmarks.glade.h:12 ../ui/markverse.glade.h:10
+msgid "Verse Entry"
+msgstr "Entrada de versículo"
+
+#: ../ui/bookmarks.glade.h:13 ../ui/markverse.glade.h:11
+msgid "Verse:"
+msgstr "Versículo:"
+
+#: ../ui/editor_note.xml.h:1
+msgid "Delete the current note"
+msgstr "Borrar la nota actual"
+
+#: ../ui/editor_note.xml.h:2 ../ui/editor_studypad.xml.h:4
+#: ../ui/editor.xml.h:2
+msgid "E_xit"
+msgstr "_Salir"
+
+#: ../ui/editor_note.xml.h:3 ../ui/editor_studypad.xml.h:5
+#: ../ui/editor.xml.h:3
+msgid "Exit"
+msgstr "Salir"
+
+#: ../ui/editor_note.xml.h:4 ../ui/editor_studypad.xml.h:6
+#: ../ui/editor.xml.h:4
+msgid "Exit the program"
+msgstr "Salir del programa"
+
+#: ../ui/editor_note.xml.h:5 ../ui/editor_studypad.xml.h:7
+#: ../ui/editor.xml.h:5
+msgid "For_mat"
+msgstr "For_mato"
+
+#: ../ui/editor_note.xml.h:6 ../ui/editor_studypad.xml.h:8
+#: ../ui/editor.xml.h:6
+msgid "HTML Format switch"
+msgstr "Interruptor del formato HTML"
+
+#: ../ui/editor_note.xml.h:7 ../ui/editor_studypad.xml.h:9
+#: ../ui/editor.xml.h:7
+msgid "HTML mode"
+msgstr "Modo HTML"
+
+#: ../ui/editor_note.xml.h:8
+msgid "Preview the note to be printed"
+msgstr "Previsualizar la nota a imprimir"
+
+#: ../ui/editor_note.xml.h:10
+msgid "Print this note"
+msgstr "Imprimir esta nota"
+
+#: ../ui/editor_note.xml.h:12
+msgid "Save the current note"
+msgstr "Guardar esta nota"
+
+#: ../ui/editor_note.xml.h:13
+msgid "_Delete Personal Comment"
+msgstr "_Borrar Comentario Personal"
+
+#: ../ui/editor_note.xml.h:16
+msgid "_Save (Personal Comment)"
+msgstr "_Guardar (Comentario Personal)"
+
+#: ../ui/editor_studypad.xml.h:1
+msgid "Add this file to your bookmarks"
+msgstr "Añadir este archivo a marcadores"
+
+#: ../ui/editor_studypad.xml.h:3 ../ui/editor.xml.h:1
+msgid "Create a new document"
+msgstr "Crear un nuevo documento"
+
+#: ../ui/editor_studypad.xml.h:10 ../ui/editor.xml.h:8
+msgid "New Document"
+msgstr "Documento nuevo"
+
+#: ../ui/editor_studypad.xml.h:11 ../ui/editor.xml.h:9
+msgid "Open"
+msgstr "Abrir"
+
+#: ../ui/editor_studypad.xml.h:12
+msgid "Open a file in Studypad"
+msgstr "Abrir este archivo en el Cuaderno de Estudio"
+
+#: ../ui/editor_studypad.xml.h:13
+msgid "Preview the document to be printed"
+msgstr "Previsualizar el documento a imprimir"
+
+#: ../ui/editor_studypad.xml.h:15
+msgid "Print this document"
+msgstr "Imprimir este documento"
+
+#: ../ui/editor_studypad.xml.h:17
+msgid "Save AS"
+msgstr "Guardar como"
+
+#: ../ui/editor_studypad.xml.h:18 ../ui/editor.xml.h:12
+msgid "Save the current file"
+msgstr "Guardar el archivo actual"
+
+#: ../ui/editor_studypad.xml.h:19
+msgid "Save the current file as"
+msgstr "Guardar el archivo actual como"
+
+#: ../ui/editor.xml.h:10
+msgid "Open the file in Studypad"
+msgstr "Abrir el archivo en el Cuaderno de Estudio"
+
+#: ../ui/export-dialog.glade.h:1
+msgid ": "
+msgstr ": "
+
+#: ../ui/export-dialog.glade.h:2
+msgid "<b>Copy</b>"
+msgstr "<b>Copiar</b>"
+
+#: ../ui/export-dialog.glade.h:3
+msgid "<b>Export</b>"
+msgstr "<b>Exportar</b>"
+
+#: ../ui/export-dialog.glade.h:4
+msgid "<b>Format</b>"
+msgstr "<b>Formato</b>"
+
+#: ../ui/export-dialog.glade.h:5 ../ui/prefs.glade.h:25
+msgid "Book"
+msgstr "Libro"
+
+#: ../ui/export-dialog.glade.h:6
+msgid "Book Radio Button"
+msgstr "Botón de opción de Libro"
+
+#: ../ui/export-dialog.glade.h:8
+msgid "Chapter Radio Button"
+msgstr "Botón de opción de Capítulo"
+
+#: ../ui/export-dialog.glade.h:9 ../ui/xi-menus.glade.h:18
+msgid "Copy/Export Passage"
+msgstr "Copiar/Exportar pasaje"
+
+#: ../ui/export-dialog.glade.h:10
+msgid "Export Passage Cancel"
+msgstr "Cancelar exportación de pasaje"
+
+#: ../ui/export-dialog.glade.h:11
+msgid "Export Passage OK"
+msgstr "Continuar con exportación de pasaje"
+
+#: ../ui/export-dialog.glade.h:12
+msgid "Export complete book"
+msgstr "Exportar todo el libro"
+
+#: ../ui/export-dialog.glade.h:13
+msgid "Export complete chapter"
+msgstr "Exportar todo el capítulo"
+
+#: ../ui/export-dialog.glade.h:14
+msgid "Export single verse"
+msgstr "Exportar un versículo"
+
+#: ../ui/export-dialog.glade.h:15
+msgid "HTML"
+msgstr "HTML"
+
+#: ../ui/export-dialog.glade.h:16
+msgid "HTML Radio Button"
+msgstr "Botón de opción HTML"
+
+#: ../ui/export-dialog.glade.h:17
+msgid "Key"
+msgstr "Clave"
+
+#: ../ui/export-dialog.glade.h:18
+msgid "Plain Text"
+msgstr "Texto plano"
+
+#: ../ui/export-dialog.glade.h:19
+msgid "Plain Text Radio Button"
+msgstr "Botón de opción de Texto plano"
+
+#: ../ui/export-dialog.glade.h:21
+msgid "Save Export As"
+msgstr "Guardar la exportación como"
+
+#: ../ui/export-dialog.glade.h:22
+msgid "Verse"
+msgstr "Versículo"
+
+#: ../ui/export-dialog.glade.h:23
+msgid "Verse Radio Button"
+msgstr "Botón de opción de versículo"
+
+#: ../ui/export-dialog.glade.h:24
+msgid "Verse range"
+msgstr "Rango de versículos"
+
+#: ../ui/export-dialog.glade.h:25
+msgid "Version"
+msgstr "Versión"
+
+#: ../ui/markverse.glade.h:4
+msgid "Mark"
+msgstr "Marcar"
+
+#: ../ui/markverse.glade.h:5
+msgid "Mark/Unmark Verse"
+msgstr "Marcar/Desmarcar versículo"
+
+#: ../ui/markverse.glade.h:9
+msgid "Unmark"
+msgstr "Desmarcar"
+
+#: ../ui/module-manager.glade.h:1
+msgid "<b>Add and Remove Sources</b>"
+msgstr "<b>Añadir y quitar fuentes</b>"
+
+#: ../ui/module-manager.glade.h:2
+msgid "<b>Install Destination</b>"
+msgstr "<b>Destino de la instalación</b>"
+
+#: ../ui/module-manager.glade.h:3
+msgid "<b>Install Source</b>"
+msgstr "<b>Fuente de la instalación</b>"
+
+#: ../ui/module-manager.glade.h:4
+msgid "<b>Module Manager</b>"
+msgstr "<b>Gestor de Módulos</b>"
+
+#. do not translate <b> and </b> they are html formating
+#: ../ui/module-manager.glade.h:6
+msgid "<b>Sword</b>"
+msgstr "<b>Sword</b>"
+
+#: ../ui/module-manager.glade.h:7
+msgid "<b>WARNING:</b> If you live in a persecuted country use with care."
+msgstr ""
+"<b>ADVERTENCIA</b> Use con cuidado si vive en un país donde es perseguido."
+
+#: ../ui/module-manager.glade.h:8
+msgid ""
+"<b>Warning:</b> If you live in a persecuted country and do not wish to risk "
+"detection you should NOT use  the remote installation feature! "
+msgstr ""
+"<b>Advertencia:</b> Si vive en un país donde es perseguido y no desea "
+"arriesgarse a ser detectado NO use la instalación remota. "
+
+#: ../ui/module-manager.glade.h:9
+msgid "<i>Personal area, for your use only:</i>"
+msgstr "<i>Área personal, sólo para su uso:</i>"
+
+#: ../ui/module-manager.glade.h:10
+msgid "<i>System area, for all users:</i>"
+msgstr "<i>Área del sistema, para todos los usuarios:</i>"
+
+#: ../ui/module-manager.glade.h:12
+msgid "Continue"
+msgstr "Continuar"
+
+#: ../ui/module-manager.glade.h:13
+msgid "Current Remote Sources"
+msgstr "Fuentes remotas actuales"
+
+#: ../ui/module-manager.glade.h:14
+msgid "Current local sources"
+msgstr "Fuentes locales actuales"
+
+#: ../ui/module-manager.glade.h:15
+msgid "Delete Index"
+msgstr "Borrar índice"
+
+#: ../ui/module-manager.glade.h:16
+msgid "Home dir"
+msgstr "Carpeta personal (home)"
+
+#: ../ui/module-manager.glade.h:19
+msgid "Load Standard"
+msgstr "Cargar Predeterminados"
+
+#: ../ui/module-manager.glade.h:20
+msgid "Local"
+msgstr "Local"
+
+#: ../ui/module-manager.glade.h:21
+msgid "Local Install Folder"
+msgstr "Carpeta de instalación local"
+
+#: ../ui/module-manager.glade.h:22
+msgid "Module Manager"
+msgstr "Gestor de Módulos"
+
+#: ../ui/module-manager.glade.h:23
+msgid "Remote"
+msgstr "Remoto"
+
+#: ../ui/module-manager.glade.h:24
+msgid "Sword sys dir"
+msgstr "Directorio de Sword en el sistema"
+
+#: ../ui/navbar_versekey.glade.h:1
+msgid "1"
+msgstr "1"
+
+#: ../ui/navbar_versekey.glade.h:2
+msgid "<b>Revelation of John</b>"
+msgstr "<b>Apocalipsis de Juan</b>"
+
+#: ../ui/navbar_versekey.glade.h:3
+msgid "Book Selector Button"
+msgstr "Botón selector de libros"
+
+#: ../ui/navbar_versekey.glade.h:4
+msgid "Choose book to display"
+msgstr "Elija el libro a mostrar"
+
+#: ../ui/navbar_versekey.glade.h:5
+msgid "Drop down history list"
+msgstr "Historial en lista desplegable"
+
+#: ../ui/navbar_versekey.glade.h:6
+msgid "Reference Entry"
+msgstr "Entrada de referencia"
+
+#: ../ui/navbar_versekey.glade.h:7
+msgid "Toggle Chapter Button"
+msgstr "Botón de cambio de capítulo"
+
+#: ../ui/navbar_versekey.glade.h:8
+msgid "Toggle Verse Button"
+msgstr "Botón de cambio de versículo"
+
+#: ../ui/prefs.glade.h:1
+msgid ""
+"-2\n"
+"-1\n"
+"+0\n"
+"+1\n"
+"+2\n"
+"+3\n"
+"+4\n"
+"+5"
+msgstr ""
+"-2\n"
+"-1\n"
+"+0\n"
+"+1\n"
+"+2\n"
+"+3\n"
+"+4\n"
+"+5"
+
+#: ../ui/prefs.glade.h:9
+msgid "<b>Font Colors</b>"
+msgstr "<b>Colores de tipografía</b>"
+
+#: ../ui/prefs.glade.h:10
+msgid "<b>Font Sizes</b>"
+msgstr "<b>Tamaños de tipografía</b>"
+
+#: ../ui/prefs.glade.h:11
+msgid "<b>General</b>"
+msgstr "<b>General</b>"
+
+#: ../ui/prefs.glade.h:12
+msgid "<b>Main Window Modules</b>"
+msgstr "<b>Módulos de la ventana principal</b>"
+
+#: ../ui/prefs.glade.h:13
+msgid "<b>Parallel View</b>"
+msgstr "<b>Vista Paralela</b>"
+
+#: ../ui/prefs.glade.h:14
+msgid "<b>Show</b>"
+msgstr "<b>Mostrar</b>"
+
+#: ../ui/prefs.glade.h:15
+msgid "<b>Special Purpose Modules</b>"
+msgstr "<b>Módulos especiales</b>"
+
+#: ../ui/prefs.glade.h:16
+msgid "<b>StudyPad default directory</b>"
+msgstr "<b>Directorio por defecto del Cuaderno de Estudio</b>"
+
+#: ../ui/prefs.glade.h:17
+msgid "<b>Tabs</b>"
+msgstr "<b>Pestañas</b>"
+
+#: ../ui/prefs.glade.h:18
+msgid "Apply high-contrast highlight to current verse"
+msgstr "Aplicar resaltado de alto contraste al versículo actual"
+
+#: ../ui/prefs.glade.h:19
+msgid ""
+"Automatically resize commentary, book, and dictionary image content to fit "
+"subwindow"
+msgstr ""
+"Ajustar automáticamente el comentario, libro y diccionario a la subventana"
+
+#: ../ui/prefs.glade.h:20
+msgid "Background"
+msgstr "Fondo"
+
+#: ../ui/prefs.glade.h:21
+msgid "Base font size"
+msgstr "Tamaño de tipografía base"
+
+#: ../ui/prefs.glade.h:22
+msgid "Bible Texts"
+msgstr "Texto bíblicos"
+
+#: ../ui/prefs.glade.h:23
+msgid "Bible Texts Checkbox"
+msgstr "Marca para los textos bíblicos"
+
+#: ../ui/prefs.glade.h:24
+msgid "Biblical Text"
+msgstr "Texto bíblico"
+
+#: ../ui/prefs.glade.h:26
+msgid "Change Biblical Text Combo"
+msgstr "Combo para texto bíblico"
+
+#: ../ui/prefs.glade.h:27
+msgid "Change Book Combo"
+msgstr "Combo para el libro"
+
+#: ../ui/prefs.glade.h:28
+msgid "Change Commentary Combo"
+msgstr "Combo para comentario"
+
+#: ../ui/prefs.glade.h:29
+msgid "Change Default Dictionary Combo"
+msgstr "Combo para diccionario predeterminado"
+
+#: ../ui/prefs.glade.h:30
+msgid "Change Dictionary Combo"
+msgstr "Combo para diccionario"
+
+#: ../ui/prefs.glade.h:31
+msgid "Change Personal Notes Combo"
+msgstr "Combo para notas personales"
+
+#: ../ui/prefs.glade.h:32
+msgid "Choose to enable Prayer lists "
+msgstr "Elija para habilitar Listas de oración. "
+
+#: ../ui/prefs.glade.h:34
+msgid "Commentaries Checkbox"
+msgstr "Marca para comentarios"
+
+#: ../ui/prefs.glade.h:36
+msgid "Cover"
+msgstr "Cobierta"
+
+#: ../ui/prefs.glade.h:37
+msgid "Current Verse"
+msgstr "Versículo actual"
+
+#: ../ui/prefs.glade.h:38
+msgid "Daily Devotional"
+msgstr "Devocional diario"
+
+#: ../ui/prefs.glade.h:39
+msgid "Daily Devotional Combo"
+msgstr "Combo para el devocional diario"
+
+#: ../ui/prefs.glade.h:40
+msgid "Default Dictionary"
+msgstr "Diccionario predeterminado"
+
+#: ../ui/prefs.glade.h:41
+msgid "Dictionary"
+msgstr "Diccionario"
+
+#: ../ui/prefs.glade.h:42
+msgid "Dictionary/Lexicon"
+msgstr "Diccionario/Léxico"
+
+#: ../ui/prefs.glade.h:43
+msgid "Dictionary/Lexicon Checkbox"
+msgstr "Marca para el diccionario/léxico"
+
+#: ../ui/prefs.glade.h:44
+msgid "Enable Prayer Lists"
+msgstr "Habilitar Listas de Oración"
+
+#: ../ui/prefs.glade.h:45
+msgid "Enable Prayer Lists Checkbox"
+msgstr "Marca para habilitar Listas de Oración"
+
+#: ../ui/prefs.glade.h:46
+msgid "Font Colors"
+msgstr "Colores de Tipografía"
+
+#: ../ui/prefs.glade.h:47
+msgid "Font Misc"
+msgstr "Misc de Tipografías"
+
+#: ../ui/prefs.glade.h:48
+msgid "Foreground"
+msgstr "Frente"
+
+#: ../ui/prefs.glade.h:49
+msgid "General Misc"
+msgstr "Misc Generales"
+
+#: ../ui/prefs.glade.h:50
+msgid "Greek Lexicon"
+msgstr "Léxico griego"
+
+#: ../ui/prefs.glade.h:51
+msgid "Greek Lexicon Combo"
+msgstr "Combo para el léxico griego"
+
+#: ../ui/prefs.glade.h:52
+msgid "Hebrew Lexicon"
+msgstr "Léxico hebreo"
+
+#: ../ui/prefs.glade.h:53
+msgid "Hebrew Lexicon Combo"
+msgstr "Combo para el léxico hebreo"
+
+#: ../ui/prefs.glade.h:54
+msgid "Highlight Background"
+msgstr "Resaltar fondo"
+
+#: ../ui/prefs.glade.h:55
+msgid "Highlight Foreground"
+msgstr "Resaltar frente"
+
+#: ../ui/prefs.glade.h:56
+msgid "Highlight current verse"
+msgstr "Resaltar el versículo actual"
+
+#: ../ui/prefs.glade.h:57
+msgid "Highlight current verse check box"
+msgstr "Marca para resaltar el versículo actual"
+
+#: ../ui/prefs.glade.h:58
+msgid "Links"
+msgstr "Enlaces"
+
+#: ../ui/prefs.glade.h:59
+msgid "Modules Main"
+msgstr "Principal de Módulos"
+
+#: ../ui/prefs.glade.h:60
+msgid "Modules Misc"
+msgstr "Misc de Módulos"
+
+#: ../ui/prefs.glade.h:61
+msgid "Modules Parallel"
+msgstr "Paralelo de Módulos"
+
+#: ../ui/prefs.glade.h:62
+msgid "Parallel 1"
+msgstr "Paralelo 1"
+
+#: ../ui/prefs.glade.h:63
+msgid "Parallel 1 Combo"
+msgstr "Combo para el paralelo 1"
+
+#: ../ui/prefs.glade.h:64
+msgid "Parallel 2"
+msgstr "Paralelo 2"
+
+#: ../ui/prefs.glade.h:65
+msgid "Parallel 2 Combo"
+msgstr "Combo para el paralelo 2"
+
+#: ../ui/prefs.glade.h:66
+msgid "Parallel 3"
+msgstr "Paralelo 3"
+
+#: ../ui/prefs.glade.h:67
+msgid "Parallel 3 Combo"
+msgstr "Combo para el paralelo 3"
+
+#: ../ui/prefs.glade.h:68
+msgid "Parallel 4"
+msgstr "Paralelo 4"
+
+#: ../ui/prefs.glade.h:69
+msgid "Parallel 4 Combo"
+msgstr "Combo para el paralelo 4"
+
+#: ../ui/prefs.glade.h:70
+msgid "Parallel 5"
+msgstr "Paralelo 5"
+
+#: ../ui/prefs.glade.h:71
+msgid "Parallel 5 Combo"
+msgstr "Combo para el paralelo 5"
+
+#: ../ui/prefs.glade.h:72
+msgid "Parallel View in a tab"
+msgstr "Vista paralela en pestaña"
+
+#: ../ui/prefs.glade.h:73
+msgid "Personal Notes"
+msgstr "Notas personales"
+
+#: ../ui/prefs.glade.h:76
+msgid "Previewer Checkbox"
+msgstr "Marca para el previsualizador"
+
+#: ../ui/prefs.glade.h:77
+msgid "Resize images"
+msgstr "Redimensionar imágenes"
+
+#: ../ui/prefs.glade.h:78
+msgid "Resize images checkbox"
+msgstr "Marca de redimensionar imágenes"
+
+#: ../ui/prefs.glade.h:79
+msgid "Scroll to Previous/Next Chapter"
+msgstr "Desplazarse al capítulo siguiente/anterior"
+
+#: ../ui/prefs.glade.h:80
+msgid "Scroll to Previous/Next Chapter Checkbox"
+msgstr "Marca para desplazarse al capítulo siguiente/anterior"
+
+#: ../ui/prefs.glade.h:81
+msgid "Select A Directory"
+msgstr "Seleccione un diccionario"
+
+#: ../ui/prefs.glade.h:82
+msgid "Show Daily Devotion at start up"
+msgstr "Mostrar devocional diario al iniciar"
+
+#: ../ui/prefs.glade.h:83
+msgid "Show splash screen at start up"
+msgstr "Mostrar pantalla de bienvenida al iniciar"
+
+#: ../ui/prefs.glade.h:84
+msgid "Special Locale (requires restart)"
+msgstr "Idioma especial (requiere reiniciar)"
+
+#: ../ui/prefs.glade.h:85
+msgid "Special Locale Combo"
+msgstr "Combo para el idioma especial"
+
+#: ../ui/prefs.glade.h:86
+msgid "StudyPad default directory combo"
+msgstr "Combo para el directorio predeterminado del Cuaderno de Estudio"
+
+#: ../ui/prefs.glade.h:88
+msgid "Use Bible Text scroll bar to scroll to previous or next chapter"
+msgstr ""
+"Utilice las barras de desplazamiento del texto bíblico para desplazarse al "
+"capítulo siguiente o anterior."
+
+#: ../ui/prefs.glade.h:89
+msgid "Use Verse Per Line"
+msgstr "Utilizar versículo por línea"
+
+#: ../ui/prefs.glade.h:90
+msgid "Use Verse Per Line Checkbox"
+msgstr "Marca para utilizar versículo por línea"
+
+#: ../ui/prefs.glade.h:91
+msgid "Use default Dictionary"
+msgstr "Utilizar el diccionario predeterminado"
+
+#: ../ui/prefs.glade.h:92
+msgid "Use default Dictionary Checkbox"
+msgstr "Marca para utilizar el diccionario predeterminado"
+
+#: ../ui/prefs.glade.h:93
+msgid "Use tabbed browsing"
+msgstr "Navegar por pestañas"
+
+#: ../ui/prefs.glade.h:94
+msgid "Use tabbed browsing Checkbox"
+msgstr "Marco para navegar por pestañas"
+
+#: ../ui/prefs.glade.h:95
+msgid "Verse Number"
+msgstr "Número de versículo"
+
+#: ../ui/prefs.glade.h:96
+msgid "Verse number size"
+msgstr "Tamaño de número de versículo"
+
+#: ../ui/search-dialog.glade.h:1
+msgid "<b>Attribute</b>"
+msgstr "<b>Atributo</b>"
+
+#: ../ui/search-dialog.glade.h:2
+msgid "<b>Found</b>"
+msgstr "<b>Encontrado</b>"
+
+#: ../ui/search-dialog.glade.h:3
+msgid "<b>List Name</b>"
+msgstr "<b>Lista de nombres</b>"
+
+#: ../ui/search-dialog.glade.h:4
+msgid "<b>Module Lists</b>"
+msgstr "<b>Lista de Módulos</b>"
+
+#: ../ui/search-dialog.glade.h:5
+msgid "<b>Modules</b>"
+msgstr "<b>Módulos</b>"
+
+#: ../ui/search-dialog.glade.h:6
+msgid "<b>Options</b>"
+msgstr "<b>Opciones</b>"
+
+#: ../ui/search-dialog.glade.h:7
+msgid "<b>Preview</b>"
+msgstr "<b>Vista previa</b>"
+
+#: ../ui/search-dialog.glade.h:8
+msgid "<b>Range Definition</b>"
+msgstr "<b>Definición del rango</b>"
+
+#: ../ui/search-dialog.glade.h:9
+msgid "<b>Range Name</b>"
+msgstr "<b>Nombre del rango</b>"
+
+#: ../ui/search-dialog.glade.h:10
+msgid "<b>Ranges</b>"
+msgstr "<b>Rangos</b>"
+
+#: ../ui/search-dialog.glade.h:11
+msgid "<b>Results Display Options</b>"
+msgstr "<b>Opciones de la muestra de resultados</b>"
+
+#: ../ui/search-dialog.glade.h:12
+msgid "<b>Scope</b>"
+msgstr "<b>Alcance</b>"
+
+#: ../ui/search-dialog.glade.h:13
+msgid "<b>Search Results</b>"
+msgstr "<b>Resultados de la búsqueda</b>"
+
+#: ../ui/search-dialog.glade.h:14
+msgid "<b>Search Type</b>"
+msgstr "<b>Tipo de búsqueda</b>"
+
+#: ../ui/search-dialog.glade.h:15
+msgid "Add Modules"
+msgstr "Añadir módulos"
+
+#: ../ui/search-dialog.glade.h:16
+msgid "Advanced Search"
+msgstr "Búsqueda avanzada"
+
+#: ../ui/search-dialog.glade.h:17
+msgid "Attribute Search"
+msgstr "Búsqueda por atributos"
+
+#: ../ui/search-dialog.glade.h:18
+msgid "Attributes"
+msgstr "Atributos"
+
+#: ../ui/search-dialog.glade.h:19
+msgid "Attributes radiobutton"
+msgstr "Botón de opción de atributos"
+
+#: ../ui/search-dialog.glade.h:20
+msgid "Clear Custom Module List Button"
+msgstr "Botón de limpieza de la lista módulos personalizados"
+
+#: ../ui/search-dialog.glade.h:21
+msgid "Clear Modules from List Button"
+msgstr "Botón de limpieza de la lista de módulos"
+
+#: ../ui/search-dialog.glade.h:22
+msgid "Clear all modules from the list"
+msgstr "Quitar todos los módulos de la lista"
+
+#: ../ui/search-dialog.glade.h:23
+msgid "Clear lists for new search"
+msgstr "Limpiar listas para nueva búsqueda"
+
+#: ../ui/search-dialog.glade.h:24
+msgid "Create a new module list"
+msgstr "Crear una nueva lista de módulos"
+
+#: ../ui/search-dialog.glade.h:25
+msgid "Create new custom range"
+msgstr "Crear un nuevo rango personalizado"
+
+#: ../ui/search-dialog.glade.h:26
+msgid "Current results"
+msgstr "Resultados actuales"
+
+#: ../ui/search-dialog.glade.h:27
+msgid "Current results radiobutton"
+msgstr "Botón de opción de resultados actuales"
+
+#: ../ui/search-dialog.glade.h:28
+msgid "Custom Module List Combo"
+msgstr "Combo de la lista de módulos"
+
+#: ../ui/search-dialog.glade.h:29
+msgid "Custom Module List Name Entry"
+msgstr "Entrada del nombre de lista de módulos personalizada"
+
+#: ../ui/search-dialog.glade.h:30
+msgid "Custom Module Lists"
+msgstr "Lista de módulos personalizada"
+
+#: ../ui/search-dialog.glade.h:31
+msgid "Custom Range Preview"
+msgstr "Previsualización del rango personalizado"
+
+#: ../ui/search-dialog.glade.h:32
+msgid "Custom Range Selector Combo"
+msgstr "Combo del selector de rango personalizado"
+
+#: ../ui/search-dialog.glade.h:33
+msgid "Custom Verse Ranges"
+msgstr "Rangos de versículo personalizados"
+
+#: ../ui/search-dialog.glade.h:34
+msgid "Custom module list"
+msgstr "Lista de módulos personalizada"
+
+#: ../ui/search-dialog.glade.h:35
+msgid "Custom module list radiobutton"
+msgstr "Botón de opción de la lista de módulos personalizada"
+
+#: ../ui/search-dialog.glade.h:36
+msgid "Custom verse range"
+msgstr "Rango de versículos personalizado"
+
+#: ../ui/search-dialog.glade.h:37
+msgid "Custom verse range radiobutton"
+msgstr "Botón de opción del rango de versículos personalizado"
+
+#: ../ui/search-dialog.glade.h:38
+msgid "Delete Range Button"
+msgstr "Botón para borrar el rango"
+
+#: ../ui/search-dialog.glade.h:39
+msgid "Delete Selected Module From List Button"
+msgstr "Botón para borrar el módulo seleccionado de la lista"
+
+#: ../ui/search-dialog.glade.h:40
+msgid "Delete selected range"
+msgstr "Borrar el rango seleccionado"
+
+#: ../ui/search-dialog.glade.h:41
+msgid "Delete the selected list"
+msgstr "Borrar la lista seleccionada"
+
+#: ../ui/search-dialog.glade.h:42
+msgid "Entire module"
+msgstr "Todo el módulo"
+
+#: ../ui/search-dialog.glade.h:43
+msgid "Entire module radiobutton"
+msgstr "Botón de opción de todo el módulo"
+
+#: ../ui/search-dialog.glade.h:45
+msgid "Exact phrase radiobutton"
+msgstr "Botón de opción de frase exacta"
+
+#: ../ui/search-dialog.glade.h:46
+msgid "Export"
+msgstr "Exportar"
+
+#: ../ui/search-dialog.glade.h:47
+msgid "Export current search results"
+msgstr "Exportar los resultados de búsqueda actuales"
+
+#: ../ui/search-dialog.glade.h:48
+msgid ""
+"Fast, featureful, index-based search\n"
+"Indexes must have been built beforehand:\n"
+"See Module Manager's maintenance functions"
+msgstr ""
+"Búsqueda útil y rápida basada en el índice\n"
+"Los índices deben haber sido previamente construidos:\n"
+"Vea la sección de Mantenimiento del Gestor de Módulos"
+
+#: ../ui/search-dialog.glade.h:51
+msgid "Find Button"
+msgstr "Botón de buscar"
+
+#: ../ui/search-dialog.glade.h:53
+msgid "Footnotes radiobutton"
+msgstr "Botón de opción de notas al pie"
+
+#: ../ui/search-dialog.glade.h:54
+msgid "In modules that have Footnotes"
+msgstr "En módulos que tienen Notas al pie"
+
+#: ../ui/search-dialog.glade.h:55
+msgid "In modules that have Morphological Tags"
+msgstr "En módulos que tienen Etiquetas Morfológicas"
+
+#: ../ui/search-dialog.glade.h:56
+msgid "In modules that have Strong's Numbers"
+msgstr "En módulos que tienen Números de Strong"
+
+#: ../ui/search-dialog.glade.h:57
+msgid "Main Search Entry"
+msgstr "Entrada de búsqueda principal"
+
+#: ../ui/search-dialog.glade.h:58
+msgid "Make selections on the Attribute Search tab"
+msgstr "Haga selecciones en la pestaña de Búsqueda por Atributos"
+
+#: ../ui/search-dialog.glade.h:60
+msgid "Match case checkbox"
+msgstr "Marca de coincidir mayúsculas"
+
+#: ../ui/search-dialog.glade.h:61
+msgid "Module Selection"
+msgstr "Selección de módulo"
+
+#: ../ui/search-dialog.glade.h:62
+msgid "Module list"
+msgstr "Lista de módulos"
+
+#: ../ui/search-dialog.glade.h:63
+msgid "Module list radiobutton"
+msgstr "Botón de opción de lista de módulos"
+
+#: ../ui/search-dialog.glade.h:65
+msgid "Morphological Tags radiobutton"
+msgstr "Botón de opción de Etiquetas Morfológicas"
+
+#: ../ui/search-dialog.glade.h:67
+msgid "Multi word radiobutton"
+msgstr "Botón de opción de multi-palabra"
+
+#: ../ui/search-dialog.glade.h:68
+msgid "New Custom Module List Button"
+msgstr "Botón de Nueva lista de módulos personalizada"
+
+#: ../ui/search-dialog.glade.h:69
+msgid "New Range Button"
+msgstr "Botón de Nuevo rango"
+
+#: ../ui/search-dialog.glade.h:70
+msgid "Open Selection Dialog Button"
+msgstr "Botón de Abrir diálogo de selección"
+
+#: ../ui/search-dialog.glade.h:71
+msgid "Open a dialog to select modules to add to the list"
+msgstr "Abrir un diálogo para seleccionar módulos que añadir a la lista"
+
+#: ../ui/search-dialog.glade.h:72
+msgid "Optimized (\"Lucene\")"
+msgstr "Optimizado (\"Lucene\")"
+
+#: ../ui/search-dialog.glade.h:73
+msgid "Optimized (\"Lucene\") radiobutton"
+msgstr "Botón de opción de Optimizado (\"Lucene\")"
+
+#: ../ui/search-dialog.glade.h:74
+msgid "Range Definition Entry"
+msgstr "Entrada de definición de rango"
+
+#: ../ui/search-dialog.glade.h:75
+msgid "Range Name Entry"
+msgstr "Entrada de nombre de rango"
+
+#: ../ui/search-dialog.glade.h:77
+msgid "Regular expression radiobutton"
+msgstr "Botón de opción de expresión regular"
+
+#: ../ui/search-dialog.glade.h:78
+msgid "Remove the selected module from the list"
+msgstr "Remover el módulo seleccionado de la lista"
+
+#: ../ui/search-dialog.glade.h:79
+msgid "Result Summary Table"
+msgstr "Tabla de resumen de resultados"
+
+#: ../ui/search-dialog.glade.h:80
+msgid "Result Summary Window"
+msgstr "Ventana de resumen de resultados"
+
+#: ../ui/search-dialog.glade.h:81
+msgid "Results"
+msgstr "Resultados"
+
+#: ../ui/search-dialog.glade.h:82
+msgid "Save Custom Module List Button"
+msgstr "Botón de Guardar lista de módulos personalizada"
+
+#: ../ui/search-dialog.glade.h:83
+msgid "Save Range Button"
+msgstr "Botón de Guardar rango"
+
+#: ../ui/search-dialog.glade.h:84
+msgid "Save custom range"
+msgstr "Guardar rango personalizado"
+
+#: ../ui/search-dialog.glade.h:85
+msgid "Save search results as bookmarks"
+msgstr "Guardar los resultados de búsqueda como marcadores"
+
+#: ../ui/search-dialog.glade.h:86
+msgid "Save the module list"
+msgstr "Guardar la lista de módulos"
+
+#: ../ui/search-dialog.glade.h:87
+msgid "Search  Criteria"
+msgstr "Criterios de búsqueda"
+
+#: ../ui/search-dialog.glade.h:88
+msgid "Search Criteria Treeview"
+msgstr "Vista de árbol de criterios de búsqueda"
+
+#: ../ui/search-dialog.glade.h:89
+msgid "Search entire module"
+msgstr "Buscar en todo el módulo"
+
+#: ../ui/search-dialog.glade.h:90
+msgid "Search for Morphological tags"
+msgstr "Buscar Etiquetas Morfológicas"
+
+#: ../ui/search-dialog.glade.h:91
+msgid "Search for Strongs Numbers like G4442 or H1121"
+msgstr "Buscar números de Strong como G4442 ó H1121"
+
+#: ../ui/search-dialog.glade.h:92
+msgid "Search in footnotes"
+msgstr "Buscar Notas al pie"
+
+#: ../ui/search-dialog.glade.h:93
+msgid "Show Footnotes"
+msgstr "Mostra Notas al pie"
+
+#: ../ui/search-dialog.glade.h:94
+msgid "Show Footnotes checkbox"
+msgstr "Marca de mostrar notas al pie"
+
+#: ../ui/search-dialog.glade.h:95
+msgid "Show Morphological Tags"
+msgstr "Mostrar Etiquetas Morfológicas"
+
+#: ../ui/search-dialog.glade.h:96
+msgid "Show Morphological Tags checkbox"
+msgstr "Marca de mostrar Etiquetas Morfológicas"
+
+#: ../ui/search-dialog.glade.h:97
+msgid "Show Strong's Numbers"
+msgstr "Mostrar Números de Strong"
+
+#: ../ui/search-dialog.glade.h:98
+msgid "Show Strong's Numbers checkbox"
+msgstr "Marca de mostrar Números de Strong"
+
+#: ../ui/search-dialog.glade.h:99
+msgid "Show in main window"
+msgstr "Mostrar en la ventana principal"
+
+#: ../ui/search-dialog.glade.h:100
+msgid "Single module"
+msgstr "Un sólo módulo"
+
+#: ../ui/search-dialog.glade.h:101
+msgid "Single module radiobutton"
+msgstr "Botón de opción de un sólo módulo"
+
+#: ../ui/search-dialog.glade.h:102
+msgid "Start/stop searching"
+msgstr "Iniciar/detener búsqueda"
+
+#: ../ui/search-dialog.glade.h:103
+msgid "Strongs Numbers"
+msgstr "Números de Strong"
+
+#: ../ui/search-dialog.glade.h:104
+msgid "Strongs Numbers radiobutton"
+msgstr "Botón de opción de Números de Strong"
+
+#: ../ui/search-dialog.glade.h:105
+msgid "Use a custom module list for the search"
+msgstr "Utilizar un lista de módulos personalizada para la búsqueda"
+
+#: ../ui/search-dialog.glade.h:106
+msgid "Use a custom range for the scope of the search"
+msgstr "Utilizar un rango personalizado como alcance de la búsqueda"
+
+#: ../ui/search-dialog.glade.h:107
+msgid "Use a single module for the search"
+msgstr "Utilizar un sólo módulo para la búsqueda"
+
+#: ../ui/search-dialog.glade.h:108
+msgid "Use the current module list for the search"
+msgstr "Utilizar la lista de módulos actual para la búsqueda"
+
+#: ../ui/search-dialog.glade.h:109
+msgid "Use the results of the last search as the scope of the search"
+msgstr ""
+"Utilizar los últimos resultados de búsqueda como el alcance de esta búsqueda"
+
+#: ../ui/search-dialog.glade.h:110
+msgid "e.g. Matt-John;Rev4"
+msgstr "ej. Mateo-Juan;Apocalipsis4"
+
+#: ../ui/search-dialog.glade.h:111
+msgid "for "
+msgstr "para "
+
+#: ../ui/xi-menus.glade.h:2
+msgid "About _Translation"
+msgstr "Acerca de la _traducción"
+
+#: ../ui/xi-menus.glade.h:3
+msgid "About _Xiphos"
+msgstr "Acerca de _Xiphos"
+
+#: ../ui/xi-menus.glade.h:4
+msgid "Add Item"
+msgstr "Añadir elemento"
+
+#: ../ui/xi-menus.glade.h:5
+msgid "Add Sub-Item"
+msgstr "Añadir sub-elemento"
+
+#: ../ui/xi-menus.glade.h:6
+msgid "Add a sub-item"
+msgstr "Añadir un sub-elemento"
+
+#: ../ui/xi-menus.glade.h:7
+msgid "Add an item"
+msgstr "Añadir un elemento"
+
+#: ../ui/xi-menus.glade.h:8
+msgid "Add new folder to selected folder"
+msgstr "Añadir una nueva carpeta a la carpeta seleccionada"
+
+#: ../ui/xi-menus.glade.h:10
+msgid "Allow Reordering"
+msgstr "Permitir reordenación"
+
+#: ../ui/xi-menus.glade.h:11
+msgid "Allow items to be moved from one folder to another"
+msgstr "Permitir que los elementos se muevan de una carpeta a otra"
+
+#: ../ui/xi-menus.glade.h:12
+msgid "Annotate Verse"
+msgstr "Anotar versículo"
+
+#: ../ui/xi-menus.glade.h:14
+msgid "Browse in BibleMap.org"
+msgstr "Navegar en BilbleMap.org"
+
+#: ../ui/xi-menus.glade.h:15
+msgid "Collapse All"
+msgstr "Colapsar todos"
+
+#: ../ui/xi-menus.glade.h:16
+msgid "Collapse all Bookmarks groups"
+msgstr "Colapsar todos los grupos de marcadores"
+
+#: ../ui/xi-menus.glade.h:17
+msgid "Commentary by Chapter"
+msgstr "Comentario por capítulo"
+
+#: ../ui/xi-menus.glade.h:19
+msgid "Create a new daily journal"
+msgstr "Crear un nuevo diario"
+
+#: ../ui/xi-menus.glade.h:20
+msgid "Create a new monthly journal"
+msgstr "Crear un nuevo diario mensual"
+
+#: ../ui/xi-menus.glade.h:21
+msgid "Create a new outlined topic"
+msgstr "Crear un nuevo esbozo"
+
+#: ../ui/xi-menus.glade.h:22
+msgid "Create a new simple prayer list"
+msgstr "Crear una lista de oración simple"
+
+#: ../ui/xi-menus.glade.h:23
+msgid "Create a new subject prayer list"
+msgstr "Crar una nueva lista de oración por sujetos"
+
+#: ../ui/xi-menus.glade.h:24
+msgid "D_ouble-Space Text"
+msgstr "Texto a _doble espacio"
+
+#: ../ui/xi-menus.glade.h:25
+msgid "Daily"
+msgstr "Diariamente"
+
+#: ../ui/xi-menus.glade.h:26
+msgid "Delete Item"
+msgstr "Borrar elemento"
+
+#: ../ui/xi-menus.glade.h:27
+msgid "Delete item"
+msgstr "Borrar elemento"
+
+#: ../ui/xi-menus.glade.h:28
+msgid "Dictionar_y"
+msgstr "Dicci_onario"
+
+#: ../ui/xi-menus.glade.h:29
+msgid "Display Book Heading"
+msgstr "Mostrar el encabezado del libro"
+
+#: ../ui/xi-menus.glade.h:30
+msgid "Display Chapter Heading"
+msgstr "Mostrar el encabezado del capítulo"
+
+#: ../ui/xi-menus.glade.h:31
+msgid "Dump Pers.Comm."
+msgstr "Desechar comentario personal"
+
+#: ../ui/xi-menus.glade.h:33
+msgid "Edit bookmark item"
+msgstr "Editar el elemento marcador"
+
+#: ../ui/xi-menus.glade.h:34
+msgid "Edit this item"
+msgstr "Editar este elemento"
+
+#: ../ui/xi-menus.glade.h:35
+msgid "Expand All"
+msgstr "Expandir todos"
+
+#: ../ui/xi-menus.glade.h:36
+msgid "Expand all Bookmarks groups"
+msgstr "Expandir todos los grupos de marcadores"
+
+#: ../ui/xi-menus.glade.h:37
+msgid "Export Folder"
+msgstr "Exportar carpeta"
+
+#: ../ui/xi-menus.glade.h:38
+msgid "Export List"
+msgstr "Exportar lista"
+
+#: ../ui/xi-menus.glade.h:45
+msgid "Image Content"
+msgstr "Contenido de imagen"
+
+#: ../ui/xi-menus.glade.h:46
+msgid "Import Bibletime Bookmarks"
+msgstr "Importar marcadores de Bibletime"
+
+#: ../ui/xi-menus.glade.h:47
+msgid "Insert Bookmark"
+msgstr "Insertar marcador"
+
+#: ../ui/xi-menus.glade.h:48
+msgid "Insert new bookmark here"
+msgstr "Insertar un nuevo marcador aquí"
+
+#: ../ui/xi-menus.glade.h:49
+msgid "L_ink Tabs"
+msgstr "E_nlazar ventanas"
+
+#: ../ui/xi-menus.glade.h:51
+msgid "Load Bookmarks from Bibletime"
+msgstr "Cargar marcadores de Bibletime"
+
+#: ../ui/xi-menus.glade.h:52
+msgid "Lookup Selection"
+msgstr "Selección de búsqueda"
+
+#: ../ui/xi-menus.glade.h:54
+msgid "Monthly"
+msgstr "Mensual"
+
+#: ../ui/xi-menus.glade.h:57
+msgid "Note"
+msgstr "Nota"
+
+#: ../ui/xi-menus.glade.h:58
+msgid "Open Module"
+msgstr "Abrir Módulo"
+
+#: ../ui/xi-menus.glade.h:59
+msgid "Open Study_pad"
+msgstr "Abrir Cuaderno de _Estudio"
+
+#: ../ui/xi-menus.glade.h:60
+msgid "Open in a dialog"
+msgstr "Abrir en diálogo"
+
+#: ../ui/xi-menus.glade.h:61
+msgid "Open in a separate window"
+msgstr "Abrir en una nueva ventana"
+
+#: ../ui/xi-menus.glade.h:62
+msgid "Open in editor"
+msgstr "Abrir en editor"
+
+#: ../ui/xi-menus.glade.h:63
+msgid "Open in new tab"
+msgstr "Abrir en una nueva pestaña"
+
+#: ../ui/xi-menus.glade.h:64
+msgid ""
+"Open selected module in a\n"
+"\tseparate ['dialog'] window"
+msgstr ""
+"Abrir el módulo seleccionado en una\n"
+"\t ventana ['diálogo'] separada"
+
+#: ../ui/xi-menus.glade.h:66
+msgid "Open selected module in a new tab"
+msgstr "Abrir el módulo seleccionado en una nueva pestaña"
+
+#: ../ui/xi-menus.glade.h:67
+msgid "Open this bookmark in a dialog"
+msgstr "Abrir este marcador en un diálogo"
+
+#: ../ui/xi-menus.glade.h:68
+msgid "Open this bookmark in a new tab"
+msgstr "Abrir este marcador en una nueva pestaña"
+
+#: ../ui/xi-menus.glade.h:69
+msgid "Outlined"
+msgstr "Esbozado"
+
+#: ../ui/xi-menus.glade.h:71
+msgid "Read Selection Aloud"
+msgstr "Leer la selección en voz alta"
+
+#: ../ui/xi-menus.glade.h:73
+msgid "Remove folder and save it"
+msgstr "Remover carpeta y guardarla"
+
+#: ../ui/xi-menus.glade.h:74
+msgid "Remove this item"
+msgstr "Remover este elemento"
+
+#: ../ui/xi-menus.glade.h:75
+msgid "Rename Pers.Comm."
+msgstr "Renombrar Comentarios personales"
+
+#: ../ui/xi-menus.glade.h:76
+msgid "Respect Font Faces"
+msgstr "Respetar tipografías"
+
+#: ../ui/xi-menus.glade.h:77
+msgid "Restore Folder"
+msgstr "Restaurar carpeta"
+
+#: ../ui/xi-menus.glade.h:78
+msgid "Restore saved folder"
+msgstr "Restaurar carpeta guardada"
+
+#: ../ui/xi-menus.glade.h:79
+msgid "Save list as a series of bookmarks"
+msgstr "Guardar lista como una serie de marcadores"
+
+#: ../ui/xi-menus.glade.h:80
+msgid "Save list as a single bookmark"
+msgstr "Guardar lista como un solo marcador"
+
+#: ../ui/xi-menus.glade.h:81
+msgid "Save these results as a series of bookmarks in their own folder"
+msgstr ""
+"Guardar estos resultados como una serie de marcadores en su propia carpeta"
+
+#: ../ui/xi-menus.glade.h:82
+msgid "Save these results as a single bookmark"
+msgstr "Guardar estos resultados en un solo marcador"
+
+#: ../ui/xi-menus.glade.h:83
+msgid "Scripture Cross-references"
+msgstr "Referencias bíblicas cruzadas"
+
+#: ../ui/xi-menus.glade.h:85
+msgid "Show Parallel View in a _Tab"
+msgstr "Mostrar vista paralela en una pes_taña"
+
+#: ../ui/xi-menus.glade.h:86
+msgid "Show Previe_wer in the Sidebar"
+msgstr "Mostrar _previsualizador en la Barra lateral"
+
+#: ../ui/xi-menus.glade.h:87
+msgid "Show Verse _Numbers"
+msgstr "Mostrar _números de versículos"
+
+#: ../ui/xi-menus.glade.h:88
+msgid "Simple"
+msgstr "Simple"
+
+#: ../ui/xi-menus.glade.h:90
+msgid "Subject"
+msgstr "Asunto"
+
+#: ../ui/xi-menus.glade.h:92
+msgid "Unlock This Module"
+msgstr "Desbloquear este módulo"
+
+#: ../ui/xi-menus.glade.h:93
+msgid "Use Current Dictionary"
+msgstr "Utilizar el diccionario actual"
+
+#: ../ui/xi-menus.glade.h:94
+msgid "Use module manager to install and remove Sword modules"
+msgstr "Utilice el Gestor de Módulos para añadir y quitar módulos de Sword"
+
+#: ../ui/xi-menus.glade.h:95
+msgid "Variants"
+msgstr "Variantes"
+
+#: ../ui/xi-menus.glade.h:97
+msgid "_About The SWORD Project"
+msgstr "Acerca _de el Proyecto SWORD"
+
+#: ../ui/xi-menus.glade.h:98
+msgid "_Advanced Search"
+msgstr "Búsqueda A_vanzada"
+
+#: ../ui/xi-menus.glade.h:99
+msgid "_Attach/Detach Sidebar"
+msgstr "_Unir/separar barra lateral"
+
+#: ../ui/xi-menus.glade.h:100
+msgid "_Bible"
+msgstr "_Biblia"
+
+#: ../ui/xi-menus.glade.h:101
+msgid "_Commentary/Book"
+msgstr "_Comentario/Libro"
+
+#: ../ui/xi-menus.glade.h:102
+msgid "_Contents"
+msgstr "_Contenidos"
+
+#: ../ui/xi-menus.glade.h:103
+msgid "_Daily Devotion"
+msgstr "_Devocional diario"
+
+#: ../ui/xi-menus.glade.h:104
+msgid "_Edit"
+msgstr "_Editar"
+
+#: ../ui/xi-menus.glade.h:105
+msgid "_Edit Item"
+msgstr "_Editar elemento"
+
+#: ../ui/xi-menus.glade.h:107
+msgid "_Help"
+msgstr "Ay_uda"
+
+#: ../ui/xi-menus.glade.h:108
+msgid "_Highlight Current Verse"
+msgstr "_Resaltar el versículo actual"
+
+#: ../ui/xi-menus.glade.h:109
+msgid "_Live Chat"
+msgstr "_Chat en vivo"
+
+#: ../ui/xi-menus.glade.h:110
+msgid "_Mailing List"
+msgstr "_Lista de correo"
+
+#: ../ui/xi-menus.glade.h:111
+msgid "_Module Manager"
+msgstr "_Gestor de Módulos"
+
+#: ../ui/xi-menus.glade.h:112
+msgid "_Open Session"
+msgstr "_Abrir sesión"
+
+#: ../ui/xi-menus.glade.h:113
+msgid "_Preferences"
+msgstr "_Preferencias"
+
+#: ../ui/xi-menus.glade.h:114
+msgid "_Preview"
+msgstr "_Previsualizar"
+
+#: ../ui/xi-menus.glade.h:115
+msgid "_Read Aloud"
+msgstr "Lee_r en voz alta"
+
+#: ../ui/xi-menus.glade.h:116
+msgid "_Report Bug"
+msgstr "_Reportar un error (bug)"
+
+#: ../ui/xi-menus.glade.h:117
+msgid "_Save Session"
+msgstr "_Guardar sesión"
+
+#: ../ui/xi-menus.glade.h:118
+msgid "_Search"
+msgstr "_Buscar"
+
+#: ../ui/xi-menus.glade.h:119
+msgid "_Show/Hide Attached Sidebar"
+msgstr "_Mostrar/Ocultar la barra lateral"
+
+#: ../ui/xi-menus.glade.h:120
+msgid "_Verse Per Line"
+msgstr "_Versículo por línea"
+
+#: ../xiphos.desktop.in.in.h:1
+msgid "Study the Bible"
+msgstr "Estudie la Biblia"
+
+#: ../xiphos.desktop.in.in.h:2
+msgid "Xiphos Bible Guide"
+msgstr "Guía Bíblica Xiphos"
+
+#~ msgid "Open in a new tab"
+#~ msgstr "Abrir en una nueva pestaña"
+
+#~ msgid "Open selected module in a separate ['dialog'] window"
+#~ msgstr "Abrir el módulo seleccionado en una nueva ventana ['diálogo']"
+
+#~ msgid "View information about the selected dialog"
+#~ msgstr "Ver información acerca del diálogo seleccionado"
+
+#~ msgid "Create a new prayer list"
+#~ msgstr "Crear una lista de oración"
+
+#~ msgid "Daily Journal"
+#~ msgstr "Diario"
+
+#~ msgid "Outlined Topic"
+#~ msgstr "Esbozo"
+
+#~ msgid "Open selected module in a dialog"
+#~ msgstr "Abrir el módulo seleccionado en un diálogo"
+
+#~ msgid "Add Child"
+#~ msgstr "Añadir hijo"
+
+#~ msgid "Add Sibling"
+#~ msgstr "Añadir retoño"
+
+#~ msgid "H_istory/<Separator>"
+#~ msgstr "H_istorial/<Separator>"
+
+#~ msgid "H_istory/C_lear"
+#~ msgstr "H_istorial/_Limpiar"
diff --git a/po/fa.po b/po/fa.po
index d3e1822..2815ea1 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -10,433 +10,561 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 3.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-02 22:07+0200\n"
-"PO-Revision-Date: 2009-08-06 10:42+0100\n"
+"POT-Creation-Date: 2009-12-17 11:39+0000\n"
+"PO-Revision-Date: 2009-12-23 23:08+0100\n"
 "Last-Translator: Peter von Kaehne <refdoc@crosswire.org>\n"
 "Language-Team: English/GB <en@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Launchpad-Export-Date: 2009-12-10 04:38+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 
-#: ../src/backend/sword_main.cc:1153
+#: ../src/backend/sword_main.cc:1083
 msgid "Configuration not found"
 msgstr "ترکیب پیدا نشد"
 
-#: ../src/editor/bonobo-editor.c:252 ../src/editor/slib-editor.c:228
-#: ../src/gnome2/html.c:633
+#: ../src/editor/bonobo-editor.c:254
+#: ../src/editor/slib-editor.c:234
+#: ../src/gnome2/html.c:637
 #, c-format
 msgid "Page %d of %d"
-msgstr "صفحه %d از %d"
+msgstr "صفحۀ %d  از %d"
 
-#: ../src/editor/bonobo-editor.c:351
+#: ../src/editor/bonobo-editor.c:353
+#: ../src/editor/slib-editor.c:659
 msgid "Are you sure you want to delete the note for"
 msgstr "آیا به یقین می‌خواهید این یادداشت حذف شود؟"
 
-#: ../src/editor/bonobo-editor.c:963 ../src/editor/bonobo-editor.c:996
-#: ../src/editor/slib-editor.c:1161 ../src/editor/slib-editor.c:1198
+#: ../src/editor/bonobo-editor.c:965
+#: ../src/editor/bonobo-editor.c:998
+#: ../src/editor/slib-editor.c:1308
+#: ../src/editor/slib-editor.c:1345
 msgid "Save the changes to document"
 msgstr "تغییرات را ضبط کن"
 
-#: ../src/editor/bonobo-editor.c:964 ../src/editor/bonobo-editor.c:997
-#: ../src/editor/slib-editor.c:1162 ../src/editor/slib-editor.c:1199
+#: ../src/editor/bonobo-editor.c:966
+#: ../src/editor/bonobo-editor.c:999
+#: ../src/editor/slib-editor.c:1309
+#: ../src/editor/slib-editor.c:1346
 msgid "before closing?"
 msgstr "قبل از بستن؟"
 
-#: ../src/editor/bonobo-editor.c:971 ../src/editor/bonobo-editor.c:1004
-#: ../src/editor/slib-editor.c:1169 ../src/editor/slib-editor.c:1206
+#: ../src/editor/bonobo-editor.c:973
+#: ../src/editor/bonobo-editor.c:1006
+#: ../src/editor/slib-editor.c:1316
+#: ../src/editor/slib-editor.c:1353
 msgid "If you don't save, changes will be permanently lost."
 msgstr "اگر ضبط نکنید، تغییرات به کلی حذف خواهد شد."
 
-#: ../src/editor/bonobo-editor.c:995 ../src/editor/slib-editor.c:1197
-#: ../ui/xi-menus.glade.h:26
+#: ../src/editor/bonobo-editor.c:997
+#: ../src/editor/slib-editor.c:1344
+#: ../ui/xi-menus.glade.h:39
 msgid "File"
 msgstr "پرونده"
 
-#: ../src/editor/bonobo-editor.c:1222 ../src/editor/slib-editor.c:1254
+#: ../src/editor/bonobo-editor.c:1224
+#: ../src/editor/slib-editor.c:1401
 msgid "StudyPad"
 msgstr "یادداشتهای مطالعات شخصی"
 
-#: ../src/editor/bonobo-editor.c:1235 ../src/editor/slib-editor.c:1268
+#: ../src/editor/bonobo-editor.c:1237
+#: ../src/editor/slib-editor.c:1415
 msgid "Note Editor"
-msgstr "یادداشتهای شخصی"
+msgstr "ویرایشگر یادداشتهای شخصی"
 
-#: ../src/editor/bonobo-editor.c:1244 ../src/editor/slib-editor.c:1282
+#: ../src/editor/bonobo-editor.c:1246
+#: ../src/editor/slib-editor.c:1429
 msgid "Prayer List/Journal Editor"
-msgstr "لیست دعا"
+msgstr "لیست دعا/یادداشتهای هر روزه"
 
-#: ../src/editor/slib-editor.c:382 ../src/editor/slib-editor.c:429
+#: ../src/editor/slib-editor.c:401
+#: ../src/editor/slib-editor.c:448
 msgid "Save As"
-msgstr "ضبط ک به اسم"
+msgstr "ضبط کن به اسم"
 
-#: ../src/editor/slib-editor.c:400 ../src/editor/slib-editor.c:447
+#: ../src/editor/slib-editor.c:419
+#: ../src/editor/slib-editor.c:466
+#: ../src/editor/slib-editor.c:634
 msgid "Untitled document"
 msgstr "متن بی‌نام"
 
-#: ../src/editor/slib-editor.c:612
+#: ../src/editor/slib-editor.c:702
 msgid "HTML Output"
 msgstr "نتیجه به صورت اچ.تی.ام.ال"
 
-#: ../src/editor/slib-editor.c:619
+#: ../src/editor/slib-editor.c:709
 msgid "HTML Source"
 msgstr "منبع به فرمت اچ.تی.ام.ال"
 
-#: ../src/editor/slib-editor.c:626
+#: ../src/editor/slib-editor.c:716
 msgid "Plain Source"
-msgstr "منبع بدون فرمت"
+msgstr "منبع فرمت نشده"
 
-#: ../src/editor/slib-editor.c:633 ../ui/editor_note.xml.h:15
+#: ../src/editor/slib-editor.c:726
+#: ../ui/editor_note.xml.h:15
 #: ../ui/editor_studypad.xml.h:21
 msgid "_Print..."
-msgstr "...چاپ"
+msgstr "_چاپ..."
 
-#: ../src/editor/slib-editor.c:640 ../ui/editor_note.xml.h:9
+#: ../src/editor/slib-editor.c:733
+#: ../ui/editor_note.xml.h:9
 #: ../ui/editor_studypad.xml.h:14
 msgid "Print Pre_view"
 msgstr "چاپ پیشنگری"
 
-#: ../src/editor/slib-editor.c:647
+#: ../src/editor/slib-editor.c:740
 msgid "_Quit"
-msgstr "خروج"
+msgstr "_خروج"
 
-#: ../src/editor/slib-editor.c:654
+#: ../src/editor/slib-editor.c:747
 msgid "_Open"
-msgstr "باز کردن"
+msgstr "_باز کردن"
 
-#: ../src/editor/slib-editor.c:661
+#: ../src/editor/slib-editor.c:754
 msgid "_Save"
-msgstr "ضبط"
+msgstr "_ضبط"
 
-#: ../src/editor/slib-editor.c:668
+#: ../src/editor/slib-editor.c:761
 msgid "Save _As..."
-msgstr "ضبط کن به اسم"
+msgstr "ضبط کن به _اسم"
 
-#: ../src/editor/slib-editor.c:675 ../ui/editor_note.xml.h:14
-#: ../ui/editor_studypad.xml.h:20 ../ui/editor.xml.h:13
-#: ../ui/xi-menus.glade.h:85
+#: ../src/editor/slib-editor.c:767
+msgid "New"
+msgstr "جدید ..."
+
+#: ../src/editor/slib-editor.c:769
+msgid "Open new document"
+msgstr "ایجاد متن جدید"
+
+#: ../src/editor/slib-editor.c:773
+msgid "Delete"
+msgstr "حذف"
+
+#: ../src/editor/slib-editor.c:775
+msgid "Delete current note"
+msgstr "یادداشت فعلی را حذف کن"
+
+#: ../src/editor/slib-editor.c:780
+#: ../ui/editor_note.xml.h:14
+#: ../ui/editor_studypad.xml.h:20
+#: ../ui/editor.xml.h:13
+#: ../ui/xi-menus.glade.h:106
 msgid "_File"
-msgstr "پرونده"
+msgstr "_پرونده"
 
-#: ../src/editor/slib-editor.c:730
+#: ../src/editor/slib-editor.c:835
 msgid "HTML _Output"
-msgstr "نتیجه – اج.تی.ام.ال"
+msgstr "نتیجه به فرمت – اج.تی.ام.ال"
 
-#: ../src/editor/slib-editor.c:737
+#: ../src/editor/slib-editor.c:842
 msgid "_HTML Source"
-msgstr "منبع به فرمت اچ.تی.ام.ال"
+msgstr "_منبع به فرمت اچ.تی.ام.ال"
 
-#: ../src/editor/slib-editor.c:744
+#: ../src/editor/slib-editor.c:849
 msgid "_Plain Source"
-msgstr "منبع بدون فرمت"
+msgstr "منبع فرمت نشده"
 
-#: ../src/editor/slib-editor.c:751 ../ui/xi-menus.glade.h:100
+#: ../src/editor/slib-editor.c:856
+#: ../ui/xi-menus.glade.h:121
 msgid "_View"
-msgstr "نگرش"
+msgstr "_مرور"
 
-#: ../src/editor/slib-editor.c:762 ../ui/editor_note.xml.h:11
-#: ../ui/editor_studypad.xml.h:16 ../ui/editor.xml.h:11
+#: ../src/editor/slib-editor.c:867
+#: ../ui/editor_note.xml.h:11
+#: ../ui/editor_studypad.xml.h:16
+#: ../ui/editor.xml.h:11
 msgid "Save"
 msgstr "ضبط"
 
-#: ../src/gecko/gecko-html.cpp:178 ../src/gnome2/html.c:161
+#: ../src/editor/slib-editor.c:878
+#: ../src/editor/slib-editor.c:885
+msgid "Insert Link"
+msgstr "ایجاد علامت "
+
+#: ../src/gecko/gecko-html.cpp:177
+#: ../src/gnome2/html.c:165
 msgid "Unlock "
 msgstr "قفل را باز کن"
 
-#: ../src/gecko/gecko-print.c:171
+#: ../src/gecko/gecko-print.c:172
 msgid "Preparing to print"
-msgstr "آمادگی جهت نصب"
+msgstr "آمادگی جهت چاپ"
 
-#: ../src/gecko/gecko-print.c:265
+#: ../src/gecko/gecko-print.c:266
 msgid "Printing is not supported on this printer"
 msgstr "با چاپگر فعلی چاپ ممکن نیست"
 
-#: ../src/gecko/gecko-print.c:268
+#: ../src/gecko/gecko-print.c:269
 #, c-format
 msgid "Printer %s does not support PostScript printing."
-msgstr "چاپگر این نوع متن را چاپ نمی‌کند"
+msgstr "چاپگر %s .این نوع متن را چاپ نمی‌کند"
 
-#: ../src/gecko/gecko-print.c:341 ../src/gecko/gecko-print.c:369
+#: ../src/gecko/gecko-print.c:342
+#: ../src/gecko/gecko-print.c:370
 msgid "Printing"
 msgstr "چاپ"
 
-#: ../src/gecko/gecko-print.c:371
+#: ../src/gecko/gecko-print.c:372
 msgid "Waiting to print"
-msgstr "در صف چاپ"
+msgstr "در حال چاپ"
 
-#: ../src/gecko/gecko-print.c:583
+#: ../src/gecko/gecko-print.c:584
 msgid "An error occurred while printing"
-msgstr "در حین چاپ مشکلی پیش آمد"
+msgstr "در خلال چاپ مشکلی پیش آمد"
 
-#: ../src/gecko/gecko-print.c:587
+#: ../src/gecko/gecko-print.c:588
 #, c-format
 msgid "It was not possible to print your document: %s"
-msgstr "چاپ متن ممکن نشد"
+msgstr "چاپ متن %s امکان پذیر نمی‏باشد"
 
-#: ../src/gnome2/about_modules.c:189
+#: ../src/gnome2/about_modules.c:195
 msgid "About Sword Module"
-msgstr "درباره مدول سورد"
+msgstr "درباره برنامۀ سورد"
 
-#: ../src/gnome2/about_modules.c:383 ../src/gnome2/mod_mgr.c:204
+#: ../src/gnome2/about_modules.c:389
+#: ../src/gnome2/mod_mgr.c:252
 msgid "The module has no About information."
-msgstr "عتلاعت نداریم درباره این انون"
+msgstr "در بارۀ این مدول اطلاعاتی موجود نیست."
 
 #: ../src/gnome2/about_sword.c:88
-msgid ""
-"The SWORD Project is an effort to create an ever-expanding software package "
-"for research and study of God and His Word. The SWORD Project framework "
-"allows easy use and study of Bible texts, commentaries, lexicons, "
-"dictionaries, and other books. Many frontends are built using this "
-"framework. An installed set of books may be shared among all frontends using "
-"the framework."
-msgstr ""
-"پروژه سورد بر این تلاش است که نرم افزار فزاینده‌ای به جهت مطالعه کلام خدا در "
-"دسترس بگذارد. این نرم افزار به شخص این امکان را فراهم می‌کند که مطابق نیاز "
-"خود متون کتابمقدس، تفاسیر، کتب فرهنگ لغات، و دیگر کتب منابع را به هر مقدار "
-"که مي‌خواهد، در این نرم افزار قرار دهد. مدولهای نصب شده این قابلیت را دارند "
-"که افراد مختلف به شکل مشترک در آن کار کنند. "
+msgid "The SWORD Project is an effort to create an ever-expanding software package for research and study of God and His Word. The SWORD Project framework allows easy use and study of Bible texts, commentaries, lexicons, dictionaries, and other books. Many frontends are built using this framework. An installed set of books may be shared among all frontends using the framework."
+msgstr "پروژه سورد بر این تلاش است که نرم افزار فزاینده‌ای به جهت مطالعه کلام خدا در دسترس بگذارد. این نرم افزار برای شخص این امکان را فراهم می‌کند که مطابق نیاز خود متون کتابمقدس، تفاسیر، کتب فرهنگ لغات، و دیگر کتب منابع را به هر مقدار که مي‌خواهد، در این نرم افزار نصب کند. مدولهای نصب شده این قابلیت را دارند که افراد مختلف به شکل مشترک در آن کار کنند."
 
 #: ../src/gnome2/about_sword.c:106
 msgid "About the SWORD Project"
 msgstr "درباره پروژه سورد"
 
-#: ../src/gnome2/about_sword.c:123
+#: ../src/gnome2/about_sword.c:124
 msgid "Sword Version"
 msgstr "نسخه سورد"
 
-#: ../src/gnome2/about_sword.c:154
+#: ../src/gnome2/about_sword.c:155
 msgid "Books can be downloaded from the SWORD Project"
-msgstr "مدولها را می‌توان از پروژه سورد بارگذاری کرد"
+msgstr "کتابهای مختلف را می‌توان از پروژه سورد بارگذاری کرد"
 
-#: ../src/gnome2/about_sword.c:160
+#: ../src/gnome2/about_sword.c:161
 msgid "The SWORD Project"
 msgstr "پروژه سورد"
 
 #: ../src/gnome2/about_trans.c:84
 msgid ""
-"Do you like using Xiphos to study the Bible? Would you like to see its "
-"display using your native language? You could translate Xiphos! \n"
+"Do you like using Xiphos to study the Bible? Would you like to see its display using your native language? You could translate Xiphos! \n"
 "\n"
-"We are always looking for contributions of new translations of Xiphos into "
-"other languages. If you are able to translate for us, please see the link "
-"below, contact us, and get involved with our efforts."
+"We are always looking for contributions of new translations of Xiphos into other languages. If you are able to translate for us, please see the link below, contact us, and get involved with our efforts."
 msgstr ""
-"ما همیشه علاقمند هستیم که زیفوس را به زبانهای دیگر ترجمه کنیم. لذا اگر از "
-"توان ترجمه برخوردارید، خواهش می‌کنیم با لینک زیر با ما تماس بگیرید و در این "
-"امر با ما همگام شوید."
+"آیا از برنامۀ زیفوس برای مطالعۀ کتاب‏مقدس خوشتان آمده است؟ آیا مشتاق هستید که که زیفوس به زبانهای دیگر نیز ترجمه شود؟ شما می‏توانید در کار ترجمۀ زیفوس با ما همگام شوید! \n"
+"\n"
+"ما همیشه علاقمند هستیم که زیفوس را به زبانهای دیگر ترجمه کنیم. لذا اگر از توان ترجمه برخوردارید، خواهش می‌کنیم با لینک زیر با ما تماس بگیرید و در این امر با ما همگام شوید."
 
 #: ../src/gnome2/about_trans.c:98
 msgid "About Xiphos Translation"
-msgstr "درباره ترجمه زیفوس"
+msgstr "درباره ترجمۀ زیفوس"
 
-#: ../src/gnome2/about_trans.c:139
+#: ../src/gnome2/about_trans.c:140
 msgid "See TRANSLATION-HOWTO in Xiphos source"
-msgstr "لطفا به بخش ترجمه رجوع کنید"
+msgstr "لطفا به بخش ترجمه در قسمت منابع زیفوس مراجعه کنید"
 
-#: ../src/gnome2/about_trans.c:145
+#: ../src/gnome2/about_trans.c:146
 msgid "Xiphos development"
 msgstr "بسط و گسترش زیفوس"
 
-#: ../src/gnome2/about_xiphos.c:132
+#: ../src/gnome2/about_xiphos.c:131
 msgid "Copyright 2000-2009 The Xiphos Development Team"
-msgstr "حقوق چاپ: The·Xiphos·Development·Team"
+msgstr "حق چاپ برای تیم گسترش زیفوس محفوظ می‏باشد 2000-2009"
 
-#: ../src/gnome2/about_xiphos.c:135
+#: ../src/gnome2/about_xiphos.c:134
 msgid ""
 "(formerly known as GnomeSword)\n"
 "\n"
 "Powered by The SWORD Project.\n"
-"We would like to thank Troy Griffitts and all the other folks who have given "
-"us The SWORD Project."
+"We would like to thank Troy Griffitts and all the other folks who have given us The SWORD Project."
 msgstr ""
-"پروژه سوردبدینوسیله از تروی گریفیتس و بقیه دوستان که پروژه سورد را در اختیار "
-"ما گذاشتند، تشکر می‌کنیم. "
+"(برنامه‏ای که پیش از این با نام گنوم‏سورد شناخته می‏شد)\n"
+"\n"
+"تهیه شده توسط پروژۀ سورد.\n"
+"We would like to thank Troy Griffitts and all the other folks who have given us The SWORD Project.پروژه سورد بدینوسیله از تروی گریفیتس و بقیه دوستان که پروژه سورد را در اختیار ما گذاشتند، تشکر می‌کنیم."
 
-#: ../src/gnome2/bibletext_dialog.c:525
+#: ../src/gnome2/bibletext_dialog.c:358
 msgid "Go to "
-msgstr "برو به:"
+msgstr "برو به "
 
 #. info->stock_icon = GTK_STOCK_OPEN;
-#: ../src/gnome2/bookmark_dialog.c:167 ../src/gnome2/bookmarks_menu.c:471
-#: ../src/gnome2/bookmarks_menu.c:897 ../src/gnome2/bookmarks_menu.c:995
-#: ../src/gnome2/bookmarks_treeview.c:131 ../ui/editor_studypad.xml.h:2
-#: ../ui/xi-menus.glade.h:9
+#: ../src/gnome2/bookmark_dialog.c:171
+#: ../src/gnome2/bookmarks_menu.c:358
+#: ../src/gnome2/bookmarks_menu.c:765
+#: ../src/gnome2/bookmarks_menu.c:863
+#: ../src/gnome2/bookmarks_treeview.c:133
+#: ../ui/editor_studypad.xml.h:2
+#: ../ui/xi-menus.glade.h:13
 msgid "Bookmark"
 msgstr "علامت"
 
-#: ../src/gnome2/bookmark_dialog.c:169 ../src/gnome2/bookmarks_menu.c:997
-#: ../src/gnome2/bookmarks_treeview.c:132
+#: ../src/gnome2/bookmark_dialog.c:173
+#: ../src/gnome2/bookmarks_menu.c:865
+#: ../src/gnome2/bookmarks_treeview.c:134
 msgid "Enter Folder Name"
-msgstr "نام قفسه پرونده وارد کن"
+msgstr "نام پرونده را وارد کنید"
 
-#: ../src/gnome2/bookmark_dialog.c:171 ../src/gnome2/bookmarks_menu.c:999
+#: ../src/gnome2/bookmark_dialog.c:175
+#: ../src/gnome2/bookmarks_menu.c:867
 msgid "Folder Name"
-msgstr "نام قفسه پرونده "
+msgstr "نام پرونده"
 
-#: ../src/gnome2/bookmark_dialog.c:172 ../src/gnome2/bookmarks_menu.c:1000
-#: ../src/gnome2/bookmarks_treeview.c:134
+#: ../src/gnome2/bookmark_dialog.c:176
+#: ../src/gnome2/bookmarks_menu.c:868
+#: ../src/gnome2/bookmarks_treeview.c:136
 msgid "Folder: "
-msgstr "قفسه پرونده"
+msgstr "پرونده: "
 
-#: ../src/gnome2/bookmarks_menu.c:457 ../src/gnome2/treekey-editor.c:322
-#: ../ui/xi-menus.glade.h:22
+#: ../src/gnome2/bookmarks_menu.c:344
+#: ../ui/xi-menus.glade.h:32
 msgid "Edit"
 msgstr "ویرایش"
 
-#: ../src/gnome2/bookmarks_menu.c:474
+#: ../src/gnome2/bookmarks_menu.c:361
 msgid "Folder name: "
-msgstr "قفسه پرونده"
+msgstr "نام پرونده: "
 
-#: ../src/gnome2/bookmarks_menu.c:477
+#: ../src/gnome2/bookmarks_menu.c:364
 msgid "Bookmark name: "
-msgstr "نام علامت"
+msgstr "نام علامت: "
 
-#: ../src/gnome2/bookmarks_menu.c:480 ../src/gnome2/bookmarks_menu.c:905
+#: ../src/gnome2/bookmarks_menu.c:367
+#: ../src/gnome2/bookmarks_menu.c:773
 msgid "Verse: "
-msgstr "آیه:"
+msgstr "آیه: "
 
-#: ../src/gnome2/bookmarks_menu.c:481 ../src/gnome2/bookmarks_menu.c:906
+#: ../src/gnome2/bookmarks_menu.c:368
+#: ../src/gnome2/bookmarks_menu.c:774
 msgid "Module: "
-msgstr "مدول:"
+msgstr "مدول: "
 
-#: ../src/gnome2/bookmarks_menu.c:665
+#: ../src/gnome2/bookmarks_menu.c:533
 msgid "Restore Bookmark Folder"
-msgstr "قفسه پرونده علامت را به حالت اول بازگردان"
+msgstr "پرونده علامت را به حالت اول بازگردان"
 
-#: ../src/gnome2/bookmarks_menu.c:734
+#: ../src/gnome2/bookmarks_menu.c:602
 msgid "Remove the selected folder"
-msgstr "قفسه پرونده انتخاب شده را حذف کن"
+msgstr "پرونده انتخاب شده را حذف کن"
 
-#: ../src/gnome2/bookmarks_menu.c:736
+#: ../src/gnome2/bookmarks_menu.c:604
 msgid "(and all its contents)?"
-msgstr "(با تمامی محتویاتش)"
+msgstr "(به همراه تمامی محتویاتش)?"
 
-#: ../src/gnome2/bookmarks_menu.c:739
+#: ../src/gnome2/bookmarks_menu.c:607
 msgid "Remove the selected bookmark"
 msgstr "علامت انتخاب شده را حذف کن"
 
-#: ../src/gnome2/bookmarks_menu.c:898
+#: ../src/gnome2/bookmarks_menu.c:766
 msgid "Add"
 msgstr "اضافه کن"
 
-#: ../src/gnome2/bookmarks_menu.c:904
+#: ../src/gnome2/bookmarks_menu.c:772
 msgid "Label: "
-msgstr "مشخص کن"
+msgstr "علامت گذاری: "
 
-#: ../src/gnome2/bookmarks_treeview.c:105
+#: ../src/gnome2/bookmarks_treeview.c:107
 #, c-format
 msgid "Search result: %s"
-msgstr "نتایج جستجو $s"
+msgstr "نتایج جستجو: %s"
 
-#: ../src/gnome2/bookmarks_treeview.c:934 ../src/gnome2/sidebar.c:1459
+#: ../src/gnome2/bookmarks_treeview.c:943
+#: ../src/gnome2/sidebar.c:1389
 msgid "Bookmarks"
 msgstr "علائم"
 
 #: ../src/gnome2/cipher_key_dialog.c:62
 msgid "Cipher Key?"
-msgstr "کلید قفل"
+msgstr "کلید قفل؟"
 
 #: ../src/gnome2/cipher_key_dialog.c:63
 msgid "for:"
-msgstr "برای"
+msgstr "برای:"
 
 #: ../src/gnome2/cipher_key_dialog.c:66
 msgid "Enter Cipher Key: "
-msgstr "کلید قفل را وارد کن"
+msgstr "کلید قفل را وارد کن: "
 
-#: ../src/gnome2/dialog.c:241
+#: ../src/gnome2/dialog.c:265
 msgid "Close without Saving"
 msgstr "بستن بدون ضبط"
 
-#: ../src/gnome2/dialog.c:569
+#: ../src/gnome2/dialog.c:596
 msgid "Xiphos:"
-msgstr "سیفوس:"
+msgstr "زیفوس:"
 
-#: ../src/gnome2/dialog.c:670
+#: ../src/gnome2/dialog.c:697
 msgid "Close _without Saving"
 msgstr "بستن بدون ضبط"
 
-#: ../src/gnome2/export_dialog.c:265 ../ui/export-dialog.glade.h:20
+#: ../src/gnome2/export_dialog.c:267
+#: ../ui/export-dialog.glade.h:20
 msgid "Please check copyright before exporting!"
-msgstr "لطفا قبل از استخراج به حقوق قانونی کپی و نشردقت کن "
+msgstr "لطفا قبل از ارسال فایل، به حقوق قانونی کپی و نشر دقت کنید!"
 
-#: ../src/gnome2/find_dialog.c:200 ../src/gnome2/find_dialog.c:369
+#: ../src/gnome2/find_dialog.c:204
+#: ../src/gnome2/find_dialog.c:373
 msgid "Find"
 msgstr "پیدا کن"
 
-#: ../src/gnome2/find_dialog.c:218
+#: ../src/gnome2/find_dialog.c:222
 msgid "Enter Word or Phrase"
-msgstr "کلمه یا عبارت را وارد کن"
+msgstr "کلمه یا عبارت را وارد کنید"
 
-#: ../src/gnome2/find_dialog.c:234 ../src/gnome2/search_sidebar.c:303
-#: ../ui/search-dialog.glade.h:57
+#: ../src/gnome2/find_dialog.c:238
+#: ../src/gnome2/search_sidebar.c:306
+#: ../ui/search-dialog.glade.h:59
 msgid "Match case"
-msgstr "مقایسه کن"
+msgstr "مقایسه و تطبیق موارد"
 
-#: ../src/gnome2/find_dialog.c:241
+#: ../src/gnome2/find_dialog.c:245
 msgid "Search backwards"
 msgstr "جستجو به شکل برگشت"
 
-#: ../src/gnome2/find_dialog.c:250 ../src/gnome2/search_sidebar.c:268
-#: ../ui/search-dialog.glade.h:74
+#: ../src/gnome2/find_dialog.c:254
+#: ../src/gnome2/search_sidebar.c:271
+#: ../ui/search-dialog.glade.h:76
 msgid "Regular expression"
 msgstr "بیان معمول"
 
-#: ../src/gnome2/find_dialog.c:291
+#: ../src/gnome2/find_dialog.c:295
 msgid "Find Next"
 msgstr "بعدی را پیدا کن"
 
-#: ../src/gnome2/font_dialog.c:301
+#: ../src/gnome2/font_dialog.c:303
 msgid "Set Module Font"
-msgstr "قلم مدول"
+msgstr "تنظیم نوع قلم هر مدول"
 
-#: ../src/gnome2/font_dialog.c:331
+#: ../src/gnome2/font_dialog.c:333
 msgid "Change font for"
 msgstr "تعویض قلم برای"
 
-#: ../src/gnome2/font_dialog.c:335
+#: ../src/gnome2/font_dialog.c:337
 msgid "Module"
 msgstr "مدول"
 
-#: ../src/gnome2/font_dialog.c:339
+#: ../src/gnome2/font_dialog.c:341
 msgid "Current font: "
-msgstr "قلم فعلی"
+msgstr "قلم فعلی: "
 
-#: ../src/gnome2/font_dialog.c:376
+#: ../src/gnome2/font_dialog.c:378
 msgid "+0"
 msgstr "+٠"
 
-#: ../src/gnome2/font_dialog.c:380
+#: ../src/gnome2/font_dialog.c:382
 msgid "Use the default font for this module"
 msgstr "قلم پیش گزیده را برای این مدول استفاده کن"
 
-#: ../src/gnome2/main_window.c:758
+#. *****************************************************************************
+#. * Name
+#. *    gconf_setup
+#. *
+#. * Synopsis
+#. *   #include "main/settings.h"
+#. *
+#. *   void gconf_setup()
+#. *
+#. * Description
+#. *   verifies and initializes the GConf subsystem, so that "sword://" and
+#. *   similar can be handled by url-comprehending programs such as browsers.
+#. *   dialogs for permission/success/failure => conditional on debug build.
+#. *
+#. * Return value
+#. *   void
+#.
+#: ../src/gnome2/gui.c:110
+msgid ""
+"URL references using \"sword://\" (similar to web page\n"
+"references) can be used by programs to look up\n"
+"scripture references. Your system currently has no\n"
+"program set to handle these references.\n"
+"\n"
+"Would you like Xiphos to set itself as the\n"
+"program to handle these references?"
+msgstr ""
+"منابع یو آر ال \"sword://\" (شبیه ارجاعات موجود در\n"
+"وب سایت) می‏توانند توسط برنامه‏هایی استفاده شوند که در جستجوی\n"
+"ارجاعات کتاب‏مقدسی باشند. کامپیوتر شما در حال حاضر هیچ\n"
+"برنامه‏ای را در خود ندارد که بتواند این ارجاعات را اجرا کند.\n"
+"\n"
+"آيا مایل هستید که زيفوس خود را به مدول\n"
+"برنامه‌اي که با اين ارجاعات بايد کار کند، قلمداد نمايد؟"
+
+#: ../src/gnome2/gui.c:112
+msgid ""
+"Xiphos has successfully set itself\n"
+"as the handler of sword:// and bible:// URLs.\n"
+"\n"
+"You may wish to run the program \"gconf-editor\"\n"
+"to examine keys under /desktop/gnome/url-handlers,\n"
+"if you need to change these."
+msgstr ""
+"برنامۀ زیفوس توانست با موفقیت\n"
+"خود را بمدول برنامۀ مجری سورد:// و کتاب‏مقدس نصب کند:// URLs.\n"
+"\n"
+"شاید بد نباشد که برنامه را اجرا کنید \"gconf-editor\"\n"
+"و کلیدهای مختلف را بررسی کنید /desktop/gnome/url-handlers,\n"
+"و ببینید که آیا نیاز به هیچ تغییری هست یا نه."
+
+#: ../src/gnome2/gui.c:166
+#, c-format
+msgid ""
+"Xiphos failed to complete handler init for key #%d:\n"
+"%s"
+msgstr ""
+"Xiphos failed to complete handler init for key #%d:\n"
+"%s"
+
+#: ../src/gnome2/gui.c:212
+msgid "BUG! Xiphos is about to crash due to a \"STRDUP\" error."
+msgstr ""
+
+#: ../src/gnome2/gui.c:213
+#: ../src/gnome2/gui.c:248
+msgid "Please report this error to the Xiphos team with:"
+msgstr ""
+
+#: ../src/gnome2/gui.c:247
+msgid "BUG! Xiphos is about to crash due to a \"STRING\" error."
+msgstr ""
+
+#: ../src/gnome2/main_window.c:789
 msgid "Xiphos - Bible Study Software"
-msgstr "زیفوس-نرم افزار مطالعه کتابمقدس"
+msgstr "زیفوس- نرم افزار مطالعۀ کتاب‏مقدس"
 
-#: ../src/gnome2/main_window.c:814
+#: ../src/gnome2/main_window.c:844
 msgid "Open a new tab"
-msgstr "بخش جدید باز کن"
-
-#: ../src/gnome2/main_window.c:894 ../src/gnome2/sidebar.c:621
-#: ../src/gnome2/sidebar.c:627 ../src/main/sidebar.cc:643
-#: ../src/main/sidebar.cc:964 ../src/main/sidebar.cc:965
-#: ../src/main/sidebar.cc:966
+msgstr "بخش جدیدی را باز کن"
+
+# <<<<<<< variant A
+# >>>>>>> variant B
+# ###### Ancestor
+# ======= end
+#: ../src/gnome2/main_window.c:923
+#: ../src/gnome2/sidebar.c:627
+#: ../src/gnome2/sidebar.c:633
+#: ../src/main/sidebar.cc:666
+#: ../src/main/sidebar.cc:1015
+#: ../src/main/sidebar.cc:1016
+#: ../src/main/sidebar.cc:1017
 msgid "Standard View"
 msgstr "نگرش استاندارد"
 
-#: ../src/gnome2/main_window.c:971
+#: ../src/gnome2/main_window.c:1004
 msgid "Commentary View"
-msgstr "نگرش به تفسیر"
+msgstr "نگرش تفسیری"
 
-#: ../src/gnome2/main_window.c:987
+#: ../src/gnome2/main_window.c:1020
 msgid "Book View"
 msgstr "نگرش کتاب"
 
-#: ../src/gnome2/main_window.c:1012
+#: ../src/gnome2/main_window.c:1045
 msgid "Welcome to Xiphos"
-msgstr "خوش امادید به زیفوس"
+msgstr "به برنامۀ زیفوص خوش آمدید"
 
-#: ../src/gnome2/menu_popup.c:1163
+#: ../src/gnome2/menu_popup.c:1168
 msgid ""
 "Renaming is not available in Windows.\n"
 "\n"
@@ -446,1195 +574,1259 @@ msgid ""
 "such as the contents of this commentary.\n"
 "Therefore, personal commentary renaming is\n"
 "not available in the Windows environment."
-msgstr "نوع سیستم پرونده در ویندوز امکانات زیفوس را محدود می‌کند"
+msgstr ""
+"امکان تغییر نام در ویندوز موجود نیست.\n"
+"\n"
+"امکانات زیفوس محدود به توانایی‏های سیستم نام‏گذاری ویندوز می‏باشد.\n"
+"به این دلیل که ویندوز اجازۀ تغییر نام فایلی را که\n"
+"شخص دیگری همزمان آن را باز نموده است، نمی‏دهد،,\n"
+"بمدول نمونه می‏توان به محتویات همین تفسیر اشاره کرد.\n"
+"بنابراین، تغییر نام یک کتاب تفسیر بصورت دلخواه nدر محیط برنامۀ ویندوز امکان پذیر نمی‏باشد."
 
-#: ../src/gnome2/menu_popup.c:1182
+#: ../src/gnome2/menu_popup.c:1187
 msgid "Rename Commentary"
 msgstr "نامگذاری جدید تفسیر"
 
-#: ../src/gnome2/menu_popup.c:1185
+#: ../src/gnome2/menu_popup.c:1190
 msgid "Choose Commentary Name"
 msgstr "انتخاب نام تفسیر"
 
-#: ../src/gnome2/menu_popup.c:1187
+#: ../src/gnome2/menu_popup.c:1192
 msgid "New Name"
 msgstr "نام جدید"
 
-#: ../src/gnome2/menu_popup.c:1188 ../src/gnome2/treekey-editor.c:132
-#: ../src/gnome2/treekey-editor.c:191 ../src/gnome2/treekey-editor.c:277
-#: ../src/main/prayerlists.cc:240
+# <<<<<<< variant A
+# >>>>>>> variant B
+# ###### Ancestor
+# ======= end
+#: ../src/gnome2/menu_popup.c:1193
+#: ../src/gnome2/treekey-editor.c:139
+#: ../src/gnome2/treekey-editor.c:198
+#: ../src/gnome2/treekey-editor.c:284
+#: ../src/main/prayerlists.cc:243
 msgid "Name: "
-msgstr "نام"
-
-#: ../src/gnome2/menu_popup.c:1198 ../src/main/prayerlists.cc:254
+msgstr "نام: "
+
+# <<<<<<< variant A
+# >>>>>>> variant B
+# ###### Ancestor
+# ======= end
+#: ../src/gnome2/menu_popup.c:1203
+#: ../src/main/prayerlists.cc:257
 msgid "Module names must contain [A-Za-z0-9_] only."
-msgstr "برای نامگذاری مدولها تنها از حروف القبا و اعداد صفر تا نه استفاده کنید"
+msgstr "برای نامگذاری عناوین تنها می‏توانید از حروف القبا و اعداد صفر تا نه استفاده کنید."
 
-#: ../src/gnome2/menu_popup.c:1205 ../src/main/prayerlists.cc:261
+#: ../src/gnome2/menu_popup.c:1210
+#: ../src/main/prayerlists.cc:264
 msgid "Xiphos already knows a module by that name."
-msgstr "مدولی به این اسم در حال حاضر موجود است"
+msgstr "یک مدول با همین اسم موجود است."
 
-#: ../src/gnome2/menu_popup.c:1248
+#: ../src/gnome2/menu_popup.c:1253
 #, c-format
 msgid ""
 "Failed to create new configuration:\n"
 "%s"
-msgstr "خلق شکل‌بندی جدید ممکن نشد %s"
+msgstr ""
+"ایجاد شکل‏بندی جدید ممکن نیست:\n"
+"%s"
 
-#: ../src/gnome2/menu_popup.c:1257
+#: ../src/gnome2/menu_popup.c:1262
 msgid ""
 "Configuration build error:\n"
 "\n"
-msgstr "اشتباه در سازه شکل‌بندی \n"
-
-#: ../src/gnome2/mod_mgr.c:339
-msgid "Install these modules?"
-msgstr "این مدولها را نصب کن"
+msgstr ""
+"اشتباه در ساختن شکل‌بندی:\n"
+"\n"
 
-#: ../src/gnome2/mod_mgr.c:341
+#: ../src/gnome2/mod_mgr.c:169
 msgid "Remove these modules?"
-msgstr "این مدولها را حذف کن"
+msgstr "آیا مایلید که این عناوین حذف گردند؟"
 
-#: ../src/gnome2/mod_mgr.c:343
-msgid "Archive these modules?"
-msgstr "این مدولها را در آرشیو قرار بده"
+#: ../src/gnome2/mod_mgr.c:170
+msgid "Preparing to remove"
+msgstr "آمادگی جهت حذف"
 
-#: ../src/gnome2/mod_mgr.c:345
-msgid ""
-"Build fast-search index for these\n"
-"modules (may take minutes/module)?"
-msgstr "برای این مدولها ایندکس جستجوی سریع خلق کن"
+#: ../src/gnome2/mod_mgr.c:171
+msgid "Removing"
+msgstr "حذف"
 
-#: ../src/gnome2/mod_mgr.c:347
-msgid "Delete fast-search index for these modules?"
-msgstr "برای این مدولها ایندکس جستجوی سریع را حذف کن"
+#: ../src/gnome2/mod_mgr.c:172
+#: ../ui/xi-menus.glade.h:72
+msgid "Remove"
+msgstr "حذف کن"
 
-#: ../src/gnome2/mod_mgr.c:367
+#: ../src/gnome2/mod_mgr.c:175
+msgid "Install these modules?"
+msgstr "آیا می‏خواهید این عناوین نصب گردند؟"
+
+#: ../src/gnome2/mod_mgr.c:176
 msgid "Preparing to install"
 msgstr "آمادگی جهت نصب"
 
-#: ../src/gnome2/mod_mgr.c:369
-msgid "Preparing to remove"
-msgstr "آمادگی جهت حذف"
+#: ../src/gnome2/mod_mgr.c:177
+msgid "Installing"
+msgstr "نصب"
 
-#: ../src/gnome2/mod_mgr.c:371
-msgid "Preparing to archive"
-msgstr "آمادگی جهت آرشیو"
+#: ../src/gnome2/mod_mgr.c:178
+#: ../src/gnome2/mod_mgr.c:2964
+#: ../ui/module-manager.glade.h:18
+msgid "Install"
+msgstr "نصب کن"
 
-#: ../src/gnome2/mod_mgr.c:373
-msgid "Preparing to index"
-msgstr "آمادگی جهت ایندکس"
+#: ../src/gnome2/mod_mgr.c:181
+msgid "Archive these modules?"
+msgstr "آیا میخواهید که این عناوین بایگانی شوند؟"
 
-#: ../src/gnome2/mod_mgr.c:375
-msgid "Preparing to delete index"
-msgstr "آمادگی خهر حذف ایندکس"
+#: ../src/gnome2/mod_mgr.c:182
+msgid "Preparing to archive"
+msgstr "آمادگی جهت بایگانی کردن"
 
-#: ../src/gnome2/mod_mgr.c:401
-msgid "Installing"
-msgstr "نصب"
+#: ../src/gnome2/mod_mgr.c:183
+msgid "Archiving"
+msgstr "بایگانی"
 
-#: ../src/gnome2/mod_mgr.c:403
-msgid "Removing"
-msgstr "انتقال"
+#: ../src/gnome2/mod_mgr.c:184
+#: ../ui/module-manager.glade.h:11
+msgid "Archive"
+msgstr "بایگانی کن"
 
-#: ../src/gnome2/mod_mgr.c:405
-msgid "Archiving"
-msgstr "آرشیو"
+#: ../src/gnome2/mod_mgr.c:187
+msgid ""
+"Build fast-search index for these\n"
+"modules (may take minutes/module)?"
+msgstr ""
+"آیا می‏خواهید برای این عناوین\n"
+"ایندکس جستجوی سریع بسازید؟ (ممکن است اجرای این فرمان تا چند دقیقه طول بکشد)"
+
+#: ../src/gnome2/mod_mgr.c:188
+msgid "Preparing to index"
+msgstr "آمادگی جهت ایندکس‏سازی"
 
-#: ../src/gnome2/mod_mgr.c:407
+#: ../src/gnome2/mod_mgr.c:189
 msgid "Indexing"
-msgstr "ایندکس"
+msgstr "ایندکس‏سازی"
+
+#: ../src/gnome2/mod_mgr.c:190
+#: ../ui/module-manager.glade.h:17
+msgid "Index"
+msgstr "_ایندکس"
+
+#: ../src/gnome2/mod_mgr.c:193
+msgid "Delete fast-search index for these modules?"
+msgstr "آیا می‏خواهید که ایندکس جستجوی سریع برای این عناوین حذف گردد؟"
+
+#: ../src/gnome2/mod_mgr.c:194
+msgid "Preparing to delete index"
+msgstr "آمادگی جهت حذف ایندکس"
 
-#: ../src/gnome2/mod_mgr.c:409
+#: ../src/gnome2/mod_mgr.c:195
 msgid "Deleting index"
 msgstr "حذف ایندکس"
 
-#: ../src/gnome2/mod_mgr.c:432
-#, c-format
-msgid ""
-"`mkdir %s' failed:\n"
-"%s."
-msgstr ""
-"ممکن نشد \n"
-":%S."
+#: ../src/gnome2/mod_mgr.c:196
+msgid "Deletion"
+msgstr "حذف"
 
-#: ../src/gnome2/mod_mgr.c:463
-msgid "Xiphos could not execute archiver"
-msgstr "زیفوس نتوانست آرشیوگر را راه اندازی کند"
+#: ../src/gnome2/mod_mgr.c:427
+msgid "Module Name"
+msgstr "نام مدول"
 
-#: ../src/gnome2/mod_mgr.c:468
-msgid ""
-" archival result:\n"
-"\n"
-msgstr ""
-"نتیجه منتج از آرشیو:\n"
-"\n"
+#: ../src/gnome2/mod_mgr.c:448
+msgid "A checkmark means this module is already installed"
+msgstr "علامت تیک به این معناست که این مدول قبلاً نصب شده است."
 
-#: ../src/gnome2/mod_mgr.c:472
-msgid ""
-"\n"
-"Archive in "
-msgstr ""
-"\n"
-"آرشیو کن در"
+#: ../src/gnome2/mod_mgr.c:470
+msgid "Click the box to work on this module"
+msgstr "روی جعبه کلیک کنید تا بتوانید روی این مدول کار کنید."
 
-#: ../src/gnome2/mod_mgr.c:526
-msgid "Journals and prayer lists cannot be indexed."
-msgstr ""
+#: ../src/gnome2/mod_mgr.c:471
+msgid "Click the box to select this module for install/update"
+msgstr "روی این علامت کلیک کنید تا بتوانید مدول را نصب/به روز کنید"
 
-#: ../src/gnome2/mod_mgr.c:547 ../src/gnome2/mod_mgr.c:2902
-#: ../ui/module-manager.glade.h:15
-msgid "Install"
-msgstr "نصب کن"
+#: ../src/gnome2/mod_mgr.c:490
+msgid "Installed"
+msgstr "نصب شد"
 
-#: ../src/gnome2/mod_mgr.c:549 ../src/gnome2/treekey-editor.c:316
-msgid "Remove"
-msgstr "منتقل کن"
+#: ../src/gnome2/mod_mgr.c:500
+msgid "The index icon means you have built an optimized ('lucene') index for this module for fast searching (see the Maintenance pane for this function)"
+msgstr "نشانۀ \"ایندکس\" به اين معني است که شما برای اين مدول قبلا ایندکسي درست کرده‌ايد که کار جستجوي سريع را انجام دهد."
 
-#: ../src/gnome2/mod_mgr.c:551
-msgid "Archive"
-msgstr "آرشیو کن"
+#: ../src/gnome2/mod_mgr.c:518
+msgid "The lock icon means this module is encrypted, and requires that you purchase an unlock key from the content owner"
+msgstr "نشانه قفل يعني اینکه این مدول قفل است و جهت استفاده از آن، بايد کليد اين قفل خريداري شود"
 
-#: ../src/gnome2/mod_mgr.c:553
-msgid "Index"
-msgstr "ایندکس"
+#: ../src/gnome2/mod_mgr.c:535
+#: ../ui/xi-menus.glade.h:1
+msgid "About"
+msgstr "درباره"
 
 #: ../src/gnome2/mod_mgr.c:555
-msgid "Deletion"
-msgstr "حذف"
+msgid "The refresh icon means the Installed module is older than the newer Available module: You should update the module"
+msgstr "نشانه تجديد به اين معني است که مدول نصب شده از عناوین موجود قديمي‌تر است؛ لازم است که عناوین تازه‌تر را نصب فرماييد."
+
+#: ../src/gnome2/mod_mgr.c:567
+msgid "Available"
+msgstr "در دسترس"
+
+#: ../src/gnome2/mod_mgr.c:576
+msgid "Size"
+msgstr "اندازه"
+
+#: ../src/gnome2/mod_mgr.c:585
+msgid "Description"
+msgstr "توصیف"
+
+#: ../src/gnome2/mod_mgr.c:736
+#, c-format
+msgid ""
+"`mkdir %s' failed:\n"
+"%s."
+msgstr ""
+"`mkdir %s' ممکن نیست\n"
+"%s."
+
+#: ../src/gnome2/mod_mgr.c:759
+msgid " archived in: \n"
+msgstr "بایگان شد در:\n"
+
+#: ../src/gnome2/mod_mgr.c:815
+msgid "Journals and prayer lists cannot be indexed."
+msgstr "ژورنال و لیست دعا قابل ایندکس شدن نیستند"
 
-#: ../src/gnome2/mod_mgr.c:557
+#: ../src/gnome2/mod_mgr.c:833
 #, c-format
 msgid "%s failed"
-msgstr " %sممکن نشد"
+msgstr "%s ممکن نشد"
 
-#: ../src/gnome2/mod_mgr.c:559 ../src/gnome2/mod_mgr.c:1285
+#: ../src/gnome2/mod_mgr.c:836
+#: ../src/gnome2/mod_mgr.c:1562
 msgid "Finished"
 msgstr "تمام شد"
 
-#: ../src/gnome2/mod_mgr.c:726 ../src/gnome2/mod_mgr.c:728
-#: ../src/gnome2/mod_mgr.c:830 ../src/gnome2/mod_mgr.c:865
-#: ../src/gnome2/mod_mgr.c:867 ../src/gnome2/utilities.c:346
-#: ../src/gnome2/utilities.c:411 ../src/gnome2/utilities.c:413
-#: ../src/gnome2/utilities.c:1032 ../src/main/sidebar.cc:801
-#: ../src/main/sidebar.cc:873 ../src/main/sidebar.cc:875
+#: ../src/gnome2/mod_mgr.c:1003
+#: ../src/gnome2/mod_mgr.c:1005
+#: ../src/gnome2/mod_mgr.c:1107
+#: ../src/gnome2/mod_mgr.c:1142
+#: ../src/gnome2/mod_mgr.c:1144
+#: ../src/gnome2/utilities.c:435
+#: ../src/gnome2/utilities.c:500
+#: ../src/gnome2/utilities.c:502
+#: ../src/gnome2/utilities.c:986
+#: ../src/main/sidebar.cc:852
+#: ../src/main/sidebar.cc:924
+#: ../src/main/sidebar.cc:926
 msgid "Unknown"
 msgstr "ناشناس"
 
-#: ../src/gnome2/mod_mgr.c:1029
+#: ../src/gnome2/mod_mgr.c:1301
 #, c-format
 msgid ""
 "Repository:\n"
 "%s"
-msgstr "انبار %s"
+msgstr ""
+"انبار:\n"
+"%s"
 
-#: ../src/gnome2/mod_mgr.c:1041
+#: ../src/gnome2/mod_mgr.c:1313
 msgid ""
 "Categorized by\n"
 "Module Type"
-msgstr "نوع مدول"
+msgstr ""
+"دسته بندی شده بر اساس\n"
+"مدول"
 
-#: ../src/gnome2/mod_mgr.c:1046 ../src/gnome2/utilities.c:472
-#: ../src/main/sidebar.cc:948 ../src/main/sidebar.cc:950
+#: ../src/gnome2/mod_mgr.c:1318
+#: ../src/gnome2/utilities.c:561
+#: ../src/main/sidebar.cc:999
+#: ../src/main/sidebar.cc:1001
 msgid "Biblical Texts"
 msgstr "متون کتابمقدس"
 
-#: ../src/gnome2/mod_mgr.c:1050 ../src/gnome2/utilities.c:476
-#: ../src/main/sidebar.cc:655 ../src/main/sidebar.cc:973
-#: ../src/main/sidebar.cc:975 ../ui/prefs.glade.h:33
+#: ../src/gnome2/mod_mgr.c:1322
+#: ../src/gnome2/utilities.c:565
+#: ../src/main/sidebar.cc:678
+#: ../src/main/sidebar.cc:1024
+#: ../src/main/sidebar.cc:1026
+#: ../ui/prefs.glade.h:33
 msgid "Commentaries"
-msgstr "کتب تفاسیر"
+msgstr "کتب تفسیر"
 
-#: ../src/gnome2/mod_mgr.c:1054 ../src/gnome2/utilities.c:480
-#: ../src/main/sidebar.cc:982 ../src/main/sidebar.cc:984
+#: ../src/gnome2/mod_mgr.c:1326
+#: ../src/gnome2/utilities.c:569
+#: ../src/main/sidebar.cc:1033
+#: ../src/main/sidebar.cc:1035
 msgid "Dictionaries"
 msgstr "کتب فرهنگ لغات"
 
-#: ../src/gnome2/mod_mgr.c:1058 ../src/gnome2/utilities.c:484
-#: ../src/main/sidebar.cc:991 ../src/main/sidebar.cc:993
+#: ../src/gnome2/mod_mgr.c:1330
+#: ../src/gnome2/utilities.c:573
+#: ../src/main/sidebar.cc:1042
+#: ../src/main/sidebar.cc:1044
 msgid "Daily Devotionals"
 msgstr "دعا و تفکر روزانه"
 
-#: ../src/gnome2/mod_mgr.c:1062 ../src/gnome2/utilities.c:488
-#: ../src/main/sidebar.cc:665 ../src/main/sidebar.cc:1000
-#: ../src/main/sidebar.cc:1002
+#: ../src/gnome2/mod_mgr.c:1334
+#: ../src/gnome2/utilities.c:577
+#: ../src/main/sidebar.cc:688
+#: ../src/main/sidebar.cc:1051
+#: ../src/main/sidebar.cc:1053
 msgid "General Books"
 msgstr "کتب عمومی"
 
-#: ../src/gnome2/mod_mgr.c:1066 ../src/gnome2/utilities.c:492
-#: ../src/main/sidebar.cc:1009 ../src/main/sidebar.cc:1011
+#: ../src/gnome2/mod_mgr.c:1338
+#: ../src/gnome2/utilities.c:581
+#: ../src/main/sidebar.cc:1060
+#: ../src/main/sidebar.cc:1062
 msgid "Maps"
 msgstr "نقشه‌ها"
 
-#: ../src/gnome2/mod_mgr.c:1070 ../src/gnome2/utilities.c:496
-#: ../src/main/sidebar.cc:1018 ../src/main/sidebar.cc:1020
+#: ../src/gnome2/mod_mgr.c:1342
+#: ../src/gnome2/utilities.c:585
+#: ../src/main/sidebar.cc:1069
+#: ../src/main/sidebar.cc:1071
 msgid "Images"
 msgstr "تصاویر"
 
-#: ../src/gnome2/mod_mgr.c:1078
+#: ../src/gnome2/mod_mgr.c:1350
 msgid ""
 "Categorized by\n"
 "Availability"
-msgstr "قابل دسترس"
+msgstr ""
+"دسته‏بندی شده بر اساس\n"
+"دسترسی"
 
-#: ../src/gnome2/mod_mgr.c:1083
+#: ../src/gnome2/mod_mgr.c:1355
 msgid "Updates"
-msgstr "روز رسانی"
+msgstr "روز رسانی‏ها"
 
-#: ../src/gnome2/mod_mgr.c:1087
+#: ../src/gnome2/mod_mgr.c:1359
 msgid "Uninstalled"
-msgstr "دیگر نصب نیست"
-
-#: ../src/gnome2/mod_mgr.c:1091 ../src/gnome2/sidebar.c:637
-#: ../src/gnome2/utilities.c:501 ../src/main/prayerlists.cc:238
-#: ../src/main/sidebar.cc:1028 ../src/main/sidebar.cc:1030
+msgstr "عناوینی که نصب نشده‏اند"
+
+#: ../src/gnome2/mod_mgr.c:1363
+#: ../src/gnome2/sidebar.c:643
+#: ../src/gnome2/utilities.c:590
+#: ../src/main/prayerlists.cc:241
+#: ../src/main/sidebar.cc:1079
+#: ../src/main/sidebar.cc:1081
 msgid "Prayer List/Journal"
-msgstr "لیست دعا"
+msgstr "لیست دعا/نوشتار روزانه"
 
-#: ../src/gnome2/mod_mgr.c:1268
+#: ../src/gnome2/mod_mgr.c:1545
 msgid "Refreshing from remote source"
-msgstr "منبع دوردست را وارد کنید "
+msgstr "به روزرسانی از راه دور"
 
-#: ../src/gnome2/mod_mgr.c:1279
+#: ../src/gnome2/mod_mgr.c:1556
 msgid "Remote source not found"
-msgstr "پیدا نشد"
-
-#: ../src/gnome2/mod_mgr.c:1412
-msgid "Module Name"
-msgstr "نام مدول"
-
-#: ../src/gnome2/mod_mgr.c:1433
-msgid "A checkmark means this module is already installed"
-msgstr ""
-
-#: ../src/gnome2/mod_mgr.c:1455
-msgid "Click the box to work on this module"
-msgstr ""
-
-#: ../src/gnome2/mod_mgr.c:1456
-msgid "Click the box to select this module for install/update"
-msgstr ""
-
-#: ../src/gnome2/mod_mgr.c:1475
-msgid "Installed"
-msgstr "نصب شد"
-
-#: ../src/gnome2/mod_mgr.c:1485
-msgid ""
-"The index icon means you have built an optimized ('lucene') index for this "
-"module for fast searching (see the Maintenance pane for this function)"
-msgstr ""
-"نشانه اندکس به اين معني است که شما براي اين مدول قبلا اندکسي درست کرده‌ايد که "
-"کار جستجوي سريع را انجام دهد"
-
-#: ../src/gnome2/mod_mgr.c:1503
-msgid ""
-"The lock icon means this module is encrypted, and requires that you purchase "
-"an unlock key from the content owner"
-msgstr ""
-"نشانه قفل يعني مدول قفل است و جهت استفاده بايد کليد اين قفل خريداري شود"
-
-#. 2
-#: ../src/gnome2/mod_mgr.c:1520 ../src/gnome2/sidebar.c:975
-#: ../src/gnome2/sidebar.c:1143 ../ui/xi-menus.glade.h:1
-msgid "About"
-msgstr "درباره"
-
-#: ../src/gnome2/mod_mgr.c:1540
-msgid ""
-"The refresh icon means the Installed module is older than the newer "
-"Available module: You should update the module"
-msgstr ""
-"نشانه تجديد به اين معني است که مدول نصب شده از مدولهاي موجود قديمي‌تر است؛ "
-"لازم است که مدولهاي تازه‌تر را نصب فرماييد"
-
-#: ../src/gnome2/mod_mgr.c:1552
-msgid "Available"
-msgstr "در دسترس"
+msgstr "منبع راه دور پیدا نشد"
 
-#: ../src/gnome2/mod_mgr.c:1561
-msgid "Size"
-msgstr "اندازه"
-
-#: ../src/gnome2/mod_mgr.c:1570
-msgid "Description"
-msgstr "توصیف"
-
-#: ../src/gnome2/mod_mgr.c:1602 ../src/gnome2/mod_mgr.c:1702
+#: ../src/gnome2/mod_mgr.c:1670
 msgid "Configure"
 msgstr "شکل‌بندی"
 
-#: ../src/gnome2/mod_mgr.c:1633
+#: ../src/gnome2/mod_mgr.c:1701
 msgid "Type"
 msgstr "نوع"
 
-#: ../src/gnome2/mod_mgr.c:1640
+#: ../src/gnome2/mod_mgr.c:1708
 msgid "Caption"
 msgstr "سرلوحه"
 
-#: ../src/gnome2/mod_mgr.c:1648
+#: ../src/gnome2/mod_mgr.c:1716
 msgid "Source"
 msgstr "منبع"
 
-#: ../src/gnome2/mod_mgr.c:1656
+#: ../src/gnome2/mod_mgr.c:1724
 msgid "Directory"
 msgstr "لغت‌نامه"
 
-#: ../src/gnome2/mod_mgr.c:1664
-#, fuzzy
+#: ../src/gnome2/mod_mgr.c:1732
 msgid "User"
-msgstr "بالاتر"
+msgstr "کاربر"
 
-#: ../src/gnome2/mod_mgr.c:1672
+#: ../src/gnome2/mod_mgr.c:1740
 msgid "Password"
-msgstr ""
+msgstr "اسم رمز"
 
-#: ../src/gnome2/mod_mgr.c:1680
+#: ../src/gnome2/mod_mgr.c:1748
 msgid "UID"
-msgstr ""
+msgstr "کاربر"
+
+#: ../src/gnome2/mod_mgr.c:1765
+msgid "Module Sources"
+msgstr "منبع‌های مدول"
 
-#: ../src/gnome2/mod_mgr.c:1700
-msgid "Sources"
-msgstr "منابع"
+#: ../src/gnome2/mod_mgr.c:1768
+msgid "Add/Remove"
+msgstr "اضافه/حذف کن"
 
-#: ../src/gnome2/mod_mgr.c:1706 ../src/gnome2/preferences_dialog.c:1784
-#: ../src/gnome2/sidebar.c:1483
+#: ../src/gnome2/mod_mgr.c:1770
+msgid "Choose"
+msgstr "انتخاب کن"
+
+#: ../src/gnome2/mod_mgr.c:1774
+#: ../src/gnome2/preferences_dialog.c:1793
+#: ../src/gnome2/sidebar.c:1413
 msgid "Modules"
-msgstr "مدولها"
+msgstr "عناوین"
 
-#: ../src/gnome2/mod_mgr.c:1708
+#: ../src/gnome2/mod_mgr.c:1776
 msgid "Install/Update"
 msgstr "نصب/روز رسانی"
 
-#: ../src/gnome2/mod_mgr.c:1710
+#: ../src/gnome2/mod_mgr.c:1778
 msgid "Maintenance"
-msgstr "ابقا"
+msgstr "تعمیر"
 
-#: ../src/gnome2/mod_mgr.c:1930
+#: ../src/gnome2/mod_mgr.c:1999
 msgid "Please Refresh"
 msgstr "لطفا دوباره راه اندازی کنید"
 
-#: ../src/gnome2/mod_mgr.c:1931
+#: ../src/gnome2/mod_mgr.c:2000
 msgid "Your module list is not up to date!"
-msgstr "لیست مدول شما روز رسانی نشده است"
+msgstr "لیست مدول شما روز رسانی نشده است!"
 
+#. Zero Bibles is just not workable in Xiphos.
 #: ../src/gnome2/mod_mgr.c:2282
+msgid ""
+"You have uninstalled your last Bible.\n"
+"Xiphos requires at least one."
+msgstr "زیفوس یک مدول کتاب مقدس لازم درد"
+
+#: ../src/gnome2/mod_mgr.c:2288
+msgid ""
+"There are still no Bibles installed.\n"
+"Xiphos cannot continue without one."
+msgstr "زیفوس یک عنون کتاب مقدس لازم درد. خواهش میکنم یکی نصب کن! "
+
+#: ../src/gnome2/mod_mgr.c:2353
 msgid "Standard remote sources have been loaded."
-msgstr ""
+msgstr "منابع دوردست استاندارد قبلاً نصب شده‏اند"
 
-#: ../src/gnome2/mod_mgr.c:2283
+#: ../src/gnome2/mod_mgr.c:2359
 msgid "Could not load standard sources from CrossWire."
-msgstr ""
+msgstr "امکان بارگذاری منابع استاندارد از سایت کراس‏وایر موجود نیست."
 
-#: ../src/gnome2/mod_mgr.c:2435 ../src/gnome2/mod_mgr.c:2684
+#: ../src/gnome2/mod_mgr.c:2510
+#: ../src/gnome2/mod_mgr.c:2759
 msgid "Remove the selected source"
-msgstr "منبع انتخاب شده را حذف کنید"
+msgstr "منبع انتخاب شده را حذف کنید."
 
-#: ../src/gnome2/mod_mgr.c:2495
+#: ../src/gnome2/mod_mgr.c:2570
 msgid "Enter a remote source"
-msgstr "منبع دوردست را وارد کنید "
+msgstr "منبع راه دور را وارد کنید"
 
-#: ../src/gnome2/mod_mgr.c:2499
+#: ../src/gnome2/mod_mgr.c:2574
 msgid "Caption:"
-msgstr "گزیده"
+msgstr "سرلوحه:"
 
-#: ../src/gnome2/mod_mgr.c:2500
+#: ../src/gnome2/mod_mgr.c:2575
 msgid "Type:"
-msgstr "نوع"
+msgstr "نوع:"
 
-#: ../src/gnome2/mod_mgr.c:2501
+#: ../src/gnome2/mod_mgr.c:2576
 msgid "Host:"
-msgstr "میزبان"
+msgstr "میزبان:"
 
-#: ../src/gnome2/mod_mgr.c:2502
+#: ../src/gnome2/mod_mgr.c:2577
 msgid "Directory:"
-msgstr "فرهنگ لغات"
+msgstr "فهرست:"
 
-#: ../src/gnome2/mod_mgr.c:2504
+#: ../src/gnome2/mod_mgr.c:2579
 msgid "User (optional):"
-msgstr ""
+msgstr "کاربر (اختیاری)"
 
-#: ../src/gnome2/mod_mgr.c:2505
+#: ../src/gnome2/mod_mgr.c:2580
 msgid "Password (optional):"
-msgstr ""
+msgstr "اسم رمز (اختیاری)"
 
 #. this can happen at most once
-#: ../src/gnome2/mod_mgr.c:2533
+#: ../src/gnome2/mod_mgr.c:2608
 msgid "A source by that name already exists."
-msgstr "منبعی به همان اسم وجود استم"
+msgstr "منبعی با همان اسم وجود دارد."
 
-#: ../src/gnome2/mod_mgr.c:2681
+#: ../src/gnome2/mod_mgr.c:2756
 msgid "Delete a remote source"
-msgstr "منبع دوردست را وارد کنید "
+msgstr "منبع راه‏ دور را حذف کنید"
+
+#. *****************************************************************************
+#. * Name
+#. *   gui_open_mod_mgr
+#. *
+#. * Synopsis
+#. *   #include "gui/mod_mgr.h"
+#. *
+#. *   void gui_open_mod_mgr(void)
+#. *
+#. * Description
+#. *
+#. *
+#. * Return value
+#. *   void
+#.
+#: ../src/gnome2/mod_mgr.c:3244
+msgid ""
+"<b>Welcome to the Module Manager.</b>\n"
+"\n"
+"This is Xiphos' mechanism to get new and updated content.\n"
+"It appears you have never been here before, so please take a moment to look it over.\n"
+"(You will see this information box just once.)\n"
+"\n"
+"Modules come from different <u>repositories</u>.  <b>Module Sources: Add/Remove</b> will show you what repositories are currently known.\n"
+"\n"
+"<b>Module Sources: Choose</b> is for deciding from where modules should come, that is, from which repository Xiphos should obtain them, as well as where they should be placed on your system. Set <i>Install Source</i> and <i>Install Destination</i>, then click <i>Refresh</i>.\n"
+"\n"
+"<b>Modules: Install/Update</b> is for selecting and obtaining modules after choosing source and destination.\n"
+"\n"
+"<b>Modules: Maintenance</b> is for archive and index creation.\n"
+"\n"
+"See section 5 of our manual for Module Manager detail, or ask for help via Live Chat, or (if no one is responsive in chat) send mail to our users' mailing list.\n"
+msgstr ""
+"<b>به مدیر مدول خوش آمدید</b>/n/nاین مکانیزم زایفس است برای دریافت محتویات جدید و بروز شده./nبه نظر میرسد شما قبلا اینجا نبوده اید، پس لطفا چند لحظه از وقت خود را اختصاص دهید و آنرا مرور کنید./n (شما تنها یکبار این دریچه اطلاعات را خواهید دید.)/n‌مدولها از <u>انبارهای مختلفی</u> می آیند. <b>منابع مدول:   اضافه/حذف</b>    به شما نشان که در حال حاضر چه انبارهای شناخته شده ای وجود دارد.\n"
+" <b>منابع مدول:    انتخاب</b>        برای تعیین آن است که مدولها از کجا باید بیایند، از کدام زایفسها باید آنها را بدست آورد، و نیز از                                   از کجا باید آنها را روی \n"
+"سیستم خود قرار داد. تنظیم <i>منبع نصب</i> و <i>مقصد نصب</i> سپس کلیک روزرسانی   <b>مدولها: نصب/روزرسانی</b> برای انتخاب و کسب مدولها پس از انتخاب منبع و مقصد است.\n"
+"\n"
+"<b>مدولها: تعمیر</b> برای بایگانی و ایجاد ضمیمه است.\n"
+"\n"
+"برای جزییات مدیر مدول به بخش ۵ از دستورالعمل ما مراجعه کنید، یا از طریق چت زنده کمک بخواهید، یا (اگر در چت کسی برای جواب دادن حضور ندارد) به لیست پست الکترونیکی کاربران ما پیغام بفرستید.\n"
+"\n"
 
-#: ../src/gnome2/navbar_book.c:359 ../src/gnome2/navbar_book_dialog.c:299
+#: ../src/gnome2/navbar_book.c:359
+#: ../src/gnome2/navbar_book_dialog.c:300
 msgid "Go outward, to the section containing this one"
 msgstr "برو به قسمتی که این را دارد"
 
-#: ../src/gnome2/navbar_book.c:375 ../src/gnome2/navbar_book_dialog.c:315
+#: ../src/gnome2/navbar_book.c:375
+#: ../src/gnome2/navbar_book_dialog.c:316
 msgid "Go to previous item"
-msgstr "برو به مورد قبلی"
+msgstr "به مورد قبلی بازگرد"
 
-#: ../src/gnome2/navbar_book.c:390 ../src/gnome2/navbar_book_dialog.c:330
+#: ../src/gnome2/navbar_book.c:390
+#: ../src/gnome2/navbar_book_dialog.c:331
 msgid "Go to next item"
-msgstr "برو به مورد بعدی"
+msgstr "به مورد بعدی برو"
 
-#: ../src/gnome2/navbar_book.c:406 ../src/gnome2/navbar_book_dialog.c:346
+#: ../src/gnome2/navbar_book.c:406
+#: ../src/gnome2/navbar_book_dialog.c:347
 msgid "Go inward, to the first subsection"
-msgstr ""
+msgstr "به سمت اولین بخش فرعی به پیش برو"
 
-#: ../src/gnome2/navbar_versekey_dialog.c:887
-#: ../src/gnome2/navbar_versekey_editor.c:877
-#: ../src/gnome2/navbar_versekey_parallel.c:800
-#, fuzzy
+#: ../src/gnome2/navbar_versekey_dialog.c:864
+#: ../src/gnome2/navbar_versekey_editor.c:879
+#: ../src/gnome2/navbar_versekey_parallel.c:810
 msgid "Synchronize this window from main window"
-msgstr "%s درپنجره اصلی را نشان بده"
+msgstr "این پنجره را با پنجرۀ اصلی مطابقت می‏دهد"
 
-#: ../src/gnome2/parallel_dialog.c:324 ../src/gnome2/preferences_dialog.c:1790
+#: ../src/gnome2/parallel_dialog.c:328
+#: ../src/gnome2/preferences_dialog.c:1799
 msgid "Parallel"
-msgstr "توازی"
+msgstr "موازی"
 
-#: ../src/gnome2/parallel_view.c:271
+#: ../src/gnome2/parallel_view.c:275
 msgid "Copy"
 msgstr "کپی"
 
-#: ../src/gnome2/parallel_view.c:281
+#: ../src/gnome2/parallel_view.c:285
 msgid "Detach/Attach"
 msgstr "جدا کن/ الصاق کن"
 
-#: ../src/gnome2/parallel_view.c:287 ../ui/xi-menus.glade.h:40
+#: ../src/gnome2/parallel_view.c:291
+#: ../ui/xi-menus.glade.h:53
 msgid "Module Options"
-msgstr "گزینشهای مختلف مدول"
+msgstr "گزینه‏های مختلف مدول"
 
 #. build change parallel modules submenu
-#: ../src/gnome2/parallel_view.c:302
+#: ../src/gnome2/parallel_view.c:306
 msgid "Change parallel 1"
-msgstr "توازی1 را عوض کن"
+msgstr "توازی ! را عوض کن"
 
-#: ../src/gnome2/parallel_view.c:304
+#: ../src/gnome2/parallel_view.c:308
 msgid "Change parallel 2"
-msgstr "توازی 2 را عوض کن"
+msgstr "توازی ۲ را عوض کن"
 
-#: ../src/gnome2/parallel_view.c:306
+#: ../src/gnome2/parallel_view.c:310
 msgid "Change parallel 3"
-msgstr "توازی 3 را عوض کن"
+msgstr "توازی ۳ را عوض کن"
 
-#: ../src/gnome2/parallel_view.c:308
+#: ../src/gnome2/parallel_view.c:312
 msgid "Change parallel 4"
-msgstr "توازی 4 را عوض کن"
+msgstr "توازی ۴ را عوض کن"
 
-#: ../src/gnome2/parallel_view.c:310
+#: ../src/gnome2/parallel_view.c:314
 msgid "Change parallel 5"
-msgstr "توازی 5 را عوض کن"
-
-#: ../src/gnome2/parallel_view.c:467 ../src/gnome2/sidebar.c:620
-#: ../src/gnome2/sidebar.c:626 ../src/gnome2/tabbed_browser.c:231
-#: ../src/main/sidebar.cc:623 ../src/main/sidebar.cc:956
-#: ../src/main/sidebar.cc:957 ../src/main/sidebar.cc:958
+msgstr "توازی ۵ را عوض کن"
+
+#: ../src/gnome2/parallel_view.c:471
+#: ../src/gnome2/sidebar.c:626
+#: ../src/gnome2/sidebar.c:632
+#: ../src/gnome2/tabbed_browser.c:262
+#: ../src/main/sidebar.cc:646
+#: ../src/main/sidebar.cc:1007
+#: ../src/main/sidebar.cc:1008
+#: ../src/main/sidebar.cc:1009
 msgid "Parallel View"
-msgstr "نگرش به شکل توازی"
-
-#: ../src/gnome2/preferences_cell_renderer.c:398
-msgid "Text"
-msgstr "متن"
-
-#: ../src/gnome2/preferences_cell_renderer.c:400
-msgid "Text to render"
-msgstr "ارائه متن"
-
-#: ../src/gnome2/preferences_cell_renderer.c:406
-msgid "Pixbuf Object"
-msgstr ""
-
-#: ../src/gnome2/preferences_cell_renderer.c:408
-msgid "The pixbuf to render."
-msgstr ""
-
-#: ../src/gnome2/preferences_dialog.c:1231
-#: ../src/gnome2/preferences_dialog.c:1269
-#: ../src/gnome2/preferences_dialog.c:1306
-#: ../src/gnome2/preferences_dialog.c:1341
-#: ../src/gnome2/preferences_dialog.c:1375
-#: ../src/gnome2/preferences_dialog.c:1408
-#: ../src/gnome2/preferences_dialog.c:1440
-#: ../src/gnome2/preferences_dialog.c:1473
-#: ../src/gnome2/preferences_dialog.c:1505
-#: ../src/gnome2/preferences_dialog.c:1539
-#: ../src/gnome2/preferences_dialog.c:1574
-#: ../src/gnome2/preferences_dialog.c:1609
-#: ../src/gnome2/preferences_dialog.c:1645
-#: ../src/gnome2/preferences_dialog.c:2045
+msgstr "نگرش موازی"
+
+#: ../src/gnome2/preferences_dialog.c:1179
+#: ../src/gnome2/preferences_dialog.c:1217
+#: ../src/gnome2/preferences_dialog.c:1254
+#: ../src/gnome2/preferences_dialog.c:1289
+#: ../src/gnome2/preferences_dialog.c:1323
+#: ../src/gnome2/preferences_dialog.c:1356
+#: ../src/gnome2/preferences_dialog.c:1388
+#: ../src/gnome2/preferences_dialog.c:1421
+#: ../src/gnome2/preferences_dialog.c:1453
+#: ../src/gnome2/preferences_dialog.c:1487
+#: ../src/gnome2/preferences_dialog.c:1522
+#: ../src/gnome2/preferences_dialog.c:1557
+#: ../src/gnome2/preferences_dialog.c:1593
+#: ../src/gnome2/preferences_dialog.c:1631
+#: ../src/gnome2/preferences_dialog.c:2052
 msgid "-- Select --"
-msgstr "انتخاب"
+msgstr "--انتخاب--"
+
+#: ../src/gnome2/preferences_dialog.c:1652
+msgid "Locale will take effect after restart."
+msgstr "زبان جدید بعد از شروع جدید این برنامه"
 
-#: ../src/gnome2/preferences_dialog.c:1678 ../ui/prefs.glade.h:74
+#: ../src/gnome2/preferences_dialog.c:1687
+#: ../ui/prefs.glade.h:74
 msgid "Preferences"
-msgstr "ترجیحات"
+msgstr "ویژگی‏ها"
 
-#: ../src/gnome2/preferences_dialog.c:1760
+#: ../src/gnome2/preferences_dialog.c:1769
 msgid "Fonts"
-msgstr "قلمها"
+msgstr "قلم‏ها"
 
-#: ../src/gnome2/preferences_dialog.c:1763
+#: ../src/gnome2/preferences_dialog.c:1772
 msgid "Color"
 msgstr "رنگ"
 
-#: ../src/gnome2/preferences_dialog.c:1766
+#: ../src/gnome2/preferences_dialog.c:1775
 msgid "Sizes"
-msgstr "اندازه"
+msgstr "اندازه‏ها"
 
-#: ../src/gnome2/preferences_dialog.c:1770
+#: ../src/gnome2/preferences_dialog.c:1779
 msgid "General"
 msgstr "عمومی"
 
-#: ../src/gnome2/preferences_dialog.c:1773 ../ui/prefs.glade.h:85
+#: ../src/gnome2/preferences_dialog.c:1782
+#: ../ui/prefs.glade.h:87
 msgid "Tabs and Panes"
-msgstr "برگها و پنجره‌ها"
+msgstr "بخش‏ها و پنجره‌ها"
 
-#: ../src/gnome2/preferences_dialog.c:1780
+#: ../src/gnome2/preferences_dialog.c:1789
 msgid "Options"
-msgstr "گزینه"
+msgstr "گزینه‏ها"
 
-#: ../src/gnome2/preferences_dialog.c:1787
+#: ../src/gnome2/preferences_dialog.c:1796
 msgid "Main"
 msgstr "اصلی"
 
-#: ../src/gnome2/preferences_dialog.c:1793
+#: ../src/gnome2/preferences_dialog.c:1802
 msgid "Special"
 msgstr "مخصوص"
 
-#: ../src/gnome2/search_dialog.c:61 ../src/main/search_dialog.cc:60
-#: ../src/main/search_sidebar.cc:54
+#: ../src/gnome2/search_dialog.c:68
+#: ../src/main/search_dialog.cc:66
+#: ../src/main/search_sidebar.cc:61
 msgid "Searching the "
-msgstr "جستجوی"
+msgstr "جستجوی "
 
-#: ../src/gnome2/search_dialog.c:62 ../src/main/search_dialog.cc:61
-#: ../src/main/search_sidebar.cc:55
+#: ../src/gnome2/search_dialog.c:69
+#: ../src/main/search_dialog.cc:67
+#: ../src/main/search_sidebar.cc:62
 msgid " Module"
-msgstr "مدول"
+msgstr " مدول"
 
-#: ../src/gnome2/search_dialog.c:63 ../src/main/search_dialog.cc:62
-#: ../src/main/search_sidebar.cc:56
+#: ../src/gnome2/search_dialog.c:70
+#: ../src/main/search_dialog.cc:68
+#: ../src/main/search_sidebar.cc:63
 msgid "found in "
-msgstr "یافت شده در"
+msgstr "یافت شده در "
 
-#: ../src/gnome2/search_dialog.c:498
+#: ../src/gnome2/search_dialog.c:527
 msgid "Clear List?"
-msgstr "لیست را پاک کن"
+msgstr "آیا می‏خواهید لیست پاک شود؟"
 
-#: ../src/gnome2/search_dialog.c:499
+#: ../src/gnome2/search_dialog.c:528
 msgid "Are you sure you want to clear the module list?"
 msgstr "آیا به یقین می‌خواهید که لیست مدول را پاک کنید؟"
 
-#: ../src/gnome2/search_dialog.c:679
+#: ../src/gnome2/search_dialog.c:708
 msgid "The last module list may not be deleted"
-msgstr ""
+msgstr "لیست مدول پیشین ممکن است ذخیره نشده باشد"
 
-#: ../src/gnome2/search_dialog.c:697
+#: ../src/gnome2/search_dialog.c:726
 msgid "Delete list?"
-msgstr "لیست را حذف کن"
+msgstr "لیست حذف شود؟"
 
-#: ../src/gnome2/search_dialog.c:698
+#: ../src/gnome2/search_dialog.c:727
 msgid "Are you sure you want to delete:"
 msgstr "آیا به یقین می‌خواهید که لیست را حذف کنید؟"
 
-#: ../src/gnome2/search_sidebar.c:189
+#: ../src/gnome2/search_sidebar.c:192
 msgid ""
 "This is an inclusive (\"AND\") search:\n"
 "Find matches showing all words."
 msgstr ""
-"اين نوع جستجو، فراگير است (\"و\") جستجو:/ن تمامي کلمات مربوط به آن را پيدا "
-"مي‌کند"
+"این نوع جستجو فراگیر  (\"و\") است: \n"
+"تمامی کلمات مربوط به آن را پیدا می‏کند"
 
-#: ../src/gnome2/search_sidebar.c:206
+#: ../src/gnome2/search_sidebar.c:209
 msgid "Search Module"
 msgstr "جستجو در مدول"
 
-#: ../src/gnome2/search_sidebar.c:220
+#: ../src/gnome2/search_sidebar.c:223
 msgid "Bible"
-msgstr "کتابمقدس"
+msgstr "کتاب‏مقدس"
 
-#: ../src/gnome2/search_sidebar.c:229 ../ui/prefs.glade.h:35
+#: ../src/gnome2/search_sidebar.c:232
+#: ../ui/prefs.glade.h:35
 msgid "Commentary"
 msgstr "تفسیر"
 
-#: ../src/gnome2/search_sidebar.c:243
+#: ../src/gnome2/search_sidebar.c:246
 msgid "Search Type"
 msgstr "نوع جستجو"
 
-#: ../src/gnome2/search_sidebar.c:257 ../ui/search-dialog.glade.h:64
+#: ../src/gnome2/search_sidebar.c:260
+#: ../ui/search-dialog.glade.h:66
 msgid "Multi word"
 msgstr "کلمات متعدد"
 
-#: ../src/gnome2/search_sidebar.c:276 ../ui/search-dialog.glade.h:44
+#: ../src/gnome2/search_sidebar.c:279
+#: ../ui/search-dialog.glade.h:44
 msgid "Exact phrase"
 msgstr "عبارت به شکل دقیق"
 
-#: ../src/gnome2/search_sidebar.c:290
+#: ../src/gnome2/search_sidebar.c:293
 msgid "Search Options"
 msgstr "ترجیحات در جستجو"
 
-#: ../src/gnome2/search_sidebar.c:318
+#: ../src/gnome2/search_sidebar.c:321
 msgid "Search Scope"
-msgstr "محدوده جستجو"
+msgstr "محدودۀ جستجو"
 
-#: ../src/gnome2/search_sidebar.c:331
+#: ../src/gnome2/search_sidebar.c:334
 msgid "No scope"
 msgstr "بدون محدوده"
 
-#: ../src/gnome2/search_sidebar.c:341
+#: ../src/gnome2/search_sidebar.c:344
 msgid "Use bounds"
 msgstr "بکارگیری حدود"
 
-#: ../src/gnome2/search_sidebar.c:350
+#: ../src/gnome2/search_sidebar.c:353
 msgid "Last search"
-msgstr "جستجوی آخر"
+msgstr "آخرین جستجو"
 
-#: ../src/gnome2/search_sidebar.c:365
+#: ../src/gnome2/search_sidebar.c:368
 msgid "Bounds"
 msgstr "حدود"
 
-#: ../src/gnome2/search_sidebar.c:379
+#: ../src/gnome2/search_sidebar.c:382
 msgid "Lower"
-msgstr "پایینتر"
+msgstr "پایین‏تر"
 
-#: ../src/gnome2/search_sidebar.c:386
+#: ../src/gnome2/search_sidebar.c:389
 msgid "Upper"
 msgstr "بالاتر"
 
-#. 0
-#: ../src/gnome2/sidebar.c:963 ../src/gnome2/sidebar.c:1131
-msgid "Open in a new tab"
-msgstr "در بخشی جدید باز کن"
-
-#: ../src/gnome2/sidebar.c:964 ../src/gnome2/sidebar.c:1132
-msgid "Open selected module in a new tab"
-msgstr "مدول انتخاب شده را در بخشی جدید باز کن"
-
-#. 1
-#: ../src/gnome2/sidebar.c:969
-msgid "Open in a separate window"
-msgstr "باز کن در پنچره تازه"
-
-#: ../src/gnome2/sidebar.c:970
-msgid "Open selected module in a separate ['dialog'] window"
-msgstr "مدول انتخاب شده را در دیالوگ باز کن"
-
-#: ../src/gnome2/sidebar.c:976 ../src/gnome2/sidebar.c:1144
-msgid "View information about the selected dialog"
-msgstr "نگرش اطلاعات مربوط به دیالوگ منتخب"
-
-#: ../src/gnome2/sidebar.c:1067
-msgid "Simple"
-msgstr "ساده"
-
-#: ../src/gnome2/sidebar.c:1068
-msgid "Create a new simple prayer list"
-msgstr "ایجاد لیست دعا زاده جدید"
-
-#: ../src/gnome2/sidebar.c:1074
-msgid "Subject"
-msgstr "موضوع"
-
-#: ../src/gnome2/sidebar.c:1081
-msgid "Monthly"
-msgstr "ماهانه"
-
-#: ../src/gnome2/sidebar.c:1082 ../src/gnome2/sidebar.c:1089
-#: ../src/gnome2/sidebar.c:1096
-msgid "Create a new prayer list"
-msgstr "ایجاد لیست دعا جدید"
-
-#: ../src/gnome2/sidebar.c:1088
-msgid "Daily Journal"
-msgstr "دعا و تفکر روزانه"
-
-#: ../src/gnome2/sidebar.c:1095
-msgid "Outlined Topic"
-msgstr "موضوع مشخص شده"
-
-#. 1
-#: ../src/gnome2/sidebar.c:1137 ../ui/xi-menus.glade.h:47
-msgid "Open in editor"
-msgstr "در دیالوگ باز کن"
-
-#: ../src/gnome2/sidebar.c:1138
-msgid "Open selected module in a dialog"
-msgstr "مدول انتخاب شده را در دیالوگ باز کن"
-
-#: ../src/gnome2/sidebar.c:1467
+#: ../src/gnome2/sidebar.c:1397
 msgid "Search"
 msgstr "جستجو"
 
-#: ../src/gnome2/sidebar.c:1475
+#: ../src/gnome2/sidebar.c:1405
 msgid "Verse List"
 msgstr "لیست آیات"
 
-#: ../src/gnome2/sidebar_dialog.c:136 ../src/gnome2/sidebar_dialog.c:145
+#: ../src/gnome2/sidebar_dialog.c:139
+#: ../src/gnome2/sidebar_dialog.c:148
 msgid "Sidebar"
-msgstr "قفسه جانبی"
+msgstr "ستون جانبی"
 
-#: ../src/gnome2/splash.c:363
+#: ../src/gnome2/splash.c:396
 msgid "Powered by the SWORD Project"
-msgstr "توسط پروژه سورد"
+msgstr "حمایت شده توسط پروژۀ سورد"
 
-#: ../src/gnome2/treekey-editor.c:130 ../src/gnome2/treekey-editor.c:189
-#: ../src/gnome2/treekey-editor.c:275
+#: ../src/gnome2/treekey-editor.c:137
+#: ../src/gnome2/treekey-editor.c:196
+#: ../src/gnome2/treekey-editor.c:282
 msgid "Prayer List/Journal Item"
-msgstr "لیست دعا"
+msgstr "لیست دعا/یادداشتهای روزانه"
 
-#: ../src/gnome2/treekey-editor.c:131 ../src/gnome2/treekey-editor.c:190
-#: ../src/gnome2/treekey-editor.c:276
+#: ../src/gnome2/treekey-editor.c:138
+#: ../src/gnome2/treekey-editor.c:197
+#: ../src/gnome2/treekey-editor.c:283
 msgid "New name"
 msgstr "نام جدید"
 
-#: ../src/gnome2/treekey-editor.c:246
+#: ../src/gnome2/treekey-editor.c:253
 msgid "Remove the selected item"
-msgstr "قفسه پرونده انتخاب شده را حذف کن"
-
-#: ../src/gnome2/treekey-editor.c:304
-msgid "Add Child"
-msgstr "آضافه کردن بچه"
-
-#: ../src/gnome2/treekey-editor.c:305 ../src/gnome2/treekey-editor.c:311
-msgid "Add an item"
-msgstr "اضافه کردن مورد"
-
-#: ../src/gnome2/treekey-editor.c:310
-msgid "Add Sibling"
-msgstr "اضافه کردن خواهر و یا برادر"
-
-#: ../src/gnome2/treekey-editor.c:317
-msgid "Remove this item"
-msgstr "این مورد را حذف کن"
-
-#: ../src/gnome2/treekey-editor.c:323
-msgid "Edit this item"
-msgstr "این مورد را ویرایش کن"
+msgstr "مدول انتخاب شده را حذف کن"
 
-#: ../src/main/display.cc:301
+#: ../src/main/display.cc:259
 #, c-format
 msgid ""
 "Improperly encoded personal annotation label:\n"
 "'%s'"
 msgstr ""
+"برچسب حاشیه‏نویسی شخصی به صورت درستی کدبندی نشده است:\n"
+"'%s'"
 
-#: ../src/main/display.cc:427
+#: ../src/main/display.cc:386
 msgid ""
 "An image file's size could not be determined.\n"
 "Is ImageMagick's 'identify' not installed?\n"
 "(Or possibly the image is of type other than bmp/gif/jpg/png.)\n"
 "Xiphos cannot resize images to fit window."
 msgstr ""
-
-#: ../src/main/display.cc:1084 ../src/main/display.cc:1146
-#: ../src/main/display.cc:1234 ../src/main/display.cc:1242
+"تعیین اندازۀ فایل تصویر ممکن نبود.\n"
+"آیا گزینۀ «تعیین» از برنامۀ ایمیج‏ماجیک نصب شده است؟\n"
+"(شاید نوع فایل تصویر در فرمتی بجز bmp/gif/jpg/pngاست.)\n"
+"زیفوس نمی‏تواند اندازۀ تصویر را مناسب با پنجرۀ باز تنظیم کند."
+
+#: ../src/main/display.cc:1042
+#: ../src/main/display.cc:1094
+#: ../src/main/display.cc:1171
 #: ../ui/export-dialog.glade.h:7
 msgid "Chapter"
 msgstr "فصل"
 
-#: ../src/main/main.c:110
+#: ../src/main/main.c:119
 msgid "Xiphos does not understand more than one argument."
 msgstr "زیفوس در آن واحد بیش از یک بحث را درک نمی‌کند"
 
-#: ../src/main/main.c:150
+#: ../src/main/main.c:161
 msgid "Initiating Gecko"
 msgstr "راه‌اندازی گکو"
 
-#: ../src/main/main.c:156
+#: ../src/main/main.c:167
 msgid "Building Interface"
 msgstr "بنای ارائه"
 
-#: ../src/main/main.c:160
+#: ../src/main/main.c:171
 msgid "Starting Sword"
 msgstr "شروع سورد"
 
-#: ../src/main/main.c:164
-#, fuzzy
+#: ../src/main/main.c:175
 msgid "Loading Settings"
-msgstr "بار گذاری مجموعه"
+msgstr "بار گذاری تنظیمات"
 
-#: ../src/main/main.c:168
+#: ../src/main/main.c:179
 msgid "Displaying Xiphos"
 msgstr "نمایش زیفوس"
 
-#: ../src/main/module_dialogs.cc:232 ../src/main/previewer.cc:122
+#: ../src/main/module_dialogs.cc:227
+#: ../src/main/previewer.cc:127
+#: ../src/main/previewer.cc:194
 #: ../ui/prefs.glade.h:75
 msgid "Previewer"
 msgstr "مرورگر"
 
-#: ../src/main/module_dialogs.cc:298 ../src/main/module_dialogs.cc:424
-#: ../src/main/previewer.cc:197
+#: ../src/main/module_dialogs.cc:292
+#: ../src/main/module_dialogs.cc:416
+#: ../src/main/previewer.cc:269
 msgid "Footnote"
-msgstr "زیرنویس"
+msgstr "پانویس"
 
-#: ../src/main/module_dialogs.cc:304 ../src/main/module_dialogs.cc:429
-#: ../src/main/previewer.cc:209
+#: ../src/main/module_dialogs.cc:298
+#: ../src/main/module_dialogs.cc:421
+#: ../src/main/previewer.cc:281
 msgid "Cross Reference"
 msgstr "ارجاعات"
 
-#: ../src/main/module_dialogs.cc:310 ../src/main/module_dialogs.cc:324
-#: ../src/main/module_dialogs.cc:434 ../src/main/module_dialogs.cc:446
-#: ../src/main/previewer.cc:215 ../src/main/previewer.cc:234
+#: ../src/main/module_dialogs.cc:304
+#: ../src/main/module_dialogs.cc:318
+#: ../src/main/module_dialogs.cc:426
+#: ../src/main/module_dialogs.cc:438
+#: ../src/main/previewer.cc:287
+#: ../src/main/previewer.cc:306
 msgid "Strongs"
 msgstr "شماره‌های استرانگ"
 
-#: ../src/main/module_dialogs.cc:316 ../src/main/module_dialogs.cc:335
-#: ../src/main/module_dialogs.cc:439 ../src/main/module_dialogs.cc:456
-#: ../src/main/previewer.cc:221 ../src/main/previewer.cc:247
+#: ../src/main/module_dialogs.cc:310
+#: ../src/main/module_dialogs.cc:329
+#: ../src/main/module_dialogs.cc:431
+#: ../src/main/module_dialogs.cc:448
+#: ../src/main/previewer.cc:293
+#: ../src/main/previewer.cc:319
 msgid "Morphology"
-msgstr "مورفولوژی"
+msgstr "واژه شناسی"
 
-#: ../src/main/module_dialogs.cc:1089 ../src/main/url.cc:537
+#: ../src/main/module_dialogs.cc:1081
+#: ../src/main/url.cc:530
 msgid "Back to "
-msgstr "برگشت"
+msgstr "برگشت به "
 
-#: ../src/main/parallel_view.cc:398 ../ui/xi-menus.glade.h:69
+#: ../src/main/parallel_view.cc:404
+#: ../ui/xi-menus.glade.h:89
 msgid "Strong's Numbers"
 msgstr "شماره‌های استرانگ"
 
-#: ../src/main/parallel_view.cc:408 ../ui/search-dialog.glade.h:50
-#: ../ui/xi-menus.glade.h:27
+#: ../src/main/parallel_view.cc:414
+#: ../ui/search-dialog.glade.h:52
+#: ../ui/xi-menus.glade.h:40
 msgid "Footnotes"
-msgstr "زیرنویس"
+msgstr "پانویس"
 
-#: ../src/main/parallel_view.cc:418 ../ui/search-dialog.glade.h:62
-#: ../ui/xi-menus.glade.h:41
+#: ../src/main/parallel_view.cc:424
+#: ../ui/search-dialog.glade.h:64
+#: ../ui/xi-menus.glade.h:55
 msgid "Morphological Tags"
-msgstr "علائم مورفولوژیک"
+msgstr "علائم واژه‏شناسی"
 
-#: ../src/main/parallel_view.cc:428 ../ui/xi-menus.glade.h:31
+#: ../src/main/parallel_view.cc:434
+#: ../ui/xi-menus.glade.h:44
 msgid "Hebrew Vowel Points"
 msgstr "نقاط حروف صدادار عبری"
 
-#: ../src/main/parallel_view.cc:438 ../ui/xi-menus.glade.h:30
+#: ../src/main/parallel_view.cc:444
+#: ../ui/xi-menus.glade.h:43
 msgid "Hebrew Cantillation"
 msgstr "نتهای عبری جهت قرائت"
 
-#: ../src/main/parallel_view.cc:448 ../ui/xi-menus.glade.h:28
+#: ../src/main/parallel_view.cc:454
+#: ../ui/xi-menus.glade.h:41
 msgid "Greek Accents"
-msgstr "اِعراب یونانی"
+msgstr "اِعراب‏های زبان یونانی"
 
-#: ../src/main/parallel_view.cc:458
+#: ../src/main/parallel_view.cc:464
 msgid "Cross-references"
 msgstr "ارجاعات"
 
-#: ../src/main/parallel_view.cc:468 ../ui/xi-menus.glade.h:37
+#: ../src/main/parallel_view.cc:474
+#: ../ui/xi-menus.glade.h:50
 msgid "Lemmas"
 msgstr "کلمه ریشه‌ای"
 
-#: ../src/main/parallel_view.cc:478 ../ui/xi-menus.glade.h:29
+#: ../src/main/parallel_view.cc:484
+#: ../ui/xi-menus.glade.h:42
 msgid "Headings"
 msgstr "تیترها"
 
-#: ../src/main/parallel_view.cc:488
+#: ../src/main/parallel_view.cc:494
 msgid "Morpheme Segmentation"
-msgstr ""
+msgstr "تقسیم بندی یک واژه"
 
-#: ../src/main/parallel_view.cc:498 ../ui/xi-menus.glade.h:75
+#: ../src/main/parallel_view.cc:504
+#: ../ui/xi-menus.glade.h:96
 msgid "Words of Christ in Red"
 msgstr "سخنان مسیح به رنگ قرمز"
 
-#: ../src/main/parallel_view.cc:508 ../ui/xi-menus.glade.h:70
-#, fuzzy
+#: ../src/main/parallel_view.cc:514
+#: ../ui/xi-menus.glade.h:91
 msgid "Transliteration"
-msgstr "درباره ترجمه زیفوس"
+msgstr "نویسه گردانی"
 
-#: ../src/main/parallel_view.cc:518
+#: ../src/main/parallel_view.cc:524
 msgid "Textual Variants"
-msgstr "نسخه‌ها "
+msgstr "تفاوت‏های متنی"
 
-#: ../src/main/parallel_view.cc:526 ../ui/xi-menus.glade.h:51
+#: ../src/main/parallel_view.cc:532
+#: ../ui/xi-menus.glade.h:70
 msgid "Primary Reading"
-msgstr "قرائت نخستین"
+msgstr "قرائت اولیه"
 
-#: ../src/main/parallel_view.cc:535 ../ui/xi-menus.glade.h:65
+#: ../src/main/parallel_view.cc:541
+#: ../ui/xi-menus.glade.h:84
 msgid "Secondary Reading"
 msgstr "قرائت دومین"
 
-#: ../src/main/parallel_view.cc:544 ../ui/xi-menus.glade.h:5
+#: ../src/main/parallel_view.cc:550
+#: ../ui/xi-menus.glade.h:9
 msgid "All Readings"
-msgstr "تمامی قرائتها"
+msgstr "تمامی قرائت‏ها"
 
-#: ../src/main/parallel_view.cc:878 ../src/main/parallel_view.cc:1130
+#: ../src/main/parallel_view.cc:884
+#: ../src/main/parallel_view.cc:1136
 msgid "view context"
-msgstr "نگرش به متن"
+msgstr "مشاهدۀ زمینه"
 
-#: ../src/main/prayerlists.cc:71
+#: ../src/main/prayerlists.cc:74
 msgid "January"
 msgstr "ژانویه"
 
-#: ../src/main/prayerlists.cc:72
+#: ../src/main/prayerlists.cc:75
 msgid "February"
 msgstr "فوریه"
 
-#: ../src/main/prayerlists.cc:73
+#: ../src/main/prayerlists.cc:76
 msgid "March"
 msgstr "مارس"
 
-#: ../src/main/prayerlists.cc:74
+#: ../src/main/prayerlists.cc:77
 msgid "April"
 msgstr "آوریل"
 
-#: ../src/main/prayerlists.cc:75
+#: ../src/main/prayerlists.cc:78
 msgid "May"
 msgstr "می"
 
-#: ../src/main/prayerlists.cc:76
+#: ../src/main/prayerlists.cc:79
 msgid "June"
-msgstr "جون"
+msgstr "ژوئن"
 
-#: ../src/main/prayerlists.cc:77
+#: ../src/main/prayerlists.cc:80
 msgid "July"
-msgstr "جولای"
+msgstr "ژوئیه"
 
-#: ../src/main/prayerlists.cc:78
+#: ../src/main/prayerlists.cc:81
 msgid "August"
-msgstr "آگوست"
+msgstr "اوت"
 
-#: ../src/main/prayerlists.cc:79
+#: ../src/main/prayerlists.cc:82
 msgid "September"
 msgstr "سپتامبر"
 
-#: ../src/main/prayerlists.cc:80
+#: ../src/main/prayerlists.cc:83
 msgid "October"
 msgstr "اکتبر"
 
-#: ../src/main/prayerlists.cc:81
+#: ../src/main/prayerlists.cc:84
 msgid "November"
 msgstr "نوامبر"
 
-#: ../src/main/prayerlists.cc:82
+#: ../src/main/prayerlists.cc:85
 msgid "December"
 msgstr "دسامبر"
 
-#: ../src/main/prayerlists.cc:121 ../src/main/sword_treekey.cc:332
+#: ../src/main/prayerlists.cc:124
+#: ../src/main/sword_treekey.cc:332
 msgid "Growth"
 msgstr "رشد"
 
-#: ../src/main/prayerlists.cc:122 ../src/main/sword_treekey.cc:333
+#: ../src/main/prayerlists.cc:125
+#: ../src/main/sword_treekey.cc:333
 msgid "<b>For Growth</b><br>"
 msgstr "برای رشد"
 
-#: ../src/main/prayerlists.cc:123 ../src/main/prayerlists.cc:380
+#: ../src/main/prayerlists.cc:126
+#: ../src/main/prayerlists.cc:383
 #: ../src/main/sword_treekey.cc:334
 msgid "Salvation"
 msgstr "نجات"
 
-#: ../src/main/prayerlists.cc:124 ../src/main/sword_treekey.cc:335
+#: ../src/main/prayerlists.cc:127
+#: ../src/main/sword_treekey.cc:335
 msgid "<b>For Salvation</b><br>"
 msgstr "برای نجات"
 
-#: ../src/main/prayerlists.cc:125 ../src/main/prayerlists.cc:384
+#: ../src/main/prayerlists.cc:128
+#: ../src/main/prayerlists.cc:387
 #: ../src/main/sword_treekey.cc:336
 msgid "Health"
 msgstr "سلامتی"
 
-#: ../src/main/prayerlists.cc:126 ../src/main/sword_treekey.cc:337
+#: ../src/main/prayerlists.cc:129
+#: ../src/main/sword_treekey.cc:337
 msgid "<b>For Health</b><br>"
 msgstr "برای سلامتی"
 
-#: ../src/main/prayerlists.cc:127
+#: ../src/main/prayerlists.cc:130
 msgid "Misc"
-msgstr "مختلف"
+msgstr "متفرقه"
 
-#: ../src/main/prayerlists.cc:128 ../src/main/sword_treekey.cc:339
+#: ../src/main/prayerlists.cc:131
+#: ../src/main/sword_treekey.cc:339
 msgid "<b>Miscellaneous</b><br>"
-msgstr "مختلف"
+msgstr "<b>متفرقه</b><br>"
 
-#: ../src/main/prayerlists.cc:136
+#: ../src/main/prayerlists.cc:139
 msgid "Point x"
-msgstr "نقطه ایکس"
+msgstr "نقطۀ  x"
 
-#: ../src/main/prayerlists.cc:137
+#: ../src/main/prayerlists.cc:140
 msgid "<b>(x)</b><br>"
-msgstr "<b>)ا(</b><br>"
+msgstr "<b>(x)</b><br>"
 
-#: ../src/main/prayerlists.cc:138
+#: ../src/main/prayerlists.cc:141
 msgid "Point y"
-msgstr "نقطه وای"
+msgstr "نقطۀ y"
 
-#: ../src/main/prayerlists.cc:139
+#: ../src/main/prayerlists.cc:142
 msgid "<b>(y)</b><br>"
-msgstr "<b>)ب(</b><br>"
+msgstr "<b>(y)</b><br>"
 
-#: ../src/main/prayerlists.cc:140
+#: ../src/main/prayerlists.cc:143
 msgid "Point z"
-msgstr "نقطه زد"
+msgstr "نقطۀ  z"
 
-#: ../src/main/prayerlists.cc:141
+#: ../src/main/prayerlists.cc:144
 msgid "<b>(z)</b><br>"
-msgstr "<b>)پ(</b><br>"
+msgstr "<b>(z)</b><br>"
 
-#: ../src/main/prayerlists.cc:149
+#: ../src/main/prayerlists.cc:152
 msgid "Minor Topic 1"
-msgstr "زیر عنوان 1"
+msgstr "مدول فرعی ۱"
 
-#: ../src/main/prayerlists.cc:150
+#: ../src/main/prayerlists.cc:153
 msgid "<b>Subtopic 1</b><br>"
-msgstr "زیر عنوان 1"
+msgstr "زیر مدول ۱"
 
-#: ../src/main/prayerlists.cc:152
+#: ../src/main/prayerlists.cc:155
 msgid "Minor Topic 2"
-msgstr "عنوان فرعی 2"
+msgstr "مدول فرعی ۲"
 
-#: ../src/main/prayerlists.cc:153
+#: ../src/main/prayerlists.cc:156
 msgid "<b>Subtopic 2</b><br>"
-msgstr "زیر عنوان"
+msgstr "<b>زیر مدول ۲</b><br>"
 
-#: ../src/main/prayerlists.cc:155
+#: ../src/main/prayerlists.cc:158
 msgid "Minor Topic 3"
-msgstr "عنوان فرعی ۳"
+msgstr "مدول فرعی ۳"
 
-#: ../src/main/prayerlists.cc:156
+#: ../src/main/prayerlists.cc:159
 msgid "<b>Subtopic 3</b><br>"
-msgstr "زیر عنوان ۳"
+msgstr "<b>زیر مدول ۳</b><br>"
 
-#: ../src/main/prayerlists.cc:158
+#: ../src/main/prayerlists.cc:161
 msgid "Minor Topic 4"
-msgstr "عنوان فرعی ۴"
+msgstr "مدول فرعی ۴"
 
-#: ../src/main/prayerlists.cc:159
+#: ../src/main/prayerlists.cc:162
 msgid "<b>Subtopic 4</b><br>"
-msgstr "زیر عنوان ۴"
+msgstr "<b>زیر مدول ۴</b><br>"
 
-#: ../src/main/prayerlists.cc:239
+#: ../src/main/prayerlists.cc:242
 msgid "Name for new prayer list or journal"
 msgstr "نام به جهت لیست دعای جدید"
 
-#: ../src/main/prayerlists.cc:270
+#: ../src/main/prayerlists.cc:273
 msgid "Xiphos finds that prayer list already."
-msgstr "در حال حاضر زیفوس به دنبال آن لیست دعا می‌گردد"
+msgstr "در حال حاضر زیفوس به دنبال آن لیست دعا می‌گردد."
 
-#: ../src/main/prayerlists.cc:283
+#: ../src/main/prayerlists.cc:286
 #, c-format
 msgid ""
 "Xiphos cannot create module's path:\n"
 "%s"
-msgstr " %sزیفوس طریق مدول را نمی‌تواند به وجود آورد"
+msgstr ""
+"زیفوس طریق مدول را نمی‌تواند به وجود آورد\n"
+"%s"
 
-#: ../src/main/prayerlists.cc:323
+#: ../src/main/prayerlists.cc:326
 msgid "A basic prayer list. \\par\\par Module created by Xiphos."
-msgstr "یک لیست دعای ساده"
+msgstr "یک لیست دعای ساده. \\par\\parاین مدول توسط زیفوس ایجاد شده است."
 
-#: ../src/main/prayerlists.cc:324
+#: ../src/main/prayerlists.cc:327
 msgid "BasicPrayerList"
-msgstr "لیست دعا"
+msgstr "ابتدایی"
 
-#: ../src/main/prayerlists.cc:338
+#: ../src/main/prayerlists.cc:341
 msgid "MyPrayerList"
-msgstr "لیست دعا"
+msgstr "دعای من"
 
-#: ../src/main/prayerlists.cc:339
-msgid ""
-"<b>People:</b><br>Bob<br>Sam<br>Sue<br><br><b>Church:</"
-"b><br>pews<br>fellowship<br>Bibles for missionaries<br><br><br>"
-msgstr "مشارکت، کتابمقدس به جهت مبشرین"
+#: ../src/main/prayerlists.cc:342
+msgid "<b>People:</b><br>Bob<br>Sam<br>Sue<br><br><b>Church:</b><br>pews<br>fellowship<br>Bibles for missionaries<br><br><br>"
+msgstr "<b>افراد:</b><br>حمید:<br>شهرام:<br>سپیده:<br><br><b>کلیسا:</b><br>نیمکت‏ها<br>مشارکت<br>کتاب‏مقدس برای مبشرین<br><br><br>"
 
-#: ../src/main/prayerlists.cc:365
+#: ../src/main/prayerlists.cc:368
 msgid "A subject-based prayer list. \\par\\par Module created by Xiphos."
-msgstr "لیست دعای موضوعی"
+msgstr "لیست دعای موضوعی \\par\\par این مدول توسط زیفوس ایجاد شده است."
 
-#: ../src/main/prayerlists.cc:366
+#: ../src/main/prayerlists.cc:369
 msgid "SubjectPrayerList"
-msgstr "لیست دعا "
+msgstr "موضوعی"
 
-#: ../src/main/prayerlists.cc:381
+#: ../src/main/prayerlists.cc:384
 msgid "Bob<br>Sam<br>Sue<br>John<br>"
-msgstr "علی <br> محمود <br> شیرین <br> نازی"
+msgstr "حمید<br>شهرام<br>سپیده<br>پروانه<br>"
 
-#: ../src/main/prayerlists.cc:382
+#: ../src/main/prayerlists.cc:385
 msgid "Spiritual Growth"
 msgstr "رشد روحانی"
 
-#: ../src/main/prayerlists.cc:383
+#: ../src/main/prayerlists.cc:386
 msgid "Mike<br>Steve<br>"
-msgstr "شهره، <br> شبنم.<br>"
+msgstr "پویا<br>پگاه<br>"
 
-#: ../src/main/prayerlists.cc:385
+#: ../src/main/prayerlists.cc:388
 msgid "Sue<br>John<br>"
-msgstr "نوشین <br> زهره <br>"
+msgstr "نوشین<br>زهره<br>"
 
-#: ../src/main/prayerlists.cc:411
+#: ../src/main/prayerlists.cc:414
 msgid "A monthly prayer list. \\par\\par Module created by Xiphos."
-msgstr "لیست دعای ماهانه"
+msgstr "لیست دعای ماهانه. \\par\\par این مدول توسط زیفوس ایجاد شده است."
 
-#: ../src/main/prayerlists.cc:412
+#: ../src/main/prayerlists.cc:415
 msgid "MonthlyPrayerList"
-msgstr "لیست دعا (ماه)"
+msgstr "ماهانه"
 
-#: ../src/main/prayerlists.cc:463
+#: ../src/main/prayerlists.cc:466
 msgid "A daily journal. \\par\\par Module created by Xiphos."
-msgstr "ژورنال روزانه"
+msgstr "ژورنال روزانه \\par\\parاین مدول توسط زیفوس ایجاد شده است."
 
-#: ../src/main/prayerlists.cc:464
+#: ../src/main/prayerlists.cc:467
 msgid "DailyJournal"
-msgstr "دعا و تفکر روزانه"
+msgstr "روزانه"
 
-#: ../src/main/prayerlists.cc:528
+#: ../src/main/prayerlists.cc:531
 msgid "An outlined topic (e.g. sermon). \\par\\par Module created by Xiphos."
-msgstr "اصلی/ لیستهای دعا"
+msgstr "رئوس مطالب (مثلاً موعظه) \\par\\par این مدول توسط زیفوس ایجاد شده است."
 
-#: ../src/main/prayerlists.cc:529
+#: ../src/main/prayerlists.cc:532
 msgid "OutlinedTopic"
-msgstr "موضوع مشخص شده"
+msgstr "رئوس"
 
-#: ../src/main/prayerlists.cc:543
+#: ../src/main/prayerlists.cc:546
 msgid "Major Topic A"
-msgstr "عنوان اصلی الف"
+msgstr "مدول اصلی الف"
 
-#: ../src/main/prayerlists.cc:544
+#: ../src/main/prayerlists.cc:547
 msgid "<b>Major Topic A</b><br>"
-msgstr "عنوان اصلی الف"
+msgstr "<b>مدول اصلی الف</b><br>"
 
-#: ../src/main/prayerlists.cc:546
+#: ../src/main/prayerlists.cc:549
 msgid "Major Topic B"
-msgstr "عنوان اصلی ب"
+msgstr "مدول اصلی ب"
 
-#: ../src/main/prayerlists.cc:547
+#: ../src/main/prayerlists.cc:550
 msgid "<b>Major Topic B</b><br>"
-msgstr "عنوان اصلی ب"
+msgstr "<b>مدول اصلی ب</b><br>"
 
-#: ../src/main/prayerlists.cc:549
+#: ../src/main/prayerlists.cc:552
 msgid "Major Topic C"
-msgstr "عنوان اصلی ج"
+msgstr "مدول اصلی ج"
 
-#: ../src/main/prayerlists.cc:550
+#: ../src/main/prayerlists.cc:553
 msgid "<b>Major Topic C</b><br>"
-msgstr "عنوان اصلی ج"
+msgstr "<b>مدول اصلی ج</b><br>"
 
-#: ../src/main/previewer.cc:203
+#: ../src/main/previewer.cc:275
 msgid "User Annotation"
-msgstr ""
+msgstr "یادداشت کاربر"
 
-#: ../src/main/search_dialog.cc:129
+#: ../src/main/search_dialog.cc:212
 #, c-format
 msgid "Search result %s: %s"
-msgstr "نتایج جستجو را به عنوان علائم ضبط کن$s : $s"
+msgstr "نتیجۀ جستجو %s: %s"
 
-#: ../src/main/search_dialog.cc:361
+#: ../src/main/search_dialog.cc:444
 msgid "Delete Range?"
-msgstr "حدود حذف"
+msgstr "این قسمت حذف شود؟"
 
-#: ../src/main/search_dialog.cc:362
+#: ../src/main/search_dialog.cc:445
 msgid "Are you sure you want to delete this range?"
 msgstr "آیا به یقین می‌خواهید این قسمت را حذف کنید؟"
 
-#: ../src/main/search_dialog.cc:576 ../src/main/search_dialog.cc:1047
-#: ../src/main/search_dialog.cc:1050 ../src/main/search_dialog.cc:1072
-#: ../src/main/search_dialog.cc:1075
+#: ../src/main/search_dialog.cc:659
+#: ../src/main/search_dialog.cc:1130
+#: ../src/main/search_dialog.cc:1133
+#: ../src/main/search_dialog.cc:1155
+#: ../src/main/search_dialog.cc:1158
 msgid "Search: "
-msgstr "جستجو:"
+msgstr "جستجو: "
 
-#: ../src/main/search_dialog.cc:621
+#: ../src/main/search_dialog.cc:704
 msgid "Remove Module?"
 msgstr "مدول حذف شود؟"
 
-#: ../src/main/search_dialog.cc:622
+#: ../src/main/search_dialog.cc:705
 msgid "Are you sure you want to remove the selected module?"
 msgstr "آیا به یقین می‌خواهید مدول انتخاب شده را حذف کنید؟"
 
-#: ../src/main/search_dialog.cc:1471
+#: ../src/main/search_dialog.cc:1560
 #, c-format
 msgid ""
 "%s:\n"
@@ -1642,47 +1834,49 @@ msgid ""
 "%s"
 msgstr ""
 "%s:\n"
-"چنین مدولی نصب شده است \n"
+"چنین مدولی نصب شده است.\n"
 "%s"
 
-#: ../src/main/search_dialog.cc:1473
+#: ../src/main/search_dialog.cc:1562
 msgid "Please adjust the module list."
-msgstr "لطفا لیست مدولها را هماهنگ کن"
+msgstr "لطفا لیست مدولها را هماهنگ کنید."
 
-#: ../src/main/search_dialog.cc:1489
-#, fuzzy, c-format
+#: ../src/main/search_dialog.cc:1578
+#, c-format
 msgid "No fast-search index exists for %s.%s%s"
-msgstr "برای این مدولها ایندکس جستجوی سریع را حذف کن"
+msgstr "برای این موارد  راهنمای جستجوی سریع وجود ندارد. %s.%s%s"
 
-#: ../src/main/search_dialog.cc:1491
+#: ../src/main/search_dialog.cc:1580
 msgid ""
 "\n"
 "Search on this module is now `multi word'."
 msgstr ""
+"\n"
+"جستجو در این مدول اکنون بصورت «چندکلمه‏ای» می‏باشد."
 
-#: ../src/main/search_dialog.cc:1492
+#: ../src/main/search_dialog.cc:1581
 msgid ""
 "\n"
 "See the Module Manager, Maintenance pane."
 msgstr ""
+"\n"
+"به چارچوب تعمیران، در بخش مدیر مدول مراجعه کنید."
 
-#: ../src/main/search_dialog.cc:1553
+#: ../src/main/search_dialog.cc:1644
 msgid "Search finished"
 msgstr "جستجو تمام شد"
 
-#: ../src/main/search_sidebar.cc:93
+#: ../src/main/search_sidebar.cc:100
 msgid "matches"
 msgstr "مطابقت دارد"
 
-#: ../src/main/settings.c:56
+#: ../src/main/settings.c:60
 msgid ""
 "Welcome to Xiphos.\n"
 "\n"
-"There are no Bible modules installed. In order to initialize, Xiphos needs "
-"you to install at least one Bible.\n"
+"There are no Bible modules installed. In order to initialize, Xiphos needs you to install at least one Bible.\n"
 "\n"
-"With your permission, Xiphos will invoke the Module Manager so that you may "
-"install from Crosswire:\n"
+"With your permission, Xiphos will invoke the Module Manager so that you may install from Crosswire:\n"
 "1. Configure remote install.\n"
 "2. Connect.\n"
 "3. Select a Bible text of your language preference.\n"
@@ -1693,65 +1887,50 @@ msgid ""
 "\n"
 "May Xiphos invoke the Module Manager so that you may install a Bible?"
 msgstr ""
-"به خيفوس خوش آمديد \n"
+"به زيفوس خوش آمديد \n"
 "\n"
-"هيچ مدولي از کتابمقدس نصب نشده است. براي راه اندازي خيفوس لازم است حداقل يک "
-"مدول از کتابمقدس نصب شده باشد\n"
+"هنوز هيچ مدولي از کتابمقدس نصب نشده است. براي راه اندازي زيفوس ضروری است دست کم يک مدول کتابمقدس نصب شده باشد.\n"
 "\n"
-"به اجازه شما خيفوس مدول مدير نرم افزار را فعال خواهد ساخت تا شما بتوانيد از "
-"کراس‌واير نصب کنيد\n"
+"با اجازۀ شما زيفوس، مدول مدير نرم افزار را فعال خواهد ساخت تا شما بتوانيد آنها را از وب‏سایت کراس‌واير نصب کنيد:\n"
 "\n"
-"پيکربندي، دوردست، نصب\n"
+"1. پيکربندي نصب از راه دور\n"
 "\n"
-"اتصال\n"
+"2. اتصال\n"
 "\n"
-"انتخاب متن کتابمقدس به زباني که ترجيح مي‌دهيد\n"
+"3. متن کتابمقدس را به هر زباني که ترجيح مي‌دهيد، برگزینید.\n"
 "\n"
-"دگمه نصب را کليک کنيد\n"
+"4. سپس کلید «نصب» را کلیک کنید.\n"
 "\n"
-"بعد از اتمام مدير مدول را ببنديد\n"
+"بعد از اتمام مدول مدير نرم‏افزار را ببنديد.\n"
 "\n"
-"هشدار: اگر در کشور تحت جفا زندگي مي‌کنيد، در بکار گيري اين نرم افزار احتياط "
-"کنيد\n"
+"هشدار: اگر در کشوری که تحت جفا است، زندگي مي‌کنيد، در بکار گيري اين نرم افزار احتياط کنيد.\n"
 "\n"
-"آيا اجازه مي‌دهيد که خيفوس مدير مدول را جهت نصب کتابمقدس فعال کند؟"
+"آيا اجازه مي‌دهيد که زيفوس مدول مدیر برنامه را جهت نصب کتاب‏مقدس فعال کند؟"
 
-#: ../src/main/settings.c:109
+#: ../src/main/settings.c:105
 msgid "$HOME is not set!"
-msgstr "خانه هنوز تعیین نشده است"
-
-#: ../src/main/settings.c:124
-msgid "Xiphos has renamed .xiphos-2.0 to .xiphos"
-msgstr "زیفوس اسم را تغییر داده است"
+msgstr "$منطقۀ شما هنوز تعیین نشده است!"
 
-#: ../src/main/settings.c:127
+#: ../src/main/settings.c:120
 #, c-format
 msgid ""
-"Xiphos can not rename  .xiphos-2.0 to .xiphos:\n"
+"Xiphos can not create  .xiphos:\n"
 "%s\n"
 "\n"
 "Xiphos cannot continue."
 msgstr ""
-"%\n"
-"\n"
-"زیفوس قادر به ادامه نیست"
-
-#: ../src/main/settings.c:135
-#, c-format
-msgid ""
-"Xiphos can not create  .xiphos:\n"
+"برنامۀ زیفوس قادر به ایجاد زیفوس نیست:\n"
 "%s\n"
 "\n"
-"Xiphos cannot continue."
-msgstr "زیفوس قادر به ادامه نیست"
+"زیفوس قادر به ادامه نیست."
 
-#: ../src/main/settings.c:148 ../src/main/settings.c:156
-#: ../src/main/settings.c:164
-#, fuzzy
+#: ../src/main/settings.c:133
+#: ../src/main/settings.c:142
+#: ../src/main/settings.c:151
 msgid "can not create "
-msgstr "طریق قابل ایجاد نیست \n"
+msgstr "طریق قابل ایجاد نیست. "
 
-#: ../src/main/settings.c:196
+#: ../src/main/settings.c:194
 msgid ""
 "There are still no Bibles installed.\n"
 "Evidently, you declined to install any.\n"
@@ -1760,140 +1939,106 @@ msgid ""
 "Xiphos cannot proceed,\n"
 "and will now exit."
 msgstr ""
-"هیچ کتابمقدسی در حال حاضر نصب نشده است. در مقابل پیشنهاد نصب جواب منفی "
-"داده‌اید. بدون نمایش مدول کتابمقدس زیفوس قادر به ادامه نیست و برنامه خود را "
-"خواهد بست \n"
-"."
+"هیچ کتابمقدسی در حال حاضر نصب نشده است.\n"
+"به نظر می‏رسد که شما در مقابل پیشنهاد نصب، پاسخ منفی داده‏اید.\n"
+"\n"
+"بدون نمایش مدول کتابمقدس،\n"
+"زیفوس قادر به ادامه نیست\n"
+"و برنامه را خواهد بست."
 
-#: ../src/main/settings.c:200
+#: ../src/main/settings.c:198
 msgid "Bible module installation complete."
-msgstr "نصب مدول کتابمقدس به اتمام رسید"
+msgstr "نصب مدول کتابمقدس پایان یافت."
 
-#: ../src/main/settings.c:203
+#: ../src/main/settings.c:201
 msgid ""
 "Without any Bible modules to display,\n"
 "Xiphos cannot proceed,\n"
 "and will now exit."
 msgstr ""
-" بدون نمایش مدول کتابمقدس زیفوس قادر به ادامه نیست و برنامه خود را خواهد بست."
+"بدون نمایش مدول کتاب‏مقدس،\n"
+"زیفوس قادر به ادامه نیست.\n"
+" و برنامه خود را خواهد بست."
 
-#. *****************************************************************************
-#. * Name
-#. *    gconf_setup
-#. *
-#. * Synopsis
-#. *   #include "main/settings.h"
-#. *
-#. *   void gconf_setup()
-#. *
-#. * Description
-#. *   verifies and initializes the GConf subsystem, so that "sword://" and
-#. *   similar can be handled by url-comprehending programs such as browsers.
-#. *   dialogs for permission/success/failure => conditional on debug build.
-#. *
-#. * Return value
-#. *   void
-#.
-#: ../src/main/settings.c:794
-msgid ""
-"URL references using \"sword://\" (similar to web page\n"
-"references) can be used by programs to look up\n"
-"scripture references. Your system currently has no\n"
-"program set to handle these references.\n"
-"\n"
-"Would you like Xiphos to set itself as the\n"
-"program to handle these references?"
-msgstr ""
-"آيا اجازه مي‌دهيد که خيفوس خود را به عنوان برنامه‌اي که با اين ارجاعات بايد "
-"کار کند، قلمداد نمايد؟"
-
-#: ../src/main/settings.c:796
-msgid ""
-"Xiphos has successfully set itself\n"
-"as the handler of sword:// and bible:// URLs.\n"
-"\n"
-"You may wish to run the program \"gconf-editor\"\n"
-"to examine keys under /desktop/gnome/url-handlers,\n"
-"if you need to change these."
-msgstr "خيفوس خود را با موفقيت براي اين کار ترتيب داد"
-
-#: ../src/main/settings.c:849
-#, c-format
-msgid ""
-"Xiphos failed to complete handler init for key #%d:\n"
-"%s"
-msgstr "زیفوس قادر به انجام نیست"
-
-#: ../src/main/sidebar.cc:376
+#: ../src/main/sidebar.cc:399
 msgid "verse"
 msgstr "آیه"
 
-#: ../src/main/sidebar.cc:438
+#: ../src/main/sidebar.cc:461
 msgid "chapter"
 msgstr "فصل"
 
-#: ../src/main/sword.cc:546
+#: ../src/main/sword.cc:537
 msgid ""
 "Xiphos's file for language\n"
 "abbreviations is missing."
-msgstr "برخی از اطلاعات پرونده پیدا نشد"
+msgstr ""
+"فایل زیفوس برای زبان\n"
+"پیدا نشد."
 
-#: ../src/main/sword.cc:553
+#: ../src/main/sword.cc:544
 msgid ""
 "Xiphos's language abbreviation\n"
 "file cannot be opened."
-msgstr "پرونده قابل گشایش نیست"
+msgstr ""
+"زیفوس نتوانست فایل مخفف سازی زبان \n"
+"را باز کند."
 
-#: ../src/main/sword.cc:566
+#: ../src/main/sword.cc:557
 msgid ""
 "Xiphos cannot allocate space\n"
 "for language abbreviations."
-msgstr "به جهت اطلاعات مربوط به زبان"
+msgstr ""
+"زیفوس قادر نیست که فضای\n"
+"را برای مخفف سازی زبان در اختیار بگیرد."
 
-#: ../src/main/sword.cc:573
+#: ../src/main/sword.cc:564
 msgid ""
 "Xiphos cannot read the\n"
 "language abbreviation file."
-msgstr "زیفوس قادر به شناخت اطلاعات پرونده نیست"
+msgstr ""
+"زیفوس قادر به خواندن\n"
+"پروندۀ مخفف‏سازی زبان نیست."
 
-#: ../src/main/sword.cc:1191
-msgid "Daily devotional was requested, but there are none installed."
-msgstr "دعا و تفکر روزانه خواسته شد، لیکن چیزی برای نصب نیست"
+#: ../src/main/sword.cc:642
+msgid "No matching locale found for"
+msgstr "این زبان وجود نیست در این کمپوتر"
 
-#: ../src/main/tab_history.c:92
-msgid "H_istory/<Separator>"
-msgstr "سابقه/<Separator>"
+#: ../src/main/sword.cc:644
+msgid "Book names and menus may not be translated"
+msgstr ""
 
-#: ../src/main/tab_history.c:94
-msgid "H_istory/C_lear"
-msgstr "سابقه/پاک شود"
+#: ../src/main/sword.cc:1232
+msgid "Daily devotional was requested, but there are none installed."
+msgstr "دعا و تفکر روزانه درخواست شد، لیکن چیزی برای نصب وجود ندارد."
 
 #: ../src/main/tab_history.c:219
 msgid "Clear History"
 msgstr "سابقه پاک شود"
 
-#: ../src/main/url.cc:99
+#: ../src/main/url.cc:101
 msgid "URL not found:"
-msgstr "پیدا نشد"
+msgstr "یو آر ال پیدا نشد:"
 
-#: ../src/main/url.cc:194
+#: ../src/main/url.cc:191
 #, c-format
 msgid "Xiphos could not execute %s"
-msgstr "زیفوس نتوانست آرشیوگر را راه اندازی کند"
+msgstr "زیفوس قادر به اجرا نبود %s"
 
-#: ../src/main/url.cc:202
+#: ../src/main/url.cc:199
 msgid "Viewer error:\n"
-msgstr "اشتباه مرورگر:\n"
+msgstr "مرورگر اشتباه\n"
 
-#: ../src/main/url.cc:278
+#: ../src/main/url.cc:272
 #, c-format
 msgid "Show %s in main window"
-msgstr "%s درپنجره اصلی را نشان بده"
+msgstr "در پنجرۀ اصلی %s را نمایش بده"
 
-#: ../src/main/xml.c:80 ../src/main/xml.c:464
+#: ../src/main/xml.c:80
+#: ../src/main/xml.c:464
 #, c-format
 msgid "Document not created successfully. \n"
-msgstr "متن به وجود نیامد\n"
+msgstr "متن با موفقیت ایجاد نشد. \n"
 
 #: ../src/main/xml.c:89
 msgid "Personal"
@@ -1901,17 +2046,20 @@ msgstr "شخصی"
 
 #: ../src/main/xml.c:90
 msgid "What must I do to be saved?"
-msgstr "چکنم تا نجات یابم؟"
+msgstr "چه کنم تا نجات یابم؟"
 
-#: ../src/main/xml.c:92 ../src/main/xml.c:93
+#: ../src/main/xml.c:92
+#: ../src/main/xml.c:93
 msgid "Acts 16:31"
 msgstr "اعمال 16: 31"
 
-#: ../src/main/xml.c:97 ../src/main/xml.c:98
+#: ../src/main/xml.c:97
+#: ../src/main/xml.c:98
 msgid "Eph 2:8,9"
-msgstr "افس 2: 8"
+msgstr "افسسیان 2: 8"
 
-#: ../src/main/xml.c:102 ../src/main/xml.c:103
+#: ../src/main/xml.c:102
+#: ../src/main/xml.c:103
 msgid "Romans 1:16"
 msgstr "رومیان 1: 16"
 
@@ -1919,17 +2067,21 @@ msgstr "رومیان 1: 16"
 msgid "What is the Gospel?"
 msgstr "انجیل چیست؟"
 
-#: ../src/main/xml.c:108 ../src/main/xml.c:109
+#: ../src/main/xml.c:108
+#: ../src/main/xml.c:109
 msgid "1 Cor 15:1-4"
-msgstr "1قرن 15: 1-4"
+msgstr "اول قرنتیان 15: 1-4"
 
-#: ../src/main/xml.c:413 ../src/main/xml.c:1071
+#: ../src/main/xml.c:413
+#: ../src/main/xml.c:1144
 #, c-format
 msgid "Document not parsed successfully. \n"
-msgstr "متن شناخته نشد\n"
+msgstr "Document not parsed successfully. \n"
 
-#: ../src/main/xml.c:419 ../src/main/xml.c:674 ../src/main/xml.c:952
-#: ../src/main/xml.c:1131
+#: ../src/main/xml.c:419
+#: ../src/main/xml.c:747
+#: ../src/main/xml.c:1025
+#: ../src/main/xml.c:1204
 #, c-format
 msgid "empty document \n"
 msgstr "متن خالی \n"
@@ -1937,7 +2089,7 @@ msgstr "متن خالی \n"
 #: ../src/main/xml.c:425
 #, c-format
 msgid "wrong type, root node != SwordBookmarks\n"
-msgstr "نوع پرونده غلط است \n"
+msgstr "نوع پرونده غلط است, ایراد ساختاری != SwordBookmarks\n"
 
 #: ../src/main/xml.c:476
 msgid "Old Testament"
@@ -1959,7 +2111,8 @@ msgstr "متی-مکا"
 msgid "Sample Module List"
 msgstr "لیست مدولهای نمونه"
 
-#: ../src/main/xml.c:680 ../src/main/xml.c:958
+#: ../src/main/xml.c:753
+#: ../src/main/xml.c:1031
 #, c-format
 msgid "wrong type, root node != %s\n"
 msgstr "نوع پرونده غلط است !=%s\n"
@@ -1968,21 +2121,24 @@ msgstr "نوع پرونده غلط است !=%s\n"
 msgid "Add Bookmark"
 msgstr "علامت بگذار"
 
-#: ../ui/bookmarks.glade.h:2 ../ui/markverse.glade.h:1
+#: ../ui/bookmarks.glade.h:2
+#: ../ui/markverse.glade.h:1
 msgid "Bookmark Dialog"
-msgstr "علامت"
+msgstr "علامت گذاری دیالوگ"
 
 #: ../ui/bookmarks.glade.h:3
 msgid "Bookmark Folder Treeview"
-msgstr "قفسه پرونده علامت را به حالت اول بازگردان"
+msgstr "پرونده را به حالت اول بازگردان"
 
-#: ../ui/bookmarks.glade.h:4 ../ui/markverse.glade.h:2
+#: ../ui/bookmarks.glade.h:4
+#: ../ui/markverse.glade.h:2
 msgid "Cancel Bookmark"
-msgstr "علامت وارد کن"
+msgstr "علامت را ابطال کن"
 
-#: ../ui/bookmarks.glade.h:5 ../ui/markverse.glade.h:3
+#: ../ui/bookmarks.glade.h:5
+#: ../ui/markverse.glade.h:3
 msgid "Create new folder"
-msgstr "قفسه پرونده جدید"
+msgstr "ایچاد پروندۀ جدید"
 
 #: ../ui/bookmarks.glade.h:6
 msgid "Label Entry"
@@ -1990,30 +2146,35 @@ msgstr "نامگذاری کن"
 
 #: ../ui/bookmarks.glade.h:7
 msgid "Label:"
-msgstr "اتیکت"
+msgstr "برچسب:"
 
-#: ../ui/bookmarks.glade.h:8 ../ui/markverse.glade.h:6
+#: ../ui/bookmarks.glade.h:8
+#: ../ui/markverse.glade.h:6
 msgid "Module Entry"
-msgstr "ورود مدول"
+msgstr "ثبت مدول"
 
-#: ../ui/bookmarks.glade.h:9 ../ui/markverse.glade.h:7
+#: ../ui/bookmarks.glade.h:9
+#: ../ui/markverse.glade.h:7
 msgid "Module:"
 msgstr "مدول:"
 
 #: ../ui/bookmarks.glade.h:10
 msgid "New ..."
-msgstr "جدید:"
+msgstr "جدید ..."
 
-#: ../ui/bookmarks.glade.h:11 ../ui/markverse.glade.h:8
-#: ../ui/xi-menus.glade.h:42
+#: ../ui/bookmarks.glade.h:11
+#: ../ui/markverse.glade.h:8
+#: ../ui/xi-menus.glade.h:56
 msgid "New Folder"
-msgstr "قفسه پرونده جدید"
+msgstr "پروندۀ جدید"
 
-#: ../ui/bookmarks.glade.h:12 ../ui/markverse.glade.h:10
+#: ../ui/bookmarks.glade.h:12
+#: ../ui/markverse.glade.h:10
 msgid "Verse Entry"
-msgstr "شیوه آیه"
+msgstr "ثبت آیه"
 
-#: ../ui/bookmarks.glade.h:13 ../ui/markverse.glade.h:11
+#: ../ui/bookmarks.glade.h:13
+#: ../ui/markverse.glade.h:11
 msgid "Verse:"
 msgstr "آیه:"
 
@@ -2021,39 +2182,45 @@ msgstr "آیه:"
 msgid "Delete the current note"
 msgstr "یادداشت فعلی را حذف کن"
 
-#: ../ui/editor_note.xml.h:2 ../ui/editor_studypad.xml.h:4
+#: ../ui/editor_note.xml.h:2
+#: ../ui/editor_studypad.xml.h:4
 #: ../ui/editor.xml.h:2
 msgid "E_xit"
 msgstr "خروج"
 
-#: ../ui/editor_note.xml.h:3 ../ui/editor_studypad.xml.h:5
+#: ../ui/editor_note.xml.h:3
+#: ../ui/editor_studypad.xml.h:5
 #: ../ui/editor.xml.h:3
 msgid "Exit"
 msgstr "خروج"
 
-#: ../ui/editor_note.xml.h:4 ../ui/editor_studypad.xml.h:6
+#: ../ui/editor_note.xml.h:4
+#: ../ui/editor_studypad.xml.h:6
 #: ../ui/editor.xml.h:4
 msgid "Exit the program"
 msgstr "خروج از برنامه"
 
-#: ../ui/editor_note.xml.h:5 ../ui/editor_studypad.xml.h:7
+#: ../ui/editor_note.xml.h:5
+#: ../ui/editor_studypad.xml.h:7
 #: ../ui/editor.xml.h:5
 msgid "For_mat"
 msgstr "فرمت"
 
-#: ../ui/editor_note.xml.h:6 ../ui/editor_studypad.xml.h:8
+#: ../ui/editor_note.xml.h:6
+#: ../ui/editor_studypad.xml.h:8
 #: ../ui/editor.xml.h:6
 msgid "HTML Format switch"
 msgstr "کلید فرمت اچ.تی.ام.ال"
 
-#: ../ui/editor_note.xml.h:7 ../ui/editor_studypad.xml.h:9
+#: ../ui/editor_note.xml.h:7
+#: ../ui/editor_studypad.xml.h:9
 #: ../ui/editor.xml.h:7
 msgid "HTML mode"
 msgstr "حالت اچ.تی.ام.ال"
 
 #: ../ui/editor_note.xml.h:8
 msgid "Preview the note to be printed"
-msgstr "پیشنگری یادداشت قبل از چاپ"
+msgstr "مرور  یادداشت قبل از چاپ"
 
 #: ../ui/editor_note.xml.h:10
 msgid "Print this note"
@@ -2061,59 +2228,63 @@ msgstr "این یادداشت را چاپ کن"
 
 #: ../ui/editor_note.xml.h:12
 msgid "Save the current note"
-msgstr "یادداشت فعلی را حذف کن"
+msgstr "یادداشت فعلی را ذخیره کن"
 
 #: ../ui/editor_note.xml.h:13
 msgid "_Delete Personal Comment"
-msgstr "نظریات شخصی را حذف کن"
+msgstr "_نظرات شخصی را حذف کن"
 
 #: ../ui/editor_note.xml.h:16
 msgid "_Save (Personal Comment)"
-msgstr "ضبط (نظریات شخصی)"
+msgstr "_ضبط (نظریات شخصی)"
 
 #: ../ui/editor_studypad.xml.h:1
 msgid "Add this file to your bookmarks"
-msgstr "این پرونده را به عیست علائم اضافه کنید"
+msgstr "این پرونده را به لیست علائم اضافه کنید"
 
-#: ../ui/editor_studypad.xml.h:3 ../ui/editor.xml.h:1
+#: ../ui/editor_studypad.xml.h:3
+#: ../ui/editor.xml.h:1
 msgid "Create a new document"
 msgstr "ایجاد متن جدید"
 
-#: ../ui/editor_studypad.xml.h:10 ../ui/editor.xml.h:8
+#: ../ui/editor_studypad.xml.h:10
+#: ../ui/editor.xml.h:8
 msgid "New Document"
 msgstr "متن جدید"
 
-#: ../ui/editor_studypad.xml.h:11 ../ui/editor.xml.h:9
+#: ../ui/editor_studypad.xml.h:11
+#: ../ui/editor.xml.h:9
 msgid "Open"
 msgstr "باز کن"
 
 #: ../ui/editor_studypad.xml.h:12
 msgid "Open a file in Studypad"
-msgstr "پرونده را در یادداشت مطالعه‌ باز کن"
+msgstr "پرونده را در بخش یادداشت‏ها باز کن"
 
 #: ../ui/editor_studypad.xml.h:13
 msgid "Preview the document to be printed"
-msgstr "پیشنگری متن قبل از ارسال به چاپ"
+msgstr "پیشنگری متن قبل از ارسال به چاپگر"
 
 #: ../ui/editor_studypad.xml.h:15
 msgid "Print this document"
-msgstr "چاپ متن"
+msgstr "این متن را چاپ کن"
 
 #: ../ui/editor_studypad.xml.h:17
 msgid "Save AS"
-msgstr "ضبط به نام "
+msgstr "ذخیره با نام"
 
-#: ../ui/editor_studypad.xml.h:18 ../ui/editor.xml.h:12
+#: ../ui/editor_studypad.xml.h:18
+#: ../ui/editor.xml.h:12
 msgid "Save the current file"
-msgstr "قسمت فعلی را در یک پرونده ضبط کن"
+msgstr "این فایل را دخیره کن"
 
 #: ../ui/editor_studypad.xml.h:19
 msgid "Save the current file as"
-msgstr "قسمت فعلی را در یک پرونده ضبط کن نه نام"
+msgstr "این فایل را ذخیره کن با نام"
 
 #: ../ui/editor.xml.h:10
 msgid "Open the file in Studypad"
-msgstr "ویرایشگر یادداشت مطالعه را باز کن"
+msgstr "این فایل را در ویرایشگر یادداشت مطالعه باز کن"
 
 #: ../ui/export-dialog.glade.h:1
 msgid ": "
@@ -2121,52 +2292,53 @@ msgstr ": "
 
 #: ../ui/export-dialog.glade.h:2
 msgid "<b>Copy</b>"
-msgstr "کپی"
+msgstr "<b>کپی</b>"
 
 #: ../ui/export-dialog.glade.h:3
 msgid "<b>Export</b>"
-msgstr "<b>صادرات</b>"
+msgstr "<b>ارسال</b>"
 
 #: ../ui/export-dialog.glade.h:4
 msgid "<b>Format</b>"
-msgstr "فرمت"
+msgstr "<b>فرمت</b>"
 
-#: ../ui/export-dialog.glade.h:5 ../ui/prefs.glade.h:25
+#: ../ui/export-dialog.glade.h:5
+#: ../ui/prefs.glade.h:25
 msgid "Book"
 msgstr "کتاب"
 
 #: ../ui/export-dialog.glade.h:6
 msgid "Book Radio Button"
-msgstr "دگمه کتاب رادیو"
+msgstr "یک گزینه را علامت گذاری کنید"
 
 #: ../ui/export-dialog.glade.h:8
 msgid "Chapter Radio Button"
-msgstr "دگمه فصل رادیو"
+msgstr "یک فصل را علامت گذاری کنید"
 
-#: ../ui/export-dialog.glade.h:9 ../ui/xi-menus.glade.h:14
-#, fuzzy
+#: ../ui/export-dialog.glade.h:9
+#: ../ui/xi-menus.glade.h:18
 msgid "Copy/Export Passage"
-msgstr "استخراج متن"
+msgstr "کپی/ارسال متن"
 
 #: ../ui/export-dialog.glade.h:10
 msgid "Export Passage Cancel"
-msgstr "صرفنظر از استخراج متن"
+msgstr "صرفنظر از ارسال متن"
 
 #: ../ui/export-dialog.glade.h:11
 msgid "Export Passage OK"
-msgstr "تایید استخراج متن"
+msgstr "تایید ارسال متن"
 
 #: ../ui/export-dialog.glade.h:12
 msgid "Export complete book"
-msgstr "استخراج تمامی کتاب"
+msgstr "ارسال تمامی کتاب"
 
 #: ../ui/export-dialog.glade.h:13
 msgid "Export complete chapter"
-msgstr "استخراج تمامی فصل"
+msgstr "ارسال تمامی فصل"
 
 #: ../ui/export-dialog.glade.h:14
 msgid "Export single verse"
-msgstr "استخراج یک آیه"
+msgstr "ارسال یک آیه"
 
 #: ../ui/export-dialog.glade.h:15
 msgid "HTML"
@@ -2174,7 +2346,7 @@ msgstr "اچ.تی.ام.ال"
 
 #: ../ui/export-dialog.glade.h:16
 msgid "HTML Radio Button"
-msgstr "دگمه اچ.تی.ام.ال رادیو"
+msgstr "یک اچ.تی.ام.ال را علامت گذاری کنید"
 
 #: ../ui/export-dialog.glade.h:17
 msgid "Key"
@@ -2182,15 +2354,15 @@ msgstr "کلید"
 
 #: ../ui/export-dialog.glade.h:18
 msgid "Plain Text"
-msgstr "متن بدون فرمت"
+msgstr "متن فرمت نشده"
 
 #: ../ui/export-dialog.glade.h:19
 msgid "Plain Text Radio Button"
-msgstr "دگمه متن بدون فرمت رادیو"
+msgstr "یک متن فرمت نشده را علامت گذاری کنید"
 
 #: ../ui/export-dialog.glade.h:21
 msgid "Save Export As"
-msgstr "ضبط استخراج به نام"
+msgstr "ذخیرۀ متن ارسال شده با نام"
 
 #: ../ui/export-dialog.glade.h:22
 msgid "Verse"
@@ -2198,7 +2370,7 @@ msgstr "آیه"
 
 #: ../ui/export-dialog.glade.h:23
 msgid "Verse Radio Button"
-msgstr "دگمه آیه رادیو"
+msgstr "یک آیه را علامت گذاری کنید"
 
 #: ../ui/export-dialog.glade.h:24
 msgid "Verse range"
@@ -2206,102 +2378,100 @@ msgstr "لیست آیات"
 
 #: ../ui/export-dialog.glade.h:25
 msgid "Version"
-msgstr "نسخه"
+msgstr "ویرایش"
 
 #: ../ui/markverse.glade.h:4
-#, fuzzy
 msgid "Mark"
-msgstr "مارس"
+msgstr "علامت‏گذاری‏کن"
 
 #: ../ui/markverse.glade.h:5
 msgid "Mark/Unmark Verse"
-msgstr ""
+msgstr "علامت‏گذاری/حذف علامت یک آیه"
 
 #: ../ui/markverse.glade.h:9
 msgid "Unmark"
-msgstr ""
+msgstr "حذف علامت"
 
 #: ../ui/module-manager.glade.h:1
 msgid "<b>Add and Remove Sources</b>"
-msgstr "منابع را آضافه/کم کن"
+msgstr "<b>منابع را اضافه/کم کن</b>"
 
 #: ../ui/module-manager.glade.h:2
 msgid "<b>Install Destination</b>"
-msgstr "مقصد را نصب کن"
+msgstr "<b>مقصد نصب</b>"
 
 #: ../ui/module-manager.glade.h:3
 msgid "<b>Install Source</b>"
-msgstr "منبع را نصب کن "
+msgstr "<b>منبع نصب </b>"
 
 #: ../ui/module-manager.glade.h:4
 msgid "<b>Module Manager</b>"
-msgstr "مدیر مدول"
+msgstr "<b>مدیر مدول</b>"
 
 #. do not translate <b> and </b> they are html formating
 #: ../ui/module-manager.glade.h:6
 msgid "<b>Sword</b>"
-msgstr "سورد"
+msgstr "<b>سورد</b>"
 
 #: ../ui/module-manager.glade.h:7
 msgid "<b>WARNING:</b> If you live in a persecuted country use with care."
-msgstr "تذکر: اگر در کشور زیر جفا زندگی می‌کنید، باید با احتیاط استفاده کنید"
+msgstr "<b>هشدار:</b>اگر در کشور زیر جفا زندگی می‌کنید، باید با احتیاط استفاده کنید."
 
 #: ../ui/module-manager.glade.h:8
-msgid ""
-"<b>Warning:</b> If you live in a persecuted country and do not wish to risk "
-"detection you should NOT use  the remote installation feature! "
-msgstr ""
-"اگر در کشور تحت جفا زندگی می‌کنید، به منظور جلوگیری از خطرات احتمالی لطفا بخش "
-"مربوط به نصب دوردست را انجام ندهید"
+msgid "<b>Warning:</b> If you live in a persecuted country and do not wish to risk detection you should NOT use  the remote installation feature! "
+msgstr "<b>هشدار:/b>اگر در کشور تحت جفا زندگی می‌کنید، به منظور جلوگیری از خطرات احتمالی لطفا بخش مربوط به نصب از راه دور را انجام ندهید! "
 
 #: ../ui/module-manager.glade.h:9
 msgid "<i>Personal area, for your use only:</i>"
-msgstr ""
+msgstr "<i>محدودۀ شخصی، منحصراً برای استفادۀ شخصی شما</i>"
 
 #: ../ui/module-manager.glade.h:10
 msgid "<i>System area, for all users:</i>"
-msgstr ""
+msgstr "<i>محدودۀ سیستم، برای تمام کاربران:</i>"
 
-#: ../ui/module-manager.glade.h:11
+#: ../ui/module-manager.glade.h:12
 msgid "Continue"
 msgstr "ادامه"
 
-#: ../ui/module-manager.glade.h:12
+#: ../ui/module-manager.glade.h:13
 msgid "Current Remote Sources"
-msgstr "منابع دوردست فعلی"
+msgstr "منابع  راه دور فعلی"
 
-#: ../ui/module-manager.glade.h:13
+#: ../ui/module-manager.glade.h:14
 msgid "Current local sources"
 msgstr "منابع محلی فعلی"
 
-#: ../ui/module-manager.glade.h:14
-msgid "Home dir"
-msgstr "شاخه خانه"
+#: ../ui/module-manager.glade.h:15
+msgid "Delete Index"
+msgstr "حذف ایندکس"
 
 #: ../ui/module-manager.glade.h:16
-#, fuzzy
+msgid "Home dir"
+msgstr "فهرست پرونده‏های محلی"
+
+#: ../ui/module-manager.glade.h:19
 msgid "Load Standard"
-msgstr "نگرش استاندارد"
+msgstr "بارگذاری استاندارد"
 
-#: ../ui/module-manager.glade.h:17
+#: ../ui/module-manager.glade.h:20
 msgid "Local"
 msgstr "محلی"
 
-#: ../ui/module-manager.glade.h:18
+#: ../ui/module-manager.glade.h:21
 msgid "Local Install Folder"
 msgstr "قفسه نصب محلی"
 
-#: ../ui/module-manager.glade.h:19
+#: ../ui/module-manager.glade.h:22
 msgid "Module Manager"
 msgstr "مدیر مدول"
 
-#: ../ui/module-manager.glade.h:20
+#: ../ui/module-manager.glade.h:23
 msgid "Remote"
 msgstr "دوردست"
 
-#: ../ui/module-manager.glade.h:21
+#: ../ui/module-manager.glade.h:24
 msgid "Sword sys dir"
-msgstr "شاخه سیستم سورد"
+msgstr "فهرست سیستم سورد"
 
 #: ../ui/navbar_versekey.glade.h:1
 msgid "1"
@@ -2309,11 +2479,11 @@ msgstr "۱"
 
 #: ../ui/navbar_versekey.glade.h:2
 msgid "<b>Revelation of John</b>"
-msgstr "مکاشفه یوحنا"
+msgstr "<b>مکاشفه یوحنا</b>"
 
 #: ../ui/navbar_versekey.glade.h:3
 msgid "Book Selector Button"
-msgstr "دقمه انتخاب کتاب"
+msgstr "کلید انتخاب کتاب"
 
 #: ../ui/navbar_versekey.glade.h:4
 msgid "Choose book to display"
@@ -2321,19 +2491,19 @@ msgstr "انتخاب کتاب جهت نمایش"
 
 #: ../ui/navbar_versekey.glade.h:5
 msgid "Drop down history list"
-msgstr "از لیست سابقه را صرفنظر کن"
+msgstr "لیست تاریخچه"
 
 #: ../ui/navbar_versekey.glade.h:6
 msgid "Reference Entry"
-msgstr "ترجیحات"
+msgstr "ثبت ترجیحات"
 
 #: ../ui/navbar_versekey.glade.h:7
 msgid "Toggle Chapter Button"
-msgstr "دقمه انتخاب باب"
+msgstr "دکمۀ انتخاب باب"
 
 #: ../ui/navbar_versekey.glade.h:8
 msgid "Toggle Verse Button"
-msgstr "دقمه انتخاب ایات"
+msgstr "دکمۀ انتخاب آیات"
 
 #: ../ui/prefs.glade.h:1
 msgid ""
@@ -2357,102 +2527,99 @@ msgstr ""
 
 #: ../ui/prefs.glade.h:9
 msgid "<b>Font Colors</b>"
-msgstr "رنگ قلم"
+msgstr "<b>رنگ‏های قلم</b>"
 
 #: ../ui/prefs.glade.h:10
 msgid "<b>Font Sizes</b>"
-msgstr "<b>اندازه فونت</b>"
+msgstr "<b>اندازه‏های قلم</b>"
 
 #: ../ui/prefs.glade.h:11
 msgid "<b>General</b>"
-msgstr "عمومی"
+msgstr "<b>عمومی</b>"
 
 #: ../ui/prefs.glade.h:12
 msgid "<b>Main Window Modules</b>"
-msgstr "مدولهای پنجره اصلی"
+msgstr "<b>مدولهای پنجره اصلی</b>"
 
 #: ../ui/prefs.glade.h:13
 msgid "<b>Parallel View</b>"
-msgstr "<b>نگرش به شکل توازی<b>"
+msgstr "<b>نگرش موازی<b>"
 
 #: ../ui/prefs.glade.h:14
 msgid "<b>Show</b>"
-msgstr "نشان بده"
+msgstr "<b>نمایش</b>"
 
 #: ../ui/prefs.glade.h:15
 msgid "<b>Special Purpose Modules</b>"
-msgstr "<b>مدولهای مختلف</b>"
+msgstr "<b>مدولهای ویژه</b>"
 
 #: ../ui/prefs.glade.h:16
 msgid "<b>StudyPad default directory</b>"
-msgstr "شاخه پیش‌گزیده یادداشت مطالعه"
+msgstr "<b>شاخه پیش‌گزیده یادداشت مطالعه</b>"
 
 #: ../ui/prefs.glade.h:17
 msgid "<b>Tabs</b>"
-msgstr "بخش"
+msgstr "<b>بخش‏ها</b>"
 
 #: ../ui/prefs.glade.h:18
 msgid "Apply high-contrast highlight to current verse"
 msgstr "این آیه را قویا مشخص کن"
 
 #: ../ui/prefs.glade.h:19
-msgid ""
-"Automatically resize commentary, book, and dictionary image content to fit "
-"subwindow"
-msgstr "اندازه محتویات را به شکل اتوماتیک عوض کن که بگنجد"
+msgid "Automatically resize commentary, book, and dictionary image content to fit subwindow"
+msgstr "اندازه محتویات تفاسیر، کتب، یا دیکشنری را به شکل اتوماتیک عوض کن تا در صفحات فرعی بگنجند"
 
 #: ../ui/prefs.glade.h:20
 msgid "Background"
-msgstr "زمینه"
+msgstr "پیش‏زمینه"
 
 #: ../ui/prefs.glade.h:21
-#, fuzzy
 msgid "Base font size"
-msgstr "سایز قلم بنیاد"
+msgstr "سایز قلم پایه"
 
 #: ../ui/prefs.glade.h:22
 msgid "Bible Texts"
-msgstr "متون کتابمقدس"
+msgstr "متون کتاب‏مقدس"
 
 #: ../ui/prefs.glade.h:23
 msgid "Bible Texts Checkbox"
-msgstr "متون کتاب مقدس"
+msgstr "انتخاب متون کتاب‏مقدس"
 
 #: ../ui/prefs.glade.h:24
 msgid "Biblical Text"
-msgstr "متن از کتابمقدس"
+msgstr "متن از کتاب‏مقدس"
 
 #: ../ui/prefs.glade.h:26
 msgid "Change Biblical Text Combo"
-msgstr "متن از کتابمقدس"
+msgstr "تغییر ترکیبی متن کتاب‏مقدس"
 
 #: ../ui/prefs.glade.h:27
 msgid "Change Book Combo"
-msgstr ""
+msgstr "تغییر ترکیب کتاب"
 
 #: ../ui/prefs.glade.h:28
 msgid "Change Commentary Combo"
-msgstr "انتخاب نام تفسیر"
+msgstr "تغییر ترکیبی تفسیر"
 
 #: ../ui/prefs.glade.h:29
 msgid "Change Default Dictionary Combo"
-msgstr ""
+msgstr "تغییر ترکیب فرهنگ واژه‏های قراردادی"
 
 #: ../ui/prefs.glade.h:30
 msgid "Change Dictionary Combo"
-msgstr "کتاب فرهنگ لغات"
+msgstr "تغییر ترکیبی فرهنگ واژه‏ها"
 
 #: ../ui/prefs.glade.h:31
 msgid "Change Personal Notes Combo"
-msgstr "یادداشتهای شخصی"
+msgstr "تغییر ترکیبی یادداشت‏های شخصی"
 
 #: ../ui/prefs.glade.h:32
 msgid "Choose to enable Prayer lists "
-msgstr "لیستهای دعا را فعال کن"
+msgstr "لیست‏های دعا را فعال کن "
 
 #: ../ui/prefs.glade.h:34
 msgid "Commentaries Checkbox"
-msgstr "کتب تفاسیر"
+msgstr "انتخاب کتب تفاسیر"
 
 #: ../ui/prefs.glade.h:36
 msgid "Cover"
@@ -2460,7 +2627,7 @@ msgstr "جلد"
 
 #: ../ui/prefs.glade.h:37
 msgid "Current Verse"
-msgstr "متن آیه فعلی"
+msgstr "آیۀ فعلی"
 
 #: ../ui/prefs.glade.h:38
 msgid "Daily Devotional"
@@ -2468,67 +2635,67 @@ msgstr "دعا و تفکر روزانه"
 
 #: ../ui/prefs.glade.h:39
 msgid "Daily Devotional Combo"
-msgstr "دعا و تفکر روزانه"
+msgstr "دعا و تفکر روزانه بصورت ترکیبی"
 
 #: ../ui/prefs.glade.h:40
 msgid "Default Dictionary"
-msgstr "فرهنگ لغات پیش‌گزیده"
+msgstr "فرهنگ قراردادی واژگان"
 
 #: ../ui/prefs.glade.h:41
 msgid "Dictionary"
-msgstr "کتاب فرهنگ لغات"
+msgstr "فرهنگ واژگان"
 
 #: ../ui/prefs.glade.h:42
 msgid "Dictionary/Lexicon"
-msgstr "کتاب فرهنگ لغات"
+msgstr "فرهنگ واژگان/قاموس"
 
 #: ../ui/prefs.glade.h:43
 msgid "Dictionary/Lexicon Checkbox"
-msgstr "کتاب فرهنگ لغات"
+msgstr "انتخاب فرهنگ واژگان/قاموس"
 
 #: ../ui/prefs.glade.h:44
 msgid "Enable Prayer Lists"
-msgstr "لیست دعا"
+msgstr "لیست دعا را فعال کن"
 
 #: ../ui/prefs.glade.h:45
 msgid "Enable Prayer Lists Checkbox"
-msgstr "قسمت فعال کردن لیستهای دعا را تیک بزن"
+msgstr "قسمت فعال کردن لیستهای دعا را انتخاب کن"
 
 #: ../ui/prefs.glade.h:46
 msgid "Font Colors"
-msgstr "رنگهای قلم"
+msgstr "رنگ‏های قلم"
 
 #: ../ui/prefs.glade.h:47
 msgid "Font Misc"
-msgstr "گوناگونی قلم"
+msgstr "قلم ... متفرقه"
 
 #: ../ui/prefs.glade.h:48
 msgid "Foreground"
-msgstr "پیشن نما"
+msgstr "پیش‏نما"
 
 #: ../ui/prefs.glade.h:49
 msgid "General Misc"
-msgstr "گوناگونی عمومی"
+msgstr "عمومی ... متفرقه"
 
 #: ../ui/prefs.glade.h:50
 msgid "Greek Lexicon"
-msgstr "فرهنگ لغات یونانی"
+msgstr "قاموس به زبان یونانی"
 
 #: ../ui/prefs.glade.h:51
 msgid "Greek Lexicon Combo"
-msgstr "فرهنگ لغات یونانی"
+msgstr "قاموس یونانی ترکیبی"
 
 #: ../ui/prefs.glade.h:52
 msgid "Hebrew Lexicon"
-msgstr "فرهنگ لغات عبری"
+msgstr "قاموس عبری"
 
 #: ../ui/prefs.glade.h:53
 msgid "Hebrew Lexicon Combo"
-msgstr "فرهنگ لغات عبری"
+msgstr "قاموس عبری ترکیبی"
 
 #: ../ui/prefs.glade.h:54
 msgid "Highlight Background"
-msgstr "زمینه را مشخص کن"
+msgstr "پیش‏زمینه را مشخص کن"
 
 #: ../ui/prefs.glade.h:55
 msgid "Highlight Foreground"
@@ -2536,7 +2703,7 @@ msgstr "رو زمینه را مشخص کن"
 
 #: ../ui/prefs.glade.h:56
 msgid "Highlight current verse"
-msgstr "آیه فعلی را مشخص کن"
+msgstr "آیۀ فعلی را مشخص کن"
 
 #: ../ui/prefs.glade.h:57
 msgid "Highlight current verse check box"
@@ -2544,7 +2711,7 @@ msgstr "آیه فعلی را مشخص کن"
 
 #: ../ui/prefs.glade.h:58
 msgid "Links"
-msgstr "لینکها"
+msgstr "پیوندها"
 
 #: ../ui/prefs.glade.h:59
 msgid "Modules Main"
@@ -2556,7 +2723,7 @@ msgstr "گوناگونی مدولها"
 
 #: ../ui/prefs.glade.h:61
 msgid "Modules Parallel"
-msgstr "توازی مدولها"
+msgstr "مدولهای موازی"
 
 #: ../ui/prefs.glade.h:62
 msgid "Parallel 1"
@@ -2600,15 +2767,15 @@ msgstr "توازی ترکیبی ۵"
 
 #: ../ui/prefs.glade.h:72
 msgid "Parallel View in a tab"
-msgstr "نگرش به شکل موازی در برگ"
+msgstr "نگرش به شکل موازی در یک بخش"
 
 #: ../ui/prefs.glade.h:73
 msgid "Personal Notes"
-msgstr "یادداشتهای شخصی"
+msgstr "یادداشت‏های شخصی"
 
 #: ../ui/prefs.glade.h:76
 msgid "Previewer Checkbox"
-msgstr "مرورگر"
+msgstr "انتخاب مرورگر"
 
 #: ../ui/prefs.glade.h:77
 msgid "Resize images"
@@ -2616,7 +2783,7 @@ msgstr "اندازه تصاویر را عوض کن"
 
 #: ../ui/prefs.glade.h:78
 msgid "Resize images checkbox"
-msgstr "اندازه تصاویر را عوض کن"
+msgstr "اندازه تصاویر را عوض کن انتخاب"
 
 #: ../ui/prefs.glade.h:79
 msgid "Scroll to Previous/Next Chapter"
@@ -2624,7 +2791,7 @@ msgstr "برو به فصل قبل/بعد"
 
 #: ../ui/prefs.glade.h:80
 msgid "Scroll to Previous/Next Chapter Checkbox"
-msgstr "برو به فصل قبل/بعد"
+msgstr "انتخاب حرکت به فصل قبل/بعد"
 
 #: ../ui/prefs.glade.h:81
 msgid "Select A Directory"
@@ -2639,100 +2806,112 @@ msgid "Show splash screen at start up"
 msgstr "لوگو را در شروع نشان بده"
 
 #: ../ui/prefs.glade.h:84
-msgid "StudyPad default directory combo"
-msgstr "شاخه پیش‌گزیده یادداشت مطالعه"
+msgid "Special Locale (requires restart)"
+msgstr "زبان برنامه"
+
+#: ../ui/prefs.glade.h:85
+msgid "Special Locale Combo"
+msgstr "انتخاب زبان کومبو"
 
 #: ../ui/prefs.glade.h:86
+msgid "StudyPad default directory combo"
+msgstr "شاخه ترکیبی پیش‌گزیده یادداشت مطالعه"
+
+#: ../ui/prefs.glade.h:88
 msgid "Use Bible Text scroll bar to scroll to previous or next chapter"
 msgstr "از ستون بالابر/پایین‌بر جهت رفتن به فصل قبل و بعد استفاده کن"
 
-#: ../ui/prefs.glade.h:87
+#: ../ui/prefs.glade.h:89
 msgid "Use Verse Per Line"
-msgstr "از شیوه آیه استفاده کن"
+msgstr "از شیوۀ یک آیه در هر خط استفاده کن"
 
-#: ../ui/prefs.glade.h:88
+#: ../ui/prefs.glade.h:90
 msgid "Use Verse Per Line Checkbox"
-msgstr "از شیوه آیه استفاده کن"
+msgstr "انتخاب شیوۀ یک آیه در هر خط استفاده کن"
 
-#: ../ui/prefs.glade.h:89
+#: ../ui/prefs.glade.h:91
 msgid "Use default Dictionary"
-msgstr "فرهنگ لغات پیش گزیده را بکار گیر"
+msgstr "فرهنگ واژگان قراردادی را بکار گیر"
 
-#: ../ui/prefs.glade.h:90
+#: ../ui/prefs.glade.h:92
 msgid "Use default Dictionary Checkbox"
-msgstr "فرهنگ لغات پیش گزیده را بکار گیر"
+msgstr "انتخاب فرهنگ واژگان قراردادی"
 
-#: ../ui/prefs.glade.h:91
+#: ../ui/prefs.glade.h:93
 msgid "Use tabbed browsing"
-msgstr ""
+msgstr "گزینۀ جستجوی بخشی را استفاده کنید"
 
-#: ../ui/prefs.glade.h:92
+#: ../ui/prefs.glade.h:94
 msgid "Use tabbed browsing Checkbox"
-msgstr ""
+msgstr "انتخاب گزینۀ جستجوی بخشی"
 
-#: ../ui/prefs.glade.h:93
+#: ../ui/prefs.glade.h:95
+msgid "Verse Number"
+msgstr "شماره‌های آیات"
+
+#: ../ui/prefs.glade.h:96
 msgid "Verse number size"
-msgstr "اندازه قلم شماره آیه"
+msgstr "اندازۀ قلم شماره آیه"
 
 #: ../ui/search-dialog.glade.h:1
 msgid "<b>Attribute</b>"
-msgstr "مشخصه"
+msgstr "<b>مشخصه</b>"
 
 #: ../ui/search-dialog.glade.h:2
 msgid "<b>Found</b>"
-msgstr "پیدا شد"
+msgstr "<b>پیدا شد</b>"
 
 #: ../ui/search-dialog.glade.h:3
 msgid "<b>List Name</b>"
-msgstr "نام لینک"
+msgstr "<b>نام لینک</b>"
 
 #: ../ui/search-dialog.glade.h:4
 msgid "<b>Module Lists</b>"
-msgstr "لیستهای مدول"
+msgstr "<b>لیست‏های مدول</b>"
 
 #: ../ui/search-dialog.glade.h:5
 msgid "<b>Modules</b>"
-msgstr "مدولها"
+msgstr "<b>مدول‏ها</b>"
 
 #: ../ui/search-dialog.glade.h:6
 msgid "<b>Options</b>"
-msgstr "ترجیحات"
+msgstr "<b>گزینه‏ها</b>"
 
 #: ../ui/search-dialog.glade.h:7
 msgid "<b>Preview</b>"
-msgstr "پیشنگری"
+msgstr "<b>پیش‏نگری</b>"
 
 #: ../ui/search-dialog.glade.h:8
 msgid "<b>Range Definition</b>"
-msgstr "متن محدوده"
+msgstr "<b>تعیین محدوده</b>"
 
 #: ../ui/search-dialog.glade.h:9
 msgid "<b>Range Name</b>"
-msgstr "نام محدوده"
+msgstr "<b>نام محدوده</b>"
 
 #: ../ui/search-dialog.glade.h:10
 msgid "<b>Ranges</b>"
-msgstr "محدوده‌ها"
+msgstr "<b>محدوده‌ها</b>"
 
 #: ../ui/search-dialog.glade.h:11
 msgid "<b>Results Display Options</b>"
-msgstr "ترجیحات نمایش نتایج"
+msgstr "<b>گزینه‏های نتایج نمایش</b>"
 
 #: ../ui/search-dialog.glade.h:12
 msgid "<b>Scope</b>"
-msgstr "حدود"
+msgstr "<b>محدوده</b>"
 
 #: ../ui/search-dialog.glade.h:13
 msgid "<b>Search Results</b>"
-msgstr "نتایج جستجو"
+msgstr "<b>نتایج جستجو</b>"
 
 #: ../ui/search-dialog.glade.h:14
 msgid "<b>Search Type</b>"
-msgstr "نوع جستجو"
+msgstr "<b>نوع جستجو</b>"
 
 #: ../ui/search-dialog.glade.h:15
 msgid "Add Modules"
-msgstr "مدولها را اضافه کن"
+msgstr "اضافه کردن مدول‏ها"
 
 #: ../ui/search-dialog.glade.h:16
 msgid "Advanced Search"
@@ -2748,7 +2927,7 @@ msgstr "مشخصات"
 
 #: ../ui/search-dialog.glade.h:19
 msgid "Attributes radiobutton"
-msgstr "مشخصات"
+msgstr "انتخاب مشخصات"
 
 #: ../ui/search-dialog.glade.h:20
 msgid "Clear Custom Module List Button"
@@ -2756,11 +2935,11 @@ msgstr "دگمه خالی کردن لیست مدولهای غیر استاندا
 
 #: ../ui/search-dialog.glade.h:21
 msgid "Clear Modules from List Button"
-msgstr "همه مدولها را از لیست پاک کن"
+msgstr "مدول‏ها را از لیست پاک کن"
 
 #: ../ui/search-dialog.glade.h:22
 msgid "Clear all modules from the list"
-msgstr "همه مدولها را از لیست پاک کن"
+msgstr "همۀ مدول‏ها را از لیست پاک کن"
 
 #: ../ui/search-dialog.glade.h:23
 msgid "Clear lists for new search"
@@ -2768,11 +2947,11 @@ msgstr "لیست را برای جستجوی جدید پاک کن"
 
 #: ../ui/search-dialog.glade.h:24
 msgid "Create a new module list"
-msgstr "ایجاد لیست جدید"
+msgstr "ایجاد لیست مدول جدید"
 
 #: ../ui/search-dialog.glade.h:25
 msgid "Create new custom range"
-msgstr "ایجاد محدوده جدید "
+msgstr "ایجاد محدوده جدید"
 
 #: ../ui/search-dialog.glade.h:26
 msgid "Current results"
@@ -2780,11 +2959,11 @@ msgstr "نتایج فعلی"
 
 #: ../ui/search-dialog.glade.h:27
 msgid "Current results radiobutton"
-msgstr "نتایج فعلی"
+msgstr "انتخاب نتایج فعلی"
 
 #: ../ui/search-dialog.glade.h:28
 msgid "Custom Module List Combo"
-msgstr "ترکیب لیست مدولهای غیر استاندارد"
+msgstr "ترکیب لیست مدول‏های غیر استاندارد"
 
 #: ../ui/search-dialog.glade.h:29
 msgid "Custom Module List Name Entry"
@@ -2792,7 +2971,7 @@ msgstr "درج نام لیست مدول غیر استاندارد"
 
 #: ../ui/search-dialog.glade.h:30
 msgid "Custom Module Lists"
-msgstr "لیستهای مدول غیر استاندارد"
+msgstr "لیست‏های مدول غیر استاندارد"
 
 #: ../ui/search-dialog.glade.h:31
 msgid "Custom Range Preview"
@@ -2808,23 +2987,23 @@ msgstr "محدوده‌های آیه غیر استاندارد"
 
 #: ../ui/search-dialog.glade.h:34
 msgid "Custom module list"
-msgstr "لیست مدولها غیراستانداردها"
+msgstr "لیست مدول‏های غیراستاندارد"
 
 #: ../ui/search-dialog.glade.h:35
 msgid "Custom module list radiobutton"
-msgstr ""
+msgstr "انتخاب لیست مدول"
 
 #: ../ui/search-dialog.glade.h:36
 msgid "Custom verse range"
-msgstr "محدوده غیر استاندارد"
+msgstr "محدودۀ غیر استاندارد"
 
 #: ../ui/search-dialog.glade.h:37
 msgid "Custom verse range radiobutton"
-msgstr ""
+msgstr "انتخاب محدودۀ آیات"
 
 #: ../ui/search-dialog.glade.h:38
 msgid "Delete Range Button"
-msgstr "دگمه حذف محدوده"
+msgstr "کلید حذف محدوده"
 
 #: ../ui/search-dialog.glade.h:39
 msgid "Delete Selected Module From List Button"
@@ -2844,690 +3023,816 @@ msgstr "تمامی مدول"
 
 #: ../ui/search-dialog.glade.h:43
 msgid "Entire module radiobutton"
-msgstr "تمامی مدول"
+msgstr "انتخاب تمامی مدول"
 
 #: ../ui/search-dialog.glade.h:45
 msgid "Exact phrase radiobutton"
 msgstr "عبارت به شکل دقیق"
 
 #: ../ui/search-dialog.glade.h:46
+msgid "Export"
+msgstr "صادرت"
+
+#: ../ui/search-dialog.glade.h:47
+msgid "Export current search results"
+msgstr "صادرت نتایج جستجو"
+
+#: ../ui/search-dialog.glade.h:48
 msgid ""
 "Fast, featureful, index-based search\n"
 "Indexes must have been built beforehand:\n"
 "See Module Manager's maintenance functions"
 msgstr ""
-"براي بهبود کار، مدولها نياز به اندکس شدن دارند. اين امر فقط يکبار صورت "
-"مي‌گيرد.\n"
-"سريع، پر از موارد جوانب گوناگون، جستجوي بر اساس اندکساندسکسها بايد قبلا "
-"آماده گردند.به عملکردهاي خودبقاي مدير مدول رجوع کنيد"
+"سريع، پر از موارد جوانب گوناگون، جستجوي بر اساس ایندکس\n"
+"اندکسها بايد قبلا آماده گردند:\n"
+"به عملکردهاي خود بقاي مدير مدول رجوع کنيد"
 
-#: ../ui/search-dialog.glade.h:49
+#: ../ui/search-dialog.glade.h:51
 msgid "Find Button"
-msgstr "بعدی را پیدا کن"
+msgstr "کلید را جستجو کن"
 
-#: ../ui/search-dialog.glade.h:51
+#: ../ui/search-dialog.glade.h:53
 msgid "Footnotes radiobutton"
-msgstr "زیرنویس"
+msgstr "انتخاب پانویس"
 
-#: ../ui/search-dialog.glade.h:52
+#: ../ui/search-dialog.glade.h:54
 msgid "In modules that have Footnotes"
-msgstr "در مدولهایی که زیر نویس دارند"
+msgstr "در مدول‏هایی که پانویس دارند"
 
-#: ../ui/search-dialog.glade.h:53
+#: ../ui/search-dialog.glade.h:55
 msgid "In modules that have Morphological Tags"
-msgstr "در مدولهایی که بخشهای مورفولوژیک دارند"
+msgstr "در مدول‏هایی که بخش‏های واژه‏شناسی دارند"
 
-#: ../ui/search-dialog.glade.h:54
+#: ../ui/search-dialog.glade.h:56
 msgid "In modules that have Strong's Numbers"
-msgstr "در مدولهایی که شماره‌های استرانگ دارند"
+msgstr "در مدول‏هایی که شماره‌های کشف‏الآیات استرانگ را دارند"
 
-#: ../ui/search-dialog.glade.h:55
+#: ../ui/search-dialog.glade.h:57
 msgid "Main Search Entry"
-msgstr "بخش جستجوی اصلی"
+msgstr "ثبت جستجوی اصلی"
 
-#: ../ui/search-dialog.glade.h:56
+#: ../ui/search-dialog.glade.h:58
 msgid "Make selections on the Attribute Search tab"
 msgstr "گزینه در بخش جستجو در مشخصات"
 
-#: ../ui/search-dialog.glade.h:58
+#: ../ui/search-dialog.glade.h:60
 msgid "Match case checkbox"
-msgstr ""
+msgstr "انتخاب تطبیق مورد"
 
-#: ../ui/search-dialog.glade.h:59
+#: ../ui/search-dialog.glade.h:61
 msgid "Module Selection"
 msgstr "انتخاب مدول"
 
-#: ../ui/search-dialog.glade.h:60
+#: ../ui/search-dialog.glade.h:62
 msgid "Module list"
 msgstr "لیست مدول"
 
-#: ../ui/search-dialog.glade.h:61
+#: ../ui/search-dialog.glade.h:63
 msgid "Module list radiobutton"
-msgstr "لیست مدول"
+msgstr "انتخاب لیست مدول"
 
-#: ../ui/search-dialog.glade.h:63
+#: ../ui/search-dialog.glade.h:65
 msgid "Morphological Tags radiobutton"
-msgstr "علائم مورفولوژیک"
+msgstr "انتخاب علائم واژه‏شناسی"
 
-#: ../ui/search-dialog.glade.h:65
+#: ../ui/search-dialog.glade.h:67
 msgid "Multi word radiobutton"
-msgstr "کلمات متعدد"
+msgstr "انتخاب کلمات متعدد"
 
-#: ../ui/search-dialog.glade.h:66
+#: ../ui/search-dialog.glade.h:68
 msgid "New Custom Module List Button"
-msgstr "دکمه·لیست شخصی ·نو مدول"
+msgstr "دکمۀ لیست شخصی مدول جدید"
 
-#: ../ui/search-dialog.glade.h:67
+#: ../ui/search-dialog.glade.h:69
 msgid "New Range Button"
-msgstr "دگمه محدوده جدید"
+msgstr "دکمۀ محدودۀ جدید"
 
-#: ../ui/search-dialog.glade.h:68
+#: ../ui/search-dialog.glade.h:70
 msgid "Open Selection Dialog Button"
-msgstr "دگمه باز کردن دیالوق بخش"
+msgstr "دکمۀ دیالوگ بخش باز"
 
-#: ../ui/search-dialog.glade.h:69
+#: ../ui/search-dialog.glade.h:71
 msgid "Open a dialog to select modules to add to the list"
-msgstr "بازکردن دیالوگ برای انتخاب مدول به جهت اضافه کردن به لیست"
+msgstr "بازکردن یک دیالوگ برای انتخاب مدول به جهت اضافه کردن به لیست"
 
-#: ../ui/search-dialog.glade.h:70
+#: ../ui/search-dialog.glade.h:72
 msgid "Optimized (\"Lucene\")"
-msgstr "بهترسازی"
+msgstr "بهینه‏سازی (\"Lucene\")"
 
-#: ../ui/search-dialog.glade.h:71
+#: ../ui/search-dialog.glade.h:73
 msgid "Optimized (\"Lucene\") radiobutton"
-msgstr "بهتر سازی"
+msgstr "انتخاب (\"Lucene\") بهینه‏سازی"
 
-#: ../ui/search-dialog.glade.h:72
+#: ../ui/search-dialog.glade.h:74
 msgid "Range Definition Entry"
-msgstr "بخش درج تعریف محدوده"
+msgstr "ثبت تعریف محدوده"
 
-#: ../ui/search-dialog.glade.h:73
+#: ../ui/search-dialog.glade.h:75
 msgid "Range Name Entry"
-msgstr "بخش درج نام محدوده"
+msgstr "ثبت نام محدوده"
 
-#: ../ui/search-dialog.glade.h:75
+#: ../ui/search-dialog.glade.h:77
 msgid "Regular expression radiobutton"
-msgstr "بیان معمول"
+msgstr "انتخاب بیان معمول"
 
-#: ../ui/search-dialog.glade.h:76
+#: ../ui/search-dialog.glade.h:78
 msgid "Remove the selected module from the list"
 msgstr "مدول انتخاب شده را از لیست حذف کن"
 
-#: ../ui/search-dialog.glade.h:77
+#: ../ui/search-dialog.glade.h:79
 msgid "Result Summary Table"
-msgstr "لیست نتیجه‌ها"
+msgstr "لیست نتیجه‏ها"
 
-#: ../ui/search-dialog.glade.h:78
+#: ../ui/search-dialog.glade.h:80
 msgid "Result Summary Window"
-msgstr "پنجره خلاصه نتیجه"
+msgstr "پنجرۀ خلاصۀ نتیجه"
 
-#: ../ui/search-dialog.glade.h:79
+#: ../ui/search-dialog.glade.h:81
 msgid "Results"
 msgstr "نتایج"
 
-#: ../ui/search-dialog.glade.h:80
+#: ../ui/search-dialog.glade.h:82
 msgid "Save Custom Module List Button"
-msgstr "ضبط لیست مدول"
+msgstr "دکمۀ مدول ذخیره‏سازی غیر استاندارد"
 
-#: ../ui/search-dialog.glade.h:81
+#: ../ui/search-dialog.glade.h:83
 msgid "Save Range Button"
-msgstr "دگمه ضبط محدوده"
+msgstr "کلید ذخیره‏سازی محدوده"
 
-#: ../ui/search-dialog.glade.h:82
+#: ../ui/search-dialog.glade.h:84
 msgid "Save custom range"
 msgstr "محدوده غیراستاندارد را ضبط کن"
 
-#: ../ui/search-dialog.glade.h:83
+#: ../ui/search-dialog.glade.h:85
 msgid "Save search results as bookmarks"
-msgstr "نتایج جستجو را به عنوان علائم ضبط کن"
+msgstr "نتایج جستجو را به مدول علائم ضبط کن"
 
-#: ../ui/search-dialog.glade.h:84
+#: ../ui/search-dialog.glade.h:86
 msgid "Save the module list"
 msgstr "ضبط لیست مدول"
 
-#: ../ui/search-dialog.glade.h:85
+#: ../ui/search-dialog.glade.h:87
 msgid "Search  Criteria"
-msgstr "محدوده جستجو"
+msgstr "جستجوی معیارهای"
 
-#: ../ui/search-dialog.glade.h:86
+#: ../ui/search-dialog.glade.h:88
 msgid "Search Criteria Treeview"
-msgstr "محدوده جستجو"
+msgstr "جستجوی معیارهای شاخه‏ای"
 
-#: ../ui/search-dialog.glade.h:87
+#: ../ui/search-dialog.glade.h:89
 msgid "Search entire module"
 msgstr "جستجوی تمامی مدول"
 
-#: ../ui/search-dialog.glade.h:88
+#: ../ui/search-dialog.glade.h:90
 msgid "Search for Morphological tags"
-msgstr "جستجو به جهت بخشهای مورفولوژیکی"
+msgstr "جستجو برای علائم واژه‏شناسی"
 
-#: ../ui/search-dialog.glade.h:89
+#: ../ui/search-dialog.glade.h:91
 msgid "Search for Strongs Numbers like G4442 or H1121"
-msgstr "جستجو به جهت شماره‌های استرانگ نظیر گ یا ح"
+msgstr "جستجو به جهت شماره‌های کشف‏الآیات استرانگ نظیر G4442 یا H1121"
 
-#: ../ui/search-dialog.glade.h:90
+#: ../ui/search-dialog.glade.h:92
 msgid "Search in footnotes"
-msgstr "جستجو در زیرنویس"
+msgstr "جستجو در پانویس"
 
-#: ../ui/search-dialog.glade.h:91
+#: ../ui/search-dialog.glade.h:93
 msgid "Show Footnotes"
-msgstr "زیرنویسها را نشان بده"
+msgstr "پانویس‏ها را نشان بده"
 
-#: ../ui/search-dialog.glade.h:92
+#: ../ui/search-dialog.glade.h:94
 msgid "Show Footnotes checkbox"
-msgstr "زیرنویسها را نشان بده"
+msgstr "نمایش انتخاب پانویسها"
 
-#: ../ui/search-dialog.glade.h:93
+#: ../ui/search-dialog.glade.h:95
 msgid "Show Morphological Tags"
-msgstr "بخشهای مورفولوژیکی را نشان بده"
+msgstr "بخشهای واژه‏شناسی را نشان بده"
 
-#: ../ui/search-dialog.glade.h:94
+#: ../ui/search-dialog.glade.h:96
 msgid "Show Morphological Tags checkbox"
-msgstr "بخشهای مورفولوژیکی را نشان بده"
+msgstr "انتخاب بخشهای واژه‏شناسی"
 
-#: ../ui/search-dialog.glade.h:95
+#: ../ui/search-dialog.glade.h:97
 msgid "Show Strong's Numbers"
-msgstr "شماره‌های استرانگ را نشان بده"
+msgstr "شماره‌های کشف‏اآیات استرانگ را نشان بده"
 
-#: ../ui/search-dialog.glade.h:96
+#: ../ui/search-dialog.glade.h:98
 msgid "Show Strong's Numbers checkbox"
-msgstr "شماره‌های استرانگ را نشان بده"
+msgstr "انتخاب شماره‌های کشف‏اآیات استرانگ"
 
-#: ../ui/search-dialog.glade.h:97
+#: ../ui/search-dialog.glade.h:99
 msgid "Show in main window"
-msgstr "پنجره اصلی را نشان بده"
+msgstr "نمایش پنجره اصلی"
 
-#: ../ui/search-dialog.glade.h:98
+#: ../ui/search-dialog.glade.h:100
 msgid "Single module"
 msgstr "مدول فردی"
 
-#: ../ui/search-dialog.glade.h:99
+#: ../ui/search-dialog.glade.h:101
 msgid "Single module radiobutton"
-msgstr "مدول فردی"
+msgstr "انتخاب مدول فردی"
 
-#: ../ui/search-dialog.glade.h:100
+#: ../ui/search-dialog.glade.h:102
 msgid "Start/stop searching"
 msgstr "شروع/ توقف جستجو"
 
-#: ../ui/search-dialog.glade.h:101
+#: ../ui/search-dialog.glade.h:103
 msgid "Strongs Numbers"
-msgstr "شماره‌‌های استرانگ"
+msgstr "شماره‌‌های کشف‏الآیات استرانگ"
 
-#: ../ui/search-dialog.glade.h:102
+#: ../ui/search-dialog.glade.h:104
 msgid "Strongs Numbers radiobutton"
-msgstr "شماره‌‌های استرانگ"
+msgstr "انتخاب شماره‌‌های کشف‏الآیات استرانگ"
 
-#: ../ui/search-dialog.glade.h:103
+#: ../ui/search-dialog.glade.h:105
 msgid "Use a custom module list for the search"
-msgstr "جهت جستجو از لیست غیراستاندارد استفاده کن"
+msgstr "لیست یک مدول غیر استاندارد را برای جستجو استفاده کن"
 
-#: ../ui/search-dialog.glade.h:104
+#: ../ui/search-dialog.glade.h:106
 msgid "Use a custom range for the scope of the search"
 msgstr "برای محدوده جستجو از محدوده غیر استاندارد استفاده کن"
 
-#: ../ui/search-dialog.glade.h:105
+#: ../ui/search-dialog.glade.h:107
 msgid "Use a single module for the search"
 msgstr "برای جستجو از مدول فردی استفاده کن"
 
-#: ../ui/search-dialog.glade.h:106
+#: ../ui/search-dialog.glade.h:108
 msgid "Use the current module list for the search"
 msgstr "برای جستجو از لیست فعلی استفاده کن"
 
-#: ../ui/search-dialog.glade.h:107
+#: ../ui/search-dialog.glade.h:109
 msgid "Use the results of the last search as the scope of the search"
-msgstr "نتایج جستجوی آخر را به عنوان محدوده جستجو بکار گیر"
+msgstr "نتایج جستجوی آخر را به مدول محدوده جستجو بکار گیر"
 
-#: ../ui/search-dialog.glade.h:108
+#: ../ui/search-dialog.glade.h:110
 msgid "e.g. Matt-John;Rev4"
-msgstr "متی، یوحنا، مکا"
+msgstr "مثلاً متی-یوحنا؛مکا۴"
 
-#: ../ui/search-dialog.glade.h:109
+#: ../ui/search-dialog.glade.h:111
 msgid "for "
-msgstr "برای"
+msgstr "برای "
 
 #: ../ui/xi-menus.glade.h:2
 msgid "About _Translation"
-msgstr "درباره ترجمه زیفوس"
+msgstr "دربارۀ ترجمه"
 
 #: ../ui/xi-menus.glade.h:3
 msgid "About _Xiphos"
-msgstr "درباره زیفوس"
+msgstr "دربارۀ زیفوس"
 
 #: ../ui/xi-menus.glade.h:4
-msgid "Add new folder to selected folder"
-msgstr "به قفسه انتخاب شده قفسه پرونده جدید اضافه کن"
+msgid "Add Item"
+msgstr "مورد اضافه کن"
+
+#: ../ui/xi-menus.glade.h:5
+msgid "Add Sub-Item"
+msgstr "زیر مورد اضافه کن"
 
 #: ../ui/xi-menus.glade.h:6
+msgid "Add a sub-item"
+msgstr "زیر مورد اضافه کن"
+
+#: ../ui/xi-menus.glade.h:7
+msgid "Add an item"
+msgstr "اضافه کردن مورد"
+
+#: ../ui/xi-menus.glade.h:8
+msgid "Add new folder to selected folder"
+msgstr "قفسۀ جدیدی را در این قفسه اضافه کن"
+
+#: ../ui/xi-menus.glade.h:10
 msgid "Allow Reordering"
 msgstr "ترتیب دوباره را اجازه بده"
 
-#: ../ui/xi-menus.glade.h:7
+#: ../ui/xi-menus.glade.h:11
 msgid "Allow items to be moved from one folder to another"
 msgstr "انتقال یک مورد را از قفسه‌ای به قفسه‌ای دیگر اجازه بده"
 
-#: ../ui/xi-menus.glade.h:8
-#, fuzzy
+#: ../ui/xi-menus.glade.h:12
 msgid "Annotate Verse"
-msgstr "آیه را عوض کن"
+msgstr "تفسیر یک آیه"
 
-#: ../ui/xi-menus.glade.h:10
+#: ../ui/xi-menus.glade.h:14
 msgid "Browse in BibleMap.org"
-msgstr ""
+msgstr "جستجو ی نقشه‏های کتاب‏مقدس در بایبل‏مپ"
 
-#: ../ui/xi-menus.glade.h:11
+#: ../ui/xi-menus.glade.h:15
 msgid "Collapse All"
-msgstr "فروریزی همه"
+msgstr "فروریزی تمام"
 
-#: ../ui/xi-menus.glade.h:12
+#: ../ui/xi-menus.glade.h:16
 msgid "Collapse all Bookmarks groups"
-msgstr "فروریزی همه گروههای علائم"
+msgstr "فروریزی تمام گروههای علائم"
 
-#: ../ui/xi-menus.glade.h:13
+#: ../ui/xi-menus.glade.h:17
 msgid "Commentary by Chapter"
-msgstr "تفسیر فصل به إصل"
+msgstr "تفسیر فصل به فصل"
 
-#: ../ui/xi-menus.glade.h:15
+#: ../ui/xi-menus.glade.h:19
+msgid "Create a new daily journal"
+msgstr "یجاد لیست  دعا روزانه"
+
+#: ../ui/xi-menus.glade.h:20
+msgid "Create a new monthly journal"
+msgstr "یجاد لیست دعا ماهیانه"
+
+#: ../ui/xi-menus.glade.h:21
+msgid "Create a new outlined topic"
+msgstr "یجاد لیست دعا موضوع زمینه"
+
+#: ../ui/xi-menus.glade.h:22
+msgid "Create a new simple prayer list"
+msgstr "ایجاد لیست سادۀ دعا"
+
+#: ../ui/xi-menus.glade.h:23
+msgid "Create a new subject prayer list"
+msgstr "یجاد لیست دعا درباره مرود"
+
+#: ../ui/xi-menus.glade.h:24
 msgid "D_ouble-Space Text"
 msgstr "متن را دوبرابر فاصله بده"
 
-#: ../ui/xi-menus.glade.h:16
+#: ../ui/xi-menus.glade.h:25
+msgid "Daily"
+msgstr "روزانه"
+
+#: ../ui/xi-menus.glade.h:26
 msgid "Delete Item"
 msgstr "حذف مورد"
 
-#: ../ui/xi-menus.glade.h:17
+#: ../ui/xi-menus.glade.h:27
 msgid "Delete item"
 msgstr "حذف مورد"
 
-#: ../ui/xi-menus.glade.h:18
+#: ../ui/xi-menus.glade.h:28
 msgid "Dictionar_y"
-msgstr "کتاب فرهنگ لغات"
+msgstr "فرهنگ واژه‏ها"
 
-#: ../ui/xi-menus.glade.h:19
+#: ../ui/xi-menus.glade.h:29
 msgid "Display Book Heading"
 msgstr "نمایش تیتر کتاب"
 
-#: ../ui/xi-menus.glade.h:20
+#: ../ui/xi-menus.glade.h:30
 msgid "Display Chapter Heading"
 msgstr "نمایش تیتر فصل"
 
-#: ../ui/xi-menus.glade.h:21
+#: ../ui/xi-menus.glade.h:31
 msgid "Dump Pers.Comm."
 msgstr "دور ریزی تفاسیر شخصی"
 
-#: ../ui/xi-menus.glade.h:23
+#: ../ui/xi-menus.glade.h:33
 msgid "Edit bookmark item"
 msgstr "ویرایش مورد علامت"
 
-#: ../ui/xi-menus.glade.h:24
+#: ../ui/xi-menus.glade.h:34
+msgid "Edit this item"
+msgstr "این مورد را ویرایش کن"
+
+#: ../ui/xi-menus.glade.h:35
 msgid "Expand All"
 msgstr "بسط همه"
 
-#: ../ui/xi-menus.glade.h:25
+#: ../ui/xi-menus.glade.h:36
 msgid "Expand all Bookmarks groups"
-msgstr "بسط همه گروههای علائم"
+msgstr "بسط همۀ گروههای علائم"
 
-#: ../ui/xi-menus.glade.h:32
+#: ../ui/xi-menus.glade.h:37
+msgid "Export Folder"
+msgstr "صادرت پرونده"
+
+#: ../ui/xi-menus.glade.h:38
+msgid "Export List"
+msgstr "صادرت لیست"
+
+#: ../ui/xi-menus.glade.h:45
 msgid "Image Content"
 msgstr "محتویات تصویر"
 
-#: ../ui/xi-menus.glade.h:33
+#: ../ui/xi-menus.glade.h:46
 msgid "Import Bibletime Bookmarks"
-msgstr "علائم را از نرم افزار بایبلتایم وارد کن"
+msgstr "علائم را از نرم افزار بایبل‏تایم وارد کن"
 
-#: ../ui/xi-menus.glade.h:34
+#: ../ui/xi-menus.glade.h:47
 msgid "Insert Bookmark"
-msgstr "علامت وارد کن"
+msgstr "ایجاد علامت"
 
-#: ../ui/xi-menus.glade.h:35
+#: ../ui/xi-menus.glade.h:48
 msgid "Insert new bookmark here"
 msgstr "علامت جدید را در اینجا وارد کن"
 
-#: ../ui/xi-menus.glade.h:36
+#: ../ui/xi-menus.glade.h:49
 msgid "L_ink Tabs"
-msgstr "پحوندگاه برگها "
+msgstr "بخش پیوندگاه"
 
-#: ../ui/xi-menus.glade.h:38
+#: ../ui/xi-menus.glade.h:51
 msgid "Load Bookmarks from Bibletime"
-msgstr "علائم را از نرم افزار بایبلتایم بارگذاری کن"
+msgstr "علائم را از نرم افزار بایبل‏تایم بارگذاری کن"
 
-#: ../ui/xi-menus.glade.h:39
+#: ../ui/xi-menus.glade.h:52
 msgid "Lookup Selection"
 msgstr "به گزیده نگاه کن"
 
-#: ../ui/xi-menus.glade.h:43
+#: ../ui/xi-menus.glade.h:54
+msgid "Monthly"
+msgstr "ماهانه"
+
+#: ../ui/xi-menus.glade.h:57
 msgid "Note"
 msgstr "یادداشت"
 
-#: ../ui/xi-menus.glade.h:44
+#: ../ui/xi-menus.glade.h:58
 msgid "Open Module"
 msgstr "بازکردن مدول"
 
-#: ../ui/xi-menus.glade.h:45
+#: ../ui/xi-menus.glade.h:59
 msgid "Open Study_pad"
 msgstr "یادداشت مطالعه‌ را باز کن"
 
-#: ../ui/xi-menus.glade.h:46
+#: ../ui/xi-menus.glade.h:60
 msgid "Open in a dialog"
-msgstr "یک ایالوگ باز کن"
+msgstr "یک دیالوگ باز کن"
 
-#: ../ui/xi-menus.glade.h:48
+#: ../ui/xi-menus.glade.h:61
+msgid "Open in a separate window"
+msgstr "در پنجرۀ تازه‏ای این را باز کن"
+
+#: ../ui/xi-menus.glade.h:62
+msgid "Open in editor"
+msgstr "در ویرایشگر باز کن"
+
+#: ../ui/xi-menus.glade.h:63
 msgid "Open in new tab"
 msgstr "در بخشی جدید باز کن"
 
-#: ../ui/xi-menus.glade.h:49
+#: ../ui/xi-menus.glade.h:64
+msgid ""
+"Open selected module in a\n"
+"\tseparate ['dialog'] window"
+msgstr "عنون باز کن در پنجاره جدید"
+
+#: ../ui/xi-menus.glade.h:66
+msgid "Open selected module in a new tab"
+msgstr "مدول انتخاب شده را در بخشی جدید باز کن"
+
+#: ../ui/xi-menus.glade.h:67
 msgid "Open this bookmark in a dialog"
 msgstr "این علامت را در دیالوگ باز کن"
 
-#: ../ui/xi-menus.glade.h:50
+#: ../ui/xi-menus.glade.h:68
 msgid "Open this bookmark in a new tab"
-msgstr "این علامت را در دیالوگ تازه باز کن"
+msgstr "این علامت را در بخشی تازه باز کن"
 
-#: ../ui/xi-menus.glade.h:52
-msgid "Read Selection Aloud"
-msgstr "گزیده را به صدای بلند بخوان"
-
-#: ../ui/xi-menus.glade.h:53
-msgid "Remove - Restore"
-msgstr "حذف - احیا"
+#: ../ui/xi-menus.glade.h:69
+msgid "Outlined"
+msgstr "زمینه‌ی"
 
-#: ../ui/xi-menus.glade.h:54
-msgid "Remove Folder"
-msgstr "قفسه پرونده را حذف کن"
+#: ../ui/xi-menus.glade.h:71
+msgid "Read Selection Aloud"
+msgstr "گزیده را با صدای بلند بخوان"
 
-#: ../ui/xi-menus.glade.h:55
+#: ../ui/xi-menus.glade.h:73
 msgid "Remove folder and save it"
-msgstr "قفسه پرونده را حذف کن و آن را ضبط نما"
+msgstr "پرونده را حذف کن و آن را ضبط نما"
 
-#: ../ui/xi-menus.glade.h:56
+#: ../ui/xi-menus.glade.h:74
+msgid "Remove this item"
+msgstr "این مورد را حذف کن"
+
+#: ../ui/xi-menus.glade.h:75
 msgid "Rename Pers.Comm."
 msgstr "نامگذاری جدید تفاسیر شخصی"
 
-#: ../ui/xi-menus.glade.h:57
+#: ../ui/xi-menus.glade.h:76
 msgid "Respect Font Faces"
-msgstr ""
+msgstr "پذیرش فونت به گونه‏ای که هست"
 
-#: ../ui/xi-menus.glade.h:58
+#: ../ui/xi-menus.glade.h:77
 msgid "Restore Folder"
-msgstr "قفسه پرونده را به حالت اول برگردان"
+msgstr "پرونده را به حالت اول برگردان"
 
-#: ../ui/xi-menus.glade.h:59
+#: ../ui/xi-menus.glade.h:78
 msgid "Restore saved folder"
-msgstr "قفسه پرونده ضبط شده را به حالت اول برگردان"
+msgstr "پروندۀ ذخیره شده را به حالت اول برگردان"
 
-#: ../ui/xi-menus.glade.h:60
+#: ../ui/xi-menus.glade.h:79
 msgid "Save list as a series of bookmarks"
-msgstr "نتایج جستجو را به یک لیست عنوان علامت ضبط کن"
+msgstr "لیست را بمدول لیستی از علائم ذخیره کن"
 
-#: ../ui/xi-menus.glade.h:61
+#: ../ui/xi-menus.glade.h:80
 msgid "Save list as a single bookmark"
-msgstr "نتایج جستجو را به عنوان علائم ضبط کن"
+msgstr "لیست را بمدول یک علامت ذخیره کن"
 
-#: ../ui/xi-menus.glade.h:62
+#: ../ui/xi-menus.glade.h:81
 msgid "Save these results as a series of bookmarks in their own folder"
-msgstr "نتایج جستجو را به  پرڤنده تازه عنوان علامت ضبط کن"
+msgstr "این نتایج را بمدول لیستی از علائم در پروندۀ من ذخیره کن"
 
-#: ../ui/xi-menus.glade.h:63
+#: ../ui/xi-menus.glade.h:82
 msgid "Save these results as a single bookmark"
-msgstr "نتایج جستجو را به عنوان علامت ضبط کن"
+msgstr "این نتایج را بمدول یک علامت در پروندۀ من ذخیره کن"
 
-#: ../ui/xi-menus.glade.h:64
+#: ../ui/xi-menus.glade.h:83
 msgid "Scripture Cross-references"
-msgstr "ارجاعات کتابمقدس"
+msgstr "ارجاعات کتاب‏مقدس"
 
-#: ../ui/xi-menus.glade.h:66
+#: ../ui/xi-menus.glade.h:85
 msgid "Show Parallel View in a _Tab"
-msgstr "نگرش به شکل موازی"
+msgstr "نگرش موازی در یک بخش"
 
-#: ../ui/xi-menus.glade.h:67
+#: ../ui/xi-menus.glade.h:86
 msgid "Show Previe_wer in the Sidebar"
-msgstr ""
+msgstr "مرورگر را در ستون جانبی نشان بده"
 
-#: ../ui/xi-menus.glade.h:68
+#: ../ui/xi-menus.glade.h:87
 msgid "Show Verse _Numbers"
 msgstr "شماره‌های آیات را نشان بده"
 
-#: ../ui/xi-menus.glade.h:71
+#: ../ui/xi-menus.glade.h:88
+msgid "Simple"
+msgstr "ساده"
+
+#: ../ui/xi-menus.glade.h:90
+msgid "Subject"
+msgstr "موضوع"
+
+#: ../ui/xi-menus.glade.h:92
 msgid "Unlock This Module"
 msgstr "قفل این مدول را باز کن"
 
-#: ../ui/xi-menus.glade.h:72
+#: ../ui/xi-menus.glade.h:93
 msgid "Use Current Dictionary"
-msgstr "لغتنامه فعلی را استفاده کن"
+msgstr "فرهنگ لغت فعلی را استفاده کن"
 
-#: ../ui/xi-menus.glade.h:73
+#: ../ui/xi-menus.glade.h:94
 msgid "Use module manager to install and remove Sword modules"
-msgstr "از مدیر مدولها به جهت نصب و یا حذف مدولها استفاده کن"
+msgstr "از مدیر مدول‏ها به جهت نصب و یا حذف مدول‏ها استفاده کن"
 
-#: ../ui/xi-menus.glade.h:74
+#: ../ui/xi-menus.glade.h:95
 msgid "Variants"
-msgstr "نسخه‌ها"
+msgstr "مغایرت‏ها"
 
-#: ../ui/xi-menus.glade.h:76
+#: ../ui/xi-menus.glade.h:97
 msgid "_About The SWORD Project"
-msgstr "درباره پروژه سورد"
+msgstr "_دربارۀ پروژه سورد"
 
-#: ../ui/xi-menus.glade.h:77
+#: ../ui/xi-menus.glade.h:98
 msgid "_Advanced Search"
-msgstr "جستجوی پیسرفته"
+msgstr "_جستجوی پیشرفته"
 
-#: ../ui/xi-menus.glade.h:78
+#: ../ui/xi-menus.glade.h:99
 msgid "_Attach/Detach Sidebar"
-msgstr "اضافه/حذف قفسه جانبی"
+msgstr "_اضافه/حذف ستون جانبی"
 
-#: ../ui/xi-menus.glade.h:79
+#: ../ui/xi-menus.glade.h:100
 msgid "_Bible"
-msgstr "کتابمقدس"
+msgstr "_کتاب‏مقدس"
 
-#: ../ui/xi-menus.glade.h:80
+#: ../ui/xi-menus.glade.h:101
 msgid "_Commentary/Book"
-msgstr "تفسیر"
+msgstr "_تفسیر/کتاب"
 
-#: ../ui/xi-menus.glade.h:81
+#: ../ui/xi-menus.glade.h:102
 msgid "_Contents"
-msgstr "محتویات"
+msgstr "_محتویات"
 
 # msgid "C_lear"
 # msgstr " پاک کن"
 # msgid "Clear history list"
 # msgstr "لیست سابقه را پاک کن"
-#: ../ui/xi-menus.glade.h:82
+#: ../ui/xi-menus.glade.h:103
 msgid "_Daily Devotion"
-msgstr "دعا و تفکر روزانه"
+msgstr "_دعا و تفکر روزانه"
 
-#: ../ui/xi-menus.glade.h:83
+#: ../ui/xi-menus.glade.h:104
 msgid "_Edit"
-msgstr "ویرایش"
+msgstr "_ویرایش"
 
-#: ../ui/xi-menus.glade.h:84
+#: ../ui/xi-menus.glade.h:105
 msgid "_Edit Item"
-msgstr "ویرایش مورد"
+msgstr "_ویرایش مورد"
 
-#: ../ui/xi-menus.glade.h:86
+#: ../ui/xi-menus.glade.h:107
 msgid "_Help"
-msgstr "کمک"
+msgstr "_کمک"
 
-#: ../ui/xi-menus.glade.h:87
+#: ../ui/xi-menus.glade.h:108
 msgid "_Highlight Current Verse"
-msgstr "آیه فعلی را علامت بگذار"
+msgstr "_آیۀ فعلی را علامت بگذار"
 
-#: ../ui/xi-menus.glade.h:88
+#: ../ui/xi-menus.glade.h:109
 msgid "_Live Chat"
-msgstr "گپ الکترونیکی"
+msgstr "_چت زنده"
 
-#: ../ui/xi-menus.glade.h:89
+#: ../ui/xi-menus.glade.h:110
 msgid "_Mailing List"
-msgstr "لیست  پست الکترونيک"
+msgstr "_لیست  پست الکترونيک"
 
-#: ../ui/xi-menus.glade.h:90
+#: ../ui/xi-menus.glade.h:111
 msgid "_Module Manager"
-msgstr "مدیر مدولهاا"
+msgstr "_مدیر مدول‏ها"
 
-#: ../ui/xi-menus.glade.h:91
+#: ../ui/xi-menus.glade.h:112
 msgid "_Open Session"
-msgstr "قسمت را باز کن"
+msgstr "_قسمت را باز کن"
 
-#: ../ui/xi-menus.glade.h:92
+#: ../ui/xi-menus.glade.h:113
 msgid "_Preferences"
-msgstr "ترجیحات"
+msgstr "_ترجیحات"
 
-#: ../ui/xi-menus.glade.h:93
+#: ../ui/xi-menus.glade.h:114
 msgid "_Preview"
-msgstr "پیش‌نگری"
+msgstr "_پیش‌نگری"
 
-#: ../ui/xi-menus.glade.h:94
+#: ../ui/xi-menus.glade.h:115
 msgid "_Read Aloud"
-msgstr "به صدای بلند بخوان"
+msgstr "_با صدای بلند بخوان"
 
-#: ../ui/xi-menus.glade.h:95
+#: ../ui/xi-menus.glade.h:116
 msgid "_Report Bug"
-msgstr "مشگل با برنامه؟"
+msgstr "_گزارش دادن مشکل در برنامه"
 
-#: ../ui/xi-menus.glade.h:96
+#: ../ui/xi-menus.glade.h:117
 msgid "_Save Session"
-msgstr "قسمت را ضبط کن"
+msgstr "_قسمت را ذخیره کن"
 
-#: ../ui/xi-menus.glade.h:97
+#: ../ui/xi-menus.glade.h:118
 msgid "_Search"
-msgstr "جستجو"
+msgstr "_جستجو"
 
-#: ../ui/xi-menus.glade.h:98
-msgid "_Show/Hide Sidebar"
-msgstr "آشکار/مخفی کردن قفسه جانبی"
+#: ../ui/xi-menus.glade.h:119
+msgid "_Show/Hide Attached Sidebar"
+msgstr "_ستون جانبی نمایش بده/نده"
 
-#: ../ui/xi-menus.glade.h:99
+#: ../ui/xi-menus.glade.h:120
 msgid "_Verse Per Line"
-msgstr "لیست آیات"
+msgstr "_یک آیه در هر خط"
 
 #: ../xiphos.desktop.in.in.h:1
 msgid "Study the Bible"
-msgstr "کتابمقدس چه می‌گوید؟"
+msgstr "کتاب‏مقدس چه می‌گوید؟"
 
 #: ../xiphos.desktop.in.in.h:2
 msgid "Xiphos Bible Guide"
-msgstr "زیفوس-نرم·افزار·مطالعه·کتابمقدس"
-
+msgstr "راهنمای کتاب‏مقدس زیفوس"
+
+#~ msgid "Xiphos could not execute archiver"
+#~ msgstr ""
+#~ "زیفوس نتوانست بایگانی‏ساز را راه "
+#~ "اندازی کند"
+#~ msgid ""
+#~ " archival result:\n"
+#~ "\n"
+#~ msgstr ""
+#~ " نتیجۀ منتج از بایگانی\n"
+#~ "\n"
+#~ msgid ""
+#~ "\n"
+#~ "Archive in "
+#~ msgstr ""
+#~ "\n"
+#~ "آرشیو کن در "
+#~ msgid "Sources"
+#~ msgstr "منابع"
+#~ msgid "Text"
+#~ msgstr "متن"
+#~ msgid "Text to render"
+#~ msgstr "ارائه متن"
+#~ msgid "Pixbuf Object"
+#~ msgstr "Pixbuf Object"
+#~ msgid "The pixbuf to render."
+#~ msgstr "The pixbuf to render."
+#~ msgid "Open in a new tab"
+#~ msgstr "در بخشی جدید باز کن"
+#~ msgid "Open selected module in a separate ['dialog'] window"
+#~ msgstr ""
+#~ "مدول انتخاب شده را در پنجرۀ ['دیالوگ'] باز "
+#~ "کن"
+#~ msgid "View information about the selected dialog"
+#~ msgstr ""
+#~ "مشاهدۀ اطلاعات مربوط به دیالوگ انتخاب "
+#~ "شده"
+#~ msgid "Create a new prayer list"
+#~ msgstr "ایجاد لیست جدید دعا"
+#~ msgid "Daily Journal"
+#~ msgstr "یادداشتهای روزانه"
+#~ msgid "Outlined Topic"
+#~ msgstr "موضوع مشخص شده"
+#~ msgid "Open selected module in a dialog"
+#~ msgstr "مدول انتخاب شده را در دیالوگ باز کن"
+#~ msgid "Add Child"
+#~ msgstr "اضافه کردن کودک"
+#~ msgid "Add Sibling"
+#~ msgstr "اضافه کردن خواهر و یا برادر"
+#~ msgid "Xiphos has renamed .xiphos-2.0 to .xiphos"
+#~ msgstr ""
+#~ "برنامۀ زیفوس نام برنامه را از زیفوس2.0 به "
+#~ "زیفوس تغییر داده است."
+#~ msgid ""
+#~ "Xiphos can not rename  .xiphos-2.0 to .xiphos:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Xiphos cannot continue."
+#~ msgstr ""
+#~ "زیفوس قادر به تغییر نام از زیفوس 2.0 به "
+#~ "زیفوس نیست:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "زیفوس قادر به ادامه نیست."
+#~ msgid "H_istory/<Separator>"
+#~ msgstr "سابقه/<Separator>"
+#~ msgid "H_istory/C_lear"
+#~ msgstr "سابقه/پاک شود"
+#~ msgid "Remove - Restore"
+#~ msgstr "حذف - احیا"
+#~ msgid "Remove Folder"
+#~ msgstr "حذف پرونده"
+#~ msgid "_Show/Hide Sidebar"
+#~ msgstr "آشکار/مخفی کردن ستون جانبی"
 #~ msgid "Move backwards through history"
 #~ msgstr "در سابقه به عقب برو"
-
 #~ msgid "Move foward through history"
 #~ msgstr "در سابقه به پیش برو"
-
 #~ msgid "Select a Book of the Bible"
 #~ msgstr "یکی از کتابهای کتابمقدس را انتخاب کن"
-
 #~ msgid "Change Chapter"
 #~ msgstr "فصل را عوض کن"
-
 #~ msgid "Enter a Verse reference in Book 1:1 format and press Return"
-#~ msgstr "آیه ارجاعی را در فرمت کتاب 1: 1 وارد کرده و برگشت کن"
-
+#~ msgstr ""
+#~ "آیه ارجاعی را در فرمت کتاب 1: 1 وارد کرده و "
+#~ "برگشت کن"
 #~ msgid "Dictionary/_Lexicon"
 #~ msgstr "کتاب فرهنگ"
-
 #~ msgid "_Bible Text"
 #~ msgstr "متون کتابمقدس"
-
 #~ msgid "Open StudyPad File"
 #~ msgstr "پرونده یادداشتهای مطالعه را باز کن"
-
 #~ msgid "Save StudyPad File"
 #~ msgstr "پرونده یادداشتهای مطالعه را ضبط کن"
-
 #~ msgid "item1"
-#~ msgstr "مورد1 "
-
+#~ msgstr "مورد1"
 #~ msgid "item2"
 #~ msgstr "مورد2"
-
 #~ msgid "_Module Options"
 #~ msgstr "ترجیحات مدول"
-
 #~ msgid "Sync with main"
 #~ msgstr "به اصل مرتبط کن"
-
 #~ msgid "Stay in sync"
 #~ msgstr "در ارتباط بمان"
-
 #~ msgid "Print"
 #~ msgstr "چاپ"
-
 #~ msgid "Print Preview"
 #~ msgstr "نگرش قبل از چاپ"
-
 #~ msgid "Failed to print the document"
 #~ msgstr "چاپ متن ممکن نشد"
-
 #~ msgid "Save List"
 #~ msgstr "لیست را ضبط کن"
-
 #~ msgid "_Modules"
 #~ msgstr "مدولها"
-
 #~ msgid "_Bookmarks"
 #~ msgstr "علامات"
-
 #~ msgid "Verse _List"
 #~ msgstr "لیست آیات"
-
 #~ msgid "%s not found"
 #~ msgstr "%s پیدا نشد"
-
 #~ msgid "has been modified. Do you wish to save it?"
 #~ msgstr "عوض شده است. آیا ضبط شود؟"
-
 #~ msgid "not loaded"
 #~ msgstr "بارگذاری نشده است"
-
 #~ msgid "Open the StudyPad editor"
 #~ msgstr "ویرایشگر یادداشت مطالعه را باز کن"
-
 #~ msgid "Open a saved session"
 #~ msgstr "قسمت ضبط شده را باز کن"
-
 #~ msgid "Save the current session to a file"
 #~ msgstr "قسمت فعلی را در یک پرونده ضبط کن"
-
 #~ msgid "_Copy"
 #~ msgstr "کپی"
-
 #~ msgid "Copy highlighted text from main window"
 #~ msgstr "متن گزیده شده از پنجره اصلی را کپی کن"
-
 #~ msgid "Search using the shortcut bar"
 #~ msgstr "جستجو با استفاده از بخش شورتکاتها"
-
 #~ msgid "Advanced search using the search dialog"
-#~ msgstr "جستجوی پیشرفته با استفاده از دیالوگ جستجو"
-
+#~ msgstr ""
+#~ "جستجوی پیشرفته با استفاده از دیالوگ "
+#~ "جستجو"
 #~ msgid "C_lear"
 #~ msgstr "پاک"
-
 #~ msgid "Clear history list"
 #~ msgstr "سابقه پاک شود"
-
 #~ msgid "Show the Daily Devotion for today"
 #~ msgstr "دعا و تفکر روزانه امروز را نشان بده"
-
 #~ msgid "Show or hide Bible texts window"
-#~ msgstr "پنجره متون کتابمقدس را آشکار و یا مخفی کن"
-
+#~ msgstr ""
+#~ "پنجره متون کتابمقدس را آشکار و یا مخفی کن"
 #~ msgid "Show or hide Preview window"
 #~ msgstr "پنجره پیش‌نگری را آشکار و یا مخفی کن"
-
 #~ msgid "Show or hide commentaries"
 #~ msgstr "تفاسیر را آشکار و یا مخفی کن"
-
 #~ msgid "Show or hide - dictionaries and lexicons"
 #~ msgstr "کتب فرهنگ را آشکار و یا مخفی کن"
-
 #~ msgid "Open the Xiphos manual"
 #~ msgstr "دستورالعمل زیفوس را باز کن"
-
 #~ msgid "Translating Xiphos to other languages"
 #~ msgstr "در حال ترجمه زیفوس به دیگر زبانها"
-
 #~ msgid "More information about the SWORD Project"
 #~ msgstr "اطلاعات بیشتر در مورد پروژه سورد؟"
-
 #~ msgid "About this application"
 #~ msgstr "درباره این برنامه"
+
diff --git a/po/fi.po b/po/fi.po
index da315ee..2ece489 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -5,69 +5,207 @@
 # This file is distributed under the same license as the Xiphos package.
 # Eerik Saarikalle <eerik.suuri@gmail.com> 2007
 # Eeli Kaikkonen <eeli.kaikkonen@gmail.com>
-# Eerik Saarikalle <eerik.suuri@gmail.com>, 2009.
 #
 #
+# Eerik Saarikalle <eerik.suuri@gmail.com>, 2009.
+# Eeli Kaikkonen <eekaikko@mail.student.oulu.fi>, 2009.
 msgid ""
 msgstr ""
 "Project-Id-Version: fi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-27 20:29+0200\n"
-"PO-Revision-Date: 2009-02-09 00:07+0200\n"
-"Last-Translator: Eeli Kaikkonen\n"
-"Language-Team: Finnish <en@li.org>\n"
+"POT-Creation-Date: 2009-12-14 23:45+0000\n"
+"PO-Revision-Date: 2009-12-16 15:01+0200\n"
+"Last-Translator: Eeli Kaikkonen <eekaikko@mail.student.oulu.fi>\n"
+"Language-Team: American English <kde-i18n-doc@kde.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
-"X-Generator: KBabel 1.11.4\n"
-
-#: ../xiphos.desktop.in.in.h:1
-msgid "Study the Bible"
-msgstr "Opiskele Raamattua"
-
-#: ../xiphos.desktop.in.in.h:2
-msgid "Xiphos Bible Guide"
-msgstr "Xiphos Raamattuopas"
+"X-Launchpad-Export-Date: 2009-12-11 04:39+0000\n"
+"X-Generator: Lokalize 1.0\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../src/backend/sword_main.cc:1154
+#: ../src/backend/sword_main.cc:1083
 msgid "Configuration not found"
 msgstr "Asetuksia ei löydetty"
 
-#: ../src/gecko/gecko-html.cpp:178 ../src/gnome2/html.c:161
+#: ../src/editor/bonobo-editor.c:254 ../src/editor/slib-editor.c:234
+#: ../src/gnome2/html.c:637
+#, c-format
+msgid "Page %d of %d"
+msgstr "Sivu %d / %d"
+
+#: ../src/editor/bonobo-editor.c:353 ../src/editor/slib-editor.c:659
+msgid "Are you sure you want to delete the note for"
+msgstr "Haluatko poistaa merkinnän"
+
+#: ../src/editor/bonobo-editor.c:965 ../src/editor/bonobo-editor.c:998
+#: ../src/editor/slib-editor.c:1308 ../src/editor/slib-editor.c:1345
+msgid "Save the changes to document"
+msgstr "Tallenna muutokset tiedostoon"
+
+#: ../src/editor/bonobo-editor.c:966 ../src/editor/bonobo-editor.c:999
+#: ../src/editor/slib-editor.c:1309 ../src/editor/slib-editor.c:1346
+msgid "before closing?"
+msgstr "ennen sulkemista?"
+
+#: ../src/editor/bonobo-editor.c:973 ../src/editor/bonobo-editor.c:1006
+#: ../src/editor/slib-editor.c:1316 ../src/editor/slib-editor.c:1353
+msgid "If you don't save, changes will be permanently lost."
+msgstr "Jos et tallenna, muutokset katoavat pysyvästi."
+
+#: ../src/editor/bonobo-editor.c:997 ../src/editor/slib-editor.c:1344
+#: ../ui/xi-menus.glade.h:39
+msgid "File"
+msgstr "Tiedosto"
+
+#: ../src/editor/bonobo-editor.c:1224 ../src/editor/slib-editor.c:1401
+msgid "StudyPad"
+msgstr "Opiskelumuistio"
+
+#: ../src/editor/bonobo-editor.c:1237 ../src/editor/slib-editor.c:1415
+msgid "Note Editor"
+msgstr "Muistiinpanojen muokkain"
+
+#: ../src/editor/bonobo-editor.c:1246 ../src/editor/slib-editor.c:1429
+msgid "Prayer List/Journal Editor"
+msgstr "Rukouslistan/päiväkirjan editori"
+
+#: ../src/editor/slib-editor.c:401 ../src/editor/slib-editor.c:448
+msgid "Save As"
+msgstr "Tallenna nimellä"
+
+#: ../src/editor/slib-editor.c:419 ../src/editor/slib-editor.c:466
+#: ../src/editor/slib-editor.c:634
+msgid "Untitled document"
+msgstr "Nimeämätön dokumentti"
+
+#: ../src/editor/slib-editor.c:702
+msgid "HTML Output"
+msgstr "HTML-tuloste"
+
+#: ../src/editor/slib-editor.c:709
+msgid "HTML Source"
+msgstr "HTML-lähdeteksti"
+
+#: ../src/editor/slib-editor.c:716
+msgid "Plain Source"
+msgstr "Muotoilematon lähdeteksti"
+
+#: ../src/editor/slib-editor.c:726 ../ui/editor_note.xml.h:15
+#: ../ui/editor_studypad.xml.h:21
+msgid "_Print..."
+msgstr "_Tulosta..."
+
+#: ../src/editor/slib-editor.c:733 ../ui/editor_note.xml.h:9
+#: ../ui/editor_studypad.xml.h:14
+msgid "Print Pre_view"
+msgstr "Tulostuksen esi_katselu"
+
+#: ../src/editor/slib-editor.c:740
+msgid "_Quit"
+msgstr "_Lopeta"
+
+#: ../src/editor/slib-editor.c:747
+msgid "_Open"
+msgstr "_Avaa"
+
+#: ../src/editor/slib-editor.c:754
+msgid "_Save"
+msgstr "_Tallenna"
+
+#: ../src/editor/slib-editor.c:761
+msgid "Save _As..."
+msgstr "Tallenna nimellä..."
+
+#: ../src/editor/slib-editor.c:767
+msgid "New"
+msgstr "Uusi"
+
+#: ../src/editor/slib-editor.c:769
+msgid "Open new document"
+msgstr "Avaa uusi dokumentti"
+
+#: ../src/editor/slib-editor.c:773
+msgid "Delete"
+msgstr "Poista"
+
+#: ../src/editor/slib-editor.c:775
+msgid "Delete current note"
+msgstr "Poista nykyinen teksti"
+
+#: ../src/editor/slib-editor.c:780 ../ui/editor_note.xml.h:14
+#: ../ui/editor_studypad.xml.h:20 ../ui/editor.xml.h:13
+#: ../ui/xi-menus.glade.h:106
+msgid "_File"
+msgstr "_Tiedosto"
+
+#: ../src/editor/slib-editor.c:835
+msgid "HTML _Output"
+msgstr "_HTML-muotoilu"
+
+#: ../src/editor/slib-editor.c:842
+msgid "_HTML Source"
+msgstr "HTML-lähdekoodi"
+
+#: ../src/editor/slib-editor.c:849
+msgid "_Plain Source"
+msgstr "_Muotoilematon lähdekoodi"
+
+#: ../src/editor/slib-editor.c:856 ../ui/xi-menus.glade.h:121
+msgid "_View"
+msgstr "_Näkymä"
+
+#: ../src/editor/slib-editor.c:867 ../ui/editor_note.xml.h:11
+#: ../ui/editor_studypad.xml.h:16 ../ui/editor.xml.h:11
+msgid "Save"
+msgstr "Tallenna"
+
+#: ../src/editor/slib-editor.c:878 ../src/editor/slib-editor.c:885
+msgid "Insert Link"
+msgstr "Lisää linkki"
+
+#: ../src/gecko/gecko-html.cpp:177 ../src/gnome2/html.c:165
 msgid "Unlock "
 msgstr "Poista lukitus "
 
-#: ../src/gecko/gecko-print.c:171
+#: ../src/gecko/gecko-print.c:172
 msgid "Preparing to print"
 msgstr "Valmistellaan tulostusta"
 
-#: ../src/gecko/gecko-print.c:265
+#: ../src/gecko/gecko-print.c:266
 msgid "Printing is not supported on this printer"
 msgstr "Tulostus tälle tulostimelle ei ole tuettu"
 
-#: ../src/gecko/gecko-print.c:268
+#: ../src/gecko/gecko-print.c:269
 #, c-format
 msgid "Printer %s does not support PostScript printing."
 msgstr "Tulostin %s ei tue PostScript-tulostusta."
 
-#: ../src/gecko/gecko-print.c:341 ../src/gecko/gecko-print.c:369
+#: ../src/gecko/gecko-print.c:342 ../src/gecko/gecko-print.c:370
 msgid "Printing"
 msgstr "Tulostaa"
 
-#: ../src/gecko/gecko-print.c:371
+#: ../src/gecko/gecko-print.c:372
 msgid "Waiting to print"
 msgstr "Odotetaan tulostusta"
 
-#: ../src/gecko/gecko-print.c:583
+#: ../src/gecko/gecko-print.c:584
 msgid "An error occurred while printing"
 msgstr "Tulostuksessa tapahtui virhe"
 
-#: ../src/gecko/gecko-print.c:587
+#: ../src/gecko/gecko-print.c:588
 #, c-format
 msgid "It was not possible to print your document: %s"
 msgstr "Dokumentin %s tulostus ei onnistunut"
 
+#: ../src/gnome2/about_modules.c:195
+msgid "About Sword Module"
+msgstr "Tietoa Swordin moduulista"
+
+#: ../src/gnome2/about_modules.c:389 ../src/gnome2/mod_mgr.c:252
+msgid "The module has no About information."
+msgstr "Moduulilla ei ole tietoja"
+
 #: ../src/gnome2/about_sword.c:88
 msgid ""
 "The SWORD Project is an effort to create an ever-expanding software package "
@@ -88,32 +226,142 @@ msgstr ""
 msgid "About the SWORD Project"
 msgstr "Tietoa SWORD-projektista"
 
-#: ../src/gnome2/about_sword.c:123
+#: ../src/gnome2/about_sword.c:124
 msgid "Sword Version"
 msgstr "Swordin versio"
 
-#: ../src/gnome2/about_sword.c:154
+#: ../src/gnome2/about_sword.c:155
 msgid "Books can be downloaded from the SWORD Project"
 msgstr "Kirjoja voidaan ladata SWORD-projektista"
 
-#: ../src/gnome2/about_sword.c:160
+#: ../src/gnome2/about_sword.c:161
 msgid "The SWORD Project"
 msgstr "SWORD-projekti"
 
-#: ../src/gnome2/navbar_versekey_editor.c:877
-#: ../src/gnome2/navbar_versekey_dialog.c:887
-#: ../src/gnome2/navbar_versekey_parallel.c:801
-#, fuzzy
-msgid "Synchronize this window from main window"
-msgstr "Näytä %s pääikkunassa"
+#: ../src/gnome2/about_trans.c:84
+msgid ""
+"Do you like using Xiphos to study the Bible? Would you like to see its "
+"display using your native language? You could translate Xiphos! \n"
+"\n"
+"We are always looking for contributions of new translations of Xiphos into "
+"other languages. If you are able to translate for us, please see the link "
+"below, contact us, and get involved with our efforts."
+msgstr ""
+"Pidätkö Xiphos-ohjelmasta? Haluatko nähdä sen käyttävän omaa kieltäsi? Voit "
+"kääntää Xiphoksen!\n"
+"\n"
+"Etsimme jatkuvasti kääntäjiä uusille kielille. Jos kykenet auttamaan "
+"kääntämisessä, käytä allaolevaa linkkiä, ota meihin yhteytttä ja tule mukaan "
+"työhömme."
 
-#: ../src/gnome2/about_modules.c:189
-msgid "About Sword Module"
-msgstr "Tietoa Swordin moduulista"
+#: ../src/gnome2/about_trans.c:98
+msgid "About Xiphos Translation"
+msgstr "Tietoa Xiphoksen käännöksestä"
 
-#: ../src/gnome2/about_modules.c:383 ../src/gnome2/mod_mgr.c:198
-msgid "The module has no About information."
+#: ../src/gnome2/about_trans.c:140
+msgid "See TRANSLATION-HOWTO in Xiphos source"
+msgstr "Katso TRANSLATION HOWTO Xiphoksen lähdekoodista"
+
+#: ../src/gnome2/about_trans.c:146
+msgid "Xiphos development"
+msgstr "Xiphoksen kehittäminen"
+
+#: ../src/gnome2/about_xiphos.c:131
+msgid "Copyright 2000-2009 The Xiphos Development Team"
+msgstr "Copyright 2000-2009 Xiphoksen kehitystiimi"
+
+#: ../src/gnome2/about_xiphos.c:134
+msgid ""
+"(formerly known as GnomeSword)\n"
+"\n"
+"Powered by The SWORD Project.\n"
+"We would like to thank Troy Griffitts and all the other folks who have given "
+"us The SWORD Project."
 msgstr ""
+"(tunnettu aiemmin nimellä GnomeSword\n"
+"\n"
+"Toimii SWORD-projektin avulla.\n"
+"Haluamme kiittää Troy Griffittsiä ja kaikkia muita, jotka ovat antaneet "
+"meille SWORD-projektin."
+
+#: ../src/gnome2/bibletext_dialog.c:358
+msgid "Go to "
+msgstr "Mene "
+
+#. info->stock_icon = GTK_STOCK_OPEN;
+#: ../src/gnome2/bookmark_dialog.c:171 ../src/gnome2/bookmarks_menu.c:358
+#: ../src/gnome2/bookmarks_menu.c:765 ../src/gnome2/bookmarks_menu.c:863
+#: ../src/gnome2/bookmarks_treeview.c:133 ../ui/editor_studypad.xml.h:2
+#: ../ui/xi-menus.glade.h:13
+msgid "Bookmark"
+msgstr "Kirjanmerkki"
+
+#: ../src/gnome2/bookmark_dialog.c:173 ../src/gnome2/bookmarks_menu.c:865
+#: ../src/gnome2/bookmarks_treeview.c:134
+msgid "Enter Folder Name"
+msgstr "Kirjoita kansion nimi"
+
+#: ../src/gnome2/bookmark_dialog.c:175 ../src/gnome2/bookmarks_menu.c:867
+msgid "Folder Name"
+msgstr "Kansion nimi"
+
+#: ../src/gnome2/bookmark_dialog.c:176 ../src/gnome2/bookmarks_menu.c:868
+#: ../src/gnome2/bookmarks_treeview.c:136
+msgid "Folder: "
+msgstr "Kansio: "
+
+#: ../src/gnome2/bookmarks_menu.c:344 ../ui/xi-menus.glade.h:32
+msgid "Edit"
+msgstr "Muokkaa"
+
+#: ../src/gnome2/bookmarks_menu.c:361
+msgid "Folder name: "
+msgstr "Kansion nimi: "
+
+#: ../src/gnome2/bookmarks_menu.c:364
+msgid "Bookmark name: "
+msgstr "Kirjanmerkin nimi: "
+
+#: ../src/gnome2/bookmarks_menu.c:367 ../src/gnome2/bookmarks_menu.c:773
+msgid "Verse: "
+msgstr "Jae: "
+
+#: ../src/gnome2/bookmarks_menu.c:368 ../src/gnome2/bookmarks_menu.c:774
+msgid "Module: "
+msgstr "Moduuli: "
+
+#: ../src/gnome2/bookmarks_menu.c:533
+msgid "Restore Bookmark Folder"
+msgstr "Palauta kirjanmerkkikansio"
+
+#: ../src/gnome2/bookmarks_menu.c:602
+msgid "Remove the selected folder"
+msgstr "Poista valittu kansio"
+
+#: ../src/gnome2/bookmarks_menu.c:604
+msgid "(and all its contents)?"
+msgstr "(ja kaikki sen sisältö)?"
+
+#: ../src/gnome2/bookmarks_menu.c:607
+msgid "Remove the selected bookmark"
+msgstr "Poista valitut kirjanmerkit"
+
+#: ../src/gnome2/bookmarks_menu.c:766
+msgid "Add"
+msgstr "Lisää"
+
+#: ../src/gnome2/bookmarks_menu.c:772
+msgid "Label: "
+msgstr "Etiketti: "
+
+#: ../src/gnome2/bookmarks_treeview.c:107
+#, c-format
+msgid "Search result: %s"
+msgstr "Haun tulos: %s"
+
+#: ../src/gnome2/bookmarks_treeview.c:943 ../src/gnome2/sidebar.c:1389
+msgid "Bookmarks"
+msgstr "Kirjanmerkit"
 
 #: ../src/gnome2/cipher_key_dialog.c:62
 msgid "Cipher Key?"
@@ -127,273 +375,413 @@ msgstr "moduulille:"
 msgid "Enter Cipher Key: "
 msgstr "Anna salausavain: "
 
-#: ../src/gnome2/parallel_view.c:271
-msgid "Copy"
-msgstr "Kopioi"
-
-#: ../src/gnome2/parallel_view.c:281
-msgid "Detach/Attach"
-msgstr "Liitä/Irrota"
-
-#: ../src/gnome2/parallel_view.c:287 ../ui/xi-menus.glade.h:38
-msgid "Module Options"
-msgstr "Moduulin asetukset"
-
-#. build change parallel modules submenu
-#: ../src/gnome2/parallel_view.c:302
-msgid "Change parallel 1"
-msgstr "Muuta rinnakkaisnäkymä 1"
-
-#: ../src/gnome2/parallel_view.c:304
-msgid "Change parallel 2"
-msgstr "Muuta rinnakkaisnäkymä 2"
-
-#: ../src/gnome2/parallel_view.c:306
-msgid "Change parallel 3"
-msgstr "Muuta rinnakkaisnäkymä 3"
+#: ../src/gnome2/dialog.c:265
+msgid "Close without Saving"
+msgstr "Sulje tallentamatta"
 
-#: ../src/gnome2/parallel_view.c:308
-msgid "Change parallel 4"
-msgstr "Muuta rinnakkaisnäkymä 4"
+#: ../src/gnome2/dialog.c:596
+msgid "Xiphos:"
+msgstr "Xiphos:"
 
-#: ../src/gnome2/parallel_view.c:310
-msgid "Change parallel 5"
-msgstr "Muuta rinnakkaisnäkymä 5"
+#: ../src/gnome2/dialog.c:697
+msgid "Close _without Saving"
+msgstr "Sulje _tallentamatta"
 
-#: ../src/gnome2/parallel_view.c:467 ../src/gnome2/sidebar.c:599
-#: ../src/gnome2/sidebar.c:605 ../src/gnome2/tabbed_browser.c:231
-#: ../src/main/sidebar.cc:618 ../src/main/sidebar.cc:956
-#: ../src/main/sidebar.cc:957 ../src/main/sidebar.cc:958
-msgid "Parallel View"
-msgstr "Rinnakkaisnäkymä"
+#: ../src/gnome2/export_dialog.c:267 ../ui/export-dialog.glade.h:20
+msgid "Please check copyright before exporting!"
+msgstr "Ole hyvä ja tarkista tekijänoikeudet ennen vientiä!"
 
-#: ../src/gnome2/find_dialog.c:200 ../src/gnome2/find_dialog.c:369
+#: ../src/gnome2/find_dialog.c:204 ../src/gnome2/find_dialog.c:373
 msgid "Find"
 msgstr "Etsi"
 
-#: ../src/gnome2/find_dialog.c:218
+#: ../src/gnome2/find_dialog.c:222
 msgid "Enter Word or Phrase"
 msgstr "Kirjoita sana tai fraasi"
 
-#: ../src/gnome2/find_dialog.c:234 ../src/gnome2/search_sidebar.c:303
-#: ../ui/search-dialog.glade.h:57
+#: ../src/gnome2/find_dialog.c:238 ../src/gnome2/search_sidebar.c:306
+#: ../ui/search-dialog.glade.h:59
 msgid "Match case"
 msgstr "Huomioi kirjainkoko"
 
-#: ../src/gnome2/find_dialog.c:241
+#: ../src/gnome2/find_dialog.c:245
 msgid "Search backwards"
 msgstr "Hae taaksepäin"
 
-#: ../src/gnome2/find_dialog.c:250 ../src/gnome2/search_sidebar.c:268
-#: ../ui/search-dialog.glade.h:74
+#: ../src/gnome2/find_dialog.c:254 ../src/gnome2/search_sidebar.c:271
+#: ../ui/search-dialog.glade.h:76
 msgid "Regular expression"
 msgstr "Säännöllinen lauseke"
 
-#: ../src/gnome2/find_dialog.c:291
+#: ../src/gnome2/find_dialog.c:295
 msgid "Find Next"
 msgstr "Etsi seuraava"
 
-#: ../src/gnome2/bibletext_dialog.c:525
-msgid "Go to "
-msgstr "Mene"
-
-#: ../src/gnome2/dialog.c:241
-msgid "Close without Saving"
-msgstr "Sulje tallentamatta"
-
-#: ../src/gnome2/dialog.c:730
-msgid "Xiphos:"
-msgstr "Xiphos:"
-
-#: ../src/gnome2/dialog.c:831
-msgid "Close _without Saving"
-msgstr "Sulje _tallentamatta"
-
-#: ../src/gnome2/font_dialog.c:297
+#: ../src/gnome2/font_dialog.c:303
 msgid "Set Module Font"
 msgstr "Aseta moduulin fontti"
 
-#: ../src/gnome2/font_dialog.c:327
+#: ../src/gnome2/font_dialog.c:333
 msgid "Change font for"
 msgstr "Vaihda fontti"
 
-#: ../src/gnome2/font_dialog.c:331
+#: ../src/gnome2/font_dialog.c:337
 msgid "Module"
 msgstr "Moduuli"
 
-#: ../src/gnome2/font_dialog.c:335
+#: ../src/gnome2/font_dialog.c:341
 msgid "Current font: "
 msgstr "Nykyinen fontti: "
 
-#: ../src/gnome2/font_dialog.c:372
+#: ../src/gnome2/font_dialog.c:378
 msgid "+0"
-msgstr ""
+msgstr "+0"
 
-#: ../src/gnome2/font_dialog.c:376
+#: ../src/gnome2/font_dialog.c:382
 msgid "Use the default font for this module"
 msgstr "Käytä oletusfonttia tälle moduulille"
 
-#: ../src/gnome2/toolbar_nav.c:416
-msgid "Move backwards through history"
-msgstr "Liiku taaksepäin historiassa"
+#. *****************************************************************************
+#. * Name
+#. *    gconf_setup
+#. *
+#. * Synopsis
+#. *   #include "main/settings.h"
+#. *
+#. *   void gconf_setup()
+#. *
+#. * Description
+#. *   verifies and initializes the GConf subsystem, so that "sword://" and
+#. *   similar can be handled by url-comprehending programs such as browsers.
+#. *   dialogs for permission/success/failure => conditional on debug build.
+#. *
+#. * Return value
+#. *   void
+#.
+#: ../src/gnome2/gui.c:110
+msgid ""
+"URL references using \"sword://\" (similar to web page\n"
+"references) can be used by programs to look up\n"
+"scripture references. Your system currently has no\n"
+"program set to handle these references.\n"
+"\n"
+"Would you like Xiphos to set itself as the\n"
+"program to handle these references?"
+msgstr ""
+"\"sword://\"-alkuisia URL-viittauksia (jotka ovat samankaltaisia\n"
+"veppisivujen viittausten kanssa) voidaan käyttää ohjelmistoissa\n"
+"viittaamaan raamatunpaikkoihin. Järjestelmässäsi ei tällä hetkellä\n"
+"ole asetettu ohjelmistoa käsittelemään näitä viittauksia.\n"
+"\n"
+"Haluatko, että Xiphos asentaa itsensä näiden viitausten\n"
+"käsittelijäksi?"
+
+#: ../src/gnome2/gui.c:112
+msgid ""
+"Xiphos has successfully set itself\n"
+"as the handler of sword:// and bible:// URLs.\n"
+"\n"
+"You may wish to run the program \"gconf-editor\"\n"
+"to examine keys under /desktop/gnome/url-handlers,\n"
+"if you need to change these."
+msgstr ""
+"Xiphos on onnistuneesti asennettu\n"
+"sword://- ja bible://-URL:ien käsittelijäksi.\n"
+"\n"
+"Voit käyttää ohjelmaa \"gconf-editor\"\n"
+"tutkiaksesi /desktop/gnome/url-handlers -polun\n"
+"alla olevia avaimia, jos niitä on tarvetta muuttaa."
+
+#: ../src/gnome2/gui.c:166
+#, c-format
+msgid ""
+"Xiphos failed to complete handler init for key #%d:\n"
+"%s"
+msgstr ""
+"Xiphos ei onnistunut muuttamaan käsittelijää avaimelle #%d:\n"
+"%s"
 
-#: ../src/gnome2/toolbar_nav.c:437
-msgid "Move foward through history"
-msgstr "Liiku eteenpäin historiassa"
+#: ../src/gnome2/gui.c:212
+msgid "BUG! Xiphos is about to crash due to a \"STRDUP\" error."
+msgstr "BUGI! Xiphos kaatuu virheen \"STRDUP\" takia."
 
-#: ../src/gnome2/toolbar_nav.c:458
-msgid "Select a Book of the Bible"
-msgstr "Valitse Raamatun kirja"
+#: ../src/gnome2/gui.c:213 ../src/gnome2/gui.c:248
+msgid "Please report this error to the Xiphos team with:"
+msgstr "Voit raportoida tämän virheen Xiphos-tiimille:"
 
-#: ../src/gnome2/toolbar_nav.c:523
-msgid "Change Chapter"
-msgstr "Vaihda kappaletta"
+#: ../src/gnome2/gui.c:247
+msgid "BUG! Xiphos is about to crash due to a \"STRING\" error."
+msgstr "BUGI! Xiphos kaatuu virheen \"STRING\" takia."
 
-#: ../src/gnome2/toolbar_nav.c:593
-msgid "Change Verse"
-msgstr "Vaihda jaetta"
+#: ../src/gnome2/main_window.c:789
+msgid "Xiphos - Bible Study Software"
+msgstr "Xiphos - Raamatunopiskeluohjelma"
 
-#: ../src/gnome2/toolbar_nav.c:661
-msgid "Enter a Verse reference in Book 1:1 format and press Return"
-msgstr "Anna viittaus muodossa Kirja 1:1 ja paina Return"
+#: ../src/gnome2/main_window.c:844
+msgid "Open a new tab"
+msgstr "Avaa uusi välilehti"
+
+#: ../src/gnome2/main_window.c:923 ../src/gnome2/sidebar.c:627
+#: ../src/gnome2/sidebar.c:633 ../src/main/sidebar.cc:666
+#: ../src/main/sidebar.cc:1015 ../src/main/sidebar.cc:1016
+#: ../src/main/sidebar.cc:1017
+msgid "Standard View"
+msgstr "Standardinäkymä"
 
-#: ../src/gnome2/mod_mgr.c:333
-msgid "Install these modules:"
-msgstr "Asenna seuraavat moduulit:"
+#: ../src/gnome2/main_window.c:1004
+msgid "Commentary View"
+msgstr "Kommentaarinäkymä"
 
-#: ../src/gnome2/mod_mgr.c:335
-msgid "Remove these modules:"
-msgstr "Poista seuraavat moduulit:"
+#: ../src/gnome2/main_window.c:1020
+msgid "Book View"
+msgstr "Kirjanäkymä"
 
-#: ../src/gnome2/mod_mgr.c:337
-msgid "Archive these modules:"
-msgstr "Arkistoi seuraavat moduulit:"
+#: ../src/gnome2/main_window.c:1045
+msgid "Welcome to Xiphos"
+msgstr "Tervetuloa Xiphokseen"
 
-#: ../src/gnome2/mod_mgr.c:339
+#: ../src/gnome2/menu_popup.c:1168
 msgid ""
-"Build fast-search index for these\n"
-"modules (may take minutes/module):"
+"Renaming is not available in Windows.\n"
+"\n"
+"Xiphos is limited by Windows' filesystem,\n"
+"because it disallows the renaming of filename\n"
+"components of currently-open files,\n"
+"such as the contents of this commentary.\n"
+"Therefore, personal commentary renaming is\n"
+"not available in the Windows environment."
+msgstr ""
+"Uudelleennimeäminen ei ole mahdollista Windowsissa.\n"
+"\n"
+"Windowsin tiedostojärjestelmä ei salli avattuna olevan\n"
+"tiedoston nimen muuttamista. Sen takia henkilökohtaisen\n"
+"kommentaarin uudelleennimeäminen ei ole käytössä\n"
+"Windows-ympäristössä."
+
+#: ../src/gnome2/menu_popup.c:1187
+msgid "Rename Commentary"
+msgstr "Uudelleennimeä kommentaari"
+
+#: ../src/gnome2/menu_popup.c:1190
+msgid "Choose Commentary Name"
+msgstr "Valitse kommentaarin nimi"
+
+#: ../src/gnome2/menu_popup.c:1192
+msgid "New Name"
+msgstr "Uusi nimi"
+
+#: ../src/gnome2/menu_popup.c:1193 ../src/gnome2/treekey-editor.c:139
+#: ../src/gnome2/treekey-editor.c:198 ../src/gnome2/treekey-editor.c:284
+#: ../src/main/prayerlists.cc:243
+msgid "Name: "
+msgstr "Nimi: "
+
+#: ../src/gnome2/menu_popup.c:1203 ../src/main/prayerlists.cc:257
+msgid "Module names must contain [A-Za-z0-9_] only."
+msgstr "Moduulin nimi saa sisältää vain merkkejä [A-Za-z0-9]."
+
+#: ../src/gnome2/menu_popup.c:1210 ../src/main/prayerlists.cc:264
+msgid "Xiphos already knows a module by that name."
+msgstr "Xiphos käyttää jo nimeä jollekin moduulille."
+
+#: ../src/gnome2/menu_popup.c:1253
+#, c-format
+msgid ""
+"Failed to create new configuration:\n"
+"%s"
 msgstr ""
-"Luo nope hakuindeksi näille moduuleille\n"
-"(voi kestää minuutteja/moduuli):"
+"Uusien asetusten luominen epäonnistui:\n"
+"%s"
 
-#: ../src/gnome2/mod_mgr.c:341
-msgid "Delete fast-search index for these modules:"
-msgstr "Tuhoa seuraavien moduulin hakuindeksit:"
+#: ../src/gnome2/menu_popup.c:1262
+msgid ""
+"Configuration build error:\n"
+"\n"
+msgstr ""
+"Asetusten muodostusvirhe:\n"
+"\n"
 
-#: ../src/gnome2/mod_mgr.c:361
-msgid "Preparing to install"
-msgstr "Valmistellaan asennusta"
+#: ../src/gnome2/mod_mgr.c:169
+msgid "Remove these modules?"
+msgstr "Poista nämä moduulit?"
 
-#: ../src/gnome2/mod_mgr.c:363
+#: ../src/gnome2/mod_mgr.c:170
 msgid "Preparing to remove"
 msgstr "Valmistellaan poistoa"
 
-#: ../src/gnome2/mod_mgr.c:365
-msgid "Preparing to archive"
-msgstr "Valmistellaan arkistointia"
+#: ../src/gnome2/mod_mgr.c:171
+msgid "Removing"
+msgstr "Poistetaan"
 
-#: ../src/gnome2/mod_mgr.c:367
-msgid "Preparing to index"
-msgstr "Valmistellaan indeksointia"
+#: ../src/gnome2/mod_mgr.c:172 ../ui/xi-menus.glade.h:72
+msgid "Remove"
+msgstr "Poista"
 
-#: ../src/gnome2/mod_mgr.c:369
-msgid "Preparing to delete index"
-msgstr "Valmistellaan indeksin poistoa"
+#: ../src/gnome2/mod_mgr.c:175
+msgid "Install these modules?"
+msgstr "Asenna nämä moduulit?"
+
+#: ../src/gnome2/mod_mgr.c:176
+msgid "Preparing to install"
+msgstr "Valmistellaan asennusta"
 
-#: ../src/gnome2/mod_mgr.c:394
+#: ../src/gnome2/mod_mgr.c:177
 msgid "Installing"
 msgstr "Asennetaan"
 
-#: ../src/gnome2/mod_mgr.c:396
-msgid "Removing"
-msgstr "Poistetaan"
+#: ../src/gnome2/mod_mgr.c:178 ../src/gnome2/mod_mgr.c:2964
+#: ../ui/module-manager.glade.h:18
+msgid "Install"
+msgstr "Asenna"
 
-#: ../src/gnome2/mod_mgr.c:398
+#: ../src/gnome2/mod_mgr.c:181
+msgid "Archive these modules?"
+msgstr "Arkistoi nämä moduulit?"
+
+#: ../src/gnome2/mod_mgr.c:182
+msgid "Preparing to archive"
+msgstr "Valmistellaan arkistointia"
+
+#: ../src/gnome2/mod_mgr.c:183
 msgid "Archiving"
 msgstr "Arkistoidaan"
 
-#: ../src/gnome2/mod_mgr.c:400
+#: ../src/gnome2/mod_mgr.c:184 ../ui/module-manager.glade.h:11
+msgid "Archive"
+msgstr "Arkistoi"
+
+#: ../src/gnome2/mod_mgr.c:187
+msgid ""
+"Build fast-search index for these\n"
+"modules (may take minutes/module)?"
+msgstr ""
+"Luo indeksi nopeaa hakua varten näille moduuleille\n"
+"(voi kestää minuutteja/moduuli)?"
+
+#: ../src/gnome2/mod_mgr.c:188
+msgid "Preparing to index"
+msgstr "Valmistellaan indeksointia"
+
+#: ../src/gnome2/mod_mgr.c:189
 msgid "Indexing"
 msgstr "Indeksoidaan"
 
-#: ../src/gnome2/mod_mgr.c:402
+#: ../src/gnome2/mod_mgr.c:190 ../ui/module-manager.glade.h:17
+msgid "Index"
+msgstr "Indeksoi"
+
+#: ../src/gnome2/mod_mgr.c:193
+msgid "Delete fast-search index for these modules?"
+msgstr "Poista nopean haun indeksit näiltä moduuleilta?"
+
+#: ../src/gnome2/mod_mgr.c:194
+msgid "Preparing to delete index"
+msgstr "Valmistellaan indeksin poistoa"
+
+#: ../src/gnome2/mod_mgr.c:195
 msgid "Deleting index"
 msgstr "Poistaan indeksiä"
 
-#: ../src/gnome2/mod_mgr.c:422
-#, c-format
-msgid ""
-"`mkdir %s' failed:\n"
-"%s."
-msgstr ""
-"`mkdir %s' epäonnistui:\n"
-"%s."
+#: ../src/gnome2/mod_mgr.c:196
+msgid "Deletion"
+msgstr "Poista"
+
+#: ../src/gnome2/mod_mgr.c:427
+msgid "Module Name"
+msgstr "Moduulin nimi"
 
 #: ../src/gnome2/mod_mgr.c:448
-msgid "Xiphos could not execute archiver"
-msgstr "Xiphos ei voinut suorittaa arkistointia"
+msgid "A checkmark means this module is already installed"
+msgstr "Valintamerkki tarkoittaa, että moduuli on jo asennettu"
 
-#: ../src/gnome2/mod_mgr.c:453
+#: ../src/gnome2/mod_mgr.c:470
+msgid "Click the box to work on this module"
+msgstr "Paina valintaruutua valitaksesi moduuli toimintoja varten"
+
+#: ../src/gnome2/mod_mgr.c:471
+msgid "Click the box to select this module for install/update"
+msgstr "Paina valintaruutua valitaksesi moduuli asennusta/päivitystä varten"
+
+#: ../src/gnome2/mod_mgr.c:490
+msgid "Installed"
+msgstr "Asennettu"
+
+#: ../src/gnome2/mod_mgr.c:500
 msgid ""
-" archival result:\n"
-"\n"
+"The index icon means you have built an optimized ('lucene') index for this "
+"module for fast searching (see the Maintenance pane for this function)"
 msgstr ""
-" arkistoinnin tulos:\n"
-"\n"
+"Indeksikuvake tarkoittaa, että moduulille on luotu optimoitu ('lucene') "
+"indeksi nopeaa hakua varten (ks. Ylläpito-paneeli)"
 
-#: ../src/gnome2/mod_mgr.c:457
+#: ../src/gnome2/mod_mgr.c:518
 msgid ""
-"\n"
-"Archive in "
+"The lock icon means this module is encrypted, and requires that you purchase "
+"an unlock key from the content owner"
 msgstr ""
-"\n"
-"Arkisto "
+"Lukkokuvake tarkoittaa, ettää moduuli on salattu ja vaatii "
+"salauksenpurkuavaimen ostoa sisällön omistajalta"
 
-#: ../src/gnome2/mod_mgr.c:514
-msgid "Journals and prayer lists cannot be indexed."
-msgstr "Rukouslistoja ja -päiväkirjoja ei voi indeksoida."
+#: ../src/gnome2/mod_mgr.c:535 ../ui/xi-menus.glade.h:1
+msgid "About"
+msgstr "Tietoa"
 
-#: ../src/gnome2/mod_mgr.c:535 ../src/gnome2/mod_mgr.c:2753
-#: ../ui/module-manager.glade.h:15
-msgid "Install"
-msgstr "Asenna"
+#: ../src/gnome2/mod_mgr.c:555
+msgid ""
+"The refresh icon means the Installed module is older than the newer "
+"Available module: You should update the module"
+msgstr ""
+"Uudelleenlatauskuvake tarkoittaa, että asennettu moduuli on vanhempi kuin "
+"saatavilla oleva: moduuli kannattaisi päivittää"
 
-#: ../src/gnome2/mod_mgr.c:537 ../src/gnome2/treekey-editor.c:315
-msgid "Remove"
-msgstr "Poista"
+#: ../src/gnome2/mod_mgr.c:567
+msgid "Available"
+msgstr "Saatavilla"
 
-#: ../src/gnome2/mod_mgr.c:539
-msgid "Archive"
-msgstr "Arkistoi"
+#: ../src/gnome2/mod_mgr.c:576
+msgid "Size"
+msgstr "Koko"
 
-#: ../src/gnome2/mod_mgr.c:541
-msgid "Index"
-msgstr "Indeksoi"
+#: ../src/gnome2/mod_mgr.c:585
+msgid "Description"
+msgstr "Kuvaus"
 
-#: ../src/gnome2/mod_mgr.c:543
-msgid "Deletion"
-msgstr "Poista"
+#: ../src/gnome2/mod_mgr.c:736
+#, c-format
+msgid ""
+"`mkdir %s' failed:\n"
+"%s."
+msgstr ""
+"`mkdir %s' epäonnistui:\n"
+"%s."
+
+#: ../src/gnome2/mod_mgr.c:759
+msgid " archived in: \n"
+msgstr " arkistoitu kohteeseen: \n"
+
+#: ../src/gnome2/mod_mgr.c:815
+msgid "Journals and prayer lists cannot be indexed."
+msgstr "Rukouslistoja ja -päiväkirjoja ei voi indeksoida."
 
-#: ../src/gnome2/mod_mgr.c:545
+#: ../src/gnome2/mod_mgr.c:833
 #, c-format
 msgid "%s failed"
 msgstr "%s epäonnistui"
 
-#: ../src/gnome2/mod_mgr.c:547 ../src/gnome2/mod_mgr.c:1267
+#: ../src/gnome2/mod_mgr.c:836 ../src/gnome2/mod_mgr.c:1562
 msgid "Finished"
 msgstr "Valmis"
 
-#: ../src/gnome2/mod_mgr.c:712 ../src/gnome2/mod_mgr.c:714
-#: ../src/gnome2/mod_mgr.c:816 ../src/gnome2/mod_mgr.c:851
-#: ../src/gnome2/mod_mgr.c:853 ../src/gnome2/utilities.c:346
-#: ../src/gnome2/utilities.c:411 ../src/gnome2/utilities.c:413
-#: ../src/gnome2/utilities.c:1031 ../src/main/sidebar.cc:801
-#: ../src/main/sidebar.cc:873 ../src/main/sidebar.cc:875
+#: ../src/gnome2/mod_mgr.c:1003 ../src/gnome2/mod_mgr.c:1005
+#: ../src/gnome2/mod_mgr.c:1107 ../src/gnome2/mod_mgr.c:1142
+#: ../src/gnome2/mod_mgr.c:1144 ../src/gnome2/utilities.c:435
+#: ../src/gnome2/utilities.c:500 ../src/gnome2/utilities.c:502
+#: ../src/gnome2/utilities.c:986 ../src/main/sidebar.cc:852
+#: ../src/main/sidebar.cc:924 ../src/main/sidebar.cc:926
 msgid "Unknown"
 msgstr "Tuntematon"
 
-#: ../src/gnome2/mod_mgr.c:1012
+#: ../src/gnome2/mod_mgr.c:1301
 #, c-format
 msgid ""
 "Repository:\n"
@@ -402,7 +790,7 @@ msgstr ""
 "Varasto:\n"
 "%s"
 
-#: ../src/gnome2/mod_mgr.c:1024
+#: ../src/gnome2/mod_mgr.c:1313
 msgid ""
 "Categorized by\n"
 "Module Type"
@@ -410,44 +798,44 @@ msgstr ""
 "Lajiteltu moduulin\n"
 "tyypin mukaan"
 
-#: ../src/gnome2/mod_mgr.c:1029 ../src/gnome2/utilities.c:472
-#: ../src/main/sidebar.cc:948 ../src/main/sidebar.cc:950
+#: ../src/gnome2/mod_mgr.c:1318 ../src/gnome2/utilities.c:561
+#: ../src/main/sidebar.cc:999 ../src/main/sidebar.cc:1001
 msgid "Biblical Texts"
 msgstr "Raamatulliset tekstit"
 
-#: ../src/gnome2/mod_mgr.c:1033 ../src/gnome2/utilities.c:476
-#: ../src/main/sidebar.cc:650 ../src/main/sidebar.cc:973
-#: ../src/main/sidebar.cc:975 ../ui/prefs.glade.h:33
+#: ../src/gnome2/mod_mgr.c:1322 ../src/gnome2/utilities.c:565
+#: ../src/main/sidebar.cc:678 ../src/main/sidebar.cc:1024
+#: ../src/main/sidebar.cc:1026 ../ui/prefs.glade.h:33
 msgid "Commentaries"
 msgstr "Kommentaarit"
 
-#: ../src/gnome2/mod_mgr.c:1037 ../src/gnome2/utilities.c:480
-#: ../src/main/sidebar.cc:982 ../src/main/sidebar.cc:984
+#: ../src/gnome2/mod_mgr.c:1326 ../src/gnome2/utilities.c:569
+#: ../src/main/sidebar.cc:1033 ../src/main/sidebar.cc:1035
 msgid "Dictionaries"
 msgstr "Sanakirjat"
 
-#: ../src/gnome2/mod_mgr.c:1041 ../src/gnome2/utilities.c:484
-#: ../src/main/sidebar.cc:991 ../src/main/sidebar.cc:993
+#: ../src/gnome2/mod_mgr.c:1330 ../src/gnome2/utilities.c:573
+#: ../src/main/sidebar.cc:1042 ../src/main/sidebar.cc:1044
 msgid "Daily Devotionals"
 msgstr "Päivittäiset hartaudet"
 
-#: ../src/gnome2/mod_mgr.c:1045 ../src/gnome2/utilities.c:488
-#: ../src/main/sidebar.cc:660 ../src/main/sidebar.cc:1000
-#: ../src/main/sidebar.cc:1002
+#: ../src/gnome2/mod_mgr.c:1334 ../src/gnome2/utilities.c:577
+#: ../src/main/sidebar.cc:688 ../src/main/sidebar.cc:1051
+#: ../src/main/sidebar.cc:1053
 msgid "General Books"
 msgstr "Yleiset kirjat"
 
-#: ../src/gnome2/mod_mgr.c:1049 ../src/gnome2/utilities.c:492
-#: ../src/main/sidebar.cc:1009 ../src/main/sidebar.cc:1011
+#: ../src/gnome2/mod_mgr.c:1338 ../src/gnome2/utilities.c:581
+#: ../src/main/sidebar.cc:1060 ../src/main/sidebar.cc:1062
 msgid "Maps"
 msgstr "Kartat"
 
-#: ../src/gnome2/mod_mgr.c:1053 ../src/gnome2/utilities.c:496
-#: ../src/main/sidebar.cc:1018 ../src/main/sidebar.cc:1020
+#: ../src/gnome2/mod_mgr.c:1342 ../src/gnome2/utilities.c:585
+#: ../src/main/sidebar.cc:1069 ../src/main/sidebar.cc:1071
 msgid "Images"
 msgstr "Kuvat"
 
-#: ../src/gnome2/mod_mgr.c:1061
+#: ../src/gnome2/mod_mgr.c:1350
 msgid ""
 "Categorized by\n"
 "Availability"
@@ -455,329 +843,384 @@ msgstr ""
 "Lajiteltu saatavuuden\n"
 "mukaan"
 
-#: ../src/gnome2/mod_mgr.c:1066
+#: ../src/gnome2/mod_mgr.c:1355
 msgid "Updates"
 msgstr "Päivitykset"
 
-#: ../src/gnome2/mod_mgr.c:1070
+#: ../src/gnome2/mod_mgr.c:1359
 msgid "Uninstalled"
 msgstr "Asentamaton"
 
-#: ../src/gnome2/mod_mgr.c:1074 ../src/gnome2/sidebar.c:616
-#: ../src/gnome2/utilities.c:501 ../src/main/prayerlists.cc:238
-#: ../src/main/sidebar.cc:1028 ../src/main/sidebar.cc:1030
+#: ../src/gnome2/mod_mgr.c:1363 ../src/gnome2/sidebar.c:643
+#: ../src/gnome2/utilities.c:590 ../src/main/prayerlists.cc:241
+#: ../src/main/sidebar.cc:1079 ../src/main/sidebar.cc:1081
 msgid "Prayer List/Journal"
 msgstr "Rukouslista/päiväkirja"
 
-#: ../src/gnome2/mod_mgr.c:1250
-msgid "Refreshing remote"
-msgstr "Yhdistetään"
-
-#: ../src/gnome2/mod_mgr.c:1261
-msgid "Remote not found"
-msgstr "Etäyhteyttä ei saatu"
-
-#: ../src/gnome2/mod_mgr.c:1393
-msgid "Module Name"
-msgstr "Moduulin nimi"
-
-#: ../src/gnome2/mod_mgr.c:1414
-msgid "A checkmark means this module is already installed"
-msgstr "Valintamerkki tarkoittaa, että moduuli on jo asennettu"
-
-#: ../src/gnome2/mod_mgr.c:1436
-msgid "Click the box to work on this module"
-msgstr "Paina valintaruutua valitaksesi moduuli toimintoja varten"
-
-#: ../src/gnome2/mod_mgr.c:1437
-msgid "Click the box to select this module for install/update"
-msgstr "Paina valintaruutua valitaksesi moduuli asennusta/päivitystä varten"
+#: ../src/gnome2/mod_mgr.c:1545
+msgid "Refreshing from remote source"
+msgstr "Virkistetään etälähteestä"
 
-#: ../src/gnome2/mod_mgr.c:1456
-msgid "Installed"
-msgstr "Asennettu"
+#: ../src/gnome2/mod_mgr.c:1556
+msgid "Remote source not found"
+msgstr "Etälähdettä ei löytynyt"
 
-#: ../src/gnome2/mod_mgr.c:1466
-msgid ""
-"The index icon means you have built an optimized ('lucene') index for this "
-"module for fast searching (see the Maintenance pane for this function)"
-msgstr ""
-"Indeksikuvake tarkoittaa, että moduulille on luotu optimoitu ('lucene') "
-"indeksi nopeaa hakua varten (ks. Ylläpito-paneeli)"
-
-#: ../src/gnome2/mod_mgr.c:1484
-msgid ""
-"The lock icon means this module is encrypted, and requires that you purchase "
-"an unlock key from the content owner"
-msgstr ""
-"Lukkokuvake tarkoittaa, ettää moduuli on salattu ja vaatii "
-"salauksenpurkuavaimen ostoa sisällön omistajalta"
-
-#. 2
-#: ../src/gnome2/mod_mgr.c:1501 ../src/gnome2/sidebar.c:954
-#: ../src/gnome2/sidebar.c:1122 ../ui/xi-menus.glade.h:1
-msgid "About"
-msgstr "Tietoa"
-
-#: ../src/gnome2/mod_mgr.c:1521
-msgid ""
-"The refresh icon means the Installed module is older than the newer "
-"Available module: You should update the module"
-msgstr ""
-"Uudelleenlatauskuvake tarkoittaa, että asennettu moduuli on vanhempi kuin "
-"saatavilla oleva: moduuli kannattaisi päivittää"
-
-#: ../src/gnome2/mod_mgr.c:1533
-msgid "Available"
-msgstr "Saatavilla"
-
-#: ../src/gnome2/mod_mgr.c:1542
-msgid "Size"
-msgstr "Koko"
-
-#: ../src/gnome2/mod_mgr.c:1551
-msgid "Description"
-msgstr "Kuvaus"
-
-#: ../src/gnome2/mod_mgr.c:1583 ../src/gnome2/mod_mgr.c:1660
+#: ../src/gnome2/mod_mgr.c:1670
 msgid "Configure"
 msgstr "Asetukset"
 
-#: ../src/gnome2/mod_mgr.c:1614
+#: ../src/gnome2/mod_mgr.c:1701
 msgid "Type"
 msgstr "Tyyppi"
 
-#: ../src/gnome2/mod_mgr.c:1621
+#: ../src/gnome2/mod_mgr.c:1708
 msgid "Caption"
 msgstr "Seloste"
 
-#: ../src/gnome2/mod_mgr.c:1629
+#: ../src/gnome2/mod_mgr.c:1716
 msgid "Source"
 msgstr "Lähde"
 
-#: ../src/gnome2/mod_mgr.c:1637
+#: ../src/gnome2/mod_mgr.c:1724
 msgid "Directory"
 msgstr "Kansio"
 
-#: ../src/gnome2/mod_mgr.c:1658
-msgid "Sources"
-msgstr "Lähteet"
+#: ../src/gnome2/mod_mgr.c:1732
+msgid "User"
+msgstr "Käyttäjä"
+
+#: ../src/gnome2/mod_mgr.c:1740
+msgid "Password"
+msgstr "Salasana"
+
+#: ../src/gnome2/mod_mgr.c:1748
+msgid "UID"
+msgstr "UID"
+
+#: ../src/gnome2/mod_mgr.c:1765
+msgid "Module Sources"
+msgstr "Moduulien lähteet"
+
+#: ../src/gnome2/mod_mgr.c:1768
+msgid "Add/Remove"
+msgstr "Lisää/Poista"
+
+#: ../src/gnome2/mod_mgr.c:1770
+msgid "Choose"
+msgstr "Valitse"
 
-#: ../src/gnome2/mod_mgr.c:1664 ../src/gnome2/sidebar.c:1462
-#: ../src/gnome2/preferences_dialog.c:1784
+#: ../src/gnome2/mod_mgr.c:1774 ../src/gnome2/preferences_dialog.c:1793
+#: ../src/gnome2/sidebar.c:1413
 msgid "Modules"
 msgstr "Moduulit"
 
-#: ../src/gnome2/mod_mgr.c:1666
+#: ../src/gnome2/mod_mgr.c:1776
 msgid "Install/Update"
 msgstr "Asenna/Päivitä"
 
-#: ../src/gnome2/mod_mgr.c:1668
+#: ../src/gnome2/mod_mgr.c:1778
 msgid "Maintenance"
 msgstr "Ylläpito"
 
-#: ../src/gnome2/mod_mgr.c:1872
+#: ../src/gnome2/mod_mgr.c:1999
 msgid "Please Refresh"
 msgstr "Lataa uudestaan"
 
-#: ../src/gnome2/mod_mgr.c:1873
+#: ../src/gnome2/mod_mgr.c:2000
 msgid "Your module list is not up to date!"
 msgstr "Moduulilistasi ei ole ajan tasalla!"
 
-#: ../src/gnome2/mod_mgr.c:2336 ../src/gnome2/mod_mgr.c:2542
+#. Zero Bibles is just not workable in Xiphos.
+#: ../src/gnome2/mod_mgr.c:2282
+msgid ""
+"You have uninstalled your last Bible.\n"
+"Xiphos requires at least one."
+msgstr ""
+"Olet poistanut viimeisen Raamatun. "
+"Xiphos tarvitsee ainakin yhden."
+
+#: ../src/gnome2/mod_mgr.c:2288
+msgid ""
+"There are still no Bibles installed.\n"
+"Xiphos cannot continue without one."
+msgstr ""
+"Yhtään Raamattua ei ole vielä asennettu. "
+"Xiphos ei voi jatkaa ilman raamattumoduulia."
+
+#: ../src/gnome2/mod_mgr.c:2353
+msgid "Standard remote sources have been loaded."
+msgstr "Vakioetälähteet on ladattu."
+
+#: ../src/gnome2/mod_mgr.c:2359
+msgid "Could not load standard sources from CrossWire."
+msgstr "Lähteiden lataaminen CrossWirelta ei onnistunut."
+
+#: ../src/gnome2/mod_mgr.c:2510 ../src/gnome2/mod_mgr.c:2759
 msgid "Remove the selected source"
 msgstr "Poista valittu lähde"
 
-#: ../src/gnome2/mod_mgr.c:2393
+#: ../src/gnome2/mod_mgr.c:2570
 msgid "Enter a remote source"
 msgstr "Lisää etälähde"
 
-#: ../src/gnome2/mod_mgr.c:2397
+#: ../src/gnome2/mod_mgr.c:2574
 msgid "Caption:"
 msgstr "Seloste:"
 
-#: ../src/gnome2/mod_mgr.c:2398
+#: ../src/gnome2/mod_mgr.c:2575
 msgid "Type:"
 msgstr "Tyyppi:"
 
-#: ../src/gnome2/mod_mgr.c:2399
+#: ../src/gnome2/mod_mgr.c:2576
 msgid "Host:"
 msgstr "Palvelin:"
 
-#: ../src/gnome2/mod_mgr.c:2400
+#: ../src/gnome2/mod_mgr.c:2577
 msgid "Directory:"
 msgstr "Kansio:"
 
+#: ../src/gnome2/mod_mgr.c:2579
+msgid "User (optional):"
+msgstr "Käyttäjä (ei pakollinen):"
+
+#: ../src/gnome2/mod_mgr.c:2580
+msgid "Password (optional):"
+msgstr "Salasana (valinnainen):"
+
 #. this can happen at most once
-#: ../src/gnome2/mod_mgr.c:2425
+#: ../src/gnome2/mod_mgr.c:2608
 msgid "A source by that name already exists."
 msgstr "Tämänniminen lähde on jo olemassa."
 
-#: ../src/gnome2/mod_mgr.c:2539
+#: ../src/gnome2/mod_mgr.c:2756
 msgid "Delete a remote source"
 msgstr "Tuhoa etälähde"
 
-#: ../src/gnome2/sidebar_dialog.c:135
-msgid "Sidebar"
-msgstr "Sivupalkki"
-
-#: ../src/gnome2/html.c:629
-#, c-format
-msgid "Page %d of %d"
-msgstr "Sivu %d / %d"
-
-#: ../src/gnome2/main_window.c:740
-msgid "Xiphos - Bible Study Software"
-msgstr "Xiphos - Raamatunopiskeluohjelma"
-
-#: ../src/gnome2/main_window.c:794
-msgid "Open a new tab"
-msgstr "Avaa uusi välilehti"
-
-#: ../src/gnome2/main_window.c:880 ../src/gnome2/sidebar.c:600
-#: ../src/gnome2/sidebar.c:606 ../src/main/sidebar.cc:638
-#: ../src/main/sidebar.cc:964 ../src/main/sidebar.cc:965
-#: ../src/main/sidebar.cc:966
-msgid "Standard View"
-msgstr "Standardinäkymä"
-
-#: ../src/gnome2/main_window.c:957
-msgid "Commentary View"
-msgstr "Kommentaarinäkymä"
-
-#: ../src/gnome2/main_window.c:973
-msgid "Book View"
-msgstr "Kirjanäkymä"
-
-#: ../src/gnome2/main_window.c:998
-#, fuzzy
-msgid "Welcome to Xiphos"
-msgstr "Tietoa _Xiphoksesta"
+#. *****************************************************************************
+#. * Name
+#. *   gui_open_mod_mgr
+#. *
+#. * Synopsis
+#. *   #include "gui/mod_mgr.h"
+#. *
+#. *   void gui_open_mod_mgr(void)
+#. *
+#. * Description
+#. *
+#. *
+#. * Return value
+#. *   void
+#.
+#: ../src/gnome2/mod_mgr.c:3244
+msgid ""
+"<b>Welcome to the Module Manager.</b>\n"
+"\n"
+"This is Xiphos' mechanism to get new and updated content.\n"
+"It appears you have never been here before, so please take a moment to look "
+"it over.\n"
+"(You will see this information box just once.)\n"
+"\n"
+"Modules come from different <u>repositories</u>.  <b>Module Sources: Add/"
+"Remove</b> will show you what repositories are currently known.\n"
+"\n"
+"<b>Module Sources: Choose</b> is for deciding from where modules should "
+"come, that is, from which repository Xiphos should obtain them, as well as "
+"where they should be placed on your system. Set <i>Install Source</i> and "
+"<i>Install Destination</i>, then click <i>Refresh</i>.\n"
+"\n"
+"<b>Modules: Install/Update</b> is for selecting and obtaining modules after "
+"choosing source and destination.\n"
+"\n"
+"<b>Modules: Maintenance</b> is for archive and index creation.\n"
+"\n"
+"See section 5 of our manual for Module Manager detail, or ask for help via "
+"Live Chat, or (if no one is responsive in chat) send mail to our users' "
+"mailing list.\n"
+msgstr ""
+"<b>Tervetuloa moduulienhallintaan.</b>\n"
+"\n"
+"Tämä on Xiphoksen tapa hakea uutta ja päivitettyä sisältöä.\n"
+"Näyttää siltä, ettet ole aiemmin ollut täällä, joten tutustu tähän hetkinen."
+"\n"
+"(Tämä näytetään vain kerran.)\n"
+"\n"
+"Moduulit tulevat eri <u>varastoista</u> (repository). <b>Moduulien lähteet: "
+"Lisää/Poista</b> näyttää, mitkä varastot ovat tällä hetkellä tiedossa.\n"
+"\n"
+"<b>Moduulien lähteet: Valitse</b> valitsee, mistä varastosta Xiphos hakee "
+"moduulit, ja myös, minne ne asennetaan järjestelmässäsi. Aseta <i>"
+"Asennuslähde</i> ja <i>Asennuskohde</i> ja paina <i>Virkistä</i>.\n"
+"\n"
+"<b>Moduulit: Asenna/Päivitä</b> valitsee ja hakee moduulit, kun lähde ja "
+"kohde on ensin valittu.\n"
+"\n"
+"<b>Moduulit: Ylläpito</b> arkistoi moduuleja ja hallinnoi indeksejä.\n"
+"\n"
+"Tarkempia tietoja löytyy käsikirjan kohdasta \"Moduulien hallinta\", tai "
+"voit kysyä apua LIve Chatin kautta, tai "
+"(jos chatissa ei vastata) voit lähettää sähköpostia käyttäjien "
+"sähköpostilistalle.\n"
 
-#: ../src/gnome2/navbar_book.c:359 ../src/gnome2/navbar_book_dialog.c:299
+#: ../src/gnome2/navbar_book.c:359 ../src/gnome2/navbar_book_dialog.c:300
 msgid "Go outward, to the section containing this one"
 msgstr "Siirry ulospäin jaksoon joka sisältää tämän"
 
-#: ../src/gnome2/navbar_book.c:375 ../src/gnome2/navbar_book_dialog.c:315
+#: ../src/gnome2/navbar_book.c:375 ../src/gnome2/navbar_book_dialog.c:316
 msgid "Go to previous item"
 msgstr "Mene edelliseen jaksoon"
 
-#: ../src/gnome2/navbar_book.c:390 ../src/gnome2/navbar_book_dialog.c:330
+#: ../src/gnome2/navbar_book.c:390 ../src/gnome2/navbar_book_dialog.c:331
 msgid "Go to next item"
 msgstr "Mene seuraavaan jaksoon"
 
-#: ../src/gnome2/navbar_book.c:406 ../src/gnome2/navbar_book_dialog.c:346
+#: ../src/gnome2/navbar_book.c:406 ../src/gnome2/navbar_book_dialog.c:347
 msgid "Go inward, to the first subsection"
 msgstr "Siirry sisäänpäin, ensimmäiseen alijaksoon"
 
-#. 0
-#: ../src/gnome2/sidebar.c:942 ../src/gnome2/sidebar.c:1110
-msgid "Open in a new tab"
-msgstr "Avaa uudessa välilehdessä"
+#: ../src/gnome2/navbar_versekey_dialog.c:864
+#: ../src/gnome2/navbar_versekey_editor.c:879
+#: ../src/gnome2/navbar_versekey_parallel.c:810
+msgid "Synchronize this window from main window"
+msgstr "Synkronoi tämä ikkuna pääikkunan kanssa"
 
-#: ../src/gnome2/sidebar.c:943 ../src/gnome2/sidebar.c:1111
-msgid "Open selected module in a new tab"
-msgstr "Avaa valittu moduuli uudessa välilehdessä"
+#: ../src/gnome2/parallel_dialog.c:328 ../src/gnome2/preferences_dialog.c:1799
+msgid "Parallel"
+msgstr "Rinnakkaisnäkymä"
 
-#. 1
-#: ../src/gnome2/sidebar.c:948
-msgid "Open in a separate window"
-msgstr "Avaa erillisessä ikkunassa"
+#: ../src/gnome2/parallel_view.c:275
+msgid "Copy"
+msgstr "Kopioi"
 
-#: ../src/gnome2/sidebar.c:949
-msgid "Open selected module in a separate ['dialog'] window"
-msgstr "Avaa valittu moduuli dialogissa"
+#: ../src/gnome2/parallel_view.c:285
+msgid "Detach/Attach"
+msgstr "Liitä/Irrota"
 
-#: ../src/gnome2/sidebar.c:955 ../src/gnome2/sidebar.c:1123
-msgid "View information about the selected dialog"
-msgstr "Katsele tietoa valitusta dialogista"
+#: ../src/gnome2/parallel_view.c:291 ../ui/xi-menus.glade.h:53
+msgid "Module Options"
+msgstr "Moduulin asetukset"
 
-#: ../src/gnome2/sidebar.c:1046
-msgid "Simple"
-msgstr "Yksinkertainen"
+#. build change parallel modules submenu
+#: ../src/gnome2/parallel_view.c:306
+msgid "Change parallel 1"
+msgstr "Muuta rinnakkaisnäkymä 1"
 
-#: ../src/gnome2/sidebar.c:1047
-msgid "Create a new simple prayer list"
-msgstr "Luo uusi yksinkertainen rukouslista"
+#: ../src/gnome2/parallel_view.c:308
+msgid "Change parallel 2"
+msgstr "Muuta rinnakkaisnäkymä 2"
 
-#: ../src/gnome2/sidebar.c:1053
-msgid "Subject"
-msgstr "Aihe"
+#: ../src/gnome2/parallel_view.c:310
+msgid "Change parallel 3"
+msgstr "Muuta rinnakkaisnäkymä 3"
 
-#: ../src/gnome2/sidebar.c:1060
-msgid "Monthly"
-msgstr "Kuukausittainen"
+#: ../src/gnome2/parallel_view.c:312
+msgid "Change parallel 4"
+msgstr "Muuta rinnakkaisnäkymä 4"
 
-#: ../src/gnome2/sidebar.c:1061 ../src/gnome2/sidebar.c:1068
-#: ../src/gnome2/sidebar.c:1075
-msgid "Create a new prayer list"
-msgstr "Luo uusi rukouslista"
+#: ../src/gnome2/parallel_view.c:314
+msgid "Change parallel 5"
+msgstr "Muuta rinnakkaisnäkymä 5"
 
-#: ../src/gnome2/sidebar.c:1067
-msgid "Daily Journal"
-msgstr "Päiväkirja"
+#: ../src/gnome2/parallel_view.c:471 ../src/gnome2/sidebar.c:626
+#: ../src/gnome2/sidebar.c:632 ../src/gnome2/tabbed_browser.c:262
+#: ../src/main/sidebar.cc:646 ../src/main/sidebar.cc:1007
+#: ../src/main/sidebar.cc:1008 ../src/main/sidebar.cc:1009
+msgid "Parallel View"
+msgstr "Rinnakkaisnäkymä"
 
-#: ../src/gnome2/sidebar.c:1074
-msgid "Outlined Topic"
-msgstr "Aiheen hahmotelma"
+#: ../src/gnome2/preferences_dialog.c:1179
+#: ../src/gnome2/preferences_dialog.c:1217
+#: ../src/gnome2/preferences_dialog.c:1254
+#: ../src/gnome2/preferences_dialog.c:1289
+#: ../src/gnome2/preferences_dialog.c:1323
+#: ../src/gnome2/preferences_dialog.c:1356
+#: ../src/gnome2/preferences_dialog.c:1388
+#: ../src/gnome2/preferences_dialog.c:1421
+#: ../src/gnome2/preferences_dialog.c:1453
+#: ../src/gnome2/preferences_dialog.c:1487
+#: ../src/gnome2/preferences_dialog.c:1522
+#: ../src/gnome2/preferences_dialog.c:1557
+#: ../src/gnome2/preferences_dialog.c:1593
+#: ../src/gnome2/preferences_dialog.c:1631
+#: ../src/gnome2/preferences_dialog.c:2052
+msgid "-- Select --"
+msgstr "-- Valitse --"
 
-#. 1
-#: ../src/gnome2/sidebar.c:1116 ../ui/xi-menus.glade.h:45
-msgid "Open in editor"
-msgstr "Avaa editorissa"
+#: ../src/gnome2/preferences_dialog.c:1652
+msgid "Locale will take effect after restart."
+msgstr "Paikallisuusasetus astuu voimaan uudellenkäynnistyksen jälkeen."
 
-#: ../src/gnome2/sidebar.c:1117
-msgid "Open selected module in a dialog"
-msgstr "Avaa valittu moduuli dialogissa"
+#: ../src/gnome2/preferences_dialog.c:1687 ../ui/prefs.glade.h:74
+msgid "Preferences"
+msgstr "Asetukset"
 
-#: ../src/gnome2/sidebar.c:1438 ../src/gnome2/bookmarks_treeview.c:934
-msgid "Bookmarks"
-msgstr "Kirjanmerkit"
+#: ../src/gnome2/preferences_dialog.c:1769
+msgid "Fonts"
+msgstr "Kirjasinlajit"
 
-#: ../src/gnome2/sidebar.c:1446
-msgid "Search"
-msgstr "Haku"
+#: ../src/gnome2/preferences_dialog.c:1772
+msgid "Color"
+msgstr "Väri"
 
-#: ../src/gnome2/sidebar.c:1454
-msgid "Verse List"
-msgstr "Jaelista"
+#: ../src/gnome2/preferences_dialog.c:1775
+msgid "Sizes"
+msgstr "Koot"
+
+#: ../src/gnome2/preferences_dialog.c:1779
+msgid "General"
+msgstr "Yleinen"
+
+#: ../src/gnome2/preferences_dialog.c:1782 ../ui/prefs.glade.h:87
+msgid "Tabs and Panes"
+msgstr "Välilehdet ja paneelit"
+
+#: ../src/gnome2/preferences_dialog.c:1789
+msgid "Options"
+msgstr "Vaihtoehdot"
+
+#: ../src/gnome2/preferences_dialog.c:1796
+msgid "Main"
+msgstr "Yleinen"
 
-#: ../src/gnome2/search_dialog.c:61 ../src/main/search_dialog.cc:60
-#: ../src/main/search_sidebar.cc:54
+#: ../src/gnome2/preferences_dialog.c:1802
+msgid "Special"
+msgstr "Erityiset"
+
+#: ../src/gnome2/search_dialog.c:68 ../src/main/search_dialog.cc:66
+#: ../src/main/search_sidebar.cc:61
 msgid "Searching the "
-msgstr "Haetaan"
+msgstr "Haetaan "
 
-#: ../src/gnome2/search_dialog.c:62 ../src/main/search_dialog.cc:61
-#: ../src/main/search_sidebar.cc:55
+#: ../src/gnome2/search_dialog.c:69 ../src/main/search_dialog.cc:67
+#: ../src/main/search_sidebar.cc:62
 msgid " Module"
-msgstr "Moduuli"
+msgstr " Moduuli"
 
-#: ../src/gnome2/search_dialog.c:63 ../src/main/search_dialog.cc:62
-#: ../src/main/search_sidebar.cc:56
+#: ../src/gnome2/search_dialog.c:70 ../src/main/search_dialog.cc:68
+#: ../src/main/search_sidebar.cc:63
 msgid "found in "
 msgstr "löydetty "
 
-#: ../src/gnome2/search_dialog.c:498
+#: ../src/gnome2/search_dialog.c:527
 msgid "Clear List?"
 msgstr "Tyhjennä lista?"
 
-#: ../src/gnome2/search_dialog.c:499
+#: ../src/gnome2/search_dialog.c:528
 msgid "Are you sure you want to clear the module list?"
 msgstr "Haluatko varmasti tyhjentää moduulilistan?"
 
-#: ../src/gnome2/search_dialog.c:682
+#: ../src/gnome2/search_dialog.c:708
 msgid "The last module list may not be deleted"
 msgstr "Viimeistä moduulilistaa ei voi poistaa"
 
-#: ../src/gnome2/search_dialog.c:699
+#: ../src/gnome2/search_dialog.c:726
 msgid "Delete list?"
 msgstr "Poista lista?"
 
-#: ../src/gnome2/search_dialog.c:700
+#: ../src/gnome2/search_dialog.c:727
 msgid "Are you sure you want to delete:"
 msgstr "Haluatko varmasti poistaa:"
 
-#: ../src/gnome2/search_sidebar.c:189
+#: ../src/gnome2/search_sidebar.c:192
 msgid ""
 "This is an inclusive (\"AND\") search:\n"
 "Find matches showing all words."
@@ -785,575 +1228,390 @@ msgstr ""
 "Tämä on JA-haku:\n"
 "Näyttää tulokset jotka sisältävät kaikki sanat."
 
-#: ../src/gnome2/search_sidebar.c:206
+#: ../src/gnome2/search_sidebar.c:209
 msgid "Search Module"
 msgstr "Hae moduulista"
 
-#: ../src/gnome2/search_sidebar.c:220
+#: ../src/gnome2/search_sidebar.c:223
 msgid "Bible"
 msgstr "Raamattu"
 
-#: ../src/gnome2/search_sidebar.c:229 ../ui/prefs.glade.h:35
+#: ../src/gnome2/search_sidebar.c:232 ../ui/prefs.glade.h:35
 msgid "Commentary"
 msgstr "Kommentaari"
 
-#: ../src/gnome2/search_sidebar.c:243
+#: ../src/gnome2/search_sidebar.c:246
 msgid "Search Type"
 msgstr "Hakutapa"
 
-#: ../src/gnome2/search_sidebar.c:257 ../ui/search-dialog.glade.h:64
+#: ../src/gnome2/search_sidebar.c:260 ../ui/search-dialog.glade.h:66
 msgid "Multi word"
 msgstr "Monta sanaa"
 
-#: ../src/gnome2/search_sidebar.c:276 ../ui/search-dialog.glade.h:44
+#: ../src/gnome2/search_sidebar.c:279 ../ui/search-dialog.glade.h:44
 msgid "Exact phrase"
 msgstr "Tarkka fraasi"
 
-#: ../src/gnome2/search_sidebar.c:290
+#: ../src/gnome2/search_sidebar.c:293
 msgid "Search Options"
 msgstr "Hakuasetukset"
 
-#: ../src/gnome2/search_sidebar.c:318
+#: ../src/gnome2/search_sidebar.c:321
 msgid "Search Scope"
 msgstr "Haun laajuus"
 
-#: ../src/gnome2/search_sidebar.c:331
+#: ../src/gnome2/search_sidebar.c:334
 msgid "No scope"
 msgstr "Ei laajuutta"
 
-#: ../src/gnome2/search_sidebar.c:341
+#: ../src/gnome2/search_sidebar.c:344
 msgid "Use bounds"
 msgstr "Käytä rajoja"
 
-#: ../src/gnome2/search_sidebar.c:350
+#: ../src/gnome2/search_sidebar.c:353
 msgid "Last search"
 msgstr "Viimeisin haku"
 
-#: ../src/gnome2/search_sidebar.c:365
+#: ../src/gnome2/search_sidebar.c:368
 msgid "Bounds"
 msgstr "Rajat"
 
-#: ../src/gnome2/search_sidebar.c:379
+#: ../src/gnome2/search_sidebar.c:382
 msgid "Lower"
 msgstr "Alempi"
 
-#: ../src/gnome2/search_sidebar.c:386
+#: ../src/gnome2/search_sidebar.c:389
 msgid "Upper"
 msgstr "Ylempi"
 
-#. info->stock_icon = GTK_STOCK_OPEN;
-#: ../src/gnome2/bookmark_dialog.c:145 ../src/gnome2/bookmarks_menu.c:471
-#: ../src/gnome2/bookmarks_menu.c:897 ../src/gnome2/bookmarks_menu.c:995
-#: ../src/gnome2/bookmarks_treeview.c:131 ../ui/editor_studypad.xml.h:2
-#: ../ui/xi-menus.glade.h:8
-msgid "Bookmark"
-msgstr "Kirjanmerkki"
-
-#: ../src/gnome2/bookmark_dialog.c:147 ../src/gnome2/bookmarks_menu.c:997
-#: ../src/gnome2/bookmarks_treeview.c:132
-msgid "Enter Folder Name"
-msgstr "Kirjoita kansion nimi"
-
-#: ../src/gnome2/bookmark_dialog.c:149 ../src/gnome2/bookmarks_menu.c:999
-msgid "Folder Name"
-msgstr "Kansion nimi"
-
-#: ../src/gnome2/bookmark_dialog.c:150 ../src/gnome2/bookmarks_menu.c:1000
-#: ../src/gnome2/bookmarks_treeview.c:134
-msgid "Folder: "
-msgstr "Kansio: "
-
-#: ../src/gnome2/preferences_dialog.c:1231
-#: ../src/gnome2/preferences_dialog.c:1269
-#: ../src/gnome2/preferences_dialog.c:1306
-#: ../src/gnome2/preferences_dialog.c:1341
-#: ../src/gnome2/preferences_dialog.c:1375
-#: ../src/gnome2/preferences_dialog.c:1408
-#: ../src/gnome2/preferences_dialog.c:1440
-#: ../src/gnome2/preferences_dialog.c:1473
-#: ../src/gnome2/preferences_dialog.c:1505
-#: ../src/gnome2/preferences_dialog.c:1539
-#: ../src/gnome2/preferences_dialog.c:1574
-#: ../src/gnome2/preferences_dialog.c:1609
-#: ../src/gnome2/preferences_dialog.c:1645
-#: ../src/gnome2/preferences_dialog.c:2045
-msgid "-- Select --"
-msgstr "-- Valitse --"
-
-#: ../src/gnome2/preferences_dialog.c:1678 ../ui/prefs.glade.h:74
-msgid "Preferences"
-msgstr "Asetukset"
-
-#: ../src/gnome2/preferences_dialog.c:1760
-msgid "Fonts"
-msgstr "Kirjasinlajit"
-
-#: ../src/gnome2/preferences_dialog.c:1763
-msgid "Color"
-msgstr "Väri"
-
-#: ../src/gnome2/preferences_dialog.c:1766
-msgid "Sizes"
-msgstr "Koot"
-
-#: ../src/gnome2/preferences_dialog.c:1770
-msgid "General"
-msgstr "Yleinen"
-
-#: ../src/gnome2/preferences_dialog.c:1773 ../ui/prefs.glade.h:85
-msgid "Tabs and Panes"
-msgstr "Välilehdet ja paneelit"
-
-#: ../src/gnome2/preferences_dialog.c:1780
-msgid "Options"
-msgstr "Vaihtoehdot"
-
-#: ../src/gnome2/preferences_dialog.c:1787
-msgid "Main"
-msgstr "Yleinen"
-
-#: ../src/gnome2/preferences_dialog.c:1790 ../src/gnome2/parallel_dialog.c:635
-msgid "Parallel"
-msgstr "Rinnakkaisnäkymä"
-
-#: ../src/gnome2/preferences_dialog.c:1793
-msgid "Special"
-msgstr "Erityiset"
-
-#: ../src/gnome2/preferences_cell_renderer.c:398
-msgid "Text"
-msgstr "Teksti"
-
-#: ../src/gnome2/preferences_cell_renderer.c:400
-msgid "Text to render"
-msgstr "Käsiteltävä teksti"
-
-#: ../src/gnome2/preferences_cell_renderer.c:406
-msgid "Pixbuf Object"
-msgstr ""
-
-#: ../src/gnome2/preferences_cell_renderer.c:408
-msgid "The pixbuf to render."
-msgstr "Renderöitävä kuvapuskuri."
-
-#: ../src/gnome2/about_xiphos.c:132
-msgid "Copyright 2000-2009 The Xiphos Development Team"
-msgstr "Copyright 2000-2009 Xiphosin kehitystiimi"
-
-#: ../src/gnome2/about_xiphos.c:135
-#, fuzzy
-msgid ""
-"(formerly known as GnomeSword)\n"
-"\n"
-"Powered by The SWORD Project.\n"
-"We would like to thank Troy Griffitts and all the other folks who have given "
-"us The SWORD Project."
-msgstr ""
-"Tahdomme kiittää Troy Griffittsiä sekä muita The SWORD -projektin tekijöitä."
-
-#: ../src/gnome2/bookmarks_menu.c:457 ../src/gnome2/treekey-editor.c:321
-#: ../ui/xi-menus.glade.h:20
-msgid "Edit"
-msgstr "Muokkaa"
-
-#: ../src/gnome2/bookmarks_menu.c:474
-msgid "Folder name: "
-msgstr "Kansion nimi: "
-
-#: ../src/gnome2/bookmarks_menu.c:477
-msgid "Bookmark name: "
-msgstr "Kirjanmerkin nimi: "
-
-#: ../src/gnome2/bookmarks_menu.c:480 ../src/gnome2/bookmarks_menu.c:905
-msgid "Verse: "
-msgstr "Jae: "
-
-#: ../src/gnome2/bookmarks_menu.c:481 ../src/gnome2/bookmarks_menu.c:906
-msgid "Module: "
-msgstr "Moduuli: "
-
-#: ../src/gnome2/bookmarks_menu.c:665
-msgid "Restore Bookmark Folder"
-msgstr "Palauta kirjanmerkkikansio"
-
-#: ../src/gnome2/bookmarks_menu.c:734
-msgid "Remove the selected folder"
-msgstr "Poista valittu kansio"
-
-#: ../src/gnome2/bookmarks_menu.c:736
-msgid "(and all its contents)?"
-msgstr "(ja kaikki sen sisältö)?"
+#: ../src/gnome2/sidebar.c:1397
+msgid "Search"
+msgstr "Haku"
 
-#: ../src/gnome2/bookmarks_menu.c:739
-msgid "Remove the selected bookmark"
-msgstr "Poista valitut kirjanmerkit"
+#: ../src/gnome2/sidebar.c:1405
+msgid "Verse List"
+msgstr "Jaelista"
 
-#: ../src/gnome2/bookmarks_menu.c:898
-msgid "Add"
-msgstr "Lisää"
+#: ../src/gnome2/sidebar_dialog.c:139 ../src/gnome2/sidebar_dialog.c:148
+msgid "Sidebar"
+msgstr "Sivupalkki"
 
-#: ../src/gnome2/bookmarks_menu.c:904
-msgid "Label: "
-msgstr "Etiketti: "
+#: ../src/gnome2/splash.c:396
+msgid "Powered by the SWORD Project"
+msgstr "SWORD-projektin mahdollistama"
 
-#: ../src/gnome2/treekey-editor.c:129 ../src/gnome2/treekey-editor.c:188
-#: ../src/gnome2/treekey-editor.c:274
+#: ../src/gnome2/treekey-editor.c:137 ../src/gnome2/treekey-editor.c:196
+#: ../src/gnome2/treekey-editor.c:282
 msgid "Prayer List/Journal Item"
 msgstr "Rukouslistan/päiväkirjan kohta"
 
-#: ../src/gnome2/treekey-editor.c:130 ../src/gnome2/treekey-editor.c:189
-#: ../src/gnome2/treekey-editor.c:275
+#: ../src/gnome2/treekey-editor.c:138 ../src/gnome2/treekey-editor.c:197
+#: ../src/gnome2/treekey-editor.c:283
 msgid "New name"
-msgstr "Uusi nimi "
-
-#: ../src/gnome2/treekey-editor.c:131 ../src/gnome2/treekey-editor.c:190
-#: ../src/gnome2/treekey-editor.c:276 ../src/main/prayerlists.cc:240
-msgid "Name: "
-msgstr "Nimi: "
+msgstr "Uusi nimi"
 
-#: ../src/gnome2/treekey-editor.c:245
+#: ../src/gnome2/treekey-editor.c:253
 msgid "Remove the selected item"
 msgstr "Poista valittu kohta"
 
-#: ../src/gnome2/treekey-editor.c:303
-msgid "Add Child"
-msgstr "Lisää alataso"
-
-#: ../src/gnome2/treekey-editor.c:304 ../src/gnome2/treekey-editor.c:310
-msgid "Add an item"
-msgstr "Lisää kohta"
-
-#: ../src/gnome2/treekey-editor.c:309
-msgid "Add Sibling"
-msgstr "Lisää sama taso"
+#: ../src/main/display.cc:259
+#, c-format
+msgid ""
+"Improperly encoded personal annotation label:\n"
+"'%s'"
+msgstr ""
+"Väärin enkoodattu oman muistiinpanon otsikko:\n"
+"'%s'"
 
-#: ../src/gnome2/treekey-editor.c:316
-msgid "Remove this item"
-msgstr "Poista tämä kohta"
+#: ../src/main/display.cc:386
+msgid ""
+"An image file's size could not be determined.\n"
+"Is ImageMagick's 'identify' not installed?\n"
+"(Or possibly the image is of type other than bmp/gif/jpg/png.)\n"
+"Xiphos cannot resize images to fit window."
+msgstr ""
+"Kuvan kokoa ei voitu päätellä.\n"
+"Onko ImageMagick-paketin 'identify' asennettu?\n"
+"(Tai mahdollisesti kuva on muuta tyyppiä kuin bmp/gif/jpg/png.)\n"
+"Xiphos ei voi muuttaa kuvien kokoa ikkunaan sopivaksi."
 
-#: ../src/gnome2/treekey-editor.c:322
-msgid "Edit this item"
-msgstr "Muokkaa tätä kohtaa"
+#: ../src/main/display.cc:1043 ../src/main/display.cc:1095
+#: ../src/main/display.cc:1172 ../ui/export-dialog.glade.h:7
+msgid "Chapter"
+msgstr "Kappale"
 
-#: ../src/gnome2/splash.c:363
-msgid "Powered by the SWORD Project"
-msgstr "SWORD-projektin mahdollistama"
+#: ../src/main/main.c:119
+msgid "Xiphos does not understand more than one argument."
+msgstr "Xiphos ei ymmärrä enempää kuin yhden argumentin."
 
-#: ../src/gnome2/splash.c:563
+#: ../src/main/main.c:161
 msgid "Initiating Gecko"
 msgstr "Alustetaan Gecko"
 
-#: ../src/gnome2/splash.c:580
-msgid "Loading settings"
-msgstr "Ladataan asetuksia"
-
-#: ../src/gnome2/splash.c:598
+#: ../src/main/main.c:167
 msgid "Building Interface"
 msgstr "Kasataan näkymää"
 
-#: ../src/gnome2/splash.c:615
+#: ../src/main/main.c:171
 msgid "Starting Sword"
 msgstr "Käynnistetään Sword"
 
-#: ../src/gnome2/splash.c:632
+#: ../src/main/main.c:175
+msgid "Loading Settings"
+msgstr "Ladataan asetuksia"
+
+#: ../src/main/main.c:179
 msgid "Displaying Xiphos"
 msgstr "Näytetään Xiphos"
 
-#: ../src/gnome2/export_dialog.c:265 ../ui/export-dialog.glade.h:20
-msgid "Please check copyright before exporting!"
-msgstr "Ole hyvä ja tarkista tekijänoikeudet ennen vientiä!"
-
-#: ../src/gnome2/bookmarks_treeview.c:105
-#, fuzzy, c-format
-msgid "Search result: %s"
-msgstr "<b>Haun tulokset</b>"
+#: ../src/main/module_dialogs.cc:227 ../src/main/previewer.cc:127
+#: ../src/main/previewer.cc:194 ../ui/prefs.glade.h:75
+msgid "Previewer"
+msgstr "Esikatselija"
 
-#: ../src/gnome2/about_trans.c:84
-msgid ""
-"Do you like using Xiphos to study the Bible? Would you like to see its "
-"display using your native language? You could translate Xiphos! \n"
-"\n"
-"We are always looking for contributions of new translations of Xiphos into "
-"other languages. If you are able to translate for us, please see the link "
-"below, contact us, and get involved with our efforts."
-msgstr ""
-"Pidätkö Xiphos-ohjelmasta? Haluatko nähdä sen käyttävän omaa kieltäsi? Voit "
-"kääntää Xiphoksen!\n"
-"\n"
-"Etsimme jatkuvasti kääntäjiä uusille kielille. Jos kykenet auttamaan "
-"kääntämisessä, käytä allaolevaa linkkiä, ota meihin yhteytttä ja tule mukaan "
-"työhömme."
+#: ../src/main/module_dialogs.cc:292 ../src/main/module_dialogs.cc:416
+#: ../src/main/previewer.cc:269
+msgid "Footnote"
+msgstr "Alaviite"
 
-#: ../src/gnome2/about_trans.c:98
-msgid "About Xiphos Translation"
-msgstr "Tietoa Xiphoksen käännöksestä"
+#: ../src/main/module_dialogs.cc:298 ../src/main/module_dialogs.cc:421
+#: ../src/main/previewer.cc:281
+msgid "Cross Reference"
+msgstr "Ristiviittaus"
 
-#: ../src/gnome2/about_trans.c:139
-msgid "See TRANSLATION-HOWTO in Xiphos source"
-msgstr "Katso TRANSLATION HOWTO Xiphoksen lähdekoodista"
+#: ../src/main/module_dialogs.cc:304 ../src/main/module_dialogs.cc:318
+#: ../src/main/module_dialogs.cc:426 ../src/main/module_dialogs.cc:438
+#: ../src/main/previewer.cc:287 ../src/main/previewer.cc:306
+msgid "Strongs"
+msgstr "Strongin numerot"
 
-#: ../src/gnome2/about_trans.c:145
-msgid "Xiphos development"
-msgstr "Xiphoksen kehittäminen"
+#: ../src/main/module_dialogs.cc:310 ../src/main/module_dialogs.cc:329
+#: ../src/main/module_dialogs.cc:431 ../src/main/module_dialogs.cc:448
+#: ../src/main/previewer.cc:293 ../src/main/previewer.cc:319
+msgid "Morphology"
+msgstr "Sanojen taivutus"
 
-#: ../src/main/sword.cc:549
-msgid ""
-"Xiphos's file for language\n"
-"abbreviations is missing."
-msgstr ""
-"Xiphoksen kielilyhenteiden\n"
-"tiedostoa ei löydy."
+#: ../src/main/module_dialogs.cc:1081 ../src/main/url.cc:530
+msgid "Back to "
+msgstr "Takaisin "
 
-#: ../src/main/sword.cc:556
-msgid ""
-"Xiphos's language abbreviation\n"
-"file cannot be opened."
-msgstr ""
-"Xiphoksen kielilyhenteiden\n"
-"tiedostoa ei voi avata."
+#: ../src/main/parallel_view.cc:404 ../ui/xi-menus.glade.h:89
+msgid "Strong's Numbers"
+msgstr "Strongin numerot"
 
-#: ../src/main/sword.cc:567
-msgid ""
-"Xiphos cannot allocate space\n"
-"for language abbreviations."
-msgstr ""
-"Xiphos ei pysty varaamaan\n"
-"tilaa kielilyhenteille."
+#: ../src/main/parallel_view.cc:414 ../ui/search-dialog.glade.h:52
+#: ../ui/xi-menus.glade.h:40
+msgid "Footnotes"
+msgstr "Alaviitteet"
 
-#: ../src/main/sword.cc:574
-msgid ""
-"Xiphos cannot read the\n"
-"language abbreviation file."
-msgstr ""
-"Xiphos ei voi lukea\n"
-"kielilyhenteiden tiedostoa."
+#: ../src/main/parallel_view.cc:424 ../ui/search-dialog.glade.h:64
+#: ../ui/xi-menus.glade.h:55
+msgid "Morphological Tags"
+msgstr "Morfologiset tunnisteet"
 
-#: ../src/main/sword.cc:1202
-msgid "Daily devotional was requested, but there are none installed."
-msgstr "Päivittäistä hartausta etsittiin, mutta sellaista ei ole asennettu."
+#: ../src/main/parallel_view.cc:434 ../ui/xi-menus.glade.h:44
+msgid "Hebrew Vowel Points"
+msgstr "Heprean vokaalipisteet"
 
-#: ../src/main/search_dialog.cc:129
-#, fuzzy, c-format
-msgid "Search result %s: %s"
-msgstr "Tallenna hakutulokset kirjanmerkkeinä"
+#: ../src/main/parallel_view.cc:444 ../ui/xi-menus.glade.h:43
+msgid "Hebrew Cantillation"
+msgstr "Heprean kantillaatio"
 
-#: ../src/main/search_dialog.cc:363
-msgid "Delete Range?"
-msgstr "Poista alue?"
+#: ../src/main/parallel_view.cc:454 ../ui/xi-menus.glade.h:41
+msgid "Greek Accents"
+msgstr "Kreikkalaiset korkomerkit"
 
-#: ../src/main/search_dialog.cc:364
-msgid "Are you sure you want to delete this range?"
-msgstr "Oletko varma, että haluat poistaa tämän alueen?"
+#: ../src/main/parallel_view.cc:464
+msgid "Cross-references"
+msgstr "Ristiviittaukset"
 
-#: ../src/main/search_dialog.cc:578 ../src/main/search_dialog.cc:1049
-#: ../src/main/search_dialog.cc:1052 ../src/main/search_dialog.cc:1074
-#: ../src/main/search_dialog.cc:1077
-msgid "Search: "
-msgstr "Haku: "
+#: ../src/main/parallel_view.cc:474 ../ui/xi-menus.glade.h:50
+msgid "Lemmas"
+msgstr "Sanojen perusmuodot"
 
-#: ../src/main/search_dialog.cc:623
-msgid "Remove Module?"
-msgstr "Poista moduuli?"
+#: ../src/main/parallel_view.cc:484 ../ui/xi-menus.glade.h:42
+msgid "Headings"
+msgstr "Otsikot"
 
-#: ../src/main/search_dialog.cc:624
-msgid "Are you sure you want to remove the selected module?"
-msgstr "Oletko varma, että haluat poistaa valitun moduulin?"
+#: ../src/main/parallel_view.cc:494
+msgid "Morpheme Segmentation"
+msgstr "Morfeemien segmentointi"
 
-#: ../src/main/search_dialog.cc:1473
-#, c-format
-msgid ""
-"%s:\n"
-"No such module is installed.\n"
-"%s"
-msgstr ""
-"%s:\n"
-"Kyseistä moduulia ei ole asennettu.\n"
-"%s"
+#: ../src/main/parallel_view.cc:504 ../ui/xi-menus.glade.h:96
+msgid "Words of Christ in Red"
+msgstr "Jeesuksen sanat punaisella"
 
-#: ../src/main/search_dialog.cc:1475
-msgid "Please adjust the module list."
-msgstr "Ole hyvä ja muokkaa moduulilistaa."
+#: ../src/main/parallel_view.cc:514 ../ui/xi-menus.glade.h:91
+msgid "Transliteration"
+msgstr "Translitteraatio"
 
-#: ../src/main/search_dialog.cc:1491
-#, fuzzy, c-format
-msgid "No fast-search index exists for %s.%s%s"
-msgstr "Tuhoa seuraavien moduulin hakuindeksit:"
+#: ../src/main/parallel_view.cc:524
+msgid "Textual Variants"
+msgstr "Tekstivariantit"
 
-#: ../src/main/search_dialog.cc:1493
-msgid ""
-"\n"
-"Search on this module is now `multi word'."
-msgstr ""
+#: ../src/main/parallel_view.cc:532 ../ui/xi-menus.glade.h:70
+msgid "Primary Reading"
+msgstr "Ensisijainen lukutapa"
 
-#: ../src/main/search_dialog.cc:1494
-msgid ""
-"\n"
-"See the Module Manager, Maintenance pane."
-msgstr ""
+#: ../src/main/parallel_view.cc:541 ../ui/xi-menus.glade.h:84
+msgid "Secondary Reading"
+msgstr "Toissijainen lukutapa"
 
-#: ../src/main/search_dialog.cc:1555
-msgid "Search finished"
-msgstr "Haku päättynyt"
+#: ../src/main/parallel_view.cc:550 ../ui/xi-menus.glade.h:9
+msgid "All Readings"
+msgstr "Kaikki lukutavat"
 
-#: ../src/main/main.c:109
-msgid "Xiphos does not understand more than one argument."
-msgstr "Xiphos ei ymmärrä enempää kuin yhden argumentin."
+#: ../src/main/parallel_view.cc:884 ../src/main/parallel_view.cc:1136
+msgid "view context"
+msgstr "näytä asiayhteys"
 
-#: ../src/main/prayerlists.cc:71
+#: ../src/main/prayerlists.cc:74
 msgid "January"
 msgstr "Tammikuu"
 
-#: ../src/main/prayerlists.cc:72
+#: ../src/main/prayerlists.cc:75
 msgid "February"
 msgstr "Helmikuu"
 
-#: ../src/main/prayerlists.cc:73
+#: ../src/main/prayerlists.cc:76
 msgid "March"
 msgstr "Maaliskuu"
 
-#: ../src/main/prayerlists.cc:74
+#: ../src/main/prayerlists.cc:77
 msgid "April"
 msgstr "Huhtikuu"
 
-#: ../src/main/prayerlists.cc:75
+#: ../src/main/prayerlists.cc:78
 msgid "May"
 msgstr "Toukokuu"
 
-#: ../src/main/prayerlists.cc:76
+#: ../src/main/prayerlists.cc:79
 msgid "June"
 msgstr "Kesäkuu"
 
-#: ../src/main/prayerlists.cc:77
+#: ../src/main/prayerlists.cc:80
 msgid "July"
 msgstr "Heinäkuu"
 
-#: ../src/main/prayerlists.cc:78
+#: ../src/main/prayerlists.cc:81
 msgid "August"
 msgstr "Elokuu"
 
-#: ../src/main/prayerlists.cc:79
+#: ../src/main/prayerlists.cc:82
 msgid "September"
 msgstr "Syyskuu"
 
-#: ../src/main/prayerlists.cc:80
+#: ../src/main/prayerlists.cc:83
 msgid "October"
 msgstr "Lokakuu"
 
-#: ../src/main/prayerlists.cc:81
+#: ../src/main/prayerlists.cc:84
 msgid "November"
 msgstr "Marraskuu"
 
-#: ../src/main/prayerlists.cc:82
+#: ../src/main/prayerlists.cc:85
 msgid "December"
 msgstr "Joulukuu"
 
-#: ../src/main/prayerlists.cc:121 ../src/main/sword_treekey.cc:332
+#: ../src/main/prayerlists.cc:124 ../src/main/sword_treekey.cc:332
 msgid "Growth"
 msgstr "Kasvu"
 
-#: ../src/main/prayerlists.cc:122 ../src/main/sword_treekey.cc:333
+#: ../src/main/prayerlists.cc:125 ../src/main/sword_treekey.cc:333
 msgid "<b>For Growth</b><br>"
 msgstr "<b>Kasvua varten</b><br>"
 
-#: ../src/main/prayerlists.cc:123 ../src/main/prayerlists.cc:380
+#: ../src/main/prayerlists.cc:126 ../src/main/prayerlists.cc:383
 #: ../src/main/sword_treekey.cc:334
 msgid "Salvation"
 msgstr "Pelastus"
 
-#: ../src/main/prayerlists.cc:124 ../src/main/sword_treekey.cc:335
+#: ../src/main/prayerlists.cc:127 ../src/main/sword_treekey.cc:335
 msgid "<b>For Salvation</b><br>"
 msgstr "<b>Pelastusta varten</b><br>"
 
-#: ../src/main/prayerlists.cc:125 ../src/main/prayerlists.cc:384
+#: ../src/main/prayerlists.cc:128 ../src/main/prayerlists.cc:387
 #: ../src/main/sword_treekey.cc:336
 msgid "Health"
 msgstr "Terveys"
 
-#: ../src/main/prayerlists.cc:126 ../src/main/sword_treekey.cc:337
+#: ../src/main/prayerlists.cc:129 ../src/main/sword_treekey.cc:337
 msgid "<b>For Health</b><br>"
 msgstr "Terveyttä varten"
 
-#: ../src/main/prayerlists.cc:127
+#: ../src/main/prayerlists.cc:130
 msgid "Misc"
 msgstr "Sekalaiset"
 
-#: ../src/main/prayerlists.cc:128 ../src/main/sword_treekey.cc:339
+#: ../src/main/prayerlists.cc:131 ../src/main/sword_treekey.cc:339
 msgid "<b>Miscellaneous</b><br>"
 msgstr "<b>Sekalaiset</b>"
 
-#: ../src/main/prayerlists.cc:136
+#: ../src/main/prayerlists.cc:139
 msgid "Point x"
 msgstr "Kohta x"
 
-#: ../src/main/prayerlists.cc:137
+#: ../src/main/prayerlists.cc:140
 msgid "<b>(x)</b><br>"
 msgstr "<b>(x)</b><br>"
 
-#: ../src/main/prayerlists.cc:138
+#: ../src/main/prayerlists.cc:141
 msgid "Point y"
 msgstr "Kohta y"
 
-#: ../src/main/prayerlists.cc:139
+#: ../src/main/prayerlists.cc:142
 msgid "<b>(y)</b><br>"
 msgstr "<b>(y)</b><br>"
 
-#: ../src/main/prayerlists.cc:140
+#: ../src/main/prayerlists.cc:143
 msgid "Point z"
 msgstr "Kohta z"
 
-#: ../src/main/prayerlists.cc:141
+#: ../src/main/prayerlists.cc:144
 msgid "<b>(z)</b><br>"
 msgstr "<b>(z)</b><br>"
 
-#: ../src/main/prayerlists.cc:149
+#: ../src/main/prayerlists.cc:152
 msgid "Minor Topic 1"
 msgstr "Alaotsikko 1"
 
-#: ../src/main/prayerlists.cc:150
+#: ../src/main/prayerlists.cc:153
 msgid "<b>Subtopic 1</b><br>"
 msgstr "<b>Alaotsikko 1</b><br>"
 
-#: ../src/main/prayerlists.cc:152
+#: ../src/main/prayerlists.cc:155
 msgid "Minor Topic 2"
 msgstr "Alaotsikko 2"
 
-#: ../src/main/prayerlists.cc:153
+#: ../src/main/prayerlists.cc:156
 msgid "<b>Subtopic 2</b><br>"
 msgstr "<b>Alaotsikko 2</b><br>"
 
-#: ../src/main/prayerlists.cc:155
+#: ../src/main/prayerlists.cc:158
 msgid "Minor Topic 3"
 msgstr "Alaotsikko 3"
 
-#: ../src/main/prayerlists.cc:156
+#: ../src/main/prayerlists.cc:159
 msgid "<b>Subtopic 3</b><br>"
 msgstr "<b>Alaotsikko 3</b><br>"
 
-#: ../src/main/prayerlists.cc:158
+#: ../src/main/prayerlists.cc:161
 msgid "Minor Topic 4"
 msgstr "Alaotsikko 4"
 
-#: ../src/main/prayerlists.cc:159
+#: ../src/main/prayerlists.cc:162
 msgid "<b>Subtopic 4</b><br>"
 msgstr "<b>Alaotsikko 4</b><br>"
 
-#: ../src/main/prayerlists.cc:239
+#: ../src/main/prayerlists.cc:242
 msgid "Name for new prayer list or journal"
 msgstr "Uuden rukouslistan tai -päiväkirjan nimi"
 
-#: ../src/main/prayerlists.cc:254
-msgid "Module names must contain [A-Za-z0-9_] only."
-msgstr "Moduulin nimi saa sisältää vain merkkejä [A-Za-z0-9]."
-
-#: ../src/main/prayerlists.cc:261
-msgid "Xiphos already knows a module by that name."
-msgstr "Xiphos käyttää jo nimeä jollekin moduulille."
-
-#: ../src/main/prayerlists.cc:270
+#: ../src/main/prayerlists.cc:273
 msgid "Xiphos finds that prayer list already."
 msgstr "Tämänniminen rukouslista on jo olemassa."
 
-#: ../src/main/prayerlists.cc:283
+#: ../src/main/prayerlists.cc:286
 #, c-format
 msgid ""
 "Xiphos cannot create module's path:\n"
@@ -1362,20 +1620,19 @@ msgstr ""
 "Xiphos ei voi luoda moduulin polkua:\n"
 "%s"
 
-#: ../src/main/prayerlists.cc:323
+#: ../src/main/prayerlists.cc:326
 msgid "A basic prayer list. \\par\\par Module created by Xiphos."
 msgstr "Yksinkertainen rukouslista. \\par\\par Xiphoksen luoma moduuli."
 
-#: ../src/main/prayerlists.cc:324
-#, fuzzy
+#: ../src/main/prayerlists.cc:327
 msgid "BasicPrayerList"
-msgstr "OmaRukouslista"
+msgstr "PerusRukousLista"
 
-#: ../src/main/prayerlists.cc:338
+#: ../src/main/prayerlists.cc:341
 msgid "MyPrayerList"
 msgstr "OmaRukouslista"
 
-#: ../src/main/prayerlists.cc:339
+#: ../src/main/prayerlists.cc:342
 msgid ""
 "<b>People:</b><br>Bob<br>Sam<br>Sue<br><br><b>Church:</"
 "b><br>pews<br>fellowship<br>Bibles for missionaries<br><br><br>"
@@ -1383,321 +1640,154 @@ msgstr ""
 "<b>Ihmiset:</b><br>Pekka<br>Sami<br>Susanna<br><br><b>Seurakunta:</"
 "b><br>tilaisuudet<br>yhteys<br>Raamattuja lähetystyöntekijöille<br><br><br>"
 
-#: ../src/main/prayerlists.cc:365
+#: ../src/main/prayerlists.cc:368
 msgid "A subject-based prayer list. \\par\\par Module created by Xiphos."
 msgstr "Aiheisiin perustuva rukouslista. \\par\\par Xiphoksen luoma moduuli."
 
-#: ../src/main/prayerlists.cc:366
-#, fuzzy
+#: ../src/main/prayerlists.cc:369
 msgid "SubjectPrayerList"
-msgstr "OmaRukouslista"
+msgstr "RukousListaAiheet"
 
-#: ../src/main/prayerlists.cc:381
+#: ../src/main/prayerlists.cc:384
 msgid "Bob<br>Sam<br>Sue<br>John<br>"
 msgstr "Pekka<br>Sami<br>Susanna<br>Jussi<br>"
 
-#: ../src/main/prayerlists.cc:382
+#: ../src/main/prayerlists.cc:385
 msgid "Spiritual Growth"
 msgstr "Hengellinen kasvu"
 
-#: ../src/main/prayerlists.cc:383
+#: ../src/main/prayerlists.cc:386
 msgid "Mike<br>Steve<br>"
 msgstr "Mikko<br>Teppo<br>"
 
-#: ../src/main/prayerlists.cc:385
+#: ../src/main/prayerlists.cc:388
 msgid "Sue<br>John<br>"
 msgstr "Susanna<br>Jussi<br>"
 
-#: ../src/main/prayerlists.cc:411
+#: ../src/main/prayerlists.cc:414
 msgid "A monthly prayer list. \\par\\par Module created by Xiphos."
 msgstr "Kuukausittainen rukouslista. \\par\\par Xiphoksen luoma moduuli."
 
-#: ../src/main/prayerlists.cc:412
-#, fuzzy
+#: ../src/main/prayerlists.cc:415
 msgid "MonthlyPrayerList"
-msgstr "OmaRukouslista"
+msgstr "KuukausiRukousLista"
 
-#: ../src/main/prayerlists.cc:463
+#: ../src/main/prayerlists.cc:466
 msgid "A daily journal. \\par\\par Module created by Xiphos."
 msgstr "Päiväkirja. \\par\\par Xiphoksen luoma moduuli."
 
-#: ../src/main/prayerlists.cc:464
-#, fuzzy
+#: ../src/main/prayerlists.cc:467
 msgid "DailyJournal"
-msgstr "Päiväkirja"
+msgstr "PäiväKirja"
 
-#: ../src/main/prayerlists.cc:528
+#: ../src/main/prayerlists.cc:531
 msgid "An outlined topic (e.g. sermon). \\par\\par Module created by Xiphos."
 msgstr "Aiheen runko (esim. saarna). \\par\\par Xiphoksen luoma moduuli."
 
-#: ../src/main/prayerlists.cc:529
-#, fuzzy
+#: ../src/main/prayerlists.cc:532
 msgid "OutlinedTopic"
-msgstr "Aiheen hahmotelma"
+msgstr "AiheenRunko"
 
-#: ../src/main/prayerlists.cc:543
+#: ../src/main/prayerlists.cc:546
 msgid "Major Topic A"
 msgstr "Yläotsikko A"
 
-#: ../src/main/prayerlists.cc:544
+#: ../src/main/prayerlists.cc:547
 msgid "<b>Major Topic A</b><br>"
 msgstr "<b>Yläotsikko A</b><br>"
 
-#: ../src/main/prayerlists.cc:546
+#: ../src/main/prayerlists.cc:549
 msgid "Major Topic B"
 msgstr "Yläotsikko B"
 
-#: ../src/main/prayerlists.cc:547
+#: ../src/main/prayerlists.cc:550
 msgid "<b>Major Topic B</b><br>"
 msgstr "<b>Yläotsikko B</b><br>"
 
-#: ../src/main/prayerlists.cc:549
+#: ../src/main/prayerlists.cc:552
 msgid "Major Topic C"
 msgstr "Yläotsikko C"
 
-#: ../src/main/prayerlists.cc:550
+#: ../src/main/prayerlists.cc:553
 msgid "<b>Major Topic C</b><br>"
 msgstr "<b>Yläotsikko C</b><br>"
 
-#: ../src/main/xml.c:80 ../src/main/xml.c:465
-#, c-format
-msgid "Document not created successfully. \n"
-msgstr "Dokumenttia ei onnistuttu luomaan.\n"
-
-#: ../src/main/xml.c:89
-msgid "Personal"
-msgstr "Henkilökohtaista"
-
-#: ../src/main/xml.c:90
-msgid "What must I do to be saved?"
-msgstr "Mitä minun täytyy tehdä pelastuakseni?"
-
-#: ../src/main/xml.c:92 ../src/main/xml.c:93
-msgid "Acts 16:31"
-msgstr "Apt 16:31"
+#: ../src/main/previewer.cc:275
+msgid "User Annotation"
+msgstr "Käyttäjän muistiinpanot"
 
-#: ../src/main/xml.c:97 ../src/main/xml.c:98
-msgid "Eph 2:8"
-msgstr "Efes 2:8"
+#: ../src/main/search_dialog.cc:212
+#, c-format
+msgid "Search result %s: %s"
+msgstr "Hakutulos %s: %s"
 
-#: ../src/main/xml.c:102 ../src/main/xml.c:103
-msgid "Romans 1:16"
-msgstr "Room 1:16"
+#: ../src/main/search_dialog.cc:444
+msgid "Delete Range?"
+msgstr "Poista alue?"
 
-#: ../src/main/xml.c:106
-msgid "What is the Gospel?"
-msgstr "Mitä on evankeliumi?"
+#: ../src/main/search_dialog.cc:445
+msgid "Are you sure you want to delete this range?"
+msgstr "Oletko varma, että haluat poistaa tämän alueen?"
 
-#: ../src/main/xml.c:108 ../src/main/xml.c:109
-msgid "1 Cor 15:1-4"
-msgstr "1 Kor 15:1-4"
+#: ../src/main/search_dialog.cc:659 ../src/main/search_dialog.cc:1130
+#: ../src/main/search_dialog.cc:1133 ../src/main/search_dialog.cc:1155
+#: ../src/main/search_dialog.cc:1158
+msgid "Search: "
+msgstr "Haku: "
 
-#: ../src/main/xml.c:413 ../src/main/xml.c:1078
-#, c-format
-msgid "Document not parsed successfully. \n"
-msgstr "Dokumenttia ei onnistuttu käsittelemään. \n"
+#: ../src/main/search_dialog.cc:704
+msgid "Remove Module?"
+msgstr "Poista moduuli?"
 
-#: ../src/main/xml.c:419 ../src/main/xml.c:681 ../src/main/xml.c:959
-#: ../src/main/xml.c:1138
-#, c-format
-msgid "empty document \n"
-msgstr "tyhjä dokumentti \n"
+#: ../src/main/search_dialog.cc:705
+msgid "Are you sure you want to remove the selected module?"
+msgstr "Oletko varma, että haluat poistaa valitun moduulin?"
 
-#: ../src/main/xml.c:425
+#: ../src/main/search_dialog.cc:1560
 #, c-format
-msgid "wrong type, root node != SwordBookmarks\n"
+msgid ""
+"%s:\n"
+"No such module is installed.\n"
+"%s"
 msgstr ""
+"%s:\n"
+"Kyseistä moduulia ei ole asennettu.\n"
+"%s"
 
-#: ../src/main/xml.c:479
-msgid "Old Testament"
-msgstr "Vanha Testamentti"
-
-#: ../src/main/xml.c:481
-msgid "Gen - Mal"
-msgstr "1Moos - Malakia"
-
-#: ../src/main/xml.c:487
-msgid "New Testament"
-msgstr "Uusi Testamentti"
-
-#: ../src/main/xml.c:489
-msgid "Mat - Rev"
-msgstr "Matt- Ilm"
-
-#: ../src/main/xml.c:497
-msgid "Sample Module List"
-msgstr "Moduulilistan malli"
+#: ../src/main/search_dialog.cc:1562
+msgid "Please adjust the module list."
+msgstr "Ole hyvä ja muokkaa moduulilistaa."
 
-#: ../src/main/xml.c:687 ../src/main/xml.c:965
+#: ../src/main/search_dialog.cc:1578
 #, c-format
-msgid "wrong type, root node != %s\n"
-msgstr ""
+msgid "No fast-search index exists for %s.%s%s"
+msgstr "Pikahakuindeksiä ei ole moduulille %s.%s%s"
 
-#: ../src/main/display.cc:278
+#: ../src/main/search_dialog.cc:1580
 msgid ""
-"An image file's size could not be determined.\n"
-"Is ImageMagick's 'identify' not installed?\n"
-"(Or possibly the image is of type other than bmp/gif/jpg/png.)\n"
-"Xiphos cannot resize images to fit window."
+"\n"
+"Search on this module is now `multi word'."
 msgstr ""
-"Kuvan kokoa ei voitu päätellä.\n"
-"Onko ImageMagick-paketin 'identify' asennettu?\n"
-"(Tai mahdollisesti kuva on muuta tyyppiä kuin bmp/gif/jpg/png.)\n"
-"Xiphos ei voi muuttaa kuvien kokoa ikkunaan sopivaksi."
-
-#: ../src/main/display.cc:931 ../src/main/display.cc:993
-#: ../src/main/display.cc:1081 ../src/main/display.cc:1089
-#: ../ui/export-dialog.glade.h:7
-msgid "Chapter"
-msgstr "Kappale"
-
-#: ../src/main/previewer.cc:122 ../src/main/module_dialogs.cc:231
-#: ../ui/prefs.glade.h:75
-msgid "Previewer"
-msgstr "Esikatselija"
-
-#: ../src/main/previewer.cc:197 ../src/main/module_dialogs.cc:297
-#: ../src/main/module_dialogs.cc:423
-msgid "Footnote"
-msgstr "Alaviite"
-
-#: ../src/main/previewer.cc:203 ../src/main/module_dialogs.cc:303
-#: ../src/main/module_dialogs.cc:428
-msgid "Cross Reference"
-msgstr "Ristiviittaus"
-
-#: ../src/main/previewer.cc:209 ../src/main/previewer.cc:228
-#: ../src/main/module_dialogs.cc:309 ../src/main/module_dialogs.cc:323
-#: ../src/main/module_dialogs.cc:433 ../src/main/module_dialogs.cc:445
-msgid "Strongs"
-msgstr "Strongin numerot"
+"\n"
+"Tälle moduulille on asetettu hakutapa 'monta sanaa'."
 
-#: ../src/main/previewer.cc:215 ../src/main/previewer.cc:241
-#: ../src/main/module_dialogs.cc:315 ../src/main/module_dialogs.cc:334
-#: ../src/main/module_dialogs.cc:438 ../src/main/module_dialogs.cc:455
-msgid "Morphology"
-msgstr "Sanojen taivutus"
+#: ../src/main/search_dialog.cc:1581
+msgid ""
+"\n"
+"See the Module Manager, Maintenance pane."
+msgstr ""
+"\n"
+"Katso Moduulien hallinta, Ylläpito."
 
-#: ../src/main/module_dialogs.cc:1104 ../src/main/url.cc:543
-msgid "Back to "
-msgstr "Takaisin"
+#: ../src/main/search_dialog.cc:1644
+msgid "Search finished"
+msgstr "Haku päättynyt"
 
-#: ../src/main/search_sidebar.cc:93
+#: ../src/main/search_sidebar.cc:100
 msgid "matches"
 msgstr "osumat"
 
-#: ../src/main/parallel_view.cc:398 ../ui/xi-menus.glade.h:67
-msgid "Strong's Numbers"
-msgstr "Strongin numerot"
-
-#: ../src/main/parallel_view.cc:408 ../ui/search-dialog.glade.h:50
-#: ../ui/xi-menus.glade.h:25
-msgid "Footnotes"
-msgstr "Alaviitteet"
-
-#: ../src/main/parallel_view.cc:418 ../ui/search-dialog.glade.h:62
-#: ../ui/xi-menus.glade.h:39
-msgid "Morphological Tags"
-msgstr "Morfologiset tunnisteet"
-
-#: ../src/main/parallel_view.cc:428 ../ui/xi-menus.glade.h:29
-msgid "Hebrew Vowel Points"
-msgstr "Heprean vokaalipisteet"
-
-#: ../src/main/parallel_view.cc:438 ../ui/xi-menus.glade.h:28
-msgid "Hebrew Cantillation"
-msgstr "Heprean kantillaatio"
-
-#: ../src/main/parallel_view.cc:448 ../ui/xi-menus.glade.h:26
-msgid "Greek Accents"
-msgstr "Kreikkalaiset korkomerkit"
-
-#: ../src/main/parallel_view.cc:458
-#, fuzzy
-msgid "Cross-references"
-msgstr "Ristiviittaus"
-
-#: ../src/main/parallel_view.cc:468 ../ui/xi-menus.glade.h:35
-msgid "Lemmas"
-msgstr "Sanojen perusmuodot"
-
-#: ../src/main/parallel_view.cc:478 ../ui/xi-menus.glade.h:27
-msgid "Headings"
-msgstr "Otsikot"
-
-#: ../src/main/parallel_view.cc:488
-msgid "Morpheme Segmentation"
-msgstr ""
-
-#: ../src/main/parallel_view.cc:498 ../ui/xi-menus.glade.h:73
-msgid "Words of Christ in Red"
-msgstr "Jeesuksen sanat punaisella"
-
-#: ../src/main/parallel_view.cc:508 ../ui/xi-menus.glade.h:68
-#, fuzzy
-msgid "Transliteration"
-msgstr "Tietoa käännöksestä"
-
-#: ../src/main/parallel_view.cc:518
-#, fuzzy
-msgid "Textual Variants"
-msgstr "Variantit"
-
-#: ../src/main/parallel_view.cc:526 ../ui/xi-menus.glade.h:49
-msgid "Primary Reading"
-msgstr "Ensisijainen lukutapa"
-
-#: ../src/main/parallel_view.cc:535 ../ui/xi-menus.glade.h:63
-msgid "Secondary Reading"
-msgstr "Toissijainen lukutapa"
-
-#: ../src/main/parallel_view.cc:544 ../ui/xi-menus.glade.h:5
-msgid "All Readings"
-msgstr "Kaikki lukutavat"
-
-#: ../src/main/parallel_view.cc:878 ../src/main/parallel_view.cc:1130
-msgid "view context"
-msgstr ""
-
-#: ../src/main/url.cc:99
-msgid "URL not found:"
-msgstr "URLia ei löydetty:"
-
-#: ../src/main/url.cc:194
-#, c-format
-msgid "Xiphos could not execute %s"
-msgstr "Xiphos ei voinut suorittaa: %s"
-
-#: ../src/main/url.cc:202
-msgid "Viewer error:\n"
-msgstr "Katselunäkymän virhe:\n"
-
-#: ../src/main/url.cc:278
-#, c-format
-msgid "Show %s in main window"
-msgstr "Näytä %s pääikkunassa"
-
-#: ../src/main/tab_history.c:97
-msgid "H_istory/<Separator>"
-msgstr "H_istoria/<Separator>"
-
-#: ../src/main/tab_history.c:99
-msgid "H_istory/C_lear"
-msgstr "H_istoria/P_uhdista"
-
-#: ../src/main/tab_history.c:224
-msgid "Clear History"
-msgstr "Tyhjennä historialista"
-
-#: ../src/main/sidebar.cc:375
-msgid "verse"
-msgstr "jae"
-
-#: ../src/main/sidebar.cc:437
-msgid "chapter"
-msgstr "luku"
-
-#: ../src/main/settings.c:56
+#: ../src/main/settings.c:60
 msgid ""
 "Welcome to Xiphos.\n"
 "\n"
@@ -1734,29 +1824,11 @@ msgstr ""
 "\n"
 "Saako Xiphos käynnistää moduulien hallinnan jotta voit asentaa Raamatun?"
 
-#: ../src/main/settings.c:109
+#: ../src/main/settings.c:105
 msgid "$HOME is not set!"
 msgstr "$HOME ei ole asetettu!"
 
-#: ../src/main/settings.c:124
-msgid "Xiphos has renamed .xiphos-2.0 to .xiphos"
-msgstr "Xiphos on uudelleennimennyt kansion .xiphos-2.0 kansioksi .xiphos"
-
-#: ../src/main/settings.c:127
-#, c-format
-msgid ""
-"Xiphos can not rename  .xiphos-2.0 to .xiphos:\n"
-"%s\n"
-"\n"
-"Xiphos cannot continue."
-msgstr ""
-"Xiphos ei voi uudelleennimetä .kansiota .xiphos-2.0\n"
-"kansioksi .xiphos:\n"
-"%s\n"
-"\n"
-"Xiphos ei voi jatkaa."
-
-#: ../src/main/settings.c:135
+#: ../src/main/settings.c:120
 #, c-format
 msgid ""
 "Xiphos can not create  .xiphos:\n"
@@ -1769,13 +1841,12 @@ msgstr ""
 "\n"
 "Xiphos ei voi jatkaa."
 
-#: ../src/main/settings.c:148 ../src/main/settings.c:156
-#: ../src/main/settings.c:164
-#, fuzzy
+#: ../src/main/settings.c:133 ../src/main/settings.c:142
+#: ../src/main/settings.c:151
 msgid "can not create "
-msgstr "ei voi luoda polkua\n"
+msgstr "ei voi luoda "
 
-#: ../src/main/settings.c:196
+#: ../src/main/settings.c:194
 msgid ""
 "There are still no Bibles installed.\n"
 "Evidently, you declined to install any.\n"
@@ -1790,11 +1861,11 @@ msgstr ""
 "Xiphos ei voi jatkaa ilman näytettävää\n"
 "Raamattumoduulia. Ohjelma suljetaan."
 
-#: ../src/main/settings.c:200
+#: ../src/main/settings.c:198
 msgid "Bible module installation complete."
 msgstr "Raamattumoduulin asennus valmis."
 
-#: ../src/main/settings.c:203
+#: ../src/main/settings.c:201
 msgid ""
 "Without any Bible modules to display,\n"
 "Xiphos cannot proceed,\n"
@@ -1803,71 +1874,159 @@ msgstr ""
 "Xiphos ei voi jatkaa ilman näytettäviä Raamattuja.\n"
 "Ohjelma suljetaan."
 
-#. *****************************************************************************
-#. * Name
-#. *    gconf_setup
-#. *
-#. * Synopsis
-#. *   #include "main/settings.h"
-#. *
-#. *   void gconf_setup()
-#. *
-#. * Description
-#. *   verifies and initializes the GConf subsystem, so that "sword://" and
-#. *   similar can be handled by url-comprehending programs such as browsers.
-#. *   dialogs for permission/success/failure => conditional on debug build.
-#. *
-#. * Return value
-#. *   void
-#.
-#: ../src/main/settings.c:816
+#: ../src/main/sidebar.cc:399
+msgid "verse"
+msgstr "jae"
+
+#: ../src/main/sidebar.cc:461
+msgid "chapter"
+msgstr "luku"
+
+#: ../src/main/sword.cc:537
 msgid ""
-"URL references using \"sword://\" (similar to web page\n"
-"references) can be used by programs to look up\n"
-"scripture references. Your system currently has no\n"
-"program set to handle these references.\n"
-"\n"
-"Would you like Xiphos to set itself as the\n"
-"program to handle these references?"
+"Xiphos's file for language\n"
+"abbreviations is missing."
 msgstr ""
-"\"sword://\"-alkuisia URL-viittauksia (jotka ovat samankaltaisia\n"
-"veppisivujen viittausten kanssa) voidaan käyttää ohjelmistoissa\n"
-"viittaamaan raamatunpaikkoihin. Järjestelmässäsi ei tällä hetkellä\n"
-"ole asetettu ohjelmistoa käsittelemään näitä viittauksia.\n"
-"\n"
-"Haluatko, että Xiphos asentaa itsensä näiden viitausten\n"
-"käsittelijäksi?"
+"Xiphoksen kielilyhenteiden\n"
+"tiedostoa ei löydy."
 
-#: ../src/main/settings.c:818
+#: ../src/main/sword.cc:544
 msgid ""
-"Xiphos has successfully set itself\n"
-"as the handler of sword:// and bible:// URLs.\n"
-"\n"
-"You may wish to run the program \"gconf-editor\"\n"
-"to examine keys under /desktop/gnome/url-handlers,\n"
-"if you need to change these."
+"Xiphos's language abbreviation\n"
+"file cannot be opened."
 msgstr ""
-"Xiphos on onnistuneesti asennettu\n"
-"sword://- ja bible://-URL:ien käsittelijäksi.\n"
-"\n"
-"Voit käyttää ohjelmaa \"gconf-editor\"\n"
-"tutkiaksesi /desktop/gnome/url-handlers -polun\n"
-"alla olevia avaimia, jos niitä on tarvetta muuttaa."
+"Xiphoksen kielilyhenteiden\n"
+"tiedostoa ei voi avata."
 
-#: ../src/main/settings.c:871
-#, c-format
+#: ../src/main/sword.cc:557
 msgid ""
-"Xiphos failed to complete handler init for key #%d:\n"
-"%s"
+"Xiphos cannot allocate space\n"
+"for language abbreviations."
 msgstr ""
-"Xiphos ei onnistunut muuttamaan käsittelijää avaimelle #%d:\n"
-"%s"
+"Xiphos ei pysty varaamaan\n"
+"tilaa kielilyhenteille."
+
+#: ../src/main/sword.cc:564
+msgid ""
+"Xiphos cannot read the\n"
+"language abbreviation file."
+msgstr ""
+"Xiphos ei voi lukea\n"
+"kielilyhenteiden tiedostoa."
+
+#: ../src/main/sword.cc:642
+msgid "No matching locale found for"
+msgstr "Paikallisuusasetusta ei löydy:"
+
+#: ../src/main/sword.cc:644
+msgid "Book names and menus may not be translated"
+msgstr "Kirjojen nimiä ja valikkoja ei ehkä pystytä kääntämään"
+
+#: ../src/main/sword.cc:1232
+msgid "Daily devotional was requested, but there are none installed."
+msgstr "Päivittäistä hartausta etsittiin, mutta sellaista ei ole asennettu."
+
+#: ../src/main/tab_history.c:219
+msgid "Clear History"
+msgstr "Tyhjennä historialista"
+
+#: ../src/main/url.cc:101
+msgid "URL not found:"
+msgstr "URLia ei löydetty:"
+
+#: ../src/main/url.cc:191
+#, c-format
+msgid "Xiphos could not execute %s"
+msgstr "Xiphos ei voinut suorittaa: %s"
+
+#: ../src/main/url.cc:199
+msgid "Viewer error:\n"
+msgstr "Katselunäkymän virhe:\n"
+
+#: ../src/main/url.cc:272
+#, c-format
+msgid "Show %s in main window"
+msgstr "Näytä %s pääikkunassa"
+
+#: ../src/main/xml.c:80 ../src/main/xml.c:464
+#, c-format
+msgid "Document not created successfully. \n"
+msgstr "Dokumenttia ei onnistuttu luomaan. \n"
+
+#: ../src/main/xml.c:89
+msgid "Personal"
+msgstr "Henkilökohtaista"
+
+#: ../src/main/xml.c:90
+msgid "What must I do to be saved?"
+msgstr "Mitä minun täytyy tehdä pelastuakseni?"
+
+#: ../src/main/xml.c:92 ../src/main/xml.c:93
+msgid "Acts 16:31"
+msgstr "Apt 16:31"
+
+#: ../src/main/xml.c:97 ../src/main/xml.c:98
+msgid "Eph 2:8,9"
+msgstr "Ef 2:8,9"
+
+#: ../src/main/xml.c:102 ../src/main/xml.c:103
+msgid "Romans 1:16"
+msgstr "Room 1:16"
+
+#: ../src/main/xml.c:106
+msgid "What is the Gospel?"
+msgstr "Mitä on evankeliumi?"
+
+#: ../src/main/xml.c:108 ../src/main/xml.c:109
+msgid "1 Cor 15:1-4"
+msgstr "1 Kor 15:1-4"
+
+#: ../src/main/xml.c:413 ../src/main/xml.c:1144
+#, c-format
+msgid "Document not parsed successfully. \n"
+msgstr "Dokumenttia ei onnistuttu käsittelemään. \n"
+
+#: ../src/main/xml.c:419 ../src/main/xml.c:747 ../src/main/xml.c:1025
+#: ../src/main/xml.c:1204
+#, c-format
+msgid "empty document \n"
+msgstr "tyhjä dokumentti \n"
+
+#: ../src/main/xml.c:425
+#, c-format
+msgid "wrong type, root node != SwordBookmarks\n"
+msgstr "väärä tyyppi, juurisolmu != SwordBookmarks\n"
+
+#: ../src/main/xml.c:476
+msgid "Old Testament"
+msgstr "Vanha Testamentti"
+
+#: ../src/main/xml.c:477
+msgid "Gen - Mal"
+msgstr "1Moos - Malakia"
+
+#: ../src/main/xml.c:482
+msgid "New Testament"
+msgstr "Uusi Testamentti"
+
+#: ../src/main/xml.c:483
+msgid "Mat - Rev"
+msgstr "Matt- Ilm"
+
+#: ../src/main/xml.c:489
+msgid "Sample Module List"
+msgstr "Moduulilistan malli"
+
+#: ../src/main/xml.c:753 ../src/main/xml.c:1031
+#, c-format
+msgid "wrong type, root node != %s\n"
+msgstr "väärä tyyppi, juurisolmu != %s\n"
 
 #: ../ui/bookmarks.glade.h:1
 msgid "Add Bookmark"
 msgstr "Lisää kirjanmerkki"
 
-#: ../ui/bookmarks.glade.h:2
+#: ../ui/bookmarks.glade.h:2 ../ui/markverse.glade.h:1
 msgid "Bookmark Dialog"
 msgstr "Kirjanmerkkidialogi"
 
@@ -1875,11 +2034,11 @@ msgstr "Kirjanmerkkidialogi"
 msgid "Bookmark Folder Treeview"
 msgstr "Kirjanmerkkikansion puunäkymä"
 
-#: ../ui/bookmarks.glade.h:4
+#: ../ui/bookmarks.glade.h:4 ../ui/markverse.glade.h:2
 msgid "Cancel Bookmark"
 msgstr "Peruuta kirjanmerkki"
 
-#: ../ui/bookmarks.glade.h:5
+#: ../ui/bookmarks.glade.h:5 ../ui/markverse.glade.h:3
 msgid "Create new folder"
 msgstr "Luo hakemisto"
 
@@ -1891,11 +2050,11 @@ msgstr "Etiketti"
 msgid "Label:"
 msgstr "Etiketti:"
 
-#: ../ui/bookmarks.glade.h:8
+#: ../ui/bookmarks.glade.h:8 ../ui/markverse.glade.h:6
 msgid "Module Entry"
 msgstr "Moduuli"
 
-#: ../ui/bookmarks.glade.h:9
+#: ../ui/bookmarks.glade.h:9 ../ui/markverse.glade.h:7
 msgid "Module:"
 msgstr "Moduuli:"
 
@@ -1903,15 +2062,16 @@ msgstr "Moduuli:"
 msgid "New ..."
 msgstr "Uusi ..."
 
-#: ../ui/bookmarks.glade.h:11 ../ui/xi-menus.glade.h:40
+#: ../ui/bookmarks.glade.h:11 ../ui/markverse.glade.h:8
+#: ../ui/xi-menus.glade.h:56
 msgid "New Folder"
 msgstr "Uusi kansio"
 
-#: ../ui/bookmarks.glade.h:12
+#: ../ui/bookmarks.glade.h:12 ../ui/markverse.glade.h:10
 msgid "Verse Entry"
 msgstr "Jae"
 
-#: ../ui/bookmarks.glade.h:13
+#: ../ui/bookmarks.glade.h:13 ../ui/markverse.glade.h:11
 msgid "Verse:"
 msgstr "Jae:"
 
@@ -1953,19 +2113,10 @@ msgstr "HTML-tila"
 msgid "Preview the note to be printed"
 msgstr "Esikatsele tulostettavaa muistiinpanoa"
 
-#: ../ui/editor_note.xml.h:9 ../ui/editor_studypad.xml.h:14
-msgid "Print Pre_view"
-msgstr "Tulostuksen esi_katselu"
-
 #: ../ui/editor_note.xml.h:10
 msgid "Print this note"
 msgstr "Tulosta tämä muistiinpano"
 
-#: ../ui/editor_note.xml.h:11 ../ui/editor_studypad.xml.h:16
-#: ../ui/editor.xml.h:11
-msgid "Save"
-msgstr "Tallenna"
-
 #: ../ui/editor_note.xml.h:12
 msgid "Save the current note"
 msgstr "Tallenna nykyinen muistiinpano"
@@ -1974,15 +2125,6 @@ msgstr "Tallenna nykyinen muistiinpano"
 msgid "_Delete Personal Comment"
 msgstr "_Poista henkilökohtainen kommentti"
 
-#: ../ui/editor_note.xml.h:14 ../ui/editor_studypad.xml.h:20
-#: ../ui/editor.xml.h:13 ../ui/xi-menus.glade.h:83
-msgid "_File"
-msgstr "_Tiedosto"
-
-#: ../ui/editor_note.xml.h:15 ../ui/editor_studypad.xml.h:21
-msgid "_Print..."
-msgstr "_Tulosta..."
-
 #: ../ui/editor_note.xml.h:16
 msgid "_Save (Personal Comment)"
 msgstr "_Tallenna (henkilökohtainen kommentti)"
@@ -2036,9 +2178,8 @@ msgid ": "
 msgstr ": "
 
 #: ../ui/export-dialog.glade.h:2
-#, fuzzy
 msgid "<b>Copy</b>"
-msgstr "<b>Laajuus</b>"
+msgstr "<b>Kopioi</b>"
 
 #: ../ui/export-dialog.glade.h:3
 msgid "<b>Export</b>"
@@ -2060,10 +2201,9 @@ msgstr ""
 msgid "Chapter Radio Button"
 msgstr ""
 
-#: ../ui/export-dialog.glade.h:9 ../ui/xi-menus.glade.h:12
-#, fuzzy
+#: ../ui/export-dialog.glade.h:9 ../ui/xi-menus.glade.h:18
 msgid "Copy/Export Passage"
-msgstr "Vie kappale"
+msgstr "Kopioi/vie jakso"
 
 #: ../ui/export-dialog.glade.h:10
 msgid "Export Passage Cancel"
@@ -2118,14 +2258,25 @@ msgid "Verse Radio Button"
 msgstr ""
 
 #: ../ui/export-dialog.glade.h:24
-#, fuzzy
 msgid "Verse range"
-msgstr "Yksi jae rivillä"
+msgstr "Jaejakso"
 
 #: ../ui/export-dialog.glade.h:25
 msgid "Version"
 msgstr "Versio"
 
+#: ../ui/markverse.glade.h:4
+msgid "Mark"
+msgstr "Merkkaa"
+
+#: ../ui/markverse.glade.h:5
+msgid "Mark/Unmark Verse"
+msgstr "Merkkaa jae/poista merkkaus"
+
+#: ../ui/markverse.glade.h:9
+msgid "Unmark"
+msgstr "Poista merkkaus"
+
 #: ../ui/module-manager.glade.h:1
 msgid "<b>Add and Remove Sources</b>"
 msgstr "<b> Lisää ja Poista lähteitä</b>"
@@ -2167,45 +2318,53 @@ msgstr "<i>Henkilökohtainen alue, omaan käyttöösi:</i>"
 msgid "<i>System area, for all users:</i>"
 msgstr "<i>Järjestelmän alue, kaikille käyttäjille:</i>"
 
-#: ../ui/module-manager.glade.h:11
+#: ../ui/module-manager.glade.h:12
 msgid "Continue"
 msgstr "Jatka"
 
-#: ../ui/module-manager.glade.h:12
+#: ../ui/module-manager.glade.h:13
 msgid "Current Remote Sources"
 msgstr "Nykyiset etälähteet"
 
-#: ../ui/module-manager.glade.h:13
+#: ../ui/module-manager.glade.h:14
 msgid "Current local sources"
 msgstr "Nykyiset paikalliset lähteet"
 
-#: ../ui/module-manager.glade.h:14
+#: ../ui/module-manager.glade.h:15
+msgid "Delete Index"
+msgstr "Tuhoa indeksi"
+
+#: ../ui/module-manager.glade.h:16
 msgid "Home dir"
 msgstr "Kotihakemisto"
 
-#: ../ui/module-manager.glade.h:16
+#: ../ui/module-manager.glade.h:19
+msgid "Load Standard"
+msgstr "Lataa vakio"
+
+#: ../ui/module-manager.glade.h:20
 msgid "Local"
 msgstr "Paikallinen"
 
-#: ../ui/module-manager.glade.h:17
+#: ../ui/module-manager.glade.h:21
 msgid "Local Install Folder"
 msgstr "Paikallinen asennushakemisto"
 
-#: ../ui/module-manager.glade.h:18
+#: ../ui/module-manager.glade.h:22
 msgid "Module Manager"
 msgstr "Moduulien hallinta"
 
-#: ../ui/module-manager.glade.h:19
+#: ../ui/module-manager.glade.h:23
 msgid "Remote"
 msgstr "Etä"
 
-#: ../ui/module-manager.glade.h:20
+#: ../ui/module-manager.glade.h:24
 msgid "Sword sys dir"
 msgstr "Swordin järjestelmähakemisto"
 
 #: ../ui/navbar_versekey.glade.h:1
 msgid "1"
-msgstr ""
+msgstr "1"
 
 #: ../ui/navbar_versekey.glade.h:2
 msgid "<b>Revelation of John</b>"
@@ -2300,8 +2459,8 @@ msgid "Background"
 msgstr "Tausta"
 
 #: ../ui/prefs.glade.h:21
-msgid "Base text size"
-msgstr "Tekstin peruskoko"
+msgid "Base font size"
+msgstr "Perusfontin koko"
 
 #: ../ui/prefs.glade.h:22
 msgid "Bible Texts"
@@ -2341,7 +2500,7 @@ msgstr ""
 
 #: ../ui/prefs.glade.h:32
 msgid "Choose to enable Prayer lists "
-msgstr "Valitse ottaaksesi käytöön rukouslistat"
+msgstr "Valitse ottaaksesi käytöön rukouslistat "
 
 #: ../ui/prefs.glade.h:34
 msgid "Commentaries Checkbox"
@@ -2532,38 +2691,50 @@ msgid "Show splash screen at start up"
 msgstr "Näytä käynnistyskuva aloituksen yhteydessä"
 
 #: ../ui/prefs.glade.h:84
-msgid "StudyPad default directory combo"
+msgid "Special Locale (requires restart)"
+msgstr "Erityinen paikallisuusasetus (vaatii uudelleenkäynnistyksen)"
+
+#: ../ui/prefs.glade.h:85
+msgid "Special Locale Combo"
 msgstr ""
 
 #: ../ui/prefs.glade.h:86
+msgid "StudyPad default directory combo"
+msgstr ""
+
+#: ../ui/prefs.glade.h:88
 msgid "Use Bible Text scroll bar to scroll to previous or next chapter"
 msgstr "Käytä Raamatun tekstin vierityspalkkia kappaleiden selaamiseen"
 
-#: ../ui/prefs.glade.h:87
+#: ../ui/prefs.glade.h:89
 msgid "Use Verse Per Line"
 msgstr "Yksi jae yhdellä rivillä"
 
-#: ../ui/prefs.glade.h:88
+#: ../ui/prefs.glade.h:90
 msgid "Use Verse Per Line Checkbox"
 msgstr ""
 
-#: ../ui/prefs.glade.h:89
+#: ../ui/prefs.glade.h:91
 msgid "Use default Dictionary"
 msgstr "Käytä oletussanakirjaa"
 
-#: ../ui/prefs.glade.h:90
+#: ../ui/prefs.glade.h:92
 msgid "Use default Dictionary Checkbox"
 msgstr ""
 
-#: ../ui/prefs.glade.h:91
+#: ../ui/prefs.glade.h:93
 msgid "Use tabbed browsing"
 msgstr "Käytä välilehtiä"
 
-#: ../ui/prefs.glade.h:92
+#: ../ui/prefs.glade.h:94
 msgid "Use tabbed browsing Checkbox"
 msgstr ""
 
-#: ../ui/prefs.glade.h:93
+#: ../ui/prefs.glade.h:95
+msgid "Verse Number"
+msgstr "Jakeen numero"
+
+#: ../ui/prefs.glade.h:96
 msgid "Verse number size"
 msgstr "Jaenumeron fontin koko"
 
@@ -2744,6 +2915,14 @@ msgid "Exact phrase radiobutton"
 msgstr ""
 
 #: ../ui/search-dialog.glade.h:46
+msgid "Export"
+msgstr "Vie"
+
+#: ../ui/search-dialog.glade.h:47
+msgid "Export current search results"
+msgstr "Vie nykyisen haun tulos"
+
+#: ../ui/search-dialog.glade.h:48
 msgid ""
 "Fast, featureful, index-based search\n"
 "Indexes must have been built beforehand:\n"
@@ -2753,227 +2932,227 @@ msgstr ""
 "Indeksin täytyy olla luotu etukäteen:\n"
 "Ks. moduulien hallinan ylläpitotoiminnot"
 
-#: ../ui/search-dialog.glade.h:49
+#: ../ui/search-dialog.glade.h:51
 msgid "Find Button"
 msgstr ""
 
-#: ../ui/search-dialog.glade.h:51
+#: ../ui/search-dialog.glade.h:53
 msgid "Footnotes radiobutton"
 msgstr ""
 
-#: ../ui/search-dialog.glade.h:52
+#: ../ui/search-dialog.glade.h:54
 msgid "In modules that have Footnotes"
 msgstr "Moduuleissa, joissa on alaviitteet"
 
-#: ../ui/search-dialog.glade.h:53
+#: ../ui/search-dialog.glade.h:55
 msgid "In modules that have Morphological Tags"
 msgstr "Moduuleissa, joissa on morfologiset tunnisteet"
 
-#: ../ui/search-dialog.glade.h:54
+#: ../ui/search-dialog.glade.h:56
 msgid "In modules that have Strong's Numbers"
 msgstr "Moduuleissa, joissa on Strongin numeroita"
 
-#: ../ui/search-dialog.glade.h:55
+#: ../ui/search-dialog.glade.h:57
 msgid "Main Search Entry"
 msgstr ""
 
-#: ../ui/search-dialog.glade.h:56
+#: ../ui/search-dialog.glade.h:58
 msgid "Make selections on the Attribute Search tab"
 msgstr "Tee valinnat Attribuuttihaku-välilehdellä"
 
-#: ../ui/search-dialog.glade.h:58
+#: ../ui/search-dialog.glade.h:60
 msgid "Match case checkbox"
 msgstr ""
 
-#: ../ui/search-dialog.glade.h:59
+#: ../ui/search-dialog.glade.h:61
 msgid "Module Selection"
 msgstr "Moduulivalinta"
 
-#: ../ui/search-dialog.glade.h:60
+#: ../ui/search-dialog.glade.h:62
 msgid "Module list"
 msgstr "Moduulilista"
 
-#: ../ui/search-dialog.glade.h:61
+#: ../ui/search-dialog.glade.h:63
 msgid "Module list radiobutton"
 msgstr ""
 
-#: ../ui/search-dialog.glade.h:63
+#: ../ui/search-dialog.glade.h:65
 msgid "Morphological Tags radiobutton"
 msgstr ""
 
-#: ../ui/search-dialog.glade.h:65
+#: ../ui/search-dialog.glade.h:67
 msgid "Multi word radiobutton"
 msgstr ""
 
-#: ../ui/search-dialog.glade.h:66
+#: ../ui/search-dialog.glade.h:68
 msgid "New Custom Module List Button"
 msgstr ""
 
-#: ../ui/search-dialog.glade.h:67
+#: ../ui/search-dialog.glade.h:69
 msgid "New Range Button"
 msgstr ""
 
-#: ../ui/search-dialog.glade.h:68
+#: ../ui/search-dialog.glade.h:70
 msgid "Open Selection Dialog Button"
 msgstr ""
 
-#: ../ui/search-dialog.glade.h:69
+#: ../ui/search-dialog.glade.h:71
 msgid "Open a dialog to select modules to add to the list"
 msgstr "Avaa dialogi valitaksesi moduulit, jotka lisätään listaan"
 
-#: ../ui/search-dialog.glade.h:70
+#: ../ui/search-dialog.glade.h:72
 msgid "Optimized (\"Lucene\")"
 msgstr "Optimoitu (\"Lucene\")"
 
-#: ../ui/search-dialog.glade.h:71
+#: ../ui/search-dialog.glade.h:73
 msgid "Optimized (\"Lucene\") radiobutton"
 msgstr ""
 
-#: ../ui/search-dialog.glade.h:72
+#: ../ui/search-dialog.glade.h:74
 msgid "Range Definition Entry"
 msgstr ""
 
-#: ../ui/search-dialog.glade.h:73
+#: ../ui/search-dialog.glade.h:75
 msgid "Range Name Entry"
 msgstr ""
 
-#: ../ui/search-dialog.glade.h:75
+#: ../ui/search-dialog.glade.h:77
 msgid "Regular expression radiobutton"
 msgstr ""
 
-#: ../ui/search-dialog.glade.h:76
+#: ../ui/search-dialog.glade.h:78
 msgid "Remove the selected module from the list"
 msgstr "Poista valittu moduuli listasta"
 
-#: ../ui/search-dialog.glade.h:77
+#: ../ui/search-dialog.glade.h:79
 msgid "Result Summary Table"
 msgstr ""
 
-#: ../ui/search-dialog.glade.h:78
+#: ../ui/search-dialog.glade.h:80
 msgid "Result Summary Window"
 msgstr ""
 
-#: ../ui/search-dialog.glade.h:79
+#: ../ui/search-dialog.glade.h:81
 msgid "Results"
 msgstr "Tulokset"
 
-#: ../ui/search-dialog.glade.h:80
+#: ../ui/search-dialog.glade.h:82
 msgid "Save Custom Module List Button"
 msgstr ""
 
-#: ../ui/search-dialog.glade.h:81
+#: ../ui/search-dialog.glade.h:83
 msgid "Save Range Button"
 msgstr ""
 
-#: ../ui/search-dialog.glade.h:82
+#: ../ui/search-dialog.glade.h:84
 msgid "Save custom range"
 msgstr "Tallenna oma alue"
 
-#: ../ui/search-dialog.glade.h:83
+#: ../ui/search-dialog.glade.h:85
 msgid "Save search results as bookmarks"
 msgstr "Tallenna hakutulokset kirjanmerkkeinä"
 
-#: ../ui/search-dialog.glade.h:84
+#: ../ui/search-dialog.glade.h:86
 msgid "Save the module list"
 msgstr "Tallenna moduulilista"
 
-#: ../ui/search-dialog.glade.h:85
+#: ../ui/search-dialog.glade.h:87
 msgid "Search  Criteria"
 msgstr "Haun määritykset"
 
-#: ../ui/search-dialog.glade.h:86
+#: ../ui/search-dialog.glade.h:88
 msgid "Search Criteria Treeview"
 msgstr ""
 
-#: ../ui/search-dialog.glade.h:87
+#: ../ui/search-dialog.glade.h:89
 msgid "Search entire module"
 msgstr "Hae koko moduulista"
 
-#: ../ui/search-dialog.glade.h:88
+#: ../ui/search-dialog.glade.h:90
 msgid "Search for Morphological tags"
 msgstr "Hae morfologisia tunnisteita"
 
-#: ../ui/search-dialog.glade.h:89
+#: ../ui/search-dialog.glade.h:91
 msgid "Search for Strongs Numbers like G4442 or H1121"
 msgstr "Hae Strongin numeroita kuten G4442 tai H1121"
 
-#: ../ui/search-dialog.glade.h:90
+#: ../ui/search-dialog.glade.h:92
 msgid "Search in footnotes"
 msgstr "Hae alaviitteistä"
 
-#: ../ui/search-dialog.glade.h:91
+#: ../ui/search-dialog.glade.h:93
 msgid "Show Footnotes"
 msgstr "Näytä alaviitteet"
 
-#: ../ui/search-dialog.glade.h:92
+#: ../ui/search-dialog.glade.h:94
 msgid "Show Footnotes checkbox"
 msgstr ""
 
-#: ../ui/search-dialog.glade.h:93
+#: ../ui/search-dialog.glade.h:95
 msgid "Show Morphological Tags"
 msgstr "Näytä morfologiset tunnisteet"
 
-#: ../ui/search-dialog.glade.h:94
+#: ../ui/search-dialog.glade.h:96
 msgid "Show Morphological Tags checkbox"
 msgstr ""
 
-#: ../ui/search-dialog.glade.h:95
+#: ../ui/search-dialog.glade.h:97
 msgid "Show Strong's Numbers"
 msgstr "Näytä Strongin numerot"
 
-#: ../ui/search-dialog.glade.h:96
+#: ../ui/search-dialog.glade.h:98
 msgid "Show Strong's Numbers checkbox"
 msgstr ""
 
-#: ../ui/search-dialog.glade.h:97
+#: ../ui/search-dialog.glade.h:99
 msgid "Show in main window"
 msgstr "Näytä pääikkunassa"
 
-#: ../ui/search-dialog.glade.h:98
+#: ../ui/search-dialog.glade.h:100
 msgid "Single module"
 msgstr "Yksittäinen moduuli"
 
-#: ../ui/search-dialog.glade.h:99
+#: ../ui/search-dialog.glade.h:101
 msgid "Single module radiobutton"
 msgstr ""
 
-#: ../ui/search-dialog.glade.h:100
+#: ../ui/search-dialog.glade.h:102
 msgid "Start/stop searching"
 msgstr "Aloita/keskeytä haku"
 
-#: ../ui/search-dialog.glade.h:101
+#: ../ui/search-dialog.glade.h:103
 msgid "Strongs Numbers"
 msgstr "Strongin numerot"
 
-#: ../ui/search-dialog.glade.h:102
+#: ../ui/search-dialog.glade.h:104
 msgid "Strongs Numbers radiobutton"
 msgstr ""
 
-#: ../ui/search-dialog.glade.h:103
+#: ../ui/search-dialog.glade.h:105
 msgid "Use a custom module list for the search"
 msgstr "Käytä omaa moduulilistaa hakuun"
 
-#: ../ui/search-dialog.glade.h:104
+#: ../ui/search-dialog.glade.h:106
 msgid "Use a custom range for the scope of the search"
 msgstr "Käytä omaa aluetta haun laajuutena"
 
-#: ../ui/search-dialog.glade.h:105
+#: ../ui/search-dialog.glade.h:107
 msgid "Use a single module for the search"
 msgstr "Käytä yksittäistä moduulia haulle"
 
-#: ../ui/search-dialog.glade.h:106
+#: ../ui/search-dialog.glade.h:108
 msgid "Use the current module list for the search"
 msgstr "Käytä nykyistä modulilistaa haulle"
 
-#: ../ui/search-dialog.glade.h:107
+#: ../ui/search-dialog.glade.h:109
 msgid "Use the results of the last search as the scope of the search"
 msgstr "Käytä viimeisen haun tuloksia haun laajuutena"
 
-#: ../ui/search-dialog.glade.h:108
+#: ../ui/search-dialog.glade.h:110
 msgid "e.g. Matt-John;Rev4"
 msgstr "esim. Matt-John;Rev4"
 
-#: ../ui/search-dialog.glade.h:109
+#: ../ui/search-dialog.glade.h:111
 msgid "for "
 msgstr "teksti "
 
@@ -2986,371 +3165,537 @@ msgid "About _Xiphos"
 msgstr "Tietoa _Xiphoksesta"
 
 #: ../ui/xi-menus.glade.h:4
+msgid "Add Item"
+msgstr ""
+
+#: ../ui/xi-menus.glade.h:5
+msgid "Add Sub-Item"
+msgstr ""
+
+#: ../ui/xi-menus.glade.h:6
+msgid "Add a sub-item"
+msgstr ""
+
+#: ../ui/xi-menus.glade.h:7
+msgid "Add an item"
+msgstr "Lisää kohta"
+
+#: ../ui/xi-menus.glade.h:8
 msgid "Add new folder to selected folder"
 msgstr "Lisää uusi kansio valittuun kansioon"
 
-#: ../ui/xi-menus.glade.h:6
+#: ../ui/xi-menus.glade.h:10
 msgid "Allow Reordering"
 msgstr "Salli uudelleenjärjestys"
 
-#: ../ui/xi-menus.glade.h:7
+#: ../ui/xi-menus.glade.h:11
 msgid "Allow items to be moved from one folder to another"
 msgstr "Salli jaksojen siirtäminen kansiosta toiseen"
 
-#: ../ui/xi-menus.glade.h:9
+#: ../ui/xi-menus.glade.h:12
+msgid "Annotate Verse"
+msgstr ""
+
+#: ../ui/xi-menus.glade.h:14
+msgid "Browse in BibleMap.org"
+msgstr ""
+
+#: ../ui/xi-menus.glade.h:15
 msgid "Collapse All"
 msgstr "Kutista kaikki"
 
-#: ../ui/xi-menus.glade.h:10
+#: ../ui/xi-menus.glade.h:16
 msgid "Collapse all Bookmarks groups"
 msgstr "Kutista kaikki kirjanmerkkiryhmät"
 
-#: ../ui/xi-menus.glade.h:11
+#: ../ui/xi-menus.glade.h:17
 msgid "Commentary by Chapter"
 msgstr "Kommentaari luvuittain"
 
-#: ../ui/xi-menus.glade.h:13
+#: ../ui/xi-menus.glade.h:19
+msgid "Create a new daily journal"
+msgstr "Luo uusi päivittäinen päiväkirja"
+
+#: ../ui/xi-menus.glade.h:20
+msgid "Create a new monthly journal"
+msgstr "Luo uusi kuukausittainen päiväkirja"
+
+#: ../ui/xi-menus.glade.h:21
+msgid "Create a new outlined topic"
+msgstr "Luo uusi aiheen runko"
+
+#: ../ui/xi-menus.glade.h:22
+msgid "Create a new simple prayer list"
+msgstr "Luo uusi yksinkertainen rukouslista"
+
+#: ../ui/xi-menus.glade.h:23
+msgid "Create a new subject prayer list"
+msgstr "Luo uusi aiheenmukainen rukouslista"
+
+#: ../ui/xi-menus.glade.h:24
 msgid "D_ouble-Space Text"
 msgstr "Kaksinkertainen riviväli"
 
-#: ../ui/xi-menus.glade.h:14
+#: ../ui/xi-menus.glade.h:25
+msgid "Daily"
+msgstr "Päivittäinen"
+
+#: ../ui/xi-menus.glade.h:26
 msgid "Delete Item"
 msgstr "Poista Jakso"
 
-#: ../ui/xi-menus.glade.h:15
+#: ../ui/xi-menus.glade.h:27
 msgid "Delete item"
 msgstr "Poista jakso"
 
-#: ../ui/xi-menus.glade.h:16
-msgid "Dictionary/_Lexicon"
+#: ../ui/xi-menus.glade.h:28
+msgid "Dictionar_y"
 msgstr "Sanakirja"
 
-#: ../ui/xi-menus.glade.h:17
+#: ../ui/xi-menus.glade.h:29
 msgid "Display Book Heading"
 msgstr "Näytä kirjan otsikko"
 
-#: ../ui/xi-menus.glade.h:18
+#: ../ui/xi-menus.glade.h:30
 msgid "Display Chapter Heading"
 msgstr "Näytä luvun otsikko"
 
-#: ../ui/xi-menus.glade.h:19
+#: ../ui/xi-menus.glade.h:31
 msgid "Dump Pers.Comm."
 msgstr "Hävitä henk.koht. komm."
 
-#: ../ui/xi-menus.glade.h:21
+#: ../ui/xi-menus.glade.h:33
 msgid "Edit bookmark item"
 msgstr "Muokkaa kirjanmerkkijaksoa"
 
-#: ../ui/xi-menus.glade.h:22
+#: ../ui/xi-menus.glade.h:34
+msgid "Edit this item"
+msgstr "Muokkaa tätä kohtaa"
+
+#: ../ui/xi-menus.glade.h:35
 msgid "Expand All"
 msgstr "Laajenna kaikki"
 
-#: ../ui/xi-menus.glade.h:23
+#: ../ui/xi-menus.glade.h:36
 msgid "Expand all Bookmarks groups"
 msgstr "Laajenna kaikki kirjanmerkkiryhmät"
 
-#: ../ui/xi-menus.glade.h:24
-msgid "File"
-msgstr "Tiedosto"
+#: ../ui/xi-menus.glade.h:37
+msgid "Export Folder"
+msgstr "Vie kansio"
 
-#: ../ui/xi-menus.glade.h:30
+#: ../ui/xi-menus.glade.h:38
+msgid "Export List"
+msgstr "Vie lista"
+
+#: ../ui/xi-menus.glade.h:45
 msgid "Image Content"
 msgstr "Kuva_sisältö"
 
-#: ../ui/xi-menus.glade.h:31
+#: ../ui/xi-menus.glade.h:46
 msgid "Import Bibletime Bookmarks"
 msgstr "Tuo Bibletimen kirjanmerkit"
 
-#: ../ui/xi-menus.glade.h:32
+#: ../ui/xi-menus.glade.h:47
 msgid "Insert Bookmark"
 msgstr "Lisää kirjanmerkki"
 
-#: ../ui/xi-menus.glade.h:33
+#: ../ui/xi-menus.glade.h:48
 msgid "Insert new bookmark here"
 msgstr "Lisää uusi kirjanmerkki tähän"
 
-#: ../ui/xi-menus.glade.h:34
+#: ../ui/xi-menus.glade.h:49
 msgid "L_ink Tabs"
 msgstr "_Linkitä välilehdet"
 
-#: ../ui/xi-menus.glade.h:36
+#: ../ui/xi-menus.glade.h:51
 msgid "Load Bookmarks from Bibletime"
 msgstr "Lataa kirjanmerkit Bibletimesta"
 
-#: ../ui/xi-menus.glade.h:37
+#: ../ui/xi-menus.glade.h:52
 msgid "Lookup Selection"
 msgstr "Etsi valinta"
 
-#: ../ui/xi-menus.glade.h:41
+#: ../ui/xi-menus.glade.h:54
+msgid "Monthly"
+msgstr "Kuukausittainen"
+
+#: ../ui/xi-menus.glade.h:57
 msgid "Note"
 msgstr "Muistiinpano"
 
-#: ../ui/xi-menus.glade.h:42
+#: ../ui/xi-menus.glade.h:58
 msgid "Open Module"
 msgstr "Avaa moduuli"
 
-#: ../ui/xi-menus.glade.h:43
-#, fuzzy
+#: ../ui/xi-menus.glade.h:59
 msgid "Open Study_pad"
-msgstr "Avaa _Opiskelumuistio"
+msgstr "Avaa Opiskelumuistio"
 
-#: ../ui/xi-menus.glade.h:44
+#: ../ui/xi-menus.glade.h:60
 msgid "Open in a dialog"
 msgstr "Avaa dialogissa"
 
-#: ../ui/xi-menus.glade.h:46
-#, fuzzy
+#: ../ui/xi-menus.glade.h:61
+msgid "Open in a separate window"
+msgstr "Avaa erillisessä ikkunassa"
+
+#: ../ui/xi-menus.glade.h:62
+msgid "Open in editor"
+msgstr "Avaa editorissa"
+
+#: ../ui/xi-menus.glade.h:63
 msgid "Open in new tab"
 msgstr "Avaa uudessa välilehdessä"
 
-#: ../ui/xi-menus.glade.h:47
+#: ../ui/xi-menus.glade.h:64
+msgid ""
+"Open selected module in a\n"
+"\tseparate ['dialog'] window"
+msgstr ""
+"Avaa valittu moduuli\n"
+"\terillisessä ['dialogi'] ikkunassa"
+
+#: ../ui/xi-menus.glade.h:66
+msgid "Open selected module in a new tab"
+msgstr "Avaa valittu moduuli uudessa välilehdessä"
+
+#: ../ui/xi-menus.glade.h:67
 msgid "Open this bookmark in a dialog"
 msgstr "Avaa tämä kirjanmerkki dialogissa"
 
-#: ../ui/xi-menus.glade.h:48
+#: ../ui/xi-menus.glade.h:68
 msgid "Open this bookmark in a new tab"
 msgstr "Avaa tämä kirjanmerkki uudessa välilehdessä"
 
-#: ../ui/xi-menus.glade.h:50
+#: ../ui/xi-menus.glade.h:69
+msgid "Outlined"
+msgstr ""
+
+#: ../ui/xi-menus.glade.h:71
 msgid "Read Selection Aloud"
 msgstr "Lue valinta ääneen"
 
-#: ../ui/xi-menus.glade.h:51
-msgid "Remove - Restore"
-msgstr "Poista - Palauta"
-
-#: ../ui/xi-menus.glade.h:52
-msgid "Remove Folder"
-msgstr "Poista kansio"
-
-#: ../ui/xi-menus.glade.h:53
+#: ../ui/xi-menus.glade.h:73
 msgid "Remove folder and save it"
 msgstr "Poista kansio ja tallenna se"
 
-#: ../ui/xi-menus.glade.h:54
+#: ../ui/xi-menus.glade.h:74
+msgid "Remove this item"
+msgstr "Poista tämä kohta"
+
+#: ../ui/xi-menus.glade.h:75
 msgid "Rename Pers.Comm."
 msgstr "Nimeä henk.koht. komm."
 
-#: ../ui/xi-menus.glade.h:55
+#: ../ui/xi-menus.glade.h:76
 msgid "Respect Font Faces"
 msgstr "Noudata fonttimäärittelyjä"
 
-#: ../ui/xi-menus.glade.h:56
+#: ../ui/xi-menus.glade.h:77
 msgid "Restore Folder"
 msgstr "Palauta kansio"
 
-#: ../ui/xi-menus.glade.h:57
+#: ../ui/xi-menus.glade.h:78
 msgid "Restore saved folder"
 msgstr "Palaute tallennettu kansio"
 
-#: ../ui/xi-menus.glade.h:58
-#, fuzzy
+#: ../ui/xi-menus.glade.h:79
 msgid "Save list as a series of bookmarks"
-msgstr "Tallenna hakutulokset kirjanmerkkeinä"
+msgstr "Tallenna lista peräkkäisiksi kirjanmerkeiksi"
 
-#: ../ui/xi-menus.glade.h:59
-#, fuzzy
+#: ../ui/xi-menus.glade.h:80
 msgid "Save list as a single bookmark"
-msgstr "Tallenna hakutulokset kirjanmerkkeinä"
+msgstr "Tallenna lista yhdeksi kirjanmerkiksi"
 
-#: ../ui/xi-menus.glade.h:60
-#, fuzzy
+#: ../ui/xi-menus.glade.h:81
 msgid "Save these results as a series of bookmarks in their own folder"
-msgstr "Tallenna hakutulokset kirjanmerkkeinä"
+msgstr "Tallenna tulokset yhteen kansioon peräkkäisiksi kirjanmerkeiksi"
 
-#: ../ui/xi-menus.glade.h:61
-#, fuzzy
+#: ../ui/xi-menus.glade.h:82
 msgid "Save these results as a single bookmark"
-msgstr "Tallenna hakutulokset kirjanmerkkeinä"
+msgstr "Tallenna tulokset yhdeksi kirjanmerkiksi"
 
-#: ../ui/xi-menus.glade.h:62
+#: ../ui/xi-menus.glade.h:83
 msgid "Scripture Cross-references"
 msgstr "Ristiviittaukset"
 
-#: ../ui/xi-menus.glade.h:64
-#, fuzzy
+#: ../ui/xi-menus.glade.h:85
 msgid "Show Parallel View in a _Tab"
-msgstr "Näytä rinnakkaisnäkymä välilehdessä"
+msgstr "Näytä _rinnakkaisnäkymä välilehdessä"
 
-#: ../ui/xi-menus.glade.h:65
-#, fuzzy
+#: ../ui/xi-menus.glade.h:86
 msgid "Show Previe_wer in the Sidebar"
-msgstr "Näytä esikatselija sivupalkissa"
+msgstr "Näytä _esikatselu sivupalkissa"
 
-#: ../ui/xi-menus.glade.h:66
+#: ../ui/xi-menus.glade.h:87
 msgid "Show Verse _Numbers"
 msgstr "Näytä jae_numerot"
 
-#: ../ui/xi-menus.glade.h:69
+#: ../ui/xi-menus.glade.h:88
+msgid "Simple"
+msgstr "Yksinkertainen"
+
+#: ../ui/xi-menus.glade.h:90
+msgid "Subject"
+msgstr "Aihe"
+
+#: ../ui/xi-menus.glade.h:92
 msgid "Unlock This Module"
 msgstr "Poista moduulin lukitus"
 
-#: ../ui/xi-menus.glade.h:70
+#: ../ui/xi-menus.glade.h:93
 msgid "Use Current Dictionary"
 msgstr "Käytä nykyistä sanakirjaa"
 
-#: ../ui/xi-menus.glade.h:71
+#: ../ui/xi-menus.glade.h:94
 msgid "Use module manager to install and remove Sword modules"
 msgstr "Käytä moduulien hallintaa Sword-moduulien asennukseen tai poistoon"
 
-#: ../ui/xi-menus.glade.h:72
+#: ../ui/xi-menus.glade.h:95
 msgid "Variants"
 msgstr "Variantit"
 
-#: ../ui/xi-menus.glade.h:74
-#, fuzzy
+#: ../ui/xi-menus.glade.h:97
 msgid "_About The SWORD Project"
-msgstr "Tietoa _SWORD-projektista"
+msgstr "_Tietoja SWORD-projektista"
 
-#: ../ui/xi-menus.glade.h:75
+#: ../ui/xi-menus.glade.h:98
 msgid "_Advanced Search"
 msgstr "_Edistynyt haku"
 
-#: ../ui/xi-menus.glade.h:76
+#: ../ui/xi-menus.glade.h:99
 msgid "_Attach/Detach Sidebar"
 msgstr "_Liitä/Irrota sivupalkki"
 
-#: ../ui/xi-menus.glade.h:77
-#, fuzzy
-msgid "_Bible Text"
-msgstr "_Raamatun tekstit"
+#: ../ui/xi-menus.glade.h:100
+msgid "_Bible"
+msgstr "_Raamattu"
 
-#: ../ui/xi-menus.glade.h:78
-msgid "_Commentary"
-msgstr "_Kommentaari"
+#: ../ui/xi-menus.glade.h:101
+msgid "_Commentary/Book"
+msgstr "_Kommentaari/kirja"
 
-#: ../ui/xi-menus.glade.h:79
+#: ../ui/xi-menus.glade.h:102
 msgid "_Contents"
 msgstr "_Sisältö"
 
-#: ../ui/xi-menus.glade.h:80
+#: ../ui/xi-menus.glade.h:103
 msgid "_Daily Devotion"
 msgstr "_Päivittäinen hartaus"
 
-#: ../ui/xi-menus.glade.h:81
+#: ../ui/xi-menus.glade.h:104
 msgid "_Edit"
 msgstr "_Muokkaa"
 
-#: ../ui/xi-menus.glade.h:82
+#: ../ui/xi-menus.glade.h:105
 msgid "_Edit Item"
 msgstr "_Muokkaa jaksoa"
 
-#: ../ui/xi-menus.glade.h:84
+#: ../ui/xi-menus.glade.h:107
 msgid "_Help"
-msgstr "_Apua"
+msgstr "_Ohje"
 
-#: ../ui/xi-menus.glade.h:85
+#: ../ui/xi-menus.glade.h:108
 msgid "_Highlight Current Verse"
 msgstr "_Korosta nykyinen jae"
 
-#: ../ui/xi-menus.glade.h:86
+#: ../ui/xi-menus.glade.h:109
 msgid "_Live Chat"
 msgstr "_IRC-kanava"
 
-#: ../ui/xi-menus.glade.h:87
+#: ../ui/xi-menus.glade.h:110
 msgid "_Mailing List"
 msgstr "Sähköpostilista"
 
-#: ../ui/xi-menus.glade.h:88
+#: ../ui/xi-menus.glade.h:111
 msgid "_Module Manager"
 msgstr "_Moduulien hallinta"
 
-#: ../ui/xi-menus.glade.h:89
+#: ../ui/xi-menus.glade.h:112
 msgid "_Open Session"
 msgstr "_Avaa istunto"
 
-#: ../ui/xi-menus.glade.h:90
+#: ../ui/xi-menus.glade.h:113
 msgid "_Preferences"
 msgstr "_Asetukset"
 
-#: ../ui/xi-menus.glade.h:91
+#: ../ui/xi-menus.glade.h:114
 msgid "_Preview"
 msgstr "E_sikatselu"
 
-#: ../ui/xi-menus.glade.h:92
+#: ../ui/xi-menus.glade.h:115
 msgid "_Read Aloud"
 msgstr "L_ue ääneen"
 
-#: ../ui/xi-menus.glade.h:93
+#: ../ui/xi-menus.glade.h:116
 msgid "_Report Bug"
 msgstr "Raportoi virheestä"
 
-#: ../ui/xi-menus.glade.h:94
+#: ../ui/xi-menus.glade.h:117
 msgid "_Save Session"
 msgstr "_Tallenna istunto"
 
-#: ../ui/xi-menus.glade.h:95
+#: ../ui/xi-menus.glade.h:118
 msgid "_Search"
 msgstr "_Etsi"
 
-#: ../ui/xi-menus.glade.h:96
-msgid "_Show/Hide Sidebar"
-msgstr "_Näytä/Piilota sivupalkki"
+#: ../ui/xi-menus.glade.h:119
+msgid "_Show/Hide Attached Sidebar"
+msgstr "Näytä/piilota sivupalkki"
 
-#: ../ui/xi-menus.glade.h:97
+#: ../ui/xi-menus.glade.h:120
 msgid "_Verse Per Line"
 msgstr "Yksi jae rivillä"
 
-#: ../ui/xi-menus.glade.h:98
-msgid "_View"
-msgstr "_Näkymä"
+#: ../xiphos.desktop.in.in.h:1
+msgid "Study the Bible"
+msgstr "Opiskele Raamattua"
+
+#: ../xiphos.desktop.in.in.h:2
+msgid "Xiphos Bible Guide"
+msgstr "Xiphos Raamattuopas"
 
-#~ msgid "Save As"
-#~ msgstr "Tallenna nimellä"
+#~ msgid "Move backwards through history"
+#~ msgstr "Liiku taaksepäin historiassa"
 
-#~ msgid "Untitled document"
-#~ msgstr "Nimeämätön dokumentti"
+#~ msgid "Move foward through history"
+#~ msgstr "Liiku eteenpäin historiassa"
 
-#~ msgid "HTML Output"
-#~ msgstr "HTML-tuloste"
+#~ msgid "Select a Book of the Bible"
+#~ msgstr "Valitse Raamatun kirja"
 
-#~ msgid "HTML Source"
-#~ msgstr "HTML-lähdeteksti"
+#~ msgid "Change Chapter"
+#~ msgstr "Vaihda kappaletta"
 
-#~ msgid "Plain Source"
-#~ msgstr "Muotoilematon lähdeteksti"
+#~ msgid "Change Verse"
+#~ msgstr "Vaihda jaetta"
 
-#~ msgid "_Quit"
-#~ msgstr "_Lopeta"
+#~ msgid "Enter a Verse reference in Book 1:1 format and press Return"
+#~ msgstr "Anna viittaus muodossa Kirja 1:1 ja paina Return"
 
-#~ msgid "_Open"
-#~ msgstr "_Avaa"
+#~ msgid "Install these modules:"
+#~ msgstr "Asenna seuraavat moduulit:"
 
-#~ msgid "_Save"
-#~ msgstr "_Tallenna"
+#~ msgid "Remove these modules:"
+#~ msgstr "Poista seuraavat moduulit:"
 
-#~ msgid "Save _As..."
-#~ msgstr "Tallenna nimellä..."
+#~ msgid "Archive these modules:"
+#~ msgstr "Arkistoi seuraavat moduulit:"
 
-#~ msgid "HTML _Output"
-#~ msgstr "_HTML-muotoilu"
+#~ msgid ""
+#~ "Build fast-search index for these\n"
+#~ "modules (may take minutes/module):"
+#~ msgstr ""
+#~ "Luo nope hakuindeksi näille moduuleille\n"
+#~ "(voi kestää minuutteja/moduuli):"
+
+#~ msgid "Delete fast-search index for these modules:"
+#~ msgstr "Tuhoa seuraavien moduulin hakuindeksit:"
+
+#~ msgid "Xiphos could not execute archiver"
+#~ msgstr "Xiphos ei voinut suorittaa arkistointia"
+
+#~ msgid ""
+#~ " archival result:\n"
+#~ "\n"
+#~ msgstr ""
+#~ " arkistoinnin tulos:\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Archive in "
+#~ msgstr ""
+#~ "\n"
+#~ "Arkisto "
+
+#~ msgid "Refreshing remote"
+#~ msgstr "Yhdistetään"
+
+#~ msgid "Remote not found"
+#~ msgstr "Etäyhteyttä ei saatu"
+
+#~ msgid "Sources"
+#~ msgstr "Lähteet"
+
+#~ msgid "Open in a new tab"
+#~ msgstr "Avaa uudessa välilehdessä"
+
+#~ msgid "Open selected module in a separate ['dialog'] window"
+#~ msgstr "Avaa valittu moduuli dialogissa"
+
+#~ msgid "View information about the selected dialog"
+#~ msgstr "Katsele tietoa valitusta dialogista"
+
+#~ msgid "Create a new prayer list"
+#~ msgstr "Luo uusi rukouslista"
+
+#~ msgid "Daily Journal"
+#~ msgstr "Päiväkirja"
+
+#~ msgid "Outlined Topic"
+#~ msgstr "Aiheen hahmotelma"
+
+#~ msgid "Open selected module in a dialog"
+#~ msgstr "Avaa valittu moduuli dialogissa"
+
+#~ msgid "Text"
+#~ msgstr "Teksti"
+
+#~ msgid "Text to render"
+#~ msgstr "Käsiteltävä teksti"
 
-#~ msgid "_HTML Source"
-#~ msgstr "HTML-lähdekoodi"
+#~ msgid "The pixbuf to render."
+#~ msgstr "Renderöitävä kuvapuskuri."
 
-#~ msgid "_Plain Source"
-#~ msgstr "_Muotoilematon lähdekoodi"
+#~ msgid "Add Child"
+#~ msgstr "Lisää alataso"
 
-#~ msgid "Are you sure you want to delete the note for"
-#~ msgstr "Haluatko poistaa merkinnän"
+#~ msgid "Add Sibling"
+#~ msgstr "Lisää sama taso"
 
-#~ msgid "Save the changes to document"
-#~ msgstr "Tallenna muutokset tiedostoon"
+#~ msgid "Eph 2:8"
+#~ msgstr "Efes 2:8"
 
-#~ msgid "before closing?"
-#~ msgstr "ennen sulkemista?"
+#~ msgid "H_istory/<Separator>"
+#~ msgstr "H_istoria/<Separator>"
 
-#~ msgid "If you don't save, changes will be permanently lost."
-#~ msgstr "Jos et tallenna, muutokset katoavat pysyvästi."
+#~ msgid "H_istory/C_lear"
+#~ msgstr "H_istoria/P_uhdista"
 
-#~ msgid "StudyPad"
-#~ msgstr "Opiskelumuistio"
+#~ msgid "Xiphos has renamed .xiphos-2.0 to .xiphos"
+#~ msgstr "Xiphos on uudelleennimennyt kansion .xiphos-2.0 kansioksi .xiphos"
 
-#~ msgid "Note Editor"
-#~ msgstr "Muistiinpanojen muokkain"
+#~ msgid ""
+#~ "Xiphos can not rename  .xiphos-2.0 to .xiphos:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Xiphos cannot continue."
+#~ msgstr ""
+#~ "Xiphos ei voi uudelleennimetä .kansiota .xiphos-2.0\n"
+#~ "kansioksi .xiphos:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Xiphos ei voi jatkaa."
+
+#~ msgid "Base text size"
+#~ msgstr "Tekstin peruskoko"
+
+#~ msgid "Dictionary/_Lexicon"
+#~ msgstr "Sanakirja"
+
+#~ msgid "Remove - Restore"
+#~ msgstr "Poista - Palauta"
 
-#~ msgid "Prayer List/Journal Editor"
-#~ msgstr "Rukouslistan/päiväkirjan editori"
+#~ msgid "Remove Folder"
+#~ msgstr "Poista kansio"
+
+#~ msgid "_Commentary"
+#~ msgstr "_Kommentaari"
+
+#~ msgid "_Show/Hide Sidebar"
+#~ msgstr "_Näytä/Piilota sivupalkki"
 
 #~ msgid "Open StudyPad File"
 #~ msgstr "Avaa Opiskelumuistio"
@@ -3368,51 +3713,11 @@ msgstr "_Näkymä"
 #~ msgstr "_Moduuliasetukset"
 
 #~ msgid "Sync with main"
-#~ msgstr "Yhdistä "
+#~ msgstr "Yhdistä"
 
 #~ msgid "Stay in sync"
 #~ msgstr "Pysy yhdistettynä"
 
-#~ msgid ""
-#~ "Renaming is not available in Windows.\n"
-#~ "\n"
-#~ "Xiphos is limited by Windows' filesystem,\n"
-#~ "because it disallows the renaming of filename\n"
-#~ "components of currently-open files,\n"
-#~ "such as the contents of this commentary.\n"
-#~ "Therefore, personal commentary renaming is\n"
-#~ "not available in the Windows environment."
-#~ msgstr ""
-#~ "Uudelleennimeäminen ei ole mahdollista Windowsissa.\n"
-#~ "\n"
-#~ "Windowsin tiedostojärjestelmä ei salli avattuna olevan\n"
-#~ "tiedoston nimen muuttamista. Sen takia henkilökohtaisen\n"
-#~ "kommentaarin uudelleennimeäminen ei ole käytössä\n"
-#~ "Windows-ympäristössä."
-
-#~ msgid "Rename Commentary"
-#~ msgstr "Uudelleennimeä kommentaari"
-
-#~ msgid "Choose Commentary Name"
-#~ msgstr "Valitse kommentaarin nimi"
-
-#~ msgid "New Name"
-#~ msgstr "Uusi nimi"
-
-#~ msgid ""
-#~ "Failed to create new configuration:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Uusien asetusten luominen epäonnistui:\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "Configuration build error:\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Asetusten muodostusvirhe:\n"
-#~ "\n"
-
 #~ msgid "Print"
 #~ msgstr "Tulosta"
 
@@ -3527,9 +3832,6 @@ msgstr "_Näkymä"
 #~ msgid "\\par\\par My prayer list \\par\\par Module created in Xiphos"
 #~ msgstr "\\par\\par Oma rukouslista \\par\\par Xiphoksen luoma moduuli"
 
-#~ msgid "Delete Index"
-#~ msgstr "Tuhoa indeksi"
-
 #~ msgid "Select Local Source"
 #~ msgstr "Valitse paikallinen lähde"
 
diff --git a/po/fr.po b/po/fr.po
index a88a6d0..8628eff 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,6 +1,5 @@
 # French translation for Xiphos
-# Copyright (C) 2002, 2009 Free Software Foundation, Inc.
-# Dominique Corbex <domcox@users.sourceforge.net>, 2002, 2008
+# Copyright (C) 2002, 2010 Free Software Foundation, Inc.
 # Contributions are welcome.
 # Translation Notes (Any comment welcome)
 # ---------------------------------------
@@ -16,178 +15,200 @@
 # Daily Devotion          -> Calendrier biblique
 #
 #
+# Dominique Corbex <domcox@users.sourceforge.net>, 2002, 2010.
 msgid ""
 msgstr ""
-"Project-Id-Version: Xiphos 3.0.0\n"
+"Project-Id-Version: Xiphos 3.1.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-29 14:21+0200\n"
-"PO-Revision-Date: 2009-04-29 13:48+0200\n"
+"POT-Creation-Date: 2009-12-14 23:45+0000\n"
+"PO-Revision-Date: 2009-12-12 13:39+0100\n"
 "Last-Translator: Dominique Corbex <domcox@users.sourceforge.net>\n"
-"Language-Team: Project-Id-Version: gtranslator 1.0.1 <gnomefr@traduc.org>\n"
+"Language-Team: emacs + po-mode <gnomefr@traduc.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n>1;\n"
 
-#: ../src/backend/sword_main.cc:1154
+#: ../src/backend/sword_main.cc:1083
 msgid "Configuration not found"
 msgstr "Configuration non trouvée"
 
-#: ../src/editor/bonobo-editor.c:252 ../src/editor/slib-editor.c:228
-#: ../src/gnome2/html.c:629
+#: ../src/editor/bonobo-editor.c:254 ../src/editor/slib-editor.c:234
+#: ../src/gnome2/html.c:637
 #, c-format
 msgid "Page %d of %d"
 msgstr "Page %d de %d"
 
-#: ../src/editor/bonobo-editor.c:351
+#: ../src/editor/bonobo-editor.c:353 ../src/editor/slib-editor.c:659
 msgid "Are you sure you want to delete the note for"
 msgstr "Êtes-vous certain de vouloir supprimer le commentaire de"
 
-#: ../src/editor/bonobo-editor.c:963 ../src/editor/bonobo-editor.c:996
-#: ../src/editor/slib-editor.c:1161 ../src/editor/slib-editor.c:1198
+#: ../src/editor/bonobo-editor.c:965 ../src/editor/bonobo-editor.c:998
+#: ../src/editor/slib-editor.c:1308 ../src/editor/slib-editor.c:1345
 msgid "Save the changes to document"
 msgstr "Voulez-vous enregistrer les modifications apportées au document"
 
-#: ../src/editor/bonobo-editor.c:964 ../src/editor/bonobo-editor.c:997
-#: ../src/editor/slib-editor.c:1162 ../src/editor/slib-editor.c:1199
+#: ../src/editor/bonobo-editor.c:966 ../src/editor/bonobo-editor.c:999
+#: ../src/editor/slib-editor.c:1309 ../src/editor/slib-editor.c:1346
 msgid "before closing?"
 msgstr "avant de fermer?"
 
-#: ../src/editor/bonobo-editor.c:971 ../src/editor/bonobo-editor.c:1004
-#: ../src/editor/slib-editor.c:1169 ../src/editor/slib-editor.c:1206
+#: ../src/editor/bonobo-editor.c:973 ../src/editor/bonobo-editor.c:1006
+#: ../src/editor/slib-editor.c:1316 ../src/editor/slib-editor.c:1353
 msgid "If you don't save, changes will be permanently lost."
 msgstr ""
 "Si vous n'enregistrez pas, les modifications seront définitivement perdues."
 
-#: ../src/editor/bonobo-editor.c:995 ../src/editor/slib-editor.c:1197
-#: ../ui/xi-menus.glade.h:24
+#: ../src/editor/bonobo-editor.c:997 ../src/editor/slib-editor.c:1344
+#: ../ui/xi-menus.glade.h:39
 msgid "File"
 msgstr "Fichier"
 
-#: ../src/editor/bonobo-editor.c:1222 ../src/editor/slib-editor.c:1254
+#: ../src/editor/bonobo-editor.c:1224 ../src/editor/slib-editor.c:1401
 msgid "StudyPad"
 msgstr "Bloc-notes"
 
-#: ../src/editor/bonobo-editor.c:1235 ../src/editor/slib-editor.c:1268
+#: ../src/editor/bonobo-editor.c:1237 ../src/editor/slib-editor.c:1415
 msgid "Note Editor"
 msgstr "Éditeur de note"
 
-#: ../src/editor/bonobo-editor.c:1244 ../src/editor/slib-editor.c:1282
+#: ../src/editor/bonobo-editor.c:1246 ../src/editor/slib-editor.c:1429
 msgid "Prayer List/Journal Editor"
 msgstr "Éditeur de liste de prières ou de journal"
 
-#: ../src/editor/slib-editor.c:382 ../src/editor/slib-editor.c:429
+#: ../src/editor/slib-editor.c:401 ../src/editor/slib-editor.c:448
 msgid "Save As"
 msgstr "Enregistrer sous"
 
-#: ../src/editor/slib-editor.c:400 ../src/editor/slib-editor.c:447
+#: ../src/editor/slib-editor.c:419 ../src/editor/slib-editor.c:466
+#: ../src/editor/slib-editor.c:634
 msgid "Untitled document"
 msgstr "Sans titre"
 
-#: ../src/editor/slib-editor.c:612
+#: ../src/editor/slib-editor.c:702
 msgid "HTML Output"
 msgstr "Sortie HTML"
 
-#: ../src/editor/slib-editor.c:619
+#: ../src/editor/slib-editor.c:709
 msgid "HTML Source"
 msgstr "Source HTML"
 
-#: ../src/editor/slib-editor.c:626
+#: ../src/editor/slib-editor.c:716
 msgid "Plain Source"
 msgstr "Source texte"
 
-#: ../src/editor/slib-editor.c:633 ../ui/editor_note.xml.h:15
+#: ../src/editor/slib-editor.c:726 ../ui/editor_note.xml.h:15
 #: ../ui/editor_studypad.xml.h:21
 msgid "_Print..."
 msgstr "_Imprimer..."
 
-#: ../src/editor/slib-editor.c:640 ../ui/editor_note.xml.h:9
+#: ../src/editor/slib-editor.c:733 ../ui/editor_note.xml.h:9
 #: ../ui/editor_studypad.xml.h:14
 msgid "Print Pre_view"
 msgstr "A_perçu avant impression"
 
-#: ../src/editor/slib-editor.c:647
+#: ../src/editor/slib-editor.c:740
 msgid "_Quit"
 msgstr "_Quitter"
 
-#: ../src/editor/slib-editor.c:654
+#: ../src/editor/slib-editor.c:747
 msgid "_Open"
 msgstr "_Ouvrir"
 
-#: ../src/editor/slib-editor.c:661
+#: ../src/editor/slib-editor.c:754
 msgid "_Save"
 msgstr "_Enregistrer"
 
-#: ../src/editor/slib-editor.c:668
+#: ../src/editor/slib-editor.c:761
 msgid "Save _As..."
 msgstr "Enregistrer _sous..."
 
-#: ../src/editor/slib-editor.c:675 ../ui/editor_note.xml.h:14
+#: ../src/editor/slib-editor.c:767
+msgid "New"
+msgstr "Nouveau"
+
+#: ../src/editor/slib-editor.c:769
+msgid "Open new document"
+msgstr "Ouvre un nouveau document"
+
+#: ../src/editor/slib-editor.c:773
+msgid "Delete"
+msgstr "Supprime"
+
+#: ../src/editor/slib-editor.c:775
+msgid "Delete current note"
+msgstr "Supprime la note en cours"
+
+#: ../src/editor/slib-editor.c:780 ../ui/editor_note.xml.h:14
 #: ../ui/editor_studypad.xml.h:20 ../ui/editor.xml.h:13
-#: ../ui/xi-menus.glade.h:83
+#: ../ui/xi-menus.glade.h:106
 msgid "_File"
 msgstr "_Fichier"
 
-#: ../src/editor/slib-editor.c:730
+#: ../src/editor/slib-editor.c:835
 msgid "HTML _Output"
 msgstr "_Sortie HTML"
 
-#: ../src/editor/slib-editor.c:737
+#: ../src/editor/slib-editor.c:842
 msgid "_HTML Source"
 msgstr "Source _HTML"
 
-#: ../src/editor/slib-editor.c:744
+#: ../src/editor/slib-editor.c:849
 msgid "_Plain Source"
 msgstr "Source _texte"
 
-#: ../src/editor/slib-editor.c:751 ../ui/xi-menus.glade.h:98
+#: ../src/editor/slib-editor.c:856 ../ui/xi-menus.glade.h:121
 msgid "_View"
 msgstr "_Affichage"
 
-#: ../src/editor/slib-editor.c:762 ../ui/editor_note.xml.h:11
+#: ../src/editor/slib-editor.c:867 ../ui/editor_note.xml.h:11
 #: ../ui/editor_studypad.xml.h:16 ../ui/editor.xml.h:11
 msgid "Save"
 msgstr "Enregistrer"
 
-#: ../src/gecko/gecko-html.cpp:178 ../src/gnome2/html.c:161
+#: ../src/editor/slib-editor.c:878 ../src/editor/slib-editor.c:885
+msgid "Insert Link"
+msgstr "Insérer un lien"
+
+#: ../src/gecko/gecko-html.cpp:177 ../src/gnome2/html.c:165
 msgid "Unlock "
-msgstr "Entrez la clé de déverrouillage"
+msgstr "Entrez la clé de déverrouillage "
 
-#: ../src/gecko/gecko-print.c:171
+#: ../src/gecko/gecko-print.c:172
 msgid "Preparing to print"
 msgstr "Préparation de l'impression"
 
-#: ../src/gecko/gecko-print.c:265
+#: ../src/gecko/gecko-print.c:266
 msgid "Printing is not supported on this printer"
 msgstr "L'impression n'est pas supportée par ce périphérique."
 
-#: ../src/gecko/gecko-print.c:268
+#: ../src/gecko/gecko-print.c:269
 #, c-format
 msgid "Printer %s does not support PostScript printing."
 msgstr "L'imprimante %s n'accepte pas les impressions de type PostScript."
 
-#: ../src/gecko/gecko-print.c:341 ../src/gecko/gecko-print.c:369
+#: ../src/gecko/gecko-print.c:342 ../src/gecko/gecko-print.c:370
 msgid "Printing"
 msgstr "Impression"
 
-#: ../src/gecko/gecko-print.c:371
+#: ../src/gecko/gecko-print.c:372
 msgid "Waiting to print"
 msgstr "En attente de l'impression"
 
-#: ../src/gecko/gecko-print.c:583
+#: ../src/gecko/gecko-print.c:584
 msgid "An error occurred while printing"
 msgstr "Une erreur s'est produite pendant l'impression"
 
-#: ../src/gecko/gecko-print.c:587
+#: ../src/gecko/gecko-print.c:588
 #, c-format
 msgid "It was not possible to print your document: %s"
 msgstr "Le document %s n'a pas pu être imprimé"
 
-#: ../src/gnome2/about_modules.c:189
+#: ../src/gnome2/about_modules.c:195
 msgid "About Sword Module"
 msgstr "À propos de ce module SWORD"
 
-#: ../src/gnome2/about_modules.c:383 ../src/gnome2/mod_mgr.c:198
+#: ../src/gnome2/about_modules.c:389 ../src/gnome2/mod_mgr.c:252
 msgid "The module has no About information."
 msgstr "Ce module ne contient pas d'information À propos"
 
@@ -213,16 +234,16 @@ msgstr ""
 msgid "About the SWORD Project"
 msgstr "À propos du Projet SWORD"
 
-#: ../src/gnome2/about_sword.c:123
+#: ../src/gnome2/about_sword.c:124
 msgid "Sword Version"
 msgstr "Version de Sword"
 
-#: ../src/gnome2/about_sword.c:154
+#: ../src/gnome2/about_sword.c:155
 msgid "Books can be downloaded from the SWORD Project"
 msgstr ""
 "Plus d'informations en ligne sur le site du Projet SWORD (en anglais) :"
 
-#: ../src/gnome2/about_sword.c:160
+#: ../src/gnome2/about_sword.c:161
 msgid "The SWORD Project"
 msgstr "The SWORD Project"
 
@@ -247,19 +268,19 @@ msgstr ""
 msgid "About Xiphos Translation"
 msgstr "À propos de de la traduction de Xiphos"
 
-#: ../src/gnome2/about_trans.c:139
+#: ../src/gnome2/about_trans.c:140
 msgid "See TRANSLATION-HOWTO in Xiphos source"
 msgstr "Voir le TRANSLATION-HOWTO dans le source de Xiphos"
 
-#: ../src/gnome2/about_trans.c:145
+#: ../src/gnome2/about_trans.c:146
 msgid "Xiphos development"
 msgstr "SIte de développement de Xiphos"
 
-#: ../src/gnome2/about_xiphos.c:132
+#: ../src/gnome2/about_xiphos.c:131
 msgid "Copyright 2000-2009 The Xiphos Development Team"
 msgstr "Copyright 2000-2009 L'équipe de développement Xiphos"
 
-#: ../src/gnome2/about_xiphos.c:135
+#: ../src/gnome2/about_xiphos.c:134
 msgid ""
 "(formerly known as GnomeSword)\n"
 "\n"
@@ -273,83 +294,82 @@ msgstr ""
 "Tous nos remerciements vont avec plaisir à Troy Griffitts et autres membres "
 "du Projet SWORD."
 
-#: ../src/gnome2/bibletext_dialog.c:525
+#: ../src/gnome2/bibletext_dialog.c:358
 msgid "Go to "
-msgstr "Aller à"
+msgstr "Aller à "
 
 #. info->stock_icon = GTK_STOCK_OPEN;
-#: ../src/gnome2/bookmark_dialog.c:145 ../src/gnome2/bookmarks_menu.c:471
-#: ../src/gnome2/bookmarks_menu.c:897 ../src/gnome2/bookmarks_menu.c:995
-#: ../src/gnome2/bookmarks_treeview.c:131 ../ui/editor_studypad.xml.h:2
-#: ../ui/xi-menus.glade.h:8
+#: ../src/gnome2/bookmark_dialog.c:171 ../src/gnome2/bookmarks_menu.c:358
+#: ../src/gnome2/bookmarks_menu.c:765 ../src/gnome2/bookmarks_menu.c:863
+#: ../src/gnome2/bookmarks_treeview.c:133 ../ui/editor_studypad.xml.h:2
+#: ../ui/xi-menus.glade.h:13
 msgid "Bookmark"
 msgstr "Signet"
 
-#: ../src/gnome2/bookmark_dialog.c:147 ../src/gnome2/bookmarks_menu.c:997
-#: ../src/gnome2/bookmarks_treeview.c:132
+#: ../src/gnome2/bookmark_dialog.c:173 ../src/gnome2/bookmarks_menu.c:865
+#: ../src/gnome2/bookmarks_treeview.c:134
 msgid "Enter Folder Name"
 msgstr "Saisir le nom du dossier"
 
-#: ../src/gnome2/bookmark_dialog.c:149 ../src/gnome2/bookmarks_menu.c:999
+#: ../src/gnome2/bookmark_dialog.c:175 ../src/gnome2/bookmarks_menu.c:867
 msgid "Folder Name"
 msgstr "Nom du dossier"
 
-#: ../src/gnome2/bookmark_dialog.c:150 ../src/gnome2/bookmarks_menu.c:1000
-#: ../src/gnome2/bookmarks_treeview.c:134
+#: ../src/gnome2/bookmark_dialog.c:176 ../src/gnome2/bookmarks_menu.c:868
+#: ../src/gnome2/bookmarks_treeview.c:136
 msgid "Folder: "
-msgstr "Dossier :"
+msgstr "Dossier : "
 
-#: ../src/gnome2/bookmarks_menu.c:457 ../src/gnome2/treekey-editor.c:321
-#: ../ui/xi-menus.glade.h:20
+#: ../src/gnome2/bookmarks_menu.c:344 ../ui/xi-menus.glade.h:32
 msgid "Edit"
 msgstr "Édition"
 
-#: ../src/gnome2/bookmarks_menu.c:474
+#: ../src/gnome2/bookmarks_menu.c:361
 msgid "Folder name: "
 msgstr "Nom du dossier : "
 
-#: ../src/gnome2/bookmarks_menu.c:477
+#: ../src/gnome2/bookmarks_menu.c:364
 msgid "Bookmark name: "
 msgstr "Nom du signet : "
 
-#: ../src/gnome2/bookmarks_menu.c:480 ../src/gnome2/bookmarks_menu.c:905
+#: ../src/gnome2/bookmarks_menu.c:367 ../src/gnome2/bookmarks_menu.c:773
 msgid "Verse: "
 msgstr "Verset : "
 
-#: ../src/gnome2/bookmarks_menu.c:481 ../src/gnome2/bookmarks_menu.c:906
+#: ../src/gnome2/bookmarks_menu.c:368 ../src/gnome2/bookmarks_menu.c:774
 msgid "Module: "
 msgstr "Module : "
 
-#: ../src/gnome2/bookmarks_menu.c:665
+#: ../src/gnome2/bookmarks_menu.c:533
 msgid "Restore Bookmark Folder"
 msgstr "Restaurer le dossier des signets"
 
-#: ../src/gnome2/bookmarks_menu.c:734
+#: ../src/gnome2/bookmarks_menu.c:602
 msgid "Remove the selected folder"
 msgstr "Supprimer le dossier sélectionné"
 
-#: ../src/gnome2/bookmarks_menu.c:736
+#: ../src/gnome2/bookmarks_menu.c:604
 msgid "(and all its contents)?"
 msgstr "(et tout son contenu)?"
 
-#: ../src/gnome2/bookmarks_menu.c:739
+#: ../src/gnome2/bookmarks_menu.c:607
 msgid "Remove the selected bookmark"
 msgstr "Supprimer le signet"
 
-#: ../src/gnome2/bookmarks_menu.c:898
+#: ../src/gnome2/bookmarks_menu.c:766
 msgid "Add"
 msgstr "Ajouter"
 
-#: ../src/gnome2/bookmarks_menu.c:904
+#: ../src/gnome2/bookmarks_menu.c:772
 msgid "Label: "
-msgstr "Étiquette :"
+msgstr "Étiquette : "
 
-#: ../src/gnome2/bookmarks_treeview.c:105
+#: ../src/gnome2/bookmarks_treeview.c:107
 #, c-format
 msgid "Search result: %s"
 msgstr "Résultat de la requête : %s"
 
-#: ../src/gnome2/bookmarks_treeview.c:934 ../src/gnome2/sidebar.c:1438
+#: ../src/gnome2/bookmarks_treeview.c:943 ../src/gnome2/sidebar.c:1389
 msgid "Bookmarks"
 msgstr "Signets"
 
@@ -363,102 +383,175 @@ msgstr "pour :"
 
 #: ../src/gnome2/cipher_key_dialog.c:66
 msgid "Enter Cipher Key: "
-msgstr "Entrer la clé de déverrouillage:"
+msgstr "Entrer la clé de déverrouillage : "
 
-#: ../src/gnome2/dialog.c:241
+#: ../src/gnome2/dialog.c:265
 msgid "Close without Saving"
 msgstr "Fermer sans sauvegarder"
 
-#: ../src/gnome2/dialog.c:730
+#: ../src/gnome2/dialog.c:596
 msgid "Xiphos:"
 msgstr "Xiphos :"
 
-#: ../src/gnome2/dialog.c:831
+#: ../src/gnome2/dialog.c:697
 msgid "Close _without Saving"
 msgstr "Ferme sans enregistrer"
 
-#: ../src/gnome2/export_dialog.c:265 ../ui/export-dialog.glade.h:20
+#: ../src/gnome2/export_dialog.c:267 ../ui/export-dialog.glade.h:20
 msgid "Please check copyright before exporting!"
 msgstr "Prière de vérifier le copyright avant l'export!"
 
-#: ../src/gnome2/find_dialog.c:200 ../src/gnome2/find_dialog.c:369
+#: ../src/gnome2/find_dialog.c:204 ../src/gnome2/find_dialog.c:373
 msgid "Find"
 msgstr "Rechercher..."
 
-#: ../src/gnome2/find_dialog.c:218
+#: ../src/gnome2/find_dialog.c:222
 msgid "Enter Word or Phrase"
 msgstr "Entrez un mot ou une phrase"
 
-#: ../src/gnome2/find_dialog.c:234 ../src/gnome2/search_sidebar.c:303
-#: ../ui/search-dialog.glade.h:57
+#: ../src/gnome2/find_dialog.c:238 ../src/gnome2/search_sidebar.c:306
+#: ../ui/search-dialog.glade.h:59
 msgid "Match case"
 msgstr "Respecter la casse"
 
-#: ../src/gnome2/find_dialog.c:241
+#: ../src/gnome2/find_dialog.c:245
 msgid "Search backwards"
 msgstr "Rechercher en arrière"
 
-#: ../src/gnome2/find_dialog.c:250 ../src/gnome2/search_sidebar.c:268
-#: ../ui/search-dialog.glade.h:74
+#: ../src/gnome2/find_dialog.c:254 ../src/gnome2/search_sidebar.c:271
+#: ../ui/search-dialog.glade.h:76
 msgid "Regular expression"
 msgstr "Expression rationnelle"
 
-#: ../src/gnome2/find_dialog.c:291
+#: ../src/gnome2/find_dialog.c:295
 msgid "Find Next"
 msgstr "Rechercher suivant"
 
-#: ../src/gnome2/font_dialog.c:297
+#: ../src/gnome2/font_dialog.c:303
 msgid "Set Module Font"
 msgstr "Changer de police"
 
-#: ../src/gnome2/font_dialog.c:327
+#: ../src/gnome2/font_dialog.c:333
 msgid "Change font for"
-msgstr "Change la police de "
+msgstr "Change la police de"
 
-#: ../src/gnome2/font_dialog.c:331
+#: ../src/gnome2/font_dialog.c:337
 msgid "Module"
 msgstr "Module"
 
-#: ../src/gnome2/font_dialog.c:335
+#: ../src/gnome2/font_dialog.c:341
 msgid "Current font: "
 msgstr "Police utilisée : "
 
-#: ../src/gnome2/font_dialog.c:372
+#: ../src/gnome2/font_dialog.c:378
 msgid "+0"
 msgstr "+0"
 
-#: ../src/gnome2/font_dialog.c:376
+#: ../src/gnome2/font_dialog.c:382
 msgid "Use the default font for this module"
 msgstr "Police par défaut dans ce module"
 
-#: ../src/gnome2/main_window.c:740
+#. *****************************************************************************
+#. * Name
+#. *    gconf_setup
+#. *
+#. * Synopsis
+#. *   #include "main/settings.h"
+#. *
+#. *   void gconf_setup()
+#. *
+#. * Description
+#. *   verifies and initializes the GConf subsystem, so that "sword://" and
+#. *   similar can be handled by url-comprehending programs such as browsers.
+#. *   dialogs for permission/success/failure => conditional on debug build.
+#. *
+#. * Return value
+#. *   void
+#.
+#: ../src/gnome2/gui.c:110
+msgid ""
+"URL references using \"sword://\" (similar to web page\n"
+"references) can be used by programs to look up\n"
+"scripture references. Your system currently has no\n"
+"program set to handle these references.\n"
+"\n"
+"Would you like Xiphos to set itself as the\n"
+"program to handle these references?"
+msgstr ""
+"Des adresses URL de type « sword:// » (similaires aux\n"
+"pages web) peuvent être utilisées par d'autres applications\n"
+"pour rechercher une référence biblique. Votre système n'a\n"
+"pas de programme configuré pour traiter ces adresses.\n"
+"\n"
+"Voulez-vous que Xiphos soit paramétré comme\n"
+"l'application gérant ces adresses URL?"
+
+#: ../src/gnome2/gui.c:112
+msgid ""
+"Xiphos has successfully set itself\n"
+"as the handler of sword:// and bible:// URLs.\n"
+"\n"
+"You may wish to run the program \"gconf-editor\"\n"
+"to examine keys under /desktop/gnome/url-handlers,\n"
+"if you need to change these."
+msgstr ""
+"Xiphos a été déclaré comme gestionnaire \n"
+"par défaut des URL de type sword:// et bible://\n"
+"\n"
+"Le programme \"gconf-editor\" permet de modifier \n"
+"les clés sous : /desktop/gnome/url-handlers,\n"
+"si vous éprouvez le besoin de les changer."
+
+#: ../src/gnome2/gui.c:166
+#, c-format
+msgid ""
+"Xiphos failed to complete handler init for key #%d:\n"
+"%s"
+msgstr ""
+"Xiphos n'a pas pu initialiser la clé #%d:\n"
+"%s"
+
+#: ../src/gnome2/gui.c:212
+msgid "BUG! Xiphos is about to crash due to a \"STRDUP\" error."
+msgstr "BUG! Xiphos va s'arrêter sur une erreur « STRDUP »"
+
+#: ../src/gnome2/gui.c:213 ../src/gnome2/gui.c:248
+msgid "Please report this error to the Xiphos team with:"
+msgstr ""
+"Merci de signaler cette erreur à l'équipe de développement Xiphos avec :"
+
+#: ../src/gnome2/gui.c:247
+msgid "BUG! Xiphos is about to crash due to a \"STRING\" error."
+msgstr "BUG! Xiphos va s'arrêter sur une erreur « STRING »."
+
+#: ../src/gnome2/main_window.c:789
 msgid "Xiphos - Bible Study Software"
 msgstr "Xiphos - Logiciel d'étude biblique"
 
-#: ../src/gnome2/main_window.c:794
+#: ../src/gnome2/main_window.c:844
 msgid "Open a new tab"
 msgstr "Ouvrir un nouvel onglet"
 
-#: ../src/gnome2/main_window.c:880 ../src/gnome2/sidebar.c:600
-#: ../src/gnome2/sidebar.c:606 ../src/main/sidebar.cc:638
-#: ../src/main/sidebar.cc:964 ../src/main/sidebar.cc:965
-#: ../src/main/sidebar.cc:966
+#: ../src/gnome2/main_window.c:923 ../src/gnome2/sidebar.c:627
+#: ../src/gnome2/sidebar.c:633 ../src/main/sidebar.cc:666
+#: ../src/main/sidebar.cc:1015 ../src/main/sidebar.cc:1016
+#: ../src/main/sidebar.cc:1017
 msgid "Standard View"
 msgstr "Vue simple"
 
-#: ../src/gnome2/main_window.c:957
+#: ../src/gnome2/main_window.c:1004
 msgid "Commentary View"
 msgstr "Commentaire"
 
-#: ../src/gnome2/main_window.c:973
+#: ../src/gnome2/main_window.c:1020
 msgid "Book View"
 msgstr "Livre"
 
-#: ../src/gnome2/main_window.c:998
+#: ../src/gnome2/main_window.c:1045
 msgid "Welcome to Xiphos"
 msgstr "Bienvenue dans Xiphos"
 
-#: ../src/gnome2/menu_popup.c:1126
+#: ../src/gnome2/menu_popup.c:1168
 msgid ""
 "Renaming is not available in Windows.\n"
 "\n"
@@ -476,34 +569,34 @@ msgstr ""
 "Windows ne permet pas de renommer des fichiers en cours d'utilisation\n"
 "ce qui est le cas des commentaires personnels."
 
-#: ../src/gnome2/menu_popup.c:1145
+#: ../src/gnome2/menu_popup.c:1187
 msgid "Rename Commentary"
 msgstr "Renommer le commentaire"
 
-#: ../src/gnome2/menu_popup.c:1148
+#: ../src/gnome2/menu_popup.c:1190
 msgid "Choose Commentary Name"
 msgstr "Nom du commentaire"
 
-#: ../src/gnome2/menu_popup.c:1150
+#: ../src/gnome2/menu_popup.c:1192
 msgid "New Name"
 msgstr "Nouveau nom :"
 
-#: ../src/gnome2/menu_popup.c:1151 ../src/gnome2/treekey-editor.c:131
-#: ../src/gnome2/treekey-editor.c:190 ../src/gnome2/treekey-editor.c:276
-#: ../src/main/prayerlists.cc:240
+#: ../src/gnome2/menu_popup.c:1193 ../src/gnome2/treekey-editor.c:139
+#: ../src/gnome2/treekey-editor.c:198 ../src/gnome2/treekey-editor.c:284
+#: ../src/main/prayerlists.cc:243
 msgid "Name: "
-msgstr "Nom :"
+msgstr "Nom : "
 
-#: ../src/gnome2/menu_popup.c:1161 ../src/main/prayerlists.cc:254
+#: ../src/gnome2/menu_popup.c:1203 ../src/main/prayerlists.cc:257
 msgid "Module names must contain [A-Za-z0-9_] only."
 msgstr ""
 "Les noms de modules ne peuvent contenir que des lettres et des chiffres."
 
-#: ../src/gnome2/menu_popup.c:1168 ../src/main/prayerlists.cc:261
+#: ../src/gnome2/menu_popup.c:1210 ../src/main/prayerlists.cc:264
 msgid "Xiphos already knows a module by that name."
 msgstr "Il existe déjà un module de ce nom."
 
-#: ../src/gnome2/menu_popup.c:1211
+#: ../src/gnome2/menu_popup.c:1253
 #, c-format
 msgid ""
 "Failed to create new configuration:\n"
@@ -512,7 +605,7 @@ msgstr ""
 "Impossible de créer une nouvelle configuration\n"
 "%s"
 
-#: ../src/gnome2/menu_popup.c:1220
+#: ../src/gnome2/menu_popup.c:1262
 msgid ""
 "Configuration build error:\n"
 "\n"
@@ -520,143 +613,188 @@ msgstr ""
 "Erreur de configuration\n"
 "\n"
 
-#: ../src/gnome2/mod_mgr.c:333
-msgid "Install these modules:"
-msgstr "Installer les modules suivants :"
+#: ../src/gnome2/mod_mgr.c:169
+msgid "Remove these modules?"
+msgstr "Supprimer ces modules ?"
 
-#: ../src/gnome2/mod_mgr.c:335
-msgid "Remove these modules:"
-msgstr "Supprimer les modules suivants :"
+#: ../src/gnome2/mod_mgr.c:170
+msgid "Preparing to remove"
+msgstr "Préparation à la suppression"
 
-#: ../src/gnome2/mod_mgr.c:337
-msgid "Archive these modules:"
-msgstr "Archiver les modules suivants :"
+#: ../src/gnome2/mod_mgr.c:171
+msgid "Removing"
+msgstr "Suppression de"
 
-#: ../src/gnome2/mod_mgr.c:339
-msgid ""
-"Build fast-search index for these\n"
-"modules (may take minutes/module):"
-msgstr ""
-"Ajouter un index pour recherche rapide aux modules suivants (dure un certain "
-"temps) :"
+#: ../src/gnome2/mod_mgr.c:172 ../ui/xi-menus.glade.h:72
+msgid "Remove"
+msgstr "Supprimer"
 
-#: ../src/gnome2/mod_mgr.c:341
-msgid "Delete fast-search index for these modules:"
-msgstr "Retirer l'index pour recherche rapide aux modules suivants :"
+#: ../src/gnome2/mod_mgr.c:175
+msgid "Install these modules?"
+msgstr "Installer ces modules ?"
 
-#: ../src/gnome2/mod_mgr.c:361
+#: ../src/gnome2/mod_mgr.c:176
 msgid "Preparing to install"
 msgstr "Préparation à l'installation"
 
-#: ../src/gnome2/mod_mgr.c:363
-msgid "Preparing to remove"
-msgstr "Préparation à la suppression"
+#: ../src/gnome2/mod_mgr.c:177
+msgid "Installing"
+msgstr "Installation de"
+
+#: ../src/gnome2/mod_mgr.c:178 ../src/gnome2/mod_mgr.c:2964
+#: ../ui/module-manager.glade.h:18
+msgid "Install"
+msgstr "Installer"
+
+#: ../src/gnome2/mod_mgr.c:181
+msgid "Archive these modules?"
+msgstr "Archiver ces modules ?"
 
-#: ../src/gnome2/mod_mgr.c:365
+#: ../src/gnome2/mod_mgr.c:182
 msgid "Preparing to archive"
 msgstr "Préparation à l'archivage"
 
-#: ../src/gnome2/mod_mgr.c:367
+#: ../src/gnome2/mod_mgr.c:183
+msgid "Archiving"
+msgstr "Archivage de"
+
+#: ../src/gnome2/mod_mgr.c:184 ../ui/module-manager.glade.h:11
+msgid "Archive"
+msgstr "Archiver"
+
+#: ../src/gnome2/mod_mgr.c:187
+msgid ""
+"Build fast-search index for these\n"
+"modules (may take minutes/module)?"
+msgstr ""
+"Construire un index de recherche rapide pour les modules suivants (dure un "
+"certain temps) ?"
+
+#: ../src/gnome2/mod_mgr.c:188
 msgid "Preparing to index"
 msgstr "Préparation à l'indexation"
 
-#: ../src/gnome2/mod_mgr.c:369
+#: ../src/gnome2/mod_mgr.c:189
+msgid "Indexing"
+msgstr "Indexation de"
+
+#: ../src/gnome2/mod_mgr.c:190 ../ui/module-manager.glade.h:17
+msgid "Index"
+msgstr "Indexer"
+
+#: ../src/gnome2/mod_mgr.c:193
+msgid "Delete fast-search index for these modules?"
+msgstr "Supprimer l'index de recherche rapide pour les modules suivants ?"
+
+#: ../src/gnome2/mod_mgr.c:194
 msgid "Preparing to delete index"
 msgstr "Préparation à la suppression d'index"
 
-#: ../src/gnome2/mod_mgr.c:394
-msgid "Installing"
-msgstr "Installation de"
+#: ../src/gnome2/mod_mgr.c:195
+msgid "Deleting index"
+msgstr "Suppression de l'index à"
 
-#: ../src/gnome2/mod_mgr.c:396
-msgid "Removing"
-msgstr "Suppression de"
+#: ../src/gnome2/mod_mgr.c:196
+msgid "Deletion"
+msgstr "Suppression"
 
-#: ../src/gnome2/mod_mgr.c:398
-msgid "Archiving"
-msgstr "Archivage de"
+#: ../src/gnome2/mod_mgr.c:427
+msgid "Module Name"
+msgstr "Nom du module"
 
-#: ../src/gnome2/mod_mgr.c:400
-msgid "Indexing"
-msgstr "Indexation de"
+#: ../src/gnome2/mod_mgr.c:448
+msgid "A checkmark means this module is already installed"
+msgstr "Une coche indique un module déjà installé"
 
-#: ../src/gnome2/mod_mgr.c:402
-msgid "Deleting index"
-msgstr "Suppression de l'index à"
+#: ../src/gnome2/mod_mgr.c:470
+msgid "Click the box to work on this module"
+msgstr "Cocher la case pour travailler avec ce module"
 
-#: ../src/gnome2/mod_mgr.c:422
-#, c-format
-msgid ""
-"`mkdir %s' failed:\n"
-"%s."
+#: ../src/gnome2/mod_mgr.c:471
+msgid "Click the box to select this module for install/update"
 msgstr ""
-"Impossible de créer le répertoire %s\n"
-"%s"
+"Cocher la case pour sélectionner ce module à installer ou à mettre à jour"
 
-#: ../src/gnome2/mod_mgr.c:448
-msgid "Xiphos could not execute archiver"
-msgstr "Xiphos n'a pas pu démarrer l'archivage"
+#: ../src/gnome2/mod_mgr.c:490
+msgid "Installed"
+msgstr "Installé"
 
-#: ../src/gnome2/mod_mgr.c:453
+#: ../src/gnome2/mod_mgr.c:500
 msgid ""
-" archival result:\n"
-"\n"
+"The index icon means you have built an optimized ('lucene') index for this "
+"module for fast searching (see the Maintenance pane for this function)"
 msgstr ""
-" résultat de l'archivage\n"
-"\n"
+"L'icône index indique qu'un index optimisé pour des requêtes rapides "
+"(lucène) a été construit à l'aide du bouton indexer."
 
-#: ../src/gnome2/mod_mgr.c:457
+#: ../src/gnome2/mod_mgr.c:518
 msgid ""
-"\n"
-"Archive in "
+"The lock icon means this module is encrypted, and requires that you purchase "
+"an unlock key from the content owner"
 msgstr ""
-"\n"
-" Archive dans "
+"L'icône protection indique un module encrypté et nécessite l'achat d'une clé "
+"de déverrouillage auprès de l'éditeur du document"
 
-#: ../src/gnome2/mod_mgr.c:514
-msgid "Journals and prayer lists cannot be indexed."
-msgstr "Les listes de prières et journaux ne peuvent pas être indexés."
+#: ../src/gnome2/mod_mgr.c:535 ../ui/xi-menus.glade.h:1
+msgid "About"
+msgstr "À propos"
 
-#: ../src/gnome2/mod_mgr.c:535 ../src/gnome2/mod_mgr.c:2753
-#: ../ui/module-manager.glade.h:15
-msgid "Install"
-msgstr "Installer"
+#: ../src/gnome2/mod_mgr.c:555
+msgid ""
+"The refresh icon means the Installed module is older than the newer "
+"Available module: You should update the module"
+msgstr ""
+"L'icône Rafraichir indique un module installé plus vieux que le nouveau "
+"disponible. Le module est à mettre à jour."
 
-#: ../src/gnome2/mod_mgr.c:537 ../src/gnome2/treekey-editor.c:315
-msgid "Remove"
-msgstr "Supprimer"
+#: ../src/gnome2/mod_mgr.c:567
+msgid "Available"
+msgstr "Dispo"
 
-#: ../src/gnome2/mod_mgr.c:539
-msgid "Archive"
-msgstr "Archiver"
+#: ../src/gnome2/mod_mgr.c:576
+msgid "Size"
+msgstr "Taille"
 
-#: ../src/gnome2/mod_mgr.c:541
-msgid "Index"
-msgstr "Indexer"
+#: ../src/gnome2/mod_mgr.c:585
+msgid "Description"
+msgstr "Description"
 
-#: ../src/gnome2/mod_mgr.c:543
-msgid "Deletion"
-msgstr "Suppression"
+#: ../src/gnome2/mod_mgr.c:736
+#, c-format
+msgid ""
+"`mkdir %s' failed:\n"
+"%s."
+msgstr ""
+"Impossible de créer le répertoire %s\n"
+"%s"
+
+#: ../src/gnome2/mod_mgr.c:759
+msgid " archived in: \n"
+msgstr "Archivé dans \n"
 
-#: ../src/gnome2/mod_mgr.c:545
+#: ../src/gnome2/mod_mgr.c:815
+msgid "Journals and prayer lists cannot be indexed."
+msgstr "Les listes de prières et journaux ne peuvent pas être indexés."
+
+#: ../src/gnome2/mod_mgr.c:833
 #, c-format
 msgid "%s failed"
 msgstr "%s a échoué"
 
-#: ../src/gnome2/mod_mgr.c:547 ../src/gnome2/mod_mgr.c:1267
+#: ../src/gnome2/mod_mgr.c:836 ../src/gnome2/mod_mgr.c:1562
 msgid "Finished"
 msgstr "Terminé"
 
-#: ../src/gnome2/mod_mgr.c:712 ../src/gnome2/mod_mgr.c:714
-#: ../src/gnome2/mod_mgr.c:816 ../src/gnome2/mod_mgr.c:851
-#: ../src/gnome2/mod_mgr.c:853 ../src/gnome2/utilities.c:346
-#: ../src/gnome2/utilities.c:411 ../src/gnome2/utilities.c:413
-#: ../src/gnome2/utilities.c:1031 ../src/main/sidebar.cc:801
-#: ../src/main/sidebar.cc:873 ../src/main/sidebar.cc:875
+#: ../src/gnome2/mod_mgr.c:1003 ../src/gnome2/mod_mgr.c:1005
+#: ../src/gnome2/mod_mgr.c:1107 ../src/gnome2/mod_mgr.c:1142
+#: ../src/gnome2/mod_mgr.c:1144 ../src/gnome2/utilities.c:435
+#: ../src/gnome2/utilities.c:500 ../src/gnome2/utilities.c:502
+#: ../src/gnome2/utilities.c:986 ../src/main/sidebar.cc:852
+#: ../src/main/sidebar.cc:924 ../src/main/sidebar.cc:926
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: ../src/gnome2/mod_mgr.c:1012
+#: ../src/gnome2/mod_mgr.c:1301
 #, c-format
 msgid ""
 "Repository:\n"
@@ -665,7 +803,7 @@ msgstr ""
 "Dépôt :\n"
 "%s"
 
-#: ../src/gnome2/mod_mgr.c:1024
+#: ../src/gnome2/mod_mgr.c:1313
 msgid ""
 "Categorized by\n"
 "Module Type"
@@ -673,44 +811,44 @@ msgstr ""
 "Modules classés\n"
 "par type"
 
-#: ../src/gnome2/mod_mgr.c:1029 ../src/gnome2/utilities.c:472
-#: ../src/main/sidebar.cc:948 ../src/main/sidebar.cc:950
+#: ../src/gnome2/mod_mgr.c:1318 ../src/gnome2/utilities.c:561
+#: ../src/main/sidebar.cc:999 ../src/main/sidebar.cc:1001
 msgid "Biblical Texts"
 msgstr "Textes bibliques"
 
-#: ../src/gnome2/mod_mgr.c:1033 ../src/gnome2/utilities.c:476
-#: ../src/main/sidebar.cc:650 ../src/main/sidebar.cc:973
-#: ../src/main/sidebar.cc:975 ../ui/prefs.glade.h:33
+#: ../src/gnome2/mod_mgr.c:1322 ../src/gnome2/utilities.c:565
+#: ../src/main/sidebar.cc:678 ../src/main/sidebar.cc:1024
+#: ../src/main/sidebar.cc:1026 ../ui/prefs.glade.h:33
 msgid "Commentaries"
 msgstr "Commentaires"
 
-#: ../src/gnome2/mod_mgr.c:1037 ../src/gnome2/utilities.c:480
-#: ../src/main/sidebar.cc:982 ../src/main/sidebar.cc:984
+#: ../src/gnome2/mod_mgr.c:1326 ../src/gnome2/utilities.c:569
+#: ../src/main/sidebar.cc:1033 ../src/main/sidebar.cc:1035
 msgid "Dictionaries"
 msgstr "Dictionnaires"
 
-#: ../src/gnome2/mod_mgr.c:1041 ../src/gnome2/utilities.c:484
-#: ../src/main/sidebar.cc:991 ../src/main/sidebar.cc:993
+#: ../src/gnome2/mod_mgr.c:1330 ../src/gnome2/utilities.c:573
+#: ../src/main/sidebar.cc:1042 ../src/main/sidebar.cc:1044
 msgid "Daily Devotionals"
 msgstr "Calendriers bibliques"
 
-#: ../src/gnome2/mod_mgr.c:1045 ../src/gnome2/utilities.c:488
-#: ../src/main/sidebar.cc:660 ../src/main/sidebar.cc:1000
-#: ../src/main/sidebar.cc:1002
+#: ../src/gnome2/mod_mgr.c:1334 ../src/gnome2/utilities.c:577
+#: ../src/main/sidebar.cc:688 ../src/main/sidebar.cc:1051
+#: ../src/main/sidebar.cc:1053
 msgid "General Books"
 msgstr "Livres"
 
-#: ../src/gnome2/mod_mgr.c:1049 ../src/gnome2/utilities.c:492
-#: ../src/main/sidebar.cc:1009 ../src/main/sidebar.cc:1011
+#: ../src/gnome2/mod_mgr.c:1338 ../src/gnome2/utilities.c:581
+#: ../src/main/sidebar.cc:1060 ../src/main/sidebar.cc:1062
 msgid "Maps"
 msgstr "Cartes"
 
-#: ../src/gnome2/mod_mgr.c:1053 ../src/gnome2/utilities.c:496
-#: ../src/main/sidebar.cc:1018 ../src/main/sidebar.cc:1020
+#: ../src/gnome2/mod_mgr.c:1342 ../src/gnome2/utilities.c:585
+#: ../src/main/sidebar.cc:1069 ../src/main/sidebar.cc:1071
 msgid "Images"
 msgstr "Images"
 
-#: ../src/gnome2/mod_mgr.c:1061
+#: ../src/gnome2/mod_mgr.c:1350
 msgid ""
 "Categorized by\n"
 "Availability"
@@ -718,342 +856,386 @@ msgstr ""
 "Modules classés\n"
 "par disponibilité"
 
-#: ../src/gnome2/mod_mgr.c:1066
+#: ../src/gnome2/mod_mgr.c:1355
 msgid "Updates"
 msgstr "Mise à jour disponible"
 
-#: ../src/gnome2/mod_mgr.c:1070
+#: ../src/gnome2/mod_mgr.c:1359
 msgid "Uninstalled"
 msgstr "Non installé"
 
-#: ../src/gnome2/mod_mgr.c:1074 ../src/gnome2/sidebar.c:616
-#: ../src/gnome2/utilities.c:501 ../src/main/prayerlists.cc:238
-#: ../src/main/sidebar.cc:1028 ../src/main/sidebar.cc:1030
+#: ../src/gnome2/mod_mgr.c:1363 ../src/gnome2/sidebar.c:643
+#: ../src/gnome2/utilities.c:590 ../src/main/prayerlists.cc:241
+#: ../src/main/sidebar.cc:1079 ../src/main/sidebar.cc:1081
 msgid "Prayer List/Journal"
 msgstr "Liste de prières / Journal"
 
-#: ../src/gnome2/mod_mgr.c:1250
-msgid "Refreshing remote"
+#: ../src/gnome2/mod_mgr.c:1545
+msgid "Refreshing from remote source"
 msgstr "Rafraîchissement en cours"
 
-#: ../src/gnome2/mod_mgr.c:1261
-msgid "Remote not found"
+#: ../src/gnome2/mod_mgr.c:1556
+msgid "Remote source not found"
 msgstr "Serveur non trouvé"
 
-#: ../src/gnome2/mod_mgr.c:1393
-msgid "Module Name"
-msgstr "Nom du module"
-
-#: ../src/gnome2/mod_mgr.c:1414
-msgid "A checkmark means this module is already installed"
-msgstr "Une coche indique un module déjà installé"
-
-#: ../src/gnome2/mod_mgr.c:1436
-msgid "Click the box to work on this module"
-msgstr "Cocher la case pour travailler avec ce module"
-
-#: ../src/gnome2/mod_mgr.c:1437
-msgid "Click the box to select this module for install/update"
-msgstr ""
-"Cocher la case pour sélectionner ce module à installer ou à mettre à jour"
-
-#: ../src/gnome2/mod_mgr.c:1456
-msgid "Installed"
-msgstr "Installé"
-
-#: ../src/gnome2/mod_mgr.c:1466
-msgid ""
-"The index icon means you have built an optimized ('lucene') index for this "
-"module for fast searching (see the Maintenance pane for this function)"
-msgstr ""
-"L'icône index indique qu'un index optimisé pour des requêtes rapides "
-"(lucène) a été construit à l'aide du bouton indexer."
-
-#: ../src/gnome2/mod_mgr.c:1484
-msgid ""
-"The lock icon means this module is encrypted, and requires that you purchase "
-"an unlock key from the content owner"
-msgstr ""
-"L'icône protection indique un module encrypté et nécessite l'achat d'une clé "
-"de déverrouillage auprès de l'éditeur du document"
-
-#. 2
-#: ../src/gnome2/mod_mgr.c:1501 ../src/gnome2/sidebar.c:954
-#: ../src/gnome2/sidebar.c:1122 ../ui/xi-menus.glade.h:1
-msgid "About"
-msgstr "À propos"
-
-#: ../src/gnome2/mod_mgr.c:1521
-msgid ""
-"The refresh icon means the Installed module is older than the newer "
-"Available module: You should update the module"
-msgstr ""
-"L'icône Rafraichir indique un module installé plus vieux que le nouveau "
-"disponible. Le module est à mettre à jour."
-
-#: ../src/gnome2/mod_mgr.c:1533
-msgid "Available"
-msgstr "Dispo"
-
-#: ../src/gnome2/mod_mgr.c:1542
-msgid "Size"
-msgstr "Taille"
-
-#: ../src/gnome2/mod_mgr.c:1551
-msgid "Description"
-msgstr "Description"
-
-#: ../src/gnome2/mod_mgr.c:1583 ../src/gnome2/mod_mgr.c:1660
+#: ../src/gnome2/mod_mgr.c:1670
 msgid "Configure"
 msgstr "Configurer"
 
-#: ../src/gnome2/mod_mgr.c:1614
+#: ../src/gnome2/mod_mgr.c:1701
 msgid "Type"
 msgstr "Type"
 
-#: ../src/gnome2/mod_mgr.c:1621
+#: ../src/gnome2/mod_mgr.c:1708
 msgid "Caption"
 msgstr "Libellé"
 
-#: ../src/gnome2/mod_mgr.c:1629
+#: ../src/gnome2/mod_mgr.c:1716
 msgid "Source"
 msgstr "Source"
 
 # src/gs_preferences_dlg.c
-#: ../src/gnome2/mod_mgr.c:1637
+#: ../src/gnome2/mod_mgr.c:1724
 msgid "Directory"
 msgstr "Répertoire"
 
-#: ../src/gnome2/mod_mgr.c:1658
-msgid "Sources"
-msgstr "Dépôts"
+#: ../src/gnome2/mod_mgr.c:1732
+msgid "User"
+msgstr "Identifiant"
+
+#: ../src/gnome2/mod_mgr.c:1740
+msgid "Password"
+msgstr "Mot de passe"
 
-#: ../src/gnome2/mod_mgr.c:1664 ../src/gnome2/preferences_dialog.c:1784
-#: ../src/gnome2/sidebar.c:1462
+#: ../src/gnome2/mod_mgr.c:1748
+msgid "UID"
+msgstr "UID"
+
+#: ../src/gnome2/mod_mgr.c:1765
+msgid "Module Sources"
+msgstr "Dépots"
+
+#: ../src/gnome2/mod_mgr.c:1768
+msgid "Add/Remove"
+msgstr "Ajouter/Supprimer"
+
+#: ../src/gnome2/mod_mgr.c:1770
+msgid "Choose"
+msgstr "Choisir"
+
+#: ../src/gnome2/mod_mgr.c:1774 ../src/gnome2/preferences_dialog.c:1793
+#: ../src/gnome2/sidebar.c:1413
 msgid "Modules"
 msgstr "Modules"
 
-#: ../src/gnome2/mod_mgr.c:1666
+#: ../src/gnome2/mod_mgr.c:1776
 msgid "Install/Update"
 msgstr "Installer"
 
-#: ../src/gnome2/mod_mgr.c:1668
+#: ../src/gnome2/mod_mgr.c:1778
 msgid "Maintenance"
 msgstr "Maintenance"
 
-#: ../src/gnome2/mod_mgr.c:1872
+#: ../src/gnome2/mod_mgr.c:1999
 msgid "Please Refresh"
 msgstr "Rafraîchir"
 
-#: ../src/gnome2/mod_mgr.c:1873
+#: ../src/gnome2/mod_mgr.c:2000
 msgid "Your module list is not up to date!"
 msgstr "La liste des modules n'est pas à jour!"
 
-#: ../src/gnome2/mod_mgr.c:2336 ../src/gnome2/mod_mgr.c:2542
+#. Zero Bibles is just not workable in Xiphos.
+#: ../src/gnome2/mod_mgr.c:2282
+msgid ""
+"You have uninstalled your last Bible.\n"
+"Xiphos requires at least one."
+msgstr ""
+"Vous avez désinstallé votre dernière Bible.\n"
+"Xiphos requiert au minimum une."
+
+#: ../src/gnome2/mod_mgr.c:2288
+msgid ""
+"There are still no Bibles installed.\n"
+"Xiphos cannot continue without one."
+msgstr ""
+"Toujours aucune Bible installée.\n"
+"Xiphos ne peut pas continuer sans."
+
+#: ../src/gnome2/mod_mgr.c:2353
+msgid "Standard remote sources have been loaded."
+msgstr "Les dépôts distants standards ont été chargés."
+
+#: ../src/gnome2/mod_mgr.c:2359
+msgid "Could not load standard sources from CrossWire."
+msgstr "Impossible de charger les dépôts standards depuis CrossWire."
+
+#: ../src/gnome2/mod_mgr.c:2510 ../src/gnome2/mod_mgr.c:2759
 msgid "Remove the selected source"
 msgstr "Supprime le dépôt sélectionné"
 
-#: ../src/gnome2/mod_mgr.c:2393
+#: ../src/gnome2/mod_mgr.c:2570
 msgid "Enter a remote source"
 msgstr "Ajouter un dépôt distant"
 
-#: ../src/gnome2/mod_mgr.c:2397
+#: ../src/gnome2/mod_mgr.c:2574
 msgid "Caption:"
 msgstr "Libellé :"
 
-#: ../src/gnome2/mod_mgr.c:2398
+#: ../src/gnome2/mod_mgr.c:2575
 msgid "Type:"
 msgstr "Type :"
 
-#: ../src/gnome2/mod_mgr.c:2399
+#: ../src/gnome2/mod_mgr.c:2576
 msgid "Host:"
 msgstr "Serveur :"
 
 # src/gs_preferences_dlg.c
-#: ../src/gnome2/mod_mgr.c:2400
+#: ../src/gnome2/mod_mgr.c:2577
 msgid "Directory:"
 msgstr "Répertoire :"
 
+#: ../src/gnome2/mod_mgr.c:2579
+msgid "User (optional):"
+msgstr "Identifiant (optionnel) :"
+
+#: ../src/gnome2/mod_mgr.c:2580
+msgid "Password (optional):"
+msgstr "Password (optional):(optionnel) :"
+
 #. this can happen at most once
-#: ../src/gnome2/mod_mgr.c:2425
+#: ../src/gnome2/mod_mgr.c:2608
 msgid "A source by that name already exists."
 msgstr "Un dépôt du même nom existe déjà"
 
-#: ../src/gnome2/mod_mgr.c:2539
+#: ../src/gnome2/mod_mgr.c:2756
 msgid "Delete a remote source"
 msgstr "Supprimer un dépôt distant"
 
-#: ../src/gnome2/navbar_book.c:359 ../src/gnome2/navbar_book_dialog.c:299
+#. *****************************************************************************
+#. * Name
+#. *   gui_open_mod_mgr
+#. *
+#. * Synopsis
+#. *   #include "gui/mod_mgr.h"
+#. *
+#. *   void gui_open_mod_mgr(void)
+#. *
+#. * Description
+#. *
+#. *
+#. * Return value
+#. *   void
+#.
+#: ../src/gnome2/mod_mgr.c:3244
+msgid ""
+"<b>Welcome to the Module Manager.</b>\n"
+"\n"
+"This is Xiphos' mechanism to get new and updated content.\n"
+"It appears you have never been here before, so please take a moment to look "
+"it over.\n"
+"(You will see this information box just once.)\n"
+"\n"
+"Modules come from different <u>repositories</u>.  <b>Module Sources: Add/"
+"Remove</b> will show you what repositories are currently known.\n"
+"\n"
+"<b>Module Sources: Choose</b> is for deciding from where modules should "
+"come, that is, from which repository Xiphos should obtain them, as well as "
+"where they should be placed on your system. Set <i>Install Source</i> and "
+"<i>Install Destination</i>, then click <i>Refresh</i>.\n"
+"\n"
+"<b>Modules: Install/Update</b> is for selecting and obtaining modules after "
+"choosing source and destination.\n"
+"\n"
+"<b>Modules: Maintenance</b> is for archive and index creation.\n"
+"\n"
+"See section 5 of our manual for Module Manager detail, or ask for help via "
+"Live Chat, or (if no one is responsive in chat) send mail to our users' "
+"mailing list.\n"
+msgstr ""
+"<b>Bienvenue dans le Gestionnaire de modules</b>\n"
+"\n"
+"C'est le mécanisme utilisé par Xiphos pour obtenir et mettre à jour les "
+"contenus.\n"
+"Il ressort qu'il n'a pas encore été utilisé, arrêtez-vous donc un petit "
+"moment pour mieux le connaître.\n"
+"(Cette information n'apparaitra qu'une seule fois).\n"
+" \n"
+"Les modules proviennent de différents <u>dépots</u>.  <b>Dépots : Ajouter/"
+"Supprimer</b> indique quels dépots sont actuellement répertoriés.\n"
+"\n"
+"<b>Dépots : Choisir</b> permet de décider d'où les modules doivent provenir, "
+"c'est-à-dire de quel dépot Xiphos doit les obtenir, et aussi à quel endroit "
+"ils doivent être placés sur le système. Sélectionnez <i>Source des dépots</"
+"i> et <i>Dossier d'installation</i>, puis ensuite <i>Actualiser</i>.\n"
+"\n"
+"<b>Modules : Installer</b> permet de sélectionner et d'obtenir des modules "
+"après avoir choisi la source et le dossier d'installation.\n"
+"\n"
+"<b>Modules ; Maintenance</b> est pour l'archivage et la création d'index.\n"
+"\n"
+"Pour plus d'informations sur le gestionnaire de modules, voir la section 5du "
+"manuel d'aide. \n"
+
+#: ../src/gnome2/navbar_book.c:359 ../src/gnome2/navbar_book_dialog.c:300
 msgid "Go outward, to the section containing this one"
 msgstr "Remonter d'un niveau dans le sommaire du livre"
 
-#: ../src/gnome2/navbar_book.c:375 ../src/gnome2/navbar_book_dialog.c:315
+#: ../src/gnome2/navbar_book.c:375 ../src/gnome2/navbar_book_dialog.c:316
 msgid "Go to previous item"
 msgstr "Passage précédent"
 
-#: ../src/gnome2/navbar_book.c:390 ../src/gnome2/navbar_book_dialog.c:330
+#: ../src/gnome2/navbar_book.c:390 ../src/gnome2/navbar_book_dialog.c:331
 msgid "Go to next item"
 msgstr "Passage suivant"
 
-#: ../src/gnome2/navbar_book.c:406 ../src/gnome2/navbar_book_dialog.c:346
+#: ../src/gnome2/navbar_book.c:406 ../src/gnome2/navbar_book_dialog.c:347
 msgid "Go inward, to the first subsection"
 msgstr "Descendre d'un niveau dans le sommaire du livre"
 
-#: ../src/gnome2/navbar_versekey_dialog.c:887
-#: ../src/gnome2/navbar_versekey_editor.c:877
-#: ../src/gnome2/navbar_versekey_parallel.c:801
+#: ../src/gnome2/navbar_versekey_dialog.c:864
+#: ../src/gnome2/navbar_versekey_editor.c:879
+#: ../src/gnome2/navbar_versekey_parallel.c:810
 msgid "Synchronize this window from main window"
 msgstr "Synchronise cette fenêtre avec la fenêtre principale"
 
-#: ../src/gnome2/parallel_dialog.c:635 ../src/gnome2/preferences_dialog.c:1790
+#: ../src/gnome2/parallel_dialog.c:328 ../src/gnome2/preferences_dialog.c:1799
 msgid "Parallel"
 msgstr "Vue parallèle"
 
-#: ../src/gnome2/parallel_view.c:271
+#: ../src/gnome2/parallel_view.c:275
 msgid "Copy"
 msgstr "Copier"
 
-#: ../src/gnome2/parallel_view.c:281
+#: ../src/gnome2/parallel_view.c:285
 msgid "Detach/Attach"
 msgstr "Détacher/Attacher"
 
-#: ../src/gnome2/parallel_view.c:287 ../ui/xi-menus.glade.h:38
+#: ../src/gnome2/parallel_view.c:291 ../ui/xi-menus.glade.h:53
 msgid "Module Options"
 msgstr "Options du module"
 
 #. build change parallel modules submenu
-#: ../src/gnome2/parallel_view.c:302
+#: ../src/gnome2/parallel_view.c:306
 msgid "Change parallel 1"
 msgstr "Changer parallèle 1"
 
-#: ../src/gnome2/parallel_view.c:304
+#: ../src/gnome2/parallel_view.c:308
 msgid "Change parallel 2"
 msgstr "Changer parallèle 2"
 
-#: ../src/gnome2/parallel_view.c:306
+#: ../src/gnome2/parallel_view.c:310
 msgid "Change parallel 3"
 msgstr "Changer parallèle 3"
 
-#: ../src/gnome2/parallel_view.c:308
+#: ../src/gnome2/parallel_view.c:312
 msgid "Change parallel 4"
 msgstr "Changer parallèle 4"
 
-#: ../src/gnome2/parallel_view.c:310
+#: ../src/gnome2/parallel_view.c:314
 msgid "Change parallel 5"
 msgstr "Changer parallèle 5"
 
-#: ../src/gnome2/parallel_view.c:467 ../src/gnome2/sidebar.c:599
-#: ../src/gnome2/sidebar.c:605 ../src/gnome2/tabbed_browser.c:231
-#: ../src/main/sidebar.cc:618 ../src/main/sidebar.cc:956
-#: ../src/main/sidebar.cc:957 ../src/main/sidebar.cc:958
+#: ../src/gnome2/parallel_view.c:471 ../src/gnome2/sidebar.c:626
+#: ../src/gnome2/sidebar.c:632 ../src/gnome2/tabbed_browser.c:262
+#: ../src/main/sidebar.cc:646 ../src/main/sidebar.cc:1007
+#: ../src/main/sidebar.cc:1008 ../src/main/sidebar.cc:1009
 msgid "Parallel View"
 msgstr "Vue parallèle"
 
-#: ../src/gnome2/preferences_cell_renderer.c:398
-msgid "Text"
-msgstr "Texte"
-
-#: ../src/gnome2/preferences_cell_renderer.c:400
-msgid "Text to render"
-msgstr "Texte à reproduire"
-
-#: ../src/gnome2/preferences_cell_renderer.c:406
-msgid "Pixbuf Object"
-msgstr "Objet pixbuf"
-
-#: ../src/gnome2/preferences_cell_renderer.c:408
-msgid "The pixbuf to render."
-msgstr "Le pixbuf à restituer"
-
-#: ../src/gnome2/preferences_dialog.c:1231
-#: ../src/gnome2/preferences_dialog.c:1269
-#: ../src/gnome2/preferences_dialog.c:1306
-#: ../src/gnome2/preferences_dialog.c:1341
-#: ../src/gnome2/preferences_dialog.c:1375
-#: ../src/gnome2/preferences_dialog.c:1408
-#: ../src/gnome2/preferences_dialog.c:1440
-#: ../src/gnome2/preferences_dialog.c:1473
-#: ../src/gnome2/preferences_dialog.c:1505
-#: ../src/gnome2/preferences_dialog.c:1539
-#: ../src/gnome2/preferences_dialog.c:1574
-#: ../src/gnome2/preferences_dialog.c:1609
-#: ../src/gnome2/preferences_dialog.c:1645
-#: ../src/gnome2/preferences_dialog.c:2045
+#: ../src/gnome2/preferences_dialog.c:1179
+#: ../src/gnome2/preferences_dialog.c:1217
+#: ../src/gnome2/preferences_dialog.c:1254
+#: ../src/gnome2/preferences_dialog.c:1289
+#: ../src/gnome2/preferences_dialog.c:1323
+#: ../src/gnome2/preferences_dialog.c:1356
+#: ../src/gnome2/preferences_dialog.c:1388
+#: ../src/gnome2/preferences_dialog.c:1421
+#: ../src/gnome2/preferences_dialog.c:1453
+#: ../src/gnome2/preferences_dialog.c:1487
+#: ../src/gnome2/preferences_dialog.c:1522
+#: ../src/gnome2/preferences_dialog.c:1557
+#: ../src/gnome2/preferences_dialog.c:1593
+#: ../src/gnome2/preferences_dialog.c:1631
+#: ../src/gnome2/preferences_dialog.c:2052
 msgid "-- Select --"
 msgstr "[ Aucun ]"
 
-#: ../src/gnome2/preferences_dialog.c:1678 ../ui/prefs.glade.h:74
+#: ../src/gnome2/preferences_dialog.c:1652
+msgid "Locale will take effect after restart."
+msgstr "La langue prendra effet après redémarrage"
+
+#: ../src/gnome2/preferences_dialog.c:1687 ../ui/prefs.glade.h:74
 msgid "Preferences"
 msgstr "Préférences"
 
-#: ../src/gnome2/preferences_dialog.c:1760
+#: ../src/gnome2/preferences_dialog.c:1769
 msgid "Fonts"
 msgstr "Polices"
 
-#: ../src/gnome2/preferences_dialog.c:1763
+#: ../src/gnome2/preferences_dialog.c:1772
 msgid "Color"
 msgstr "Couleurs"
 
-#: ../src/gnome2/preferences_dialog.c:1766
+#: ../src/gnome2/preferences_dialog.c:1775
 msgid "Sizes"
 msgstr "Tailles"
 
-#: ../src/gnome2/preferences_dialog.c:1770
+#: ../src/gnome2/preferences_dialog.c:1779
 msgid "General"
 msgstr "Général"
 
-#: ../src/gnome2/preferences_dialog.c:1773 ../ui/prefs.glade.h:85
+#: ../src/gnome2/preferences_dialog.c:1782 ../ui/prefs.glade.h:87
 msgid "Tabs and Panes"
 msgstr "Onglets et volets"
 
-#: ../src/gnome2/preferences_dialog.c:1780
+#: ../src/gnome2/preferences_dialog.c:1789
 msgid "Options"
 msgstr "Options"
 
-#: ../src/gnome2/preferences_dialog.c:1787
+#: ../src/gnome2/preferences_dialog.c:1796
 msgid "Main"
 msgstr "Base"
 
-#: ../src/gnome2/preferences_dialog.c:1793
+#: ../src/gnome2/preferences_dialog.c:1802
 msgid "Special"
 msgstr "Spécial"
 
-#: ../src/gnome2/search_dialog.c:61 ../src/main/search_dialog.cc:60
-#: ../src/main/search_sidebar.cc:54
+#: ../src/gnome2/search_dialog.c:68 ../src/main/search_dialog.cc:66
+#: ../src/main/search_sidebar.cc:61
 msgid "Searching the "
 msgstr "Recherche dans "
 
-#: ../src/gnome2/search_dialog.c:62 ../src/main/search_dialog.cc:61
-#: ../src/main/search_sidebar.cc:55
+#: ../src/gnome2/search_dialog.c:69 ../src/main/search_dialog.cc:67
+#: ../src/main/search_sidebar.cc:62
 msgid " Module"
 msgstr " Module"
 
-#: ../src/gnome2/search_dialog.c:63 ../src/main/search_dialog.cc:62
-#: ../src/main/search_sidebar.cc:56
+#: ../src/gnome2/search_dialog.c:70 ../src/main/search_dialog.cc:68
+#: ../src/main/search_sidebar.cc:63
 msgid "found in "
 msgstr "dans "
 
-#: ../src/gnome2/search_dialog.c:498
+#: ../src/gnome2/search_dialog.c:527
 msgid "Clear List?"
 msgstr "Effacer la liste?"
 
-#: ../src/gnome2/search_dialog.c:499
+#: ../src/gnome2/search_dialog.c:528
 msgid "Are you sure you want to clear the module list?"
 msgstr "Êtes-vous certain d'effacer la liste des modules?"
 
-#: ../src/gnome2/search_dialog.c:682
+#: ../src/gnome2/search_dialog.c:708
 msgid "The last module list may not be deleted"
 msgstr "Le dernier module de la liste ne peut être supprimé"
 
-#: ../src/gnome2/search_dialog.c:699
+#: ../src/gnome2/search_dialog.c:726
 msgid "Delete list?"
 msgstr "Supprimer la liste?"
 
-#: ../src/gnome2/search_dialog.c:700
+#: ../src/gnome2/search_dialog.c:727
 msgid "Are you sure you want to delete:"
 msgstr "Êtes-vous certain de vouloir supprimer :"
 
-#: ../src/gnome2/search_sidebar.c:189
+#: ../src/gnome2/search_sidebar.c:192
 msgid ""
 "This is an inclusive (\"AND\") search:\n"
 "Find matches showing all words."
@@ -1061,219 +1243,102 @@ msgstr ""
 "Ceci est une requête inclusive (« AND »)\n"
 "Les mots se trouvent simultanément dans le résultat."
 
-#: ../src/gnome2/search_sidebar.c:206
+#: ../src/gnome2/search_sidebar.c:209
 msgid "Search Module"
 msgstr "Module"
 
-#: ../src/gnome2/search_sidebar.c:220
+#: ../src/gnome2/search_sidebar.c:223
 msgid "Bible"
 msgstr "Texte biblique"
 
-#: ../src/gnome2/search_sidebar.c:229 ../ui/prefs.glade.h:35
+#: ../src/gnome2/search_sidebar.c:232 ../ui/prefs.glade.h:35
 msgid "Commentary"
 msgstr "Commentaire"
 
-#: ../src/gnome2/search_sidebar.c:243
+#: ../src/gnome2/search_sidebar.c:246
 msgid "Search Type"
 msgstr "Type de requête"
 
-#: ../src/gnome2/search_sidebar.c:257 ../ui/search-dialog.glade.h:64
+#: ../src/gnome2/search_sidebar.c:260 ../ui/search-dialog.glade.h:66
 msgid "Multi word"
 msgstr "Mots multiples"
 
-#: ../src/gnome2/search_sidebar.c:276 ../ui/search-dialog.glade.h:44
+#: ../src/gnome2/search_sidebar.c:279 ../ui/search-dialog.glade.h:44
 msgid "Exact phrase"
 msgstr "Phrase exacte"
 
-#: ../src/gnome2/search_sidebar.c:290
+#: ../src/gnome2/search_sidebar.c:293
 msgid "Search Options"
 msgstr "Options de la requête"
 
-#: ../src/gnome2/search_sidebar.c:318
+#: ../src/gnome2/search_sidebar.c:321
 msgid "Search Scope"
 msgstr "Plage de versets"
 
-#: ../src/gnome2/search_sidebar.c:331
+#: ../src/gnome2/search_sidebar.c:334
 msgid "No scope"
 msgstr "Sans limites"
 
-#: ../src/gnome2/search_sidebar.c:341
+#: ../src/gnome2/search_sidebar.c:344
 msgid "Use bounds"
 msgstr "Avec des limites"
 
-#: ../src/gnome2/search_sidebar.c:350
+#: ../src/gnome2/search_sidebar.c:353
 msgid "Last search"
 msgstr "Dernière requête"
 
-#: ../src/gnome2/search_sidebar.c:365
+#: ../src/gnome2/search_sidebar.c:368
 msgid "Bounds"
 msgstr "Limites de la plage"
 
-#: ../src/gnome2/search_sidebar.c:379
+#: ../src/gnome2/search_sidebar.c:382
 msgid "Lower"
 msgstr "Basse"
 
-#: ../src/gnome2/search_sidebar.c:386
+#: ../src/gnome2/search_sidebar.c:389
 msgid "Upper"
 msgstr "Haute"
 
-#. 0
-#: ../src/gnome2/sidebar.c:942 ../src/gnome2/sidebar.c:1110
-msgid "Open in a new tab"
-msgstr "Ouvrir dans un nouvel onglet"
-
-#: ../src/gnome2/sidebar.c:943 ../src/gnome2/sidebar.c:1111
-msgid "Open selected module in a new tab"
-msgstr "Ouvrir le module sélectionné dans un nouvel onglet"
-
-#. 1
-#: ../src/gnome2/sidebar.c:948
-msgid "Open in a separate window"
-msgstr "Ouvrir dans une fenêtre séparée"
-
-#: ../src/gnome2/sidebar.c:949
-msgid "Open selected module in a separate ['dialog'] window"
-msgstr "Ouvrir le module sélectionné dans une nouvelle fenêtre"
-
-#: ../src/gnome2/sidebar.c:955 ../src/gnome2/sidebar.c:1123
-msgid "View information about the selected dialog"
-msgstr "Information à propos du module sélectionné"
-
-#: ../src/gnome2/sidebar.c:1046
-msgid "Simple"
-msgstr "Liste simple"
-
-#: ../src/gnome2/sidebar.c:1047
-msgid "Create a new simple prayer list"
-msgstr "Crée une nouvelle liste de prières"
-
-#: ../src/gnome2/sidebar.c:1053
-msgid "Subject"
-msgstr "Liste ordonnée par sujet"
-
-#: ../src/gnome2/sidebar.c:1060
-msgid "Monthly"
-msgstr "Journal mensuel"
-
-#: ../src/gnome2/sidebar.c:1061 ../src/gnome2/sidebar.c:1068
-#: ../src/gnome2/sidebar.c:1075
-msgid "Create a new prayer list"
-msgstr "Crée une nouvelle liste de prières"
-
-#: ../src/gnome2/sidebar.c:1067
-msgid "Daily Journal"
-msgstr "Journal quotidien"
-
-#: ../src/gnome2/sidebar.c:1074
-msgid "Outlined Topic"
-msgstr "Note structurée"
-
-#. 1
-#: ../src/gnome2/sidebar.c:1116 ../ui/xi-menus.glade.h:45
-msgid "Open in editor"
-msgstr "Ouvrir dans l'éditeur"
-
-#: ../src/gnome2/sidebar.c:1117
-msgid "Open selected module in a dialog"
-msgstr "Ouvrir le module sélectionné dans une nouvelle fenêtre"
-
-#: ../src/gnome2/sidebar.c:1446
+#: ../src/gnome2/sidebar.c:1397
 msgid "Search"
 msgstr "Rechercher"
 
-#: ../src/gnome2/sidebar.c:1454
+#: ../src/gnome2/sidebar.c:1405
 msgid "Verse List"
 msgstr "_Versets"
 
-#: ../src/gnome2/sidebar_dialog.c:135
+#: ../src/gnome2/sidebar_dialog.c:139 ../src/gnome2/sidebar_dialog.c:148
 msgid "Sidebar"
 msgstr "Barre latérale"
 
-#: ../src/gnome2/splash.c:363
+#: ../src/gnome2/splash.c:396
 msgid "Powered by the SWORD Project"
 msgstr "Xiphos utilise l'architecture logicielle du Projet SWORD"
 
-#: ../src/gnome2/splash.c:563
-msgid "Initiating Gecko"
-msgstr "Initialisation de Gecko"
-
-#: ../src/gnome2/splash.c:580
-msgid "Loading settings"
-msgstr "Chargement des préférences"
-
-#: ../src/gnome2/splash.c:598
-msgid "Building Interface"
-msgstr "Construction de l'interface"
-
-#: ../src/gnome2/splash.c:615
-msgid "Starting Sword"
-msgstr "Démarrage de Sword"
-
-#: ../src/gnome2/splash.c:632
-msgid "Displaying Xiphos"
-msgstr "Affichage de Xiphos"
-
-#: ../src/gnome2/toolbar_nav.c:416
-msgid "Move backwards through history"
-msgstr "Verset précédent dans l'historique"
-
-#: ../src/gnome2/toolbar_nav.c:437
-msgid "Move foward through history"
-msgstr "Verset suivant dans l'historique"
-
-#: ../src/gnome2/toolbar_nav.c:458
-msgid "Select a Book of the Bible"
-msgstr "Change de livre"
-
-#: ../src/gnome2/toolbar_nav.c:523
-msgid "Change Chapter"
-msgstr "Change de chapitre"
-
-#: ../src/gnome2/toolbar_nav.c:593
-msgid "Change Verse"
-msgstr "Change de verset"
-
-#: ../src/gnome2/toolbar_nav.c:661
-msgid "Enter a Verse reference in Book 1:1 format and press Return"
-msgstr ""
-"Saisir un verset au format <livre> <chapitre>:<verset>(ex: Jn 3:16) puis "
-"valider par appui sur la touche Entrée"
-
-#: ../src/gnome2/treekey-editor.c:129 ../src/gnome2/treekey-editor.c:188
-#: ../src/gnome2/treekey-editor.c:274
+#: ../src/gnome2/treekey-editor.c:137 ../src/gnome2/treekey-editor.c:196
+#: ../src/gnome2/treekey-editor.c:282
 msgid "Prayer List/Journal Item"
 msgstr "Élément de liste de prières/Journal"
 
-#: ../src/gnome2/treekey-editor.c:130 ../src/gnome2/treekey-editor.c:189
-#: ../src/gnome2/treekey-editor.c:275
+#: ../src/gnome2/treekey-editor.c:138 ../src/gnome2/treekey-editor.c:197
+#: ../src/gnome2/treekey-editor.c:283
 msgid "New name"
 msgstr "Nouveau nom"
 
-#: ../src/gnome2/treekey-editor.c:245
+#: ../src/gnome2/treekey-editor.c:253
 msgid "Remove the selected item"
 msgstr "Supprimer l'élément sélectionné"
 
-#: ../src/gnome2/treekey-editor.c:303
-msgid "Add Child"
-msgstr "Ajouter un sous-sujet"
-
-#: ../src/gnome2/treekey-editor.c:304 ../src/gnome2/treekey-editor.c:310
-msgid "Add an item"
-msgstr "Ajouter un élément"
-
-#: ../src/gnome2/treekey-editor.c:309
-msgid "Add Sibling"
-msgstr "Ajouter un élément"
-
-#: ../src/gnome2/treekey-editor.c:316
-msgid "Remove this item"
-msgstr "Supprimer cet élément :"
-
-#: ../src/gnome2/treekey-editor.c:322
-msgid "Edit this item"
-msgstr "Éditer cet élément"
+#: ../src/main/display.cc:259
+#, c-format
+msgid ""
+"Improperly encoded personal annotation label:\n"
+"'%s'"
+msgstr ""
+"Ce nom d'annotation personnelle est improprement formé :\n"
+"'%s'"
 
-#: ../src/main/display.cc:278
+#: ../src/main/display.cc:386
 msgid ""
 "An image file's size could not be determined.\n"
 "Is ImageMagick's 'identify' not installed?\n"
@@ -1285,264 +1350,283 @@ msgstr ""
 "(ou l'image n'est pas de type bmp/gif/jpg/png).\n"
 "&app; ne peut redimensionner les images."
 
-#: ../src/main/display.cc:931 ../src/main/display.cc:993
-#: ../src/main/display.cc:1081 ../src/main/display.cc:1089
-#: ../ui/export-dialog.glade.h:7
+#: ../src/main/display.cc:1043 ../src/main/display.cc:1095
+#: ../src/main/display.cc:1172 ../ui/export-dialog.glade.h:7
 msgid "Chapter"
 msgstr "Chapitre"
 
-#: ../src/main/main.c:109
+#: ../src/main/main.c:119
 msgid "Xiphos does not understand more than one argument."
 msgstr "Xiphos n'accepte pas plus d'un argument."
 
-#: ../src/main/module_dialogs.cc:231 ../src/main/previewer.cc:122
-#: ../ui/prefs.glade.h:75
+#: ../src/main/main.c:161
+msgid "Initiating Gecko"
+msgstr "Initialisation de Gecko"
+
+#: ../src/main/main.c:167
+msgid "Building Interface"
+msgstr "Construction de l'interface"
+
+#: ../src/main/main.c:171
+msgid "Starting Sword"
+msgstr "Démarrage de Sword"
+
+#: ../src/main/main.c:175
+msgid "Loading Settings"
+msgstr "Chargement des préférences"
+
+#: ../src/main/main.c:179
+msgid "Displaying Xiphos"
+msgstr "Affichage de Xiphos"
+
+#: ../src/main/module_dialogs.cc:227 ../src/main/previewer.cc:127
+#: ../src/main/previewer.cc:194 ../ui/prefs.glade.h:75
 msgid "Previewer"
 msgstr "Aperçu"
 
-#: ../src/main/module_dialogs.cc:297 ../src/main/module_dialogs.cc:423
-#: ../src/main/previewer.cc:197
+#: ../src/main/module_dialogs.cc:292 ../src/main/module_dialogs.cc:416
+#: ../src/main/previewer.cc:269
 msgid "Footnote"
 msgstr "Note de bas de page"
 
-#: ../src/main/module_dialogs.cc:303 ../src/main/module_dialogs.cc:428
-#: ../src/main/previewer.cc:203
+#: ../src/main/module_dialogs.cc:298 ../src/main/module_dialogs.cc:421
+#: ../src/main/previewer.cc:281
 msgid "Cross Reference"
 msgstr "Référence croisée"
 
-#: ../src/main/module_dialogs.cc:309 ../src/main/module_dialogs.cc:323
-#: ../src/main/module_dialogs.cc:433 ../src/main/module_dialogs.cc:445
-#: ../src/main/previewer.cc:209 ../src/main/previewer.cc:228
+#: ../src/main/module_dialogs.cc:304 ../src/main/module_dialogs.cc:318
+#: ../src/main/module_dialogs.cc:426 ../src/main/module_dialogs.cc:438
+#: ../src/main/previewer.cc:287 ../src/main/previewer.cc:306
 msgid "Strongs"
 msgstr "Strongs"
 
-#: ../src/main/module_dialogs.cc:315 ../src/main/module_dialogs.cc:334
-#: ../src/main/module_dialogs.cc:438 ../src/main/module_dialogs.cc:455
-#: ../src/main/previewer.cc:215 ../src/main/previewer.cc:241
+#: ../src/main/module_dialogs.cc:310 ../src/main/module_dialogs.cc:329
+#: ../src/main/module_dialogs.cc:431 ../src/main/module_dialogs.cc:448
+#: ../src/main/previewer.cc:293 ../src/main/previewer.cc:319
 msgid "Morphology"
 msgstr "Étiquette morphologique"
 
-#: ../src/main/module_dialogs.cc:1104 ../src/main/url.cc:543
+#: ../src/main/module_dialogs.cc:1081 ../src/main/url.cc:530
 msgid "Back to "
 msgstr "Revenir à "
 
-#: ../src/main/parallel_view.cc:398 ../ui/xi-menus.glade.h:67
+#: ../src/main/parallel_view.cc:404 ../ui/xi-menus.glade.h:89
 msgid "Strong's Numbers"
 msgstr "Nombres de Strong"
 
-#: ../src/main/parallel_view.cc:408 ../ui/search-dialog.glade.h:50
-#: ../ui/xi-menus.glade.h:25
+#: ../src/main/parallel_view.cc:414 ../ui/search-dialog.glade.h:52
+#: ../ui/xi-menus.glade.h:40
 msgid "Footnotes"
 msgstr "Notes de bas de page"
 
-#: ../src/main/parallel_view.cc:418 ../ui/search-dialog.glade.h:62
-#: ../ui/xi-menus.glade.h:39
+#: ../src/main/parallel_view.cc:424 ../ui/search-dialog.glade.h:64
+#: ../ui/xi-menus.glade.h:55
 msgid "Morphological Tags"
 msgstr "Étiquettes morphologiques"
 
-#: ../src/main/parallel_view.cc:428 ../ui/xi-menus.glade.h:29
+#: ../src/main/parallel_view.cc:434 ../ui/xi-menus.glade.h:44
 msgid "Hebrew Vowel Points"
 msgstr "Ponctuation des voyelles en hébreu"
 
-#: ../src/main/parallel_view.cc:438 ../ui/xi-menus.glade.h:28
+#: ../src/main/parallel_view.cc:444 ../ui/xi-menus.glade.h:43
 msgid "Hebrew Cantillation"
 msgstr "Vocalisations en hébreu"
 
-#: ../src/main/parallel_view.cc:448 ../ui/xi-menus.glade.h:26
+#: ../src/main/parallel_view.cc:454 ../ui/xi-menus.glade.h:41
 msgid "Greek Accents"
 msgstr "Accents grecs"
 
-#: ../src/main/parallel_view.cc:458
+#: ../src/main/parallel_view.cc:464
 msgid "Cross-references"
 msgstr "Références croisées"
 
-#: ../src/main/parallel_view.cc:468 ../ui/xi-menus.glade.h:35
+#: ../src/main/parallel_view.cc:474 ../ui/xi-menus.glade.h:50
 msgid "Lemmas"
 msgstr "Lemmes"
 
-#: ../src/main/parallel_view.cc:478 ../ui/xi-menus.glade.h:27
+#: ../src/main/parallel_view.cc:484 ../ui/xi-menus.glade.h:42
 msgid "Headings"
 msgstr "En-têtes"
 
-#: ../src/main/parallel_view.cc:488
+#: ../src/main/parallel_view.cc:494
 msgid "Morpheme Segmentation"
 msgstr "Segmentation de morphème"
 
-#: ../src/main/parallel_view.cc:498 ../ui/xi-menus.glade.h:73
+#: ../src/main/parallel_view.cc:504 ../ui/xi-menus.glade.h:96
 msgid "Words of Christ in Red"
 msgstr "Paroles de Christ en rouge"
 
-#: ../src/main/parallel_view.cc:508 ../ui/xi-menus.glade.h:68
+#: ../src/main/parallel_view.cc:514 ../ui/xi-menus.glade.h:91
 msgid "Transliteration"
 msgstr "Translittération"
 
-#: ../src/main/parallel_view.cc:518
+#: ../src/main/parallel_view.cc:524
 msgid "Textual Variants"
 msgstr "Variantes du texte"
 
-#: ../src/main/parallel_view.cc:526 ../ui/xi-menus.glade.h:49
+#: ../src/main/parallel_view.cc:532 ../ui/xi-menus.glade.h:70
 msgid "Primary Reading"
 msgstr "Lectures principales"
 
-#: ../src/main/parallel_view.cc:535 ../ui/xi-menus.glade.h:63
+#: ../src/main/parallel_view.cc:541 ../ui/xi-menus.glade.h:84
 msgid "Secondary Reading"
 msgstr "Lectures secondaires"
 
-#: ../src/main/parallel_view.cc:544 ../ui/xi-menus.glade.h:5
+#: ../src/main/parallel_view.cc:550 ../ui/xi-menus.glade.h:9
 msgid "All Readings"
 msgstr "Toutes les lectures"
 
-#: ../src/main/parallel_view.cc:878 ../src/main/parallel_view.cc:1130
+#: ../src/main/parallel_view.cc:884 ../src/main/parallel_view.cc:1136
 msgid "view context"
 msgstr "Voir le contexte"
 
-#: ../src/main/prayerlists.cc:71
+#: ../src/main/prayerlists.cc:74
 msgid "January"
 msgstr "Janvier"
 
-#: ../src/main/prayerlists.cc:72
+#: ../src/main/prayerlists.cc:75
 msgid "February"
 msgstr "Février"
 
-#: ../src/main/prayerlists.cc:73
+#: ../src/main/prayerlists.cc:76
 msgid "March"
 msgstr "Mars"
 
-#: ../src/main/prayerlists.cc:74
+#: ../src/main/prayerlists.cc:77
 msgid "April"
 msgstr "Avril"
 
-#: ../src/main/prayerlists.cc:75
+#: ../src/main/prayerlists.cc:78
 msgid "May"
 msgstr "Mai"
 
-#: ../src/main/prayerlists.cc:76
+#: ../src/main/prayerlists.cc:79
 msgid "June"
 msgstr "Juin"
 
-#: ../src/main/prayerlists.cc:77
+#: ../src/main/prayerlists.cc:80
 msgid "July"
 msgstr "Juillet"
 
-#: ../src/main/prayerlists.cc:78
+#: ../src/main/prayerlists.cc:81
 msgid "August"
 msgstr "Août"
 
-#: ../src/main/prayerlists.cc:79
+#: ../src/main/prayerlists.cc:82
 msgid "September"
 msgstr "Septembre"
 
-#: ../src/main/prayerlists.cc:80
+#: ../src/main/prayerlists.cc:83
 msgid "October"
 msgstr "Octobre"
 
-#: ../src/main/prayerlists.cc:81
+#: ../src/main/prayerlists.cc:84
 msgid "November"
 msgstr "Novembre"
 
-#: ../src/main/prayerlists.cc:82
+#: ../src/main/prayerlists.cc:85
 msgid "December"
 msgstr "Décembre"
 
-#: ../src/main/prayerlists.cc:121 ../src/main/sword_treekey.cc:332
+#: ../src/main/prayerlists.cc:124 ../src/main/sword_treekey.cc:332
 msgid "Growth"
 msgstr "Croissance spirituelle"
 
-#: ../src/main/prayerlists.cc:122 ../src/main/sword_treekey.cc:333
+#: ../src/main/prayerlists.cc:125 ../src/main/sword_treekey.cc:333
 msgid "<b>For Growth</b><br>"
 msgstr "<b>Pour la croissance spirituelle</b><br>"
 
-#: ../src/main/prayerlists.cc:123 ../src/main/prayerlists.cc:380
+#: ../src/main/prayerlists.cc:126 ../src/main/prayerlists.cc:383
 #: ../src/main/sword_treekey.cc:334
 msgid "Salvation"
 msgstr "Salut"
 
-#: ../src/main/prayerlists.cc:124 ../src/main/sword_treekey.cc:335
+#: ../src/main/prayerlists.cc:127 ../src/main/sword_treekey.cc:335
 msgid "<b>For Salvation</b><br>"
 msgstr "<b>Pour le salut</b><br>"
 
-#: ../src/main/prayerlists.cc:125 ../src/main/prayerlists.cc:384
+#: ../src/main/prayerlists.cc:128 ../src/main/prayerlists.cc:387
 #: ../src/main/sword_treekey.cc:336
 msgid "Health"
 msgstr "Guérison"
 
-#: ../src/main/prayerlists.cc:126 ../src/main/sword_treekey.cc:337
+#: ../src/main/prayerlists.cc:129 ../src/main/sword_treekey.cc:337
 msgid "<b>For Health</b><br>"
 msgstr "<b>Pour la guérison</b><br>"
 
-#: ../src/main/prayerlists.cc:127
+#: ../src/main/prayerlists.cc:130
 msgid "Misc"
 msgstr "Divers"
 
-#: ../src/main/prayerlists.cc:128 ../src/main/sword_treekey.cc:339
+#: ../src/main/prayerlists.cc:131 ../src/main/sword_treekey.cc:339
 msgid "<b>Miscellaneous</b><br>"
 msgstr "<b>Divers</b><br>"
 
-#: ../src/main/prayerlists.cc:136
+#: ../src/main/prayerlists.cc:139
 msgid "Point x"
 msgstr "Point x"
 
-#: ../src/main/prayerlists.cc:137
+#: ../src/main/prayerlists.cc:140
 msgid "<b>(x)</b><br>"
 msgstr "<b>(x)</b><br>"
 
-#: ../src/main/prayerlists.cc:138
+#: ../src/main/prayerlists.cc:141
 msgid "Point y"
 msgstr "Point y"
 
-#: ../src/main/prayerlists.cc:139
+#: ../src/main/prayerlists.cc:142
 msgid "<b>(y)</b><br>"
 msgstr "<b>(y)</b><br>"
 
-#: ../src/main/prayerlists.cc:140
+#: ../src/main/prayerlists.cc:143
 msgid "Point z"
 msgstr "Point z"
 
-#: ../src/main/prayerlists.cc:141
+#: ../src/main/prayerlists.cc:144
 msgid "<b>(z)</b><br>"
 msgstr "<b>(z)</b><br>"
 
-#: ../src/main/prayerlists.cc:149
+#: ../src/main/prayerlists.cc:152
 msgid "Minor Topic 1"
 msgstr "Section 1"
 
-#: ../src/main/prayerlists.cc:150
+#: ../src/main/prayerlists.cc:153
 msgid "<b>Subtopic 1</b><br>"
 msgstr "<b>Section 1</b><br>"
 
-#: ../src/main/prayerlists.cc:152
+#: ../src/main/prayerlists.cc:155
 msgid "Minor Topic 2"
 msgstr "Section 2"
 
-#: ../src/main/prayerlists.cc:153
+#: ../src/main/prayerlists.cc:156
 msgid "<b>Subtopic 2</b><br>"
 msgstr "<b>Section 2</b><br>"
 
-#: ../src/main/prayerlists.cc:155
+#: ../src/main/prayerlists.cc:158
 msgid "Minor Topic 3"
 msgstr "Section 3"
 
-#: ../src/main/prayerlists.cc:156
+#: ../src/main/prayerlists.cc:159
 msgid "<b>Subtopic 3</b><br>"
 msgstr "<b>Section 3</b><br>"
 
-#: ../src/main/prayerlists.cc:158
+#: ../src/main/prayerlists.cc:161
 msgid "Minor Topic 4"
 msgstr "Section 4"
 
-#: ../src/main/prayerlists.cc:159
+#: ../src/main/prayerlists.cc:162
 msgid "<b>Subtopic 4</b><br>"
 msgstr "<b>Section 4</b><br>"
 
-#: ../src/main/prayerlists.cc:239
+#: ../src/main/prayerlists.cc:242
 msgid "Name for new prayer list or journal"
 msgstr "Nom de la nouvelle liste de prières ou du journal"
 
-#: ../src/main/prayerlists.cc:270
+#: ../src/main/prayerlists.cc:273
 msgid "Xiphos finds that prayer list already."
 msgstr "Cette liste de prières ou note existe déjà."
 
-#: ../src/main/prayerlists.cc:283
+#: ../src/main/prayerlists.cc:286
 #, c-format
 msgid ""
 "Xiphos cannot create module's path:\n"
@@ -1551,128 +1635,130 @@ msgstr ""
 "Impossible de créer le chemin d'accès au module:\n"
 "%s"
 
-#: ../src/main/prayerlists.cc:323
+#: ../src/main/prayerlists.cc:326
 msgid "A basic prayer list. \\par\\par Module created by Xiphos."
-msgstr "\\par\\par Liste simple\\par\\par Module crée par Xiphos"
+msgstr "Une liste simple. \\par\\par Module crée par Xiphos."
 
-#: ../src/main/prayerlists.cc:324
+#: ../src/main/prayerlists.cc:327
 msgid "BasicPrayerList"
 msgstr "MaListeDeBase"
 
-#: ../src/main/prayerlists.cc:338
+#: ../src/main/prayerlists.cc:341
 msgid "MyPrayerList"
 msgstr "MaListe"
 
-#: ../src/main/prayerlists.cc:339
+#: ../src/main/prayerlists.cc:342
 msgid ""
 "<b>People:</b><br>Bob<br>Sam<br>Sue<br><br><b>Church:</"
 "b><br>pews<br>fellowship<br>Bibles for missionaries<br><br><br>"
 msgstr ""
-"<b>Personnes:</b><br>Personne 1<br>Personne 2<br>Personne "
-"3<br><br><b>Assemblées:</"
+"<b>Personnes:</b><br>Jean<br>Pierre<br>Paul<br><br><b>Assemblée:</"
 "b><br>Participants<br>Fonctionnement<br>Missions<br><br><br>"
 
-#: ../src/main/prayerlists.cc:365
+#: ../src/main/prayerlists.cc:368
 msgid "A subject-based prayer list. \\par\\par Module created by Xiphos."
-msgstr "\\par\\par Liste ordonnée par sujets\\par\\par Module crée par Xiphos"
+msgstr "Liste ordonnée par sujets. \\par\\par Module crée par Xiphos."
 
-#: ../src/main/prayerlists.cc:366
+#: ../src/main/prayerlists.cc:369
 msgid "SubjectPrayerList"
 msgstr "MaListeParSujets"
 
-#: ../src/main/prayerlists.cc:381
+#: ../src/main/prayerlists.cc:384
 msgid "Bob<br>Sam<br>Sue<br>John<br>"
-msgstr "Personne 1<br>Personne 2<br>Personne 3<br>"
+msgstr "Jean<br>Pierre<br>Paul<br>Esther<br>"
 
-#: ../src/main/prayerlists.cc:382
+#: ../src/main/prayerlists.cc:385
 msgid "Spiritual Growth"
 msgstr "Croissance spirituelle"
 
-#: ../src/main/prayerlists.cc:383
+#: ../src/main/prayerlists.cc:386
 msgid "Mike<br>Steve<br>"
 msgstr "Personne 1<br>Personne 2<br>Personne 3<br>"
 
-#: ../src/main/prayerlists.cc:385
+#: ../src/main/prayerlists.cc:388
 msgid "Sue<br>John<br>"
 msgstr "Personne 1<br>Personne 2<br>Personne 3<br>"
 
-#: ../src/main/prayerlists.cc:411
+#: ../src/main/prayerlists.cc:414
 msgid "A monthly prayer list. \\par\\par Module created by Xiphos."
-msgstr "\\par\\par Suivi mensuel\\par\\par Module crée par Xiphos"
+msgstr "Liste mensuelle. \\par\\par Module crée par Xiphos."
 
-#: ../src/main/prayerlists.cc:412
+#: ../src/main/prayerlists.cc:415
 msgid "MonthlyPrayerList"
 msgstr "MaListeMensuelle"
 
-#: ../src/main/prayerlists.cc:463
+#: ../src/main/prayerlists.cc:466
 msgid "A daily journal. \\par\\par Module created by Xiphos."
-msgstr "\\par\\par Journal quotidien\\par\\par Module crée par Xiphos"
+msgstr "Un journal quotidien. \\par\\par Module crée par Xiphos."
 
-#: ../src/main/prayerlists.cc:464
+#: ../src/main/prayerlists.cc:467
 msgid "DailyJournal"
-msgstr "Journal quotidien"
+msgstr "JournalQuotidien"
 
-#: ../src/main/prayerlists.cc:528
+#: ../src/main/prayerlists.cc:531
 msgid "An outlined topic (e.g. sermon). \\par\\par Module created by Xiphos."
-msgstr ""
-"\\par\\par Note structurée (ex sermon)\\par\\par Module crée par Xiphos"
+msgstr "Une note structurée (ex sermon). \\par\\par Module crée par Xiphos."
 
-#: ../src/main/prayerlists.cc:529
+#: ../src/main/prayerlists.cc:532
 msgid "OutlinedTopic"
 msgstr "NoteStructurée"
 
-#: ../src/main/prayerlists.cc:543
+#: ../src/main/prayerlists.cc:546
 msgid "Major Topic A"
 msgstr "Sujet majeur A"
 
-#: ../src/main/prayerlists.cc:544
+#: ../src/main/prayerlists.cc:547
 msgid "<b>Major Topic A</b><br>"
 msgstr "<b>Sujet majeur A</b><br>"
 
-#: ../src/main/prayerlists.cc:546
+#: ../src/main/prayerlists.cc:549
 msgid "Major Topic B"
 msgstr "Sujet majeur B"
 
-#: ../src/main/prayerlists.cc:547
+#: ../src/main/prayerlists.cc:550
 msgid "<b>Major Topic B</b><br>"
 msgstr "<b>Sujet majeur B</b><br>"
 
-#: ../src/main/prayerlists.cc:549
+#: ../src/main/prayerlists.cc:552
 msgid "Major Topic C"
 msgstr "Sujet majeur C"
 
-#: ../src/main/prayerlists.cc:550
+#: ../src/main/prayerlists.cc:553
 msgid "<b>Major Topic C</b><br>"
 msgstr "<b>Sujet majeur C</b><br>"
 
-#: ../src/main/search_dialog.cc:129
+#: ../src/main/previewer.cc:275
+msgid "User Annotation"
+msgstr "Annotation personnelle de"
+
+#: ../src/main/search_dialog.cc:212
 #, c-format
 msgid "Search result %s: %s"
 msgstr "Résultat de la requête %s : %s"
 
-#: ../src/main/search_dialog.cc:363
+#: ../src/main/search_dialog.cc:444
 msgid "Delete Range?"
 msgstr "Supprimer la plage?"
 
-#: ../src/main/search_dialog.cc:364
+#: ../src/main/search_dialog.cc:445
 msgid "Are you sure you want to delete this range?"
 msgstr "Êtes-vous certain de supprimer cette plage?"
 
-#: ../src/main/search_dialog.cc:578 ../src/main/search_dialog.cc:1049
-#: ../src/main/search_dialog.cc:1052 ../src/main/search_dialog.cc:1074
-#: ../src/main/search_dialog.cc:1077
+#: ../src/main/search_dialog.cc:659 ../src/main/search_dialog.cc:1130
+#: ../src/main/search_dialog.cc:1133 ../src/main/search_dialog.cc:1155
+#: ../src/main/search_dialog.cc:1158
 msgid "Search: "
 msgstr "Dans : "
 
-#: ../src/main/search_dialog.cc:623
+#: ../src/main/search_dialog.cc:704
 msgid "Remove Module?"
 msgstr "Enlever les modules?"
 
-#: ../src/main/search_dialog.cc:624
+#: ../src/main/search_dialog.cc:705
 msgid "Are you sure you want to remove the selected module?"
 msgstr "Êtes-vous certain de vouloir supprimer le module sélectionné?"
 
-#: ../src/main/search_dialog.cc:1473
+#: ../src/main/search_dialog.cc:1560
 #, c-format
 msgid ""
 "%s:\n"
@@ -1683,16 +1769,16 @@ msgstr ""
 "Module non installé.\n"
 "%s"
 
-#: ../src/main/search_dialog.cc:1475
+#: ../src/main/search_dialog.cc:1562
 msgid "Please adjust the module list."
 msgstr "La liste de modules est à régénérer"
 
-#: ../src/main/search_dialog.cc:1491
+#: ../src/main/search_dialog.cc:1578
 #, c-format
 msgid "No fast-search index exists for %s.%s%s"
 msgstr "Aucun index de recherche rapide n'existe pour %s %s%s"
 
-#: ../src/main/search_dialog.cc:1493
+#: ../src/main/search_dialog.cc:1580
 msgid ""
 "\n"
 "Search on this module is now `multi word'."
@@ -1700,7 +1786,7 @@ msgstr ""
 "\n"
 "Les requêtes sur ce module sont maintenant 'multi-mots'"
 
-#: ../src/main/search_dialog.cc:1494
+#: ../src/main/search_dialog.cc:1581
 msgid ""
 "\n"
 "See the Module Manager, Maintenance pane."
@@ -1708,15 +1794,15 @@ msgstr ""
 "\n"
 "Voir le Gestionnaire de modules, onglet Maintenance"
 
-#: ../src/main/search_dialog.cc:1555
+#: ../src/main/search_dialog.cc:1644
 msgid "Search finished"
-msgstr "Recherche terminée "
+msgstr "Recherche terminée"
 
-#: ../src/main/search_sidebar.cc:93
+#: ../src/main/search_sidebar.cc:100
 msgid "matches"
 msgstr "réponses"
 
-#: ../src/main/settings.c:56
+#: ../src/main/settings.c:60
 msgid ""
 "Welcome to Xiphos.\n"
 "\n"
@@ -1753,28 +1839,11 @@ msgstr ""
 "Autorisez-vous Xiphos à lancer le gestionnaire de modules pour télécharger "
 "un texte biblique?"
 
-#: ../src/main/settings.c:109
+#: ../src/main/settings.c:105
 msgid "$HOME is not set!"
 msgstr "$HOME n'est pas défini!"
 
-#: ../src/main/settings.c:124
-msgid "Xiphos has renamed .xiphos-2.0 to .xiphos"
-msgstr "Le répertoire ~/.xiphos-2.0 a été renommé en ~/.xiphos"
-
-#: ../src/main/settings.c:127
-#, c-format
-msgid ""
-"Xiphos can not rename  .xiphos-2.0 to .xiphos:\n"
-"%s\n"
-"\n"
-"Xiphos cannot continue."
-msgstr ""
-"Xiphos n'a pas pu renommer ~/.xiphos-2.0 en ~/.xiphos\n"
-"%s\n"
-"\n"
-"Xiphos ne peut s'exécuter normalement."
-
-#: ../src/main/settings.c:135
+#: ../src/main/settings.c:120
 #, c-format
 msgid ""
 "Xiphos can not create  .xiphos:\n"
@@ -1785,14 +1854,14 @@ msgstr ""
 "Xiphos n'a pas pu créer ~/.xiphos:\n"
 "%s\n"
 "\n"
-"Xiphos ne peut s\"exécuter normalement."
+"Xiphos ne peut s'exécuter normalement."
 
-#: ../src/main/settings.c:148 ../src/main/settings.c:156
-#: ../src/main/settings.c:164
+#: ../src/main/settings.c:133 ../src/main/settings.c:142
+#: ../src/main/settings.c:151
 msgid "can not create "
 msgstr "impossible de créer "
 
-#: ../src/main/settings.c:196
+#: ../src/main/settings.c:194
 msgid ""
 "There are still no Bibles installed.\n"
 "Evidently, you declined to install any.\n"
@@ -1808,11 +1877,11 @@ msgstr ""
 "Xiphos ne peut fonctionner,\n"
 "et va maintenant se terminer."
 
-#: ../src/main/settings.c:200
+#: ../src/main/settings.c:198
 msgid "Bible module installation complete."
 msgstr "Installation de module terminée."
 
-#: ../src/main/settings.c:203
+#: ../src/main/settings.c:201
 msgid ""
 "Without any Bible modules to display,\n"
 "Xiphos cannot proceed,\n"
@@ -1822,75 +1891,15 @@ msgstr ""
 "Xiphos ne peut fonctionner\n"
 "et va maintenant se terminer."
 
-#. *****************************************************************************
-#. * Name
-#. *    gconf_setup
-#. *
-#. * Synopsis
-#. *   #include "main/settings.h"
-#. *
-#. *   void gconf_setup()
-#. *
-#. * Description
-#. *   verifies and initializes the GConf subsystem, so that "sword://" and
-#. *   similar can be handled by url-comprehending programs such as browsers.
-#. *   dialogs for permission/success/failure => conditional on debug build.
-#. *
-#. * Return value
-#. *   void
-#.
-#: ../src/main/settings.c:816
-msgid ""
-"URL references using \"sword://\" (similar to web page\n"
-"references) can be used by programs to look up\n"
-"scripture references. Your system currently has no\n"
-"program set to handle these references.\n"
-"\n"
-"Would you like Xiphos to set itself as the\n"
-"program to handle these references?"
-msgstr ""
-"Des adresses URL de type « sword:// » (similaires aux\n"
-"pages web) peuvent être utilisées par d'autres applications\n"
-"pour rechercher une référence biblique. Votre système n'a\n"
-"pas de programme configuré pour traiter ces adresses.\n"
-"\n"
-"Voulez-vous que Xiphos soit paramétré comme\n"
-"l'application gérant ces adresses URL?"
-
-#: ../src/main/settings.c:818
-msgid ""
-"Xiphos has successfully set itself\n"
-"as the handler of sword:// and bible:// URLs.\n"
-"\n"
-"You may wish to run the program \"gconf-editor\"\n"
-"to examine keys under /desktop/gnome/url-handlers,\n"
-"if you need to change these."
-msgstr ""
-"Xiphos a été déclaré comme gestionnaire \n"
-"par défaut des URL de type sword:// et bible://\n"
-"\n"
-"Le programme \"gconf-editor\" permet de modifier \n"
-"les clés sous : /desktop/gnome/url-handlers,\n"
-"si vous éprouvez le besoin de les changer."
-
-#: ../src/main/settings.c:871
-#, c-format
-msgid ""
-"Xiphos failed to complete handler init for key #%d:\n"
-"%s"
-msgstr ""
-"Xiphos n'a pas pu initialiser la clé #%d:\n"
-"%s"
-
-#: ../src/main/sidebar.cc:375
+#: ../src/main/sidebar.cc:399
 msgid "verse"
 msgstr "verset"
 
-#: ../src/main/sidebar.cc:437
+#: ../src/main/sidebar.cc:461
 msgid "chapter"
 msgstr "chapitre"
 
-#: ../src/main/sword.cc:549
+#: ../src/main/sword.cc:537
 msgid ""
 "Xiphos's file for language\n"
 "abbreviations is missing."
@@ -1898,7 +1907,7 @@ msgstr ""
 "Le fichier des définitions\n"
 "de langages est absent."
 
-#: ../src/main/sword.cc:556
+#: ../src/main/sword.cc:544
 msgid ""
 "Xiphos's language abbreviation\n"
 "file cannot be opened."
@@ -1906,7 +1915,7 @@ msgstr ""
 "Ouverture impossible du fichier\n"
 "des définitions de langages."
 
-#: ../src/main/sword.cc:567
+#: ../src/main/sword.cc:557
 msgid ""
 "Xiphos cannot allocate space\n"
 "for language abbreviations."
@@ -1914,7 +1923,7 @@ msgstr ""
 "Impossible d'allouer l'espace suffisant\n"
 "aux abbréviations de langage."
 
-#: ../src/main/sword.cc:574
+#: ../src/main/sword.cc:564
 msgid ""
 "Xiphos cannot read the\n"
 "language abbreviation file."
@@ -1922,43 +1931,43 @@ msgstr ""
 "Erreur de lecture du fichier des\n"
 "définitions de langages."
 
-#: ../src/main/sword.cc:1202
+#: ../src/main/sword.cc:642
+msgid "No matching locale found for"
+msgstr "Pas de locale pour"
+
+#: ../src/main/sword.cc:644
+msgid "Book names and menus may not be translated"
+msgstr "Les noms de livres et les menus ne seront peut-être pas traduits"
+
+#: ../src/main/sword.cc:1232
 msgid "Daily devotional was requested, but there are none installed."
 msgstr ""
 "Impossible d'afficher le calendrier biblique, aucun module de ce type n'est "
 "installé."
 
-#: ../src/main/tab_history.c:97
-msgid "H_istory/<Separator>"
-msgstr "H_istorique/<Separator>"
-
-#: ../src/main/tab_history.c:99
-msgid "H_istory/C_lear"
-msgstr "H_istorique/_Effacer"
-
-#: ../src/main/tab_history.c:224
+#: ../src/main/tab_history.c:219
 msgid "Clear History"
 msgstr "Effacer l'historique"
 
-#: ../src/main/url.cc:99
+#: ../src/main/url.cc:101
 msgid "URL not found:"
 msgstr "URL non trouvée :"
 
-#: ../src/main/url.cc:194
+#: ../src/main/url.cc:191
 #, c-format
 msgid "Xiphos could not execute %s"
 msgstr "Xiphos n'a pas pu exécuter %s"
 
-#: ../src/main/url.cc:202
+#: ../src/main/url.cc:199
 msgid "Viewer error:\n"
 msgstr "Erreur d'aperçu:\n"
 
-#: ../src/main/url.cc:278
+#: ../src/main/url.cc:272
 #, c-format
 msgid "Show %s in main window"
 msgstr "Affiche %s dans la fenêtre principale"
 
-#: ../src/main/xml.c:80 ../src/main/xml.c:465
+#: ../src/main/xml.c:80 ../src/main/xml.c:464
 #, c-format
 msgid "Document not created successfully. \n"
 msgstr "Erreur de création du document. \n"
@@ -1976,8 +1985,8 @@ msgid "Acts 16:31"
 msgstr "Act 16:31"
 
 #: ../src/main/xml.c:97 ../src/main/xml.c:98
-msgid "Eph 2:8"
-msgstr "Éph 2:8"
+msgid "Eph 2:8,9"
+msgstr "Éph 2:8,9"
 
 #: ../src/main/xml.c:102 ../src/main/xml.c:103
 msgid "Romans 1:16"
@@ -1991,13 +2000,13 @@ msgstr "Qu'est-ce que l'Évangile?"
 msgid "1 Cor 15:1-4"
 msgstr "1 Cor 15:1-4"
 
-#: ../src/main/xml.c:413 ../src/main/xml.c:1078
+#: ../src/main/xml.c:413 ../src/main/xml.c:1144
 #, c-format
 msgid "Document not parsed successfully. \n"
 msgstr "Erreur de lecture du document. \n"
 
-#: ../src/main/xml.c:419 ../src/main/xml.c:681 ../src/main/xml.c:959
-#: ../src/main/xml.c:1138
+#: ../src/main/xml.c:419 ../src/main/xml.c:747 ../src/main/xml.c:1025
+#: ../src/main/xml.c:1204
 #, c-format
 msgid "empty document \n"
 msgstr "Document vide \n"
@@ -2007,27 +2016,27 @@ msgstr "Document vide \n"
 msgid "wrong type, root node != SwordBookmarks\n"
 msgstr "Erreur de type, root node != SwordBookmarks\n"
 
-#: ../src/main/xml.c:479
+#: ../src/main/xml.c:476
 msgid "Old Testament"
 msgstr "Ancien Testament"
 
-#: ../src/main/xml.c:481
+#: ../src/main/xml.c:477
 msgid "Gen - Mal"
 msgstr "Ge - Mal"
 
-#: ../src/main/xml.c:487
+#: ../src/main/xml.c:482
 msgid "New Testament"
 msgstr "Nouveau Testament"
 
-#: ../src/main/xml.c:489
+#: ../src/main/xml.c:483
 msgid "Mat - Rev"
 msgstr "Mt - Ap"
 
-#: ../src/main/xml.c:497
+#: ../src/main/xml.c:489
 msgid "Sample Module List"
 msgstr "Exemple de liste de modules"
 
-#: ../src/main/xml.c:687 ../src/main/xml.c:965
+#: ../src/main/xml.c:753 ../src/main/xml.c:1031
 #, c-format
 msgid "wrong type, root node != %s\n"
 msgstr "Erreur de type, root node != %s\n"
@@ -2036,7 +2045,7 @@ msgstr "Erreur de type, root node != %s\n"
 msgid "Add Bookmark"
 msgstr "Ajouter un signet"
 
-#: ../ui/bookmarks.glade.h:2
+#: ../ui/bookmarks.glade.h:2 ../ui/markverse.glade.h:1
 msgid "Bookmark Dialog"
 msgstr "Signet"
 
@@ -2044,11 +2053,11 @@ msgstr "Signet"
 msgid "Bookmark Folder Treeview"
 msgstr "Arborescence Dossier des signets"
 
-#: ../ui/bookmarks.glade.h:4
+#: ../ui/bookmarks.glade.h:4 ../ui/markverse.glade.h:2
 msgid "Cancel Bookmark"
 msgstr "Annuler un signet"
 
-#: ../ui/bookmarks.glade.h:5
+#: ../ui/bookmarks.glade.h:5 ../ui/markverse.glade.h:3
 msgid "Create new folder"
 msgstr "Crée un nouveau dossier"
 
@@ -2060,11 +2069,11 @@ msgstr "Entrée Étiquette"
 msgid "Label:"
 msgstr "Étiquette :"
 
-#: ../ui/bookmarks.glade.h:8
+#: ../ui/bookmarks.glade.h:8 ../ui/markverse.glade.h:6
 msgid "Module Entry"
 msgstr "Entrée Module"
 
-#: ../ui/bookmarks.glade.h:9
+#: ../ui/bookmarks.glade.h:9 ../ui/markverse.glade.h:7
 msgid "Module:"
 msgstr "Module :"
 
@@ -2072,15 +2081,16 @@ msgstr "Module :"
 msgid "New ..."
 msgstr "Nouveau..."
 
-#: ../ui/bookmarks.glade.h:11 ../ui/xi-menus.glade.h:40
+#: ../ui/bookmarks.glade.h:11 ../ui/markverse.glade.h:8
+#: ../ui/xi-menus.glade.h:56
 msgid "New Folder"
 msgstr "Nouveau dossier"
 
-#: ../ui/bookmarks.glade.h:12
+#: ../ui/bookmarks.glade.h:12 ../ui/markverse.glade.h:10
 msgid "Verse Entry"
 msgstr "Entrée Verset"
 
-#: ../ui/bookmarks.glade.h:13
+#: ../ui/bookmarks.glade.h:13 ../ui/markverse.glade.h:11
 msgid "Verse:"
 msgstr "Verset :"
 
@@ -2210,7 +2220,7 @@ msgstr "Bouton radio Livre"
 msgid "Chapter Radio Button"
 msgstr "Bouton radio Chapitre"
 
-#: ../ui/export-dialog.glade.h:9 ../ui/xi-menus.glade.h:12
+#: ../ui/export-dialog.glade.h:9 ../ui/xi-menus.glade.h:18
 msgid "Copy/Export Passage"
 msgstr "Copier/exporter le passage"
 
@@ -2274,6 +2284,18 @@ msgstr "Plage de versets"
 msgid "Version"
 msgstr "Version"
 
+#: ../ui/markverse.glade.h:4
+msgid "Mark"
+msgstr "Annoter"
+
+#: ../ui/markverse.glade.h:5
+msgid "Mark/Unmark Verse"
+msgstr "Annoter ce verset"
+
+#: ../ui/markverse.glade.h:9
+msgid "Unmark"
+msgstr "Supprimer"
+
 #: ../ui/module-manager.glade.h:1
 msgid "<b>Add and Remove Sources</b>"
 msgstr "<b>Gestion des dépôts de modules </b>"
@@ -2284,7 +2306,7 @@ msgstr "<b>Dossier d'installation</b>"
 
 #: ../ui/module-manager.glade.h:3
 msgid "<b>Install Source</b>"
-msgstr "<b>Dépôt des modules</b>"
+msgstr "<b>Source des dépôts</b>"
 
 #: ../ui/module-manager.glade.h:4
 msgid "<b>Module Manager</b>"
@@ -2305,7 +2327,7 @@ msgid ""
 "detection you should NOT use  the remote installation feature! "
 msgstr ""
 "<b>Attention :</b> Ne pas utiliser les dépôts distants depuis les pays où il "
-"est dangereux d'être repéré!"
+"est dangereux d'être repéré! "
 
 #: ../ui/module-manager.glade.h:9
 msgid "<i>Personal area, for your use only:</i>"
@@ -2315,39 +2337,47 @@ msgstr "<i>Espace personnel, pour votre usage uniquement</i>"
 msgid "<i>System area, for all users:</i>"
 msgstr "<i>Espace système, pour tous les utilisateurs</i>"
 
-#: ../ui/module-manager.glade.h:11
+#: ../ui/module-manager.glade.h:12
 msgid "Continue"
 msgstr "Continuer"
 
-#: ../ui/module-manager.glade.h:12
+#: ../ui/module-manager.glade.h:13
 msgid "Current Remote Sources"
 msgstr "Dépôts distants"
 
-#: ../ui/module-manager.glade.h:13
+#: ../ui/module-manager.glade.h:14
 msgid "Current local sources"
 msgstr "Dépôts locaux"
 
-#: ../ui/module-manager.glade.h:14
+#: ../ui/module-manager.glade.h:15
+msgid "Delete Index"
+msgstr "Désindexer"
+
+#: ../ui/module-manager.glade.h:16
 msgid "Home dir"
 msgstr "Dossier personnel"
 
-#: ../ui/module-manager.glade.h:16
+#: ../ui/module-manager.glade.h:19
+msgid "Load Standard"
+msgstr "Recharger liste"
+
+#: ../ui/module-manager.glade.h:20
 msgid "Local"
 msgstr "Dépôt local"
 
-#: ../ui/module-manager.glade.h:17
+#: ../ui/module-manager.glade.h:21
 msgid "Local Install Folder"
 msgstr "Répertoire local d'installation"
 
-#: ../ui/module-manager.glade.h:18
+#: ../ui/module-manager.glade.h:22
 msgid "Module Manager"
 msgstr "Gérer les modules"
 
-#: ../ui/module-manager.glade.h:19
+#: ../ui/module-manager.glade.h:23
 msgid "Remote"
 msgstr "Dépôt distant"
 
-#: ../ui/module-manager.glade.h:20
+#: ../ui/module-manager.glade.h:24
 msgid "Sword sys dir"
 msgstr "Rép Sword-sys"
 
@@ -2456,8 +2486,8 @@ msgid "Background"
 msgstr "Arrière-plan"
 
 #: ../ui/prefs.glade.h:21
-msgid "Base text size"
-msgstr "Taille du texte de base"
+msgid "Base font size"
+msgstr "Taille police de base"
 
 #: ../ui/prefs.glade.h:22
 msgid "Bible Texts"
@@ -2498,7 +2528,7 @@ msgstr "Boite combinée Changement de notes personnelles"
 
 #: ../ui/prefs.glade.h:32
 msgid "Choose to enable Prayer lists "
-msgstr "Autorise les listes de prières"
+msgstr "Active les listes de prières "
 
 #: ../ui/prefs.glade.h:34
 msgid "Commentaries Checkbox"
@@ -2690,44 +2720,56 @@ msgstr "Afficher le calendrier biblique au démarrage"
 msgid "Show splash screen at start up"
 msgstr "Afficher l'écran de démarrage"
 
-# src/gs_preferences_dlg.c
 #: ../ui/prefs.glade.h:84
+msgid "Special Locale (requires restart)"
+msgstr "Langue spéciale (Nécessite un redémarrage)"
+
+#: ../ui/prefs.glade.h:85
+msgid "Special Locale Combo"
+msgstr "Combo langue spéciale"
+
+# src/gs_preferences_dlg.c
+#: ../ui/prefs.glade.h:86
 msgid "StudyPad default directory combo"
 msgstr "Boite combinée Répertoire par défaut du bloc-notes"
 
-#: ../ui/prefs.glade.h:86
+#: ../ui/prefs.glade.h:88
 msgid "Use Bible Text scroll bar to scroll to previous or next chapter"
 msgstr ""
 "Permet d'utiliser la barre de déplacement vertical du volet des textes "
 "bibliques pour se déplacer au chapitre suivant ou précédent"
 
-#: ../ui/prefs.glade.h:87
+#: ../ui/prefs.glade.h:89
 msgid "Use Verse Per Line"
 msgstr "Affichage d'un verset par ligne"
 
-#: ../ui/prefs.glade.h:88
+#: ../ui/prefs.glade.h:90
 msgid "Use Verse Per Line Checkbox"
 msgstr "Case à cocher Verset par ligne"
 
 # src/gs_preferences_dlg.c
-#: ../ui/prefs.glade.h:89
+#: ../ui/prefs.glade.h:91
 msgid "Use default Dictionary"
 msgstr "Définitions du dictionnaire par défaut"
 
 # src/gs_preferences_dlg.c
-#: ../ui/prefs.glade.h:90
+#: ../ui/prefs.glade.h:92
 msgid "Use default Dictionary Checkbox"
 msgstr "Case à cocher Dictionnaire par défaut"
 
-#: ../ui/prefs.glade.h:91
+#: ../ui/prefs.glade.h:93
 msgid "Use tabbed browsing"
 msgstr "Utiliser les onglets"
 
-#: ../ui/prefs.glade.h:92
+#: ../ui/prefs.glade.h:94
 msgid "Use tabbed browsing Checkbox"
 msgstr "Case à cocher Utiliser les onglets"
 
-#: ../ui/prefs.glade.h:93
+#: ../ui/prefs.glade.h:95
+msgid "Verse Number"
+msgstr "Numéros de verset"
+
+#: ../ui/prefs.glade.h:96
 msgid "Verse number size"
 msgstr "Taille du numéro de verset"
 
@@ -2908,6 +2950,14 @@ msgid "Exact phrase radiobutton"
 msgstr "Bouton radio Phrase exacte"
 
 #: ../ui/search-dialog.glade.h:46
+msgid "Export"
+msgstr "Exporter"
+
+#: ../ui/search-dialog.glade.h:47
+msgid "Export current search results"
+msgstr "Exporte les résultats de la requête courante"
+
+#: ../ui/search-dialog.glade.h:48
 msgid ""
 "Fast, featureful, index-based search\n"
 "Indexes must have been built beforehand:\n"
@@ -2917,233 +2967,233 @@ msgstr ""
 "Les index doivent être préalablement construits.\n"
 "Voir l'onglet Gérer du gestionnaire de modules."
 
-#: ../ui/search-dialog.glade.h:49
+#: ../ui/search-dialog.glade.h:51
 msgid "Find Button"
 msgstr "Bouton Rechercher"
 
-#: ../ui/search-dialog.glade.h:51
+#: ../ui/search-dialog.glade.h:53
 msgid "Footnotes radiobutton"
 msgstr "Bouton radio Notes de bas de page"
 
-#: ../ui/search-dialog.glade.h:52
+#: ../ui/search-dialog.glade.h:54
 msgid "In modules that have Footnotes"
-msgstr "Inclut les notes de bas de page dans l'affichage des versets "
+msgstr "Inclut les notes de bas de page dans l'affichage des versets"
 
-#: ../ui/search-dialog.glade.h:53
+#: ../ui/search-dialog.glade.h:55
 msgid "In modules that have Morphological Tags"
 msgstr "Inclut les étiquettes morphologiques dans l'affichage des versets"
 
-#: ../ui/search-dialog.glade.h:54
+#: ../ui/search-dialog.glade.h:56
 msgid "In modules that have Strong's Numbers"
 msgstr "Inclut les nombres de Strong dans l'affichage des versets"
 
-#: ../ui/search-dialog.glade.h:55
+#: ../ui/search-dialog.glade.h:57
 msgid "Main Search Entry"
 msgstr "Entrée Recherche principale"
 
-#: ../ui/search-dialog.glade.h:56
+#: ../ui/search-dialog.glade.h:58
 msgid "Make selections on the Attribute Search tab"
 msgstr ""
 "Recherche sur les nombres de Strong \n"
 "Plus d'options dans l'onglet Attributs"
 
-#: ../ui/search-dialog.glade.h:58
+#: ../ui/search-dialog.glade.h:60
 msgid "Match case checkbox"
 msgstr "Case à cocher Respecter la casse"
 
-#: ../ui/search-dialog.glade.h:59
+#: ../ui/search-dialog.glade.h:61
 msgid "Module Selection"
 msgstr "Sélection de module"
 
-#: ../ui/search-dialog.glade.h:60
+#: ../ui/search-dialog.glade.h:62
 msgid "Module list"
 msgstr "Plusieurs modules"
 
-#: ../ui/search-dialog.glade.h:61
+#: ../ui/search-dialog.glade.h:63
 msgid "Module list radiobutton"
 msgstr "Radio bouton Liste de modules"
 
-#: ../ui/search-dialog.glade.h:63
+#: ../ui/search-dialog.glade.h:65
 msgid "Morphological Tags radiobutton"
 msgstr "Bouton radio Étiquettes morphologiques"
 
-#: ../ui/search-dialog.glade.h:65
+#: ../ui/search-dialog.glade.h:67
 msgid "Multi word radiobutton"
 msgstr "Bouton radio Mots multiples"
 
-#: ../ui/search-dialog.glade.h:66
+#: ../ui/search-dialog.glade.h:68
 msgid "New Custom Module List Button"
 msgstr "Bouton Nouvelle liste de modules"
 
-#: ../ui/search-dialog.glade.h:67
+#: ../ui/search-dialog.glade.h:69
 msgid "New Range Button"
 msgstr "Bouton Nouvelle plage personnalisée"
 
-#: ../ui/search-dialog.glade.h:68
+#: ../ui/search-dialog.glade.h:70
 msgid "Open Selection Dialog Button"
 msgstr "Bouton Ouvrir la boite de sélection"
 
-#: ../ui/search-dialog.glade.h:69
+#: ../ui/search-dialog.glade.h:71
 msgid "Open a dialog to select modules to add to the list"
 msgstr "Sélectionne les modules à ajouter à la liste"
 
-#: ../ui/search-dialog.glade.h:70
+#: ../ui/search-dialog.glade.h:72
 msgid "Optimized (\"Lucene\")"
 msgstr "Optimisée Lucene"
 
-#: ../ui/search-dialog.glade.h:71
+#: ../ui/search-dialog.glade.h:73
 msgid "Optimized (\"Lucene\") radiobutton"
 msgstr "Bouton radio Optimisée Lucene"
 
-#: ../ui/search-dialog.glade.h:72
+#: ../ui/search-dialog.glade.h:74
 msgid "Range Definition Entry"
 msgstr "Entrée Limites de la plage"
 
-#: ../ui/search-dialog.glade.h:73
+#: ../ui/search-dialog.glade.h:75
 msgid "Range Name Entry"
 msgstr "Entrée Nom de la plage"
 
-#: ../ui/search-dialog.glade.h:75
+#: ../ui/search-dialog.glade.h:77
 msgid "Regular expression radiobutton"
 msgstr "Bouton radio Expression rationnelle"
 
-#: ../ui/search-dialog.glade.h:76
+#: ../ui/search-dialog.glade.h:78
 msgid "Remove the selected module from the list"
 msgstr "Supprime le module sélectionné de la liste"
 
-#: ../ui/search-dialog.glade.h:77
+#: ../ui/search-dialog.glade.h:79
 msgid "Result Summary Table"
 msgstr "Table Récapitulatif des résultats"
 
-#: ../ui/search-dialog.glade.h:78
+#: ../ui/search-dialog.glade.h:80
 msgid "Result Summary Window"
 msgstr "Fenêtre Récapitulatif des résultats"
 
-#: ../ui/search-dialog.glade.h:79
+#: ../ui/search-dialog.glade.h:81
 msgid "Results"
 msgstr "Résultats"
 
-#: ../ui/search-dialog.glade.h:80
+#: ../ui/search-dialog.glade.h:82
 msgid "Save Custom Module List Button"
 msgstr "Bouton Enregistrer la liste de modules"
 
-#: ../ui/search-dialog.glade.h:81
+#: ../ui/search-dialog.glade.h:83
 msgid "Save Range Button"
 msgstr "Bouton Enregistrer plage personnalisée"
 
-#: ../ui/search-dialog.glade.h:82
+#: ../ui/search-dialog.glade.h:84
 msgid "Save custom range"
 msgstr "Enregistre la plage de versets"
 
-#: ../ui/search-dialog.glade.h:83
+#: ../ui/search-dialog.glade.h:85
 msgid "Save search results as bookmarks"
 msgstr "Enregistre les résultats de la recherche comme signets"
 
-#: ../ui/search-dialog.glade.h:84
+#: ../ui/search-dialog.glade.h:86
 msgid "Save the module list"
 msgstr "Enregistre la liste de modules"
 
-#: ../ui/search-dialog.glade.h:85
+#: ../ui/search-dialog.glade.h:87
 msgid "Search  Criteria"
 msgstr "Critères"
 
-#: ../ui/search-dialog.glade.h:86
+#: ../ui/search-dialog.glade.h:88
 msgid "Search Criteria Treeview"
 msgstr "Arborescence Critères de recherche"
 
-#: ../ui/search-dialog.glade.h:87
+#: ../ui/search-dialog.glade.h:89
 msgid "Search entire module"
 msgstr "La requête s'exécute sur tous les versets"
 
-#: ../ui/search-dialog.glade.h:88
+#: ../ui/search-dialog.glade.h:90
 msgid "Search for Morphological tags"
 msgstr "Recherche d'étiquettes morphologiques"
 
-#: ../ui/search-dialog.glade.h:89
+#: ../ui/search-dialog.glade.h:91
 msgid "Search for Strongs Numbers like G4442 or H1121"
 msgstr "Recherche de nombres de Strong de type G4442 ou H1121"
 
-#: ../ui/search-dialog.glade.h:90
+#: ../ui/search-dialog.glade.h:92
 msgid "Search in footnotes"
 msgstr "Recherche de notes de bas de page"
 
-#: ../ui/search-dialog.glade.h:91
+#: ../ui/search-dialog.glade.h:93
 msgid "Show Footnotes"
 msgstr "Avec notes de bas de page"
 
-#: ../ui/search-dialog.glade.h:92
+#: ../ui/search-dialog.glade.h:94
 msgid "Show Footnotes checkbox"
 msgstr "Case à cocher Afficher les notes de bas de page"
 
-#: ../ui/search-dialog.glade.h:93
+#: ../ui/search-dialog.glade.h:95
 msgid "Show Morphological Tags"
 msgstr "Avec étiquettes morphologiques"
 
-#: ../ui/search-dialog.glade.h:94
+#: ../ui/search-dialog.glade.h:96
 msgid "Show Morphological Tags checkbox"
 msgstr "Case à cocher Afficher les étiquettes morphologiques"
 
-#: ../ui/search-dialog.glade.h:95
+#: ../ui/search-dialog.glade.h:97
 msgid "Show Strong's Numbers"
 msgstr "Avec nombres de Strong"
 
-#: ../ui/search-dialog.glade.h:96
+#: ../ui/search-dialog.glade.h:98
 msgid "Show Strong's Numbers checkbox"
 msgstr "Case à cocher Afficher les nombres de Strong"
 
-#: ../ui/search-dialog.glade.h:97
+#: ../ui/search-dialog.glade.h:99
 msgid "Show in main window"
 msgstr "Affiche le résultat dans la fenêtre principale"
 
-#: ../ui/search-dialog.glade.h:98
+#: ../ui/search-dialog.glade.h:100
 msgid "Single module"
 msgstr "Module unique"
 
-#: ../ui/search-dialog.glade.h:99
+#: ../ui/search-dialog.glade.h:101
 msgid "Single module radiobutton"
 msgstr "Bouton radio Module unique"
 
-#: ../ui/search-dialog.glade.h:100
+#: ../ui/search-dialog.glade.h:102
 msgid "Start/stop searching"
 msgstr "Démarre/stoppe la requête"
 
-#: ../ui/search-dialog.glade.h:101
+#: ../ui/search-dialog.glade.h:103
 msgid "Strongs Numbers"
 msgstr "Nombres de Strong"
 
-#: ../ui/search-dialog.glade.h:102
+#: ../ui/search-dialog.glade.h:104
 msgid "Strongs Numbers radiobutton"
 msgstr "Bouton radio Nombres de Strong"
 
-#: ../ui/search-dialog.glade.h:103
+#: ../ui/search-dialog.glade.h:105
 msgid "Use a custom module list for the search"
 msgstr "La requête s'exécute dans une liste de modules prédéfinie"
 
-#: ../ui/search-dialog.glade.h:104
+#: ../ui/search-dialog.glade.h:106
 msgid "Use a custom range for the scope of the search"
 msgstr "La requête s'exécute sur une plage prédéfinie de versets"
 
-#: ../ui/search-dialog.glade.h:105
+#: ../ui/search-dialog.glade.h:107
 msgid "Use a single module for the search"
 msgstr "La requête s'exécute sur  un seul module"
 
-#: ../ui/search-dialog.glade.h:106
+#: ../ui/search-dialog.glade.h:108
 msgid "Use the current module list for the search"
 msgstr "La requête s'exécute sur plusieurs modules"
 
-#: ../ui/search-dialog.glade.h:107
+#: ../ui/search-dialog.glade.h:109
 msgid "Use the results of the last search as the scope of the search"
 msgstr ""
 "La requête s'exécute uniquement sur les versets retournés lors de la requête "
 "précédente"
 
-#: ../ui/search-dialog.glade.h:108
+#: ../ui/search-dialog.glade.h:110
 msgid "e.g. Matt-John;Rev4"
 msgstr "ex Mat-Jean; Ap4"
 
-#: ../ui/search-dialog.glade.h:109
+#: ../ui/search-dialog.glade.h:111
 msgid "for "
-msgstr "Expression"
+msgstr "Expression "
 
 #: ../ui/xi-menus.glade.h:2
 msgid "About _Translation"
@@ -3154,296 +3204,388 @@ msgid "About _Xiphos"
 msgstr "À propos de Xiphos"
 
 #: ../ui/xi-menus.glade.h:4
+msgid "Add Item"
+msgstr "Ajouter un élément"
+
+#: ../ui/xi-menus.glade.h:5
+msgid "Add Sub-Item"
+msgstr "Ajouter un sous-élément"
+
+#: ../ui/xi-menus.glade.h:6
+msgid "Add a sub-item"
+msgstr "Ajoute un sous-élément"
+
+#: ../ui/xi-menus.glade.h:7
+msgid "Add an item"
+msgstr "Ajouter un élément"
+
+#: ../ui/xi-menus.glade.h:8
 msgid "Add new folder to selected folder"
 msgstr "Ajoute un nouveau dossier au dossier sélectionné"
 
-#: ../ui/xi-menus.glade.h:6
+#: ../ui/xi-menus.glade.h:10
 msgid "Allow Reordering"
 msgstr "Déplacer les signets"
 
-#: ../ui/xi-menus.glade.h:7
+#: ../ui/xi-menus.glade.h:11
 msgid "Allow items to be moved from one folder to another"
 msgstr "Active/désactive le déplacement des éléments"
 
-#: ../ui/xi-menus.glade.h:9
+#: ../ui/xi-menus.glade.h:12
+msgid "Annotate Verse"
+msgstr "Annoter un verset"
+
+#: ../ui/xi-menus.glade.h:14
+msgid "Browse in BibleMap.org"
+msgstr "Consulter la carte sur BibleMap.org"
+
+#: ../ui/xi-menus.glade.h:15
 msgid "Collapse All"
 msgstr "Réduire tout"
 
-#: ../ui/xi-menus.glade.h:10
+#: ../ui/xi-menus.glade.h:16
 msgid "Collapse all Bookmarks groups"
 msgstr "Réduit tous les groupes de signets"
 
-#: ../ui/xi-menus.glade.h:11
+#: ../ui/xi-menus.glade.h:17
 msgid "Commentary by Chapter"
 msgstr "Commentaire par chapitre"
 
-#: ../ui/xi-menus.glade.h:13
+#: ../ui/xi-menus.glade.h:19
+msgid "Create a new daily journal"
+msgstr "Crée un nouveau journal quotidien"
+
+#: ../ui/xi-menus.glade.h:20
+msgid "Create a new monthly journal"
+msgstr "Crée un nouveau journal mensuel"
+
+#: ../ui/xi-menus.glade.h:21
+msgid "Create a new outlined topic"
+msgstr "Crée un nouveau sujet structuré"
+
+#: ../ui/xi-menus.glade.h:22
+msgid "Create a new simple prayer list"
+msgstr "Crée une nouvelle liste de prières"
+
+#: ../ui/xi-menus.glade.h:23
+msgid "Create a new subject prayer list"
+msgstr "Crée un nouveau sujet liste de prières"
+
+#: ../ui/xi-menus.glade.h:24
 msgid "D_ouble-Space Text"
 msgstr "D_ouble espacement du texte"
 
-#: ../ui/xi-menus.glade.h:14
+#: ../ui/xi-menus.glade.h:25
+msgid "Daily"
+msgstr "Quotidien"
+
+#: ../ui/xi-menus.glade.h:26
 msgid "Delete Item"
 msgstr "Supprimer l'élément"
 
-#: ../ui/xi-menus.glade.h:15
+#: ../ui/xi-menus.glade.h:27
 msgid "Delete item"
 msgstr "Supprime l'élément sélectionné"
 
-#: ../ui/xi-menus.glade.h:16
-msgid "Dictionary/_Lexicon"
-msgstr "Dictionnaire/Lexique"
+#: ../ui/xi-menus.glade.h:28
+msgid "Dictionar_y"
+msgstr "Dictionnaire"
 
-#: ../ui/xi-menus.glade.h:17
+#: ../ui/xi-menus.glade.h:29
 msgid "Display Book Heading"
 msgstr "Affiche l'entête du livre"
 
-#: ../ui/xi-menus.glade.h:18
+#: ../ui/xi-menus.glade.h:30
 msgid "Display Chapter Heading"
 msgstr "Affiche l'entête du chapitre"
 
-#: ../ui/xi-menus.glade.h:19
+#: ../ui/xi-menus.glade.h:31
 msgid "Dump Pers.Comm."
 msgstr "Liste des versets commentés"
 
-#: ../ui/xi-menus.glade.h:21
+#: ../ui/xi-menus.glade.h:33
 msgid "Edit bookmark item"
 msgstr "Édite ce signet"
 
-#: ../ui/xi-menus.glade.h:22
+#: ../ui/xi-menus.glade.h:34
+msgid "Edit this item"
+msgstr "Éditer cet élément"
+
+#: ../ui/xi-menus.glade.h:35
 msgid "Expand All"
 msgstr "Développer tout"
 
-#: ../ui/xi-menus.glade.h:23
+#: ../ui/xi-menus.glade.h:36
 msgid "Expand all Bookmarks groups"
 msgstr "Développe tous les groupes de signets"
 
-#: ../ui/xi-menus.glade.h:30
+#: ../ui/xi-menus.glade.h:37
+msgid "Export Folder"
+msgstr "Exporter le dossier"
+
+#: ../ui/xi-menus.glade.h:38
+msgid "Export List"
+msgstr "Exporter la liste"
+
+#: ../ui/xi-menus.glade.h:45
 msgid "Image Content"
 msgstr "Afficher les images"
 
-#: ../ui/xi-menus.glade.h:31
+#: ../ui/xi-menus.glade.h:46
 msgid "Import Bibletime Bookmarks"
 msgstr "Importer les signets de Bibletime"
 
-#: ../ui/xi-menus.glade.h:32
+#: ../ui/xi-menus.glade.h:47
 msgid "Insert Bookmark"
 msgstr "Insérer un signet"
 
-#: ../ui/xi-menus.glade.h:33
+#: ../ui/xi-menus.glade.h:48
 msgid "Insert new bookmark here"
 msgstr "Insère un nouveau signet dans le dossier sélectionné"
 
-#: ../ui/xi-menus.glade.h:34
+#: ../ui/xi-menus.glade.h:49
 msgid "L_ink Tabs"
 msgstr "Onglets liés"
 
-#: ../ui/xi-menus.glade.h:36
+#: ../ui/xi-menus.glade.h:51
 msgid "Load Bookmarks from Bibletime"
 msgstr "Charge les signets de Bibletime"
 
-#: ../ui/xi-menus.glade.h:37
+#: ../ui/xi-menus.glade.h:52
 msgid "Lookup Selection"
 msgstr "Définition du mot sélectionné"
 
-#: ../ui/xi-menus.glade.h:41
+#: ../ui/xi-menus.glade.h:54
+msgid "Monthly"
+msgstr "Journal mensuel"
+
+#: ../ui/xi-menus.glade.h:57
 msgid "Note"
 msgstr "Note"
 
-#: ../ui/xi-menus.glade.h:42
+#: ../ui/xi-menus.glade.h:58
 msgid "Open Module"
 msgstr "Ouvrir le module"
 
-#: ../ui/xi-menus.glade.h:43
+#: ../ui/xi-menus.glade.h:59
 msgid "Open Study_pad"
 msgstr "Ouvrir le bloc-notes"
 
-#: ../ui/xi-menus.glade.h:44
+#: ../ui/xi-menus.glade.h:60
 msgid "Open in a dialog"
 msgstr "Ouvrir dans une fenêtre"
 
-#: ../ui/xi-menus.glade.h:46
+#: ../ui/xi-menus.glade.h:61
+msgid "Open in a separate window"
+msgstr "Ouvrir dans une fenêtre séparée"
+
+#: ../ui/xi-menus.glade.h:62
+msgid "Open in editor"
+msgstr "Ouvrir dans l'éditeur"
+
+#: ../ui/xi-menus.glade.h:63
 msgid "Open in new tab"
 msgstr "Ouvrir dans un nouvel onglet"
 
-#: ../ui/xi-menus.glade.h:47
+#: ../ui/xi-menus.glade.h:64
+msgid ""
+"Open selected module in a\n"
+"\tseparate ['dialog'] window"
+msgstr ""
+"Ouvrir le module sélectionné dans une\n"
+"nouvelle fenêtre ['dialog']"
+
+#: ../ui/xi-menus.glade.h:66
+msgid "Open selected module in a new tab"
+msgstr "Ouvrir le module sélectionné dans un nouvel onglet"
+
+#: ../ui/xi-menus.glade.h:67
 msgid "Open this bookmark in a dialog"
 msgstr "Ouvre le signet dans une nouvelle fenêtre"
 
-#: ../ui/xi-menus.glade.h:48
+#: ../ui/xi-menus.glade.h:68
 msgid "Open this bookmark in a new tab"
 msgstr "Ouvre ce signet dans un nouvel onglet"
 
-#: ../ui/xi-menus.glade.h:50
+#: ../ui/xi-menus.glade.h:69
+msgid "Outlined"
+msgstr "Structuré"
+
+#: ../ui/xi-menus.glade.h:71
 msgid "Read Selection Aloud"
 msgstr "Synthèse vocale du texte sélectionné"
 
-#: ../ui/xi-menus.glade.h:51
-msgid "Remove - Restore"
-msgstr "Charger - Sauver"
-
-#: ../ui/xi-menus.glade.h:52
-msgid "Remove Folder"
-msgstr "Supprimer le dossier"
-
-#: ../ui/xi-menus.glade.h:53
+#: ../ui/xi-menus.glade.h:73
 msgid "Remove folder and save it"
-msgstr "Sauve et supprime le dossier"
+msgstr "Supprimer le dossier et le sauvegarder"
 
-#: ../ui/xi-menus.glade.h:54
+#: ../ui/xi-menus.glade.h:74
+msgid "Remove this item"
+msgstr "Supprimer cet élément :"
+
+#: ../ui/xi-menus.glade.h:75
 msgid "Rename Pers.Comm."
 msgstr "Renommer ce commentaire"
 
-#: ../ui/xi-menus.glade.h:55
+#: ../ui/xi-menus.glade.h:76
 msgid "Respect Font Faces"
 msgstr "Respect des polices"
 
-#: ../ui/xi-menus.glade.h:56
+#: ../ui/xi-menus.glade.h:77
 msgid "Restore Folder"
 msgstr "Restaurer le dossier"
 
-#: ../ui/xi-menus.glade.h:57
+#: ../ui/xi-menus.glade.h:78
 msgid "Restore saved folder"
 msgstr "Restaure un dossier sauvegardé"
 
-#: ../ui/xi-menus.glade.h:58
+#: ../ui/xi-menus.glade.h:79
 msgid "Save list as a series of bookmarks"
 msgstr "Enregistre la liste dans une série de signets"
 
-#: ../ui/xi-menus.glade.h:59
+#: ../ui/xi-menus.glade.h:80
 msgid "Save list as a single bookmark"
 msgstr "Enregistre la liste sous un seul signet"
 
-#: ../ui/xi-menus.glade.h:60
+#: ../ui/xi-menus.glade.h:81
 msgid "Save these results as a series of bookmarks in their own folder"
 msgstr ""
 "Enregistre ces résultats sous une série de signets dans leur propre dossier"
 
-#: ../ui/xi-menus.glade.h:61
+#: ../ui/xi-menus.glade.h:82
 msgid "Save these results as a single bookmark"
 msgstr "Enregistre ces résultats sous un seul signet"
 
-#: ../ui/xi-menus.glade.h:62
+#: ../ui/xi-menus.glade.h:83
 msgid "Scripture Cross-references"
 msgstr "Références croisées de l'Écriture"
 
-#: ../ui/xi-menus.glade.h:64
+#: ../ui/xi-menus.glade.h:85
 msgid "Show Parallel View in a _Tab"
 msgstr "Vue parallèle dans un ongle_t"
 
-#: ../ui/xi-menus.glade.h:65
+#: ../ui/xi-menus.glade.h:86
 msgid "Show Previe_wer in the Sidebar"
 msgstr "Aperçu dans le volet _latéral"
 
-#: ../ui/xi-menus.glade.h:66
+#: ../ui/xi-menus.glade.h:87
 msgid "Show Verse _Numbers"
 msgstr "Affiche les numéros de verset"
 
-#: ../ui/xi-menus.glade.h:69
+#: ../ui/xi-menus.glade.h:88
+msgid "Simple"
+msgstr "Liste simple"
+
+#: ../ui/xi-menus.glade.h:90
+msgid "Subject"
+msgstr "Liste ordonnée par sujet"
+
+#: ../ui/xi-menus.glade.h:92
 msgid "Unlock This Module"
 msgstr "Déverrouiller ce module"
 
 # src/gs_preferences_dlg.c
-#: ../ui/xi-menus.glade.h:70
+#: ../ui/xi-menus.glade.h:93
 msgid "Use Current Dictionary"
 msgstr "Utiliser le dictionnaire en cours"
 
-#: ../ui/xi-menus.glade.h:71
+#: ../ui/xi-menus.glade.h:94
 msgid "Use module manager to install and remove Sword modules"
 msgstr "Installe ou supprime des modules du Projet SWORD"
 
-#: ../ui/xi-menus.glade.h:72
+#: ../ui/xi-menus.glade.h:95
 msgid "Variants"
 msgstr "Variantes"
 
-#: ../ui/xi-menus.glade.h:74
+#: ../ui/xi-menus.glade.h:97
 msgid "_About The SWORD Project"
 msgstr "_À propos du Projet SWORD"
 
-#: ../ui/xi-menus.glade.h:75
+#: ../ui/xi-menus.glade.h:98
 msgid "_Advanced Search"
 msgstr "Recherche avancée.."
 
-#: ../ui/xi-menus.glade.h:76
+#: ../ui/xi-menus.glade.h:99
 msgid "_Attach/Detach Sidebar"
 msgstr "Attacher/Détacher le volet latéral"
 
-#: ../ui/xi-menus.glade.h:77
-msgid "_Bible Text"
+#: ../ui/xi-menus.glade.h:100
+msgid "_Bible"
 msgstr "Texte _biblique"
 
-#: ../ui/xi-menus.glade.h:78
-msgid "_Commentary"
-msgstr "Commentaire"
+#: ../ui/xi-menus.glade.h:101
+msgid "_Commentary/Book"
+msgstr "_Commentaire/Livre"
 
-#: ../ui/xi-menus.glade.h:79
+#: ../ui/xi-menus.glade.h:102
 msgid "_Contents"
 msgstr "Sommaire"
 
-#: ../ui/xi-menus.glade.h:80
+#: ../ui/xi-menus.glade.h:103
 msgid "_Daily Devotion"
 msgstr "Calendrier biblique"
 
-#: ../ui/xi-menus.glade.h:81
+#: ../ui/xi-menus.glade.h:104
 msgid "_Edit"
 msgstr "_Édition"
 
-#: ../ui/xi-menus.glade.h:82
+#: ../ui/xi-menus.glade.h:105
 msgid "_Edit Item"
 msgstr "Éditer l'élément"
 
-#: ../ui/xi-menus.glade.h:84
+#: ../ui/xi-menus.glade.h:107
 msgid "_Help"
 msgstr "_Aide"
 
-#: ../ui/xi-menus.glade.h:85
+#: ../ui/xi-menus.glade.h:108
 msgid "_Highlight Current Verse"
 msgstr "_Verset en cours surligné"
 
-#: ../ui/xi-menus.glade.h:86
+#: ../ui/xi-menus.glade.h:109
 msgid "_Live Chat"
 msgstr "Chat en _ligne"
 
-#: ../ui/xi-menus.glade.h:87
+#: ../ui/xi-menus.glade.h:110
 msgid "_Mailing List"
 msgstr "Liste de diffusion"
 
-#: ../ui/xi-menus.glade.h:88
+#: ../ui/xi-menus.glade.h:111
 msgid "_Module Manager"
 msgstr "Gérer les modules"
 
-#: ../ui/xi-menus.glade.h:89
+#: ../ui/xi-menus.glade.h:112
 msgid "_Open Session"
 msgstr "Ouvrir une session"
 
-#: ../ui/xi-menus.glade.h:90
+#: ../ui/xi-menus.glade.h:113
 msgid "_Preferences"
 msgstr "_Préférences"
 
-#: ../ui/xi-menus.glade.h:91
+#: ../ui/xi-menus.glade.h:114
 msgid "_Preview"
 msgstr "_Aperçu"
 
-#: ../ui/xi-menus.glade.h:92
+#: ../ui/xi-menus.glade.h:115
 msgid "_Read Aloud"
 msgstr "Synthèse vocale"
 
-#: ../ui/xi-menus.glade.h:93
+#: ../ui/xi-menus.glade.h:116
 msgid "_Report Bug"
 msgstr "_Signaler un bogue"
 
-#: ../ui/xi-menus.glade.h:94
+#: ../ui/xi-menus.glade.h:117
 msgid "_Save Session"
 msgstr "Enregistrer la session"
 
-#: ../ui/xi-menus.glade.h:95
+#: ../ui/xi-menus.glade.h:118
 msgid "_Search"
 msgstr "_Rechercher"
 
-#: ../ui/xi-menus.glade.h:96
-msgid "_Show/Hide Sidebar"
-msgstr "Afficher/Cacher le volet latéral"
+#: ../ui/xi-menus.glade.h:119
+msgid "_Show/Hide Attached Sidebar"
+msgstr "_Afficher/Cacher le volet latéral"
 
-#: ../ui/xi-menus.glade.h:97
+#: ../ui/xi-menus.glade.h:120
 msgid "_Verse Per Line"
 msgstr "_Verset par ligne"
 
@@ -3455,6 +3597,104 @@ msgstr "Aide à l'étude de la Bible"
 msgid "Xiphos Bible Guide"
 msgstr "Guide de la Bible Xiphos"
 
+#~ msgid "Open in a new tab"
+#~ msgstr "Ouvrir dans un nouvel onglet"
+
+#~ msgid "View information about the selected dialog"
+#~ msgstr "Information à propos du module sélectionné"
+
+#~ msgid "Create a new prayer list"
+#~ msgstr "Crée une nouvelle liste de prières"
+
+#~ msgid "Daily Journal"
+#~ msgstr "Journal quotidien"
+
+#~ msgid "Outlined Topic"
+#~ msgstr "Note structurée"
+
+#~ msgid "Open selected module in a dialog"
+#~ msgstr "Ouvrir le module sélectionné dans une nouvelle fenêtre"
+
+#~ msgid "Add Child"
+#~ msgstr "Ajouter un sous-sujet"
+
+#~ msgid "Add Sibling"
+#~ msgstr "Ajouter un élément"
+
+#~ msgid "H_istory/<Separator>"
+#~ msgstr "H_istorique/<Separator>"
+
+#~ msgid "H_istory/C_lear"
+#~ msgstr "H_istorique/_Effacer"
+
+#~ msgid "Text"
+#~ msgstr "Texte"
+
+#~ msgid "Text to render"
+#~ msgstr "Texte à reproduire"
+
+#~ msgid "Pixbuf Object"
+#~ msgstr "Objet pixbuf"
+
+#~ msgid "The pixbuf to render."
+#~ msgstr "Le pixbuf à restituer"
+
+#~ msgid "Xiphos could not execute archiver"
+#~ msgstr "Xiphos n'a pas pu démarrer l'archivage"
+
+#~ msgid ""
+#~ " archival result:\n"
+#~ "\n"
+#~ msgstr ""
+#~ " résultat de l'archivage\n"
+#~ "\n"
+
+#~ msgid "Remove - Restore"
+#~ msgstr "Charger - Sauver"
+
+#~ msgid "Remove Folder"
+#~ msgstr "Supprimer le dossier"
+
+#~ msgid "Sources"
+#~ msgstr "Dépôts"
+
+#~ msgid "Xiphos has renamed .xiphos-2.0 to .xiphos"
+#~ msgstr "Le répertoire ~/.xiphos-2.0 a été renommé en ~/.xiphos"
+
+#~ msgid ""
+#~ "Xiphos can not rename  .xiphos-2.0 to .xiphos:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Xiphos cannot continue."
+#~ msgstr ""
+#~ "Xiphos n'a pas pu renommer ~/.xiphos-2.0 en ~/.xiphos\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Xiphos ne peut s'exécuter normalement."
+
+#~ msgid "Move backwards through history"
+#~ msgstr "Verset précédent dans l'historique"
+
+#~ msgid "Move foward through history"
+#~ msgstr "Verset suivant dans l'historique"
+
+#~ msgid "Select a Book of the Bible"
+#~ msgstr "Change de livre"
+
+#~ msgid "Change Chapter"
+#~ msgstr "Change de chapitre"
+
+#~ msgid "Enter a Verse reference in Book 1:1 format and press Return"
+#~ msgstr ""
+#~ "Saisir un verset au format <livre> <chapitre>:<verset>(ex: Jn 3:16) puis "
+#~ "valider par appui sur la touche Entrée"
+
+#~ msgid "Dictionary/_Lexicon"
+#~ msgstr "Dictionnaire/Lexique"
+
+#~ msgid "_Bible Text"
+#~ msgstr "Texte _biblique"
+
 #~ msgid "Open StudyPad File"
 #~ msgstr "Ouvrir"
 
@@ -3591,9 +3831,6 @@ msgstr "Guide de la Bible Xiphos"
 #~ msgid "\\par\\par My prayer list \\par\\par Module created in Xiphos"
 #~ msgstr "\\par\\par Liste simple\\par\\par Module crée par Xiphos"
 
-#~ msgid "Delete Index"
-#~ msgstr "Suppr. Index"
-
 #~ msgid "+5"
 #~ msgstr "+5"
 
diff --git a/po/he_IL.po b/po/he_IL.po
index 5b48ea4..8c545aa 100644
--- a/po/he_IL.po
+++ b/po/he_IL.po
@@ -9,345 +9,350 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Xiphos 2.3.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-07 14:58-0400\n"
-"PO-Revision-Date: 2009-08-07 20:22+0100\n"
-"Last-Translator: Yotam Benshalom <benshalom@gmail.com>\n"
+"POT-Creation-Date: 2009-12-14 23:45+0000\n"
+"PO-Revision-Date: 2009-12-17 10:02+0000\n"
+"Last-Translator: Ddorda <d.dorda@gmail.com>\n"
 "Language-Team: Xiphos Translation Team\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Hebrew\n"
+"X-Launchpad-Export-Date: 2009-12-18 04:37+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: ISRAEL\n"
+"X-Poedit-Language: Hebrew\n"
 
-#: ../src/backend/sword_main.cc:1153
+#: ../src/backend/sword_main.cc:1083
 msgid "Configuration not found"
 msgstr "מידע מרוחק לא נמצא"
 
-#: ../src/editor/bonobo-editor.c:252
-#: ../src/editor/slib-editor.c:228
-#: ../src/gnome2/html.c:633
+#: ../src/editor/bonobo-editor.c:254 ../src/editor/slib-editor.c:234
+#: ../src/gnome2/html.c:637
 #, c-format
 msgid "Page %d of %d"
 msgstr "עמוד %d מתוך %d"
 
-#: ../src/editor/bonobo-editor.c:351
+#: ../src/editor/bonobo-editor.c:353 ../src/editor/slib-editor.c:659
 msgid "Are you sure you want to delete the note for"
 msgstr "האם ברצונך למחוק את ההערה על"
 
-#: ../src/editor/bonobo-editor.c:963
-#: ../src/editor/bonobo-editor.c:996
-#: ../src/editor/slib-editor.c:1161
-#: ../src/editor/slib-editor.c:1198
+#: ../src/editor/bonobo-editor.c:965 ../src/editor/bonobo-editor.c:998
+#: ../src/editor/slib-editor.c:1308 ../src/editor/slib-editor.c:1345
 msgid "Save the changes to document"
 msgstr "שמור את השינויים במסמך"
 
-#: ../src/editor/bonobo-editor.c:964
-#: ../src/editor/bonobo-editor.c:997
-#: ../src/editor/slib-editor.c:1162
-#: ../src/editor/slib-editor.c:1199
+#: ../src/editor/bonobo-editor.c:966 ../src/editor/bonobo-editor.c:999
+#: ../src/editor/slib-editor.c:1309 ../src/editor/slib-editor.c:1346
 msgid "before closing?"
 msgstr "לפני הסגירה?"
 
-#: ../src/editor/bonobo-editor.c:971
-#: ../src/editor/bonobo-editor.c:1004
-#: ../src/editor/slib-editor.c:1169
-#: ../src/editor/slib-editor.c:1206
+#: ../src/editor/bonobo-editor.c:973 ../src/editor/bonobo-editor.c:1006
+#: ../src/editor/slib-editor.c:1316 ../src/editor/slib-editor.c:1353
 msgid "If you don't save, changes will be permanently lost."
 msgstr "ללא שמירה, השינויים יאבדו לעד."
 
-#: ../src/editor/bonobo-editor.c:995
-#: ../src/editor/slib-editor.c:1197
-#: ../ui/xi-menus.glade.h:26
+#: ../src/editor/bonobo-editor.c:997 ../src/editor/slib-editor.c:1344
+#: ../ui/xi-menus.glade.h:39
 msgid "File"
 msgstr "קובץ"
 
-#: ../src/editor/bonobo-editor.c:1222
-#: ../src/editor/slib-editor.c:1254
+#: ../src/editor/bonobo-editor.c:1224 ../src/editor/slib-editor.c:1401
 msgid "StudyPad"
 msgstr "שולחן מחקר"
 
-#: ../src/editor/bonobo-editor.c:1235
-#: ../src/editor/slib-editor.c:1268
+#: ../src/editor/bonobo-editor.c:1237 ../src/editor/slib-editor.c:1415
 msgid "Note Editor"
 msgstr "עורך הערות"
 
-#: ../src/editor/bonobo-editor.c:1244
-#: ../src/editor/slib-editor.c:1282
+#: ../src/editor/bonobo-editor.c:1246 ../src/editor/slib-editor.c:1429
 msgid "Prayer List/Journal Editor"
 msgstr "עורך יומן\\רשימת תפילות"
 
-#: ../src/editor/slib-editor.c:382
-#: ../src/editor/slib-editor.c:429
+#: ../src/editor/slib-editor.c:401 ../src/editor/slib-editor.c:448
 msgid "Save As"
 msgstr "שמור רשימה"
 
-#: ../src/editor/slib-editor.c:400
-#: ../src/editor/slib-editor.c:447
+#: ../src/editor/slib-editor.c:419 ../src/editor/slib-editor.c:466
+#: ../src/editor/slib-editor.c:634
 msgid "Untitled document"
 msgstr "הדפס מסמך"
 
-#: ../src/editor/slib-editor.c:612
+#: ../src/editor/slib-editor.c:702
 msgid "HTML Output"
 msgstr "פלט HTML"
 
-#: ../src/editor/slib-editor.c:619
+#: ../src/editor/slib-editor.c:709
 msgid "HTML Source"
 msgstr "מקור"
 
-#: ../src/editor/slib-editor.c:626
+#: ../src/editor/slib-editor.c:716
 msgid "Plain Source"
 msgstr "מקור"
 
-#: ../src/editor/slib-editor.c:633
-#: ../ui/editor_note.xml.h:15
+#: ../src/editor/slib-editor.c:726 ../ui/editor_note.xml.h:15
 #: ../ui/editor_studypad.xml.h:21
 msgid "_Print..."
 msgstr "הדפס..."
 
-#: ../src/editor/slib-editor.c:640
-#: ../ui/editor_note.xml.h:9
+#: ../src/editor/slib-editor.c:733 ../ui/editor_note.xml.h:9
 #: ../ui/editor_studypad.xml.h:14
 msgid "Print Pre_view"
 msgstr "תצוגה לפני הדפסה"
 
-#: ../src/editor/slib-editor.c:647
+#: ../src/editor/slib-editor.c:740
 msgid "_Quit"
 msgstr "עריכה"
 
-#: ../src/editor/slib-editor.c:654
+#: ../src/editor/slib-editor.c:747
 msgid "_Open"
 msgstr "פתח"
 
-#: ../src/editor/slib-editor.c:661
+#: ../src/editor/slib-editor.c:754
 msgid "_Save"
 msgstr "שמור"
 
-#: ../src/editor/slib-editor.c:668
+#: ../src/editor/slib-editor.c:761
 msgid "Save _As..."
 msgstr "שמור קובץ בשם..."
 
-#: ../src/editor/slib-editor.c:675
-#: ../ui/editor_note.xml.h:14
-#: ../ui/editor_studypad.xml.h:20
-#: ../ui/editor.xml.h:13
-#: ../ui/xi-menus.glade.h:85
+#: ../src/editor/slib-editor.c:767
+msgid "New"
+msgstr "חדש"
+
+#: ../src/editor/slib-editor.c:769
+msgid "Open new document"
+msgstr ""
+
+#: ../src/editor/slib-editor.c:773
+msgid "Delete"
+msgstr ""
+
+#: ../src/editor/slib-editor.c:775
+msgid "Delete current note"
+msgstr ""
+
+#: ../src/editor/slib-editor.c:780 ../ui/editor_note.xml.h:14
+#: ../ui/editor_studypad.xml.h:20 ../ui/editor.xml.h:13
+#: ../ui/xi-menus.glade.h:106
 msgid "_File"
-msgstr "קובץ"
+msgstr "_קובץ"
 
-#: ../src/editor/slib-editor.c:730
+#: ../src/editor/slib-editor.c:835
 msgid "HTML _Output"
-msgstr "פלט HTML"
+msgstr "_פלט HTML"
 
-#: ../src/editor/slib-editor.c:737
+#: ../src/editor/slib-editor.c:842
 msgid "_HTML Source"
-msgstr "מקור"
+msgstr "_מקור HTML"
 
-#: ../src/editor/slib-editor.c:744
+#: ../src/editor/slib-editor.c:849
 msgid "_Plain Source"
 msgstr "מקור"
 
-#: ../src/editor/slib-editor.c:751
-#: ../ui/xi-menus.glade.h:100
+#: ../src/editor/slib-editor.c:856 ../ui/xi-menus.glade.h:121
 msgid "_View"
-msgstr "תצוגה"
+msgstr "_תצוגה"
 
-#: ../src/editor/slib-editor.c:762
-#: ../ui/editor_note.xml.h:11
-#: ../ui/editor_studypad.xml.h:16
-#: ../ui/editor.xml.h:11
+#: ../src/editor/slib-editor.c:867 ../ui/editor_note.xml.h:11
+#: ../ui/editor_studypad.xml.h:16 ../ui/editor.xml.h:11
 msgid "Save"
-msgstr "שמור"
+msgstr "שמירה"
+
+#: ../src/editor/slib-editor.c:878 ../src/editor/slib-editor.c:885
+msgid "Insert Link"
+msgstr "הוספת קישור"
 
-#: ../src/gecko/gecko-html.cpp:178
-#: ../src/gnome2/html.c:161
+#: ../src/gecko/gecko-html.cpp:177 ../src/gnome2/html.c:165
 msgid "Unlock "
-msgstr "פתח"
+msgstr "פתח "
 
-#: ../src/gecko/gecko-print.c:171
+#: ../src/gecko/gecko-print.c:172
 msgid "Preparing to print"
 msgstr "מתכונן להתקנה"
 
-#: ../src/gecko/gecko-print.c:265
+#: ../src/gecko/gecko-print.c:266
 msgid "Printing is not supported on this printer"
 msgstr "המדפסת אינה תומכת בהדפסה"
 
-#: ../src/gecko/gecko-print.c:268
+#: ../src/gecko/gecko-print.c:269
 #, c-format
 msgid "Printer %s does not support PostScript printing."
 msgstr "המדפסת %s אינה תומכת בהדפסה."
 
-#: ../src/gecko/gecko-print.c:341
-#: ../src/gecko/gecko-print.c:369
+#: ../src/gecko/gecko-print.c:342 ../src/gecko/gecko-print.c:370
 msgid "Printing"
 msgstr "הדפס"
 
-#: ../src/gecko/gecko-print.c:371
+#: ../src/gecko/gecko-print.c:372
 msgid "Waiting to print"
 msgstr "מתכונן להתקנה"
 
-#: ../src/gecko/gecko-print.c:583
+#: ../src/gecko/gecko-print.c:584
 msgid "An error occurred while printing"
 msgstr "חלה שגיאה בעת ההדפסה"
 
-#: ../src/gecko/gecko-print.c:587
+#: ../src/gecko/gecko-print.c:588
 #, c-format
 msgid "It was not possible to print your document: %s"
 msgstr "הדפסת המסמך נכשלה: %s"
 
-#: ../src/gnome2/about_modules.c:189
+#: ../src/gnome2/about_modules.c:195
 msgid "About Sword Module"
 msgstr "אודות מודול SWORD"
 
-#: ../src/gnome2/about_modules.c:383
-#: ../src/gnome2/mod_mgr.c:204
+#: ../src/gnome2/about_modules.c:389 ../src/gnome2/mod_mgr.c:252
 msgid "The module has no About information."
 msgstr "למודול זה אין טקסט 'אודות'."
 
 #: ../src/gnome2/about_sword.c:88
-msgid "The SWORD Project is an effort to create an ever-expanding software package for research and study of God and His Word. The SWORD Project framework allows easy use and study of Bible texts, commentaries, lexicons, dictionaries, and other books. Many frontends are built using this framework. An installed set of books may be shared among all frontends using the framework."
-msgstr "מטרתו של פרויקט SWORD היא להפיק ולפתח חבילת תוכנה המוקדשת ללימוד דבר האל. תשתית כתבי הקודש של WORD מאפשרת גישה קלה לכתבי קודש, פירושים, לקסיקונים, מילונים וספרים אחרים. ממשקי משתמש רבים מתבססים על תשתית זו. ניתן לשתף ערכות של מודולים מותקנים בין כל סוגי הממשקים הללו."
+msgid ""
+"The SWORD Project is an effort to create an ever-expanding software package "
+"for research and study of God and His Word. The SWORD Project framework "
+"allows easy use and study of Bible texts, commentaries, lexicons, "
+"dictionaries, and other books. Many frontends are built using this "
+"framework. An installed set of books may be shared among all frontends using "
+"the framework."
+msgstr ""
+"מטרתו של פרויקט SWORD היא להפיק ולפתח חבילת תוכנה המוקדשת ללימוד דבר האל. "
+"תשתית כתבי הקודש של WORD מאפשרת גישה קלה לכתבי קודש, פירושים, לקסיקונים, "
+"מילונים וספרים אחרים. ממשקי משתמש רבים מתבססים על תשתית זו. ניתן לשתף ערכות "
+"של מודולים מותקנים בין כל סוגי הממשקים הללו."
 
 #: ../src/gnome2/about_sword.c:106
 msgid "About the SWORD Project"
 msgstr "אודות פרויקט SWORD"
 
-#: ../src/gnome2/about_sword.c:123
+#: ../src/gnome2/about_sword.c:124
 msgid "Sword Version"
 msgstr "גרסת SWORD"
 
-#: ../src/gnome2/about_sword.c:154
+#: ../src/gnome2/about_sword.c:155
 msgid "Books can be downloaded from the SWORD Project"
 msgstr "מודולים להורדה מפרויקט SWORD"
 
-#: ../src/gnome2/about_sword.c:160
+#: ../src/gnome2/about_sword.c:161
 msgid "The SWORD Project"
 msgstr "פרויקט SWORD"
 
 #: ../src/gnome2/about_trans.c:84
 msgid ""
-"Do you like using Xiphos to study the Bible? Would you like to see its display using your native language? You could translate Xiphos! \n"
+"Do you like using Xiphos to study the Bible? Would you like to see its "
+"display using your native language? You could translate Xiphos! \n"
 "\n"
-"We are always looking for contributions of new translations of Xiphos into other languages. If you are able to translate for us, please see the link below, contact us, and get involved with our efforts."
+"We are always looking for contributions of new translations of Xiphos into "
+"other languages. If you are able to translate for us, please see the link "
+"below, contact us, and get involved with our efforts."
 msgstr ""
-"האם אתם מרוצים מן השימוש ב-Xiphos ככלי עזר לחקר כתבי הקודש? הייתם רוצים שהתוכנה תתמוך בשפת אמכם? אתם יכולים לתרגם את Xiphos! \n"
+"האם אתם מרוצים מן השימוש ב-Xiphos ככלי עזר לחקר כתבי הקודש? הייתם רוצים "
+"שהתוכנה תתמוך בשפת אמכם? אתם יכולים לתרגם את Xiphos! \n"
 "\n"
-"אנו מעוניינים בתרגום הממשק של Xiphos לשפות נוספות. אם באפשרותכם לתרגם עבורנו, אנא צרו קשר דרך הקישור להלן ותנו כתף למלאכה."
+"אנו מעוניינים בתרגום הממשק של Xiphos לשפות נוספות. אם באפשרותכם לתרגם "
+"עבורנו, אנא צרו קשר דרך הקישור להלן ותנו כתף למלאכה."
 
 #: ../src/gnome2/about_trans.c:98
 msgid "About Xiphos Translation"
 msgstr "אודות תרגום Xiphos"
 
-#: ../src/gnome2/about_trans.c:139
+#: ../src/gnome2/about_trans.c:140
 msgid "See TRANSLATION-HOWTO in Xiphos source"
 msgstr "ראו TRANSLATION-HOWTO בקוד המקור של Xiphos"
 
-#: ../src/gnome2/about_trans.c:145
+#: ../src/gnome2/about_trans.c:146
 msgid "Xiphos development"
 msgstr "פיתוח Xiphos"
 
-#: ../src/gnome2/about_xiphos.c:132
+#: ../src/gnome2/about_xiphos.c:131
 msgid "Copyright 2000-2009 The Xiphos Development Team"
 msgstr "זכויות היוצרים (2000-2009) שמורות לצוות הפיתוח של Xiphos"
 
-#: ../src/gnome2/about_xiphos.c:135
+#: ../src/gnome2/about_xiphos.c:134
 msgid ""
 "(formerly known as GnomeSword)\n"
 "\n"
 "Powered by The SWORD Project.\n"
-"We would like to thank Troy Griffitts and all the other folks who have given us The SWORD Project."
+"We would like to thank Troy Griffitts and all the other folks who have given "
+"us The SWORD Project."
 msgstr ""
 "(לשעבר GnomeSword)\n"
 "\n"
 "בחסות פרויקט Sword.\n"
 "תודה לטרוי גריפיתס ולכל מי שהעניק לנו את פרוייקט SWORD."
 
-#: ../src/gnome2/bibletext_dialog.c:525
+#: ../src/gnome2/bibletext_dialog.c:358
 msgid "Go to "
-msgstr "לך אל"
+msgstr "לך אל "
 
 #. info->stock_icon = GTK_STOCK_OPEN;
-#: ../src/gnome2/bookmark_dialog.c:167
-#: ../src/gnome2/bookmarks_menu.c:471
-#: ../src/gnome2/bookmarks_menu.c:897
-#: ../src/gnome2/bookmarks_menu.c:995
-#: ../src/gnome2/bookmarks_treeview.c:131
-#: ../ui/editor_studypad.xml.h:2
-#: ../ui/xi-menus.glade.h:9
+#: ../src/gnome2/bookmark_dialog.c:171 ../src/gnome2/bookmarks_menu.c:358
+#: ../src/gnome2/bookmarks_menu.c:765 ../src/gnome2/bookmarks_menu.c:863
+#: ../src/gnome2/bookmarks_treeview.c:133 ../ui/editor_studypad.xml.h:2
+#: ../ui/xi-menus.glade.h:13
 msgid "Bookmark"
 msgstr "סימנייה"
 
-#: ../src/gnome2/bookmark_dialog.c:169
-#: ../src/gnome2/bookmarks_menu.c:997
-#: ../src/gnome2/bookmarks_treeview.c:132
+#: ../src/gnome2/bookmark_dialog.c:173 ../src/gnome2/bookmarks_menu.c:865
+#: ../src/gnome2/bookmarks_treeview.c:134
 msgid "Enter Folder Name"
 msgstr "הזן שם תיקייה"
 
-#: ../src/gnome2/bookmark_dialog.c:171
-#: ../src/gnome2/bookmarks_menu.c:999
+#: ../src/gnome2/bookmark_dialog.c:175 ../src/gnome2/bookmarks_menu.c:867
 msgid "Folder Name"
 msgstr "שם תיקייה"
 
-#: ../src/gnome2/bookmark_dialog.c:172
-#: ../src/gnome2/bookmarks_menu.c:1000
-#: ../src/gnome2/bookmarks_treeview.c:134
+#: ../src/gnome2/bookmark_dialog.c:176 ../src/gnome2/bookmarks_menu.c:868
+#: ../src/gnome2/bookmarks_treeview.c:136
 msgid "Folder: "
-msgstr "תיקייה:"
+msgstr "תיקייה: "
 
-#: ../src/gnome2/bookmarks_menu.c:457
-#: ../src/gnome2/treekey-editor.c:322
-#: ../ui/xi-menus.glade.h:22
+#: ../src/gnome2/bookmarks_menu.c:344 ../ui/xi-menus.glade.h:32
 msgid "Edit"
 msgstr "ערוך"
 
-#: ../src/gnome2/bookmarks_menu.c:474
+#: ../src/gnome2/bookmarks_menu.c:361
 msgid "Folder name: "
-msgstr "שם תיקייה:"
+msgstr "שם תיקייה: "
 
-#: ../src/gnome2/bookmarks_menu.c:477
+#: ../src/gnome2/bookmarks_menu.c:364
 msgid "Bookmark name: "
-msgstr "שם סימנייה:"
+msgstr "שם סימנייה: "
 
-#: ../src/gnome2/bookmarks_menu.c:480
-#: ../src/gnome2/bookmarks_menu.c:905
+#: ../src/gnome2/bookmarks_menu.c:367 ../src/gnome2/bookmarks_menu.c:773
 msgid "Verse: "
-msgstr "פסוק:"
+msgstr "פסוק: "
 
-#: ../src/gnome2/bookmarks_menu.c:481
-#: ../src/gnome2/bookmarks_menu.c:906
+#: ../src/gnome2/bookmarks_menu.c:368 ../src/gnome2/bookmarks_menu.c:774
 msgid "Module: "
-msgstr "מודול:"
+msgstr "מודול: "
 
-#: ../src/gnome2/bookmarks_menu.c:665
+#: ../src/gnome2/bookmarks_menu.c:533
 msgid "Restore Bookmark Folder"
 msgstr "לשחזר תיקיית הסימניות"
 
-#: ../src/gnome2/bookmarks_menu.c:734
+#: ../src/gnome2/bookmarks_menu.c:602
 msgid "Remove the selected folder"
 msgstr "להסיר התיקייה שנבחרה"
 
-#: ../src/gnome2/bookmarks_menu.c:736
+#: ../src/gnome2/bookmarks_menu.c:604
 msgid "(and all its contents)?"
 msgstr "על כל אשר בה?"
 
-#: ../src/gnome2/bookmarks_menu.c:739
+#: ../src/gnome2/bookmarks_menu.c:607
 msgid "Remove the selected bookmark"
 msgstr "הסר את הסימנייה שנבחרה"
 
-#: ../src/gnome2/bookmarks_menu.c:898
+#: ../src/gnome2/bookmarks_menu.c:766
 msgid "Add"
 msgstr "הוסף"
 
-#: ../src/gnome2/bookmarks_menu.c:904
+#: ../src/gnome2/bookmarks_menu.c:772
 msgid "Label: "
-msgstr "תווית:"
+msgstr "תווית: "
 
-#: ../src/gnome2/bookmarks_treeview.c:105
+#: ../src/gnome2/bookmarks_treeview.c:107
 #, c-format
 msgid "Search result: %s"
 msgstr "תוצאות החיפוש: %s"
 
-#: ../src/gnome2/bookmarks_treeview.c:934
-#: ../src/gnome2/sidebar.c:1459
+#: ../src/gnome2/bookmarks_treeview.c:943 ../src/gnome2/sidebar.c:1389
 msgid "Bookmarks"
 msgstr "סימניות"
 
@@ -361,109 +366,174 @@ msgstr "עבור:"
 
 #: ../src/gnome2/cipher_key_dialog.c:66
 msgid "Enter Cipher Key: "
-msgstr "נא להזין מפתח הצפנה:"
+msgstr "נא להזין מפתח הצפנה: "
 
-#: ../src/gnome2/dialog.c:241
+#: ../src/gnome2/dialog.c:265
 msgid "Close without Saving"
 msgstr "סגור ללא שמירה"
 
-#: ../src/gnome2/dialog.c:569
+#: ../src/gnome2/dialog.c:596
 msgid "Xiphos:"
 msgstr "Xiphos:"
 
-#: ../src/gnome2/dialog.c:670
+#: ../src/gnome2/dialog.c:697
 msgid "Close _without Saving"
 msgstr "סגור ללא שמירה"
 
-#: ../src/gnome2/export_dialog.c:265
-#: ../ui/export-dialog.glade.h:20
+#: ../src/gnome2/export_dialog.c:267 ../ui/export-dialog.glade.h:20
 msgid "Please check copyright before exporting!"
 msgstr "נא לבדוק זכויות יוצרים בטרם ייצוא!"
 
-#: ../src/gnome2/find_dialog.c:200
-#: ../src/gnome2/find_dialog.c:369
+#: ../src/gnome2/find_dialog.c:204 ../src/gnome2/find_dialog.c:373
 msgid "Find"
 msgstr "מצא"
 
-#: ../src/gnome2/find_dialog.c:218
+#: ../src/gnome2/find_dialog.c:222
 msgid "Enter Word or Phrase"
 msgstr "הזן מילה או ביטוי"
 
-#: ../src/gnome2/find_dialog.c:234
-#: ../src/gnome2/search_sidebar.c:303
-#: ../ui/search-dialog.glade.h:57
+#: ../src/gnome2/find_dialog.c:238 ../src/gnome2/search_sidebar.c:306
+#: ../ui/search-dialog.glade.h:59
 msgid "Match case"
 msgstr "התאם אותיות רישיות"
 
-#: ../src/gnome2/find_dialog.c:241
+#: ../src/gnome2/find_dialog.c:245
 msgid "Search backwards"
 msgstr "חפש אחורה"
 
-#: ../src/gnome2/find_dialog.c:250
-#: ../src/gnome2/search_sidebar.c:268
-#: ../ui/search-dialog.glade.h:74
+#: ../src/gnome2/find_dialog.c:254 ../src/gnome2/search_sidebar.c:271
+#: ../ui/search-dialog.glade.h:76
 msgid "Regular expression"
 msgstr "ביטוי רגולרי"
 
-#: ../src/gnome2/find_dialog.c:291
+#: ../src/gnome2/find_dialog.c:295
 msgid "Find Next"
 msgstr "מצא את הבא"
 
-#: ../src/gnome2/font_dialog.c:301
+#: ../src/gnome2/font_dialog.c:303
 msgid "Set Module Font"
 msgstr "קבע גופן מודול"
 
-#: ../src/gnome2/font_dialog.c:331
+#: ../src/gnome2/font_dialog.c:333
 msgid "Change font for"
 msgstr "שנה גופן עבור"
 
-#: ../src/gnome2/font_dialog.c:335
+#: ../src/gnome2/font_dialog.c:337
 msgid "Module"
 msgstr "מודול"
 
-#: ../src/gnome2/font_dialog.c:339
+#: ../src/gnome2/font_dialog.c:341
 msgid "Current font: "
-msgstr "גופן נוכחי:"
+msgstr "גופן נוכחי: "
 
-#: ../src/gnome2/font_dialog.c:376
+#: ../src/gnome2/font_dialog.c:378
 msgid "+0"
 msgstr "+0"
 
-#: ../src/gnome2/font_dialog.c:380
+#: ../src/gnome2/font_dialog.c:382
 msgid "Use the default font for this module"
 msgstr "השתמש בגופן ברירת המחדל עבור מודול זה"
 
-#: ../src/gnome2/main_window.c:758
+#. *****************************************************************************
+#. * Name
+#. *    gconf_setup
+#. *
+#. * Synopsis
+#. *   #include "main/settings.h"
+#. *
+#. *   void gconf_setup()
+#. *
+#. * Description
+#. *   verifies and initializes the GConf subsystem, so that "sword://" and
+#. *   similar can be handled by url-comprehending programs such as browsers.
+#. *   dialogs for permission/success/failure => conditional on debug build.
+#. *
+#. * Return value
+#. *   void
+#. 
+#: ../src/gnome2/gui.c:110
+msgid ""
+"URL references using \"sword://\" (similar to web page\n"
+"references) can be used by programs to look up\n"
+"scripture references. Your system currently has no\n"
+"program set to handle these references.\n"
+"\n"
+"Would you like Xiphos to set itself as the\n"
+"program to handle these references?"
+msgstr ""
+"הפניות URL של \"sword://\" (בדומה לדפי\n"
+"רשת) יכולות לאפשר לתוכנות לאתר\n"
+"הפניות לכתבי הקודש. כרגע לא מוגדרת\n"
+"במערכת שלך תוכנה לטיפול בהפניות אלה.\n"
+"\n"
+"האם ברצונך לקבוע את קסיפוס כתוכנת\n"
+"ברירת המחדל לטיפול בהפניות אלה?"
+
+#: ../src/gnome2/gui.c:112
+msgid ""
+"Xiphos has successfully set itself\n"
+"as the handler of sword:// and bible:// URLs.\n"
+"\n"
+"You may wish to run the program \"gconf-editor\"\n"
+"to examine keys under /desktop/gnome/url-handlers,\n"
+"if you need to change these."
+msgstr ""
+"Xiphos הגדירה את עצמה בהצלחה\n"
+"כתובנה לטיפול בכתובות sword:// and bible://.\n"
+"\n"
+"ניתן להריץ את התוכנה \"gconf-editor\"\n"
+"על מנת לעיין במפתחות תחת /desktop/gnome/url-handlers,\n"
+"אם עולה הצורך לשנותם."
+
+#: ../src/gnome2/gui.c:166
+#, c-format
+msgid ""
+"Xiphos failed to complete handler init for key #%d:\n"
+"%s"
+msgstr ""
+"Xiphos לא הצליחה להשלים את אתחול הליך הטיפול עבור המפתח #%d:\n"
+"%s"
+
+#: ../src/gnome2/gui.c:212
+msgid "BUG! Xiphos is about to crash due to a \"STRDUP\" error."
+msgstr ""
+
+#: ../src/gnome2/gui.c:213 ../src/gnome2/gui.c:248
+msgid "Please report this error to the Xiphos team with:"
+msgstr ""
+
+#: ../src/gnome2/gui.c:247
+msgid "BUG! Xiphos is about to crash due to a \"STRING\" error."
+msgstr ""
+
+#: ../src/gnome2/main_window.c:789
 msgid "Xiphos - Bible Study Software"
 msgstr "Xiphos - תוכנה לחקר כתבי הקודש"
 
-#: ../src/gnome2/main_window.c:814
+#: ../src/gnome2/main_window.c:844
 msgid "Open a new tab"
 msgstr "פתח לשונית חדשה"
 
-#: ../src/gnome2/main_window.c:894
-#: ../src/gnome2/sidebar.c:621
-#: ../src/gnome2/sidebar.c:627
-#: ../src/main/sidebar.cc:643
-#: ../src/main/sidebar.cc:964
-#: ../src/main/sidebar.cc:965
-#: ../src/main/sidebar.cc:966
+#: ../src/gnome2/main_window.c:923 ../src/gnome2/sidebar.c:627
+#: ../src/gnome2/sidebar.c:633 ../src/main/sidebar.cc:666
+#: ../src/main/sidebar.cc:1015 ../src/main/sidebar.cc:1016
+#: ../src/main/sidebar.cc:1017
 msgid "Standard View"
 msgstr "תצוגה רגילה"
 
-#: ../src/gnome2/main_window.c:971
+#: ../src/gnome2/main_window.c:1004
 msgid "Commentary View"
 msgstr "תצוגת פירוש"
 
-#: ../src/gnome2/main_window.c:987
+#: ../src/gnome2/main_window.c:1020
 msgid "Book View"
 msgstr "תצוגת ספר"
 
-#: ../src/gnome2/main_window.c:1012
+#: ../src/gnome2/main_window.c:1045
 msgid "Welcome to Xiphos"
 msgstr "ברוכים הבאים ל-Xiphos"
 
-#: ../src/gnome2/menu_popup.c:1163
+#: ../src/gnome2/menu_popup.c:1168
 msgid ""
 "Renaming is not available in Windows.\n"
 "\n"
@@ -483,37 +553,33 @@ msgstr ""
 "לפיכך, לא ניתן לשנות שמות של פירושים אישיים\n"
 "בסביבת חלונות."
 
-#: ../src/gnome2/menu_popup.c:1182
+#: ../src/gnome2/menu_popup.c:1187
 msgid "Rename Commentary"
 msgstr "פירוש"
 
-#: ../src/gnome2/menu_popup.c:1185
+#: ../src/gnome2/menu_popup.c:1190
 msgid "Choose Commentary Name"
 msgstr "תצוגת פירוש"
 
-#: ../src/gnome2/menu_popup.c:1187
+#: ../src/gnome2/menu_popup.c:1192
 msgid "New Name"
 msgstr "שם תיקייה"
 
-#: ../src/gnome2/menu_popup.c:1188
-#: ../src/gnome2/treekey-editor.c:132
-#: ../src/gnome2/treekey-editor.c:191
-#: ../src/gnome2/treekey-editor.c:277
-#: ../src/main/prayerlists.cc:240
+#: ../src/gnome2/menu_popup.c:1193 ../src/gnome2/treekey-editor.c:139
+#: ../src/gnome2/treekey-editor.c:198 ../src/gnome2/treekey-editor.c:284
+#: ../src/main/prayerlists.cc:243
 msgid "Name: "
-msgstr "תווית:"
+msgstr "תווית: "
 
-#: ../src/gnome2/menu_popup.c:1198
-#: ../src/main/prayerlists.cc:254
+#: ../src/gnome2/menu_popup.c:1203 ../src/main/prayerlists.cc:257
 msgid "Module names must contain [A-Za-z0-9_] only."
 msgstr "שמות מודולים יכולים להכיל אך ורק את התווים [A-Za-z0-9_]."
 
-#: ../src/gnome2/menu_popup.c:1205
-#: ../src/main/prayerlists.cc:261
+#: ../src/gnome2/menu_popup.c:1210 ../src/main/prayerlists.cc:264
 msgid "Xiphos already knows a module by that name."
 msgstr "מערכת Xiphos כבר מכירה מודול בשם זה."
 
-#: ../src/gnome2/menu_popup.c:1248
+#: ../src/gnome2/menu_popup.c:1253
 #, c-format
 msgid ""
 "Failed to create new configuration:\n"
@@ -522,7 +588,7 @@ msgstr ""
 "לא ניתן להפיק תצורה חדשה:\n"
 "%s"
 
-#: ../src/gnome2/menu_popup.c:1257
+#: ../src/gnome2/menu_popup.c:1262
 msgid ""
 "Configuration build error:\n"
 "\n"
@@ -530,19 +596,56 @@ msgstr ""
 "שגיאה בבניית תצורה:\n"
 "\n"
 
-#: ../src/gnome2/mod_mgr.c:339
+#: ../src/gnome2/mod_mgr.c:169
+msgid "Remove these modules?"
+msgstr "להסיר את המודולים הבאים?"
+
+#: ../src/gnome2/mod_mgr.c:170
+msgid "Preparing to remove"
+msgstr "מתכונן להסרה"
+
+#: ../src/gnome2/mod_mgr.c:171
+msgid "Removing"
+msgstr "מסיר:"
+
+#: ../src/gnome2/mod_mgr.c:172 ../ui/xi-menus.glade.h:72
+msgid "Remove"
+msgstr "הסרה"
+
+#: ../src/gnome2/mod_mgr.c:175
 msgid "Install these modules?"
 msgstr "להתקין את המודולים הבאים?"
 
-#: ../src/gnome2/mod_mgr.c:341
-msgid "Remove these modules?"
-msgstr "להסיר את המודולים הבאים?"
+#: ../src/gnome2/mod_mgr.c:176
+msgid "Preparing to install"
+msgstr "מתכונן להתקנה"
 
-#: ../src/gnome2/mod_mgr.c:343
+#: ../src/gnome2/mod_mgr.c:177
+msgid "Installing"
+msgstr "מתקין:"
+
+#: ../src/gnome2/mod_mgr.c:178 ../src/gnome2/mod_mgr.c:2964
+#: ../ui/module-manager.glade.h:18
+msgid "Install"
+msgstr "התקנה"
+
+#: ../src/gnome2/mod_mgr.c:181
 msgid "Archive these modules?"
 msgstr "להעביר את המודולים הבאים לארכיון?"
 
-#: ../src/gnome2/mod_mgr.c:345
+#: ../src/gnome2/mod_mgr.c:182
+msgid "Preparing to archive"
+msgstr "מתכונן להסרה"
+
+#: ../src/gnome2/mod_mgr.c:183
+msgid "Archiving"
+msgstr "מעביר לארכיב"
+
+#: ../src/gnome2/mod_mgr.c:184 ../ui/module-manager.glade.h:11
+msgid "Archive"
+msgstr "ארכיב"
+
+#: ../src/gnome2/mod_mgr.c:187
 msgid ""
 "Build fast-search index for these\n"
 "modules (may take minutes/module)?"
@@ -550,132 +653,128 @@ msgstr ""
 "לבנות אינדקס לחיפוש מהיר עבור\n"
 "המודולים הבאים (זמן בדקות\\מודול)?"
 
-#: ../src/gnome2/mod_mgr.c:347
-msgid "Delete fast-search index for these modules?"
-msgstr "למחוק אינדקס לחיפוש מהיר עבור המודולים הבאים?"
-
-#: ../src/gnome2/mod_mgr.c:367
-msgid "Preparing to install"
+#: ../src/gnome2/mod_mgr.c:188
+msgid "Preparing to index"
 msgstr "מתכונן להתקנה"
 
-#: ../src/gnome2/mod_mgr.c:369
-msgid "Preparing to remove"
-msgstr "מתכונן להסרה"
+#: ../src/gnome2/mod_mgr.c:189
+msgid "Indexing"
+msgstr "בונה אינדקס"
 
-#: ../src/gnome2/mod_mgr.c:371
-msgid "Preparing to archive"
-msgstr "מתכונן להסרה"
+#: ../src/gnome2/mod_mgr.c:190 ../ui/module-manager.glade.h:17
+msgid "Index"
+msgstr "אינדקס"
 
-#: ../src/gnome2/mod_mgr.c:373
-msgid "Preparing to index"
-msgstr "מתכונן להתקנה"
+#: ../src/gnome2/mod_mgr.c:193
+msgid "Delete fast-search index for these modules?"
+msgstr "למחוק אינדקס לחיפוש מהיר עבור המודולים הבאים?"
 
-#: ../src/gnome2/mod_mgr.c:375
+#: ../src/gnome2/mod_mgr.c:194
 msgid "Preparing to delete index"
 msgstr "מתכונן להסרה"
 
-#: ../src/gnome2/mod_mgr.c:401
-msgid "Installing"
-msgstr "מתקין:"
+#: ../src/gnome2/mod_mgr.c:195
+msgid "Deleting index"
+msgstr "מחק פריט"
 
-#: ../src/gnome2/mod_mgr.c:403
-msgid "Removing"
-msgstr "מסיר:"
+#: ../src/gnome2/mod_mgr.c:196
+msgid "Deletion"
+msgstr "מחק פריט"
 
-#: ../src/gnome2/mod_mgr.c:405
-msgid "Archiving"
-msgstr "מעביר לארכיב"
+#: ../src/gnome2/mod_mgr.c:427
+msgid "Module Name"
+msgstr "שם מודול"
 
-#: ../src/gnome2/mod_mgr.c:407
-msgid "Indexing"
-msgstr "בונה אינדקס"
+#: ../src/gnome2/mod_mgr.c:448
+msgid "A checkmark means this module is already installed"
+msgstr "סימן וי מציין שהמודול כבר מותקן"
 
-#: ../src/gnome2/mod_mgr.c:409
-msgid "Deleting index"
-msgstr "מחק פריט"
+#: ../src/gnome2/mod_mgr.c:470
+msgid "Click the box to work on this module"
+msgstr "נא לסמן תיבה זו על מנת לעבוד עם המודול הזה."
 
-#: ../src/gnome2/mod_mgr.c:432
-#, c-format
-msgid ""
-"`mkdir %s' failed:\n"
-"%s."
-msgstr ""
-"פעולת `mkdir %s' נכשלה:\n"
-"%s."
+#: ../src/gnome2/mod_mgr.c:471
+msgid "Click the box to select this module for install/update"
+msgstr "סמנו תיבה זו כדי להתקין או לעדכן מודול זה"
 
-#: ../src/gnome2/mod_mgr.c:463
-msgid "Xiphos could not execute archiver"
-msgstr "מערכת Xiphos לא הצליחה להריץ את יוצר הארכיב"
+#: ../src/gnome2/mod_mgr.c:490
+msgid "Installed"
+msgstr "התקנה"
 
-#: ../src/gnome2/mod_mgr.c:468
+#: ../src/gnome2/mod_mgr.c:500
 msgid ""
-" archival result:\n"
-"\n"
+"The index icon means you have built an optimized ('lucene') index for this "
+"module for fast searching (see the Maintenance pane for this function)"
 msgstr ""
-"תוצאת הארכיב:\n"
-"\n"
+"סמלון האינדקס מציין שבנית אינדקס מיטבי ('lucene') עבור המודול על מנת לבצע "
+"חיפוש מהיר (עיינו בפונקציה זו בחלונית התחזוקה)"
 
-#: ../src/gnome2/mod_mgr.c:472
+#: ../src/gnome2/mod_mgr.c:518
 msgid ""
-"\n"
-"Archive in "
+"The lock icon means this module is encrypted, and requires that you purchase "
+"an unlock key from the content owner"
+msgstr "סמלון המנעול מציין שהמודול מוצפן, ושעליך לרכוש מפתח מבעלי התוכן"
+
+#: ../src/gnome2/mod_mgr.c:535 ../ui/xi-menus.glade.h:1
+msgid "About"
+msgstr "אודות"
+
+#: ../src/gnome2/mod_mgr.c:555
+msgid ""
+"The refresh icon means the Installed module is older than the newer "
+"Available module: You should update the module"
 msgstr ""
-"\n"
-"ארכיב בתוך"
+"סמלון הרענון מציין שהמודול המותקן מיושן וקיימת גרסה חדשה יותר: עליך לעדכן את "
+"המודול"
 
-#: ../src/gnome2/mod_mgr.c:529
-msgid "Journals and prayer lists cannot be indexed."
-msgstr "לא ניתן לאנדקס כתבי עת ורשימות תפילות."
+#: ../src/gnome2/mod_mgr.c:567
+msgid "Available"
+msgstr "זמין"
 
-#: ../src/gnome2/mod_mgr.c:550
-#: ../src/gnome2/mod_mgr.c:2905
-#: ../ui/module-manager.glade.h:15
-msgid "Install"
-msgstr "התקנה"
+#: ../src/gnome2/mod_mgr.c:576
+msgid "Size"
+msgstr "גודל"
 
-#: ../src/gnome2/mod_mgr.c:552
-#: ../src/gnome2/treekey-editor.c:316
-msgid "Remove"
-msgstr "הסרה"
+#: ../src/gnome2/mod_mgr.c:585
+msgid "Description"
+msgstr "תיאור"
 
-#: ../src/gnome2/mod_mgr.c:554
-msgid "Archive"
-msgstr "ארכיב"
+#: ../src/gnome2/mod_mgr.c:736
+#, c-format
+msgid ""
+"`mkdir %s' failed:\n"
+"%s."
+msgstr ""
+"פעולת `mkdir %s' נכשלה:\n"
+"%s."
 
-#: ../src/gnome2/mod_mgr.c:556
-msgid "Index"
-msgstr "אינדקס"
+#: ../src/gnome2/mod_mgr.c:759
+msgid " archived in: \n"
+msgstr ""
 
-#: ../src/gnome2/mod_mgr.c:558
-msgid "Deletion"
-msgstr "מחק פריט"
+#: ../src/gnome2/mod_mgr.c:815
+msgid "Journals and prayer lists cannot be indexed."
+msgstr "לא ניתן לאנדקס כתבי עת ורשימות תפילות."
 
-#: ../src/gnome2/mod_mgr.c:560
+#: ../src/gnome2/mod_mgr.c:833
 #, c-format
 msgid "%s failed"
 msgstr "%sכישלון ב"
 
-#: ../src/gnome2/mod_mgr.c:562
-#: ../src/gnome2/mod_mgr.c:1288
+#: ../src/gnome2/mod_mgr.c:836 ../src/gnome2/mod_mgr.c:1562
 msgid "Finished"
-msgstr "סיום"
-
-#: ../src/gnome2/mod_mgr.c:729
-#: ../src/gnome2/mod_mgr.c:731
-#: ../src/gnome2/mod_mgr.c:833
-#: ../src/gnome2/mod_mgr.c:868
-#: ../src/gnome2/mod_mgr.c:870
-#: ../src/gnome2/utilities.c:346
-#: ../src/gnome2/utilities.c:411
-#: ../src/gnome2/utilities.c:413
-#: ../src/gnome2/utilities.c:1032
-#: ../src/main/sidebar.cc:801
-#: ../src/main/sidebar.cc:873
-#: ../src/main/sidebar.cc:875
+msgstr "הסתיים"
+
+#: ../src/gnome2/mod_mgr.c:1003 ../src/gnome2/mod_mgr.c:1005
+#: ../src/gnome2/mod_mgr.c:1107 ../src/gnome2/mod_mgr.c:1142
+#: ../src/gnome2/mod_mgr.c:1144 ../src/gnome2/utilities.c:435
+#: ../src/gnome2/utilities.c:500 ../src/gnome2/utilities.c:502
+#: ../src/gnome2/utilities.c:986 ../src/main/sidebar.cc:852
+#: ../src/main/sidebar.cc:924 ../src/main/sidebar.cc:926
 msgid "Unknown"
 msgstr "לא ידוע"
 
-#: ../src/gnome2/mod_mgr.c:1032
+#: ../src/gnome2/mod_mgr.c:1301
 #, c-format
 msgid ""
 "Repository:\n"
@@ -684,7 +783,7 @@ msgstr ""
 "מאגר:\n"
 "%s"
 
-#: ../src/gnome2/mod_mgr.c:1044
+#: ../src/gnome2/mod_mgr.c:1313
 msgid ""
 "Categorized by\n"
 "Module Type"
@@ -692,59 +791,44 @@ msgstr ""
 "ממוין לפי\n"
 "סוג המודול"
 
-#: ../src/gnome2/mod_mgr.c:1049
-#: ../src/gnome2/utilities.c:472
-#: ../src/main/sidebar.cc:948
-#: ../src/main/sidebar.cc:950
+#: ../src/gnome2/mod_mgr.c:1318 ../src/gnome2/utilities.c:561
+#: ../src/main/sidebar.cc:999 ../src/main/sidebar.cc:1001
 msgid "Biblical Texts"
 msgstr "כתבי קודש"
 
-#: ../src/gnome2/mod_mgr.c:1053
-#: ../src/gnome2/utilities.c:476
-#: ../src/main/sidebar.cc:655
-#: ../src/main/sidebar.cc:973
-#: ../src/main/sidebar.cc:975
-#: ../ui/prefs.glade.h:33
+#: ../src/gnome2/mod_mgr.c:1322 ../src/gnome2/utilities.c:565
+#: ../src/main/sidebar.cc:678 ../src/main/sidebar.cc:1024
+#: ../src/main/sidebar.cc:1026 ../ui/prefs.glade.h:33
 msgid "Commentaries"
 msgstr "פירושים"
 
-#: ../src/gnome2/mod_mgr.c:1057
-#: ../src/gnome2/utilities.c:480
-#: ../src/main/sidebar.cc:982
-#: ../src/main/sidebar.cc:984
+#: ../src/gnome2/mod_mgr.c:1326 ../src/gnome2/utilities.c:569
+#: ../src/main/sidebar.cc:1033 ../src/main/sidebar.cc:1035
 msgid "Dictionaries"
 msgstr "מילונים"
 
-#: ../src/gnome2/mod_mgr.c:1061
-#: ../src/gnome2/utilities.c:484
-#: ../src/main/sidebar.cc:991
-#: ../src/main/sidebar.cc:993
+#: ../src/gnome2/mod_mgr.c:1330 ../src/gnome2/utilities.c:573
+#: ../src/main/sidebar.cc:1042 ../src/main/sidebar.cc:1044
 msgid "Daily Devotionals"
 msgstr "דרשות יומיות"
 
-#: ../src/gnome2/mod_mgr.c:1065
-#: ../src/gnome2/utilities.c:488
-#: ../src/main/sidebar.cc:665
-#: ../src/main/sidebar.cc:1000
-#: ../src/main/sidebar.cc:1002
+#: ../src/gnome2/mod_mgr.c:1334 ../src/gnome2/utilities.c:577
+#: ../src/main/sidebar.cc:688 ../src/main/sidebar.cc:1051
+#: ../src/main/sidebar.cc:1053
 msgid "General Books"
 msgstr "ספרים כלליים"
 
-#: ../src/gnome2/mod_mgr.c:1069
-#: ../src/gnome2/utilities.c:492
-#: ../src/main/sidebar.cc:1009
-#: ../src/main/sidebar.cc:1011
+#: ../src/gnome2/mod_mgr.c:1338 ../src/gnome2/utilities.c:581
+#: ../src/main/sidebar.cc:1060 ../src/main/sidebar.cc:1062
 msgid "Maps"
 msgstr "מפות"
 
-#: ../src/gnome2/mod_mgr.c:1073
-#: ../src/gnome2/utilities.c:496
-#: ../src/main/sidebar.cc:1018
-#: ../src/main/sidebar.cc:1020
+#: ../src/gnome2/mod_mgr.c:1342 ../src/gnome2/utilities.c:585
+#: ../src/main/sidebar.cc:1069 ../src/main/sidebar.cc:1071
 msgid "Images"
 msgstr "התאמות"
 
-#: ../src/gnome2/mod_mgr.c:1081
+#: ../src/gnome2/mod_mgr.c:1350
 msgid ""
 "Categorized by\n"
 "Availability"
@@ -752,378 +836,357 @@ msgstr ""
 "ממוין לפי\n"
 "זמינות"
 
-#: ../src/gnome2/mod_mgr.c:1086
+#: ../src/gnome2/mod_mgr.c:1355
 msgid "Updates"
 msgstr "עדכונים"
 
-#: ../src/gnome2/mod_mgr.c:1090
+#: ../src/gnome2/mod_mgr.c:1359
 msgid "Uninstalled"
 msgstr "התקנה"
 
-#: ../src/gnome2/mod_mgr.c:1094
-#: ../src/gnome2/sidebar.c:637
-#: ../src/gnome2/utilities.c:501
-#: ../src/main/prayerlists.cc:238
-#: ../src/main/sidebar.cc:1028
-#: ../src/main/sidebar.cc:1030
+#: ../src/gnome2/mod_mgr.c:1363 ../src/gnome2/sidebar.c:643
+#: ../src/gnome2/utilities.c:590 ../src/main/prayerlists.cc:241
+#: ../src/main/sidebar.cc:1079 ../src/main/sidebar.cc:1081
 msgid "Prayer List/Journal"
 msgstr "יומן\\רשימת תפילות"
 
-#: ../src/gnome2/mod_mgr.c:1271
+#: ../src/gnome2/mod_mgr.c:1545
 msgid "Refreshing from remote source"
 msgstr "מרענן מן המקור המרוחק"
 
-#: ../src/gnome2/mod_mgr.c:1282
+#: ../src/gnome2/mod_mgr.c:1556
 msgid "Remote source not found"
 msgstr "המקור המרוחק לא נמצא"
 
-#: ../src/gnome2/mod_mgr.c:1415
-msgid "Module Name"
-msgstr "שם מודול"
-
-#: ../src/gnome2/mod_mgr.c:1436
-msgid "A checkmark means this module is already installed"
-msgstr "סימן וי מציין שהמודול כבר מותקן"
-
-#: ../src/gnome2/mod_mgr.c:1458
-msgid "Click the box to work on this module"
-msgstr "נא לסמן תיבה זו על מנת לעבוד עם המודול הזה."
-
-#: ../src/gnome2/mod_mgr.c:1459
-msgid "Click the box to select this module for install/update"
-msgstr "סמנו תיבה זו כדי להתקין או לעדכן מודול זה"
-
-#: ../src/gnome2/mod_mgr.c:1478
-msgid "Installed"
-msgstr "התקנה"
-
-#: ../src/gnome2/mod_mgr.c:1488
-msgid "The index icon means you have built an optimized ('lucene') index for this module for fast searching (see the Maintenance pane for this function)"
-msgstr "סמלון האינדקס מציין שבנית אינדקס מיטבי ('lucene') עבור המודול על מנת לבצע חיפוש מהיר (עיינו בפונקציה זו בחלונית התחזוקה)"
-
-#: ../src/gnome2/mod_mgr.c:1506
-msgid "The lock icon means this module is encrypted, and requires that you purchase an unlock key from the content owner"
-msgstr "סמלון המנעול מציין שהמודול מוצפן, ושעליך לרכוש מפתח מבעלי התוכן"
-
-#. 2
-#: ../src/gnome2/mod_mgr.c:1523
-#: ../src/gnome2/sidebar.c:975
-#: ../src/gnome2/sidebar.c:1143
-#: ../ui/xi-menus.glade.h:1
-msgid "About"
-msgstr "אודות"
-
-#: ../src/gnome2/mod_mgr.c:1543
-msgid "The refresh icon means the Installed module is older than the newer Available module: You should update the module"
-msgstr "סמלון הרענון מציין שהמודול המותקן מיושן וקיימת גרסה חדשה יותר: עליך לעדכן את המודול"
-
-#: ../src/gnome2/mod_mgr.c:1555
-msgid "Available"
-msgstr "זמין"
-
-#: ../src/gnome2/mod_mgr.c:1564
-msgid "Size"
-msgstr "גודל"
-
-#: ../src/gnome2/mod_mgr.c:1573
-msgid "Description"
-msgstr "תיאור"
-
-#: ../src/gnome2/mod_mgr.c:1605
-#: ../src/gnome2/mod_mgr.c:1705
+#: ../src/gnome2/mod_mgr.c:1670
 msgid "Configure"
 msgstr "ערוך תצורה"
 
-#: ../src/gnome2/mod_mgr.c:1636
+#: ../src/gnome2/mod_mgr.c:1701
 msgid "Type"
 msgstr "סוג"
 
-#: ../src/gnome2/mod_mgr.c:1643
+#: ../src/gnome2/mod_mgr.c:1708
 msgid "Caption"
 msgstr "כותרת"
 
-#: ../src/gnome2/mod_mgr.c:1651
+#: ../src/gnome2/mod_mgr.c:1716
 msgid "Source"
 msgstr "מקור"
 
-#: ../src/gnome2/mod_mgr.c:1659
+#: ../src/gnome2/mod_mgr.c:1724
 msgid "Directory"
 msgstr "ספריה"
 
-#: ../src/gnome2/mod_mgr.c:1667
+#: ../src/gnome2/mod_mgr.c:1732
 msgid "User"
 msgstr "משתמש"
 
-#: ../src/gnome2/mod_mgr.c:1675
+#: ../src/gnome2/mod_mgr.c:1740
 msgid "Password"
 msgstr "סיסמה"
 
-#: ../src/gnome2/mod_mgr.c:1683
+#: ../src/gnome2/mod_mgr.c:1748
 msgid "UID"
 msgstr "UID"
 
-#: ../src/gnome2/mod_mgr.c:1703
-msgid "Sources"
-msgstr "מקורות"
+#: ../src/gnome2/mod_mgr.c:1765
+msgid "Module Sources"
+msgstr ""
+
+#: ../src/gnome2/mod_mgr.c:1768
+msgid "Add/Remove"
+msgstr ""
+
+#: ../src/gnome2/mod_mgr.c:1770
+msgid "Choose"
+msgstr ""
 
-#: ../src/gnome2/mod_mgr.c:1709
-#: ../src/gnome2/preferences_dialog.c:1784
-#: ../src/gnome2/sidebar.c:1483
+#: ../src/gnome2/mod_mgr.c:1774 ../src/gnome2/preferences_dialog.c:1793
+#: ../src/gnome2/sidebar.c:1413
 msgid "Modules"
 msgstr "מודולים"
 
-#: ../src/gnome2/mod_mgr.c:1711
+#: ../src/gnome2/mod_mgr.c:1776
 msgid "Install/Update"
 msgstr "התקנה"
 
-#: ../src/gnome2/mod_mgr.c:1713
+#: ../src/gnome2/mod_mgr.c:1778
 msgid "Maintenance"
 msgstr "תחזוקה"
 
-#: ../src/gnome2/mod_mgr.c:1933
+#: ../src/gnome2/mod_mgr.c:1999
 msgid "Please Refresh"
 msgstr "נא לרענן"
 
-#: ../src/gnome2/mod_mgr.c:1934
+#: ../src/gnome2/mod_mgr.c:2000
 msgid "Your module list is not up to date!"
 msgstr "רשימת המודולים אינה מעודכנת!"
 
-#: ../src/gnome2/mod_mgr.c:2285
+#. Zero Bibles is just not workable in Xiphos.
+#: ../src/gnome2/mod_mgr.c:2282
+msgid ""
+"You have uninstalled your last Bible.\n"
+"Xiphos requires at least one."
+msgstr ""
+
+#: ../src/gnome2/mod_mgr.c:2288
+msgid ""
+"There are still no Bibles installed.\n"
+"Xiphos cannot continue without one."
+msgstr ""
+
+#: ../src/gnome2/mod_mgr.c:2353
 msgid "Standard remote sources have been loaded."
 msgstr "נטענו מקורות מרוחקים סטנדרטיים."
 
-#: ../src/gnome2/mod_mgr.c:2286
+#: ../src/gnome2/mod_mgr.c:2359
 msgid "Could not load standard sources from CrossWire."
 msgstr "טעינת מקורות סטנדרטיים מ-Crosswire נכשלה."
 
-#: ../src/gnome2/mod_mgr.c:2438
-#: ../src/gnome2/mod_mgr.c:2687
+#: ../src/gnome2/mod_mgr.c:2510 ../src/gnome2/mod_mgr.c:2759
 msgid "Remove the selected source"
 msgstr "הסר את המקור שנבחר"
 
-#: ../src/gnome2/mod_mgr.c:2498
+#: ../src/gnome2/mod_mgr.c:2570
 msgid "Enter a remote source"
 msgstr "הזן מקור מרוחק"
 
-#: ../src/gnome2/mod_mgr.c:2502
+#: ../src/gnome2/mod_mgr.c:2574
 msgid "Caption:"
 msgstr "כותרת:"
 
-#: ../src/gnome2/mod_mgr.c:2503
+#: ../src/gnome2/mod_mgr.c:2575
 msgid "Type:"
 msgstr "סוג:"
 
-#: ../src/gnome2/mod_mgr.c:2504
+#: ../src/gnome2/mod_mgr.c:2576
 msgid "Host:"
 msgstr "מארח:"
 
-#: ../src/gnome2/mod_mgr.c:2505
+#: ../src/gnome2/mod_mgr.c:2577
 msgid "Directory:"
 msgstr "ספריה:"
 
-#: ../src/gnome2/mod_mgr.c:2507
+#: ../src/gnome2/mod_mgr.c:2579
 msgid "User (optional):"
 msgstr "משתמש (אופציונלי):"
 
-#: ../src/gnome2/mod_mgr.c:2508
+#: ../src/gnome2/mod_mgr.c:2580
 msgid "Password (optional):"
 msgstr "סיסמה (אופציונלי):"
 
 #. this can happen at most once
-#: ../src/gnome2/mod_mgr.c:2536
+#: ../src/gnome2/mod_mgr.c:2608
 msgid "A source by that name already exists."
 msgstr "יש כבר מקור בשם זה."
 
-#: ../src/gnome2/mod_mgr.c:2684
+#: ../src/gnome2/mod_mgr.c:2756
 msgid "Delete a remote source"
 msgstr "מחק מקור מרוחק"
 
-#: ../src/gnome2/navbar_book.c:359
-#: ../src/gnome2/navbar_book_dialog.c:299
+#. *****************************************************************************
+#. * Name
+#. *   gui_open_mod_mgr
+#. *
+#. * Synopsis
+#. *   #include "gui/mod_mgr.h"
+#. *
+#. *   void gui_open_mod_mgr(void)
+#. *
+#. * Description
+#. *
+#. *
+#. * Return value
+#. *   void
+#. 
+#: ../src/gnome2/mod_mgr.c:3244
+msgid ""
+"<b>Welcome to the Module Manager.</b>\n"
+"\n"
+"This is Xiphos' mechanism to get new and updated content.\n"
+"It appears you have never been here before, so please take a moment to look "
+"it over.\n"
+"(You will see this information box just once.)\n"
+"\n"
+"Modules come from different <u>repositories</u>.  <b>Module Sources: "
+"Add/Remove</b> will show you what repositories are currently known.\n"
+"\n"
+"<b>Module Sources: Choose</b> is for deciding from where modules should "
+"come, that is, from which repository Xiphos should obtain them, as well as "
+"where they should be placed on your system. Set <i>Install Source</i> and "
+"<i>Install Destination</i>, then click <i>Refresh</i>.\n"
+"\n"
+"<b>Modules: Install/Update</b> is for selecting and obtaining modules after "
+"choosing source and destination.\n"
+"\n"
+"<b>Modules: Maintenance</b> is for archive and index creation.\n"
+"\n"
+"See section 5 of our manual for Module Manager detail, or ask for help via "
+"Live Chat, or (if no one is responsive in chat) send mail to our users' "
+"mailing list.\n"
+msgstr ""
+
+#: ../src/gnome2/navbar_book.c:359 ../src/gnome2/navbar_book_dialog.c:300
 msgid "Go outward, to the section containing this one"
 msgstr "נוע החוצה אל הקטע הכולל את זה הנוכחי"
 
-#: ../src/gnome2/navbar_book.c:375
-#: ../src/gnome2/navbar_book_dialog.c:315
+#: ../src/gnome2/navbar_book.c:375 ../src/gnome2/navbar_book_dialog.c:316
 msgid "Go to previous item"
 msgstr "לך אל הפריט הקודם"
 
-#: ../src/gnome2/navbar_book.c:390
-#: ../src/gnome2/navbar_book_dialog.c:330
+#: ../src/gnome2/navbar_book.c:390 ../src/gnome2/navbar_book_dialog.c:331
 msgid "Go to next item"
 msgstr "לך אל הפריט הבא"
 
-#: ../src/gnome2/navbar_book.c:406
-#: ../src/gnome2/navbar_book_dialog.c:346
+#: ../src/gnome2/navbar_book.c:406 ../src/gnome2/navbar_book_dialog.c:347
 msgid "Go inward, to the first subsection"
 msgstr "נוע פנימה אל תת הקטע הראשון"
 
-#: ../src/gnome2/navbar_versekey_dialog.c:887
-#: ../src/gnome2/navbar_versekey_editor.c:877
-#: ../src/gnome2/navbar_versekey_parallel.c:800
+#: ../src/gnome2/navbar_versekey_dialog.c:864
+#: ../src/gnome2/navbar_versekey_editor.c:879
+#: ../src/gnome2/navbar_versekey_parallel.c:810
 msgid "Synchronize this window from main window"
 msgstr "סנכרן חלון זה על פי החלון הראשי"
 
-#: ../src/gnome2/parallel_dialog.c:324
-#: ../src/gnome2/preferences_dialog.c:1790
+#: ../src/gnome2/parallel_dialog.c:328 ../src/gnome2/preferences_dialog.c:1799
 msgid "Parallel"
 msgstr "מקביל"
 
-#: ../src/gnome2/parallel_view.c:271
+#: ../src/gnome2/parallel_view.c:275
 msgid "Copy"
 msgstr "העתק"
 
-#: ../src/gnome2/parallel_view.c:281
+#: ../src/gnome2/parallel_view.c:285
 msgid "Detach/Attach"
 msgstr "נתק \\ הצמד"
 
-#: ../src/gnome2/parallel_view.c:287
-#: ../ui/xi-menus.glade.h:40
+#: ../src/gnome2/parallel_view.c:291 ../ui/xi-menus.glade.h:53
 msgid "Module Options"
 msgstr "אפשרויות מודול"
 
 #. build change parallel modules submenu
-#: ../src/gnome2/parallel_view.c:302
+#: ../src/gnome2/parallel_view.c:306
 msgid "Change parallel 1"
 msgstr "שנה מקביל 1"
 
-#: ../src/gnome2/parallel_view.c:304
+#: ../src/gnome2/parallel_view.c:308
 msgid "Change parallel 2"
 msgstr "שנה מקביל 2"
 
-#: ../src/gnome2/parallel_view.c:306
+#: ../src/gnome2/parallel_view.c:310
 msgid "Change parallel 3"
 msgstr "שנה מקביל 3"
 
-#: ../src/gnome2/parallel_view.c:308
+#: ../src/gnome2/parallel_view.c:312
 msgid "Change parallel 4"
 msgstr "שנה מקביל 4"
 
-#: ../src/gnome2/parallel_view.c:310
+#: ../src/gnome2/parallel_view.c:314
 msgid "Change parallel 5"
 msgstr "שנה מקביל 5"
 
-#: ../src/gnome2/parallel_view.c:467
-#: ../src/gnome2/sidebar.c:620
-#: ../src/gnome2/sidebar.c:626
-#: ../src/gnome2/tabbed_browser.c:256
-#: ../src/main/sidebar.cc:623
-#: ../src/main/sidebar.cc:956
-#: ../src/main/sidebar.cc:957
-#: ../src/main/sidebar.cc:958
+#: ../src/gnome2/parallel_view.c:471 ../src/gnome2/sidebar.c:626
+#: ../src/gnome2/sidebar.c:632 ../src/gnome2/tabbed_browser.c:262
+#: ../src/main/sidebar.cc:646 ../src/main/sidebar.cc:1007
+#: ../src/main/sidebar.cc:1008 ../src/main/sidebar.cc:1009
 msgid "Parallel View"
 msgstr "תצוגה מקבילה"
 
-#: ../src/gnome2/preferences_cell_renderer.c:398
-msgid "Text"
-msgstr "טקסט"
-
-#: ../src/gnome2/preferences_cell_renderer.c:400
-msgid "Text to render"
-msgstr "טקסט לציור"
-
-#: ../src/gnome2/preferences_cell_renderer.c:406
-msgid "Pixbuf Object"
-msgstr "אובייקט Pixbuf"
-
-#: ../src/gnome2/preferences_cell_renderer.c:408
-msgid "The pixbuf to render."
-msgstr "Pixbuf לציור"
-
-#: ../src/gnome2/preferences_dialog.c:1231
-#: ../src/gnome2/preferences_dialog.c:1269
-#: ../src/gnome2/preferences_dialog.c:1306
-#: ../src/gnome2/preferences_dialog.c:1341
-#: ../src/gnome2/preferences_dialog.c:1375
-#: ../src/gnome2/preferences_dialog.c:1408
-#: ../src/gnome2/preferences_dialog.c:1440
-#: ../src/gnome2/preferences_dialog.c:1473
-#: ../src/gnome2/preferences_dialog.c:1505
-#: ../src/gnome2/preferences_dialog.c:1539
-#: ../src/gnome2/preferences_dialog.c:1574
-#: ../src/gnome2/preferences_dialog.c:1609
-#: ../src/gnome2/preferences_dialog.c:1645
-#: ../src/gnome2/preferences_dialog.c:2045
+#: ../src/gnome2/preferences_dialog.c:1179
+#: ../src/gnome2/preferences_dialog.c:1217
+#: ../src/gnome2/preferences_dialog.c:1254
+#: ../src/gnome2/preferences_dialog.c:1289
+#: ../src/gnome2/preferences_dialog.c:1323
+#: ../src/gnome2/preferences_dialog.c:1356
+#: ../src/gnome2/preferences_dialog.c:1388
+#: ../src/gnome2/preferences_dialog.c:1421
+#: ../src/gnome2/preferences_dialog.c:1453
+#: ../src/gnome2/preferences_dialog.c:1487
+#: ../src/gnome2/preferences_dialog.c:1522
+#: ../src/gnome2/preferences_dialog.c:1557
+#: ../src/gnome2/preferences_dialog.c:1593
+#: ../src/gnome2/preferences_dialog.c:1631
+#: ../src/gnome2/preferences_dialog.c:2052
 msgid "-- Select --"
 msgstr "-- בחירה --"
 
-#: ../src/gnome2/preferences_dialog.c:1678
-#: ../ui/prefs.glade.h:74
+#: ../src/gnome2/preferences_dialog.c:1652
+msgid "Locale will take effect after restart."
+msgstr ""
+
+#: ../src/gnome2/preferences_dialog.c:1687 ../ui/prefs.glade.h:74
 msgid "Preferences"
-msgstr "הגדרות"
+msgstr "העדפות"
 
-#: ../src/gnome2/preferences_dialog.c:1760
+#: ../src/gnome2/preferences_dialog.c:1769
 msgid "Fonts"
 msgstr "גופנים"
 
-#: ../src/gnome2/preferences_dialog.c:1763
+#: ../src/gnome2/preferences_dialog.c:1772
 msgid "Color"
 msgstr "צבע"
 
-#: ../src/gnome2/preferences_dialog.c:1766
+#: ../src/gnome2/preferences_dialog.c:1775
 msgid "Sizes"
 msgstr "גדלים"
 
-#: ../src/gnome2/preferences_dialog.c:1770
+#: ../src/gnome2/preferences_dialog.c:1779
 msgid "General"
 msgstr "כללי"
 
-#: ../src/gnome2/preferences_dialog.c:1773
-#: ../ui/prefs.glade.h:85
+#: ../src/gnome2/preferences_dialog.c:1782 ../ui/prefs.glade.h:87
 msgid "Tabs and Panes"
 msgstr "לשוניות וחלוניות"
 
-#: ../src/gnome2/preferences_dialog.c:1780
+#: ../src/gnome2/preferences_dialog.c:1789
 msgid "Options"
 msgstr "אפשרויות"
 
-#: ../src/gnome2/preferences_dialog.c:1787
+#: ../src/gnome2/preferences_dialog.c:1796
 msgid "Main"
 msgstr "ראשי"
 
-#: ../src/gnome2/preferences_dialog.c:1793
+#: ../src/gnome2/preferences_dialog.c:1802
 msgid "Special"
 msgstr "מיוחד"
 
-#: ../src/gnome2/search_dialog.c:61
-#: ../src/main/search_dialog.cc:60
-#: ../src/main/search_sidebar.cc:54
+#: ../src/gnome2/search_dialog.c:68 ../src/main/search_dialog.cc:66
+#: ../src/main/search_sidebar.cc:61
 msgid "Searching the "
-msgstr "מחפש בתוך"
+msgstr "מחפש בתוך "
 
-#: ../src/gnome2/search_dialog.c:62
-#: ../src/main/search_dialog.cc:61
-#: ../src/main/search_sidebar.cc:55
+#: ../src/gnome2/search_dialog.c:69 ../src/main/search_dialog.cc:67
+#: ../src/main/search_sidebar.cc:62
 msgid " Module"
-msgstr "מודול"
+msgstr " מודול"
 
-#: ../src/gnome2/search_dialog.c:63
-#: ../src/main/search_dialog.cc:62
-#: ../src/main/search_sidebar.cc:56
+#: ../src/gnome2/search_dialog.c:70 ../src/main/search_dialog.cc:68
+#: ../src/main/search_sidebar.cc:63
 msgid "found in "
-msgstr "נמצא בתוך"
+msgstr "נמצא בתוך "
 
-#: ../src/gnome2/search_dialog.c:498
+#: ../src/gnome2/search_dialog.c:527
 msgid "Clear List?"
 msgstr "לנקות את הרשימה?"
 
-#: ../src/gnome2/search_dialog.c:499
+#: ../src/gnome2/search_dialog.c:528
 msgid "Are you sure you want to clear the module list?"
 msgstr "לנר"
 
-#: ../src/gnome2/search_dialog.c:679
+#: ../src/gnome2/search_dialog.c:708
 msgid "The last module list may not be deleted"
 msgstr "לא ניתן למחוק את רשימת המודולים האחרונה"
 
-#: ../src/gnome2/search_dialog.c:697
+#: ../src/gnome2/search_dialog.c:726
 msgid "Delete list?"
 msgstr "למחוק את הרשימה?"
 
-#: ../src/gnome2/search_dialog.c:698
+#: ../src/gnome2/search_dialog.c:727
 msgid "Are you sure you want to delete:"
 msgstr "האם למחוק:"
 
-#: ../src/gnome2/search_sidebar.c:189
+#: ../src/gnome2/search_sidebar.c:192
 msgid ""
 "This is an inclusive (\"AND\") search:\n"
 "Find matches showing all words."
@@ -1131,185 +1194,93 @@ msgstr ""
 "זהו חיפוש מכיל (\"AND\"):\n"
 "מצא את כל ההתאמות שכוללות את כל המילים."
 
-#: ../src/gnome2/search_sidebar.c:206
+#: ../src/gnome2/search_sidebar.c:209
 msgid "Search Module"
 msgstr "חפש במודול"
 
-#: ../src/gnome2/search_sidebar.c:220
+#: ../src/gnome2/search_sidebar.c:223
 msgid "Bible"
 msgstr "כתבי קודש"
 
-#: ../src/gnome2/search_sidebar.c:229
-#: ../ui/prefs.glade.h:35
+#: ../src/gnome2/search_sidebar.c:232 ../ui/prefs.glade.h:35
 msgid "Commentary"
 msgstr "פירוש"
 
-#: ../src/gnome2/search_sidebar.c:243
+#: ../src/gnome2/search_sidebar.c:246
 msgid "Search Type"
 msgstr "סוג חיפוש"
 
-#: ../src/gnome2/search_sidebar.c:257
-#: ../ui/search-dialog.glade.h:64
+#: ../src/gnome2/search_sidebar.c:260 ../ui/search-dialog.glade.h:66
 msgid "Multi word"
 msgstr "מרובה מלים"
 
-#: ../src/gnome2/search_sidebar.c:276
-#: ../ui/search-dialog.glade.h:44
+#: ../src/gnome2/search_sidebar.c:279 ../ui/search-dialog.glade.h:44
 msgid "Exact phrase"
 msgstr "ביטוי מדויק"
 
-#: ../src/gnome2/search_sidebar.c:290
+#: ../src/gnome2/search_sidebar.c:293
 msgid "Search Options"
 msgstr "אפשרויות חיפוש"
 
-#: ../src/gnome2/search_sidebar.c:318
+#: ../src/gnome2/search_sidebar.c:321
 msgid "Search Scope"
 msgstr "היקף חיפוש"
 
-#: ../src/gnome2/search_sidebar.c:331
+#: ../src/gnome2/search_sidebar.c:334
 msgid "No scope"
 msgstr "ללא היקף"
 
-#: ../src/gnome2/search_sidebar.c:341
+#: ../src/gnome2/search_sidebar.c:344
 msgid "Use bounds"
 msgstr "הצב גבולות"
 
-#: ../src/gnome2/search_sidebar.c:350
+#: ../src/gnome2/search_sidebar.c:353
 msgid "Last search"
 msgstr "חיפוש אחרון"
 
-#: ../src/gnome2/search_sidebar.c:365
+#: ../src/gnome2/search_sidebar.c:368
 msgid "Bounds"
 msgstr "גבולות"
 
-#: ../src/gnome2/search_sidebar.c:379
+#: ../src/gnome2/search_sidebar.c:382
 msgid "Lower"
 msgstr "תחתון"
 
-#: ../src/gnome2/search_sidebar.c:386
+#: ../src/gnome2/search_sidebar.c:389
 msgid "Upper"
 msgstr "עליון"
 
-#. 0
-#: ../src/gnome2/sidebar.c:963
-#: ../src/gnome2/sidebar.c:1131
-msgid "Open in a new tab"
-msgstr "פתח בלשונית חדשה"
-
-#: ../src/gnome2/sidebar.c:964
-#: ../src/gnome2/sidebar.c:1132
-msgid "Open selected module in a new tab"
-msgstr "פתח את המודול הנבחר בלשונית חדשה"
-
-#. 1
-#: ../src/gnome2/sidebar.c:969
-msgid "Open in a separate window"
-msgstr "פתח בחלון נפרד"
-
-#: ../src/gnome2/sidebar.c:970
-msgid "Open selected module in a separate ['dialog'] window"
-msgstr "פתח את המודול הנבחר בתיבת דיאלוג נפרדת"
-
-#: ../src/gnome2/sidebar.c:976
-#: ../src/gnome2/sidebar.c:1144
-msgid "View information about the selected dialog"
-msgstr "הצג מידע אודות המודול הנבחר"
-
-#: ../src/gnome2/sidebar.c:1067
-msgid "Simple"
-msgstr "קובץ"
-
-#: ../src/gnome2/sidebar.c:1068
-msgid "Create a new simple prayer list"
-msgstr "צור רשימת מודולים חדשה"
-
-#: ../src/gnome2/sidebar.c:1074
-msgid "Subject"
-msgstr "אובייקט Pixbuf"
-
-#: ../src/gnome2/sidebar.c:1081
-msgid "Monthly"
-msgstr "חודשי"
-
-#: ../src/gnome2/sidebar.c:1082
-#: ../src/gnome2/sidebar.c:1089
-#: ../src/gnome2/sidebar.c:1096
-msgid "Create a new prayer list"
-msgstr "צור רשימת מודולים חדשה"
-
-#: ../src/gnome2/sidebar.c:1088
-msgid "Daily Journal"
-msgstr "יומן יומי"
-
-#: ../src/gnome2/sidebar.c:1095
-msgid "Outlined Topic"
-msgstr "נושא מתואר"
-
-#. 1
-#: ../src/gnome2/sidebar.c:1137
-#: ../ui/xi-menus.glade.h:47
-msgid "Open in editor"
-msgstr "פתח בתיבת דיאלוג"
-
-#: ../src/gnome2/sidebar.c:1138
-msgid "Open selected module in a dialog"
-msgstr "פתח את המודול הנבחר בתיבת דיאלוג"
-
-#: ../src/gnome2/sidebar.c:1467
+#: ../src/gnome2/sidebar.c:1397
 msgid "Search"
 msgstr "חיפוש"
 
-#: ../src/gnome2/sidebar.c:1475
+#: ../src/gnome2/sidebar.c:1405
 msgid "Verse List"
 msgstr "רשימת פסוקים"
 
-#: ../src/gnome2/sidebar_dialog.c:136
-#: ../src/gnome2/sidebar_dialog.c:145
+#: ../src/gnome2/sidebar_dialog.c:139 ../src/gnome2/sidebar_dialog.c:148
 msgid "Sidebar"
 msgstr "שורת צד"
 
-#: ../src/gnome2/splash.c:363
+#: ../src/gnome2/splash.c:396
 msgid "Powered by the SWORD Project"
 msgstr "מושתת על פרויקט SWORD"
 
-#: ../src/gnome2/treekey-editor.c:130
-#: ../src/gnome2/treekey-editor.c:189
-#: ../src/gnome2/treekey-editor.c:275
+#: ../src/gnome2/treekey-editor.c:137 ../src/gnome2/treekey-editor.c:196
+#: ../src/gnome2/treekey-editor.c:282
 msgid "Prayer List/Journal Item"
 msgstr "פריט יומן\\רשימת תפילות"
 
-#: ../src/gnome2/treekey-editor.c:131
-#: ../src/gnome2/treekey-editor.c:190
-#: ../src/gnome2/treekey-editor.c:276
+#: ../src/gnome2/treekey-editor.c:138 ../src/gnome2/treekey-editor.c:197
+#: ../src/gnome2/treekey-editor.c:283
 msgid "New name"
 msgstr "מסמך חדש"
 
-#: ../src/gnome2/treekey-editor.c:246
+#: ../src/gnome2/treekey-editor.c:253
 msgid "Remove the selected item"
 msgstr "להסיר התיקייה שנבחרה"
 
-#: ../src/gnome2/treekey-editor.c:304
-msgid "Add Child"
-msgstr "הוסף צאצא"
-
-#: ../src/gnome2/treekey-editor.c:305
-#: ../src/gnome2/treekey-editor.c:311
-msgid "Add an item"
-msgstr "הוסף כפריט"
-
-#: ../src/gnome2/treekey-editor.c:310
-msgid "Add Sibling"
-msgstr "הוסף אח"
-
-#: ../src/gnome2/treekey-editor.c:317
-msgid "Remove this item"
-msgstr "הסר - שחזר"
-
-#: ../src/gnome2/treekey-editor.c:323
-msgid "Edit this item"
-msgstr "הדפס הערה"
-
-#: ../src/main/display.cc:301
+#: ../src/main/display.cc:259
 #, c-format
 msgid ""
 "Improperly encoded personal annotation label:\n"
@@ -1318,7 +1289,7 @@ msgstr ""
 "קידוד שגוי בתיבת הערות אישיות:\n"
 "'%s'"
 
-#: ../src/main/display.cc:427
+#: ../src/main/display.cc:386
 msgid ""
 "An image file's size could not be determined.\n"
 "Is ImageMagick's 'identify' not installed?\n"
@@ -1330,317 +1301,283 @@ msgstr ""
 "(ייתכן גם שהתמונה אינה מסוג bmp/gif/jpg/png.)\n"
 "לא ניתן להתאים את גודל התמונות לחלון."
 
-#: ../src/main/display.cc:1084
-#: ../src/main/display.cc:1146
-#: ../src/main/display.cc:1234
-#: ../src/main/display.cc:1242
-#: ../ui/export-dialog.glade.h:7
+#: ../src/main/display.cc:1043 ../src/main/display.cc:1095
+#: ../src/main/display.cc:1172 ../ui/export-dialog.glade.h:7
 msgid "Chapter"
 msgstr "פרק"
 
-#: ../src/main/main.c:110
+#: ../src/main/main.c:119
 msgid "Xiphos does not understand more than one argument."
 msgstr "Xiphos אינה מפענחת יותר מארגומנט אחד"
 
-#: ../src/main/main.c:150
+#: ../src/main/main.c:161
 msgid "Initiating Gecko"
 msgstr "מפעיל את Xiphos"
 
-#: ../src/main/main.c:156
+#: ../src/main/main.c:167
 msgid "Building Interface"
 msgstr "ממשק בנייה"
 
-#: ../src/main/main.c:160
+#: ../src/main/main.c:171
 msgid "Starting Sword"
 msgstr "מתחיל את Sword"
 
-#: ../src/main/main.c:164
+#: ../src/main/main.c:175
 msgid "Loading Settings"
 msgstr "טוען הגדרות"
 
-#: ../src/main/main.c:168
+#: ../src/main/main.c:179
 msgid "Displaying Xiphos"
 msgstr "מציג את Xiphos"
 
-#: ../src/main/module_dialogs.cc:232
-#: ../src/main/previewer.cc:122
-#: ../ui/prefs.glade.h:75
+#: ../src/main/module_dialogs.cc:227 ../src/main/previewer.cc:127
+#: ../src/main/previewer.cc:194 ../ui/prefs.glade.h:75
 msgid "Previewer"
 msgstr "תצוגה מקדימה"
 
-#: ../src/main/module_dialogs.cc:298
-#: ../src/main/module_dialogs.cc:424
-#: ../src/main/previewer.cc:197
+#: ../src/main/module_dialogs.cc:292 ../src/main/module_dialogs.cc:416
+#: ../src/main/previewer.cc:269
 msgid "Footnote"
 msgstr "הערת שוליים"
 
-#: ../src/main/module_dialogs.cc:304
-#: ../src/main/module_dialogs.cc:429
-#: ../src/main/previewer.cc:209
+#: ../src/main/module_dialogs.cc:298 ../src/main/module_dialogs.cc:421
+#: ../src/main/previewer.cc:281
 msgid "Cross Reference"
 msgstr "הפנייה צולבת"
 
-#: ../src/main/module_dialogs.cc:310
-#: ../src/main/module_dialogs.cc:324
-#: ../src/main/module_dialogs.cc:434
-#: ../src/main/module_dialogs.cc:446
-#: ../src/main/previewer.cc:215
-#: ../src/main/previewer.cc:234
+#: ../src/main/module_dialogs.cc:304 ../src/main/module_dialogs.cc:318
+#: ../src/main/module_dialogs.cc:426 ../src/main/module_dialogs.cc:438
+#: ../src/main/previewer.cc:287 ../src/main/previewer.cc:306
 msgid "Strongs"
 msgstr "סטרונג"
 
-#: ../src/main/module_dialogs.cc:316
-#: ../src/main/module_dialogs.cc:335
-#: ../src/main/module_dialogs.cc:439
-#: ../src/main/module_dialogs.cc:456
-#: ../src/main/previewer.cc:221
-#: ../src/main/previewer.cc:247
+#: ../src/main/module_dialogs.cc:310 ../src/main/module_dialogs.cc:329
+#: ../src/main/module_dialogs.cc:431 ../src/main/module_dialogs.cc:448
+#: ../src/main/previewer.cc:293 ../src/main/previewer.cc:319
 msgid "Morphology"
 msgstr "מורפולוגיה"
 
-#: ../src/main/module_dialogs.cc:1089
-#: ../src/main/url.cc:537
+#: ../src/main/module_dialogs.cc:1081 ../src/main/url.cc:530
 msgid "Back to "
-msgstr "חזרה אל"
+msgstr "חזרה אל "
 
-#: ../src/main/parallel_view.cc:398
-#: ../ui/xi-menus.glade.h:69
+#: ../src/main/parallel_view.cc:404 ../ui/xi-menus.glade.h:89
 msgid "Strong's Numbers"
 msgstr "מספרי סטרונג"
 
-#: ../src/main/parallel_view.cc:408
-#: ../ui/search-dialog.glade.h:50
-#: ../ui/xi-menus.glade.h:27
+#: ../src/main/parallel_view.cc:414 ../ui/search-dialog.glade.h:52
+#: ../ui/xi-menus.glade.h:40
 msgid "Footnotes"
 msgstr "הערות שוליים"
 
-#: ../src/main/parallel_view.cc:418
-#: ../ui/search-dialog.glade.h:62
-#: ../ui/xi-menus.glade.h:41
+#: ../src/main/parallel_view.cc:424 ../ui/search-dialog.glade.h:64
+#: ../ui/xi-menus.glade.h:55
 msgid "Morphological Tags"
 msgstr "תגיות מורפולוגיות"
 
-#: ../src/main/parallel_view.cc:428
-#: ../ui/xi-menus.glade.h:31
+#: ../src/main/parallel_view.cc:434 ../ui/xi-menus.glade.h:44
 msgid "Hebrew Vowel Points"
 msgstr "ניקוד עברי"
 
-#: ../src/main/parallel_view.cc:438
-#: ../ui/xi-menus.glade.h:30
+#: ../src/main/parallel_view.cc:444 ../ui/xi-menus.glade.h:43
 msgid "Hebrew Cantillation"
 msgstr "טעמי המקרא"
 
-#: ../src/main/parallel_view.cc:448
-#: ../ui/xi-menus.glade.h:28
+#: ../src/main/parallel_view.cc:454 ../ui/xi-menus.glade.h:41
 msgid "Greek Accents"
 msgstr "הטעמות יווניות"
 
-#: ../src/main/parallel_view.cc:458
+#: ../src/main/parallel_view.cc:464
 msgid "Cross-references"
 msgstr "הפניות צולבות"
 
-#: ../src/main/parallel_view.cc:468
-#: ../ui/xi-menus.glade.h:37
+#: ../src/main/parallel_view.cc:474 ../ui/xi-menus.glade.h:50
 msgid "Lemmas"
 msgstr "כותרות פירושים"
 
-#: ../src/main/parallel_view.cc:478
-#: ../ui/xi-menus.glade.h:29
+#: ../src/main/parallel_view.cc:484 ../ui/xi-menus.glade.h:42
 msgid "Headings"
 msgstr "כותרות"
 
-#: ../src/main/parallel_view.cc:488
+#: ../src/main/parallel_view.cc:494
 msgid "Morpheme Segmentation"
 msgstr "התחלקות מורפמות"
 
-#: ../src/main/parallel_view.cc:498
-#: ../ui/xi-menus.glade.h:75
+#: ../src/main/parallel_view.cc:504 ../ui/xi-menus.glade.h:96
 msgid "Words of Christ in Red"
 msgstr "מילות הצלוב באדום"
 
-#: ../src/main/parallel_view.cc:508
-#: ../ui/xi-menus.glade.h:70
+#: ../src/main/parallel_view.cc:514 ../ui/xi-menus.glade.h:91
 msgid "Transliteration"
 msgstr "תעתיק"
 
-#: ../src/main/parallel_view.cc:518
+#: ../src/main/parallel_view.cc:524
 msgid "Textual Variants"
 msgstr "משתנים טקסטואליים"
 
-#: ../src/main/parallel_view.cc:526
-#: ../ui/xi-menus.glade.h:51
+#: ../src/main/parallel_view.cc:532 ../ui/xi-menus.glade.h:70
 msgid "Primary Reading"
 msgstr "קריאה עיקרית"
 
-#: ../src/main/parallel_view.cc:535
-#: ../ui/xi-menus.glade.h:65
+#: ../src/main/parallel_view.cc:541 ../ui/xi-menus.glade.h:84
 msgid "Secondary Reading"
 msgstr "קריאה משנית"
 
-#: ../src/main/parallel_view.cc:544
-#: ../ui/xi-menus.glade.h:5
+#: ../src/main/parallel_view.cc:550 ../ui/xi-menus.glade.h:9
 msgid "All Readings"
 msgstr "כל הקריאות"
 
-#: ../src/main/parallel_view.cc:878
-#: ../src/main/parallel_view.cc:1130
+#: ../src/main/parallel_view.cc:884 ../src/main/parallel_view.cc:1136
 msgid "view context"
 msgstr "כתבי קודש"
 
-#: ../src/main/prayerlists.cc:71
+#: ../src/main/prayerlists.cc:74
 msgid "January"
 msgstr "ינואר"
 
-#: ../src/main/prayerlists.cc:72
+#: ../src/main/prayerlists.cc:75
 msgid "February"
 msgstr "פברואר"
 
-#: ../src/main/prayerlists.cc:73
+#: ../src/main/prayerlists.cc:76
 msgid "March"
 msgstr "חיפוש"
 
-#: ../src/main/prayerlists.cc:74
+#: ../src/main/prayerlists.cc:77
 msgid "April"
 msgstr "אפריל"
 
-#: ../src/main/prayerlists.cc:75
+#: ../src/main/prayerlists.cc:78
 msgid "May"
 msgstr "מאי"
 
-#: ../src/main/prayerlists.cc:76
+#: ../src/main/prayerlists.cc:79
 msgid "June"
 msgstr "יוני"
 
-#: ../src/main/prayerlists.cc:77
+#: ../src/main/prayerlists.cc:80
 msgid "July"
 msgstr "יולי"
 
-#: ../src/main/prayerlists.cc:78
+#: ../src/main/prayerlists.cc:81
 msgid "August"
 msgstr "אוגוסט"
 
-#: ../src/main/prayerlists.cc:79
+#: ../src/main/prayerlists.cc:82
 msgid "September"
 msgstr "ספטמבר"
 
-#: ../src/main/prayerlists.cc:80
+#: ../src/main/prayerlists.cc:83
 msgid "October"
 msgstr "אוקטובר"
 
-#: ../src/main/prayerlists.cc:81
+#: ../src/main/prayerlists.cc:84
 msgid "November"
 msgstr "עטיפה"
 
-#: ../src/main/prayerlists.cc:82
+#: ../src/main/prayerlists.cc:85
 msgid "December"
 msgstr "דצמבר"
 
-#: ../src/main/prayerlists.cc:121
-#: ../src/main/sword_treekey.cc:332
+#: ../src/main/prayerlists.cc:124 ../src/main/sword_treekey.cc:332
 msgid "Growth"
 msgstr "התחזקות"
 
-#: ../src/main/prayerlists.cc:122
-#: ../src/main/sword_treekey.cc:333
+#: ../src/main/prayerlists.cc:125 ../src/main/sword_treekey.cc:333
 msgid "<b>For Growth</b><br>"
 msgstr "<b>לשם התחזקות</b><br>"
 
-#: ../src/main/prayerlists.cc:123
-#: ../src/main/prayerlists.cc:380
+#: ../src/main/prayerlists.cc:126 ../src/main/prayerlists.cc:383
 #: ../src/main/sword_treekey.cc:334
 msgid "Salvation"
 msgstr "כותרת"
 
-#: ../src/main/prayerlists.cc:124
-#: ../src/main/sword_treekey.cc:335
+#: ../src/main/prayerlists.cc:127 ../src/main/sword_treekey.cc:335
 msgid "<b>For Salvation</b><br>"
 msgstr "<b>לשם ישועה</b><br>"
 
-#: ../src/main/prayerlists.cc:125
-#: ../src/main/prayerlists.cc:384
+#: ../src/main/prayerlists.cc:128 ../src/main/prayerlists.cc:387
 #: ../src/main/sword_treekey.cc:336
 msgid "Health"
 msgstr "בריאות"
 
-#: ../src/main/prayerlists.cc:126
-#: ../src/main/sword_treekey.cc:337
+#: ../src/main/prayerlists.cc:129 ../src/main/sword_treekey.cc:337
 msgid "<b>For Health</b><br>"
 msgstr "<b>לשם בריאות</b><br>"
 
-#: ../src/main/prayerlists.cc:127
+#: ../src/main/prayerlists.cc:130
 msgid "Misc"
 msgstr "שונות"
 
-#: ../src/main/prayerlists.cc:128
-#: ../src/main/sword_treekey.cc:339
+#: ../src/main/prayerlists.cc:131 ../src/main/sword_treekey.cc:339
 msgid "<b>Miscellaneous</b><br>"
 msgstr "<b>גופן - שונות</b>"
 
-#: ../src/main/prayerlists.cc:136
+#: ../src/main/prayerlists.cc:139
 msgid "Point x"
 msgstr "הדפס"
 
-#: ../src/main/prayerlists.cc:137
+#: ../src/main/prayerlists.cc:140
 msgid "<b>(x)</b><br>"
 msgstr "<b>(x)</b><br>"
 
-#: ../src/main/prayerlists.cc:138
+#: ../src/main/prayerlists.cc:141
 msgid "Point y"
 msgstr "הדפס"
 
-#: ../src/main/prayerlists.cc:139
+#: ../src/main/prayerlists.cc:142
 msgid "<b>(y)</b><br>"
 msgstr "<b>(y)</b><br>"
 
-#: ../src/main/prayerlists.cc:140
+#: ../src/main/prayerlists.cc:143
 msgid "Point z"
 msgstr "הדפס"
 
-#: ../src/main/prayerlists.cc:141
+#: ../src/main/prayerlists.cc:144
 msgid "<b>(z)</b><br>"
 msgstr "<b>(z)</b><br>"
 
-#: ../src/main/prayerlists.cc:149
+#: ../src/main/prayerlists.cc:152
 msgid "Minor Topic 1"
 msgstr "נושא משני 1"
 
-#: ../src/main/prayerlists.cc:150
+#: ../src/main/prayerlists.cc:153
 msgid "<b>Subtopic 1</b><br>"
 msgstr "<b>היקף</b>"
 
-#: ../src/main/prayerlists.cc:152
+#: ../src/main/prayerlists.cc:155
 msgid "Minor Topic 2"
 msgstr "נושא משני 2"
 
-#: ../src/main/prayerlists.cc:153
+#: ../src/main/prayerlists.cc:156
 msgid "<b>Subtopic 2</b><br>"
 msgstr "<b>היקף</b>"
 
-#: ../src/main/prayerlists.cc:155
+#: ../src/main/prayerlists.cc:158
 msgid "Minor Topic 3"
 msgstr "נושא משני 3"
 
-#: ../src/main/prayerlists.cc:156
+#: ../src/main/prayerlists.cc:159
 msgid "<b>Subtopic 3</b><br>"
 msgstr "<b>היקף</b>"
 
-#: ../src/main/prayerlists.cc:158
+#: ../src/main/prayerlists.cc:161
 msgid "Minor Topic 4"
 msgstr "נושא משני 4"
 
-#: ../src/main/prayerlists.cc:159
+#: ../src/main/prayerlists.cc:162
 msgid "<b>Subtopic 4</b><br>"
 msgstr "<b>היקף</b>"
 
-#: ../src/main/prayerlists.cc:239
+#: ../src/main/prayerlists.cc:242
 msgid "Name for new prayer list or journal"
 msgstr "שם עבור יומן או רשימת תפילות"
 
-#: ../src/main/prayerlists.cc:270
+#: ../src/main/prayerlists.cc:273
 msgid "Xiphos finds that prayer list already."
 msgstr "רשימת התפילות הזו כבר נמצאה."
 
-#: ../src/main/prayerlists.cc:283
+#: ../src/main/prayerlists.cc:286
 #, c-format
 msgid ""
 "Xiphos cannot create module's path:\n"
@@ -1649,128 +1586,130 @@ msgstr ""
 "לא ניתן ליצור את הנתיב למודול:\n"
 "%s"
 
-#: ../src/main/prayerlists.cc:323
+#: ../src/main/prayerlists.cc:326
 msgid "A basic prayer list. \\par\\par Module created by Xiphos."
 msgstr "A basic prayer list. \\par\\par Module created by Xiphos."
 
-#: ../src/main/prayerlists.cc:324
+#: ../src/main/prayerlists.cc:327
 msgid "BasicPrayerList"
 msgstr "רשימת-תפילות-בסיסית"
 
-#: ../src/main/prayerlists.cc:338
+#: ../src/main/prayerlists.cc:341
 msgid "MyPrayerList"
 msgstr "רשימת התפילות שלי"
 
-#: ../src/main/prayerlists.cc:339
-msgid "<b>People:</b><br>Bob<br>Sam<br>Sue<br><br><b>Church:</b><br>pews<br>fellowship<br>Bibles for missionaries<br><br><br>"
-msgstr "<b>אנשים:</b><br>בנימין<br>שמואל<br>שושנה<br><br><b>כנסייה:</b><br>מושבים<br>אחווה<br>ספרים למסיונרים<br><br><br>"
+#: ../src/main/prayerlists.cc:342
+msgid ""
+"<b>People:</b><br>Bob<br>Sam<br>Sue<br><br><b>Church:</b><br>pews<br>fellowsh"
+"ip<br>Bibles for missionaries<br><br><br>"
+msgstr ""
+"<b>אנשים:</b><br>בנימין<br>שמואל<br>שושנה<br><br><b>כנסייה:</b><br>מושבים<br>"
+"אחווה<br>ספרים למסיונרים<br><br><br>"
 
-#: ../src/main/prayerlists.cc:365
+#: ../src/main/prayerlists.cc:368
 msgid "A subject-based prayer list. \\par\\par Module created by Xiphos."
 msgstr "רשימת תפילות על פי נושא. מודול אחד-לאחד שנבנה על ידי Xiphos."
 
-#: ../src/main/prayerlists.cc:366
+#: ../src/main/prayerlists.cc:369
 msgid "SubjectPrayerList"
 msgstr "רשימת-תפילות-נושא"
 
-#: ../src/main/prayerlists.cc:381
+#: ../src/main/prayerlists.cc:384
 msgid "Bob<br>Sam<br>Sue<br>John<br>"
 msgstr "בנימין<br>שמואל<br>שושנה<br>יוחנן<br>"
 
-#: ../src/main/prayerlists.cc:382
+#: ../src/main/prayerlists.cc:385
 msgid "Spiritual Growth"
 msgstr "התחזקות רוחנית"
 
-#: ../src/main/prayerlists.cc:383
+#: ../src/main/prayerlists.cc:386
 msgid "Mike<br>Steve<br>"
 msgstr "מיכאל<br>טוביה<br>"
 
-#: ../src/main/prayerlists.cc:385
+#: ../src/main/prayerlists.cc:388
 msgid "Sue<br>John<br>"
 msgstr "שושנה<br>יוחנן<br>"
 
-#: ../src/main/prayerlists.cc:411
+#: ../src/main/prayerlists.cc:414
 msgid "A monthly prayer list. \\par\\par Module created by Xiphos."
 msgstr "רשימת תפילות חודשית. מודול אחד-לאחד שנבנה על ידי Xiphos."
 
-#: ../src/main/prayerlists.cc:412
+#: ../src/main/prayerlists.cc:415
 msgid "MonthlyPrayerList"
 msgstr "רשימת-תפילות-חודשית"
 
-#: ../src/main/prayerlists.cc:463
+#: ../src/main/prayerlists.cc:466
 msgid "A daily journal. \\par\\par Module created by Xiphos."
 msgstr "יומן יומי. מודול אחד-לאחד שנבנה על ידי Xiphos."
 
-#: ../src/main/prayerlists.cc:464
+#: ../src/main/prayerlists.cc:467
 msgid "DailyJournal"
 msgstr "יומן-יומי"
 
-#: ../src/main/prayerlists.cc:528
+#: ../src/main/prayerlists.cc:531
 msgid "An outlined topic (e.g. sermon). \\par\\par Module created by Xiphos."
 msgstr "נושא מתואר (למשל, דרשה). מודול אחד-לאחד שנבנה על ידי Xiphos."
 
-#: ../src/main/prayerlists.cc:529
+#: ../src/main/prayerlists.cc:532
 msgid "OutlinedTopic"
 msgstr "נושא-מתואר"
 
-#: ../src/main/prayerlists.cc:543
+#: ../src/main/prayerlists.cc:546
 msgid "Major Topic A"
 msgstr "נושא עיקרי א'"
 
-#: ../src/main/prayerlists.cc:544
+#: ../src/main/prayerlists.cc:547
 msgid "<b>Major Topic A</b><br>"
 msgstr "<b>נושא עיקרי א'</b><br>"
 
-#: ../src/main/prayerlists.cc:546
+#: ../src/main/prayerlists.cc:549
 msgid "Major Topic B"
 msgstr "נושא עיקרי ב'"
 
-#: ../src/main/prayerlists.cc:547
+#: ../src/main/prayerlists.cc:550
 msgid "<b>Major Topic B</b><br>"
 msgstr "<b>נושא עיקרי ב'</b><br>"
 
-#: ../src/main/prayerlists.cc:549
+#: ../src/main/prayerlists.cc:552
 msgid "Major Topic C"
 msgstr "נושא עיקרי ג'"
 
-#: ../src/main/prayerlists.cc:550
+#: ../src/main/prayerlists.cc:553
 msgid "<b>Major Topic C</b><br>"
 msgstr "<b>נושא עיקרי ג'</b><br>"
 
-#: ../src/main/previewer.cc:203
+#: ../src/main/previewer.cc:275
 msgid "User Annotation"
 msgstr "הערות משתמש"
 
-#: ../src/main/search_dialog.cc:129
+#: ../src/main/search_dialog.cc:212
 #, c-format
 msgid "Search result %s: %s"
 msgstr "תוצאות החיפוש %s: %s"
 
-#: ../src/main/search_dialog.cc:361
+#: ../src/main/search_dialog.cc:444
 msgid "Delete Range?"
 msgstr "טווח למחיקה?"
 
-#: ../src/main/search_dialog.cc:362
+#: ../src/main/search_dialog.cc:445
 msgid "Are you sure you want to delete this range?"
 msgstr "האם למחוק טווח זה?"
 
-#: ../src/main/search_dialog.cc:576
-#: ../src/main/search_dialog.cc:1047
-#: ../src/main/search_dialog.cc:1050
-#: ../src/main/search_dialog.cc:1072
-#: ../src/main/search_dialog.cc:1075
+#: ../src/main/search_dialog.cc:659 ../src/main/search_dialog.cc:1130
+#: ../src/main/search_dialog.cc:1133 ../src/main/search_dialog.cc:1155
+#: ../src/main/search_dialog.cc:1158
 msgid "Search: "
-msgstr "חיפוש"
+msgstr "חיפוש "
 
-#: ../src/main/search_dialog.cc:621
+#: ../src/main/search_dialog.cc:704
 msgid "Remove Module?"
 msgstr "להסיר את המודול?"
 
-#: ../src/main/search_dialog.cc:622
+#: ../src/main/search_dialog.cc:705
 msgid "Are you sure you want to remove the selected module?"
 msgstr "האם להסיר את המודול הנבחר?"
 
-#: ../src/main/search_dialog.cc:1471
+#: ../src/main/search_dialog.cc:1560
 #, c-format
 msgid ""
 "%s:\n"
@@ -1781,16 +1720,16 @@ msgstr ""
 "לא מותקן מודול כזה.\n"
 "%s"
 
-#: ../src/main/search_dialog.cc:1473
+#: ../src/main/search_dialog.cc:1562
 msgid "Please adjust the module list."
 msgstr "שמור רשימת מודולים"
 
-#: ../src/main/search_dialog.cc:1489
+#: ../src/main/search_dialog.cc:1578
 #, c-format
 msgid "No fast-search index exists for %s.%s%s"
 msgstr "אין אינדקס לחיפוש מהיר עבור %s.%s%s"
 
-#: ../src/main/search_dialog.cc:1491
+#: ../src/main/search_dialog.cc:1580
 msgid ""
 "\n"
 "Search on this module is now `multi word'."
@@ -1798,7 +1737,7 @@ msgstr ""
 "\n"
 "החיפוש במודול זה הוא מעתה 'מרובה מלים'."
 
-#: ../src/main/search_dialog.cc:1492
+#: ../src/main/search_dialog.cc:1581
 msgid ""
 "\n"
 "See the Module Manager, Maintenance pane."
@@ -1806,21 +1745,23 @@ msgstr ""
 "\n"
 "ראו בחלונית התחזוקה שבמנהל המודולים."
 
-#: ../src/main/search_dialog.cc:1553
+#: ../src/main/search_dialog.cc:1644
 msgid "Search finished"
 msgstr "החיפוש הושלם"
 
-#: ../src/main/search_sidebar.cc:93
+#: ../src/main/search_sidebar.cc:100
 msgid "matches"
 msgstr "התאמות"
 
-#: ../src/main/settings.c:56
+#: ../src/main/settings.c:60
 msgid ""
 "Welcome to Xiphos.\n"
 "\n"
-"There are no Bible modules installed. In order to initialize, Xiphos needs you to install at least one Bible.\n"
+"There are no Bible modules installed. In order to initialize, Xiphos needs "
+"you to install at least one Bible.\n"
 "\n"
-"With your permission, Xiphos will invoke the Module Manager so that you may install from Crosswire:\n"
+"With your permission, Xiphos will invoke the Module Manager so that you may "
+"install from Crosswire:\n"
 "1. Configure remote install.\n"
 "2. Connect.\n"
 "3. Select a Bible text of your language preference.\n"
@@ -1833,7 +1774,8 @@ msgid ""
 msgstr ""
 "ברוכים הבאים ל-Xiphos.\n"
 "\n"
-"לא מותקנים כרגע מודולי כתבי קודש. כדי לפעול, Xiphos זקוק להתקנה של מודול כתבי קודש אחד לפחות.\n"
+"לא מותקנים כרגע מודולי כתבי קודש. כדי לפעול, Xiphos זקוק להתקנה של מודול "
+"כתבי קודש אחד לפחות.\n"
 "\n"
 "ברשותכם, Xiphos יפעיל את מנהל המודולים כדי שתוכלו להתקין דרך Crosswire:\n"
 "1. קבעו תצורת התקנה מרחוק.\n"
@@ -1846,28 +1788,11 @@ msgstr ""
 "\n"
 "האם להפעיל את מנהל המודולים לשם התקנת כתבי קודש?"
 
-#: ../src/main/settings.c:109
+#: ../src/main/settings.c:105
 msgid "$HOME is not set!"
 msgstr "לא נקבע $HOME!"
 
-#: ../src/main/settings.c:124
-msgid "Xiphos has renamed .xiphos-2.0 to .xiphos"
-msgstr "Xiphos שינתה את השם .xiphos-2.0 ל .xiphos"
-
-#: ../src/main/settings.c:127
-#, c-format
-msgid ""
-"Xiphos can not rename  .xiphos-2.0 to .xiphos:\n"
-"%s\n"
-"\n"
-"Xiphos cannot continue."
-msgstr ""
-"Xiphos אינה מסוגלת לשנות את השם  .xiphos-2.0 ל .xiphos:\n"
-"%s\n"
-"\n"
-"לא ניתן להמשיך."
-
-#: ../src/main/settings.c:135
+#: ../src/main/settings.c:120
 #, c-format
 msgid ""
 "Xiphos can not create  .xiphos:\n"
@@ -1880,13 +1805,12 @@ msgstr ""
 "\n"
 "לא ניתן להמשיך."
 
-#: ../src/main/settings.c:148
-#: ../src/main/settings.c:156
-#: ../src/main/settings.c:164
+#: ../src/main/settings.c:133 ../src/main/settings.c:142
+#: ../src/main/settings.c:151
 msgid "can not create "
-msgstr "לא ניתן ליצור"
+msgstr "לא ניתן ליצור "
 
-#: ../src/main/settings.c:196
+#: ../src/main/settings.c:194
 msgid ""
 "There are still no Bibles installed.\n"
 "Evidently, you declined to install any.\n"
@@ -1902,11 +1826,11 @@ msgstr ""
 "Xiphos אינה יכולה להמשיך,\n"
 "ולכן תיסגר."
 
-#: ../src/main/settings.c:200
+#: ../src/main/settings.c:198
 msgid "Bible module installation complete."
 msgstr "התקנת מודול כתבי קודש הושלמה."
 
-#: ../src/main/settings.c:203
+#: ../src/main/settings.c:201
 msgid ""
 "Without any Bible modules to display,\n"
 "Xiphos cannot proceed,\n"
@@ -1916,75 +1840,15 @@ msgstr ""
 "Xiphos אינה יכולה להמשיך,\n"
 "ולכן תיסגר."
 
-#. *****************************************************************************
-#. * Name
-#. *    gconf_setup
-#. *
-#. * Synopsis
-#. *   #include "main/settings.h"
-#. *
-#. *   void gconf_setup()
-#. *
-#. * Description
-#. *   verifies and initializes the GConf subsystem, so that "sword://" and
-#. *   similar can be handled by url-comprehending programs such as browsers.
-#. *   dialogs for permission/success/failure => conditional on debug build.
-#. *
-#. * Return value
-#. *   void
-#.
-#: ../src/main/settings.c:794
-msgid ""
-"URL references using \"sword://\" (similar to web page\n"
-"references) can be used by programs to look up\n"
-"scripture references. Your system currently has no\n"
-"program set to handle these references.\n"
-"\n"
-"Would you like Xiphos to set itself as the\n"
-"program to handle these references?"
-msgstr ""
-"הפניות URL של \"sword://\" (בדומה לדפי\n"
-"רשת) יכולות לאפשר לתוכנות לאתר\n"
-"הפניות לכתבי הקודש. כרגע לא מוגדרת\n"
-"במערכת שלך תוכנה לטיפול בהפניות אלה.\n"
-"\n"
-"האם ברצונך לקבוע את קסיפוס כתוכנת\n"
-"ברירת המחדל לטיפול בהפניות אלה?"
-
-#: ../src/main/settings.c:796
-msgid ""
-"Xiphos has successfully set itself\n"
-"as the handler of sword:// and bible:// URLs.\n"
-"\n"
-"You may wish to run the program \"gconf-editor\"\n"
-"to examine keys under /desktop/gnome/url-handlers,\n"
-"if you need to change these."
-msgstr ""
-"Xiphos הגדירה את עצמה בהצלחה\n"
-"כתובנה לטיפול בכתובות sword:// and bible://.\n"
-"\n"
-"ניתן להריץ את התוכנה \"gconf-editor\"\n"
-"על מנת לעיין במפתחות תחת /desktop/gnome/url-handlers,\n"
-"אם עולה הצורך לשנותם."
-
-#: ../src/main/settings.c:849
-#, c-format
-msgid ""
-"Xiphos failed to complete handler init for key #%d:\n"
-"%s"
-msgstr ""
-"Xiphos לא הצליחה להשלים את אתחול הליך הטיפול עבור המפתח #%d:\n"
-"%s"
-
-#: ../src/main/sidebar.cc:376
+#: ../src/main/sidebar.cc:399
 msgid "verse"
 msgstr "פסוק"
 
-#: ../src/main/sidebar.cc:438
+#: ../src/main/sidebar.cc:461
 msgid "chapter"
 msgstr "פרק"
 
-#: ../src/main/sword.cc:546
+#: ../src/main/sword.cc:537
 msgid ""
 "Xiphos's file for language\n"
 "abbreviations is missing."
@@ -1992,7 +1856,7 @@ msgstr ""
 "קובץ השפה\\הקיצורים\n"
 "של Xiphos חסר."
 
-#: ../src/main/sword.cc:553
+#: ../src/main/sword.cc:544
 msgid ""
 "Xiphos's language abbreviation\n"
 "file cannot be opened."
@@ -2000,7 +1864,7 @@ msgstr ""
 "לא ניתן לפתוח את קובץ\n"
 "השפה\\הקיצורים של Xiphos."
 
-#: ../src/main/sword.cc:566
+#: ../src/main/sword.cc:557
 msgid ""
 "Xiphos cannot allocate space\n"
 "for language abbreviations."
@@ -2008,7 +1872,7 @@ msgstr ""
 "לא ניתן להקצות שטח\n"
 "לקיצורי השפה של Xiphos."
 
-#: ../src/main/sword.cc:573
+#: ../src/main/sword.cc:564
 msgid ""
 "Xiphos cannot read the\n"
 "language abbreviation file."
@@ -2016,42 +1880,41 @@ msgstr ""
 "לא ניתן לקרוא את קובץ\n"
 "קיצורי השפה של Xiphos."
 
-#: ../src/main/sword.cc:1191
-msgid "Daily devotional was requested, but there are none installed."
-msgstr "ביקשת דרשה יומית, אך אף מודול דרשות אינו מותקן."
+#: ../src/main/sword.cc:642
+msgid "No matching locale found for"
+msgstr ""
 
-#: ../src/main/tab_history.c:92
-msgid "H_istory/<Separator>"
-msgstr "היסטוריה/<Separator>"
+#: ../src/main/sword.cc:644
+msgid "Book names and menus may not be translated"
+msgstr ""
 
-#: ../src/main/tab_history.c:94
-msgid "H_istory/C_lear"
-msgstr "היסטוריה/נקה"
+#: ../src/main/sword.cc:1232
+msgid "Daily devotional was requested, but there are none installed."
+msgstr "ביקשת דרשה יומית, אך אף מודול דרשות אינו מותקן."
 
 #: ../src/main/tab_history.c:219
 msgid "Clear History"
 msgstr "נקה את רשימת ההסטוריה"
 
-#: ../src/main/url.cc:99
+#: ../src/main/url.cc:101
 msgid "URL not found:"
 msgstr "%s לא נמצא"
 
-#: ../src/main/url.cc:194
+#: ../src/main/url.cc:191
 #, c-format
 msgid "Xiphos could not execute %s"
 msgstr "לא ניתן להריץ את %s"
 
-#: ../src/main/url.cc:202
+#: ../src/main/url.cc:199
 msgid "Viewer error:\n"
 msgstr "שגיאת תצוגה:\n"
 
-#: ../src/main/url.cc:278
+#: ../src/main/url.cc:272
 #, c-format
 msgid "Show %s in main window"
 msgstr "הצג %s בחלון הראשי"
 
-#: ../src/main/xml.c:80
-#: ../src/main/xml.c:464
+#: ../src/main/xml.c:80 ../src/main/xml.c:464
 #, c-format
 msgid "Document not created successfully. \n"
 msgstr "יצירת המסמך נכשלה. \n"
@@ -2064,18 +1927,15 @@ msgstr "הערות אישיות"
 msgid "What must I do to be saved?"
 msgstr "מה עלי לעשות כדי להיוושע?"
 
-#: ../src/main/xml.c:92
-#: ../src/main/xml.c:93
+#: ../src/main/xml.c:92 ../src/main/xml.c:93
 msgid "Acts 16:31"
 msgstr "מעשי השליחים 16:31"
 
-#: ../src/main/xml.c:97
-#: ../src/main/xml.c:98
+#: ../src/main/xml.c:97 ../src/main/xml.c:98
 msgid "Eph 2:8,9"
 msgstr "אל האפסים 2:8,9"
 
-#: ../src/main/xml.c:102
-#: ../src/main/xml.c:103
+#: ../src/main/xml.c:102 ../src/main/xml.c:103
 msgid "Romans 1:16"
 msgstr "אל הרומים 1:16"
 
@@ -2083,21 +1943,17 @@ msgstr "אל הרומים 1:16"
 msgid "What is the Gospel?"
 msgstr "מהי הבשורה?"
 
-#: ../src/main/xml.c:108
-#: ../src/main/xml.c:109
+#: ../src/main/xml.c:108 ../src/main/xml.c:109
 msgid "1 Cor 15:1-4"
 msgstr "הראשונה אל הקורינתים 15:1-4"
 
-#: ../src/main/xml.c:413
-#: ../src/main/xml.c:1071
+#: ../src/main/xml.c:413 ../src/main/xml.c:1144
 #, c-format
 msgid "Document not parsed successfully. \n"
 msgstr "לא ניתן לנתח את המסמך. \n"
 
-#: ../src/main/xml.c:419
-#: ../src/main/xml.c:674
-#: ../src/main/xml.c:952
-#: ../src/main/xml.c:1131
+#: ../src/main/xml.c:419 ../src/main/xml.c:747 ../src/main/xml.c:1025
+#: ../src/main/xml.c:1204
 #, c-format
 msgid "empty document \n"
 msgstr "מסמך חדש \n"
@@ -2127,8 +1983,7 @@ msgstr "הבשורה על פי מתי"
 msgid "Sample Module List"
 msgstr "רשימת מודולים"
 
-#: ../src/main/xml.c:680
-#: ../src/main/xml.c:958
+#: ../src/main/xml.c:753 ../src/main/xml.c:1031
 #, c-format
 msgid "wrong type, root node != %s\n"
 msgstr "סוג שגוי, צומת השורש != %s\n"
@@ -2137,8 +1992,7 @@ msgstr "סוג שגוי, צומת השורש != %s\n"
 msgid "Add Bookmark"
 msgstr "הוסף סימניה"
 
-#: ../ui/bookmarks.glade.h:2
-#: ../ui/markverse.glade.h:1
+#: ../ui/bookmarks.glade.h:2 ../ui/markverse.glade.h:1
 msgid "Bookmark Dialog"
 msgstr "דיאלוג סימנייה"
 
@@ -2146,13 +2000,11 @@ msgstr "דיאלוג סימנייה"
 msgid "Bookmark Folder Treeview"
 msgstr "מבט עץ על תיקיית הסימניות"
 
-#: ../ui/bookmarks.glade.h:4
-#: ../ui/markverse.glade.h:2
+#: ../ui/bookmarks.glade.h:4 ../ui/markverse.glade.h:2
 msgid "Cancel Bookmark"
 msgstr "בטל סימנייה"
 
-#: ../ui/bookmarks.glade.h:5
-#: ../ui/markverse.glade.h:3
+#: ../ui/bookmarks.glade.h:5 ../ui/markverse.glade.h:3
 msgid "Create new folder"
 msgstr "צור תיקייה חדשה"
 
@@ -2164,13 +2016,11 @@ msgstr "ערך תווית"
 msgid "Label:"
 msgstr "תווית:"
 
-#: ../ui/bookmarks.glade.h:8
-#: ../ui/markverse.glade.h:6
+#: ../ui/bookmarks.glade.h:8 ../ui/markverse.glade.h:6
 msgid "Module Entry"
 msgstr "ערך מודול"
 
-#: ../ui/bookmarks.glade.h:9
-#: ../ui/markverse.glade.h:7
+#: ../ui/bookmarks.glade.h:9 ../ui/markverse.glade.h:7
 msgid "Module:"
 msgstr "מודול:"
 
@@ -2178,19 +2028,16 @@ msgstr "מודול:"
 msgid "New ..."
 msgstr "חדש..."
 
-#: ../ui/bookmarks.glade.h:11
-#: ../ui/markverse.glade.h:8
-#: ../ui/xi-menus.glade.h:42
+#: ../ui/bookmarks.glade.h:11 ../ui/markverse.glade.h:8
+#: ../ui/xi-menus.glade.h:56
 msgid "New Folder"
 msgstr "תיקייה חדשה"
 
-#: ../ui/bookmarks.glade.h:12
-#: ../ui/markverse.glade.h:10
+#: ../ui/bookmarks.glade.h:12 ../ui/markverse.glade.h:10
 msgid "Verse Entry"
 msgstr "ערך פסוק"
 
-#: ../ui/bookmarks.glade.h:13
-#: ../ui/markverse.glade.h:11
+#: ../ui/bookmarks.glade.h:13 ../ui/markverse.glade.h:11
 msgid "Verse:"
 msgstr "פסוק:"
 
@@ -2198,38 +2045,32 @@ msgstr "פסוק:"
 msgid "Delete the current note"
 msgstr "מחק הערה נוכחית"
 
-#: ../ui/editor_note.xml.h:2
-#: ../ui/editor_studypad.xml.h:4
+#: ../ui/editor_note.xml.h:2 ../ui/editor_studypad.xml.h:4
 #: ../ui/editor.xml.h:2
 msgid "E_xit"
 msgstr "יציאה"
 
-#: ../ui/editor_note.xml.h:3
-#: ../ui/editor_studypad.xml.h:5
+#: ../ui/editor_note.xml.h:3 ../ui/editor_studypad.xml.h:5
 #: ../ui/editor.xml.h:3
 msgid "Exit"
 msgstr "יציאה"
 
-#: ../ui/editor_note.xml.h:4
-#: ../ui/editor_studypad.xml.h:6
+#: ../ui/editor_note.xml.h:4 ../ui/editor_studypad.xml.h:6
 #: ../ui/editor.xml.h:4
 msgid "Exit the program"
 msgstr "צא מן התוכנה"
 
-#: ../ui/editor_note.xml.h:5
-#: ../ui/editor_studypad.xml.h:7
+#: ../ui/editor_note.xml.h:5 ../ui/editor_studypad.xml.h:7
 #: ../ui/editor.xml.h:5
 msgid "For_mat"
 msgstr "עיצוב"
 
-#: ../ui/editor_note.xml.h:6
-#: ../ui/editor_studypad.xml.h:8
+#: ../ui/editor_note.xml.h:6 ../ui/editor_studypad.xml.h:8
 #: ../ui/editor.xml.h:6
 msgid "HTML Format switch"
 msgstr "מתג עיצוב HTML"
 
-#: ../ui/editor_note.xml.h:7
-#: ../ui/editor_studypad.xml.h:9
+#: ../ui/editor_note.xml.h:7 ../ui/editor_studypad.xml.h:9
 #: ../ui/editor.xml.h:7
 msgid "HTML mode"
 msgstr "מצב HTML"
@@ -2258,18 +2099,15 @@ msgstr "שמור (הערה אישת)"
 msgid "Add this file to your bookmarks"
 msgstr "הוסף קובץ זה לסימניות"
 
-#: ../ui/editor_studypad.xml.h:3
-#: ../ui/editor.xml.h:1
+#: ../ui/editor_studypad.xml.h:3 ../ui/editor.xml.h:1
 msgid "Create a new document"
 msgstr "צור מסמך חדש"
 
-#: ../ui/editor_studypad.xml.h:10
-#: ../ui/editor.xml.h:8
+#: ../ui/editor_studypad.xml.h:10 ../ui/editor.xml.h:8
 msgid "New Document"
 msgstr "מסמך חדש"
 
-#: ../ui/editor_studypad.xml.h:11
-#: ../ui/editor.xml.h:9
+#: ../ui/editor_studypad.xml.h:11 ../ui/editor.xml.h:9
 msgid "Open"
 msgstr "פתיחה"
 
@@ -2289,8 +2127,7 @@ msgstr "הדפס מסמך"
 msgid "Save AS"
 msgstr "שמור"
 
-#: ../ui/editor_studypad.xml.h:18
-#: ../ui/editor.xml.h:12
+#: ../ui/editor_studypad.xml.h:18 ../ui/editor.xml.h:12
 msgid "Save the current file"
 msgstr "שמור את ההפעלה הנוכחית בקובץ"
 
@@ -2318,8 +2155,7 @@ msgstr "<b>Sword</b>"
 msgid "<b>Format</b>"
 msgstr "<b>Sword</b>"
 
-#: ../ui/export-dialog.glade.h:5
-#: ../ui/prefs.glade.h:25
+#: ../ui/export-dialog.glade.h:5 ../ui/prefs.glade.h:25
 msgid "Book"
 msgstr "ספר"
 
@@ -2331,8 +2167,7 @@ msgstr "כפתור רדיו: ספר"
 msgid "Chapter Radio Button"
 msgstr "כפתור רדיו: פרק"
 
-#: ../ui/export-dialog.glade.h:9
-#: ../ui/xi-menus.glade.h:14
+#: ../ui/export-dialog.glade.h:9 ../ui/xi-menus.glade.h:18
 msgid "Copy/Export Passage"
 msgstr "העתקייצא קטע"
 
@@ -2431,11 +2266,16 @@ msgstr "<b>Sword</b>"
 
 #: ../ui/module-manager.glade.h:7
 msgid "<b>WARNING:</b> If you live in a persecuted country use with care."
-msgstr "<b>אזהרה:</b> אם אתם חיים במדינה הרודפת את המאמינים, היזהרו בעת השימוש."
+msgstr ""
+"<b>אזהרה:</b> אם אתם חיים במדינה הרודפת את המאמינים, היזהרו בעת השימוש."
 
 #: ../ui/module-manager.glade.h:8
-msgid "<b>Warning:</b> If you live in a persecuted country and do not wish to risk detection you should NOT use  the remote installation feature! "
-msgstr "<b>אזהרה:</b> אם אתם חיים במדינה הרודפת את המאמינים ומבקשים להימנע מזיהוי, אל תשתמשו באפשרות ההתקנה מרחוק!"
+msgid ""
+"<b>Warning:</b> If you live in a persecuted country and do not wish to risk "
+"detection you should NOT use  the remote installation feature! "
+msgstr ""
+"<b>אזהרה:</b> אם אתם חיים במדינה הרודפת את המאמינים ומבקשים להימנע מזיהוי, "
+"אל תשתמשו באפשרות ההתקנה מרחוק! "
 
 #: ../ui/module-manager.glade.h:9
 msgid "<i>Personal area, for your use only:</i>"
@@ -2445,43 +2285,47 @@ msgstr "<i>איזור אישי, לעיניך בלבד:</i>"
 msgid "<i>System area, for all users:</i>"
 msgstr "<i>איזור מערכת, לכל המשתמשים:</i>"
 
-#: ../ui/module-manager.glade.h:11
+#: ../ui/module-manager.glade.h:12
 msgid "Continue"
 msgstr "המשך"
 
-#: ../ui/module-manager.glade.h:12
+#: ../ui/module-manager.glade.h:13
 msgid "Current Remote Sources"
 msgstr "מקורות מרוחקים נוכחיים"
 
-#: ../ui/module-manager.glade.h:13
+#: ../ui/module-manager.glade.h:14
 msgid "Current local sources"
 msgstr "מקורות מקומיים נוכחיים"
 
-#: ../ui/module-manager.glade.h:14
+#: ../ui/module-manager.glade.h:15
+msgid "Delete Index"
+msgstr "מחק פריט"
+
+#: ../ui/module-manager.glade.h:16
 msgid "Home dir"
 msgstr "ספריית בית"
 
-#: ../ui/module-manager.glade.h:16
+#: ../ui/module-manager.glade.h:19
 msgid "Load Standard"
 msgstr "טעינה סטנדרטית"
 
-#: ../ui/module-manager.glade.h:17
+#: ../ui/module-manager.glade.h:20
 msgid "Local"
 msgstr "מקומי"
 
-#: ../ui/module-manager.glade.h:18
+#: ../ui/module-manager.glade.h:21
 msgid "Local Install Folder"
 msgstr "תיקיית התקנה מקומית"
 
-#: ../ui/module-manager.glade.h:19
+#: ../ui/module-manager.glade.h:22
 msgid "Module Manager"
 msgstr "מנהל מודולים"
 
-#: ../ui/module-manager.glade.h:20
+#: ../ui/module-manager.glade.h:23
 msgid "Remote"
 msgstr "מרוחק"
 
-#: ../ui/module-manager.glade.h:21
+#: ../ui/module-manager.glade.h:24
 msgid "Sword sys dir"
 msgstr "ספריית sys של Sword"
 
@@ -2578,8 +2422,11 @@ msgid "Apply high-contrast highlight to current verse"
 msgstr "הדגש את הפסוק הנוכחי בעזרת ניגודיות גבוהה"
 
 #: ../ui/prefs.glade.h:19
-msgid "Automatically resize commentary, book, and dictionary image content to fit subwindow"
-msgstr "שנה את גודל התמונות בחלוניות הפירוש, הספר והמילון כדי להתאים לתת-החלון"
+msgid ""
+"Automatically resize commentary, book, and dictionary image content to fit "
+"subwindow"
+msgstr ""
+"שנה את גודל התמונות בחלוניות הפירוש, הספר והמילון כדי להתאים לתת-החלון"
 
 #: ../ui/prefs.glade.h:20
 msgid "Background"
@@ -2627,7 +2474,7 @@ msgstr "תיבה משולבת לשינוי הערות אישיות"
 
 #: ../ui/prefs.glade.h:32
 msgid "Choose to enable Prayer lists "
-msgstr "אפשר רשימות תפילה"
+msgstr "אפשר רשימות תפילה "
 
 #: ../ui/prefs.glade.h:34
 msgid "Commentaries Checkbox"
@@ -2818,38 +2665,50 @@ msgid "Show splash screen at start up"
 msgstr "הצג מסך פתיחה"
 
 #: ../ui/prefs.glade.h:84
+msgid "Special Locale (requires restart)"
+msgstr ""
+
+#: ../ui/prefs.glade.h:85
+msgid "Special Locale Combo"
+msgstr ""
+
+#: ../ui/prefs.glade.h:86
 msgid "StudyPad default directory combo"
 msgstr "תיבה משולבת לתיקיית ברירת המחדל של שולחן המחקר"
 
-#: ../ui/prefs.glade.h:86
+#: ../ui/prefs.glade.h:88
 msgid "Use Bible Text scroll bar to scroll to previous or next chapter"
 msgstr "השתמש בשורת הגלילה של הטקסט כדי לעבור לפרק הקודם או הבא"
 
-#: ../ui/prefs.glade.h:87
+#: ../ui/prefs.glade.h:89
 msgid "Use Verse Per Line"
 msgstr "השתמש בפסוק לכל שורה"
 
-#: ../ui/prefs.glade.h:88
+#: ../ui/prefs.glade.h:90
 msgid "Use Verse Per Line Checkbox"
 msgstr "תיבת סימון לציון הצגת פסוק בשורה אחת"
 
-#: ../ui/prefs.glade.h:89
+#: ../ui/prefs.glade.h:91
 msgid "Use default Dictionary"
 msgstr "השתמש במילון ברירת המחדל"
 
-#: ../ui/prefs.glade.h:90
+#: ../ui/prefs.glade.h:92
 msgid "Use default Dictionary Checkbox"
 msgstr "תיבת סימון לשימוש במילון ברירת המחדל"
 
-#: ../ui/prefs.glade.h:91
+#: ../ui/prefs.glade.h:93
 msgid "Use tabbed browsing"
 msgstr "השתמש בגלישה בלשוניות"
 
-#: ../ui/prefs.glade.h:92
+#: ../ui/prefs.glade.h:94
 msgid "Use tabbed browsing Checkbox"
 msgstr "תיבת סימון לגלישה בלשוניות"
 
-#: ../ui/prefs.glade.h:93
+#: ../ui/prefs.glade.h:95
+msgid "Verse Number"
+msgstr ""
+
+#: ../ui/prefs.glade.h:96
 msgid "Verse number size"
 msgstr "גודל מספר הפסוק"
 
@@ -3030,6 +2889,14 @@ msgid "Exact phrase radiobutton"
 msgstr "כפתור רדיו לביטוי מדויק"
 
 #: ../ui/search-dialog.glade.h:46
+msgid "Export"
+msgstr ""
+
+#: ../ui/search-dialog.glade.h:47
+msgid "Export current search results"
+msgstr ""
+
+#: ../ui/search-dialog.glade.h:48
 msgid ""
 "Fast, featureful, index-based search\n"
 "Indexes must have been built beforehand:\n"
@@ -3039,229 +2906,229 @@ msgstr ""
 "את האינדקס יש לבנות מראש:\n"
 "נא לעיין באפשרויות התחזוקה של מנהל המודולים"
 
-#: ../ui/search-dialog.glade.h:49
+#: ../ui/search-dialog.glade.h:51
 msgid "Find Button"
 msgstr "כפתור רדיו לאיתור"
 
-#: ../ui/search-dialog.glade.h:51
+#: ../ui/search-dialog.glade.h:53
 msgid "Footnotes radiobutton"
 msgstr "כפתור רדיו להערות שוליים"
 
-#: ../ui/search-dialog.glade.h:52
+#: ../ui/search-dialog.glade.h:54
 msgid "In modules that have Footnotes"
 msgstr "במודולים בעלי הערות שוליים"
 
-#: ../ui/search-dialog.glade.h:53
+#: ../ui/search-dialog.glade.h:55
 msgid "In modules that have Morphological Tags"
 msgstr "במודולים בעלי תגיות מורפולוגיות"
 
-#: ../ui/search-dialog.glade.h:54
+#: ../ui/search-dialog.glade.h:56
 msgid "In modules that have Strong's Numbers"
 msgstr "במודולים בעלי מספרי סטרונג"
 
-#: ../ui/search-dialog.glade.h:55
+#: ../ui/search-dialog.glade.h:57
 msgid "Main Search Entry"
 msgstr "ערך חיפוש ראשי"
 
-#: ../ui/search-dialog.glade.h:56
+#: ../ui/search-dialog.glade.h:58
 msgid "Make selections on the Attribute Search tab"
 msgstr "בחר בלשונית חיפוש התכונות"
 
-#: ../ui/search-dialog.glade.h:58
+#: ../ui/search-dialog.glade.h:60
 msgid "Match case checkbox"
 msgstr "תיבת סימון להתאמת אותיות רישיות"
 
-#: ../ui/search-dialog.glade.h:59
+#: ../ui/search-dialog.glade.h:61
 msgid "Module Selection"
 msgstr "בחירת מודולים"
 
-#: ../ui/search-dialog.glade.h:60
+#: ../ui/search-dialog.glade.h:62
 msgid "Module list"
 msgstr "רשימת מודולים"
 
-#: ../ui/search-dialog.glade.h:61
+#: ../ui/search-dialog.glade.h:63
 msgid "Module list radiobutton"
 msgstr "כפתור רדיו לרשימת מודולים"
 
-#: ../ui/search-dialog.glade.h:63
+#: ../ui/search-dialog.glade.h:65
 msgid "Morphological Tags radiobutton"
 msgstr "כפתור רדיו לתגיות מורפולוגיות"
 
-#: ../ui/search-dialog.glade.h:65
+#: ../ui/search-dialog.glade.h:67
 msgid "Multi word radiobutton"
 msgstr "כפתור רדיו לריבוי מלים"
 
-#: ../ui/search-dialog.glade.h:66
+#: ../ui/search-dialog.glade.h:68
 msgid "New Custom Module List Button"
 msgstr "כפתור לרשימת מודולים מותאמת אישית"
 
-#: ../ui/search-dialog.glade.h:67
+#: ../ui/search-dialog.glade.h:69
 msgid "New Range Button"
 msgstr "כפתור טווח חדש"
 
-#: ../ui/search-dialog.glade.h:68
+#: ../ui/search-dialog.glade.h:70
 msgid "Open Selection Dialog Button"
 msgstr "כפתור לדיאלוג פתיחת הפריטים הנבחרים"
 
-#: ../ui/search-dialog.glade.h:69
+#: ../ui/search-dialog.glade.h:71
 msgid "Open a dialog to select modules to add to the list"
 msgstr "פתח תיבת דיאלוג לבחירת המודולים שיתווספו לרשימה"
 
-#: ../ui/search-dialog.glade.h:70
+#: ../ui/search-dialog.glade.h:72
 msgid "Optimized (\"Lucene\")"
 msgstr "מיועל (\"Lucene\")"
 
-#: ../ui/search-dialog.glade.h:71
+#: ../ui/search-dialog.glade.h:73
 msgid "Optimized (\"Lucene\") radiobutton"
 msgstr "כפתור רדיו לייעול (\"Lucene\")"
 
-#: ../ui/search-dialog.glade.h:72
+#: ../ui/search-dialog.glade.h:74
 msgid "Range Definition Entry"
 msgstr "<b>ערך הגדרת טווח</b>"
 
-#: ../ui/search-dialog.glade.h:73
+#: ../ui/search-dialog.glade.h:75
 msgid "Range Name Entry"
 msgstr "ערך שם טווח"
 
-#: ../ui/search-dialog.glade.h:75
+#: ../ui/search-dialog.glade.h:77
 msgid "Regular expression radiobutton"
 msgstr "כפתור רדיו לביטוי רגולרי"
 
-#: ../ui/search-dialog.glade.h:76
+#: ../ui/search-dialog.glade.h:78
 msgid "Remove the selected module from the list"
 msgstr "הסר את המודולים שנבחרו מהרשימה"
 
-#: ../ui/search-dialog.glade.h:77
+#: ../ui/search-dialog.glade.h:79
 msgid "Result Summary Table"
 msgstr "טבלת תקציר תוצאות"
 
-#: ../ui/search-dialog.glade.h:78
+#: ../ui/search-dialog.glade.h:80
 msgid "Result Summary Window"
 msgstr "חלון תקציר תוצאות"
 
-#: ../ui/search-dialog.glade.h:79
+#: ../ui/search-dialog.glade.h:81
 msgid "Results"
 msgstr "תוצאות"
 
-#: ../ui/search-dialog.glade.h:80
+#: ../ui/search-dialog.glade.h:82
 msgid "Save Custom Module List Button"
 msgstr "כפתור לשמירת רשימת מודולים מותאמת אישית"
 
-#: ../ui/search-dialog.glade.h:81
+#: ../ui/search-dialog.glade.h:83
 msgid "Save Range Button"
 msgstr "כפתור שמירת טווח"
 
-#: ../ui/search-dialog.glade.h:82
+#: ../ui/search-dialog.glade.h:84
 msgid "Save custom range"
 msgstr "שמור טווח מותאם אישית"
 
-#: ../ui/search-dialog.glade.h:83
+#: ../ui/search-dialog.glade.h:85
 msgid "Save search results as bookmarks"
 msgstr "שמור את תוצאות החיפוש כסימניות"
 
-#: ../ui/search-dialog.glade.h:84
+#: ../ui/search-dialog.glade.h:86
 msgid "Save the module list"
 msgstr "שמור רשימת מודולים"
 
-#: ../ui/search-dialog.glade.h:85
+#: ../ui/search-dialog.glade.h:87
 msgid "Search  Criteria"
 msgstr "קריטריונים לחיפוש"
 
-#: ../ui/search-dialog.glade.h:86
+#: ../ui/search-dialog.glade.h:88
 msgid "Search Criteria Treeview"
 msgstr "מבט עץ על קריטריונים לחיפוש"
 
-#: ../ui/search-dialog.glade.h:87
+#: ../ui/search-dialog.glade.h:89
 msgid "Search entire module"
 msgstr "חפש בכל המודול"
 
-#: ../ui/search-dialog.glade.h:88
+#: ../ui/search-dialog.glade.h:90
 msgid "Search for Morphological tags"
 msgstr "הצג תגיות מורפולוגיות"
 
-#: ../ui/search-dialog.glade.h:89
+#: ../ui/search-dialog.glade.h:91
 msgid "Search for Strongs Numbers like G4442 or H1121"
 msgstr "חפש מספרי סטרונג כגון G4442 or H1121"
 
-#: ../ui/search-dialog.glade.h:90
+#: ../ui/search-dialog.glade.h:92
 msgid "Search in footnotes"
 msgstr "מחפש בתוך"
 
-#: ../ui/search-dialog.glade.h:91
+#: ../ui/search-dialog.glade.h:93
 msgid "Show Footnotes"
 msgstr "הצג הערות שוליים"
 
-#: ../ui/search-dialog.glade.h:92
+#: ../ui/search-dialog.glade.h:94
 msgid "Show Footnotes checkbox"
 msgstr "תיבת סימון להצגת הערות שוליים"
 
-#: ../ui/search-dialog.glade.h:93
+#: ../ui/search-dialog.glade.h:95
 msgid "Show Morphological Tags"
 msgstr "הצג תגיות מורפולוגיות"
 
-#: ../ui/search-dialog.glade.h:94
+#: ../ui/search-dialog.glade.h:96
 msgid "Show Morphological Tags checkbox"
 msgstr "תיבת סימון להצגת תגיות מורפולוגיות"
 
-#: ../ui/search-dialog.glade.h:95
+#: ../ui/search-dialog.glade.h:97
 msgid "Show Strong's Numbers"
 msgstr "הצג את מספרי סטרונג"
 
-#: ../ui/search-dialog.glade.h:96
+#: ../ui/search-dialog.glade.h:98
 msgid "Show Strong's Numbers checkbox"
 msgstr "תיבת סימון להצגת מספרי סטרונג"
 
-#: ../ui/search-dialog.glade.h:97
+#: ../ui/search-dialog.glade.h:99
 msgid "Show in main window"
 msgstr "הצג בחלון ראשי"
 
-#: ../ui/search-dialog.glade.h:98
+#: ../ui/search-dialog.glade.h:100
 msgid "Single module"
 msgstr "מודול יחיד"
 
-#: ../ui/search-dialog.glade.h:99
+#: ../ui/search-dialog.glade.h:101
 msgid "Single module radiobutton"
 msgstr "תיבת סימון למודול יחיד"
 
-#: ../ui/search-dialog.glade.h:100
+#: ../ui/search-dialog.glade.h:102
 msgid "Start/stop searching"
 msgstr "התחל חיפוש"
 
-#: ../ui/search-dialog.glade.h:101
+#: ../ui/search-dialog.glade.h:103
 msgid "Strongs Numbers"
 msgstr "מספרי סטרונג"
 
-#: ../ui/search-dialog.glade.h:102
+#: ../ui/search-dialog.glade.h:104
 msgid "Strongs Numbers radiobutton"
 msgstr "תיבת סימון למספרי סטרונג"
 
-#: ../ui/search-dialog.glade.h:103
+#: ../ui/search-dialog.glade.h:105
 msgid "Use a custom module list for the search"
 msgstr "חפש ברשימת מודולים מותאמת אישית"
 
-#: ../ui/search-dialog.glade.h:104
+#: ../ui/search-dialog.glade.h:106
 msgid "Use a custom range for the scope of the search"
 msgstr "חפש בטווח מותאם אישית"
 
-#: ../ui/search-dialog.glade.h:105
+#: ../ui/search-dialog.glade.h:107
 msgid "Use a single module for the search"
-msgstr "חפש במודול יחיד "
+msgstr "חפש במודול יחיד"
 
-#: ../ui/search-dialog.glade.h:106
+#: ../ui/search-dialog.glade.h:108
 msgid "Use the current module list for the search"
 msgstr "חפש במודולים שברשימה הנוכחית"
 
-#: ../ui/search-dialog.glade.h:107
+#: ../ui/search-dialog.glade.h:109
 msgid "Use the results of the last search as the scope of the search"
 msgstr "חפש בטווח המוגדר על פי תוצאות החיפוש האחרון"
 
-#: ../ui/search-dialog.glade.h:108
+#: ../ui/search-dialog.glade.h:110
 msgid "e.g. Matt-John;Rev4"
 msgstr "למשל Matt-John;Rev4"
 
-#: ../ui/search-dialog.glade.h:109
+#: ../ui/search-dialog.glade.h:111
 msgid "for "
-msgstr "עבור"
+msgstr "עבור "
 
 #: ../ui/xi-menus.glade.h:2
 msgid "About _Translation"
@@ -3272,302 +3139,384 @@ msgid "About _Xiphos"
 msgstr "אודות Xiphos_..."
 
 #: ../ui/xi-menus.glade.h:4
+msgid "Add Item"
+msgstr ""
+
+#: ../ui/xi-menus.glade.h:5
+msgid "Add Sub-Item"
+msgstr ""
+
+#: ../ui/xi-menus.glade.h:6
+msgid "Add a sub-item"
+msgstr ""
+
+#: ../ui/xi-menus.glade.h:7
+msgid "Add an item"
+msgstr "הוסף כפריט"
+
+#: ../ui/xi-menus.glade.h:8
 msgid "Add new folder to selected folder"
 msgstr "הוסף התיקייה החדשה לתיקייה שנבחרה"
 
-#: ../ui/xi-menus.glade.h:6
+#: ../ui/xi-menus.glade.h:10
 msgid "Allow Reordering"
 msgstr "אפשר סידור מחדש"
 
-#: ../ui/xi-menus.glade.h:7
+#: ../ui/xi-menus.glade.h:11
 msgid "Allow items to be moved from one folder to another"
 msgstr "אפשר הזזת פריטים בין ספריות"
 
-#: ../ui/xi-menus.glade.h:8
+#: ../ui/xi-menus.glade.h:12
 msgid "Annotate Verse"
 msgstr "הערות לפסוק"
 
-#: ../ui/xi-menus.glade.h:10
+#: ../ui/xi-menus.glade.h:14
 msgid "Browse in BibleMap.org"
 msgstr "עיין ב-BibleMap.org"
 
-#: ../ui/xi-menus.glade.h:11
+#: ../ui/xi-menus.glade.h:15
 msgid "Collapse All"
 msgstr "צמצם הכל"
 
-#: ../ui/xi-menus.glade.h:12
+#: ../ui/xi-menus.glade.h:16
 msgid "Collapse all Bookmarks groups"
 msgstr "צמצם את כל קבוצות הסימניות"
 
-#: ../ui/xi-menus.glade.h:13
+#: ../ui/xi-menus.glade.h:17
 msgid "Commentary by Chapter"
 msgstr "פירוש לפי פרק"
 
-#: ../ui/xi-menus.glade.h:15
+#: ../ui/xi-menus.glade.h:19
+msgid "Create a new daily journal"
+msgstr ""
+
+#: ../ui/xi-menus.glade.h:20
+msgid "Create a new monthly journal"
+msgstr ""
+
+#: ../ui/xi-menus.glade.h:21
+msgid "Create a new outlined topic"
+msgstr ""
+
+#: ../ui/xi-menus.glade.h:22
+msgid "Create a new simple prayer list"
+msgstr "צור רשימת מודולים חדשה"
+
+#: ../ui/xi-menus.glade.h:23
+msgid "Create a new subject prayer list"
+msgstr ""
+
+#: ../ui/xi-menus.glade.h:24
 msgid "D_ouble-Space Text"
 msgstr "רווחים כפולים"
 
-#: ../ui/xi-menus.glade.h:16
+#: ../ui/xi-menus.glade.h:25
+msgid "Daily"
+msgstr ""
+
+#: ../ui/xi-menus.glade.h:26
 msgid "Delete Item"
 msgstr "מחק פריט"
 
-#: ../ui/xi-menus.glade.h:17
+#: ../ui/xi-menus.glade.h:27
 msgid "Delete item"
 msgstr "מחק פריט"
 
-#: ../ui/xi-menus.glade.h:18
+#: ../ui/xi-menus.glade.h:28
 msgid "Dictionar_y"
 msgstr "מיל_ון"
 
-#: ../ui/xi-menus.glade.h:19
+#: ../ui/xi-menus.glade.h:29
 msgid "Display Book Heading"
 msgstr "הצג כותרת ספר"
 
-#: ../ui/xi-menus.glade.h:20
+#: ../ui/xi-menus.glade.h:30
 msgid "Display Chapter Heading"
 msgstr "הצג כותרת פרק"
 
-#: ../ui/xi-menus.glade.h:21
+#: ../ui/xi-menus.glade.h:31
 msgid "Dump Pers.Comm."
 msgstr "השלך פירוש אישי"
 
-#: ../ui/xi-menus.glade.h:23
+#: ../ui/xi-menus.glade.h:33
 msgid "Edit bookmark item"
 msgstr "ערוך פריט סימנייה"
 
-#: ../ui/xi-menus.glade.h:24
+#: ../ui/xi-menus.glade.h:34
+msgid "Edit this item"
+msgstr "הדפס הערה"
+
+#: ../ui/xi-menus.glade.h:35
 msgid "Expand All"
 msgstr "הרחב הכל"
 
-#: ../ui/xi-menus.glade.h:25
+#: ../ui/xi-menus.glade.h:36
 msgid "Expand all Bookmarks groups"
 msgstr "הרחב את כל קבוצות הסימניות"
 
-#: ../ui/xi-menus.glade.h:32
+#: ../ui/xi-menus.glade.h:37
+msgid "Export Folder"
+msgstr ""
+
+#: ../ui/xi-menus.glade.h:38
+msgid "Export List"
+msgstr ""
+
+#: ../ui/xi-menus.glade.h:45
 msgid "Image Content"
 msgstr "תוכן"
 
-#: ../ui/xi-menus.glade.h:33
+#: ../ui/xi-menus.glade.h:46
 msgid "Import Bibletime Bookmarks"
 msgstr "יבא סימניות Bibletime"
 
-#: ../ui/xi-menus.glade.h:34
+#: ../ui/xi-menus.glade.h:47
 msgid "Insert Bookmark"
 msgstr "הכנס סימנייה"
 
-#: ../ui/xi-menus.glade.h:35
+#: ../ui/xi-menus.glade.h:48
 msgid "Insert new bookmark here"
 msgstr "הכנס לכאן את הסימנייה החדשה"
 
-#: ../ui/xi-menus.glade.h:36
+#: ../ui/xi-menus.glade.h:49
 msgid "L_ink Tabs"
 msgstr "נעץ לשוניות"
 
-#: ../ui/xi-menus.glade.h:38
+#: ../ui/xi-menus.glade.h:51
 msgid "Load Bookmarks from Bibletime"
 msgstr "טען סימניות מ-Bibletime"
 
-#: ../ui/xi-menus.glade.h:39
+#: ../ui/xi-menus.glade.h:52
 msgid "Lookup Selection"
 msgstr "בחירת חיפוש"
 
-#: ../ui/xi-menus.glade.h:43
+#: ../ui/xi-menus.glade.h:54
+msgid "Monthly"
+msgstr "חודשי"
+
+#: ../ui/xi-menus.glade.h:57
 msgid "Note"
 msgstr "הערה"
 
-#: ../ui/xi-menus.glade.h:44
+#: ../ui/xi-menus.glade.h:58
 msgid "Open Module"
 msgstr "פתח מודול"
 
-#: ../ui/xi-menus.glade.h:45
+#: ../ui/xi-menus.glade.h:59
 msgid "Open Study_pad"
 msgstr "פתח שולחן _מחקר"
 
-#: ../ui/xi-menus.glade.h:46
+#: ../ui/xi-menus.glade.h:60
 msgid "Open in a dialog"
 msgstr "פתח בתיבת דיאלוג"
 
-#: ../ui/xi-menus.glade.h:48
+#: ../ui/xi-menus.glade.h:61
+msgid "Open in a separate window"
+msgstr "פתח בחלון נפרד"
+
+#: ../ui/xi-menus.glade.h:62
+msgid "Open in editor"
+msgstr "פתח בתיבת דיאלוג"
+
+#: ../ui/xi-menus.glade.h:63
 msgid "Open in new tab"
 msgstr "פתח בלשונית חדשה"
 
-#: ../ui/xi-menus.glade.h:49
+#: ../ui/xi-menus.glade.h:64
+msgid ""
+"Open selected module in a\n"
+"\tseparate ['dialog'] window"
+msgstr ""
+
+#: ../ui/xi-menus.glade.h:66
+msgid "Open selected module in a new tab"
+msgstr "פתח את המודול הנבחר בלשונית חדשה"
+
+#: ../ui/xi-menus.glade.h:67
 msgid "Open this bookmark in a dialog"
 msgstr "פתח את הסימנייה בתיבת דיאלוג"
 
-#: ../ui/xi-menus.glade.h:50
+#: ../ui/xi-menus.glade.h:68
 msgid "Open this bookmark in a new tab"
 msgstr "פתח סימנייה זו בטאב חדש."
 
-#: ../ui/xi-menus.glade.h:52
+#: ../ui/xi-menus.glade.h:69
+msgid "Outlined"
+msgstr ""
+
+#: ../ui/xi-menus.glade.h:71
 msgid "Read Selection Aloud"
 msgstr "קריאה בקול"
 
-#: ../ui/xi-menus.glade.h:53
-msgid "Remove - Restore"
-msgstr "הסר - שחזר"
-
-#: ../ui/xi-menus.glade.h:54
-msgid "Remove Folder"
-msgstr "הסר תיקייה"
-
-#: ../ui/xi-menus.glade.h:55
+#: ../ui/xi-menus.glade.h:73
 msgid "Remove folder and save it"
 msgstr "הסר תיקייה ושמור אותה"
 
-#: ../ui/xi-menus.glade.h:56
+#: ../ui/xi-menus.glade.h:74
+msgid "Remove this item"
+msgstr "הסר - שחזר"
+
+#: ../ui/xi-menus.glade.h:75
 msgid "Rename Pers.Comm."
 msgstr "שנה שם פירוש אישי"
 
-#: ../ui/xi-menus.glade.h:57
+#: ../ui/xi-menus.glade.h:76
 msgid "Respect Font Faces"
 msgstr "התחשב בקבוצות גופנים"
 
-#: ../ui/xi-menus.glade.h:58
+#: ../ui/xi-menus.glade.h:77
 msgid "Restore Folder"
 msgstr "שחזר תיקייה"
 
-#: ../ui/xi-menus.glade.h:59
+#: ../ui/xi-menus.glade.h:78
 msgid "Restore saved folder"
 msgstr "שחזר התיקייה שנשמרה"
 
-#: ../ui/xi-menus.glade.h:60
+#: ../ui/xi-menus.glade.h:79
 msgid "Save list as a series of bookmarks"
 msgstr "שמור את הרשימה כסדרת סימניות"
 
-#: ../ui/xi-menus.glade.h:61
+#: ../ui/xi-menus.glade.h:80
 msgid "Save list as a single bookmark"
 msgstr "שמור את הרשימה כסימניה בודדת"
 
-#: ../ui/xi-menus.glade.h:62
+#: ../ui/xi-menus.glade.h:81
 msgid "Save these results as a series of bookmarks in their own folder"
 msgstr "שמור תוצאות אלה כסדרת סימניות בתיקיה חדשה"
 
-#: ../ui/xi-menus.glade.h:63
+#: ../ui/xi-menus.glade.h:82
 msgid "Save these results as a single bookmark"
 msgstr "שמור תוצאות אלה כסימניה בודדת"
 
-#: ../ui/xi-menus.glade.h:64
+#: ../ui/xi-menus.glade.h:83
 msgid "Scripture Cross-references"
 msgstr "הפניות צולבות לכתבי הקודש"
 
-#: ../ui/xi-menus.glade.h:66
+#: ../ui/xi-menus.glade.h:85
 msgid "Show Parallel View in a _Tab"
 msgstr "הצג תצוגה מקבילה ב_לשונית"
 
-#: ../ui/xi-menus.glade.h:67
+#: ../ui/xi-menus.glade.h:86
 msgid "Show Previe_wer in the Sidebar"
 msgstr "הצג תצוגה מ_קדימה בסרגל הצד"
 
-#: ../ui/xi-menus.glade.h:68
+#: ../ui/xi-menus.glade.h:87
 msgid "Show Verse _Numbers"
 msgstr "הצג מספרי פסוקים"
 
-#: ../ui/xi-menus.glade.h:71
+#: ../ui/xi-menus.glade.h:88
+msgid "Simple"
+msgstr "פשוט"
+
+#: ../ui/xi-menus.glade.h:90
+msgid "Subject"
+msgstr "אובייקט Pixbuf"
+
+#: ../ui/xi-menus.glade.h:92
 msgid "Unlock This Module"
 msgstr "פתח מודול זה"
 
-#: ../ui/xi-menus.glade.h:72
+#: ../ui/xi-menus.glade.h:93
 msgid "Use Current Dictionary"
 msgstr "השתמש במילון הנוכחי"
 
-#: ../ui/xi-menus.glade.h:73
+#: ../ui/xi-menus.glade.h:94
 msgid "Use module manager to install and remove Sword modules"
 msgstr "השתמש במנהל המודולים להתקנת והסרת מודולים של Sword"
 
-#: ../ui/xi-menus.glade.h:74
+#: ../ui/xi-menus.glade.h:95
 msgid "Variants"
 msgstr "משתנים"
 
-#: ../ui/xi-menus.glade.h:76
+#: ../ui/xi-menus.glade.h:97
 msgid "_About The SWORD Project"
 msgstr "אודות _פרויקט SWORD"
 
-#: ../ui/xi-menus.glade.h:77
+#: ../ui/xi-menus.glade.h:98
 msgid "_Advanced Search"
 msgstr "חיפוש מתקדם"
 
-#: ../ui/xi-menus.glade.h:78
+#: ../ui/xi-menus.glade.h:99
 msgid "_Attach/Detach Sidebar"
 msgstr "הצמד \\ נתק שורת צד"
 
-#: ../ui/xi-menus.glade.h:79
+#: ../ui/xi-menus.glade.h:100
 msgid "_Bible"
 msgstr "_כתבי קודש"
 
-#: ../ui/xi-menus.glade.h:80
+#: ../ui/xi-menus.glade.h:101
 msgid "_Commentary/Book"
 msgstr "_פירוש ספר"
 
-#: ../ui/xi-menus.glade.h:81
+#: ../ui/xi-menus.glade.h:102
 msgid "_Contents"
-msgstr "תוכן"
+msgstr "_תכנים"
 
-#: ../ui/xi-menus.glade.h:82
+#: ../ui/xi-menus.glade.h:103
 msgid "_Daily Devotion"
 msgstr "דרשה יומית"
 
-#: ../ui/xi-menus.glade.h:83
+#: ../ui/xi-menus.glade.h:104
 msgid "_Edit"
-msgstr "עריכה"
+msgstr "ע_ריכה"
 
-#: ../ui/xi-menus.glade.h:84
+#: ../ui/xi-menus.glade.h:105
 msgid "_Edit Item"
 msgstr "ערוך פריט"
 
-#: ../ui/xi-menus.glade.h:86
+#: ../ui/xi-menus.glade.h:107
 msgid "_Help"
-msgstr "עזרה"
+msgstr "ע_זרה"
 
-#: ../ui/xi-menus.glade.h:87
+#: ../ui/xi-menus.glade.h:108
 msgid "_Highlight Current Verse"
 msgstr "הדגש פסוק נוכחי"
 
-#: ../ui/xi-menus.glade.h:88
+#: ../ui/xi-menus.glade.h:109
 msgid "_Live Chat"
 msgstr "_צ'אט חי"
 
-#: ../ui/xi-menus.glade.h:89
+#: ../ui/xi-menus.glade.h:110
 msgid "_Mailing List"
 msgstr "_רשימת דיוור"
 
-#: ../ui/xi-menus.glade.h:90
+#: ../ui/xi-menus.glade.h:111
 msgid "_Module Manager"
 msgstr "מנהל מודולים"
 
-#: ../ui/xi-menus.glade.h:91
+#: ../ui/xi-menus.glade.h:112
 msgid "_Open Session"
 msgstr "פתח הפעלה"
 
-#: ../ui/xi-menus.glade.h:92
+#: ../ui/xi-menus.glade.h:113
 msgid "_Preferences"
 msgstr "_הגדרות"
 
-#: ../ui/xi-menus.glade.h:93
+#: ../ui/xi-menus.glade.h:114
 msgid "_Preview"
 msgstr "תצוגה מקדימה"
 
-#: ../ui/xi-menus.glade.h:94
+#: ../ui/xi-menus.glade.h:115
 msgid "_Read Aloud"
 msgstr "קריאה בקול"
 
-#: ../ui/xi-menus.glade.h:95
+#: ../ui/xi-menus.glade.h:116
 msgid "_Report Bug"
 msgstr "_דיווח על באג"
 
-#: ../ui/xi-menus.glade.h:96
+#: ../ui/xi-menus.glade.h:117
 msgid "_Save Session"
 msgstr "שמור הפעלה"
 
-#: ../ui/xi-menus.glade.h:97
+#: ../ui/xi-menus.glade.h:118
 msgid "_Search"
 msgstr "חפש"
 
-#: ../ui/xi-menus.glade.h:98
-msgid "_Show/Hide Sidebar"
-msgstr "הצג \\ הסתר שורת צד"
+#: ../ui/xi-menus.glade.h:119
+msgid "_Show/Hide Attached Sidebar"
+msgstr ""
 
-#: ../ui/xi-menus.glade.h:99
+#: ../ui/xi-menus.glade.h:120
 msgid "_Verse Per Line"
 msgstr "_פסוק לשורה"
 
@@ -3579,196 +3528,372 @@ msgstr "מחקר בכתבי הקודש"
 msgid "Xiphos Bible Guide"
 msgstr "ׂמדריך Xiphos לכתבי הקודש"
 
+#~ msgid "Xiphos could not execute archiver"
+#~ msgstr "מערכת Xiphos לא הצליחה להריץ את יוצר הארכיב"
+
+#~ msgid ""
+#~ " archival result:\n"
+#~ "\n"
+#~ msgstr ""
+#~ " תוצאת הארכיב:\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Archive in "
+#~ msgstr ""
+#~ "\n"
+#~ "ארכיב בתוך "
+
+#~ msgid "Sources"
+#~ msgstr "מקורות"
+
+#~ msgid "Text"
+#~ msgstr "טקסט"
+
+#~ msgid "Text to render"
+#~ msgstr "טקסט לציור"
+
+#~ msgid "Pixbuf Object"
+#~ msgstr "אובייקט Pixbuf"
+
+#~ msgid "The pixbuf to render."
+#~ msgstr "Pixbuf לציור"
+
+#~ msgid "Open in a new tab"
+#~ msgstr "פתח בלשונית חדשה"
+
+#~ msgid "Open selected module in a separate ['dialog'] window"
+#~ msgstr "פתח את המודול הנבחר בתיבת דיאלוג נפרדת"
+
+#~ msgid "View information about the selected dialog"
+#~ msgstr "הצג מידע אודות המודול הנבחר"
+
+#~ msgid "Create a new prayer list"
+#~ msgstr "צור רשימת מודולים חדשה"
+
+#~ msgid "Daily Journal"
+#~ msgstr "יומן יומי"
+
+#~ msgid "Outlined Topic"
+#~ msgstr "נושא מתואר"
+
+#~ msgid "Open selected module in a dialog"
+#~ msgstr "פתח את המודול הנבחר בתיבת דיאלוג"
+
+#~ msgid "Add Child"
+#~ msgstr "הוסף צאצא"
+
+#~ msgid "Add Sibling"
+#~ msgstr "הוסף אח"
+
+#~ msgid "Xiphos has renamed .xiphos-2.0 to .xiphos"
+#~ msgstr "Xiphos שינתה את השם .xiphos-2.0 ל .xiphos"
+
+#~ msgid ""
+#~ "Xiphos can not rename  .xiphos-2.0 to .xiphos:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Xiphos cannot continue."
+#~ msgstr ""
+#~ "Xiphos אינה מסוגלת לשנות את השם  .xiphos-2.0 ל .xiphos:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "לא ניתן להמשיך."
+
+#~ msgid "H_istory/<Separator>"
+#~ msgstr "היסטוריה/<Separator>"
+
+#~ msgid "H_istory/C_lear"
+#~ msgstr "היסטוריה/נקה"
+
+#~ msgid "Remove - Restore"
+#~ msgstr "הסר - שחזר"
+
+#~ msgid "Remove Folder"
+#~ msgstr "הסר תיקייה"
+
+#~ msgid "_Show/Hide Sidebar"
+#~ msgstr "הצג \\ הסתר שורת צד"
+
 #~ msgid "Move backwards through history"
 #~ msgstr "נוע לאחור ברשימת ההסטוריה"
+
 #~ msgid "Move foward through history"
 #~ msgstr "נוע קדימה ברשימת ההסטוריה"
+
 #~ msgid "Select a Book of the Bible"
 #~ msgstr "בחר ספר מתוך כתבי הקודש"
+
 #~ msgid "Change Chapter"
 #~ msgstr "עבור פרק"
+
 #~ msgid "Enter a Verse reference in Book 1:1 format and press Return"
 #~ msgstr "הזן מראה מקום לפסוק בפורמט \"ספר 1:1\" והקש על Enter"
+
 #~ msgid "Dictionary/_Lexicon"
 #~ msgstr "מילון \\ לקסיקון"
+
 #~ msgid "_Bible Text"
 #~ msgstr "_כתבי קודש"
+
 #~ msgid "Open StudyPad File"
 #~ msgstr "פתח קובץ שולחן מחקר"
+
 #~ msgid "Save StudyPad File"
 #~ msgstr "שמור קובץ שולחן מחקר"
+
 #~ msgid "item1"
 #~ msgstr "פריט1"
+
 #~ msgid "item2"
 #~ msgstr "פריט2"
+
 #~ msgid "_Module Options"
 #~ msgstr "אפשרויות מודול"
+
 #~ msgid "Sync with main"
 #~ msgstr "סנכרן עם הראשי"
+
 #~ msgid "Stay in sync"
 #~ msgstr "שמור על סינכרון"
+
 #~ msgid "Print"
 #~ msgstr "הדפס"
+
 #~ msgid "Print Preview"
 #~ msgstr "תצוגה לפני הדפסה"
+
 #~ msgid "Failed to print the document"
 #~ msgstr "הדפסת המסמך נכשלה"
+
 #~ msgid "Save List"
 #~ msgstr "שמור רשימה"
+
 #~ msgid "_Modules"
 #~ msgstr "מודולים"
+
 #~ msgid "_Bookmarks"
 #~ msgstr "סימניות"
+
 #~ msgid "Verse _List"
 #~ msgstr "רשימת פסוקים"
+
 #~ msgid "%s not found"
 #~ msgstr "%s לא נמצא"
+
 #~ msgid "has been modified. Do you wish to save it?"
 #~ msgstr "השתנה. האם ברצונך לשמור את השינויים?"
+
 #~ msgid "not loaded"
 #~ msgstr "לא נטען"
+
 #~ msgid "Open the StudyPad editor"
 #~ msgstr "פתח את עורך שולחן המחקר"
+
 #~ msgid "Open a saved session"
 #~ msgstr "פתח הפעלה שמורה"
+
 #~ msgid "Save the current session to a file"
 #~ msgstr "שמור את ההפעלה הנוכחית בקובץ"
+
 #~ msgid "_Copy"
 #~ msgstr "העתק"
+
 #~ msgid "Copy highlighted text from main window"
 #~ msgstr "העתק את הטקסט המסומן מהחלון הראשי"
+
 #~ msgid "Search using the shortcut bar"
 #~ msgstr "חפש בעזרת שורת קיצורי הדרך"
+
 #~ msgid "Advanced search using the search dialog"
 #~ msgstr "חיפוש מתקדם בעזרת תיבת החיפוש"
+
 #~ msgid "Set user preferences"
 #~ msgstr "קבע הגדרות משתמש"
+
 #~ msgid "C_lear"
 #~ msgstr "נקה"
+
 #~ msgid "Clear history list"
 #~ msgstr "נקה את רשימת ההסטוריה"
+
 #~ msgid "Show the Daily Devotion for today"
 #~ msgstr "הצג את הדרשה היומית להיום"
+
 #~ msgid "Show or hide Bible texts window"
 #~ msgstr "הצג \\ הסתר את חלון כתבי הקודש"
+
 #~ msgid "Show or hide Preview window"
 #~ msgstr "הצג \\ הסתר את חלון התצוגה המקדימה"
+
 #~ msgid "Show or hide commentaries"
 #~ msgstr "הצג \\ הסתר פירושים"
+
 #~ msgid "Show or hide - dictionaries and lexicons"
 #~ msgstr "הצג \\ הסתר מילונים ולקסיקונים"
+
 #~ msgid "Open the Xiphos manual"
 #~ msgstr "עיין במדריך ל-Xiphos"
+
 #~ msgid "Sign up for the users' mailing list"
 #~ msgstr "הצטרף לרשימת הדיוור למשתמשים"
+
 #~ msgid "Chat with other users and developers"
 #~ msgstr "צ'אט עם משתמשים ומפתחים"
+
 #~ msgid "Report bug to SourceForge"
 #~ msgstr "דיווח על באג ל-SourceForge"
+
 #~ msgid "Translating Xiphos to other languages"
 #~ msgstr "תרגום Xiphos לשפות נוספות"
+
 #~ msgid "More information about the SWORD Project"
 #~ msgstr "מידע נוסף אודות פרויקט Sword"
+
 #~ msgid "About this application"
 #~ msgstr "אודות יישום זה"
+
 #~ msgid "Hi_story"
 #~ msgstr "הסטוריה"
+
 #~ msgid "1 Cor 15:1"
 #~ msgstr "הראשונה אל הקורינתים 15:1"
+
 #~ msgid "Name for new prayer list"
 #~ msgstr "שם עבור רשימת התפילות החדשה"
+
 #~ msgid "can not create path\n"
 #~ msgstr "לא ניתן ליצור נתיב\n"
+
 #~ msgid "Prayer list already exist\n"
 #~ msgstr "רשימת התפילות כבר קיימת\n"
+
 #~ msgid "\\par\\par My prayer list \\par\\par Module created in Xiphos"
 #~ msgstr "רשימת התפילות שלי: מודול אחד-לאחד שנבנה על ידי Xiphos"
-#~ msgid "Delete Index"
-#~ msgstr "מחק פריט"
+
 #~ msgid "+5"
 #~ msgstr "+5"
+
 #~ msgid "+4"
 #~ msgstr "+4"
+
 #~ msgid "+3"
 #~ msgstr "+3"
+
 #~ msgid "+2"
 #~ msgstr "+2"
+
 #~ msgid "+1"
 #~ msgstr "+1"
+
 #~ msgid "-1"
 #~ msgstr "-1"
+
 #~ msgid "-2"
 #~ msgstr "-2"
+
 #~ msgid "-3"
 #~ msgstr "-3"
+
 #~ msgid "Starting"
 #~ msgstr "התחלה"
+
 #~ msgid "Building Xiphos interface"
 #~ msgstr "ממשק בניית Xiphos"
+
 #~ msgid "Initiating Xiphos"
 #~ msgstr "מפעיל את Xiphos"
+
 #~ msgid "done"
 #~ msgstr "בוצע"
+
 #~ msgid "Xiphos is shutdown"
 #~ msgstr "סוגר את Xiphos"
+
 #~ msgid "Initiating SWORD"
 #~ msgstr "מאתחל את SWORD"
+
 #~ msgid "path to sword"
 #~ msgstr "נתיב התקנת SWORD"
+
 #~ msgid "System locale is"
 #~ msgstr "לוקאל המערכת הוא"
+
 #~ msgid "SWORD locale is"
 #~ msgstr "לוקאל SWORD הוא"
+
 #~ msgid "Checking for SWORD Modules"
 #~ msgstr "בודק את מודולי SWORD"
+
 #~ msgid "SWORD is shutdown"
 #~ msgstr "מכבה את SWORD"
+
 #~ msgid "Number of Text modules"
 #~ msgstr "מספר מודולי טקסט"
+
 #~ msgid "Number of Commentary modules"
 #~ msgstr "מספר מודולי פירוש"
+
 #~ msgid "Number of Dict/lex modules"
 #~ msgstr "מספר מודולי Dict/Lex"
+
 #~ msgid "Number of Book modules"
 #~ msgstr "מספר מודולי ספר"
+
 #~ msgid "Number of Percomm modules"
 #~ msgstr "מספר מודולי פירוש אישי"
+
 #~ msgid "Number of Devotion modules"
 #~ msgstr "מספר מודולי דרשות"
+
 #~ msgid "Number of Prayer modules"
 #~ msgstr "מספר מודולי פירוש אישי"
+
 #~ msgid ""
 #~ "\n"
 #~ "First Run: need to create settings!\n"
 #~ msgstr ""
 #~ "\n"
 #~ "הרצה ראשונה: יש לבנות תצורה!\n"
+
 #~ msgid "can not create  .sword"
 #~ msgstr "לא ניתן ליצור את  .sword"
+
 #~ msgid "can not create  .sword/mods.d"
 #~ msgstr "לא ניתן ליצור את  .sword/mods.d"
+
 #~ msgid "can not create  .sword/modules"
 #~ msgstr "לא ניתן ליצור את  .sword/modules"
+
 #~ msgid "Select Local Source"
 #~ msgstr "נא לבחור מקור מקומי"
+
 #~ msgid "It will be lost permanently!"
 #~ msgstr "המידע יאבד לעד!"
+
 #~ msgid "Open file..."
 #~ msgstr "פתח קובץ..."
+
 #~ msgid "Save file as..."
 #~ msgstr "שמור קובץ בשם..."
+
 #~ msgid "Open in dialog"
 #~ msgstr "פתח בתיבת דיאלוג"
+
 #~ msgid ""
 #~ "For multi-word search, use\n"
 #~ "+FirstWord +SecondWord"
 #~ msgstr ""
 #~ "על מנת לחפש מלים מרובות,\n"
 #~ "נא להזין מילה1+מילה2"
+
 #~ msgid "_About the SWORD Project ..."
 #~ msgstr "אודות פרויקט Sword..."
+
 #~ msgid "Select the modules you want"
 #~ msgstr "שמור רשימת מודולים"
+
 #~ msgid ""
 #~ "There is currently no program set as your\n"
 #~ "handler for \"sword://\" and similar URLs.\n"
@@ -3779,66 +3904,93 @@ msgstr "ׂמדריך Xiphos לכתבי הקודש"
 #~ "ב \"sword://\" ובכתובות URL דומות.\n"
 #~ "האם ברצונך לאפשר ל-Xiphos \n"
 #~ "להגדיר את עצמה כתוכנה כזו?"
+
 #~ msgid "<b>Font Miscellaneous</b>"
 #~ msgstr "<b>גופן - שונות</b>"
+
 #~ msgid "Bible text"
 #~ msgstr "כתבי קודש"
+
 #~ msgid "found in"
 #~ msgstr "נמצא בתוך"
+
 #~ msgid "The"
 #~ msgstr "ה-"
+
 #~ msgid "module is locked."
 #~ msgstr "המודול נעול."
+
 #~ msgid "module has been unlocked."
 #~ msgstr "המודול נפתח."
+
 #~ msgid "If you have the cipher key you can"
 #~ msgstr "אם ברשותך מפתח צופן, ניתן"
+
 #~ msgid "click here"
 #~ msgstr "הקלק כאן"
+
 #~ msgid "to unlock the module"
 #~ msgstr "לפתוח את המודול"
+
 #~ msgid "You will need to restart Xiphos after you unlock it."
 #~ msgstr "לאחר הפתיחה, יש להפעיל מחדש את Xiphos."
+
 #~ msgid "You need to restart Xiphos to view it"
 #~ msgstr "לצפייה, יש להפעיל מחדש את Xiphos"
+
 #~ msgid "Show Tabs"
 #~ msgstr "הצג לשוניות"
+
 #~ msgid "Go to %s"
 #~ msgstr "לך אל %s"
+
 #~ msgid "The Setup Druid was cancelled."
 #~ msgstr "פעולת אשף ההתקנה בוטלה."
+
 #~ msgid "Do you wish to set preferences now?"
 #~ msgstr "האם ברצונך לקבוע הגדרות כעת?"
+
 #~ msgid "Remove failed"
 #~ msgstr "ההסרה נכשלה"
+
 #~ msgid "Old"
 #~ msgstr "ישן"
-#~ msgid "New"
-#~ msgstr "חדש"
+
 #~ msgid "URL:"
 #~ msgstr "URL:"
+
 #~ msgid "Go to parent"
 #~ msgstr "לך אל ההורה"
+
 #~ msgid "Go to first child"
 #~ msgstr "לך אל הצאצא הראשון"
+
 #~ msgid "Save using the PersistStream interface"
 #~ msgstr "שמור באמצעות ממשק PersistStream"
+
 #~ msgid "Open (PersistFile)"
 #~ msgstr "פתח (PersistFIle)"
+
 #~ msgid "Open using the PersistFile interface"
 #~ msgstr "פתח באמצעות ממשק PersistFile"
+
 #~ msgid "Save (PersistFile)"
 #~ msgstr "שמור (PersistFile)"
+
 #~ msgid "Save using the PersistFile interface"
 #~ msgstr "שמור באמצעות ממשק PersistFile"
+
 #~ msgid "Pick the background color"
 #~ msgstr "Pick the background colour"
+
 #~ msgid "Pick the Bible text color"
 #~ msgstr "Pick the Bible text colour"
+
 #~ msgid "Pick the current Verse color"
 #~ msgstr "Pick the current Verse colour"
+
 #~ msgid "Pick the current Verse background color"
 #~ msgstr "Pick the current Verse background colour"
+
 #~ msgid "<span weight=\"bold\">Font Colors</span>"
 #~ msgstr "<span weight=\"bold\">Font Colours</span>"
-
diff --git a/po/nb_NO.po b/po/nb_NO.po
index 5889aa2..e5b80b3 100644
--- a/po/nb_NO.po
+++ b/po/nb_NO.po
@@ -7,60 +7,198 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Xiphos 2.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-27 20:29+0200\n"
-"PO-Revision-Date: 2009-03-11 21:35+0100\n"
-"Last-Translator: Peter von Kaehne <refdoc@crosswire.org>\n"
-"Language-Team:  <i18n-nb@lister.ping.uio.no>\n"
+"POT-Creation-Date: 2009-12-14 23:45+0000\n"
+"PO-Revision-Date: 2009-12-09 22:09+0000\n"
+"Last-Translator: Peter von Kaehne <Unknown>\n"
+"Language-Team: <i18n-nb@lister.ping.uio.no>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-12-10 04:38+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 
-#: ../xiphos.desktop.in.in.h:1
-msgid "Study the Bible"
-msgstr "Studér Bibelen"
-
-#: ../xiphos.desktop.in.in.h:2
-msgid "Xiphos Bible Guide"
-msgstr "Xiphos Bibel Guide"
-
-#: ../src/backend/sword_main.cc:1154
+#: ../src/backend/sword_main.cc:1083
 msgid "Configuration not found"
 msgstr "Konfigurasjonen ikke funnet"
 
-#: ../src/gecko/gecko-html.cpp:178 ../src/gnome2/html.c:161
+#: ../src/editor/bonobo-editor.c:254 ../src/editor/slib-editor.c:234
+#: ../src/gnome2/html.c:637
+#, c-format
+msgid "Page %d of %d"
+msgstr "Side %d av %d"
+
+#: ../src/editor/bonobo-editor.c:353 ../src/editor/slib-editor.c:659
+msgid "Are you sure you want to delete the note for"
+msgstr "Er du sikker på at du vil slette notatet for"
+
+#: ../src/editor/bonobo-editor.c:965 ../src/editor/bonobo-editor.c:998
+#: ../src/editor/slib-editor.c:1308 ../src/editor/slib-editor.c:1345
+msgid "Save the changes to document"
+msgstr "Lagre endringer i dokumentet"
+
+#: ../src/editor/bonobo-editor.c:966 ../src/editor/bonobo-editor.c:999
+#: ../src/editor/slib-editor.c:1309 ../src/editor/slib-editor.c:1346
+msgid "before closing?"
+msgstr "før du avslutter?"
+
+#: ../src/editor/bonobo-editor.c:973 ../src/editor/bonobo-editor.c:1006
+#: ../src/editor/slib-editor.c:1316 ../src/editor/slib-editor.c:1353
+msgid "If you don't save, changes will be permanently lost."
+msgstr "Hvis du ikke lagrer vil du miste alle endringer du har gjort."
+
+#: ../src/editor/bonobo-editor.c:997 ../src/editor/slib-editor.c:1344
+#: ../ui/xi-menus.glade.h:39
+msgid "File"
+msgstr "Fil"
+
+#: ../src/editor/bonobo-editor.c:1224 ../src/editor/slib-editor.c:1401
+msgid "StudyPad"
+msgstr "Studieblokk"
+
+#: ../src/editor/bonobo-editor.c:1237 ../src/editor/slib-editor.c:1415
+msgid "Note Editor"
+msgstr "Notatblokk"
+
+#: ../src/editor/bonobo-editor.c:1246 ../src/editor/slib-editor.c:1429
+msgid "Prayer List/Journal Editor"
+msgstr "Bønne Liste/Journal Editor"
+
+#: ../src/editor/slib-editor.c:401 ../src/editor/slib-editor.c:448
+msgid "Save As"
+msgstr "Lagre Som"
+
+#: ../src/editor/slib-editor.c:419 ../src/editor/slib-editor.c:466
+#: ../src/editor/slib-editor.c:634
+msgid "Untitled document"
+msgstr "Navnløst dokument"
+
+#: ../src/editor/slib-editor.c:702
+msgid "HTML Output"
+msgstr "HTML Ut"
+
+#: ../src/editor/slib-editor.c:709
+msgid "HTML Source"
+msgstr "HTML Kilde"
+
+#: ../src/editor/slib-editor.c:716
+msgid "Plain Source"
+msgstr "Enkel Kilde"
+
+#: ../src/editor/slib-editor.c:726 ../ui/editor_note.xml.h:15
+#: ../ui/editor_studypad.xml.h:21
+msgid "_Print..."
+msgstr "_Skriv ut..."
+
+#: ../src/editor/slib-editor.c:733 ../ui/editor_note.xml.h:9
+#: ../ui/editor_studypad.xml.h:14
+msgid "Print Pre_view"
+msgstr "For hånds_visning"
+
+#: ../src/editor/slib-editor.c:740
+msgid "_Quit"
+msgstr "_Avslutt"
+
+#: ../src/editor/slib-editor.c:747
+msgid "_Open"
+msgstr "_Åpne"
+
+#: ../src/editor/slib-editor.c:754
+msgid "_Save"
+msgstr "_Lagre"
+
+#: ../src/editor/slib-editor.c:761
+msgid "Save _As..."
+msgstr "Lagre Som..."
+
+#: ../src/editor/slib-editor.c:767
+msgid "New"
+msgstr "Ny"
+
+#: ../src/editor/slib-editor.c:769
+msgid "Open new document"
+msgstr ""
+
+#: ../src/editor/slib-editor.c:773
+msgid "Delete"
+msgstr ""
+
+#: ../src/editor/slib-editor.c:775
+msgid "Delete current note"
+msgstr ""
+
+#: ../src/editor/slib-editor.c:780 ../ui/editor_note.xml.h:14
+#: ../ui/editor_studypad.xml.h:20 ../ui/editor.xml.h:13
+#: ../ui/xi-menus.glade.h:106
+msgid "_File"
+msgstr "_Fil"
+
+#: ../src/editor/slib-editor.c:835
+msgid "HTML _Output"
+msgstr "HTML _Ut"
+
+#: ../src/editor/slib-editor.c:842
+msgid "_HTML Source"
+msgstr "_HTML Kilde"
+
+#: ../src/editor/slib-editor.c:849
+msgid "_Plain Source"
+msgstr "_Enkel Kilde"
+
+#: ../src/editor/slib-editor.c:856 ../ui/xi-menus.glade.h:121
+msgid "_View"
+msgstr "_Vis"
+
+#: ../src/editor/slib-editor.c:867 ../ui/editor_note.xml.h:11
+#: ../ui/editor_studypad.xml.h:16 ../ui/editor.xml.h:11
+msgid "Save"
+msgstr "Lagre"
+
+#: ../src/editor/slib-editor.c:878 ../src/editor/slib-editor.c:885
+msgid "Insert Link"
+msgstr ""
+
+#: ../src/gecko/gecko-html.cpp:177 ../src/gnome2/html.c:165
 msgid "Unlock "
 msgstr "Lås opp "
 
-#: ../src/gecko/gecko-print.c:171
+#: ../src/gecko/gecko-print.c:172
 msgid "Preparing to print"
 msgstr "Forbereder utskrift"
 
-#: ../src/gecko/gecko-print.c:265
+#: ../src/gecko/gecko-print.c:266
 msgid "Printing is not supported on this printer"
 msgstr "Utskrift har ikke støtte for denne printer"
 
-#: ../src/gecko/gecko-print.c:268
+#: ../src/gecko/gecko-print.c:269
 #, c-format
 msgid "Printer %s does not support PostScript printing."
 msgstr "Printer·%s·støtter ikke PostScript·printing."
 
-#: ../src/gecko/gecko-print.c:341 ../src/gecko/gecko-print.c:369
+#: ../src/gecko/gecko-print.c:342 ../src/gecko/gecko-print.c:370
 msgid "Printing"
 msgstr "Skriver ut"
 
-#: ../src/gecko/gecko-print.c:371
+#: ../src/gecko/gecko-print.c:372
 msgid "Waiting to print"
 msgstr "Avventer utskrift"
 
-#: ../src/gecko/gecko-print.c:583
+#: ../src/gecko/gecko-print.c:584
 msgid "An error occurred while printing"
 msgstr "En feil oppstod ved utskrift"
 
-#: ../src/gecko/gecko-print.c:587
+#: ../src/gecko/gecko-print.c:588
 #, c-format
 msgid "It was not possible to print your document: %s"
 msgstr "klarte ikke å skrive ut dokumentet:·%s"
 
+#: ../src/gnome2/about_modules.c:195
+msgid "About Sword Module"
+msgstr "Om programbiblioteket Sword"
+
+#: ../src/gnome2/about_modules.c:389 ../src/gnome2/mod_mgr.c:252
+msgid "The module has no About information."
+msgstr ""
+
 #: ../src/gnome2/about_sword.c:88
 msgid ""
 "The SWORD Project is an effort to create an ever-expanding software package "
@@ -80,31 +218,142 @@ msgstr ""
 msgid "About the SWORD Project"
 msgstr "Om SWORD-prosjektet"
 
-#: ../src/gnome2/about_sword.c:123
+#: ../src/gnome2/about_sword.c:124
 msgid "Sword Version"
 msgstr "Sword versjon"
 
-#: ../src/gnome2/about_sword.c:154
+#: ../src/gnome2/about_sword.c:155
 msgid "Books can be downloaded from the SWORD Project"
 msgstr "Bøker kan lastes ned fra SWORD·Project"
 
-#: ../src/gnome2/about_sword.c:160
+#: ../src/gnome2/about_sword.c:161
 msgid "The SWORD Project"
 msgstr "SWORD-prosjektet"
 
-#: ../src/gnome2/navbar_versekey_editor.c:877
-#: ../src/gnome2/navbar_versekey_dialog.c:887
-#: ../src/gnome2/navbar_versekey_parallel.c:801
-msgid "Synchronize this window from main window"
-msgstr "Synkroniser vinduet med hovedvindu"
+#: ../src/gnome2/about_trans.c:84
+msgid ""
+"Do you like using Xiphos to study the Bible? Would you like to see its "
+"display using your native language? You could translate Xiphos! \n"
+"\n"
+"We are always looking for contributions of new translations of Xiphos into "
+"other languages. If you are able to translate for us, please see the link "
+"below, contact us, and get involved with our efforts."
+msgstr ""
+"Liker du å bruke Xiphos til å studere Bibelen? Ville du like å se ditt eget "
+"språk? Du kan oversette Xiphos! \n"
+"\n"
+"Vi er alltid på utkikk etter noen som vil oversette Xiphos til andre språk. "
+"Hvis du har muligheten til oversette for oss, vennligst kontakt oss, og bli "
+"del i dette viktige arbeidet. Se link under"
 
-#: ../src/gnome2/about_modules.c:189
-msgid "About Sword Module"
-msgstr "Om programbiblioteket Sword"
+#: ../src/gnome2/about_trans.c:98
+msgid "About Xiphos Translation"
+msgstr "Om Xiphos Oversettelsen"
 
-#: ../src/gnome2/about_modules.c:383 ../src/gnome2/mod_mgr.c:198
-msgid "The module has no About information."
+#: ../src/gnome2/about_trans.c:140
+msgid "See TRANSLATION-HOWTO in Xiphos source"
+msgstr "Se HVORDAN OVERSETTE i Xiphos kilde"
+
+#: ../src/gnome2/about_trans.c:146
+msgid "Xiphos development"
+msgstr "Xiphos utvikling"
+
+#: ../src/gnome2/about_xiphos.c:131
+msgid "Copyright 2000-2009 The Xiphos Development Team"
+msgstr "Copyright·2000-2009·The·Xiphos·Development·Team"
+
+#: ../src/gnome2/about_xiphos.c:134
+msgid ""
+"(formerly known as GnomeSword)\n"
+"\n"
+"Powered by The SWORD Project.\n"
+"We would like to thank Troy Griffitts and all the other folks who have given "
+"us The SWORD Project."
 msgstr ""
+"(tidligere kjent som GnomeSword)\n"
+"\n"
+"Levert av The·SWORD·Project.\n"
+"Vi vil gjerne takke·Troy·Griffitts·og alle andre som har bidratt i "
+"The·SWORD·Project."
+
+#: ../src/gnome2/bibletext_dialog.c:358
+msgid "Go to "
+msgstr "Gå til "
+
+#. info->stock_icon = GTK_STOCK_OPEN;
+#: ../src/gnome2/bookmark_dialog.c:171 ../src/gnome2/bookmarks_menu.c:358
+#: ../src/gnome2/bookmarks_menu.c:765 ../src/gnome2/bookmarks_menu.c:863
+#: ../src/gnome2/bookmarks_treeview.c:133 ../ui/editor_studypad.xml.h:2
+#: ../ui/xi-menus.glade.h:13
+msgid "Bookmark"
+msgstr "Bokmerke"
+
+#: ../src/gnome2/bookmark_dialog.c:173 ../src/gnome2/bookmarks_menu.c:865
+#: ../src/gnome2/bookmarks_treeview.c:134
+msgid "Enter Folder Name"
+msgstr "Skriv inn navn på mappe"
+
+#: ../src/gnome2/bookmark_dialog.c:175 ../src/gnome2/bookmarks_menu.c:867
+msgid "Folder Name"
+msgstr "Navn på mappe"
+
+#: ../src/gnome2/bookmark_dialog.c:176 ../src/gnome2/bookmarks_menu.c:868
+#: ../src/gnome2/bookmarks_treeview.c:136
+msgid "Folder: "
+msgstr "Mappe: "
+
+#: ../src/gnome2/bookmarks_menu.c:344 ../ui/xi-menus.glade.h:32
+msgid "Edit"
+msgstr "Rediger"
+
+#: ../src/gnome2/bookmarks_menu.c:361
+msgid "Folder name: "
+msgstr "Navn på mappe: "
+
+#: ../src/gnome2/bookmarks_menu.c:364
+msgid "Bookmark name: "
+msgstr "Navn på bokmerke: "
+
+#: ../src/gnome2/bookmarks_menu.c:367 ../src/gnome2/bookmarks_menu.c:773
+msgid "Verse: "
+msgstr "Vers: "
+
+#: ../src/gnome2/bookmarks_menu.c:368 ../src/gnome2/bookmarks_menu.c:774
+msgid "Module: "
+msgstr "Modul: "
+
+#: ../src/gnome2/bookmarks_menu.c:533
+msgid "Restore Bookmark Folder"
+msgstr "Gjenopprett mappe med bokmerker"
+
+#: ../src/gnome2/bookmarks_menu.c:602
+msgid "Remove the selected folder"
+msgstr "Fjern mappa"
+
+#: ../src/gnome2/bookmarks_menu.c:604
+msgid "(and all its contents)?"
+msgstr "(og alt som ligger i den)?"
+
+#: ../src/gnome2/bookmarks_menu.c:607
+msgid "Remove the selected bookmark"
+msgstr "Fjern bokmerket"
+
+#: ../src/gnome2/bookmarks_menu.c:766
+msgid "Add"
+msgstr "Legg til"
+
+#: ../src/gnome2/bookmarks_menu.c:772
+msgid "Label: "
+msgstr "Merke: "
+
+#: ../src/gnome2/bookmarks_treeview.c:107
+#, c-format
+msgid "Search result: %s"
+msgstr ""
+
+#: ../src/gnome2/bookmarks_treeview.c:943 ../src/gnome2/sidebar.c:1389
+msgid "Bookmarks"
+msgstr "Bokmerker"
 
 #: ../src/gnome2/cipher_key_dialog.c:62
 msgid "Cipher Key?"
@@ -118,273 +367,413 @@ msgstr "for:"
 msgid "Enter Cipher Key: "
 msgstr "Skriv inn kodenøkkel: "
 
-#: ../src/gnome2/parallel_view.c:271
-msgid "Copy"
-msgstr "Kopier"
-
-#: ../src/gnome2/parallel_view.c:281
-msgid "Detach/Attach"
-msgstr "Koble til / fra"
-
-#: ../src/gnome2/parallel_view.c:287 ../ui/xi-menus.glade.h:38
-msgid "Module Options"
-msgstr "Valg for moduler"
-
-#. build change parallel modules submenu
-#: ../src/gnome2/parallel_view.c:302
-msgid "Change parallel 1"
-msgstr "Endre parallell 1"
-
-#: ../src/gnome2/parallel_view.c:304
-msgid "Change parallel 2"
-msgstr "Endre parallell 2"
-
-#: ../src/gnome2/parallel_view.c:306
-msgid "Change parallel 3"
-msgstr "Endre parallell 3"
+#: ../src/gnome2/dialog.c:265
+msgid "Close without Saving"
+msgstr "Lukk uten å lagre"
 
-#: ../src/gnome2/parallel_view.c:308
-msgid "Change parallel 4"
-msgstr "Endre parallell 4"
+#: ../src/gnome2/dialog.c:596
+msgid "Xiphos:"
+msgstr "Xiphos:"
 
-#: ../src/gnome2/parallel_view.c:310
-msgid "Change parallel 5"
-msgstr "Endre parallell 5"
+#: ../src/gnome2/dialog.c:697
+msgid "Close _without Saving"
+msgstr "Lukk _uten å lagre"
 
-#: ../src/gnome2/parallel_view.c:467 ../src/gnome2/sidebar.c:599
-#: ../src/gnome2/sidebar.c:605 ../src/gnome2/tabbed_browser.c:231
-#: ../src/main/sidebar.cc:618 ../src/main/sidebar.cc:956
-#: ../src/main/sidebar.cc:957 ../src/main/sidebar.cc:958
-msgid "Parallel View"
-msgstr "Parallellvisning"
+#: ../src/gnome2/export_dialog.c:267 ../ui/export-dialog.glade.h:20
+msgid "Please check copyright before exporting!"
+msgstr "Vennligst sjekk kopirettigheter før eksportering!"
 
-#: ../src/gnome2/find_dialog.c:200 ../src/gnome2/find_dialog.c:369
+#: ../src/gnome2/find_dialog.c:204 ../src/gnome2/find_dialog.c:373
 msgid "Find"
 msgstr "Finn"
 
-#: ../src/gnome2/find_dialog.c:218
+#: ../src/gnome2/find_dialog.c:222
 msgid "Enter Word or Phrase"
 msgstr "Skriv inn ord eller uttrykk"
 
-#: ../src/gnome2/find_dialog.c:234 ../src/gnome2/search_sidebar.c:303
-#: ../ui/search-dialog.glade.h:57
+#: ../src/gnome2/find_dialog.c:238 ../src/gnome2/search_sidebar.c:306
+#: ../ui/search-dialog.glade.h:59
 msgid "Match case"
 msgstr "Skill mellom store og små bokstaver"
 
-#: ../src/gnome2/find_dialog.c:241
+#: ../src/gnome2/find_dialog.c:245
 msgid "Search backwards"
 msgstr "Søk bakover"
 
-#: ../src/gnome2/find_dialog.c:250 ../src/gnome2/search_sidebar.c:268
-#: ../ui/search-dialog.glade.h:74
+#: ../src/gnome2/find_dialog.c:254 ../src/gnome2/search_sidebar.c:271
+#: ../ui/search-dialog.glade.h:76
 msgid "Regular expression"
 msgstr "Regulært uttrykk"
 
-#: ../src/gnome2/find_dialog.c:291
+#: ../src/gnome2/find_dialog.c:295
 msgid "Find Next"
 msgstr "Finn neste"
 
-#: ../src/gnome2/bibletext_dialog.c:525
-msgid "Go to "
-msgstr "Gå til"
-
-#: ../src/gnome2/dialog.c:241
-msgid "Close without Saving"
-msgstr "Lukk uten å lagre"
-
-#: ../src/gnome2/dialog.c:730
-msgid "Xiphos:"
-msgstr "Xiphos:"
-
-#: ../src/gnome2/dialog.c:831
-msgid "Close _without Saving"
-msgstr "Lukk _uten å lagre"
-
-#: ../src/gnome2/font_dialog.c:297
+#: ../src/gnome2/font_dialog.c:303
 msgid "Set Module Font"
 msgstr "Sett skrifttype for modul"
 
-#: ../src/gnome2/font_dialog.c:327
+#: ../src/gnome2/font_dialog.c:333
 msgid "Change font for"
 msgstr "Endre tegnsett for"
 
-#: ../src/gnome2/font_dialog.c:331
+#: ../src/gnome2/font_dialog.c:337
 msgid "Module"
 msgstr "Modul"
 
-#: ../src/gnome2/font_dialog.c:335
+#: ../src/gnome2/font_dialog.c:341
 msgid "Current font: "
 msgstr "Nåværende tegnsett: "
 
-#: ../src/gnome2/font_dialog.c:372
+#: ../src/gnome2/font_dialog.c:378
 msgid "+0"
 msgstr "+0"
 
-#: ../src/gnome2/font_dialog.c:376
+#: ../src/gnome2/font_dialog.c:382
 msgid "Use the default font for this module"
 msgstr "Bruk standard tegnsett for denne modulen"
 
-#: ../src/gnome2/toolbar_nav.c:416
-msgid "Move backwards through history"
-msgstr "Gå bakover i historie"
+#. *****************************************************************************
+#. * Name
+#. *    gconf_setup
+#. *
+#. * Synopsis
+#. *   #include "main/settings.h"
+#. *
+#. *   void gconf_setup()
+#. *
+#. * Description
+#. *   verifies and initializes the GConf subsystem, so that "sword://" and
+#. *   similar can be handled by url-comprehending programs such as browsers.
+#. *   dialogs for permission/success/failure => conditional on debug build.
+#. *
+#. * Return value
+#. *   void
+#.
+#: ../src/gnome2/gui.c:110
+msgid ""
+"URL references using \"sword://\" (similar to web page\n"
+"references) can be used by programs to look up\n"
+"scripture references. Your system currently has no\n"
+"program set to handle these references.\n"
+"\n"
+"Would you like Xiphos to set itself as the\n"
+"program to handle these references?"
+msgstr ""
+"URL·references·using·\"sword://\"·(similar·to·web·page\n"
+"references)·can·be·used·by·programs·to·look·up\n"
+"scripture·references.·Your·system·currently·has·no\n"
+"program·set·to·handle·these·references.\n"
+"\n"
+"Would·you·like·Xiphos·to·set·itself·as·the\n"
+"program·to·handle·these·references?"
 
-#: ../src/gnome2/toolbar_nav.c:437
-msgid "Move foward through history"
-msgstr "Gå forover i historie"
+#: ../src/gnome2/gui.c:112
+msgid ""
+"Xiphos has successfully set itself\n"
+"as the handler of sword:// and bible:// URLs.\n"
+"\n"
+"You may wish to run the program \"gconf-editor\"\n"
+"to examine keys under /desktop/gnome/url-handlers,\n"
+"if you need to change these."
+msgstr ""
+"Xiphos·har nå vellykket blitt satt som\n"
+"håndterer av sword://·and·bible://·URLs.\n"
+"\n"
+"Du kan nå kjøre programmet·\"gconf-editor\"\n"
+"for å undersøke nøkler·under·/desktop/gnome/url-handlers,\n"
+"hvis du trenger å endre disse."
 
-#: ../src/gnome2/toolbar_nav.c:458
-msgid "Select a Book of the Bible"
-msgstr "Velg en av bibelens bøker"
+#: ../src/gnome2/gui.c:166
+#, c-format
+msgid ""
+"Xiphos failed to complete handler init for key #%d:\n"
+"%s"
+msgstr ""
+"Xiphos kunne ikke settes opp til å håndtere nøkkel #%d:\n"
+"%s"
 
-#: ../src/gnome2/toolbar_nav.c:523
-msgid "Change Chapter"
-msgstr "Endre kapittel"
+#: ../src/gnome2/gui.c:212
+msgid "BUG! Xiphos is about to crash due to a \"STRDUP\" error."
+msgstr ""
 
-#: ../src/gnome2/toolbar_nav.c:593
-msgid "Change Verse"
-msgstr "Endre vers"
+#: ../src/gnome2/gui.c:213 ../src/gnome2/gui.c:248
+msgid "Please report this error to the Xiphos team with:"
+msgstr ""
 
-#: ../src/gnome2/toolbar_nav.c:661
-msgid "Enter a Verse reference in Book 1:1 format and press Return"
-msgstr "Skriv inn en referanse i formen Bok 1:1 og trykk linjeskift"
+#: ../src/gnome2/gui.c:247
+msgid "BUG! Xiphos is about to crash due to a \"STRING\" error."
+msgstr ""
 
-#: ../src/gnome2/mod_mgr.c:333
-msgid "Install these modules:"
-msgstr "Installer disse modulene:"
+#: ../src/gnome2/main_window.c:789
+msgid "Xiphos - Bible Study Software"
+msgstr "Xiphos - Program for bibelstudier"
 
-#: ../src/gnome2/mod_mgr.c:335
-msgid "Remove these modules:"
-msgstr "Slett disse modulene:"
+#: ../src/gnome2/main_window.c:844
+msgid "Open a new tab"
+msgstr "Åpne ny arkfane"
+
+#: ../src/gnome2/main_window.c:923 ../src/gnome2/sidebar.c:627
+#: ../src/gnome2/sidebar.c:633 ../src/main/sidebar.cc:666
+#: ../src/main/sidebar.cc:1015 ../src/main/sidebar.cc:1016
+#: ../src/main/sidebar.cc:1017
+msgid "Standard View"
+msgstr "Standardvisning"
+
+#: ../src/gnome2/main_window.c:1004
+msgid "Commentary View"
+msgstr "Kommentarvisning"
 
-#: ../src/gnome2/mod_mgr.c:337
-msgid "Archive these modules:"
-msgstr "Arkiver disse modulene:"
+#: ../src/gnome2/main_window.c:1020
+msgid "Book View"
+msgstr "Bokvisning"
 
-#: ../src/gnome2/mod_mgr.c:339
+#: ../src/gnome2/main_window.c:1045
+msgid "Welcome to Xiphos"
+msgstr ""
+
+#: ../src/gnome2/menu_popup.c:1168
 msgid ""
-"Build fast-search index for these\n"
-"modules (may take minutes/module):"
+"Renaming is not available in Windows.\n"
+"\n"
+"Xiphos is limited by Windows' filesystem,\n"
+"because it disallows the renaming of filename\n"
+"components of currently-open files,\n"
+"such as the contents of this commentary.\n"
+"Therefore, personal commentary renaming is\n"
+"not available in the Windows environment."
 msgstr ""
-"Bygg rask søke indeks·for·disse\n"
-"modulene (kan ta minutter/moduler):"
+"Å gi nytt navn er ikke mulig i Windows\n"
+"\n"
+"Xiphos begrenses av Windows sitt filsystem,\n"
+"da systemet ikke tillater at man endrer filnavn\n"
+"på komponenter som er åpne, som for eksempel\n"
+"innholdet i denne kommentaren.\n"
+"Derfor er det heller ikke mulig å endre navn i\n"
+"personlige kommentarer, i ett windows oppsett."
+
+#: ../src/gnome2/menu_popup.c:1187
+msgid "Rename Commentary"
+msgstr "Endre navn på kommentar"
+
+#: ../src/gnome2/menu_popup.c:1190
+msgid "Choose Commentary Name"
+msgstr "Velg et navn på kommentaren"
+
+#: ../src/gnome2/menu_popup.c:1192
+msgid "New Name"
+msgstr "Nytt navn"
 
-#: ../src/gnome2/mod_mgr.c:341
-msgid "Delete fast-search index for these modules:"
-msgstr "Slett raskt søk indeks for disse modulene:"
+#: ../src/gnome2/menu_popup.c:1193 ../src/gnome2/treekey-editor.c:139
+#: ../src/gnome2/treekey-editor.c:198 ../src/gnome2/treekey-editor.c:284
+#: ../src/main/prayerlists.cc:243
+msgid "Name: "
+msgstr "Navn: "
 
-#: ../src/gnome2/mod_mgr.c:361
-msgid "Preparing to install"
-msgstr "Forbereder installasjon"
+#: ../src/gnome2/menu_popup.c:1203 ../src/main/prayerlists.cc:257
+msgid "Module names must contain [A-Za-z0-9_] only."
+msgstr "Modul navn må inneholde·[A-Za-z0-9_]"
+
+#: ../src/gnome2/menu_popup.c:1210 ../src/main/prayerlists.cc:264
+msgid "Xiphos already knows a module by that name."
+msgstr "Xiphos kjenner allerede til en modul med dette navnet"
+
+#: ../src/gnome2/menu_popup.c:1253
+#, c-format
+msgid ""
+"Failed to create new configuration:\n"
+"%s"
+msgstr ""
+"Kunne ikke lage nytt oppsett:\n"
+"%s"
+
+#: ../src/gnome2/menu_popup.c:1262
+msgid ""
+"Configuration build error:\n"
+"\n"
+msgstr ""
+"Feil ved bygging av oppsett:\n"
+"\n"
 
-#: ../src/gnome2/mod_mgr.c:363
+#: ../src/gnome2/mod_mgr.c:169
+msgid "Remove these modules?"
+msgstr ""
+
+#: ../src/gnome2/mod_mgr.c:170
 msgid "Preparing to remove"
 msgstr "Forbereder sletting"
 
-#: ../src/gnome2/mod_mgr.c:365
-msgid "Preparing to archive"
-msgstr "Gjør klar for å arkivere"
+#: ../src/gnome2/mod_mgr.c:171
+msgid "Removing"
+msgstr "Sletter"
 
-#: ../src/gnome2/mod_mgr.c:367
-msgid "Preparing to index"
-msgstr "Forbereder indeksering"
+#: ../src/gnome2/mod_mgr.c:172 ../ui/xi-menus.glade.h:72
+msgid "Remove"
+msgstr "Slett"
 
-#: ../src/gnome2/mod_mgr.c:369
-msgid "Preparing to delete index"
-msgstr "Forbereder sletting av indeks"
+#: ../src/gnome2/mod_mgr.c:175
+msgid "Install these modules?"
+msgstr ""
+
+#: ../src/gnome2/mod_mgr.c:176
+msgid "Preparing to install"
+msgstr "Forbereder installasjon"
 
-#: ../src/gnome2/mod_mgr.c:394
+#: ../src/gnome2/mod_mgr.c:177
 msgid "Installing"
 msgstr "Installerer"
 
-#: ../src/gnome2/mod_mgr.c:396
-msgid "Removing"
-msgstr "Sletter"
+#: ../src/gnome2/mod_mgr.c:178 ../src/gnome2/mod_mgr.c:2964
+#: ../ui/module-manager.glade.h:18
+msgid "Install"
+msgstr "Installer"
+
+#: ../src/gnome2/mod_mgr.c:181
+msgid "Archive these modules?"
+msgstr ""
+
+#: ../src/gnome2/mod_mgr.c:182
+msgid "Preparing to archive"
+msgstr "Gjør klar for å arkivere"
 
-#: ../src/gnome2/mod_mgr.c:398
+#: ../src/gnome2/mod_mgr.c:183
 msgid "Archiving"
 msgstr "Arkiverer"
 
-#: ../src/gnome2/mod_mgr.c:400
+#: ../src/gnome2/mod_mgr.c:184 ../ui/module-manager.glade.h:11
+msgid "Archive"
+msgstr "Arkiv"
+
+#: ../src/gnome2/mod_mgr.c:187
+msgid ""
+"Build fast-search index for these\n"
+"modules (may take minutes/module)?"
+msgstr ""
+
+#: ../src/gnome2/mod_mgr.c:188
+msgid "Preparing to index"
+msgstr "Forbereder indeksering"
+
+#: ../src/gnome2/mod_mgr.c:189
 msgid "Indexing"
 msgstr "Indeksering"
 
-#: ../src/gnome2/mod_mgr.c:402
+#: ../src/gnome2/mod_mgr.c:190 ../ui/module-manager.glade.h:17
+msgid "Index"
+msgstr "Indeks"
+
+#: ../src/gnome2/mod_mgr.c:193
+msgid "Delete fast-search index for these modules?"
+msgstr ""
+
+#: ../src/gnome2/mod_mgr.c:194
+msgid "Preparing to delete index"
+msgstr "Forbereder sletting av indeks"
+
+#: ../src/gnome2/mod_mgr.c:195
 msgid "Deleting index"
 msgstr "Sletter indeks"
 
-#: ../src/gnome2/mod_mgr.c:422
-#, c-format
-msgid ""
-"`mkdir %s' failed:\n"
-"%s."
-msgstr ""
-"Kunne ikke opprette mappa %s:\n"
-"%s."
+#: ../src/gnome2/mod_mgr.c:196
+msgid "Deletion"
+msgstr "Utstryking"
+
+#: ../src/gnome2/mod_mgr.c:427
+msgid "Module Name"
+msgstr "Modulnavn"
 
 #: ../src/gnome2/mod_mgr.c:448
-msgid "Xiphos could not execute archiver"
-msgstr "Xiphos kunne ikke kjøre arkiveringsprogram"
+msgid "A checkmark means this module is already installed"
+msgstr "Sjekkmerket betyr at modulen er allerede innstallert"
 
-#: ../src/gnome2/mod_mgr.c:453
+#: ../src/gnome2/mod_mgr.c:470
+msgid "Click the box to work on this module"
+msgstr "Klikk boksen for å bruke denne modulen"
+
+#: ../src/gnome2/mod_mgr.c:471
+msgid "Click the box to select this module for install/update"
+msgstr "Klikk i boksen for å velge denne modulen for innstallasjon/oppdatering"
+
+#: ../src/gnome2/mod_mgr.c:490
+msgid "Installed"
+msgstr "Installert"
+
+#: ../src/gnome2/mod_mgr.c:500
 msgid ""
-" archival result:\n"
-"\n"
+"The index icon means you have built an optimized ('lucene') index for this "
+"module for fast searching (see the Maintenance pane for this function)"
 msgstr ""
-" resultat fra arkivering:\n"
-"\n"
+"Inndeks ikonet betyr at du har laget en optimalisert ('lucene') indeks for "
+"denne modulen for raskt søking (see vedlikeholdspanel for denne funksjonen)"
 
-#: ../src/gnome2/mod_mgr.c:457
+#: ../src/gnome2/mod_mgr.c:518
 msgid ""
-"\n"
-"Archive in "
+"The lock icon means this module is encrypted, and requires that you purchase "
+"an unlock key from the content owner"
 msgstr ""
-"\n"
-"Arkiv inn"
+"Lås ikonet betyr at denne modulen er kryptert, og at du må kjøpe en "
+"opplåsingskode fra eier av dette innhold"
 
-#: ../src/gnome2/mod_mgr.c:514
-msgid "Journals and prayer lists cannot be indexed."
-msgstr "Får ikke indeksert Journal og bønneliste"
+#: ../src/gnome2/mod_mgr.c:535 ../ui/xi-menus.glade.h:1
+msgid "About"
+msgstr "Om"
 
-#: ../src/gnome2/mod_mgr.c:535 ../src/gnome2/mod_mgr.c:2753
-#: ../ui/module-manager.glade.h:15
-msgid "Install"
-msgstr "Installer"
+#: ../src/gnome2/mod_mgr.c:555
+msgid ""
+"The refresh icon means the Installed module is older than the newer "
+"Available module: You should update the module"
+msgstr ""
+"Oppdateringsikonet betyr at den innstallerte modulen er eldre en den nyeste "
+"tilgjengelige modulen: Du burde oppdatere denne modulen"
 
-#: ../src/gnome2/mod_mgr.c:537 ../src/gnome2/treekey-editor.c:315
-msgid "Remove"
-msgstr "Slett"
+#: ../src/gnome2/mod_mgr.c:567
+msgid "Available"
+msgstr "Tilgjengelig"
 
-#: ../src/gnome2/mod_mgr.c:539
-msgid "Archive"
-msgstr "Arkiv"
+#: ../src/gnome2/mod_mgr.c:576
+msgid "Size"
+msgstr "Størrelse"
 
-#: ../src/gnome2/mod_mgr.c:541
-msgid "Index"
-msgstr "Indeks"
+#: ../src/gnome2/mod_mgr.c:585
+msgid "Description"
+msgstr "Beskrivelse"
 
-#: ../src/gnome2/mod_mgr.c:543
-msgid "Deletion"
-msgstr "Utstryking"
+#: ../src/gnome2/mod_mgr.c:736
+#, c-format
+msgid ""
+"`mkdir %s' failed:\n"
+"%s."
+msgstr ""
+"Kunne ikke opprette mappa %s:\n"
+"%s."
 
-#: ../src/gnome2/mod_mgr.c:545
+#: ../src/gnome2/mod_mgr.c:759
+msgid " archived in: \n"
+msgstr ""
+
+#: ../src/gnome2/mod_mgr.c:815
+msgid "Journals and prayer lists cannot be indexed."
+msgstr "Får ikke indeksert Journal og bønneliste"
+
+#: ../src/gnome2/mod_mgr.c:833
 #, c-format
 msgid "%s failed"
 msgstr "%s·feilet"
 
-#: ../src/gnome2/mod_mgr.c:547 ../src/gnome2/mod_mgr.c:1267
+#: ../src/gnome2/mod_mgr.c:836 ../src/gnome2/mod_mgr.c:1562
 msgid "Finished"
 msgstr "Ferdig"
 
-#: ../src/gnome2/mod_mgr.c:712 ../src/gnome2/mod_mgr.c:714
-#: ../src/gnome2/mod_mgr.c:816 ../src/gnome2/mod_mgr.c:851
-#: ../src/gnome2/mod_mgr.c:853 ../src/gnome2/utilities.c:346
-#: ../src/gnome2/utilities.c:411 ../src/gnome2/utilities.c:413
-#: ../src/gnome2/utilities.c:1031 ../src/main/sidebar.cc:801
-#: ../src/main/sidebar.cc:873 ../src/main/sidebar.cc:875
+#: ../src/gnome2/mod_mgr.c:1003 ../src/gnome2/mod_mgr.c:1005
+#: ../src/gnome2/mod_mgr.c:1107 ../src/gnome2/mod_mgr.c:1142
+#: ../src/gnome2/mod_mgr.c:1144 ../src/gnome2/utilities.c:435
+#: ../src/gnome2/utilities.c:500 ../src/gnome2/utilities.c:502
+#: ../src/gnome2/utilities.c:986 ../src/main/sidebar.cc:852
+#: ../src/main/sidebar.cc:924 ../src/main/sidebar.cc:926
 msgid "Unknown"
 msgstr "Ukjent"
 
-#: ../src/gnome2/mod_mgr.c:1012
+#: ../src/gnome2/mod_mgr.c:1301
 #, c-format
 msgid ""
 "Repository:\n"
@@ -393,7 +782,7 @@ msgstr ""
 "Oppbevaringssted:\n"
 "%s"
 
-#: ../src/gnome2/mod_mgr.c:1024
+#: ../src/gnome2/mod_mgr.c:1313
 msgid ""
 "Categorized by\n"
 "Module Type"
@@ -401,44 +790,44 @@ msgstr ""
 "Kategorisert ved\n"
 "Modul Type"
 
-#: ../src/gnome2/mod_mgr.c:1029 ../src/gnome2/utilities.c:472
-#: ../src/main/sidebar.cc:948 ../src/main/sidebar.cc:950
+#: ../src/gnome2/mod_mgr.c:1318 ../src/gnome2/utilities.c:561
+#: ../src/main/sidebar.cc:999 ../src/main/sidebar.cc:1001
 msgid "Biblical Texts"
 msgstr "Bibeltekster"
 
-#: ../src/gnome2/mod_mgr.c:1033 ../src/gnome2/utilities.c:476
-#: ../src/main/sidebar.cc:650 ../src/main/sidebar.cc:973
-#: ../src/main/sidebar.cc:975 ../ui/prefs.glade.h:33
+#: ../src/gnome2/mod_mgr.c:1322 ../src/gnome2/utilities.c:565
+#: ../src/main/sidebar.cc:678 ../src/main/sidebar.cc:1024
+#: ../src/main/sidebar.cc:1026 ../ui/prefs.glade.h:33
 msgid "Commentaries"
 msgstr "Kommentarer"
 
-#: ../src/gnome2/mod_mgr.c:1037 ../src/gnome2/utilities.c:480
-#: ../src/main/sidebar.cc:982 ../src/main/sidebar.cc:984
+#: ../src/gnome2/mod_mgr.c:1326 ../src/gnome2/utilities.c:569
+#: ../src/main/sidebar.cc:1033 ../src/main/sidebar.cc:1035
 msgid "Dictionaries"
 msgstr "Ordbøker"
 
-#: ../src/gnome2/mod_mgr.c:1041 ../src/gnome2/utilities.c:484
-#: ../src/main/sidebar.cc:991 ../src/main/sidebar.cc:993
+#: ../src/gnome2/mod_mgr.c:1330 ../src/gnome2/utilities.c:573
+#: ../src/main/sidebar.cc:1042 ../src/main/sidebar.cc:1044
 msgid "Daily Devotionals"
 msgstr "Dagens Andakt"
 
-#: ../src/gnome2/mod_mgr.c:1045 ../src/gnome2/utilities.c:488
-#: ../src/main/sidebar.cc:660 ../src/main/sidebar.cc:1000
-#: ../src/main/sidebar.cc:1002
+#: ../src/gnome2/mod_mgr.c:1334 ../src/gnome2/utilities.c:577
+#: ../src/main/sidebar.cc:688 ../src/main/sidebar.cc:1051
+#: ../src/main/sidebar.cc:1053
 msgid "General Books"
 msgstr "Andre bøker"
 
-#: ../src/gnome2/mod_mgr.c:1049 ../src/gnome2/utilities.c:492
-#: ../src/main/sidebar.cc:1009 ../src/main/sidebar.cc:1011
+#: ../src/gnome2/mod_mgr.c:1338 ../src/gnome2/utilities.c:581
+#: ../src/main/sidebar.cc:1060 ../src/main/sidebar.cc:1062
 msgid "Maps"
 msgstr "Kart"
 
-#: ../src/gnome2/mod_mgr.c:1053 ../src/gnome2/utilities.c:496
-#: ../src/main/sidebar.cc:1018 ../src/main/sidebar.cc:1020
+#: ../src/gnome2/mod_mgr.c:1342 ../src/gnome2/utilities.c:585
+#: ../src/main/sidebar.cc:1069 ../src/main/sidebar.cc:1071
 msgid "Images"
 msgstr "Bilder"
 
-#: ../src/gnome2/mod_mgr.c:1061
+#: ../src/gnome2/mod_mgr.c:1350
 msgid ""
 "Categorized by\n"
 "Availability"
@@ -446,907 +835,744 @@ msgstr ""
 "Kategorisert ved\n"
 "Tilgjengelighet"
 
-#: ../src/gnome2/mod_mgr.c:1066
+#: ../src/gnome2/mod_mgr.c:1355
 msgid "Updates"
 msgstr "Oppdateringer"
 
-#: ../src/gnome2/mod_mgr.c:1070
+#: ../src/gnome2/mod_mgr.c:1359
 msgid "Uninstalled"
 msgstr "Avinstallert"
 
-#: ../src/gnome2/mod_mgr.c:1074 ../src/gnome2/sidebar.c:616
-#: ../src/gnome2/utilities.c:501 ../src/main/prayerlists.cc:238
-#: ../src/main/sidebar.cc:1028 ../src/main/sidebar.cc:1030
+#: ../src/gnome2/mod_mgr.c:1363 ../src/gnome2/sidebar.c:643
+#: ../src/gnome2/utilities.c:590 ../src/main/prayerlists.cc:241
+#: ../src/main/sidebar.cc:1079 ../src/main/sidebar.cc:1081
 msgid "Prayer List/Journal"
 msgstr "Bønneliste/Journal"
 
-#: ../src/gnome2/mod_mgr.c:1250
-msgid "Refreshing remote"
-msgstr "Oppdaterer eksterne kilder"
-
-#: ../src/gnome2/mod_mgr.c:1261
-msgid "Remote not found"
-msgstr "Ekstern kilde ikke funnet"
-
-#: ../src/gnome2/mod_mgr.c:1393
-msgid "Module Name"
-msgstr "Modulnavn"
-
-#: ../src/gnome2/mod_mgr.c:1414
-msgid "A checkmark means this module is already installed"
-msgstr "Sjekkmerket betyr at modulen er allerede innstallert"
-
-#: ../src/gnome2/mod_mgr.c:1436
-msgid "Click the box to work on this module"
-msgstr "Klikk boksen for å bruke denne modulen"
-
-#: ../src/gnome2/mod_mgr.c:1437
-msgid "Click the box to select this module for install/update"
-msgstr "Klikk i boksen for å velge denne modulen for innstallasjon/oppdatering"
-
-#: ../src/gnome2/mod_mgr.c:1456
-msgid "Installed"
-msgstr "Installert"
-
-#: ../src/gnome2/mod_mgr.c:1466
-msgid ""
-"The index icon means you have built an optimized ('lucene') index for this "
-"module for fast searching (see the Maintenance pane for this function)"
+#: ../src/gnome2/mod_mgr.c:1545
+msgid "Refreshing from remote source"
 msgstr ""
-"Inndeks ikonet betyr at du har laget en optimalisert ('lucene') indeks for "
-"denne modulen for raskt søking (see vedlikeholdspanel for denne funksjonen)"
 
-#: ../src/gnome2/mod_mgr.c:1484
-msgid ""
-"The lock icon means this module is encrypted, and requires that you purchase "
-"an unlock key from the content owner"
+#: ../src/gnome2/mod_mgr.c:1556
+msgid "Remote source not found"
 msgstr ""
-"Lås ikonet betyr at denne modulen er kryptert, og at du må kjøpe en "
-"opplåsingskode fra eier av dette innhold"
-
-#. 2
-#: ../src/gnome2/mod_mgr.c:1501 ../src/gnome2/sidebar.c:954
-#: ../src/gnome2/sidebar.c:1122 ../ui/xi-menus.glade.h:1
-msgid "About"
-msgstr "Om"
 
-#: ../src/gnome2/mod_mgr.c:1521
-msgid ""
-"The refresh icon means the Installed module is older than the newer "
-"Available module: You should update the module"
-msgstr ""
-"Oppdateringsikonet betyr at den innstallerte modulen er eldre en den nyeste "
-"tilgjengelige modulen: Du burde oppdatere denne modulen"
-
-#: ../src/gnome2/mod_mgr.c:1533
-msgid "Available"
-msgstr "Tilgjengelig"
-
-#: ../src/gnome2/mod_mgr.c:1542
-msgid "Size"
-msgstr "Størrelse"
-
-#: ../src/gnome2/mod_mgr.c:1551
-msgid "Description"
-msgstr "Beskrivelse"
-
-#: ../src/gnome2/mod_mgr.c:1583 ../src/gnome2/mod_mgr.c:1660
+#: ../src/gnome2/mod_mgr.c:1670
 msgid "Configure"
 msgstr "Oppsett"
 
-#: ../src/gnome2/mod_mgr.c:1614
+#: ../src/gnome2/mod_mgr.c:1701
 msgid "Type"
 msgstr "Type"
 
-#: ../src/gnome2/mod_mgr.c:1621
+#: ../src/gnome2/mod_mgr.c:1708
 msgid "Caption"
 msgstr "Bildetekst"
 
-#: ../src/gnome2/mod_mgr.c:1629
+#: ../src/gnome2/mod_mgr.c:1716
 msgid "Source"
 msgstr "Kilde"
 
-#: ../src/gnome2/mod_mgr.c:1637
+#: ../src/gnome2/mod_mgr.c:1724
 msgid "Directory"
 msgstr "Mappe"
 
-#: ../src/gnome2/mod_mgr.c:1658
-msgid "Sources"
-msgstr "Kilder"
+#: ../src/gnome2/mod_mgr.c:1732
+msgid "User"
+msgstr ""
 
-#: ../src/gnome2/mod_mgr.c:1664 ../src/gnome2/sidebar.c:1462
-#: ../src/gnome2/preferences_dialog.c:1784
+#: ../src/gnome2/mod_mgr.c:1740
+msgid "Password"
+msgstr ""
+
+#: ../src/gnome2/mod_mgr.c:1748
+msgid "UID"
+msgstr ""
+
+#: ../src/gnome2/mod_mgr.c:1765
+msgid "Module Sources"
+msgstr ""
+
+#: ../src/gnome2/mod_mgr.c:1768
+msgid "Add/Remove"
+msgstr ""
+
+#: ../src/gnome2/mod_mgr.c:1770
+msgid "Choose"
+msgstr ""
+
+#: ../src/gnome2/mod_mgr.c:1774 ../src/gnome2/preferences_dialog.c:1793
+#: ../src/gnome2/sidebar.c:1413
 msgid "Modules"
 msgstr "Moduler"
 
-#: ../src/gnome2/mod_mgr.c:1666
+#: ../src/gnome2/mod_mgr.c:1776
 msgid "Install/Update"
 msgstr "Installer/Oppdater"
 
-#: ../src/gnome2/mod_mgr.c:1668
+#: ../src/gnome2/mod_mgr.c:1778
 msgid "Maintenance"
 msgstr "Vedlikehold"
 
-#: ../src/gnome2/mod_mgr.c:1872
+#: ../src/gnome2/mod_mgr.c:1999
 msgid "Please Refresh"
 msgstr "Vennligst oppdater"
 
-#: ../src/gnome2/mod_mgr.c:1873
+#: ../src/gnome2/mod_mgr.c:2000
 msgid "Your module list is not up to date!"
 msgstr "Lista over moduler er ikke oppdatert!"
 
-#: ../src/gnome2/mod_mgr.c:2336 ../src/gnome2/mod_mgr.c:2542
+#. Zero Bibles is just not workable in Xiphos.
+#: ../src/gnome2/mod_mgr.c:2282
+msgid ""
+"You have uninstalled your last Bible.\n"
+"Xiphos requires at least one."
+msgstr ""
+
+#: ../src/gnome2/mod_mgr.c:2288
+msgid ""
+"There are still no Bibles installed.\n"
+"Xiphos cannot continue without one."
+msgstr ""
+
+#: ../src/gnome2/mod_mgr.c:2353
+msgid "Standard remote sources have been loaded."
+msgstr ""
+
+#: ../src/gnome2/mod_mgr.c:2359
+msgid "Could not load standard sources from CrossWire."
+msgstr ""
+
+#: ../src/gnome2/mod_mgr.c:2510 ../src/gnome2/mod_mgr.c:2759
 msgid "Remove the selected source"
 msgstr "Fjern den valgte kilden"
 
-#: ../src/gnome2/mod_mgr.c:2393
+#: ../src/gnome2/mod_mgr.c:2570
 msgid "Enter a remote source"
 msgstr "Skriv inn en ekstern kilde"
 
-#: ../src/gnome2/mod_mgr.c:2397
+#: ../src/gnome2/mod_mgr.c:2574
 msgid "Caption:"
 msgstr "Bildetekst:"
 
-#: ../src/gnome2/mod_mgr.c:2398
+#: ../src/gnome2/mod_mgr.c:2575
 msgid "Type:"
 msgstr "Type:"
 
-#: ../src/gnome2/mod_mgr.c:2399
+#: ../src/gnome2/mod_mgr.c:2576
 msgid "Host:"
 msgstr "Vert:"
 
-#: ../src/gnome2/mod_mgr.c:2400
+#: ../src/gnome2/mod_mgr.c:2577
 msgid "Directory:"
 msgstr "Mappe:"
 
+#: ../src/gnome2/mod_mgr.c:2579
+msgid "User (optional):"
+msgstr ""
+
+#: ../src/gnome2/mod_mgr.c:2580
+msgid "Password (optional):"
+msgstr ""
+
 #. this can happen at most once
-#: ../src/gnome2/mod_mgr.c:2425
+#: ../src/gnome2/mod_mgr.c:2608
 msgid "A source by that name already exists."
 msgstr "En kilde med dette navnet finnes allerede"
 
-#: ../src/gnome2/mod_mgr.c:2539
+#: ../src/gnome2/mod_mgr.c:2756
 msgid "Delete a remote source"
 msgstr "Slett en ekstern kilde"
 
-#: ../src/gnome2/sidebar_dialog.c:135
-msgid "Sidebar"
-msgstr "Sidefelt"
-
-#: ../src/gnome2/html.c:629
-#, c-format
-msgid "Page %d of %d"
-msgstr "Side %d av %d "
-
-#: ../src/gnome2/main_window.c:740
-msgid "Xiphos - Bible Study Software"
-msgstr "Xiphos - Program for bibelstudier"
-
-#: ../src/gnome2/main_window.c:794
-msgid "Open a new tab"
-msgstr "Åpne ny arkfane"
-
-#: ../src/gnome2/main_window.c:880 ../src/gnome2/sidebar.c:600
-#: ../src/gnome2/sidebar.c:606 ../src/main/sidebar.cc:638
-#: ../src/main/sidebar.cc:964 ../src/main/sidebar.cc:965
-#: ../src/main/sidebar.cc:966
-msgid "Standard View"
-msgstr "Standardvisning"
-
-#: ../src/gnome2/main_window.c:957
-msgid "Commentary View"
-msgstr "Kommentarvisning"
-
-#: ../src/gnome2/main_window.c:973
-msgid "Book View"
-msgstr "Bokvisning"
-
-#: ../src/gnome2/main_window.c:998
-#, fuzzy
-msgid "Welcome to Xiphos"
-msgstr "Om _Xiphos"
+#. *****************************************************************************
+#. * Name
+#. *   gui_open_mod_mgr
+#. *
+#. * Synopsis
+#. *   #include "gui/mod_mgr.h"
+#. *
+#. *   void gui_open_mod_mgr(void)
+#. *
+#. * Description
+#. *
+#. *
+#. * Return value
+#. *   void
+#.
+#: ../src/gnome2/mod_mgr.c:3244
+msgid ""
+"<b>Welcome to the Module Manager.</b>\n"
+"\n"
+"This is Xiphos' mechanism to get new and updated content.\n"
+"It appears you have never been here before, so please take a moment to look "
+"it over.\n"
+"(You will see this information box just once.)\n"
+"\n"
+"Modules come from different <u>repositories</u>.  <b>Module Sources: Add/"
+"Remove</b> will show you what repositories are currently known.\n"
+"\n"
+"<b>Module Sources: Choose</b> is for deciding from where modules should "
+"come, that is, from which repository Xiphos should obtain them, as well as "
+"where they should be placed on your system. Set <i>Install Source</i> and "
+"<i>Install Destination</i>, then click <i>Refresh</i>.\n"
+"\n"
+"<b>Modules: Install/Update</b> is for selecting and obtaining modules after "
+"choosing source and destination.\n"
+"\n"
+"<b>Modules: Maintenance</b> is for archive and index creation.\n"
+"\n"
+"See section 5 of our manual for Module Manager detail, or ask for help via "
+"Live Chat, or (if no one is responsive in chat) send mail to our users' "
+"mailing list.\n"
+msgstr ""
 
-#: ../src/gnome2/navbar_book.c:359 ../src/gnome2/navbar_book_dialog.c:299
+#: ../src/gnome2/navbar_book.c:359 ../src/gnome2/navbar_book_dialog.c:300
 msgid "Go outward, to the section containing this one"
 msgstr "Gå utover til seksjonen som inneholder denne"
 
-#: ../src/gnome2/navbar_book.c:375 ../src/gnome2/navbar_book_dialog.c:315
+#: ../src/gnome2/navbar_book.c:375 ../src/gnome2/navbar_book_dialog.c:316
 msgid "Go to previous item"
 msgstr "Gå til forrige"
 
-#: ../src/gnome2/navbar_book.c:390 ../src/gnome2/navbar_book_dialog.c:330
+#: ../src/gnome2/navbar_book.c:390 ../src/gnome2/navbar_book_dialog.c:331
 msgid "Go to next item"
 msgstr "Gå til neste"
 
-#: ../src/gnome2/navbar_book.c:406 ../src/gnome2/navbar_book_dialog.c:346
+#: ../src/gnome2/navbar_book.c:406 ../src/gnome2/navbar_book_dialog.c:347
 msgid "Go inward, to the first subsection"
 msgstr "Gå innover til den første subseksjonen"
 
-#. 0
-#: ../src/gnome2/sidebar.c:942 ../src/gnome2/sidebar.c:1110
-msgid "Open in a new tab"
-msgstr "Åpne i en ny arkfane"
+#: ../src/gnome2/navbar_versekey_dialog.c:864
+#: ../src/gnome2/navbar_versekey_editor.c:879
+#: ../src/gnome2/navbar_versekey_parallel.c:810
+msgid "Synchronize this window from main window"
+msgstr "Synkroniser vinduet med hovedvindu"
 
-#: ../src/gnome2/sidebar.c:943 ../src/gnome2/sidebar.c:1111
-msgid "Open selected module in a new tab"
-msgstr "Åpne valgt modul i ny fane"
+#: ../src/gnome2/parallel_dialog.c:328 ../src/gnome2/preferences_dialog.c:1799
+msgid "Parallel"
+msgstr "Parallell"
 
-#. 1
-#: ../src/gnome2/sidebar.c:948
-msgid "Open in a separate window"
-msgstr "Åpne i ett separat vindu"
+#: ../src/gnome2/parallel_view.c:275
+msgid "Copy"
+msgstr "Kopier"
 
-#: ../src/gnome2/sidebar.c:949
-msgid "Open selected module in a separate ['dialog'] window"
-msgstr "Åpne valgt modul i eget ['dialog']·vindu"
+#: ../src/gnome2/parallel_view.c:285
+msgid "Detach/Attach"
+msgstr "Koble til / fra"
 
-#: ../src/gnome2/sidebar.c:955 ../src/gnome2/sidebar.c:1123
-msgid "View information about the selected dialog"
-msgstr "Vis informasjon om valgt vindu"
+#: ../src/gnome2/parallel_view.c:291 ../ui/xi-menus.glade.h:53
+msgid "Module Options"
+msgstr "Valg for moduler"
 
-#: ../src/gnome2/sidebar.c:1046
-msgid "Simple"
-msgstr "Enkel"
+#. build change parallel modules submenu
+#: ../src/gnome2/parallel_view.c:306
+msgid "Change parallel 1"
+msgstr "Endre parallell 1"
 
-#: ../src/gnome2/sidebar.c:1047
-msgid "Create a new simple prayer list"
-msgstr "Lag en ny lenkel bønne liste"
+#: ../src/gnome2/parallel_view.c:308
+msgid "Change parallel 2"
+msgstr "Endre parallell 2"
 
-#: ../src/gnome2/sidebar.c:1053
-msgid "Subject"
-msgstr "Subjekt"
+#: ../src/gnome2/parallel_view.c:310
+msgid "Change parallel 3"
+msgstr "Endre parallell 3"
 
-#: ../src/gnome2/sidebar.c:1060
-msgid "Monthly"
-msgstr "Månedlig"
+#: ../src/gnome2/parallel_view.c:312
+msgid "Change parallel 4"
+msgstr "Endre parallell 4"
 
-#: ../src/gnome2/sidebar.c:1061 ../src/gnome2/sidebar.c:1068
-#: ../src/gnome2/sidebar.c:1075
-msgid "Create a new prayer list"
-msgstr "Lag en ny liste bønneliste"
+#: ../src/gnome2/parallel_view.c:314
+msgid "Change parallel 5"
+msgstr "Endre parallell 5"
 
-#: ../src/gnome2/sidebar.c:1067
-msgid "Daily Journal"
-msgstr "Dagens Logg"
+#: ../src/gnome2/parallel_view.c:471 ../src/gnome2/sidebar.c:626
+#: ../src/gnome2/sidebar.c:632 ../src/gnome2/tabbed_browser.c:262
+#: ../src/main/sidebar.cc:646 ../src/main/sidebar.cc:1007
+#: ../src/main/sidebar.cc:1008 ../src/main/sidebar.cc:1009
+msgid "Parallel View"
+msgstr "Parallellvisning"
 
-#: ../src/gnome2/sidebar.c:1074
-msgid "Outlined Topic"
-msgstr "Uthevet Emne"
+#: ../src/gnome2/preferences_dialog.c:1179
+#: ../src/gnome2/preferences_dialog.c:1217
+#: ../src/gnome2/preferences_dialog.c:1254
+#: ../src/gnome2/preferences_dialog.c:1289
+#: ../src/gnome2/preferences_dialog.c:1323
+#: ../src/gnome2/preferences_dialog.c:1356
+#: ../src/gnome2/preferences_dialog.c:1388
+#: ../src/gnome2/preferences_dialog.c:1421
+#: ../src/gnome2/preferences_dialog.c:1453
+#: ../src/gnome2/preferences_dialog.c:1487
+#: ../src/gnome2/preferences_dialog.c:1522
+#: ../src/gnome2/preferences_dialog.c:1557
+#: ../src/gnome2/preferences_dialog.c:1593
+#: ../src/gnome2/preferences_dialog.c:1631
+#: ../src/gnome2/preferences_dialog.c:2052
+msgid "-- Select --"
+msgstr "-- Velg --"
 
-#. 1
-#: ../src/gnome2/sidebar.c:1116 ../ui/xi-menus.glade.h:45
-msgid "Open in editor"
-msgstr "Åpne i editor"
+#: ../src/gnome2/preferences_dialog.c:1652
+msgid "Locale will take effect after restart."
+msgstr ""
 
-#: ../src/gnome2/sidebar.c:1117
-msgid "Open selected module in a dialog"
-msgstr "Åpne valgt modul i eget vindu"
+#: ../src/gnome2/preferences_dialog.c:1687 ../ui/prefs.glade.h:74
+msgid "Preferences"
+msgstr "Innstillinger"
 
-#: ../src/gnome2/sidebar.c:1438 ../src/gnome2/bookmarks_treeview.c:934
-msgid "Bookmarks"
-msgstr "Bokmerker"
+#: ../src/gnome2/preferences_dialog.c:1769
+msgid "Fonts"
+msgstr "Skrift"
 
-#: ../src/gnome2/sidebar.c:1446
-msgid "Search"
-msgstr "Søk"
+#: ../src/gnome2/preferences_dialog.c:1772
+msgid "Color"
+msgstr "Farge"
 
-#: ../src/gnome2/sidebar.c:1454
-msgid "Verse List"
-msgstr "Liste over vers"
+#: ../src/gnome2/preferences_dialog.c:1775
+msgid "Sizes"
+msgstr "Størrelser"
 
-#: ../src/gnome2/search_dialog.c:61 ../src/main/search_dialog.cc:60
-#: ../src/main/search_sidebar.cc:54
+#: ../src/gnome2/preferences_dialog.c:1779
+msgid "General"
+msgstr "Generelt"
+
+#: ../src/gnome2/preferences_dialog.c:1782 ../ui/prefs.glade.h:87
+msgid "Tabs and Panes"
+msgstr "Arkfaner og paneler"
+
+#: ../src/gnome2/preferences_dialog.c:1789
+msgid "Options"
+msgstr "Muligheter"
+
+#: ../src/gnome2/preferences_dialog.c:1796
+msgid "Main"
+msgstr "Hoved"
+
+#: ../src/gnome2/preferences_dialog.c:1802
+msgid "Special"
+msgstr "Spesial"
+
+#: ../src/gnome2/search_dialog.c:68 ../src/main/search_dialog.cc:66
+#: ../src/main/search_sidebar.cc:61
 msgid "Searching the "
 msgstr "Søker gjennom "
 
-#: ../src/gnome2/search_dialog.c:62 ../src/main/search_dialog.cc:61
-#: ../src/main/search_sidebar.cc:55
+#: ../src/gnome2/search_dialog.c:69 ../src/main/search_dialog.cc:67
+#: ../src/main/search_sidebar.cc:62
 msgid " Module"
 msgstr " Modul"
 
-#: ../src/gnome2/search_dialog.c:63 ../src/main/search_dialog.cc:62
-#: ../src/main/search_sidebar.cc:56
+#: ../src/gnome2/search_dialog.c:70 ../src/main/search_dialog.cc:68
+#: ../src/main/search_sidebar.cc:63
 msgid "found in "
-msgstr "funnet i"
+msgstr "funnet i "
 
-#: ../src/gnome2/search_dialog.c:498
+#: ../src/gnome2/search_dialog.c:527
 msgid "Clear List?"
 msgstr "Tøm lista?"
 
-#: ../src/gnome2/search_dialog.c:499
+#: ../src/gnome2/search_dialog.c:528
 msgid "Are you sure you want to clear the module list?"
 msgstr "Er du sikker på at du vil slette lista med moduler?"
 
-#: ../src/gnome2/search_dialog.c:682
+#: ../src/gnome2/search_dialog.c:708
 msgid "The last module list may not be deleted"
 msgstr "Den siste modul listen kan ikke slettes"
 
-#: ../src/gnome2/search_dialog.c:699
+#: ../src/gnome2/search_dialog.c:726
 msgid "Delete list?"
 msgstr "Slett lista?"
 
-#: ../src/gnome2/search_dialog.c:700
+#: ../src/gnome2/search_dialog.c:727
 msgid "Are you sure you want to delete:"
 msgstr "Er du sikker på at du vil slette:"
 
-#: ../src/gnome2/search_sidebar.c:189
+#: ../src/gnome2/search_sidebar.c:192
 msgid ""
 "This is an inclusive (\"AND\") search:\n"
 "Find matches showing all words."
-msgstr "Dette er en "
+msgstr "Dette er en"
 
-#: ../src/gnome2/search_sidebar.c:206
+#: ../src/gnome2/search_sidebar.c:209
 msgid "Search Module"
 msgstr "Søkemodul"
 
-#: ../src/gnome2/search_sidebar.c:220
+#: ../src/gnome2/search_sidebar.c:223
 msgid "Bible"
 msgstr "Bibel"
 
-#: ../src/gnome2/search_sidebar.c:229 ../ui/prefs.glade.h:35
+#: ../src/gnome2/search_sidebar.c:232 ../ui/prefs.glade.h:35
 msgid "Commentary"
 msgstr "Kommentar"
 
-#: ../src/gnome2/search_sidebar.c:243
+#: ../src/gnome2/search_sidebar.c:246
 msgid "Search Type"
 msgstr "Type søk"
 
-#: ../src/gnome2/search_sidebar.c:257 ../ui/search-dialog.glade.h:64
+#: ../src/gnome2/search_sidebar.c:260 ../ui/search-dialog.glade.h:66
 msgid "Multi word"
 msgstr "Flere ord"
 
-#: ../src/gnome2/search_sidebar.c:276 ../ui/search-dialog.glade.h:44
+#: ../src/gnome2/search_sidebar.c:279 ../ui/search-dialog.glade.h:44
 msgid "Exact phrase"
 msgstr "Nøyaktig det du skriver"
 
-#: ../src/gnome2/search_sidebar.c:290
+#: ../src/gnome2/search_sidebar.c:293
 msgid "Search Options"
 msgstr "Søkevalg"
 
-#: ../src/gnome2/search_sidebar.c:318
+#: ../src/gnome2/search_sidebar.c:321
 msgid "Search Scope"
 msgstr "Tekst det skal søkes i"
 
-#: ../src/gnome2/search_sidebar.c:331
+#: ../src/gnome2/search_sidebar.c:334
 msgid "No scope"
 msgstr "Søk i hele teksten"
 
-#: ../src/gnome2/search_sidebar.c:341
+#: ../src/gnome2/search_sidebar.c:344
 msgid "Use bounds"
 msgstr "Søk i bare deler av teksten"
 
-#: ../src/gnome2/search_sidebar.c:350
+#: ../src/gnome2/search_sidebar.c:353
 msgid "Last search"
 msgstr "Forrige søk"
 
-#: ../src/gnome2/search_sidebar.c:365
+#: ../src/gnome2/search_sidebar.c:368
 msgid "Bounds"
 msgstr "Grenser"
 
-#: ../src/gnome2/search_sidebar.c:379
+#: ../src/gnome2/search_sidebar.c:382
 msgid "Lower"
 msgstr "Nedre"
 
-#: ../src/gnome2/search_sidebar.c:386
+#: ../src/gnome2/search_sidebar.c:389
 msgid "Upper"
 msgstr "Øvre"
 
-#. info->stock_icon = GTK_STOCK_OPEN;
-#: ../src/gnome2/bookmark_dialog.c:145 ../src/gnome2/bookmarks_menu.c:471
-#: ../src/gnome2/bookmarks_menu.c:897 ../src/gnome2/bookmarks_menu.c:995
-#: ../src/gnome2/bookmarks_treeview.c:131 ../ui/editor_studypad.xml.h:2
-#: ../ui/xi-menus.glade.h:8
-msgid "Bookmark"
-msgstr "Bokmerke"
-
-#: ../src/gnome2/bookmark_dialog.c:147 ../src/gnome2/bookmarks_menu.c:997
-#: ../src/gnome2/bookmarks_treeview.c:132
-msgid "Enter Folder Name"
-msgstr "Skriv inn navn på mappe"
-
-#: ../src/gnome2/bookmark_dialog.c:149 ../src/gnome2/bookmarks_menu.c:999
-msgid "Folder Name"
-msgstr "Navn på mappe"
-
-#: ../src/gnome2/bookmark_dialog.c:150 ../src/gnome2/bookmarks_menu.c:1000
-#: ../src/gnome2/bookmarks_treeview.c:134
-msgid "Folder: "
-msgstr "Mappe: "
-
-#: ../src/gnome2/preferences_dialog.c:1231
-#: ../src/gnome2/preferences_dialog.c:1269
-#: ../src/gnome2/preferences_dialog.c:1306
-#: ../src/gnome2/preferences_dialog.c:1341
-#: ../src/gnome2/preferences_dialog.c:1375
-#: ../src/gnome2/preferences_dialog.c:1408
-#: ../src/gnome2/preferences_dialog.c:1440
-#: ../src/gnome2/preferences_dialog.c:1473
-#: ../src/gnome2/preferences_dialog.c:1505
-#: ../src/gnome2/preferences_dialog.c:1539
-#: ../src/gnome2/preferences_dialog.c:1574
-#: ../src/gnome2/preferences_dialog.c:1609
-#: ../src/gnome2/preferences_dialog.c:1645
-#: ../src/gnome2/preferences_dialog.c:2045
-msgid "-- Select --"
-msgstr "-- Velg --"
-
-#: ../src/gnome2/preferences_dialog.c:1678 ../ui/prefs.glade.h:74
-msgid "Preferences"
-msgstr "Innstillinger"
-
-#: ../src/gnome2/preferences_dialog.c:1760
-msgid "Fonts"
-msgstr "Skrift"
-
-#: ../src/gnome2/preferences_dialog.c:1763
-msgid "Color"
-msgstr "Farge"
-
-#: ../src/gnome2/preferences_dialog.c:1766
-msgid "Sizes"
-msgstr "Størrelser"
-
-#: ../src/gnome2/preferences_dialog.c:1770
-msgid "General"
-msgstr "Generelt"
-
-#: ../src/gnome2/preferences_dialog.c:1773 ../ui/prefs.glade.h:85
-msgid "Tabs and Panes"
-msgstr "Arkfaner og paneler"
-
-#: ../src/gnome2/preferences_dialog.c:1780
-msgid "Options"
-msgstr "Muligheter"
-
-#: ../src/gnome2/preferences_dialog.c:1787
-msgid "Main"
-msgstr "Hoved"
-
-#: ../src/gnome2/preferences_dialog.c:1790 ../src/gnome2/parallel_dialog.c:635
-msgid "Parallel"
-msgstr "Parallell"
-
-#: ../src/gnome2/preferences_dialog.c:1793
-msgid "Special"
-msgstr "Spesial"
-
-#: ../src/gnome2/preferences_cell_renderer.c:398
-msgid "Text"
-msgstr "Tekst"
-
-#: ../src/gnome2/preferences_cell_renderer.c:400
-msgid "Text to render"
-msgstr "Tegn opp tekst"
-
-#: ../src/gnome2/preferences_cell_renderer.c:406
-msgid "Pixbuf Object"
-msgstr "Objekt for bildebuffer"
-
-#: ../src/gnome2/preferences_cell_renderer.c:408
-msgid "The pixbuf to render."
-msgstr "Bildebufferet som skal tegnes opp."
-
-#: ../src/gnome2/about_xiphos.c:132
-msgid "Copyright 2000-2009 The Xiphos Development Team"
-msgstr "Copyright·2000-2009·The·Xiphos·Development·Team"
-
-#: ../src/gnome2/about_xiphos.c:135
-msgid ""
-"(formerly known as GnomeSword)\n"
-"\n"
-"Powered by The SWORD Project.\n"
-"We would like to thank Troy Griffitts and all the other folks who have given "
-"us The SWORD Project."
-msgstr ""
-"(tidligere kjent som GnomeSword)\n"
-"\n"
-"Levert av The·SWORD·Project.\n"
-"Vi vil gjerne takke·Troy·Griffitts·og alle andre som har bidratt i "
-"The·SWORD·Project."
-
-#: ../src/gnome2/bookmarks_menu.c:457 ../src/gnome2/treekey-editor.c:321
-#: ../ui/xi-menus.glade.h:20
-msgid "Edit"
-msgstr "Rediger"
-
-#: ../src/gnome2/bookmarks_menu.c:474
-msgid "Folder name: "
-msgstr "Navn på mappe: "
-
-#: ../src/gnome2/bookmarks_menu.c:477
-msgid "Bookmark name: "
-msgstr "Navn på bokmerke: "
-
-#: ../src/gnome2/bookmarks_menu.c:480 ../src/gnome2/bookmarks_menu.c:905
-msgid "Verse: "
-msgstr "Vers: "
-
-#: ../src/gnome2/bookmarks_menu.c:481 ../src/gnome2/bookmarks_menu.c:906
-msgid "Module: "
-msgstr "Modul: "
-
-#: ../src/gnome2/bookmarks_menu.c:665
-msgid "Restore Bookmark Folder"
-msgstr "Gjenopprett mappe med bokmerker"
-
-#: ../src/gnome2/bookmarks_menu.c:734
-msgid "Remove the selected folder"
-msgstr "Fjern mappa"
-
-#: ../src/gnome2/bookmarks_menu.c:736
-msgid "(and all its contents)?"
-msgstr "(og alt som ligger i den)?"
+#: ../src/gnome2/sidebar.c:1397
+msgid "Search"
+msgstr "Søk"
 
-#: ../src/gnome2/bookmarks_menu.c:739
-msgid "Remove the selected bookmark"
-msgstr "Fjern bokmerket"
+#: ../src/gnome2/sidebar.c:1405
+msgid "Verse List"
+msgstr "Liste over vers"
 
-#: ../src/gnome2/bookmarks_menu.c:898
-msgid "Add"
-msgstr "Legg til"
+#: ../src/gnome2/sidebar_dialog.c:139 ../src/gnome2/sidebar_dialog.c:148
+msgid "Sidebar"
+msgstr "Sidefelt"
 
-#: ../src/gnome2/bookmarks_menu.c:904
-msgid "Label: "
-msgstr "Merke: "
+#: ../src/gnome2/splash.c:396
+msgid "Powered by the SWORD Project"
+msgstr "Med SWORD-prosjektet i bånn"
 
-#: ../src/gnome2/treekey-editor.c:129 ../src/gnome2/treekey-editor.c:188
-#: ../src/gnome2/treekey-editor.c:274
+#: ../src/gnome2/treekey-editor.c:137 ../src/gnome2/treekey-editor.c:196
+#: ../src/gnome2/treekey-editor.c:282
 msgid "Prayer List/Journal Item"
 msgstr "Bønne liste/Journal Emne"
 
-#: ../src/gnome2/treekey-editor.c:130 ../src/gnome2/treekey-editor.c:189
-#: ../src/gnome2/treekey-editor.c:275
+#: ../src/gnome2/treekey-editor.c:138 ../src/gnome2/treekey-editor.c:197
+#: ../src/gnome2/treekey-editor.c:283
 msgid "New name"
 msgstr "Nytt navn"
 
-#: ../src/gnome2/treekey-editor.c:131 ../src/gnome2/treekey-editor.c:190
-#: ../src/gnome2/treekey-editor.c:276 ../src/main/prayerlists.cc:240
-msgid "Name: "
-msgstr "Navn: "
-
-#: ../src/gnome2/treekey-editor.c:245
+#: ../src/gnome2/treekey-editor.c:253
 msgid "Remove the selected item"
 msgstr "Fjern merket objekt"
 
-#: ../src/gnome2/treekey-editor.c:303
-msgid "Add Child"
-msgstr "Legg til Undergruppe"
-
-#: ../src/gnome2/treekey-editor.c:304 ../src/gnome2/treekey-editor.c:310
-msgid "Add an item"
-msgstr "Legg til sak"
-
-#: ../src/gnome2/treekey-editor.c:309
-msgid "Add Sibling"
-msgstr "Legg til Undergruppe"
+#: ../src/main/display.cc:259
+#, c-format
+msgid ""
+"Improperly encoded personal annotation label:\n"
+"'%s'"
+msgstr ""
 
-#: ../src/gnome2/treekey-editor.c:316
-msgid "Remove this item"
-msgstr "Fjern denne saken"
+#: ../src/main/display.cc:386
+msgid ""
+"An image file's size could not be determined.\n"
+"Is ImageMagick's 'identify' not installed?\n"
+"(Or possibly the image is of type other than bmp/gif/jpg/png.)\n"
+"Xiphos cannot resize images to fit window."
+msgstr ""
+"En bildefilstørrelse kunne ikke bestemmes.\n"
+"ImageMagick's·'identifikasjon'·ikke installert?\n"
+"(Bildet har annen filtype enn·bmp/gif/jpg/png.)\n"
+"Xiphos·kan ikke gjøre om bilde til å passe."
 
-#: ../src/gnome2/treekey-editor.c:322
-msgid "Edit this item"
-msgstr "Rediger denne saken"
+#: ../src/main/display.cc:1043 ../src/main/display.cc:1095
+#: ../src/main/display.cc:1172 ../ui/export-dialog.glade.h:7
+msgid "Chapter"
+msgstr "Kapittel"
 
-#: ../src/gnome2/splash.c:363
-msgid "Powered by the SWORD Project"
-msgstr "Med SWORD-prosjektet i bånn"
+#: ../src/main/main.c:119
+msgid "Xiphos does not understand more than one argument."
+msgstr "Xiphos forstår ikke mer enn ett argument."
 
-#: ../src/gnome2/splash.c:563
+#: ../src/main/main.c:161
 msgid "Initiating Gecko"
 msgstr "Starter Gecko"
 
-#: ../src/gnome2/splash.c:580
-msgid "Loading settings"
-msgstr "Last innstillinger"
-
-#: ../src/gnome2/splash.c:598
+#: ../src/main/main.c:167
 msgid "Building Interface"
 msgstr "Bygger grensesnitt"
 
-#: ../src/gnome2/splash.c:615
+#: ../src/main/main.c:171
 msgid "Starting Sword"
 msgstr "Starter Sword"
 
-#: ../src/gnome2/splash.c:632
+#: ../src/main/main.c:175
+msgid "Loading Settings"
+msgstr "Last innstillinger"
+
+#: ../src/main/main.c:179
 msgid "Displaying Xiphos"
 msgstr "Viser Gbomesword"
 
-#: ../src/gnome2/export_dialog.c:265 ../ui/export-dialog.glade.h:20
-msgid "Please check copyright before exporting!"
-msgstr "Vennligst sjekk kopirettigheter før eksportering!"
-
-#: ../src/gnome2/bookmarks_treeview.c:105
-#, fuzzy, c-format
-msgid "Search result: %s"
-msgstr "<b>Søkeresultater</b>"
-
-#: ../src/gnome2/about_trans.c:84
-msgid ""
-"Do you like using Xiphos to study the Bible? Would you like to see its "
-"display using your native language? You could translate Xiphos! \n"
-"\n"
-"We are always looking for contributions of new translations of Xiphos into "
-"other languages. If you are able to translate for us, please see the link "
-"below, contact us, and get involved with our efforts."
-msgstr ""
-"Liker du å bruke Xiphos til å studere Bibelen? Ville du like å se ditt eget "
-"språk? Du kan oversette Xiphos! \n"
-"\n"
-"Vi er alltid på utkikk etter noen som vil oversette Xiphos til andre språk. "
-"Hvis du har muligheten til oversette for oss, vennligst kontakt oss, og bli "
-"del i dette viktige arbeidet. Se link under"
+#: ../src/main/module_dialogs.cc:227 ../src/main/previewer.cc:127
+#: ../src/main/previewer.cc:194 ../ui/prefs.glade.h:75
+msgid "Previewer"
+msgstr "Program for forhåndsvisning"
 
-#: ../src/gnome2/about_trans.c:98
-msgid "About Xiphos Translation"
-msgstr "Om Xiphos Oversettelsen"
+#: ../src/main/module_dialogs.cc:292 ../src/main/module_dialogs.cc:416
+#: ../src/main/previewer.cc:269
+msgid "Footnote"
+msgstr "Fotnote"
 
-#: ../src/gnome2/about_trans.c:139
-msgid "See TRANSLATION-HOWTO in Xiphos source"
-msgstr "Se HVORDAN OVERSETTE i Xiphos kilde"
+#: ../src/main/module_dialogs.cc:298 ../src/main/module_dialogs.cc:421
+#: ../src/main/previewer.cc:281
+msgid "Cross Reference"
+msgstr "Kryssreferanse"
 
-#: ../src/gnome2/about_trans.c:145
-msgid "Xiphos development"
-msgstr "Xiphos utvikling"
+#: ../src/main/module_dialogs.cc:304 ../src/main/module_dialogs.cc:318
+#: ../src/main/module_dialogs.cc:426 ../src/main/module_dialogs.cc:438
+#: ../src/main/previewer.cc:287 ../src/main/previewer.cc:306
+msgid "Strongs"
+msgstr "Referanser til kildetekst"
 
-#: ../src/main/sword.cc:549
-msgid ""
-"Xiphos's file for language\n"
-"abbreviations is missing."
-msgstr ""
-"Xiphos's fil for språk\n"
-"forkortelser mangler."
+#: ../src/main/module_dialogs.cc:310 ../src/main/module_dialogs.cc:329
+#: ../src/main/module_dialogs.cc:431 ../src/main/module_dialogs.cc:448
+#: ../src/main/previewer.cc:293 ../src/main/previewer.cc:319
+msgid "Morphology"
+msgstr "Morfologi"
 
-#: ../src/main/sword.cc:556
-msgid ""
-"Xiphos's language abbreviation\n"
-"file cannot be opened."
-msgstr ""
-"Xiphos's språk forkortelse\n"
-"filen kan ikke åpnes."
+#: ../src/main/module_dialogs.cc:1081 ../src/main/url.cc:530
+msgid "Back to "
+msgstr "Tilbake til "
 
-#: ../src/main/sword.cc:567
-msgid ""
-"Xiphos cannot allocate space\n"
-"for language abbreviations."
-msgstr ""
-"Xiphos kan ikke tilegne plass\n"
-"for språk forkortelser."
+#: ../src/main/parallel_view.cc:404 ../ui/xi-menus.glade.h:89
+msgid "Strong's Numbers"
+msgstr "Referanser til kildetekst"
 
-#: ../src/main/sword.cc:574
-msgid ""
-"Xiphos cannot read the\n"
-"language abbreviation file."
-msgstr ""
-"Xiphos kan ikke lese\n"
-"språk forkortelse filen"
+#: ../src/main/parallel_view.cc:414 ../ui/search-dialog.glade.h:52
+#: ../ui/xi-menus.glade.h:40
+msgid "Footnotes"
+msgstr "Fotnoter"
 
-#: ../src/main/sword.cc:1202
-msgid "Daily devotional was requested, but there are none installed."
-msgstr ""
-"Dagens tekst er slått på, men ingen modul for dagens tekst er installert."
+#: ../src/main/parallel_view.cc:424 ../ui/search-dialog.glade.h:64
+#: ../ui/xi-menus.glade.h:55
+msgid "Morphological Tags"
+msgstr "Morfologiske merker"
 
-#: ../src/main/search_dialog.cc:129
-#, fuzzy, c-format
-msgid "Search result %s: %s"
-msgstr "Lagre søkeresultater som bokmerker"
+#: ../src/main/parallel_view.cc:434 ../ui/xi-menus.glade.h:44
+msgid "Hebrew Vowel Points"
+msgstr "Hebraiske vokaltegn"
 
-#: ../src/main/search_dialog.cc:363
-msgid "Delete Range?"
-msgstr "Slett området?"
+#: ../src/main/parallel_view.cc:444 ../ui/xi-menus.glade.h:43
+msgid "Hebrew Cantillation"
+msgstr "Hebraisk betoning"
 
-#: ../src/main/search_dialog.cc:364
-msgid "Are you sure you want to delete this range?"
-msgstr "Er du sikker på at du vil slette dette området?"
+#: ../src/main/parallel_view.cc:454 ../ui/xi-menus.glade.h:41
+msgid "Greek Accents"
+msgstr "Greske apostrofer"
 
-#: ../src/main/search_dialog.cc:578 ../src/main/search_dialog.cc:1049
-#: ../src/main/search_dialog.cc:1052 ../src/main/search_dialog.cc:1074
-#: ../src/main/search_dialog.cc:1077
-msgid "Search: "
-msgstr "Søk: "
+#: ../src/main/parallel_view.cc:464
+msgid "Cross-references"
+msgstr ""
 
-#: ../src/main/search_dialog.cc:623
-msgid "Remove Module?"
-msgstr "Slett modul?"
+#: ../src/main/parallel_view.cc:474 ../ui/xi-menus.glade.h:50
+msgid "Lemmas"
+msgstr "Oppslag"
 
-#: ../src/main/search_dialog.cc:624
-msgid "Are you sure you want to remove the selected module?"
-msgstr "Er du sikker på at du vil slette denne modulen?"
+#: ../src/main/parallel_view.cc:484 ../ui/xi-menus.glade.h:42
+msgid "Headings"
+msgstr "Overskrifter"
 
-#: ../src/main/search_dialog.cc:1473
-#, c-format
-msgid ""
-"%s:\n"
-"No such module is installed.\n"
-"%s"
+#: ../src/main/parallel_view.cc:494
+msgid "Morpheme Segmentation"
 msgstr ""
-"%s:\n"
-"Ingen slik modul er installert.\n"
-"%s"
 
-#: ../src/main/search_dialog.cc:1475
-msgid "Please adjust the module list."
-msgstr "Vennligst"
+#: ../src/main/parallel_view.cc:504 ../ui/xi-menus.glade.h:96
+msgid "Words of Christ in Red"
+msgstr "Jesu ord er skrevet i rødt"
 
-#: ../src/main/search_dialog.cc:1491
-#, fuzzy, c-format
-msgid "No fast-search index exists for %s.%s%s"
-msgstr "Slett raskt søk indeks for disse modulene:"
+#: ../src/main/parallel_view.cc:514 ../ui/xi-menus.glade.h:91
+msgid "Transliteration"
+msgstr "Transkripsjon fra et alfabet til et annet"
 
-#: ../src/main/search_dialog.cc:1493
-msgid ""
-"\n"
-"Search on this module is now `multi word'."
+#: ../src/main/parallel_view.cc:524
+msgid "Textual Variants"
 msgstr ""
 
-#: ../src/main/search_dialog.cc:1494
-msgid ""
-"\n"
-"See the Module Manager, Maintenance pane."
-msgstr ""
+#: ../src/main/parallel_view.cc:532 ../ui/xi-menus.glade.h:70
+msgid "Primary Reading"
+msgstr "Hoved lesning"
 
-#: ../src/main/search_dialog.cc:1555
-msgid "Search finished"
-msgstr "Søk fullført"
+#: ../src/main/parallel_view.cc:541 ../ui/xi-menus.glade.h:84
+msgid "Secondary Reading"
+msgstr "Annen lesning"
 
-#: ../src/main/main.c:109
-msgid "Xiphos does not understand more than one argument."
-msgstr "Xiphos forstår ikke mer enn ett argument."
+#: ../src/main/parallel_view.cc:550 ../ui/xi-menus.glade.h:9
+msgid "All Readings"
+msgstr "Alle lesninger"
+
+#: ../src/main/parallel_view.cc:884 ../src/main/parallel_view.cc:1136
+msgid "view context"
+msgstr "se innhold"
 
-#: ../src/main/prayerlists.cc:71
+#: ../src/main/prayerlists.cc:74
 msgid "January"
 msgstr "Januar"
 
-#: ../src/main/prayerlists.cc:72
+#: ../src/main/prayerlists.cc:75
 msgid "February"
 msgstr "Februar"
 
-#: ../src/main/prayerlists.cc:73
+#: ../src/main/prayerlists.cc:76
 msgid "March"
 msgstr "Marker"
 
-#: ../src/main/prayerlists.cc:74
+#: ../src/main/prayerlists.cc:77
 msgid "April"
 msgstr "April"
 
-#: ../src/main/prayerlists.cc:75
+#: ../src/main/prayerlists.cc:78
 msgid "May"
 msgstr "Mai"
 
-#: ../src/main/prayerlists.cc:76
+#: ../src/main/prayerlists.cc:79
 msgid "June"
 msgstr "Juni"
 
-#: ../src/main/prayerlists.cc:77
+#: ../src/main/prayerlists.cc:80
 msgid "July"
 msgstr "Juli"
 
-#: ../src/main/prayerlists.cc:78
+#: ../src/main/prayerlists.cc:81
 msgid "August"
 msgstr "August"
 
-#: ../src/main/prayerlists.cc:79
+#: ../src/main/prayerlists.cc:82
 msgid "September"
 msgstr "September"
 
-#: ../src/main/prayerlists.cc:80
+#: ../src/main/prayerlists.cc:83
 msgid "October"
 msgstr "Oktober"
 
-#: ../src/main/prayerlists.cc:81
+#: ../src/main/prayerlists.cc:84
 msgid "November"
 msgstr "November"
 
-#: ../src/main/prayerlists.cc:82
+#: ../src/main/prayerlists.cc:85
 msgid "December"
 msgstr "Desember"
 
-#: ../src/main/prayerlists.cc:121 ../src/main/sword_treekey.cc:332
+#: ../src/main/prayerlists.cc:124 ../src/main/sword_treekey.cc:332
 msgid "Growth"
 msgstr "Vekst"
 
-#: ../src/main/prayerlists.cc:122 ../src/main/sword_treekey.cc:333
+#: ../src/main/prayerlists.cc:125 ../src/main/sword_treekey.cc:333
 msgid "<b>For Growth</b><br>"
 msgstr "<b>For Vekst</b><br>"
 
-#: ../src/main/prayerlists.cc:123 ../src/main/prayerlists.cc:380
+#: ../src/main/prayerlists.cc:126 ../src/main/prayerlists.cc:383
 #: ../src/main/sword_treekey.cc:334
 msgid "Salvation"
 msgstr "Frelse"
 
-#: ../src/main/prayerlists.cc:124 ../src/main/sword_treekey.cc:335
+#: ../src/main/prayerlists.cc:127 ../src/main/sword_treekey.cc:335
 msgid "<b>For Salvation</b><br>"
 msgstr "<b>For·Frelse</b><br>"
 
-#: ../src/main/prayerlists.cc:125 ../src/main/prayerlists.cc:384
+#: ../src/main/prayerlists.cc:128 ../src/main/prayerlists.cc:387
 #: ../src/main/sword_treekey.cc:336
 msgid "Health"
 msgstr "Helse"
 
-#: ../src/main/prayerlists.cc:126 ../src/main/sword_treekey.cc:337
+#: ../src/main/prayerlists.cc:129 ../src/main/sword_treekey.cc:337
 msgid "<b>For Health</b><br>"
 msgstr "<b>For·Helse</b><br>"
 
-#: ../src/main/prayerlists.cc:127
+#: ../src/main/prayerlists.cc:130
 msgid "Misc"
 msgstr "Diverse"
 
-#: ../src/main/prayerlists.cc:128 ../src/main/sword_treekey.cc:339
+#: ../src/main/prayerlists.cc:131 ../src/main/sword_treekey.cc:339
 msgid "<b>Miscellaneous</b><br>"
 msgstr "<b>Blandet</b><br>"
 
-#: ../src/main/prayerlists.cc:136
+#: ../src/main/prayerlists.cc:139
 msgid "Point x"
 msgstr "Punkt x"
 
-#: ../src/main/prayerlists.cc:137
+#: ../src/main/prayerlists.cc:140
 msgid "<b>(x)</b><br>"
 msgstr "<b>(x)</b><br>"
 
-#: ../src/main/prayerlists.cc:138
+#: ../src/main/prayerlists.cc:141
 msgid "Point y"
 msgstr "Punkt y"
 
-#: ../src/main/prayerlists.cc:139
+#: ../src/main/prayerlists.cc:142
 msgid "<b>(y)</b><br>"
 msgstr "<b>(y)</b><br>"
 
-#: ../src/main/prayerlists.cc:140
+#: ../src/main/prayerlists.cc:143
 msgid "Point z"
 msgstr "Punkt z"
 
-#: ../src/main/prayerlists.cc:141
+#: ../src/main/prayerlists.cc:144
 msgid "<b>(z)</b><br>"
 msgstr "<b>(z)</b><br>"
 
-#: ../src/main/prayerlists.cc:149
+#: ../src/main/prayerlists.cc:152
 msgid "Minor Topic 1"
 msgstr "Mindre Emne 1"
 
-#: ../src/main/prayerlists.cc:150
+#: ../src/main/prayerlists.cc:153
 msgid "<b>Subtopic 1</b><br>"
 msgstr "<b>Subemne·1</b><br>"
 
-#: ../src/main/prayerlists.cc:152
+#: ../src/main/prayerlists.cc:155
 msgid "Minor Topic 2"
 msgstr "Mindre·Emne·2"
 
-#: ../src/main/prayerlists.cc:153
+#: ../src/main/prayerlists.cc:156
 msgid "<b>Subtopic 2</b><br>"
 msgstr "<b>Subemne 2</b><br>"
 
-#: ../src/main/prayerlists.cc:155
+#: ../src/main/prayerlists.cc:158
 msgid "Minor Topic 3"
 msgstr "Mindre·Emne·3"
 
-#: ../src/main/prayerlists.cc:156
+#: ../src/main/prayerlists.cc:159
 msgid "<b>Subtopic 3</b><br>"
 msgstr "<b>Subemne 3</b><br>"
 
-#: ../src/main/prayerlists.cc:158
+#: ../src/main/prayerlists.cc:161
 msgid "Minor Topic 4"
 msgstr "Mindre·Emne·4"
 
-#: ../src/main/prayerlists.cc:159
+#: ../src/main/prayerlists.cc:162
 msgid "<b>Subtopic 4</b><br>"
 msgstr "<b>Subemne 4</b><br>"
 
-#: ../src/main/prayerlists.cc:239
+#: ../src/main/prayerlists.cc:242
 msgid "Name for new prayer list or journal"
 msgstr "Navn for ny bønne liste eller journal"
 
-#: ../src/main/prayerlists.cc:254
-msgid "Module names must contain [A-Za-z0-9_] only."
-msgstr "Modul navn må inneholde·[A-Za-z0-9_]"
-
-#: ../src/main/prayerlists.cc:261
-msgid "Xiphos already knows a module by that name."
-msgstr "Xiphos kjenner allerede til en modul med dette navnet"
-
-#: ../src/main/prayerlists.cc:270
+#: ../src/main/prayerlists.cc:273
 msgid "Xiphos finds that prayer list already."
 msgstr "Xiphos finner denne bønnelisten allerede."
 
-#: ../src/main/prayerlists.cc:283
+#: ../src/main/prayerlists.cc:286
 #, c-format
 msgid ""
 "Xiphos cannot create module's path:\n"
@@ -1355,20 +1581,19 @@ msgstr ""
 "Xiphos·kan ikke lage module's·path:\n"
 "%s"
 
-#: ../src/main/prayerlists.cc:323
+#: ../src/main/prayerlists.cc:326
 msgid "A basic prayer list. \\par\\par Module created by Xiphos."
 msgstr "En grunnleggende bønneliste. \\par\\par·Module·created·by·Xiphos."
 
-#: ../src/main/prayerlists.cc:324
-#, fuzzy
+#: ../src/main/prayerlists.cc:327
 msgid "BasicPrayerList"
-msgstr "MinBønneListe"
+msgstr ""
 
-#: ../src/main/prayerlists.cc:338
+#: ../src/main/prayerlists.cc:341
 msgid "MyPrayerList"
 msgstr "MinBønneListe"
 
-#: ../src/main/prayerlists.cc:339
+#: ../src/main/prayerlists.cc:342
 msgid ""
 "<b>People:</b><br>Bob<br>Sam<br>Sue<br><br><b>Church:</"
 "b><br>pews<br>fellowship<br>Bibles for missionaries<br><br><br>"
@@ -1376,322 +1601,152 @@ msgstr ""
 "<b>Mennesker:</b><br>Bjarne<br>Sigurd<br>Siri<br><br><b>Kirke:</"
 "b><br>pews<br>felleskap<br>Bibler for misjonærer<br><br><br>"
 
-#: ../src/main/prayerlists.cc:365
+#: ../src/main/prayerlists.cc:368
 msgid "A subject-based prayer list. \\par\\par Module created by Xiphos."
 msgstr "En subjekt basert bønneliste. \\par\\par·Module·created·by·Xiphos."
 
-#: ../src/main/prayerlists.cc:366
-#, fuzzy
+#: ../src/main/prayerlists.cc:369
 msgid "SubjectPrayerList"
-msgstr "MinBønneListe"
+msgstr ""
 
-#: ../src/main/prayerlists.cc:381
+#: ../src/main/prayerlists.cc:384
 msgid "Bob<br>Sam<br>Sue<br>John<br>"
 msgstr "Bob<br>Sam<br>Sue<br>John<br>"
 
-#: ../src/main/prayerlists.cc:382
+#: ../src/main/prayerlists.cc:385
 msgid "Spiritual Growth"
 msgstr "Åndelig Vekst"
 
-#: ../src/main/prayerlists.cc:383
+#: ../src/main/prayerlists.cc:386
 msgid "Mike<br>Steve<br>"
 msgstr "Mike<br>Steve<br>"
 
-#: ../src/main/prayerlists.cc:385
+#: ../src/main/prayerlists.cc:388
 msgid "Sue<br>John<br>"
 msgstr "Sue<br>John<br>"
 
-#: ../src/main/prayerlists.cc:411
+#: ../src/main/prayerlists.cc:414
 msgid "A monthly prayer list. \\par\\par Module created by Xiphos."
 msgstr "En månedlig bønne liste.·\\par\\par·Moduler laget av Xiphos."
 
-#: ../src/main/prayerlists.cc:412
-#, fuzzy
+#: ../src/main/prayerlists.cc:415
 msgid "MonthlyPrayerList"
-msgstr "MinBønneListe"
+msgstr ""
 
-#: ../src/main/prayerlists.cc:463
+#: ../src/main/prayerlists.cc:466
 msgid "A daily journal. \\par\\par Module created by Xiphos."
 msgstr "En daglig journal. \\par\\par·Moduler·laget av Xiphos."
 
-#: ../src/main/prayerlists.cc:464
-#, fuzzy
+#: ../src/main/prayerlists.cc:467
 msgid "DailyJournal"
-msgstr "Dagens Logg"
+msgstr ""
 
-#: ../src/main/prayerlists.cc:528
+#: ../src/main/prayerlists.cc:531
 msgid "An outlined topic (e.g. sermon). \\par\\par Module created by Xiphos."
 msgstr ""
 "En understreket linje (eks. forkynnelse). \\par"
 "\\par·Module·created·by·Xiphos."
 
-#: ../src/main/prayerlists.cc:529
-#, fuzzy
+#: ../src/main/prayerlists.cc:532
 msgid "OutlinedTopic"
-msgstr "Uthevet Emne"
+msgstr ""
 
-#: ../src/main/prayerlists.cc:543
+#: ../src/main/prayerlists.cc:546
 msgid "Major Topic A"
 msgstr "Hoved Emne A"
 
-#: ../src/main/prayerlists.cc:544
+#: ../src/main/prayerlists.cc:547
 msgid "<b>Major Topic A</b><br>"
 msgstr "<b>Hoved Emne·A</b><br>"
 
-#: ../src/main/prayerlists.cc:546
+#: ../src/main/prayerlists.cc:549
 msgid "Major Topic B"
 msgstr "Hoved Emne B"
 
-#: ../src/main/prayerlists.cc:547
+#: ../src/main/prayerlists.cc:550
 msgid "<b>Major Topic B</b><br>"
 msgstr "<b>Hoved Emne B</b><br>"
 
-#: ../src/main/prayerlists.cc:549
+#: ../src/main/prayerlists.cc:552
 msgid "Major Topic C"
 msgstr "Hoved Emne C"
 
-#: ../src/main/prayerlists.cc:550
+#: ../src/main/prayerlists.cc:553
 msgid "<b>Major Topic C</b><br>"
 msgstr "<b>Hoved Emne C</b><br>"
 
-#: ../src/main/xml.c:80 ../src/main/xml.c:465
-#, c-format
-msgid "Document not created successfully. \n"
-msgstr "Dokumentet kunne ikke opprettes. \n"
-
-#: ../src/main/xml.c:89
-msgid "Personal"
-msgstr "Personlig"
-
-#: ../src/main/xml.c:90
-msgid "What must I do to be saved?"
-msgstr "Hva kan jeg gjøre for å bli frelst?"
-
-#: ../src/main/xml.c:92 ../src/main/xml.c:93
-msgid "Acts 16:31"
-msgstr "Apg 16:31"
-
-#: ../src/main/xml.c:97 ../src/main/xml.c:98
-msgid "Eph 2:8"
-msgstr "Efes 2:8"
-
-#: ../src/main/xml.c:102 ../src/main/xml.c:103
-msgid "Romans 1:16"
-msgstr "Rom 1:16"
-
-#: ../src/main/xml.c:106
-msgid "What is the Gospel?"
-msgstr "Hva er evangeliet?"
-
-#: ../src/main/xml.c:108 ../src/main/xml.c:109
-msgid "1 Cor 15:1-4"
-msgstr "1 Kor 15:1-4"
-
-#: ../src/main/xml.c:413 ../src/main/xml.c:1078
-#, c-format
-msgid "Document not parsed successfully. \n"
-msgstr "Dokumentet kunne ikke leses. \n"
-
-#: ../src/main/xml.c:419 ../src/main/xml.c:681 ../src/main/xml.c:959
-#: ../src/main/xml.c:1138
-#, c-format
-msgid "empty document \n"
-msgstr "tomt dokument \n"
+#: ../src/main/previewer.cc:275
+msgid "User Annotation"
+msgstr ""
 
-#: ../src/main/xml.c:425
+#: ../src/main/search_dialog.cc:212
 #, c-format
-msgid "wrong type, root node != SwordBookmarks\n"
-msgstr "feil type, root node != SwordBookmarks\n"
+msgid "Search result %s: %s"
+msgstr ""
 
-#: ../src/main/xml.c:479
-msgid "Old Testament"
-msgstr "Gamle testamentet"
+#: ../src/main/search_dialog.cc:444
+msgid "Delete Range?"
+msgstr "Slett området?"
 
-#: ../src/main/xml.c:481
-msgid "Gen - Mal"
-msgstr "Fra Mosebøkene til Malaki"
+#: ../src/main/search_dialog.cc:445
+msgid "Are you sure you want to delete this range?"
+msgstr "Er du sikker på at du vil slette dette området?"
 
-#: ../src/main/xml.c:487
-msgid "New Testament"
-msgstr "Nye testamentet"
+#: ../src/main/search_dialog.cc:659 ../src/main/search_dialog.cc:1130
+#: ../src/main/search_dialog.cc:1133 ../src/main/search_dialog.cc:1155
+#: ../src/main/search_dialog.cc:1158
+msgid "Search: "
+msgstr "Søk: "
 
-#: ../src/main/xml.c:489
-msgid "Mat - Rev"
-msgstr "Fra Matteus' Evangelium til Johannes' Åpenbaring"
+#: ../src/main/search_dialog.cc:704
+msgid "Remove Module?"
+msgstr "Slett modul?"
 
-#: ../src/main/xml.c:497
-msgid "Sample Module List"
-msgstr "Utvalgte moduler"
+#: ../src/main/search_dialog.cc:705
+msgid "Are you sure you want to remove the selected module?"
+msgstr "Er du sikker på at du vil slette denne modulen?"
 
-#: ../src/main/xml.c:687 ../src/main/xml.c:965
+#: ../src/main/search_dialog.cc:1560
 #, c-format
-msgid "wrong type, root node != %s\n"
-msgstr "feil type, rot er ikke %s\n"
-
-#: ../src/main/display.cc:278
 msgid ""
-"An image file's size could not be determined.\n"
-"Is ImageMagick's 'identify' not installed?\n"
-"(Or possibly the image is of type other than bmp/gif/jpg/png.)\n"
-"Xiphos cannot resize images to fit window."
+"%s:\n"
+"No such module is installed.\n"
+"%s"
 msgstr ""
-"En bildefilstørrelse kunne ikke bestemmes.\n"
-"ImageMagick's·'identifikasjon'·ikke installert?\n"
-"(Bildet har annen filtype enn·bmp/gif/jpg/png.)\n"
-"Xiphos·kan ikke gjøre om bilde til å passe."
-
-#: ../src/main/display.cc:931 ../src/main/display.cc:993
-#: ../src/main/display.cc:1081 ../src/main/display.cc:1089
-#: ../ui/export-dialog.glade.h:7
-msgid "Chapter"
-msgstr "Kapittel"
-
-#: ../src/main/previewer.cc:122 ../src/main/module_dialogs.cc:231
-#: ../ui/prefs.glade.h:75
-msgid "Previewer"
-msgstr "Program for forhåndsvisning"
+"%s:\n"
+"Ingen slik modul er installert.\n"
+"%s"
 
-#: ../src/main/previewer.cc:197 ../src/main/module_dialogs.cc:297
-#: ../src/main/module_dialogs.cc:423
-msgid "Footnote"
-msgstr "Fotnote"
+#: ../src/main/search_dialog.cc:1562
+msgid "Please adjust the module list."
+msgstr "Vennligst"
 
-#: ../src/main/previewer.cc:203 ../src/main/module_dialogs.cc:303
-#: ../src/main/module_dialogs.cc:428
-msgid "Cross Reference"
-msgstr "Kryssreferanse"
+#: ../src/main/search_dialog.cc:1578
+#, c-format
+msgid "No fast-search index exists for %s.%s%s"
+msgstr ""
 
-#: ../src/main/previewer.cc:209 ../src/main/previewer.cc:228
-#: ../src/main/module_dialogs.cc:309 ../src/main/module_dialogs.cc:323
-#: ../src/main/module_dialogs.cc:433 ../src/main/module_dialogs.cc:445
-msgid "Strongs"
-msgstr "Referanser til kildetekst"
+#: ../src/main/search_dialog.cc:1580
+msgid ""
+"\n"
+"Search on this module is now `multi word'."
+msgstr ""
 
-#: ../src/main/previewer.cc:215 ../src/main/previewer.cc:241
-#: ../src/main/module_dialogs.cc:315 ../src/main/module_dialogs.cc:334
-#: ../src/main/module_dialogs.cc:438 ../src/main/module_dialogs.cc:455
-msgid "Morphology"
-msgstr "Morfologi"
+#: ../src/main/search_dialog.cc:1581
+msgid ""
+"\n"
+"See the Module Manager, Maintenance pane."
+msgstr ""
 
-#: ../src/main/module_dialogs.cc:1104 ../src/main/url.cc:543
-msgid "Back to "
-msgstr "Tilbake til"
+#: ../src/main/search_dialog.cc:1644
+msgid "Search finished"
+msgstr "Søk fullført"
 
-#: ../src/main/search_sidebar.cc:93
+#: ../src/main/search_sidebar.cc:100
 msgid "matches"
 msgstr "søkeresultater"
 
-#: ../src/main/parallel_view.cc:398 ../ui/xi-menus.glade.h:67
-msgid "Strong's Numbers"
-msgstr "Referanser til kildetekst"
-
-#: ../src/main/parallel_view.cc:408 ../ui/search-dialog.glade.h:50
-#: ../ui/xi-menus.glade.h:25
-msgid "Footnotes"
-msgstr "Fotnoter"
-
-#: ../src/main/parallel_view.cc:418 ../ui/search-dialog.glade.h:62
-#: ../ui/xi-menus.glade.h:39
-msgid "Morphological Tags"
-msgstr "Morfologiske merker"
-
-#: ../src/main/parallel_view.cc:428 ../ui/xi-menus.glade.h:29
-msgid "Hebrew Vowel Points"
-msgstr "Hebraiske vokaltegn"
-
-#: ../src/main/parallel_view.cc:438 ../ui/xi-menus.glade.h:28
-msgid "Hebrew Cantillation"
-msgstr "Hebraisk betoning"
-
-#: ../src/main/parallel_view.cc:448 ../ui/xi-menus.glade.h:26
-msgid "Greek Accents"
-msgstr "Greske apostrofer"
-
-#: ../src/main/parallel_view.cc:458
-#, fuzzy
-msgid "Cross-references"
-msgstr "Kryssreferanse"
-
-#: ../src/main/parallel_view.cc:468 ../ui/xi-menus.glade.h:35
-msgid "Lemmas"
-msgstr "Oppslag"
-
-#: ../src/main/parallel_view.cc:478 ../ui/xi-menus.glade.h:27
-msgid "Headings"
-msgstr "Overskrifter"
-
-#: ../src/main/parallel_view.cc:488
-msgid "Morpheme Segmentation"
-msgstr ""
-
-#: ../src/main/parallel_view.cc:498 ../ui/xi-menus.glade.h:73
-msgid "Words of Christ in Red"
-msgstr "Jesu ord er skrevet i rødt"
-
-#: ../src/main/parallel_view.cc:508 ../ui/xi-menus.glade.h:68
-msgid "Transliteration"
-msgstr "Transkripsjon fra et alfabet til et annet"
-
-#: ../src/main/parallel_view.cc:518
-#, fuzzy
-msgid "Textual Variants"
-msgstr "Varianter"
-
-#: ../src/main/parallel_view.cc:526 ../ui/xi-menus.glade.h:49
-msgid "Primary Reading"
-msgstr "Hoved lesning"
-
-#: ../src/main/parallel_view.cc:535 ../ui/xi-menus.glade.h:63
-msgid "Secondary Reading"
-msgstr "Annen lesning"
-
-#: ../src/main/parallel_view.cc:544 ../ui/xi-menus.glade.h:5
-msgid "All Readings"
-msgstr "Alle lesninger"
-
-#: ../src/main/parallel_view.cc:878 ../src/main/parallel_view.cc:1130
-msgid "view context"
-msgstr "se innhold"
-
-#: ../src/main/url.cc:99
-msgid "URL not found:"
-msgstr "URL ikke funnet"
-
-#: ../src/main/url.cc:194
-#, c-format
-msgid "Xiphos could not execute %s"
-msgstr "Xiphos kunne ikke starte%s"
-
-#: ../src/main/url.cc:202
-msgid "Viewer error:\n"
-msgstr "Visningsfeil:\n"
-
-#: ../src/main/url.cc:278
-#, c-format
-msgid "Show %s in main window"
-msgstr "Vis %s i hovedvinduet"
-
-#: ../src/main/tab_history.c:97
-msgid "H_istory/<Separator>"
-msgstr "H_istorie/<Separator>"
-
-#: ../src/main/tab_history.c:99
-msgid "H_istory/C_lear"
-msgstr "H_istorie/S_lett"
-
-#: ../src/main/tab_history.c:224
-msgid "Clear History"
-msgstr "Slett Historie"
-
-#: ../src/main/sidebar.cc:375
-msgid "verse"
-msgstr "vers"
-
-#: ../src/main/sidebar.cc:437
-msgid "chapter"
-msgstr "kapittel"
-
-#: ../src/main/settings.c:56
+#: ../src/main/settings.c:60
 msgid ""
 "Welcome to Xiphos.\n"
 "\n"
@@ -1727,28 +1782,11 @@ msgstr ""
 "forsiktig!\n"
 "Vil du starte modulhåndtereren så du kan legge inn en bibeltekst?"
 
-#: ../src/main/settings.c:109
+#: ../src/main/settings.c:105
 msgid "$HOME is not set!"
 msgstr "$HOME er ikke satt!"
 
-#: ../src/main/settings.c:124
-msgid "Xiphos has renamed .xiphos-2.0 to .xiphos"
-msgstr "Xiphos har skiftet ut navnet på mappen .xiphos-2.0 til .xiphos"
-
-#: ../src/main/settings.c:127
-#, c-format
-msgid ""
-"Xiphos can not rename  .xiphos-2.0 to .xiphos:\n"
-"%s\n"
-"\n"
-"Xiphos cannot continue."
-msgstr ""
-"Xiphos kan ikke skifte navn på mappen .xiphos-2.0 til .xiphos:\n"
-"%s\n"
-"\n"
-"Xiphos kan ikke fortsette."
-
-#: ../src/main/settings.c:135
+#: ../src/main/settings.c:120
 #, c-format
 msgid ""
 "Xiphos can not create  .xiphos:\n"
@@ -1761,12 +1799,12 @@ msgstr ""
 "\n"
 "Xiphos kan ikke fortsette."
 
-#: ../src/main/settings.c:148 ../src/main/settings.c:156
-#: ../src/main/settings.c:164
+#: ../src/main/settings.c:133 ../src/main/settings.c:142
+#: ../src/main/settings.c:151
 msgid "can not create "
-msgstr "kan ikke skape"
+msgstr "kan ikke skape "
 
-#: ../src/main/settings.c:196
+#: ../src/main/settings.c:194
 msgid ""
 "There are still no Bibles installed.\n"
 "Evidently, you declined to install any.\n"
@@ -1782,11 +1820,11 @@ msgstr ""
 "kan ikke Xiphos·fortsette,\n"
 "og vil nå ende økt."
 
-#: ../src/main/settings.c:200
+#: ../src/main/settings.c:198
 msgid "Bible module installation complete."
 msgstr "Bibeltekst er nå installert."
 
-#: ../src/main/settings.c:203
+#: ../src/main/settings.c:201
 msgid ""
 "Without any Bible modules to display,\n"
 "Xiphos cannot proceed,\n"
@@ -1796,71 +1834,160 @@ msgstr ""
 "kan ikke Xiphos fortsette,\n"
 "og vil nå avslutte."
 
-#. *****************************************************************************
-#. * Name
-#. *    gconf_setup
-#. *
-#. * Synopsis
-#. *   #include "main/settings.h"
-#. *
-#. *   void gconf_setup()
-#. *
-#. * Description
-#. *   verifies and initializes the GConf subsystem, so that "sword://" and
-#. *   similar can be handled by url-comprehending programs such as browsers.
-#. *   dialogs for permission/success/failure => conditional on debug build.
-#. *
-#. * Return value
-#. *   void
-#.
-#: ../src/main/settings.c:816
+#: ../src/main/sidebar.cc:399
+msgid "verse"
+msgstr "vers"
+
+#: ../src/main/sidebar.cc:461
+msgid "chapter"
+msgstr "kapittel"
+
+#: ../src/main/sword.cc:537
 msgid ""
-"URL references using \"sword://\" (similar to web page\n"
-"references) can be used by programs to look up\n"
-"scripture references. Your system currently has no\n"
-"program set to handle these references.\n"
-"\n"
-"Would you like Xiphos to set itself as the\n"
-"program to handle these references?"
+"Xiphos's file for language\n"
+"abbreviations is missing."
 msgstr ""
-"URL·references·using·\"sword://\"·(similar·to·web·page\n"
-"references)·can·be·used·by·programs·to·look·up\n"
-"scripture·references.·Your·system·currently·has·no\n"
-"program·set·to·handle·these·references.\n"
-"\n"
-"Would·you·like·Xiphos·to·set·itself·as·the\n"
-"program·to·handle·these·references?"
+"Xiphos's fil for språk\n"
+"forkortelser mangler."
 
-#: ../src/main/settings.c:818
+#: ../src/main/sword.cc:544
 msgid ""
-"Xiphos has successfully set itself\n"
-"as the handler of sword:// and bible:// URLs.\n"
-"\n"
-"You may wish to run the program \"gconf-editor\"\n"
-"to examine keys under /desktop/gnome/url-handlers,\n"
-"if you need to change these."
+"Xiphos's language abbreviation\n"
+"file cannot be opened."
 msgstr ""
-"Xiphos·har nå vellykket blitt satt som\n"
-"håndterer av sword://·and·bible://·URLs.\n"
-"\n"
-"Du kan nå kjøre programmet·\"gconf-editor\"\n"
-"for å undersøke nøkler·under·/desktop/gnome/url-handlers,\n"
-"hvis du trenger å endre disse."
+"Xiphos's språk forkortelse\n"
+"filen kan ikke åpnes."
 
-#: ../src/main/settings.c:871
-#, c-format
+#: ../src/main/sword.cc:557
 msgid ""
-"Xiphos failed to complete handler init for key #%d:\n"
-"%s"
+"Xiphos cannot allocate space\n"
+"for language abbreviations."
 msgstr ""
-"Xiphos kunne ikke settes opp til å håndtere nøkkel #%d:\n"
-"%s"
+"Xiphos kan ikke tilegne plass\n"
+"for språk forkortelser."
+
+#: ../src/main/sword.cc:564
+msgid ""
+"Xiphos cannot read the\n"
+"language abbreviation file."
+msgstr ""
+"Xiphos kan ikke lese\n"
+"språk forkortelse filen"
+
+#: ../src/main/sword.cc:642
+msgid "No matching locale found for"
+msgstr ""
+
+#: ../src/main/sword.cc:644
+msgid "Book names and menus may not be translated"
+msgstr ""
+
+#: ../src/main/sword.cc:1232
+msgid "Daily devotional was requested, but there are none installed."
+msgstr ""
+"Dagens tekst er slått på, men ingen modul for dagens tekst er installert."
+
+#: ../src/main/tab_history.c:219
+msgid "Clear History"
+msgstr "Slett Historie"
+
+#: ../src/main/url.cc:101
+msgid "URL not found:"
+msgstr "URL ikke funnet"
+
+#: ../src/main/url.cc:191
+#, c-format
+msgid "Xiphos could not execute %s"
+msgstr "Xiphos kunne ikke starte%s"
+
+#: ../src/main/url.cc:199
+msgid "Viewer error:\n"
+msgstr "Visningsfeil:\n"
+
+#: ../src/main/url.cc:272
+#, c-format
+msgid "Show %s in main window"
+msgstr "Vis %s i hovedvinduet"
+
+#: ../src/main/xml.c:80 ../src/main/xml.c:464
+#, c-format
+msgid "Document not created successfully. \n"
+msgstr "Dokumentet kunne ikke opprettes. \n"
+
+#: ../src/main/xml.c:89
+msgid "Personal"
+msgstr "Personlig"
+
+#: ../src/main/xml.c:90
+msgid "What must I do to be saved?"
+msgstr "Hva kan jeg gjøre for å bli frelst?"
+
+#: ../src/main/xml.c:92 ../src/main/xml.c:93
+msgid "Acts 16:31"
+msgstr "Apg 16:31"
+
+#: ../src/main/xml.c:97 ../src/main/xml.c:98
+msgid "Eph 2:8,9"
+msgstr ""
+
+#: ../src/main/xml.c:102 ../src/main/xml.c:103
+msgid "Romans 1:16"
+msgstr "Rom 1:16"
+
+#: ../src/main/xml.c:106
+msgid "What is the Gospel?"
+msgstr "Hva er evangeliet?"
+
+#: ../src/main/xml.c:108 ../src/main/xml.c:109
+msgid "1 Cor 15:1-4"
+msgstr "1 Kor 15:1-4"
+
+#: ../src/main/xml.c:413 ../src/main/xml.c:1144
+#, c-format
+msgid "Document not parsed successfully. \n"
+msgstr "Dokumentet kunne ikke leses. \n"
+
+#: ../src/main/xml.c:419 ../src/main/xml.c:747 ../src/main/xml.c:1025
+#: ../src/main/xml.c:1204
+#, c-format
+msgid "empty document \n"
+msgstr "tomt dokument \n"
+
+#: ../src/main/xml.c:425
+#, c-format
+msgid "wrong type, root node != SwordBookmarks\n"
+msgstr "feil type, root node != SwordBookmarks\n"
+
+#: ../src/main/xml.c:476
+msgid "Old Testament"
+msgstr "Gamle testamentet"
+
+#: ../src/main/xml.c:477
+msgid "Gen - Mal"
+msgstr "Fra Mosebøkene til Malaki"
+
+#: ../src/main/xml.c:482
+msgid "New Testament"
+msgstr "Nye testamentet"
+
+#: ../src/main/xml.c:483
+msgid "Mat - Rev"
+msgstr "Fra Matteus' Evangelium til Johannes' Åpenbaring"
+
+#: ../src/main/xml.c:489
+msgid "Sample Module List"
+msgstr "Utvalgte moduler"
+
+#: ../src/main/xml.c:753 ../src/main/xml.c:1031
+#, c-format
+msgid "wrong type, root node != %s\n"
+msgstr "feil type, rot er ikke %s\n"
 
 #: ../ui/bookmarks.glade.h:1
 msgid "Add Bookmark"
 msgstr "Legg inn bokmerke"
 
-#: ../ui/bookmarks.glade.h:2
+#: ../ui/bookmarks.glade.h:2 ../ui/markverse.glade.h:1
 msgid "Bookmark Dialog"
 msgstr "Bokmerke Dialog"
 
@@ -1868,11 +1995,11 @@ msgstr "Bokmerke Dialog"
 msgid "Bookmark Folder Treeview"
 msgstr "Bokmerker Mappe 3 Visning"
 
-#: ../ui/bookmarks.glade.h:4
+#: ../ui/bookmarks.glade.h:4 ../ui/markverse.glade.h:2
 msgid "Cancel Bookmark"
 msgstr "Angre Bokmerke"
 
-#: ../ui/bookmarks.glade.h:5
+#: ../ui/bookmarks.glade.h:5 ../ui/markverse.glade.h:3
 msgid "Create new folder"
 msgstr "Lag ny mappe"
 
@@ -1884,11 +2011,11 @@ msgstr "Inngangsmerke"
 msgid "Label:"
 msgstr "Merke:"
 
-#: ../ui/bookmarks.glade.h:8
+#: ../ui/bookmarks.glade.h:8 ../ui/markverse.glade.h:6
 msgid "Module Entry"
 msgstr "Modul Inngang"
 
-#: ../ui/bookmarks.glade.h:9
+#: ../ui/bookmarks.glade.h:9 ../ui/markverse.glade.h:7
 msgid "Module:"
 msgstr "Modul:"
 
@@ -1896,15 +2023,16 @@ msgstr "Modul:"
 msgid "New ..."
 msgstr "Ny ..."
 
-#: ../ui/bookmarks.glade.h:11 ../ui/xi-menus.glade.h:40
+#: ../ui/bookmarks.glade.h:11 ../ui/markverse.glade.h:8
+#: ../ui/xi-menus.glade.h:56
 msgid "New Folder"
 msgstr "Ny mappe"
 
-#: ../ui/bookmarks.glade.h:12
+#: ../ui/bookmarks.glade.h:12 ../ui/markverse.glade.h:10
 msgid "Verse Entry"
 msgstr "Vers Inngang"
 
-#: ../ui/bookmarks.glade.h:13
+#: ../ui/bookmarks.glade.h:13 ../ui/markverse.glade.h:11
 msgid "Verse:"
 msgstr "Vers:"
 
@@ -1946,19 +2074,10 @@ msgstr "HTML-modus"
 msgid "Preview the note to be printed"
 msgstr "Forhåndsvis notatet du skal skrive ut"
 
-#: ../ui/editor_note.xml.h:9 ../ui/editor_studypad.xml.h:14
-msgid "Print Pre_view"
-msgstr "For hånds_visning"
-
 #: ../ui/editor_note.xml.h:10
 msgid "Print this note"
 msgstr "Skriv ut notatet"
 
-#: ../ui/editor_note.xml.h:11 ../ui/editor_studypad.xml.h:16
-#: ../ui/editor.xml.h:11
-msgid "Save"
-msgstr "Lagre"
-
 #: ../ui/editor_note.xml.h:12
 msgid "Save the current note"
 msgstr "Lagre nåværende notat"
@@ -1967,15 +2086,6 @@ msgstr "Lagre nåværende notat"
 msgid "_Delete Personal Comment"
 msgstr "S_lett egen kommentar"
 
-#: ../ui/editor_note.xml.h:14 ../ui/editor_studypad.xml.h:20
-#: ../ui/editor.xml.h:13 ../ui/xi-menus.glade.h:83
-msgid "_File"
-msgstr "_Fil"
-
-#: ../ui/editor_note.xml.h:15 ../ui/editor_studypad.xml.h:21
-msgid "_Print..."
-msgstr "_Skriv ut..."
-
 #: ../ui/editor_note.xml.h:16
 msgid "_Save (Personal Comment)"
 msgstr "_Lagre (egen kommentar)"
@@ -2029,9 +2139,8 @@ msgid ": "
 msgstr ": "
 
 #: ../ui/export-dialog.glade.h:2
-#, fuzzy
 msgid "<b>Copy</b>"
-msgstr "<b>Skop</b>"
+msgstr ""
 
 #: ../ui/export-dialog.glade.h:3
 msgid "<b>Export</b>"
@@ -2053,10 +2162,9 @@ msgstr "Bok Radio Knapp"
 msgid "Chapter Radio Button"
 msgstr "Kapittel Radio Knapp"
 
-#: ../ui/export-dialog.glade.h:9 ../ui/xi-menus.glade.h:12
-#, fuzzy
+#: ../ui/export-dialog.glade.h:9 ../ui/xi-menus.glade.h:18
 msgid "Copy/Export Passage"
-msgstr "Eksport Passasje"
+msgstr ""
 
 #: ../ui/export-dialog.glade.h:10
 msgid "Export Passage Cancel"
@@ -2111,14 +2219,25 @@ msgid "Verse Radio Button"
 msgstr "Vers Radio Knapp"
 
 #: ../ui/export-dialog.glade.h:24
-#, fuzzy
 msgid "Verse range"
-msgstr "_Vers Pr Linje"
+msgstr ""
 
 #: ../ui/export-dialog.glade.h:25
 msgid "Version"
 msgstr "Versjon"
 
+#: ../ui/markverse.glade.h:4
+msgid "Mark"
+msgstr ""
+
+#: ../ui/markverse.glade.h:5
+msgid "Mark/Unmark Verse"
+msgstr ""
+
+#: ../ui/markverse.glade.h:9
+msgid "Unmark"
+msgstr ""
+
 #: ../ui/module-manager.glade.h:1
 msgid "<b>Add and Remove Sources</b>"
 msgstr "<b>Legg til/fjern kilder</b>"
@@ -2152,7 +2271,7 @@ msgid ""
 "detection you should NOT use  the remote installation feature! "
 msgstr ""
 "<b>Advarsel:</b> Hvis du er i et land der det ikke er lov å bruke bibelog "
-"ikke vil bli oppdaget bør du IKKE installere fra Internett."
+"ikke vil bli oppdaget bør du IKKE installere fra Internett. "
 
 #: ../ui/module-manager.glade.h:9
 msgid "<i>Personal area, for your use only:</i>"
@@ -2162,39 +2281,47 @@ msgstr "<i>Personelig område, for bruk av bare deg:<i>"
 msgid "<i>System area, for all users:</i>"
 msgstr "<I>System område, for alle brukere:</i>"
 
-#: ../ui/module-manager.glade.h:11
+#: ../ui/module-manager.glade.h:12
 msgid "Continue"
 msgstr "Fortsett"
 
-#: ../ui/module-manager.glade.h:12
+#: ../ui/module-manager.glade.h:13
 msgid "Current Remote Sources"
 msgstr "Kilder på Internett"
 
-#: ../ui/module-manager.glade.h:13
+#: ../ui/module-manager.glade.h:14
 msgid "Current local sources"
 msgstr "Lokale kilder"
 
-#: ../ui/module-manager.glade.h:14
+#: ../ui/module-manager.glade.h:15
+msgid "Delete Index"
+msgstr "Slett Indeks"
+
+#: ../ui/module-manager.glade.h:16
 msgid "Home dir"
 msgstr "Hjemmemappe"
 
-#: ../ui/module-manager.glade.h:16
+#: ../ui/module-manager.glade.h:19
+msgid "Load Standard"
+msgstr ""
+
+#: ../ui/module-manager.glade.h:20
 msgid "Local"
 msgstr "Lokal"
 
-#: ../ui/module-manager.glade.h:17
+#: ../ui/module-manager.glade.h:21
 msgid "Local Install Folder"
 msgstr "Lokal mappe for installasjon"
 
-#: ../ui/module-manager.glade.h:18
+#: ../ui/module-manager.glade.h:22
 msgid "Module Manager"
 msgstr "Modul Håndterer"
 
-#: ../ui/module-manager.glade.h:19
+#: ../ui/module-manager.glade.h:23
 msgid "Remote"
 msgstr "Fjern"
 
-#: ../ui/module-manager.glade.h:20
+#: ../ui/module-manager.glade.h:24
 msgid "Sword sys dir"
 msgstr "Sword system-mappe"
 
@@ -2294,15 +2421,15 @@ msgstr "Uthev merket felt"
 msgid ""
 "Automatically resize commentary, book, and dictionary image content to fit "
 "subwindow"
-msgstr "Endre størrelse på vindu for kommentarer, bok og ordbok automatisk "
+msgstr "Endre størrelse på vindu for kommentarer, bok og ordbok automatisk"
 
 #: ../ui/prefs.glade.h:20
 msgid "Background"
 msgstr "Bakgrunn"
 
 #: ../ui/prefs.glade.h:21
-msgid "Base text size"
-msgstr "Base tekst størrelse"
+msgid "Base font size"
+msgstr ""
 
 #: ../ui/prefs.glade.h:22
 msgid "Bible Texts"
@@ -2342,7 +2469,7 @@ msgstr "Endre Personlige Notater Combo"
 
 #: ../ui/prefs.glade.h:32
 msgid "Choose to enable Prayer lists "
-msgstr "Velg for å aktivere Bønneliste"
+msgstr "Velg for å aktivere Bønneliste "
 
 #: ../ui/prefs.glade.h:34
 msgid "Commentaries Checkbox"
@@ -2533,38 +2660,50 @@ msgid "Show splash screen at start up"
 msgstr "Vis oppstartbilde"
 
 #: ../ui/prefs.glade.h:84
+msgid "Special Locale (requires restart)"
+msgstr ""
+
+#: ../ui/prefs.glade.h:85
+msgid "Special Locale Combo"
+msgstr ""
+
+#: ../ui/prefs.glade.h:86
 msgid "StudyPad default directory combo"
 msgstr "Studieblokk standard oppslag combo"
 
-#: ../ui/prefs.glade.h:86
+#: ../ui/prefs.glade.h:88
 msgid "Use Bible Text scroll bar to scroll to previous or next chapter"
 msgstr "Bruk rullefeltet for bibeltekst til å gå til forrige/neste kapittel"
 
-#: ../ui/prefs.glade.h:87
+#: ../ui/prefs.glade.h:89
 msgid "Use Verse Per Line"
 msgstr "Bruk Vers Per Linje"
 
-#: ../ui/prefs.glade.h:88
+#: ../ui/prefs.glade.h:90
 msgid "Use Verse Per Line Checkbox"
 msgstr "Bruk Vers Pr Linje Sjekkboks"
 
-#: ../ui/prefs.glade.h:89
+#: ../ui/prefs.glade.h:91
 msgid "Use default Dictionary"
 msgstr "Bruk standard ordbok"
 
-#: ../ui/prefs.glade.h:90
+#: ../ui/prefs.glade.h:92
 msgid "Use default Dictionary Checkbox"
 msgstr "Bruk standard Ordbok Avkryssningboks"
 
-#: ../ui/prefs.glade.h:91
+#: ../ui/prefs.glade.h:93
 msgid "Use tabbed browsing"
 msgstr "Bruk faneblader"
 
-#: ../ui/prefs.glade.h:92
+#: ../ui/prefs.glade.h:94
 msgid "Use tabbed browsing Checkbox"
 msgstr "Bruk faneblad browsing Avkryssningsboks"
 
-#: ../ui/prefs.glade.h:93
+#: ../ui/prefs.glade.h:95
+msgid "Verse Number"
+msgstr ""
+
+#: ../ui/prefs.glade.h:96
 msgid "Verse number size"
 msgstr "Vers nummer størrelse"
 
@@ -2745,6 +2884,14 @@ msgid "Exact phrase radiobutton"
 msgstr "Nøyaktig frase radioknapp"
 
 #: ../ui/search-dialog.glade.h:46
+msgid "Export"
+msgstr ""
+
+#: ../ui/search-dialog.glade.h:47
+msgid "Export current search results"
+msgstr ""
+
+#: ../ui/search-dialog.glade.h:48
 msgid ""
 "Fast, featureful, index-based search\n"
 "Indexes must have been built beforehand:\n"
@@ -2754,227 +2901,227 @@ msgstr ""
 "Indekser må være ferdig på forhånd:\n"
 "Se·Module·Manager's·vedlikeholds funksjoner"
 
-#: ../ui/search-dialog.glade.h:49
+#: ../ui/search-dialog.glade.h:51
 msgid "Find Button"
 msgstr "Finn Knapp"
 
-#: ../ui/search-dialog.glade.h:51
+#: ../ui/search-dialog.glade.h:53
 msgid "Footnotes radiobutton"
 msgstr "Fotnoter radioknapp"
 
-#: ../ui/search-dialog.glade.h:52
+#: ../ui/search-dialog.glade.h:54
 msgid "In modules that have Footnotes"
 msgstr "I moduler som har fotnoter"
 
-#: ../ui/search-dialog.glade.h:53
+#: ../ui/search-dialog.glade.h:55
 msgid "In modules that have Morphological Tags"
 msgstr "I moduler som har morfologiske merker"
 
-#: ../ui/search-dialog.glade.h:54
+#: ../ui/search-dialog.glade.h:56
 msgid "In modules that have Strong's Numbers"
 msgstr "I moduler som har referanser til kildetekst"
 
-#: ../ui/search-dialog.glade.h:55
+#: ../ui/search-dialog.glade.h:57
 msgid "Main Search Entry"
 msgstr "Hoved Søk Inngang"
 
-#: ../ui/search-dialog.glade.h:56
+#: ../ui/search-dialog.glade.h:58
 msgid "Make selections on the Attribute Search tab"
 msgstr "Gjør valg på fanen for søk i egenskaper"
 
-#: ../ui/search-dialog.glade.h:58
+#: ../ui/search-dialog.glade.h:60
 msgid "Match case checkbox"
 msgstr "Skill mellom store og små bokstaver avkryssningsboks"
 
-#: ../ui/search-dialog.glade.h:59
+#: ../ui/search-dialog.glade.h:61
 msgid "Module Selection"
 msgstr "Modulvalg"
 
-#: ../ui/search-dialog.glade.h:60
+#: ../ui/search-dialog.glade.h:62
 msgid "Module list"
 msgstr "Modul-liste"
 
-#: ../ui/search-dialog.glade.h:61
+#: ../ui/search-dialog.glade.h:63
 msgid "Module list radiobutton"
 msgstr "Modul-liste radioknapp"
 
-#: ../ui/search-dialog.glade.h:63
+#: ../ui/search-dialog.glade.h:65
 msgid "Morphological Tags radiobutton"
 msgstr "Morfologiske Merker radioknapp"
 
-#: ../ui/search-dialog.glade.h:65
+#: ../ui/search-dialog.glade.h:67
 msgid "Multi word radiobutton"
 msgstr "Flere ord radioknapp"
 
-#: ../ui/search-dialog.glade.h:66
+#: ../ui/search-dialog.glade.h:68
 msgid "New Custom Module List Button"
 msgstr "Ny Vanlig Modul Liste Knapp"
 
-#: ../ui/search-dialog.glade.h:67
+#: ../ui/search-dialog.glade.h:69
 msgid "New Range Button"
 msgstr "Ny Område Knapp"
 
-#: ../ui/search-dialog.glade.h:68
+#: ../ui/search-dialog.glade.h:70
 msgid "Open Selection Dialog Button"
 msgstr "Åpne Utvalg Dialog Knapp"
 
-#: ../ui/search-dialog.glade.h:69
+#: ../ui/search-dialog.glade.h:71
 msgid "Open a dialog to select modules to add to the list"
 msgstr "Åpne et vindu for å legge til flere moduler på lista"
 
-#: ../ui/search-dialog.glade.h:70
+#: ../ui/search-dialog.glade.h:72
 msgid "Optimized (\"Lucene\")"
 msgstr "Optimisert (\"Lucene\")"
 
-#: ../ui/search-dialog.glade.h:71
+#: ../ui/search-dialog.glade.h:73
 msgid "Optimized (\"Lucene\") radiobutton"
 msgstr "Optimisert (\"Lucene\") radioknapp"
 
-#: ../ui/search-dialog.glade.h:72
+#: ../ui/search-dialog.glade.h:74
 msgid "Range Definition Entry"
 msgstr "Område Definisjon Inngang"
 
-#: ../ui/search-dialog.glade.h:73
+#: ../ui/search-dialog.glade.h:75
 msgid "Range Name Entry"
 msgstr "Område Navn Inngang"
 
-#: ../ui/search-dialog.glade.h:75
+#: ../ui/search-dialog.glade.h:77
 msgid "Regular expression radiobutton"
 msgstr "Regulært uttrykk.radioknapp"
 
-#: ../ui/search-dialog.glade.h:76
+#: ../ui/search-dialog.glade.h:78
 msgid "Remove the selected module from the list"
 msgstr "Fjern valgt modul fra lista"
 
-#: ../ui/search-dialog.glade.h:77
+#: ../ui/search-dialog.glade.h:79
 msgid "Result Summary Table"
 msgstr "Resultat Oppsummering Oppslag"
 
-#: ../ui/search-dialog.glade.h:78
+#: ../ui/search-dialog.glade.h:80
 msgid "Result Summary Window"
 msgstr "Resultat Oppsummering Vindu"
 
-#: ../ui/search-dialog.glade.h:79
+#: ../ui/search-dialog.glade.h:81
 msgid "Results"
 msgstr "Resultater"
 
-#: ../ui/search-dialog.glade.h:80
+#: ../ui/search-dialog.glade.h:82
 msgid "Save Custom Module List Button"
 msgstr "Lagre Egen Modul Liste Knapp"
 
-#: ../ui/search-dialog.glade.h:81
+#: ../ui/search-dialog.glade.h:83
 msgid "Save Range Button"
 msgstr "Lagre Område Knapp"
 
-#: ../ui/search-dialog.glade.h:82
+#: ../ui/search-dialog.glade.h:84
 msgid "Save custom range"
 msgstr "Lagre eget område"
 
-#: ../ui/search-dialog.glade.h:83
+#: ../ui/search-dialog.glade.h:85
 msgid "Save search results as bookmarks"
 msgstr "Lagre søkeresultater som bokmerker"
 
-#: ../ui/search-dialog.glade.h:84
+#: ../ui/search-dialog.glade.h:86
 msgid "Save the module list"
 msgstr "Lagre lista med moduler"
 
-#: ../ui/search-dialog.glade.h:85
+#: ../ui/search-dialog.glade.h:87
 msgid "Search  Criteria"
 msgstr "Søkekriterier"
 
-#: ../ui/search-dialog.glade.h:86
+#: ../ui/search-dialog.glade.h:88
 msgid "Search Criteria Treeview"
 msgstr "Søk kriterier Trevisning"
 
-#: ../ui/search-dialog.glade.h:87
+#: ../ui/search-dialog.glade.h:89
 msgid "Search entire module"
 msgstr "Søk i hele modulen"
 
-#: ../ui/search-dialog.glade.h:88
+#: ../ui/search-dialog.glade.h:90
 msgid "Search for Morphological tags"
 msgstr "Søk etter morfologiske merker"
 
-#: ../ui/search-dialog.glade.h:89
+#: ../ui/search-dialog.glade.h:91
 msgid "Search for Strongs Numbers like G4442 or H1121"
 msgstr "Søk etter referanser til kildetekst (som G4442 eller H1121)"
 
-#: ../ui/search-dialog.glade.h:90
+#: ../ui/search-dialog.glade.h:92
 msgid "Search in footnotes"
 msgstr "Søk i fotnoter"
 
-#: ../ui/search-dialog.glade.h:91
+#: ../ui/search-dialog.glade.h:93
 msgid "Show Footnotes"
 msgstr "Vis fotnoter"
 
-#: ../ui/search-dialog.glade.h:92
+#: ../ui/search-dialog.glade.h:94
 msgid "Show Footnotes checkbox"
 msgstr "Vis fotnoter avkryssingsboks"
 
-#: ../ui/search-dialog.glade.h:93
+#: ../ui/search-dialog.glade.h:95
 msgid "Show Morphological Tags"
 msgstr "Vis morfologiske merker"
 
-#: ../ui/search-dialog.glade.h:94
+#: ../ui/search-dialog.glade.h:96
 msgid "Show Morphological Tags checkbox"
 msgstr "Vis Morfologiske merker avkryssingsboks"
 
-#: ../ui/search-dialog.glade.h:95
+#: ../ui/search-dialog.glade.h:97
 msgid "Show Strong's Numbers"
 msgstr "Vis referanser til kildetekst"
 
-#: ../ui/search-dialog.glade.h:96
+#: ../ui/search-dialog.glade.h:98
 msgid "Show Strong's Numbers checkbox"
 msgstr "Vis Strongs Nummer sjekkboks"
 
-#: ../ui/search-dialog.glade.h:97
+#: ../ui/search-dialog.glade.h:99
 msgid "Show in main window"
 msgstr "Vis i hovedvinduet"
 
-#: ../ui/search-dialog.glade.h:98
+#: ../ui/search-dialog.glade.h:100
 msgid "Single module"
 msgstr "Én modul"
 
-#: ../ui/search-dialog.glade.h:99
+#: ../ui/search-dialog.glade.h:101
 msgid "Single module radiobutton"
 msgstr "Enkel modul radioknapp"
 
-#: ../ui/search-dialog.glade.h:100
+#: ../ui/search-dialog.glade.h:102
 msgid "Start/stop searching"
 msgstr "Start/stop søk"
 
-#: ../ui/search-dialog.glade.h:101
+#: ../ui/search-dialog.glade.h:103
 msgid "Strongs Numbers"
 msgstr "Referanser til kildetekst"
 
-#: ../ui/search-dialog.glade.h:102
+#: ../ui/search-dialog.glade.h:104
 msgid "Strongs Numbers radiobutton"
 msgstr "Strongs Nummer radioknapp"
 
-#: ../ui/search-dialog.glade.h:103
+#: ../ui/search-dialog.glade.h:105
 msgid "Use a custom module list for the search"
 msgstr "Bruk egen liste over moduler til søket"
 
-#: ../ui/search-dialog.glade.h:104
+#: ../ui/search-dialog.glade.h:106
 msgid "Use a custom range for the scope of the search"
 msgstr "Bruk eget område som skop for søket"
 
-#: ../ui/search-dialog.glade.h:105
+#: ../ui/search-dialog.glade.h:107
 msgid "Use a single module for the search"
 msgstr "Bruk én modul i søket"
 
-#: ../ui/search-dialog.glade.h:106
+#: ../ui/search-dialog.glade.h:108
 msgid "Use the current module list for the search"
 msgstr "Bruk nåværende liste over moduler i søket"
 
-#: ../ui/search-dialog.glade.h:107
+#: ../ui/search-dialog.glade.h:109
 msgid "Use the results of the last search as the scope of the search"
 msgstr "Bruk resultatene fra forrige søk til å søke fra"
 
-#: ../ui/search-dialog.glade.h:108
+#: ../ui/search-dialog.glade.h:110
 msgid "e.g. Matt-John;Rev4"
 msgstr "f.eks. Matt-Joh;Rev4"
 
-#: ../ui/search-dialog.glade.h:109
+#: ../ui/search-dialog.glade.h:111
 msgid "for "
 msgstr "for "
 
@@ -2987,371 +3134,537 @@ msgid "About _Xiphos"
 msgstr "Om _Xiphos"
 
 #: ../ui/xi-menus.glade.h:4
+msgid "Add Item"
+msgstr ""
+
+#: ../ui/xi-menus.glade.h:5
+msgid "Add Sub-Item"
+msgstr ""
+
+#: ../ui/xi-menus.glade.h:6
+msgid "Add a sub-item"
+msgstr ""
+
+#: ../ui/xi-menus.glade.h:7
+msgid "Add an item"
+msgstr "Legg til sak"
+
+#: ../ui/xi-menus.glade.h:8
 msgid "Add new folder to selected folder"
 msgstr "Legg ny mappe i den valgte mappa"
 
-#: ../ui/xi-menus.glade.h:6
+#: ../ui/xi-menus.glade.h:10
 msgid "Allow Reordering"
 msgstr "Tillat sortering"
 
-#: ../ui/xi-menus.glade.h:7
+#: ../ui/xi-menus.glade.h:11
 msgid "Allow items to be moved from one folder to another"
 msgstr "Tillat at elementer flyttes fra en mappe til en annen"
 
-#: ../ui/xi-menus.glade.h:9
+#: ../ui/xi-menus.glade.h:12
+msgid "Annotate Verse"
+msgstr ""
+
+#: ../ui/xi-menus.glade.h:14
+msgid "Browse in BibleMap.org"
+msgstr ""
+
+#: ../ui/xi-menus.glade.h:15
 msgid "Collapse All"
 msgstr "Fold sammen alt"
 
-#: ../ui/xi-menus.glade.h:10
+#: ../ui/xi-menus.glade.h:16
 msgid "Collapse all Bookmarks groups"
 msgstr "Fold sammen alle grupper av bokmerker"
 
-#: ../ui/xi-menus.glade.h:11
+#: ../ui/xi-menus.glade.h:17
 msgid "Commentary by Chapter"
 msgstr "Kapittel Kommentarer"
 
-#: ../ui/xi-menus.glade.h:13
+#: ../ui/xi-menus.glade.h:19
+msgid "Create a new daily journal"
+msgstr ""
+
+#: ../ui/xi-menus.glade.h:20
+msgid "Create a new monthly journal"
+msgstr ""
+
+#: ../ui/xi-menus.glade.h:21
+msgid "Create a new outlined topic"
+msgstr ""
+
+#: ../ui/xi-menus.glade.h:22
+msgid "Create a new simple prayer list"
+msgstr "Lag en ny lenkel bønne liste"
+
+#: ../ui/xi-menus.glade.h:23
+msgid "Create a new subject prayer list"
+msgstr ""
+
+#: ../ui/xi-menus.glade.h:24
 msgid "D_ouble-Space Text"
 msgstr "D_obbelt mellomrom"
 
-#: ../ui/xi-menus.glade.h:14
+#: ../ui/xi-menus.glade.h:25
+msgid "Daily"
+msgstr ""
+
+#: ../ui/xi-menus.glade.h:26
 msgid "Delete Item"
 msgstr "Slett element"
 
-#: ../ui/xi-menus.glade.h:15
+#: ../ui/xi-menus.glade.h:27
 msgid "Delete item"
 msgstr "Slett element"
 
-#: ../ui/xi-menus.glade.h:16
-msgid "Dictionary/_Lexicon"
-msgstr "Ordbok/_Leksikon"
+#: ../ui/xi-menus.glade.h:28
+msgid "Dictionar_y"
+msgstr ""
 
-#: ../ui/xi-menus.glade.h:17
+#: ../ui/xi-menus.glade.h:29
 msgid "Display Book Heading"
 msgstr "Vis tittel på bok"
 
-#: ../ui/xi-menus.glade.h:18
+#: ../ui/xi-menus.glade.h:30
 msgid "Display Chapter Heading"
 msgstr "Vis overskrift for hvert kapittel"
 
-#: ../ui/xi-menus.glade.h:19
+#: ../ui/xi-menus.glade.h:31
 msgid "Dump Pers.Comm."
 msgstr "Dump personlig kommentar"
 
-#: ../ui/xi-menus.glade.h:21
+#: ../ui/xi-menus.glade.h:33
 msgid "Edit bookmark item"
 msgstr "Rediger bokmerke"
 
-#: ../ui/xi-menus.glade.h:22
+#: ../ui/xi-menus.glade.h:34
+msgid "Edit this item"
+msgstr "Rediger denne saken"
+
+#: ../ui/xi-menus.glade.h:35
 msgid "Expand All"
 msgstr "Utvid alt"
 
-#: ../ui/xi-menus.glade.h:23
+#: ../ui/xi-menus.glade.h:36
 msgid "Expand all Bookmarks groups"
 msgstr "Utvid alle grupper av bokmerker"
 
-#: ../ui/xi-menus.glade.h:24
-msgid "File"
-msgstr "Fil"
+#: ../ui/xi-menus.glade.h:37
+msgid "Export Folder"
+msgstr ""
 
-#: ../ui/xi-menus.glade.h:30
+#: ../ui/xi-menus.glade.h:38
+msgid "Export List"
+msgstr ""
+
+#: ../ui/xi-menus.glade.h:45
 msgid "Image Content"
 msgstr "Inneholder"
 
-#: ../ui/xi-menus.glade.h:31
+#: ../ui/xi-menus.glade.h:46
 msgid "Import Bibletime Bookmarks"
 msgstr "Les inn bokmerker fra Bibletime"
 
-#: ../ui/xi-menus.glade.h:32
+#: ../ui/xi-menus.glade.h:47
 msgid "Insert Bookmark"
 msgstr "Sett inn bokmerke"
 
-#: ../ui/xi-menus.glade.h:33
+#: ../ui/xi-menus.glade.h:48
 msgid "Insert new bookmark here"
 msgstr "Sett inn nytt bokmerke her"
 
-#: ../ui/xi-menus.glade.h:34
+#: ../ui/xi-menus.glade.h:49
 msgid "L_ink Tabs"
 msgstr "S_lå sammen arkfaner"
 
-#: ../ui/xi-menus.glade.h:36
+#: ../ui/xi-menus.glade.h:51
 msgid "Load Bookmarks from Bibletime"
 msgstr "Last inn bokmerker fra Bibletime"
 
-#: ../ui/xi-menus.glade.h:37
+#: ../ui/xi-menus.glade.h:52
 msgid "Lookup Selection"
 msgstr "Slå opp utvalg"
 
-#: ../ui/xi-menus.glade.h:41
+#: ../ui/xi-menus.glade.h:54
+msgid "Monthly"
+msgstr "Månedlig"
+
+#: ../ui/xi-menus.glade.h:57
 msgid "Note"
 msgstr "Notat"
 
-#: ../ui/xi-menus.glade.h:42
+#: ../ui/xi-menus.glade.h:58
 msgid "Open Module"
 msgstr "Åpne modul"
 
-#: ../ui/xi-menus.glade.h:43
-#, fuzzy
+#: ../ui/xi-menus.glade.h:59
 msgid "Open Study_pad"
-msgstr "Åpne notatblokk"
+msgstr ""
 
-#: ../ui/xi-menus.glade.h:44
+#: ../ui/xi-menus.glade.h:60
 msgid "Open in a dialog"
 msgstr "Åpne i et dialogvindu"
 
-#: ../ui/xi-menus.glade.h:46
-#, fuzzy
+#: ../ui/xi-menus.glade.h:61
+msgid "Open in a separate window"
+msgstr "Åpne i ett separat vindu"
+
+#: ../ui/xi-menus.glade.h:62
+msgid "Open in editor"
+msgstr "Åpne i editor"
+
+#: ../ui/xi-menus.glade.h:63
 msgid "Open in new tab"
-msgstr "Åpne i en ny arkfane"
+msgstr ""
 
-#: ../ui/xi-menus.glade.h:47
+#: ../ui/xi-menus.glade.h:64
+msgid ""
+"Open selected module in a\n"
+"\tseparate ['dialog'] window"
+msgstr ""
+
+#: ../ui/xi-menus.glade.h:66
+msgid "Open selected module in a new tab"
+msgstr "Åpne valgt modul i ny fane"
+
+#: ../ui/xi-menus.glade.h:67
 msgid "Open this bookmark in a dialog"
 msgstr "Åpne bokmerket i et dialogvindu"
 
-#: ../ui/xi-menus.glade.h:48
+#: ../ui/xi-menus.glade.h:68
 msgid "Open this bookmark in a new tab"
 msgstr "Åpne bokmerket i ny arkfane"
 
-#: ../ui/xi-menus.glade.h:50
+#: ../ui/xi-menus.glade.h:69
+msgid "Outlined"
+msgstr ""
+
+#: ../ui/xi-menus.glade.h:71
 msgid "Read Selection Aloud"
 msgstr "Les utvalget høyt"
 
-#: ../ui/xi-menus.glade.h:51
-msgid "Remove - Restore"
-msgstr "Fjern - gjenopprett"
-
-#: ../ui/xi-menus.glade.h:52
-msgid "Remove Folder"
-msgstr "Fjern mappe"
-
-#: ../ui/xi-menus.glade.h:53
+#: ../ui/xi-menus.glade.h:73
 msgid "Remove folder and save it"
 msgstr "Fjern mappe og lagre den"
 
-#: ../ui/xi-menus.glade.h:54
+#: ../ui/xi-menus.glade.h:74
+msgid "Remove this item"
+msgstr "Fjern denne saken"
+
+#: ../ui/xi-menus.glade.h:75
 msgid "Rename Pers.Comm."
 msgstr "Endre navn på personlig kommentar"
 
-#: ../ui/xi-menus.glade.h:55
+#: ../ui/xi-menus.glade.h:76
 msgid "Respect Font Faces"
 msgstr "Respekt Font Visning"
 
-#: ../ui/xi-menus.glade.h:56
+#: ../ui/xi-menus.glade.h:77
 msgid "Restore Folder"
 msgstr "Gjenopprett mappe"
 
-#: ../ui/xi-menus.glade.h:57
+#: ../ui/xi-menus.glade.h:78
 msgid "Restore saved folder"
 msgstr "Gjenopprett lagret mappe"
 
-#: ../ui/xi-menus.glade.h:58
-#, fuzzy
+#: ../ui/xi-menus.glade.h:79
 msgid "Save list as a series of bookmarks"
-msgstr "Lagre søkeresultater som bokmerker"
+msgstr ""
 
-#: ../ui/xi-menus.glade.h:59
-#, fuzzy
+#: ../ui/xi-menus.glade.h:80
 msgid "Save list as a single bookmark"
-msgstr "Lagre søkeresultater som bokmerker"
+msgstr ""
 
-#: ../ui/xi-menus.glade.h:60
-#, fuzzy
+#: ../ui/xi-menus.glade.h:81
 msgid "Save these results as a series of bookmarks in their own folder"
-msgstr "Lagre søkeresultater som bokmerker"
+msgstr ""
 
-#: ../ui/xi-menus.glade.h:61
-#, fuzzy
+#: ../ui/xi-menus.glade.h:82
 msgid "Save these results as a single bookmark"
-msgstr "Lagre søkeresultater som bokmerker"
+msgstr ""
 
-#: ../ui/xi-menus.glade.h:62
+#: ../ui/xi-menus.glade.h:83
 msgid "Scripture Cross-references"
 msgstr "Kryssreferanse i Skriften"
 
-#: ../ui/xi-menus.glade.h:64
-#, fuzzy
+#: ../ui/xi-menus.glade.h:85
 msgid "Show Parallel View in a _Tab"
-msgstr "Parallellvisning i en arkfane"
+msgstr ""
 
-#: ../ui/xi-menus.glade.h:65
-#, fuzzy
+#: ../ui/xi-menus.glade.h:86
 msgid "Show Previe_wer in the Sidebar"
-msgstr "Vis Forhåndsvisning i Sidevisningen"
+msgstr ""
 
-#: ../ui/xi-menus.glade.h:66
+#: ../ui/xi-menus.glade.h:87
 msgid "Show Verse _Numbers"
 msgstr "_Nummerer versene"
 
-#: ../ui/xi-menus.glade.h:69
+#: ../ui/xi-menus.glade.h:88
+msgid "Simple"
+msgstr "Enkel"
+
+#: ../ui/xi-menus.glade.h:90
+msgid "Subject"
+msgstr "Subjekt"
+
+#: ../ui/xi-menus.glade.h:92
 msgid "Unlock This Module"
 msgstr "Lås opp modulen"
 
-#: ../ui/xi-menus.glade.h:70
+#: ../ui/xi-menus.glade.h:93
 msgid "Use Current Dictionary"
 msgstr "Bruk den valgte ordlista"
 
-#: ../ui/xi-menus.glade.h:71
+#: ../ui/xi-menus.glade.h:94
 msgid "Use module manager to install and remove Sword modules"
 msgstr "Bruk modulhåndterer for å legge installere og slette Sword-moduler"
 
-#: ../ui/xi-menus.glade.h:72
+#: ../ui/xi-menus.glade.h:95
 msgid "Variants"
 msgstr "Varianter"
 
-#: ../ui/xi-menus.glade.h:74
-#, fuzzy
+#: ../ui/xi-menus.glade.h:97
 msgid "_About The SWORD Project"
-msgstr "_Om the·SWORD·Project"
+msgstr ""
 
-#: ../ui/xi-menus.glade.h:75
+#: ../ui/xi-menus.glade.h:98
 msgid "_Advanced Search"
 msgstr "_Avansert søk"
 
-#: ../ui/xi-menus.glade.h:76
+#: ../ui/xi-menus.glade.h:99
 msgid "_Attach/Detach Sidebar"
 msgstr "_Sett inn / ta ut sidestolpe"
 
-#: ../ui/xi-menus.glade.h:77
-#, fuzzy
-msgid "_Bible Text"
-msgstr "_Bibeltekster"
+#: ../ui/xi-menus.glade.h:100
+msgid "_Bible"
+msgstr ""
 
-#: ../ui/xi-menus.glade.h:78
-msgid "_Commentary"
-msgstr "_Kommentar"
+#: ../ui/xi-menus.glade.h:101
+msgid "_Commentary/Book"
+msgstr ""
 
-#: ../ui/xi-menus.glade.h:79
+#: ../ui/xi-menus.glade.h:102
 msgid "_Contents"
 msgstr "_Innhold"
 
-#: ../ui/xi-menus.glade.h:80
+#: ../ui/xi-menus.glade.h:103
 msgid "_Daily Devotion"
 msgstr "_Dagens tekst"
 
-#: ../ui/xi-menus.glade.h:81
+#: ../ui/xi-menus.glade.h:104
 msgid "_Edit"
 msgstr "_Endre"
 
-#: ../ui/xi-menus.glade.h:82
+#: ../ui/xi-menus.glade.h:105
 msgid "_Edit Item"
 msgstr "_Rediger element"
 
-#: ../ui/xi-menus.glade.h:84
+#: ../ui/xi-menus.glade.h:107
 msgid "_Help"
 msgstr "_Hjelp"
 
-#: ../ui/xi-menus.glade.h:85
+#: ../ui/xi-menus.glade.h:108
 msgid "_Highlight Current Verse"
 msgstr "_Uthev dette verset"
 
-#: ../ui/xi-menus.glade.h:86
+#: ../ui/xi-menus.glade.h:109
 msgid "_Live Chat"
 msgstr "_Live Chat"
 
-#: ../ui/xi-menus.glade.h:87
+#: ../ui/xi-menus.glade.h:110
 msgid "_Mailing List"
 msgstr "_Epost Liste"
 
-#: ../ui/xi-menus.glade.h:88
+#: ../ui/xi-menus.glade.h:111
 msgid "_Module Manager"
 msgstr "_Modulhåndterer"
 
-#: ../ui/xi-menus.glade.h:89
+#: ../ui/xi-menus.glade.h:112
 msgid "_Open Session"
 msgstr "_Åpne økt"
 
-#: ../ui/xi-menus.glade.h:90
+#: ../ui/xi-menus.glade.h:113
 msgid "_Preferences"
 msgstr "_Innstillinger"
 
-#: ../ui/xi-menus.glade.h:91
+#: ../ui/xi-menus.glade.h:114
 msgid "_Preview"
 msgstr "_Forhåndsvis"
 
-#: ../ui/xi-menus.glade.h:92
+#: ../ui/xi-menus.glade.h:115
 msgid "_Read Aloud"
 msgstr "_Les Høyt"
 
-#: ../ui/xi-menus.glade.h:93
+#: ../ui/xi-menus.glade.h:116
 msgid "_Report Bug"
 msgstr "_Rapporter Bug"
 
-#: ../ui/xi-menus.glade.h:94
+#: ../ui/xi-menus.glade.h:117
 msgid "_Save Session"
 msgstr "_Lagre økt"
 
-#: ../ui/xi-menus.glade.h:95
+#: ../ui/xi-menus.glade.h:118
 msgid "_Search"
 msgstr "_Søk"
 
-#: ../ui/xi-menus.glade.h:96
-msgid "_Show/Hide Sidebar"
-msgstr "_Vis / skjul sidestolpe"
+#: ../ui/xi-menus.glade.h:119
+msgid "_Show/Hide Attached Sidebar"
+msgstr ""
 
-#: ../ui/xi-menus.glade.h:97
+#: ../ui/xi-menus.glade.h:120
 msgid "_Verse Per Line"
 msgstr "_Vers Pr Linje"
 
-#: ../ui/xi-menus.glade.h:98
-msgid "_View"
-msgstr "_Vis"
+#: ../xiphos.desktop.in.in.h:1
+msgid "Study the Bible"
+msgstr "Studér Bibelen"
 
-#~ msgid "Save As"
-#~ msgstr "Lagre Som"
+#: ../xiphos.desktop.in.in.h:2
+msgid "Xiphos Bible Guide"
+msgstr "Xiphos Bibel Guide"
 
-#~ msgid "Untitled document"
-#~ msgstr "Navnløst dokument"
+#~ msgid "Move backwards through history"
+#~ msgstr "Gå bakover i historie"
 
-#~ msgid "HTML Output"
-#~ msgstr "HTML Ut"
+#~ msgid "Move foward through history"
+#~ msgstr "Gå forover i historie"
 
-#~ msgid "HTML Source"
-#~ msgstr "HTML Kilde"
+#~ msgid "Select a Book of the Bible"
+#~ msgstr "Velg en av bibelens bøker"
 
-#~ msgid "Plain Source"
-#~ msgstr "Enkel Kilde"
+#~ msgid "Change Chapter"
+#~ msgstr "Endre kapittel"
 
-#~ msgid "_Quit"
-#~ msgstr "_Avslutt"
+#~ msgid "Change Verse"
+#~ msgstr "Endre vers"
 
-#~ msgid "_Open"
-#~ msgstr "_Åpne"
+#~ msgid "Enter a Verse reference in Book 1:1 format and press Return"
+#~ msgstr "Skriv inn en referanse i formen Bok 1:1 og trykk linjeskift"
 
-#~ msgid "_Save"
-#~ msgstr "_Lagre"
+#~ msgid "Install these modules:"
+#~ msgstr "Installer disse modulene:"
 
-#~ msgid "Save _As..."
-#~ msgstr "Lagre Som..."
+#~ msgid "Remove these modules:"
+#~ msgstr "Slett disse modulene:"
 
-#~ msgid "HTML _Output"
-#~ msgstr "HTML _Ut"
+#~ msgid "Archive these modules:"
+#~ msgstr "Arkiver disse modulene:"
 
-#~ msgid "_HTML Source"
-#~ msgstr "_HTML Kilde"
+#~ msgid ""
+#~ "Build fast-search index for these\n"
+#~ "modules (may take minutes/module):"
+#~ msgstr ""
+#~ "Bygg rask søke indeks·for·disse\n"
+#~ "modulene (kan ta minutter/moduler):"
 
-#~ msgid "_Plain Source"
-#~ msgstr "_Enkel Kilde"
+#~ msgid "Delete fast-search index for these modules:"
+#~ msgstr "Slett raskt søk indeks for disse modulene:"
 
-#~ msgid "Are you sure you want to delete the note for"
-#~ msgstr "Er du sikker på at du vil slette notatet for"
+#~ msgid "Xiphos could not execute archiver"
+#~ msgstr "Xiphos kunne ikke kjøre arkiveringsprogram"
 
-#~ msgid "Save the changes to document"
-#~ msgstr "Lagre endringer i dokumentet"
+#~ msgid ""
+#~ " archival result:\n"
+#~ "\n"
+#~ msgstr ""
+#~ " resultat fra arkivering:\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Archive in "
+#~ msgstr ""
+#~ "\n"
+#~ "Arkiv inn "
+
+#~ msgid "Refreshing remote"
+#~ msgstr "Oppdaterer eksterne kilder"
+
+#~ msgid "Remote not found"
+#~ msgstr "Ekstern kilde ikke funnet"
+
+#~ msgid "Sources"
+#~ msgstr "Kilder"
+
+#~ msgid "Open in a new tab"
+#~ msgstr "Åpne i en ny arkfane"
+
+#~ msgid "Open selected module in a separate ['dialog'] window"
+#~ msgstr "Åpne valgt modul i eget ['dialog']·vindu"
+
+#~ msgid "View information about the selected dialog"
+#~ msgstr "Vis informasjon om valgt vindu"
+
+#~ msgid "Create a new prayer list"
+#~ msgstr "Lag en ny liste bønneliste"
+
+#~ msgid "Daily Journal"
+#~ msgstr "Dagens Logg"
+
+#~ msgid "Outlined Topic"
+#~ msgstr "Uthevet Emne"
+
+#~ msgid "Open selected module in a dialog"
+#~ msgstr "Åpne valgt modul i eget vindu"
+
+#~ msgid "Text"
+#~ msgstr "Tekst"
+
+#~ msgid "Text to render"
+#~ msgstr "Tegn opp tekst"
+
+#~ msgid "Pixbuf Object"
+#~ msgstr "Objekt for bildebuffer"
+
+#~ msgid "The pixbuf to render."
+#~ msgstr "Bildebufferet som skal tegnes opp."
+
+#~ msgid "Add Child"
+#~ msgstr "Legg til Undergruppe"
+
+#~ msgid "Add Sibling"
+#~ msgstr "Legg til Undergruppe"
+
+#~ msgid "Eph 2:8"
+#~ msgstr "Efes 2:8"
+
+#~ msgid "H_istory/<Separator>"
+#~ msgstr "H_istorie/<Separator>"
+
+#~ msgid "H_istory/C_lear"
+#~ msgstr "H_istorie/S_lett"
+
+#~ msgid "Xiphos has renamed .xiphos-2.0 to .xiphos"
+#~ msgstr "Xiphos har skiftet ut navnet på mappen .xiphos-2.0 til .xiphos"
+
+#~ msgid ""
+#~ "Xiphos can not rename  .xiphos-2.0 to .xiphos:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Xiphos cannot continue."
+#~ msgstr ""
+#~ "Xiphos kan ikke skifte navn på mappen .xiphos-2.0 til .xiphos:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Xiphos kan ikke fortsette."
 
-#~ msgid "before closing?"
-#~ msgstr "før du avslutter?"
+#~ msgid "Base text size"
+#~ msgstr "Base tekst størrelse"
 
-#~ msgid "If you don't save, changes will be permanently lost."
-#~ msgstr "Hvis du ikke lagrer vil du miste alle endringer du har gjort."
+#~ msgid "Dictionary/_Lexicon"
+#~ msgstr "Ordbok/_Leksikon"
 
-#~ msgid "StudyPad"
-#~ msgstr "Studieblokk"
+#~ msgid "Remove - Restore"
+#~ msgstr "Fjern - gjenopprett"
 
-#~ msgid "Note Editor"
-#~ msgstr "Notatblokk"
+#~ msgid "Remove Folder"
+#~ msgstr "Fjern mappe"
 
-#~ msgid "Prayer List/Journal Editor"
-#~ msgstr "Bønne Liste/Journal Editor"
+#~ msgid "_Commentary"
+#~ msgstr "_Kommentar"
+
+#~ msgid "_Show/Hide Sidebar"
+#~ msgstr "_Vis / skjul sidestolpe"
 
 #~ msgid "Open StudyPad File"
 #~ msgstr "Åpne notatblokk"
@@ -3374,48 +3687,6 @@ msgstr "_Vis"
 #~ msgid "Stay in sync"
 #~ msgstr "Hold oppdatert hele tiden"
 
-#~ msgid ""
-#~ "Renaming is not available in Windows.\n"
-#~ "\n"
-#~ "Xiphos is limited by Windows' filesystem,\n"
-#~ "because it disallows the renaming of filename\n"
-#~ "components of currently-open files,\n"
-#~ "such as the contents of this commentary.\n"
-#~ "Therefore, personal commentary renaming is\n"
-#~ "not available in the Windows environment."
-#~ msgstr ""
-#~ "Å gi nytt navn er ikke mulig i Windows\n"
-#~ "\n"
-#~ "Xiphos begrenses av Windows sitt filsystem,\n"
-#~ "da systemet ikke tillater at man endrer filnavn\n"
-#~ "på komponenter som er åpne, som for eksempel\n"
-#~ "innholdet i denne kommentaren.\n"
-#~ "Derfor er det heller ikke mulig å endre navn i\n"
-#~ "personlige kommentarer, i ett windows oppsett."
-
-#~ msgid "Rename Commentary"
-#~ msgstr "Endre navn på kommentar"
-
-#~ msgid "Choose Commentary Name"
-#~ msgstr "Velg et navn på kommentaren"
-
-#~ msgid "New Name"
-#~ msgstr "Nytt navn"
-
-#~ msgid ""
-#~ "Failed to create new configuration:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Kunne ikke lage nytt oppsett:\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "Configuration build error:\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Feil ved bygging av oppsett:\n"
-#~ "\n"
-
 #~ msgid "Print"
 #~ msgstr "Skriv ut"
 
@@ -3530,9 +3801,6 @@ msgstr "_Vis"
 #~ msgid "\\par\\par My prayer list \\par\\par Module created in Xiphos"
 #~ msgstr "\\par\\par·Min bønneliste·\\par\\par·Moduler laget i Xiphos"
 
-#~ msgid "Delete Index"
-#~ msgstr "Slett Indeks"
-
 #~ msgid "+5"
 #~ msgstr "+5"
 
@@ -3611,10 +3879,6 @@ msgstr "_Vis"
 #~ msgid "Number of Devotion modules"
 #~ msgstr "Antall moduler for dagens tekst"
 
-#, fuzzy
-#~ msgid "Number of Prayer modules"
-#~ msgstr "Antall kommentar-moduler"
-
 #~ msgid "can not create  .sword"
 #~ msgstr "kan ikke lage mappen .sword"
 
@@ -3960,9 +4224,6 @@ msgstr "_Vis"
 #~ msgid "Old"
 #~ msgstr "Gammel"
 
-#~ msgid "New"
-#~ msgstr "Ny"
-
 #~ msgid "Remove/Archive"
 #~ msgstr "Fjern/Arkiver"
 
diff --git a/po/nl.po b/po/nl.po
index b4d1d58..3d300e8 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -8,107 +8,365 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Xiphos 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-27 20:29+0200\n"
-"PO-Revision-Date: 2009-02-12 16:02+0100\n"
-"Last-Translator: Gertjan Francke <gwfrancke@gmail.com>\n"
+"POT-Creation-Date: 2009-12-14 23:45+0000\n"
+"PO-Revision-Date: 2009-12-23 08:34-0500\n"
+"Last-Translator: Karl Kleinpaste <charcoal@users.sourceforge.net>\n"
 "Language-Team: Xiphos-developers <xiphos-developers@lists>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-12-10 04:38+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 
-#: ../xiphos.desktop.in.in.h:1
-msgid "Study the Bible"
-msgstr "Onderzoek de Bijbel"
-
-#: ../xiphos.desktop.in.in.h:2
-msgid "Xiphos Bible Guide"
-msgstr "Xiphos Bijbelgids"
-
-#: ../src/backend/sword_main.cc:1154
+#: ../src/backend/sword_main.cc:1083
 msgid "Configuration not found"
 msgstr "Configuratie niet gevonden"
 
-#: ../src/gecko/gecko-html.cpp:178 ../src/gnome2/html.c:161
+#: ../src/editor/bonobo-editor.c:254
+#: ../src/editor/slib-editor.c:234
+#: ../src/gnome2/html.c:637
+#, c-format
+msgid "Page %d of %d"
+msgstr "Pagina %d van %d"
+
+#: ../src/editor/bonobo-editor.c:353
+#: ../src/editor/slib-editor.c:659
+msgid "Are you sure you want to delete the note for"
+msgstr "Weet u zeker dat u de notitie wilt verwijderen voor"
+
+#: ../src/editor/bonobo-editor.c:965
+#: ../src/editor/bonobo-editor.c:998
+#: ../src/editor/slib-editor.c:1308
+#: ../src/editor/slib-editor.c:1345
+msgid "Save the changes to document"
+msgstr "Wijzigingen opslaan"
+
+#: ../src/editor/bonobo-editor.c:966
+#: ../src/editor/bonobo-editor.c:999
+#: ../src/editor/slib-editor.c:1309
+#: ../src/editor/slib-editor.c:1346
+msgid "before closing?"
+msgstr "voor afsluiten?"
+
+#: ../src/editor/bonobo-editor.c:973
+#: ../src/editor/bonobo-editor.c:1006
+#: ../src/editor/slib-editor.c:1316
+#: ../src/editor/slib-editor.c:1353
+msgid "If you don't save, changes will be permanently lost."
+msgstr "Wijzigingen gaan verloren als u niet opslaat."
+
+#: ../src/editor/bonobo-editor.c:997
+#: ../src/editor/slib-editor.c:1344
+#: ../ui/xi-menus.glade.h:39
+msgid "File"
+msgstr "Bestand"
+
+#: ../src/editor/bonobo-editor.c:1224
+#: ../src/editor/slib-editor.c:1401
+msgid "StudyPad"
+msgstr "Notitieblok"
+
+#: ../src/editor/bonobo-editor.c:1237
+#: ../src/editor/slib-editor.c:1415
+msgid "Note Editor"
+msgstr "Notitieblok"
+
+#: ../src/editor/bonobo-editor.c:1246
+#: ../src/editor/slib-editor.c:1429
+msgid "Prayer List/Journal Editor"
+msgstr "Gebedslijst/Berichten-editor"
+
+#: ../src/editor/slib-editor.c:401
+#: ../src/editor/slib-editor.c:448
+msgid "Save As"
+msgstr "Opslaan als"
+
+#: ../src/editor/slib-editor.c:419
+#: ../src/editor/slib-editor.c:466
+#: ../src/editor/slib-editor.c:634
+msgid "Untitled document"
+msgstr "Niet-opgeslagen document"
+
+#: ../src/editor/slib-editor.c:702
+msgid "HTML Output"
+msgstr "HTML-weergave"
+
+#: ../src/editor/slib-editor.c:709
+msgid "HTML Source"
+msgstr "HTML code"
+
+#: ../src/editor/slib-editor.c:716
+msgid "Plain Source"
+msgstr "Platte tekst"
+
+#: ../src/editor/slib-editor.c:726
+#: ../ui/editor_note.xml.h:15
+#: ../ui/editor_studypad.xml.h:21
+msgid "_Print..."
+msgstr "_Printen..."
+
+#: ../src/editor/slib-editor.c:733
+#: ../ui/editor_note.xml.h:9
+#: ../ui/editor_studypad.xml.h:14
+msgid "Print Pre_view"
+msgstr "Afdruk_voorbeeld"
+
+#: ../src/editor/slib-editor.c:740
+msgid "_Quit"
+msgstr "Afsluiten"
+
+#: ../src/editor/slib-editor.c:747
+msgid "_Open"
+msgstr "_Openen"
+
+#: ../src/editor/slib-editor.c:754
+msgid "_Save"
+msgstr "Op_slaan"
+
+#: ../src/editor/slib-editor.c:761
+msgid "Save _As..."
+msgstr "Bestand opslaan _als..."
+
+#: ../src/editor/slib-editor.c:767
+msgid "New"
+msgstr "Nieuw"
+
+#: ../src/editor/slib-editor.c:769
+msgid "Open new document"
+msgstr "Open nieuw document"
+
+#: ../src/editor/slib-editor.c:773
+msgid "Delete"
+msgstr "Wissen"
+
+#: ../src/editor/slib-editor.c:775
+msgid "Delete current note"
+msgstr "Verwijderen huidige notitie"
+
+#: ../src/editor/slib-editor.c:780
+#: ../ui/editor_note.xml.h:14
+#: ../ui/editor_studypad.xml.h:20
+#: ../ui/editor.xml.h:13
+#: ../ui/xi-menus.glade.h:106
+msgid "_File"
+msgstr "_Bestand"
+
+#: ../src/editor/slib-editor.c:835
+msgid "HTML _Output"
+msgstr "HTML _Output"
+
+#: ../src/editor/slib-editor.c:842
+msgid "_HTML Source"
+msgstr "_HTML broncode"
+
+#: ../src/editor/slib-editor.c:849
+msgid "_Plain Source"
+msgstr "_Platte tekst"
+
+#: ../src/editor/slib-editor.c:856
+#: ../ui/xi-menus.glade.h:121
+msgid "_View"
+msgstr "Beel_d"
+
+#: ../src/editor/slib-editor.c:867
+#: ../ui/editor_note.xml.h:11
+#: ../ui/editor_studypad.xml.h:16
+#: ../ui/editor.xml.h:11
+msgid "Save"
+msgstr "Opslaan"
+
+#: ../src/editor/slib-editor.c:878
+#: ../src/editor/slib-editor.c:885
+msgid "Insert Link"
+msgstr "Verwijzing toevoegen"
+
+#: ../src/gecko/gecko-html.cpp:177
+#: ../src/gnome2/html.c:165
 msgid "Unlock "
-msgstr "Slot openen"
+msgstr "Slot openen "
 
-#: ../src/gecko/gecko-print.c:171
+#: ../src/gecko/gecko-print.c:172
 msgid "Preparing to print"
 msgstr "Afdrukken wordt voorbereid"
 
-#: ../src/gecko/gecko-print.c:265
+#: ../src/gecko/gecko-print.c:266
 msgid "Printing is not supported on this printer"
 msgstr "Printen op deze printer wordt niet ondersteund"
 
-#: ../src/gecko/gecko-print.c:268
+#: ../src/gecko/gecko-print.c:269
 #, c-format
 msgid "Printer %s does not support PostScript printing."
 msgstr "Printer %s ondersteund geen PostScript-printen."
 
-#: ../src/gecko/gecko-print.c:341 ../src/gecko/gecko-print.c:369
+#: ../src/gecko/gecko-print.c:342
+#: ../src/gecko/gecko-print.c:370
 msgid "Printing"
 msgstr "Bezig met afdrukken"
 
-#: ../src/gecko/gecko-print.c:371
+#: ../src/gecko/gecko-print.c:372
 msgid "Waiting to print"
 msgstr "Bezig met wachten totdat er afgedrukt kan worden"
 
-#: ../src/gecko/gecko-print.c:583
+#: ../src/gecko/gecko-print.c:584
 msgid "An error occurred while printing"
 msgstr "Fout tijdens afdrukken"
 
-#: ../src/gecko/gecko-print.c:587
+#: ../src/gecko/gecko-print.c:588
 #, c-format
 msgid "It was not possible to print your document: %s"
 msgstr "Afdrukken van document %s is mislukt."
 
+#: ../src/gnome2/about_modules.c:195
+msgid "About Sword Module"
+msgstr "Module over SWORD"
+
+#: ../src/gnome2/about_modules.c:389
+#: ../src/gnome2/mod_mgr.c:252
+msgid "The module has no About information."
+msgstr "De module heeft geen \"Over\" informatie"
+
 #: ../src/gnome2/about_sword.c:88
-msgid ""
-"The SWORD Project is an effort to create an ever-expanding software package "
-"for research and study of God and His Word. The SWORD Project framework "
-"allows easy use and study of Bible texts, commentaries, lexicons, "
-"dictionaries, and other books. Many frontends are built using this "
-"framework. An installed set of books may be shared among all frontends using "
-"the framework."
-msgstr ""
-"Het SWORD-project levert de basis voor computer programma's waarmee de "
-"Bijbel kan worden gelezen en bestudeerd. Het SWORD-project brengt "
-"Bijbelvertalingen, commentaren, woordenboeken en nog veel meer literatuur op "
-"eenvoudige wijze beschikbaar. Meerdere programma's gebruiken de basis "
-"software van het Sword project. Een module(bijbelvertaling, commentaar, "
-"etc.) die is geïnstalleerd door één van deze programma's kan ook direct "
-"benut worden vanuit andere programma's."
+msgid "The SWORD Project is an effort to create an ever-expanding software package for research and study of God and His Word. The SWORD Project framework allows easy use and study of Bible texts, commentaries, lexicons, dictionaries, and other books. Many frontends are built using this framework. An installed set of books may be shared among all frontends using the framework."
+msgstr "Het SWORD-project levert de basis voor computer programma's waarmee de Bijbel kan worden gelezen en bestudeerd. Het SWORD-project brengt Bijbelvertalingen, commentaren, woordenboeken en nog veel meer literatuur op eenvoudige wijze beschikbaar. Meerdere programma's gebruiken de basis software van het Sword project. Een module(bijbelvertaling, commentaar, etc.) die is geïnstalleerd door één van deze programma's kan ook direct benut worden vanuit andere programma's."
 
 #: ../src/gnome2/about_sword.c:106
 msgid "About the SWORD Project"
 msgstr "Over het SWORD-project"
 
-#: ../src/gnome2/about_sword.c:123
+#: ../src/gnome2/about_sword.c:124
 msgid "Sword Version"
 msgstr "SWORD-versie"
 
-#: ../src/gnome2/about_sword.c:154
+#: ../src/gnome2/about_sword.c:155
 msgid "Books can be downloaded from the SWORD Project"
 msgstr "Boeken kunnen worden gedownload van de website van het SWORD-project"
 
-#: ../src/gnome2/about_sword.c:160
+#: ../src/gnome2/about_sword.c:161
 msgid "The SWORD Project"
 msgstr "Het SWORD-project"
 
-#: ../src/gnome2/navbar_versekey_editor.c:877
-#: ../src/gnome2/navbar_versekey_dialog.c:887
-#: ../src/gnome2/navbar_versekey_parallel.c:801
-#, fuzzy
-msgid "Synchronize this window from main window"
-msgstr "%s in hoofdscherm tonen"
+#: ../src/gnome2/about_trans.c:84
+msgid ""
+"Do you like using Xiphos to study the Bible? Would you like to see its display using your native language? You could translate Xiphos! \n"
+"\n"
+"We are always looking for contributions of new translations of Xiphos into other languages. If you are able to translate for us, please see the link below, contact us, and get involved with our efforts."
+msgstr "Bevalt Xiphos u als bijbelstudiehulp? Wilt u dat het programma ook uw taal ondersteund? U kunt ook een bijdrage leveren.Wij zijn altijd op zoek naar nieuwe vertalingen van Xiphos. Als u daarvoor de tijd heeft, klik dan op de link hieronder voor meer informatie."
 
-#: ../src/gnome2/about_modules.c:189
-msgid "About Sword Module"
-msgstr "Module over SWORD"
+#: ../src/gnome2/about_trans.c:98
+msgid "About Xiphos Translation"
+msgstr "Xiphos vertaling"
 
-#: ../src/gnome2/about_modules.c:383 ../src/gnome2/mod_mgr.c:198
-msgid "The module has no About information."
+#: ../src/gnome2/about_trans.c:140
+msgid "See TRANSLATION-HOWTO in Xiphos source"
+msgstr "Lees de TRANSLATION HOWTO in de broncode van Xiphos"
+
+#: ../src/gnome2/about_trans.c:146
+msgid "Xiphos development"
+msgstr "Xiphos ontwikkeling"
+
+#: ../src/gnome2/about_xiphos.c:131
+msgid "Copyright 2000-2009 The Xiphos Development Team"
+msgstr "Auteursrecht 2000-2008 Het ontwikkelteam van Xiphos"
+
+#: ../src/gnome2/about_xiphos.c:134
+msgid ""
+"(formerly known as GnomeSword)\n"
+"\n"
+"Powered by The SWORD Project.\n"
+"We would like to thank Troy Griffitts and all the other folks who have given us The SWORD Project."
 msgstr ""
+"(voorheen bekend als GnomeSword)\n"
+"Mogelijk gemaakt voor het SWORD-project.\n"
+"We willen Troy Griffitts en vele anderen bedanken voor hun bijdrage aan SWORD."
+
+#: ../src/gnome2/bibletext_dialog.c:358
+msgid "Go to "
+msgstr "Ga naar "
+
+#. info->stock_icon = GTK_STOCK_OPEN;
+#: ../src/gnome2/bookmark_dialog.c:171
+#: ../src/gnome2/bookmarks_menu.c:358
+#: ../src/gnome2/bookmarks_menu.c:765
+#: ../src/gnome2/bookmarks_menu.c:863
+#: ../src/gnome2/bookmarks_treeview.c:133
+#: ../ui/editor_studypad.xml.h:2
+#: ../ui/xi-menus.glade.h:13
+msgid "Bookmark"
+msgstr "Bladwijzer"
+
+#: ../src/gnome2/bookmark_dialog.c:173
+#: ../src/gnome2/bookmarks_menu.c:865
+#: ../src/gnome2/bookmarks_treeview.c:134
+msgid "Enter Folder Name"
+msgstr "Mapnaam invoeren"
+
+#: ../src/gnome2/bookmark_dialog.c:175
+#: ../src/gnome2/bookmarks_menu.c:867
+msgid "Folder Name"
+msgstr "Mapnaam"
+
+#: ../src/gnome2/bookmark_dialog.c:176
+#: ../src/gnome2/bookmarks_menu.c:868
+#: ../src/gnome2/bookmarks_treeview.c:136
+msgid "Folder: "
+msgstr "Map: "
+
+#: ../src/gnome2/bookmarks_menu.c:344
+#: ../ui/xi-menus.glade.h:32
+msgid "Edit"
+msgstr "Bewerken"
+
+#: ../src/gnome2/bookmarks_menu.c:361
+msgid "Folder name: "
+msgstr "Mapnaam: "
+
+#: ../src/gnome2/bookmarks_menu.c:364
+msgid "Bookmark name: "
+msgstr "Bladwijzernaam: "
+
+#: ../src/gnome2/bookmarks_menu.c:367
+#: ../src/gnome2/bookmarks_menu.c:773
+msgid "Verse: "
+msgstr "Vers: "
+
+#: ../src/gnome2/bookmarks_menu.c:368
+#: ../src/gnome2/bookmarks_menu.c:774
+msgid "Module: "
+msgstr "Module: "
+
+#: ../src/gnome2/bookmarks_menu.c:533
+msgid "Restore Bookmark Folder"
+msgstr "Bladwijzermap herstellen"
+
+#: ../src/gnome2/bookmarks_menu.c:602
+msgid "Remove the selected folder"
+msgstr "Geselecteerde map verwijderen"
+
+#: ../src/gnome2/bookmarks_menu.c:604
+msgid "(and all its contents)?"
+msgstr "(en de gehele inhoud)?"
+
+#: ../src/gnome2/bookmarks_menu.c:607
+msgid "Remove the selected bookmark"
+msgstr "Geselecteerde bladwijzer verwijderen"
+
+#: ../src/gnome2/bookmarks_menu.c:766
+msgid "Add"
+msgstr "Toevoegen"
+
+#: ../src/gnome2/bookmarks_menu.c:772
+msgid "Label: "
+msgstr "Label: "
+
+#: ../src/gnome2/bookmarks_treeview.c:107
+#, c-format
+msgid "Search result: %s"
+msgstr "Zoekresultaat: %s"
+
+#: ../src/gnome2/bookmarks_treeview.c:943
+#: ../src/gnome2/sidebar.c:1389
+msgid "Bookmarks"
+msgstr "Bladwijzers"
 
 #: ../src/gnome2/cipher_key_dialog.c:62
 msgid "Cipher Key?"
@@ -122,201 +380,379 @@ msgstr "voor:"
 msgid "Enter Cipher Key: "
 msgstr "Geef sleutelcode: "
 
-#: ../src/gnome2/parallel_view.c:271
-msgid "Copy"
-msgstr "Kopieëren"
-
-#: ../src/gnome2/parallel_view.c:281
-msgid "Detach/Attach"
-msgstr "Koppel/Ontkoppel"
-
-#: ../src/gnome2/parallel_view.c:287 ../ui/xi-menus.glade.h:38
-msgid "Module Options"
-msgstr "Moduleopties"
-
-#. build change parallel modules submenu
-#: ../src/gnome2/parallel_view.c:302
-msgid "Change parallel 1"
-msgstr "Wijzig parallel 1"
-
-#: ../src/gnome2/parallel_view.c:304
-msgid "Change parallel 2"
-msgstr "Wijzig parallel 2"
-
-#: ../src/gnome2/parallel_view.c:306
-msgid "Change parallel 3"
-msgstr "Wijzig parallel 3"
+#: ../src/gnome2/dialog.c:265
+msgid "Close without Saving"
+msgstr "Sluiten zonder opslaan"
 
-#: ../src/gnome2/parallel_view.c:308
-msgid "Change parallel 4"
-msgstr "Wijzig parallel 4"
+#: ../src/gnome2/dialog.c:596
+msgid "Xiphos:"
+msgstr "Xiphos:"
 
-#: ../src/gnome2/parallel_view.c:310
-msgid "Change parallel 5"
-msgstr "Wijzig parallel 5"
+#: ../src/gnome2/dialog.c:697
+msgid "Close _without Saving"
+msgstr "Sluiten _zonder opslaan"
 
-#: ../src/gnome2/parallel_view.c:467 ../src/gnome2/sidebar.c:599
-#: ../src/gnome2/sidebar.c:605 ../src/gnome2/tabbed_browser.c:231
-#: ../src/main/sidebar.cc:618 ../src/main/sidebar.cc:956
-#: ../src/main/sidebar.cc:957 ../src/main/sidebar.cc:958
-msgid "Parallel View"
-msgstr "Parallelweergave"
+#: ../src/gnome2/export_dialog.c:267
+#: ../ui/export-dialog.glade.h:20
+msgid "Please check copyright before exporting!"
+msgstr "Controleer de auteursrechten voordat u exporteert!"
 
-#: ../src/gnome2/find_dialog.c:200 ../src/gnome2/find_dialog.c:369
+#: ../src/gnome2/find_dialog.c:204
+#: ../src/gnome2/find_dialog.c:373
 msgid "Find"
 msgstr "Zoeken"
 
-#: ../src/gnome2/find_dialog.c:218
+#: ../src/gnome2/find_dialog.c:222
 msgid "Enter Word or Phrase"
 msgstr "Geef een woord of een zin"
 
-#: ../src/gnome2/find_dialog.c:234 ../src/gnome2/search_sidebar.c:303
-#: ../ui/search-dialog.glade.h:57
+#: ../src/gnome2/find_dialog.c:238
+#: ../src/gnome2/search_sidebar.c:306
+#: ../ui/search-dialog.glade.h:59
 msgid "Match case"
 msgstr "Hoofdlettergevoelig"
 
-#: ../src/gnome2/find_dialog.c:241
+#: ../src/gnome2/find_dialog.c:245
 msgid "Search backwards"
 msgstr "Terugwaarts zoeken"
 
-#: ../src/gnome2/find_dialog.c:250 ../src/gnome2/search_sidebar.c:268
-#: ../ui/search-dialog.glade.h:74
+#: ../src/gnome2/find_dialog.c:254
+#: ../src/gnome2/search_sidebar.c:271
+#: ../ui/search-dialog.glade.h:76
 msgid "Regular expression"
 msgstr "Reguliere expressie"
 
-#: ../src/gnome2/find_dialog.c:291
+#: ../src/gnome2/find_dialog.c:295
 msgid "Find Next"
 msgstr "Volgende zoeken"
 
-#: ../src/gnome2/bibletext_dialog.c:525
-msgid "Go to "
-msgstr "Ga naar "
-
-#: ../src/gnome2/dialog.c:241
-msgid "Close without Saving"
-msgstr "Sluiten zonder opslaan"
-
-#: ../src/gnome2/dialog.c:730
-msgid "Xiphos:"
-msgstr "Xiphos:"
-
-#: ../src/gnome2/dialog.c:831
-msgid "Close _without Saving"
-msgstr "Sluiten _zonder opslaan"
-
-#: ../src/gnome2/font_dialog.c:297
+#: ../src/gnome2/font_dialog.c:303
 msgid "Set Module Font"
 msgstr "Lettertype voor module"
 
-#: ../src/gnome2/font_dialog.c:327
+#: ../src/gnome2/font_dialog.c:333
 msgid "Change font for"
 msgstr "Wijzig lettertype van"
 
-#: ../src/gnome2/font_dialog.c:331
+#: ../src/gnome2/font_dialog.c:337
 msgid "Module"
 msgstr "Module"
 
-#: ../src/gnome2/font_dialog.c:335
+#: ../src/gnome2/font_dialog.c:341
 msgid "Current font: "
 msgstr "Huidige lettertype: "
 
-#: ../src/gnome2/font_dialog.c:372
+#: ../src/gnome2/font_dialog.c:378
 msgid "+0"
 msgstr "+0"
 
-#: ../src/gnome2/font_dialog.c:376
+#: ../src/gnome2/font_dialog.c:382
 msgid "Use the default font for this module"
 msgstr "Gebruik het standaardlettertype voor deze module"
 
-#: ../src/gnome2/toolbar_nav.c:416
-msgid "Move backwards through history"
-msgstr "Schuif terugwaarts in de geschiedenis"
+#. *****************************************************************************
+#. * Name
+#. *    gconf_setup
+#. *
+#. * Synopsis
+#. *   #include "main/settings.h"
+#. *
+#. *   void gconf_setup()
+#. *
+#. * Description
+#. *   verifies and initializes the GConf subsystem, so that "sword://" and
+#. *   similar can be handled by url-comprehending programs such as browsers.
+#. *   dialogs for permission/success/failure => conditional on debug build.
+#. *
+#. * Return value
+#. *   void
+#.
+#: ../src/gnome2/gui.c:110
+msgid ""
+"URL references using \"sword://\" (similar to web page\n"
+"references) can be used by programs to look up\n"
+"scripture references. Your system currently has no\n"
+"program set to handle these references.\n"
+"\n"
+"Would you like Xiphos to set itself as the\n"
+"program to handle these references?"
+msgstr ""
+"URL-verwijzingen als \"sword://\"(net zoals http) kunnenworden gebruikt door programma's om bijbelverwijzingente openen. Wilt u dat Xiphos als standaard programma op uw systeem wordt ingesteld?\n"
+"\n"
+"Momenteel is er geen programma gekoppeld aan dit typeverwijzing."
+
+#: ../src/gnome2/gui.c:112
+msgid ""
+"Xiphos has successfully set itself\n"
+"as the handler of sword:// and bible:// URLs.\n"
+"\n"
+"You may wish to run the program \"gconf-editor\"\n"
+"to examine keys under /desktop/gnome/url-handlers,\n"
+"if you need to change these."
+msgstr ""
+"Xiphos is nu het standaardprogramma\n"
+"voor URLs als sword:// en bible://.\n"
+"\n"
+"Met het programma \"gconf-editor\" kunt u dit\n"
+"m.b.v. de sleutels onder /desktop/gnome/url-handlers\n"
+"wijzigen."
+
+#: ../src/gnome2/gui.c:166
+#, c-format
+msgid ""
+"Xiphos failed to complete handler init for key #%d:\n"
+"%s"
+msgstr ""
+"Het instellen van de standaardtoewijzing voor de toets #%d:\n"
+"%s is mislukt"
+
+#: ../src/gnome2/gui.c:212
+msgid "BUG! Xiphos is about to crash due to a \"STRDUP\" error."
+msgstr "BUG! Xiphos punt staat te crashen als gevolg van een \"STRDUP\" error."
 
-#: ../src/gnome2/toolbar_nav.c:437
-msgid "Move foward through history"
-msgstr "Schuif voorwaarts in de geschiedenis"
+#: ../src/gnome2/gui.c:213
+#: ../src/gnome2/gui.c:248
+msgid "Please report this error to the Xiphos team with:"
+msgstr "Meld deze fout aan de xiphos team met:"
 
-#: ../src/gnome2/toolbar_nav.c:458
-msgid "Select a Book of the Bible"
-msgstr "Selecteer een bijbelboek"
+#: ../src/gnome2/gui.c:247
+msgid "BUG! Xiphos is about to crash due to a \"STRING\" error."
+msgstr "BUG! Xiphos punt staat te crashen als gevolg van een \"STRING\" error."
 
-#: ../src/gnome2/toolbar_nav.c:523
-msgid "Change Chapter"
-msgstr "Hoofdstuk wijzigen"
+#: ../src/gnome2/main_window.c:789
+msgid "Xiphos - Bible Study Software"
+msgstr "Xiphos - Bijbelstudieprogramma"
 
-#: ../src/gnome2/toolbar_nav.c:593
-msgid "Change Verse"
-msgstr "Vers wijzigen"
+#: ../src/gnome2/main_window.c:844
+msgid "Open a new tab"
+msgstr "Nieuw tabblad openen"
 
-#: ../src/gnome2/toolbar_nav.c:661
-msgid "Enter a Verse reference in Book 1:1 format and press Return"
-msgstr "Geef een versreferentie in Boek 1:1 formaat en druk op Enter"
+#: ../src/gnome2/main_window.c:923
+#: ../src/gnome2/sidebar.c:627
+#: ../src/gnome2/sidebar.c:633
+#: ../src/main/sidebar.cc:666
+#: ../src/main/sidebar.cc:1015
+#: ../src/main/sidebar.cc:1016
+#: ../src/main/sidebar.cc:1017
+msgid "Standard View"
+msgstr "Standaardweergave"
 
-#: ../src/gnome2/mod_mgr.c:333
-msgid "Install these modules:"
-msgstr "Deze modules installeren:"
+#: ../src/gnome2/main_window.c:1004
+msgid "Commentary View"
+msgstr "Commentaar"
 
-#: ../src/gnome2/mod_mgr.c:335
-msgid "Remove these modules:"
-msgstr "Deze modules verwijderen:"
+#: ../src/gnome2/main_window.c:1020
+msgid "Book View"
+msgstr "Boek"
 
-#: ../src/gnome2/mod_mgr.c:337
-msgid "Archive these modules:"
-msgstr "Back-up maken van:"
+#: ../src/gnome2/main_window.c:1045
+msgid "Welcome to Xiphos"
+msgstr "Welkom op Xiphos"
 
-#: ../src/gnome2/mod_mgr.c:339
+#: ../src/gnome2/menu_popup.c:1168
 msgid ""
-"Build fast-search index for these\n"
-"modules (may take minutes/module):"
+"Renaming is not available in Windows.\n"
+"\n"
+"Xiphos is limited by Windows' filesystem,\n"
+"because it disallows the renaming of filename\n"
+"components of currently-open files,\n"
+"such as the contents of this commentary.\n"
+"Therefore, personal commentary renaming is\n"
+"not available in the Windows environment."
+msgstr ""
+"Hernoemen is niet mogelijk in Windows.\n"
+"\n"
+"Xiphos wordt beperkt door Windows'\n"
+"bestandssysteem. Daardoor is het niet mogelijk\n"
+"om geopende bestanden te hernoemen,\n"
+"zoals de inhoud van dit commentaar."
+
+#: ../src/gnome2/menu_popup.c:1187
+msgid "Rename Commentary"
+msgstr "Commentaar hernoemen"
+
+#: ../src/gnome2/menu_popup.c:1190
+msgid "Choose Commentary Name"
+msgstr "Commentaarnaam kiezen"
+
+#: ../src/gnome2/menu_popup.c:1192
+msgid "New Name"
+msgstr "Nieuwe naam"
+
+#: ../src/gnome2/menu_popup.c:1193
+#: ../src/gnome2/treekey-editor.c:139
+#: ../src/gnome2/treekey-editor.c:198
+#: ../src/gnome2/treekey-editor.c:284
+#: ../src/main/prayerlists.cc:243
+msgid "Name: "
+msgstr "Naam: "
+
+#: ../src/gnome2/menu_popup.c:1203
+#: ../src/main/prayerlists.cc:257
+msgid "Module names must contain [A-Za-z0-9_] only."
+msgstr "Modulenamen kunnen alleen letters en getallen.bevatten."
+
+#: ../src/gnome2/menu_popup.c:1210
+#: ../src/main/prayerlists.cc:264
+msgid "Xiphos already knows a module by that name."
+msgstr "Xiphos kent al een module met die naam."
+
+#: ../src/gnome2/menu_popup.c:1253
+#, c-format
+msgid ""
+"Failed to create new configuration:\n"
+"%s"
 msgstr ""
-"Snelzoek-index voor deze modules maken\n"
-"(duurt enkele minuten):"
+"Maken van een nieuwe configuratie is mislukt:\n"
+"%s"
 
-#: ../src/gnome2/mod_mgr.c:341
-msgid "Delete fast-search index for these modules:"
-msgstr "Snelzoek-index van deze modules verwijderen:"
+#: ../src/gnome2/menu_popup.c:1262
+msgid ""
+"Configuration build error:\n"
+"\n"
+msgstr ""
+"Fout bij het aanmaken van de configuratie:\n"
+"\n"
 
-#: ../src/gnome2/mod_mgr.c:361
-msgid "Preparing to install"
-msgstr "Installatie wordt voorbereid"
+#: ../src/gnome2/mod_mgr.c:169
+msgid "Remove these modules?"
+msgstr "Verwijder deze modules?"
 
-#: ../src/gnome2/mod_mgr.c:363
+#: ../src/gnome2/mod_mgr.c:170
 msgid "Preparing to remove"
 msgstr "Verwijderen wordt voorbereid"
 
-#: ../src/gnome2/mod_mgr.c:365
-msgid "Preparing to archive"
-msgstr "Back-up wordt voorbereid"
+#: ../src/gnome2/mod_mgr.c:171
+msgid "Removing"
+msgstr "Verwijderen"
 
-#: ../src/gnome2/mod_mgr.c:367
-msgid "Preparing to index"
-msgstr "Indexeren wordt voorbereid"
+#: ../src/gnome2/mod_mgr.c:172
+#: ../ui/xi-menus.glade.h:72
+msgid "Remove"
+msgstr "Verwijder"
 
-#: ../src/gnome2/mod_mgr.c:369
-msgid "Preparing to delete index"
-msgstr "Verwijderen index wordt voorbereid"
+#: ../src/gnome2/mod_mgr.c:175
+msgid "Install these modules?"
+msgstr "Installeer deze modules?"
+
+#: ../src/gnome2/mod_mgr.c:176
+msgid "Preparing to install"
+msgstr "Installatie wordt voorbereid"
 
-#: ../src/gnome2/mod_mgr.c:394
+#: ../src/gnome2/mod_mgr.c:177
 msgid "Installing"
 msgstr "Installeren"
 
-#: ../src/gnome2/mod_mgr.c:396
-msgid "Removing"
-msgstr "Verwijderen"
+#: ../src/gnome2/mod_mgr.c:178
+#: ../src/gnome2/mod_mgr.c:2964
+#: ../ui/module-manager.glade.h:18
+msgid "Install"
+msgstr "Installeer"
+
+#: ../src/gnome2/mod_mgr.c:181
+msgid "Archive these modules?"
+msgstr "Archief deze modules?"
+
+#: ../src/gnome2/mod_mgr.c:182
+msgid "Preparing to archive"
+msgstr "Back-up wordt voorbereid"
 
-#: ../src/gnome2/mod_mgr.c:398
+#: ../src/gnome2/mod_mgr.c:183
 msgid "Archiving"
 msgstr "Bezig met maken back-up"
 
-#: ../src/gnome2/mod_mgr.c:400
+#: ../src/gnome2/mod_mgr.c:184
+#: ../ui/module-manager.glade.h:11
+msgid "Archive"
+msgstr "Back-up maken"
+
+#: ../src/gnome2/mod_mgr.c:187
+msgid ""
+"Build fast-search index for these\n"
+"modules (may take minutes/module)?"
+msgstr ""
+"Bouw fast-index voor deze\n"
+"modules (kan minuten duren/module)?"
+
+#: ../src/gnome2/mod_mgr.c:188
+msgid "Preparing to index"
+msgstr "Indexeren wordt voorbereid"
+
+#: ../src/gnome2/mod_mgr.c:189
 msgid "Indexing"
 msgstr "Indexeren"
 
-#: ../src/gnome2/mod_mgr.c:402
+#: ../src/gnome2/mod_mgr.c:190
+#: ../ui/module-manager.glade.h:17
+msgid "Index"
+msgstr "Zoekindex maken"
+
+#: ../src/gnome2/mod_mgr.c:193
+msgid "Delete fast-search index for these modules?"
+msgstr "Verwijder fast-search-index voor deze modules?"
+
+#: ../src/gnome2/mod_mgr.c:194
+msgid "Preparing to delete index"
+msgstr "Verwijderen index wordt voorbereid"
+
+#: ../src/gnome2/mod_mgr.c:195
 msgid "Deleting index"
 msgstr "Index wordt verwijderd"
 
-#: ../src/gnome2/mod_mgr.c:422
+#: ../src/gnome2/mod_mgr.c:196
+msgid "Deletion"
+msgstr "Verwijderen"
+
+#: ../src/gnome2/mod_mgr.c:427
+msgid "Module Name"
+msgstr "Modulenaam"
+
+#: ../src/gnome2/mod_mgr.c:448
+msgid "A checkmark means this module is already installed"
+msgstr "Het markeringssymbool betekent dat deze module al geïnstalleerd is."
+
+#: ../src/gnome2/mod_mgr.c:470
+msgid "Click the box to work on this module"
+msgstr "Klik op het vakje om te werken aan deze module"
+
+#: ../src/gnome2/mod_mgr.c:471
+msgid "Click the box to select this module for install/update"
+msgstr "Klik op het vakje te selecteren voor deze module te installeren/updaten"
+
+#: ../src/gnome2/mod_mgr.c:490
+msgid "Installed"
+msgstr "Geïnstalleerd"
+
+#: ../src/gnome2/mod_mgr.c:500
+msgid "The index icon means you have built an optimized ('lucene') index for this module for fast searching (see the Maintenance pane for this function)"
+msgstr "De index-pictogram betekent dat je een geoptimaliseerd ('Lucene') index gebouwd voor deze module voor snel zoeken (zie de Maintenance paneel voor deze functie)"
+
+#: ../src/gnome2/mod_mgr.c:518
+msgid "The lock icon means this module is encrypted, and requires that you purchase an unlock key from the content owner"
+msgstr "Het slot pictogram betekent deze module is gecodeerd, en vereist dat u koopt een unlock sleutel van de eigenaar van de inhoud"
+
+#: ../src/gnome2/mod_mgr.c:535
+#: ../ui/xi-menus.glade.h:1
+msgid "About"
+msgstr "In_fo"
+
+#: ../src/gnome2/mod_mgr.c:555
+msgid "The refresh icon means the Installed module is older than the newer Available module: You should update the module"
+msgstr "Het vernieuwen icoon betekent dat de geïnstalleerde module is ouder dan de nieuwere Beschikbaar module: U moet de module update"
+
+#: ../src/gnome2/mod_mgr.c:567
+msgid "Available"
+msgstr "Beschikbaar"
+
+#: ../src/gnome2/mod_mgr.c:576
+msgid "Size"
+msgstr "Grootte"
+
+#: ../src/gnome2/mod_mgr.c:585
+msgid "Description"
+msgstr "Beschrijving"
+
+#: ../src/gnome2/mod_mgr.c:736
 #, c-format
 msgid ""
 "`mkdir %s' failed:\n"
@@ -325,70 +761,40 @@ msgstr ""
 "`mkdir %s' is mislukt:\n"
 "%s."
 
-#: ../src/gnome2/mod_mgr.c:448
-msgid "Xiphos could not execute archiver"
-msgstr "Xiphos kon het backupbeheer niet starten"
-
-#: ../src/gnome2/mod_mgr.c:453
-msgid ""
-" archival result:\n"
-"\n"
-msgstr ""
-"archiveer resultaat:\n"
-"\n"
-
-#: ../src/gnome2/mod_mgr.c:457
-msgid ""
-"\n"
-"Archive in "
-msgstr ""
-"\n"
-"Back-up in "
+#: ../src/gnome2/mod_mgr.c:759
+msgid " archived in: \n"
+msgstr "gearchiveerd in:\n"
 
-#: ../src/gnome2/mod_mgr.c:514
+#: ../src/gnome2/mod_mgr.c:815
 msgid "Journals and prayer lists cannot be indexed."
 msgstr "Berichten en gebedslijsten kunnen niet geïndexeerd worden."
 
-#: ../src/gnome2/mod_mgr.c:535 ../src/gnome2/mod_mgr.c:2753
-#: ../ui/module-manager.glade.h:15
-msgid "Install"
-msgstr "Installeer"
-
-#: ../src/gnome2/mod_mgr.c:537 ../src/gnome2/treekey-editor.c:315
-msgid "Remove"
-msgstr "Verwijder"
-
-#: ../src/gnome2/mod_mgr.c:539
-msgid "Archive"
-msgstr "Back-up maken"
-
-#: ../src/gnome2/mod_mgr.c:541
-msgid "Index"
-msgstr "Zoekindex maken"
-
-#: ../src/gnome2/mod_mgr.c:543
-msgid "Deletion"
-msgstr "Verwijderen"
-
-#: ../src/gnome2/mod_mgr.c:545
+#: ../src/gnome2/mod_mgr.c:833
 #, c-format
 msgid "%s failed"
 msgstr "%s is mislukt"
 
-#: ../src/gnome2/mod_mgr.c:547 ../src/gnome2/mod_mgr.c:1267
+#: ../src/gnome2/mod_mgr.c:836
+#: ../src/gnome2/mod_mgr.c:1562
 msgid "Finished"
 msgstr "Voltooid"
 
-#: ../src/gnome2/mod_mgr.c:712 ../src/gnome2/mod_mgr.c:714
-#: ../src/gnome2/mod_mgr.c:816 ../src/gnome2/mod_mgr.c:851
-#: ../src/gnome2/mod_mgr.c:853 ../src/gnome2/utilities.c:346
-#: ../src/gnome2/utilities.c:411 ../src/gnome2/utilities.c:413
-#: ../src/gnome2/utilities.c:1031 ../src/main/sidebar.cc:801
-#: ../src/main/sidebar.cc:873 ../src/main/sidebar.cc:875
+#: ../src/gnome2/mod_mgr.c:1003
+#: ../src/gnome2/mod_mgr.c:1005
+#: ../src/gnome2/mod_mgr.c:1107
+#: ../src/gnome2/mod_mgr.c:1142
+#: ../src/gnome2/mod_mgr.c:1144
+#: ../src/gnome2/utilities.c:435
+#: ../src/gnome2/utilities.c:500
+#: ../src/gnome2/utilities.c:502
+#: ../src/gnome2/utilities.c:986
+#: ../src/main/sidebar.cc:852
+#: ../src/main/sidebar.cc:924
+#: ../src/main/sidebar.cc:926
 msgid "Unknown"
 msgstr "Onbekend"
 
-#: ../src/gnome2/mod_mgr.c:1012
+#: ../src/gnome2/mod_mgr.c:1301
 #, c-format
 msgid ""
 "Repository:\n"
@@ -397,7 +803,7 @@ msgstr ""
 "Bron:\n"
 "%s"
 
-#: ../src/gnome2/mod_mgr.c:1024
+#: ../src/gnome2/mod_mgr.c:1313
 msgid ""
 "Categorized by\n"
 "Module Type"
@@ -405,44 +811,59 @@ msgstr ""
 "Gesorteerd bij\n"
 "moduletype"
 
-#: ../src/gnome2/mod_mgr.c:1029 ../src/gnome2/utilities.c:472
-#: ../src/main/sidebar.cc:948 ../src/main/sidebar.cc:950
+#: ../src/gnome2/mod_mgr.c:1318
+#: ../src/gnome2/utilities.c:561
+#: ../src/main/sidebar.cc:999
+#: ../src/main/sidebar.cc:1001
 msgid "Biblical Texts"
 msgstr "Bijbelvertalingen"
 
-#: ../src/gnome2/mod_mgr.c:1033 ../src/gnome2/utilities.c:476
-#: ../src/main/sidebar.cc:650 ../src/main/sidebar.cc:973
-#: ../src/main/sidebar.cc:975 ../ui/prefs.glade.h:33
+#: ../src/gnome2/mod_mgr.c:1322
+#: ../src/gnome2/utilities.c:565
+#: ../src/main/sidebar.cc:678
+#: ../src/main/sidebar.cc:1024
+#: ../src/main/sidebar.cc:1026
+#: ../ui/prefs.glade.h:33
 msgid "Commentaries"
 msgstr "Commentaren"
 
-#: ../src/gnome2/mod_mgr.c:1037 ../src/gnome2/utilities.c:480
-#: ../src/main/sidebar.cc:982 ../src/main/sidebar.cc:984
+#: ../src/gnome2/mod_mgr.c:1326
+#: ../src/gnome2/utilities.c:569
+#: ../src/main/sidebar.cc:1033
+#: ../src/main/sidebar.cc:1035
 msgid "Dictionaries"
 msgstr "Woordenboeken"
 
-#: ../src/gnome2/mod_mgr.c:1041 ../src/gnome2/utilities.c:484
-#: ../src/main/sidebar.cc:991 ../src/main/sidebar.cc:993
+#: ../src/gnome2/mod_mgr.c:1330
+#: ../src/gnome2/utilities.c:573
+#: ../src/main/sidebar.cc:1042
+#: ../src/main/sidebar.cc:1044
 msgid "Daily Devotionals"
 msgstr "Dagboeken"
 
-#: ../src/gnome2/mod_mgr.c:1045 ../src/gnome2/utilities.c:488
-#: ../src/main/sidebar.cc:660 ../src/main/sidebar.cc:1000
-#: ../src/main/sidebar.cc:1002
+#: ../src/gnome2/mod_mgr.c:1334
+#: ../src/gnome2/utilities.c:577
+#: ../src/main/sidebar.cc:688
+#: ../src/main/sidebar.cc:1051
+#: ../src/main/sidebar.cc:1053
 msgid "General Books"
 msgstr "Boeken"
 
-#: ../src/gnome2/mod_mgr.c:1049 ../src/gnome2/utilities.c:492
-#: ../src/main/sidebar.cc:1009 ../src/main/sidebar.cc:1011
+#: ../src/gnome2/mod_mgr.c:1338
+#: ../src/gnome2/utilities.c:581
+#: ../src/main/sidebar.cc:1060
+#: ../src/main/sidebar.cc:1062
 msgid "Maps"
 msgstr "Landkaarten"
 
-#: ../src/gnome2/mod_mgr.c:1053 ../src/gnome2/utilities.c:496
-#: ../src/main/sidebar.cc:1018 ../src/main/sidebar.cc:1020
+#: ../src/gnome2/mod_mgr.c:1342
+#: ../src/gnome2/utilities.c:585
+#: ../src/main/sidebar.cc:1069
+#: ../src/main/sidebar.cc:1071
 msgid "Images"
 msgstr "Illustraties"
 
-#: ../src/gnome2/mod_mgr.c:1061
+#: ../src/gnome2/mod_mgr.c:1350
 msgid ""
 "Categorized by\n"
 "Availability"
@@ -450,323 +871,388 @@ msgstr ""
 "Gecategoriseerd bij\n"
 "beschikbaarheid"
 
-#: ../src/gnome2/mod_mgr.c:1066
+#: ../src/gnome2/mod_mgr.c:1355
 msgid "Updates"
 msgstr "Updates"
 
-#: ../src/gnome2/mod_mgr.c:1070
+#: ../src/gnome2/mod_mgr.c:1359
 msgid "Uninstalled"
 msgstr "Niet geïnstalleerd"
 
-#: ../src/gnome2/mod_mgr.c:1074 ../src/gnome2/sidebar.c:616
-#: ../src/gnome2/utilities.c:501 ../src/main/prayerlists.cc:238
-#: ../src/main/sidebar.cc:1028 ../src/main/sidebar.cc:1030
+#: ../src/gnome2/mod_mgr.c:1363
+#: ../src/gnome2/sidebar.c:643
+#: ../src/gnome2/utilities.c:590
+#: ../src/main/prayerlists.cc:241
+#: ../src/main/sidebar.cc:1079
+#: ../src/main/sidebar.cc:1081
 msgid "Prayer List/Journal"
 msgstr "Gebedslijst/Bericht"
 
-#: ../src/gnome2/mod_mgr.c:1250
-msgid "Refreshing remote"
-msgstr "Bezig met zoeken naar updates"
-
-#: ../src/gnome2/mod_mgr.c:1261
-msgid "Remote not found"
-msgstr "Externe bron niet gevonden"
-
-#: ../src/gnome2/mod_mgr.c:1393
-msgid "Module Name"
-msgstr "Modulenaam"
-
-#: ../src/gnome2/mod_mgr.c:1414
-msgid "A checkmark means this module is already installed"
-msgstr "Het markeringssymbool betekent dat deze module al geïnstalleerd is."
-
-#: ../src/gnome2/mod_mgr.c:1436
-msgid "Click the box to work on this module"
-msgstr ""
-
-#: ../src/gnome2/mod_mgr.c:1437
-msgid "Click the box to select this module for install/update"
-msgstr ""
+#: ../src/gnome2/mod_mgr.c:1545
+msgid "Refreshing from remote source"
+msgstr "Verfrissend afgelegen bron"
 
-#: ../src/gnome2/mod_mgr.c:1456
-msgid "Installed"
-msgstr "Geïnstalleerd"
-
-#: ../src/gnome2/mod_mgr.c:1466
-msgid ""
-"The index icon means you have built an optimized ('lucene') index for this "
-"module for fast searching (see the Maintenance pane for this function)"
-msgstr ""
-
-#: ../src/gnome2/mod_mgr.c:1484
-msgid ""
-"The lock icon means this module is encrypted, and requires that you purchase "
-"an unlock key from the content owner"
-msgstr ""
+#: ../src/gnome2/mod_mgr.c:1556
+msgid "Remote source not found"
+msgstr "Remote source not found"
 
-#. 2
-#: ../src/gnome2/mod_mgr.c:1501 ../src/gnome2/sidebar.c:954
-#: ../src/gnome2/sidebar.c:1122 ../ui/xi-menus.glade.h:1
-msgid "About"
-msgstr "In_fo"
-
-#: ../src/gnome2/mod_mgr.c:1521
-msgid ""
-"The refresh icon means the Installed module is older than the newer "
-"Available module: You should update the module"
-msgstr ""
-
-#: ../src/gnome2/mod_mgr.c:1533
-msgid "Available"
-msgstr "Beschikbaar"
-
-#: ../src/gnome2/mod_mgr.c:1542
-msgid "Size"
-msgstr "Grootte"
-
-#: ../src/gnome2/mod_mgr.c:1551
-msgid "Description"
-msgstr "Beschrijving"
-
-#: ../src/gnome2/mod_mgr.c:1583 ../src/gnome2/mod_mgr.c:1660
+#: ../src/gnome2/mod_mgr.c:1670
 msgid "Configure"
 msgstr "Configureren"
 
-#: ../src/gnome2/mod_mgr.c:1614
+#: ../src/gnome2/mod_mgr.c:1701
 msgid "Type"
 msgstr "Type"
 
-#: ../src/gnome2/mod_mgr.c:1621
+#: ../src/gnome2/mod_mgr.c:1708
 msgid "Caption"
 msgstr "Titel"
 
-#: ../src/gnome2/mod_mgr.c:1629
+#: ../src/gnome2/mod_mgr.c:1716
 msgid "Source"
 msgstr "Bron"
 
-#: ../src/gnome2/mod_mgr.c:1637
+#: ../src/gnome2/mod_mgr.c:1724
 msgid "Directory"
 msgstr "Map"
 
-#: ../src/gnome2/mod_mgr.c:1658
-msgid "Sources"
-msgstr "Bronnen"
+#: ../src/gnome2/mod_mgr.c:1732
+msgid "User"
+msgstr "Gebruiker"
+
+#: ../src/gnome2/mod_mgr.c:1740
+msgid "Password"
+msgstr "Wachtwoord"
 
-#: ../src/gnome2/mod_mgr.c:1664 ../src/gnome2/sidebar.c:1462
-#: ../src/gnome2/preferences_dialog.c:1784
+#: ../src/gnome2/mod_mgr.c:1748
+msgid "UID"
+msgstr "UID"
+
+#: ../src/gnome2/mod_mgr.c:1765
+msgid "Module Sources"
+msgstr "Module Bronnen"
+
+#: ../src/gnome2/mod_mgr.c:1768
+msgid "Add/Remove"
+msgstr "Toevoegen/Verwijderen"
+
+#: ../src/gnome2/mod_mgr.c:1770
+msgid "Choose"
+msgstr "Kiezen"
+
+#: ../src/gnome2/mod_mgr.c:1774
+#: ../src/gnome2/preferences_dialog.c:1793
+#: ../src/gnome2/sidebar.c:1413
 msgid "Modules"
 msgstr "Modules"
 
-#: ../src/gnome2/mod_mgr.c:1666
+#: ../src/gnome2/mod_mgr.c:1776
 msgid "Install/Update"
 msgstr "Installeren/Bijwerken"
 
-#: ../src/gnome2/mod_mgr.c:1668
+#: ../src/gnome2/mod_mgr.c:1778
 msgid "Maintenance"
 msgstr "Onderhoud"
 
-#: ../src/gnome2/mod_mgr.c:1872
+#: ../src/gnome2/mod_mgr.c:1999
 msgid "Please Refresh"
 msgstr "Verversen alstublieft"
 
-#: ../src/gnome2/mod_mgr.c:1873
+#: ../src/gnome2/mod_mgr.c:2000
 msgid "Your module list is not up to date!"
 msgstr "Uw modelelijst is niet actueel!"
 
-#: ../src/gnome2/mod_mgr.c:2336 ../src/gnome2/mod_mgr.c:2542
+#. Zero Bibles is just not workable in Xiphos.
+#: ../src/gnome2/mod_mgr.c:2282
+msgid ""
+"You have uninstalled your last Bible.\n"
+"Xiphos requires at least one."
+msgstr ""
+"U hebt verwijderd uw laatste Bijbel.\n"
+"Xiphos vereist ten minste een."
+
+#: ../src/gnome2/mod_mgr.c:2288
+msgid ""
+"There are still no Bibles installed.\n"
+"Xiphos cannot continue without one."
+msgstr ""
+"Er zijn nog geen bijbels geïnstalleerd.\n"
+"Xiphos kan niet doorgaan zonder een."
+
+#: ../src/gnome2/mod_mgr.c:2353
+msgid "Standard remote sources have been loaded."
+msgstr "Standaard afstandsbediening bronnen zijn geladen."
+
+#: ../src/gnome2/mod_mgr.c:2359
+msgid "Could not load standard sources from CrossWire."
+msgstr "Kan niet laden standaard bronnen van CrossWire."
+
+#: ../src/gnome2/mod_mgr.c:2510
+#: ../src/gnome2/mod_mgr.c:2759
 msgid "Remove the selected source"
 msgstr "Geselecteerde bron verwijderen"
 
-#: ../src/gnome2/mod_mgr.c:2393
+#: ../src/gnome2/mod_mgr.c:2570
 msgid "Enter a remote source"
 msgstr "Externe bron invoeren"
 
-#: ../src/gnome2/mod_mgr.c:2397
+#: ../src/gnome2/mod_mgr.c:2574
 msgid "Caption:"
 msgstr "Titel:"
 
-#: ../src/gnome2/mod_mgr.c:2398
+#: ../src/gnome2/mod_mgr.c:2575
 msgid "Type:"
 msgstr "Type:"
 
-#: ../src/gnome2/mod_mgr.c:2399
+#: ../src/gnome2/mod_mgr.c:2576
 msgid "Host:"
 msgstr "Host:"
 
-#: ../src/gnome2/mod_mgr.c:2400
+#: ../src/gnome2/mod_mgr.c:2577
 msgid "Directory:"
 msgstr "Map:"
 
+#: ../src/gnome2/mod_mgr.c:2579
+msgid "User (optional):"
+msgstr "Gebruiker (optioneel):"
+
+#: ../src/gnome2/mod_mgr.c:2580
+msgid "Password (optional):"
+msgstr "Wachtwoord (optioneel):"
+
 #. this can happen at most once
-#: ../src/gnome2/mod_mgr.c:2425
+#: ../src/gnome2/mod_mgr.c:2608
 msgid "A source by that name already exists."
 msgstr "Een bron met die naam bestaat al."
 
-#: ../src/gnome2/mod_mgr.c:2539
+#: ../src/gnome2/mod_mgr.c:2756
 msgid "Delete a remote source"
 msgstr "Verwijder een externe bron"
 
-#: ../src/gnome2/sidebar_dialog.c:135
-msgid "Sidebar"
-msgstr "Zijbalk"
-
-#: ../src/gnome2/html.c:629
-#, c-format
-msgid "Page %d of %d"
-msgstr "Pagina %d van %d"
-
-#: ../src/gnome2/main_window.c:740
-msgid "Xiphos - Bible Study Software"
-msgstr "Xiphos - Bijbelstudieprogramma"
-
-#: ../src/gnome2/main_window.c:794
-msgid "Open a new tab"
-msgstr "Nieuw tabblad openen"
-
-#: ../src/gnome2/main_window.c:880 ../src/gnome2/sidebar.c:600
-#: ../src/gnome2/sidebar.c:606 ../src/main/sidebar.cc:638
-#: ../src/main/sidebar.cc:964 ../src/main/sidebar.cc:965
-#: ../src/main/sidebar.cc:966
-msgid "Standard View"
-msgstr "Standaardweergave"
-
-#: ../src/gnome2/main_window.c:957
-msgid "Commentary View"
-msgstr "Commentaar"
-
-#: ../src/gnome2/main_window.c:973
-msgid "Book View"
-msgstr "Boek"
-
-#: ../src/gnome2/main_window.c:998
-#, fuzzy
-msgid "Welcome to Xiphos"
-msgstr "Welkom bij Xiphos"
+#. *****************************************************************************
+#. * Name
+#. *   gui_open_mod_mgr
+#. *
+#. * Synopsis
+#. *   #include "gui/mod_mgr.h"
+#. *
+#. *   void gui_open_mod_mgr(void)
+#. *
+#. * Description
+#. *
+#. *
+#. * Return value
+#. *   void
+#.
+#: ../src/gnome2/mod_mgr.c:3244
+msgid ""
+"<b>Welcome to the Module Manager.</b>\n"
+"\n"
+"This is Xiphos' mechanism to get new and updated content.\n"
+"It appears you have never been here before, so please take a moment to look it over.\n"
+"(You will see this information box just once.)\n"
+"\n"
+"Modules come from different <u>repositories</u>.  <b>Module Sources: Add/Remove</b> will show you what repositories are currently known.\n"
+"\n"
+"<b>Module Sources: Choose</b> is for deciding from where modules should come, that is, from which repository Xiphos should obtain them, as well as where they should be placed on your system. Set <i>Install Source</i> and <i>Install Destination</i>, then click <i>Refresh</i>.\n"
+"\n"
+"<b>Modules: Install/Update</b> is for selecting and obtaining modules after choosing source and destination.\n"
+"\n"
+"<b>Modules: Maintenance</b> is for archive and index creation.\n"
+"\n"
+"See section 5 of our manual for Module Manager detail, or ask for help via Live Chat, or (if no one is responsive in chat) send mail to our users' mailing list.\n"
+msgstr ""
+"<b>Welkom op de Module Manager.</b>\n"
+"\n"
+"Dit mechanisme xiphos 'om nieuwe en bijgewerkte inhoud te krijgen.\n"
+"Het lijkt u hier nog nooit geweest, dus neem een moment om te kijken over.\n"
+"(U ziet deze informatie doos maar een keer.)\n"
+"\n"
+"Modules komen uit verschillende <u>repositories</u>. <b>Module Bronnen: Toevoegen/Verwijderen</b> zal u tonen wat repositories momenteel bekend zijn.\n"
+"\n"
+"<b> Module Bronnen: Kies </b> is voor de besluitvorming van waar modules moeten komen, dat wil zeggen, van waaruit menu xiphos hen zou verkrijgen, alsmede waar ze zouden moeten worden geplaatst op uw systeem. Stel <i> Install Source</i> en <i>Installeren Bestemming</i> en klik <i>Vernieuwen</i>.\n"
+"\n"
+"<b>Modules: Install/Update</b> is voor de selectie en het verkrijgen van modules na het kiezen van de bron en bestemming.\n"
+"\n"
+"<b>Modules: Onderhoud</b> is voor het archief en de index van de schepping.\n"
+"\n"
+"Zie punt 5 van onze handleiding voor Module Manager detail, of om hulp te vragen via Live Chat, of (als niemand reageert in chat) stuur mail naar mailing onze gebruikers 'lijst.\n"
 
-#: ../src/gnome2/navbar_book.c:359 ../src/gnome2/navbar_book_dialog.c:299
+#: ../src/gnome2/navbar_book.c:359
+#: ../src/gnome2/navbar_book_dialog.c:300
 msgid "Go outward, to the section containing this one"
 msgstr "Ga naar buiten, naar de sectie die deze bevat."
 
-#: ../src/gnome2/navbar_book.c:375 ../src/gnome2/navbar_book_dialog.c:315
+#: ../src/gnome2/navbar_book.c:375
+#: ../src/gnome2/navbar_book_dialog.c:316
 msgid "Go to previous item"
 msgstr "Vorig item"
 
-#: ../src/gnome2/navbar_book.c:390 ../src/gnome2/navbar_book_dialog.c:330
+#: ../src/gnome2/navbar_book.c:390
+#: ../src/gnome2/navbar_book_dialog.c:331
 msgid "Go to next item"
 msgstr "Volgend item"
 
-#: ../src/gnome2/navbar_book.c:406 ../src/gnome2/navbar_book_dialog.c:346
+#: ../src/gnome2/navbar_book.c:406
+#: ../src/gnome2/navbar_book_dialog.c:347
 msgid "Go inward, to the first subsection"
 msgstr "Ga naar binnen, naar de eerste subsectie"
 
-#. 0
-#: ../src/gnome2/sidebar.c:942 ../src/gnome2/sidebar.c:1110
-msgid "Open in a new tab"
-msgstr "In een nieuw tabblad openen"
+#: ../src/gnome2/navbar_versekey_dialog.c:864
+#: ../src/gnome2/navbar_versekey_editor.c:879
+#: ../src/gnome2/navbar_versekey_parallel.c:810
+msgid "Synchronize this window from main window"
+msgstr "Synchroniseren dit venster hoofdvenster"
 
-#: ../src/gnome2/sidebar.c:943 ../src/gnome2/sidebar.c:1111
-msgid "Open selected module in a new tab"
-msgstr "Geselecteerde module in een nieuw tabblad openen"
+#: ../src/gnome2/parallel_dialog.c:328
+#: ../src/gnome2/preferences_dialog.c:1799
+msgid "Parallel"
+msgstr "Parallel"
 
-#. 1
-#: ../src/gnome2/sidebar.c:948
-msgid "Open in a separate window"
-msgstr "Openen in een nieuw scherm"
+#: ../src/gnome2/parallel_view.c:275
+msgid "Copy"
+msgstr "Kopieëren"
 
-#: ../src/gnome2/sidebar.c:949
-msgid "Open selected module in a separate ['dialog'] window"
-msgstr "Geselecteerde module in een dialoogvenster openen"
+#: ../src/gnome2/parallel_view.c:285
+msgid "Detach/Attach"
+msgstr "Koppel/Ontkoppel"
 
-#: ../src/gnome2/sidebar.c:955 ../src/gnome2/sidebar.c:1123
-msgid "View information about the selected dialog"
-msgstr "Informatie over het geselecteerde dialoogvenster tonen"
+#: ../src/gnome2/parallel_view.c:291
+#: ../ui/xi-menus.glade.h:53
+msgid "Module Options"
+msgstr "Moduleopties"
 
-#: ../src/gnome2/sidebar.c:1046
-msgid "Simple"
-msgstr "Eenvoudig"
+#. build change parallel modules submenu
+#: ../src/gnome2/parallel_view.c:306
+msgid "Change parallel 1"
+msgstr "Wijzig parallel 1"
 
-#: ../src/gnome2/sidebar.c:1047
-msgid "Create a new simple prayer list"
-msgstr "Een eenvoudige gebedslijst maken"
+#: ../src/gnome2/parallel_view.c:308
+msgid "Change parallel 2"
+msgstr "Wijzig parallel 2"
 
-#: ../src/gnome2/sidebar.c:1053
-msgid "Subject"
-msgstr "Onderwerp"
+#: ../src/gnome2/parallel_view.c:310
+msgid "Change parallel 3"
+msgstr "Wijzig parallel 3"
 
-#: ../src/gnome2/sidebar.c:1060
-msgid "Monthly"
-msgstr "Maandelijks"
+#: ../src/gnome2/parallel_view.c:312
+msgid "Change parallel 4"
+msgstr "Wijzig parallel 4"
 
-#: ../src/gnome2/sidebar.c:1061 ../src/gnome2/sidebar.c:1068
-#: ../src/gnome2/sidebar.c:1075
-msgid "Create a new prayer list"
-msgstr "Een nieuwe gebedslijst maken"
+#: ../src/gnome2/parallel_view.c:314
+msgid "Change parallel 5"
+msgstr "Wijzig parallel 5"
 
-#: ../src/gnome2/sidebar.c:1067
-msgid "Daily Journal"
-msgstr "Dagelijkse berichten"
+#: ../src/gnome2/parallel_view.c:471
+#: ../src/gnome2/sidebar.c:626
+#: ../src/gnome2/sidebar.c:632
+#: ../src/gnome2/tabbed_browser.c:262
+#: ../src/main/sidebar.cc:646
+#: ../src/main/sidebar.cc:1007
+#: ../src/main/sidebar.cc:1008
+#: ../src/main/sidebar.cc:1009
+msgid "Parallel View"
+msgstr "Parallelweergave"
 
-#: ../src/gnome2/sidebar.c:1074
-msgid "Outlined Topic"
-msgstr "Uitgelijnd onderwerp"
+#: ../src/gnome2/preferences_dialog.c:1179
+#: ../src/gnome2/preferences_dialog.c:1217
+#: ../src/gnome2/preferences_dialog.c:1254
+#: ../src/gnome2/preferences_dialog.c:1289
+#: ../src/gnome2/preferences_dialog.c:1323
+#: ../src/gnome2/preferences_dialog.c:1356
+#: ../src/gnome2/preferences_dialog.c:1388
+#: ../src/gnome2/preferences_dialog.c:1421
+#: ../src/gnome2/preferences_dialog.c:1453
+#: ../src/gnome2/preferences_dialog.c:1487
+#: ../src/gnome2/preferences_dialog.c:1522
+#: ../src/gnome2/preferences_dialog.c:1557
+#: ../src/gnome2/preferences_dialog.c:1593
+#: ../src/gnome2/preferences_dialog.c:1631
+#: ../src/gnome2/preferences_dialog.c:2052
+msgid "-- Select --"
+msgstr "-- Selecteer --"
 
-#. 1
-#: ../src/gnome2/sidebar.c:1116 ../ui/xi-menus.glade.h:45
-msgid "Open in editor"
-msgstr "In editor openen"
+#: ../src/gnome2/preferences_dialog.c:1652
+msgid "Locale will take effect after restart."
+msgstr "Locale wordt van kracht na herstarten."
 
-#: ../src/gnome2/sidebar.c:1117
-msgid "Open selected module in a dialog"
-msgstr "Geselecteerde module in een dialoogvenster openen"
+#: ../src/gnome2/preferences_dialog.c:1687
+#: ../ui/prefs.glade.h:74
+msgid "Preferences"
+msgstr "Voorkeuren"
 
-#: ../src/gnome2/sidebar.c:1438 ../src/gnome2/bookmarks_treeview.c:934
-msgid "Bookmarks"
-msgstr "Bladwijzers"
+#: ../src/gnome2/preferences_dialog.c:1769
+msgid "Fonts"
+msgstr "Lettertypes"
 
-#: ../src/gnome2/sidebar.c:1446
-msgid "Search"
-msgstr "Zoeken"
+#: ../src/gnome2/preferences_dialog.c:1772
+msgid "Color"
+msgstr "Kleur"
 
-#: ../src/gnome2/sidebar.c:1454
-msgid "Verse List"
-msgstr "Verslijst"
+#: ../src/gnome2/preferences_dialog.c:1775
+msgid "Sizes"
+msgstr "Groottes"
 
-#: ../src/gnome2/search_dialog.c:61 ../src/main/search_dialog.cc:60
-#: ../src/main/search_sidebar.cc:54
+#: ../src/gnome2/preferences_dialog.c:1779
+msgid "General"
+msgstr "Algemeen"
+
+#: ../src/gnome2/preferences_dialog.c:1782
+#: ../ui/prefs.glade.h:87
+msgid "Tabs and Panes"
+msgstr "Tabbladen en panelen"
+
+#: ../src/gnome2/preferences_dialog.c:1789
+msgid "Options"
+msgstr "Opties"
+
+#: ../src/gnome2/preferences_dialog.c:1796
+msgid "Main"
+msgstr "Hoofdscherm"
+
+#: ../src/gnome2/preferences_dialog.c:1802
+msgid "Special"
+msgstr "Geavanceerd"
+
+#: ../src/gnome2/search_dialog.c:68
+#: ../src/main/search_dialog.cc:66
+#: ../src/main/search_sidebar.cc:61
 msgid "Searching the "
 msgstr "Zoek in "
 
-#: ../src/gnome2/search_dialog.c:62 ../src/main/search_dialog.cc:61
-#: ../src/main/search_sidebar.cc:55
+#: ../src/gnome2/search_dialog.c:69
+#: ../src/main/search_dialog.cc:67
+#: ../src/main/search_sidebar.cc:62
 msgid " Module"
 msgstr " Module"
 
-#: ../src/gnome2/search_dialog.c:63 ../src/main/search_dialog.cc:62
-#: ../src/main/search_sidebar.cc:56
+#: ../src/gnome2/search_dialog.c:70
+#: ../src/main/search_dialog.cc:68
+#: ../src/main/search_sidebar.cc:63
 msgid "found in "
 msgstr "gevonden in "
 
-#: ../src/gnome2/search_dialog.c:498
+#: ../src/gnome2/search_dialog.c:527
 msgid "Clear List?"
 msgstr "Lijst wissen?"
 
-#: ../src/gnome2/search_dialog.c:499
+#: ../src/gnome2/search_dialog.c:528
 msgid "Are you sure you want to clear the module list?"
 msgstr "Weet u zeker dat u de module lijst wilt wissen?"
 
-#: ../src/gnome2/search_dialog.c:682
+#: ../src/gnome2/search_dialog.c:708
 msgid "The last module list may not be deleted"
-msgstr ""
+msgstr "De laatste module lijst mag niet worden verwijderd."
 
-#: ../src/gnome2/search_dialog.c:699
+#: ../src/gnome2/search_dialog.c:726
 msgid "Delete list?"
 msgstr "Lijst verwijderen?"
 
-#: ../src/gnome2/search_dialog.c:700
+#: ../src/gnome2/search_dialog.c:727
 msgid "Are you sure you want to delete:"
 msgstr "Weet u zeker dat u het volgende wilt verwijderen:"
 
-#: ../src/gnome2/search_sidebar.c:189
+#: ../src/gnome2/search_sidebar.c:192
 msgid ""
 "This is an inclusive (\"AND\") search:\n"
 "Find matches showing all words."
@@ -774,925 +1260,610 @@ msgstr ""
 "Inclusief (\"AND\") zoeken:\n"
 "Een resultaat bevat alle woorden."
 
-#: ../src/gnome2/search_sidebar.c:206
+#: ../src/gnome2/search_sidebar.c:209
 msgid "Search Module"
 msgstr "Module zoeken"
 
-#: ../src/gnome2/search_sidebar.c:220
+#: ../src/gnome2/search_sidebar.c:223
 msgid "Bible"
 msgstr "Bijbel"
 
-#: ../src/gnome2/search_sidebar.c:229 ../ui/prefs.glade.h:35
+#: ../src/gnome2/search_sidebar.c:232
+#: ../ui/prefs.glade.h:35
 msgid "Commentary"
 msgstr "Commentaar"
 
-#: ../src/gnome2/search_sidebar.c:243
+#: ../src/gnome2/search_sidebar.c:246
 msgid "Search Type"
 msgstr "Zoektype"
 
-#: ../src/gnome2/search_sidebar.c:257 ../ui/search-dialog.glade.h:64
+#: ../src/gnome2/search_sidebar.c:260
+#: ../ui/search-dialog.glade.h:66
 msgid "Multi word"
 msgstr "Meerdere woorden"
 
-#: ../src/gnome2/search_sidebar.c:276 ../ui/search-dialog.glade.h:44
+#: ../src/gnome2/search_sidebar.c:279
+#: ../ui/search-dialog.glade.h:44
 msgid "Exact phrase"
 msgstr "Exacte zin"
 
-#: ../src/gnome2/search_sidebar.c:290
+#: ../src/gnome2/search_sidebar.c:293
 msgid "Search Options"
 msgstr "Zoekopties"
 
-#: ../src/gnome2/search_sidebar.c:318
+#: ../src/gnome2/search_sidebar.c:321
 msgid "Search Scope"
 msgstr "Zoekruimte"
 
-#: ../src/gnome2/search_sidebar.c:331
+#: ../src/gnome2/search_sidebar.c:334
 msgid "No scope"
 msgstr "Overal zoeken"
 
-#: ../src/gnome2/search_sidebar.c:341
+#: ../src/gnome2/search_sidebar.c:344
 msgid "Use bounds"
 msgstr "Grenzen gebruiken"
 
-#: ../src/gnome2/search_sidebar.c:350
+#: ../src/gnome2/search_sidebar.c:353
 msgid "Last search"
 msgstr "Laatste zoekactie"
 
-#: ../src/gnome2/search_sidebar.c:365
+#: ../src/gnome2/search_sidebar.c:368
 msgid "Bounds"
 msgstr "Grenzen"
 
-#: ../src/gnome2/search_sidebar.c:379
+#: ../src/gnome2/search_sidebar.c:382
 msgid "Lower"
 msgstr "Onder"
 
-#: ../src/gnome2/search_sidebar.c:386
+#: ../src/gnome2/search_sidebar.c:389
 msgid "Upper"
 msgstr "Boven"
 
-#. info->stock_icon = GTK_STOCK_OPEN;
-#: ../src/gnome2/bookmark_dialog.c:145 ../src/gnome2/bookmarks_menu.c:471
-#: ../src/gnome2/bookmarks_menu.c:897 ../src/gnome2/bookmarks_menu.c:995
-#: ../src/gnome2/bookmarks_treeview.c:131 ../ui/editor_studypad.xml.h:2
-#: ../ui/xi-menus.glade.h:8
-msgid "Bookmark"
-msgstr "Bladwijzer"
-
-#: ../src/gnome2/bookmark_dialog.c:147 ../src/gnome2/bookmarks_menu.c:997
-#: ../src/gnome2/bookmarks_treeview.c:132
-msgid "Enter Folder Name"
-msgstr "Mapnaam invoeren"
-
-#: ../src/gnome2/bookmark_dialog.c:149 ../src/gnome2/bookmarks_menu.c:999
-msgid "Folder Name"
-msgstr "Mapnaam"
-
-#: ../src/gnome2/bookmark_dialog.c:150 ../src/gnome2/bookmarks_menu.c:1000
-#: ../src/gnome2/bookmarks_treeview.c:134
-msgid "Folder: "
-msgstr "Map:"
-
-#: ../src/gnome2/preferences_dialog.c:1231
-#: ../src/gnome2/preferences_dialog.c:1269
-#: ../src/gnome2/preferences_dialog.c:1306
-#: ../src/gnome2/preferences_dialog.c:1341
-#: ../src/gnome2/preferences_dialog.c:1375
-#: ../src/gnome2/preferences_dialog.c:1408
-#: ../src/gnome2/preferences_dialog.c:1440
-#: ../src/gnome2/preferences_dialog.c:1473
-#: ../src/gnome2/preferences_dialog.c:1505
-#: ../src/gnome2/preferences_dialog.c:1539
-#: ../src/gnome2/preferences_dialog.c:1574
-#: ../src/gnome2/preferences_dialog.c:1609
-#: ../src/gnome2/preferences_dialog.c:1645
-#: ../src/gnome2/preferences_dialog.c:2045
-msgid "-- Select --"
-msgstr "-- Selecteer --"
-
-#: ../src/gnome2/preferences_dialog.c:1678 ../ui/prefs.glade.h:74
-msgid "Preferences"
-msgstr "Voorkeuren"
-
-#: ../src/gnome2/preferences_dialog.c:1760
-msgid "Fonts"
-msgstr "Lettertypes"
-
-#: ../src/gnome2/preferences_dialog.c:1763
-msgid "Color"
-msgstr "Kleur"
-
-#: ../src/gnome2/preferences_dialog.c:1766
-msgid "Sizes"
-msgstr "Groottes"
-
-#: ../src/gnome2/preferences_dialog.c:1770
-msgid "General"
-msgstr "Algemeen"
-
-#: ../src/gnome2/preferences_dialog.c:1773 ../ui/prefs.glade.h:85
-msgid "Tabs and Panes"
-msgstr "Tabbladen en panelen"
-
-#: ../src/gnome2/preferences_dialog.c:1780
-msgid "Options"
-msgstr "Opties"
-
-#: ../src/gnome2/preferences_dialog.c:1787
-msgid "Main"
-msgstr "Hoofdscherm"
-
-#: ../src/gnome2/preferences_dialog.c:1790 ../src/gnome2/parallel_dialog.c:635
-msgid "Parallel"
-msgstr "Parallel"
-
-#: ../src/gnome2/preferences_dialog.c:1793
-msgid "Special"
-msgstr "Geavanceerd"
-
-#: ../src/gnome2/preferences_cell_renderer.c:398
-msgid "Text"
-msgstr "Tekst"
-
-#: ../src/gnome2/preferences_cell_renderer.c:400
-msgid "Text to render"
-msgstr "Te genereren tekst"
-
-#: ../src/gnome2/preferences_cell_renderer.c:406
-msgid "Pixbuf Object"
-msgstr ""
-
-#: ../src/gnome2/preferences_cell_renderer.c:408
-msgid "The pixbuf to render."
-msgstr ""
-
-#: ../src/gnome2/about_xiphos.c:132
-msgid "Copyright 2000-2009 The Xiphos Development Team"
-msgstr "Auteursrecht 2000-2008 Het ontwikkelteam van Xiphos"
-
-#: ../src/gnome2/about_xiphos.c:135
-msgid ""
-"(formerly known as GnomeSword)\n"
-"\n"
-"Powered by The SWORD Project.\n"
-"We would like to thank Troy Griffitts and all the other folks who have given "
-"us The SWORD Project."
-msgstr ""
-"(voorheen bekend als GnomeSword)\n"
-"Mogelijk gemaakt voor het SWORD-project.\n"
-"We willen Troy Griffitts en vele anderen bedanken voor hun bijdrage aan "
-"SWORD."
-
-#: ../src/gnome2/bookmarks_menu.c:457 ../src/gnome2/treekey-editor.c:321
-#: ../ui/xi-menus.glade.h:20
-msgid "Edit"
-msgstr "Bewerken"
-
-#: ../src/gnome2/bookmarks_menu.c:474
-msgid "Folder name: "
-msgstr "Mapnaam:"
-
-#: ../src/gnome2/bookmarks_menu.c:477
-msgid "Bookmark name: "
-msgstr "Bladwijzernaam:"
-
-#: ../src/gnome2/bookmarks_menu.c:480 ../src/gnome2/bookmarks_menu.c:905
-msgid "Verse: "
-msgstr "Vers:"
-
-#: ../src/gnome2/bookmarks_menu.c:481 ../src/gnome2/bookmarks_menu.c:906
-msgid "Module: "
-msgstr "Module: "
-
-#: ../src/gnome2/bookmarks_menu.c:665
-msgid "Restore Bookmark Folder"
-msgstr "Bladwijzermap herstellen"
-
-#: ../src/gnome2/bookmarks_menu.c:734
-msgid "Remove the selected folder"
-msgstr "Geselecteerde map verwijderen"
-
-#: ../src/gnome2/bookmarks_menu.c:736
-msgid "(and all its contents)?"
-msgstr "(en de gehele inhoud)?"
+#: ../src/gnome2/sidebar.c:1397
+msgid "Search"
+msgstr "Zoeken"
 
-#: ../src/gnome2/bookmarks_menu.c:739
-msgid "Remove the selected bookmark"
-msgstr "Geselecteerde bladwijzer verwijderen"
+#: ../src/gnome2/sidebar.c:1405
+msgid "Verse List"
+msgstr "Verslijst"
 
-#: ../src/gnome2/bookmarks_menu.c:898
-msgid "Add"
-msgstr "Toevoegen"
+#: ../src/gnome2/sidebar_dialog.c:139
+#: ../src/gnome2/sidebar_dialog.c:148
+msgid "Sidebar"
+msgstr "Zijbalk"
 
-#: ../src/gnome2/bookmarks_menu.c:904
-msgid "Label: "
-msgstr "Label: "
+#: ../src/gnome2/splash.c:396
+msgid "Powered by the SWORD Project"
+msgstr "Mede mogelijk gemaakt door het SWORD-project"
 
-#: ../src/gnome2/treekey-editor.c:129 ../src/gnome2/treekey-editor.c:188
-#: ../src/gnome2/treekey-editor.c:274
+#: ../src/gnome2/treekey-editor.c:137
+#: ../src/gnome2/treekey-editor.c:196
+#: ../src/gnome2/treekey-editor.c:282
 msgid "Prayer List/Journal Item"
 msgstr "Gebedspunt/Bericht"
 
-#: ../src/gnome2/treekey-editor.c:130 ../src/gnome2/treekey-editor.c:189
-#: ../src/gnome2/treekey-editor.c:275
+#: ../src/gnome2/treekey-editor.c:138
+#: ../src/gnome2/treekey-editor.c:197
+#: ../src/gnome2/treekey-editor.c:283
 msgid "New name"
 msgstr "Nieuwe naam"
 
-#: ../src/gnome2/treekey-editor.c:131 ../src/gnome2/treekey-editor.c:190
-#: ../src/gnome2/treekey-editor.c:276 ../src/main/prayerlists.cc:240
-msgid "Name: "
-msgstr "Naam: "
-
-#: ../src/gnome2/treekey-editor.c:245
+#: ../src/gnome2/treekey-editor.c:253
 msgid "Remove the selected item"
 msgstr "Geselecteerde item verwijderen"
 
-#: ../src/gnome2/treekey-editor.c:303
-msgid "Add Child"
-msgstr "Kind toevoegen"
-
-#: ../src/gnome2/treekey-editor.c:304 ../src/gnome2/treekey-editor.c:310
-msgid "Add an item"
-msgstr "Item toevoegen"
-
-#: ../src/gnome2/treekey-editor.c:309
-msgid "Add Sibling"
-msgstr "Element toevoegen"
+#: ../src/main/display.cc:259
+#, c-format
+msgid ""
+"Improperly encoded personal annotation label:\n"
+"'%s'"
+msgstr ""
+"Onjuist gecodeerde persoonlijke annotatie label:\n"
+"'%s'"
 
-#: ../src/gnome2/treekey-editor.c:316
-msgid "Remove this item"
-msgstr "Item verwijderen"
+#: ../src/main/display.cc:386
+msgid ""
+"An image file's size could not be determined.\n"
+"Is ImageMagick's 'identify' not installed?\n"
+"(Or possibly the image is of type other than bmp/gif/jpg/png.)\n"
+"Xiphos cannot resize images to fit window."
+msgstr ""
+"De grootte van een illustratie kon niet worden vastgesteld.\n"
+"Is ImageMagick geïnstalleerd?\n"
+"(Mogelijks is het bestandstype iets anders dan bm/gif/jpg/png.)\n"
+"Xiphos kan illustraties niet aanpassen aan de schermgrootte."
 
-#: ../src/gnome2/treekey-editor.c:322
-msgid "Edit this item"
-msgstr "Item bewerken"
+#: ../src/main/display.cc:1043
+#: ../src/main/display.cc:1095
+#: ../src/main/display.cc:1172
+#: ../ui/export-dialog.glade.h:7
+msgid "Chapter"
+msgstr "Hoofdstuk"
 
-#: ../src/gnome2/splash.c:363
-msgid "Powered by the SWORD Project"
-msgstr "Mede mogelijk gemaakt door het SWORD-project"
+#: ../src/main/main.c:119
+msgid "Xiphos does not understand more than one argument."
+msgstr "Xiphos ondersteund niet meer dan één argument."
 
-#: ../src/gnome2/splash.c:563
+#: ../src/main/main.c:161
 msgid "Initiating Gecko"
 msgstr "Initialiseren van Gecko"
 
-#: ../src/gnome2/splash.c:580
-msgid "Loading settings"
-msgstr "Instellingen worden geladen"
-
-#: ../src/gnome2/splash.c:598
+#: ../src/main/main.c:167
 msgid "Building Interface"
 msgstr "Interface wordt opgebouwd"
 
-#: ../src/gnome2/splash.c:615
+#: ../src/main/main.c:171
 msgid "Starting Sword"
 msgstr "Sword wordt gestart"
 
-#: ../src/gnome2/splash.c:632
+#: ../src/main/main.c:175
+msgid "Loading Settings"
+msgstr "Instellingen worden geladen"
+
+#: ../src/main/main.c:179
 msgid "Displaying Xiphos"
 msgstr "Opbouwen interface"
 
-#: ../src/gnome2/export_dialog.c:265 ../ui/export-dialog.glade.h:20
-msgid "Please check copyright before exporting!"
-msgstr "Controleer de auteursrechten voordat u exporteert!"
-
-#: ../src/gnome2/bookmarks_treeview.c:105
-#, fuzzy, c-format
-msgid "Search result: %s"
-msgstr "<b>Zoekresultaten</b>"
+#: ../src/main/module_dialogs.cc:227
+#: ../src/main/previewer.cc:127
+#: ../src/main/previewer.cc:194
+#: ../ui/prefs.glade.h:75
+msgid "Previewer"
+msgstr "Voorbeeldweergave"
 
-#: ../src/gnome2/about_trans.c:84
-msgid ""
-"Do you like using Xiphos to study the Bible? Would you like to see its "
-"display using your native language? You could translate Xiphos! \n"
-"\n"
-"We are always looking for contributions of new translations of Xiphos into "
-"other languages. If you are able to translate for us, please see the link "
-"below, contact us, and get involved with our efforts."
-msgstr ""
-"Bevalt Xiphos u als bijbelstudiehulp? Wilt u dat het programma ook uw taal "
-"ondersteund? U kunt ook een bijdrage leveren.Wij zijn altijd op zoek naar "
-"nieuwe vertalingen van Xiphos. Als u daarvoor de tijd heeft, klik dan op de "
-"link hieronder voor meer informatie."
+#: ../src/main/module_dialogs.cc:292
+#: ../src/main/module_dialogs.cc:416
+#: ../src/main/previewer.cc:269
+msgid "Footnote"
+msgstr "Voetnoot"
 
-#: ../src/gnome2/about_trans.c:98
-msgid "About Xiphos Translation"
-msgstr "Xiphos vertaling"
+#: ../src/main/module_dialogs.cc:298
+#: ../src/main/module_dialogs.cc:421
+#: ../src/main/previewer.cc:281
+msgid "Cross Reference"
+msgstr "Kruisverwijzing"
 
-#: ../src/gnome2/about_trans.c:139
-msgid "See TRANSLATION-HOWTO in Xiphos source"
-msgstr "Lees de TRANSLATION HOWTO in de broncode van Xiphos"
+#: ../src/main/module_dialogs.cc:304
+#: ../src/main/module_dialogs.cc:318
+#: ../src/main/module_dialogs.cc:426
+#: ../src/main/module_dialogs.cc:438
+#: ../src/main/previewer.cc:287
+#: ../src/main/previewer.cc:306
+msgid "Strongs"
+msgstr "Strongs"
 
-#: ../src/gnome2/about_trans.c:145
-msgid "Xiphos development"
-msgstr "Xiphos ontwikkeling"
+#: ../src/main/module_dialogs.cc:310
+#: ../src/main/module_dialogs.cc:329
+#: ../src/main/module_dialogs.cc:431
+#: ../src/main/module_dialogs.cc:448
+#: ../src/main/previewer.cc:293
+#: ../src/main/previewer.cc:319
+msgid "Morphology"
+msgstr "Morfologie"
 
-#: ../src/main/sword.cc:549
-msgid ""
-"Xiphos's file for language\n"
-"abbreviations is missing."
-msgstr ""
-"Xiphos's bestand voor taal\n"
-"afkortingen is niet gevonden."
+#: ../src/main/module_dialogs.cc:1081
+#: ../src/main/url.cc:530
+msgid "Back to "
+msgstr "Terug naar "
 
-#: ../src/main/sword.cc:556
-msgid ""
-"Xiphos's language abbreviation\n"
-"file cannot be opened."
-msgstr ""
-"Xiphos's taalafkortingen bestand\n"
-"kan niet worden geopend."
+#: ../src/main/parallel_view.cc:404
+#: ../ui/xi-menus.glade.h:89
+msgid "Strong's Numbers"
+msgstr "Strongs getallen"
 
-#: ../src/main/sword.cc:567
-msgid ""
-"Xiphos cannot allocate space\n"
-"for language abbreviations."
-msgstr ""
+#: ../src/main/parallel_view.cc:414
+#: ../ui/search-dialog.glade.h:52
+#: ../ui/xi-menus.glade.h:40
+msgid "Footnotes"
+msgstr "Voetnoten"
 
-#: ../src/main/sword.cc:574
-msgid ""
-"Xiphos cannot read the\n"
-"language abbreviation file."
-msgstr ""
+#: ../src/main/parallel_view.cc:424
+#: ../ui/search-dialog.glade.h:64
+#: ../ui/xi-menus.glade.h:55
+msgid "Morphological Tags"
+msgstr "Morfologische Markeringen"
 
-#: ../src/main/sword.cc:1202
-msgid "Daily devotional was requested, but there are none installed."
-msgstr "Dagboeken werd opgevraagd, maar zijn niet geïnstalleerd."
+#: ../src/main/parallel_view.cc:434
+#: ../ui/xi-menus.glade.h:44
+msgid "Hebrew Vowel Points"
+msgstr "Hebreeuwse Klinkertekens"
 
-#: ../src/main/search_dialog.cc:129
-#, fuzzy, c-format
-msgid "Search result %s: %s"
-msgstr "Zoekresultaten als bladwijzers opslaan"
+#: ../src/main/parallel_view.cc:444
+#: ../ui/xi-menus.glade.h:43
+msgid "Hebrew Cantillation"
+msgstr "Hebreeuwse Cantillation"
 
-#: ../src/main/search_dialog.cc:363
-msgid "Delete Range?"
-msgstr "Reeks verwijderen?"
+#: ../src/main/parallel_view.cc:454
+#: ../ui/xi-menus.glade.h:41
+msgid "Greek Accents"
+msgstr "Griekse Leestekens"
 
-#: ../src/main/search_dialog.cc:364
-msgid "Are you sure you want to delete this range?"
-msgstr "Wilt u deze reeks echt verwijderen?"
+#: ../src/main/parallel_view.cc:464
+msgid "Cross-references"
+msgstr "Kruisverwijzingen"
 
-#: ../src/main/search_dialog.cc:578 ../src/main/search_dialog.cc:1049
-#: ../src/main/search_dialog.cc:1052 ../src/main/search_dialog.cc:1074
-#: ../src/main/search_dialog.cc:1077
-msgid "Search: "
-msgstr "Zoeken in: "
+#: ../src/main/parallel_view.cc:474
+#: ../ui/xi-menus.glade.h:50
+msgid "Lemmas"
+msgstr "Lemmas"
 
-#: ../src/main/search_dialog.cc:623
-msgid "Remove Module?"
-msgstr "Module verwijderen?"
+#: ../src/main/parallel_view.cc:484
+#: ../ui/xi-menus.glade.h:42
+msgid "Headings"
+msgstr "Rubrieken"
 
-#: ../src/main/search_dialog.cc:624
-msgid "Are you sure you want to remove the selected module?"
-msgstr "Weet u zeker dat u de selecteerde module wilt wissen?"
+#: ../src/main/parallel_view.cc:494
+msgid "Morpheme Segmentation"
+msgstr "Morfeem Segmentatie"
 
-#: ../src/main/search_dialog.cc:1473
-#, c-format
-msgid ""
-"%s:\n"
-"No such module is installed.\n"
-"%s"
-msgstr ""
-"%s:\n"
-"Deze module is niet geïnstalleerd.\n"
-"%s"
+#: ../src/main/parallel_view.cc:504
+#: ../ui/xi-menus.glade.h:96
+msgid "Words of Christ in Red"
+msgstr "Uitspraken van Jezus rood weergeven"
 
-#: ../src/main/search_dialog.cc:1475
-msgid "Please adjust the module list."
-msgstr "Pas de modulelijst aan."
+#: ../src/main/parallel_view.cc:514
+#: ../ui/xi-menus.glade.h:91
+msgid "Transliteration"
+msgstr "Transliteration"
 
-#: ../src/main/search_dialog.cc:1491
-#, fuzzy, c-format
-msgid "No fast-search index exists for %s.%s%s"
-msgstr "Snelzoek-index van deze modules verwijderen:"
+#: ../src/main/parallel_view.cc:524
+msgid "Textual Variants"
+msgstr "Tekstuele Varianten"
 
-#: ../src/main/search_dialog.cc:1493
-msgid ""
-"\n"
-"Search on this module is now `multi word'."
-msgstr ""
+#: ../src/main/parallel_view.cc:532
+#: ../ui/xi-menus.glade.h:70
+msgid "Primary Reading"
+msgstr "Primaire Lezing"
 
-#: ../src/main/search_dialog.cc:1494
-msgid ""
-"\n"
-"See the Module Manager, Maintenance pane."
-msgstr ""
+#: ../src/main/parallel_view.cc:541
+#: ../ui/xi-menus.glade.h:84
+msgid "Secondary Reading"
+msgstr "Secundaire Lezing"
 
-#: ../src/main/search_dialog.cc:1555
-msgid "Search finished"
-msgstr "Zoeken voltooid"
+#: ../src/main/parallel_view.cc:550
+#: ../ui/xi-menus.glade.h:9
+msgid "All Readings"
+msgstr "Alle lezingen"
 
-#: ../src/main/main.c:109
-msgid "Xiphos does not understand more than one argument."
-msgstr "Xiphos ondersteund niet meer dan één argument."
+#: ../src/main/parallel_view.cc:884
+#: ../src/main/parallel_view.cc:1136
+msgid "view context"
+msgstr "context bekijken"
 
-#: ../src/main/prayerlists.cc:71
+#: ../src/main/prayerlists.cc:74
 msgid "January"
 msgstr "Januari"
 
-#: ../src/main/prayerlists.cc:72
+#: ../src/main/prayerlists.cc:75
 msgid "February"
 msgstr "Februari"
 
-#: ../src/main/prayerlists.cc:73
+#: ../src/main/prayerlists.cc:76
 msgid "March"
 msgstr "Maart"
 
-#: ../src/main/prayerlists.cc:74
+#: ../src/main/prayerlists.cc:77
 msgid "April"
 msgstr "April"
 
-#: ../src/main/prayerlists.cc:75
+#: ../src/main/prayerlists.cc:78
 msgid "May"
 msgstr "Mei"
 
-#: ../src/main/prayerlists.cc:76
+#: ../src/main/prayerlists.cc:79
 msgid "June"
 msgstr "Juni"
 
-#: ../src/main/prayerlists.cc:77
+#: ../src/main/prayerlists.cc:80
 msgid "July"
 msgstr "Juli"
 
-#: ../src/main/prayerlists.cc:78
+#: ../src/main/prayerlists.cc:81
 msgid "August"
 msgstr "Augustus"
 
-#: ../src/main/prayerlists.cc:79
+#: ../src/main/prayerlists.cc:82
 msgid "September"
 msgstr "September"
 
-#: ../src/main/prayerlists.cc:80
+#: ../src/main/prayerlists.cc:83
 msgid "October"
 msgstr "October"
 
-#: ../src/main/prayerlists.cc:81
+#: ../src/main/prayerlists.cc:84
 msgid "November"
 msgstr "November"
 
-#: ../src/main/prayerlists.cc:82
+#: ../src/main/prayerlists.cc:85
 msgid "December"
 msgstr "December"
 
-#: ../src/main/prayerlists.cc:121 ../src/main/sword_treekey.cc:332
+#: ../src/main/prayerlists.cc:124
+#: ../src/main/sword_treekey.cc:332
 msgid "Growth"
 msgstr "Groei"
 
-#: ../src/main/prayerlists.cc:122 ../src/main/sword_treekey.cc:333
+#: ../src/main/prayerlists.cc:125
+#: ../src/main/sword_treekey.cc:333
 msgid "<b>For Growth</b><br>"
 msgstr "<b>Voor groei</b><br>"
 
-#: ../src/main/prayerlists.cc:123 ../src/main/prayerlists.cc:380
+#: ../src/main/prayerlists.cc:126
+#: ../src/main/prayerlists.cc:383
 #: ../src/main/sword_treekey.cc:334
 msgid "Salvation"
 msgstr "Verlossing"
 
-#: ../src/main/prayerlists.cc:124 ../src/main/sword_treekey.cc:335
+#: ../src/main/prayerlists.cc:127
+#: ../src/main/sword_treekey.cc:335
 msgid "<b>For Salvation</b><br>"
 msgstr "<b>Voor verlossing</b><br>"
 
-#: ../src/main/prayerlists.cc:125 ../src/main/prayerlists.cc:384
+#: ../src/main/prayerlists.cc:128
+#: ../src/main/prayerlists.cc:387
 #: ../src/main/sword_treekey.cc:336
 msgid "Health"
 msgstr "Gezondheid"
 
-#: ../src/main/prayerlists.cc:126 ../src/main/sword_treekey.cc:337
+#: ../src/main/prayerlists.cc:129
+#: ../src/main/sword_treekey.cc:337
 msgid "<b>For Health</b><br>"
 msgstr "<b>Voor gezondheid</b><br>"
 
-#: ../src/main/prayerlists.cc:127
+#: ../src/main/prayerlists.cc:130
 msgid "Misc"
 msgstr "Overig"
 
-#: ../src/main/prayerlists.cc:128 ../src/main/sword_treekey.cc:339
+#: ../src/main/prayerlists.cc:131
+#: ../src/main/sword_treekey.cc:339
 msgid "<b>Miscellaneous</b><br>"
 msgstr "<b>Overig</b><br>"
 
-#: ../src/main/prayerlists.cc:136
+#: ../src/main/prayerlists.cc:139
 msgid "Point x"
 msgstr "Punt x"
 
-#: ../src/main/prayerlists.cc:137
+#: ../src/main/prayerlists.cc:140
 msgid "<b>(x)</b><br>"
 msgstr "<b>(x)</b><br>"
 
-#: ../src/main/prayerlists.cc:138
+#: ../src/main/prayerlists.cc:141
 msgid "Point y"
 msgstr "Punt y"
 
-#: ../src/main/prayerlists.cc:139
+#: ../src/main/prayerlists.cc:142
 msgid "<b>(y)</b><br>"
 msgstr "<b>(y)</b><br>"
 
-#: ../src/main/prayerlists.cc:140
+#: ../src/main/prayerlists.cc:143
 msgid "Point z"
 msgstr "Punt z"
 
-#: ../src/main/prayerlists.cc:141
+#: ../src/main/prayerlists.cc:144
 msgid "<b>(z)</b><br>"
 msgstr "<b>(z)</b><br>"
 
-#: ../src/main/prayerlists.cc:149
+#: ../src/main/prayerlists.cc:152
 msgid "Minor Topic 1"
 msgstr "Deelonderwerp 1"
 
-#: ../src/main/prayerlists.cc:150
+#: ../src/main/prayerlists.cc:153
 msgid "<b>Subtopic 1</b><br>"
 msgstr "<b>Deelonderwerp 1</b><br>"
 
-#: ../src/main/prayerlists.cc:152
+#: ../src/main/prayerlists.cc:155
 msgid "Minor Topic 2"
 msgstr "Deelonderwerp 2"
 
-#: ../src/main/prayerlists.cc:153
+#: ../src/main/prayerlists.cc:156
 msgid "<b>Subtopic 2</b><br>"
 msgstr "<b>Deelonderwerp 2</b><br>"
 
-#: ../src/main/prayerlists.cc:155
+#: ../src/main/prayerlists.cc:158
 msgid "Minor Topic 3"
 msgstr "Deelonderwerp 3"
 
-#: ../src/main/prayerlists.cc:156
+#: ../src/main/prayerlists.cc:159
 msgid "<b>Subtopic 3</b><br>"
 msgstr "<b>Deelonderwerp 3</b><br>"
 
-#: ../src/main/prayerlists.cc:158
+#: ../src/main/prayerlists.cc:161
 msgid "Minor Topic 4"
 msgstr "Deelonderwerp 4"
 
-#: ../src/main/prayerlists.cc:159
+#: ../src/main/prayerlists.cc:162
 msgid "<b>Subtopic 4</b><br>"
 msgstr "<b>Deelonderwerp 4</b><br>"
 
-#: ../src/main/prayerlists.cc:239
+#: ../src/main/prayerlists.cc:242
 msgid "Name for new prayer list or journal"
 msgstr "Naam voor gebedslijst of bericht"
 
-#: ../src/main/prayerlists.cc:254
-msgid "Module names must contain [A-Za-z0-9_] only."
-msgstr "Modulenamen kunnen alleen letters en getallen.bevatten."
-
-#: ../src/main/prayerlists.cc:261
-msgid "Xiphos already knows a module by that name."
-msgstr "Xiphos kent al een module met die naam."
-
-#: ../src/main/prayerlists.cc:270
+#: ../src/main/prayerlists.cc:273
 msgid "Xiphos finds that prayer list already."
 msgstr "Xiphos heeft al zo'n gebedslijst."
 
-#: ../src/main/prayerlists.cc:283
+#: ../src/main/prayerlists.cc:286
 #, c-format
 msgid ""
 "Xiphos cannot create module's path:\n"
 "%s"
 msgstr ""
+"Xiphos kunt geen pad module:\n"
+"%s"
 
-#: ../src/main/prayerlists.cc:323
+#: ../src/main/prayerlists.cc:326
 msgid "A basic prayer list. \\par\\par Module created by Xiphos."
-msgstr ""
-"Een standaard gebedslijst. \\par\\par Module is aangemaakt door Xiphos."
+msgstr "Een standaard gebedslijst. \\par\\par Module is aangemaakt door Xiphos."
 
-#: ../src/main/prayerlists.cc:324
-#, fuzzy
+#: ../src/main/prayerlists.cc:327
 msgid "BasicPrayerList"
-msgstr "MijnGebedslijst"
+msgstr "BasicPrayerList"
 
-#: ../src/main/prayerlists.cc:338
+#: ../src/main/prayerlists.cc:341
 msgid "MyPrayerList"
 msgstr "MijnGebedslijst"
 
-#: ../src/main/prayerlists.cc:339
-msgid ""
-"<b>People:</b><br>Bob<br>Sam<br>Sue<br><br><b>Church:</"
-"b><br>pews<br>fellowship<br>Bibles for missionaries<br><br><br>"
-msgstr ""
-"<b>Personen:</b><br>Bob<br>Sam<br>Sue<br><br><b>Kerk:</"
-"b><br>Veiligheid<br>Eenheid<br>Bijbels voor zendelingen<br><br><br>"
+#: ../src/main/prayerlists.cc:342
+msgid "<b>People:</b><br>Bob<br>Sam<br>Sue<br><br><b>Church:</b><br>pews<br>fellowship<br>Bibles for missionaries<br><br><br>"
+msgstr "<b>Personen:</b><br>Bob<br>Sam<br>Sue<br><br><b>Kerk:</b><br>Veiligheid<br>Eenheid<br>Bijbels voor zendelingen<br><br><br>"
 
-#: ../src/main/prayerlists.cc:365
+#: ../src/main/prayerlists.cc:368
 msgid "A subject-based prayer list. \\par\\par Module created by Xiphos."
 msgstr "Een gebedslijst op onderwerp. \\par\\par Module aangemaakt met Xiphos."
 
-#: ../src/main/prayerlists.cc:366
-#, fuzzy
+#: ../src/main/prayerlists.cc:369
 msgid "SubjectPrayerList"
-msgstr "MijnGebedslijst"
+msgstr "OnderwerpPrayerList"
 
-#: ../src/main/prayerlists.cc:381
+#: ../src/main/prayerlists.cc:384
 msgid "Bob<br>Sam<br>Sue<br>John<br>"
 msgstr "Bob<br>Sam<br>Sue<br>John<br>"
 
-#: ../src/main/prayerlists.cc:382
+#: ../src/main/prayerlists.cc:385
 msgid "Spiritual Growth"
 msgstr "Geestelijke groei"
 
-#: ../src/main/prayerlists.cc:383
+#: ../src/main/prayerlists.cc:386
 msgid "Mike<br>Steve<br>"
 msgstr "Mike<br>Steve<br>"
 
-#: ../src/main/prayerlists.cc:385
+#: ../src/main/prayerlists.cc:388
 msgid "Sue<br>John<br>"
 msgstr "Sue<br>John<br>"
 
-#: ../src/main/prayerlists.cc:411
+#: ../src/main/prayerlists.cc:414
 msgid "A monthly prayer list. \\par\\par Module created by Xiphos."
-msgstr ""
-"Een maandelijkse gebedslijst. \\par\\par Module is aangemaakt bij Xiphos."
+msgstr "Een maandelijkse gebedslijst. \\par\\par Module is aangemaakt bij Xiphos."
 
-#: ../src/main/prayerlists.cc:412
-#, fuzzy
+#: ../src/main/prayerlists.cc:415
 msgid "MonthlyPrayerList"
-msgstr "MijnGebedslijst"
+msgstr "MaandelijksPrayerList"
 
-#: ../src/main/prayerlists.cc:463
+#: ../src/main/prayerlists.cc:466
 msgid "A daily journal. \\par\\par Module created by Xiphos."
 msgstr "Een dagelijks bericht. \\par\\par Module is aangemaakt door Xiphos."
 
-#: ../src/main/prayerlists.cc:464
-#, fuzzy
+#: ../src/main/prayerlists.cc:467
 msgid "DailyJournal"
-msgstr "Dagelijkse berichten"
+msgstr "DailyJournal"
 
-#: ../src/main/prayerlists.cc:528
+#: ../src/main/prayerlists.cc:531
 msgid "An outlined topic (e.g. sermon). \\par\\par Module created by Xiphos."
-msgstr ""
-"Een uitgelijnd onderwerp(e.g. preek). \\par\\par Module aangemaakt met "
-"Xiphos."
+msgstr "Een uitgelijnd onderwerp(e.g. preek). \\par\\par Module aangemaakt met Xiphos."
 
-#: ../src/main/prayerlists.cc:529
-#, fuzzy
+#: ../src/main/prayerlists.cc:532
 msgid "OutlinedTopic"
-msgstr "Uitgelijnd onderwerp"
+msgstr "GeschetstTopic"
 
-#: ../src/main/prayerlists.cc:543
+#: ../src/main/prayerlists.cc:546
 msgid "Major Topic A"
 msgstr "Hoofdonderwerp A"
 
-#: ../src/main/prayerlists.cc:544
+#: ../src/main/prayerlists.cc:547
 msgid "<b>Major Topic A</b><br>"
 msgstr "<b>Hoofdondewerp A</b><br>"
 
-#: ../src/main/prayerlists.cc:546
+#: ../src/main/prayerlists.cc:549
 msgid "Major Topic B"
 msgstr "Hoofdonderwerp B"
 
-#: ../src/main/prayerlists.cc:547
+#: ../src/main/prayerlists.cc:550
 msgid "<b>Major Topic B</b><br>"
 msgstr "<b>Hoofdondewerp B</b><br>"
 
-#: ../src/main/prayerlists.cc:549
+#: ../src/main/prayerlists.cc:552
 msgid "Major Topic C"
 msgstr "Hoofdonderwerp C"
 
-#: ../src/main/prayerlists.cc:550
+#: ../src/main/prayerlists.cc:553
 msgid "<b>Major Topic C</b><br>"
 msgstr "<b>Hoofdondewerp C</b><br>"
 
-#: ../src/main/xml.c:80 ../src/main/xml.c:465
-#, c-format
-msgid "Document not created successfully. \n"
-msgstr "Aanmaken document is mislukt.\n"
-
-#: ../src/main/xml.c:89
-msgid "Personal"
-msgstr "Persoonlijk"
-
-#: ../src/main/xml.c:90
-msgid "What must I do to be saved?"
-msgstr "Wat moet ik doen om gered te worden?"
-
-#: ../src/main/xml.c:92 ../src/main/xml.c:93
-msgid "Acts 16:31"
-msgstr "Handelingen 16:31"
-
-#: ../src/main/xml.c:97 ../src/main/xml.c:98
-msgid "Eph 2:8"
-msgstr "Ef 2:8"
+#: ../src/main/previewer.cc:275
+msgid "User Annotation"
+msgstr "Gebruiker Annotatie"
 
-#: ../src/main/xml.c:102 ../src/main/xml.c:103
-msgid "Romans 1:16"
-msgstr "Romeinen 1:16"
-
-#: ../src/main/xml.c:106
-msgid "What is the Gospel?"
-msgstr "Wat is het Evangelie?"
-
-#: ../src/main/xml.c:108 ../src/main/xml.c:109
-msgid "1 Cor 15:1-4"
-msgstr "1 Kor 15:1-4"
-
-#: ../src/main/xml.c:413 ../src/main/xml.c:1078
+#: ../src/main/search_dialog.cc:212
 #, c-format
-msgid "Document not parsed successfully. \n"
-msgstr "Document kon niet worden gelezen.\n"
-
-#: ../src/main/xml.c:419 ../src/main/xml.c:681 ../src/main/xml.c:959
-#: ../src/main/xml.c:1138
-#, c-format
-msgid "empty document \n"
-msgstr "leeg document \n"
-
-#: ../src/main/xml.c:425
-#, c-format
-msgid "wrong type, root node != SwordBookmarks\n"
-msgstr "verkeerd type, sleutelnode != SwordBookmarks\n"
+msgid "Search result %s: %s"
+msgstr "Zoekresultaat %s: %s"
 
-#: ../src/main/xml.c:479
-msgid "Old Testament"
-msgstr "Oude Testament"
+#: ../src/main/search_dialog.cc:444
+msgid "Delete Range?"
+msgstr "Reeks verwijderen?"
 
-#: ../src/main/xml.c:481
-msgid "Gen - Mal"
-msgstr "Genesis - Maleachi"
+#: ../src/main/search_dialog.cc:445
+msgid "Are you sure you want to delete this range?"
+msgstr "Wilt u deze reeks echt verwijderen?"
 
-#: ../src/main/xml.c:487
-msgid "New Testament"
-msgstr "Nieuwe Testament"
+#: ../src/main/search_dialog.cc:659
+#: ../src/main/search_dialog.cc:1130
+#: ../src/main/search_dialog.cc:1133
+#: ../src/main/search_dialog.cc:1155
+#: ../src/main/search_dialog.cc:1158
+msgid "Search: "
+msgstr "Zoeken in: "
 
-#: ../src/main/xml.c:489
-msgid "Mat - Rev"
-msgstr "Matth. - Openbaring"
+#: ../src/main/search_dialog.cc:704
+msgid "Remove Module?"
+msgstr "Module verwijderen?"
 
-#: ../src/main/xml.c:497
-msgid "Sample Module List"
-msgstr "Voorbeeld modulelijst"
+#: ../src/main/search_dialog.cc:705
+msgid "Are you sure you want to remove the selected module?"
+msgstr "Weet u zeker dat u de selecteerde module wilt wissen?"
 
-#: ../src/main/xml.c:687 ../src/main/xml.c:965
+#: ../src/main/search_dialog.cc:1560
 #, c-format
-msgid "wrong type, root node != %s\n"
-msgstr "verkeerd type, sleutelnode != %s\n"
-
-#: ../src/main/display.cc:278
 msgid ""
-"An image file's size could not be determined.\n"
-"Is ImageMagick's 'identify' not installed?\n"
-"(Or possibly the image is of type other than bmp/gif/jpg/png.)\n"
-"Xiphos cannot resize images to fit window."
-msgstr ""
-"De grootte van een illustratie kon niet worden vastgesteld.\n"
-"Is ImageMagick geïnstalleerd?\n"
-"(Mogelijks is het bestandstype iets anders dan bm/gif/jpg/png.)\n"
-"Xiphos kan illustraties niet aanpassen aan de schermgrootte."
-
-#: ../src/main/display.cc:931 ../src/main/display.cc:993
-#: ../src/main/display.cc:1081 ../src/main/display.cc:1089
-#: ../ui/export-dialog.glade.h:7
-msgid "Chapter"
-msgstr "Hoofdstuk"
-
-#: ../src/main/previewer.cc:122 ../src/main/module_dialogs.cc:231
-#: ../ui/prefs.glade.h:75
-msgid "Previewer"
-msgstr "Voorbeeldweergave"
-
-#: ../src/main/previewer.cc:197 ../src/main/module_dialogs.cc:297
-#: ../src/main/module_dialogs.cc:423
-msgid "Footnote"
-msgstr "Voetnoot"
-
-#: ../src/main/previewer.cc:203 ../src/main/module_dialogs.cc:303
-#: ../src/main/module_dialogs.cc:428
-msgid "Cross Reference"
-msgstr "Kruisverwijzing"
-
-#: ../src/main/previewer.cc:209 ../src/main/previewer.cc:228
-#: ../src/main/module_dialogs.cc:309 ../src/main/module_dialogs.cc:323
-#: ../src/main/module_dialogs.cc:433 ../src/main/module_dialogs.cc:445
-msgid "Strongs"
-msgstr "Strongs"
-
-#: ../src/main/previewer.cc:215 ../src/main/previewer.cc:241
-#: ../src/main/module_dialogs.cc:315 ../src/main/module_dialogs.cc:334
-#: ../src/main/module_dialogs.cc:438 ../src/main/module_dialogs.cc:455
-msgid "Morphology"
-msgstr "Morfologie"
-
-#: ../src/main/module_dialogs.cc:1104 ../src/main/url.cc:543
-msgid "Back to "
-msgstr "Terug naar "
-
-#: ../src/main/search_sidebar.cc:93
-msgid "matches"
-msgstr "resultaten"
-
-#: ../src/main/parallel_view.cc:398 ../ui/xi-menus.glade.h:67
-msgid "Strong's Numbers"
-msgstr "Strongs getallen"
-
-#: ../src/main/parallel_view.cc:408 ../ui/search-dialog.glade.h:50
-#: ../ui/xi-menus.glade.h:25
-msgid "Footnotes"
-msgstr "Voetnoten"
-
-#: ../src/main/parallel_view.cc:418 ../ui/search-dialog.glade.h:62
-#: ../ui/xi-menus.glade.h:39
-msgid "Morphological Tags"
-msgstr "Morfologische Markeringen"
-
-#: ../src/main/parallel_view.cc:428 ../ui/xi-menus.glade.h:29
-msgid "Hebrew Vowel Points"
-msgstr "Hebreeuwse Klinkertekens"
-
-#: ../src/main/parallel_view.cc:438 ../ui/xi-menus.glade.h:28
-msgid "Hebrew Cantillation"
-msgstr "Hebreeuwse Cantillation"
-
-#: ../src/main/parallel_view.cc:448 ../ui/xi-menus.glade.h:26
-msgid "Greek Accents"
-msgstr "Griekse Leestekens"
-
-#: ../src/main/parallel_view.cc:458
-#, fuzzy
-msgid "Cross-references"
-msgstr "Kruisverwijzing"
-
-#: ../src/main/parallel_view.cc:468 ../ui/xi-menus.glade.h:35
-msgid "Lemmas"
-msgstr "Lemmas"
-
-#: ../src/main/parallel_view.cc:478 ../ui/xi-menus.glade.h:27
-msgid "Headings"
-msgstr "Rubrieken"
-
-#: ../src/main/parallel_view.cc:488
-msgid "Morpheme Segmentation"
+"%s:\n"
+"No such module is installed.\n"
+"%s"
 msgstr ""
+"%s:\n"
+"Deze module is niet geïnstalleerd.\n"
+"%s"
 
-#: ../src/main/parallel_view.cc:498 ../ui/xi-menus.glade.h:73
-msgid "Words of Christ in Red"
-msgstr "Uitspraken van Jezus rood weergeven"
-
-#: ../src/main/parallel_view.cc:508 ../ui/xi-menus.glade.h:68
-#, fuzzy
-msgid "Transliteration"
-msgstr "Vertaling"
-
-#: ../src/main/parallel_view.cc:518
-#, fuzzy
-msgid "Textual Variants"
-msgstr "Varianten"
-
-#: ../src/main/parallel_view.cc:526 ../ui/xi-menus.glade.h:49
-msgid "Primary Reading"
-msgstr "Primaire Lezing"
-
-#: ../src/main/parallel_view.cc:535 ../ui/xi-menus.glade.h:63
-msgid "Secondary Reading"
-msgstr "Secundaire Lezing"
-
-#: ../src/main/parallel_view.cc:544 ../ui/xi-menus.glade.h:5
-msgid "All Readings"
-msgstr "Alle lezingen"
-
-#: ../src/main/parallel_view.cc:878 ../src/main/parallel_view.cc:1130
-msgid "view context"
-msgstr "context bekijken"
-
-#: ../src/main/url.cc:99
-msgid "URL not found:"
-msgstr "URL niet gevonden:"
+#: ../src/main/search_dialog.cc:1562
+msgid "Please adjust the module list."
+msgstr "Pas de modulelijst aan."
 
-#: ../src/main/url.cc:194
+#: ../src/main/search_dialog.cc:1578
 #, c-format
-msgid "Xiphos could not execute %s"
-msgstr "Xiphos kon %s niet uitvoeren"
+msgid "No fast-search index exists for %s.%s%s"
+msgstr "Geen snelle-index bestaat voor %s.%s%s"
 
-#: ../src/main/url.cc:202
-msgid "Viewer error:\n"
+#: ../src/main/search_dialog.cc:1580
+msgid ""
+"\n"
+"Search on this module is now `multi word'."
 msgstr ""
+"\n"
+"Zoek op deze module is nu `multi woord '."
 
-#: ../src/main/url.cc:278
-#, c-format
-msgid "Show %s in main window"
-msgstr "%s in hoofdscherm tonen"
-
-#: ../src/main/tab_history.c:97
-msgid "H_istory/<Separator>"
-msgstr "_Geschiedenis<Separator>"
-
-#: ../src/main/tab_history.c:99
-msgid "H_istory/C_lear"
-msgstr "_Geschiedenis/_Wissen"
-
-#: ../src/main/tab_history.c:224
-msgid "Clear History"
-msgstr "Geschiedenis wissen"
+#: ../src/main/search_dialog.cc:1581
+msgid ""
+"\n"
+"See the Module Manager, Maintenance pane."
+msgstr ""
+"\n"
+"Zie module Manager, Maintenance ruit."
 
-#: ../src/main/sidebar.cc:375
-msgid "verse"
-msgstr "vers"
+#: ../src/main/search_dialog.cc:1644
+msgid "Search finished"
+msgstr "Zoeken voltooid"
 
-#: ../src/main/sidebar.cc:437
-msgid "chapter"
-msgstr "hoofdstuk"
+#: ../src/main/search_sidebar.cc:100
+msgid "matches"
+msgstr "resultaten"
 
-#: ../src/main/settings.c:56
+#: ../src/main/settings.c:60
 msgid ""
 "Welcome to Xiphos.\n"
 "\n"
-"There are no Bible modules installed. In order to initialize, Xiphos needs "
-"you to install at least one Bible.\n"
+"There are no Bible modules installed. In order to initialize, Xiphos needs you to install at least one Bible.\n"
 "\n"
-"With your permission, Xiphos will invoke the Module Manager so that you may "
-"install from Crosswire:\n"
+"With your permission, Xiphos will invoke the Module Manager so that you may install from Crosswire:\n"
 "1. Configure remote install.\n"
 "2. Connect.\n"
 "3. Select a Bible text of your language preference.\n"
@@ -1705,44 +1876,24 @@ msgid ""
 msgstr ""
 "Welkom bij Xiphos.\n"
 "\n"
-"Er zijn geen Bijbelmodules geinstalleerd. Xiphos heeft minimaal een "
-"Bijbelmodule nodig, om te kunnen starten.\n"
+"Er zijn geen Bijbelmodules geinstalleerd. Xiphos heeft minimaal een Bijbelmodule nodig, om te kunnen starten.\n"
 "\n"
-"Met uw toestemming wordt het Modulebeheer gestart, zodat u modules kunt "
-"installeren vanaf Crosswire:\n"
+"Met uw toestemming wordt het Modulebeheer gestart, zodat u modules kunt installeren vanaf Crosswire:\n"
 "1. Configureer installatie vanaf een andere lokatie\n"
 "2. Maak een verbinding.\n"
 "3. Selecteer een Bijbelmodule naar keuze.\n"
 "4. Kies 'Installeren'.\n"
 "Sluit het Modulebeheer als u klaar bent.\n"
 "\n"
-"Waarschuwing: Wees voorzichtig met het gebruik als u in uw land wordt "
-"vervolgd.\n"
+"Waarschuwing: Wees voorzichtig met het gebruik als u in uw land wordt vervolgd.\n"
 "\n"
 "Modulebeheer opstarten om een Bijbelmodule te installeren?"
 
-#: ../src/main/settings.c:109
+#: ../src/main/settings.c:105
 msgid "$HOME is not set!"
 msgstr "$HOME is niet ingesteld!"
 
-#: ../src/main/settings.c:124
-msgid "Xiphos has renamed .xiphos-2.0 to .xiphos"
-msgstr "Xiphos heeft .xiphos-2.0 hernoemd naar .xiphos"
-
-#: ../src/main/settings.c:127
-#, c-format
-msgid ""
-"Xiphos can not rename  .xiphos-2.0 to .xiphos:\n"
-"%s\n"
-"\n"
-"Xiphos cannot continue."
-msgstr ""
-"Xiphos kan .xiphos-2.0 niet hernoemen naar .xiphos:\n"
-"%s\n"
-"\n"
-"Xiphos zal worden afgesloten."
-
-#: ../src/main/settings.c:135
+#: ../src/main/settings.c:120
 #, c-format
 msgid ""
 "Xiphos can not create  .xiphos:\n"
@@ -1754,12 +1905,13 @@ msgstr ""
 "\n"
 "Xiphos zal worden afgesloten."
 
-#: ../src/main/settings.c:148 ../src/main/settings.c:156
-#: ../src/main/settings.c:164
+#: ../src/main/settings.c:133
+#: ../src/main/settings.c:142
+#: ../src/main/settings.c:151
 msgid "can not create "
-msgstr "aanmaken niet gelukt van"
+msgstr "aanmaken niet gelukt van "
 
-#: ../src/main/settings.c:196
+#: ../src/main/settings.c:194
 msgid ""
 "There are still no Bibles installed.\n"
 "Evidently, you declined to install any.\n"
@@ -1773,11 +1925,11 @@ msgstr ""
 "dit blijkbaar weigerde.\n"
 "Zonder een Bijbelmodule"
 
-#: ../src/main/settings.c:200
+#: ../src/main/settings.c:198
 msgid "Bible module installation complete."
 msgstr "Installatie van Bijbelmodules is voltooid."
 
-#: ../src/main/settings.c:203
+#: ../src/main/settings.c:201
 msgid ""
 "Without any Bible modules to display,\n"
 "Xiphos cannot proceed,\n"
@@ -1787,97 +1939,201 @@ msgstr ""
 "kan Xiphos niet worden gestart\n"
 "en zal daarom nu afsluiten."
 
-#. *****************************************************************************
-#. * Name
-#. *    gconf_setup
-#. *
-#. * Synopsis
-#. *   #include "main/settings.h"
-#. *
-#. *   void gconf_setup()
-#. *
-#. * Description
-#. *   verifies and initializes the GConf subsystem, so that "sword://" and
-#. *   similar can be handled by url-comprehending programs such as browsers.
-#. *   dialogs for permission/success/failure => conditional on debug build.
-#. *
-#. * Return value
-#. *   void
-#.
-#: ../src/main/settings.c:816
+#: ../src/main/sidebar.cc:399
+msgid "verse"
+msgstr "vers"
+
+#: ../src/main/sidebar.cc:461
+msgid "chapter"
+msgstr "hoofdstuk"
+
+#: ../src/main/sword.cc:537
 msgid ""
-"URL references using \"sword://\" (similar to web page\n"
-"references) can be used by programs to look up\n"
-"scripture references. Your system currently has no\n"
-"program set to handle these references.\n"
-"\n"
-"Would you like Xiphos to set itself as the\n"
-"program to handle these references?"
+"Xiphos's file for language\n"
+"abbreviations is missing."
 msgstr ""
-"URL-verwijzingen als \"sword://\"(net zoals http) kunnenworden gebruikt door "
-"programma's om bijbelverwijzingente openen. Wilt u dat Xiphos als standaard "
-"programma op uw systeem wordt ingesteld?\n"
-"\n"
-"Momenteel is er geen programma gekoppeld aan dit typeverwijzing."
+"Xiphos's bestand voor taal\n"
+"afkortingen is niet gevonden."
 
-#: ../src/main/settings.c:818
+#: ../src/main/sword.cc:544
 msgid ""
-"Xiphos has successfully set itself\n"
-"as the handler of sword:// and bible:// URLs.\n"
-"\n"
-"You may wish to run the program \"gconf-editor\"\n"
-"to examine keys under /desktop/gnome/url-handlers,\n"
-"if you need to change these."
+"Xiphos's language abbreviation\n"
+"file cannot be opened."
 msgstr ""
-"Xiphos is nu het standaardprogramma\n"
-"voor URLs als sword:// en bible://.\n"
-"\n"
-"Met het programma \"gconf-editor\" kunt u dit\n"
-"m.b.v. de sleutels onder /desktop/gnome/url-handlers\n"
-"wijzigen."
+"Xiphos's taalafkortingen bestand\n"
+"kan niet worden geopend."
 
-#: ../src/main/settings.c:871
-#, c-format
+#: ../src/main/sword.cc:557
 msgid ""
-"Xiphos failed to complete handler init for key #%d:\n"
-"%s"
+"Xiphos cannot allocate space\n"
+"for language abbreviations."
 msgstr ""
-"Het instellen van de standaardtoewijzing voor de toets #%d:\n"
-"%s is mislukt"
+"Xiphos niet toewijzen ruimte\n"
+"voor taal afkortingen."
+
+#: ../src/main/sword.cc:564
+msgid ""
+"Xiphos cannot read the\n"
+"language abbreviation file."
+msgstr ""
+"Xiphos kan niet lezen\n"
+"taal afkorting bestand."
+
+#: ../src/main/sword.cc:642
+msgid "No matching locale found for"
+msgstr "Geen overeenkomende locale gevonden voor"
+
+#: ../src/main/sword.cc:644
+msgid "Book names and menus may not be translated"
+msgstr "Boek namen en menu's mogen niet worden vertaald"
+
+#: ../src/main/sword.cc:1232
+msgid "Daily devotional was requested, but there are none installed."
+msgstr "Dagboeken werd opgevraagd, maar zijn niet geïnstalleerd."
+
+#: ../src/main/tab_history.c:219
+msgid "Clear History"
+msgstr "Geschiedenis wissen"
+
+#: ../src/main/url.cc:101
+msgid "URL not found:"
+msgstr "URL niet gevonden:"
+
+#: ../src/main/url.cc:191
+#, c-format
+msgid "Xiphos could not execute %s"
+msgstr "Xiphos kon %s niet uitvoeren"
+
+#: ../src/main/url.cc:199
+msgid "Viewer error:\n"
+msgstr "Viewer fout:\n"
+
+#: ../src/main/url.cc:272
+#, c-format
+msgid "Show %s in main window"
+msgstr "%s in hoofdscherm tonen"
+
+#: ../src/main/xml.c:80
+#: ../src/main/xml.c:464
+#, c-format
+msgid "Document not created successfully. \n"
+msgstr "Aanmaken document is mislukt.\n"
+
+#: ../src/main/xml.c:89
+msgid "Personal"
+msgstr "Persoonlijk"
+
+#: ../src/main/xml.c:90
+msgid "What must I do to be saved?"
+msgstr "Wat moet ik doen om gered te worden?"
+
+#: ../src/main/xml.c:92
+#: ../src/main/xml.c:93
+msgid "Acts 16:31"
+msgstr "Handelingen 16:31"
+
+#: ../src/main/xml.c:97
+#: ../src/main/xml.c:98
+msgid "Eph 2:8,9"
+msgstr "Eph 2:8,9"
+
+#: ../src/main/xml.c:102
+#: ../src/main/xml.c:103
+msgid "Romans 1:16"
+msgstr "Romeinen 1:16"
+
+#: ../src/main/xml.c:106
+msgid "What is the Gospel?"
+msgstr "Wat is het Evangelie?"
+
+#: ../src/main/xml.c:108
+#: ../src/main/xml.c:109
+msgid "1 Cor 15:1-4"
+msgstr "1 Kor 15:1-4"
+
+#: ../src/main/xml.c:413
+#: ../src/main/xml.c:1144
+#, c-format
+msgid "Document not parsed successfully. \n"
+msgstr "Document kon niet worden gelezen.\n"
+
+#: ../src/main/xml.c:419
+#: ../src/main/xml.c:747
+#: ../src/main/xml.c:1025
+#: ../src/main/xml.c:1204
+#, c-format
+msgid "empty document \n"
+msgstr "leeg document\n"
+
+#: ../src/main/xml.c:425
+#, c-format
+msgid "wrong type, root node != SwordBookmarks\n"
+msgstr "verkeerd type, sleutelnode != SwordBookmarks\n"
+
+#: ../src/main/xml.c:476
+msgid "Old Testament"
+msgstr "Oude Testament"
+
+#: ../src/main/xml.c:477
+msgid "Gen - Mal"
+msgstr "Genesis - Maleachi"
+
+#: ../src/main/xml.c:482
+msgid "New Testament"
+msgstr "Nieuwe Testament"
+
+#: ../src/main/xml.c:483
+msgid "Mat - Rev"
+msgstr "Matth. - Openbaring"
+
+#: ../src/main/xml.c:489
+msgid "Sample Module List"
+msgstr "Voorbeeld modulelijst"
+
+#: ../src/main/xml.c:753
+#: ../src/main/xml.c:1031
+#, c-format
+msgid "wrong type, root node != %s\n"
+msgstr "verkeerd type, sleutelnode != %s\n"
 
 #: ../ui/bookmarks.glade.h:1
 msgid "Add Bookmark"
 msgstr "Bladwijzer toevoegen"
 
 #: ../ui/bookmarks.glade.h:2
+#: ../ui/markverse.glade.h:1
 msgid "Bookmark Dialog"
 msgstr "Bladwijzervenster"
 
 #: ../ui/bookmarks.glade.h:3
 msgid "Bookmark Folder Treeview"
-msgstr ""
+msgstr "Bladwijzermap Treeview"
 
 #: ../ui/bookmarks.glade.h:4
+#: ../ui/markverse.glade.h:2
 msgid "Cancel Bookmark"
 msgstr "Bladwijzer verwijderen"
 
 #: ../ui/bookmarks.glade.h:5
+#: ../ui/markverse.glade.h:3
 msgid "Create new folder"
 msgstr "Map aanmaken"
 
 #: ../ui/bookmarks.glade.h:6
 msgid "Label Entry"
-msgstr ""
+msgstr "Label Entry"
 
 #: ../ui/bookmarks.glade.h:7
 msgid "Label:"
 msgstr "Label:"
 
 #: ../ui/bookmarks.glade.h:8
+#: ../ui/markverse.glade.h:6
 msgid "Module Entry"
-msgstr ""
+msgstr "Module Entry"
 
 #: ../ui/bookmarks.glade.h:9
+#: ../ui/markverse.glade.h:7
 msgid "Module:"
 msgstr "Module:"
 
@@ -1885,15 +2141,19 @@ msgstr "Module:"
 msgid "New ..."
 msgstr "Nieuw ..."
 
-#: ../ui/bookmarks.glade.h:11 ../ui/xi-menus.glade.h:40
+#: ../ui/bookmarks.glade.h:11
+#: ../ui/markverse.glade.h:8
+#: ../ui/xi-menus.glade.h:56
 msgid "New Folder"
 msgstr "Nieuwe map"
 
 #: ../ui/bookmarks.glade.h:12
+#: ../ui/markverse.glade.h:10
 msgid "Verse Entry"
-msgstr ""
+msgstr "Vers Entry"
 
 #: ../ui/bookmarks.glade.h:13
+#: ../ui/markverse.glade.h:11
 msgid "Verse:"
 msgstr "Vers:"
 
@@ -1901,32 +2161,38 @@ msgstr "Vers:"
 msgid "Delete the current note"
 msgstr "Huidige notitie verwijderen"
 
-#: ../ui/editor_note.xml.h:2 ../ui/editor_studypad.xml.h:4
+#: ../ui/editor_note.xml.h:2
+#: ../ui/editor_studypad.xml.h:4
 #: ../ui/editor.xml.h:2
 msgid "E_xit"
 msgstr "Afsluiten"
 
-#: ../ui/editor_note.xml.h:3 ../ui/editor_studypad.xml.h:5
+#: ../ui/editor_note.xml.h:3
+#: ../ui/editor_studypad.xml.h:5
 #: ../ui/editor.xml.h:3
 msgid "Exit"
 msgstr "Afsluiten"
 
-#: ../ui/editor_note.xml.h:4 ../ui/editor_studypad.xml.h:6
+#: ../ui/editor_note.xml.h:4
+#: ../ui/editor_studypad.xml.h:6
 #: ../ui/editor.xml.h:4
 msgid "Exit the program"
 msgstr "Het programma afsluiten"
 
-#: ../ui/editor_note.xml.h:5 ../ui/editor_studypad.xml.h:7
+#: ../ui/editor_note.xml.h:5
+#: ../ui/editor_studypad.xml.h:7
 #: ../ui/editor.xml.h:5
 msgid "For_mat"
 msgstr "Op_maak"
 
-#: ../ui/editor_note.xml.h:6 ../ui/editor_studypad.xml.h:8
+#: ../ui/editor_note.xml.h:6
+#: ../ui/editor_studypad.xml.h:8
 #: ../ui/editor.xml.h:6
 msgid "HTML Format switch"
 msgstr "HTML-opmaak wisselaar"
 
-#: ../ui/editor_note.xml.h:7 ../ui/editor_studypad.xml.h:9
+#: ../ui/editor_note.xml.h:7
+#: ../ui/editor_studypad.xml.h:9
 #: ../ui/editor.xml.h:7
 msgid "HTML mode"
 msgstr "HTML weergave"
@@ -1935,19 +2201,10 @@ msgstr "HTML weergave"
 msgid "Preview the note to be printed"
 msgstr "Afdrukvoorbeeld van de notitie"
 
-#: ../ui/editor_note.xml.h:9 ../ui/editor_studypad.xml.h:14
-msgid "Print Pre_view"
-msgstr "Afdruk_voorbeeld"
-
 #: ../ui/editor_note.xml.h:10
 msgid "Print this note"
 msgstr "Notitie afdrukken"
 
-#: ../ui/editor_note.xml.h:11 ../ui/editor_studypad.xml.h:16
-#: ../ui/editor.xml.h:11
-msgid "Save"
-msgstr "Opslaan"
-
 #: ../ui/editor_note.xml.h:12
 msgid "Save the current note"
 msgstr "Notitie opslaan"
@@ -1956,15 +2213,6 @@ msgstr "Notitie opslaan"
 msgid "_Delete Personal Comment"
 msgstr "Verwij_der Persoonlijk Commentaar"
 
-#: ../ui/editor_note.xml.h:14 ../ui/editor_studypad.xml.h:20
-#: ../ui/editor.xml.h:13 ../ui/xi-menus.glade.h:83
-msgid "_File"
-msgstr "_Bestand"
-
-#: ../ui/editor_note.xml.h:15 ../ui/editor_studypad.xml.h:21
-msgid "_Print..."
-msgstr "_Printen..."
-
 #: ../ui/editor_note.xml.h:16
 msgid "_Save (Personal Comment)"
 msgstr "_Opslaan (Persoonlijk Commentaar)"
@@ -1973,15 +2221,18 @@ msgstr "_Opslaan (Persoonlijk Commentaar)"
 msgid "Add this file to your bookmarks"
 msgstr "Dit bestand aan uw bladwijzers toevoegen"
 
-#: ../ui/editor_studypad.xml.h:3 ../ui/editor.xml.h:1
+#: ../ui/editor_studypad.xml.h:3
+#: ../ui/editor.xml.h:1
 msgid "Create a new document"
 msgstr "Maak een nieuw document"
 
-#: ../ui/editor_studypad.xml.h:10 ../ui/editor.xml.h:8
+#: ../ui/editor_studypad.xml.h:10
+#: ../ui/editor.xml.h:8
 msgid "New Document"
 msgstr "Nieuw document"
 
-#: ../ui/editor_studypad.xml.h:11 ../ui/editor.xml.h:9
+#: ../ui/editor_studypad.xml.h:11
+#: ../ui/editor.xml.h:9
 msgid "Open"
 msgstr "Openen"
 
@@ -2001,7 +2252,8 @@ msgstr "Huidig document afdrukken"
 msgid "Save AS"
 msgstr "Opslaan als"
 
-#: ../ui/editor_studypad.xml.h:18 ../ui/editor.xml.h:12
+#: ../ui/editor_studypad.xml.h:18
+#: ../ui/editor.xml.h:12
 msgid "Save the current file"
 msgstr "Huidig bestand opslaan"
 
@@ -2018,9 +2270,8 @@ msgid ": "
 msgstr ": "
 
 #: ../ui/export-dialog.glade.h:2
-#, fuzzy
 msgid "<b>Copy</b>"
-msgstr "<b>Zoekgebied</b>"
+msgstr "<b>Kopiëren</b>"
 
 #: ../ui/export-dialog.glade.h:3
 msgid "<b>Export</b>"
@@ -2030,30 +2281,31 @@ msgstr "<b>Exporteren</b>"
 msgid "<b>Format</b>"
 msgstr "<b>Formaat</b>"
 
-#: ../ui/export-dialog.glade.h:5 ../ui/prefs.glade.h:25
+#: ../ui/export-dialog.glade.h:5
+#: ../ui/prefs.glade.h:25
 msgid "Book"
 msgstr "Boek"
 
 #: ../ui/export-dialog.glade.h:6
 msgid "Book Radio Button"
-msgstr ""
+msgstr "Book radio button"
 
 #: ../ui/export-dialog.glade.h:8
 msgid "Chapter Radio Button"
-msgstr ""
+msgstr "Show romanizationHoofdstuk keuzerondje"
 
-#: ../ui/export-dialog.glade.h:9 ../ui/xi-menus.glade.h:12
-#, fuzzy
+#: ../ui/export-dialog.glade.h:9
+#: ../ui/xi-menus.glade.h:18
 msgid "Copy/Export Passage"
-msgstr "Passage exporteren"
+msgstr "Copy/Export Passage"
 
 #: ../ui/export-dialog.glade.h:10
 msgid "Export Passage Cancel"
-msgstr ""
+msgstr "Export Passage Annuleren"
 
 #: ../ui/export-dialog.glade.h:11
 msgid "Export Passage OK"
-msgstr ""
+msgstr "Export Passage OK"
 
 #: ../ui/export-dialog.glade.h:12
 msgid "Export complete book"
@@ -2073,7 +2325,7 @@ msgstr "HTML"
 
 #: ../ui/export-dialog.glade.h:16
 msgid "HTML Radio Button"
-msgstr ""
+msgstr "HTML Radio Button"
 
 #: ../ui/export-dialog.glade.h:17
 msgid "Key"
@@ -2085,7 +2337,7 @@ msgstr "Tekst"
 
 #: ../ui/export-dialog.glade.h:19
 msgid "Plain Text Radio Button"
-msgstr ""
+msgstr "Plain Text Radio Button"
 
 #: ../ui/export-dialog.glade.h:21
 msgid "Save Export As"
@@ -2097,17 +2349,28 @@ msgstr "Vers"
 
 #: ../ui/export-dialog.glade.h:23
 msgid "Verse Radio Button"
-msgstr ""
+msgstr "Vers Radio Button"
 
 #: ../ui/export-dialog.glade.h:24
-#, fuzzy
 msgid "Verse range"
-msgstr "Eén vers per regel"
+msgstr "Vers Range"
 
 #: ../ui/export-dialog.glade.h:25
 msgid "Version"
 msgstr "Versie"
 
+#: ../ui/markverse.glade.h:4
+msgid "Mark"
+msgstr "Merken"
+
+#: ../ui/markverse.glade.h:5
+msgid "Mark/Unmark Verse"
+msgstr "Mark/Deselect Vers"
+
+#: ../ui/markverse.glade.h:9
+msgid "Unmark"
+msgstr "Deselect"
+
 #: ../ui/module-manager.glade.h:1
 msgid "<b>Add and Remove Sources</b>"
 msgstr "<b>Externe bronnen toevoegen en verwijderen</b>"
@@ -2131,17 +2394,11 @@ msgstr "<b>Sword</b>"
 
 #: ../ui/module-manager.glade.h:7
 msgid "<b>WARNING:</b> If you live in a persecuted country use with care."
-msgstr ""
-"<b>WAARSCHUWING:</b> Wees voorzichtig als u in een land leeft waar u wordt "
-"vervolgd."
+msgstr "<b>WAARSCHUWING:</b> Wees voorzichtig als u in een land leeft waar u wordt vervolgd."
 
 #: ../ui/module-manager.glade.h:8
-msgid ""
-"<b>Warning:</b> If you live in a persecuted country and do not wish to risk "
-"detection you should NOT use  the remote installation feature! "
-msgstr ""
-"<b>WAARSCHUWING:</b> Als u wordt vervolgd en niet wilt worden opgemerkt, "
-"gebruik dan geen externe bronnen! "
+msgid "<b>Warning:</b> If you live in a persecuted country and do not wish to risk detection you should NOT use  the remote installation feature! "
+msgstr "<b>WAARSCHUWING:</b> Als u wordt vervolgd en niet wilt worden opgemerkt, gebruik dan geen externe bronnen! "
 
 #: ../ui/module-manager.glade.h:9
 msgid "<i>Personal area, for your use only:</i>"
@@ -2151,39 +2408,47 @@ msgstr "<i>Persoonlijk map, alleen voor eigen gebruik:</li>"
 msgid "<i>System area, for all users:</i>"
 msgstr "<i>Gedeelde map, voor alle gebruikers:</i>"
 
-#: ../ui/module-manager.glade.h:11
+#: ../ui/module-manager.glade.h:12
 msgid "Continue"
 msgstr "Doorgaan"
 
-#: ../ui/module-manager.glade.h:12
+#: ../ui/module-manager.glade.h:13
 msgid "Current Remote Sources"
 msgstr "Huidige externe bronnen"
 
-#: ../ui/module-manager.glade.h:13
+#: ../ui/module-manager.glade.h:14
 msgid "Current local sources"
 msgstr "Huidige lokale bronnen"
 
-#: ../ui/module-manager.glade.h:14
+#: ../ui/module-manager.glade.h:15
+msgid "Delete Index"
+msgstr "Zoekindex verwijderen"
+
+#: ../ui/module-manager.glade.h:16
 msgid "Home dir"
 msgstr "Persoonlijke map"
 
-#: ../ui/module-manager.glade.h:16
+#: ../ui/module-manager.glade.h:19
+msgid "Load Standard"
+msgstr "Load Standard"
+
+#: ../ui/module-manager.glade.h:20
 msgid "Local"
 msgstr "Lokaal"
 
-#: ../ui/module-manager.glade.h:17
+#: ../ui/module-manager.glade.h:21
 msgid "Local Install Folder"
 msgstr "Lokale installatiemap"
 
-#: ../ui/module-manager.glade.h:18
+#: ../ui/module-manager.glade.h:22
 msgid "Module Manager"
 msgstr "Modulebeheer"
 
-#: ../ui/module-manager.glade.h:19
+#: ../ui/module-manager.glade.h:23
 msgid "Remote"
 msgstr "Extern"
 
-#: ../ui/module-manager.glade.h:20
+#: ../ui/module-manager.glade.h:24
 msgid "Sword sys dir"
 msgstr "SWORD systeemmap"
 
@@ -2197,7 +2462,7 @@ msgstr "<b>Openbaringen van Johannes</b>"
 
 #: ../ui/navbar_versekey.glade.h:3
 msgid "Book Selector Button"
-msgstr ""
+msgstr "Boek Selector Button"
 
 #: ../ui/navbar_versekey.glade.h:4
 msgid "Choose book to display"
@@ -2205,19 +2470,19 @@ msgstr "Kies een boek om weer te geven"
 
 #: ../ui/navbar_versekey.glade.h:5
 msgid "Drop down history list"
-msgstr ""
+msgstr "Vervolgkeuzelijst geschiedenis lijst"
 
 #: ../ui/navbar_versekey.glade.h:6
 msgid "Reference Entry"
-msgstr ""
+msgstr "Referentie Entry"
 
 #: ../ui/navbar_versekey.glade.h:7
 msgid "Toggle Chapter Button"
-msgstr ""
+msgstr "Hoofdstuk Toggle Button"
 
 #: ../ui/navbar_versekey.glade.h:8
 msgid "Toggle Verse Button"
-msgstr ""
+msgstr "Vers Toggle Button"
 
 #: ../ui/prefs.glade.h:1
 msgid ""
@@ -2280,9 +2545,7 @@ msgid "Apply high-contrast highlight to current verse"
 msgstr "Hoog contrast toepassen op het huidige vers"
 
 #: ../ui/prefs.glade.h:19
-msgid ""
-"Automatically resize commentary, book, and dictionary image content to fit "
-"subwindow"
+msgid "Automatically resize commentary, book, and dictionary image content to fit subwindow"
 msgstr "Commentaar, boek en woordenboek automatisch passend maken aan venster"
 
 #: ../ui/prefs.glade.h:20
@@ -2290,8 +2553,8 @@ msgid "Background"
 msgstr "Achtergrond"
 
 #: ../ui/prefs.glade.h:21
-msgid "Base text size"
-msgstr "Standaard lettertypegrootte"
+msgid "Base font size"
+msgstr "Base lettergrootte"
 
 #: ../ui/prefs.glade.h:22
 msgid "Bible Texts"
@@ -2299,7 +2562,7 @@ msgstr "Bijbelteksten"
 
 #: ../ui/prefs.glade.h:23
 msgid "Bible Texts Checkbox"
-msgstr ""
+msgstr "Bijbelteksten selectievakje"
 
 #: ../ui/prefs.glade.h:24
 msgid "Biblical Text"
@@ -2307,35 +2570,35 @@ msgstr "Bijbelse tekst"
 
 #: ../ui/prefs.glade.h:26
 msgid "Change Biblical Text Combo"
-msgstr ""
+msgstr "Verander bijbelse tekst Combo"
 
 #: ../ui/prefs.glade.h:27
 msgid "Change Book Combo"
-msgstr ""
+msgstr "Verander Boek Combo"
 
 #: ../ui/prefs.glade.h:28
 msgid "Change Commentary Combo"
-msgstr ""
+msgstr "Verander Commentary Combo"
 
 #: ../ui/prefs.glade.h:29
 msgid "Change Default Dictionary Combo"
-msgstr ""
+msgstr "Verander Standaard Woordenboek Combo"
 
 #: ../ui/prefs.glade.h:30
 msgid "Change Dictionary Combo"
-msgstr ""
+msgstr "Verander Woordenboek Combo"
 
 #: ../ui/prefs.glade.h:31
 msgid "Change Personal Notes Combo"
-msgstr ""
+msgstr "Verander Persoonlijke notities Combo"
 
 #: ../ui/prefs.glade.h:32
 msgid "Choose to enable Prayer lists "
-msgstr "Gebedspunten tonen"
+msgstr "Gebedspunten tonen "
 
 #: ../ui/prefs.glade.h:34
 msgid "Commentaries Checkbox"
-msgstr ""
+msgstr "Commentaren Checkbox"
 
 #: ../ui/prefs.glade.h:36
 msgid "Cover"
@@ -2351,7 +2614,7 @@ msgstr "Dagboek"
 
 #: ../ui/prefs.glade.h:39
 msgid "Daily Devotional Combo"
-msgstr ""
+msgstr "Daily Devotional Checkbox"
 
 #: ../ui/prefs.glade.h:40
 msgid "Default Dictionary"
@@ -2367,7 +2630,7 @@ msgstr "Woordenboek/Lexicon"
 
 #: ../ui/prefs.glade.h:43
 msgid "Dictionary/Lexicon Checkbox"
-msgstr ""
+msgstr "Woordenboek/Lexicon selectievakje"
 
 #: ../ui/prefs.glade.h:44
 msgid "Enable Prayer Lists"
@@ -2375,7 +2638,7 @@ msgstr "Gebedslijst inschakelen"
 
 #: ../ui/prefs.glade.h:45
 msgid "Enable Prayer Lists Checkbox"
-msgstr ""
+msgstr "Enable Gebed Lijsten selectievakje"
 
 #: ../ui/prefs.glade.h:46
 msgid "Font Colors"
@@ -2399,7 +2662,7 @@ msgstr "Grieks Lexicon"
 
 #: ../ui/prefs.glade.h:51
 msgid "Greek Lexicon Combo"
-msgstr ""
+msgstr "Grieks Lexicon Combo"
 
 #: ../ui/prefs.glade.h:52
 msgid "Hebrew Lexicon"
@@ -2407,7 +2670,7 @@ msgstr "Hebreeuws Lexicon"
 
 #: ../ui/prefs.glade.h:53
 msgid "Hebrew Lexicon Combo"
-msgstr ""
+msgstr "Hebreeuws Lexicon Combo"
 
 #: ../ui/prefs.glade.h:54
 msgid "Highlight Background"
@@ -2423,7 +2686,7 @@ msgstr "Huidig vers benadrukken"
 
 #: ../ui/prefs.glade.h:57
 msgid "Highlight current verse check box"
-msgstr ""
+msgstr "Markeer huidige vers selectievakje"
 
 #: ../ui/prefs.glade.h:58
 msgid "Links"
@@ -2447,7 +2710,7 @@ msgstr "Parallel 1"
 
 #: ../ui/prefs.glade.h:63
 msgid "Parallel 1 Combo"
-msgstr ""
+msgstr "Parallel 1 Combo"
 
 #: ../ui/prefs.glade.h:64
 msgid "Parallel 2"
@@ -2455,7 +2718,7 @@ msgstr "Parallel 2"
 
 #: ../ui/prefs.glade.h:65
 msgid "Parallel 2 Combo"
-msgstr ""
+msgstr "Parallel 2 Combo"
 
 #: ../ui/prefs.glade.h:66
 msgid "Parallel 3"
@@ -2463,7 +2726,7 @@ msgstr "Parallel 3"
 
 #: ../ui/prefs.glade.h:67
 msgid "Parallel 3 Combo"
-msgstr ""
+msgstr "Parallel 3 Combo"
 
 #: ../ui/prefs.glade.h:68
 msgid "Parallel 4"
@@ -2479,11 +2742,11 @@ msgstr "Parallel 5"
 
 #: ../ui/prefs.glade.h:71
 msgid "Parallel 5 Combo"
-msgstr ""
+msgstr "Parallel 5 Combo"
 
 #: ../ui/prefs.glade.h:72
 msgid "Parallel View in a tab"
-msgstr ""
+msgstr "Parallel Bekijk in een tabblad"
 
 #: ../ui/prefs.glade.h:73
 msgid "Personal Notes"
@@ -2491,7 +2754,7 @@ msgstr "Persoonlijke aantekeningen"
 
 #: ../ui/prefs.glade.h:76
 msgid "Previewer Checkbox"
-msgstr ""
+msgstr "Previewer selectievakje"
 
 #: ../ui/prefs.glade.h:77
 msgid "Resize images"
@@ -2499,7 +2762,7 @@ msgstr "Illustratiegrootte wijzigen"
 
 #: ../ui/prefs.glade.h:78
 msgid "Resize images checkbox"
-msgstr ""
+msgstr "Resize images selectievakje"
 
 #: ../ui/prefs.glade.h:79
 msgid "Scroll to Previous/Next Chapter"
@@ -2507,7 +2770,7 @@ msgstr "Ga naar het vorige/volgende hoofdstuk"
 
 #: ../ui/prefs.glade.h:80
 msgid "Scroll to Previous/Next Chapter Checkbox"
-msgstr ""
+msgstr "Ga naar vorige/volgende hoofdstuk selectievakje"
 
 #: ../ui/prefs.glade.h:81
 msgid "Select A Directory"
@@ -2522,38 +2785,50 @@ msgid "Show splash screen at start up"
 msgstr "Opstartscherm tonen bij opstarten"
 
 #: ../ui/prefs.glade.h:84
-msgid "StudyPad default directory combo"
-msgstr ""
+msgid "Special Locale (requires restart)"
+msgstr "Speciale Locale (opnieuw opstarten vereist)"
+
+#: ../ui/prefs.glade.h:85
+msgid "Special Locale Combo"
+msgstr "Speciale Locale Combo"
 
 #: ../ui/prefs.glade.h:86
+msgid "StudyPad default directory combo"
+msgstr "StudiePad standaard directory combo"
+
+#: ../ui/prefs.glade.h:88
 msgid "Use Bible Text scroll bar to scroll to previous or next chapter"
 msgstr "Gebruik de schuifbalk om naar het vorige of volgende hoofdstuk te gaan"
 
-#: ../ui/prefs.glade.h:87
+#: ../ui/prefs.glade.h:89
 msgid "Use Verse Per Line"
 msgstr "Eénregelige verzen"
 
-#: ../ui/prefs.glade.h:88
+#: ../ui/prefs.glade.h:90
 msgid "Use Verse Per Line Checkbox"
-msgstr ""
+msgstr "Gebruik Vers Per Line selectievakje"
 
-#: ../ui/prefs.glade.h:89
+#: ../ui/prefs.glade.h:91
 msgid "Use default Dictionary"
 msgstr "Gebruik standaard woordenboek"
 
-#: ../ui/prefs.glade.h:90
+#: ../ui/prefs.glade.h:92
 msgid "Use default Dictionary Checkbox"
-msgstr ""
+msgstr "Gebruik standaard woordenboek selectievakje"
 
-#: ../ui/prefs.glade.h:91
+#: ../ui/prefs.glade.h:93
 msgid "Use tabbed browsing"
 msgstr "Gebruik tabbladen"
 
-#: ../ui/prefs.glade.h:92
+#: ../ui/prefs.glade.h:94
 msgid "Use tabbed browsing Checkbox"
-msgstr ""
+msgstr "Gebruik browsen met tabbladen selectievakje"
 
-#: ../ui/prefs.glade.h:93
+#: ../ui/prefs.glade.h:95
+msgid "Verse Number"
+msgstr "Vers nummer"
+
+#: ../ui/prefs.glade.h:96
 msgid "Verse number size"
 msgstr "Vers lettergrootte"
 
@@ -2631,15 +2906,15 @@ msgstr "Attributen"
 
 #: ../ui/search-dialog.glade.h:19
 msgid "Attributes radiobutton"
-msgstr ""
+msgstr "Attributen keuzerondje"
 
 #: ../ui/search-dialog.glade.h:20
 msgid "Clear Custom Module List Button"
-msgstr ""
+msgstr "Wissen Aangepaste Module knop Lijst"
 
 #: ../ui/search-dialog.glade.h:21
 msgid "Clear Modules from List Button"
-msgstr ""
+msgstr "Duidelijke Modules uit lijst Button"
 
 #: ../ui/search-dialog.glade.h:22
 msgid "Clear all modules from the list"
@@ -2663,15 +2938,15 @@ msgstr "Huidige resultaten"
 
 #: ../ui/search-dialog.glade.h:27
 msgid "Current results radiobutton"
-msgstr ""
+msgstr "Huidige resultaten Button"
 
 #: ../ui/search-dialog.glade.h:28
 msgid "Custom Module List Combo"
-msgstr ""
+msgstr "Aangepast Module Lijst Combo"
 
 #: ../ui/search-dialog.glade.h:29
 msgid "Custom Module List Name Entry"
-msgstr ""
+msgstr "Aangepast Module Naam Entry List"
 
 #: ../ui/search-dialog.glade.h:30
 msgid "Custom Module Lists"
@@ -2679,11 +2954,11 @@ msgstr "Aangepaste modulelijsten"
 
 #: ../ui/search-dialog.glade.h:31
 msgid "Custom Range Preview"
-msgstr ""
+msgstr "Aangepast Range Preview"
 
 #: ../ui/search-dialog.glade.h:32
 msgid "Custom Range Selector Combo"
-msgstr ""
+msgstr "Aangepast Range Selector Combo"
 
 #: ../ui/search-dialog.glade.h:33
 msgid "Custom Verse Ranges"
@@ -2695,7 +2970,7 @@ msgstr "Aangepaste modulelijst"
 
 #: ../ui/search-dialog.glade.h:35
 msgid "Custom module list radiobutton"
-msgstr ""
+msgstr "Aangepaste module lijst keuzerondje"
 
 #: ../ui/search-dialog.glade.h:36
 msgid "Custom verse range"
@@ -2703,15 +2978,15 @@ msgstr "Aangepaste versreeks"
 
 #: ../ui/search-dialog.glade.h:37
 msgid "Custom verse range radiobutton"
-msgstr ""
+msgstr "Aangepaste vers assortiment keuzerondje"
 
 #: ../ui/search-dialog.glade.h:38
 msgid "Delete Range Button"
-msgstr ""
+msgstr "Verwijderen bereik keuzerondje"
 
 #: ../ui/search-dialog.glade.h:39
 msgid "Delete Selected Module From List Button"
-msgstr ""
+msgstr "Geselecteerde module uit knop Lijst"
 
 #: ../ui/search-dialog.glade.h:40
 msgid "Delete selected range"
@@ -2727,13 +3002,21 @@ msgstr "Gehele module"
 
 #: ../ui/search-dialog.glade.h:43
 msgid "Entire module radiobutton"
-msgstr ""
+msgstr "Hele module keuzerondje"
 
 #: ../ui/search-dialog.glade.h:45
 msgid "Exact phrase radiobutton"
-msgstr ""
+msgstr "Exacte zin keuzerondje"
 
 #: ../ui/search-dialog.glade.h:46
+msgid "Export"
+msgstr "Exporteer"
+
+#: ../ui/search-dialog.glade.h:47
+msgid "Export current search results"
+msgstr "Export huidige zoekresultaten"
+
+#: ../ui/search-dialog.glade.h:48
 msgid ""
 "Fast, featureful, index-based search\n"
 "Indexes must have been built beforehand:\n"
@@ -2743,227 +3026,227 @@ msgstr ""
 "Indexen moeten vooraf worden gecreëerd:\n"
 "Zie de onderhoudsfuncties in het modulebeheer"
 
-#: ../ui/search-dialog.glade.h:49
+#: ../ui/search-dialog.glade.h:51
 msgid "Find Button"
-msgstr ""
+msgstr "Zoek Knop"
 
-#: ../ui/search-dialog.glade.h:51
+#: ../ui/search-dialog.glade.h:53
 msgid "Footnotes radiobutton"
-msgstr ""
+msgstr "Voetnoten keuzerondje"
 
-#: ../ui/search-dialog.glade.h:52
+#: ../ui/search-dialog.glade.h:54
 msgid "In modules that have Footnotes"
 msgstr "In modules met voetnoten"
 
-#: ../ui/search-dialog.glade.h:53
+#: ../ui/search-dialog.glade.h:55
 msgid "In modules that have Morphological Tags"
 msgstr "In modules met morfologische markeringen"
 
-#: ../ui/search-dialog.glade.h:54
+#: ../ui/search-dialog.glade.h:56
 msgid "In modules that have Strong's Numbers"
 msgstr "in modules met Strongs-getallen"
 
-#: ../ui/search-dialog.glade.h:55
+#: ../ui/search-dialog.glade.h:57
 msgid "Main Search Entry"
-msgstr ""
+msgstr "Main Zoeken Entry"
 
-#: ../ui/search-dialog.glade.h:56
+#: ../ui/search-dialog.glade.h:58
 msgid "Make selections on the Attribute Search tab"
 msgstr "Maak een selectie in het tabblad zoekattributen"
 
-#: ../ui/search-dialog.glade.h:58
+#: ../ui/search-dialog.glade.h:60
 msgid "Match case checkbox"
-msgstr ""
+msgstr "Hoofdlettergevoelig selectievakje"
 
-#: ../ui/search-dialog.glade.h:59
+#: ../ui/search-dialog.glade.h:61
 msgid "Module Selection"
 msgstr "Moduleselectie"
 
-#: ../ui/search-dialog.glade.h:60
+#: ../ui/search-dialog.glade.h:62
 msgid "Module list"
 msgstr "Modulelijst"
 
-#: ../ui/search-dialog.glade.h:61
+#: ../ui/search-dialog.glade.h:63
 msgid "Module list radiobutton"
-msgstr ""
+msgstr "Module lijst keuzerondje"
 
-#: ../ui/search-dialog.glade.h:63
+#: ../ui/search-dialog.glade.h:65
 msgid "Morphological Tags radiobutton"
-msgstr ""
+msgstr "Morfologische Tags keuzerondje"
 
-#: ../ui/search-dialog.glade.h:65
+#: ../ui/search-dialog.glade.h:67
 msgid "Multi word radiobutton"
-msgstr ""
+msgstr "Multi woord keuzerondje"
 
-#: ../ui/search-dialog.glade.h:66
+#: ../ui/search-dialog.glade.h:68
 msgid "New Custom Module List Button"
-msgstr ""
+msgstr "New Custom Module Lijst keuzerondje"
 
-#: ../ui/search-dialog.glade.h:67
+#: ../ui/search-dialog.glade.h:69
 msgid "New Range Button"
-msgstr ""
+msgstr "Nieuw Range Button"
 
-#: ../ui/search-dialog.glade.h:68
+#: ../ui/search-dialog.glade.h:70
 msgid "Open Selection Dialog Button"
-msgstr ""
+msgstr "Open Selectie Dialog Button"
 
-#: ../ui/search-dialog.glade.h:69
+#: ../ui/search-dialog.glade.h:71
 msgid "Open a dialog to select modules to add to the list"
 msgstr "Open een venster om modules te selecteren"
 
-#: ../ui/search-dialog.glade.h:70
+#: ../ui/search-dialog.glade.h:72
 msgid "Optimized (\"Lucene\")"
 msgstr "Snelzoeken met behulp van de zoekindex"
 
-#: ../ui/search-dialog.glade.h:71
+#: ../ui/search-dialog.glade.h:73
 msgid "Optimized (\"Lucene\") radiobutton"
-msgstr ""
+msgstr "Geoptimaliseerd (\"Lucene\") radiobutton"
 
-#: ../ui/search-dialog.glade.h:72
+#: ../ui/search-dialog.glade.h:74
 msgid "Range Definition Entry"
-msgstr ""
+msgstr "Range Definitie Entry"
 
-#: ../ui/search-dialog.glade.h:73
+#: ../ui/search-dialog.glade.h:75
 msgid "Range Name Entry"
-msgstr ""
+msgstr "Range Naam Entry"
 
-#: ../ui/search-dialog.glade.h:75
+#: ../ui/search-dialog.glade.h:77
 msgid "Regular expression radiobutton"
-msgstr ""
+msgstr "Reguliere expressie keuzerondje"
 
-#: ../ui/search-dialog.glade.h:76
+#: ../ui/search-dialog.glade.h:78
 msgid "Remove the selected module from the list"
 msgstr "Geselecteerde modules uit lijst verwijderen"
 
-#: ../ui/search-dialog.glade.h:77
+#: ../ui/search-dialog.glade.h:79
 msgid "Result Summary Table"
-msgstr ""
+msgstr "Uitslag overzichtstabel"
 
-#: ../ui/search-dialog.glade.h:78
+#: ../ui/search-dialog.glade.h:80
 msgid "Result Summary Window"
-msgstr ""
+msgstr "Uitslag samenvatting venster"
 
-#: ../ui/search-dialog.glade.h:79
+#: ../ui/search-dialog.glade.h:81
 msgid "Results"
 msgstr "Resultaten"
 
-#: ../ui/search-dialog.glade.h:80
+#: ../ui/search-dialog.glade.h:82
 msgid "Save Custom Module List Button"
-msgstr ""
+msgstr "Sla aangepaste Module knop Lijst"
 
-#: ../ui/search-dialog.glade.h:81
+#: ../ui/search-dialog.glade.h:83
 msgid "Save Range Button"
-msgstr ""
+msgstr "Opslaan Range Button"
 
-#: ../ui/search-dialog.glade.h:82
+#: ../ui/search-dialog.glade.h:84
 msgid "Save custom range"
 msgstr "Aangepaste reeks opslaan"
 
-#: ../ui/search-dialog.glade.h:83
+#: ../ui/search-dialog.glade.h:85
 msgid "Save search results as bookmarks"
 msgstr "Zoekresultaten als bladwijzers opslaan"
 
-#: ../ui/search-dialog.glade.h:84
+#: ../ui/search-dialog.glade.h:86
 msgid "Save the module list"
 msgstr "Modulelijst opslaan"
 
-#: ../ui/search-dialog.glade.h:85
+#: ../ui/search-dialog.glade.h:87
 msgid "Search  Criteria"
 msgstr "Zoekcriteria"
 
-#: ../ui/search-dialog.glade.h:86
+#: ../ui/search-dialog.glade.h:88
 msgid "Search Criteria Treeview"
-msgstr ""
+msgstr "Zoekcriteria Treeview"
 
-#: ../ui/search-dialog.glade.h:87
+#: ../ui/search-dialog.glade.h:89
 msgid "Search entire module"
 msgstr "Gehele module doorzoeken"
 
-#: ../ui/search-dialog.glade.h:88
+#: ../ui/search-dialog.glade.h:90
 msgid "Search for Morphological tags"
 msgstr "Zoek naar morfologische markeringen"
 
-#: ../ui/search-dialog.glade.h:89
+#: ../ui/search-dialog.glade.h:91
 msgid "Search for Strongs Numbers like G4442 or H1121"
 msgstr "Zoek naar Strongs-getallen zoals G4442 of H1121"
 
-#: ../ui/search-dialog.glade.h:90
+#: ../ui/search-dialog.glade.h:92
 msgid "Search in footnotes"
 msgstr "Zoeken in voetnoten"
 
-#: ../ui/search-dialog.glade.h:91
+#: ../ui/search-dialog.glade.h:93
 msgid "Show Footnotes"
 msgstr "Voetnoten tonen"
 
-#: ../ui/search-dialog.glade.h:92
+#: ../ui/search-dialog.glade.h:94
 msgid "Show Footnotes checkbox"
-msgstr ""
+msgstr "Toon Voetnoten selectievakje"
 
-#: ../ui/search-dialog.glade.h:93
+#: ../ui/search-dialog.glade.h:95
 msgid "Show Morphological Tags"
 msgstr "Morfologische markeringen tonen"
 
-#: ../ui/search-dialog.glade.h:94
+#: ../ui/search-dialog.glade.h:96
 msgid "Show Morphological Tags checkbox"
-msgstr ""
+msgstr "Toon Morfologische Tags selectievakje"
 
-#: ../ui/search-dialog.glade.h:95
+#: ../ui/search-dialog.glade.h:97
 msgid "Show Strong's Numbers"
 msgstr "Toon Strongsgetallen"
 
-#: ../ui/search-dialog.glade.h:96
+#: ../ui/search-dialog.glade.h:98
 msgid "Show Strong's Numbers checkbox"
-msgstr ""
+msgstr "Toon Strong's Numbers selectievakje"
 
-#: ../ui/search-dialog.glade.h:97
+#: ../ui/search-dialog.glade.h:99
 msgid "Show in main window"
 msgstr "Hoofdscherm tonen"
 
-#: ../ui/search-dialog.glade.h:98
+#: ../ui/search-dialog.glade.h:100
 msgid "Single module"
 msgstr "Enkele module"
 
-#: ../ui/search-dialog.glade.h:99
+#: ../ui/search-dialog.glade.h:101
 msgid "Single module radiobutton"
-msgstr ""
+msgstr "Enkele module keuzerondje"
 
-#: ../ui/search-dialog.glade.h:100
+#: ../ui/search-dialog.glade.h:102
 msgid "Start/stop searching"
 msgstr "Start/Stop zoeken"
 
-#: ../ui/search-dialog.glade.h:101
+#: ../ui/search-dialog.glade.h:103
 msgid "Strongs Numbers"
 msgstr "Strongs-getallen"
 
-#: ../ui/search-dialog.glade.h:102
+#: ../ui/search-dialog.glade.h:104
 msgid "Strongs Numbers radiobutton"
-msgstr ""
+msgstr "Strong nummers keuzerondje"
 
-#: ../ui/search-dialog.glade.h:103
+#: ../ui/search-dialog.glade.h:105
 msgid "Use a custom module list for the search"
 msgstr "Gebruik een aangepaste modulelijst voor het zoeken"
 
-#: ../ui/search-dialog.glade.h:104
+#: ../ui/search-dialog.glade.h:106
 msgid "Use a custom range for the scope of the search"
 msgstr "Een aangepaste reeks als zoekruimte gebruiken"
 
-#: ../ui/search-dialog.glade.h:105
+#: ../ui/search-dialog.glade.h:107
 msgid "Use a single module for the search"
 msgstr "Zoek binnen een enkele module"
 
-#: ../ui/search-dialog.glade.h:106
+#: ../ui/search-dialog.glade.h:108
 msgid "Use the current module list for the search"
 msgstr "Gebruik de huidige lijst met modules om te zoeken"
 
-#: ../ui/search-dialog.glade.h:107
+#: ../ui/search-dialog.glade.h:109
 msgid "Use the results of the last search as the scope of the search"
 msgstr "Beperk de zoekruimte tot de laatste zoekresultaten"
 
-#: ../ui/search-dialog.glade.h:108
+#: ../ui/search-dialog.glade.h:110
 msgid "e.g. Matt-John;Rev4"
 msgstr "bijv. Matt-John;Rev4"
 
-#: ../ui/search-dialog.glade.h:109
+#: ../ui/search-dialog.glade.h:111
 msgid "for "
 msgstr "Tekst bevat "
 
@@ -2976,669 +3259,667 @@ msgid "About _Xiphos"
 msgstr "Over _Xiphos"
 
 #: ../ui/xi-menus.glade.h:4
+msgid "Add Item"
+msgstr "Add Item"
+
+#: ../ui/xi-menus.glade.h:5
+msgid "Add Sub-Item"
+msgstr "Voeg Sub-item"
+
+#: ../ui/xi-menus.glade.h:6
+msgid "Add a sub-item"
+msgstr "Voeg een sub-item"
+
+#: ../ui/xi-menus.glade.h:7
+msgid "Add an item"
+msgstr "Item toevoegen"
+
+#: ../ui/xi-menus.glade.h:8
 msgid "Add new folder to selected folder"
 msgstr "Nieuwe map toevoegen aan de geselecteerde map"
 
-#: ../ui/xi-menus.glade.h:6
+#: ../ui/xi-menus.glade.h:10
 msgid "Allow Reordering"
 msgstr "Herschikken toestaan"
 
-#: ../ui/xi-menus.glade.h:7
+#: ../ui/xi-menus.glade.h:11
 msgid "Allow items to be moved from one folder to another"
 msgstr "Items tussen mappen verplaatsen toestaan"
 
-#: ../ui/xi-menus.glade.h:9
+#: ../ui/xi-menus.glade.h:12
+msgid "Annotate Verse"
+msgstr "Commenteren Vers"
+
+#: ../ui/xi-menus.glade.h:14
+msgid "Browse in BibleMap.org"
+msgstr "Bladeren in BibleMap.org"
+
+#: ../ui/xi-menus.glade.h:15
 msgid "Collapse All"
 msgstr "Alles inklappen"
 
-#: ../ui/xi-menus.glade.h:10
+#: ../ui/xi-menus.glade.h:16
 msgid "Collapse all Bookmarks groups"
 msgstr "Alle referenties inklappen"
 
-#: ../ui/xi-menus.glade.h:11
+#: ../ui/xi-menus.glade.h:17
 msgid "Commentary by Chapter"
 msgstr "Commentaar per hoofdstuk"
 
-#: ../ui/xi-menus.glade.h:13
+#: ../ui/xi-menus.glade.h:19
+msgid "Create a new daily journal"
+msgstr "Maak een nieuwe dagelijkse journaal"
+
+#: ../ui/xi-menus.glade.h:20
+msgid "Create a new monthly journal"
+msgstr "Maak een nieuw maandblad"
+
+#: ../ui/xi-menus.glade.h:21
+msgid "Create a new outlined topic"
+msgstr "Maak een nieuw onderwerp geschetste"
+
+#: ../ui/xi-menus.glade.h:22
+msgid "Create a new simple prayer list"
+msgstr "Een eenvoudige gebedslijst maken"
+
+#: ../ui/xi-menus.glade.h:23
+msgid "Create a new subject prayer list"
+msgstr "Maak een nieuw onderwerp gebed lijst"
+
+#: ../ui/xi-menus.glade.h:24
 msgid "D_ouble-Space Text"
 msgstr "Dubbele spatiëring"
 
-#: ../ui/xi-menus.glade.h:14
+#: ../ui/xi-menus.glade.h:25
+msgid "Daily"
+msgstr "Dagelijks"
+
+#: ../ui/xi-menus.glade.h:26
 msgid "Delete Item"
 msgstr "Item verwijderen"
 
-#: ../ui/xi-menus.glade.h:15
+#: ../ui/xi-menus.glade.h:27
 msgid "Delete item"
 msgstr "Item verwijderen"
 
-#: ../ui/xi-menus.glade.h:16
-msgid "Dictionary/_Lexicon"
-msgstr "Woordenboek/_Lexicon"
+#: ../ui/xi-menus.glade.h:28
+msgid "Dictionar_y"
+msgstr "Woordenboek"
 
-#: ../ui/xi-menus.glade.h:17
+#: ../ui/xi-menus.glade.h:29
 msgid "Display Book Heading"
 msgstr "Toon boektitel"
 
-#: ../ui/xi-menus.glade.h:18
+#: ../ui/xi-menus.glade.h:30
 msgid "Display Chapter Heading"
 msgstr "Toon hoofdstuktitel"
 
-#: ../ui/xi-menus.glade.h:19
+#: ../ui/xi-menus.glade.h:31
 msgid "Dump Pers.Comm."
 msgstr "Persoonlijk commentaar verwijderen."
 
-#: ../ui/xi-menus.glade.h:21
+#: ../ui/xi-menus.glade.h:33
 msgid "Edit bookmark item"
 msgstr "Bladwijzeritem bewerken"
 
-#: ../ui/xi-menus.glade.h:22
+#: ../ui/xi-menus.glade.h:34
+msgid "Edit this item"
+msgstr "Item bewerken"
+
+#: ../ui/xi-menus.glade.h:35
 msgid "Expand All"
 msgstr "Alles uitklappen"
 
-#: ../ui/xi-menus.glade.h:23
+#: ../ui/xi-menus.glade.h:36
 msgid "Expand all Bookmarks groups"
 msgstr "Alle bladwijzergroepen uitklappen"
 
-#: ../ui/xi-menus.glade.h:24
-msgid "File"
-msgstr "Bestand"
+#: ../ui/xi-menus.glade.h:37
+msgid "Export Folder"
+msgstr "Export Folder"
 
-#: ../ui/xi-menus.glade.h:30
+#: ../ui/xi-menus.glade.h:38
+msgid "Export List"
+msgstr "Ausfuhrliste"
+
+#: ../ui/xi-menus.glade.h:45
 msgid "Image Content"
 msgstr "Illustratie Inhoud"
 
-#: ../ui/xi-menus.glade.h:31
+#: ../ui/xi-menus.glade.h:46
 msgid "Import Bibletime Bookmarks"
 msgstr "Bibletime-bladwijzers importeren"
 
-#: ../ui/xi-menus.glade.h:32
+#: ../ui/xi-menus.glade.h:47
 msgid "Insert Bookmark"
 msgstr "Bladwijzer toevoegen"
 
-#: ../ui/xi-menus.glade.h:33
+#: ../ui/xi-menus.glade.h:48
 msgid "Insert new bookmark here"
 msgstr "Bladwijzer hier toevoegen"
 
-#: ../ui/xi-menus.glade.h:34
+#: ../ui/xi-menus.glade.h:49
 msgid "L_ink Tabs"
 msgstr "Tabs synchron_iseren"
 
-#: ../ui/xi-menus.glade.h:36
+#: ../ui/xi-menus.glade.h:51
 msgid "Load Bookmarks from Bibletime"
 msgstr "Bladwijzers van Bibletime laden"
 
-#: ../ui/xi-menus.glade.h:37
+#: ../ui/xi-menus.glade.h:52
 msgid "Lookup Selection"
 msgstr "Selectie bekijken"
 
-#: ../ui/xi-menus.glade.h:41
+#: ../ui/xi-menus.glade.h:54
+msgid "Monthly"
+msgstr "Maandelijks"
+
+#: ../ui/xi-menus.glade.h:57
 msgid "Note"
 msgstr "Notitie"
 
-#: ../ui/xi-menus.glade.h:42
+#: ../ui/xi-menus.glade.h:58
 msgid "Open Module"
 msgstr "Module openen"
 
-#: ../ui/xi-menus.glade.h:43
-#, fuzzy
+#: ../ui/xi-menus.glade.h:59
 msgid "Open Study_pad"
-msgstr "O_pen het notitieblok"
+msgstr "Open StudyPad"
 
-#: ../ui/xi-menus.glade.h:44
+#: ../ui/xi-menus.glade.h:60
 msgid "Open in a dialog"
 msgstr "Open in een venster"
 
-#: ../ui/xi-menus.glade.h:46
-#, fuzzy
+#: ../ui/xi-menus.glade.h:61
+msgid "Open in a separate window"
+msgstr "Openen in een nieuw scherm"
+
+#: ../ui/xi-menus.glade.h:62
+msgid "Open in editor"
+msgstr "In editor openen"
+
+#: ../ui/xi-menus.glade.h:63
 msgid "Open in new tab"
-msgstr "In een nieuw tabblad openen"
+msgstr "Openen in nieuw tabblad"
 
-#: ../ui/xi-menus.glade.h:47
+#: ../ui/xi-menus.glade.h:64
+msgid ""
+"Open selected module in a\n"
+"\tseparate ['dialog'] window"
+msgstr ""
+"Open geselecteerde module in een\n"
+"\t aparte [ 'dialoog'] venster"
+
+#: ../ui/xi-menus.glade.h:66
+msgid "Open selected module in a new tab"
+msgstr "Geselecteerde module in een nieuw tabblad openen"
+
+#: ../ui/xi-menus.glade.h:67
 msgid "Open this bookmark in a dialog"
 msgstr "Open deze bladwijzer in een venster"
 
-#: ../ui/xi-menus.glade.h:48
+#: ../ui/xi-menus.glade.h:68
 msgid "Open this bookmark in a new tab"
 msgstr "Open deze bladwijzer in een nieuw tabblad"
 
-#: ../ui/xi-menus.glade.h:50
+#: ../ui/xi-menus.glade.h:69
+msgid "Outlined"
+msgstr "Outlined"
+
+#: ../ui/xi-menus.glade.h:71
 msgid "Read Selection Aloud"
 msgstr "Selectie hardop voorlezen"
 
-#: ../ui/xi-menus.glade.h:51
-msgid "Remove - Restore"
-msgstr "Verwijderen - Herstellen"
-
-#: ../ui/xi-menus.glade.h:52
-msgid "Remove Folder"
-msgstr "Map verwijderen"
-
-#: ../ui/xi-menus.glade.h:53
+#: ../ui/xi-menus.glade.h:73
 msgid "Remove folder and save it"
 msgstr "Map verwijderen en opslaan"
 
-#: ../ui/xi-menus.glade.h:54
+#: ../ui/xi-menus.glade.h:74
+msgid "Remove this item"
+msgstr "Item verwijderen"
+
+#: ../ui/xi-menus.glade.h:75
 msgid "Rename Pers.Comm."
 msgstr "Persoonlijk commentaar hernoemen."
 
-#: ../ui/xi-menus.glade.h:55
+#: ../ui/xi-menus.glade.h:76
 msgid "Respect Font Faces"
 msgstr "Letterbeeld behouden"
 
-#: ../ui/xi-menus.glade.h:56
+#: ../ui/xi-menus.glade.h:77
 msgid "Restore Folder"
 msgstr "Map herstellen"
 
-#: ../ui/xi-menus.glade.h:57
+#: ../ui/xi-menus.glade.h:78
 msgid "Restore saved folder"
 msgstr "Herstel opgeslagen map"
 
-#: ../ui/xi-menus.glade.h:58
-#, fuzzy
+#: ../ui/xi-menus.glade.h:79
 msgid "Save list as a series of bookmarks"
-msgstr "Zoekresultaten als bladwijzers opslaan"
+msgstr "Lijst opslaan als een reeks van bladwijzers"
 
-#: ../ui/xi-menus.glade.h:59
-#, fuzzy
+#: ../ui/xi-menus.glade.h:80
 msgid "Save list as a single bookmark"
-msgstr "Zoekresultaten als bladwijzers opslaan"
+msgstr "Lijst opslaan als een bladwijzer"
 
-#: ../ui/xi-menus.glade.h:60
-#, fuzzy
+#: ../ui/xi-menus.glade.h:81
 msgid "Save these results as a series of bookmarks in their own folder"
-msgstr "Zoekresultaten als bladwijzers opslaan"
+msgstr "Sla deze resultaten als een reeks van bladwizjers in hun eigen map"
 
-#: ../ui/xi-menus.glade.h:61
-#, fuzzy
+#: ../ui/xi-menus.glade.h:82
 msgid "Save these results as a single bookmark"
-msgstr "Zoekresultaten als bladwijzers opslaan"
+msgstr "Sla deze resultaten als een bladwijzer"
 
-#: ../ui/xi-menus.glade.h:62
+#: ../ui/xi-menus.glade.h:83
 msgid "Scripture Cross-references"
 msgstr "Kruisverwijzingen"
 
-#: ../ui/xi-menus.glade.h:64
-#, fuzzy
+#: ../ui/xi-menus.glade.h:85
 msgid "Show Parallel View in a _Tab"
-msgstr "Parallelweergave"
+msgstr "Toon Parallel Bekijk in een Tab"
 
-#: ../ui/xi-menus.glade.h:65
+#: ../ui/xi-menus.glade.h:86
 msgid "Show Previe_wer in the Sidebar"
-msgstr ""
+msgstr "Toon Previewer in de zijbalk"
 
-#: ../ui/xi-menus.glade.h:66
+#: ../ui/xi-menus.glade.h:87
 msgid "Show Verse _Numbers"
 msgstr "Versnummers tonen"
 
-#: ../ui/xi-menus.glade.h:69
+#: ../ui/xi-menus.glade.h:88
+msgid "Simple"
+msgstr "Eenvoudig"
+
+#: ../ui/xi-menus.glade.h:90
+msgid "Subject"
+msgstr "Onderwerp"
+
+#: ../ui/xi-menus.glade.h:92
 msgid "Unlock This Module"
 msgstr "Open deze module"
 
-#: ../ui/xi-menus.glade.h:70
+#: ../ui/xi-menus.glade.h:93
 msgid "Use Current Dictionary"
 msgstr "Gebruik huidig woordenboek"
 
-#: ../ui/xi-menus.glade.h:71
+#: ../ui/xi-menus.glade.h:94
 msgid "Use module manager to install and remove Sword modules"
-msgstr ""
-"Gebruik het Modulebeheer om SWORD-modules te installeren of te verwijderen"
+msgstr "Gebruik het Modulebeheer om SWORD-modules te installeren of te verwijderen"
 
-#: ../ui/xi-menus.glade.h:72
+#: ../ui/xi-menus.glade.h:95
 msgid "Variants"
 msgstr "Varianten"
 
-#: ../ui/xi-menus.glade.h:74
-#, fuzzy
+#: ../ui/xi-menus.glade.h:97
 msgid "_About The SWORD Project"
-msgstr "Over het SWORD-project"
+msgstr "Over The SWORD Project"
 
-#: ../ui/xi-menus.glade.h:75
+#: ../ui/xi-menus.glade.h:98
 msgid "_Advanced Search"
 msgstr "_Geavanceerd zoeken"
 
-#: ../ui/xi-menus.glade.h:76
+#: ../ui/xi-menus.glade.h:99
 msgid "_Attach/Detach Sidebar"
 msgstr "Zijbalk koppelen/ontkoppelen"
 
-#: ../ui/xi-menus.glade.h:77
-#, fuzzy
-msgid "_Bible Text"
-msgstr "_Bijbelteksten"
+#: ../ui/xi-menus.glade.h:100
+msgid "_Bible"
+msgstr "Bijbel"
 
-#: ../ui/xi-menus.glade.h:78
-msgid "_Commentary"
-msgstr "_Commentaar"
+#: ../ui/xi-menus.glade.h:101
+msgid "_Commentary/Book"
+msgstr "Commentaar/boeken"
 
-#: ../ui/xi-menus.glade.h:79
+#: ../ui/xi-menus.glade.h:102
 msgid "_Contents"
 msgstr "Inhoud"
 
-#: ../ui/xi-menus.glade.h:80
+#: ../ui/xi-menus.glade.h:103
 msgid "_Daily Devotion"
 msgstr "_Dagboek"
 
-#: ../ui/xi-menus.glade.h:81
+#: ../ui/xi-menus.glade.h:104
 msgid "_Edit"
 msgstr "B_ewerken"
 
-#: ../ui/xi-menus.glade.h:82
+#: ../ui/xi-menus.glade.h:105
 msgid "_Edit Item"
 msgstr "It_em bewerken"
 
-#: ../ui/xi-menus.glade.h:84
+#: ../ui/xi-menus.glade.h:107
 msgid "_Help"
 msgstr "_Hulp"
 
-#: ../ui/xi-menus.glade.h:85
+#: ../ui/xi-menus.glade.h:108
 msgid "_Highlight Current Verse"
 msgstr "Geselecteerde vers benadrukken"
 
-#: ../ui/xi-menus.glade.h:86
+#: ../ui/xi-menus.glade.h:109
 msgid "_Live Chat"
 msgstr "_Live chat"
 
-#: ../ui/xi-menus.glade.h:87
+#: ../ui/xi-menus.glade.h:110
 msgid "_Mailing List"
 msgstr "E-maillijst"
 
-#: ../ui/xi-menus.glade.h:88
+#: ../ui/xi-menus.glade.h:111
 msgid "_Module Manager"
 msgstr "Modulebeheer"
 
-#: ../ui/xi-menus.glade.h:89
+#: ../ui/xi-menus.glade.h:112
 msgid "_Open Session"
 msgstr "Sessie _openen"
 
-#: ../ui/xi-menus.glade.h:90
+#: ../ui/xi-menus.glade.h:113
 msgid "_Preferences"
 msgstr "Voorkeuren"
 
-#: ../ui/xi-menus.glade.h:91
+#: ../ui/xi-menus.glade.h:114
 msgid "_Preview"
 msgstr "Afdrukvoorbeeld"
 
-#: ../ui/xi-menus.glade.h:92
+#: ../ui/xi-menus.glade.h:115
 msgid "_Read Aloud"
 msgstr "Ha_rdop voorlezen"
 
-#: ../ui/xi-menus.glade.h:93
+#: ../ui/xi-menus.glade.h:116
 msgid "_Report Bug"
 msgstr "Fout rapporteren"
 
-#: ../ui/xi-menus.glade.h:94
+#: ../ui/xi-menus.glade.h:117
 msgid "_Save Session"
 msgstr "Sessie op_slaan"
 
-#: ../ui/xi-menus.glade.h:95
+#: ../ui/xi-menus.glade.h:118
 msgid "_Search"
 msgstr "_Zoeken"
 
-#: ../ui/xi-menus.glade.h:96
-msgid "_Show/Hide Sidebar"
-msgstr "Zijbalk tonen/verbergen"
+#: ../ui/xi-menus.glade.h:119
+msgid "_Show/Hide Attached Sidebar"
+msgstr "Show/Hide Bijgevoegde Sidebar"
 
-#: ../ui/xi-menus.glade.h:97
+#: ../ui/xi-menus.glade.h:120
 msgid "_Verse Per Line"
 msgstr "Eén vers per regel"
 
-#: ../ui/xi-menus.glade.h:98
-msgid "_View"
-msgstr "Beel_d"
-
-#~ msgid "Save As"
-#~ msgstr "Opslaan als"
-
-#~ msgid "Untitled document"
-#~ msgstr "Niet-opgeslagen document"
-
-#~ msgid "HTML Output"
-#~ msgstr "HTML-weergave"
-
-#~ msgid "HTML Source"
-#~ msgstr "HTML code"
-
-#~ msgid "Plain Source"
-#~ msgstr "Platte tekst"
-
-#~ msgid "_Quit"
-#~ msgstr "Afsluiten"
-
-#~ msgid "_Open"
-#~ msgstr "_Openen"
-
-#~ msgid "_Save"
-#~ msgstr "Op_slaan"
-
-#~ msgid "Save _As..."
-#~ msgstr "Bestand opslaan _als..."
-
-#~ msgid "HTML _Output"
-#~ msgstr "HTML _Output"
-
-#~ msgid "_HTML Source"
-#~ msgstr "_HTML broncode"
-
-#~ msgid "_Plain Source"
-#~ msgstr "_Platte tekst"
-
-#~ msgid "Are you sure you want to delete the note for"
-#~ msgstr "Weet u zeker dat u de notitie wilt verwijderen voor"
-
-#~ msgid "Save the changes to document"
-#~ msgstr "Wijzigingen opslaan"
-
-#~ msgid "before closing?"
-#~ msgstr "voor afsluiten?"
-
-#~ msgid "If you don't save, changes will be permanently lost."
-#~ msgstr "Wijzigingen gaan verloren als u niet opslaat."
-
-#~ msgid "StudyPad"
-#~ msgstr "Notitieblok"
-
-#~ msgid "Note Editor"
-#~ msgstr "Notitieblok"
+#: ../xiphos.desktop.in.in.h:1
+msgid "Study the Bible"
+msgstr "Onderzoek de Bijbel"
 
-#~ msgid "Prayer List/Journal Editor"
-#~ msgstr "Gebedslijst/Berichten-editor"
+#: ../xiphos.desktop.in.in.h:2
+msgid "Xiphos Bible Guide"
+msgstr "Xiphos Bijbelgids"
 
+#~ msgid "Move backwards through history"
+#~ msgstr "Schuif terugwaarts in de geschiedenis"
+#~ msgid "Move foward through history"
+#~ msgstr "Schuif voorwaarts in de geschiedenis"
+#~ msgid "Select a Book of the Bible"
+#~ msgstr "Selecteer een bijbelboek"
+#~ msgid "Change Chapter"
+#~ msgstr "Hoofdstuk wijzigen"
+#~ msgid "Change Verse"
+#~ msgstr "Vers wijzigen"
+#~ msgid "Enter a Verse reference in Book 1:1 format and press Return"
+#~ msgstr "Geef een versreferentie in Boek 1:1 formaat en druk op Enter"
+#~ msgid "Install these modules:"
+#~ msgstr "Deze modules installeren:"
+#~ msgid "Remove these modules:"
+#~ msgstr "Deze modules verwijderen:"
+#~ msgid "Archive these modules:"
+#~ msgstr "Back-up maken van:"
+#~ msgid ""
+#~ "Build fast-search index for these\n"
+#~ "modules (may take minutes/module):"
+#~ msgstr ""
+#~ "Snelzoek-index voor deze modules maken\n"
+#~ "(duurt enkele minuten):"
+#~ msgid "Delete fast-search index for these modules:"
+#~ msgstr "Snelzoek-index van deze modules verwijderen:"
+#~ msgid "Xiphos could not execute archiver"
+#~ msgstr "Xiphos kon het backupbeheer niet starten"
+#~ msgid ""
+#~ " archival result:\n"
+#~ "\n"
+#~ msgstr ""
+#~ " archiveer resultaat:\n"
+#~ "\n"
+#~ msgid ""
+#~ "\n"
+#~ "Archive in "
+#~ msgstr ""
+#~ "\n"
+#~ "Back-up in "
+#~ msgid "Refreshing remote"
+#~ msgstr "Bezig met zoeken naar updates"
+#~ msgid "Remote not found"
+#~ msgstr "Externe bron niet gevonden"
+#~ msgid "Sources"
+#~ msgstr "Bronnen"
+#~ msgid "Open in a new tab"
+#~ msgstr "In een nieuw tabblad openen"
+#~ msgid "Open selected module in a separate ['dialog'] window"
+#~ msgstr "Geselecteerde module in een dialoogvenster openen"
+#~ msgid "View information about the selected dialog"
+#~ msgstr "Informatie over het geselecteerde dialoogvenster tonen"
+#~ msgid "Create a new prayer list"
+#~ msgstr "Een nieuwe gebedslijst maken"
+#~ msgid "Daily Journal"
+#~ msgstr "Dagelijkse berichten"
+#~ msgid "Outlined Topic"
+#~ msgstr "Uitgelijnd onderwerp"
+#~ msgid "Open selected module in a dialog"
+#~ msgstr "Geselecteerde module in een dialoogvenster openen"
+#~ msgid "Text"
+#~ msgstr "Tekst"
+#~ msgid "Text to render"
+#~ msgstr "Te genereren tekst"
+#~ msgid "Add Child"
+#~ msgstr "Kind toevoegen"
+#~ msgid "Add Sibling"
+#~ msgstr "Element toevoegen"
+#~ msgid "Eph 2:8"
+#~ msgstr "Ef 2:8"
+#~ msgid "H_istory/<Separator>"
+#~ msgstr "_Geschiedenis<Separator>"
+#~ msgid "H_istory/C_lear"
+#~ msgstr "_Geschiedenis/_Wissen"
+#~ msgid "Xiphos has renamed .xiphos-2.0 to .xiphos"
+#~ msgstr "Xiphos heeft .xiphos-2.0 hernoemd naar .xiphos"
+#~ msgid ""
+#~ "Xiphos can not rename  .xiphos-2.0 to .xiphos:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Xiphos cannot continue."
+#~ msgstr ""
+#~ "Xiphos kan .xiphos-2.0 niet hernoemen naar .xiphos:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Xiphos zal worden afgesloten."
+#~ msgid "Base text size"
+#~ msgstr "Standaard lettertypegrootte"
+#~ msgid "Dictionary/_Lexicon"
+#~ msgstr "Woordenboek/_Lexicon"
+#~ msgid "Remove - Restore"
+#~ msgstr "Verwijderen - Herstellen"
+#~ msgid "Remove Folder"
+#~ msgstr "Map verwijderen"
+#~ msgid "_Commentary"
+#~ msgstr "_Commentaar"
+#~ msgid "_Show/Hide Sidebar"
+#~ msgstr "Zijbalk tonen/verbergen"
 #~ msgid "Open StudyPad File"
 #~ msgstr "Open notitieblokbestand"
-
 #~ msgid "Save StudyPad File"
 #~ msgstr "Notitieblokbestand opslaan"
-
 #~ msgid "item1"
 #~ msgstr "item1"
-
 #~ msgid "item2"
 #~ msgstr "item2"
-
 #~ msgid "_Module Options"
 #~ msgstr "_Moduleopties"
-
 #~ msgid "Sync with main"
 #~ msgstr "Synchroniseer met main"
-
 #~ msgid "Stay in sync"
 #~ msgstr "Synchroon houden"
-
-#~ msgid ""
-#~ "Renaming is not available in Windows.\n"
-#~ "\n"
-#~ "Xiphos is limited by Windows' filesystem,\n"
-#~ "because it disallows the renaming of filename\n"
-#~ "components of currently-open files,\n"
-#~ "such as the contents of this commentary.\n"
-#~ "Therefore, personal commentary renaming is\n"
-#~ "not available in the Windows environment."
-#~ msgstr ""
-#~ "Hernoemen is niet mogelijk in Windows.\n"
-#~ "\n"
-#~ "Xiphos wordt beperkt door Windows'\n"
-#~ "bestandssysteem. Daardoor is het niet mogelijk\n"
-#~ "om geopende bestanden te hernoemen,\n"
-#~ "zoals de inhoud van dit commentaar."
-
-#~ msgid "Rename Commentary"
-#~ msgstr "Commentaar hernoemen"
-
-#~ msgid "Choose Commentary Name"
-#~ msgstr "Commentaarnaam kiezen"
-
-#~ msgid "New Name"
-#~ msgstr "Nieuwe naam"
-
-#~ msgid ""
-#~ "Failed to create new configuration:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Maken van een nieuwe configuratie is mislukt:\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "Configuration build error:\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Fout bij het aanmaken van de configuratie:\n"
-#~ "\n"
-
 #~ msgid "Print"
 #~ msgstr "Afdrukken"
-
 #~ msgid "Print Preview"
 #~ msgstr "Afdrukvoorbeeld"
-
 #~ msgid "Failed to print the document"
 #~ msgstr "Afdrukken is mislukt"
-
 #~ msgid "Save List"
 #~ msgstr "Lijst opslaan"
-
 #~ msgid "_Modules"
 #~ msgstr "_Modules"
-
 #~ msgid "_Bookmarks"
 #~ msgstr "_Bladwijzers"
-
 #~ msgid "Verse _List"
 #~ msgstr "Vers_lijst"
-
 #~ msgid "%s not found"
 #~ msgstr "%s is niet gevonden"
-
 #~ msgid "has been modified. Do you wish to save it?"
 #~ msgstr "is gewijzigd. Wijzigingen opslaan?"
-
 #~ msgid "not loaded"
 #~ msgstr "niet geladen"
-
 #~ msgid "Open the StudyPad editor"
 #~ msgstr "Notitieblok-editor openen"
-
 #~ msgid "Open a saved session"
 #~ msgstr "Open een opgeslagen sessie"
-
 #~ msgid "Save the current session to a file"
 #~ msgstr "Huidige sessie als bestand opslaan"
-
 #~ msgid "_Copy"
 #~ msgstr "Kopiëren"
-
 #~ msgid "Copy highlighted text from main window"
 #~ msgstr "Geselecteerde tekst van hoofdscherm kopiëren"
-
 #~ msgid "Search using the shortcut bar"
 #~ msgstr "Zoek met behulp van de snelkoppelingen balk"
-
 #~ msgid "Advanced search using the search dialog"
 #~ msgstr "Geavanceerd zoeken met het zoekvenster"
-
 #~ msgid "Set user preferences"
 #~ msgstr "Gebruikersinstellingen"
-
 #~ msgid "C_lear"
 #~ msgstr "_Wissen"
-
 #~ msgid "Clear history list"
 #~ msgstr "Geschiedenis wissen"
-
 #~ msgid "Show the Daily Devotion for today"
 #~ msgstr "Dagboek van vandaag tonen"
-
 #~ msgid "Show or hide Bible texts window"
 #~ msgstr "Bijbeltekstenscherm tonen of verbergen"
-
 #~ msgid "Show or hide Preview window"
 #~ msgstr "Toon of verberg Voorbeeldscherm"
-
 #~ msgid "Show or hide commentaries"
 #~ msgstr "Toon of verberg commentaren"
-
 #~ msgid "Show or hide - dictionaries and lexicons"
 #~ msgstr "Toon of verberg - woordenboeken en lexicons"
-
 #~ msgid "Open the Xiphos manual"
 #~ msgstr "Xiphos's gebruikershandleiding openen"
-
 #~ msgid "Sign up for the users' mailing list"
 #~ msgstr "Meld je aan voor de gebruikers e-maillijst"
-
 #~ msgid "Chat with other users and developers"
 #~ msgstr "Chat met andere gebruikers en ontwikkelaars"
-
 #~ msgid "Report bug to SourceForge"
 #~ msgstr "Meld een fout bij SourceForge"
-
 #~ msgid "Translating Xiphos to other languages"
 #~ msgstr "Xiphos vertalen"
-
 #~ msgid "More information about the SWORD Project"
 #~ msgstr "Meer informatie over het SWORD-project"
-
 #~ msgid "About this application"
 #~ msgstr "Over deze toepassing"
-
 #~ msgid "Hi_story"
 #~ msgstr "_Geschiedenis"
-
 #~ msgid "1 Cor 15:1"
 #~ msgstr "1 Kor 15:1"
-
 #~ msgid "Name for new prayer list"
 #~ msgstr "Gebedslijst naam"
-
 #~ msgid "can not create path\n"
 #~ msgstr "Aanmaken pad mislukt\n"
-
 #~ msgid "Prayer list already exist\n"
 #~ msgstr "Gebedslijst bestaat altijd\n"
-
 #~ msgid "\\par\\par My prayer list \\par\\par Module created in Xiphos"
 #~ msgstr "\\par\\par Mijn gebedslijst \\par\\par Module aangemaakt met Xiphos"
-
-#~ msgid "Delete Index"
-#~ msgstr "Zoekindex verwijderen"
-
 #~ msgid "+5"
 #~ msgstr "+5"
-
 #~ msgid "+4"
 #~ msgstr "+4"
-
 #~ msgid "+3"
 #~ msgstr "+3"
-
 #~ msgid "+2"
 #~ msgstr "+2"
-
 #~ msgid "+1"
 #~ msgstr "+1"
-
 #~ msgid "-1"
 #~ msgstr "-1"
-
 #~ msgid "-2"
 #~ msgstr "-2"
-
 #~ msgid "-3"
 #~ msgstr "-3"
-
 #~ msgid "Starting"
 #~ msgstr "Bezig met starten"
-
 #~ msgid "Building Xiphos interface"
 #~ msgstr "Bezig met opbouwen Xiphos interface"
-
 #~ msgid "Initiating Xiphos"
 #~ msgstr "Initialiseren Xiphos"
-
 #~ msgid "done"
 #~ msgstr "klaar"
-
 #~ msgid "Xiphos is shutdown"
 #~ msgstr "Xiphos wordt afgesloten"
-
 #~ msgid "Initiating SWORD"
 #~ msgstr "Bezig met initialiseren van Xiphos"
-
 #~ msgid "path to sword"
 #~ msgstr "pad naar sword"
-
 #~ msgid "System locale is"
 #~ msgstr "Systeem lokalisatie is"
-
 #~ msgid "SWORD locale is"
 #~ msgstr "SWORD lokalisatie is"
-
 #~ msgid "Checking for SWORD Modules"
 #~ msgstr "Bezig met zoeken naar SWORD-modules"
-
 #~ msgid "SWORD is shutdown"
 #~ msgstr "SWORD wordt afgesloten"
-
 #~ msgid "Number of Text modules"
 #~ msgstr "Aantal bijbelvertalingmodules"
-
 #~ msgid "Number of Commentary modules"
 #~ msgstr "Aantal commentaarmodules"
-
 #~ msgid "Number of Dict/lex modules"
 #~ msgstr "Aantal woordenboek/lexiconmodules"
-
 #~ msgid "Number of Book modules"
 #~ msgstr "Aantal boekmodules"
-
 #~ msgid "Number of Devotion modules"
 #~ msgstr "Aantal dagboekmodules"
-
 #~ msgid "Number of Prayer modules"
 #~ msgstr "Aantal gebedsmodules"
-
 #~ msgid ""
 #~ "\n"
 #~ "First Run: need to create settings!\n"
 #~ msgstr ""
 #~ "\n"
 #~ "Eerste start: configuratie vereist!\n"
-
 #~ msgid "can not create  .sword"
 #~ msgstr "Kan .sword niet aanmaken"
-
 #~ msgid "can not create  .sword/mods.d"
 #~ msgstr "Kan .sword/mods.d niet aanmaken"
-
 #~ msgid "can not create  .sword/modules"
 #~ msgstr "Kan .sword/modules niet aanmaken"
-
 #~ msgid "Select Local Source"
 #~ msgstr "Selecteer een lokale bron"
-
 #~ msgid "It will be lost permanently!"
 #~ msgstr "Het gaat definitief verloren!"
-
 #~ msgid "Open file..."
 #~ msgstr "Bestand openen..."
-
 #~ msgid "Save file as..."
 #~ msgstr "Bestand opslaan als..."
-
 #~ msgid "Open in dialog"
 #~ msgstr "In een dialoogvenster openen"
-
 #~ msgid ""
 #~ "For multi-word search, use\n"
 #~ "+FirstWord +SecondWord"
 #~ msgstr ""
 #~ "Gebruik bij meerdere zoekwoorden het plus-teken:\n"
 #~ "+EersteWoord + TweedeWoord"
-
 #~ msgid "_About the SWORD Project ..."
 #~ msgstr "Over het SWORD-project ..."
-
 #~ msgid "Select the modules you want"
 #~ msgstr "Selecteer de gewenste modules"
-
 #~ msgid ""
 #~ "There is currently no program set as your\n"
 #~ "handler for \"sword://\" and similar URLs.\n"
@@ -3649,678 +3930,418 @@ msgstr "Beel_d"
 #~ "\"sword://\" and gelijkwaardige URLs.\n"
 #~ "Wilt u dat Xiphos wordt ingesteld\n"
 #~ "als standaardprogramma voor deze URLs?"
-
 #~ msgid "<b>Font Miscellaneous</b>"
 #~ msgstr "<b>Overige Lettertypeinstellingen</b>"
-
 #~ msgid "Bible text"
 #~ msgstr "Bijbeltekst"
-
 #~ msgid "Afrikaans"
 #~ msgstr "Afrikaans"
-
 #~ msgid "English, Old (ca.450-1100)"
 #~ msgstr "Oud Engels (ca.450-1100)"
-
 #~ msgid "Arabic"
 #~ msgstr "Arabisch"
-
 #~ msgid "Azerbaijani"
 #~ msgstr "Azerbeidzjaans"
-
 #~ msgid "Belarusian"
 #~ msgstr "Wit-Russisch"
-
 #~ msgid "Bulgarian"
 #~ msgstr "Bulgaars"
-
 #~ msgid "Breton"
 #~ msgstr "Bretons"
-
 #~ msgid "Bosnian"
 #~ msgstr "Bosnisch"
-
 #~ msgid "Catalan"
 #~ msgstr "Catalaans"
-
 #~ msgid "Cebuano"
 #~ msgstr "Cebuano"
-
 #~ msgid "Coptic"
 #~ msgstr "Koptisch"
-
 #~ msgid "Czech"
 #~ msgstr "Tsjechisch"
-
 #~ msgid "Church Slavic"
 #~ msgstr "Oudkerkslavisch"
-
 #~ msgid "Welsh"
 #~ msgstr "Wels"
-
 #~ msgid "Danish"
 #~ msgstr "Deens"
-
 #~ msgid "German"
 #~ msgstr "Duits"
-
 #~ msgid "Greek, Modern (1453-)"
 #~ msgstr "Modern Grieks (1453-)"
-
 #~ msgid "English"
 #~ msgstr "Engels"
-
 #~ msgid "American English"
 #~ msgstr "Amerikaans Engels"
-
 #~ msgid "English, Middle (1100-1500)"
 #~ msgstr "Midden Engels (1100-1500)"
-
 #~ msgid "Esperanto"
 #~ msgstr "Esperanto"
-
 #~ msgid "Spanish"
 #~ msgstr "Spaans"
-
 #~ msgid "Estonian"
 #~ msgstr "Estisch"
-
 #~ msgid "Basque"
 #~ msgstr "Baskisch"
-
 #~ msgid "Finnish"
 #~ msgstr "Fins"
-
 #~ msgid "French"
 #~ msgstr "Frans"
-
 #~ msgid "Frisian"
 #~ msgstr "Fries"
-
 #~ msgid "Irish"
 #~ msgstr "Iers"
-
 #~ msgid "Gaelic (Scots)"
 #~ msgstr "Schots-Gaelisch"
-
 #~ msgid "Manx"
 #~ msgstr "Manx-Gaelisch"
-
 #~ msgid "Greek, Ancient (to 1453)"
 #~ msgstr "Oud Grieks (tot 1453)"
-
 #~ msgid "Hebrew"
 #~ msgstr "Hebreeuws"
-
 #~ msgid "Hawaiian"
 #~ msgstr "Hawaiiaans"
-
 #~ msgid "Croatian"
 #~ msgstr "Kroatisch"
-
 #~ msgid "Hungarian"
 #~ msgstr "Hongaars"
-
 #~ msgid "Armenian"
 #~ msgstr "Armeens"
-
 #~ msgid "Klingon"
 #~ msgstr "Klingon"
-
 #~ msgid "Icelandic"
 #~ msgstr "IJslands"
-
 #~ msgid "Italian"
 #~ msgstr "Italiaans"
-
 #~ msgid "Japanese"
 #~ msgstr "Japans"
-
 #~ msgid "Georgian"
 #~ msgstr "Georgisch"
-
 #~ msgid "Korean"
 #~ msgstr "Koreaans"
-
 #~ msgid "Kurdish"
 #~ msgstr "Koerdisch"
-
 #~ msgid "Kirghiz"
 #~ msgstr "Kirgizisch"
-
 #~ msgid "Latin"
 #~ msgstr "Latijn"
-
 #~ msgid "Lithuanian"
 #~ msgstr "Litouws"
-
 #~ msgid "Latvian"
 #~ msgstr "Lets"
-
 #~ msgid "Maori"
 #~ msgstr "Maori"
-
 #~ msgid "Macedonian"
 #~ msgstr "Macedonisch"
-
 #~ msgid "Maltese"
 #~ msgstr "Maltees"
-
 #~ msgid "Low German; Low Saxon"
 #~ msgstr "Nederduits"
-
 #~ msgid "Dutch"
 #~ msgstr "Nederlands"
-
 #~ msgid "Norwegian"
 #~ msgstr "Noors"
-
 #~ msgid "Papiamento"
 #~ msgstr "Papiamentu"
-
 #~ msgid "Polish"
 #~ msgstr "Pools"
-
 #~ msgid "Portuguese"
 #~ msgstr "Portugees"
-
 #~ msgid "Romanian"
 #~ msgstr "Roemeens"
-
 #~ msgid "Russian"
 #~ msgstr "Russisch"
-
 #~ msgid "Scots"
 #~ msgstr "Schots"
-
 #~ msgid "Slovak"
 #~ msgstr "Slowaaks"
-
 #~ msgid "Slovenian"
 #~ msgstr "Sloveens"
-
 #~ msgid "Somali"
 #~ msgstr "Somalisch"
-
 #~ msgid "Albanian"
 #~ msgstr "Albanees"
-
 #~ msgid "Swedish"
 #~ msgstr "Zweeds"
-
 #~ msgid "Swahili"
 #~ msgstr "Swahili"
-
 #~ msgid "Syriac"
 #~ msgstr "Syrisch"
-
 #~ msgid "Tamil"
 #~ msgstr "Tamil"
-
 #~ msgid "Thai"
 #~ msgstr "Thais"
-
 #~ msgid "Tagalog"
 #~ msgstr "Tagalog"
-
 #~ msgid "Tswana"
 #~ msgstr "Tswana"
-
 #~ msgid "Turkish"
 #~ msgstr "Turks"
-
 #~ msgid "Tahitian"
 #~ msgstr "Tahitisch"
-
 #~ msgid "Ukrainian"
 #~ msgstr "Oekraiens"
-
 #~ msgid "Vietnamese"
 #~ msgstr "Vietnamees"
-
 #~ msgid "Xhosa"
 #~ msgstr "Xhosa"
-
 #~ msgid "Bavarian"
 #~ msgstr "Beiers"
-
 #~ msgid "Alemannisch"
 #~ msgstr "Alemannisch"
-
 #~ msgid "Haitian Creole French"
 #~ msgstr "Kreyol"
-
 #~ msgid "Itz"
 #~ msgstr "Itza"
-
 #~ msgid "Shuar"
 #~ msgstr "Shuar"
-
 #~ msgid "Kekchi"
 #~ msgstr "Kekchi"
-
 #~ msgid "Lombard"
 #~ msgstr "Lombardisch"
-
 #~ msgid "Tok Pisin"
 #~ msgstr "Tok Pisin"
-
 #~ msgid "Uma"
 #~ msgstr "Uma"
-
 #~ msgid "Romani, Vlax"
 #~ msgstr "Romani, Vlax"
-
 #~ msgid "Sango"
 #~ msgstr "Sango"
-
 #~ msgid "Sranan"
 #~ msgstr "Sranan"
-
 #~ msgid "Chinese"
 #~ msgstr "Chinees"
-
 #~ msgid "Zulu"
 #~ msgstr "Zoeloe"
-
 #~ msgid "found in"
 #~ msgstr "gevonden in"
-
 #~ msgid "The"
 #~ msgstr "De"
-
 #~ msgid "module is locked."
 #~ msgstr "modules is vergrendeld."
-
 #~ msgid "module has been unlocked."
 #~ msgstr "module is beschikbaar."
-
 #~ msgid "If you have the cipher key you can"
 #~ msgstr "Als u de decodeersleutel heeft kunt u"
-
 #~ msgid "click here"
 #~ msgstr "hier klikken"
-
 #~ msgid "to unlock the module"
 #~ msgstr "Ontgrendel deze module"
-
 #~ msgid "You will need to restart Xiphos after you unlock it."
 #~ msgstr "U moet Xiphos herstarten na het ontgrendelen."
-
 #~ msgid "You need to restart Xiphos to view it"
 #~ msgstr "U moet Xiphos herstarten om het te bekijken"
-
-#, fuzzy
-#~ msgid ""
-#~ "Unlink of old configuration failed:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Los maken van oude configuratie niet gelukt:\n"
-#~ "%s"
-
 #~ msgid "Show Tabs"
 #~ msgstr "Tabbladen tonen"
-
 #~ msgid "Go to %s"
 #~ msgstr "Ga naar %s"
-
-#, fuzzy
-#~ msgid "The Setup Druid was cancelled."
-#~ msgstr "The Setup Druid werd geannuleerd."
-
 #~ msgid "Do you wish to set preferences now?"
 #~ msgstr "Wilt u nu instellingen wijzigen?"
-
 #~ msgid "Old"
 #~ msgstr "Oud"
-
-#~ msgid "New"
-#~ msgstr "Nieuw"
-
 #~ msgid "Remove/Archive"
 #~ msgstr "Verwijderen/Archiveer"
-
 #~ msgid "URL:"
 #~ msgstr "URL:"
-
 #~ msgid "Go to parent"
 #~ msgstr "Ga naar bovenliggende"
-
 #~ msgid "Go to first child"
 #~ msgstr "Ga naar het eerste"
-
-#, fuzzy
-#~ msgid "Save using the PersistStream interface"
-#~ msgstr "Opslaan m.b.v. de PersistStream interface"
-
-#, fuzzy
-#~ msgid "Open (PersistFile)"
-#~ msgstr "Open (PersistFile)"
-
-#, fuzzy
-#~ msgid "Open using the PersistFile interface"
-#~ msgstr "Openen m.b.v. de PersistFile interface"
-
 #~ msgid "Save (PersistFile)"
 #~ msgstr "Opslaan (PersistFile)"
-
-#, fuzzy
-#~ msgid "Save using the PersistFile interface"
-#~ msgstr "Opslaan m.b.v. de PersistFile interface"
-
 #~ msgid "Remove failed"
 #~ msgstr "Verwijderen is mislukt"
-
 #~ msgid "-untitled-"
 #~ msgstr "-naamloos-"
-
 #~ msgid "Add reference Link"
 #~ msgstr "Referentieverwijzing toevoegen"
-
 #~ msgid "Link text: "
-#~ msgstr "Verwijzing tekst"
-
-#~ msgid "Export"
-#~ msgstr "Exporteer"
-
+#~ msgstr "Verwijzing tekst "
 #~ msgid "Cut"
 #~ msgstr "Knippen"
-
 #~ msgid "Paste"
 #~ msgstr "Plakken"
-
 #~ msgid "Spell Check"
 #~ msgstr "Spellingscontrole"
-
 #~ msgid "Undo"
 #~ msgstr "Ongedaan maken"
-
 #~ msgid "Replace"
 #~ msgstr "Vervangen"
-
 #~ msgid "Link..."
 #~ msgstr "Verwijzing..."
-
 #~ msgid "Link"
 #~ msgstr "Verwijzing"
-
 #~ msgid "Paragraph"
 #~ msgstr "Paragraaf"
-
 #~ msgid "Page"
 #~ msgstr "Pagina"
-
 #~ msgid "Rule"
 #~ msgstr "Regel"
-
 #~ msgid "Cell"
 #~ msgstr "Cel"
-
 #~ msgid "Paste Quotation"
 #~ msgstr "Citaat plakken"
-
-#~ msgid "Insert Link"
-#~ msgstr "Verwijzing toevoegen"
-
 #~ msgid "Remove Link"
 #~ msgstr "Verwijzing verwijderen"
-
 #~ msgid "Style"
 #~ msgstr "Stijl"
-
 #~ msgid "Text Style..."
 #~ msgstr "Tekstopmaak"
-
 #~ msgid "Paragraph Style..."
 #~ msgstr "Paragraafopmaak"
-
 #~ msgid "Link Style..."
 #~ msgstr "Verwijzingopmaak"
-
 #~ msgid "Rule Style..."
 #~ msgstr "Regelopmaak"
-
 #~ msgid "Image Style..."
 #~ msgstr "Illustratieopmaak"
-
 #~ msgid "Cell Style..."
 #~ msgstr "Celopmaak"
-
 #~ msgid "Table Style..."
 #~ msgstr "Tabelopmaak"
-
 #~ msgid "Page Style..."
 #~ msgstr "Paginaopmaak"
-
 #~ msgid "Table insert"
 #~ msgstr "Tabel invoegen"
-
 #~ msgid "Row above"
 #~ msgstr "Rij omhoog"
-
 #~ msgid "Row below"
 #~ msgstr "Rij beneden"
-
 #~ msgid "Column before"
 #~ msgstr "Kolom voor"
-
 #~ msgid "Column after"
 #~ msgstr "Kolom na"
-
 #~ msgid "Table delete"
 #~ msgstr "Tabel verwijderen"
-
 #~ msgid "Row"
 #~ msgstr "Rij"
-
 #~ msgid "Column"
 #~ msgstr "Kolom"
-
 #~ msgid "Check Word Spelling..."
 #~ msgstr "Spellingcontrole"
-
 #~ msgid "Add Word to"
 #~ msgstr "Woord toevoegen aan"
-
 #~ msgid "Add Word to Dictionary"
 #~ msgstr "Woord toevoegen aan Woordenboek"
-
 #~ msgid "Ignore Misspelled Word"
 #~ msgstr "Spelfout negeren"
-
 #~ msgid "Input Methods"
 #~ msgstr "Invoermethoden"
-
 #~ msgid "Replace confirmation"
 #~ msgstr "Vervangen bevestigen"
-
 #~ msgid "Replace _All"
 #~ msgstr "_Alles vervangen"
-
 #~ msgid "_Next"
 #~ msgstr "_Volgende"
-
 #~ msgid "_Replace"
 #~ msgstr "_Vervangen"
-
 #~ msgid "Search _backward"
 #~ msgstr "Terugwaarts _zoeken"
-
 #~ msgid "Case _sensitive"
 #~ msgstr "Hoofdletter _gevoelig"
-
 #~ msgid "Replace:"
 #~ msgstr "Vervangen:"
-
 #~ msgid "With:"
 #~ msgstr "Met:"
-
 #~ msgid "_Backward"
 #~ msgstr "_Terugwaarts"
-
 #~ msgid "_Regular Expression"
 #~ msgstr "_Reguliere expressie"
-
 #~ msgid "No misspelled word found"
 #~ msgstr "Geen spelfouten gevonden"
-
 #~ msgid "Spell checker"
 #~ msgstr "Spellingcontrole"
-
 #~ msgid "Current _Languages"
 #~ msgstr "Huidige _talen"
-
 #~ msgid "Insert"
 #~ msgstr "Toevoegen"
-
 #~ msgid "Delete Note?"
 #~ msgstr "Notitie verwijderen?"
-
 #~ msgid "Create a new file"
 #~ msgstr "Nieuw bestand"
-
 #~ msgid "Print window contents"
 #~ msgstr "Scherm afdrukken"
-
 #~ msgid "Find in this note"
 #~ msgstr "Zoek in notitie"
-
 #~ msgid "Find and Replace"
 #~ msgstr "Zoeken en vervangen"
-
 #~ msgid "Insert image at cursor"
 #~ msgstr "Illustratie toevoegen op cursor"
-
 #~ msgid "Insert link"
 #~ msgstr "Verwijzing invoegen"
-
 #~ msgid "Insert link at cursor"
 #~ msgstr "Verwijzing invoegen op cursor"
-
 #~ msgid "Insert rule"
 #~ msgstr "Regel invoegen"
-
 #~ msgid "Insert rule at cursor"
 #~ msgstr "Regel invoegen op cursor"
-
 #~ msgid "Insert table"
 #~ msgstr "Tabel invoegen"
-
 #~ msgid "Insert table at cursor"
 #~ msgstr "Tabel invoegen op cursor"
-
 #~ msgid "Check spelling in this note"
 #~ msgstr "Spelling controleren van deze notitie"
-
 #~ msgid "Preformat"
 #~ msgstr "Maak vooraf op"
-
 #~ msgid "Bulleted List"
 #~ msgstr "Ongenummerde lijst"
-
 #~ msgid "Numbered List"
 #~ msgstr "Genummerde lijst"
-
 #~ msgid "Alphabetical List"
 #~ msgstr "Alfabetische lijst"
-
 #~ msgid "Header 1"
 #~ msgstr "Kop 1"
-
 #~ msgid "Header 2"
 #~ msgstr "Kop 2"
-
 #~ msgid "Header 3"
 #~ msgstr "Kop 3"
-
 #~ msgid "Header 4"
 #~ msgstr "Kop 4"
-
 #~ msgid "Header 5"
 #~ msgstr "Kop 5"
-
 #~ msgid "Header 6"
 #~ msgstr "Kop 6"
-
 #~ msgid "Address"
 #~ msgstr "Adres"
-
 #~ msgid "Automatic"
 #~ msgstr "Automatisch"
-
 #~ msgid "Left align"
 #~ msgstr "Links uitlijnen"
-
-#, fuzzy
-#~ msgid "Left justifies the paragraphs"
-#~ msgstr "Links de paragraaf uitlijnen"
-
 #~ msgid "Center"
 #~ msgstr "Centreer"
-
-#, fuzzy
-#~ msgid "Center justifies the paragraphs"
-#~ msgstr "Het midden rechtvaardigt de paragrafen"
-
 #~ msgid "Right align"
 #~ msgstr "Rechts uitlijnen"
-
-#, fuzzy
-#~ msgid "Right justifies the paragraphs"
-#~ msgstr "Rechts de tekstuitvullen"
-
 #~ msgid "Typewriter"
 #~ msgstr "Typemachine"
-
-#, fuzzy
-#~ msgid "Toggle typewriter font style"
-#~ msgstr "Wijzig toetsenbordlettertypestijl"
-
 #~ msgid "Bold"
 #~ msgstr "Vet"
-
 #~ msgid "Makes the text bold"
 #~ msgstr "Maakt de tekst vet"
-
 #~ msgid "Makes the text italic"
 #~ msgstr "Tekst cursiveren"
-
 #~ msgid "Underline"
 #~ msgstr "Onderstrepen"
-
 #~ msgid "Underlines the text"
 #~ msgstr "Tekst onderstrepen"
-
 #~ msgid "Strikeout"
 #~ msgstr "Doorhalen"
-
 #~ msgid "Strikes out the text"
 #~ msgstr "Tekst doorhalen"
-
 #~ msgid "Unindent"
 #~ msgstr "Inspringen kleiner maken"
-
 #~ msgid "Indents the paragraphs less"
 #~ msgstr "De paragraaf minder inspringen"
-
 #~ msgid "Indents the paragraphs more"
 #~ msgstr "De paragraaf verder inspringen"
-
 #~ msgid "Save Note"
 #~ msgstr "Notitie opslaan"
-
 #~ msgid "Delete Note"
 #~ msgstr "Notitie verwijderen"
-
 #~ msgid "Genesis"
 #~ msgstr "Genesis"
-
 #~ msgid "Setup"
 #~ msgstr "Installatie"
-
 #~ msgid "Xiphos Configuration - Page 1 of 5"
 #~ msgstr "Xiphos Configuratie - Pagina 1 of 5"
-
 #~ msgid ""
 #~ "Since this is the first time you have run Xiphos, this assistant will "
 #~ "guide you through the initial setup by asking a few simple questions.\n"
@@ -4332,84 +4353,60 @@ msgstr "Beel_d"
 #~ "de initiële configuratie leiden met behulp van eenvoudige vragen.Als u "
 #~ "klaar bent, kunt u de configuratie altijd wijzigen met het venster "
 #~ "Voorkeuren."
-
 #~ msgid "Xiphos Configuration - Page 2 of 5"
 #~ msgstr "Xiphos Configuratie - Pagina 2 of 5"
-
 #~ msgid "These values have been detected automatically"
 #~ msgstr "Deze gegevens zijn automatisch gedetecteerd"
-
 #~ msgid "Your home directory:"
 #~ msgstr "Uw persoonlijke map"
-
 #~ msgid "Sword"
 #~ msgstr "Sword"
-
 #~ msgid "SWORD version"
 #~ msgstr "Sword-versie"
-
 #~ msgid "SWORD Directory:"
 #~ msgstr "SWORD-map"
-
 #~ msgid "Number of Bible text modules:"
 #~ msgstr "Aantal Bijbel-modules"
-
 #~ msgid "Number of Commentary modules:"
 #~ msgstr "Aantal Commentaar-modules"
-
 #~ msgid "Number of Dictionary/Lexicon modules:"
 #~ msgstr "Aantal Woordenboek/Lexicon-modules"
-
 #~ msgid "Xiphos Configuration - Page 3 of 5"
 #~ msgstr "Xiphos Configuratie - Pagina 3 of 5"
-
 #~ msgid "Settings to use when Xiphos starts"
 #~ msgstr "Opstartinstellingen van Xiphos"
-
 #~ msgid "Show Bible tabs"
 #~ msgstr "Toon Bijbeltabbladen"
-
 #~ msgid "Show Bible window"
 #~ msgstr "Toon Bijbelscherm"
-
 #~ msgid "Show upper workbook"
 #~ msgstr "Toon upper workbook"
-
 #~ msgid "Show Dictionary/Lexicon tabs"
 #~ msgstr "Toon Woordeboek/Lexicon tabbladen"
-
 #~ msgid "Show lower workbook"
 #~ msgstr "Toon lager werkboek"
-
 #~ msgid "Show book tabs"
 #~ msgstr "Toon tabbladen met boeken"
-
 #~ msgid "Xiphos Configuration - Page 4 of 5"
 #~ msgstr "Xiphos Configuratie - Pagina 4 of 5"
-
 #~ msgid "Text Module       "
-#~ msgstr "Tekstmodule"
-
+#~ msgstr "Tekstmodule       "
 #~ msgid "Generic book"
 #~ msgstr "Algemeen boek"
-
 #~ msgid ""
 #~ "Which Greek Lexicon to display in Dictionary/Lexicon Window when a link "
 #~ "or word is clicked"
 #~ msgstr ""
 #~ "Het Griekse lexicon dat wordt getoond in het Woordenboek/Lexicon scherm "
 #~ "als er op een verwijzing of een woord wordt geklikt"
-
 #~ msgid ""
 #~ "Which Hebrew Lexicon to display in Dictionary/Lexicon Window when a link "
 #~ "or word is clicked"
 #~ msgstr ""
 #~ "Het Hebreeuwse lexicon dat wordt getoond in het Woordenboek/Lexicon "
 #~ "scherm als er op een verwijzing of een woord wordt geklikt"
-
 #~ msgid "Xiphos Configuration - Page 5 of 5"
 #~ msgstr "Xiphos Configuratie - Pagina 5 van 5"
-
 #~ msgid ""
 #~ "Thank you for using Xiphos.\n"
 #~ "\n"
@@ -4417,15 +4414,12 @@ msgstr "Beel_d"
 #~ msgstr ""
 #~ "Bedankt voor het gebruiken van Xiphos.\n"
 #~ "Klik Toepassen om dit scherm te sluiten en Xiphos te starten"
-
 #~ msgid "Greed Lexicon"
 #~ msgstr "Grieks lexicon"
-
 #~ msgid "Include Footnotes"
 #~ msgstr "Inclusief voetnoten"
-
 #~ msgid "Include Morphological Tags"
 #~ msgstr "Morphologischetags invoegen"
-
 #~ msgid "Include Strong's Numbers"
 #~ msgstr "Strongs getallen invoegen"
+
diff --git a/po/pt.po b/po/pt.po
index f4c8c8e..fdc8522 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,172 +7,195 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Xiphos\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-09 20:54+0100\n"
-"PO-Revision-Date: 2009-07-09 20:54+0100\n"
+"POT-Creation-Date: 2009-12-17 11:39+0000\n"
+"PO-Revision-Date: 2009-12-17 11:38+0000\n"
 "Last-Translator: Ari Constâncio <ari.constancio@gmail.com>\n"
 "Language-Team: Xiphos Project\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-12-11 04:39+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 
-#: ../src/backend/sword_main.cc:1162
+#: ../src/backend/sword_main.cc:1083
 msgid "Configuration not found"
 msgstr "Configuração não encontrada"
 
-#: ../src/editor/bonobo-editor.c:252 ../src/editor/slib-editor.c:228
-#: ../src/gnome2/html.c:633
+#: ../src/editor/bonobo-editor.c:254 ../src/editor/slib-editor.c:234
+#: ../src/gnome2/html.c:637
 #, c-format
 msgid "Page %d of %d"
 msgstr "Página %d de %d"
 
-#: ../src/editor/bonobo-editor.c:351
+#: ../src/editor/bonobo-editor.c:353 ../src/editor/slib-editor.c:659
 msgid "Are you sure you want to delete the note for"
 msgstr "Tem a certeza de que quer apagar a nota para"
 
-#: ../src/editor/bonobo-editor.c:963 ../src/editor/bonobo-editor.c:996
-#: ../src/editor/slib-editor.c:1161 ../src/editor/slib-editor.c:1198
+#: ../src/editor/bonobo-editor.c:965 ../src/editor/bonobo-editor.c:998
+#: ../src/editor/slib-editor.c:1308 ../src/editor/slib-editor.c:1345
 msgid "Save the changes to document"
 msgstr "Guardar as alterações ao documento"
 
-#: ../src/editor/bonobo-editor.c:964 ../src/editor/bonobo-editor.c:997
-#: ../src/editor/slib-editor.c:1162 ../src/editor/slib-editor.c:1199
+#: ../src/editor/bonobo-editor.c:966 ../src/editor/bonobo-editor.c:999
+#: ../src/editor/slib-editor.c:1309 ../src/editor/slib-editor.c:1346
 msgid "before closing?"
 msgstr "antes de fechar?"
 
-#: ../src/editor/bonobo-editor.c:971 ../src/editor/bonobo-editor.c:1004
-#: ../src/editor/slib-editor.c:1169 ../src/editor/slib-editor.c:1206
+#: ../src/editor/bonobo-editor.c:973 ../src/editor/bonobo-editor.c:1006
+#: ../src/editor/slib-editor.c:1316 ../src/editor/slib-editor.c:1353
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Se não guardar, as alterações serão definitivamente perdidas."
 
-#: ../src/editor/bonobo-editor.c:995 ../src/editor/slib-editor.c:1197
-#: ../ui/xi-menus.glade.h:26
+#: ../src/editor/bonobo-editor.c:997 ../src/editor/slib-editor.c:1344
+#: ../ui/xi-menus.glade.h:39
 msgid "File"
 msgstr "Ficheiro"
 
-#: ../src/editor/bonobo-editor.c:1222 ../src/editor/slib-editor.c:1254
+#: ../src/editor/bonobo-editor.c:1224 ../src/editor/slib-editor.c:1401
 msgid "StudyPad"
 msgstr "StudyPad"
 
-#: ../src/editor/bonobo-editor.c:1235 ../src/editor/slib-editor.c:1268
+#: ../src/editor/bonobo-editor.c:1237 ../src/editor/slib-editor.c:1415
 msgid "Note Editor"
 msgstr "Editor de Notas"
 
-#: ../src/editor/bonobo-editor.c:1244 ../src/editor/slib-editor.c:1282
+#: ../src/editor/bonobo-editor.c:1246 ../src/editor/slib-editor.c:1429
 msgid "Prayer List/Journal Editor"
 msgstr "Lista de Oração/Editor de Diário"
 
-#: ../src/editor/slib-editor.c:382 ../src/editor/slib-editor.c:429
+#: ../src/editor/slib-editor.c:401 ../src/editor/slib-editor.c:448
 msgid "Save As"
 msgstr "Guardar como"
 
-#: ../src/editor/slib-editor.c:400 ../src/editor/slib-editor.c:447
+#: ../src/editor/slib-editor.c:419 ../src/editor/slib-editor.c:466
+#: ../src/editor/slib-editor.c:634
 msgid "Untitled document"
 msgstr "Documento sem título"
 
-#: ../src/editor/slib-editor.c:612
+#: ../src/editor/slib-editor.c:702
 msgid "HTML Output"
 msgstr "Saída HTML"
 
-#: ../src/editor/slib-editor.c:619
+#: ../src/editor/slib-editor.c:709
 msgid "HTML Source"
 msgstr "Fonte HTML"
 
-#: ../src/editor/slib-editor.c:626
+#: ../src/editor/slib-editor.c:716
 msgid "Plain Source"
 msgstr "Fonte Simples"
 
-#: ../src/editor/slib-editor.c:633 ../ui/editor_note.xml.h:15
+#: ../src/editor/slib-editor.c:726 ../ui/editor_note.xml.h:15
 #: ../ui/editor_studypad.xml.h:21
 msgid "_Print..."
 msgstr "Im_primir..."
 
-#: ../src/editor/slib-editor.c:640 ../ui/editor_note.xml.h:9
+#: ../src/editor/slib-editor.c:733 ../ui/editor_note.xml.h:9
 #: ../ui/editor_studypad.xml.h:14
 msgid "Print Pre_view"
 msgstr "Ante_visão de Impressão"
 
-#: ../src/editor/slib-editor.c:647
+#: ../src/editor/slib-editor.c:740
 msgid "_Quit"
 msgstr "_Sair"
 
-#: ../src/editor/slib-editor.c:654
+#: ../src/editor/slib-editor.c:747
 msgid "_Open"
 msgstr "_Abrir"
 
-#: ../src/editor/slib-editor.c:661
+#: ../src/editor/slib-editor.c:754
 msgid "_Save"
 msgstr "_Guardar"
 
-#: ../src/editor/slib-editor.c:668
+#: ../src/editor/slib-editor.c:761
 msgid "Save _As..."
 msgstr "Guardar _Como..."
 
-#: ../src/editor/slib-editor.c:675 ../ui/editor_note.xml.h:14
+#: ../src/editor/slib-editor.c:767
+msgid "New"
+msgstr "Novo"
+
+#: ../src/editor/slib-editor.c:769
+msgid "Open new document"
+msgstr "Abrir novo documento"
+
+#: ../src/editor/slib-editor.c:773
+msgid "Delete"
+msgstr "Apagar"
+
+#: ../src/editor/slib-editor.c:775
+msgid "Delete current note"
+msgstr "Apagar a nota corrente"
+
+#: ../src/editor/slib-editor.c:780 ../ui/editor_note.xml.h:14
 #: ../ui/editor_studypad.xml.h:20 ../ui/editor.xml.h:13
-#: ../ui/xi-menus.glade.h:85
+#: ../ui/xi-menus.glade.h:106
 msgid "_File"
 msgstr "_Ficheiro"
 
-#: ../src/editor/slib-editor.c:730
+#: ../src/editor/slib-editor.c:835
 msgid "HTML _Output"
 msgstr "_Saída HTML"
 
-#: ../src/editor/slib-editor.c:737
+#: ../src/editor/slib-editor.c:842
 msgid "_HTML Source"
 msgstr "Fonte _HTML"
 
-#: ../src/editor/slib-editor.c:744
+#: ../src/editor/slib-editor.c:849
 msgid "_Plain Source"
 msgstr "Fonte _Simples"
 
-#: ../src/editor/slib-editor.c:751 ../ui/xi-menus.glade.h:100
+#: ../src/editor/slib-editor.c:856 ../ui/xi-menus.glade.h:121
 msgid "_View"
 msgstr "_Ver"
 
-#: ../src/editor/slib-editor.c:762 ../ui/editor_note.xml.h:11
+#: ../src/editor/slib-editor.c:867 ../ui/editor_note.xml.h:11
 #: ../ui/editor_studypad.xml.h:16 ../ui/editor.xml.h:11
 msgid "Save"
 msgstr "Guardar"
 
-#: ../src/gecko/gecko-html.cpp:178 ../src/gnome2/html.c:161
+#: ../src/editor/slib-editor.c:878 ../src/editor/slib-editor.c:885
+msgid "Insert Link"
+msgstr "Inserir Ligação"
+
+#: ../src/gecko/gecko-html.cpp:177 ../src/gnome2/html.c:165
 msgid "Unlock "
 msgstr "Desbloquear "
 
-#: ../src/gecko/gecko-print.c:171
+#: ../src/gecko/gecko-print.c:172
 msgid "Preparing to print"
 msgstr "Preparando impressão"
 
-#: ../src/gecko/gecko-print.c:265
+#: ../src/gecko/gecko-print.c:266
 msgid "Printing is not supported on this printer"
 msgstr "Impressão não suportada nesta impressora"
 
-#: ../src/gecko/gecko-print.c:268
+#: ../src/gecko/gecko-print.c:269
 #, c-format
 msgid "Printer %s does not support PostScript printing."
 msgstr "Impressora %s não suporta impressão PostScript."
 
-#: ../src/gecko/gecko-print.c:341 ../src/gecko/gecko-print.c:369
+#: ../src/gecko/gecko-print.c:342 ../src/gecko/gecko-print.c:370
 msgid "Printing"
 msgstr "Imprimindo"
 
-#: ../src/gecko/gecko-print.c:371
+#: ../src/gecko/gecko-print.c:372
 msgid "Waiting to print"
 msgstr "Aguardando impressão"
 
-#: ../src/gecko/gecko-print.c:583
+#: ../src/gecko/gecko-print.c:584
 msgid "An error occurred while printing"
 msgstr "Um erro ocorreu durante a impressão"
 
-#: ../src/gecko/gecko-print.c:587
+#: ../src/gecko/gecko-print.c:588
 #, c-format
 msgid "It was not possible to print your document: %s"
 msgstr "Não foi possível a impressão do seu documento: %s"
 
-#: ../src/gnome2/about_modules.c:189
+#: ../src/gnome2/about_modules.c:195
 msgid "About Sword Module"
 msgstr "Sobre o Módulo Sword"
 
-#: ../src/gnome2/about_modules.c:383 ../src/gnome2/mod_mgr.c:204
+#: ../src/gnome2/about_modules.c:389 ../src/gnome2/mod_mgr.c:252
 msgid "The module has no About information."
 msgstr "O módulo não tem informação Sobre."
 
@@ -196,15 +219,15 @@ msgstr ""
 msgid "About the SWORD Project"
 msgstr "Sobre o Projecto SWORD"
 
-#: ../src/gnome2/about_sword.c:123
+#: ../src/gnome2/about_sword.c:124
 msgid "Sword Version"
 msgstr "Versão Sword"
 
-#: ../src/gnome2/about_sword.c:154
+#: ../src/gnome2/about_sword.c:155
 msgid "Books can be downloaded from the SWORD Project"
 msgstr "Livros podem ser descarregados do Projecto SWORD"
 
-#: ../src/gnome2/about_sword.c:160
+#: ../src/gnome2/about_sword.c:161
 msgid "The SWORD Project"
 msgstr "O Projecto SWORD"
 
@@ -228,19 +251,19 @@ msgstr ""
 msgid "About Xiphos Translation"
 msgstr "Sobre a tradução de Xiphos ..."
 
-#: ../src/gnome2/about_trans.c:139
+#: ../src/gnome2/about_trans.c:140
 msgid "See TRANSLATION-HOWTO in Xiphos source"
 msgstr "Veja TRANSLATION-HOWTO no código de Xiphos"
 
-#: ../src/gnome2/about_trans.c:145
+#: ../src/gnome2/about_trans.c:146
 msgid "Xiphos development"
 msgstr "Desenvolvimento de Xiphos"
 
-#: ../src/gnome2/about_xiphos.c:132
+#: ../src/gnome2/about_xiphos.c:131
 msgid "Copyright 2000-2009 The Xiphos Development Team"
 msgstr "Copyright 2000-2009 Equipa de Desenvolvimento Xiphos"
 
-#: ../src/gnome2/about_xiphos.c:135
+#: ../src/gnome2/about_xiphos.c:134
 msgid ""
 "(formerly known as GnomeSword)\n"
 "\n"
@@ -254,83 +277,82 @@ msgstr ""
 "Gostaríamos de agradecer a Troy Griffitts e aos outros colaboradores que nos "
 "deram o Projecto SWORD."
 
-#: ../src/gnome2/bibletext_dialog.c:525
+#: ../src/gnome2/bibletext_dialog.c:358
 msgid "Go to "
 msgstr "Ir para "
 
 #. info->stock_icon = GTK_STOCK_OPEN;
-#: ../src/gnome2/bookmark_dialog.c:167 ../src/gnome2/bookmarks_menu.c:471
-#: ../src/gnome2/bookmarks_menu.c:897 ../src/gnome2/bookmarks_menu.c:995
-#: ../src/gnome2/bookmarks_treeview.c:131 ../ui/editor_studypad.xml.h:2
-#: ../ui/xi-menus.glade.h:9
+#: ../src/gnome2/bookmark_dialog.c:171 ../src/gnome2/bookmarks_menu.c:358
+#: ../src/gnome2/bookmarks_menu.c:765 ../src/gnome2/bookmarks_menu.c:863
+#: ../src/gnome2/bookmarks_treeview.c:133 ../ui/editor_studypad.xml.h:2
+#: ../ui/xi-menus.glade.h:13
 msgid "Bookmark"
 msgstr "Marca"
 
-#: ../src/gnome2/bookmark_dialog.c:169 ../src/gnome2/bookmarks_menu.c:997
-#: ../src/gnome2/bookmarks_treeview.c:132
+#: ../src/gnome2/bookmark_dialog.c:173 ../src/gnome2/bookmarks_menu.c:865
+#: ../src/gnome2/bookmarks_treeview.c:134
 msgid "Enter Folder Name"
 msgstr "Introduzir Nome da Pasta"
 
-#: ../src/gnome2/bookmark_dialog.c:171 ../src/gnome2/bookmarks_menu.c:999
+#: ../src/gnome2/bookmark_dialog.c:175 ../src/gnome2/bookmarks_menu.c:867
 msgid "Folder Name"
 msgstr "Nome da Pasta"
 
-#: ../src/gnome2/bookmark_dialog.c:172 ../src/gnome2/bookmarks_menu.c:1000
-#: ../src/gnome2/bookmarks_treeview.c:134
+#: ../src/gnome2/bookmark_dialog.c:176 ../src/gnome2/bookmarks_menu.c:868
+#: ../src/gnome2/bookmarks_treeview.c:136
 msgid "Folder: "
 msgstr "Pasta: "
 
-#: ../src/gnome2/bookmarks_menu.c:457 ../src/gnome2/treekey-editor.c:322
-#: ../ui/xi-menus.glade.h:22
+#: ../src/gnome2/bookmarks_menu.c:344 ../ui/xi-menus.glade.h:32
 msgid "Edit"
 msgstr "Editar"
 
-#: ../src/gnome2/bookmarks_menu.c:474
+#: ../src/gnome2/bookmarks_menu.c:361
 msgid "Folder name: "
 msgstr "Nome de pasta: "
 
-#: ../src/gnome2/bookmarks_menu.c:477
+#: ../src/gnome2/bookmarks_menu.c:364
 msgid "Bookmark name: "
 msgstr "Nome de marca: "
 
-#: ../src/gnome2/bookmarks_menu.c:480 ../src/gnome2/bookmarks_menu.c:905
+#: ../src/gnome2/bookmarks_menu.c:367 ../src/gnome2/bookmarks_menu.c:773
 msgid "Verse: "
 msgstr "Versículo: "
 
-#: ../src/gnome2/bookmarks_menu.c:481 ../src/gnome2/bookmarks_menu.c:906
+#: ../src/gnome2/bookmarks_menu.c:368 ../src/gnome2/bookmarks_menu.c:774
 msgid "Module: "
 msgstr "Módulo: "
 
-#: ../src/gnome2/bookmarks_menu.c:665
+#: ../src/gnome2/bookmarks_menu.c:533
 msgid "Restore Bookmark Folder"
 msgstr "Restaurar Pasta de Marca"
 
-#: ../src/gnome2/bookmarks_menu.c:734
+#: ../src/gnome2/bookmarks_menu.c:602
 msgid "Remove the selected folder"
 msgstr "Remover a pasta seleccionada"
 
-#: ../src/gnome2/bookmarks_menu.c:736
+#: ../src/gnome2/bookmarks_menu.c:604
 msgid "(and all its contents)?"
 msgstr "(e todo o seu conteúdo)?"
 
-#: ../src/gnome2/bookmarks_menu.c:739
+#: ../src/gnome2/bookmarks_menu.c:607
 msgid "Remove the selected bookmark"
 msgstr "Remover a marca seleccionada"
 
-#: ../src/gnome2/bookmarks_menu.c:898
+#: ../src/gnome2/bookmarks_menu.c:766
 msgid "Add"
 msgstr "Adicionar"
 
-#: ../src/gnome2/bookmarks_menu.c:904
+#: ../src/gnome2/bookmarks_menu.c:772
 msgid "Label: "
 msgstr "Rótulo: "
 
-#: ../src/gnome2/bookmarks_treeview.c:105
+#: ../src/gnome2/bookmarks_treeview.c:107
 #, c-format
 msgid "Search result: %s"
 msgstr "Resultado da Pesquisa: %s"
 
-#: ../src/gnome2/bookmarks_treeview.c:934 ../src/gnome2/sidebar.c:1461
+#: ../src/gnome2/bookmarks_treeview.c:943 ../src/gnome2/sidebar.c:1389
 msgid "Bookmarks"
 msgstr "Marcas"
 
@@ -346,100 +368,172 @@ msgstr "para:"
 msgid "Enter Cipher Key: "
 msgstr "Introduza Chave Cifrada: "
 
-#: ../src/gnome2/dialog.c:241
+#: ../src/gnome2/dialog.c:265
 msgid "Close without Saving"
 msgstr "Fechar sem guardar"
 
-#: ../src/gnome2/dialog.c:569
+#: ../src/gnome2/dialog.c:596
 msgid "Xiphos:"
 msgstr "Xiphos:"
 
-#: ../src/gnome2/dialog.c:670
+#: ../src/gnome2/dialog.c:697
 msgid "Close _without Saving"
 msgstr "Fechar se_m Guardar"
 
-#: ../src/gnome2/export_dialog.c:265 ../ui/export-dialog.glade.h:20
+#: ../src/gnome2/export_dialog.c:267 ../ui/export-dialog.glade.h:20
 msgid "Please check copyright before exporting!"
 msgstr "Por favor verifique os direitos de autor antes de exportar!"
 
-#: ../src/gnome2/find_dialog.c:200 ../src/gnome2/find_dialog.c:369
+#: ../src/gnome2/find_dialog.c:204 ../src/gnome2/find_dialog.c:373
 msgid "Find"
 msgstr "Procurar"
 
-#: ../src/gnome2/find_dialog.c:218
+#: ../src/gnome2/find_dialog.c:222
 msgid "Enter Word or Phrase"
 msgstr "Introduza Palavra ou Frase"
 
-#: ../src/gnome2/find_dialog.c:234 ../src/gnome2/search_sidebar.c:303
-#: ../ui/search-dialog.glade.h:57
+#: ../src/gnome2/find_dialog.c:238 ../src/gnome2/search_sidebar.c:306
+#: ../ui/search-dialog.glade.h:59
 msgid "Match case"
 msgstr "Combinar capitalização"
 
-#: ../src/gnome2/find_dialog.c:241
+#: ../src/gnome2/find_dialog.c:245
 msgid "Search backwards"
 msgstr "Pesquisar para trás"
 
-#: ../src/gnome2/find_dialog.c:250 ../src/gnome2/search_sidebar.c:268
-#: ../ui/search-dialog.glade.h:74
+#: ../src/gnome2/find_dialog.c:254 ../src/gnome2/search_sidebar.c:271
+#: ../ui/search-dialog.glade.h:76
 msgid "Regular expression"
 msgstr "Expressão Regular"
 
-#: ../src/gnome2/find_dialog.c:291
+#: ../src/gnome2/find_dialog.c:295
 msgid "Find Next"
 msgstr "Procurar Próximo"
 
-#: ../src/gnome2/font_dialog.c:301
+#: ../src/gnome2/font_dialog.c:303
 msgid "Set Module Font"
 msgstr "Definir Fonte do Módulo"
 
-#: ../src/gnome2/font_dialog.c:331
+#: ../src/gnome2/font_dialog.c:333
 msgid "Change font for"
 msgstr "Mudar fonte para"
 
-#: ../src/gnome2/font_dialog.c:335
+#: ../src/gnome2/font_dialog.c:337
 msgid "Module"
 msgstr "Módulo"
 
-#: ../src/gnome2/font_dialog.c:339
+#: ../src/gnome2/font_dialog.c:341
 msgid "Current font: "
 msgstr "Fonte corrente: "
 
-#: ../src/gnome2/font_dialog.c:376
+#: ../src/gnome2/font_dialog.c:378
 msgid "+0"
 msgstr "+0"
 
-#: ../src/gnome2/font_dialog.c:380
+#: ../src/gnome2/font_dialog.c:382
 msgid "Use the default font for this module"
 msgstr "Usar a fonte por omissão para este módulo"
 
-#: ../src/gnome2/main_window.c:756
+#. *****************************************************************************
+#. * Name
+#. *    gconf_setup
+#. *
+#. * Synopsis
+#. *   #include "main/settings.h"
+#. *
+#. *   void gconf_setup()
+#. *
+#. * Description
+#. *   verifies and initializes the GConf subsystem, so that "sword://" and
+#. *   similar can be handled by url-comprehending programs such as browsers.
+#. *   dialogs for permission/success/failure => conditional on debug build.
+#. *
+#. * Return value
+#. *   void
+#.
+#: ../src/gnome2/gui.c:110
+msgid ""
+"URL references using \"sword://\" (similar to web page\n"
+"references) can be used by programs to look up\n"
+"scripture references. Your system currently has no\n"
+"program set to handle these references.\n"
+"\n"
+"Would you like Xiphos to set itself as the\n"
+"program to handle these references?"
+msgstr ""
+"Referências URL usando \"sword://\" (semelhantes às referências de páginas "
+"web) \n"
+"podem ser usadas por programas para pesquisar referências bíblicas. \n"
+"O seu sistema não possui actualmente nenhum programa preparado para lidar \n"
+"com essas referências.\n"
+"Gostaria que Xiphos se configurasse para lidar com essas referências?"
+
+#: ../src/gnome2/gui.c:112
+msgid ""
+"Xiphos has successfully set itself\n"
+"as the handler of sword:// and bible:// URLs.\n"
+"\n"
+"You may wish to run the program \"gconf-editor\"\n"
+"to examine keys under /desktop/gnome/url-handlers,\n"
+"if you need to change these."
+msgstr ""
+"Xiphos foi configurado com sucesso \n"
+"para lidar com URLs sword:// e bible://.\n"
+"\n"
+"Se desejar, pode correr o programa \"gconf-editor\" \n"
+"para examinar chaves sob /desktop/gnome/url-handlers, \n"
+"se necessitar de as alterar."
+
+#: ../src/gnome2/gui.c:166
+#, c-format
+msgid ""
+"Xiphos failed to complete handler init for key #%d:\n"
+"%s"
+msgstr ""
+"Xiphos não conseguiu completar a inicialização do handler para a chave #%"
+"d: \n"
+"%s"
+
+#: ../src/gnome2/gui.c:212
+msgid "BUG! Xiphos is about to crash due to a \"STRDUP\" error."
+msgstr "ERRO! Xiphos está a estourar devido a um erro \"STRDUP\"."
+
+#: ../src/gnome2/gui.c:213 ../src/gnome2/gui.c:248
+msgid "Please report this error to the Xiphos team with:"
+msgstr "Por favor, comunique este erro à equipa Xiphos com:"
+
+#: ../src/gnome2/gui.c:247
+msgid "BUG! Xiphos is about to crash due to a \"STRING\" error."
+msgstr "ERRO! Xiphos está a estourar devido a um erro \"STRING\".<"
+
+#: ../src/gnome2/main_window.c:789
 msgid "Xiphos - Bible Study Software"
 msgstr "Xiphos - Software de Estudo Bíblico"
 
-#: ../src/gnome2/main_window.c:812
+#: ../src/gnome2/main_window.c:844
 msgid "Open a new tab"
 msgstr "Abrir uma nova aba"
 
-#: ../src/gnome2/main_window.c:892 ../src/gnome2/sidebar.c:623
-#: ../src/gnome2/sidebar.c:629 ../src/main/sidebar.cc:642
-#: ../src/main/sidebar.cc:962 ../src/main/sidebar.cc:963
-#: ../src/main/sidebar.cc:964
+#: ../src/gnome2/main_window.c:923 ../src/gnome2/sidebar.c:627
+#: ../src/gnome2/sidebar.c:633 ../src/main/sidebar.cc:666
+#: ../src/main/sidebar.cc:1015 ../src/main/sidebar.cc:1016
+#: ../src/main/sidebar.cc:1017
 msgid "Standard View"
 msgstr "Vista Normal"
 
-#: ../src/gnome2/main_window.c:969
+#: ../src/gnome2/main_window.c:1004
 msgid "Commentary View"
 msgstr "Vista de Comentário"
 
-#: ../src/gnome2/main_window.c:985
+#: ../src/gnome2/main_window.c:1020
 msgid "Book View"
 msgstr "Vista de Livro"
 
-#: ../src/gnome2/main_window.c:1010
+#: ../src/gnome2/main_window.c:1045
 msgid "Welcome to Xiphos"
 msgstr "Benvindo a Xiphos"
 
-#: ../src/gnome2/menu_popup.c:1163
+#: ../src/gnome2/menu_popup.c:1168
 msgid ""
 "Renaming is not available in Windows.\n"
 "\n"
@@ -458,33 +552,33 @@ msgstr ""
 "tal como os conteúdos deste comentário.\n"
 "Por isso, não é possível renomear comentários pessoais no ambiente Windows."
 
-#: ../src/gnome2/menu_popup.c:1182
+#: ../src/gnome2/menu_popup.c:1187
 msgid "Rename Commentary"
 msgstr "Renomear Comentário"
 
-#: ../src/gnome2/menu_popup.c:1185
+#: ../src/gnome2/menu_popup.c:1190
 msgid "Choose Commentary Name"
 msgstr "Escolher Nome de Comentário"
 
-#: ../src/gnome2/menu_popup.c:1187
+#: ../src/gnome2/menu_popup.c:1192
 msgid "New Name"
 msgstr "Novo Nome"
 
-#: ../src/gnome2/menu_popup.c:1188 ../src/gnome2/treekey-editor.c:132
-#: ../src/gnome2/treekey-editor.c:191 ../src/gnome2/treekey-editor.c:277
-#: ../src/main/prayerlists.cc:240
+#: ../src/gnome2/menu_popup.c:1193 ../src/gnome2/treekey-editor.c:139
+#: ../src/gnome2/treekey-editor.c:198 ../src/gnome2/treekey-editor.c:284
+#: ../src/main/prayerlists.cc:243
 msgid "Name: "
 msgstr "Nome: "
 
-#: ../src/gnome2/menu_popup.c:1198 ../src/main/prayerlists.cc:254
+#: ../src/gnome2/menu_popup.c:1203 ../src/main/prayerlists.cc:257
 msgid "Module names must contain [A-Za-z0-9_] only."
 msgstr "Os nomes de módulos devem conter apenas [A-Za-z0-9_]."
 
-#: ../src/gnome2/menu_popup.c:1205 ../src/main/prayerlists.cc:261
+#: ../src/gnome2/menu_popup.c:1210 ../src/main/prayerlists.cc:264
 msgid "Xiphos already knows a module by that name."
 msgstr "Xiphos já conhece um módulo por esse nome."
 
-#: ../src/gnome2/menu_popup.c:1248
+#: ../src/gnome2/menu_popup.c:1253
 #, c-format
 msgid ""
 "Failed to create new configuration:\n"
@@ -493,7 +587,7 @@ msgstr ""
 "Falhou a criação de nova configuração:\n"
 "%s"
 
-#: ../src/gnome2/menu_popup.c:1257
+#: ../src/gnome2/menu_popup.c:1262
 msgid ""
 "Configuration build error:\n"
 "\n"
@@ -501,19 +595,56 @@ msgstr ""
 "Erro de compilação da configuração:\n"
 "\n"
 
-#: ../src/gnome2/mod_mgr.c:339
+#: ../src/gnome2/mod_mgr.c:169
+msgid "Remove these modules?"
+msgstr "Remover estes módulos?"
+
+#: ../src/gnome2/mod_mgr.c:170
+msgid "Preparing to remove"
+msgstr "Preparando remoção"
+
+#: ../src/gnome2/mod_mgr.c:171
+msgid "Removing"
+msgstr "Removendo"
+
+#: ../src/gnome2/mod_mgr.c:172 ../ui/xi-menus.glade.h:72
+msgid "Remove"
+msgstr "Remover"
+
+#: ../src/gnome2/mod_mgr.c:175
 msgid "Install these modules?"
 msgstr "Instalar estes módulos?"
 
-#: ../src/gnome2/mod_mgr.c:341
-msgid "Remove these modules?"
-msgstr "Remover estes módulos?"
+#: ../src/gnome2/mod_mgr.c:176
+msgid "Preparing to install"
+msgstr "Preparando instalação"
+
+#: ../src/gnome2/mod_mgr.c:177
+msgid "Installing"
+msgstr "Instalando"
+
+#: ../src/gnome2/mod_mgr.c:178 ../src/gnome2/mod_mgr.c:2964
+#: ../ui/module-manager.glade.h:18
+msgid "Install"
+msgstr "Instalar"
 
-#: ../src/gnome2/mod_mgr.c:343
+#: ../src/gnome2/mod_mgr.c:181
 msgid "Archive these modules?"
 msgstr "Arquivar estes módulos?"
 
-#: ../src/gnome2/mod_mgr.c:345
+#: ../src/gnome2/mod_mgr.c:182
+msgid "Preparing to archive"
+msgstr "Preparando arquivo"
+
+#: ../src/gnome2/mod_mgr.c:183
+msgid "Archiving"
+msgstr "Arquivando"
+
+#: ../src/gnome2/mod_mgr.c:184 ../ui/module-manager.glade.h:11
+msgid "Archive"
+msgstr "Arquivar"
+
+#: ../src/gnome2/mod_mgr.c:187
 msgid ""
 "Build fast-search index for these\n"
 "modules (may take minutes/module)?"
@@ -521,123 +652,131 @@ msgstr ""
 "Construir índice de busca rápida para estes\n"
 "módulos (pode demorar minutos por módulo)?"
 
-#: ../src/gnome2/mod_mgr.c:347
-msgid "Delete fast-search index for these modules?"
-msgstr "Apagar índice de busca rápida para estes módulos?"
-
-#: ../src/gnome2/mod_mgr.c:367
-msgid "Preparing to install"
-msgstr "Preparando instalação"
+#: ../src/gnome2/mod_mgr.c:188
+msgid "Preparing to index"
+msgstr "Preparando indexação"
 
-#: ../src/gnome2/mod_mgr.c:369
-msgid "Preparing to remove"
-msgstr "Preparando remoção"
+#: ../src/gnome2/mod_mgr.c:189
+msgid "Indexing"
+msgstr "Indexando"
 
-#: ../src/gnome2/mod_mgr.c:371
-msgid "Preparing to archive"
-msgstr "Preparando arquivo"
+#: ../src/gnome2/mod_mgr.c:190 ../ui/module-manager.glade.h:17
+msgid "Index"
+msgstr "Indexar"
 
-#: ../src/gnome2/mod_mgr.c:373
-msgid "Preparing to index"
-msgstr "Preparando indexação"
+#: ../src/gnome2/mod_mgr.c:193
+msgid "Delete fast-search index for these modules?"
+msgstr "Apagar índice de busca rápida para estes módulos?"
 
-#: ../src/gnome2/mod_mgr.c:375
+#: ../src/gnome2/mod_mgr.c:194
 msgid "Preparing to delete index"
 msgstr "Preparando para apagar index"
 
-#: ../src/gnome2/mod_mgr.c:401
-msgid "Installing"
-msgstr "Instalando"
+#: ../src/gnome2/mod_mgr.c:195
+msgid "Deleting index"
+msgstr "Apagando index"
 
-#: ../src/gnome2/mod_mgr.c:403
-msgid "Removing"
-msgstr "Removendo"
+#: ../src/gnome2/mod_mgr.c:196
+msgid "Deletion"
+msgstr "Remoção"
 
-#: ../src/gnome2/mod_mgr.c:405
-msgid "Archiving"
-msgstr "Arquivando"
+#: ../src/gnome2/mod_mgr.c:427
+msgid "Module Name"
+msgstr "Nome de Módulo"
 
-#: ../src/gnome2/mod_mgr.c:407
-msgid "Indexing"
-msgstr "Indexando"
+#: ../src/gnome2/mod_mgr.c:448
+msgid "A checkmark means this module is already installed"
+msgstr "Uma marca significa que o módulo já está instalado"
 
-#: ../src/gnome2/mod_mgr.c:409
-msgid "Deleting index"
-msgstr "Apagando index"
+#: ../src/gnome2/mod_mgr.c:470
+msgid "Click the box to work on this module"
+msgstr "Clique na caixa para trabalhar neste módulo"
 
-#: ../src/gnome2/mod_mgr.c:432
-#, c-format
+#: ../src/gnome2/mod_mgr.c:471
+msgid "Click the box to select this module for install/update"
+msgstr "Clique na caixa para seleccionar este módulo para instalar/actualizar"
+
+#: ../src/gnome2/mod_mgr.c:490
+msgid "Installed"
+msgstr "Instalado"
+
+#: ../src/gnome2/mod_mgr.c:500
 msgid ""
-"`mkdir %s' failed:\n"
-"%s."
+"The index icon means you have built an optimized ('lucene') index for this "
+"module for fast searching (see the Maintenance pane for this function)"
 msgstr ""
-"`mkdir %s' falhou:\n"
-"%s."
-
-#: ../src/gnome2/mod_mgr.c:463
-msgid "Xiphos could not execute archiver"
-msgstr "Xiphos não conseguiu executar arquivador"
+"O ícone de índice significa que tem um índice optimizado ('lucene') para "
+"este módulo para pesquisa rápida (veja no painel de Manutenção sobre esta "
+"função)"
 
-#: ../src/gnome2/mod_mgr.c:468
+#: ../src/gnome2/mod_mgr.c:518
 msgid ""
-" archival result:\n"
-"\n"
+"The lock icon means this module is encrypted, and requires that you purchase "
+"an unlock key from the content owner"
 msgstr ""
-" resultado de arquivo:\n"
-"\n"
+"O ícone de fechadura significa que este módulo está encriptado e requer a "
+"compra de uma chave de abertura ao proprietário do conteúdo"
 
-#: ../src/gnome2/mod_mgr.c:472
+#: ../src/gnome2/mod_mgr.c:535 ../ui/xi-menus.glade.h:1
+msgid "About"
+msgstr "Sobre"
+
+#: ../src/gnome2/mod_mgr.c:555
 msgid ""
-"\n"
-"Archive in "
+"The refresh icon means the Installed module is older than the newer "
+"Available module: You should update the module"
 msgstr ""
-"\n"
-"Arquivar em "
+"O ícone de refrescar significa que o módulo instalado é mais antigo do que o "
+"módulo disponível: deve actualizar o módulo"
 
-#: ../src/gnome2/mod_mgr.c:526
-msgid "Journals and prayer lists cannot be indexed."
-msgstr "Diários e listas de oração não podem ser indexados."
+#: ../src/gnome2/mod_mgr.c:567
+msgid "Available"
+msgstr "Disponível"
 
-#: ../src/gnome2/mod_mgr.c:547 ../src/gnome2/mod_mgr.c:2902
-#: ../ui/module-manager.glade.h:15
-msgid "Install"
-msgstr "Instalar"
+#: ../src/gnome2/mod_mgr.c:576
+msgid "Size"
+msgstr "Tamanho"
 
-#: ../src/gnome2/mod_mgr.c:549 ../src/gnome2/treekey-editor.c:316
-msgid "Remove"
-msgstr "Remover"
+#: ../src/gnome2/mod_mgr.c:585
+msgid "Description"
+msgstr "Descrição"
 
-#: ../src/gnome2/mod_mgr.c:551
-msgid "Archive"
-msgstr "Arquivar"
+#: ../src/gnome2/mod_mgr.c:736
+#, c-format
+msgid ""
+"`mkdir %s' failed:\n"
+"%s."
+msgstr ""
+"`mkdir %s' falhou:\n"
+"%s."
 
-#: ../src/gnome2/mod_mgr.c:553
-msgid "Index"
-msgstr "Indexar"
+#: ../src/gnome2/mod_mgr.c:759
+msgid " archived in: \n"
+msgstr "arquivado em: \n"
 
-#: ../src/gnome2/mod_mgr.c:555
-msgid "Deletion"
-msgstr "Remoção"
+#: ../src/gnome2/mod_mgr.c:815
+msgid "Journals and prayer lists cannot be indexed."
+msgstr "Diários e listas de oração não podem ser indexados."
 
-#: ../src/gnome2/mod_mgr.c:557
+#: ../src/gnome2/mod_mgr.c:833
 #, c-format
 msgid "%s failed"
 msgstr "%s falhou"
 
-#: ../src/gnome2/mod_mgr.c:559 ../src/gnome2/mod_mgr.c:1285
+#: ../src/gnome2/mod_mgr.c:836 ../src/gnome2/mod_mgr.c:1562
 msgid "Finished"
 msgstr "Terminado"
 
-#: ../src/gnome2/mod_mgr.c:726 ../src/gnome2/mod_mgr.c:728
-#: ../src/gnome2/mod_mgr.c:830 ../src/gnome2/mod_mgr.c:865
-#: ../src/gnome2/mod_mgr.c:867 ../src/gnome2/utilities.c:346
-#: ../src/gnome2/utilities.c:411 ../src/gnome2/utilities.c:413
-#: ../src/gnome2/utilities.c:1032 ../src/main/sidebar.cc:799
-#: ../src/main/sidebar.cc:871 ../src/main/sidebar.cc:873
+#: ../src/gnome2/mod_mgr.c:1003 ../src/gnome2/mod_mgr.c:1005
+#: ../src/gnome2/mod_mgr.c:1107 ../src/gnome2/mod_mgr.c:1142
+#: ../src/gnome2/mod_mgr.c:1144 ../src/gnome2/utilities.c:435
+#: ../src/gnome2/utilities.c:500 ../src/gnome2/utilities.c:502
+#: ../src/gnome2/utilities.c:986 ../src/main/sidebar.cc:852
+#: ../src/main/sidebar.cc:924 ../src/main/sidebar.cc:926
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: ../src/gnome2/mod_mgr.c:1029
+#: ../src/gnome2/mod_mgr.c:1301
 #, c-format
 msgid ""
 "Repository:\n"
@@ -646,7 +785,7 @@ msgstr ""
 "Repositório:\n"
 "%s"
 
-#: ../src/gnome2/mod_mgr.c:1041
+#: ../src/gnome2/mod_mgr.c:1313
 msgid ""
 "Categorized by\n"
 "Module Type"
@@ -654,44 +793,44 @@ msgstr ""
 "Categorizado por \n"
 "Tipo de Módulo"
 
-#: ../src/gnome2/mod_mgr.c:1046 ../src/gnome2/utilities.c:472
-#: ../src/main/sidebar.cc:946 ../src/main/sidebar.cc:948
+#: ../src/gnome2/mod_mgr.c:1318 ../src/gnome2/utilities.c:561
+#: ../src/main/sidebar.cc:999 ../src/main/sidebar.cc:1001
 msgid "Biblical Texts"
 msgstr "Textos Bíblicos"
 
-#: ../src/gnome2/mod_mgr.c:1050 ../src/gnome2/utilities.c:476
-#: ../src/main/sidebar.cc:654 ../src/main/sidebar.cc:971
-#: ../src/main/sidebar.cc:973 ../ui/prefs.glade.h:33
+#: ../src/gnome2/mod_mgr.c:1322 ../src/gnome2/utilities.c:565
+#: ../src/main/sidebar.cc:678 ../src/main/sidebar.cc:1024
+#: ../src/main/sidebar.cc:1026 ../ui/prefs.glade.h:33
 msgid "Commentaries"
 msgstr "Comentários"
 
-#: ../src/gnome2/mod_mgr.c:1054 ../src/gnome2/utilities.c:480
-#: ../src/main/sidebar.cc:980 ../src/main/sidebar.cc:982
+#: ../src/gnome2/mod_mgr.c:1326 ../src/gnome2/utilities.c:569
+#: ../src/main/sidebar.cc:1033 ../src/main/sidebar.cc:1035
 msgid "Dictionaries"
 msgstr "Dicionários"
 
-#: ../src/gnome2/mod_mgr.c:1058 ../src/gnome2/utilities.c:484
-#: ../src/main/sidebar.cc:989 ../src/main/sidebar.cc:991
+#: ../src/gnome2/mod_mgr.c:1330 ../src/gnome2/utilities.c:573
+#: ../src/main/sidebar.cc:1042 ../src/main/sidebar.cc:1044
 msgid "Daily Devotionals"
 msgstr "Devocionais Diários"
 
-#: ../src/gnome2/mod_mgr.c:1062 ../src/gnome2/utilities.c:488
-#: ../src/main/sidebar.cc:664 ../src/main/sidebar.cc:998
-#: ../src/main/sidebar.cc:1000
+#: ../src/gnome2/mod_mgr.c:1334 ../src/gnome2/utilities.c:577
+#: ../src/main/sidebar.cc:688 ../src/main/sidebar.cc:1051
+#: ../src/main/sidebar.cc:1053
 msgid "General Books"
 msgstr "Livros Gerais"
 
-#: ../src/gnome2/mod_mgr.c:1066 ../src/gnome2/utilities.c:492
-#: ../src/main/sidebar.cc:1007 ../src/main/sidebar.cc:1009
+#: ../src/gnome2/mod_mgr.c:1338 ../src/gnome2/utilities.c:581
+#: ../src/main/sidebar.cc:1060 ../src/main/sidebar.cc:1062
 msgid "Maps"
 msgstr "Mapas"
 
-#: ../src/gnome2/mod_mgr.c:1070 ../src/gnome2/utilities.c:496
-#: ../src/main/sidebar.cc:1016 ../src/main/sidebar.cc:1018
+#: ../src/gnome2/mod_mgr.c:1342 ../src/gnome2/utilities.c:585
+#: ../src/main/sidebar.cc:1069 ../src/main/sidebar.cc:1071
 msgid "Images"
 msgstr "Imagens"
 
-#: ../src/gnome2/mod_mgr.c:1078
+#: ../src/gnome2/mod_mgr.c:1350
 msgid ""
 "Categorized by\n"
 "Availability"
@@ -699,368 +838,384 @@ msgstr ""
 "Categorizado por \n"
 "Disponibilidade"
 
-#: ../src/gnome2/mod_mgr.c:1083
+#: ../src/gnome2/mod_mgr.c:1355
 msgid "Updates"
 msgstr "Actualizações"
 
-#: ../src/gnome2/mod_mgr.c:1087
+#: ../src/gnome2/mod_mgr.c:1359
 msgid "Uninstalled"
 msgstr "Desinstalado"
 
-#: ../src/gnome2/mod_mgr.c:1091 ../src/gnome2/sidebar.c:639
-#: ../src/gnome2/utilities.c:501 ../src/main/prayerlists.cc:238
-#: ../src/main/sidebar.cc:1026 ../src/main/sidebar.cc:1028
+#: ../src/gnome2/mod_mgr.c:1363 ../src/gnome2/sidebar.c:643
+#: ../src/gnome2/utilities.c:590 ../src/main/prayerlists.cc:241
+#: ../src/main/sidebar.cc:1079 ../src/main/sidebar.cc:1081
 msgid "Prayer List/Journal"
 msgstr "Lista de Oração/Diário"
 
-#: ../src/gnome2/mod_mgr.c:1268
+#: ../src/gnome2/mod_mgr.c:1545
 msgid "Refreshing from remote source"
 msgstr "Actualizando de fonte remota"
 
-#: ../src/gnome2/mod_mgr.c:1279
+#: ../src/gnome2/mod_mgr.c:1556
 msgid "Remote source not found"
 msgstr "Fonte remota não encontrada"
 
-#: ../src/gnome2/mod_mgr.c:1412
-msgid "Module Name"
-msgstr "Nome de Módulo"
-
-#: ../src/gnome2/mod_mgr.c:1433
-msgid "A checkmark means this module is already installed"
-msgstr "Uma marca significa que o módulo já está instalado"
-
-#: ../src/gnome2/mod_mgr.c:1455
-msgid "Click the box to work on this module"
-msgstr "Clique na caixa para trabalhar neste módulo"
-
-#: ../src/gnome2/mod_mgr.c:1456
-msgid "Click the box to select this module for install/update"
-msgstr "Clique na caixa para seleccionar este módulo para instalar/actualizar"
-
-#: ../src/gnome2/mod_mgr.c:1475
-msgid "Installed"
-msgstr "Instalado"
-
-#: ../src/gnome2/mod_mgr.c:1485
-msgid ""
-"The index icon means you have built an optimized ('lucene') index for this "
-"module for fast searching (see the Maintenance pane for this function)"
-msgstr ""
-"O ícone de índice significa que tem um índice optimizado ('lucene') para "
-"este módulo para pesquisa rápida (veja no painel de Manutenção sobre esta "
-"função)"
-
-#: ../src/gnome2/mod_mgr.c:1503
-msgid ""
-"The lock icon means this module is encrypted, and requires that you purchase "
-"an unlock key from the content owner"
-msgstr ""
-"O ícone de fechadura significa que este módulo está encriptado e requer a "
-"compra de uma chave de abertura ao proprietário do conteúdo"
-
-#. 2
-#: ../src/gnome2/mod_mgr.c:1520 ../src/gnome2/sidebar.c:977
-#: ../src/gnome2/sidebar.c:1145 ../ui/xi-menus.glade.h:1
-msgid "About"
-msgstr "Sobre"
-
-#: ../src/gnome2/mod_mgr.c:1540
-msgid ""
-"The refresh icon means the Installed module is older than the newer "
-"Available module: You should update the module"
-msgstr ""
-"O ícone de refrescar significa que o módulo instalado é mais antigo do que o "
-"módulo disponível: deve actualizar o módulo"
-
-#: ../src/gnome2/mod_mgr.c:1552
-msgid "Available"
-msgstr "Disponível"
-
-#: ../src/gnome2/mod_mgr.c:1561
-msgid "Size"
-msgstr "Tamanho"
-
-#: ../src/gnome2/mod_mgr.c:1570
-msgid "Description"
-msgstr "Descrição"
-
-#: ../src/gnome2/mod_mgr.c:1602 ../src/gnome2/mod_mgr.c:1702
+#: ../src/gnome2/mod_mgr.c:1670
 msgid "Configure"
 msgstr "Configurar"
 
-#: ../src/gnome2/mod_mgr.c:1633
+#: ../src/gnome2/mod_mgr.c:1701
 msgid "Type"
 msgstr "Tipo"
 
-#: ../src/gnome2/mod_mgr.c:1640
+#: ../src/gnome2/mod_mgr.c:1708
 msgid "Caption"
 msgstr "Nome"
 
-#: ../src/gnome2/mod_mgr.c:1648
+#: ../src/gnome2/mod_mgr.c:1716
 msgid "Source"
 msgstr "Fonte"
 
-#: ../src/gnome2/mod_mgr.c:1656
+#: ../src/gnome2/mod_mgr.c:1724
 msgid "Directory"
 msgstr "Directório"
 
-#: ../src/gnome2/mod_mgr.c:1664
+#: ../src/gnome2/mod_mgr.c:1732
 msgid "User"
 msgstr "Utilizador"
 
-#: ../src/gnome2/mod_mgr.c:1672
+#: ../src/gnome2/mod_mgr.c:1740
 msgid "Password"
 msgstr "Palavra-passe"
 
-#: ../src/gnome2/mod_mgr.c:1680
+#: ../src/gnome2/mod_mgr.c:1748
 msgid "UID"
 msgstr "UID"
 
-#: ../src/gnome2/mod_mgr.c:1700
-msgid "Sources"
-msgstr "Fontes"
+#: ../src/gnome2/mod_mgr.c:1765
+msgid "Module Sources"
+msgstr "Fontes de Módulos"
+
+#: ../src/gnome2/mod_mgr.c:1768
+msgid "Add/Remove"
+msgstr "Adicionar/Remover"
+
+#: ../src/gnome2/mod_mgr.c:1770
+msgid "Choose"
+msgstr "Escolher"
 
-#: ../src/gnome2/mod_mgr.c:1706 ../src/gnome2/preferences_dialog.c:1784
-#: ../src/gnome2/sidebar.c:1485
+#: ../src/gnome2/mod_mgr.c:1774 ../src/gnome2/preferences_dialog.c:1793
+#: ../src/gnome2/sidebar.c:1413
 msgid "Modules"
 msgstr "Módulos"
 
-#: ../src/gnome2/mod_mgr.c:1708
+#: ../src/gnome2/mod_mgr.c:1776
 msgid "Install/Update"
 msgstr "Instalar/Actualizar"
 
-#: ../src/gnome2/mod_mgr.c:1710
+#: ../src/gnome2/mod_mgr.c:1778
 msgid "Maintenance"
 msgstr "Manutenção"
 
-#: ../src/gnome2/mod_mgr.c:1930
+#: ../src/gnome2/mod_mgr.c:1999
 msgid "Please Refresh"
 msgstr "Por favor actualize"
 
-#: ../src/gnome2/mod_mgr.c:1931
+#: ../src/gnome2/mod_mgr.c:2000
 msgid "Your module list is not up to date!"
 msgstr "A sua lista de módulos não está actual!"
 
+#. Zero Bibles is just not workable in Xiphos.
 #: ../src/gnome2/mod_mgr.c:2282
+msgid ""
+"You have uninstalled your last Bible.\n"
+"Xiphos requires at least one."
+msgstr ""
+"Desinstalou a sua última Bíblia.\n"
+"Xiphos requer no mínimo uma."
+
+#: ../src/gnome2/mod_mgr.c:2288
+msgid ""
+"There are still no Bibles installed.\n"
+"Xiphos cannot continue without one."
+msgstr ""
+"Ainda não tem Bíblias instaladas.\n"
+"Xiphos não pode continuar sem nenhuma."
+
+#: ../src/gnome2/mod_mgr.c:2353
 msgid "Standard remote sources have been loaded."
 msgstr "Fontes remotas habituais foram carregadas."
 
-#: ../src/gnome2/mod_mgr.c:2283
+#: ../src/gnome2/mod_mgr.c:2359
 msgid "Could not load standard sources from CrossWire."
 msgstr "Não foi possível carregar as fontes habituais de CrossWire."
 
-#: ../src/gnome2/mod_mgr.c:2435 ../src/gnome2/mod_mgr.c:2684
+#: ../src/gnome2/mod_mgr.c:2510 ../src/gnome2/mod_mgr.c:2759
 msgid "Remove the selected source"
 msgstr "Remover a fonte seleccionada"
 
-#: ../src/gnome2/mod_mgr.c:2495
+#: ../src/gnome2/mod_mgr.c:2570
 msgid "Enter a remote source"
 msgstr "Introduzir uma fonte remota"
 
-#: ../src/gnome2/mod_mgr.c:2499
+#: ../src/gnome2/mod_mgr.c:2574
 msgid "Caption:"
 msgstr "Nome:"
 
-#: ../src/gnome2/mod_mgr.c:2500
+#: ../src/gnome2/mod_mgr.c:2575
 msgid "Type:"
 msgstr "Tipo:"
 
-#: ../src/gnome2/mod_mgr.c:2501
+#: ../src/gnome2/mod_mgr.c:2576
 msgid "Host:"
 msgstr "Máquina:"
 
-#: ../src/gnome2/mod_mgr.c:2502
+#: ../src/gnome2/mod_mgr.c:2577
 msgid "Directory:"
 msgstr "Directório:"
 
-#: ../src/gnome2/mod_mgr.c:2504
+#: ../src/gnome2/mod_mgr.c:2579
 msgid "User (optional):"
 msgstr "Utilizador (opcional):"
 
-#: ../src/gnome2/mod_mgr.c:2505
+#: ../src/gnome2/mod_mgr.c:2580
 msgid "Password (optional):"
 msgstr "Palavra-passe (opcional):"
 
 #. this can happen at most once
-#: ../src/gnome2/mod_mgr.c:2533
+#: ../src/gnome2/mod_mgr.c:2608
 msgid "A source by that name already exists."
 msgstr "Já existe uma fonte com esse nome."
 
-#: ../src/gnome2/mod_mgr.c:2681
+#: ../src/gnome2/mod_mgr.c:2756
 msgid "Delete a remote source"
 msgstr "Apagar uma fonte remota"
 
-#: ../src/gnome2/navbar_book.c:359 ../src/gnome2/navbar_book_dialog.c:299
+#. *****************************************************************************
+#. * Name
+#. *   gui_open_mod_mgr
+#. *
+#. * Synopsis
+#. *   #include "gui/mod_mgr.h"
+#. *
+#. *   void gui_open_mod_mgr(void)
+#. *
+#. * Description
+#. *
+#. *
+#. * Return value
+#. *   void
+#.
+#: ../src/gnome2/mod_mgr.c:3244
+msgid ""
+"<b>Welcome to the Module Manager.</b>\n"
+"\n"
+"This is Xiphos' mechanism to get new and updated content.\n"
+"It appears you have never been here before, so please take a moment to look "
+"it over.\n"
+"(You will see this information box just once.)\n"
+"\n"
+"Modules come from different <u>repositories</u>.  <b>Module Sources: Add/"
+"Remove</b> will show you what repositories are currently known.\n"
+"\n"
+"<b>Module Sources: Choose</b> is for deciding from where modules should "
+"come, that is, from which repository Xiphos should obtain them, as well as "
+"where they should be placed on your system. Set <i>Install Source</i> and "
+"<i>Install Destination</i>, then click <i>Refresh</i>.\n"
+"\n"
+"<b>Modules: Install/Update</b> is for selecting and obtaining modules after "
+"choosing source and destination.\n"
+"\n"
+"<b>Modules: Maintenance</b> is for archive and index creation.\n"
+"\n"
+"See section 5 of our manual for Module Manager detail, or ask for help via "
+"Live Chat, or (if no one is responsive in chat) send mail to our users' "
+"mailing list.\n"
+msgstr ""
+"<b>Benvindo ao Gestor de Módulos.</b>\n"
+"\n"
+"Este é o mecanismo de Xiphos para obter conteúdo novo e actualizado.\n"
+"Parece que nunca esteve aqui. Por isso, gaste um momento para analisar.\n"
+"(Verá esta caixa de informação apenas uma vez.)\n"
+"\n"
+"Os módulos vêm de diferentes <u>repositórios</u>. <b>Fontes de Módulos: "
+"Adicionar/Remover</b> mostra quais os repositórios conhecidos "
+"presentemente.\n"
+"\n"
+"<b>Fontes de Módulos: Escolher</b> permite decidir de onde devem vir os "
+"módulos (isto é, de que repositório Xiphos deve obtê-los), bem como onde "
+"guardá-los no sistema. Active <i>Fonte de Instalação</i> e <i>Destino de "
+"Instalação</i>, e clique <i>Actualizar</i>.\n"
+"\n"
+"<b>Módulos: Instalar/Actualizar</b> permite seleccionar e obter módulos "
+"depois de escolher a fonte e o destino.\n"
+"\n"
+"<b>Módulos: Manutenção</b> é para criação de arquivo e índices.\n"
+"\n"
+"Veja a Secção 5 do nosso manual para detalhes sobre o Gestor de Módulos, ou "
+"peça ajuda através do Chat, ou ainda (se não obtiver resposta no Chat) envie "
+"mail para a nossa lista de utilizadores.\n"
+
+#: ../src/gnome2/navbar_book.c:359 ../src/gnome2/navbar_book_dialog.c:300
 msgid "Go outward, to the section containing this one"
 msgstr "Ir para fora, para a secção que contém este"
 
-#: ../src/gnome2/navbar_book.c:375 ../src/gnome2/navbar_book_dialog.c:315
+#: ../src/gnome2/navbar_book.c:375 ../src/gnome2/navbar_book_dialog.c:316
 msgid "Go to previous item"
 msgstr "Ir para item anterior"
 
-#: ../src/gnome2/navbar_book.c:390 ../src/gnome2/navbar_book_dialog.c:330
+#: ../src/gnome2/navbar_book.c:390 ../src/gnome2/navbar_book_dialog.c:331
 msgid "Go to next item"
 msgstr "Ir para próximo item"
 
-#: ../src/gnome2/navbar_book.c:406 ../src/gnome2/navbar_book_dialog.c:346
+#: ../src/gnome2/navbar_book.c:406 ../src/gnome2/navbar_book_dialog.c:347
 msgid "Go inward, to the first subsection"
 msgstr "Ir para dentro, para a primeira subsecção"
 
-#: ../src/gnome2/navbar_versekey_dialog.c:887
-#: ../src/gnome2/navbar_versekey_editor.c:877
-#: ../src/gnome2/navbar_versekey_parallel.c:800
+#: ../src/gnome2/navbar_versekey_dialog.c:864
+#: ../src/gnome2/navbar_versekey_editor.c:879
+#: ../src/gnome2/navbar_versekey_parallel.c:810
 msgid "Synchronize this window from main window"
 msgstr "Sincronizar esta janela com a janela principal"
 
-#: ../src/gnome2/parallel_dialog.c:324 ../src/gnome2/preferences_dialog.c:1790
+#: ../src/gnome2/parallel_dialog.c:328 ../src/gnome2/preferences_dialog.c:1799
 msgid "Parallel"
 msgstr "Paralelo"
 
-#: ../src/gnome2/parallel_view.c:271
+#: ../src/gnome2/parallel_view.c:275
 msgid "Copy"
 msgstr "Cópia"
 
-#: ../src/gnome2/parallel_view.c:281
+#: ../src/gnome2/parallel_view.c:285
 msgid "Detach/Attach"
 msgstr "Desanexar/Anexar"
 
-#: ../src/gnome2/parallel_view.c:287 ../ui/xi-menus.glade.h:40
+#: ../src/gnome2/parallel_view.c:291 ../ui/xi-menus.glade.h:53
 msgid "Module Options"
 msgstr "Opções do Módulo"
 
 #. build change parallel modules submenu
-#: ../src/gnome2/parallel_view.c:302
+#: ../src/gnome2/parallel_view.c:306
 msgid "Change parallel 1"
 msgstr "Mudar paralelo 1"
 
-#: ../src/gnome2/parallel_view.c:304
+#: ../src/gnome2/parallel_view.c:308
 msgid "Change parallel 2"
 msgstr "Mudar paralelo 2"
 
-#: ../src/gnome2/parallel_view.c:306
+#: ../src/gnome2/parallel_view.c:310
 msgid "Change parallel 3"
 msgstr "Mudar paralelo 3"
 
-#: ../src/gnome2/parallel_view.c:308
+#: ../src/gnome2/parallel_view.c:312
 msgid "Change parallel 4"
 msgstr "Mudar paralelo 4"
 
-#: ../src/gnome2/parallel_view.c:310
+#: ../src/gnome2/parallel_view.c:314
 msgid "Change parallel 5"
 msgstr "Mudar paralelo 5"
 
-#: ../src/gnome2/parallel_view.c:467 ../src/gnome2/sidebar.c:622
-#: ../src/gnome2/sidebar.c:628 ../src/gnome2/tabbed_browser.c:231
-#: ../src/main/sidebar.cc:622 ../src/main/sidebar.cc:954
-#: ../src/main/sidebar.cc:955 ../src/main/sidebar.cc:956
+#: ../src/gnome2/parallel_view.c:471 ../src/gnome2/sidebar.c:626
+#: ../src/gnome2/sidebar.c:632 ../src/gnome2/tabbed_browser.c:262
+#: ../src/main/sidebar.cc:646 ../src/main/sidebar.cc:1007
+#: ../src/main/sidebar.cc:1008 ../src/main/sidebar.cc:1009
 msgid "Parallel View"
 msgstr "Vista Paralela"
 
-#: ../src/gnome2/preferences_cell_renderer.c:398
-msgid "Text"
-msgstr "Texto"
-
-#: ../src/gnome2/preferences_cell_renderer.c:400
-msgid "Text to render"
-msgstr "Texto a renderizar"
-
-#: ../src/gnome2/preferences_cell_renderer.c:406
-msgid "Pixbuf Object"
-msgstr "Objecto Pixbuf"
-
-#: ../src/gnome2/preferences_cell_renderer.c:408
-msgid "The pixbuf to render."
-msgstr "Pixbuf a renderizar."
-
-#: ../src/gnome2/preferences_dialog.c:1231
-#: ../src/gnome2/preferences_dialog.c:1269
-#: ../src/gnome2/preferences_dialog.c:1306
-#: ../src/gnome2/preferences_dialog.c:1341
-#: ../src/gnome2/preferences_dialog.c:1375
-#: ../src/gnome2/preferences_dialog.c:1408
-#: ../src/gnome2/preferences_dialog.c:1440
-#: ../src/gnome2/preferences_dialog.c:1473
-#: ../src/gnome2/preferences_dialog.c:1505
-#: ../src/gnome2/preferences_dialog.c:1539
-#: ../src/gnome2/preferences_dialog.c:1574
-#: ../src/gnome2/preferences_dialog.c:1609
-#: ../src/gnome2/preferences_dialog.c:1645
-#: ../src/gnome2/preferences_dialog.c:2045
+#: ../src/gnome2/preferences_dialog.c:1179
+#: ../src/gnome2/preferences_dialog.c:1217
+#: ../src/gnome2/preferences_dialog.c:1254
+#: ../src/gnome2/preferences_dialog.c:1289
+#: ../src/gnome2/preferences_dialog.c:1323
+#: ../src/gnome2/preferences_dialog.c:1356
+#: ../src/gnome2/preferences_dialog.c:1388
+#: ../src/gnome2/preferences_dialog.c:1421
+#: ../src/gnome2/preferences_dialog.c:1453
+#: ../src/gnome2/preferences_dialog.c:1487
+#: ../src/gnome2/preferences_dialog.c:1522
+#: ../src/gnome2/preferences_dialog.c:1557
+#: ../src/gnome2/preferences_dialog.c:1593
+#: ../src/gnome2/preferences_dialog.c:1631
+#: ../src/gnome2/preferences_dialog.c:2052
 msgid "-- Select --"
 msgstr "-- Seleccionar --"
 
-#: ../src/gnome2/preferences_dialog.c:1678 ../ui/prefs.glade.h:74
+#: ../src/gnome2/preferences_dialog.c:1652
+msgid "Locale will take effect after restart."
+msgstr "Locale tem efeito após reinício do programa."
+
+#: ../src/gnome2/preferences_dialog.c:1687 ../ui/prefs.glade.h:74
 msgid "Preferences"
 msgstr "Preferências"
 
-#: ../src/gnome2/preferences_dialog.c:1760
+#: ../src/gnome2/preferences_dialog.c:1769
 msgid "Fonts"
 msgstr "Fontes"
 
-#: ../src/gnome2/preferences_dialog.c:1763
+#: ../src/gnome2/preferences_dialog.c:1772
 msgid "Color"
 msgstr "Cor"
 
-#: ../src/gnome2/preferences_dialog.c:1766
+#: ../src/gnome2/preferences_dialog.c:1775
 msgid "Sizes"
 msgstr "Tamanhos"
 
-#: ../src/gnome2/preferences_dialog.c:1770
+#: ../src/gnome2/preferences_dialog.c:1779
 msgid "General"
 msgstr "Geral"
 
-#: ../src/gnome2/preferences_dialog.c:1773 ../ui/prefs.glade.h:85
+#: ../src/gnome2/preferences_dialog.c:1782 ../ui/prefs.glade.h:87
 msgid "Tabs and Panes"
 msgstr "Abas e painéis"
 
-#: ../src/gnome2/preferences_dialog.c:1780
+#: ../src/gnome2/preferences_dialog.c:1789
 msgid "Options"
 msgstr "Opções"
 
-#: ../src/gnome2/preferences_dialog.c:1787
+#: ../src/gnome2/preferences_dialog.c:1796
 msgid "Main"
 msgstr "Principal"
 
-#: ../src/gnome2/preferences_dialog.c:1793
+#: ../src/gnome2/preferences_dialog.c:1802
 msgid "Special"
 msgstr "Especial"
 
-#: ../src/gnome2/search_dialog.c:61 ../src/main/search_dialog.cc:60
-#: ../src/main/search_sidebar.cc:54
+#: ../src/gnome2/search_dialog.c:68 ../src/main/search_dialog.cc:66
+#: ../src/main/search_sidebar.cc:61
 msgid "Searching the "
-msgstr "Pesquisando"
+msgstr "Pesquisando "
 
-#: ../src/gnome2/search_dialog.c:62 ../src/main/search_dialog.cc:61
-#: ../src/main/search_sidebar.cc:55
+#: ../src/gnome2/search_dialog.c:69 ../src/main/search_dialog.cc:67
+#: ../src/main/search_sidebar.cc:62
 msgid " Module"
-msgstr "Módulo"
+msgstr " Módulo"
 
-#: ../src/gnome2/search_dialog.c:63 ../src/main/search_dialog.cc:62
-#: ../src/main/search_sidebar.cc:56
+#: ../src/gnome2/search_dialog.c:70 ../src/main/search_dialog.cc:68
+#: ../src/main/search_sidebar.cc:63
 msgid "found in "
 msgstr "encontrado em "
 
-#: ../src/gnome2/search_dialog.c:498
+#: ../src/gnome2/search_dialog.c:527
 msgid "Clear List?"
 msgstr "Limpar Lista?"
 
-#: ../src/gnome2/search_dialog.c:499
+#: ../src/gnome2/search_dialog.c:528
 msgid "Are you sure you want to clear the module list?"
 msgstr "Tem a certeza de que pretende limpar a lista de módulos?"
 
-#: ../src/gnome2/search_dialog.c:682
+#: ../src/gnome2/search_dialog.c:708
 msgid "The last module list may not be deleted"
 msgstr "A última lista de módulos não pode ser apagada"
 
-#: ../src/gnome2/search_dialog.c:699
+#: ../src/gnome2/search_dialog.c:726
 msgid "Delete list?"
 msgstr "Apagar Lista?"
 
-#: ../src/gnome2/search_dialog.c:700
+#: ../src/gnome2/search_dialog.c:727
 msgid "Are you sure you want to delete:"
 msgstr "Tem a certeza de que pretende apagar:"
 
-#: ../src/gnome2/search_sidebar.c:189
+#: ../src/gnome2/search_sidebar.c:192
 msgid ""
 "This is an inclusive (\"AND\") search:\n"
 "Find matches showing all words."
@@ -1068,173 +1223,93 @@ msgstr ""
 "Esta é uma pesquisa inclusiva (\"AND\"):\n"
 "Encontrar combinações com todas as palavras."
 
-#: ../src/gnome2/search_sidebar.c:206
+#: ../src/gnome2/search_sidebar.c:209
 msgid "Search Module"
 msgstr "Pesquisar Módulo"
 
-#: ../src/gnome2/search_sidebar.c:220
+#: ../src/gnome2/search_sidebar.c:223
 msgid "Bible"
 msgstr "Bíblia"
 
-#: ../src/gnome2/search_sidebar.c:229 ../ui/prefs.glade.h:35
+#: ../src/gnome2/search_sidebar.c:232 ../ui/prefs.glade.h:35
 msgid "Commentary"
 msgstr "Comentário"
 
-#: ../src/gnome2/search_sidebar.c:243
+#: ../src/gnome2/search_sidebar.c:246
 msgid "Search Type"
 msgstr "Tipo de pesquisa"
 
-#: ../src/gnome2/search_sidebar.c:257 ../ui/search-dialog.glade.h:64
+#: ../src/gnome2/search_sidebar.c:260 ../ui/search-dialog.glade.h:66
 msgid "Multi word"
 msgstr "Palavra múltipla"
 
-#: ../src/gnome2/search_sidebar.c:276 ../ui/search-dialog.glade.h:44
+#: ../src/gnome2/search_sidebar.c:279 ../ui/search-dialog.glade.h:44
 msgid "Exact phrase"
 msgstr "Frase exacta"
 
-#: ../src/gnome2/search_sidebar.c:290
+#: ../src/gnome2/search_sidebar.c:293
 msgid "Search Options"
 msgstr "Opções de Pesquisa"
 
-#: ../src/gnome2/search_sidebar.c:318
+#: ../src/gnome2/search_sidebar.c:321
 msgid "Search Scope"
 msgstr "Âmbito de Pesquisa"
 
-#: ../src/gnome2/search_sidebar.c:331
+#: ../src/gnome2/search_sidebar.c:334
 msgid "No scope"
 msgstr "Sem âmbito"
 
-#: ../src/gnome2/search_sidebar.c:341
+#: ../src/gnome2/search_sidebar.c:344
 msgid "Use bounds"
 msgstr "Usar limites"
 
-#: ../src/gnome2/search_sidebar.c:350
+#: ../src/gnome2/search_sidebar.c:353
 msgid "Last search"
 msgstr "Última pesquisa"
 
-#: ../src/gnome2/search_sidebar.c:365
+#: ../src/gnome2/search_sidebar.c:368
 msgid "Bounds"
 msgstr "Limites"
 
-#: ../src/gnome2/search_sidebar.c:379
+#: ../src/gnome2/search_sidebar.c:382
 msgid "Lower"
 msgstr "Inferior"
 
-#: ../src/gnome2/search_sidebar.c:386
+#: ../src/gnome2/search_sidebar.c:389
 msgid "Upper"
 msgstr "Superior"
 
-#. 0
-#: ../src/gnome2/sidebar.c:965 ../src/gnome2/sidebar.c:1133
-msgid "Open in a new tab"
-msgstr "Abrir numa nova aba"
-
-#: ../src/gnome2/sidebar.c:966 ../src/gnome2/sidebar.c:1134
-msgid "Open selected module in a new tab"
-msgstr "Abrir módulo seleccionado numa nova aba"
-
-#. 1
-#: ../src/gnome2/sidebar.c:971
-msgid "Open in a separate window"
-msgstr "Abrir numa janela separada"
-
-#: ../src/gnome2/sidebar.c:972
-msgid "Open selected module in a separate ['dialog'] window"
-msgstr "Abrir módulo seleccionado numa janela ['diálogo'] separada"
-
-#: ../src/gnome2/sidebar.c:978 ../src/gnome2/sidebar.c:1146
-msgid "View information about the selected dialog"
-msgstr "Ver informação sobre o diálogo seleccionado"
-
-#: ../src/gnome2/sidebar.c:1069
-msgid "Simple"
-msgstr "Simples"
-
-#: ../src/gnome2/sidebar.c:1070
-msgid "Create a new simple prayer list"
-msgstr "Criar uma nova lista de oração simples"
-
-#: ../src/gnome2/sidebar.c:1076
-msgid "Subject"
-msgstr "Assunto"
-
-#: ../src/gnome2/sidebar.c:1083
-msgid "Monthly"
-msgstr "Mensal"
-
-#: ../src/gnome2/sidebar.c:1084 ../src/gnome2/sidebar.c:1091
-#: ../src/gnome2/sidebar.c:1098
-msgid "Create a new prayer list"
-msgstr "Criar uma nova lista de oração"
-
-#: ../src/gnome2/sidebar.c:1090
-msgid "Daily Journal"
-msgstr "Devocional Diário"
-
-#: ../src/gnome2/sidebar.c:1097
-msgid "Outlined Topic"
-msgstr "Tópico Sublinhado"
-
-#. 1
-#: ../src/gnome2/sidebar.c:1139 ../ui/xi-menus.glade.h:47
-msgid "Open in editor"
-msgstr "Abrir no editor"
-
-#: ../src/gnome2/sidebar.c:1140
-msgid "Open selected module in a dialog"
-msgstr "Abrir módulo seleccionado num diálogo"
-
-#: ../src/gnome2/sidebar.c:1469
+#: ../src/gnome2/sidebar.c:1397
 msgid "Search"
 msgstr "Pesquisar"
 
-#: ../src/gnome2/sidebar.c:1477
+#: ../src/gnome2/sidebar.c:1405
 msgid "Verse List"
 msgstr "Lista de Versículos"
 
-#: ../src/gnome2/sidebar_dialog.c:136 ../src/gnome2/sidebar_dialog.c:145
+#: ../src/gnome2/sidebar_dialog.c:139 ../src/gnome2/sidebar_dialog.c:148
 msgid "Sidebar"
 msgstr "Barra Lateral"
 
-#: ../src/gnome2/splash.c:363
+#: ../src/gnome2/splash.c:396
 msgid "Powered by the SWORD Project"
 msgstr "Movido pelo Projecto SWORD"
 
-#: ../src/gnome2/treekey-editor.c:130 ../src/gnome2/treekey-editor.c:189
-#: ../src/gnome2/treekey-editor.c:275
+#: ../src/gnome2/treekey-editor.c:137 ../src/gnome2/treekey-editor.c:196
+#: ../src/gnome2/treekey-editor.c:282
 msgid "Prayer List/Journal Item"
 msgstr "Lista de oração/Item de Diário"
 
-#: ../src/gnome2/treekey-editor.c:131 ../src/gnome2/treekey-editor.c:190
-#: ../src/gnome2/treekey-editor.c:276
+#: ../src/gnome2/treekey-editor.c:138 ../src/gnome2/treekey-editor.c:197
+#: ../src/gnome2/treekey-editor.c:283
 msgid "New name"
 msgstr "Novo Nome"
 
-#: ../src/gnome2/treekey-editor.c:246
+#: ../src/gnome2/treekey-editor.c:253
 msgid "Remove the selected item"
 msgstr "Remover o item seleccionado"
 
-#: ../src/gnome2/treekey-editor.c:304
-msgid "Add Child"
-msgstr "Adicionar Descendente"
-
-#: ../src/gnome2/treekey-editor.c:305 ../src/gnome2/treekey-editor.c:311
-msgid "Add an item"
-msgstr "Adicionar um item"
-
-#: ../src/gnome2/treekey-editor.c:310
-msgid "Add Sibling"
-msgstr "Adicionar Irmão"
-
-#: ../src/gnome2/treekey-editor.c:317
-msgid "Remove this item"
-msgstr "Remover este item"
-
-#: ../src/gnome2/treekey-editor.c:323
-msgid "Edit this item"
-msgstr "Editar este item"
-
-#: ../src/main/display.cc:303
+#: ../src/main/display.cc:259
 #, c-format
 msgid ""
 "Improperly encoded personal annotation label:\n"
@@ -1243,7 +1318,7 @@ msgstr ""
 "Rótulo de anotação pessoal indevidamente codificado:\n"
 "'%s'"
 
-#: ../src/main/display.cc:434
+#: ../src/main/display.cc:386
 msgid ""
 "An image file's size could not be determined.\n"
 "Is ImageMagick's 'identify' not installed?\n"
@@ -1255,284 +1330,283 @@ msgstr ""
 "(Ou possivelmente o tipo de imagem é distinto de bmp/gif/jpg/png.)\n"
 "Xiphos não pode redimensionar as imagens para ajustar à janela."
 
-#: ../src/main/display.cc:1090 ../src/main/display.cc:1152
-#: ../src/main/display.cc:1240 ../src/main/display.cc:1248
-#: ../ui/export-dialog.glade.h:7
+#: ../src/main/display.cc:1042 ../src/main/display.cc:1094
+#: ../src/main/display.cc:1171 ../ui/export-dialog.glade.h:7
 msgid "Chapter"
 msgstr "Capítulo"
 
-#: ../src/main/main.c:110
+#: ../src/main/main.c:119
 msgid "Xiphos does not understand more than one argument."
 msgstr "Xiphos não aceita mais do que um argumento."
 
-#: ../src/main/main.c:150
+#: ../src/main/main.c:161
 msgid "Initiating Gecko"
 msgstr "Iniciando Gecko"
 
-#: ../src/main/main.c:156
+#: ../src/main/main.c:167
 msgid "Building Interface"
 msgstr "Construindo Interface"
 
-#: ../src/main/main.c:160
+#: ../src/main/main.c:171
 msgid "Starting Sword"
 msgstr "Iniciando Sword"
 
-#: ../src/main/main.c:164
+#: ../src/main/main.c:175
 msgid "Loading Settings"
 msgstr "Carregando Definições"
 
-#: ../src/main/main.c:168
+#: ../src/main/main.c:179
 msgid "Displaying Xiphos"
 msgstr "Mostrando Xiphos"
 
-#: ../src/main/module_dialogs.cc:232 ../src/main/previewer.cc:122
-#: ../ui/prefs.glade.h:75
+#: ../src/main/module_dialogs.cc:227 ../src/main/previewer.cc:127
+#: ../src/main/previewer.cc:194 ../ui/prefs.glade.h:75
 msgid "Previewer"
 msgstr "Pré-visualizador"
 
-#: ../src/main/module_dialogs.cc:298 ../src/main/module_dialogs.cc:424
-#: ../src/main/previewer.cc:197
+#: ../src/main/module_dialogs.cc:292 ../src/main/module_dialogs.cc:416
+#: ../src/main/previewer.cc:269
 msgid "Footnote"
 msgstr "Nota de rodapé"
 
-#: ../src/main/module_dialogs.cc:304 ../src/main/module_dialogs.cc:429
-#: ../src/main/previewer.cc:209
+#: ../src/main/module_dialogs.cc:298 ../src/main/module_dialogs.cc:421
+#: ../src/main/previewer.cc:281
 msgid "Cross Reference"
 msgstr "Referência cruzada"
 
-#: ../src/main/module_dialogs.cc:310 ../src/main/module_dialogs.cc:324
-#: ../src/main/module_dialogs.cc:434 ../src/main/module_dialogs.cc:446
-#: ../src/main/previewer.cc:215 ../src/main/previewer.cc:234
+#: ../src/main/module_dialogs.cc:304 ../src/main/module_dialogs.cc:318
+#: ../src/main/module_dialogs.cc:426 ../src/main/module_dialogs.cc:438
+#: ../src/main/previewer.cc:287 ../src/main/previewer.cc:306
 msgid "Strongs"
 msgstr "Strongs"
 
-#: ../src/main/module_dialogs.cc:316 ../src/main/module_dialogs.cc:335
-#: ../src/main/module_dialogs.cc:439 ../src/main/module_dialogs.cc:456
-#: ../src/main/previewer.cc:221 ../src/main/previewer.cc:247
+#: ../src/main/module_dialogs.cc:310 ../src/main/module_dialogs.cc:329
+#: ../src/main/module_dialogs.cc:431 ../src/main/module_dialogs.cc:448
+#: ../src/main/previewer.cc:293 ../src/main/previewer.cc:319
 msgid "Morphology"
 msgstr "Morfologia"
 
-#: ../src/main/module_dialogs.cc:1089 ../src/main/url.cc:537
+#: ../src/main/module_dialogs.cc:1081 ../src/main/url.cc:530
 msgid "Back to "
 msgstr "Voltar a "
 
-#: ../src/main/parallel_view.cc:398 ../ui/xi-menus.glade.h:69
+#: ../src/main/parallel_view.cc:404 ../ui/xi-menus.glade.h:89
 msgid "Strong's Numbers"
 msgstr "Números Strong"
 
-#: ../src/main/parallel_view.cc:408 ../ui/search-dialog.glade.h:50
-#: ../ui/xi-menus.glade.h:27
+#: ../src/main/parallel_view.cc:414 ../ui/search-dialog.glade.h:52
+#: ../ui/xi-menus.glade.h:40
 msgid "Footnotes"
 msgstr "Notas de rodapé"
 
-#: ../src/main/parallel_view.cc:418 ../ui/search-dialog.glade.h:62
-#: ../ui/xi-menus.glade.h:41
+#: ../src/main/parallel_view.cc:424 ../ui/search-dialog.glade.h:64
+#: ../ui/xi-menus.glade.h:55
 msgid "Morphological Tags"
 msgstr "Etiquetas morfológicas"
 
-#: ../src/main/parallel_view.cc:428 ../ui/xi-menus.glade.h:31
+#: ../src/main/parallel_view.cc:434 ../ui/xi-menus.glade.h:44
 msgid "Hebrew Vowel Points"
 msgstr "Pontos Vogais do Hebraico"
 
-#: ../src/main/parallel_view.cc:438 ../ui/xi-menus.glade.h:30
+#: ../src/main/parallel_view.cc:444 ../ui/xi-menus.glade.h:43
 msgid "Hebrew Cantillation"
 msgstr "Cantilação do Hebraico"
 
-#: ../src/main/parallel_view.cc:448 ../ui/xi-menus.glade.h:28
+#: ../src/main/parallel_view.cc:454 ../ui/xi-menus.glade.h:41
 msgid "Greek Accents"
 msgstr "Acentos Gregos"
 
-#: ../src/main/parallel_view.cc:458
+#: ../src/main/parallel_view.cc:464
 msgid "Cross-references"
 msgstr "Referências cruzadas"
 
-#: ../src/main/parallel_view.cc:468 ../ui/xi-menus.glade.h:37
+#: ../src/main/parallel_view.cc:474 ../ui/xi-menus.glade.h:50
 msgid "Lemmas"
 msgstr "Lemas"
 
-#: ../src/main/parallel_view.cc:478 ../ui/xi-menus.glade.h:29
+#: ../src/main/parallel_view.cc:484 ../ui/xi-menus.glade.h:42
 msgid "Headings"
 msgstr "Cabeçalhos"
 
-#: ../src/main/parallel_view.cc:488
+#: ../src/main/parallel_view.cc:494
 msgid "Morpheme Segmentation"
 msgstr "Segmentação de Morfema"
 
-#: ../src/main/parallel_view.cc:498 ../ui/xi-menus.glade.h:75
+#: ../src/main/parallel_view.cc:504 ../ui/xi-menus.glade.h:96
 msgid "Words of Christ in Red"
 msgstr "Palavras de Cristo a vermelho"
 
-#: ../src/main/parallel_view.cc:508 ../ui/xi-menus.glade.h:70
+#: ../src/main/parallel_view.cc:514 ../ui/xi-menus.glade.h:91
 msgid "Transliteration"
 msgstr "Transliteração"
 
-#: ../src/main/parallel_view.cc:518
+#: ../src/main/parallel_view.cc:524
 msgid "Textual Variants"
 msgstr "Variantes Textuais"
 
-#: ../src/main/parallel_view.cc:526 ../ui/xi-menus.glade.h:51
+#: ../src/main/parallel_view.cc:532 ../ui/xi-menus.glade.h:70
 msgid "Primary Reading"
 msgstr "Leitura Principal"
 
-#: ../src/main/parallel_view.cc:535 ../ui/xi-menus.glade.h:65
+#: ../src/main/parallel_view.cc:541 ../ui/xi-menus.glade.h:84
 msgid "Secondary Reading"
 msgstr "Leitura Secundária"
 
-#: ../src/main/parallel_view.cc:544 ../ui/xi-menus.glade.h:5
+#: ../src/main/parallel_view.cc:550 ../ui/xi-menus.glade.h:9
 msgid "All Readings"
 msgstr "Todas as Leituras"
 
-#: ../src/main/parallel_view.cc:878 ../src/main/parallel_view.cc:1130
+#: ../src/main/parallel_view.cc:884 ../src/main/parallel_view.cc:1136
 msgid "view context"
 msgstr "contexto da vista"
 
-#: ../src/main/prayerlists.cc:71
+#: ../src/main/prayerlists.cc:74
 msgid "January"
 msgstr "Janeiro"
 
-#: ../src/main/prayerlists.cc:72
+#: ../src/main/prayerlists.cc:75
 msgid "February"
 msgstr "Fevereiro"
 
-#: ../src/main/prayerlists.cc:73
+#: ../src/main/prayerlists.cc:76
 msgid "March"
 msgstr "Março"
 
-#: ../src/main/prayerlists.cc:74
+#: ../src/main/prayerlists.cc:77
 msgid "April"
 msgstr "Abril"
 
-#: ../src/main/prayerlists.cc:75
+#: ../src/main/prayerlists.cc:78
 msgid "May"
 msgstr "Maio"
 
-#: ../src/main/prayerlists.cc:76
+#: ../src/main/prayerlists.cc:79
 msgid "June"
 msgstr "Junho"
 
-#: ../src/main/prayerlists.cc:77
+#: ../src/main/prayerlists.cc:80
 msgid "July"
 msgstr "Julho"
 
-#: ../src/main/prayerlists.cc:78
+#: ../src/main/prayerlists.cc:81
 msgid "August"
 msgstr "Agosto"
 
-#: ../src/main/prayerlists.cc:79
+#: ../src/main/prayerlists.cc:82
 msgid "September"
 msgstr "Setembro"
 
-#: ../src/main/prayerlists.cc:80
+#: ../src/main/prayerlists.cc:83
 msgid "October"
 msgstr "Outubro"
 
-#: ../src/main/prayerlists.cc:81
+#: ../src/main/prayerlists.cc:84
 msgid "November"
 msgstr "Novembro"
 
-#: ../src/main/prayerlists.cc:82
+#: ../src/main/prayerlists.cc:85
 msgid "December"
 msgstr "Dezembro"
 
-#: ../src/main/prayerlists.cc:121 ../src/main/sword_treekey.cc:332
+#: ../src/main/prayerlists.cc:124 ../src/main/sword_treekey.cc:332
 msgid "Growth"
 msgstr "Crescimento"
 
-#: ../src/main/prayerlists.cc:122 ../src/main/sword_treekey.cc:333
+#: ../src/main/prayerlists.cc:125 ../src/main/sword_treekey.cc:333
 msgid "<b>For Growth</b><br>"
 msgstr "<b>Para Crescimento</b><br>"
 
-#: ../src/main/prayerlists.cc:123 ../src/main/prayerlists.cc:380
+#: ../src/main/prayerlists.cc:126 ../src/main/prayerlists.cc:383
 #: ../src/main/sword_treekey.cc:334
 msgid "Salvation"
 msgstr "Salvação"
 
-#: ../src/main/prayerlists.cc:124 ../src/main/sword_treekey.cc:335
+#: ../src/main/prayerlists.cc:127 ../src/main/sword_treekey.cc:335
 msgid "<b>For Salvation</b><br>"
 msgstr "<b>Para Salvação</b><br>"
 
-#: ../src/main/prayerlists.cc:125 ../src/main/prayerlists.cc:384
+#: ../src/main/prayerlists.cc:128 ../src/main/prayerlists.cc:387
 #: ../src/main/sword_treekey.cc:336
 msgid "Health"
 msgstr "Saúde"
 
-#: ../src/main/prayerlists.cc:126 ../src/main/sword_treekey.cc:337
+#: ../src/main/prayerlists.cc:129 ../src/main/sword_treekey.cc:337
 msgid "<b>For Health</b><br>"
 msgstr "<b>Para Saúde</b><br>"
 
-#: ../src/main/prayerlists.cc:127
+#: ../src/main/prayerlists.cc:130
 msgid "Misc"
 msgstr "Variado"
 
-#: ../src/main/prayerlists.cc:128 ../src/main/sword_treekey.cc:339
+#: ../src/main/prayerlists.cc:131 ../src/main/sword_treekey.cc:339
 msgid "<b>Miscellaneous</b><br>"
 msgstr "<b>Miscelâneo</b><br>"
 
-#: ../src/main/prayerlists.cc:136
+#: ../src/main/prayerlists.cc:139
 msgid "Point x"
 msgstr "Ponto x"
 
-#: ../src/main/prayerlists.cc:137
+#: ../src/main/prayerlists.cc:140
 msgid "<b>(x)</b><br>"
 msgstr "<b>(x)</b><br>"
 
-#: ../src/main/prayerlists.cc:138
+#: ../src/main/prayerlists.cc:141
 msgid "Point y"
 msgstr "Ponto y"
 
-#: ../src/main/prayerlists.cc:139
+#: ../src/main/prayerlists.cc:142
 msgid "<b>(y)</b><br>"
 msgstr "<b>(y)</b><br>"
 
-#: ../src/main/prayerlists.cc:140
+#: ../src/main/prayerlists.cc:143
 msgid "Point z"
 msgstr "Ponto z"
 
-#: ../src/main/prayerlists.cc:141
+#: ../src/main/prayerlists.cc:144
 msgid "<b>(z)</b><br>"
 msgstr "<b>(z)</b><br>"
 
-#: ../src/main/prayerlists.cc:149
+#: ../src/main/prayerlists.cc:152
 msgid "Minor Topic 1"
 msgstr "Tópico Menor 1"
 
-#: ../src/main/prayerlists.cc:150
+#: ../src/main/prayerlists.cc:153
 msgid "<b>Subtopic 1</b><br>"
 msgstr "<b>Subtópico 1</b><br>"
 
-#: ../src/main/prayerlists.cc:152
+#: ../src/main/prayerlists.cc:155
 msgid "Minor Topic 2"
 msgstr "Tópico Menor 2"
 
-#: ../src/main/prayerlists.cc:153
+#: ../src/main/prayerlists.cc:156
 msgid "<b>Subtopic 2</b><br>"
 msgstr "<b>Subtópico 2</b><br>"
 
-#: ../src/main/prayerlists.cc:155
+#: ../src/main/prayerlists.cc:158
 msgid "Minor Topic 3"
 msgstr "Tópico Menor 3"
 
-#: ../src/main/prayerlists.cc:156
+#: ../src/main/prayerlists.cc:159
 msgid "<b>Subtopic 3</b><br>"
 msgstr "<b>Subtópico 3</b><br>"
 
-#: ../src/main/prayerlists.cc:158
+#: ../src/main/prayerlists.cc:161
 msgid "Minor Topic 4"
 msgstr "Tópico Menor 4"
 
-#: ../src/main/prayerlists.cc:159
+#: ../src/main/prayerlists.cc:162
 msgid "<b>Subtopic 4</b><br>"
 msgstr "<b>Subtópico 4</b><br>"
 
-#: ../src/main/prayerlists.cc:239
+#: ../src/main/prayerlists.cc:242
 msgid "Name for new prayer list or journal"
 msgstr "Nome da nova lista de oração ou diário"
 
-#: ../src/main/prayerlists.cc:270
+#: ../src/main/prayerlists.cc:273
 msgid "Xiphos finds that prayer list already."
 msgstr "Xiphos já encontra essa lista de oração."
 
-#: ../src/main/prayerlists.cc:283
+#: ../src/main/prayerlists.cc:286
 #, c-format
 msgid ""
 "Xiphos cannot create module's path:\n"
@@ -1541,19 +1615,19 @@ msgstr ""
 "Xiphos não pode criar o caminho do módulo:\n"
 "%s"
 
-#: ../src/main/prayerlists.cc:323
+#: ../src/main/prayerlists.cc:326
 msgid "A basic prayer list. \\par\\par Module created by Xiphos."
 msgstr "Uma lista de oração básica. \\par\\par Módulo criado por Xiphos."
 
-#: ../src/main/prayerlists.cc:324
+#: ../src/main/prayerlists.cc:327
 msgid "BasicPrayerList"
 msgstr "Lista Básica de Oração"
 
-#: ../src/main/prayerlists.cc:338
+#: ../src/main/prayerlists.cc:341
 msgid "MyPrayerList"
 msgstr "Minha Lista de Oração"
 
-#: ../src/main/prayerlists.cc:339
+#: ../src/main/prayerlists.cc:342
 msgid ""
 "<b>People:</b><br>Bob<br>Sam<br>Sue<br><br><b>Church:</"
 "b><br>pews<br>fellowship<br>Bibles for missionaries<br><br><br>"
@@ -1561,112 +1635,112 @@ msgstr ""
 "<b>Pessoas:</b><br>Bob<br>Sam<br>Sue<br><br><b>Igreja:</"
 "b><br>bancos<br>congregação<br>Bíblias para missionários<br><br><br>"
 
-#: ../src/main/prayerlists.cc:365
+#: ../src/main/prayerlists.cc:368
 msgid "A subject-based prayer list. \\par\\par Module created by Xiphos."
 msgstr ""
 "Uma lista de oração baseada em assunto. \\par\\par Módulo criado por Xiphos."
 
-#: ../src/main/prayerlists.cc:366
+#: ../src/main/prayerlists.cc:369
 msgid "SubjectPrayerList"
 msgstr "Lista de Oração"
 
-#: ../src/main/prayerlists.cc:381
+#: ../src/main/prayerlists.cc:384
 msgid "Bob<br>Sam<br>Sue<br>John<br>"
 msgstr "Bob<br>Sam<br>Sue<br>John<br>"
 
-#: ../src/main/prayerlists.cc:382
+#: ../src/main/prayerlists.cc:385
 msgid "Spiritual Growth"
 msgstr "Crescimento Espiritual"
 
-#: ../src/main/prayerlists.cc:383
+#: ../src/main/prayerlists.cc:386
 msgid "Mike<br>Steve<br>"
 msgstr "Mike<br>Steve<br>"
 
-#: ../src/main/prayerlists.cc:385
+#: ../src/main/prayerlists.cc:388
 msgid "Sue<br>John<br>"
 msgstr "Sue<br>John<br>"
 
-#: ../src/main/prayerlists.cc:411
+#: ../src/main/prayerlists.cc:414
 msgid "A monthly prayer list. \\par\\par Module created by Xiphos."
 msgstr "Uma lista de oração mensal. \\par\\par Módulo criado por Xiphos."
 
-#: ../src/main/prayerlists.cc:412
+#: ../src/main/prayerlists.cc:415
 msgid "MonthlyPrayerList"
 msgstr "Lista de Oração Mensal"
 
-#: ../src/main/prayerlists.cc:463
+#: ../src/main/prayerlists.cc:466
 msgid "A daily journal. \\par\\par Module created by Xiphos."
 msgstr "Um diário. \\par\\par Módulo criado por Xiphos."
 
-#: ../src/main/prayerlists.cc:464
+#: ../src/main/prayerlists.cc:467
 msgid "DailyJournal"
 msgstr "Devocional Diário"
 
-#: ../src/main/prayerlists.cc:528
+#: ../src/main/prayerlists.cc:531
 msgid "An outlined topic (e.g. sermon). \\par\\par Module created by Xiphos."
 msgstr ""
 "Um tópico assinalado (ex. sermão). \\par\\par Módulo criado por Xiphos."
 
-#: ../src/main/prayerlists.cc:529
+#: ../src/main/prayerlists.cc:532
 msgid "OutlinedTopic"
 msgstr "Tópico Sublinhado"
 
-#: ../src/main/prayerlists.cc:543
+#: ../src/main/prayerlists.cc:546
 msgid "Major Topic A"
 msgstr "Tópico Maior A"
 
-#: ../src/main/prayerlists.cc:544
+#: ../src/main/prayerlists.cc:547
 msgid "<b>Major Topic A</b><br>"
 msgstr "<b>Tópico Maior A</b><br>"
 
-#: ../src/main/prayerlists.cc:546
+#: ../src/main/prayerlists.cc:549
 msgid "Major Topic B"
 msgstr "Tópico Maior B"
 
-#: ../src/main/prayerlists.cc:547
+#: ../src/main/prayerlists.cc:550
 msgid "<b>Major Topic B</b><br>"
 msgstr "<b>Tópico Maior B</b><br>"
 
-#: ../src/main/prayerlists.cc:549
+#: ../src/main/prayerlists.cc:552
 msgid "Major Topic C"
 msgstr "Tópico Maior C"
 
-#: ../src/main/prayerlists.cc:550
+#: ../src/main/prayerlists.cc:553
 msgid "<b>Major Topic C</b><br>"
 msgstr "<b>Tópico Maior C</b><br>"
 
-#: ../src/main/previewer.cc:203
+#: ../src/main/previewer.cc:275
 msgid "User Annotation"
 msgstr "Anotação do Utilizador"
 
-#: ../src/main/search_dialog.cc:129
+#: ../src/main/search_dialog.cc:212
 #, c-format
 msgid "Search result %s: %s"
 msgstr "Resultado da Pesquisa %s: %s"
 
-#: ../src/main/search_dialog.cc:362
+#: ../src/main/search_dialog.cc:444
 msgid "Delete Range?"
 msgstr "Apagar Extensão?"
 
-#: ../src/main/search_dialog.cc:363
+#: ../src/main/search_dialog.cc:445
 msgid "Are you sure you want to delete this range?"
 msgstr "Tem a certeza de que quer apagar esta extensão?"
 
-#: ../src/main/search_dialog.cc:577 ../src/main/search_dialog.cc:1048
-#: ../src/main/search_dialog.cc:1051 ../src/main/search_dialog.cc:1073
-#: ../src/main/search_dialog.cc:1076
+#: ../src/main/search_dialog.cc:659 ../src/main/search_dialog.cc:1130
+#: ../src/main/search_dialog.cc:1133 ../src/main/search_dialog.cc:1155
+#: ../src/main/search_dialog.cc:1158
 msgid "Search: "
 msgstr "Pesquisar: "
 
-#: ../src/main/search_dialog.cc:622
+#: ../src/main/search_dialog.cc:704
 msgid "Remove Module?"
 msgstr "Remover Módulo?"
 
-#: ../src/main/search_dialog.cc:623
+#: ../src/main/search_dialog.cc:705
 msgid "Are you sure you want to remove the selected module?"
 msgstr "Tem a certeza de que pretende remover o módulo seleccionado?"
 
-#: ../src/main/search_dialog.cc:1472
+#: ../src/main/search_dialog.cc:1560
 #, c-format
 msgid ""
 "%s:\n"
@@ -1677,16 +1751,16 @@ msgstr ""
 "Esse módulo não está instalado.\n"
 "%s"
 
-#: ../src/main/search_dialog.cc:1474
+#: ../src/main/search_dialog.cc:1562
 msgid "Please adjust the module list."
 msgstr "Por favor, ajuste a lista de módulos."
 
-#: ../src/main/search_dialog.cc:1490
+#: ../src/main/search_dialog.cc:1578
 #, c-format
 msgid "No fast-search index exists for %s.%s%s"
 msgstr "Não existe qualquer índice de busca rápida para %s.%s%s"
 
-#: ../src/main/search_dialog.cc:1492
+#: ../src/main/search_dialog.cc:1580
 msgid ""
 "\n"
 "Search on this module is now `multi word'."
@@ -1694,7 +1768,7 @@ msgstr ""
 "\n"
 "Pesquisa neste módulo é agora `multi palavras'."
 
-#: ../src/main/search_dialog.cc:1493
+#: ../src/main/search_dialog.cc:1581
 msgid ""
 "\n"
 "See the Module Manager, Maintenance pane."
@@ -1702,15 +1776,15 @@ msgstr ""
 "\n"
 "Ver o Gestor de Módulos, Manutenção."
 
-#: ../src/main/search_dialog.cc:1554
+#: ../src/main/search_dialog.cc:1644
 msgid "Search finished"
 msgstr "Pesquisa concluída"
 
-#: ../src/main/search_sidebar.cc:93
+#: ../src/main/search_sidebar.cc:100
 msgid "matches"
 msgstr "combina com"
 
-#: ../src/main/settings.c:56
+#: ../src/main/settings.c:60
 msgid ""
 "Welcome to Xiphos.\n"
 "\n"
@@ -1746,28 +1820,11 @@ msgstr ""
 "\n"
 "Pode Xiphos invocar o Gestor de Módulos para que possa instalar uma Bíblia?"
 
-#: ../src/main/settings.c:109
+#: ../src/main/settings.c:105
 msgid "$HOME is not set!"
 msgstr "$HOME não está definido!"
 
-#: ../src/main/settings.c:124
-msgid "Xiphos has renamed .xiphos-2.0 to .xiphos"
-msgstr "Xiphos não pode renomear .xiphos-2.0 para .xiphos:"
-
-#: ../src/main/settings.c:127
-#, c-format
-msgid ""
-"Xiphos can not rename  .xiphos-2.0 to .xiphos:\n"
-"%s\n"
-"\n"
-"Xiphos cannot continue."
-msgstr ""
-"Xiphos não consegue renomear .xiphos-2.0 para .xiphos:\n"
-"%s\n"
-"\n"
-"Xiphos não pode continuar."
-
-#: ../src/main/settings.c:135
+#: ../src/main/settings.c:120
 #, c-format
 msgid ""
 "Xiphos can not create  .xiphos:\n"
@@ -1780,12 +1837,12 @@ msgstr ""
 "\n"
 "Xiphos não pode continuar."
 
-#: ../src/main/settings.c:148 ../src/main/settings.c:156
-#: ../src/main/settings.c:164
+#: ../src/main/settings.c:133 ../src/main/settings.c:142
+#: ../src/main/settings.c:151
 msgid "can not create "
 msgstr "não pode criar "
 
-#: ../src/main/settings.c:196
+#: ../src/main/settings.c:194
 msgid ""
 "There are still no Bibles installed.\n"
 "Evidently, you declined to install any.\n"
@@ -1801,11 +1858,11 @@ msgstr ""
 "Xiphos não pode prosseguir \n"
 "e vai agora terminar."
 
-#: ../src/main/settings.c:200
+#: ../src/main/settings.c:198
 msgid "Bible module installation complete."
 msgstr "Instalação de módulo bíblico concluída."
 
-#: ../src/main/settings.c:203
+#: ../src/main/settings.c:201
 msgid ""
 "Without any Bible modules to display,\n"
 "Xiphos cannot proceed,\n"
@@ -1815,75 +1872,15 @@ msgstr ""
 "Xiphos não pode prosseguir \n"
 "e vai agora terminar."
 
-#. *****************************************************************************
-#. * Name
-#. *    gconf_setup
-#. *
-#. * Synopsis
-#. *   #include "main/settings.h"
-#. *
-#. *   void gconf_setup()
-#. *
-#. * Description
-#. *   verifies and initializes the GConf subsystem, so that "sword://" and
-#. *   similar can be handled by url-comprehending programs such as browsers.
-#. *   dialogs for permission/success/failure => conditional on debug build.
-#. *
-#. * Return value
-#. *   void
-#.
-#: ../src/main/settings.c:804
-msgid ""
-"URL references using \"sword://\" (similar to web page\n"
-"references) can be used by programs to look up\n"
-"scripture references. Your system currently has no\n"
-"program set to handle these references.\n"
-"\n"
-"Would you like Xiphos to set itself as the\n"
-"program to handle these references?"
-msgstr ""
-"Referências URL usando \"sword://\" (semelhantes às referências de páginas "
-"web) \n"
-"podem ser usadas por programas para pesquisar referências bíblicas. \n"
-"O seu sistema não possui actualmente nenhum programa preparado para lidar \n"
-"com essas referências.\n"
-"Gostaria que Xiphos se configurasse para lidar com essas referências?"
-
-#: ../src/main/settings.c:806
-msgid ""
-"Xiphos has successfully set itself\n"
-"as the handler of sword:// and bible:// URLs.\n"
-"\n"
-"You may wish to run the program \"gconf-editor\"\n"
-"to examine keys under /desktop/gnome/url-handlers,\n"
-"if you need to change these."
-msgstr ""
-"Xiphos foi configurado com sucesso \n"
-"para lidar com URLs sword:// e bible://.\n"
-"\n"
-"Se desejar, pode correr o programa \"gconf-editor\" \n"
-"para examinar chaves sob /desktop/gnome/url-handlers, \n"
-"se necessitar de as alterar."
-
-#: ../src/main/settings.c:859
-#, c-format
-msgid ""
-"Xiphos failed to complete handler init for key #%d:\n"
-"%s"
-msgstr ""
-"Xiphos não conseguiu completar a inicialização do handler para a chave #%"
-"d: \n"
-"%s"
-
-#: ../src/main/sidebar.cc:376
+#: ../src/main/sidebar.cc:399
 msgid "verse"
 msgstr "versículo"
 
-#: ../src/main/sidebar.cc:438
+#: ../src/main/sidebar.cc:461
 msgid "chapter"
 msgstr "capítulo"
 
-#: ../src/main/sword.cc:546
+#: ../src/main/sword.cc:537
 msgid ""
 "Xiphos's file for language\n"
 "abbreviations is missing."
@@ -1891,7 +1888,7 @@ msgstr ""
 "O ficheiro de Xiphos para \n"
 "as abreviaturas de linguagem está ausente."
 
-#: ../src/main/sword.cc:553
+#: ../src/main/sword.cc:544
 msgid ""
 "Xiphos's language abbreviation\n"
 "file cannot be opened."
@@ -1899,7 +1896,7 @@ msgstr ""
 "O ficheiro de abreviaturas \n"
 "de Xiphos não pode ser aberto."
 
-#: ../src/main/sword.cc:566
+#: ../src/main/sword.cc:557
 msgid ""
 "Xiphos cannot allocate space\n"
 "for language abbreviations."
@@ -1907,7 +1904,7 @@ msgstr ""
 "Xiphos não pode alocar espaço\n"
 "para abreviaturas de linguagens."
 
-#: ../src/main/sword.cc:573
+#: ../src/main/sword.cc:564
 msgid ""
 "Xiphos cannot read the\n"
 "language abbreviation file."
@@ -1915,36 +1912,36 @@ msgstr ""
 "Xiphos não pode ler o ficheiro \n"
 "de abreviaturas de linguagens."
 
-#: ../src/main/sword.cc:1191
-msgid "Daily devotional was requested, but there are none installed."
-msgstr "Foi pedido um Devocional Diário, mas não há nenhum instalado."
+#: ../src/main/sword.cc:642
+msgid "No matching locale found for"
+msgstr "Nenhum locale adequado foi encontrado"
 
-#: ../src/main/tab_history.c:92
-msgid "H_istory/<Separator>"
-msgstr "_Histórico/<Separator>"
+#: ../src/main/sword.cc:644
+msgid "Book names and menus may not be translated"
+msgstr "Nomes de livros e menus podem não estar traduzidos"
 
-#: ../src/main/tab_history.c:94
-msgid "H_istory/C_lear"
-msgstr "_Histórico/_Limpar"
+#: ../src/main/sword.cc:1232
+msgid "Daily devotional was requested, but there are none installed."
+msgstr "Foi pedido um Devocional Diário, mas não há nenhum instalado."
 
 #: ../src/main/tab_history.c:219
 msgid "Clear History"
 msgstr "Limpar Histórico"
 
-#: ../src/main/url.cc:99
+#: ../src/main/url.cc:101
 msgid "URL not found:"
 msgstr "URL não encontrado:"
 
-#: ../src/main/url.cc:194
+#: ../src/main/url.cc:191
 #, c-format
 msgid "Xiphos could not execute %s"
 msgstr "Xiphos não conseguiu executar %s"
 
-#: ../src/main/url.cc:202
+#: ../src/main/url.cc:199
 msgid "Viewer error:\n"
 msgstr "Erro de visualizador:\n"
 
-#: ../src/main/url.cc:278
+#: ../src/main/url.cc:272
 #, c-format
 msgid "Show %s in main window"
 msgstr "Mostrar %s na janela principal"
@@ -1982,13 +1979,13 @@ msgstr "O que é o Evangelho?"
 msgid "1 Cor 15:1-4"
 msgstr "1 Cor 15:1-4"
 
-#: ../src/main/xml.c:413 ../src/main/xml.c:1071
+#: ../src/main/xml.c:413 ../src/main/xml.c:1144
 #, c-format
 msgid "Document not parsed successfully. \n"
 msgstr "Documento não processado com sucesso. \n"
 
-#: ../src/main/xml.c:419 ../src/main/xml.c:674 ../src/main/xml.c:952
-#: ../src/main/xml.c:1131
+#: ../src/main/xml.c:419 ../src/main/xml.c:747 ../src/main/xml.c:1025
+#: ../src/main/xml.c:1204
 #, c-format
 msgid "empty document \n"
 msgstr "documento vazio \n"
@@ -2018,7 +2015,7 @@ msgstr "Mat - Ap"
 msgid "Sample Module List"
 msgstr "Amostra de Lista de Módulos"
 
-#: ../src/main/xml.c:680 ../src/main/xml.c:958
+#: ../src/main/xml.c:753 ../src/main/xml.c:1031
 #, c-format
 msgid "wrong type, root node != %s\n"
 msgstr "tipo errado, root node != %s\n"
@@ -2064,7 +2061,7 @@ msgid "New ..."
 msgstr "Novo ..."
 
 #: ../ui/bookmarks.glade.h:11 ../ui/markverse.glade.h:8
-#: ../ui/xi-menus.glade.h:42
+#: ../ui/xi-menus.glade.h:56
 msgid "New Folder"
 msgstr "Nova Pasta"
 
@@ -2202,7 +2199,7 @@ msgstr "Botão de Rádio de Livro"
 msgid "Chapter Radio Button"
 msgstr "Botão de Rádio de Capítulo"
 
-#: ../ui/export-dialog.glade.h:9 ../ui/xi-menus.glade.h:14
+#: ../ui/export-dialog.glade.h:9 ../ui/xi-menus.glade.h:18
 msgid "Copy/Export Passage"
 msgstr "Copiar/Exportar Passagem"
 
@@ -2319,43 +2316,47 @@ msgstr "<i>Área pessoal, para seu uso apenas:</i>"
 msgid "<i>System area, for all users:</i>"
 msgstr "<i>Área do sistema, para todos os utilizadores:</i>"
 
-#: ../ui/module-manager.glade.h:11
+#: ../ui/module-manager.glade.h:12
 msgid "Continue"
 msgstr "Continuar"
 
-#: ../ui/module-manager.glade.h:12
+#: ../ui/module-manager.glade.h:13
 msgid "Current Remote Sources"
 msgstr "Fontes Remotas actuais"
 
-#: ../ui/module-manager.glade.h:13
+#: ../ui/module-manager.glade.h:14
 msgid "Current local sources"
 msgstr "Fontes Locais actuais"
 
-#: ../ui/module-manager.glade.h:14
+#: ../ui/module-manager.glade.h:15
+msgid "Delete Index"
+msgstr "Apagar Índice"
+
+#: ../ui/module-manager.glade.h:16
 msgid "Home dir"
 msgstr "Directório local (home)"
 
-#: ../ui/module-manager.glade.h:16
+#: ../ui/module-manager.glade.h:19
 msgid "Load Standard"
 msgstr "Carregar Vista Normal"
 
-#: ../ui/module-manager.glade.h:17
+#: ../ui/module-manager.glade.h:20
 msgid "Local"
 msgstr "Local"
 
-#: ../ui/module-manager.glade.h:18
+#: ../ui/module-manager.glade.h:21
 msgid "Local Install Folder"
 msgstr "Pasta de instalação local"
 
-#: ../ui/module-manager.glade.h:19
+#: ../ui/module-manager.glade.h:22
 msgid "Module Manager"
 msgstr "Gestor de Módulos"
 
-#: ../ui/module-manager.glade.h:20
+#: ../ui/module-manager.glade.h:23
 msgid "Remote"
 msgstr "Remoto"
 
-#: ../ui/module-manager.glade.h:21
+#: ../ui/module-manager.glade.h:24
 msgid "Sword sys dir"
 msgstr "Directório de sistema Sword"
 
@@ -2505,7 +2506,7 @@ msgstr "Combo para mudar Notas Pessoais"
 
 #: ../ui/prefs.glade.h:32
 msgid "Choose to enable Prayer lists "
-msgstr "Escolha para activar listas de oração"
+msgstr "Escolha para activar listas de oração "
 
 #: ../ui/prefs.glade.h:34
 msgid "Commentaries Checkbox"
@@ -2696,40 +2697,52 @@ msgid "Show splash screen at start up"
 msgstr "Mostrar janela splash no arranque"
 
 #: ../ui/prefs.glade.h:84
+msgid "Special Locale (requires restart)"
+msgstr "Locale Especial (requer reinício do programa)"
+
+#: ../ui/prefs.glade.h:85
+msgid "Special Locale Combo"
+msgstr "Combo de Locale Especial"
+
+#: ../ui/prefs.glade.h:86
 msgid "StudyPad default directory combo"
 msgstr "Combo de Directório StudyPad por omissão"
 
-#: ../ui/prefs.glade.h:86
+#: ../ui/prefs.glade.h:88
 msgid "Use Bible Text scroll bar to scroll to previous or next chapter"
 msgstr ""
 "Use a barra de deslocamento do texto bíblico para passar ao capítulo "
 "anterior ou seguinte"
 
-#: ../ui/prefs.glade.h:87
+#: ../ui/prefs.glade.h:89
 msgid "Use Verse Per Line"
 msgstr "Usar versículo por linha"
 
-#: ../ui/prefs.glade.h:88
+#: ../ui/prefs.glade.h:90
 msgid "Use Verse Per Line Checkbox"
 msgstr "Visto para usar versículo por linha"
 
-#: ../ui/prefs.glade.h:89
+#: ../ui/prefs.glade.h:91
 msgid "Use default Dictionary"
 msgstr "Usar Dicionário por omissão"
 
-#: ../ui/prefs.glade.h:90
+#: ../ui/prefs.glade.h:92
 msgid "Use default Dictionary Checkbox"
 msgstr "Visto para Usar Dicionário por omissão"
 
-#: ../ui/prefs.glade.h:91
+#: ../ui/prefs.glade.h:93
 msgid "Use tabbed browsing"
 msgstr "Use exploração com abas"
 
-#: ../ui/prefs.glade.h:92
+#: ../ui/prefs.glade.h:94
 msgid "Use tabbed browsing Checkbox"
 msgstr "Visto para Usar exploração com abas"
 
-#: ../ui/prefs.glade.h:93
+#: ../ui/prefs.glade.h:95
+msgid "Verse Number"
+msgstr "Número de Versículo"
+
+#: ../ui/prefs.glade.h:96
 msgid "Verse number size"
 msgstr "Tamanho do número de versículo"
 
@@ -2910,6 +2923,14 @@ msgid "Exact phrase radiobutton"
 msgstr "Rádio Frase exacta"
 
 #: ../ui/search-dialog.glade.h:46
+msgid "Export"
+msgstr "Exportar"
+
+#: ../ui/search-dialog.glade.h:47
+msgid "Export current search results"
+msgstr "Exportar os resultados da pesquisa actual"
+
+#: ../ui/search-dialog.glade.h:48
 msgid ""
 "Fast, featureful, index-based search\n"
 "Indexes must have been built beforehand:\n"
@@ -2919,227 +2940,227 @@ msgstr ""
 "Os índices devem ser criados a priori:\n"
 "Veja as funções de manutenção do Gestor de Módulos"
 
-#: ../ui/search-dialog.glade.h:49
+#: ../ui/search-dialog.glade.h:51
 msgid "Find Button"
 msgstr "Botão Procurar"
 
-#: ../ui/search-dialog.glade.h:51
+#: ../ui/search-dialog.glade.h:53
 msgid "Footnotes radiobutton"
 msgstr "Rádio Notas de rodapé"
 
-#: ../ui/search-dialog.glade.h:52
+#: ../ui/search-dialog.glade.h:54
 msgid "In modules that have Footnotes"
 msgstr "Em módulos com Notas de Rodapé"
 
-#: ../ui/search-dialog.glade.h:53
+#: ../ui/search-dialog.glade.h:55
 msgid "In modules that have Morphological Tags"
 msgstr "Em módulos com etiquetas morfológicas"
 
-#: ../ui/search-dialog.glade.h:54
+#: ../ui/search-dialog.glade.h:56
 msgid "In modules that have Strong's Numbers"
 msgstr "Em módulos com números de Strong"
 
-#: ../ui/search-dialog.glade.h:55
+#: ../ui/search-dialog.glade.h:57
 msgid "Main Search Entry"
 msgstr "Entrada de Pesquisa Principal"
 
-#: ../ui/search-dialog.glade.h:56
+#: ../ui/search-dialog.glade.h:58
 msgid "Make selections on the Attribute Search tab"
 msgstr "Fazer selecções na Pesquisa de Atributos"
 
-#: ../ui/search-dialog.glade.h:58
+#: ../ui/search-dialog.glade.h:60
 msgid "Match case checkbox"
 msgstr "Visto Combinar capitalização"
 
-#: ../ui/search-dialog.glade.h:59
+#: ../ui/search-dialog.glade.h:61
 msgid "Module Selection"
 msgstr "Selecção de Módulo"
 
-#: ../ui/search-dialog.glade.h:60
+#: ../ui/search-dialog.glade.h:62
 msgid "Module list"
 msgstr "Lista de Módulos"
 
-#: ../ui/search-dialog.glade.h:61
+#: ../ui/search-dialog.glade.h:63
 msgid "Module list radiobutton"
 msgstr "Rádio Lista de Módulos"
 
-#: ../ui/search-dialog.glade.h:63
+#: ../ui/search-dialog.glade.h:65
 msgid "Morphological Tags radiobutton"
 msgstr "Rádio Etiquetas morfológicas"
 
-#: ../ui/search-dialog.glade.h:65
+#: ../ui/search-dialog.glade.h:67
 msgid "Multi word radiobutton"
 msgstr "Rádio Palavra múltipla"
 
-#: ../ui/search-dialog.glade.h:66
+#: ../ui/search-dialog.glade.h:68
 msgid "New Custom Module List Button"
 msgstr "Botão Listas de Módulos personalizadas"
 
-#: ../ui/search-dialog.glade.h:67
+#: ../ui/search-dialog.glade.h:69
 msgid "New Range Button"
 msgstr "Botão de Nova Extensão"
 
-#: ../ui/search-dialog.glade.h:68
+#: ../ui/search-dialog.glade.h:70
 msgid "Open Selection Dialog Button"
 msgstr "Botão Abrir Selecção"
 
-#: ../ui/search-dialog.glade.h:69
+#: ../ui/search-dialog.glade.h:71
 msgid "Open a dialog to select modules to add to the list"
 msgstr "Abrir um diálogo para seleccionar módulos a adicionar à lista"
 
-#: ../ui/search-dialog.glade.h:70
+#: ../ui/search-dialog.glade.h:72
 msgid "Optimized (\"Lucene\")"
 msgstr "Optimizada (\"Lucene\")"
 
-#: ../ui/search-dialog.glade.h:71
+#: ../ui/search-dialog.glade.h:73
 msgid "Optimized (\"Lucene\") radiobutton"
 msgstr "Rádio Optimizada (\"Lucene\")"
 
-#: ../ui/search-dialog.glade.h:72
+#: ../ui/search-dialog.glade.h:74
 msgid "Range Definition Entry"
 msgstr "Entrada de Definição de Extensão"
 
-#: ../ui/search-dialog.glade.h:73
+#: ../ui/search-dialog.glade.h:75
 msgid "Range Name Entry"
 msgstr "Entrada de Nome de Extensão"
 
-#: ../ui/search-dialog.glade.h:75
+#: ../ui/search-dialog.glade.h:77
 msgid "Regular expression radiobutton"
 msgstr "Rádio Expressão Regular"
 
-#: ../ui/search-dialog.glade.h:76
+#: ../ui/search-dialog.glade.h:78
 msgid "Remove the selected module from the list"
 msgstr "Remover o módulo seleccionado da lista"
 
-#: ../ui/search-dialog.glade.h:77
+#: ../ui/search-dialog.glade.h:79
 msgid "Result Summary Table"
 msgstr "Tabela de Sumário de Resultados"
 
-#: ../ui/search-dialog.glade.h:78
+#: ../ui/search-dialog.glade.h:80
 msgid "Result Summary Window"
 msgstr "Janela de Sumário de Resultados"
 
-#: ../ui/search-dialog.glade.h:79
+#: ../ui/search-dialog.glade.h:81
 msgid "Results"
 msgstr "Resultados"
 
-#: ../ui/search-dialog.glade.h:80
+#: ../ui/search-dialog.glade.h:82
 msgid "Save Custom Module List Button"
 msgstr "Botão Guardar Listas de Módulos personalizadas"
 
-#: ../ui/search-dialog.glade.h:81
+#: ../ui/search-dialog.glade.h:83
 msgid "Save Range Button"
 msgstr "Botão de Guardar Extensão"
 
-#: ../ui/search-dialog.glade.h:82
+#: ../ui/search-dialog.glade.h:84
 msgid "Save custom range"
 msgstr "Guardar extensão personalizada"
 
-#: ../ui/search-dialog.glade.h:83
+#: ../ui/search-dialog.glade.h:85
 msgid "Save search results as bookmarks"
 msgstr "Guardar resultados da pesquisa como marcas"
 
-#: ../ui/search-dialog.glade.h:84
+#: ../ui/search-dialog.glade.h:86
 msgid "Save the module list"
 msgstr "Guardar a lista de módulos"
 
-#: ../ui/search-dialog.glade.h:85
+#: ../ui/search-dialog.glade.h:87
 msgid "Search  Criteria"
 msgstr "Critério de Pesquisa"
 
-#: ../ui/search-dialog.glade.h:86
+#: ../ui/search-dialog.glade.h:88
 msgid "Search Criteria Treeview"
 msgstr "Vista de Critério de Pesquisa"
 
-#: ../ui/search-dialog.glade.h:87
+#: ../ui/search-dialog.glade.h:89
 msgid "Search entire module"
 msgstr "Pesquisar módulo inteiro"
 
-#: ../ui/search-dialog.glade.h:88
+#: ../ui/search-dialog.glade.h:90
 msgid "Search for Morphological tags"
 msgstr "Pesquisar etiquetas morfológicas"
 
-#: ../ui/search-dialog.glade.h:89
+#: ../ui/search-dialog.glade.h:91
 msgid "Search for Strongs Numbers like G4442 or H1121"
 msgstr "Pesquisar Números de Strong como G4442 ou H1121"
 
-#: ../ui/search-dialog.glade.h:90
+#: ../ui/search-dialog.glade.h:92
 msgid "Search in footnotes"
 msgstr "Pesquisar em notas de rodapé"
 
-#: ../ui/search-dialog.glade.h:91
+#: ../ui/search-dialog.glade.h:93
 msgid "Show Footnotes"
 msgstr "Mostrar Notas de Rodapé"
 
-#: ../ui/search-dialog.glade.h:92
+#: ../ui/search-dialog.glade.h:94
 msgid "Show Footnotes checkbox"
 msgstr "Visto Mostrar Notas de Rodapé"
 
-#: ../ui/search-dialog.glade.h:93
+#: ../ui/search-dialog.glade.h:95
 msgid "Show Morphological Tags"
 msgstr "Mostrar Etiquetas Morfológicas"
 
-#: ../ui/search-dialog.glade.h:94
+#: ../ui/search-dialog.glade.h:96
 msgid "Show Morphological Tags checkbox"
 msgstr "Visto Mostrar Etiquetas Morfológicas"
 
-#: ../ui/search-dialog.glade.h:95
+#: ../ui/search-dialog.glade.h:97
 msgid "Show Strong's Numbers"
 msgstr "Mostrar Números Strong"
 
-#: ../ui/search-dialog.glade.h:96
+#: ../ui/search-dialog.glade.h:98
 msgid "Show Strong's Numbers checkbox"
 msgstr "Visto Mostrar Números Strong"
 
-#: ../ui/search-dialog.glade.h:97
+#: ../ui/search-dialog.glade.h:99
 msgid "Show in main window"
 msgstr "Mostrar na janela principal"
 
-#: ../ui/search-dialog.glade.h:98
+#: ../ui/search-dialog.glade.h:100
 msgid "Single module"
 msgstr "Módulo singular"
 
-#: ../ui/search-dialog.glade.h:99
+#: ../ui/search-dialog.glade.h:101
 msgid "Single module radiobutton"
 msgstr "Rádio Módulo singular"
 
-#: ../ui/search-dialog.glade.h:100
+#: ../ui/search-dialog.glade.h:102
 msgid "Start/stop searching"
 msgstr "Iniciar/parar busca"
 
-#: ../ui/search-dialog.glade.h:101
+#: ../ui/search-dialog.glade.h:103
 msgid "Strongs Numbers"
 msgstr "Números de Strong"
 
-#: ../ui/search-dialog.glade.h:102
+#: ../ui/search-dialog.glade.h:104
 msgid "Strongs Numbers radiobutton"
 msgstr "Rádio Números de Strong"
 
-#: ../ui/search-dialog.glade.h:103
+#: ../ui/search-dialog.glade.h:105
 msgid "Use a custom module list for the search"
 msgstr "Usar uma lista personalizada de módulos para a pesquisa"
 
-#: ../ui/search-dialog.glade.h:104
+#: ../ui/search-dialog.glade.h:106
 msgid "Use a custom range for the scope of the search"
 msgstr "Usar uma extensão personalizada no âmbito da pesquisa"
 
-#: ../ui/search-dialog.glade.h:105
+#: ../ui/search-dialog.glade.h:107
 msgid "Use a single module for the search"
 msgstr "Usar um único módulo para a pesquisa"
 
-#: ../ui/search-dialog.glade.h:106
+#: ../ui/search-dialog.glade.h:108
 msgid "Use the current module list for the search"
 msgstr "Usar a lista actual de módulos na pesquisa"
 
-#: ../ui/search-dialog.glade.h:107
+#: ../ui/search-dialog.glade.h:109
 msgid "Use the results of the last search as the scope of the search"
 msgstr "Usar os resultados da última pesquisa como âmbito da pesquisa"
 
-#: ../ui/search-dialog.glade.h:108
+#: ../ui/search-dialog.glade.h:110
 msgid "e.g. Matt-John;Rev4"
 msgstr "ex. Mt-Jo;Ap4"
 
-#: ../ui/search-dialog.glade.h:109
+#: ../ui/search-dialog.glade.h:111
 msgid "for "
 msgstr "para "
 
@@ -3152,302 +3173,386 @@ msgid "About _Xiphos"
 msgstr "Sobre _Xiphos"
 
 #: ../ui/xi-menus.glade.h:4
+msgid "Add Item"
+msgstr "Adicionar Item"
+
+#: ../ui/xi-menus.glade.h:5
+msgid "Add Sub-Item"
+msgstr "Adicionar Sub-Item"
+
+#: ../ui/xi-menus.glade.h:6
+msgid "Add a sub-item"
+msgstr "Adicionar um sub-item"
+
+#: ../ui/xi-menus.glade.h:7
+msgid "Add an item"
+msgstr "Adicionar um item"
+
+#: ../ui/xi-menus.glade.h:8
 msgid "Add new folder to selected folder"
 msgstr "Adicionar nova pasta à pasta seleccionada"
 
-#: ../ui/xi-menus.glade.h:6
+#: ../ui/xi-menus.glade.h:10
 msgid "Allow Reordering"
 msgstr "Permitir Reordenação"
 
-#: ../ui/xi-menus.glade.h:7
+#: ../ui/xi-menus.glade.h:11
 msgid "Allow items to be moved from one folder to another"
 msgstr "Permitir mover itens de uma pasta para outra"
 
-#: ../ui/xi-menus.glade.h:8
+#: ../ui/xi-menus.glade.h:12
 msgid "Annotate Verse"
 msgstr "Anotar Versículo"
 
-#: ../ui/xi-menus.glade.h:10
+#: ../ui/xi-menus.glade.h:14
 msgid "Browse in BibleMap.org"
 msgstr "Explorar em BibleMap.org"
 
-#: ../ui/xi-menus.glade.h:11
+#: ../ui/xi-menus.glade.h:15
 msgid "Collapse All"
 msgstr "Colapsar Tudo"
 
-#: ../ui/xi-menus.glade.h:12
+#: ../ui/xi-menus.glade.h:16
 msgid "Collapse all Bookmarks groups"
 msgstr "Colapsar todos os grupos de Marcas"
 
-#: ../ui/xi-menus.glade.h:13
+#: ../ui/xi-menus.glade.h:17
 msgid "Commentary by Chapter"
 msgstr "Comentário por capítulo"
 
-#: ../ui/xi-menus.glade.h:15
+#: ../ui/xi-menus.glade.h:19
+msgid "Create a new daily journal"
+msgstr "Criar um novo diário"
+
+#: ../ui/xi-menus.glade.h:20
+msgid "Create a new monthly journal"
+msgstr "Criar um novo registo mensal"
+
+#: ../ui/xi-menus.glade.h:21
+msgid "Create a new outlined topic"
+msgstr "Criar um novo tópico alinhado"
+
+#: ../ui/xi-menus.glade.h:22
+msgid "Create a new simple prayer list"
+msgstr "Criar uma nova lista de oração simples"
+
+#: ../ui/xi-menus.glade.h:23
+msgid "Create a new subject prayer list"
+msgstr "Criar uma nova lista de oração por assunto"
+
+#: ../ui/xi-menus.glade.h:24
 msgid "D_ouble-Space Text"
 msgstr "Texto em Espaço D_uplo"
 
-#: ../ui/xi-menus.glade.h:16
+#: ../ui/xi-menus.glade.h:25
+msgid "Daily"
+msgstr "Diário"
+
+#: ../ui/xi-menus.glade.h:26
 msgid "Delete Item"
 msgstr "Apagar Item"
 
-#: ../ui/xi-menus.glade.h:17
+#: ../ui/xi-menus.glade.h:27
 msgid "Delete item"
 msgstr "Apagar item"
 
-#: ../ui/xi-menus.glade.h:18
+#: ../ui/xi-menus.glade.h:28
 msgid "Dictionar_y"
 msgstr "Dicionár_io"
 
-#: ../ui/xi-menus.glade.h:19
+#: ../ui/xi-menus.glade.h:29
 msgid "Display Book Heading"
 msgstr "Mostrar Cabeçalho de Livro"
 
-#: ../ui/xi-menus.glade.h:20
+#: ../ui/xi-menus.glade.h:30
 msgid "Display Chapter Heading"
 msgstr "Mostrar Caebeçalho de Capítulo"
 
-#: ../ui/xi-menus.glade.h:21
+#: ../ui/xi-menus.glade.h:31
 msgid "Dump Pers.Comm."
 msgstr "Descarregar Comentário Pessoal"
 
-#: ../ui/xi-menus.glade.h:23
+#: ../ui/xi-menus.glade.h:33
 msgid "Edit bookmark item"
 msgstr "Editar item de marca"
 
-#: ../ui/xi-menus.glade.h:24
+#: ../ui/xi-menus.glade.h:34
+msgid "Edit this item"
+msgstr "Editar este item"
+
+#: ../ui/xi-menus.glade.h:35
 msgid "Expand All"
 msgstr "Expandir Tudo"
 
-#: ../ui/xi-menus.glade.h:25
+#: ../ui/xi-menus.glade.h:36
 msgid "Expand all Bookmarks groups"
 msgstr "Expandir todos os grupos de Marcas"
 
-#: ../ui/xi-menus.glade.h:32
+#: ../ui/xi-menus.glade.h:37
+msgid "Export Folder"
+msgstr "Exportar Pasta"
+
+#: ../ui/xi-menus.glade.h:38
+msgid "Export List"
+msgstr "Exportar Lista"
+
+#: ../ui/xi-menus.glade.h:45
 msgid "Image Content"
 msgstr "Conteúdo da Imagem"
 
-#: ../ui/xi-menus.glade.h:33
+#: ../ui/xi-menus.glade.h:46
 msgid "Import Bibletime Bookmarks"
 msgstr "Importar Marcas Bibletime"
 
-#: ../ui/xi-menus.glade.h:34
+#: ../ui/xi-menus.glade.h:47
 msgid "Insert Bookmark"
 msgstr "Inserir Marca"
 
-#: ../ui/xi-menus.glade.h:35
+#: ../ui/xi-menus.glade.h:48
 msgid "Insert new bookmark here"
 msgstr "Inserir nova marca aqui"
 
-#: ../ui/xi-menus.glade.h:36
+#: ../ui/xi-menus.glade.h:49
 msgid "L_ink Tabs"
 msgstr "L_igar Abas"
 
-#: ../ui/xi-menus.glade.h:38
+#: ../ui/xi-menus.glade.h:51
 msgid "Load Bookmarks from Bibletime"
 msgstr "Carregar Marcas de Bibletime"
 
-#: ../ui/xi-menus.glade.h:39
+#: ../ui/xi-menus.glade.h:52
 msgid "Lookup Selection"
 msgstr "Selecção de Procura"
 
-#: ../ui/xi-menus.glade.h:43
+#: ../ui/xi-menus.glade.h:54
+msgid "Monthly"
+msgstr "Mensal"
+
+#: ../ui/xi-menus.glade.h:57
 msgid "Note"
 msgstr "Nota"
 
-#: ../ui/xi-menus.glade.h:44
+#: ../ui/xi-menus.glade.h:58
 msgid "Open Module"
 msgstr "Abrir Módulo"
 
-#: ../ui/xi-menus.glade.h:45
+#: ../ui/xi-menus.glade.h:59
 msgid "Open Study_pad"
 msgstr "Abrir Study_Pad"
 
-#: ../ui/xi-menus.glade.h:46
+#: ../ui/xi-menus.glade.h:60
 msgid "Open in a dialog"
 msgstr "Abrir num diálogo"
 
-#: ../ui/xi-menus.glade.h:48
+#: ../ui/xi-menus.glade.h:61
+msgid "Open in a separate window"
+msgstr "Abrir numa janela separada"
+
+#: ../ui/xi-menus.glade.h:62
+msgid "Open in editor"
+msgstr "Abrir no editor"
+
+#: ../ui/xi-menus.glade.h:63
 msgid "Open in new tab"
 msgstr "Abrir numa nova aba"
 
-#: ../ui/xi-menus.glade.h:49
+#: ../ui/xi-menus.glade.h:64
+msgid ""
+"Open selected module in a\n"
+"\tseparate ['dialog'] window"
+msgstr ""
+"Abrir módulo seleccionado numa\n"
+"      janela ['diálogo'] separada "
+
+#: ../ui/xi-menus.glade.h:66
+msgid "Open selected module in a new tab"
+msgstr "Abrir módulo seleccionado numa nova aba"
+
+#: ../ui/xi-menus.glade.h:67
 msgid "Open this bookmark in a dialog"
 msgstr "Abrir esta marca num diálogo"
 
-#: ../ui/xi-menus.glade.h:50
+#: ../ui/xi-menus.glade.h:68
 msgid "Open this bookmark in a new tab"
 msgstr "Abrir esta marca numa nova aba"
 
-#: ../ui/xi-menus.glade.h:52
+#: ../ui/xi-menus.glade.h:69
+msgid "Outlined"
+msgstr "Alinhado"
+
+#: ../ui/xi-menus.glade.h:71
 msgid "Read Selection Aloud"
 msgstr "Ler Selecção em voz alta"
 
-#: ../ui/xi-menus.glade.h:53
-msgid "Remove - Restore"
-msgstr "Remover - Restaurar"
-
-#: ../ui/xi-menus.glade.h:54
-msgid "Remove Folder"
-msgstr "Remover Pasta"
-
-#: ../ui/xi-menus.glade.h:55
+#: ../ui/xi-menus.glade.h:73
 msgid "Remove folder and save it"
 msgstr "Remover pasta e guardá-la"
 
-#: ../ui/xi-menus.glade.h:56
+#: ../ui/xi-menus.glade.h:74
+msgid "Remove this item"
+msgstr "Remover este item"
+
+#: ../ui/xi-menus.glade.h:75
 msgid "Rename Pers.Comm."
 msgstr "Renomear Comentário Pessoal"
 
-#: ../ui/xi-menus.glade.h:57
+#: ../ui/xi-menus.glade.h:76
 msgid "Respect Font Faces"
 msgstr "Respeitar fontes"
 
-#: ../ui/xi-menus.glade.h:58
+#: ../ui/xi-menus.glade.h:77
 msgid "Restore Folder"
 msgstr "Restaurar Pasta"
 
-#: ../ui/xi-menus.glade.h:59
+#: ../ui/xi-menus.glade.h:78
 msgid "Restore saved folder"
 msgstr "Restaurar pasta guardada"
 
-#: ../ui/xi-menus.glade.h:60
+#: ../ui/xi-menus.glade.h:79
 msgid "Save list as a series of bookmarks"
 msgstr "Guardar lista como uma série de marcas"
 
-#: ../ui/xi-menus.glade.h:61
+#: ../ui/xi-menus.glade.h:80
 msgid "Save list as a single bookmark"
 msgstr "Guardar lista como uma única marca"
 
-#: ../ui/xi-menus.glade.h:62
+#: ../ui/xi-menus.glade.h:81
 msgid "Save these results as a series of bookmarks in their own folder"
 msgstr "Guardar estes resultados como uma série de marcas na sua pasta"
 
-#: ../ui/xi-menus.glade.h:63
+#: ../ui/xi-menus.glade.h:82
 msgid "Save these results as a single bookmark"
 msgstr "Guardar estes resultados como uma única marca"
 
-#: ../ui/xi-menus.glade.h:64
+#: ../ui/xi-menus.glade.h:83
 msgid "Scripture Cross-references"
 msgstr "Referências Cruzadas da Escritura"
 
-#: ../ui/xi-menus.glade.h:66
+#: ../ui/xi-menus.glade.h:85
 msgid "Show Parallel View in a _Tab"
 msgstr "Mostrar Vista Paralela numa _Aba"
 
-#: ../ui/xi-menus.glade.h:67
+#: ../ui/xi-menus.glade.h:86
 msgid "Show Previe_wer in the Sidebar"
 msgstr "Mostrar Pre_visualizador na Barra Lateral"
 
-#: ../ui/xi-menus.glade.h:68
+#: ../ui/xi-menus.glade.h:87
 msgid "Show Verse _Numbers"
 msgstr "Mostrar _Números de Versículos"
 
-#: ../ui/xi-menus.glade.h:71
+#: ../ui/xi-menus.glade.h:88
+msgid "Simple"
+msgstr "Simples"
+
+#: ../ui/xi-menus.glade.h:90
+msgid "Subject"
+msgstr "Assunto"
+
+#: ../ui/xi-menus.glade.h:92
 msgid "Unlock This Module"
 msgstr "Desbloquear este Módulo"
 
-#: ../ui/xi-menus.glade.h:72
+#: ../ui/xi-menus.glade.h:93
 msgid "Use Current Dictionary"
 msgstr "Usar Dicionário corrente"
 
-#: ../ui/xi-menus.glade.h:73
+#: ../ui/xi-menus.glade.h:94
 msgid "Use module manager to install and remove Sword modules"
 msgstr "Utilizar o gestor de módulos para instalar e remover módulos Sword"
 
-#: ../ui/xi-menus.glade.h:74
+#: ../ui/xi-menus.glade.h:95
 msgid "Variants"
 msgstr "Variantes"
 
-#: ../ui/xi-menus.glade.h:76
+#: ../ui/xi-menus.glade.h:97
 msgid "_About The SWORD Project"
 msgstr "_Sobre O Projecto SWORD"
 
-#: ../ui/xi-menus.glade.h:77
+#: ../ui/xi-menus.glade.h:98
 msgid "_Advanced Search"
 msgstr "Pesquisa _Avançada"
 
-#: ../ui/xi-menus.glade.h:78
+#: ../ui/xi-menus.glade.h:99
 msgid "_Attach/Detach Sidebar"
 msgstr "_Anexar/Desanexar Barra Lateral"
 
-#: ../ui/xi-menus.glade.h:79
+#: ../ui/xi-menus.glade.h:100
 msgid "_Bible"
 msgstr "_Bíblia"
 
-#: ../ui/xi-menus.glade.h:80
+#: ../ui/xi-menus.glade.h:101
 msgid "_Commentary/Book"
 msgstr "_Comentário/Livro"
 
-#: ../ui/xi-menus.glade.h:81
+#: ../ui/xi-menus.glade.h:102
 msgid "_Contents"
 msgstr "_Conteúdo"
 
-#: ../ui/xi-menus.glade.h:82
+#: ../ui/xi-menus.glade.h:103
 msgid "_Daily Devotion"
 msgstr "_Devocional Diário"
 
-#: ../ui/xi-menus.glade.h:83
+#: ../ui/xi-menus.glade.h:104
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../ui/xi-menus.glade.h:84
+#: ../ui/xi-menus.glade.h:105
 msgid "_Edit Item"
 msgstr "_Editar Item"
 
-#: ../ui/xi-menus.glade.h:86
+#: ../ui/xi-menus.glade.h:107
 msgid "_Help"
 msgstr "A_juda"
 
-#: ../ui/xi-menus.glade.h:87
+#: ../ui/xi-menus.glade.h:108
 msgid "_Highlight Current Verse"
 msgstr "_Assinalar Versículo Corrente"
 
-#: ../ui/xi-menus.glade.h:88
+#: ../ui/xi-menus.glade.h:109
 msgid "_Live Chat"
 msgstr "_Chat ao vivo"
 
-#: ../ui/xi-menus.glade.h:89
+#: ../ui/xi-menus.glade.h:110
 msgid "_Mailing List"
 msgstr "Lista de _mail"
 
-#: ../ui/xi-menus.glade.h:90
+#: ../ui/xi-menus.glade.h:111
 msgid "_Module Manager"
 msgstr "Gestor de _Módulos"
 
-#: ../ui/xi-menus.glade.h:91
+#: ../ui/xi-menus.glade.h:112
 msgid "_Open Session"
 msgstr "_Abrir Sessão"
 
-#: ../ui/xi-menus.glade.h:92
+#: ../ui/xi-menus.glade.h:113
 msgid "_Preferences"
 msgstr "_Preferências"
 
-#: ../ui/xi-menus.glade.h:93
+#: ../ui/xi-menus.glade.h:114
 msgid "_Preview"
 msgstr "P_revisão"
 
-#: ../ui/xi-menus.glade.h:94
+#: ../ui/xi-menus.glade.h:115
 msgid "_Read Aloud"
 msgstr "L_er em voz alta"
 
-#: ../ui/xi-menus.glade.h:95
+#: ../ui/xi-menus.glade.h:116
 msgid "_Report Bug"
 msgstr "_Relatar erro"
 
-#: ../ui/xi-menus.glade.h:96
+#: ../ui/xi-menus.glade.h:117
 msgid "_Save Session"
 msgstr "Guardar _Sessão"
 
-#: ../ui/xi-menus.glade.h:97
+#: ../ui/xi-menus.glade.h:118
 msgid "_Search"
 msgstr "_Pesquisar"
 
-#: ../ui/xi-menus.glade.h:98
-msgid "_Show/Hide Sidebar"
-msgstr "Mo_strar/Ocultar Barra Lateral"
+#: ../ui/xi-menus.glade.h:119
+msgid "_Show/Hide Attached Sidebar"
+msgstr "Mo_strar/Ocultar Barra Lateral Anexada"
 
-#: ../ui/xi-menus.glade.h:99
+#: ../ui/xi-menus.glade.h:120
 msgid "_Verse Per Line"
 msgstr "_Versículo por linha"
 
@@ -3459,6 +3564,91 @@ msgstr "Estudar a Bíblia"
 msgid "Xiphos Bible Guide"
 msgstr "Guia Bíblico Xiphos"
 
+#~ msgid "Xiphos could not execute archiver"
+#~ msgstr "Xiphos não conseguiu executar arquivador"
+
+#~ msgid ""
+#~ " archival result:\n"
+#~ "\n"
+#~ msgstr ""
+#~ " resultado de arquivo:\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Archive in "
+#~ msgstr ""
+#~ "\n"
+#~ "Arquivar em "
+
+#~ msgid "Text"
+#~ msgstr "Texto"
+
+#~ msgid "Text to render"
+#~ msgstr "Texto a renderizar"
+
+#~ msgid "Pixbuf Object"
+#~ msgstr "Objecto Pixbuf"
+
+#~ msgid "The pixbuf to render."
+#~ msgstr "Pixbuf a renderizar."
+
+#~ msgid "Open in a new tab"
+#~ msgstr "Abrir numa nova aba"
+
+#~ msgid "Open selected module in a separate ['dialog'] window"
+#~ msgstr "Abrir módulo seleccionado numa janela ['diálogo'] separada"
+
+#~ msgid "View information about the selected dialog"
+#~ msgstr "Ver informação sobre o diálogo seleccionado"
+
+#~ msgid "Create a new prayer list"
+#~ msgstr "Criar uma nova lista de oração"
+
+#~ msgid "Daily Journal"
+#~ msgstr "Devocional Diário"
+
+#~ msgid "Outlined Topic"
+#~ msgstr "Tópico Sublinhado"
+
+#~ msgid "Open selected module in a dialog"
+#~ msgstr "Abrir módulo seleccionado num diálogo"
+
+#~ msgid "Add Child"
+#~ msgstr "Adicionar Descendente"
+
+#~ msgid "Add Sibling"
+#~ msgstr "Adicionar Irmão"
+
+#~ msgid "H_istory/<Separator>"
+#~ msgstr "_Histórico/<Separator>"
+
+#~ msgid "H_istory/C_lear"
+#~ msgstr "_Histórico/_Limpar"
+
+#~ msgid "Export folder and save it"
+#~ msgstr "Exportar pasta e guardá-la"
+
+#~ msgid "Remove - Restore"
+#~ msgstr "Remover - Restaurar"
+
+#~ msgid "Remove Folder"
+#~ msgstr "Remover Pasta"
+
+#~ msgid "Xiphos has renamed .xiphos-2.0 to .xiphos"
+#~ msgstr "Xiphos não pode renomear .xiphos-2.0 para .xiphos:"
+
+#~ msgid ""
+#~ "Xiphos can not rename  .xiphos-2.0 to .xiphos:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Xiphos cannot continue."
+#~ msgstr ""
+#~ "Xiphos não consegue renomear .xiphos-2.0 para .xiphos:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Xiphos não pode continuar."
+
 #~ msgid "Move backwards through history"
 #~ msgstr "Percorrer o histórico para trás"
 
@@ -3618,9 +3808,6 @@ msgstr "Guia Bíblico Xiphos"
 #~ msgstr ""
 #~ "\\par\\par Minha lista de oração \\par\\par Módulo criado por Xiphos."
 
-#~ msgid "Delete Index"
-#~ msgstr "Apagar Índice"
-
 #~ msgid "+5"
 #~ msgstr "+5"
 
@@ -3973,9 +4160,6 @@ msgstr "Guia Bíblico Xiphos"
 #~ msgid "Haitian Creole French"
 #~ msgstr "Francês Creoulo Haitiano"
 
-#~ msgid "Chinese"
-#~ msgstr "Chinês"
-
 #~ msgid "Zulu"
 #~ msgstr "Zulu"
 
@@ -4022,9 +4206,6 @@ msgstr "Guia Bíblico Xiphos"
 #~ msgid "Old"
 #~ msgstr "Velho"
 
-#~ msgid "New"
-#~ msgstr "Novo"
-
 #~ msgid "Go to parent"
 #~ msgstr "Ir para cima"
 
diff --git a/po/pt_PT.po b/po/pt_PT.po
deleted file mode 100644
index f4c8c8e..0000000
--- a/po/pt_PT.po
+++ /dev/null
@@ -1,4047 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Xiphos\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-09 20:54+0100\n"
-"PO-Revision-Date: 2009-07-09 20:54+0100\n"
-"Last-Translator: Ari Constâncio <ari.constancio@gmail.com>\n"
-"Language-Team: Xiphos Project\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: ../src/backend/sword_main.cc:1162
-msgid "Configuration not found"
-msgstr "Configuração não encontrada"
-
-#: ../src/editor/bonobo-editor.c:252 ../src/editor/slib-editor.c:228
-#: ../src/gnome2/html.c:633
-#, c-format
-msgid "Page %d of %d"
-msgstr "Página %d de %d"
-
-#: ../src/editor/bonobo-editor.c:351
-msgid "Are you sure you want to delete the note for"
-msgstr "Tem a certeza de que quer apagar a nota para"
-
-#: ../src/editor/bonobo-editor.c:963 ../src/editor/bonobo-editor.c:996
-#: ../src/editor/slib-editor.c:1161 ../src/editor/slib-editor.c:1198
-msgid "Save the changes to document"
-msgstr "Guardar as alterações ao documento"
-
-#: ../src/editor/bonobo-editor.c:964 ../src/editor/bonobo-editor.c:997
-#: ../src/editor/slib-editor.c:1162 ../src/editor/slib-editor.c:1199
-msgid "before closing?"
-msgstr "antes de fechar?"
-
-#: ../src/editor/bonobo-editor.c:971 ../src/editor/bonobo-editor.c:1004
-#: ../src/editor/slib-editor.c:1169 ../src/editor/slib-editor.c:1206
-msgid "If you don't save, changes will be permanently lost."
-msgstr "Se não guardar, as alterações serão definitivamente perdidas."
-
-#: ../src/editor/bonobo-editor.c:995 ../src/editor/slib-editor.c:1197
-#: ../ui/xi-menus.glade.h:26
-msgid "File"
-msgstr "Ficheiro"
-
-#: ../src/editor/bonobo-editor.c:1222 ../src/editor/slib-editor.c:1254
-msgid "StudyPad"
-msgstr "StudyPad"
-
-#: ../src/editor/bonobo-editor.c:1235 ../src/editor/slib-editor.c:1268
-msgid "Note Editor"
-msgstr "Editor de Notas"
-
-#: ../src/editor/bonobo-editor.c:1244 ../src/editor/slib-editor.c:1282
-msgid "Prayer List/Journal Editor"
-msgstr "Lista de Oração/Editor de Diário"
-
-#: ../src/editor/slib-editor.c:382 ../src/editor/slib-editor.c:429
-msgid "Save As"
-msgstr "Guardar como"
-
-#: ../src/editor/slib-editor.c:400 ../src/editor/slib-editor.c:447
-msgid "Untitled document"
-msgstr "Documento sem título"
-
-#: ../src/editor/slib-editor.c:612
-msgid "HTML Output"
-msgstr "Saída HTML"
-
-#: ../src/editor/slib-editor.c:619
-msgid "HTML Source"
-msgstr "Fonte HTML"
-
-#: ../src/editor/slib-editor.c:626
-msgid "Plain Source"
-msgstr "Fonte Simples"
-
-#: ../src/editor/slib-editor.c:633 ../ui/editor_note.xml.h:15
-#: ../ui/editor_studypad.xml.h:21
-msgid "_Print..."
-msgstr "Im_primir..."
-
-#: ../src/editor/slib-editor.c:640 ../ui/editor_note.xml.h:9
-#: ../ui/editor_studypad.xml.h:14
-msgid "Print Pre_view"
-msgstr "Ante_visão de Impressão"
-
-#: ../src/editor/slib-editor.c:647
-msgid "_Quit"
-msgstr "_Sair"
-
-#: ../src/editor/slib-editor.c:654
-msgid "_Open"
-msgstr "_Abrir"
-
-#: ../src/editor/slib-editor.c:661
-msgid "_Save"
-msgstr "_Guardar"
-
-#: ../src/editor/slib-editor.c:668
-msgid "Save _As..."
-msgstr "Guardar _Como..."
-
-#: ../src/editor/slib-editor.c:675 ../ui/editor_note.xml.h:14
-#: ../ui/editor_studypad.xml.h:20 ../ui/editor.xml.h:13
-#: ../ui/xi-menus.glade.h:85
-msgid "_File"
-msgstr "_Ficheiro"
-
-#: ../src/editor/slib-editor.c:730
-msgid "HTML _Output"
-msgstr "_Saída HTML"
-
-#: ../src/editor/slib-editor.c:737
-msgid "_HTML Source"
-msgstr "Fonte _HTML"
-
-#: ../src/editor/slib-editor.c:744
-msgid "_Plain Source"
-msgstr "Fonte _Simples"
-
-#: ../src/editor/slib-editor.c:751 ../ui/xi-menus.glade.h:100
-msgid "_View"
-msgstr "_Ver"
-
-#: ../src/editor/slib-editor.c:762 ../ui/editor_note.xml.h:11
-#: ../ui/editor_studypad.xml.h:16 ../ui/editor.xml.h:11
-msgid "Save"
-msgstr "Guardar"
-
-#: ../src/gecko/gecko-html.cpp:178 ../src/gnome2/html.c:161
-msgid "Unlock "
-msgstr "Desbloquear "
-
-#: ../src/gecko/gecko-print.c:171
-msgid "Preparing to print"
-msgstr "Preparando impressão"
-
-#: ../src/gecko/gecko-print.c:265
-msgid "Printing is not supported on this printer"
-msgstr "Impressão não suportada nesta impressora"
-
-#: ../src/gecko/gecko-print.c:268
-#, c-format
-msgid "Printer %s does not support PostScript printing."
-msgstr "Impressora %s não suporta impressão PostScript."
-
-#: ../src/gecko/gecko-print.c:341 ../src/gecko/gecko-print.c:369
-msgid "Printing"
-msgstr "Imprimindo"
-
-#: ../src/gecko/gecko-print.c:371
-msgid "Waiting to print"
-msgstr "Aguardando impressão"
-
-#: ../src/gecko/gecko-print.c:583
-msgid "An error occurred while printing"
-msgstr "Um erro ocorreu durante a impressão"
-
-#: ../src/gecko/gecko-print.c:587
-#, c-format
-msgid "It was not possible to print your document: %s"
-msgstr "Não foi possível a impressão do seu documento: %s"
-
-#: ../src/gnome2/about_modules.c:189
-msgid "About Sword Module"
-msgstr "Sobre o Módulo Sword"
-
-#: ../src/gnome2/about_modules.c:383 ../src/gnome2/mod_mgr.c:204
-msgid "The module has no About information."
-msgstr "O módulo não tem informação Sobre."
-
-#: ../src/gnome2/about_sword.c:88
-msgid ""
-"The SWORD Project is an effort to create an ever-expanding software package "
-"for research and study of God and His Word. The SWORD Project framework "
-"allows easy use and study of Bible texts, commentaries, lexicons, "
-"dictionaries, and other books. Many frontends are built using this "
-"framework. An installed set of books may be shared among all frontends using "
-"the framework."
-msgstr ""
-"O Projecto SWORD é uma iniciativa para criar um pacote de software "
-"expansível para pesquisa e estudo de Deus e da Sua Palavra. A Plataforma do "
-"Projecto SWORD permite fácil manipulação de textos da Bíblia, comentários, "
-"léxicos, dicionários e outros livros. Várias interfaces são construídas com "
-"base nesta plataforma. Um conjunto de módulos instalados pode ser partilhado "
-"entre quaisquer dessas interfaces."
-
-#: ../src/gnome2/about_sword.c:106
-msgid "About the SWORD Project"
-msgstr "Sobre o Projecto SWORD"
-
-#: ../src/gnome2/about_sword.c:123
-msgid "Sword Version"
-msgstr "Versão Sword"
-
-#: ../src/gnome2/about_sword.c:154
-msgid "Books can be downloaded from the SWORD Project"
-msgstr "Livros podem ser descarregados do Projecto SWORD"
-
-#: ../src/gnome2/about_sword.c:160
-msgid "The SWORD Project"
-msgstr "O Projecto SWORD"
-
-#: ../src/gnome2/about_trans.c:84
-msgid ""
-"Do you like using Xiphos to study the Bible? Would you like to see its "
-"display using your native language? You could translate Xiphos! \n"
-"\n"
-"We are always looking for contributions of new translations of Xiphos into "
-"other languages. If you are able to translate for us, please see the link "
-"below, contact us, and get involved with our efforts."
-msgstr ""
-"Gostaria de usar Xiphos para estudar a Bíblia? Gostaria de uma interface na "
-"sua língua materna? Você pode traduzir Xiphos!\n"
-"\n"
-"Estamos sempre procurando contribuições de novas traduções de Xiphos noutras "
-"línguas. Se consegue traduzir para nós, veja por favor a ligação abaixo, "
-"contacte-nos e junte-se aos nossos esforços."
-
-#: ../src/gnome2/about_trans.c:98
-msgid "About Xiphos Translation"
-msgstr "Sobre a tradução de Xiphos ..."
-
-#: ../src/gnome2/about_trans.c:139
-msgid "See TRANSLATION-HOWTO in Xiphos source"
-msgstr "Veja TRANSLATION-HOWTO no código de Xiphos"
-
-#: ../src/gnome2/about_trans.c:145
-msgid "Xiphos development"
-msgstr "Desenvolvimento de Xiphos"
-
-#: ../src/gnome2/about_xiphos.c:132
-msgid "Copyright 2000-2009 The Xiphos Development Team"
-msgstr "Copyright 2000-2009 Equipa de Desenvolvimento Xiphos"
-
-#: ../src/gnome2/about_xiphos.c:135
-msgid ""
-"(formerly known as GnomeSword)\n"
-"\n"
-"Powered by The SWORD Project.\n"
-"We would like to thank Troy Griffitts and all the other folks who have given "
-"us The SWORD Project."
-msgstr ""
-"(com a designação anterior de GnomeSword)\n"
-"\n"
-"Movido pelo Projecto SWORD.\n"
-"Gostaríamos de agradecer a Troy Griffitts e aos outros colaboradores que nos "
-"deram o Projecto SWORD."
-
-#: ../src/gnome2/bibletext_dialog.c:525
-msgid "Go to "
-msgstr "Ir para "
-
-#. info->stock_icon = GTK_STOCK_OPEN;
-#: ../src/gnome2/bookmark_dialog.c:167 ../src/gnome2/bookmarks_menu.c:471
-#: ../src/gnome2/bookmarks_menu.c:897 ../src/gnome2/bookmarks_menu.c:995
-#: ../src/gnome2/bookmarks_treeview.c:131 ../ui/editor_studypad.xml.h:2
-#: ../ui/xi-menus.glade.h:9
-msgid "Bookmark"
-msgstr "Marca"
-
-#: ../src/gnome2/bookmark_dialog.c:169 ../src/gnome2/bookmarks_menu.c:997
-#: ../src/gnome2/bookmarks_treeview.c:132
-msgid "Enter Folder Name"
-msgstr "Introduzir Nome da Pasta"
-
-#: ../src/gnome2/bookmark_dialog.c:171 ../src/gnome2/bookmarks_menu.c:999
-msgid "Folder Name"
-msgstr "Nome da Pasta"
-
-#: ../src/gnome2/bookmark_dialog.c:172 ../src/gnome2/bookmarks_menu.c:1000
-#: ../src/gnome2/bookmarks_treeview.c:134
-msgid "Folder: "
-msgstr "Pasta: "
-
-#: ../src/gnome2/bookmarks_menu.c:457 ../src/gnome2/treekey-editor.c:322
-#: ../ui/xi-menus.glade.h:22
-msgid "Edit"
-msgstr "Editar"
-
-#: ../src/gnome2/bookmarks_menu.c:474
-msgid "Folder name: "
-msgstr "Nome de pasta: "
-
-#: ../src/gnome2/bookmarks_menu.c:477
-msgid "Bookmark name: "
-msgstr "Nome de marca: "
-
-#: ../src/gnome2/bookmarks_menu.c:480 ../src/gnome2/bookmarks_menu.c:905
-msgid "Verse: "
-msgstr "Versículo: "
-
-#: ../src/gnome2/bookmarks_menu.c:481 ../src/gnome2/bookmarks_menu.c:906
-msgid "Module: "
-msgstr "Módulo: "
-
-#: ../src/gnome2/bookmarks_menu.c:665
-msgid "Restore Bookmark Folder"
-msgstr "Restaurar Pasta de Marca"
-
-#: ../src/gnome2/bookmarks_menu.c:734
-msgid "Remove the selected folder"
-msgstr "Remover a pasta seleccionada"
-
-#: ../src/gnome2/bookmarks_menu.c:736
-msgid "(and all its contents)?"
-msgstr "(e todo o seu conteúdo)?"
-
-#: ../src/gnome2/bookmarks_menu.c:739
-msgid "Remove the selected bookmark"
-msgstr "Remover a marca seleccionada"
-
-#: ../src/gnome2/bookmarks_menu.c:898
-msgid "Add"
-msgstr "Adicionar"
-
-#: ../src/gnome2/bookmarks_menu.c:904
-msgid "Label: "
-msgstr "Rótulo: "
-
-#: ../src/gnome2/bookmarks_treeview.c:105
-#, c-format
-msgid "Search result: %s"
-msgstr "Resultado da Pesquisa: %s"
-
-#: ../src/gnome2/bookmarks_treeview.c:934 ../src/gnome2/sidebar.c:1461
-msgid "Bookmarks"
-msgstr "Marcas"
-
-#: ../src/gnome2/cipher_key_dialog.c:62
-msgid "Cipher Key?"
-msgstr "Chave cifrada?"
-
-#: ../src/gnome2/cipher_key_dialog.c:63
-msgid "for:"
-msgstr "para:"
-
-#: ../src/gnome2/cipher_key_dialog.c:66
-msgid "Enter Cipher Key: "
-msgstr "Introduza Chave Cifrada: "
-
-#: ../src/gnome2/dialog.c:241
-msgid "Close without Saving"
-msgstr "Fechar sem guardar"
-
-#: ../src/gnome2/dialog.c:569
-msgid "Xiphos:"
-msgstr "Xiphos:"
-
-#: ../src/gnome2/dialog.c:670
-msgid "Close _without Saving"
-msgstr "Fechar se_m Guardar"
-
-#: ../src/gnome2/export_dialog.c:265 ../ui/export-dialog.glade.h:20
-msgid "Please check copyright before exporting!"
-msgstr "Por favor verifique os direitos de autor antes de exportar!"
-
-#: ../src/gnome2/find_dialog.c:200 ../src/gnome2/find_dialog.c:369
-msgid "Find"
-msgstr "Procurar"
-
-#: ../src/gnome2/find_dialog.c:218
-msgid "Enter Word or Phrase"
-msgstr "Introduza Palavra ou Frase"
-
-#: ../src/gnome2/find_dialog.c:234 ../src/gnome2/search_sidebar.c:303
-#: ../ui/search-dialog.glade.h:57
-msgid "Match case"
-msgstr "Combinar capitalização"
-
-#: ../src/gnome2/find_dialog.c:241
-msgid "Search backwards"
-msgstr "Pesquisar para trás"
-
-#: ../src/gnome2/find_dialog.c:250 ../src/gnome2/search_sidebar.c:268
-#: ../ui/search-dialog.glade.h:74
-msgid "Regular expression"
-msgstr "Expressão Regular"
-
-#: ../src/gnome2/find_dialog.c:291
-msgid "Find Next"
-msgstr "Procurar Próximo"
-
-#: ../src/gnome2/font_dialog.c:301
-msgid "Set Module Font"
-msgstr "Definir Fonte do Módulo"
-
-#: ../src/gnome2/font_dialog.c:331
-msgid "Change font for"
-msgstr "Mudar fonte para"
-
-#: ../src/gnome2/font_dialog.c:335
-msgid "Module"
-msgstr "Módulo"
-
-#: ../src/gnome2/font_dialog.c:339
-msgid "Current font: "
-msgstr "Fonte corrente: "
-
-#: ../src/gnome2/font_dialog.c:376
-msgid "+0"
-msgstr "+0"
-
-#: ../src/gnome2/font_dialog.c:380
-msgid "Use the default font for this module"
-msgstr "Usar a fonte por omissão para este módulo"
-
-#: ../src/gnome2/main_window.c:756
-msgid "Xiphos - Bible Study Software"
-msgstr "Xiphos - Software de Estudo Bíblico"
-
-#: ../src/gnome2/main_window.c:812
-msgid "Open a new tab"
-msgstr "Abrir uma nova aba"
-
-#: ../src/gnome2/main_window.c:892 ../src/gnome2/sidebar.c:623
-#: ../src/gnome2/sidebar.c:629 ../src/main/sidebar.cc:642
-#: ../src/main/sidebar.cc:962 ../src/main/sidebar.cc:963
-#: ../src/main/sidebar.cc:964
-msgid "Standard View"
-msgstr "Vista Normal"
-
-#: ../src/gnome2/main_window.c:969
-msgid "Commentary View"
-msgstr "Vista de Comentário"
-
-#: ../src/gnome2/main_window.c:985
-msgid "Book View"
-msgstr "Vista de Livro"
-
-#: ../src/gnome2/main_window.c:1010
-msgid "Welcome to Xiphos"
-msgstr "Benvindo a Xiphos"
-
-#: ../src/gnome2/menu_popup.c:1163
-msgid ""
-"Renaming is not available in Windows.\n"
-"\n"
-"Xiphos is limited by Windows' filesystem,\n"
-"because it disallows the renaming of filename\n"
-"components of currently-open files,\n"
-"such as the contents of this commentary.\n"
-"Therefore, personal commentary renaming is\n"
-"not available in the Windows environment."
-msgstr ""
-"Renomear não está disponível em Windows.\n"
-"\n"
-"Xiphos está limitado pelo sistema de ficheiros de Windows,\n"
-"porque impede a renomeação de componentes do nome de ficheiro para ficheiros "
-"presentemente abertos,\n"
-"tal como os conteúdos deste comentário.\n"
-"Por isso, não é possível renomear comentários pessoais no ambiente Windows."
-
-#: ../src/gnome2/menu_popup.c:1182
-msgid "Rename Commentary"
-msgstr "Renomear Comentário"
-
-#: ../src/gnome2/menu_popup.c:1185
-msgid "Choose Commentary Name"
-msgstr "Escolher Nome de Comentário"
-
-#: ../src/gnome2/menu_popup.c:1187
-msgid "New Name"
-msgstr "Novo Nome"
-
-#: ../src/gnome2/menu_popup.c:1188 ../src/gnome2/treekey-editor.c:132
-#: ../src/gnome2/treekey-editor.c:191 ../src/gnome2/treekey-editor.c:277
-#: ../src/main/prayerlists.cc:240
-msgid "Name: "
-msgstr "Nome: "
-
-#: ../src/gnome2/menu_popup.c:1198 ../src/main/prayerlists.cc:254
-msgid "Module names must contain [A-Za-z0-9_] only."
-msgstr "Os nomes de módulos devem conter apenas [A-Za-z0-9_]."
-
-#: ../src/gnome2/menu_popup.c:1205 ../src/main/prayerlists.cc:261
-msgid "Xiphos already knows a module by that name."
-msgstr "Xiphos já conhece um módulo por esse nome."
-
-#: ../src/gnome2/menu_popup.c:1248
-#, c-format
-msgid ""
-"Failed to create new configuration:\n"
-"%s"
-msgstr ""
-"Falhou a criação de nova configuração:\n"
-"%s"
-
-#: ../src/gnome2/menu_popup.c:1257
-msgid ""
-"Configuration build error:\n"
-"\n"
-msgstr ""
-"Erro de compilação da configuração:\n"
-"\n"
-
-#: ../src/gnome2/mod_mgr.c:339
-msgid "Install these modules?"
-msgstr "Instalar estes módulos?"
-
-#: ../src/gnome2/mod_mgr.c:341
-msgid "Remove these modules?"
-msgstr "Remover estes módulos?"
-
-#: ../src/gnome2/mod_mgr.c:343
-msgid "Archive these modules?"
-msgstr "Arquivar estes módulos?"
-
-#: ../src/gnome2/mod_mgr.c:345
-msgid ""
-"Build fast-search index for these\n"
-"modules (may take minutes/module)?"
-msgstr ""
-"Construir índice de busca rápida para estes\n"
-"módulos (pode demorar minutos por módulo)?"
-
-#: ../src/gnome2/mod_mgr.c:347
-msgid "Delete fast-search index for these modules?"
-msgstr "Apagar índice de busca rápida para estes módulos?"
-
-#: ../src/gnome2/mod_mgr.c:367
-msgid "Preparing to install"
-msgstr "Preparando instalação"
-
-#: ../src/gnome2/mod_mgr.c:369
-msgid "Preparing to remove"
-msgstr "Preparando remoção"
-
-#: ../src/gnome2/mod_mgr.c:371
-msgid "Preparing to archive"
-msgstr "Preparando arquivo"
-
-#: ../src/gnome2/mod_mgr.c:373
-msgid "Preparing to index"
-msgstr "Preparando indexação"
-
-#: ../src/gnome2/mod_mgr.c:375
-msgid "Preparing to delete index"
-msgstr "Preparando para apagar index"
-
-#: ../src/gnome2/mod_mgr.c:401
-msgid "Installing"
-msgstr "Instalando"
-
-#: ../src/gnome2/mod_mgr.c:403
-msgid "Removing"
-msgstr "Removendo"
-
-#: ../src/gnome2/mod_mgr.c:405
-msgid "Archiving"
-msgstr "Arquivando"
-
-#: ../src/gnome2/mod_mgr.c:407
-msgid "Indexing"
-msgstr "Indexando"
-
-#: ../src/gnome2/mod_mgr.c:409
-msgid "Deleting index"
-msgstr "Apagando index"
-
-#: ../src/gnome2/mod_mgr.c:432
-#, c-format
-msgid ""
-"`mkdir %s' failed:\n"
-"%s."
-msgstr ""
-"`mkdir %s' falhou:\n"
-"%s."
-
-#: ../src/gnome2/mod_mgr.c:463
-msgid "Xiphos could not execute archiver"
-msgstr "Xiphos não conseguiu executar arquivador"
-
-#: ../src/gnome2/mod_mgr.c:468
-msgid ""
-" archival result:\n"
-"\n"
-msgstr ""
-" resultado de arquivo:\n"
-"\n"
-
-#: ../src/gnome2/mod_mgr.c:472
-msgid ""
-"\n"
-"Archive in "
-msgstr ""
-"\n"
-"Arquivar em "
-
-#: ../src/gnome2/mod_mgr.c:526
-msgid "Journals and prayer lists cannot be indexed."
-msgstr "Diários e listas de oração não podem ser indexados."
-
-#: ../src/gnome2/mod_mgr.c:547 ../src/gnome2/mod_mgr.c:2902
-#: ../ui/module-manager.glade.h:15
-msgid "Install"
-msgstr "Instalar"
-
-#: ../src/gnome2/mod_mgr.c:549 ../src/gnome2/treekey-editor.c:316
-msgid "Remove"
-msgstr "Remover"
-
-#: ../src/gnome2/mod_mgr.c:551
-msgid "Archive"
-msgstr "Arquivar"
-
-#: ../src/gnome2/mod_mgr.c:553
-msgid "Index"
-msgstr "Indexar"
-
-#: ../src/gnome2/mod_mgr.c:555
-msgid "Deletion"
-msgstr "Remoção"
-
-#: ../src/gnome2/mod_mgr.c:557
-#, c-format
-msgid "%s failed"
-msgstr "%s falhou"
-
-#: ../src/gnome2/mod_mgr.c:559 ../src/gnome2/mod_mgr.c:1285
-msgid "Finished"
-msgstr "Terminado"
-
-#: ../src/gnome2/mod_mgr.c:726 ../src/gnome2/mod_mgr.c:728
-#: ../src/gnome2/mod_mgr.c:830 ../src/gnome2/mod_mgr.c:865
-#: ../src/gnome2/mod_mgr.c:867 ../src/gnome2/utilities.c:346
-#: ../src/gnome2/utilities.c:411 ../src/gnome2/utilities.c:413
-#: ../src/gnome2/utilities.c:1032 ../src/main/sidebar.cc:799
-#: ../src/main/sidebar.cc:871 ../src/main/sidebar.cc:873
-msgid "Unknown"
-msgstr "Desconhecido"
-
-#: ../src/gnome2/mod_mgr.c:1029
-#, c-format
-msgid ""
-"Repository:\n"
-"%s"
-msgstr ""
-"Repositório:\n"
-"%s"
-
-#: ../src/gnome2/mod_mgr.c:1041
-msgid ""
-"Categorized by\n"
-"Module Type"
-msgstr ""
-"Categorizado por \n"
-"Tipo de Módulo"
-
-#: ../src/gnome2/mod_mgr.c:1046 ../src/gnome2/utilities.c:472
-#: ../src/main/sidebar.cc:946 ../src/main/sidebar.cc:948
-msgid "Biblical Texts"
-msgstr "Textos Bíblicos"
-
-#: ../src/gnome2/mod_mgr.c:1050 ../src/gnome2/utilities.c:476
-#: ../src/main/sidebar.cc:654 ../src/main/sidebar.cc:971
-#: ../src/main/sidebar.cc:973 ../ui/prefs.glade.h:33
-msgid "Commentaries"
-msgstr "Comentários"
-
-#: ../src/gnome2/mod_mgr.c:1054 ../src/gnome2/utilities.c:480
-#: ../src/main/sidebar.cc:980 ../src/main/sidebar.cc:982
-msgid "Dictionaries"
-msgstr "Dicionários"
-
-#: ../src/gnome2/mod_mgr.c:1058 ../src/gnome2/utilities.c:484
-#: ../src/main/sidebar.cc:989 ../src/main/sidebar.cc:991
-msgid "Daily Devotionals"
-msgstr "Devocionais Diários"
-
-#: ../src/gnome2/mod_mgr.c:1062 ../src/gnome2/utilities.c:488
-#: ../src/main/sidebar.cc:664 ../src/main/sidebar.cc:998
-#: ../src/main/sidebar.cc:1000
-msgid "General Books"
-msgstr "Livros Gerais"
-
-#: ../src/gnome2/mod_mgr.c:1066 ../src/gnome2/utilities.c:492
-#: ../src/main/sidebar.cc:1007 ../src/main/sidebar.cc:1009
-msgid "Maps"
-msgstr "Mapas"
-
-#: ../src/gnome2/mod_mgr.c:1070 ../src/gnome2/utilities.c:496
-#: ../src/main/sidebar.cc:1016 ../src/main/sidebar.cc:1018
-msgid "Images"
-msgstr "Imagens"
-
-#: ../src/gnome2/mod_mgr.c:1078
-msgid ""
-"Categorized by\n"
-"Availability"
-msgstr ""
-"Categorizado por \n"
-"Disponibilidade"
-
-#: ../src/gnome2/mod_mgr.c:1083
-msgid "Updates"
-msgstr "Actualizações"
-
-#: ../src/gnome2/mod_mgr.c:1087
-msgid "Uninstalled"
-msgstr "Desinstalado"
-
-#: ../src/gnome2/mod_mgr.c:1091 ../src/gnome2/sidebar.c:639
-#: ../src/gnome2/utilities.c:501 ../src/main/prayerlists.cc:238
-#: ../src/main/sidebar.cc:1026 ../src/main/sidebar.cc:1028
-msgid "Prayer List/Journal"
-msgstr "Lista de Oração/Diário"
-
-#: ../src/gnome2/mod_mgr.c:1268
-msgid "Refreshing from remote source"
-msgstr "Actualizando de fonte remota"
-
-#: ../src/gnome2/mod_mgr.c:1279
-msgid "Remote source not found"
-msgstr "Fonte remota não encontrada"
-
-#: ../src/gnome2/mod_mgr.c:1412
-msgid "Module Name"
-msgstr "Nome de Módulo"
-
-#: ../src/gnome2/mod_mgr.c:1433
-msgid "A checkmark means this module is already installed"
-msgstr "Uma marca significa que o módulo já está instalado"
-
-#: ../src/gnome2/mod_mgr.c:1455
-msgid "Click the box to work on this module"
-msgstr "Clique na caixa para trabalhar neste módulo"
-
-#: ../src/gnome2/mod_mgr.c:1456
-msgid "Click the box to select this module for install/update"
-msgstr "Clique na caixa para seleccionar este módulo para instalar/actualizar"
-
-#: ../src/gnome2/mod_mgr.c:1475
-msgid "Installed"
-msgstr "Instalado"
-
-#: ../src/gnome2/mod_mgr.c:1485
-msgid ""
-"The index icon means you have built an optimized ('lucene') index for this "
-"module for fast searching (see the Maintenance pane for this function)"
-msgstr ""
-"O ícone de índice significa que tem um índice optimizado ('lucene') para "
-"este módulo para pesquisa rápida (veja no painel de Manutenção sobre esta "
-"função)"
-
-#: ../src/gnome2/mod_mgr.c:1503
-msgid ""
-"The lock icon means this module is encrypted, and requires that you purchase "
-"an unlock key from the content owner"
-msgstr ""
-"O ícone de fechadura significa que este módulo está encriptado e requer a "
-"compra de uma chave de abertura ao proprietário do conteúdo"
-
-#. 2
-#: ../src/gnome2/mod_mgr.c:1520 ../src/gnome2/sidebar.c:977
-#: ../src/gnome2/sidebar.c:1145 ../ui/xi-menus.glade.h:1
-msgid "About"
-msgstr "Sobre"
-
-#: ../src/gnome2/mod_mgr.c:1540
-msgid ""
-"The refresh icon means the Installed module is older than the newer "
-"Available module: You should update the module"
-msgstr ""
-"O ícone de refrescar significa que o módulo instalado é mais antigo do que o "
-"módulo disponível: deve actualizar o módulo"
-
-#: ../src/gnome2/mod_mgr.c:1552
-msgid "Available"
-msgstr "Disponível"
-
-#: ../src/gnome2/mod_mgr.c:1561
-msgid "Size"
-msgstr "Tamanho"
-
-#: ../src/gnome2/mod_mgr.c:1570
-msgid "Description"
-msgstr "Descrição"
-
-#: ../src/gnome2/mod_mgr.c:1602 ../src/gnome2/mod_mgr.c:1702
-msgid "Configure"
-msgstr "Configurar"
-
-#: ../src/gnome2/mod_mgr.c:1633
-msgid "Type"
-msgstr "Tipo"
-
-#: ../src/gnome2/mod_mgr.c:1640
-msgid "Caption"
-msgstr "Nome"
-
-#: ../src/gnome2/mod_mgr.c:1648
-msgid "Source"
-msgstr "Fonte"
-
-#: ../src/gnome2/mod_mgr.c:1656
-msgid "Directory"
-msgstr "Directório"
-
-#: ../src/gnome2/mod_mgr.c:1664
-msgid "User"
-msgstr "Utilizador"
-
-#: ../src/gnome2/mod_mgr.c:1672
-msgid "Password"
-msgstr "Palavra-passe"
-
-#: ../src/gnome2/mod_mgr.c:1680
-msgid "UID"
-msgstr "UID"
-
-#: ../src/gnome2/mod_mgr.c:1700
-msgid "Sources"
-msgstr "Fontes"
-
-#: ../src/gnome2/mod_mgr.c:1706 ../src/gnome2/preferences_dialog.c:1784
-#: ../src/gnome2/sidebar.c:1485
-msgid "Modules"
-msgstr "Módulos"
-
-#: ../src/gnome2/mod_mgr.c:1708
-msgid "Install/Update"
-msgstr "Instalar/Actualizar"
-
-#: ../src/gnome2/mod_mgr.c:1710
-msgid "Maintenance"
-msgstr "Manutenção"
-
-#: ../src/gnome2/mod_mgr.c:1930
-msgid "Please Refresh"
-msgstr "Por favor actualize"
-
-#: ../src/gnome2/mod_mgr.c:1931
-msgid "Your module list is not up to date!"
-msgstr "A sua lista de módulos não está actual!"
-
-#: ../src/gnome2/mod_mgr.c:2282
-msgid "Standard remote sources have been loaded."
-msgstr "Fontes remotas habituais foram carregadas."
-
-#: ../src/gnome2/mod_mgr.c:2283
-msgid "Could not load standard sources from CrossWire."
-msgstr "Não foi possível carregar as fontes habituais de CrossWire."
-
-#: ../src/gnome2/mod_mgr.c:2435 ../src/gnome2/mod_mgr.c:2684
-msgid "Remove the selected source"
-msgstr "Remover a fonte seleccionada"
-
-#: ../src/gnome2/mod_mgr.c:2495
-msgid "Enter a remote source"
-msgstr "Introduzir uma fonte remota"
-
-#: ../src/gnome2/mod_mgr.c:2499
-msgid "Caption:"
-msgstr "Nome:"
-
-#: ../src/gnome2/mod_mgr.c:2500
-msgid "Type:"
-msgstr "Tipo:"
-
-#: ../src/gnome2/mod_mgr.c:2501
-msgid "Host:"
-msgstr "Máquina:"
-
-#: ../src/gnome2/mod_mgr.c:2502
-msgid "Directory:"
-msgstr "Directório:"
-
-#: ../src/gnome2/mod_mgr.c:2504
-msgid "User (optional):"
-msgstr "Utilizador (opcional):"
-
-#: ../src/gnome2/mod_mgr.c:2505
-msgid "Password (optional):"
-msgstr "Palavra-passe (opcional):"
-
-#. this can happen at most once
-#: ../src/gnome2/mod_mgr.c:2533
-msgid "A source by that name already exists."
-msgstr "Já existe uma fonte com esse nome."
-
-#: ../src/gnome2/mod_mgr.c:2681
-msgid "Delete a remote source"
-msgstr "Apagar uma fonte remota"
-
-#: ../src/gnome2/navbar_book.c:359 ../src/gnome2/navbar_book_dialog.c:299
-msgid "Go outward, to the section containing this one"
-msgstr "Ir para fora, para a secção que contém este"
-
-#: ../src/gnome2/navbar_book.c:375 ../src/gnome2/navbar_book_dialog.c:315
-msgid "Go to previous item"
-msgstr "Ir para item anterior"
-
-#: ../src/gnome2/navbar_book.c:390 ../src/gnome2/navbar_book_dialog.c:330
-msgid "Go to next item"
-msgstr "Ir para próximo item"
-
-#: ../src/gnome2/navbar_book.c:406 ../src/gnome2/navbar_book_dialog.c:346
-msgid "Go inward, to the first subsection"
-msgstr "Ir para dentro, para a primeira subsecção"
-
-#: ../src/gnome2/navbar_versekey_dialog.c:887
-#: ../src/gnome2/navbar_versekey_editor.c:877
-#: ../src/gnome2/navbar_versekey_parallel.c:800
-msgid "Synchronize this window from main window"
-msgstr "Sincronizar esta janela com a janela principal"
-
-#: ../src/gnome2/parallel_dialog.c:324 ../src/gnome2/preferences_dialog.c:1790
-msgid "Parallel"
-msgstr "Paralelo"
-
-#: ../src/gnome2/parallel_view.c:271
-msgid "Copy"
-msgstr "Cópia"
-
-#: ../src/gnome2/parallel_view.c:281
-msgid "Detach/Attach"
-msgstr "Desanexar/Anexar"
-
-#: ../src/gnome2/parallel_view.c:287 ../ui/xi-menus.glade.h:40
-msgid "Module Options"
-msgstr "Opções do Módulo"
-
-#. build change parallel modules submenu
-#: ../src/gnome2/parallel_view.c:302
-msgid "Change parallel 1"
-msgstr "Mudar paralelo 1"
-
-#: ../src/gnome2/parallel_view.c:304
-msgid "Change parallel 2"
-msgstr "Mudar paralelo 2"
-
-#: ../src/gnome2/parallel_view.c:306
-msgid "Change parallel 3"
-msgstr "Mudar paralelo 3"
-
-#: ../src/gnome2/parallel_view.c:308
-msgid "Change parallel 4"
-msgstr "Mudar paralelo 4"
-
-#: ../src/gnome2/parallel_view.c:310
-msgid "Change parallel 5"
-msgstr "Mudar paralelo 5"
-
-#: ../src/gnome2/parallel_view.c:467 ../src/gnome2/sidebar.c:622
-#: ../src/gnome2/sidebar.c:628 ../src/gnome2/tabbed_browser.c:231
-#: ../src/main/sidebar.cc:622 ../src/main/sidebar.cc:954
-#: ../src/main/sidebar.cc:955 ../src/main/sidebar.cc:956
-msgid "Parallel View"
-msgstr "Vista Paralela"
-
-#: ../src/gnome2/preferences_cell_renderer.c:398
-msgid "Text"
-msgstr "Texto"
-
-#: ../src/gnome2/preferences_cell_renderer.c:400
-msgid "Text to render"
-msgstr "Texto a renderizar"
-
-#: ../src/gnome2/preferences_cell_renderer.c:406
-msgid "Pixbuf Object"
-msgstr "Objecto Pixbuf"
-
-#: ../src/gnome2/preferences_cell_renderer.c:408
-msgid "The pixbuf to render."
-msgstr "Pixbuf a renderizar."
-
-#: ../src/gnome2/preferences_dialog.c:1231
-#: ../src/gnome2/preferences_dialog.c:1269
-#: ../src/gnome2/preferences_dialog.c:1306
-#: ../src/gnome2/preferences_dialog.c:1341
-#: ../src/gnome2/preferences_dialog.c:1375
-#: ../src/gnome2/preferences_dialog.c:1408
-#: ../src/gnome2/preferences_dialog.c:1440
-#: ../src/gnome2/preferences_dialog.c:1473
-#: ../src/gnome2/preferences_dialog.c:1505
-#: ../src/gnome2/preferences_dialog.c:1539
-#: ../src/gnome2/preferences_dialog.c:1574
-#: ../src/gnome2/preferences_dialog.c:1609
-#: ../src/gnome2/preferences_dialog.c:1645
-#: ../src/gnome2/preferences_dialog.c:2045
-msgid "-- Select --"
-msgstr "-- Seleccionar --"
-
-#: ../src/gnome2/preferences_dialog.c:1678 ../ui/prefs.glade.h:74
-msgid "Preferences"
-msgstr "Preferências"
-
-#: ../src/gnome2/preferences_dialog.c:1760
-msgid "Fonts"
-msgstr "Fontes"
-
-#: ../src/gnome2/preferences_dialog.c:1763
-msgid "Color"
-msgstr "Cor"
-
-#: ../src/gnome2/preferences_dialog.c:1766
-msgid "Sizes"
-msgstr "Tamanhos"
-
-#: ../src/gnome2/preferences_dialog.c:1770
-msgid "General"
-msgstr "Geral"
-
-#: ../src/gnome2/preferences_dialog.c:1773 ../ui/prefs.glade.h:85
-msgid "Tabs and Panes"
-msgstr "Abas e painéis"
-
-#: ../src/gnome2/preferences_dialog.c:1780
-msgid "Options"
-msgstr "Opções"
-
-#: ../src/gnome2/preferences_dialog.c:1787
-msgid "Main"
-msgstr "Principal"
-
-#: ../src/gnome2/preferences_dialog.c:1793
-msgid "Special"
-msgstr "Especial"
-
-#: ../src/gnome2/search_dialog.c:61 ../src/main/search_dialog.cc:60
-#: ../src/main/search_sidebar.cc:54
-msgid "Searching the "
-msgstr "Pesquisando"
-
-#: ../src/gnome2/search_dialog.c:62 ../src/main/search_dialog.cc:61
-#: ../src/main/search_sidebar.cc:55
-msgid " Module"
-msgstr "Módulo"
-
-#: ../src/gnome2/search_dialog.c:63 ../src/main/search_dialog.cc:62
-#: ../src/main/search_sidebar.cc:56
-msgid "found in "
-msgstr "encontrado em "
-
-#: ../src/gnome2/search_dialog.c:498
-msgid "Clear List?"
-msgstr "Limpar Lista?"
-
-#: ../src/gnome2/search_dialog.c:499
-msgid "Are you sure you want to clear the module list?"
-msgstr "Tem a certeza de que pretende limpar a lista de módulos?"
-
-#: ../src/gnome2/search_dialog.c:682
-msgid "The last module list may not be deleted"
-msgstr "A última lista de módulos não pode ser apagada"
-
-#: ../src/gnome2/search_dialog.c:699
-msgid "Delete list?"
-msgstr "Apagar Lista?"
-
-#: ../src/gnome2/search_dialog.c:700
-msgid "Are you sure you want to delete:"
-msgstr "Tem a certeza de que pretende apagar:"
-
-#: ../src/gnome2/search_sidebar.c:189
-msgid ""
-"This is an inclusive (\"AND\") search:\n"
-"Find matches showing all words."
-msgstr ""
-"Esta é uma pesquisa inclusiva (\"AND\"):\n"
-"Encontrar combinações com todas as palavras."
-
-#: ../src/gnome2/search_sidebar.c:206
-msgid "Search Module"
-msgstr "Pesquisar Módulo"
-
-#: ../src/gnome2/search_sidebar.c:220
-msgid "Bible"
-msgstr "Bíblia"
-
-#: ../src/gnome2/search_sidebar.c:229 ../ui/prefs.glade.h:35
-msgid "Commentary"
-msgstr "Comentário"
-
-#: ../src/gnome2/search_sidebar.c:243
-msgid "Search Type"
-msgstr "Tipo de pesquisa"
-
-#: ../src/gnome2/search_sidebar.c:257 ../ui/search-dialog.glade.h:64
-msgid "Multi word"
-msgstr "Palavra múltipla"
-
-#: ../src/gnome2/search_sidebar.c:276 ../ui/search-dialog.glade.h:44
-msgid "Exact phrase"
-msgstr "Frase exacta"
-
-#: ../src/gnome2/search_sidebar.c:290
-msgid "Search Options"
-msgstr "Opções de Pesquisa"
-
-#: ../src/gnome2/search_sidebar.c:318
-msgid "Search Scope"
-msgstr "Âmbito de Pesquisa"
-
-#: ../src/gnome2/search_sidebar.c:331
-msgid "No scope"
-msgstr "Sem âmbito"
-
-#: ../src/gnome2/search_sidebar.c:341
-msgid "Use bounds"
-msgstr "Usar limites"
-
-#: ../src/gnome2/search_sidebar.c:350
-msgid "Last search"
-msgstr "Última pesquisa"
-
-#: ../src/gnome2/search_sidebar.c:365
-msgid "Bounds"
-msgstr "Limites"
-
-#: ../src/gnome2/search_sidebar.c:379
-msgid "Lower"
-msgstr "Inferior"
-
-#: ../src/gnome2/search_sidebar.c:386
-msgid "Upper"
-msgstr "Superior"
-
-#. 0
-#: ../src/gnome2/sidebar.c:965 ../src/gnome2/sidebar.c:1133
-msgid "Open in a new tab"
-msgstr "Abrir numa nova aba"
-
-#: ../src/gnome2/sidebar.c:966 ../src/gnome2/sidebar.c:1134
-msgid "Open selected module in a new tab"
-msgstr "Abrir módulo seleccionado numa nova aba"
-
-#. 1
-#: ../src/gnome2/sidebar.c:971
-msgid "Open in a separate window"
-msgstr "Abrir numa janela separada"
-
-#: ../src/gnome2/sidebar.c:972
-msgid "Open selected module in a separate ['dialog'] window"
-msgstr "Abrir módulo seleccionado numa janela ['diálogo'] separada"
-
-#: ../src/gnome2/sidebar.c:978 ../src/gnome2/sidebar.c:1146
-msgid "View information about the selected dialog"
-msgstr "Ver informação sobre o diálogo seleccionado"
-
-#: ../src/gnome2/sidebar.c:1069
-msgid "Simple"
-msgstr "Simples"
-
-#: ../src/gnome2/sidebar.c:1070
-msgid "Create a new simple prayer list"
-msgstr "Criar uma nova lista de oração simples"
-
-#: ../src/gnome2/sidebar.c:1076
-msgid "Subject"
-msgstr "Assunto"
-
-#: ../src/gnome2/sidebar.c:1083
-msgid "Monthly"
-msgstr "Mensal"
-
-#: ../src/gnome2/sidebar.c:1084 ../src/gnome2/sidebar.c:1091
-#: ../src/gnome2/sidebar.c:1098
-msgid "Create a new prayer list"
-msgstr "Criar uma nova lista de oração"
-
-#: ../src/gnome2/sidebar.c:1090
-msgid "Daily Journal"
-msgstr "Devocional Diário"
-
-#: ../src/gnome2/sidebar.c:1097
-msgid "Outlined Topic"
-msgstr "Tópico Sublinhado"
-
-#. 1
-#: ../src/gnome2/sidebar.c:1139 ../ui/xi-menus.glade.h:47
-msgid "Open in editor"
-msgstr "Abrir no editor"
-
-#: ../src/gnome2/sidebar.c:1140
-msgid "Open selected module in a dialog"
-msgstr "Abrir módulo seleccionado num diálogo"
-
-#: ../src/gnome2/sidebar.c:1469
-msgid "Search"
-msgstr "Pesquisar"
-
-#: ../src/gnome2/sidebar.c:1477
-msgid "Verse List"
-msgstr "Lista de Versículos"
-
-#: ../src/gnome2/sidebar_dialog.c:136 ../src/gnome2/sidebar_dialog.c:145
-msgid "Sidebar"
-msgstr "Barra Lateral"
-
-#: ../src/gnome2/splash.c:363
-msgid "Powered by the SWORD Project"
-msgstr "Movido pelo Projecto SWORD"
-
-#: ../src/gnome2/treekey-editor.c:130 ../src/gnome2/treekey-editor.c:189
-#: ../src/gnome2/treekey-editor.c:275
-msgid "Prayer List/Journal Item"
-msgstr "Lista de oração/Item de Diário"
-
-#: ../src/gnome2/treekey-editor.c:131 ../src/gnome2/treekey-editor.c:190
-#: ../src/gnome2/treekey-editor.c:276
-msgid "New name"
-msgstr "Novo Nome"
-
-#: ../src/gnome2/treekey-editor.c:246
-msgid "Remove the selected item"
-msgstr "Remover o item seleccionado"
-
-#: ../src/gnome2/treekey-editor.c:304
-msgid "Add Child"
-msgstr "Adicionar Descendente"
-
-#: ../src/gnome2/treekey-editor.c:305 ../src/gnome2/treekey-editor.c:311
-msgid "Add an item"
-msgstr "Adicionar um item"
-
-#: ../src/gnome2/treekey-editor.c:310
-msgid "Add Sibling"
-msgstr "Adicionar Irmão"
-
-#: ../src/gnome2/treekey-editor.c:317
-msgid "Remove this item"
-msgstr "Remover este item"
-
-#: ../src/gnome2/treekey-editor.c:323
-msgid "Edit this item"
-msgstr "Editar este item"
-
-#: ../src/main/display.cc:303
-#, c-format
-msgid ""
-"Improperly encoded personal annotation label:\n"
-"'%s'"
-msgstr ""
-"Rótulo de anotação pessoal indevidamente codificado:\n"
-"'%s'"
-
-#: ../src/main/display.cc:434
-msgid ""
-"An image file's size could not be determined.\n"
-"Is ImageMagick's 'identify' not installed?\n"
-"(Or possibly the image is of type other than bmp/gif/jpg/png.)\n"
-"Xiphos cannot resize images to fit window."
-msgstr ""
-"O tamanho de ficheiro de uma imagem não pôde ser determinado.\n"
-"Não está instalado 'identity' de ImageMagick?\n"
-"(Ou possivelmente o tipo de imagem é distinto de bmp/gif/jpg/png.)\n"
-"Xiphos não pode redimensionar as imagens para ajustar à janela."
-
-#: ../src/main/display.cc:1090 ../src/main/display.cc:1152
-#: ../src/main/display.cc:1240 ../src/main/display.cc:1248
-#: ../ui/export-dialog.glade.h:7
-msgid "Chapter"
-msgstr "Capítulo"
-
-#: ../src/main/main.c:110
-msgid "Xiphos does not understand more than one argument."
-msgstr "Xiphos não aceita mais do que um argumento."
-
-#: ../src/main/main.c:150
-msgid "Initiating Gecko"
-msgstr "Iniciando Gecko"
-
-#: ../src/main/main.c:156
-msgid "Building Interface"
-msgstr "Construindo Interface"
-
-#: ../src/main/main.c:160
-msgid "Starting Sword"
-msgstr "Iniciando Sword"
-
-#: ../src/main/main.c:164
-msgid "Loading Settings"
-msgstr "Carregando Definições"
-
-#: ../src/main/main.c:168
-msgid "Displaying Xiphos"
-msgstr "Mostrando Xiphos"
-
-#: ../src/main/module_dialogs.cc:232 ../src/main/previewer.cc:122
-#: ../ui/prefs.glade.h:75
-msgid "Previewer"
-msgstr "Pré-visualizador"
-
-#: ../src/main/module_dialogs.cc:298 ../src/main/module_dialogs.cc:424
-#: ../src/main/previewer.cc:197
-msgid "Footnote"
-msgstr "Nota de rodapé"
-
-#: ../src/main/module_dialogs.cc:304 ../src/main/module_dialogs.cc:429
-#: ../src/main/previewer.cc:209
-msgid "Cross Reference"
-msgstr "Referência cruzada"
-
-#: ../src/main/module_dialogs.cc:310 ../src/main/module_dialogs.cc:324
-#: ../src/main/module_dialogs.cc:434 ../src/main/module_dialogs.cc:446
-#: ../src/main/previewer.cc:215 ../src/main/previewer.cc:234
-msgid "Strongs"
-msgstr "Strongs"
-
-#: ../src/main/module_dialogs.cc:316 ../src/main/module_dialogs.cc:335
-#: ../src/main/module_dialogs.cc:439 ../src/main/module_dialogs.cc:456
-#: ../src/main/previewer.cc:221 ../src/main/previewer.cc:247
-msgid "Morphology"
-msgstr "Morfologia"
-
-#: ../src/main/module_dialogs.cc:1089 ../src/main/url.cc:537
-msgid "Back to "
-msgstr "Voltar a "
-
-#: ../src/main/parallel_view.cc:398 ../ui/xi-menus.glade.h:69
-msgid "Strong's Numbers"
-msgstr "Números Strong"
-
-#: ../src/main/parallel_view.cc:408 ../ui/search-dialog.glade.h:50
-#: ../ui/xi-menus.glade.h:27
-msgid "Footnotes"
-msgstr "Notas de rodapé"
-
-#: ../src/main/parallel_view.cc:418 ../ui/search-dialog.glade.h:62
-#: ../ui/xi-menus.glade.h:41
-msgid "Morphological Tags"
-msgstr "Etiquetas morfológicas"
-
-#: ../src/main/parallel_view.cc:428 ../ui/xi-menus.glade.h:31
-msgid "Hebrew Vowel Points"
-msgstr "Pontos Vogais do Hebraico"
-
-#: ../src/main/parallel_view.cc:438 ../ui/xi-menus.glade.h:30
-msgid "Hebrew Cantillation"
-msgstr "Cantilação do Hebraico"
-
-#: ../src/main/parallel_view.cc:448 ../ui/xi-menus.glade.h:28
-msgid "Greek Accents"
-msgstr "Acentos Gregos"
-
-#: ../src/main/parallel_view.cc:458
-msgid "Cross-references"
-msgstr "Referências cruzadas"
-
-#: ../src/main/parallel_view.cc:468 ../ui/xi-menus.glade.h:37
-msgid "Lemmas"
-msgstr "Lemas"
-
-#: ../src/main/parallel_view.cc:478 ../ui/xi-menus.glade.h:29
-msgid "Headings"
-msgstr "Cabeçalhos"
-
-#: ../src/main/parallel_view.cc:488
-msgid "Morpheme Segmentation"
-msgstr "Segmentação de Morfema"
-
-#: ../src/main/parallel_view.cc:498 ../ui/xi-menus.glade.h:75
-msgid "Words of Christ in Red"
-msgstr "Palavras de Cristo a vermelho"
-
-#: ../src/main/parallel_view.cc:508 ../ui/xi-menus.glade.h:70
-msgid "Transliteration"
-msgstr "Transliteração"
-
-#: ../src/main/parallel_view.cc:518
-msgid "Textual Variants"
-msgstr "Variantes Textuais"
-
-#: ../src/main/parallel_view.cc:526 ../ui/xi-menus.glade.h:51
-msgid "Primary Reading"
-msgstr "Leitura Principal"
-
-#: ../src/main/parallel_view.cc:535 ../ui/xi-menus.glade.h:65
-msgid "Secondary Reading"
-msgstr "Leitura Secundária"
-
-#: ../src/main/parallel_view.cc:544 ../ui/xi-menus.glade.h:5
-msgid "All Readings"
-msgstr "Todas as Leituras"
-
-#: ../src/main/parallel_view.cc:878 ../src/main/parallel_view.cc:1130
-msgid "view context"
-msgstr "contexto da vista"
-
-#: ../src/main/prayerlists.cc:71
-msgid "January"
-msgstr "Janeiro"
-
-#: ../src/main/prayerlists.cc:72
-msgid "February"
-msgstr "Fevereiro"
-
-#: ../src/main/prayerlists.cc:73
-msgid "March"
-msgstr "Março"
-
-#: ../src/main/prayerlists.cc:74
-msgid "April"
-msgstr "Abril"
-
-#: ../src/main/prayerlists.cc:75
-msgid "May"
-msgstr "Maio"
-
-#: ../src/main/prayerlists.cc:76
-msgid "June"
-msgstr "Junho"
-
-#: ../src/main/prayerlists.cc:77
-msgid "July"
-msgstr "Julho"
-
-#: ../src/main/prayerlists.cc:78
-msgid "August"
-msgstr "Agosto"
-
-#: ../src/main/prayerlists.cc:79
-msgid "September"
-msgstr "Setembro"
-
-#: ../src/main/prayerlists.cc:80
-msgid "October"
-msgstr "Outubro"
-
-#: ../src/main/prayerlists.cc:81
-msgid "November"
-msgstr "Novembro"
-
-#: ../src/main/prayerlists.cc:82
-msgid "December"
-msgstr "Dezembro"
-
-#: ../src/main/prayerlists.cc:121 ../src/main/sword_treekey.cc:332
-msgid "Growth"
-msgstr "Crescimento"
-
-#: ../src/main/prayerlists.cc:122 ../src/main/sword_treekey.cc:333
-msgid "<b>For Growth</b><br>"
-msgstr "<b>Para Crescimento</b><br>"
-
-#: ../src/main/prayerlists.cc:123 ../src/main/prayerlists.cc:380
-#: ../src/main/sword_treekey.cc:334
-msgid "Salvation"
-msgstr "Salvação"
-
-#: ../src/main/prayerlists.cc:124 ../src/main/sword_treekey.cc:335
-msgid "<b>For Salvation</b><br>"
-msgstr "<b>Para Salvação</b><br>"
-
-#: ../src/main/prayerlists.cc:125 ../src/main/prayerlists.cc:384
-#: ../src/main/sword_treekey.cc:336
-msgid "Health"
-msgstr "Saúde"
-
-#: ../src/main/prayerlists.cc:126 ../src/main/sword_treekey.cc:337
-msgid "<b>For Health</b><br>"
-msgstr "<b>Para Saúde</b><br>"
-
-#: ../src/main/prayerlists.cc:127
-msgid "Misc"
-msgstr "Variado"
-
-#: ../src/main/prayerlists.cc:128 ../src/main/sword_treekey.cc:339
-msgid "<b>Miscellaneous</b><br>"
-msgstr "<b>Miscelâneo</b><br>"
-
-#: ../src/main/prayerlists.cc:136
-msgid "Point x"
-msgstr "Ponto x"
-
-#: ../src/main/prayerlists.cc:137
-msgid "<b>(x)</b><br>"
-msgstr "<b>(x)</b><br>"
-
-#: ../src/main/prayerlists.cc:138
-msgid "Point y"
-msgstr "Ponto y"
-
-#: ../src/main/prayerlists.cc:139
-msgid "<b>(y)</b><br>"
-msgstr "<b>(y)</b><br>"
-
-#: ../src/main/prayerlists.cc:140
-msgid "Point z"
-msgstr "Ponto z"
-
-#: ../src/main/prayerlists.cc:141
-msgid "<b>(z)</b><br>"
-msgstr "<b>(z)</b><br>"
-
-#: ../src/main/prayerlists.cc:149
-msgid "Minor Topic 1"
-msgstr "Tópico Menor 1"
-
-#: ../src/main/prayerlists.cc:150
-msgid "<b>Subtopic 1</b><br>"
-msgstr "<b>Subtópico 1</b><br>"
-
-#: ../src/main/prayerlists.cc:152
-msgid "Minor Topic 2"
-msgstr "Tópico Menor 2"
-
-#: ../src/main/prayerlists.cc:153
-msgid "<b>Subtopic 2</b><br>"
-msgstr "<b>Subtópico 2</b><br>"
-
-#: ../src/main/prayerlists.cc:155
-msgid "Minor Topic 3"
-msgstr "Tópico Menor 3"
-
-#: ../src/main/prayerlists.cc:156
-msgid "<b>Subtopic 3</b><br>"
-msgstr "<b>Subtópico 3</b><br>"
-
-#: ../src/main/prayerlists.cc:158
-msgid "Minor Topic 4"
-msgstr "Tópico Menor 4"
-
-#: ../src/main/prayerlists.cc:159
-msgid "<b>Subtopic 4</b><br>"
-msgstr "<b>Subtópico 4</b><br>"
-
-#: ../src/main/prayerlists.cc:239
-msgid "Name for new prayer list or journal"
-msgstr "Nome da nova lista de oração ou diário"
-
-#: ../src/main/prayerlists.cc:270
-msgid "Xiphos finds that prayer list already."
-msgstr "Xiphos já encontra essa lista de oração."
-
-#: ../src/main/prayerlists.cc:283
-#, c-format
-msgid ""
-"Xiphos cannot create module's path:\n"
-"%s"
-msgstr ""
-"Xiphos não pode criar o caminho do módulo:\n"
-"%s"
-
-#: ../src/main/prayerlists.cc:323
-msgid "A basic prayer list. \\par\\par Module created by Xiphos."
-msgstr "Uma lista de oração básica. \\par\\par Módulo criado por Xiphos."
-
-#: ../src/main/prayerlists.cc:324
-msgid "BasicPrayerList"
-msgstr "Lista Básica de Oração"
-
-#: ../src/main/prayerlists.cc:338
-msgid "MyPrayerList"
-msgstr "Minha Lista de Oração"
-
-#: ../src/main/prayerlists.cc:339
-msgid ""
-"<b>People:</b><br>Bob<br>Sam<br>Sue<br><br><b>Church:</"
-"b><br>pews<br>fellowship<br>Bibles for missionaries<br><br><br>"
-msgstr ""
-"<b>Pessoas:</b><br>Bob<br>Sam<br>Sue<br><br><b>Igreja:</"
-"b><br>bancos<br>congregação<br>Bíblias para missionários<br><br><br>"
-
-#: ../src/main/prayerlists.cc:365
-msgid "A subject-based prayer list. \\par\\par Module created by Xiphos."
-msgstr ""
-"Uma lista de oração baseada em assunto. \\par\\par Módulo criado por Xiphos."
-
-#: ../src/main/prayerlists.cc:366
-msgid "SubjectPrayerList"
-msgstr "Lista de Oração"
-
-#: ../src/main/prayerlists.cc:381
-msgid "Bob<br>Sam<br>Sue<br>John<br>"
-msgstr "Bob<br>Sam<br>Sue<br>John<br>"
-
-#: ../src/main/prayerlists.cc:382
-msgid "Spiritual Growth"
-msgstr "Crescimento Espiritual"
-
-#: ../src/main/prayerlists.cc:383
-msgid "Mike<br>Steve<br>"
-msgstr "Mike<br>Steve<br>"
-
-#: ../src/main/prayerlists.cc:385
-msgid "Sue<br>John<br>"
-msgstr "Sue<br>John<br>"
-
-#: ../src/main/prayerlists.cc:411
-msgid "A monthly prayer list. \\par\\par Module created by Xiphos."
-msgstr "Uma lista de oração mensal. \\par\\par Módulo criado por Xiphos."
-
-#: ../src/main/prayerlists.cc:412
-msgid "MonthlyPrayerList"
-msgstr "Lista de Oração Mensal"
-
-#: ../src/main/prayerlists.cc:463
-msgid "A daily journal. \\par\\par Module created by Xiphos."
-msgstr "Um diário. \\par\\par Módulo criado por Xiphos."
-
-#: ../src/main/prayerlists.cc:464
-msgid "DailyJournal"
-msgstr "Devocional Diário"
-
-#: ../src/main/prayerlists.cc:528
-msgid "An outlined topic (e.g. sermon). \\par\\par Module created by Xiphos."
-msgstr ""
-"Um tópico assinalado (ex. sermão). \\par\\par Módulo criado por Xiphos."
-
-#: ../src/main/prayerlists.cc:529
-msgid "OutlinedTopic"
-msgstr "Tópico Sublinhado"
-
-#: ../src/main/prayerlists.cc:543
-msgid "Major Topic A"
-msgstr "Tópico Maior A"
-
-#: ../src/main/prayerlists.cc:544
-msgid "<b>Major Topic A</b><br>"
-msgstr "<b>Tópico Maior A</b><br>"
-
-#: ../src/main/prayerlists.cc:546
-msgid "Major Topic B"
-msgstr "Tópico Maior B"
-
-#: ../src/main/prayerlists.cc:547
-msgid "<b>Major Topic B</b><br>"
-msgstr "<b>Tópico Maior B</b><br>"
-
-#: ../src/main/prayerlists.cc:549
-msgid "Major Topic C"
-msgstr "Tópico Maior C"
-
-#: ../src/main/prayerlists.cc:550
-msgid "<b>Major Topic C</b><br>"
-msgstr "<b>Tópico Maior C</b><br>"
-
-#: ../src/main/previewer.cc:203
-msgid "User Annotation"
-msgstr "Anotação do Utilizador"
-
-#: ../src/main/search_dialog.cc:129
-#, c-format
-msgid "Search result %s: %s"
-msgstr "Resultado da Pesquisa %s: %s"
-
-#: ../src/main/search_dialog.cc:362
-msgid "Delete Range?"
-msgstr "Apagar Extensão?"
-
-#: ../src/main/search_dialog.cc:363
-msgid "Are you sure you want to delete this range?"
-msgstr "Tem a certeza de que quer apagar esta extensão?"
-
-#: ../src/main/search_dialog.cc:577 ../src/main/search_dialog.cc:1048
-#: ../src/main/search_dialog.cc:1051 ../src/main/search_dialog.cc:1073
-#: ../src/main/search_dialog.cc:1076
-msgid "Search: "
-msgstr "Pesquisar: "
-
-#: ../src/main/search_dialog.cc:622
-msgid "Remove Module?"
-msgstr "Remover Módulo?"
-
-#: ../src/main/search_dialog.cc:623
-msgid "Are you sure you want to remove the selected module?"
-msgstr "Tem a certeza de que pretende remover o módulo seleccionado?"
-
-#: ../src/main/search_dialog.cc:1472
-#, c-format
-msgid ""
-"%s:\n"
-"No such module is installed.\n"
-"%s"
-msgstr ""
-"%s: \n"
-"Esse módulo não está instalado.\n"
-"%s"
-
-#: ../src/main/search_dialog.cc:1474
-msgid "Please adjust the module list."
-msgstr "Por favor, ajuste a lista de módulos."
-
-#: ../src/main/search_dialog.cc:1490
-#, c-format
-msgid "No fast-search index exists for %s.%s%s"
-msgstr "Não existe qualquer índice de busca rápida para %s.%s%s"
-
-#: ../src/main/search_dialog.cc:1492
-msgid ""
-"\n"
-"Search on this module is now `multi word'."
-msgstr ""
-"\n"
-"Pesquisa neste módulo é agora `multi palavras'."
-
-#: ../src/main/search_dialog.cc:1493
-msgid ""
-"\n"
-"See the Module Manager, Maintenance pane."
-msgstr ""
-"\n"
-"Ver o Gestor de Módulos, Manutenção."
-
-#: ../src/main/search_dialog.cc:1554
-msgid "Search finished"
-msgstr "Pesquisa concluída"
-
-#: ../src/main/search_sidebar.cc:93
-msgid "matches"
-msgstr "combina com"
-
-#: ../src/main/settings.c:56
-msgid ""
-"Welcome to Xiphos.\n"
-"\n"
-"There are no Bible modules installed. In order to initialize, Xiphos needs "
-"you to install at least one Bible.\n"
-"\n"
-"With your permission, Xiphos will invoke the Module Manager so that you may "
-"install from Crosswire:\n"
-"1. Configure remote install.\n"
-"2. Connect.\n"
-"3. Select a Bible text of your language preference.\n"
-"4. Click `install'.\n"
-"Close the Module Manager when you are done.\n"
-"\n"
-"Warning: If you live in a persecuted country, use with care.\n"
-"\n"
-"May Xiphos invoke the Module Manager so that you may install a Bible?"
-msgstr ""
-"Benvindo(a) a Xiphos.\n"
-"\n"
-"Não existem módulos bíblicos instalados. Para poder inicializar, Xiphos "
-"precisa de ter instalada pelo menos uma Bíblia.\n"
-"\n"
-"Com a sua permissão, Xiphos vai invocar o Gestor de Módulos para que possa "
-"instalar a partir de Crosswire:\n"
-"1. Configurar instalação remota.\n"
-"2. Ligar.\n"
-"3. Seleccionar um texto bíblico na sua língua preferida.\n"
-"4. Clique 'instalar'.\n"
-"Feche o Gestor de Módulos quando terminar.\n"
-"\n"
-"Aviso: Se estiver num país sob perseguição, utilize com precaução.\n"
-"\n"
-"Pode Xiphos invocar o Gestor de Módulos para que possa instalar uma Bíblia?"
-
-#: ../src/main/settings.c:109
-msgid "$HOME is not set!"
-msgstr "$HOME não está definido!"
-
-#: ../src/main/settings.c:124
-msgid "Xiphos has renamed .xiphos-2.0 to .xiphos"
-msgstr "Xiphos não pode renomear .xiphos-2.0 para .xiphos:"
-
-#: ../src/main/settings.c:127
-#, c-format
-msgid ""
-"Xiphos can not rename  .xiphos-2.0 to .xiphos:\n"
-"%s\n"
-"\n"
-"Xiphos cannot continue."
-msgstr ""
-"Xiphos não consegue renomear .xiphos-2.0 para .xiphos:\n"
-"%s\n"
-"\n"
-"Xiphos não pode continuar."
-
-#: ../src/main/settings.c:135
-#, c-format
-msgid ""
-"Xiphos can not create  .xiphos:\n"
-"%s\n"
-"\n"
-"Xiphos cannot continue."
-msgstr ""
-"Xiphos não pode criar .xiphos:\n"
-"%s\n"
-"\n"
-"Xiphos não pode continuar."
-
-#: ../src/main/settings.c:148 ../src/main/settings.c:156
-#: ../src/main/settings.c:164
-msgid "can not create "
-msgstr "não pode criar "
-
-#: ../src/main/settings.c:196
-msgid ""
-"There are still no Bibles installed.\n"
-"Evidently, you declined to install any.\n"
-"\n"
-"Without any Bible modules to display,\n"
-"Xiphos cannot proceed,\n"
-"and will now exit."
-msgstr ""
-"Não há ainda quaisquer Bíblias instaladas.\n"
-"Evidentemente, recusou instalar alguma.\n"
-"\n"
-"Sem qualquer módulo bíblico para mostrar, \n"
-"Xiphos não pode prosseguir \n"
-"e vai agora terminar."
-
-#: ../src/main/settings.c:200
-msgid "Bible module installation complete."
-msgstr "Instalação de módulo bíblico concluída."
-
-#: ../src/main/settings.c:203
-msgid ""
-"Without any Bible modules to display,\n"
-"Xiphos cannot proceed,\n"
-"and will now exit."
-msgstr ""
-"Sem qualquer módulo bíblico para mostrar, \n"
-"Xiphos não pode prosseguir \n"
-"e vai agora terminar."
-
-#. *****************************************************************************
-#. * Name
-#. *    gconf_setup
-#. *
-#. * Synopsis
-#. *   #include "main/settings.h"
-#. *
-#. *   void gconf_setup()
-#. *
-#. * Description
-#. *   verifies and initializes the GConf subsystem, so that "sword://" and
-#. *   similar can be handled by url-comprehending programs such as browsers.
-#. *   dialogs for permission/success/failure => conditional on debug build.
-#. *
-#. * Return value
-#. *   void
-#.
-#: ../src/main/settings.c:804
-msgid ""
-"URL references using \"sword://\" (similar to web page\n"
-"references) can be used by programs to look up\n"
-"scripture references. Your system currently has no\n"
-"program set to handle these references.\n"
-"\n"
-"Would you like Xiphos to set itself as the\n"
-"program to handle these references?"
-msgstr ""
-"Referências URL usando \"sword://\" (semelhantes às referências de páginas "
-"web) \n"
-"podem ser usadas por programas para pesquisar referências bíblicas. \n"
-"O seu sistema não possui actualmente nenhum programa preparado para lidar \n"
-"com essas referências.\n"
-"Gostaria que Xiphos se configurasse para lidar com essas referências?"
-
-#: ../src/main/settings.c:806
-msgid ""
-"Xiphos has successfully set itself\n"
-"as the handler of sword:// and bible:// URLs.\n"
-"\n"
-"You may wish to run the program \"gconf-editor\"\n"
-"to examine keys under /desktop/gnome/url-handlers,\n"
-"if you need to change these."
-msgstr ""
-"Xiphos foi configurado com sucesso \n"
-"para lidar com URLs sword:// e bible://.\n"
-"\n"
-"Se desejar, pode correr o programa \"gconf-editor\" \n"
-"para examinar chaves sob /desktop/gnome/url-handlers, \n"
-"se necessitar de as alterar."
-
-#: ../src/main/settings.c:859
-#, c-format
-msgid ""
-"Xiphos failed to complete handler init for key #%d:\n"
-"%s"
-msgstr ""
-"Xiphos não conseguiu completar a inicialização do handler para a chave #%"
-"d: \n"
-"%s"
-
-#: ../src/main/sidebar.cc:376
-msgid "verse"
-msgstr "versículo"
-
-#: ../src/main/sidebar.cc:438
-msgid "chapter"
-msgstr "capítulo"
-
-#: ../src/main/sword.cc:546
-msgid ""
-"Xiphos's file for language\n"
-"abbreviations is missing."
-msgstr ""
-"O ficheiro de Xiphos para \n"
-"as abreviaturas de linguagem está ausente."
-
-#: ../src/main/sword.cc:553
-msgid ""
-"Xiphos's language abbreviation\n"
-"file cannot be opened."
-msgstr ""
-"O ficheiro de abreviaturas \n"
-"de Xiphos não pode ser aberto."
-
-#: ../src/main/sword.cc:566
-msgid ""
-"Xiphos cannot allocate space\n"
-"for language abbreviations."
-msgstr ""
-"Xiphos não pode alocar espaço\n"
-"para abreviaturas de linguagens."
-
-#: ../src/main/sword.cc:573
-msgid ""
-"Xiphos cannot read the\n"
-"language abbreviation file."
-msgstr ""
-"Xiphos não pode ler o ficheiro \n"
-"de abreviaturas de linguagens."
-
-#: ../src/main/sword.cc:1191
-msgid "Daily devotional was requested, but there are none installed."
-msgstr "Foi pedido um Devocional Diário, mas não há nenhum instalado."
-
-#: ../src/main/tab_history.c:92
-msgid "H_istory/<Separator>"
-msgstr "_Histórico/<Separator>"
-
-#: ../src/main/tab_history.c:94
-msgid "H_istory/C_lear"
-msgstr "_Histórico/_Limpar"
-
-#: ../src/main/tab_history.c:219
-msgid "Clear History"
-msgstr "Limpar Histórico"
-
-#: ../src/main/url.cc:99
-msgid "URL not found:"
-msgstr "URL não encontrado:"
-
-#: ../src/main/url.cc:194
-#, c-format
-msgid "Xiphos could not execute %s"
-msgstr "Xiphos não conseguiu executar %s"
-
-#: ../src/main/url.cc:202
-msgid "Viewer error:\n"
-msgstr "Erro de visualizador:\n"
-
-#: ../src/main/url.cc:278
-#, c-format
-msgid "Show %s in main window"
-msgstr "Mostrar %s na janela principal"
-
-#: ../src/main/xml.c:80 ../src/main/xml.c:464
-#, c-format
-msgid "Document not created successfully. \n"
-msgstr "Documento não criado com sucesso. \n"
-
-#: ../src/main/xml.c:89
-msgid "Personal"
-msgstr "Pessoal"
-
-#: ../src/main/xml.c:90
-msgid "What must I do to be saved?"
-msgstr "O que preciso de fazer para ser salvo?"
-
-#: ../src/main/xml.c:92 ../src/main/xml.c:93
-msgid "Acts 16:31"
-msgstr "Actos 16:31"
-
-#: ../src/main/xml.c:97 ../src/main/xml.c:98
-msgid "Eph 2:8,9"
-msgstr "Efésios 2:8,9"
-
-#: ../src/main/xml.c:102 ../src/main/xml.c:103
-msgid "Romans 1:16"
-msgstr "Romanos 1:16"
-
-#: ../src/main/xml.c:106
-msgid "What is the Gospel?"
-msgstr "O que é o Evangelho?"
-
-#: ../src/main/xml.c:108 ../src/main/xml.c:109
-msgid "1 Cor 15:1-4"
-msgstr "1 Cor 15:1-4"
-
-#: ../src/main/xml.c:413 ../src/main/xml.c:1071
-#, c-format
-msgid "Document not parsed successfully. \n"
-msgstr "Documento não processado com sucesso. \n"
-
-#: ../src/main/xml.c:419 ../src/main/xml.c:674 ../src/main/xml.c:952
-#: ../src/main/xml.c:1131
-#, c-format
-msgid "empty document \n"
-msgstr "documento vazio \n"
-
-#: ../src/main/xml.c:425
-#, c-format
-msgid "wrong type, root node != SwordBookmarks\n"
-msgstr "tipo errado, root node != SwordBookmarks\n"
-
-#: ../src/main/xml.c:476
-msgid "Old Testament"
-msgstr "Velho Testamento"
-
-#: ../src/main/xml.c:477
-msgid "Gen - Mal"
-msgstr "Gen - Mal"
-
-#: ../src/main/xml.c:482
-msgid "New Testament"
-msgstr "Novo Testamento"
-
-#: ../src/main/xml.c:483
-msgid "Mat - Rev"
-msgstr "Mat - Ap"
-
-#: ../src/main/xml.c:489
-msgid "Sample Module List"
-msgstr "Amostra de Lista de Módulos"
-
-#: ../src/main/xml.c:680 ../src/main/xml.c:958
-#, c-format
-msgid "wrong type, root node != %s\n"
-msgstr "tipo errado, root node != %s\n"
-
-#: ../ui/bookmarks.glade.h:1
-msgid "Add Bookmark"
-msgstr "Adicionar Marca"
-
-#: ../ui/bookmarks.glade.h:2 ../ui/markverse.glade.h:1
-msgid "Bookmark Dialog"
-msgstr "Diálogo de Marca"
-
-#: ../ui/bookmarks.glade.h:3
-msgid "Bookmark Folder Treeview"
-msgstr "Vista de Árvore da Pasta de Marca"
-
-#: ../ui/bookmarks.glade.h:4 ../ui/markverse.glade.h:2
-msgid "Cancel Bookmark"
-msgstr "Cancelar Marca"
-
-#: ../ui/bookmarks.glade.h:5 ../ui/markverse.glade.h:3
-msgid "Create new folder"
-msgstr "Criar Nova Pasta"
-
-#: ../ui/bookmarks.glade.h:6
-msgid "Label Entry"
-msgstr "Entrada de Rótulo"
-
-#: ../ui/bookmarks.glade.h:7
-msgid "Label:"
-msgstr "Rótulo:"
-
-#: ../ui/bookmarks.glade.h:8 ../ui/markverse.glade.h:6
-msgid "Module Entry"
-msgstr "Entrada de Módulo"
-
-#: ../ui/bookmarks.glade.h:9 ../ui/markverse.glade.h:7
-msgid "Module:"
-msgstr "Módulo:"
-
-#: ../ui/bookmarks.glade.h:10
-msgid "New ..."
-msgstr "Novo ..."
-
-#: ../ui/bookmarks.glade.h:11 ../ui/markverse.glade.h:8
-#: ../ui/xi-menus.glade.h:42
-msgid "New Folder"
-msgstr "Nova Pasta"
-
-#: ../ui/bookmarks.glade.h:12 ../ui/markverse.glade.h:10
-msgid "Verse Entry"
-msgstr "Entrada de Versículo"
-
-#: ../ui/bookmarks.glade.h:13 ../ui/markverse.glade.h:11
-msgid "Verse:"
-msgstr "Versículo:"
-
-#: ../ui/editor_note.xml.h:1
-msgid "Delete the current note"
-msgstr "Apagar a nota corrente"
-
-#: ../ui/editor_note.xml.h:2 ../ui/editor_studypad.xml.h:4
-#: ../ui/editor.xml.h:2
-msgid "E_xit"
-msgstr "_Sair"
-
-#: ../ui/editor_note.xml.h:3 ../ui/editor_studypad.xml.h:5
-#: ../ui/editor.xml.h:3
-msgid "Exit"
-msgstr "Sair"
-
-#: ../ui/editor_note.xml.h:4 ../ui/editor_studypad.xml.h:6
-#: ../ui/editor.xml.h:4
-msgid "Exit the program"
-msgstr "Sair do programa"
-
-#: ../ui/editor_note.xml.h:5 ../ui/editor_studypad.xml.h:7
-#: ../ui/editor.xml.h:5
-msgid "For_mat"
-msgstr "For_matar"
-
-#: ../ui/editor_note.xml.h:6 ../ui/editor_studypad.xml.h:8
-#: ../ui/editor.xml.h:6
-msgid "HTML Format switch"
-msgstr "Mudança de formato HTML"
-
-#: ../ui/editor_note.xml.h:7 ../ui/editor_studypad.xml.h:9
-#: ../ui/editor.xml.h:7
-msgid "HTML mode"
-msgstr "Modo HTML"
-
-#: ../ui/editor_note.xml.h:8
-msgid "Preview the note to be printed"
-msgstr "Antever nota a ser impressa"
-
-#: ../ui/editor_note.xml.h:10
-msgid "Print this note"
-msgstr "Imprimir esta nota"
-
-#: ../ui/editor_note.xml.h:12
-msgid "Save the current note"
-msgstr "Apagar a nota corrente"
-
-#: ../ui/editor_note.xml.h:13
-msgid "_Delete Personal Comment"
-msgstr "_Apagar Comentário Pessoal"
-
-#: ../ui/editor_note.xml.h:16
-msgid "_Save (Personal Comment)"
-msgstr "_Guardar (Comentário Pessoal)"
-
-#: ../ui/editor_studypad.xml.h:1
-msgid "Add this file to your bookmarks"
-msgstr "Adicionar este ficheiro às suas marcas"
-
-#: ../ui/editor_studypad.xml.h:3 ../ui/editor.xml.h:1
-msgid "Create a new document"
-msgstr "Criar um novo documento"
-
-#: ../ui/editor_studypad.xml.h:10 ../ui/editor.xml.h:8
-msgid "New Document"
-msgstr "Novo Documento"
-
-#: ../ui/editor_studypad.xml.h:11 ../ui/editor.xml.h:9
-msgid "Open"
-msgstr "Abrir"
-
-#: ../ui/editor_studypad.xml.h:12
-msgid "Open a file in Studypad"
-msgstr "Abrir ficheiro no StudyPad"
-
-#: ../ui/editor_studypad.xml.h:13
-msgid "Preview the document to be printed"
-msgstr "Prever o documento a imprimir"
-
-#: ../ui/editor_studypad.xml.h:15
-msgid "Print this document"
-msgstr "Imprimir este documento"
-
-#: ../ui/editor_studypad.xml.h:17
-msgid "Save AS"
-msgstr "Guardar Como"
-
-#: ../ui/editor_studypad.xml.h:18 ../ui/editor.xml.h:12
-msgid "Save the current file"
-msgstr "Guardar o ficheiro actual"
-
-#: ../ui/editor_studypad.xml.h:19
-msgid "Save the current file as"
-msgstr "Guardar o ficheiro actual como"
-
-#: ../ui/editor.xml.h:10
-msgid "Open the file in Studypad"
-msgstr "Abrir o ficheiro no StudyPad"
-
-#: ../ui/export-dialog.glade.h:1
-msgid ": "
-msgstr ": "
-
-#: ../ui/export-dialog.glade.h:2
-msgid "<b>Copy</b>"
-msgstr "<b>Copiar</b>"
-
-#: ../ui/export-dialog.glade.h:3
-msgid "<b>Export</b>"
-msgstr "<b>Exportar</b>"
-
-#: ../ui/export-dialog.glade.h:4
-msgid "<b>Format</b>"
-msgstr "<b>Formatar</b>"
-
-#: ../ui/export-dialog.glade.h:5 ../ui/prefs.glade.h:25
-msgid "Book"
-msgstr "Livro"
-
-#: ../ui/export-dialog.glade.h:6
-msgid "Book Radio Button"
-msgstr "Botão de Rádio de Livro"
-
-#: ../ui/export-dialog.glade.h:8
-msgid "Chapter Radio Button"
-msgstr "Botão de Rádio de Capítulo"
-
-#: ../ui/export-dialog.glade.h:9 ../ui/xi-menus.glade.h:14
-msgid "Copy/Export Passage"
-msgstr "Copiar/Exportar Passagem"
-
-#: ../ui/export-dialog.glade.h:10
-msgid "Export Passage Cancel"
-msgstr "Cancelar Exportação de Passagem"
-
-#: ../ui/export-dialog.glade.h:11
-msgid "Export Passage OK"
-msgstr "Exportar Passagem OK"
-
-#: ../ui/export-dialog.glade.h:12
-msgid "Export complete book"
-msgstr "Exportar livro completo"
-
-#: ../ui/export-dialog.glade.h:13
-msgid "Export complete chapter"
-msgstr "Exportar capítulo completo"
-
-#: ../ui/export-dialog.glade.h:14
-msgid "Export single verse"
-msgstr "Exportar versículo"
-
-#: ../ui/export-dialog.glade.h:15
-msgid "HTML"
-msgstr "HTML"
-
-#: ../ui/export-dialog.glade.h:16
-msgid "HTML Radio Button"
-msgstr "Botão de Rádio HTML"
-
-#: ../ui/export-dialog.glade.h:17
-msgid "Key"
-msgstr "Chave"
-
-#: ../ui/export-dialog.glade.h:18
-msgid "Plain Text"
-msgstr "Texto Simples"
-
-#: ../ui/export-dialog.glade.h:19
-msgid "Plain Text Radio Button"
-msgstr "Botão de Rádio para Texto Simples"
-
-#: ../ui/export-dialog.glade.h:21
-msgid "Save Export As"
-msgstr "Guardar Exportado como"
-
-#: ../ui/export-dialog.glade.h:22
-msgid "Verse"
-msgstr "Versículo"
-
-#: ../ui/export-dialog.glade.h:23
-msgid "Verse Radio Button"
-msgstr "Botão de Rádio de Versículo"
-
-#: ../ui/export-dialog.glade.h:24
-msgid "Verse range"
-msgstr "Extensão de versículos"
-
-#: ../ui/export-dialog.glade.h:25
-msgid "Version"
-msgstr "Versão"
-
-#: ../ui/markverse.glade.h:4
-msgid "Mark"
-msgstr "Marcar"
-
-#: ../ui/markverse.glade.h:5
-msgid "Mark/Unmark Verse"
-msgstr "Marcar/desmarcar Versículo"
-
-#: ../ui/markverse.glade.h:9
-msgid "Unmark"
-msgstr "Desmarcar"
-
-#: ../ui/module-manager.glade.h:1
-msgid "<b>Add and Remove Sources</b>"
-msgstr "<b>Adicionar e remover fontes</b>"
-
-#: ../ui/module-manager.glade.h:2
-msgid "<b>Install Destination</b>"
-msgstr "<b>Destino de instalação</b>"
-
-#: ../ui/module-manager.glade.h:3
-msgid "<b>Install Source</b>"
-msgstr "<b>Fonte de instalação</b>"
-
-#: ../ui/module-manager.glade.h:4
-msgid "<b>Module Manager</b>"
-msgstr "<b>Gestor de Módulos</b>"
-
-#. do not translate <b> and </b> they are html formating
-#: ../ui/module-manager.glade.h:6
-msgid "<b>Sword</b>"
-msgstr "<b>Sword</b>"
-
-#: ../ui/module-manager.glade.h:7
-msgid "<b>WARNING:</b> If you live in a persecuted country use with care."
-msgstr "<b>AVISO:</b> Use com cuidado se estiver num país com perseguições."
-
-#: ../ui/module-manager.glade.h:8
-msgid ""
-"<b>Warning:</b> If you live in a persecuted country and do not wish to risk "
-"detection you should NOT use  the remote installation feature! "
-msgstr ""
-"<b>Aviso:</b> Se vive num país com perseguições e não quer arriscar ser "
-"detectado, NÃO deve usar a instalação remota! "
-
-#: ../ui/module-manager.glade.h:9
-msgid "<i>Personal area, for your use only:</i>"
-msgstr "<i>Área pessoal, para seu uso apenas:</i>"
-
-#: ../ui/module-manager.glade.h:10
-msgid "<i>System area, for all users:</i>"
-msgstr "<i>Área do sistema, para todos os utilizadores:</i>"
-
-#: ../ui/module-manager.glade.h:11
-msgid "Continue"
-msgstr "Continuar"
-
-#: ../ui/module-manager.glade.h:12
-msgid "Current Remote Sources"
-msgstr "Fontes Remotas actuais"
-
-#: ../ui/module-manager.glade.h:13
-msgid "Current local sources"
-msgstr "Fontes Locais actuais"
-
-#: ../ui/module-manager.glade.h:14
-msgid "Home dir"
-msgstr "Directório local (home)"
-
-#: ../ui/module-manager.glade.h:16
-msgid "Load Standard"
-msgstr "Carregar Vista Normal"
-
-#: ../ui/module-manager.glade.h:17
-msgid "Local"
-msgstr "Local"
-
-#: ../ui/module-manager.glade.h:18
-msgid "Local Install Folder"
-msgstr "Pasta de instalação local"
-
-#: ../ui/module-manager.glade.h:19
-msgid "Module Manager"
-msgstr "Gestor de Módulos"
-
-#: ../ui/module-manager.glade.h:20
-msgid "Remote"
-msgstr "Remoto"
-
-#: ../ui/module-manager.glade.h:21
-msgid "Sword sys dir"
-msgstr "Directório de sistema Sword"
-
-#: ../ui/navbar_versekey.glade.h:1
-msgid "1"
-msgstr "1"
-
-#: ../ui/navbar_versekey.glade.h:2
-msgid "<b>Revelation of John</b>"
-msgstr "<b>Apocalipse de João</b>"
-
-#: ../ui/navbar_versekey.glade.h:3
-msgid "Book Selector Button"
-msgstr "Botão de Selecção de Livro"
-
-#: ../ui/navbar_versekey.glade.h:4
-msgid "Choose book to display"
-msgstr "Escolher livro para mostrar"
-
-#: ../ui/navbar_versekey.glade.h:5
-msgid "Drop down history list"
-msgstr "Lista de histórico (drop down)"
-
-#: ../ui/navbar_versekey.glade.h:6
-msgid "Reference Entry"
-msgstr "Entrada de Referência"
-
-#: ../ui/navbar_versekey.glade.h:7
-msgid "Toggle Chapter Button"
-msgstr "Botão Mudar Capítulo"
-
-#: ../ui/navbar_versekey.glade.h:8
-msgid "Toggle Verse Button"
-msgstr "Botão Mudar Versículo"
-
-#: ../ui/prefs.glade.h:1
-msgid ""
-"-2\n"
-"-1\n"
-"+0\n"
-"+1\n"
-"+2\n"
-"+3\n"
-"+4\n"
-"+5"
-msgstr ""
-"-2\n"
-"-1\n"
-"+0\n"
-"+1\n"
-"+2\n"
-"+3\n"
-"+4\n"
-"+5"
-
-#: ../ui/prefs.glade.h:9
-msgid "<b>Font Colors</b>"
-msgstr "<b>Cores de fonte</b>"
-
-#: ../ui/prefs.glade.h:10
-msgid "<b>Font Sizes</b>"
-msgstr "<b>Tamanhos de fonte</b>"
-
-#: ../ui/prefs.glade.h:11
-msgid "<b>General</b>"
-msgstr "<b>Geral</b>"
-
-#: ../ui/prefs.glade.h:12
-msgid "<b>Main Window Modules</b>"
-msgstr "<b>Módulos da Janela Principal</b>"
-
-#: ../ui/prefs.glade.h:13
-msgid "<b>Parallel View</b>"
-msgstr "<b>Vista Paralela</b>"
-
-#: ../ui/prefs.glade.h:14
-msgid "<b>Show</b>"
-msgstr "<b>Mostrar</b>"
-
-#: ../ui/prefs.glade.h:15
-msgid "<b>Special Purpose Modules</b>"
-msgstr "<b>Módulos especiais</b>"
-
-#: ../ui/prefs.glade.h:16
-msgid "<b>StudyPad default directory</b>"
-msgstr "<b>Directório StudyPad por omissão</b>"
-
-#: ../ui/prefs.glade.h:17
-msgid "<b>Tabs</b>"
-msgstr "<b>Abas</b>"
-
-#: ../ui/prefs.glade.h:18
-msgid "Apply high-contrast highlight to current verse"
-msgstr "Assinalar o versículo corrente com alto contraste"
-
-#: ../ui/prefs.glade.h:19
-msgid ""
-"Automatically resize commentary, book, and dictionary image content to fit "
-"subwindow"
-msgstr ""
-"Redimensionar automaticamente o comentário, livro e conteúdo de imagem de "
-"dicionário para caber na subjanela"
-
-#: ../ui/prefs.glade.h:20
-msgid "Background"
-msgstr "Fundo"
-
-#: ../ui/prefs.glade.h:21
-msgid "Base font size"
-msgstr "Tamanho da fonte base"
-
-#: ../ui/prefs.glade.h:22
-msgid "Bible Texts"
-msgstr "Textos da Bíblia"
-
-#: ../ui/prefs.glade.h:23
-msgid "Bible Texts Checkbox"
-msgstr "Visto de Textos da Bíblia"
-
-#: ../ui/prefs.glade.h:24
-msgid "Biblical Text"
-msgstr "Texto Bíblico"
-
-#: ../ui/prefs.glade.h:26
-msgid "Change Biblical Text Combo"
-msgstr "Combo para alterar Texto Bíblico"
-
-#: ../ui/prefs.glade.h:27
-msgid "Change Book Combo"
-msgstr "Combo para Mudar Livro"
-
-#: ../ui/prefs.glade.h:28
-msgid "Change Commentary Combo"
-msgstr "Combo para Mudar Comentário"
-
-#: ../ui/prefs.glade.h:29
-msgid "Change Default Dictionary Combo"
-msgstr "Combo para mudar Dicionário por omissão"
-
-#: ../ui/prefs.glade.h:30
-msgid "Change Dictionary Combo"
-msgstr "Combo para mudar Dicionário"
-
-#: ../ui/prefs.glade.h:31
-msgid "Change Personal Notes Combo"
-msgstr "Combo para mudar Notas Pessoais"
-
-#: ../ui/prefs.glade.h:32
-msgid "Choose to enable Prayer lists "
-msgstr "Escolha para activar listas de oração"
-
-#: ../ui/prefs.glade.h:34
-msgid "Commentaries Checkbox"
-msgstr "Visto de Comentários"
-
-#: ../ui/prefs.glade.h:36
-msgid "Cover"
-msgstr "Capa"
-
-#: ../ui/prefs.glade.h:37
-msgid "Current Verse"
-msgstr "Versículo corrente"
-
-#: ../ui/prefs.glade.h:38
-msgid "Daily Devotional"
-msgstr "Devocional Diário"
-
-#: ../ui/prefs.glade.h:39
-msgid "Daily Devotional Combo"
-msgstr "Combo de Devocional Diário"
-
-#: ../ui/prefs.glade.h:40
-msgid "Default Dictionary"
-msgstr "Dicionário por omissão"
-
-#: ../ui/prefs.glade.h:41
-msgid "Dictionary"
-msgstr "Dicionário"
-
-#: ../ui/prefs.glade.h:42
-msgid "Dictionary/Lexicon"
-msgstr "Dicionário/Léxico"
-
-#: ../ui/prefs.glade.h:43
-msgid "Dictionary/Lexicon Checkbox"
-msgstr "Visto de Dicionário/Léxico"
-
-#: ../ui/prefs.glade.h:44
-msgid "Enable Prayer Lists"
-msgstr "Activar Listas de Oração"
-
-#: ../ui/prefs.glade.h:45
-msgid "Enable Prayer Lists Checkbox"
-msgstr "Visto para Activar Listas de Oração"
-
-#: ../ui/prefs.glade.h:46
-msgid "Font Colors"
-msgstr "Cores da Fonte"
-
-#: ../ui/prefs.glade.h:47
-msgid "Font Misc"
-msgstr "Opções variadas da Fonte"
-
-#: ../ui/prefs.glade.h:48
-msgid "Foreground"
-msgstr "Primeiro plano"
-
-#: ../ui/prefs.glade.h:49
-msgid "General Misc"
-msgstr "Opções variadas Gerais"
-
-#: ../ui/prefs.glade.h:50
-msgid "Greek Lexicon"
-msgstr "Léxico Grego"
-
-#: ../ui/prefs.glade.h:51
-msgid "Greek Lexicon Combo"
-msgstr "Combo de Léxico Grego"
-
-#: ../ui/prefs.glade.h:52
-msgid "Hebrew Lexicon"
-msgstr "Léxico Hebraico"
-
-#: ../ui/prefs.glade.h:53
-msgid "Hebrew Lexicon Combo"
-msgstr "Combo de Léxico Hebraico"
-
-#: ../ui/prefs.glade.h:54
-msgid "Highlight Background"
-msgstr "Assinalar Fundo"
-
-#: ../ui/prefs.glade.h:55
-msgid "Highlight Foreground"
-msgstr "Assinalar Primeiro Plano"
-
-#: ../ui/prefs.glade.h:56
-msgid "Highlight current verse"
-msgstr "Assinalar versículo corrente"
-
-#: ../ui/prefs.glade.h:57
-msgid "Highlight current verse check box"
-msgstr "Visto para Assinalar versículo corrente"
-
-#: ../ui/prefs.glade.h:58
-msgid "Links"
-msgstr "Ligações"
-
-#: ../ui/prefs.glade.h:59
-msgid "Modules Main"
-msgstr "Módulos Principal"
-
-#: ../ui/prefs.glade.h:60
-msgid "Modules Misc"
-msgstr "Módulos Miscelâneo"
-
-#: ../ui/prefs.glade.h:61
-msgid "Modules Parallel"
-msgstr "Módulos Paralelo"
-
-#: ../ui/prefs.glade.h:62
-msgid "Parallel 1"
-msgstr "Paralelo 1"
-
-#: ../ui/prefs.glade.h:63
-msgid "Parallel 1 Combo"
-msgstr "Combo de Paralelo 1"
-
-#: ../ui/prefs.glade.h:64
-msgid "Parallel 2"
-msgstr "Paralelo 2"
-
-#: ../ui/prefs.glade.h:65
-msgid "Parallel 2 Combo"
-msgstr "Combo de Paralelo 2"
-
-#: ../ui/prefs.glade.h:66
-msgid "Parallel 3"
-msgstr "Paralelo 3"
-
-#: ../ui/prefs.glade.h:67
-msgid "Parallel 3 Combo"
-msgstr "Combo de Paralelo 3"
-
-#: ../ui/prefs.glade.h:68
-msgid "Parallel 4"
-msgstr "Paralelo 4"
-
-#: ../ui/prefs.glade.h:69
-msgid "Parallel 4 Combo"
-msgstr "Combo de Paralelo 4"
-
-#: ../ui/prefs.glade.h:70
-msgid "Parallel 5"
-msgstr "Paralelo 5"
-
-#: ../ui/prefs.glade.h:71
-msgid "Parallel 5 Combo"
-msgstr "Combo de Paralelo 5"
-
-#: ../ui/prefs.glade.h:72
-msgid "Parallel View in a tab"
-msgstr "Vista paralela numa aba"
-
-#: ../ui/prefs.glade.h:73
-msgid "Personal Notes"
-msgstr "Notas Pessoais"
-
-#: ../ui/prefs.glade.h:76
-msgid "Previewer Checkbox"
-msgstr "Visto de Pré-visualizador"
-
-#: ../ui/prefs.glade.h:77
-msgid "Resize images"
-msgstr "Redimensionar Imagens"
-
-#: ../ui/prefs.glade.h:78
-msgid "Resize images checkbox"
-msgstr "Visto para Redimensionar Imagens"
-
-#: ../ui/prefs.glade.h:79
-msgid "Scroll to Previous/Next Chapter"
-msgstr "Deslizar para Capítulo Anterior/Seguinte"
-
-#: ../ui/prefs.glade.h:80
-msgid "Scroll to Previous/Next Chapter Checkbox"
-msgstr "Visto para Deslizar para Capítulo Anterior/Seguinte"
-
-#: ../ui/prefs.glade.h:81
-msgid "Select A Directory"
-msgstr "Seleccionar um directório"
-
-#: ../ui/prefs.glade.h:82
-msgid "Show Daily Devotion at start up"
-msgstr "Mostrar Devocional Diário no arranque"
-
-#: ../ui/prefs.glade.h:83
-msgid "Show splash screen at start up"
-msgstr "Mostrar janela splash no arranque"
-
-#: ../ui/prefs.glade.h:84
-msgid "StudyPad default directory combo"
-msgstr "Combo de Directório StudyPad por omissão"
-
-#: ../ui/prefs.glade.h:86
-msgid "Use Bible Text scroll bar to scroll to previous or next chapter"
-msgstr ""
-"Use a barra de deslocamento do texto bíblico para passar ao capítulo "
-"anterior ou seguinte"
-
-#: ../ui/prefs.glade.h:87
-msgid "Use Verse Per Line"
-msgstr "Usar versículo por linha"
-
-#: ../ui/prefs.glade.h:88
-msgid "Use Verse Per Line Checkbox"
-msgstr "Visto para usar versículo por linha"
-
-#: ../ui/prefs.glade.h:89
-msgid "Use default Dictionary"
-msgstr "Usar Dicionário por omissão"
-
-#: ../ui/prefs.glade.h:90
-msgid "Use default Dictionary Checkbox"
-msgstr "Visto para Usar Dicionário por omissão"
-
-#: ../ui/prefs.glade.h:91
-msgid "Use tabbed browsing"
-msgstr "Use exploração com abas"
-
-#: ../ui/prefs.glade.h:92
-msgid "Use tabbed browsing Checkbox"
-msgstr "Visto para Usar exploração com abas"
-
-#: ../ui/prefs.glade.h:93
-msgid "Verse number size"
-msgstr "Tamanho do número de versículo"
-
-#: ../ui/search-dialog.glade.h:1
-msgid "<b>Attribute</b>"
-msgstr "<b>Atributo</b>"
-
-#: ../ui/search-dialog.glade.h:2
-msgid "<b>Found</b>"
-msgstr "<b>Encontrado</b>"
-
-#: ../ui/search-dialog.glade.h:3
-msgid "<b>List Name</b>"
-msgstr "<b>Nome da Lista</b>"
-
-#: ../ui/search-dialog.glade.h:4
-msgid "<b>Module Lists</b>"
-msgstr "<b>Lista de Módulos</b>"
-
-#: ../ui/search-dialog.glade.h:5
-msgid "<b>Modules</b>"
-msgstr "<b>Módulos</b>"
-
-#: ../ui/search-dialog.glade.h:6
-msgid "<b>Options</b>"
-msgstr "<b>Opções</b>"
-
-#: ../ui/search-dialog.glade.h:7
-msgid "<b>Preview</b>"
-msgstr "<b>Previsão</b>"
-
-#: ../ui/search-dialog.glade.h:8
-msgid "<b>Range Definition</b>"
-msgstr "<b>Definição de Extensão</b>"
-
-#: ../ui/search-dialog.glade.h:9
-msgid "<b>Range Name</b>"
-msgstr "<b>Nome de Extensão</b>"
-
-#: ../ui/search-dialog.glade.h:10
-msgid "<b>Ranges</b>"
-msgstr "<b>Extensões</b>"
-
-#: ../ui/search-dialog.glade.h:11
-msgid "<b>Results Display Options</b>"
-msgstr "<b>Opções para mostrar resultados</b>"
-
-#: ../ui/search-dialog.glade.h:12
-msgid "<b>Scope</b>"
-msgstr "<b>Âmbito</b>"
-
-#: ../ui/search-dialog.glade.h:13
-msgid "<b>Search Results</b>"
-msgstr "<b>Resultados de Pesquisa</b>"
-
-#: ../ui/search-dialog.glade.h:14
-msgid "<b>Search Type</b>"
-msgstr "<b>Tipo de Pesquisa</b>"
-
-#: ../ui/search-dialog.glade.h:15
-msgid "Add Modules"
-msgstr "Adicionar Módulos"
-
-#: ../ui/search-dialog.glade.h:16
-msgid "Advanced Search"
-msgstr "Pesquisa Avançada"
-
-#: ../ui/search-dialog.glade.h:17
-msgid "Attribute Search"
-msgstr "Pesquisa de Atributos"
-
-#: ../ui/search-dialog.glade.h:18
-msgid "Attributes"
-msgstr "Atributos"
-
-#: ../ui/search-dialog.glade.h:19
-msgid "Attributes radiobutton"
-msgstr "Botão de rádio de Atributos"
-
-#: ../ui/search-dialog.glade.h:20
-msgid "Clear Custom Module List Button"
-msgstr "Botão para Limpar Listas de Módulos personalizadas"
-
-#: ../ui/search-dialog.glade.h:21
-msgid "Clear Modules from List Button"
-msgstr "Botão para limpar módulos da lista"
-
-#: ../ui/search-dialog.glade.h:22
-msgid "Clear all modules from the list"
-msgstr "Limpar todos os módulos da lista"
-
-#: ../ui/search-dialog.glade.h:23
-msgid "Clear lists for new search"
-msgstr "Limpar listas para nova busca"
-
-#: ../ui/search-dialog.glade.h:24
-msgid "Create a new module list"
-msgstr "Criar uma nova lista de módulos"
-
-#: ../ui/search-dialog.glade.h:25
-msgid "Create new custom range"
-msgstr "Criar nova extensão personalizada"
-
-#: ../ui/search-dialog.glade.h:26
-msgid "Current results"
-msgstr "Resultados correntes"
-
-#: ../ui/search-dialog.glade.h:27
-msgid "Current results radiobutton"
-msgstr "Rádio Resultados correntes"
-
-#: ../ui/search-dialog.glade.h:28
-msgid "Custom Module List Combo"
-msgstr "Combo Listas de módulos personalizadas"
-
-#: ../ui/search-dialog.glade.h:29
-msgid "Custom Module List Name Entry"
-msgstr "Entrada Listas de módulos personalizadas"
-
-#: ../ui/search-dialog.glade.h:30
-msgid "Custom Module Lists"
-msgstr "Listas de Módulos personalizadas"
-
-#: ../ui/search-dialog.glade.h:31
-msgid "Custom Range Preview"
-msgstr "Previsão de extensão personalizadas"
-
-#: ../ui/search-dialog.glade.h:32
-msgid "Custom Range Selector Combo"
-msgstr "Combo de Selector de Extensão personalizada"
-
-#: ../ui/search-dialog.glade.h:33
-msgid "Custom Verse Ranges"
-msgstr "Extensões de Versículos personalizadas"
-
-#: ../ui/search-dialog.glade.h:34
-msgid "Custom module list"
-msgstr "Lista de módulos personalizada"
-
-#: ../ui/search-dialog.glade.h:35
-msgid "Custom module list radiobutton"
-msgstr "Rádio Lista de módulos personalizada"
-
-#: ../ui/search-dialog.glade.h:36
-msgid "Custom verse range"
-msgstr "Extensão de versículos personalizada"
-
-#: ../ui/search-dialog.glade.h:37
-msgid "Custom verse range radiobutton"
-msgstr "Rádio Extensão de versículos personalizada"
-
-#: ../ui/search-dialog.glade.h:38
-msgid "Delete Range Button"
-msgstr "Botão Apagar Extensão"
-
-#: ../ui/search-dialog.glade.h:39
-msgid "Delete Selected Module From List Button"
-msgstr "Botão Remover o módulo seleccionado da lista"
-
-#: ../ui/search-dialog.glade.h:40
-msgid "Delete selected range"
-msgstr "Apagar extensão seleccionada"
-
-#: ../ui/search-dialog.glade.h:41
-msgid "Delete the selected list"
-msgstr "Apagar a lista seleccionada"
-
-#: ../ui/search-dialog.glade.h:42
-msgid "Entire module"
-msgstr "Módulo Inteiro"
-
-#: ../ui/search-dialog.glade.h:43
-msgid "Entire module radiobutton"
-msgstr "Rádio Módulo Inteiro"
-
-#: ../ui/search-dialog.glade.h:45
-msgid "Exact phrase radiobutton"
-msgstr "Rádio Frase exacta"
-
-#: ../ui/search-dialog.glade.h:46
-msgid ""
-"Fast, featureful, index-based search\n"
-"Indexes must have been built beforehand:\n"
-"See Module Manager's maintenance functions"
-msgstr ""
-"Pesquisa rápida, funcional, baseada em índices\n"
-"Os índices devem ser criados a priori:\n"
-"Veja as funções de manutenção do Gestor de Módulos"
-
-#: ../ui/search-dialog.glade.h:49
-msgid "Find Button"
-msgstr "Botão Procurar"
-
-#: ../ui/search-dialog.glade.h:51
-msgid "Footnotes radiobutton"
-msgstr "Rádio Notas de rodapé"
-
-#: ../ui/search-dialog.glade.h:52
-msgid "In modules that have Footnotes"
-msgstr "Em módulos com Notas de Rodapé"
-
-#: ../ui/search-dialog.glade.h:53
-msgid "In modules that have Morphological Tags"
-msgstr "Em módulos com etiquetas morfológicas"
-
-#: ../ui/search-dialog.glade.h:54
-msgid "In modules that have Strong's Numbers"
-msgstr "Em módulos com números de Strong"
-
-#: ../ui/search-dialog.glade.h:55
-msgid "Main Search Entry"
-msgstr "Entrada de Pesquisa Principal"
-
-#: ../ui/search-dialog.glade.h:56
-msgid "Make selections on the Attribute Search tab"
-msgstr "Fazer selecções na Pesquisa de Atributos"
-
-#: ../ui/search-dialog.glade.h:58
-msgid "Match case checkbox"
-msgstr "Visto Combinar capitalização"
-
-#: ../ui/search-dialog.glade.h:59
-msgid "Module Selection"
-msgstr "Selecção de Módulo"
-
-#: ../ui/search-dialog.glade.h:60
-msgid "Module list"
-msgstr "Lista de Módulos"
-
-#: ../ui/search-dialog.glade.h:61
-msgid "Module list radiobutton"
-msgstr "Rádio Lista de Módulos"
-
-#: ../ui/search-dialog.glade.h:63
-msgid "Morphological Tags radiobutton"
-msgstr "Rádio Etiquetas morfológicas"
-
-#: ../ui/search-dialog.glade.h:65
-msgid "Multi word radiobutton"
-msgstr "Rádio Palavra múltipla"
-
-#: ../ui/search-dialog.glade.h:66
-msgid "New Custom Module List Button"
-msgstr "Botão Listas de Módulos personalizadas"
-
-#: ../ui/search-dialog.glade.h:67
-msgid "New Range Button"
-msgstr "Botão de Nova Extensão"
-
-#: ../ui/search-dialog.glade.h:68
-msgid "Open Selection Dialog Button"
-msgstr "Botão Abrir Selecção"
-
-#: ../ui/search-dialog.glade.h:69
-msgid "Open a dialog to select modules to add to the list"
-msgstr "Abrir um diálogo para seleccionar módulos a adicionar à lista"
-
-#: ../ui/search-dialog.glade.h:70
-msgid "Optimized (\"Lucene\")"
-msgstr "Optimizada (\"Lucene\")"
-
-#: ../ui/search-dialog.glade.h:71
-msgid "Optimized (\"Lucene\") radiobutton"
-msgstr "Rádio Optimizada (\"Lucene\")"
-
-#: ../ui/search-dialog.glade.h:72
-msgid "Range Definition Entry"
-msgstr "Entrada de Definição de Extensão"
-
-#: ../ui/search-dialog.glade.h:73
-msgid "Range Name Entry"
-msgstr "Entrada de Nome de Extensão"
-
-#: ../ui/search-dialog.glade.h:75
-msgid "Regular expression radiobutton"
-msgstr "Rádio Expressão Regular"
-
-#: ../ui/search-dialog.glade.h:76
-msgid "Remove the selected module from the list"
-msgstr "Remover o módulo seleccionado da lista"
-
-#: ../ui/search-dialog.glade.h:77
-msgid "Result Summary Table"
-msgstr "Tabela de Sumário de Resultados"
-
-#: ../ui/search-dialog.glade.h:78
-msgid "Result Summary Window"
-msgstr "Janela de Sumário de Resultados"
-
-#: ../ui/search-dialog.glade.h:79
-msgid "Results"
-msgstr "Resultados"
-
-#: ../ui/search-dialog.glade.h:80
-msgid "Save Custom Module List Button"
-msgstr "Botão Guardar Listas de Módulos personalizadas"
-
-#: ../ui/search-dialog.glade.h:81
-msgid "Save Range Button"
-msgstr "Botão de Guardar Extensão"
-
-#: ../ui/search-dialog.glade.h:82
-msgid "Save custom range"
-msgstr "Guardar extensão personalizada"
-
-#: ../ui/search-dialog.glade.h:83
-msgid "Save search results as bookmarks"
-msgstr "Guardar resultados da pesquisa como marcas"
-
-#: ../ui/search-dialog.glade.h:84
-msgid "Save the module list"
-msgstr "Guardar a lista de módulos"
-
-#: ../ui/search-dialog.glade.h:85
-msgid "Search  Criteria"
-msgstr "Critério de Pesquisa"
-
-#: ../ui/search-dialog.glade.h:86
-msgid "Search Criteria Treeview"
-msgstr "Vista de Critério de Pesquisa"
-
-#: ../ui/search-dialog.glade.h:87
-msgid "Search entire module"
-msgstr "Pesquisar módulo inteiro"
-
-#: ../ui/search-dialog.glade.h:88
-msgid "Search for Morphological tags"
-msgstr "Pesquisar etiquetas morfológicas"
-
-#: ../ui/search-dialog.glade.h:89
-msgid "Search for Strongs Numbers like G4442 or H1121"
-msgstr "Pesquisar Números de Strong como G4442 ou H1121"
-
-#: ../ui/search-dialog.glade.h:90
-msgid "Search in footnotes"
-msgstr "Pesquisar em notas de rodapé"
-
-#: ../ui/search-dialog.glade.h:91
-msgid "Show Footnotes"
-msgstr "Mostrar Notas de Rodapé"
-
-#: ../ui/search-dialog.glade.h:92
-msgid "Show Footnotes checkbox"
-msgstr "Visto Mostrar Notas de Rodapé"
-
-#: ../ui/search-dialog.glade.h:93
-msgid "Show Morphological Tags"
-msgstr "Mostrar Etiquetas Morfológicas"
-
-#: ../ui/search-dialog.glade.h:94
-msgid "Show Morphological Tags checkbox"
-msgstr "Visto Mostrar Etiquetas Morfológicas"
-
-#: ../ui/search-dialog.glade.h:95
-msgid "Show Strong's Numbers"
-msgstr "Mostrar Números Strong"
-
-#: ../ui/search-dialog.glade.h:96
-msgid "Show Strong's Numbers checkbox"
-msgstr "Visto Mostrar Números Strong"
-
-#: ../ui/search-dialog.glade.h:97
-msgid "Show in main window"
-msgstr "Mostrar na janela principal"
-
-#: ../ui/search-dialog.glade.h:98
-msgid "Single module"
-msgstr "Módulo singular"
-
-#: ../ui/search-dialog.glade.h:99
-msgid "Single module radiobutton"
-msgstr "Rádio Módulo singular"
-
-#: ../ui/search-dialog.glade.h:100
-msgid "Start/stop searching"
-msgstr "Iniciar/parar busca"
-
-#: ../ui/search-dialog.glade.h:101
-msgid "Strongs Numbers"
-msgstr "Números de Strong"
-
-#: ../ui/search-dialog.glade.h:102
-msgid "Strongs Numbers radiobutton"
-msgstr "Rádio Números de Strong"
-
-#: ../ui/search-dialog.glade.h:103
-msgid "Use a custom module list for the search"
-msgstr "Usar uma lista personalizada de módulos para a pesquisa"
-
-#: ../ui/search-dialog.glade.h:104
-msgid "Use a custom range for the scope of the search"
-msgstr "Usar uma extensão personalizada no âmbito da pesquisa"
-
-#: ../ui/search-dialog.glade.h:105
-msgid "Use a single module for the search"
-msgstr "Usar um único módulo para a pesquisa"
-
-#: ../ui/search-dialog.glade.h:106
-msgid "Use the current module list for the search"
-msgstr "Usar a lista actual de módulos na pesquisa"
-
-#: ../ui/search-dialog.glade.h:107
-msgid "Use the results of the last search as the scope of the search"
-msgstr "Usar os resultados da última pesquisa como âmbito da pesquisa"
-
-#: ../ui/search-dialog.glade.h:108
-msgid "e.g. Matt-John;Rev4"
-msgstr "ex. Mt-Jo;Ap4"
-
-#: ../ui/search-dialog.glade.h:109
-msgid "for "
-msgstr "para "
-
-#: ../ui/xi-menus.glade.h:2
-msgid "About _Translation"
-msgstr "Sobre a _tradução"
-
-#: ../ui/xi-menus.glade.h:3
-msgid "About _Xiphos"
-msgstr "Sobre _Xiphos"
-
-#: ../ui/xi-menus.glade.h:4
-msgid "Add new folder to selected folder"
-msgstr "Adicionar nova pasta à pasta seleccionada"
-
-#: ../ui/xi-menus.glade.h:6
-msgid "Allow Reordering"
-msgstr "Permitir Reordenação"
-
-#: ../ui/xi-menus.glade.h:7
-msgid "Allow items to be moved from one folder to another"
-msgstr "Permitir mover itens de uma pasta para outra"
-
-#: ../ui/xi-menus.glade.h:8
-msgid "Annotate Verse"
-msgstr "Anotar Versículo"
-
-#: ../ui/xi-menus.glade.h:10
-msgid "Browse in BibleMap.org"
-msgstr "Explorar em BibleMap.org"
-
-#: ../ui/xi-menus.glade.h:11
-msgid "Collapse All"
-msgstr "Colapsar Tudo"
-
-#: ../ui/xi-menus.glade.h:12
-msgid "Collapse all Bookmarks groups"
-msgstr "Colapsar todos os grupos de Marcas"
-
-#: ../ui/xi-menus.glade.h:13
-msgid "Commentary by Chapter"
-msgstr "Comentário por capítulo"
-
-#: ../ui/xi-menus.glade.h:15
-msgid "D_ouble-Space Text"
-msgstr "Texto em Espaço D_uplo"
-
-#: ../ui/xi-menus.glade.h:16
-msgid "Delete Item"
-msgstr "Apagar Item"
-
-#: ../ui/xi-menus.glade.h:17
-msgid "Delete item"
-msgstr "Apagar item"
-
-#: ../ui/xi-menus.glade.h:18
-msgid "Dictionar_y"
-msgstr "Dicionár_io"
-
-#: ../ui/xi-menus.glade.h:19
-msgid "Display Book Heading"
-msgstr "Mostrar Cabeçalho de Livro"
-
-#: ../ui/xi-menus.glade.h:20
-msgid "Display Chapter Heading"
-msgstr "Mostrar Caebeçalho de Capítulo"
-
-#: ../ui/xi-menus.glade.h:21
-msgid "Dump Pers.Comm."
-msgstr "Descarregar Comentário Pessoal"
-
-#: ../ui/xi-menus.glade.h:23
-msgid "Edit bookmark item"
-msgstr "Editar item de marca"
-
-#: ../ui/xi-menus.glade.h:24
-msgid "Expand All"
-msgstr "Expandir Tudo"
-
-#: ../ui/xi-menus.glade.h:25
-msgid "Expand all Bookmarks groups"
-msgstr "Expandir todos os grupos de Marcas"
-
-#: ../ui/xi-menus.glade.h:32
-msgid "Image Content"
-msgstr "Conteúdo da Imagem"
-
-#: ../ui/xi-menus.glade.h:33
-msgid "Import Bibletime Bookmarks"
-msgstr "Importar Marcas Bibletime"
-
-#: ../ui/xi-menus.glade.h:34
-msgid "Insert Bookmark"
-msgstr "Inserir Marca"
-
-#: ../ui/xi-menus.glade.h:35
-msgid "Insert new bookmark here"
-msgstr "Inserir nova marca aqui"
-
-#: ../ui/xi-menus.glade.h:36
-msgid "L_ink Tabs"
-msgstr "L_igar Abas"
-
-#: ../ui/xi-menus.glade.h:38
-msgid "Load Bookmarks from Bibletime"
-msgstr "Carregar Marcas de Bibletime"
-
-#: ../ui/xi-menus.glade.h:39
-msgid "Lookup Selection"
-msgstr "Selecção de Procura"
-
-#: ../ui/xi-menus.glade.h:43
-msgid "Note"
-msgstr "Nota"
-
-#: ../ui/xi-menus.glade.h:44
-msgid "Open Module"
-msgstr "Abrir Módulo"
-
-#: ../ui/xi-menus.glade.h:45
-msgid "Open Study_pad"
-msgstr "Abrir Study_Pad"
-
-#: ../ui/xi-menus.glade.h:46
-msgid "Open in a dialog"
-msgstr "Abrir num diálogo"
-
-#: ../ui/xi-menus.glade.h:48
-msgid "Open in new tab"
-msgstr "Abrir numa nova aba"
-
-#: ../ui/xi-menus.glade.h:49
-msgid "Open this bookmark in a dialog"
-msgstr "Abrir esta marca num diálogo"
-
-#: ../ui/xi-menus.glade.h:50
-msgid "Open this bookmark in a new tab"
-msgstr "Abrir esta marca numa nova aba"
-
-#: ../ui/xi-menus.glade.h:52
-msgid "Read Selection Aloud"
-msgstr "Ler Selecção em voz alta"
-
-#: ../ui/xi-menus.glade.h:53
-msgid "Remove - Restore"
-msgstr "Remover - Restaurar"
-
-#: ../ui/xi-menus.glade.h:54
-msgid "Remove Folder"
-msgstr "Remover Pasta"
-
-#: ../ui/xi-menus.glade.h:55
-msgid "Remove folder and save it"
-msgstr "Remover pasta e guardá-la"
-
-#: ../ui/xi-menus.glade.h:56
-msgid "Rename Pers.Comm."
-msgstr "Renomear Comentário Pessoal"
-
-#: ../ui/xi-menus.glade.h:57
-msgid "Respect Font Faces"
-msgstr "Respeitar fontes"
-
-#: ../ui/xi-menus.glade.h:58
-msgid "Restore Folder"
-msgstr "Restaurar Pasta"
-
-#: ../ui/xi-menus.glade.h:59
-msgid "Restore saved folder"
-msgstr "Restaurar pasta guardada"
-
-#: ../ui/xi-menus.glade.h:60
-msgid "Save list as a series of bookmarks"
-msgstr "Guardar lista como uma série de marcas"
-
-#: ../ui/xi-menus.glade.h:61
-msgid "Save list as a single bookmark"
-msgstr "Guardar lista como uma única marca"
-
-#: ../ui/xi-menus.glade.h:62
-msgid "Save these results as a series of bookmarks in their own folder"
-msgstr "Guardar estes resultados como uma série de marcas na sua pasta"
-
-#: ../ui/xi-menus.glade.h:63
-msgid "Save these results as a single bookmark"
-msgstr "Guardar estes resultados como uma única marca"
-
-#: ../ui/xi-menus.glade.h:64
-msgid "Scripture Cross-references"
-msgstr "Referências Cruzadas da Escritura"
-
-#: ../ui/xi-menus.glade.h:66
-msgid "Show Parallel View in a _Tab"
-msgstr "Mostrar Vista Paralela numa _Aba"
-
-#: ../ui/xi-menus.glade.h:67
-msgid "Show Previe_wer in the Sidebar"
-msgstr "Mostrar Pre_visualizador na Barra Lateral"
-
-#: ../ui/xi-menus.glade.h:68
-msgid "Show Verse _Numbers"
-msgstr "Mostrar _Números de Versículos"
-
-#: ../ui/xi-menus.glade.h:71
-msgid "Unlock This Module"
-msgstr "Desbloquear este Módulo"
-
-#: ../ui/xi-menus.glade.h:72
-msgid "Use Current Dictionary"
-msgstr "Usar Dicionário corrente"
-
-#: ../ui/xi-menus.glade.h:73
-msgid "Use module manager to install and remove Sword modules"
-msgstr "Utilizar o gestor de módulos para instalar e remover módulos Sword"
-
-#: ../ui/xi-menus.glade.h:74
-msgid "Variants"
-msgstr "Variantes"
-
-#: ../ui/xi-menus.glade.h:76
-msgid "_About The SWORD Project"
-msgstr "_Sobre O Projecto SWORD"
-
-#: ../ui/xi-menus.glade.h:77
-msgid "_Advanced Search"
-msgstr "Pesquisa _Avançada"
-
-#: ../ui/xi-menus.glade.h:78
-msgid "_Attach/Detach Sidebar"
-msgstr "_Anexar/Desanexar Barra Lateral"
-
-#: ../ui/xi-menus.glade.h:79
-msgid "_Bible"
-msgstr "_Bíblia"
-
-#: ../ui/xi-menus.glade.h:80
-msgid "_Commentary/Book"
-msgstr "_Comentário/Livro"
-
-#: ../ui/xi-menus.glade.h:81
-msgid "_Contents"
-msgstr "_Conteúdo"
-
-#: ../ui/xi-menus.glade.h:82
-msgid "_Daily Devotion"
-msgstr "_Devocional Diário"
-
-#: ../ui/xi-menus.glade.h:83
-msgid "_Edit"
-msgstr "_Editar"
-
-#: ../ui/xi-menus.glade.h:84
-msgid "_Edit Item"
-msgstr "_Editar Item"
-
-#: ../ui/xi-menus.glade.h:86
-msgid "_Help"
-msgstr "A_juda"
-
-#: ../ui/xi-menus.glade.h:87
-msgid "_Highlight Current Verse"
-msgstr "_Assinalar Versículo Corrente"
-
-#: ../ui/xi-menus.glade.h:88
-msgid "_Live Chat"
-msgstr "_Chat ao vivo"
-
-#: ../ui/xi-menus.glade.h:89
-msgid "_Mailing List"
-msgstr "Lista de _mail"
-
-#: ../ui/xi-menus.glade.h:90
-msgid "_Module Manager"
-msgstr "Gestor de _Módulos"
-
-#: ../ui/xi-menus.glade.h:91
-msgid "_Open Session"
-msgstr "_Abrir Sessão"
-
-#: ../ui/xi-menus.glade.h:92
-msgid "_Preferences"
-msgstr "_Preferências"
-
-#: ../ui/xi-menus.glade.h:93
-msgid "_Preview"
-msgstr "P_revisão"
-
-#: ../ui/xi-menus.glade.h:94
-msgid "_Read Aloud"
-msgstr "L_er em voz alta"
-
-#: ../ui/xi-menus.glade.h:95
-msgid "_Report Bug"
-msgstr "_Relatar erro"
-
-#: ../ui/xi-menus.glade.h:96
-msgid "_Save Session"
-msgstr "Guardar _Sessão"
-
-#: ../ui/xi-menus.glade.h:97
-msgid "_Search"
-msgstr "_Pesquisar"
-
-#: ../ui/xi-menus.glade.h:98
-msgid "_Show/Hide Sidebar"
-msgstr "Mo_strar/Ocultar Barra Lateral"
-
-#: ../ui/xi-menus.glade.h:99
-msgid "_Verse Per Line"
-msgstr "_Versículo por linha"
-
-#: ../xiphos.desktop.in.in.h:1
-msgid "Study the Bible"
-msgstr "Estudar a Bíblia"
-
-#: ../xiphos.desktop.in.in.h:2
-msgid "Xiphos Bible Guide"
-msgstr "Guia Bíblico Xiphos"
-
-#~ msgid "Move backwards through history"
-#~ msgstr "Percorrer o histórico para trás"
-
-#~ msgid "Move foward through history"
-#~ msgstr "Percorrer o histórico para a frente"
-
-#~ msgid "Select a Book of the Bible"
-#~ msgstr "Escolher um Livro da Bíblia"
-
-#~ msgid "Change Chapter"
-#~ msgstr "Alterar Capítulo"
-
-#~ msgid "Enter a Verse reference in Book 1:1 format and press Return"
-#~ msgstr ""
-#~ "Introduza uma referência de versículo no formato Livro 1:1 e pressione "
-#~ "Return"
-
-#~ msgid "Dictionary/_Lexicon"
-#~ msgstr "Dicionário/_Léxico"
-
-#~ msgid "_Bible Text"
-#~ msgstr "Texto _Bíblico"
-
-#~ msgid "Open StudyPad File"
-#~ msgstr "Abrir Ficheiro StudyPad"
-
-#~ msgid "Save StudyPad File"
-#~ msgstr "Guardar Ficheiro StudyPad"
-
-#~ msgid "item1"
-#~ msgstr "item1"
-
-#~ msgid "item2"
-#~ msgstr "item2"
-
-#~ msgid "_Module Options"
-#~ msgstr "Opções de _Módulo"
-
-#~ msgid "Sync with main"
-#~ msgstr "Sincronizar com principal"
-
-#~ msgid "Stay in sync"
-#~ msgstr "Manter sincronizado"
-
-#~ msgid "Print"
-#~ msgstr "Imprimir"
-
-#~ msgid "Print Preview"
-#~ msgstr "Prever Impressão"
-
-#~ msgid "Failed to print the document"
-#~ msgstr "Falhou a impressão do documento"
-
-#~ msgid "Save List"
-#~ msgstr "Guardar Lista"
-
-#~ msgid "_Modules"
-#~ msgstr "_Módulos"
-
-#~ msgid "_Bookmarks"
-#~ msgstr "Ma_rcas"
-
-#~ msgid "Verse _List"
-#~ msgstr "_Lista de Versículos"
-
-#~ msgid "%s not found"
-#~ msgstr "%s não encontrado"
-
-#~ msgid "has been modified. Do you wish to save it?"
-#~ msgstr "foi modificado. Pretende guardar a alteração?"
-
-#~ msgid "not loaded"
-#~ msgstr "não carregado"
-
-#~ msgid "Open the StudyPad editor"
-#~ msgstr "Abrir o editor StudyPad"
-
-#~ msgid "Open a saved session"
-#~ msgstr "Abrir uma sessão guardada"
-
-#~ msgid "Save the current session to a file"
-#~ msgstr "Guardar a sessão corrente num ficheiro"
-
-#~ msgid "_Copy"
-#~ msgstr "_Copiar"
-
-#~ msgid "Copy highlighted text from main window"
-#~ msgstr "Copiar texto assinalado na janela principal"
-
-#~ msgid "Search using the shortcut bar"
-#~ msgstr "Pesquisar com a barra de atalhos"
-
-#~ msgid "Advanced search using the search dialog"
-#~ msgstr "Pesquisa avançada usando o diálogo de pesquisa"
-
-#~ msgid "Set user preferences"
-#~ msgstr "Definir preferências do utilizador"
-
-#~ msgid "C_lear"
-#~ msgstr "_Limpar"
-
-#~ msgid "Clear history list"
-#~ msgstr "Limpar lista de histórico"
-
-#~ msgid "Show the Daily Devotion for today"
-#~ msgstr "Mostrar o Devocional Diário para hoje"
-
-#~ msgid "Show or hide Bible texts window"
-#~ msgstr "Mostrar ou ocultar janela de textos bíblicos"
-
-#~ msgid "Show or hide Preview window"
-#~ msgstr "Mostrar ou ocultar janela de Previsão"
-
-#~ msgid "Show or hide commentaries"
-#~ msgstr "Mostrar ou ocultar comentários"
-
-#~ msgid "Show or hide - dictionaries and lexicons"
-#~ msgstr "Mostrar ou ocultar - dicionários e léxicos"
-
-#~ msgid "Open the Xiphos manual"
-#~ msgstr "Abrir o manual Xiphos"
-
-#~ msgid "Sign up for the users' mailing list"
-#~ msgstr "Inscrição na lista de utilizadores"
-
-#~ msgid "Chat with other users and developers"
-#~ msgstr "Conversar no IRC com outros utilizadores e programadores"
-
-#~ msgid "Report bug to SourceForge"
-#~ msgstr "Relatar erro para SourceForge"
-
-#~ msgid "Translating Xiphos to other languages"
-#~ msgstr "Traduzir Xiphos para outras línguas"
-
-#~ msgid "More information about the SWORD Project"
-#~ msgstr "Mais informação sobre o Projecto SWORD"
-
-#~ msgid "About this application"
-#~ msgstr "Sobre esta aplicação"
-
-#~ msgid "Hi_story"
-#~ msgstr "_Histórico"
-
-#~ msgid "1 Cor 15:1"
-#~ msgstr "1 Cor 15:1"
-
-#~ msgid "Name for new prayer list"
-#~ msgstr "Nome para a nova lista de oração"
-
-#~ msgid "can not create path\n"
-#~ msgstr "não pode criar caminho\n"
-
-#~ msgid "Prayer list already exist\n"
-#~ msgstr "A lista de oração já existe\n"
-
-#~ msgid "\\par\\par My prayer list \\par\\par Module created in Xiphos"
-#~ msgstr ""
-#~ "\\par\\par Minha lista de oração \\par\\par Módulo criado por Xiphos."
-
-#~ msgid "Delete Index"
-#~ msgstr "Apagar Índice"
-
-#~ msgid "+5"
-#~ msgstr "+5"
-
-#~ msgid "+4"
-#~ msgstr "+4"
-
-#~ msgid "+3"
-#~ msgstr "+3"
-
-#~ msgid "+2"
-#~ msgstr "+2"
-
-#~ msgid "+1"
-#~ msgstr "+1"
-
-#~ msgid "-1"
-#~ msgstr "-1"
-
-#~ msgid "-2"
-#~ msgstr "-2"
-
-#~ msgid "-3"
-#~ msgstr "-3"
-
-#~ msgid "Starting"
-#~ msgstr "Começando"
-
-#~ msgid "Building Xiphos interface"
-#~ msgstr "Construindo a interface Xiphos"
-
-#~ msgid "Initiating Xiphos"
-#~ msgstr "Iniciando Xiphos"
-
-#~ msgid "done"
-#~ msgstr "feito"
-
-#~ msgid "Xiphos is shutdown"
-#~ msgstr "Xiphos está fechado"
-
-#~ msgid "Initiating SWORD"
-#~ msgstr "Iniciando SWORD"
-
-#~ msgid "path to sword"
-#~ msgstr "caminho para sword"
-
-#~ msgid "System locale is"
-#~ msgstr "O locale do sistema é"
-
-#~ msgid "SWORD locale is"
-#~ msgstr "O locale SWORD é"
-
-#~ msgid "Checking for SWORD Modules"
-#~ msgstr "Procurando Módulos SWORD"
-
-#~ msgid "SWORD is shutdown"
-#~ msgstr "SWORD está fechado"
-
-#~ msgid "Number of Text modules"
-#~ msgstr "Número de módulos de Texto"
-
-#~ msgid "Number of Commentary modules"
-#~ msgstr "Número de módulos de Comentário"
-
-#~ msgid "Number of Dict/lex modules"
-#~ msgstr "Número de módulos Dicionário/Léxico"
-
-#~ msgid "Number of Book modules"
-#~ msgstr "Número de módulos Livro"
-
-#~ msgid "Number of Percomm modules"
-#~ msgstr "Números de módulos Percomm"
-
-#~ msgid "Number of Devotion modules"
-#~ msgstr "Número de módulos Devocional"
-
-#~ msgid "Number of Prayer modules"
-#~ msgstr "Número de módulos Oração"
-
-#~ msgid ""
-#~ "\n"
-#~ "First Run: need to create settings!\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Primeira vez: é necessário criar definições!\n"
-
-#~ msgid "can not create  .sword"
-#~ msgstr "não pode criar .sword"
-
-#~ msgid "can not create  .sword/mods.d"
-#~ msgstr "não pode criar .sword/mods.d"
-
-#~ msgid "can not create  .sword/modules"
-#~ msgstr "não pode criar .sword/modules"
-
-#~ msgid "Select Local Source"
-#~ msgstr "Seleccione fonte local"
-
-#~ msgid "Select the modules you want"
-#~ msgstr "Seleccione os módulos que pretende"
-
-#~ msgid "<b>Font Miscellaneous</b>"
-#~ msgstr "<b>Miscelâneo de fonte</b>"
-
-#~ msgid "Bible text"
-#~ msgstr "Texto da Bíblia"
-
-#~ msgid "It will be lost permanently!"
-#~ msgstr "Vai ser permanentemente perdido!"
-
-#~ msgid "Open file..."
-#~ msgstr "Abrir ficheiro..."
-
-#~ msgid "Save file as..."
-#~ msgstr "Guardar ficheiro como..."
-
-#~ msgid "Open in dialog"
-#~ msgstr "Abrir num diálogo"
-
-#~ msgid ""
-#~ "For multi-word search, use\n"
-#~ "+FirstWord +SecondWord"
-#~ msgstr ""
-#~ "Para busca multi-palavras, use \n"
-#~ "+PrimeiraPalavra +SegundaPalavra"
-
-#~ msgid "_Verse Style"
-#~ msgstr "Estilo de _Versículo"
-
-#~ msgid "_About the SWORD Project ..."
-#~ msgstr "_Sobre o Projecto SWORD ..."
-
-#~ msgid ""
-#~ "There is currently no program set as your\n"
-#~ "handler for \"sword://\" and similar URLs.\n"
-#~ "Would you like Xiphos to install itself\n"
-#~ "as the program to handle these URLs?"
-#~ msgstr ""
-#~ "Não existe actualmente nenhum programa \n"
-#~ "definido para lidar com URLs \"sword://\" e similares. \n"
-#~ "Gostaria que Xiphos se instalasse como o programa \n"
-#~ "para lidar com tais URLs?"
-
-#~ msgid "Afrikaans"
-#~ msgstr "Afrikaans"
-
-#~ msgid "English, Old (ca.450-1100)"
-#~ msgstr "Inglês, Antigo (ca.450-1100)"
-
-#~ msgid "Arabic"
-#~ msgstr "Árabe"
-
-#~ msgid "Azerbaijani"
-#~ msgstr "Azerbaijano"
-
-#~ msgid "Belarusian"
-#~ msgstr "Bielorusso"
-
-#~ msgid "Bulgarian"
-#~ msgstr "Búlgaro"
-
-#~ msgid "Breton"
-#~ msgstr "Bretão"
-
-#~ msgid "Bosnian"
-#~ msgstr "Bósnio"
-
-#~ msgid "Catalan"
-#~ msgstr "Catalão"
-
-#~ msgid "Cebuano"
-#~ msgstr "Cebuano"
-
-#~ msgid "Coptic"
-#~ msgstr "Copta"
-
-#~ msgid "Czech"
-#~ msgstr "Checo"
-
-#~ msgid "Welsh"
-#~ msgstr "Galês"
-
-#~ msgid "Danish"
-#~ msgstr "Dinamarquês"
-
-#~ msgid "German"
-#~ msgstr "Alemão"
-
-#~ msgid "Greek, Modern (1453-)"
-#~ msgstr "Grego, Moderno (1453-)"
-
-#~ msgid "English"
-#~ msgstr "Inglês"
-
-#~ msgid "American English"
-#~ msgstr "Inglês Americano"
-
-#~ msgid "English, Middle (1100-1500)"
-#~ msgstr "Inglês, Idade Média (1100-1500)"
-
-#~ msgid "Esperanto"
-#~ msgstr "Esperanto"
-
-#~ msgid "Spanish"
-#~ msgstr "Espanhol"
-
-#~ msgid "Estonian"
-#~ msgstr "Estónio"
-
-#~ msgid "Basque"
-#~ msgstr "Basco"
-
-#~ msgid "Finnish"
-#~ msgstr "Finlandês"
-
-#~ msgid "French"
-#~ msgstr "Francês"
-
-#~ msgid "Frisian"
-#~ msgstr "Frisiano"
-
-#~ msgid "Irish"
-#~ msgstr "Irlandês"
-
-#~ msgid "Gaelic (Scots)"
-#~ msgstr "Gaélico (Escócia)"
-
-#~ msgid "Greek, Ancient (to 1453)"
-#~ msgstr "Grego, Antigo (até 1453)"
-
-#~ msgid "Hebrew"
-#~ msgstr "Hebraico"
-
-#~ msgid "Hawaiian"
-#~ msgstr "Havaiano"
-
-#~ msgid "Croatian"
-#~ msgstr "Croata"
-
-#~ msgid "Hungarian"
-#~ msgstr "Húngaro"
-
-#~ msgid "Armenian"
-#~ msgstr "Arménio"
-
-#~ msgid "Klingon"
-#~ msgstr "Klingon"
-
-#~ msgid "Indonesian"
-#~ msgstr "Indonésio"
-
-#~ msgid "Icelandic"
-#~ msgstr "Islandês"
-
-#~ msgid "Italian"
-#~ msgstr "Italiano"
-
-#~ msgid "Japanese"
-#~ msgstr "Japonês"
-
-#~ msgid "Georgian"
-#~ msgstr "Georgiano"
-
-#~ msgid "Korean"
-#~ msgstr "Coreano"
-
-#~ msgid "Kurdish"
-#~ msgstr "Curdo"
-
-#~ msgid "Latin"
-#~ msgstr "Latino"
-
-#~ msgid "Lithuanian"
-#~ msgstr "Lituano"
-
-#~ msgid "Latvian"
-#~ msgstr "Letão"
-
-#~ msgid "Maori"
-#~ msgstr "Maori"
-
-#~ msgid "Macedonian"
-#~ msgstr "Macedónio"
-
-#~ msgid "Maltese"
-#~ msgstr "Maltês"
-
-#~ msgid "Dutch"
-#~ msgstr "Holandês"
-
-#~ msgid "Norwegian"
-#~ msgstr "Norueguês"
-
-#~ msgid "Polish"
-#~ msgstr "Polaco"
-
-#~ msgid "Portuguese"
-#~ msgstr "Português"
-
-#~ msgid "Romanian"
-#~ msgstr "Romeno"
-
-#~ msgid "Russian"
-#~ msgstr "Russo"
-
-#~ msgid "Scots"
-#~ msgstr "Escocês"
-
-#~ msgid "Slovak"
-#~ msgstr "Eslovaco"
-
-#~ msgid "Slovenian"
-#~ msgstr "Esloveno"
-
-#~ msgid "Somali"
-#~ msgstr "Somali"
-
-#~ msgid "Albanian"
-#~ msgstr "Albanês"
-
-#~ msgid "Swedish"
-#~ msgstr "Sueco"
-
-#~ msgid "Swahili"
-#~ msgstr "Swahili"
-
-#~ msgid "Syriac"
-#~ msgstr "Siríaco"
-
-#~ msgid "Tamil"
-#~ msgstr "Tamil"
-
-#~ msgid "Thai"
-#~ msgstr "Tailandês"
-
-#~ msgid "Turkish"
-#~ msgstr "Turco"
-
-#~ msgid "Tahitian"
-#~ msgstr "Taitiano"
-
-#~ msgid "Ukrainian"
-#~ msgstr "Ucraniano"
-
-#~ msgid "Vietnamese"
-#~ msgstr "Vietnamita"
-
-#~ msgid "Bavarian"
-#~ msgstr "Bávaro"
-
-#~ msgid "Haitian Creole French"
-#~ msgstr "Francês Creoulo Haitiano"
-
-#~ msgid "Chinese"
-#~ msgstr "Chinês"
-
-#~ msgid "Zulu"
-#~ msgstr "Zulu"
-
-#~ msgid "found in"
-#~ msgstr "encontrado em"
-
-#~ msgid "The"
-#~ msgstr "O"
-
-#~ msgid "module is locked."
-#~ msgstr "módulo está bloqueado."
-
-#~ msgid "module has been unlocked."
-#~ msgstr "módulo foi desbloqueado."
-
-#~ msgid "If you have the cipher key you can"
-#~ msgstr "Se tem a chave cifrada pode"
-
-#~ msgid "click here"
-#~ msgstr "clique aqui"
-
-#~ msgid "to unlock the module"
-#~ msgstr "para desbloquear o módulo"
-
-#~ msgid "You will need to restart Xiphos after you unlock it."
-#~ msgstr "Vai precisar de reiniciar Xiphos depois de desbloqueá-lo."
-
-#~ msgid "You need to restart Xiphos to view it"
-#~ msgstr "Precisa de reiniciar Xiphos para vê-lo"
-
-#~ msgid ""
-#~ "Unlink of old configuration failed:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Desligação da configuração antiga falhou:\n"
-#~ "%s"
-
-#~ msgid "Show Tabs"
-#~ msgstr "Mostrar Abas"
-
-#~ msgid "Go to %s"
-#~ msgstr "Ir para %s"
-
-#~ msgid "Old"
-#~ msgstr "Velho"
-
-#~ msgid "New"
-#~ msgstr "Novo"
-
-#~ msgid "Go to parent"
-#~ msgstr "Ir para cima"
-
-#~ msgid "Go to first child"
-#~ msgstr "Ir para primeiro descendente"
-
-#~ msgid "Save using the PersistStream interface"
-#~ msgstr "Guardar usando a interface PersistStream"
-
-#~ msgid "Open (PersistFile)"
-#~ msgstr "Abrir (PersistFile)"
-
-#~ msgid "Open using the PersistFile interface"
-#~ msgstr "Abrir com a interface PersistFile"
-
-#~ msgid "Save (PersistFile)"
-#~ msgstr "Guardar (PersistFile)"
-
-#~ msgid "Save using the PersistFile interface"
-#~ msgstr "Guardar usando a interface PersistFile"
diff --git a/po/ro.po b/po/ro.po
new file mode 100644
index 0000000..285959c
--- /dev/null
+++ b/po/ro.po
@@ -0,0 +1,3716 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Romanian Version\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-12-19 17:44+0100\n"
+"PO-Revision-Date: 2009-12-20 14:42+0200\n"
+"Last-Translator: Laurentiu nica <nick.laurentiu.nica@gmail.com>\n"
+"Language-Team: Xiphos <nick.laurentiu.nica@gmail.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-12-10 04:39+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+"X-Poedit-Country: ROMANIA\n"
+"X-Poedit-Language: Romanian\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+#: ../src/backend/sword_main.cc:1083
+msgid "Configuration not found"
+msgstr "Configuratia nu s-a gasit"
+
+#: ../src/editor/bonobo-editor.c:254
+#: ../src/editor/slib-editor.c:234
+#: ../src/gnome2/html.c:637
+#, c-format
+msgid "Page %d of %d"
+msgstr "Pagina %d din %d"
+
+#: ../src/editor/bonobo-editor.c:353
+#: ../src/editor/slib-editor.c:659
+msgid "Are you sure you want to delete the note for"
+msgstr "Esti sigur ca vrei sa stergi nota pentru"
+
+#: ../src/editor/bonobo-editor.c:965
+#: ../src/editor/bonobo-editor.c:998
+#: ../src/editor/slib-editor.c:1308
+#: ../src/editor/slib-editor.c:1345
+msgid "Save the changes to document"
+msgstr "Salveaza schimbarile la document"
+
+#: ../src/editor/bonobo-editor.c:966
+#: ../src/editor/bonobo-editor.c:999
+#: ../src/editor/slib-editor.c:1309
+#: ../src/editor/slib-editor.c:1346
+msgid "before closing?"
+msgstr "inainte de inchidere?"
+
+#: ../src/editor/bonobo-editor.c:973
+#: ../src/editor/bonobo-editor.c:1006
+#: ../src/editor/slib-editor.c:1316
+#: ../src/editor/slib-editor.c:1353
+msgid "If you don't save, changes will be permanently lost."
+msgstr "Daca nu salvezi, schimbarile vor fi pierdute permanent."
+
+#: ../src/editor/bonobo-editor.c:997
+#: ../src/editor/slib-editor.c:1344
+#: ../ui/xi-menus.glade.h:39
+msgid "File"
+msgstr "Fisier"
+
+#: ../src/editor/bonobo-editor.c:1224
+#: ../src/editor/slib-editor.c:1401
+msgid "StudyPad"
+msgstr "Caiet de Studiu"
+
+#: ../src/editor/bonobo-editor.c:1237
+#: ../src/editor/slib-editor.c:1415
+msgid "Note Editor"
+msgstr "Editor de Note"
+
+#: ../src/editor/bonobo-editor.c:1246
+#: ../src/editor/slib-editor.c:1429
+msgid "Prayer List/Journal Editor"
+msgstr "Lista de Rugaciune / Editor Jurnal"
+
+#: ../src/editor/slib-editor.c:401
+#: ../src/editor/slib-editor.c:448
+msgid "Save As"
+msgstr "Salveaza ca"
+
+#: ../src/editor/slib-editor.c:419
+#: ../src/editor/slib-editor.c:466
+#: ../src/editor/slib-editor.c:634
+msgid "Untitled document"
+msgstr "Document fara titlu"
+
+#: ../src/editor/slib-editor.c:702
+msgid "HTML Output"
+msgstr "Rezultat HTML"
+
+#: ../src/editor/slib-editor.c:709
+msgid "HTML Source"
+msgstr "Sursa HTML"
+
+#: ../src/editor/slib-editor.c:716
+msgid "Plain Source"
+msgstr "Sursa Simpla"
+
+#: ../src/editor/slib-editor.c:726
+#: ../ui/editor_note.xml.h:15
+#: ../ui/editor_studypad.xml.h:21
+msgid "_Print..."
+msgstr "Ti_parire..."
+
+#: ../src/editor/slib-editor.c:733
+#: ../ui/editor_note.xml.h:9
+#: ../ui/editor_studypad.xml.h:14
+msgid "Print Pre_view"
+msgstr "Pre_vizualizare tiparire"
+
+#: ../src/editor/slib-editor.c:740
+msgid "_Quit"
+msgstr "_Renunta"
+
+#: ../src/editor/slib-editor.c:747
+msgid "_Open"
+msgstr "_Deschide"
+
+#: ../src/editor/slib-editor.c:754
+msgid "_Save"
+msgstr "_Salveaza"
+
+#: ../src/editor/slib-editor.c:761
+msgid "Save _As..."
+msgstr "Salveaza _Ca..."
+
+#: ../src/editor/slib-editor.c:767
+msgid "New"
+msgstr "Nou"
+
+#: ../src/editor/slib-editor.c:769
+msgid "Open new document"
+msgstr "Deschide document nou"
+
+#: ../src/editor/slib-editor.c:773
+msgid "Delete"
+msgstr "Sterge"
+
+#: ../src/editor/slib-editor.c:775
+msgid "Delete current note"
+msgstr "Sterge nota curenta"
+
+#: ../src/editor/slib-editor.c:780
+#: ../ui/editor_note.xml.h:14
+#: ../ui/editor_studypad.xml.h:20
+#: ../ui/editor.xml.h:13
+#: ../ui/xi-menus.glade.h:106
+msgid "_File"
+msgstr "_Fisier"
+
+#: ../src/editor/slib-editor.c:835
+msgid "HTML _Output"
+msgstr "_Rezultat HTML"
+
+#: ../src/editor/slib-editor.c:842
+msgid "_HTML Source"
+msgstr "_Sursa HTML"
+
+#: ../src/editor/slib-editor.c:849
+msgid "_Plain Source"
+msgstr "_Sursa Simpla"
+
+#: ../src/editor/slib-editor.c:856
+#: ../ui/xi-menus.glade.h:121
+msgid "_View"
+msgstr "_Vizualizare"
+
+#: ../src/editor/slib-editor.c:867
+#: ../ui/editor_note.xml.h:11
+#: ../ui/editor_studypad.xml.h:16
+#: ../ui/editor.xml.h:11
+msgid "Save"
+msgstr "Salvare"
+
+#: ../src/editor/slib-editor.c:878
+#: ../src/editor/slib-editor.c:885
+msgid "Insert Link"
+msgstr "Inserare Link"
+
+#: ../src/gecko/gecko-html.cpp:177
+#: ../src/gnome2/html.c:165
+msgid "Unlock "
+msgstr "Deschide "
+
+#: ../src/gecko/gecko-print.c:172
+msgid "Preparing to print"
+msgstr "Pregatire pentru tiparire"
+
+#: ../src/gecko/gecko-print.c:266
+msgid "Printing is not supported on this printer"
+msgstr "Tiparirea nu este suportate pe aceasta imprimanta"
+
+#: ../src/gecko/gecko-print.c:269
+#, c-format
+msgid "Printer %s does not support PostScript printing."
+msgstr "Imprimanta %s nu suporta tiparirea PostScript."
+
+#: ../src/gecko/gecko-print.c:342
+#: ../src/gecko/gecko-print.c:370
+msgid "Printing"
+msgstr "Tiparire"
+
+#: ../src/gecko/gecko-print.c:372
+msgid "Waiting to print"
+msgstr "Asteapta tiparirea"
+
+#: ../src/gecko/gecko-print.c:584
+msgid "An error occurred while printing"
+msgstr "O eroare a avut loc in timpul tiparirii"
+
+#: ../src/gecko/gecko-print.c:588
+#, c-format
+msgid "It was not possible to print your document: %s"
+msgstr "Nu s-a putut tiparii documentu tau: %s"
+
+#: ../src/gnome2/about_modules.c:195
+msgid "About Sword Module"
+msgstr "Despre Modului Sword"
+
+#: ../src/gnome2/about_modules.c:389
+#: ../src/gnome2/mod_mgr.c:252
+msgid "The module has no About information."
+msgstr "Modului nu are informatii descriptive."
+
+#: ../src/gnome2/about_sword.c:88
+msgid "The SWORD Project is an effort to create an ever-expanding software package for research and study of God and His Word. The SWORD Project framework allows easy use and study of Bible texts, commentaries, lexicons, dictionaries, and other books. Many frontends are built using this framework. An installed set of books may be shared among all frontends using the framework."
+msgstr "Proiectul SWORD este un efort de a crea pachetul de soft in extindere continua pentru studiu si cercetarea lui Dumnezeu si a Cuvantului Sau. Cadrul Proiectului SWORD permite folosirea cu usurinta si studierea textelor Bibliei, a comentariilor, lexicoanelor, dictionarelor si a altor carti. Multe fronturi sunt construite folosind acest cadru. Un set de carti instalate poate fi impartasit pe toate fronturile folosind acest cadru."
+
+#: ../src/gnome2/about_sword.c:106
+msgid "About the SWORD Project"
+msgstr "Despre Proiectul SWORD"
+
+#: ../src/gnome2/about_sword.c:124
+msgid "Sword Version"
+msgstr "Versiunea Sword"
+
+#: ../src/gnome2/about_sword.c:155
+msgid "Books can be downloaded from the SWORD Project"
+msgstr "Cartile pot fi descarcate din cadrul Proiectului SWORD"
+
+#: ../src/gnome2/about_sword.c:161
+msgid "The SWORD Project"
+msgstr "Proiectul SWORD"
+
+#: ../src/gnome2/about_trans.c:84
+msgid ""
+"Do you like using Xiphos to study the Bible? Would you like to see its display using your native language? You could translate Xiphos! \n"
+"\n"
+"We are always looking for contributions of new translations of Xiphos into other languages. If you are able to translate for us, please see the link below, contact us, and get involved with our efforts."
+msgstr ""
+"Iti place sa folosesti Xiphos pentru studiul Bibliei? Ai dori sa vezi afisarea lui in limba ta nativa? Ai putea traduce Xipho! \n"
+"\n"
+"Suntem in continua cautare dupa contribuitori la traduceri noi pentru Xiphos in alte limbi. Daca poti sa traduci pentru noi, vezi link-ul de mai jos, contacteaza-ne si implica-te cu eforturile noastre."
+
+#: ../src/gnome2/about_trans.c:98
+msgid "About Xiphos Translation"
+msgstr "Despre Traducerea Xiphos"
+
+#: ../src/gnome2/about_trans.c:140
+msgid "See TRANSLATION-HOWTO in Xiphos source"
+msgstr "Vezi TRANSLATION-HOWTO din sursa Xiphos"
+
+#: ../src/gnome2/about_trans.c:146
+msgid "Xiphos development"
+msgstr "Dezvoltarea Xiphos"
+
+#: ../src/gnome2/about_xiphos.c:131
+msgid "Copyright 2000-2009 The Xiphos Development Team"
+msgstr "Copyright 2000-2009 Echipa de Developeri Xiphos"
+
+#: ../src/gnome2/about_xiphos.c:134
+msgid ""
+"(formerly known as GnomeSword)\n"
+"\n"
+"Powered by The SWORD Project.\n"
+"We would like to thank Troy Griffitts and all the other folks who have given us The SWORD Project."
+msgstr ""
+"(anterior cunoscut drept GnomeSword)\n"
+"\n"
+"Powered by The Sword Project.\n"
+"Dorim sa multumim lui Troy Friffitts si toti ceilalti care ne-au daruit Proiectul SWORD."
+
+#: ../src/gnome2/bibletext_dialog.c:358
+msgid "Go to "
+msgstr "Mergi la "
+
+#. info->stock_icon = GTK_STOCK_OPEN;
+#: ../src/gnome2/bookmark_dialog.c:171
+#: ../src/gnome2/bookmarks_menu.c:358
+#: ../src/gnome2/bookmarks_menu.c:765
+#: ../src/gnome2/bookmarks_menu.c:863
+#: ../src/gnome2/bookmarks_treeview.c:133
+#: ../ui/editor_studypad.xml.h:2
+#: ../ui/xi-menus.glade.h:13
+msgid "Bookmark"
+msgstr "Insemnare"
+
+#: ../src/gnome2/bookmark_dialog.c:173
+#: ../src/gnome2/bookmarks_menu.c:865
+#: ../src/gnome2/bookmarks_treeview.c:134
+msgid "Enter Folder Name"
+msgstr "Introdu Nume Folder"
+
+#: ../src/gnome2/bookmark_dialog.c:175
+#: ../src/gnome2/bookmarks_menu.c:867
+msgid "Folder Name"
+msgstr "Nume Folder"
+
+#: ../src/gnome2/bookmark_dialog.c:176
+#: ../src/gnome2/bookmarks_menu.c:868
+#: ../src/gnome2/bookmarks_treeview.c:136
+msgid "Folder: "
+msgstr "Folder: "
+
+#: ../src/gnome2/bookmarks_menu.c:344
+#: ../ui/xi-menus.glade.h:32
+msgid "Edit"
+msgstr "Editare"
+
+#: ../src/gnome2/bookmarks_menu.c:361
+msgid "Folder name: "
+msgstr "Nume folder: "
+
+#: ../src/gnome2/bookmarks_menu.c:364
+msgid "Bookmark name: "
+msgstr "Nume insemnare: "
+
+#: ../src/gnome2/bookmarks_menu.c:367
+#: ../src/gnome2/bookmarks_menu.c:773
+msgid "Verse: "
+msgstr "Verset: "
+
+#: ../src/gnome2/bookmarks_menu.c:368
+#: ../src/gnome2/bookmarks_menu.c:774
+msgid "Module: "
+msgstr "Modul: "
+
+#: ../src/gnome2/bookmarks_menu.c:533
+msgid "Restore Bookmark Folder"
+msgstr "Restaureaza Folderul de Semne de Carte"
+
+#: ../src/gnome2/bookmarks_menu.c:602
+msgid "Remove the selected folder"
+msgstr "Scoate folderul selectat"
+
+#: ../src/gnome2/bookmarks_menu.c:604
+msgid "(and all its contents)?"
+msgstr "(si tot continutul sau)?"
+
+#: ../src/gnome2/bookmarks_menu.c:607
+msgid "Remove the selected bookmark"
+msgstr "Scoate semnul de carte selectat"
+
+#: ../src/gnome2/bookmarks_menu.c:766
+msgid "Add"
+msgstr "Adauga"
+
+#: ../src/gnome2/bookmarks_menu.c:772
+msgid "Label: "
+msgstr "Eticheta: "
+
+#: ../src/gnome2/bookmarks_treeview.c:107
+#, c-format
+msgid "Search result: %s"
+msgstr "Rezultate cautare: %s"
+
+#: ../src/gnome2/bookmarks_treeview.c:943
+#: ../src/gnome2/sidebar.c:1389
+msgid "Bookmarks"
+msgstr "Insemne"
+
+#: ../src/gnome2/cipher_key_dialog.c:62
+msgid "Cipher Key?"
+msgstr "Cheie Cipher?"
+
+#: ../src/gnome2/cipher_key_dialog.c:63
+msgid "for:"
+msgstr "pentru:"
+
+#: ../src/gnome2/cipher_key_dialog.c:66
+msgid "Enter Cipher Key: "
+msgstr "Introdu Cheia Cipher: "
+
+#: ../src/gnome2/dialog.c:265
+msgid "Close without Saving"
+msgstr "Inchide fara salvare"
+
+#: ../src/gnome2/dialog.c:596
+msgid "Xiphos:"
+msgstr "Xiphos:"
+
+#: ../src/gnome2/dialog.c:697
+msgid "Close _without Saving"
+msgstr "Inchide _fara Salvare"
+
+#: ../src/gnome2/export_dialog.c:267
+#: ../ui/export-dialog.glade.h:20
+msgid "Please check copyright before exporting!"
+msgstr "Te rog sa verifici drepturile de autor inainte de exportare!"
+
+#: ../src/gnome2/find_dialog.c:204
+#: ../src/gnome2/find_dialog.c:373
+msgid "Find"
+msgstr "Cauta"
+
+#: ../src/gnome2/find_dialog.c:222
+msgid "Enter Word or Phrase"
+msgstr "Introdu Cuvantul sau Fraza"
+
+#: ../src/gnome2/find_dialog.c:238
+#: ../src/gnome2/search_sidebar.c:306
+#: ../ui/search-dialog.glade.h:59
+msgid "Match case"
+msgstr "Potrivire litere"
+
+#: ../src/gnome2/find_dialog.c:245
+msgid "Search backwards"
+msgstr "Cauta invers"
+
+#: ../src/gnome2/find_dialog.c:254
+#: ../src/gnome2/search_sidebar.c:271
+#: ../ui/search-dialog.glade.h:76
+msgid "Regular expression"
+msgstr "Expresie regulata"
+
+#: ../src/gnome2/find_dialog.c:295
+msgid "Find Next"
+msgstr "Gaseste Urmatorul"
+
+#: ../src/gnome2/font_dialog.c:303
+msgid "Set Module Font"
+msgstr "Setare Font Modul"
+
+#: ../src/gnome2/font_dialog.c:333
+msgid "Change font for"
+msgstr "Schimba fontul pentru"
+
+#: ../src/gnome2/font_dialog.c:337
+msgid "Module"
+msgstr "Modul"
+
+#: ../src/gnome2/font_dialog.c:341
+msgid "Current font: "
+msgstr "Fontul curent: "
+
+#: ../src/gnome2/font_dialog.c:378
+msgid "+0"
+msgstr "+0"
+
+#: ../src/gnome2/font_dialog.c:382
+msgid "Use the default font for this module"
+msgstr "Foloseste fontul implicit pentru acest modul"
+
+#. *****************************************************************************
+#. * Name
+#. *    gconf_setup
+#. *
+#. * Synopsis
+#. *   #include "main/settings.h"
+#. *
+#. *   void gconf_setup()
+#. *
+#. * Description
+#. *   verifies and initializes the GConf subsystem, so that "sword://" and
+#. *   similar can be handled by url-comprehending programs such as browsers.
+#. *   dialogs for permission/success/failure => conditional on debug build.
+#. *
+#. * Return value
+#. *   void
+#.
+#: ../src/gnome2/gui.c:110
+msgid ""
+"URL references using \"sword://\" (similar to web page\n"
+"references) can be used by programs to look up\n"
+"scripture references. Your system currently has no\n"
+"program set to handle these references.\n"
+"\n"
+"Would you like Xiphos to set itself as the\n"
+"program to handle these references?"
+msgstr ""
+"Referintele URL folosind \"sword://\" (similar referintelor la\n"
+"paginile web) pot fi folosite de programe pentru a cauta\n"
+"referinte scripturale. In prezent sistemul tau nu are\n"
+"nici un program setate care sa manuiasca aceste referinte.\n"
+"\n"
+"Vrei sa setezi Xiphos drept program\n"
+"care sa manuiasca aceste referinte?"
+
+#: ../src/gnome2/gui.c:112
+msgid ""
+"Xiphos has successfully set itself\n"
+"as the handler of sword:// and bible:// URLs.\n"
+"\n"
+"You may wish to run the program \"gconf-editor\"\n"
+"to examine keys under /desktop/gnome/url-handlers,\n"
+"if you need to change these."
+msgstr ""
+"Xiphos s-a setat cu succes\n"
+"drept manuitor al URL-urilor sword:// si bible://.\n"
+"\n"
+"Ai putea rula programul \"gconf-editor\"\n"
+"pentru a examina cheile de la /desktop/gnome/url-handlers,\n"
+"daca trebuie sa schimbi acestea."
+
+#: ../src/gnome2/gui.c:166
+#, c-format
+msgid ""
+"Xiphos failed to complete handler init for key #%d:\n"
+"%s"
+msgstr ""
+"Xiphos a esuat in initializarea manuitorului pentru cheia #%d:\n"
+"%s"
+
+#: ../src/gnome2/gui.c:212
+msgid "BUG! Xiphos is about to crash due to a \"STRDUP\" error."
+msgstr "BUG! Xiphos e pe cale sa se inchida datorita unei erori \"STRDUP\"."
+
+#: ../src/gnome2/gui.c:213
+#: ../src/gnome2/gui.c:248
+msgid "Please report this error to the Xiphos team with:"
+msgstr "Te rog sa raportezi aceasta eroare echipei Xiphos cu:"
+
+#: ../src/gnome2/gui.c:247
+msgid "BUG! Xiphos is about to crash due to a \"STRING\" error."
+msgstr "BUG! Xiphos e pe cale sa se inchida datorita unei erori \"STRDUP\"."
+
+#: ../src/gnome2/main_window.c:789
+msgid "Xiphos - Bible Study Software"
+msgstr "Xiphos - Software de Studiu Biblic"
+
+#: ../src/gnome2/main_window.c:844
+msgid "Open a new tab"
+msgstr "Deschide un tab nou"
+
+#: ../src/gnome2/main_window.c:923
+#: ../src/gnome2/sidebar.c:627
+#: ../src/gnome2/sidebar.c:633
+#: ../src/main/sidebar.cc:666
+#: ../src/main/sidebar.cc:1015
+#: ../src/main/sidebar.cc:1016
+#: ../src/main/sidebar.cc:1017
+msgid "Standard View"
+msgstr "Vedere Standard"
+
+#: ../src/gnome2/main_window.c:1004
+msgid "Commentary View"
+msgstr "Vedere Comentariu"
+
+#: ../src/gnome2/main_window.c:1020
+msgid "Book View"
+msgstr "Vedere Carte"
+
+#: ../src/gnome2/main_window.c:1045
+msgid "Welcome to Xiphos"
+msgstr "Bun venit la Xiphos"
+
+#: ../src/gnome2/menu_popup.c:1168
+msgid ""
+"Renaming is not available in Windows.\n"
+"\n"
+"Xiphos is limited by Windows' filesystem,\n"
+"because it disallows the renaming of filename\n"
+"components of currently-open files,\n"
+"such as the contents of this commentary.\n"
+"Therefore, personal commentary renaming is\n"
+"not available in the Windows environment."
+msgstr ""
+"Redenumirea nu e disponibila in Windows.\n"
+"\n"
+"Xiphos este limitate de fisierele de sistem Windows,\n"
+"deoarce acesta nu permite redenumirea numelui de fisier\n"
+"a componentelor fisierelor deschise in prezent,\n"
+"cum ar fi continutul acestui comentariu.\n"
+"Prin urmare, redenumirea comentariului personal\n"
+"nu este disponibila in mediul Windows."
+
+#: ../src/gnome2/menu_popup.c:1187
+msgid "Rename Commentary"
+msgstr "Redenumire Comentariu"
+
+#: ../src/gnome2/menu_popup.c:1190
+msgid "Choose Commentary Name"
+msgstr "Alege Nume Comentariu"
+
+#: ../src/gnome2/menu_popup.c:1192
+msgid "New Name"
+msgstr "Nume Nou"
+
+#: ../src/gnome2/menu_popup.c:1193
+#: ../src/gnome2/treekey-editor.c:139
+#: ../src/gnome2/treekey-editor.c:198
+#: ../src/gnome2/treekey-editor.c:284
+#: ../src/main/prayerlists.cc:243
+msgid "Name: "
+msgstr "Nume: "
+
+#: ../src/gnome2/menu_popup.c:1203
+#: ../src/main/prayerlists.cc:257
+msgid "Module names must contain [A-Za-z0-9_] only."
+msgstr "Numele de modul trebuie sa contina doar [A-Za-z0-9_]."
+
+#: ../src/gnome2/menu_popup.c:1210
+#: ../src/main/prayerlists.cc:264
+msgid "Xiphos already knows a module by that name."
+msgstr "Xiphos cunoaste deja un modul cu acest nume."
+
+#: ../src/gnome2/menu_popup.c:1253
+#, c-format
+msgid ""
+"Failed to create new configuration:\n"
+"%s"
+msgstr ""
+"S-a esuat in crearea noii configuratii:\n"
+"%s"
+
+#: ../src/gnome2/menu_popup.c:1262
+msgid ""
+"Configuration build error:\n"
+"\n"
+msgstr ""
+"Eroare in cladirea configuratiei:\n"
+"\n"
+
+#: ../src/gnome2/mod_mgr.c:169
+msgid "Remove these modules?"
+msgstr "Elimini aceste module?"
+
+#: ../src/gnome2/mod_mgr.c:170
+msgid "Preparing to remove"
+msgstr "Pregatire pentru eliminare"
+
+#: ../src/gnome2/mod_mgr.c:171
+msgid "Removing"
+msgstr "Eliminare"
+
+#: ../src/gnome2/mod_mgr.c:172
+#: ../ui/xi-menus.glade.h:72
+msgid "Remove"
+msgstr "Elimina"
+
+#: ../src/gnome2/mod_mgr.c:175
+msgid "Install these modules?"
+msgstr "Instalezi aceste module?"
+
+#: ../src/gnome2/mod_mgr.c:176
+msgid "Preparing to install"
+msgstr "Pregatire de instalare"
+
+#: ../src/gnome2/mod_mgr.c:177
+msgid "Installing"
+msgstr "Instalare"
+
+#: ../src/gnome2/mod_mgr.c:178
+#: ../src/gnome2/mod_mgr.c:2964
+#: ../ui/module-manager.glade.h:18
+msgid "Install"
+msgstr "Instaleaza"
+
+#: ../src/gnome2/mod_mgr.c:181
+msgid "Archive these modules?"
+msgstr "Arhivezi aceste module?"
+
+#: ../src/gnome2/mod_mgr.c:182
+msgid "Preparing to archive"
+msgstr "Pregatire pentru arhivare"
+
+#: ../src/gnome2/mod_mgr.c:183
+msgid "Archiving"
+msgstr "Arhivare"
+
+#: ../src/gnome2/mod_mgr.c:184
+#: ../ui/module-manager.glade.h:11
+msgid "Archive"
+msgstr "Arhiveaza"
+
+#: ../src/gnome2/mod_mgr.c:187
+msgid ""
+"Build fast-search index for these\n"
+"modules (may take minutes/module)?"
+msgstr ""
+"Cladeste indexul de cautare rapida pentru\n"
+"aceste module (poate dura minute/modul)?"
+
+#: ../src/gnome2/mod_mgr.c:188
+msgid "Preparing to index"
+msgstr "Pregatire pentru indexare"
+
+#: ../src/gnome2/mod_mgr.c:189
+msgid "Indexing"
+msgstr "Indexare"
+
+#: ../src/gnome2/mod_mgr.c:190
+#: ../ui/module-manager.glade.h:17
+msgid "Index"
+msgstr "Index"
+
+#: ../src/gnome2/mod_mgr.c:193
+msgid "Delete fast-search index for these modules?"
+msgstr "Sterge indexul de cautare pentru aceste module?"
+
+#: ../src/gnome2/mod_mgr.c:194
+msgid "Preparing to delete index"
+msgstr "Pregatire pentru stergere index"
+
+#: ../src/gnome2/mod_mgr.c:195
+msgid "Deleting index"
+msgstr "Stergere index"
+
+#: ../src/gnome2/mod_mgr.c:196
+msgid "Deletion"
+msgstr "Stergere"
+
+#: ../src/gnome2/mod_mgr.c:427
+msgid "Module Name"
+msgstr "Nume Modul"
+
+#: ../src/gnome2/mod_mgr.c:448
+msgid "A checkmark means this module is already installed"
+msgstr "O bifare inseamna ca acest modul este deja instalat"
+
+#: ../src/gnome2/mod_mgr.c:470
+msgid "Click the box to work on this module"
+msgstr "Apasa pe casuta pentru a lucra la acest modul"
+
+#: ../src/gnome2/mod_mgr.c:471
+msgid "Click the box to select this module for install/update"
+msgstr "Apasa casuta pentru a selecta acest modul pentru instalare/actualizare"
+
+#: ../src/gnome2/mod_mgr.c:490
+msgid "Installed"
+msgstr "Instalat"
+
+#: ../src/gnome2/mod_mgr.c:500
+msgid "The index icon means you have built an optimized ('lucene') index for this module for fast searching (see the Maintenance pane for this function)"
+msgstr "Iconita de index inseamna ca ai cladit un index optimizat (\"lucene\") pentru acest modul pentru cautare rapida (vezi panoul de Intretinere pentru aceasta functie)"
+
+#: ../src/gnome2/mod_mgr.c:518
+msgid "The lock icon means this module is encrypted, and requires that you purchase an unlock key from the content owner"
+msgstr "Iconita de lacat inseamna ca acest modul este encriptate, si necesita ca tu sa cumperi o cheie de deblocare de la proprietareul acestuia"
+
+#: ../src/gnome2/mod_mgr.c:535
+#: ../ui/xi-menus.glade.h:1
+msgid "About"
+msgstr "Despre"
+
+#: ../src/gnome2/mod_mgr.c:555
+msgid "The refresh icon means the Installed module is older than the newer Available module: You should update the module"
+msgstr "Iconita de reimprospatare inseamna ca modulul Instalat este mai vechi decat modului Disponibil mai nou: Ar trebui sa actualizezi modului"
+
+#: ../src/gnome2/mod_mgr.c:567
+msgid "Available"
+msgstr "Disponibil"
+
+#: ../src/gnome2/mod_mgr.c:576
+msgid "Size"
+msgstr "Marime"
+
+#: ../src/gnome2/mod_mgr.c:585
+msgid "Description"
+msgstr "Descriere"
+
+#: ../src/gnome2/mod_mgr.c:736
+#, c-format
+msgid ""
+"`mkdir %s' failed:\n"
+"%s."
+msgstr ""
+"`mkdir %s' a esuat:\n"
+"%s."
+
+#: ../src/gnome2/mod_mgr.c:759
+msgid " archived in: \n"
+msgstr " arhivat in: \n"
+
+#: ../src/gnome2/mod_mgr.c:815
+msgid "Journals and prayer lists cannot be indexed."
+msgstr "Jurnalele si listele de rugaciune nu pot fi indexate."
+
+#: ../src/gnome2/mod_mgr.c:833
+#, c-format
+msgid "%s failed"
+msgstr "%s a esuat"
+
+#: ../src/gnome2/mod_mgr.c:836
+#: ../src/gnome2/mod_mgr.c:1562
+msgid "Finished"
+msgstr "Terminat"
+
+#: ../src/gnome2/mod_mgr.c:1003
+#: ../src/gnome2/mod_mgr.c:1005
+#: ../src/gnome2/mod_mgr.c:1107
+#: ../src/gnome2/mod_mgr.c:1142
+#: ../src/gnome2/mod_mgr.c:1144
+#: ../src/gnome2/utilities.c:435
+#: ../src/gnome2/utilities.c:500
+#: ../src/gnome2/utilities.c:502
+#: ../src/gnome2/utilities.c:986
+#: ../src/main/sidebar.cc:852
+#: ../src/main/sidebar.cc:924
+#: ../src/main/sidebar.cc:926
+msgid "Unknown"
+msgstr "Necunoscut"
+
+#: ../src/gnome2/mod_mgr.c:1301
+#, c-format
+msgid ""
+"Repository:\n"
+"%s"
+msgstr ""
+"Repozitoriu:\n"
+"%s"
+
+#: ../src/gnome2/mod_mgr.c:1313
+msgid ""
+"Categorized by\n"
+"Module Type"
+msgstr ""
+"Categorizat dupa\n"
+"Tip Modul"
+
+#: ../src/gnome2/mod_mgr.c:1318
+#: ../src/gnome2/utilities.c:561
+#: ../src/main/sidebar.cc:999
+#: ../src/main/sidebar.cc:1001
+msgid "Biblical Texts"
+msgstr "Texte Biblice"
+
+#: ../src/gnome2/mod_mgr.c:1322
+#: ../src/gnome2/utilities.c:565
+#: ../src/main/sidebar.cc:678
+#: ../src/main/sidebar.cc:1024
+#: ../src/main/sidebar.cc:1026
+#: ../ui/prefs.glade.h:33
+msgid "Commentaries"
+msgstr "Comentarii"
+
+#: ../src/gnome2/mod_mgr.c:1326
+#: ../src/gnome2/utilities.c:569
+#: ../src/main/sidebar.cc:1033
+#: ../src/main/sidebar.cc:1035
+msgid "Dictionaries"
+msgstr "Dictionare"
+
+#: ../src/gnome2/mod_mgr.c:1330
+#: ../src/gnome2/utilities.c:573
+#: ../src/main/sidebar.cc:1042
+#: ../src/main/sidebar.cc:1044
+msgid "Daily Devotionals"
+msgstr "Devotionale Zilnice"
+
+#: ../src/gnome2/mod_mgr.c:1334
+#: ../src/gnome2/utilities.c:577
+#: ../src/main/sidebar.cc:688
+#: ../src/main/sidebar.cc:1051
+#: ../src/main/sidebar.cc:1053
+msgid "General Books"
+msgstr "Carti Generale"
+
+#: ../src/gnome2/mod_mgr.c:1338
+#: ../src/gnome2/utilities.c:581
+#: ../src/main/sidebar.cc:1060
+#: ../src/main/sidebar.cc:1062
+msgid "Maps"
+msgstr "Harti"
+
+#: ../src/gnome2/mod_mgr.c:1342
+#: ../src/gnome2/utilities.c:585
+#: ../src/main/sidebar.cc:1069
+#: ../src/main/sidebar.cc:1071
+msgid "Images"
+msgstr "Imagini"
+
+#: ../src/gnome2/mod_mgr.c:1350
+msgid ""
+"Categorized by\n"
+"Availability"
+msgstr ""
+"Categorizat dupa\n"
+"Disponibilitate"
+
+#: ../src/gnome2/mod_mgr.c:1355
+msgid "Updates"
+msgstr "Actualizari"
+
+#: ../src/gnome2/mod_mgr.c:1359
+msgid "Uninstalled"
+msgstr "Dezinstalat"
+
+#: ../src/gnome2/mod_mgr.c:1363
+#: ../src/gnome2/sidebar.c:643
+#: ../src/gnome2/utilities.c:590
+#: ../src/main/prayerlists.cc:241
+#: ../src/main/sidebar.cc:1079
+#: ../src/main/sidebar.cc:1081
+msgid "Prayer List/Journal"
+msgstr "Lista/Jurnal de Rugaciune"
+
+#: ../src/gnome2/mod_mgr.c:1545
+msgid "Refreshing from remote source"
+msgstr "Reimprospatare din sursa indepartata"
+
+#: ../src/gnome2/mod_mgr.c:1556
+msgid "Remote source not found"
+msgstr "Sursa indepartata nu s-a gasit"
+
+#: ../src/gnome2/mod_mgr.c:1670
+msgid "Configure"
+msgstr "Configurare"
+
+#: ../src/gnome2/mod_mgr.c:1701
+msgid "Type"
+msgstr "Tip"
+
+#: ../src/gnome2/mod_mgr.c:1708
+msgid "Caption"
+msgstr "Legenda"
+
+#: ../src/gnome2/mod_mgr.c:1716
+msgid "Source"
+msgstr "Sursa"
+
+#: ../src/gnome2/mod_mgr.c:1724
+msgid "Directory"
+msgstr "Director"
+
+#: ../src/gnome2/mod_mgr.c:1732
+msgid "User"
+msgstr "User"
+
+#: ../src/gnome2/mod_mgr.c:1740
+msgid "Password"
+msgstr "Parola"
+
+#: ../src/gnome2/mod_mgr.c:1748
+msgid "UID"
+msgstr "UID"
+
+#: ../src/gnome2/mod_mgr.c:1765
+msgid "Module Sources"
+msgstr "Surse Module"
+
+#: ../src/gnome2/mod_mgr.c:1768
+msgid "Add/Remove"
+msgstr "Adauga/Elimina"
+
+#: ../src/gnome2/mod_mgr.c:1770
+msgid "Choose"
+msgstr "Alege"
+
+#: ../src/gnome2/mod_mgr.c:1774
+#: ../src/gnome2/preferences_dialog.c:1793
+#: ../src/gnome2/sidebar.c:1413
+msgid "Modules"
+msgstr "Module"
+
+#: ../src/gnome2/mod_mgr.c:1776
+msgid "Install/Update"
+msgstr "Instalare/Actualizare"
+
+#: ../src/gnome2/mod_mgr.c:1778
+msgid "Maintenance"
+msgstr "Intretinere"
+
+#: ../src/gnome2/mod_mgr.c:1999
+msgid "Please Refresh"
+msgstr "Te rog Reimprospateaza"
+
+#: ../src/gnome2/mod_mgr.c:2000
+msgid "Your module list is not up to date!"
+msgstr "Lista ta de module nu este actualizata!"
+
+#. Zero Bibles is just not workable in Xiphos.
+#: ../src/gnome2/mod_mgr.c:2282
+msgid ""
+"You have uninstalled your last Bible.\n"
+"Xiphos requires at least one."
+msgstr ""
+"Ai dezinstalat ultima Biblie folosita. \n"
+"Xiphos are nevoie de cel putin una."
+
+#: ../src/gnome2/mod_mgr.c:2288
+msgid ""
+"There are still no Bibles installed.\n"
+"Xiphos cannot continue without one."
+msgstr ""
+"Inca nu sunt Biblii instalate. \n"
+"Xiphos nu poate continua fara nici una."
+
+#: ../src/gnome2/mod_mgr.c:2353
+msgid "Standard remote sources have been loaded."
+msgstr "Sursele standard indepartate au fost incarcate."
+
+#: ../src/gnome2/mod_mgr.c:2359
+msgid "Could not load standard sources from CrossWire."
+msgstr "Nu s-au putut incarca sursele standard de la CrossWire."
+
+#: ../src/gnome2/mod_mgr.c:2510
+#: ../src/gnome2/mod_mgr.c:2759
+msgid "Remove the selected source"
+msgstr "Elimina sursa selectata"
+
+#: ../src/gnome2/mod_mgr.c:2570
+msgid "Enter a remote source"
+msgstr "Introdu o sursa indepartata"
+
+#: ../src/gnome2/mod_mgr.c:2574
+msgid "Caption:"
+msgstr "Legenda:"
+
+#: ../src/gnome2/mod_mgr.c:2575
+msgid "Type:"
+msgstr "Tip"
+
+#: ../src/gnome2/mod_mgr.c:2576
+msgid "Host:"
+msgstr "Gazda:"
+
+#: ../src/gnome2/mod_mgr.c:2577
+msgid "Directory:"
+msgstr "Director:"
+
+#: ../src/gnome2/mod_mgr.c:2579
+msgid "User (optional):"
+msgstr "User (optional)"
+
+#: ../src/gnome2/mod_mgr.c:2580
+msgid "Password (optional):"
+msgstr "Parola (optional):"
+
+#. this can happen at most once
+#: ../src/gnome2/mod_mgr.c:2608
+msgid "A source by that name already exists."
+msgstr "O sursa cu acel nume deja exista."
+
+#: ../src/gnome2/mod_mgr.c:2756
+msgid "Delete a remote source"
+msgstr "Sterge o sursa indepartata"
+
+#. *****************************************************************************
+#. * Name
+#. *   gui_open_mod_mgr
+#. *
+#. * Synopsis
+#. *   #include "gui/mod_mgr.h"
+#. *
+#. *   void gui_open_mod_mgr(void)
+#. *
+#. * Description
+#. *
+#. *
+#. * Return value
+#. *   void
+#.
+#: ../src/gnome2/mod_mgr.c:3244
+msgid ""
+"<b>Welcome to the Module Manager.</b>\n"
+"\n"
+"This is Xiphos' mechanism to get new and updated content.\n"
+"It appears you have never been here before, so please take a moment to look it over.\n"
+"(You will see this information box just once.)\n"
+"\n"
+"Modules come from different <u>repositories</u>.  <b>Module Sources: Add/Remove</b> will show you what repositories are currently known.\n"
+"\n"
+"<b>Module Sources: Choose</b> is for deciding from where modules should come, that is, from which repository Xiphos should obtain them, as well as where they should be placed on your system. Set <i>Install Source</i> and <i>Install Destination</i>, then click <i>Refresh</i>.\n"
+"\n"
+"<b>Modules: Install/Update</b> is for selecting and obtaining modules after choosing source and destination.\n"
+"\n"
+"<b>Modules: Maintenance</b> is for archive and index creation.\n"
+"\n"
+"See section 5 of our manual for Module Manager detail, or ask for help via Live Chat, or (if no one is responsive in chat) send mail to our users' mailing list.\n"
+msgstr ""
+"<b>Bun venit la Managerul de Module.</b>\n"
+"\n"
+"Acesta este mecanismul Xiphos de a aduce continut nou si actualizat.\n"
+"Se pare ca nu ai mai fost aici inainte, asa ca ia un moment sa revizuiesti aceasta.\n"
+"(Vei vedea aceasta casuta doar o singura data.)\n"
+"\n"
+"Modulele provin din <u>repopozitoare</u> diferite.  <b>Surse Module: Adauga/Scoate</b> iti va arata ce repozitoare sunt cunoscute in prezent.\n"
+"\n"
+"<b>Surse Module: Alege</b> este pentru a decide de unde sa se preia, adica din ce repozitoriu sa le obtina Xiphos, precum si unde sa fie puse in sistemul tau. Seteaza <i>Sursa de Instalare</i> si <i>Destinatia de Instalare</i>, apoi apasa <i>Refresh</i>.\n"
+"\n"
+"<b>Module: Instaleaza/Actualizeaza</b> este pentru selectarea si obtinerea modulelor dupa alegerea sursei si a destinatiei.\n"
+"\n"
+"<b>Module: Intretinere</b> este pentru crearea de arhiva si indexare.\n"
+"\n"
+"Vezi sectiunea 5 a manualului nostru pentru detalii despre Managerul de Modul, sau cere ajutor via Live Chat, sau, (daca nu este nimeni disponibil in chat) trimite un mail la lista de corespondenta a userilor nostri.\n"
+
+#: ../src/gnome2/navbar_book.c:359
+#: ../src/gnome2/navbar_book_dialog.c:300
+msgid "Go outward, to the section containing this one"
+msgstr "Mergi in afara, la sectiunea ce contine aceasta"
+
+#: ../src/gnome2/navbar_book.c:375
+#: ../src/gnome2/navbar_book_dialog.c:316
+msgid "Go to previous item"
+msgstr "Mergi la obiectul anterior"
+
+#: ../src/gnome2/navbar_book.c:390
+#: ../src/gnome2/navbar_book_dialog.c:331
+msgid "Go to next item"
+msgstr "Mergi la obiectul urmator"
+
+#: ../src/gnome2/navbar_book.c:406
+#: ../src/gnome2/navbar_book_dialog.c:347
+msgid "Go inward, to the first subsection"
+msgstr "Mergi in interior, la prima sub-sectiune"
+
+#: ../src/gnome2/navbar_versekey_dialog.c:864
+#: ../src/gnome2/navbar_versekey_editor.c:879
+#: ../src/gnome2/navbar_versekey_parallel.c:810
+msgid "Synchronize this window from main window"
+msgstr "Sincronizeaza aceasta fereastra din fereastra principala"
+
+#: ../src/gnome2/parallel_dialog.c:328
+#: ../src/gnome2/preferences_dialog.c:1799
+msgid "Parallel"
+msgstr "Paralel"
+
+#: ../src/gnome2/parallel_view.c:275
+msgid "Copy"
+msgstr "Copiaza"
+
+#: ../src/gnome2/parallel_view.c:285
+msgid "Detach/Attach"
+msgstr "Detaseaza/Ataseaza"
+
+#: ../src/gnome2/parallel_view.c:291
+#: ../ui/xi-menus.glade.h:53
+msgid "Module Options"
+msgstr "Optiuni Modul"
+
+#. build change parallel modules submenu
+#: ../src/gnome2/parallel_view.c:306
+msgid "Change parallel 1"
+msgstr "Schimba paralel 1"
+
+#: ../src/gnome2/parallel_view.c:308
+msgid "Change parallel 2"
+msgstr "Schimba paralel 2"
+
+#: ../src/gnome2/parallel_view.c:310
+msgid "Change parallel 3"
+msgstr "Schimba paralel 3"
+
+#: ../src/gnome2/parallel_view.c:312
+msgid "Change parallel 4"
+msgstr "Schimba paralel 4"
+
+#: ../src/gnome2/parallel_view.c:314
+msgid "Change parallel 5"
+msgstr "Schimba paralel 5"
+
+#: ../src/gnome2/parallel_view.c:471
+#: ../src/gnome2/sidebar.c:626
+#: ../src/gnome2/sidebar.c:632
+#: ../src/gnome2/tabbed_browser.c:262
+#: ../src/main/sidebar.cc:646
+#: ../src/main/sidebar.cc:1007
+#: ../src/main/sidebar.cc:1008
+#: ../src/main/sidebar.cc:1009
+msgid "Parallel View"
+msgstr "Vedere Paralela"
+
+#: ../src/gnome2/preferences_dialog.c:1179
+#: ../src/gnome2/preferences_dialog.c:1217
+#: ../src/gnome2/preferences_dialog.c:1254
+#: ../src/gnome2/preferences_dialog.c:1289
+#: ../src/gnome2/preferences_dialog.c:1323
+#: ../src/gnome2/preferences_dialog.c:1356
+#: ../src/gnome2/preferences_dialog.c:1388
+#: ../src/gnome2/preferences_dialog.c:1421
+#: ../src/gnome2/preferences_dialog.c:1453
+#: ../src/gnome2/preferences_dialog.c:1487
+#: ../src/gnome2/preferences_dialog.c:1522
+#: ../src/gnome2/preferences_dialog.c:1557
+#: ../src/gnome2/preferences_dialog.c:1593
+#: ../src/gnome2/preferences_dialog.c:1631
+#: ../src/gnome2/preferences_dialog.c:2052
+msgid "-- Select --"
+msgstr "-- Selecteaza --"
+
+#: ../src/gnome2/preferences_dialog.c:1652
+msgid "Locale will take effect after restart."
+msgstr "Limba va avea efect dupa restartare."
+
+#: ../src/gnome2/preferences_dialog.c:1687
+#: ../ui/prefs.glade.h:74
+msgid "Preferences"
+msgstr "Preferinte"
+
+#: ../src/gnome2/preferences_dialog.c:1769
+msgid "Fonts"
+msgstr "Fonturi"
+
+#: ../src/gnome2/preferences_dialog.c:1772
+msgid "Color"
+msgstr "Culoare"
+
+#: ../src/gnome2/preferences_dialog.c:1775
+msgid "Sizes"
+msgstr "Marimi"
+
+#: ../src/gnome2/preferences_dialog.c:1779
+msgid "General"
+msgstr "General"
+
+#: ../src/gnome2/preferences_dialog.c:1782
+#: ../ui/prefs.glade.h:87
+msgid "Tabs and Panes"
+msgstr "Taburi si Panouri"
+
+#: ../src/gnome2/preferences_dialog.c:1789
+msgid "Options"
+msgstr "Optiuni"
+
+#: ../src/gnome2/preferences_dialog.c:1796
+msgid "Main"
+msgstr "Principal"
+
+#: ../src/gnome2/preferences_dialog.c:1802
+msgid "Special"
+msgstr "Special"
+
+#: ../src/gnome2/search_dialog.c:68
+#: ../src/main/search_dialog.cc:66
+#: ../src/main/search_sidebar.cc:61
+msgid "Searching the "
+msgstr "Cautarea "
+
+#: ../src/gnome2/search_dialog.c:69
+#: ../src/main/search_dialog.cc:67
+#: ../src/main/search_sidebar.cc:62
+msgid " Module"
+msgstr " Modul"
+
+#: ../src/gnome2/search_dialog.c:70
+#: ../src/main/search_dialog.cc:68
+#: ../src/main/search_sidebar.cc:63
+msgid "found in "
+msgstr "gasit i "
+
+#: ../src/gnome2/search_dialog.c:527
+msgid "Clear List?"
+msgstr "Curata Lista?"
+
+#: ../src/gnome2/search_dialog.c:528
+msgid "Are you sure you want to clear the module list?"
+msgstr "Esti sigur ca vrei sa cureti lista de module?"
+
+#: ../src/gnome2/search_dialog.c:708
+msgid "The last module list may not be deleted"
+msgstr "Ultima lista de module nu poate fi stearsa"
+
+#: ../src/gnome2/search_dialog.c:726
+msgid "Delete list?"
+msgstr "Sterge lista?"
+
+#: ../src/gnome2/search_dialog.c:727
+msgid "Are you sure you want to delete:"
+msgstr "Esti sigur ca vrei sa stergi:"
+
+#: ../src/gnome2/search_sidebar.c:192
+msgid ""
+"This is an inclusive (\"AND\") search:\n"
+"Find matches showing all words."
+msgstr ""
+"Aceasta e o cautare inclusiva (\"AND\"):\n"
+"Gaseste potriviri prin aratarea tuturor cuvintelor."
+
+#: ../src/gnome2/search_sidebar.c:209
+msgid "Search Module"
+msgstr "Cauta Modul"
+
+#: ../src/gnome2/search_sidebar.c:223
+msgid "Bible"
+msgstr "Biblie"
+
+#: ../src/gnome2/search_sidebar.c:232
+#: ../ui/prefs.glade.h:35
+msgid "Commentary"
+msgstr "Comentariu"
+
+#: ../src/gnome2/search_sidebar.c:246
+msgid "Search Type"
+msgstr "Tip Cautare"
+
+#: ../src/gnome2/search_sidebar.c:260
+#: ../ui/search-dialog.glade.h:66
+msgid "Multi word"
+msgstr "Multi cuvant"
+
+#: ../src/gnome2/search_sidebar.c:279
+#: ../ui/search-dialog.glade.h:44
+msgid "Exact phrase"
+msgstr "Fraza exacta"
+
+#: ../src/gnome2/search_sidebar.c:293
+msgid "Search Options"
+msgstr "Optiuni Cautare"
+
+#: ../src/gnome2/search_sidebar.c:321
+msgid "Search Scope"
+msgstr "Proportie Cautare"
+
+#: ../src/gnome2/search_sidebar.c:334
+msgid "No scope"
+msgstr "Nici o proportie"
+
+#: ../src/gnome2/search_sidebar.c:344
+msgid "Use bounds"
+msgstr "Foloseste limite"
+
+#: ../src/gnome2/search_sidebar.c:353
+msgid "Last search"
+msgstr "Ultima cautare"
+
+#: ../src/gnome2/search_sidebar.c:368
+msgid "Bounds"
+msgstr "Limite"
+
+#: ../src/gnome2/search_sidebar.c:382
+msgid "Lower"
+msgstr "Mai jos"
+
+#: ../src/gnome2/search_sidebar.c:389
+msgid "Upper"
+msgstr "Mai sus"
+
+#: ../src/gnome2/sidebar.c:1397
+msgid "Search"
+msgstr "Cauta"
+
+#: ../src/gnome2/sidebar.c:1405
+msgid "Verse List"
+msgstr "Lista Verset"
+
+#: ../src/gnome2/sidebar_dialog.c:139
+#: ../src/gnome2/sidebar_dialog.c:148
+msgid "Sidebar"
+msgstr "Bara laterala"
+
+#: ../src/gnome2/splash.c:396
+msgid "Powered by the SWORD Project"
+msgstr "Powered by the SWORD Project"
+
+#: ../src/gnome2/treekey-editor.c:137
+#: ../src/gnome2/treekey-editor.c:196
+#: ../src/gnome2/treekey-editor.c:282
+msgid "Prayer List/Journal Item"
+msgstr "Obiect de Lista/Jurnal de Rugaciune"
+
+#: ../src/gnome2/treekey-editor.c:138
+#: ../src/gnome2/treekey-editor.c:197
+#: ../src/gnome2/treekey-editor.c:283
+msgid "New name"
+msgstr "Nume nou"
+
+#: ../src/gnome2/treekey-editor.c:253
+msgid "Remove the selected item"
+msgstr "Elimina obiectul selectat"
+
+#: ../src/main/display.cc:259
+#, c-format
+msgid ""
+"Improperly encoded personal annotation label:\n"
+"'%s'"
+msgstr ""
+"Eticheta de adnotare personnala encodata impropriu:\n"
+"'%s'"
+
+#: ../src/main/display.cc:386
+msgid ""
+"An image file's size could not be determined.\n"
+"Is ImageMagick's 'identify' not installed?\n"
+"(Or possibly the image is of type other than bmp/gif/jpg/png.)\n"
+"Xiphos cannot resize images to fit window."
+msgstr ""
+"Marimea unui fisier imagine nu s-a putut determina.\n"
+"'Identificarea' din ImageMagick nu e instalata?\n"
+"(Sau probabil imaginea e de alt tip decat bmp/gif/jpg/png.)\n"
+"Xiphos nu poate redimensiona imaginile pentru a se potrivi in fereastra."
+
+#: ../src/main/display.cc:1042
+#: ../src/main/display.cc:1094
+#: ../src/main/display.cc:1171
+#: ../ui/export-dialog.glade.h:7
+msgid "Chapter"
+msgstr "Capitol"
+
+#: ../src/main/main.c:119
+msgid "Xiphos does not understand more than one argument."
+msgstr "Xiphos nu intelege mai mult de un argument."
+
+#: ../src/main/main.c:161
+msgid "Initiating Gecko"
+msgstr "Initializez Gecko"
+
+#: ../src/main/main.c:167
+msgid "Building Interface"
+msgstr "Cladesc Interfata"
+
+#: ../src/main/main.c:171
+msgid "Starting Sword"
+msgstr "Incepe Sword"
+
+#: ../src/main/main.c:175
+msgid "Loading Settings"
+msgstr "Incarcare Setari"
+
+#: ../src/main/main.c:179
+msgid "Displaying Xiphos"
+msgstr "Afisare Xiphos"
+
+#: ../src/main/module_dialogs.cc:227
+#: ../src/main/previewer.cc:127
+#: ../src/main/previewer.cc:194
+#: ../ui/prefs.glade.h:75
+msgid "Previewer"
+msgstr "Revizuitor"
+
+#: ../src/main/module_dialogs.cc:292
+#: ../src/main/module_dialogs.cc:416
+#: ../src/main/previewer.cc:269
+msgid "Footnote"
+msgstr "Nota de subsol"
+
+#: ../src/main/module_dialogs.cc:298
+#: ../src/main/module_dialogs.cc:421
+#: ../src/main/previewer.cc:281
+msgid "Cross Reference"
+msgstr "Trimitere"
+
+#: ../src/main/module_dialogs.cc:304
+#: ../src/main/module_dialogs.cc:318
+#: ../src/main/module_dialogs.cc:426
+#: ../src/main/module_dialogs.cc:438
+#: ../src/main/previewer.cc:287
+#: ../src/main/previewer.cc:306
+msgid "Strongs"
+msgstr "Strongs"
+
+#: ../src/main/module_dialogs.cc:310
+#: ../src/main/module_dialogs.cc:329
+#: ../src/main/module_dialogs.cc:431
+#: ../src/main/module_dialogs.cc:448
+#: ../src/main/previewer.cc:293
+#: ../src/main/previewer.cc:319
+msgid "Morphology"
+msgstr "Morfologie"
+
+#: ../src/main/module_dialogs.cc:1081
+#: ../src/main/url.cc:530
+msgid "Back to "
+msgstr "Inapoi la "
+
+#: ../src/main/parallel_view.cc:404
+#: ../ui/xi-menus.glade.h:89
+msgid "Strong's Numbers"
+msgstr "Numere Strong's"
+
+#: ../src/main/parallel_view.cc:414
+#: ../ui/search-dialog.glade.h:52
+#: ../ui/xi-menus.glade.h:40
+msgid "Footnotes"
+msgstr "Note de subsol"
+
+#: ../src/main/parallel_view.cc:424
+#: ../ui/search-dialog.glade.h:64
+#: ../ui/xi-menus.glade.h:55
+msgid "Morphological Tags"
+msgstr "Etichete Morfologice"
+
+#: ../src/main/parallel_view.cc:434
+#: ../ui/xi-menus.glade.h:44
+msgid "Hebrew Vowel Points"
+msgstr "Puncte de Vocale Ebraice"
+
+#: ../src/main/parallel_view.cc:444
+#: ../ui/xi-menus.glade.h:43
+msgid "Hebrew Cantillation"
+msgstr "Cantilatie Ebraica"
+
+#: ../src/main/parallel_view.cc:454
+#: ../ui/xi-menus.glade.h:41
+msgid "Greek Accents"
+msgstr "Accente Grecesti"
+
+#: ../src/main/parallel_view.cc:464
+msgid "Cross-references"
+msgstr "Trimiteri"
+
+#: ../src/main/parallel_view.cc:474
+#: ../ui/xi-menus.glade.h:50
+msgid "Lemmas"
+msgstr "Leme"
+
+#: ../src/main/parallel_view.cc:484
+#: ../ui/xi-menus.glade.h:42
+msgid "Headings"
+msgstr "Titluri"
+
+#: ../src/main/parallel_view.cc:494
+msgid "Morpheme Segmentation"
+msgstr "Segmentare Morfema"
+
+#: ../src/main/parallel_view.cc:504
+#: ../ui/xi-menus.glade.h:96
+msgid "Words of Christ in Red"
+msgstr "Cuvintele lui Hristos in Rosu"
+
+#: ../src/main/parallel_view.cc:514
+#: ../ui/xi-menus.glade.h:91
+msgid "Transliteration"
+msgstr "Transliteratie"
+
+#: ../src/main/parallel_view.cc:524
+msgid "Textual Variants"
+msgstr "Variante Textuale"
+
+#: ../src/main/parallel_view.cc:532
+#: ../ui/xi-menus.glade.h:70
+msgid "Primary Reading"
+msgstr "Citirea Primara"
+
+#: ../src/main/parallel_view.cc:541
+#: ../ui/xi-menus.glade.h:84
+msgid "Secondary Reading"
+msgstr "Citirea Secundara"
+
+#: ../src/main/parallel_view.cc:550
+#: ../ui/xi-menus.glade.h:9
+msgid "All Readings"
+msgstr "Toate Citirile"
+
+#: ../src/main/parallel_view.cc:884
+#: ../src/main/parallel_view.cc:1136
+msgid "view context"
+msgstr "vezi contextul"
+
+#: ../src/main/prayerlists.cc:74
+msgid "January"
+msgstr "Ianuarie"
+
+#: ../src/main/prayerlists.cc:75
+msgid "February"
+msgstr "Februarie"
+
+#: ../src/main/prayerlists.cc:76
+msgid "March"
+msgstr "Martie"
+
+#: ../src/main/prayerlists.cc:77
+msgid "April"
+msgstr "Aprilie"
+
+#: ../src/main/prayerlists.cc:78
+msgid "May"
+msgstr "Mai"
+
+#: ../src/main/prayerlists.cc:79
+msgid "June"
+msgstr "Iunie"
+
+#: ../src/main/prayerlists.cc:80
+msgid "July"
+msgstr "Iulie"
+
+#: ../src/main/prayerlists.cc:81
+msgid "August"
+msgstr "August"
+
+#: ../src/main/prayerlists.cc:82
+msgid "September"
+msgstr "Septembrie"
+
+#: ../src/main/prayerlists.cc:83
+msgid "October"
+msgstr "Octombrie"
+
+#: ../src/main/prayerlists.cc:84
+msgid "November"
+msgstr "Noiembrie"
+
+#: ../src/main/prayerlists.cc:85
+msgid "December"
+msgstr "Decembrie"
+
+#: ../src/main/prayerlists.cc:124
+#: ../src/main/sword_treekey.cc:332
+msgid "Growth"
+msgstr "Crestere"
+
+#: ../src/main/prayerlists.cc:125
+#: ../src/main/sword_treekey.cc:333
+msgid "<b>For Growth</b><br>"
+msgstr "<b>Pentru Crestere</b><br>"
+
+#: ../src/main/prayerlists.cc:126
+#: ../src/main/prayerlists.cc:383
+#: ../src/main/sword_treekey.cc:334
+msgid "Salvation"
+msgstr "Mantuire"
+
+#: ../src/main/prayerlists.cc:127
+#: ../src/main/sword_treekey.cc:335
+msgid "<b>For Salvation</b><br>"
+msgstr "<b>Pentru Mantuire</b><br>"
+
+#: ../src/main/prayerlists.cc:128
+#: ../src/main/prayerlists.cc:387
+#: ../src/main/sword_treekey.cc:336
+msgid "Health"
+msgstr "Sanatate"
+
+#: ../src/main/prayerlists.cc:129
+#: ../src/main/sword_treekey.cc:337
+msgid "<b>For Health</b><br>"
+msgstr "<b>Pentru Sanatate</b><br>"
+
+#: ../src/main/prayerlists.cc:130
+msgid "Misc"
+msgstr "Diverse"
+
+#: ../src/main/prayerlists.cc:131
+#: ../src/main/sword_treekey.cc:339
+msgid "<b>Miscellaneous</b><br>"
+msgstr "<b>Diverse</b><br>"
+
+#: ../src/main/prayerlists.cc:139
+msgid "Point x"
+msgstr "Punct x"
+
+#: ../src/main/prayerlists.cc:140
+msgid "<b>(x)</b><br>"
+msgstr "<b>(x)</b><br>"
+
+#: ../src/main/prayerlists.cc:141
+msgid "Point y"
+msgstr "Punct y"
+
+#: ../src/main/prayerlists.cc:142
+msgid "<b>(y)</b><br>"
+msgstr "<b>(y)</b><br>"
+
+#: ../src/main/prayerlists.cc:143
+msgid "Point z"
+msgstr "Punct z"
+
+#: ../src/main/prayerlists.cc:144
+msgid "<b>(z)</b><br>"
+msgstr "<b>(z)</b><br>"
+
+#: ../src/main/prayerlists.cc:152
+msgid "Minor Topic 1"
+msgstr "Topic Minor 1"
+
+#: ../src/main/prayerlists.cc:153
+msgid "<b>Subtopic 1</b><br>"
+msgstr "<b>Subtopic 1</b><br>"
+
+#: ../src/main/prayerlists.cc:155
+msgid "Minor Topic 2"
+msgstr "Topic Minor 2"
+
+#: ../src/main/prayerlists.cc:156
+msgid "<b>Subtopic 2</b><br>"
+msgstr "<b>Subtopic 2</b><br>"
+
+#: ../src/main/prayerlists.cc:158
+msgid "Minor Topic 3"
+msgstr "Topic Minor 3"
+
+#: ../src/main/prayerlists.cc:159
+msgid "<b>Subtopic 3</b><br>"
+msgstr "<b>Subtopic 3</b><br>"
+
+#: ../src/main/prayerlists.cc:161
+msgid "Minor Topic 4"
+msgstr "Topic Minor 4"
+
+#: ../src/main/prayerlists.cc:162
+msgid "<b>Subtopic 4</b><br>"
+msgstr "<b>Subtopic 4</b><br>"
+
+#: ../src/main/prayerlists.cc:242
+msgid "Name for new prayer list or journal"
+msgstr "Nume pentru lista noua de rugaciune sau jurnal"
+
+#: ../src/main/prayerlists.cc:273
+msgid "Xiphos finds that prayer list already."
+msgstr "Xiphos a gasit deja lista aceea de rugaciune."
+
+#: ../src/main/prayerlists.cc:286
+#, c-format
+msgid ""
+"Xiphos cannot create module's path:\n"
+"%s"
+msgstr ""
+"Xiphos nu poate crea calea modulului:\n"
+"%s"
+
+#: ../src/main/prayerlists.cc:326
+msgid "A basic prayer list. \\par\\par Module created by Xiphos."
+msgstr "O lista de rugaciune de baza. \\par\\par Modul cread de Xiphos."
+
+#: ../src/main/prayerlists.cc:327
+msgid "BasicPrayerList"
+msgstr "ListaDeRugaciuneDeBaza"
+
+#: ../src/main/prayerlists.cc:341
+msgid "MyPrayerList"
+msgstr "ListaMeaDeRugaciune"
+
+#: ../src/main/prayerlists.cc:342
+msgid "<b>People:</b><br>Bob<br>Sam<br>Sue<br><br><b>Church:</b><br>pews<br>fellowship<br>Bibles for missionaries<br><br><br>"
+msgstr "<b>Oameni:</b><br>Bob<br>Sam<br>Sue<br><br><b>Biserica:</b><br>scaune<br>partasie<br>Biblii pentru misionari<br><br><br>"
+
+#: ../src/main/prayerlists.cc:368
+msgid "A subject-based prayer list. \\par\\par Module created by Xiphos."
+msgstr "O lista de rugaciune bazata pe un subiect. \\par\\par Modul creat de Xiphos."
+
+#: ../src/main/prayerlists.cc:369
+msgid "SubjectPrayerList"
+msgstr "SubiectListaRugaciune"
+
+#: ../src/main/prayerlists.cc:384
+msgid "Bob<br>Sam<br>Sue<br>John<br>"
+msgstr "Bob<br>Sam<br>Sue<br>John<br>"
+
+#: ../src/main/prayerlists.cc:385
+msgid "Spiritual Growth"
+msgstr "Crestere Spirituala"
+
+#: ../src/main/prayerlists.cc:386
+msgid "Mike<br>Steve<br>"
+msgstr "Mike<br>Steve<br>"
+
+#: ../src/main/prayerlists.cc:388
+msgid "Sue<br>John<br>"
+msgstr "Sue<br>John<br>"
+
+#: ../src/main/prayerlists.cc:414
+msgid "A monthly prayer list. \\par\\par Module created by Xiphos."
+msgstr "O lista de rugaciune lunara. \\par\\par Modul cread de Xiphos."
+
+#: ../src/main/prayerlists.cc:415
+msgid "MonthlyPrayerList"
+msgstr "ListaDeRugaciuneLunara"
+
+#: ../src/main/prayerlists.cc:466
+msgid "A daily journal. \\par\\par Module created by Xiphos."
+msgstr "Un jurnal zilnic. \\par\\par Modul cread de Xiphos."
+
+#: ../src/main/prayerlists.cc:467
+msgid "DailyJournal"
+msgstr "JurnalZilnic"
+
+#: ../src/main/prayerlists.cc:531
+msgid "An outlined topic (e.g. sermon). \\par\\par Module created by Xiphos."
+msgstr "Un topic schitat (ex. predica).  \\par\\par Modul cread de Xiphos."
+
+#: ../src/main/prayerlists.cc:532
+msgid "OutlinedTopic"
+msgstr "TopicSchitat"
+
+#: ../src/main/prayerlists.cc:546
+msgid "Major Topic A"
+msgstr "Topic Major A"
+
+#: ../src/main/prayerlists.cc:547
+msgid "<b>Major Topic A</b><br>"
+msgstr "<b>Topic Major A</b><br>"
+
+#: ../src/main/prayerlists.cc:549
+msgid "Major Topic B"
+msgstr "Topic Major B"
+
+#: ../src/main/prayerlists.cc:550
+msgid "<b>Major Topic B</b><br>"
+msgstr "<b>Topic Major B</b><br>"
+
+#: ../src/main/prayerlists.cc:552
+msgid "Major Topic C"
+msgstr "Topic Major C"
+
+#: ../src/main/prayerlists.cc:553
+msgid "<b>Major Topic C</b><br>"
+msgstr "<b>Topic Major C</b><br>"
+
+#: ../src/main/previewer.cc:275
+msgid "User Annotation"
+msgstr "Notarile Userului"
+
+#: ../src/main/search_dialog.cc:212
+#, c-format
+msgid "Search result %s: %s"
+msgstr "Rezultat cautare %s: %s"
+
+#: ../src/main/search_dialog.cc:444
+msgid "Delete Range?"
+msgstr "Sterge Rang?"
+
+#: ../src/main/search_dialog.cc:445
+msgid "Are you sure you want to delete this range?"
+msgstr "Esti sigur ca vrei sa stergi acest rang?"
+
+#: ../src/main/search_dialog.cc:659
+#: ../src/main/search_dialog.cc:1130
+#: ../src/main/search_dialog.cc:1133
+#: ../src/main/search_dialog.cc:1155
+#: ../src/main/search_dialog.cc:1158
+msgid "Search: "
+msgstr "Cauta: "
+
+#: ../src/main/search_dialog.cc:704
+msgid "Remove Module?"
+msgstr "Elimina Modul?"
+
+#: ../src/main/search_dialog.cc:705
+msgid "Are you sure you want to remove the selected module?"
+msgstr "Esti sigur ca vrei sa elimini modulul selectat?"
+
+#: ../src/main/search_dialog.cc:1560
+#, c-format
+msgid ""
+"%s:\n"
+"No such module is installed.\n"
+"%s"
+msgstr ""
+"%s:\n"
+"Nu este un asemenea modul instalat.\n"
+"%s"
+
+#: ../src/main/search_dialog.cc:1562
+msgid "Please adjust the module list."
+msgstr "Te rog sa ajustezi lista de module."
+
+#: ../src/main/search_dialog.cc:1578
+#, c-format
+msgid "No fast-search index exists for %s.%s%s"
+msgstr "Nu exista un index de cautare rapida pentru %s.%s%s"
+
+#: ../src/main/search_dialog.cc:1580
+msgid ""
+"\n"
+"Search on this module is now `multi word'."
+msgstr ""
+"\n"
+"Cautarea in acest modul este acum 'multi cuvant'."
+
+#: ../src/main/search_dialog.cc:1581
+msgid ""
+"\n"
+"See the Module Manager, Maintenance pane."
+msgstr ""
+"\n"
+"Vezi Managerul de Modul, panoul Intretinere."
+
+#: ../src/main/search_dialog.cc:1644
+msgid "Search finished"
+msgstr "Cautare terminata"
+
+#: ../src/main/search_sidebar.cc:100
+msgid "matches"
+msgstr "potriviri"
+
+#: ../src/main/settings.c:60
+msgid ""
+"Welcome to Xiphos.\n"
+"\n"
+"There are no Bible modules installed. In order to initialize, Xiphos needs you to install at least one Bible.\n"
+"\n"
+"With your permission, Xiphos will invoke the Module Manager so that you may install from Crosswire:\n"
+"1. Configure remote install.\n"
+"2. Connect.\n"
+"3. Select a Bible text of your language preference.\n"
+"4. Click `install'.\n"
+"Close the Module Manager when you are done.\n"
+"\n"
+"Warning: If you live in a persecuted country, use with care.\n"
+"\n"
+"May Xiphos invoke the Module Manager so that you may install a Bible?"
+msgstr ""
+"Bun venit la Xiphos.\n"
+"\n"
+"Nu exista nici un modul de Biblie instalat. Pentru a se initializa, Xiphos are nevoie sa instaleze cel putin o Biblie.\n"
+"\n"
+"Cu permisiunea ta, Xiphos va invoca Managerul de Modul ca sa poti instala de la Crosswire:\n"
+"1. Configurarea instalarea indepartata.\n"
+"2. Conectare.\n"
+"3. Selecteaza un text Biblic pentru preferinta ta de limba.\n"
+"4. Apasa pe 'instalare'.\n"
+"Inchide Managerul de Modul cand ai terminat.\n"
+"\n"
+"Atentie: Daca te afli intr-o tara persecutata, foloseste aceasta cu grija.\n"
+"\n"
+"Poate sa invoce Xiphos Managerul de Modul ca sa poti instala o Biblie?"
+
+#: ../src/main/settings.c:105
+msgid "$HOME is not set!"
+msgstr "$HOME nu este setat!"
+
+#: ../src/main/settings.c:120
+#, c-format
+msgid ""
+"Xiphos can not create  .xiphos:\n"
+"%s\n"
+"\n"
+"Xiphos cannot continue."
+msgstr ""
+"Xiphos nu poate crea  .xiphos:\n"
+"%s\n"
+"\n"
+"Xiphos nu poate continua."
+
+#: ../src/main/settings.c:133
+#: ../src/main/settings.c:142
+#: ../src/main/settings.c:151
+msgid "can not create "
+msgstr "nu se poate crea "
+
+#: ../src/main/settings.c:194
+msgid ""
+"There are still no Bibles installed.\n"
+"Evidently, you declined to install any.\n"
+"\n"
+"Without any Bible modules to display,\n"
+"Xiphos cannot proceed,\n"
+"and will now exit."
+msgstr ""
+"Nu exista inca nici o Biblie instalata.\n"
+"Evident, ai declinat sa instalezi vreuna.\n"
+"\n"
+"Fara vreun modul de Biblie pentru afisat,\n"
+"Xiphos nu poate continua,\n"
+"si se va inchide acum."
+
+#: ../src/main/settings.c:198
+msgid "Bible module installation complete."
+msgstr "Instalarea de modul de Biblie s-a incheiat."
+
+#: ../src/main/settings.c:201
+msgid ""
+"Without any Bible modules to display,\n"
+"Xiphos cannot proceed,\n"
+"and will now exit."
+msgstr ""
+"Fara vreun modul de Biblie de afisat,\n"
+"Xiphos nu poate continua,\n"
+"si se va inchide acum."
+
+#: ../src/main/sidebar.cc:399
+msgid "verse"
+msgstr "verset"
+
+#: ../src/main/sidebar.cc:461
+msgid "chapter"
+msgstr "capitol"
+
+#: ../src/main/sword.cc:537
+msgid ""
+"Xiphos's file for language\n"
+"abbreviations is missing."
+msgstr ""
+"Fisierul Xiphos pentru abreviatii\n"
+"de limba lipseste."
+
+#: ../src/main/sword.cc:544
+msgid ""
+"Xiphos's language abbreviation\n"
+"file cannot be opened."
+msgstr ""
+"Fisierul de abreviatie de limba\n"
+"din Xiphos nu poate fi deschis."
+
+#: ../src/main/sword.cc:557
+msgid ""
+"Xiphos cannot allocate space\n"
+"for language abbreviations."
+msgstr ""
+"Xiphos nu poate aloca spatiu\n"
+"pentru abreviatiile de limba."
+
+#: ../src/main/sword.cc:564
+msgid ""
+"Xiphos cannot read the\n"
+"language abbreviation file."
+msgstr ""
+"Xiphos nu poate citi\n"
+"fisierul abreviat de limbaj."
+
+#: ../src/main/sword.cc:642
+msgid "No matching locale found for"
+msgstr "Nici o potrivire de limba pentru"
+
+#: ../src/main/sword.cc:644
+msgid "Book names and menus may not be translated"
+msgstr "Numele de carti si meniurile nu pot fi translatate"
+
+#: ../src/main/sword.cc:1232
+msgid "Daily devotional was requested, but there are none installed."
+msgstr "Devotionalul zilnic a fost solicitat dar nu este nici unu instalat."
+
+#: ../src/main/tab_history.c:219
+msgid "Clear History"
+msgstr "Curata Istoric"
+
+#: ../src/main/url.cc:101
+msgid "URL not found:"
+msgstr "URL negasit:"
+
+#: ../src/main/url.cc:191
+#, c-format
+msgid "Xiphos could not execute %s"
+msgstr "Xiphos nu a putut executa %s"
+
+#: ../src/main/url.cc:199
+msgid "Viewer error:\n"
+msgstr "Eroare vizualizator:\n"
+
+#: ../src/main/url.cc:272
+#, c-format
+msgid "Show %s in main window"
+msgstr "Arata %s in fereastra principala"
+
+#: ../src/main/xml.c:80
+#: ../src/main/xml.c:464
+#, c-format
+msgid "Document not created successfully. \n"
+msgstr "Documentul nu s-a creat cu succes. \n"
+
+#: ../src/main/xml.c:89
+msgid "Personal"
+msgstr "Personal"
+
+#: ../src/main/xml.c:90
+msgid "What must I do to be saved?"
+msgstr "Ce trebuie sa fac pentru a fi mantuit?"
+
+#: ../src/main/xml.c:92
+#: ../src/main/xml.c:93
+msgid "Acts 16:31"
+msgstr "Fapte 16:31"
+
+#: ../src/main/xml.c:97
+#: ../src/main/xml.c:98
+msgid "Eph 2:8,9"
+msgstr "Ef 2:8,9"
+
+#: ../src/main/xml.c:102
+#: ../src/main/xml.c:103
+msgid "Romans 1:16"
+msgstr "Romani 1:16"
+
+#: ../src/main/xml.c:106
+msgid "What is the Gospel?"
+msgstr "Ce este Evanghelia?"
+
+#: ../src/main/xml.c:108
+#: ../src/main/xml.c:109
+msgid "1 Cor 15:1-4"
+msgstr "1 Cor 15:1-4"
+
+#: ../src/main/xml.c:413
+#: ../src/main/xml.c:1144
+#, c-format
+msgid "Document not parsed successfully. \n"
+msgstr "Documentul nu s-a analizat cu succes. \n"
+
+#: ../src/main/xml.c:419
+#: ../src/main/xml.c:747
+#: ../src/main/xml.c:1025
+#: ../src/main/xml.c:1204
+#, c-format
+msgid "empty document \n"
+msgstr "document gol \n"
+
+#: ../src/main/xml.c:425
+#, c-format
+msgid "wrong type, root node != SwordBookmarks\n"
+msgstr "tip gresit, nodul radacina != InsemneSword\n"
+
+#: ../src/main/xml.c:476
+msgid "Old Testament"
+msgstr "Vechiul Testament"
+
+#: ../src/main/xml.c:477
+msgid "Gen - Mal"
+msgstr "Gen - Mal"
+
+#: ../src/main/xml.c:482
+msgid "New Testament"
+msgstr "Noul Testament"
+
+#: ../src/main/xml.c:483
+msgid "Mat - Rev"
+msgstr "Mat - Apoc"
+
+#: ../src/main/xml.c:489
+msgid "Sample Module List"
+msgstr "Mostra de Lista Module"
+
+#: ../src/main/xml.c:753
+#: ../src/main/xml.c:1031
+#, c-format
+msgid "wrong type, root node != %s\n"
+msgstr "tip gresit, nod radacina != %s\n"
+
+#: ../ui/bookmarks.glade.h:1
+msgid "Add Bookmark"
+msgstr "Adauga Insemn"
+
+#: ../ui/bookmarks.glade.h:2
+#: ../ui/markverse.glade.h:1
+msgid "Bookmark Dialog"
+msgstr "Dialog de Insemnari"
+
+#: ../ui/bookmarks.glade.h:3
+msgid "Bookmark Folder Treeview"
+msgstr "Folder de Insemne in forma de arbore"
+
+#: ../ui/bookmarks.glade.h:4
+#: ../ui/markverse.glade.h:2
+msgid "Cancel Bookmark"
+msgstr "Anulare Insemnare"
+
+#: ../ui/bookmarks.glade.h:5
+#: ../ui/markverse.glade.h:3
+msgid "Create new folder"
+msgstr "Creaza un folder nou"
+
+#: ../ui/bookmarks.glade.h:6
+msgid "Label Entry"
+msgstr "Eticheteaza Intrare"
+
+#: ../ui/bookmarks.glade.h:7
+msgid "Label:"
+msgstr "Eticheta:"
+
+#: ../ui/bookmarks.glade.h:8
+#: ../ui/markverse.glade.h:6
+msgid "Module Entry"
+msgstr "Intrare Modul"
+
+#: ../ui/bookmarks.glade.h:9
+#: ../ui/markverse.glade.h:7
+msgid "Module:"
+msgstr "Modul"
+
+#: ../ui/bookmarks.glade.h:10
+msgid "New ..."
+msgstr "Nou ..."
+
+#: ../ui/bookmarks.glade.h:11
+#: ../ui/markverse.glade.h:8
+#: ../ui/xi-menus.glade.h:56
+msgid "New Folder"
+msgstr "Folder Nou"
+
+#: ../ui/bookmarks.glade.h:12
+#: ../ui/markverse.glade.h:10
+msgid "Verse Entry"
+msgstr "Intrare Verset"
+
+#: ../ui/bookmarks.glade.h:13
+#: ../ui/markverse.glade.h:11
+msgid "Verse:"
+msgstr "Verset:"
+
+#: ../ui/editor_note.xml.h:1
+msgid "Delete the current note"
+msgstr "Sterge nota curenta"
+
+#: ../ui/editor_note.xml.h:2
+#: ../ui/editor_studypad.xml.h:4
+#: ../ui/editor.xml.h:2
+msgid "E_xit"
+msgstr "I_esire"
+
+#: ../ui/editor_note.xml.h:3
+#: ../ui/editor_studypad.xml.h:5
+#: ../ui/editor.xml.h:3
+msgid "Exit"
+msgstr "Iesire"
+
+#: ../ui/editor_note.xml.h:4
+#: ../ui/editor_studypad.xml.h:6
+#: ../ui/editor.xml.h:4
+msgid "Exit the program"
+msgstr "Iesire din program"
+
+#: ../ui/editor_note.xml.h:5
+#: ../ui/editor_studypad.xml.h:7
+#: ../ui/editor.xml.h:5
+msgid "For_mat"
+msgstr "For_mat"
+
+#: ../ui/editor_note.xml.h:6
+#: ../ui/editor_studypad.xml.h:8
+#: ../ui/editor.xml.h:6
+msgid "HTML Format switch"
+msgstr "Schimbare format HTML"
+
+#: ../ui/editor_note.xml.h:7
+#: ../ui/editor_studypad.xml.h:9
+#: ../ui/editor.xml.h:7
+msgid "HTML mode"
+msgstr "Mod HTML"
+
+#: ../ui/editor_note.xml.h:8
+msgid "Preview the note to be printed"
+msgstr "Previzualizare nota inainte de tiparire"
+
+#: ../ui/editor_note.xml.h:10
+msgid "Print this note"
+msgstr "Tipareste aceasta nota"
+
+#: ../ui/editor_note.xml.h:12
+msgid "Save the current note"
+msgstr "Salveaza nota curenta"
+
+#: ../ui/editor_note.xml.h:13
+msgid "_Delete Personal Comment"
+msgstr "_Sterge Comentariu Personal"
+
+#: ../ui/editor_note.xml.h:16
+msgid "_Save (Personal Comment)"
+msgstr "_Salveaza (Comentariu Personal)"
+
+#: ../ui/editor_studypad.xml.h:1
+msgid "Add this file to your bookmarks"
+msgstr "Adauga acest fisier la insemnele tale"
+
+#: ../ui/editor_studypad.xml.h:3
+#: ../ui/editor.xml.h:1
+msgid "Create a new document"
+msgstr "Creaza un document nou"
+
+#: ../ui/editor_studypad.xml.h:10
+#: ../ui/editor.xml.h:8
+msgid "New Document"
+msgstr "Document Nou"
+
+#: ../ui/editor_studypad.xml.h:11
+#: ../ui/editor.xml.h:9
+msgid "Open"
+msgstr "Deschide"
+
+#: ../ui/editor_studypad.xml.h:12
+msgid "Open a file in Studypad"
+msgstr "Deschide un fisier in Caietul de Studiu"
+
+#: ../ui/editor_studypad.xml.h:13
+msgid "Preview the document to be printed"
+msgstr "Previzualizare document inainte de tiparire"
+
+#: ../ui/editor_studypad.xml.h:15
+msgid "Print this document"
+msgstr "Tipareste acest document"
+
+#: ../ui/editor_studypad.xml.h:17
+msgid "Save AS"
+msgstr "Salveaza CA"
+
+#: ../ui/editor_studypad.xml.h:18
+#: ../ui/editor.xml.h:12
+msgid "Save the current file"
+msgstr "Salveaza fisierul curent"
+
+#: ../ui/editor_studypad.xml.h:19
+msgid "Save the current file as"
+msgstr "Salveaza fisierul curent ca"
+
+#: ../ui/editor.xml.h:10
+msgid "Open the file in Studypad"
+msgstr "Deschide fisierul in Caietul de Studiu"
+
+#: ../ui/export-dialog.glade.h:1
+msgid ": "
+msgstr ": "
+
+#: ../ui/export-dialog.glade.h:2
+msgid "<b>Copy</b>"
+msgstr "<b>Copiaza</b>"
+
+#: ../ui/export-dialog.glade.h:3
+msgid "<b>Export</b>"
+msgstr "<b>Exporta</b>"
+
+#: ../ui/export-dialog.glade.h:4
+msgid "<b>Format</b>"
+msgstr "<b>Formatare</b>"
+
+#: ../ui/export-dialog.glade.h:5
+#: ../ui/prefs.glade.h:25
+msgid "Book"
+msgstr "Carte"
+
+#: ../ui/export-dialog.glade.h:6
+msgid "Book Radio Button"
+msgstr "Buton Radio Carte"
+
+#: ../ui/export-dialog.glade.h:8
+msgid "Chapter Radio Button"
+msgstr "Buton Radio Capitol"
+
+#: ../ui/export-dialog.glade.h:9
+#: ../ui/xi-menus.glade.h:18
+msgid "Copy/Export Passage"
+msgstr "Copiaza/Exporta Pasaj"
+
+#: ../ui/export-dialog.glade.h:10
+msgid "Export Passage Cancel"
+msgstr "Anulare Exportare Pasaj"
+
+#: ../ui/export-dialog.glade.h:11
+msgid "Export Passage OK"
+msgstr "OK Exportare Pasaj"
+
+#: ../ui/export-dialog.glade.h:12
+msgid "Export complete book"
+msgstr "Exporta toata cartea"
+
+#: ../ui/export-dialog.glade.h:13
+msgid "Export complete chapter"
+msgstr "Exporta tot capitolul"
+
+#: ../ui/export-dialog.glade.h:14
+msgid "Export single verse"
+msgstr "Exporta versetul singur"
+
+#: ../ui/export-dialog.glade.h:15
+msgid "HTML"
+msgstr "HTML"
+
+#: ../ui/export-dialog.glade.h:16
+msgid "HTML Radio Button"
+msgstr "Buton Radio HTML"
+
+#: ../ui/export-dialog.glade.h:17
+msgid "Key"
+msgstr "Cheie"
+
+#: ../ui/export-dialog.glade.h:18
+msgid "Plain Text"
+msgstr "Text simplu"
+
+#: ../ui/export-dialog.glade.h:19
+msgid "Plain Text Radio Button"
+msgstr "Buton Radio Text Simplu"
+
+#: ../ui/export-dialog.glade.h:21
+msgid "Save Export As"
+msgstr "Salveaza Exportarea Ca"
+
+#: ../ui/export-dialog.glade.h:22
+msgid "Verse"
+msgstr "Verset"
+
+#: ../ui/export-dialog.glade.h:23
+msgid "Verse Radio Button"
+msgstr "Buton Radio Verset"
+
+#: ../ui/export-dialog.glade.h:24
+msgid "Verse range"
+msgstr "Rang verset"
+
+#: ../ui/export-dialog.glade.h:25
+msgid "Version"
+msgstr "Versiune"
+
+#: ../ui/markverse.glade.h:4
+msgid "Mark"
+msgstr "Marcare"
+
+#: ../ui/markverse.glade.h:5
+msgid "Mark/Unmark Verse"
+msgstr "Marcare/Nemarcare Verset"
+
+#: ../ui/markverse.glade.h:9
+msgid "Unmark"
+msgstr "Nemarcare"
+
+#: ../ui/module-manager.glade.h:1
+msgid "<b>Add and Remove Sources</b>"
+msgstr "<b>Adauga si Elimina Surse</b>"
+
+#: ../ui/module-manager.glade.h:2
+msgid "<b>Install Destination</b>"
+msgstr "<b>Destinatie Instalare</b>"
+
+#: ../ui/module-manager.glade.h:3
+msgid "<b>Install Source</b>"
+msgstr "<b>Sursa Instalare</b>"
+
+#: ../ui/module-manager.glade.h:4
+msgid "<b>Module Manager</b>"
+msgstr "<b>Manager Module</b>"
+
+#. do not translate <b> and </b> they are html formating
+#: ../ui/module-manager.glade.h:6
+msgid "<b>Sword</b>"
+msgstr "<b>Sword</b>"
+
+#: ../ui/module-manager.glade.h:7
+msgid "<b>WARNING:</b> If you live in a persecuted country use with care."
+msgstr "<b>ATENTIE:</b> Daca traiesti intr-o tara persecutata foloseste cu atentie."
+
+#: ../ui/module-manager.glade.h:8
+msgid "<b>Warning:</b> If you live in a persecuted country and do not wish to risk detection you should NOT use  the remote installation feature! "
+msgstr "<b>Atentie:</b> Daca traiesti intr-o tara persecutate si nu vrei sa risti detectarea NU ar trebui sa folosest caracteristica de instalare indepartata! "
+
+#: ../ui/module-manager.glade.h:9
+msgid "<i>Personal area, for your use only:</i>"
+msgstr "<i>Zona personala, doar pentru folosul tau:</i>"
+
+#: ../ui/module-manager.glade.h:10
+msgid "<i>System area, for all users:</i>"
+msgstr "<i>Zona de sistem, pentru toti userii:</i>"
+
+#: ../ui/module-manager.glade.h:12
+msgid "Continue"
+msgstr "Continua"
+
+#: ../ui/module-manager.glade.h:13
+msgid "Current Remote Sources"
+msgstr "Surse Indepartate Curente"
+
+#: ../ui/module-manager.glade.h:14
+msgid "Current local sources"
+msgstr "Surse locale curente"
+
+#: ../ui/module-manager.glade.h:15
+msgid "Delete Index"
+msgstr "Sterge Index"
+
+#: ../ui/module-manager.glade.h:16
+msgid "Home dir"
+msgstr "Dir Home"
+
+#: ../ui/module-manager.glade.h:19
+msgid "Load Standard"
+msgstr "Incarca Standard"
+
+#: ../ui/module-manager.glade.h:20
+msgid "Local"
+msgstr "Local"
+
+#: ../ui/module-manager.glade.h:21
+msgid "Local Install Folder"
+msgstr "Folderul Instalare Local"
+
+#: ../ui/module-manager.glade.h:22
+msgid "Module Manager"
+msgstr "Manager Module"
+
+#: ../ui/module-manager.glade.h:23
+msgid "Remote"
+msgstr "Indepartat"
+
+#: ../ui/module-manager.glade.h:24
+msgid "Sword sys dir"
+msgstr "Sword dir sistem"
+
+#: ../ui/navbar_versekey.glade.h:1
+msgid "1"
+msgstr "1"
+
+#: ../ui/navbar_versekey.glade.h:2
+msgid "<b>Revelation of John</b>"
+msgstr "<b>Apocalipsa lui Ioan</b>"
+
+#: ../ui/navbar_versekey.glade.h:3
+msgid "Book Selector Button"
+msgstr "Buton Selector Carte"
+
+#: ../ui/navbar_versekey.glade.h:4
+msgid "Choose book to display"
+msgstr "Alege cartea de afisat"
+
+#: ../ui/navbar_versekey.glade.h:5
+msgid "Drop down history list"
+msgstr "Lista derulativa cu istoric"
+
+#: ../ui/navbar_versekey.glade.h:6
+msgid "Reference Entry"
+msgstr "Intrare Referinta"
+
+#: ../ui/navbar_versekey.glade.h:7
+msgid "Toggle Chapter Button"
+msgstr "Buton Schimbare Capitol"
+
+#: ../ui/navbar_versekey.glade.h:8
+msgid "Toggle Verse Button"
+msgstr "Buton Schimbare Verset"
+
+#: ../ui/prefs.glade.h:1
+msgid ""
+"-2\n"
+"-1\n"
+"+0\n"
+"+1\n"
+"+2\n"
+"+3\n"
+"+4\n"
+"+5"
+msgstr ""
+"-2\n"
+"-1\n"
+"+0\n"
+"+1\n"
+"+2\n"
+"+3\n"
+"+4\n"
+"+5"
+
+#: ../ui/prefs.glade.h:9
+msgid "<b>Font Colors</b>"
+msgstr "<b>Culori Font</b>"
+
+#: ../ui/prefs.glade.h:10
+msgid "<b>Font Sizes</b>"
+msgstr "<b>Marimi Font</b>"
+
+#: ../ui/prefs.glade.h:11
+msgid "<b>General</b>"
+msgstr "<b>General</b>"
+
+#: ../ui/prefs.glade.h:12
+msgid "<b>Main Window Modules</b>"
+msgstr "<b>Module Fereastra Principala</b>"
+
+#: ../ui/prefs.glade.h:13
+msgid "<b>Parallel View</b>"
+msgstr "<b>Vedere Paralela</b>"
+
+#: ../ui/prefs.glade.h:14
+msgid "<b>Show</b>"
+msgstr "<b>Arata</b>"
+
+#: ../ui/prefs.glade.h:15
+msgid "<b>Special Purpose Modules</b>"
+msgstr "<b>Module cu Scop Special</b>"
+
+#: ../ui/prefs.glade.h:16
+msgid "<b>StudyPad default directory</b>"
+msgstr "<b>Directorul implicit al Caietului de Studiu</b>"
+
+#: ../ui/prefs.glade.h:17
+msgid "<b>Tabs</b>"
+msgstr "<b>Tab-uri</b>"
+
+#: ../ui/prefs.glade.h:18
+msgid "Apply high-contrast highlight to current verse"
+msgstr "Aplica o marcare de contrast mare la versetul curent"
+
+#: ../ui/prefs.glade.h:19
+msgid "Automatically resize commentary, book, and dictionary image content to fit subwindow"
+msgstr "Redimensioneaza automat comentariul, cartea si continutul imaginii din dictionar pentru a se potrivi sub-ferestrei"
+
+#: ../ui/prefs.glade.h:20
+msgid "Background"
+msgstr "Fundal"
+
+#: ../ui/prefs.glade.h:21
+msgid "Base font size"
+msgstr "Marime font de baza"
+
+#: ../ui/prefs.glade.h:22
+msgid "Bible Texts"
+msgstr "Texte Biblie"
+
+#: ../ui/prefs.glade.h:23
+msgid "Bible Texts Checkbox"
+msgstr "Casuta de verificare Texte Biblie"
+
+#: ../ui/prefs.glade.h:24
+msgid "Biblical Text"
+msgstr "Text Biblic"
+
+#: ../ui/prefs.glade.h:26
+msgid "Change Biblical Text Combo"
+msgstr "Schimba Combo Text Biblic"
+
+#: ../ui/prefs.glade.h:27
+msgid "Change Book Combo"
+msgstr "Schimba Combo Carte"
+
+#: ../ui/prefs.glade.h:28
+msgid "Change Commentary Combo"
+msgstr "Schimba Combo Comentariu"
+
+#: ../ui/prefs.glade.h:29
+msgid "Change Default Dictionary Combo"
+msgstr "Schimba Combo Dictionar Implicit"
+
+#: ../ui/prefs.glade.h:30
+msgid "Change Dictionary Combo"
+msgstr "Schimba Combo Dictionar"
+
+#: ../ui/prefs.glade.h:31
+msgid "Change Personal Notes Combo"
+msgstr "Schimba Combo Note Personale"
+
+#: ../ui/prefs.glade.h:32
+msgid "Choose to enable Prayer lists "
+msgstr "Alege sa activezi listele de Rugaciune "
+
+#: ../ui/prefs.glade.h:34
+msgid "Commentaries Checkbox"
+msgstr "Casuta de verificare Comentarii"
+
+#: ../ui/prefs.glade.h:36
+msgid "Cover"
+msgstr "Coperta"
+
+#: ../ui/prefs.glade.h:37
+msgid "Current Verse"
+msgstr "Verset Curent"
+
+#: ../ui/prefs.glade.h:38
+msgid "Daily Devotional"
+msgstr "Devotional Zilnic"
+
+#: ../ui/prefs.glade.h:39
+msgid "Daily Devotional Combo"
+msgstr "Combo Devotional Zilnic"
+
+#: ../ui/prefs.glade.h:40
+msgid "Default Dictionary"
+msgstr "Dictionar Implicit"
+
+#: ../ui/prefs.glade.h:41
+msgid "Dictionary"
+msgstr "Dictionar"
+
+#: ../ui/prefs.glade.h:42
+msgid "Dictionary/Lexicon"
+msgstr "Dictionar/Lexicon"
+
+#: ../ui/prefs.glade.h:43
+msgid "Dictionary/Lexicon Checkbox"
+msgstr "Casuta de verificare Dictionar/Lexicon"
+
+#: ../ui/prefs.glade.h:44
+msgid "Enable Prayer Lists"
+msgstr "Activare Liste de Rugaciune"
+
+#: ../ui/prefs.glade.h:45
+msgid "Enable Prayer Lists Checkbox"
+msgstr "Activeaza casuta de verificare Liste de Rugaciune"
+
+#: ../ui/prefs.glade.h:46
+msgid "Font Colors"
+msgstr "Culori Font"
+
+#: ../ui/prefs.glade.h:47
+msgid "Font Misc"
+msgstr "Diverse despre Font"
+
+#: ../ui/prefs.glade.h:48
+msgid "Foreground"
+msgstr "Prim-plan"
+
+#: ../ui/prefs.glade.h:49
+msgid "General Misc"
+msgstr "Diverse Generale"
+
+#: ../ui/prefs.glade.h:50
+msgid "Greek Lexicon"
+msgstr "Lexicon Grec"
+
+#: ../ui/prefs.glade.h:51
+msgid "Greek Lexicon Combo"
+msgstr "Combo Lexicon Grec"
+
+#: ../ui/prefs.glade.h:52
+msgid "Hebrew Lexicon"
+msgstr "Lexicon Ebraic"
+
+#: ../ui/prefs.glade.h:53
+msgid "Hebrew Lexicon Combo"
+msgstr "Combo Lexicon Ebraic"
+
+#: ../ui/prefs.glade.h:54
+msgid "Highlight Background"
+msgstr "Marcheaza Fundalul"
+
+#: ../ui/prefs.glade.h:55
+msgid "Highlight Foreground"
+msgstr "Marcheaza Prim-Planul"
+
+#: ../ui/prefs.glade.h:56
+msgid "Highlight current verse"
+msgstr "Marcheaza versetul curent"
+
+#: ../ui/prefs.glade.h:57
+msgid "Highlight current verse check box"
+msgstr "Marcheaza casuta versetului curent"
+
+#: ../ui/prefs.glade.h:58
+msgid "Links"
+msgstr "Link-uri"
+
+#: ../ui/prefs.glade.h:59
+msgid "Modules Main"
+msgstr "Module Principal"
+
+#: ../ui/prefs.glade.h:60
+msgid "Modules Misc"
+msgstr "Diverse despre Module"
+
+#: ../ui/prefs.glade.h:61
+msgid "Modules Parallel"
+msgstr "Paralela Module"
+
+#: ../ui/prefs.glade.h:62
+msgid "Parallel 1"
+msgstr "Paralela 1"
+
+#: ../ui/prefs.glade.h:63
+msgid "Parallel 1 Combo"
+msgstr "Combo Paralela 1"
+
+#: ../ui/prefs.glade.h:64
+msgid "Parallel 2"
+msgstr "Paralela 2"
+
+#: ../ui/prefs.glade.h:65
+msgid "Parallel 2 Combo"
+msgstr "Combo Paralela 2"
+
+#: ../ui/prefs.glade.h:66
+msgid "Parallel 3"
+msgstr "Paralela 3"
+
+#: ../ui/prefs.glade.h:67
+msgid "Parallel 3 Combo"
+msgstr "Combo Paralela 3"
+
+#: ../ui/prefs.glade.h:68
+msgid "Parallel 4"
+msgstr "Paralela 4"
+
+#: ../ui/prefs.glade.h:69
+msgid "Parallel 4 Combo"
+msgstr "Combo Paralela 4"
+
+#: ../ui/prefs.glade.h:70
+msgid "Parallel 5"
+msgstr "Paralela 5"
+
+#: ../ui/prefs.glade.h:71
+msgid "Parallel 5 Combo"
+msgstr "Combo Paralela 5"
+
+#: ../ui/prefs.glade.h:72
+msgid "Parallel View in a tab"
+msgstr "Vedere Paralela intr-un tab"
+
+#: ../ui/prefs.glade.h:73
+msgid "Personal Notes"
+msgstr "Note Personale"
+
+#: ../ui/prefs.glade.h:76
+msgid "Previewer Checkbox"
+msgstr "Lista verificare Revizuitor"
+
+#: ../ui/prefs.glade.h:77
+msgid "Resize images"
+msgstr "Dimensionare imagini"
+
+#: ../ui/prefs.glade.h:78
+msgid "Resize images checkbox"
+msgstr "Lista verificare dimensionare imagini"
+
+#: ../ui/prefs.glade.h:79
+msgid "Scroll to Previous/Next Chapter"
+msgstr "Mergi la Capitolul Anterior/Urmator"
+
+#: ../ui/prefs.glade.h:80
+msgid "Scroll to Previous/Next Chapter Checkbox"
+msgstr "Casuta de verificare Capitol Anterior/Urmator"
+
+#: ../ui/prefs.glade.h:81
+msgid "Select A Directory"
+msgstr "Selecteaza Un Director"
+
+#: ../ui/prefs.glade.h:82
+msgid "Show Daily Devotion at start up"
+msgstr "Arata Devotionalul Zilnic la incepere"
+
+#: ../ui/prefs.glade.h:83
+msgid "Show splash screen at start up"
+msgstr "Arata ecranul de pornire la incepere"
+
+#: ../ui/prefs.glade.h:84
+msgid "Special Locale (requires restart)"
+msgstr "Limba Speciala (necesita restartare)"
+
+#: ../ui/prefs.glade.h:85
+msgid "Special Locale Combo"
+msgstr "Combo Limba Speciala"
+
+#: ../ui/prefs.glade.h:86
+msgid "StudyPad default directory combo"
+msgstr "Directorul implicit combo Caiet de Studiu"
+
+#: ../ui/prefs.glade.h:88
+msgid "Use Bible Text scroll bar to scroll to previous or next chapter"
+msgstr "Foloseste bara de derulare a Textului BIbliei pentru capitolul anterior sau urmator"
+
+#: ../ui/prefs.glade.h:89
+msgid "Use Verse Per Line"
+msgstr "Foloseste Verset Per Linie"
+
+#: ../ui/prefs.glade.h:90
+msgid "Use Verse Per Line Checkbox"
+msgstr "Casuta de verificare Verset Per Linie"
+
+#: ../ui/prefs.glade.h:91
+msgid "Use default Dictionary"
+msgstr "Foloseste Dictionarul implicit"
+
+#: ../ui/prefs.glade.h:92
+msgid "Use default Dictionary Checkbox"
+msgstr "Casuta de verificare folosire Dictionar implicit"
+
+#: ../ui/prefs.glade.h:93
+msgid "Use tabbed browsing"
+msgstr "Foloseste rasfoire in taburi"
+
+#: ../ui/prefs.glade.h:94
+msgid "Use tabbed browsing Checkbox"
+msgstr "Casuta de verificare folosire rasfoire in tab-uri"
+
+#: ../ui/prefs.glade.h:95
+msgid "Verse Number"
+msgstr "Numar Verset"
+
+#: ../ui/prefs.glade.h:96
+msgid "Verse number size"
+msgstr "Marime numar verset"
+
+#: ../ui/search-dialog.glade.h:1
+msgid "<b>Attribute</b>"
+msgstr "<b>Atribut</b>"
+
+#: ../ui/search-dialog.glade.h:2
+msgid "<b>Found</b>"
+msgstr "<b>Gasit</b>"
+
+#: ../ui/search-dialog.glade.h:3
+msgid "<b>List Name</b>"
+msgstr "<b>Nume Lista</b>"
+
+#: ../ui/search-dialog.glade.h:4
+msgid "<b>Module Lists</b>"
+msgstr "<b>Lista Module</b>"
+
+#: ../ui/search-dialog.glade.h:5
+msgid "<b>Modules</b>"
+msgstr "<b>Module</b>"
+
+#: ../ui/search-dialog.glade.h:6
+msgid "<b>Options</b>"
+msgstr "<b>Optiuni</b>"
+
+#: ../ui/search-dialog.glade.h:7
+msgid "<b>Preview</b>"
+msgstr "<b>Previzualizare</b>"
+
+#: ../ui/search-dialog.glade.h:8
+msgid "<b>Range Definition</b>"
+msgstr "<b>Rang Definire</b>"
+
+#: ../ui/search-dialog.glade.h:9
+msgid "<b>Range Name</b>"
+msgstr "<b>Rang Nume</b>"
+
+#: ../ui/search-dialog.glade.h:10
+msgid "<b>Ranges</b>"
+msgstr "<b>Ranguri</b>"
+
+#: ../ui/search-dialog.glade.h:11
+msgid "<b>Results Display Options</b>"
+msgstr "<b>Optiuni Afisare Rezultate</b>"
+
+#: ../ui/search-dialog.glade.h:12
+msgid "<b>Scope</b>"
+msgstr "<b>Scop</b>"
+
+#: ../ui/search-dialog.glade.h:13
+msgid "<b>Search Results</b>"
+msgstr "<b>Rezultate Cautare</b>"
+
+#: ../ui/search-dialog.glade.h:14
+msgid "<b>Search Type</b>"
+msgstr "<b>Tip Cautare</b>"
+
+#: ../ui/search-dialog.glade.h:15
+msgid "Add Modules"
+msgstr "Adauga Module"
+
+#: ../ui/search-dialog.glade.h:16
+msgid "Advanced Search"
+msgstr "Cautare Avansata"
+
+#: ../ui/search-dialog.glade.h:17
+msgid "Attribute Search"
+msgstr "Atribut Cautare"
+
+#: ../ui/search-dialog.glade.h:18
+msgid "Attributes"
+msgstr "Atribute"
+
+#: ../ui/search-dialog.glade.h:19
+msgid "Attributes radiobutton"
+msgstr "Buton Radio Atribute"
+
+#: ../ui/search-dialog.glade.h:20
+msgid "Clear Custom Module List Button"
+msgstr "Curata Modulul la Comanda din Butonul de lista"
+
+#: ../ui/search-dialog.glade.h:21
+msgid "Clear Modules from List Button"
+msgstr "Curata Modulele din Butonul Lista"
+
+#: ../ui/search-dialog.glade.h:22
+msgid "Clear all modules from the list"
+msgstr "Curata toate modulele din lista"
+
+#: ../ui/search-dialog.glade.h:23
+msgid "Clear lists for new search"
+msgstr "Curata listele pentru cautare noua"
+
+#: ../ui/search-dialog.glade.h:24
+msgid "Create a new module list"
+msgstr "Creaza o lista noua de module"
+
+#: ../ui/search-dialog.glade.h:25
+msgid "Create new custom range"
+msgstr "Creaza rang nou la  comanda"
+
+#: ../ui/search-dialog.glade.h:26
+msgid "Current results"
+msgstr "Rezultate curente"
+
+#: ../ui/search-dialog.glade.h:27
+msgid "Current results radiobutton"
+msgstr "Buton Radio rezultate curente"
+
+#: ../ui/search-dialog.glade.h:28
+msgid "Custom Module List Combo"
+msgstr "Combo Lista Module la Comanda"
+
+#: ../ui/search-dialog.glade.h:29
+msgid "Custom Module List Name Entry"
+msgstr "Nume Intrare Lista Module la Comanda"
+
+#: ../ui/search-dialog.glade.h:30
+msgid "Custom Module Lists"
+msgstr "Liste Module la Comanda"
+
+#: ../ui/search-dialog.glade.h:31
+msgid "Custom Range Preview"
+msgstr "Rang la Comanda de Previzualizare"
+
+#: ../ui/search-dialog.glade.h:32
+msgid "Custom Range Selector Combo"
+msgstr "Combo Selector Rang la Comanda"
+
+#: ../ui/search-dialog.glade.h:33
+msgid "Custom Verse Ranges"
+msgstr "Ranguri Verset la Comanda"
+
+#: ../ui/search-dialog.glade.h:34
+msgid "Custom module list"
+msgstr "Lista module la comanda"
+
+#: ../ui/search-dialog.glade.h:35
+msgid "Custom module list radiobutton"
+msgstr "Buton radio lista module la comanda"
+
+#: ../ui/search-dialog.glade.h:36
+msgid "Custom verse range"
+msgstr "Rang verset la comanda"
+
+#: ../ui/search-dialog.glade.h:37
+msgid "Custom verse range radiobutton"
+msgstr "Buton radio rang verset la comanda"
+
+#: ../ui/search-dialog.glade.h:38
+msgid "Delete Range Button"
+msgstr "Sterge Butonul Rang"
+
+#: ../ui/search-dialog.glade.h:39
+msgid "Delete Selected Module From List Button"
+msgstr "Sterge Modulul Selectat din Butonul Lista"
+
+#: ../ui/search-dialog.glade.h:40
+msgid "Delete selected range"
+msgstr "Sterge rangul selectat"
+
+#: ../ui/search-dialog.glade.h:41
+msgid "Delete the selected list"
+msgstr "Sterge lista selectata"
+
+#: ../ui/search-dialog.glade.h:42
+msgid "Entire module"
+msgstr "Intregul modul"
+
+#: ../ui/search-dialog.glade.h:43
+msgid "Entire module radiobutton"
+msgstr "Buton radio intregul modul"
+
+#: ../ui/search-dialog.glade.h:45
+msgid "Exact phrase radiobutton"
+msgstr "Buton radio fraza exacta"
+
+#: ../ui/search-dialog.glade.h:46
+msgid "Export"
+msgstr "Exporta"
+
+#: ../ui/search-dialog.glade.h:47
+msgid "Export current search results"
+msgstr "Exporta rezultatele curente de cautare"
+
+#: ../ui/search-dialog.glade.h:48
+msgid ""
+"Fast, featureful, index-based search\n"
+"Indexes must have been built beforehand:\n"
+"See Module Manager's maintenance functions"
+msgstr ""
+"Cautare rapida, plina de caracteristici, bazata pe index\n"
+"Indexurile trebuiesc sa fie construite in prealabil:\n"
+"Vezi functiile de intretinere de la Managerul de Module"
+
+#: ../ui/search-dialog.glade.h:51
+msgid "Find Button"
+msgstr "Buton Cautare"
+
+#: ../ui/search-dialog.glade.h:53
+msgid "Footnotes radiobutton"
+msgstr "Buton radio note de subsol"
+
+#: ../ui/search-dialog.glade.h:54
+msgid "In modules that have Footnotes"
+msgstr "In modulele care au Note de Subsol"
+
+#: ../ui/search-dialog.glade.h:55
+msgid "In modules that have Morphological Tags"
+msgstr "In modulele care au Tag-uri Morfologice"
+
+#: ../ui/search-dialog.glade.h:56
+msgid "In modules that have Strong's Numbers"
+msgstr "In modulele care ah Numere Strong's"
+
+#: ../ui/search-dialog.glade.h:57
+msgid "Main Search Entry"
+msgstr "Intrarea de Cautare Principala"
+
+#: ../ui/search-dialog.glade.h:58
+msgid "Make selections on the Attribute Search tab"
+msgstr "Fa selectii la tab-ul de Atribute Cautare"
+
+#: ../ui/search-dialog.glade.h:60
+msgid "Match case checkbox"
+msgstr "Casuta de verificare Marcheaza cazul"
+
+#: ../ui/search-dialog.glade.h:61
+msgid "Module Selection"
+msgstr "Selectie Module"
+
+#: ../ui/search-dialog.glade.h:62
+msgid "Module list"
+msgstr "Lista module"
+
+#: ../ui/search-dialog.glade.h:63
+msgid "Module list radiobutton"
+msgstr "Buton radio lista module"
+
+#: ../ui/search-dialog.glade.h:65
+msgid "Morphological Tags radiobutton"
+msgstr "Buton radio Tag-uri Morfologice"
+
+#: ../ui/search-dialog.glade.h:67
+msgid "Multi word radiobutton"
+msgstr "Buton radio multi-cuvant"
+
+#: ../ui/search-dialog.glade.h:68
+msgid "New Custom Module List Button"
+msgstr "Buton Lista Modul Nou la Comanda"
+
+#: ../ui/search-dialog.glade.h:69
+msgid "New Range Button"
+msgstr "Buton Rang Nou"
+
+#: ../ui/search-dialog.glade.h:70
+msgid "Open Selection Dialog Button"
+msgstr "Buton de Dialog Deschidere Selectie"
+
+#: ../ui/search-dialog.glade.h:71
+msgid "Open a dialog to select modules to add to the list"
+msgstr "Deschide un dialog pentru a selecta modulele de adaugat la lista"
+
+#: ../ui/search-dialog.glade.h:72
+msgid "Optimized (\"Lucene\")"
+msgstr "Optimizat (\"Lucene\")"
+
+#: ../ui/search-dialog.glade.h:73
+msgid "Optimized (\"Lucene\") radiobutton"
+msgstr "Buton radio Optimizat (\"Lucene\")"
+
+#: ../ui/search-dialog.glade.h:74
+msgid "Range Definition Entry"
+msgstr "Intrare Rang Definire"
+
+#: ../ui/search-dialog.glade.h:75
+msgid "Range Name Entry"
+msgstr "Intrare Nume Rang"
+
+#: ../ui/search-dialog.glade.h:77
+msgid "Regular expression radiobutton"
+msgstr "Buton radio expresie regulata"
+
+#: ../ui/search-dialog.glade.h:78
+msgid "Remove the selected module from the list"
+msgstr "Elimina modulul selectat din lista"
+
+#: ../ui/search-dialog.glade.h:79
+msgid "Result Summary Table"
+msgstr "Tabelul Sumar de Rezultate"
+
+#: ../ui/search-dialog.glade.h:80
+msgid "Result Summary Window"
+msgstr "Fereastra Sumar de Rezultate"
+
+#: ../ui/search-dialog.glade.h:81
+msgid "Results"
+msgstr "Rezultate"
+
+#: ../ui/search-dialog.glade.h:82
+msgid "Save Custom Module List Button"
+msgstr "Salvare Buton Lista Modul la Comanda"
+
+#: ../ui/search-dialog.glade.h:83
+msgid "Save Range Button"
+msgstr "Buton Salveaza Rang"
+
+#: ../ui/search-dialog.glade.h:84
+msgid "Save custom range"
+msgstr "Salveaza rangul la comanda"
+
+#: ../ui/search-dialog.glade.h:85
+msgid "Save search results as bookmarks"
+msgstr "Salveaza rezultatele de cautare ca insemnari"
+
+#: ../ui/search-dialog.glade.h:86
+msgid "Save the module list"
+msgstr "Salveaza lista de module"
+
+#: ../ui/search-dialog.glade.h:87
+msgid "Search  Criteria"
+msgstr "Criteriu de Cautare"
+
+#: ../ui/search-dialog.glade.h:88
+msgid "Search Criteria Treeview"
+msgstr "Criteriu de Cautare in forma de arbore"
+
+#: ../ui/search-dialog.glade.h:89
+msgid "Search entire module"
+msgstr "Cauta intregul modul"
+
+#: ../ui/search-dialog.glade.h:90
+msgid "Search for Morphological tags"
+msgstr "Cauta tag-uri Morfologice"
+
+#: ../ui/search-dialog.glade.h:91
+msgid "Search for Strongs Numbers like G4442 or H1121"
+msgstr "Cauta Numere Strongs de genul G4442 sau H11121"
+
+#: ../ui/search-dialog.glade.h:92
+msgid "Search in footnotes"
+msgstr "Cauta in note de subsol"
+
+#: ../ui/search-dialog.glade.h:93
+msgid "Show Footnotes"
+msgstr "Arata Note de Subsol"
+
+#: ../ui/search-dialog.glade.h:94
+msgid "Show Footnotes checkbox"
+msgstr "Casuta de verificare Arata Note de Subsol"
+
+#: ../ui/search-dialog.glade.h:95
+msgid "Show Morphological Tags"
+msgstr "Arata Tag-urile Morfologice"
+
+#: ../ui/search-dialog.glade.h:96
+msgid "Show Morphological Tags checkbox"
+msgstr "Casuta de verificare Arata Tag-urile Morfologice"
+
+#: ../ui/search-dialog.glade.h:97
+msgid "Show Strong's Numbers"
+msgstr "Arata Numerele Strong's"
+
+#: ../ui/search-dialog.glade.h:98
+msgid "Show Strong's Numbers checkbox"
+msgstr "Casuta de verificare Arata Numerele Strong's"
+
+#: ../ui/search-dialog.glade.h:99
+msgid "Show in main window"
+msgstr "Arata in fereastra principala"
+
+#: ../ui/search-dialog.glade.h:100
+msgid "Single module"
+msgstr "Modul singur"
+
+#: ../ui/search-dialog.glade.h:101
+msgid "Single module radiobutton"
+msgstr "Buton radio modul singur"
+
+#: ../ui/search-dialog.glade.h:102
+msgid "Start/stop searching"
+msgstr "Incepe/opreste cautarea"
+
+#: ../ui/search-dialog.glade.h:103
+msgid "Strongs Numbers"
+msgstr "Numere Strongs"
+
+#: ../ui/search-dialog.glade.h:104
+msgid "Strongs Numbers radiobutton"
+msgstr "Buton radion Numere Strongs"
+
+#: ../ui/search-dialog.glade.h:105
+msgid "Use a custom module list for the search"
+msgstr "Foloseste o lista de module la comanda pentru cautare"
+
+#: ../ui/search-dialog.glade.h:106
+msgid "Use a custom range for the scope of the search"
+msgstr "Foloseste un rang la comanda pentru cautare"
+
+#: ../ui/search-dialog.glade.h:107
+msgid "Use a single module for the search"
+msgstr "Foloseste un singur modul pentru cautare"
+
+#: ../ui/search-dialog.glade.h:108
+msgid "Use the current module list for the search"
+msgstr "Foloseste lista curenta de module pentru cautare"
+
+#: ../ui/search-dialog.glade.h:109
+msgid "Use the results of the last search as the scope of the search"
+msgstr "Foloseste rezultatele ultimei cautari ca scop al cautarii"
+
+#: ../ui/search-dialog.glade.h:110
+msgid "e.g. Matt-John;Rev4"
+msgstr "ex. Mat-Ioan;Apoc4"
+
+#: ../ui/search-dialog.glade.h:111
+msgid "for "
+msgstr "pentru "
+
+#: ../ui/xi-menus.glade.h:2
+msgid "About _Translation"
+msgstr "Despre _Traducere"
+
+#: ../ui/xi-menus.glade.h:3
+msgid "About _Xiphos"
+msgstr "Despre _Xiphos"
+
+#: ../ui/xi-menus.glade.h:4
+msgid "Add Item"
+msgstr "Adauga obiect"
+
+#: ../ui/xi-menus.glade.h:5
+msgid "Add Sub-Item"
+msgstr "Adauga Sub-Obiect"
+
+#: ../ui/xi-menus.glade.h:6
+msgid "Add a sub-item"
+msgstr "Adauga un sub-obiect"
+
+#: ../ui/xi-menus.glade.h:7
+msgid "Add an item"
+msgstr "Adauga un obiect"
+
+#: ../ui/xi-menus.glade.h:8
+msgid "Add new folder to selected folder"
+msgstr "Adauga folder nou la folderul selectat"
+
+#: ../ui/xi-menus.glade.h:10
+msgid "Allow Reordering"
+msgstr "Permite Reordonarea"
+
+#: ../ui/xi-menus.glade.h:11
+msgid "Allow items to be moved from one folder to another"
+msgstr "Permite ca obiectele sa fie mutate de la un folder la altu"
+
+#: ../ui/xi-menus.glade.h:12
+msgid "Annotate Verse"
+msgstr "Adnotare Verset"
+
+#: ../ui/xi-menus.glade.h:14
+msgid "Browse in BibleMap.org"
+msgstr "Rasfoieste in BibleMap.org"
+
+#: ../ui/xi-menus.glade.h:15
+msgid "Collapse All"
+msgstr "Strange toate"
+
+#: ../ui/xi-menus.glade.h:16
+msgid "Collapse all Bookmarks groups"
+msgstr "Strange toate grupele de Insemne"
+
+#: ../ui/xi-menus.glade.h:17
+msgid "Commentary by Chapter"
+msgstr "Comentariu pe Capitol"
+
+#: ../ui/xi-menus.glade.h:19
+msgid "Create a new daily journal"
+msgstr "Creaza un jurnal zilnic nou"
+
+#: ../ui/xi-menus.glade.h:20
+msgid "Create a new monthly journal"
+msgstr "Creaza un jurnal lunar nou"
+
+#: ../ui/xi-menus.glade.h:21
+msgid "Create a new outlined topic"
+msgstr "Creaza un topic subliniat nou"
+
+#: ../ui/xi-menus.glade.h:22
+msgid "Create a new simple prayer list"
+msgstr "Creaza o simpla lista noua de rugaciune"
+
+#: ../ui/xi-menus.glade.h:23
+msgid "Create a new subject prayer list"
+msgstr "Creaza o lista noua de rugaciune pe subiecte"
+
+#: ../ui/xi-menus.glade.h:24
+msgid "D_ouble-Space Text"
+msgstr "Text cu D_ublu-Spatiu"
+
+#: ../ui/xi-menus.glade.h:25
+msgid "Daily"
+msgstr "Zilnic"
+
+#: ../ui/xi-menus.glade.h:26
+msgid "Delete Item"
+msgstr "Sterge Obiect"
+
+#: ../ui/xi-menus.glade.h:27
+msgid "Delete item"
+msgstr "Sterge obiect"
+
+#: ../ui/xi-menus.glade.h:28
+msgid "Dictionar_y"
+msgstr "Dictiona_r"
+
+#: ../ui/xi-menus.glade.h:29
+msgid "Display Book Heading"
+msgstr "Afiseaza Titlu Carte"
+
+#: ../ui/xi-menus.glade.h:30
+msgid "Display Chapter Heading"
+msgstr "Afiseaza Titlu Capitol"
+
+#: ../ui/xi-menus.glade.h:31
+msgid "Dump Pers.Comm."
+msgstr "Goleste Com.Pers."
+
+#: ../ui/xi-menus.glade.h:33
+msgid "Edit bookmark item"
+msgstr "Editeaza obiectul de insemnare"
+
+#: ../ui/xi-menus.glade.h:34
+msgid "Edit this item"
+msgstr "Editeaza acest obiect"
+
+#: ../ui/xi-menus.glade.h:35
+msgid "Expand All"
+msgstr "Extinde Toate"
+
+#: ../ui/xi-menus.glade.h:36
+msgid "Expand all Bookmarks groups"
+msgstr "Extinde toate grupele de Insemne"
+
+#: ../ui/xi-menus.glade.h:37
+msgid "Export Folder"
+msgstr "Exporta Folder"
+
+#: ../ui/xi-menus.glade.h:38
+msgid "Export List"
+msgstr "Exporta Lista"
+
+#: ../ui/xi-menus.glade.h:45
+msgid "Image Content"
+msgstr "Continut Imagine"
+
+#: ../ui/xi-menus.glade.h:46
+msgid "Import Bibletime Bookmarks"
+msgstr "Insereaza Insemn Bibletime"
+
+#: ../ui/xi-menus.glade.h:47
+msgid "Insert Bookmark"
+msgstr "Insereaza Insemn"
+
+#: ../ui/xi-menus.glade.h:48
+msgid "Insert new bookmark here"
+msgstr "Insereaza o insemnare aici"
+
+#: ../ui/xi-menus.glade.h:49
+msgid "L_ink Tabs"
+msgstr "Tab-ul L_ink-uri"
+
+#: ../ui/xi-menus.glade.h:51
+msgid "Load Bookmarks from Bibletime"
+msgstr "Incarca Insemnele din Bibletime"
+
+#: ../ui/xi-menus.glade.h:52
+msgid "Lookup Selection"
+msgstr "Cauta Selectia"
+
+#: ../ui/xi-menus.glade.h:54
+msgid "Monthly"
+msgstr "Lunar"
+
+#: ../ui/xi-menus.glade.h:57
+msgid "Note"
+msgstr "Nota"
+
+#: ../ui/xi-menus.glade.h:58
+msgid "Open Module"
+msgstr "Deschide Modul"
+
+#: ../ui/xi-menus.glade.h:59
+msgid "Open Study_pad"
+msgstr "Deschide Caietul de _Studiu"
+
+#: ../ui/xi-menus.glade.h:60
+msgid "Open in a dialog"
+msgstr "Deschide intr-un dialog"
+
+#: ../ui/xi-menus.glade.h:61
+msgid "Open in a separate window"
+msgstr "Deschide intr-o fereastra separata"
+
+#: ../ui/xi-menus.glade.h:62
+msgid "Open in editor"
+msgstr "Deschide in editor"
+
+#: ../ui/xi-menus.glade.h:63
+msgid "Open in new tab"
+msgstr "Deschide in tab-ul curent"
+
+#: ../ui/xi-menus.glade.h:64
+msgid ""
+"Open selected module in a\n"
+"\tseparate ['dialog'] window"
+msgstr ""
+"Deschide modulul selectat intr-o\n"
+"\tfereastra ['dialog'] separata"
+
+#: ../ui/xi-menus.glade.h:66
+msgid "Open selected module in a new tab"
+msgstr "Deschide modulul selectate intr-un tab nou"
+
+#: ../ui/xi-menus.glade.h:67
+msgid "Open this bookmark in a dialog"
+msgstr "Deschide acest insemn intr-un dialog"
+
+#: ../ui/xi-menus.glade.h:68
+msgid "Open this bookmark in a new tab"
+msgstr "Deschide aceasta insemnare intr-un tab nou"
+
+#: ../ui/xi-menus.glade.h:69
+msgid "Outlined"
+msgstr "Subliniat"
+
+#: ../ui/xi-menus.glade.h:71
+msgid "Read Selection Aloud"
+msgstr "Citeste Selectiunea Tare"
+
+#: ../ui/xi-menus.glade.h:73
+msgid "Remove folder and save it"
+msgstr "Elimina folder si salveaza-l"
+
+#: ../ui/xi-menus.glade.h:74
+msgid "Remove this item"
+msgstr "Elimina acest obiect"
+
+#: ../ui/xi-menus.glade.h:75
+msgid "Rename Pers.Comm."
+msgstr "Redenumeste Com.Pers."
+
+#: ../ui/xi-menus.glade.h:76
+msgid "Respect Font Faces"
+msgstr "Respecta Fetele de Font"
+
+#: ../ui/xi-menus.glade.h:77
+msgid "Restore Folder"
+msgstr "Restaurare Folder"
+
+#: ../ui/xi-menus.glade.h:78
+msgid "Restore saved folder"
+msgstr "Restaureaza folderul salvat"
+
+#: ../ui/xi-menus.glade.h:79
+msgid "Save list as a series of bookmarks"
+msgstr "Salveaza lista ca o serie de insemnari"
+
+#: ../ui/xi-menus.glade.h:80
+msgid "Save list as a single bookmark"
+msgstr "Salveza lista ca o insemnare singura"
+
+#: ../ui/xi-menus.glade.h:81
+msgid "Save these results as a series of bookmarks in their own folder"
+msgstr "Salveaza aceste rezultate ca o serie de insemnari in propriul lor folder"
+
+#: ../ui/xi-menus.glade.h:82
+msgid "Save these results as a single bookmark"
+msgstr "Salveaza aceste rezultate ca o insemnare singura"
+
+#: ../ui/xi-menus.glade.h:83
+msgid "Scripture Cross-references"
+msgstr "Trimiteri Scriptura"
+
+#: ../ui/xi-menus.glade.h:85
+msgid "Show Parallel View in a _Tab"
+msgstr "_Arata Vederea paralela intr-un Tab"
+
+#: ../ui/xi-menus.glade.h:86
+msgid "Show Previe_wer in the Sidebar"
+msgstr "Arata _Revizuitorul in Bara laterala"
+
+#: ../ui/xi-menus.glade.h:87
+msgid "Show Verse _Numbers"
+msgstr "Arata _Numerele Versetelor"
+
+#: ../ui/xi-menus.glade.h:88
+msgid "Simple"
+msgstr "Simplu"
+
+#: ../ui/xi-menus.glade.h:90
+msgid "Subject"
+msgstr "Subiect"
+
+#: ../ui/xi-menus.glade.h:92
+msgid "Unlock This Module"
+msgstr "Deschide Acest Modul"
+
+#: ../ui/xi-menus.glade.h:93
+msgid "Use Current Dictionary"
+msgstr "Foloseste Dictionarul Curent"
+
+#: ../ui/xi-menus.glade.h:94
+msgid "Use module manager to install and remove Sword modules"
+msgstr "Foloseste managerul de modul pentru a instala si elimina module Sword"
+
+#: ../ui/xi-menus.glade.h:95
+msgid "Variants"
+msgstr "Variante"
+
+#: ../ui/xi-menus.glade.h:97
+msgid "_About The SWORD Project"
+msgstr "_Despre Proiectul SWORD"
+
+#: ../ui/xi-menus.glade.h:98
+msgid "_Advanced Search"
+msgstr "Cautare _Avansata"
+
+#: ../ui/xi-menus.glade.h:99
+msgid "_Attach/Detach Sidebar"
+msgstr "_Ataseaza/Detaseaza Bara laterala"
+
+#: ../ui/xi-menus.glade.h:100
+msgid "_Bible"
+msgstr "_Biblie"
+
+#: ../ui/xi-menus.glade.h:101
+msgid "_Commentary/Book"
+msgstr "_Comentariu/Carte"
+
+#: ../ui/xi-menus.glade.h:102
+msgid "_Contents"
+msgstr "_Cuprins"
+
+#: ../ui/xi-menus.glade.h:103
+msgid "_Daily Devotion"
+msgstr "_Devotional Zilnic"
+
+#: ../ui/xi-menus.glade.h:104
+msgid "_Edit"
+msgstr "_Editare"
+
+#: ../ui/xi-menus.glade.h:105
+msgid "_Edit Item"
+msgstr "_Editare obiect"
+
+#: ../ui/xi-menus.glade.h:107
+msgid "_Help"
+msgstr "_Ajutor"
+
+#: ../ui/xi-menus.glade.h:108
+msgid "_Highlight Current Verse"
+msgstr "_Marcheaza Versetul Curent"
+
+#: ../ui/xi-menus.glade.h:109
+msgid "_Live Chat"
+msgstr "Chat Liv_e"
+
+#: ../ui/xi-menus.glade.h:110
+msgid "_Mailing List"
+msgstr "_Lista de Corespondenta"
+
+#: ../ui/xi-menus.glade.h:111
+msgid "_Module Manager"
+msgstr "_Manager de Modul"
+
+#: ../ui/xi-menus.glade.h:112
+msgid "_Open Session"
+msgstr "_Deschide Sesiune"
+
+#: ../ui/xi-menus.glade.h:113
+msgid "_Preferences"
+msgstr "_Preferinte"
+
+#: ../ui/xi-menus.glade.h:114
+msgid "_Preview"
+msgstr "Pre_vizualizare"
+
+#: ../ui/xi-menus.glade.h:115
+msgid "_Read Aloud"
+msgstr "Citeste _Tare"
+
+#: ../ui/xi-menus.glade.h:116
+msgid "_Report Bug"
+msgstr "_Raporteaza Problema"
+
+#: ../ui/xi-menus.glade.h:117
+msgid "_Save Session"
+msgstr "_Salvare Sesiune"
+
+#: ../ui/xi-menus.glade.h:118
+msgid "_Search"
+msgstr "_Cautare"
+
+#: ../ui/xi-menus.glade.h:119
+msgid "_Show/Hide Attached Sidebar"
+msgstr "Ara_ta/Ascunde Bara de margine Atasata"
+
+#: ../ui/xi-menus.glade.h:120
+msgid "_Verse Per Line"
+msgstr "Verset Per _Linie"
+
+#: ../xiphos.desktop.in.in.h:1
+msgid "Study the Bible"
+msgstr "Studiaza Biblia"
+
+#: ../xiphos.desktop.in.in.h:2
+msgid "Xiphos Bible Guide"
+msgstr "Ghid Xiphos pentru Biblie"
+
+#~ msgid "Xiphos could not execute archiver"
+#~ msgstr "Xiphos nu a putut executa arhivatorul"
+#~ msgid ""
+#~ " archival result:\n"
+#~ "\n"
+#~ msgstr ""
+#~ " rezultate arhivare:\n"
+#~ "\n"
+#~ msgid ""
+#~ "\n"
+#~ "Archive in "
+#~ msgstr ""
+#~ "\n"
+#~ "Arhiveaza in "
+#~ msgid "Text"
+#~ msgstr "Text"
+#~ msgid "Text to render"
+#~ msgstr "Textul de redat"
+#~ msgid "Pixbuf Object"
+#~ msgstr "Obiect Pixbuf"
+#~ msgid "The pixbuf to render."
+#~ msgstr "Pixbuf de transmis."
+#~ msgid "Open in a new tab"
+#~ msgstr "Deschide intr-un tab nou"
+#~ msgid "Open selected module in a separate ['dialog'] window"
+#~ msgstr "Deschide modulul selectat intr-o fereastra de ['dialog'] separata"
+#~ msgid "View information about the selected dialog"
+#~ msgstr "Vezi informatii despre dialogul selectat"
+#~ msgid "Create a new prayer list"
+#~ msgstr "Creaza o lista noua de rugaciune"
+#~ msgid "Daily Journal"
+#~ msgstr "Jurnal Zilnic"
+#~ msgid "Outlined Topic"
+#~ msgstr "Topic Subliniat"
+#~ msgid "Open selected module in a dialog"
+#~ msgstr "Deschide modulul selectat intr-un dialog"
+#~ msgid "Add Child"
+#~ msgstr "Adauga Copil"
+#~ msgid "Add Sibling"
+#~ msgstr "Adauga o Ruda"
+#~ msgid "H_istory/<Separator>"
+#~ msgstr "I_storic/<Separator>"
+#~ msgid "H_istory/C_lear"
+#~ msgstr "I_storic/C_uratare"
+#~ msgid "Remove - Restore"
+#~ msgstr "Elimina - Restaureaza"
+#~ msgid "Remove Folder"
+#~ msgstr "Elimina Folder"
+
diff --git a/po/ru.po b/po/ru.po
new file mode 100644
index 0000000..008bef5
--- /dev/null
+++ b/po/ru.po
@@ -0,0 +1,3747 @@
+# translation of xiphos.pot to British English
+# Copyright (C) 2008
+# This file is distributed under the same license as the Xiphos package.
+#
+# Thomas Abthorpe <tabthorpe@FreeBSD.org>, 2009.
+msgid ""
+msgstr ""
+"Project-Id-Version: xiphos\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-12-14 23:45+0000\n"
+"PO-Revision-Date: 2009-12-21 22:25+0300\n"
+"Last-Translator: Konstantin Maslyuk <kalemas@mail.ru>\n"
+"Language-Team: Russian <kde-russian@lists.kde.ru>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-12-11 04:39+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+"X-Poedit-Country: RUSSIAN FEDERATION\n"
+"X-Poedit-Language: Russian\n"
+
+#: ../src/backend/sword_main.cc:1083
+msgid "Configuration not found"
+msgstr "Конфигурация не найдена"
+
+#: ../src/editor/bonobo-editor.c:254
+#: ../src/editor/slib-editor.c:234
+#: ../src/gnome2/html.c:637
+#, c-format
+msgid "Page %d of %d"
+msgstr "Страница %d из %d"
+
+#: ../src/editor/bonobo-editor.c:353
+#: ../src/editor/slib-editor.c:659
+msgid "Are you sure you want to delete the note for"
+msgstr "Вы уверены что хотите удалить заметку для"
+
+#: ../src/editor/bonobo-editor.c:965
+#: ../src/editor/bonobo-editor.c:998
+#: ../src/editor/slib-editor.c:1308
+#: ../src/editor/slib-editor.c:1345
+msgid "Save the changes to document"
+msgstr "Сохранить изменения в документе"
+
+#: ../src/editor/bonobo-editor.c:966
+#: ../src/editor/bonobo-editor.c:999
+#: ../src/editor/slib-editor.c:1309
+#: ../src/editor/slib-editor.c:1346
+msgid "before closing?"
+msgstr "перед закрытием?"
+
+#: ../src/editor/bonobo-editor.c:973
+#: ../src/editor/bonobo-editor.c:1006
+#: ../src/editor/slib-editor.c:1316
+#: ../src/editor/slib-editor.c:1353
+msgid "If you don't save, changes will be permanently lost."
+msgstr "Если вы не сохраните, изменения будут потеряны."
+
+#: ../src/editor/bonobo-editor.c:997
+#: ../src/editor/slib-editor.c:1344
+#: ../ui/xi-menus.glade.h:39
+msgid "File"
+msgstr "Файл"
+
+#: ../src/editor/bonobo-editor.c:1224
+#: ../src/editor/slib-editor.c:1401
+msgid "StudyPad"
+msgstr "StudyPad"
+
+#: ../src/editor/bonobo-editor.c:1237
+#: ../src/editor/slib-editor.c:1415
+msgid "Note Editor"
+msgstr "Редактор Заметок"
+
+#: ../src/editor/bonobo-editor.c:1246
+#: ../src/editor/slib-editor.c:1429
+msgid "Prayer List/Journal Editor"
+msgstr "Молитвенный Список/Редактор Журнала"
+
+#: ../src/editor/slib-editor.c:401
+#: ../src/editor/slib-editor.c:448
+msgid "Save As"
+msgstr "Сохранить Как"
+
+#: ../src/editor/slib-editor.c:419
+#: ../src/editor/slib-editor.c:466
+#: ../src/editor/slib-editor.c:634
+msgid "Untitled document"
+msgstr "Безымянный документ"
+
+#: ../src/editor/slib-editor.c:702
+msgid "HTML Output"
+msgstr "Результат в HTML"
+
+#: ../src/editor/slib-editor.c:709
+msgid "HTML Source"
+msgstr "Исходный текст в HTML"
+
+#: ../src/editor/slib-editor.c:716
+msgid "Plain Source"
+msgstr "Простой исходный текст"
+
+#: ../src/editor/slib-editor.c:726
+#: ../ui/editor_note.xml.h:15
+#: ../ui/editor_studypad.xml.h:21
+msgid "_Print..."
+msgstr "_Печать..."
+
+#: ../src/editor/slib-editor.c:733
+#: ../ui/editor_note.xml.h:9
+#: ../ui/editor_studypad.xml.h:14
+msgid "Print Pre_view"
+msgstr "П_редпросмотр Печати"
+
+#: ../src/editor/slib-editor.c:740
+msgid "_Quit"
+msgstr "_Выход"
+
+#: ../src/editor/slib-editor.c:747
+msgid "_Open"
+msgstr "_Открыть"
+
+#: ../src/editor/slib-editor.c:754
+msgid "_Save"
+msgstr "_Сохранить"
+
+#: ../src/editor/slib-editor.c:761
+msgid "Save _As..."
+msgstr "Сохранить _Как..."
+
+#: ../src/editor/slib-editor.c:767
+msgid "New"
+msgstr "Новый"
+
+#: ../src/editor/slib-editor.c:769
+msgid "Open new document"
+msgstr "Открыть новый документ"
+
+#: ../src/editor/slib-editor.c:773
+msgid "Delete"
+msgstr "Удалить"
+
+#: ../src/editor/slib-editor.c:775
+msgid "Delete current note"
+msgstr "Удалить текущую заметку"
+
+#: ../src/editor/slib-editor.c:780
+#: ../ui/editor_note.xml.h:14
+#: ../ui/editor_studypad.xml.h:20
+#: ../ui/editor.xml.h:13
+#: ../ui/xi-menus.glade.h:106
+msgid "_File"
+msgstr "_Файл"
+
+#: ../src/editor/slib-editor.c:835
+msgid "HTML _Output"
+msgstr "_Результат в HTML"
+
+#: ../src/editor/slib-editor.c:842
+msgid "_HTML Source"
+msgstr "_Исходный текст в HTML"
+
+#: ../src/editor/slib-editor.c:849
+msgid "_Plain Source"
+msgstr "_Простой исходный текст"
+
+#: ../src/editor/slib-editor.c:856
+#: ../ui/xi-menus.glade.h:121
+msgid "_View"
+msgstr "_Вид"
+
+#: ../src/editor/slib-editor.c:867
+#: ../ui/editor_note.xml.h:11
+#: ../ui/editor_studypad.xml.h:16
+#: ../ui/editor.xml.h:11
+msgid "Save"
+msgstr "Сохранить"
+
+#: ../src/editor/slib-editor.c:878
+#: ../src/editor/slib-editor.c:885
+msgid "Insert Link"
+msgstr "Вставить Связь"
+
+#: ../src/gecko/gecko-html.cpp:177
+#: ../src/gnome2/html.c:165
+msgid "Unlock "
+msgstr "Разблокировать "
+
+#: ../src/gecko/gecko-print.c:172
+msgid "Preparing to print"
+msgstr "Подготовка к печати"
+
+#: ../src/gecko/gecko-print.c:266
+msgid "Printing is not supported on this printer"
+msgstr "Печать не поддерживается данным принтером"
+
+#: ../src/gecko/gecko-print.c:269
+#, c-format
+msgid "Printer %s does not support PostScript printing."
+msgstr "Принтер %s не поддерживает PostScript."
+
+#: ../src/gecko/gecko-print.c:342
+#: ../src/gecko/gecko-print.c:370
+msgid "Printing"
+msgstr "Печать"
+
+#: ../src/gecko/gecko-print.c:372
+msgid "Waiting to print"
+msgstr "Ожидание печати"
+
+#: ../src/gecko/gecko-print.c:584
+msgid "An error occurred while printing"
+msgstr "Во время печати произошел сбой"
+
+#: ../src/gecko/gecko-print.c:588
+#, c-format
+msgid "It was not possible to print your document: %s"
+msgstr "Не удалось распечатать документ: %s"
+
+#: ../src/gnome2/about_modules.c:195
+msgid "About Sword Module"
+msgstr "О Модуле Sword"
+
+#: ../src/gnome2/about_modules.c:389
+#: ../src/gnome2/mod_mgr.c:252
+msgid "The module has no About information."
+msgstr "Данный модуль не содержит информации о себе."
+
+#: ../src/gnome2/about_sword.c:88
+msgid "The SWORD Project is an effort to create an ever-expanding software package for research and study of God and His Word. The SWORD Project framework allows easy use and study of Bible texts, commentaries, lexicons, dictionaries, and other books. Many frontends are built using this framework. An installed set of books may be shared among all frontends using the framework."
+msgstr ""
+"Проект SWORD - это попытка создания всеобъемлющей программы для исследования и познания Бога и Его Слова. Структура проекта SWORD позволяет легко обращаться и изучать тексты Библии, комментарии, лексиконы, словари, и другие книги.\n"
+"Кроме того модули, установленные на вашем компьютере, можно использовать в любом из множества приложений созданных для всех популярных настольных и мобильных платформ."
+
+#: ../src/gnome2/about_sword.c:106
+msgid "About the SWORD Project"
+msgstr "О Проекте SWORD"
+
+#: ../src/gnome2/about_sword.c:124
+msgid "Sword Version"
+msgstr "Версия Sword"
+
+#: ../src/gnome2/about_sword.c:155
+msgid "Books can be downloaded from the SWORD Project"
+msgstr "Модули могут быть загружены с сайта:"
+
+#: ../src/gnome2/about_sword.c:161
+msgid "The SWORD Project"
+msgstr "Проект SWORD"
+
+#: ../src/gnome2/about_trans.c:84
+msgid ""
+"Do you like using Xiphos to study the Bible? Would you like to see its display using your native language? You could translate Xiphos! \n"
+"\n"
+"We are always looking for contributions of new translations of Xiphos into other languages. If you are able to translate for us, please see the link below, contact us, and get involved with our efforts."
+msgstr ""
+"Перевод программы на русский язык подготовил Константин Маслюк, если вам кажется, что-то переведено не так, пишите на kalemas@mail.ru.\n"
+"\n"
+"Также мы всегда рады переводам Xiphos на другие языки. Если ты можешь сделать перевод, пожалуйста, свяжись с нами по ссылке ниже."
+
+#: ../src/gnome2/about_trans.c:98
+msgid "About Xiphos Translation"
+msgstr "О Переводе Xiphos"
+
+#: ../src/gnome2/about_trans.c:140
+msgid "See TRANSLATION-HOWTO in Xiphos source"
+msgstr "Смотри TRANSLATION-HOWTO в исходных файлах Xiphos"
+
+#: ../src/gnome2/about_trans.c:146
+msgid "Xiphos development"
+msgstr "Разработка Xiphos"
+
+#: ../src/gnome2/about_xiphos.c:131
+msgid "Copyright 2000-2009 The Xiphos Development Team"
+msgstr "Копирайт 2000-2009 The Xiphos Development Team"
+
+#: ../src/gnome2/about_xiphos.c:134
+msgid ""
+"(formerly known as GnomeSword)\n"
+"\n"
+"Powered by The SWORD Project.\n"
+"We would like to thank Troy Griffitts and all the other folks who have given us The SWORD Project."
+msgstr ""
+"(ранее известный как GnomeSword)\n"
+"\n"
+"Создано на основе Проекта SWORD.\n"
+"Мы хотим поблагодарить Troy Griffitts и других ребят, давших нам Проект SWORD."
+
+#: ../src/gnome2/bibletext_dialog.c:358
+msgid "Go to "
+msgstr "Перейти "
+
+#. info->stock_icon = GTK_STOCK_OPEN;
+#: ../src/gnome2/bookmark_dialog.c:171
+#: ../src/gnome2/bookmarks_menu.c:358
+#: ../src/gnome2/bookmarks_menu.c:765
+#: ../src/gnome2/bookmarks_menu.c:863
+#: ../src/gnome2/bookmarks_treeview.c:133
+#: ../ui/editor_studypad.xml.h:2
+#: ../ui/xi-menus.glade.h:13
+msgid "Bookmark"
+msgstr "Закладка"
+
+#: ../src/gnome2/bookmark_dialog.c:173
+#: ../src/gnome2/bookmarks_menu.c:865
+#: ../src/gnome2/bookmarks_treeview.c:134
+msgid "Enter Folder Name"
+msgstr "Введите Название Папки"
+
+#: ../src/gnome2/bookmark_dialog.c:175
+#: ../src/gnome2/bookmarks_menu.c:867
+msgid "Folder Name"
+msgstr "Имя Папки"
+
+#: ../src/gnome2/bookmark_dialog.c:176
+#: ../src/gnome2/bookmarks_menu.c:868
+#: ../src/gnome2/bookmarks_treeview.c:136
+msgid "Folder: "
+msgstr "Папка: "
+
+#: ../src/gnome2/bookmarks_menu.c:344
+#: ../ui/xi-menus.glade.h:32
+msgid "Edit"
+msgstr "Редактирование"
+
+#: ../src/gnome2/bookmarks_menu.c:361
+msgid "Folder name: "
+msgstr "Имя Папки: "
+
+#: ../src/gnome2/bookmarks_menu.c:364
+msgid "Bookmark name: "
+msgstr "Имя Закладки: "
+
+#: ../src/gnome2/bookmarks_menu.c:367
+#: ../src/gnome2/bookmarks_menu.c:773
+msgid "Verse: "
+msgstr "Стих: "
+
+#: ../src/gnome2/bookmarks_menu.c:368
+#: ../src/gnome2/bookmarks_menu.c:774
+msgid "Module: "
+msgstr "Модуль: "
+
+#: ../src/gnome2/bookmarks_menu.c:533
+msgid "Restore Bookmark Folder"
+msgstr "Восстановить Папку Закладок"
+
+#: ../src/gnome2/bookmarks_menu.c:602
+msgid "Remove the selected folder"
+msgstr "Удалить выбранную папку"
+
+#: ../src/gnome2/bookmarks_menu.c:604
+msgid "(and all its contents)?"
+msgstr "(и все содержимое)?"
+
+#: ../src/gnome2/bookmarks_menu.c:607
+msgid "Remove the selected bookmark"
+msgstr "Удалить выбранную закладку?"
+
+#: ../src/gnome2/bookmarks_menu.c:766
+msgid "Add"
+msgstr "Добавить"
+
+#: ../src/gnome2/bookmarks_menu.c:772
+msgid "Label: "
+msgstr "Метка: "
+
+#: ../src/gnome2/bookmarks_treeview.c:107
+#, c-format
+msgid "Search result: %s"
+msgstr "Результат поиска: %s"
+
+#: ../src/gnome2/bookmarks_treeview.c:943
+#: ../src/gnome2/sidebar.c:1389
+msgid "Bookmarks"
+msgstr "Закладки"
+
+#: ../src/gnome2/cipher_key_dialog.c:62
+msgid "Cipher Key?"
+msgstr "Шифровой Ключ?"
+
+#: ../src/gnome2/cipher_key_dialog.c:63
+msgid "for:"
+msgstr "для:"
+
+#: ../src/gnome2/cipher_key_dialog.c:66
+msgid "Enter Cipher Key: "
+msgstr "Введите Шифровой Ключ: "
+
+#: ../src/gnome2/dialog.c:265
+msgid "Close without Saving"
+msgstr "Закрыть без Сохранения"
+
+#: ../src/gnome2/dialog.c:596
+msgid "Xiphos:"
+msgstr "Xiphos:"
+
+#: ../src/gnome2/dialog.c:697
+msgid "Close _without Saving"
+msgstr "Закрыть _без Сохранения"
+
+#: ../src/gnome2/export_dialog.c:267
+#: ../ui/export-dialog.glade.h:20
+msgid "Please check copyright before exporting!"
+msgstr "Пожалуйста, проверьте копирайт перед экспортом!"
+
+#: ../src/gnome2/find_dialog.c:204
+#: ../src/gnome2/find_dialog.c:373
+msgid "Find"
+msgstr "Найти"
+
+#: ../src/gnome2/find_dialog.c:222
+msgid "Enter Word or Phrase"
+msgstr "Введите Слово или Фразу"
+
+#: ../src/gnome2/find_dialog.c:238
+#: ../src/gnome2/search_sidebar.c:306
+#: ../ui/search-dialog.glade.h:59
+msgid "Match case"
+msgstr "Соответствие регистру"
+
+#: ../src/gnome2/find_dialog.c:245
+msgid "Search backwards"
+msgstr "Поиск назад"
+
+#: ../src/gnome2/find_dialog.c:254
+#: ../src/gnome2/search_sidebar.c:271
+#: ../ui/search-dialog.glade.h:76
+msgid "Regular expression"
+msgstr "Регулярное выражение"
+
+#: ../src/gnome2/find_dialog.c:295
+msgid "Find Next"
+msgstr "Найти Следующий"
+
+#: ../src/gnome2/font_dialog.c:303
+msgid "Set Module Font"
+msgstr "Выбрать Шрифт Модуля"
+
+#: ../src/gnome2/font_dialog.c:333
+msgid "Change font for"
+msgstr "Изменить шрифт для"
+
+#: ../src/gnome2/font_dialog.c:337
+msgid "Module"
+msgstr "Модуль"
+
+#: ../src/gnome2/font_dialog.c:341
+msgid "Current font: "
+msgstr "Текущий шрифт: "
+
+#: ../src/gnome2/font_dialog.c:378
+msgid "+0"
+msgstr "+0"
+
+#: ../src/gnome2/font_dialog.c:382
+msgid "Use the default font for this module"
+msgstr "Использовать для этого модуля шрифт по-умолчанию"
+
+#. *****************************************************************************
+#. * Name
+#. *    gconf_setup
+#. *
+#. * Synopsis
+#. *   #include "main/settings.h"
+#. *
+#. *   void gconf_setup()
+#. *
+#. * Description
+#. *   verifies and initializes the GConf subsystem, so that "sword://" and
+#. *   similar can be handled by url-comprehending programs such as browsers.
+#. *   dialogs for permission/success/failure => conditional on debug build.
+#. *
+#. * Return value
+#. *   void
+#.
+#: ../src/gnome2/gui.c:110
+msgid ""
+"URL references using \"sword://\" (similar to web page\n"
+"references) can be used by programs to look up\n"
+"scripture references. Your system currently has no\n"
+"program set to handle these references.\n"
+"\n"
+"Would you like Xiphos to set itself as the\n"
+"program to handle these references?"
+msgstr ""
+"URL-ссылки типа \"sword://\" (похожие на ссылки на\n"
+"веб-страницы) могут быть использованы программами\n"
+"для получения мест писания. Ваша система на данный\n"
+"момент не имеет программ для обработки этих ссылок.\n"
+"\n"
+"Вы хотите чтобы Xiphos обрабатывал эти ссылки?"
+
+#: ../src/gnome2/gui.c:112
+msgid ""
+"Xiphos has successfully set itself\n"
+"as the handler of sword:// and bible:// URLs.\n"
+"\n"
+"You may wish to run the program \"gconf-editor\"\n"
+"to examine keys under /desktop/gnome/url-handlers,\n"
+"if you need to change these."
+msgstr ""
+"Xiphos успешно установил себя как\n"
+"обработчик ссылок типа: sword:// и bible://\n"
+"\n"
+"Вы можете запустить программу gconf-editor,\n"
+"чтобы проверить или изменить ключи:\n"
+"/desktop/gnome/url-handlers"
+
+#: ../src/gnome2/gui.c:166
+#, c-format
+msgid ""
+"Xiphos failed to complete handler init for key #%d:\n"
+"%s"
+msgstr ""
+"Xiphos не удалось установить обработчик для ключа #%d:\n"
+"%s"
+
+#: ../src/gnome2/gui.c:212
+msgid "BUG! Xiphos is about to crash due to a \"STRDUP\" error."
+msgstr "BUG! Xiphos сейчас завершит работу из-заошибки \"STRDUP\"."
+
+#: ../src/gnome2/gui.c:213
+#: ../src/gnome2/gui.c:248
+msgid "Please report this error to the Xiphos team with:"
+msgstr "Пожалуйста сообщите об этой ошибке команде Xiphos с:"
+
+#: ../src/gnome2/gui.c:247
+msgid "BUG! Xiphos is about to crash due to a \"STRING\" error."
+msgstr "BUG! Xiphos завершит работу из-зи ошибки \"STRING\"."
+
+#: ../src/gnome2/main_window.c:789
+msgid "Xiphos - Bible Study Software"
+msgstr "Xiphos - Программа для изучения Библии"
+
+#: ../src/gnome2/main_window.c:844
+msgid "Open a new tab"
+msgstr "Открыть новую вкладку"
+
+#: ../src/gnome2/main_window.c:923
+#: ../src/gnome2/sidebar.c:627
+#: ../src/gnome2/sidebar.c:633
+#: ../src/main/sidebar.cc:666
+#: ../src/main/sidebar.cc:1015
+#: ../src/main/sidebar.cc:1016
+#: ../src/main/sidebar.cc:1017
+msgid "Standard View"
+msgstr "Стандартный Вид"
+
+#: ../src/gnome2/main_window.c:1004
+msgid "Commentary View"
+msgstr "Вид Комментария"
+
+#: ../src/gnome2/main_window.c:1020
+msgid "Book View"
+msgstr "Вид Книги"
+
+#: ../src/gnome2/main_window.c:1045
+msgid "Welcome to Xiphos"
+msgstr "Добро пожаловать в Xiphos"
+
+#: ../src/gnome2/menu_popup.c:1168
+msgid ""
+"Renaming is not available in Windows.\n"
+"\n"
+"Xiphos is limited by Windows' filesystem,\n"
+"because it disallows the renaming of filename\n"
+"components of currently-open files,\n"
+"such as the contents of this commentary.\n"
+"Therefore, personal commentary renaming is\n"
+"not available in the Windows environment."
+msgstr ""
+"Переименовывание не доступно в Windows.\n"
+"\n"
+"Xiphos ограничен файловой системой Windows,\n"
+"поскольку она не позволяет переименовывание\n"
+"компонентов открытых фалов,\n"
+"таких, как компоненты этих комментариев.\n"
+"Следовательно, переименовывание личных комментариев\n"
+"не доступно в окружении Windows."
+
+#: ../src/gnome2/menu_popup.c:1187
+msgid "Rename Commentary"
+msgstr "Переименовать Комментарий"
+
+#: ../src/gnome2/menu_popup.c:1190
+msgid "Choose Commentary Name"
+msgstr "Выберите Имя Комментария"
+
+#: ../src/gnome2/menu_popup.c:1192
+msgid "New Name"
+msgstr "Новое Имя"
+
+#: ../src/gnome2/menu_popup.c:1193
+#: ../src/gnome2/treekey-editor.c:139
+#: ../src/gnome2/treekey-editor.c:198
+#: ../src/gnome2/treekey-editor.c:284
+#: ../src/main/prayerlists.cc:243
+msgid "Name: "
+msgstr "Имя: "
+
+#: ../src/gnome2/menu_popup.c:1203
+#: ../src/main/prayerlists.cc:257
+msgid "Module names must contain [A-Za-z0-9_] only."
+msgstr "Имена модулей могут состоять только из символов  [A-Za-z0-9_]."
+
+#: ../src/gnome2/menu_popup.c:1210
+#: ../src/main/prayerlists.cc:264
+msgid "Xiphos already knows a module by that name."
+msgstr "Xiphos уже известен модуль с таким именем."
+
+#: ../src/gnome2/menu_popup.c:1253
+#, c-format
+msgid ""
+"Failed to create new configuration:\n"
+"%s"
+msgstr ""
+"Не удалось создать новую конфигурацию:\n"
+"%s"
+
+#: ../src/gnome2/menu_popup.c:1262
+msgid ""
+"Configuration build error:\n"
+"\n"
+msgstr ""
+"Ошибка создания конфигурации:\n"
+"\n"
+
+#: ../src/gnome2/mod_mgr.c:169
+msgid "Remove these modules?"
+msgstr "Удалить эти модули?"
+
+#: ../src/gnome2/mod_mgr.c:170
+msgid "Preparing to remove"
+msgstr "Подготовка к удалению"
+
+#: ../src/gnome2/mod_mgr.c:171
+msgid "Removing"
+msgstr "Удаление"
+
+#: ../src/gnome2/mod_mgr.c:172
+#: ../ui/xi-menus.glade.h:72
+msgid "Remove"
+msgstr "Удалить"
+
+#: ../src/gnome2/mod_mgr.c:175
+msgid "Install these modules?"
+msgstr "Установить эти модули?"
+
+#: ../src/gnome2/mod_mgr.c:176
+msgid "Preparing to install"
+msgstr "Подготовка к установке"
+
+#: ../src/gnome2/mod_mgr.c:177
+msgid "Installing"
+msgstr "Установка"
+
+#: ../src/gnome2/mod_mgr.c:178
+#: ../src/gnome2/mod_mgr.c:2964
+#: ../ui/module-manager.glade.h:18
+msgid "Install"
+msgstr "Установить"
+
+#: ../src/gnome2/mod_mgr.c:181
+msgid "Archive these modules?"
+msgstr "Архивировать эти модули?"
+
+#: ../src/gnome2/mod_mgr.c:182
+msgid "Preparing to archive"
+msgstr "Подготовка к архивированию"
+
+#: ../src/gnome2/mod_mgr.c:183
+msgid "Archiving"
+msgstr "Архивация"
+
+#: ../src/gnome2/mod_mgr.c:184
+#: ../ui/module-manager.glade.h:11
+msgid "Archive"
+msgstr "Архивировать"
+
+#: ../src/gnome2/mod_mgr.c:187
+msgid ""
+"Build fast-search index for these\n"
+"modules (may take minutes/module)?"
+msgstr ""
+"Создать базу индексов для быстрого поиска для этих \n"
+"модулей (может занять несколько минут/модуль):"
+
+#: ../src/gnome2/mod_mgr.c:188
+msgid "Preparing to index"
+msgstr "Подготовка к индексации"
+
+#: ../src/gnome2/mod_mgr.c:189
+msgid "Indexing"
+msgstr "Индексация"
+
+#: ../src/gnome2/mod_mgr.c:190
+#: ../ui/module-manager.glade.h:17
+msgid "Index"
+msgstr "Индексировать"
+
+#: ../src/gnome2/mod_mgr.c:193
+msgid "Delete fast-search index for these modules?"
+msgstr "Удалить базы индексов для быстрого поиска для этих модулей?"
+
+#: ../src/gnome2/mod_mgr.c:194
+msgid "Preparing to delete index"
+msgstr "Подготовкка к удаленю индексов"
+
+#: ../src/gnome2/mod_mgr.c:195
+msgid "Deleting index"
+msgstr "Удаление индексации"
+
+#: ../src/gnome2/mod_mgr.c:196
+msgid "Deletion"
+msgstr "Удаление"
+
+#: ../src/gnome2/mod_mgr.c:427
+msgid "Module Name"
+msgstr "Имя Модуля"
+
+#: ../src/gnome2/mod_mgr.c:448
+msgid "A checkmark means this module is already installed"
+msgstr "Отметка означает, что модуль уже установлен"
+
+#: ../src/gnome2/mod_mgr.c:470
+msgid "Click the box to work on this module"
+msgstr "Нажми на отметку, чтобы работать с данным модулем"
+
+#: ../src/gnome2/mod_mgr.c:471
+msgid "Click the box to select this module for install/update"
+msgstr "Нажми на отметку, чтобы установить/обновить этот модуль"
+
+#: ../src/gnome2/mod_mgr.c:490
+msgid "Installed"
+msgstr "Установленное"
+
+#: ../src/gnome2/mod_mgr.c:500
+msgid "The index icon means you have built an optimized ('lucene') index for this module for fast searching (see the Maintenance pane for this function)"
+msgstr "Эта иконка означает, что для данного модуля база индексов ('lucene') уже создана. База индексов необходима для быстрого оптимизированного поиска."
+
+#: ../src/gnome2/mod_mgr.c:518
+msgid "The lock icon means this module is encrypted, and requires that you purchase an unlock key from the content owner"
+msgstr "Блокирующая иконка означает что этот модуль зашифрован, необходимо заказать ключ у владельца"
+
+#: ../src/gnome2/mod_mgr.c:535
+#: ../ui/xi-menus.glade.h:1
+msgid "About"
+msgstr "О модуле..."
+
+#: ../src/gnome2/mod_mgr.c:555
+msgid "The refresh icon means the Installed module is older than the newer Available module: You should update the module"
+msgstr "Иконка обновления означает что установленный модуль старее чем доступный: необходимо обновить модуль"
+
+#: ../src/gnome2/mod_mgr.c:567
+msgid "Available"
+msgstr "Доступно"
+
+#: ../src/gnome2/mod_mgr.c:576
+msgid "Size"
+msgstr "Размер"
+
+#: ../src/gnome2/mod_mgr.c:585
+msgid "Description"
+msgstr "Описание"
+
+#: ../src/gnome2/mod_mgr.c:736
+#, c-format
+msgid ""
+"`mkdir %s' failed:\n"
+"%s."
+msgstr ""
+"`не удалось mkdir %s':\n"
+"%s."
+
+#: ../src/gnome2/mod_mgr.c:759
+msgid " archived in: \n"
+msgstr " архивация за : \n"
+
+#: ../src/gnome2/mod_mgr.c:815
+msgid "Journals and prayer lists cannot be indexed."
+msgstr "Журналы и списки молитв не могут быть проиндексированы"
+
+#: ../src/gnome2/mod_mgr.c:833
+#, c-format
+msgid "%s failed"
+msgstr "%s провалилось"
+
+#: ../src/gnome2/mod_mgr.c:836
+#: ../src/gnome2/mod_mgr.c:1562
+msgid "Finished"
+msgstr "Закончено"
+
+#: ../src/gnome2/mod_mgr.c:1003
+#: ../src/gnome2/mod_mgr.c:1005
+#: ../src/gnome2/mod_mgr.c:1107
+#: ../src/gnome2/mod_mgr.c:1142
+#: ../src/gnome2/mod_mgr.c:1144
+#: ../src/gnome2/utilities.c:435
+#: ../src/gnome2/utilities.c:500
+#: ../src/gnome2/utilities.c:502
+#: ../src/gnome2/utilities.c:986
+#: ../src/main/sidebar.cc:852
+#: ../src/main/sidebar.cc:924
+#: ../src/main/sidebar.cc:926
+msgid "Unknown"
+msgstr "Неизвестно"
+
+#: ../src/gnome2/mod_mgr.c:1301
+#, c-format
+msgid ""
+"Repository:\n"
+"%s"
+msgstr ""
+"Репозиторий:\n"
+"%s"
+
+#: ../src/gnome2/mod_mgr.c:1313
+msgid ""
+"Categorized by\n"
+"Module Type"
+msgstr ""
+"Категоризованно по\n"
+"Типу Модуля"
+
+#: ../src/gnome2/mod_mgr.c:1318
+#: ../src/gnome2/utilities.c:561
+#: ../src/main/sidebar.cc:999
+#: ../src/main/sidebar.cc:1001
+msgid "Biblical Texts"
+msgstr "Библейские Тексты"
+
+#: ../src/gnome2/mod_mgr.c:1322
+#: ../src/gnome2/utilities.c:565
+#: ../src/main/sidebar.cc:678
+#: ../src/main/sidebar.cc:1024
+#: ../src/main/sidebar.cc:1026
+#: ../ui/prefs.glade.h:33
+msgid "Commentaries"
+msgstr "Комментарии"
+
+#: ../src/gnome2/mod_mgr.c:1326
+#: ../src/gnome2/utilities.c:569
+#: ../src/main/sidebar.cc:1033
+#: ../src/main/sidebar.cc:1035
+msgid "Dictionaries"
+msgstr "Словари"
+
+#: ../src/gnome2/mod_mgr.c:1330
+#: ../src/gnome2/utilities.c:573
+#: ../src/main/sidebar.cc:1042
+#: ../src/main/sidebar.cc:1044
+msgid "Daily Devotionals"
+msgstr "Стих Дня"
+
+#: ../src/gnome2/mod_mgr.c:1334
+#: ../src/gnome2/utilities.c:577
+#: ../src/main/sidebar.cc:688
+#: ../src/main/sidebar.cc:1051
+#: ../src/main/sidebar.cc:1053
+msgid "General Books"
+msgstr "Книги"
+
+#: ../src/gnome2/mod_mgr.c:1338
+#: ../src/gnome2/utilities.c:581
+#: ../src/main/sidebar.cc:1060
+#: ../src/main/sidebar.cc:1062
+msgid "Maps"
+msgstr "Карты"
+
+#: ../src/gnome2/mod_mgr.c:1342
+#: ../src/gnome2/utilities.c:585
+#: ../src/main/sidebar.cc:1069
+#: ../src/main/sidebar.cc:1071
+msgid "Images"
+msgstr "Изображения"
+
+#: ../src/gnome2/mod_mgr.c:1350
+msgid ""
+"Categorized by\n"
+"Availability"
+msgstr ""
+"Категоризованно по\n"
+"Доступности"
+
+#: ../src/gnome2/mod_mgr.c:1355
+msgid "Updates"
+msgstr "Обновления"
+
+#: ../src/gnome2/mod_mgr.c:1359
+msgid "Uninstalled"
+msgstr "Удаленные"
+
+#: ../src/gnome2/mod_mgr.c:1363
+#: ../src/gnome2/sidebar.c:643
+#: ../src/gnome2/utilities.c:590
+#: ../src/main/prayerlists.cc:241
+#: ../src/main/sidebar.cc:1079
+#: ../src/main/sidebar.cc:1081
+msgid "Prayer List/Journal"
+msgstr "Молитвенные Списки"
+
+#: ../src/gnome2/mod_mgr.c:1545
+msgid "Refreshing from remote source"
+msgstr "Обновление из удаленного источника"
+
+#: ../src/gnome2/mod_mgr.c:1556
+msgid "Remote source not found"
+msgstr "Удаленный источник не найден"
+
+#: ../src/gnome2/mod_mgr.c:1670
+msgid "Configure"
+msgstr "Настроить"
+
+#: ../src/gnome2/mod_mgr.c:1701
+msgid "Type"
+msgstr "Тип"
+
+#: ../src/gnome2/mod_mgr.c:1708
+msgid "Caption"
+msgstr "Заголовок"
+
+#: ../src/gnome2/mod_mgr.c:1716
+msgid "Source"
+msgstr "Источник"
+
+#: ../src/gnome2/mod_mgr.c:1724
+msgid "Directory"
+msgstr "Каталог"
+
+#: ../src/gnome2/mod_mgr.c:1732
+msgid "User"
+msgstr "Пользователь"
+
+#: ../src/gnome2/mod_mgr.c:1740
+msgid "Password"
+msgstr "Пароль"
+
+#: ../src/gnome2/mod_mgr.c:1748
+msgid "UID"
+msgstr "UID"
+
+#: ../src/gnome2/mod_mgr.c:1765
+msgid "Module Sources"
+msgstr "Источники Модулей"
+
+#: ../src/gnome2/mod_mgr.c:1768
+msgid "Add/Remove"
+msgstr "Добавить/Удалить"
+
+#: ../src/gnome2/mod_mgr.c:1770
+msgid "Choose"
+msgstr "Установки"
+
+#: ../src/gnome2/mod_mgr.c:1774
+#: ../src/gnome2/preferences_dialog.c:1793
+#: ../src/gnome2/sidebar.c:1413
+msgid "Modules"
+msgstr "Модули"
+
+#: ../src/gnome2/mod_mgr.c:1776
+msgid "Install/Update"
+msgstr "Установить/Обновить"
+
+#: ../src/gnome2/mod_mgr.c:1778
+msgid "Maintenance"
+msgstr "Обслуживание"
+
+#: ../src/gnome2/mod_mgr.c:1999
+msgid "Please Refresh"
+msgstr "Пожалуйста Обновите"
+
+#: ../src/gnome2/mod_mgr.c:2000
+msgid "Your module list is not up to date!"
+msgstr "Ваш список модулей не обновлен!"
+
+#. Zero Bibles is just not workable in Xiphos.
+#: ../src/gnome2/mod_mgr.c:2282
+msgid ""
+"You have uninstalled your last Bible.\n"
+"Xiphos requires at least one."
+msgstr ""
+"Вы удалили вашу последнюю Библию.\n"
+"Xiphos нужна хотябы одна."
+
+#: ../src/gnome2/mod_mgr.c:2288
+msgid ""
+"There are still no Bibles installed.\n"
+"Xiphos cannot continue without one."
+msgstr ""
+"По-прежнему ни одной Библии не установлено.\n"
+"Без нее Xiphos не может работать."
+
+#: ../src/gnome2/mod_mgr.c:2353
+msgid "Standard remote sources have been loaded."
+msgstr "Стандартные источники были загруженны."
+
+#: ../src/gnome2/mod_mgr.c:2359
+msgid "Could not load standard sources from CrossWire."
+msgstr ""
+"Не могу загрузить стандартные источники\n"
+"с сайта CrossWire."
+
+#: ../src/gnome2/mod_mgr.c:2510
+#: ../src/gnome2/mod_mgr.c:2759
+msgid "Remove the selected source"
+msgstr "Удалить выбранный источник"
+
+#: ../src/gnome2/mod_mgr.c:2570
+msgid "Enter a remote source"
+msgstr "Настройка Удаленного Источника:"
+
+#: ../src/gnome2/mod_mgr.c:2574
+msgid "Caption:"
+msgstr "Заголовок:"
+
+#: ../src/gnome2/mod_mgr.c:2575
+msgid "Type:"
+msgstr "Тип:"
+
+#: ../src/gnome2/mod_mgr.c:2576
+msgid "Host:"
+msgstr "Хост:"
+
+#: ../src/gnome2/mod_mgr.c:2577
+msgid "Directory:"
+msgstr "Каталог:"
+
+#: ../src/gnome2/mod_mgr.c:2579
+msgid "User (optional):"
+msgstr "Пользователь (опционально):"
+
+#: ../src/gnome2/mod_mgr.c:2580
+msgid "Password (optional):"
+msgstr "Пароль (опционально):"
+
+#. this can happen at most once
+#: ../src/gnome2/mod_mgr.c:2608
+msgid "A source by that name already exists."
+msgstr "Источник с таким именем уже существует."
+
+#: ../src/gnome2/mod_mgr.c:2756
+msgid "Delete a remote source"
+msgstr "Удалить удаленный источник"
+
+#. *****************************************************************************
+#. * Name
+#. *   gui_open_mod_mgr
+#. *
+#. * Synopsis
+#. *   #include "gui/mod_mgr.h"
+#. *
+#. *   void gui_open_mod_mgr(void)
+#. *
+#. * Description
+#. *
+#. *
+#. * Return value
+#. *   void
+#.
+#: ../src/gnome2/mod_mgr.c:3244
+msgid ""
+"<b>Welcome to the Module Manager.</b>\n"
+"\n"
+"This is Xiphos' mechanism to get new and updated content.\n"
+"It appears you have never been here before, so please take a moment to look it over.\n"
+"(You will see this information box just once.)\n"
+"\n"
+"Modules come from different <u>repositories</u>.  <b>Module Sources: Add/Remove</b> will show you what repositories are currently known.\n"
+"\n"
+"<b>Module Sources: Choose</b> is for deciding from where modules should come, that is, from which repository Xiphos should obtain them, as well as where they should be placed on your system. Set <i>Install Source</i> and <i>Install Destination</i>, then click <i>Refresh</i>.\n"
+"\n"
+"<b>Modules: Install/Update</b> is for selecting and obtaining modules after choosing source and destination.\n"
+"\n"
+"<b>Modules: Maintenance</b> is for archive and index creation.\n"
+"\n"
+"See section 5 of our manual for Module Manager detail, or ask for help via Live Chat, or (if no one is responsive in chat) send mail to our users' mailing list.\n"
+msgstr ""
+"<b>Добро пожаловать в Менеджер Модулей.</b>\n"
+"\n"
+"Это механизм Xiphos для получения нового и обновления старого контента.\n"
+"Похоже вы никогда не были здесь, так что изучите какие возможности он предоставляет.\n"
+"(Это сообщение отбражается только один раз.)\n"
+"\n"
+"Модули находятся в различных <u>репозиториях</u>.  <b>Источники Модулей: Добавить/Удалить</b> покажет какие репозитории доступны на данный момент.\n"
+"\n"
+"<b>Источники Модулей: Установки</b> необходима для выбора, откуда модули должны скачиваться, или, откуда Xiphos должен получать их, а так же куда они должны быть помещены на вашей системе. Настройте <i>Источник Установки</i> и <i>Папка Установки</i>, затем нажмите <i>Обновить</i>.\n"
+"\n"
+"<b>Модули: Установить/Обновить</b> нужна для выбора и получения модулей после выбора источника и папки назначения.\n"
+"\n"
+"<b>Модули: Обслуживание</b> для архивирования и создания индексов.\n"
+"\n"
+"Смотри раздел 5 руководства Менеджера Модулей, или попроси о помощи через Live Chat, или (если никто не отвечает в чате) пошли электронное письмо в наш список рассылки пользователей.\n"
+
+#: ../src/gnome2/navbar_book.c:359
+#: ../src/gnome2/navbar_book_dialog.c:300
+msgid "Go outward, to the section containing this one"
+msgstr "Перейти наружу, к выделению, состоящему из данного"
+
+#: ../src/gnome2/navbar_book.c:375
+#: ../src/gnome2/navbar_book_dialog.c:316
+msgid "Go to previous item"
+msgstr "Перейти к предыдущему пункту"
+
+#: ../src/gnome2/navbar_book.c:390
+#: ../src/gnome2/navbar_book_dialog.c:331
+msgid "Go to next item"
+msgstr "Перейти к следующему пункту"
+
+#: ../src/gnome2/navbar_book.c:406
+#: ../src/gnome2/navbar_book_dialog.c:347
+msgid "Go inward, to the first subsection"
+msgstr "Перейти внутрь, к подвыделению"
+
+#: ../src/gnome2/navbar_versekey_dialog.c:864
+#: ../src/gnome2/navbar_versekey_editor.c:879
+#: ../src/gnome2/navbar_versekey_parallel.c:810
+msgid "Synchronize this window from main window"
+msgstr "Синхронизировать это окно с главным"
+
+#: ../src/gnome2/parallel_dialog.c:328
+#: ../src/gnome2/preferences_dialog.c:1799
+msgid "Parallel"
+msgstr "Параллель"
+
+#: ../src/gnome2/parallel_view.c:275
+msgid "Copy"
+msgstr "Копия"
+
+#: ../src/gnome2/parallel_view.c:285
+msgid "Detach/Attach"
+msgstr "Разъединить/Соединить"
+
+#: ../src/gnome2/parallel_view.c:291
+#: ../ui/xi-menus.glade.h:53
+msgid "Module Options"
+msgstr "Опции Модуля"
+
+#. build change parallel modules submenu
+#: ../src/gnome2/parallel_view.c:306
+msgid "Change parallel 1"
+msgstr "Изменить Параллель 1"
+
+#: ../src/gnome2/parallel_view.c:308
+msgid "Change parallel 2"
+msgstr "Изменить Параллель 2"
+
+#: ../src/gnome2/parallel_view.c:310
+msgid "Change parallel 3"
+msgstr "Изменить Параллель 3"
+
+#: ../src/gnome2/parallel_view.c:312
+msgid "Change parallel 4"
+msgstr "Изменить Параллель 4"
+
+#: ../src/gnome2/parallel_view.c:314
+msgid "Change parallel 5"
+msgstr "Изменить Параллель 5"
+
+#: ../src/gnome2/parallel_view.c:471
+#: ../src/gnome2/sidebar.c:626
+#: ../src/gnome2/sidebar.c:632
+#: ../src/gnome2/tabbed_browser.c:262
+#: ../src/main/sidebar.cc:646
+#: ../src/main/sidebar.cc:1007
+#: ../src/main/sidebar.cc:1008
+#: ../src/main/sidebar.cc:1009
+msgid "Parallel View"
+msgstr "Параллельный Вид"
+
+#: ../src/gnome2/preferences_dialog.c:1179
+#: ../src/gnome2/preferences_dialog.c:1217
+#: ../src/gnome2/preferences_dialog.c:1254
+#: ../src/gnome2/preferences_dialog.c:1289
+#: ../src/gnome2/preferences_dialog.c:1323
+#: ../src/gnome2/preferences_dialog.c:1356
+#: ../src/gnome2/preferences_dialog.c:1388
+#: ../src/gnome2/preferences_dialog.c:1421
+#: ../src/gnome2/preferences_dialog.c:1453
+#: ../src/gnome2/preferences_dialog.c:1487
+#: ../src/gnome2/preferences_dialog.c:1522
+#: ../src/gnome2/preferences_dialog.c:1557
+#: ../src/gnome2/preferences_dialog.c:1593
+#: ../src/gnome2/preferences_dialog.c:1631
+#: ../src/gnome2/preferences_dialog.c:2052
+msgid "-- Select --"
+msgstr "-- Выбрать --"
+
+#: ../src/gnome2/preferences_dialog.c:1652
+msgid "Locale will take effect after restart."
+msgstr "Параметры языка вступят в силу после перезапуска."
+
+#: ../src/gnome2/preferences_dialog.c:1687
+#: ../ui/prefs.glade.h:74
+msgid "Preferences"
+msgstr "Настройки"
+
+#: ../src/gnome2/preferences_dialog.c:1769
+msgid "Fonts"
+msgstr "Шрифты"
+
+#: ../src/gnome2/preferences_dialog.c:1772
+msgid "Color"
+msgstr "Цвет"
+
+#: ../src/gnome2/preferences_dialog.c:1775
+msgid "Sizes"
+msgstr "Размеры"
+
+#: ../src/gnome2/preferences_dialog.c:1779
+msgid "General"
+msgstr "Общие"
+
+#: ../src/gnome2/preferences_dialog.c:1782
+#: ../ui/prefs.glade.h:87
+msgid "Tabs and Panes"
+msgstr "Вкладки и Панели"
+
+#: ../src/gnome2/preferences_dialog.c:1789
+msgid "Options"
+msgstr "Опции"
+
+#: ../src/gnome2/preferences_dialog.c:1796
+msgid "Main"
+msgstr "Основное"
+
+#: ../src/gnome2/preferences_dialog.c:1802
+msgid "Special"
+msgstr "Специальные"
+
+#: ../src/gnome2/search_dialog.c:68
+#: ../src/main/search_dialog.cc:66
+#: ../src/main/search_sidebar.cc:61
+msgid "Searching the "
+msgstr "Поиск "
+
+#: ../src/gnome2/search_dialog.c:69
+#: ../src/main/search_dialog.cc:67
+#: ../src/main/search_sidebar.cc:62
+msgid " Module"
+msgstr " Модуль"
+
+#: ../src/gnome2/search_dialog.c:70
+#: ../src/main/search_dialog.cc:68
+#: ../src/main/search_sidebar.cc:63
+msgid "found in "
+msgstr "найдено в "
+
+#: ../src/gnome2/search_dialog.c:527
+msgid "Clear List?"
+msgstr "Очистить Список?"
+
+#: ../src/gnome2/search_dialog.c:528
+msgid "Are you sure you want to clear the module list?"
+msgstr "Вы уверены что хотите очистить список модулей?"
+
+#: ../src/gnome2/search_dialog.c:708
+msgid "The last module list may not be deleted"
+msgstr "Последний список модулей не может быть удален"
+
+#: ../src/gnome2/search_dialog.c:726
+msgid "Delete list?"
+msgstr "Удалить Список?"
+
+#: ../src/gnome2/search_dialog.c:727
+msgid "Are you sure you want to delete:"
+msgstr "Вы уверены что хотите удалить:"
+
+#: ../src/gnome2/search_sidebar.c:192
+msgid ""
+"This is an inclusive (\"AND\") search:\n"
+"Find matches showing all words."
+msgstr ""
+"Это включающий (\"AND\") поиск:\n"
+"Находит совпадения по всем словам."
+
+#: ../src/gnome2/search_sidebar.c:209
+msgid "Search Module"
+msgstr "Поиск по Модулю"
+
+#: ../src/gnome2/search_sidebar.c:223
+msgid "Bible"
+msgstr "Библия"
+
+#: ../src/gnome2/search_sidebar.c:232
+#: ../ui/prefs.glade.h:35
+msgid "Commentary"
+msgstr "Комментарий"
+
+#: ../src/gnome2/search_sidebar.c:246
+msgid "Search Type"
+msgstr "Тип Поиска"
+
+#: ../src/gnome2/search_sidebar.c:260
+#: ../ui/search-dialog.glade.h:66
+msgid "Multi word"
+msgstr "Свободная форма"
+
+#: ../src/gnome2/search_sidebar.c:279
+#: ../ui/search-dialog.glade.h:44
+msgid "Exact phrase"
+msgstr "Точная фраза"
+
+#: ../src/gnome2/search_sidebar.c:293
+msgid "Search Options"
+msgstr "Опции Поиска"
+
+#: ../src/gnome2/search_sidebar.c:321
+msgid "Search Scope"
+msgstr "Диапазон Поиска"
+
+#: ../src/gnome2/search_sidebar.c:334
+msgid "No scope"
+msgstr "Нет Диапазона"
+
+#: ../src/gnome2/search_sidebar.c:344
+msgid "Use bounds"
+msgstr "Задать Диапазон"
+
+#: ../src/gnome2/search_sidebar.c:353
+msgid "Last search"
+msgstr "Последний поиск"
+
+#: ../src/gnome2/search_sidebar.c:368
+msgid "Bounds"
+msgstr "Границы"
+
+#: ../src/gnome2/search_sidebar.c:382
+msgid "Lower"
+msgstr "Нижняя"
+
+#: ../src/gnome2/search_sidebar.c:389
+msgid "Upper"
+msgstr "Верхняя"
+
+#: ../src/gnome2/sidebar.c:1397
+msgid "Search"
+msgstr "Поиск"
+
+#: ../src/gnome2/sidebar.c:1405
+msgid "Verse List"
+msgstr "Список Стихов"
+
+#: ../src/gnome2/sidebar_dialog.c:139
+#: ../src/gnome2/sidebar_dialog.c:148
+msgid "Sidebar"
+msgstr "Боковая Панель"
+
+#: ../src/gnome2/splash.c:396
+msgid "Powered by the SWORD Project"
+msgstr "Основано на Проекте SWORD"
+
+#: ../src/gnome2/treekey-editor.c:137
+#: ../src/gnome2/treekey-editor.c:196
+#: ../src/gnome2/treekey-editor.c:282
+msgid "Prayer List/Journal Item"
+msgstr "Пункт Молитвенного Списка"
+
+#: ../src/gnome2/treekey-editor.c:138
+#: ../src/gnome2/treekey-editor.c:197
+#: ../src/gnome2/treekey-editor.c:283
+msgid "New name"
+msgstr "Новое имя"
+
+#: ../src/gnome2/treekey-editor.c:253
+msgid "Remove the selected item"
+msgstr "Удалить выбранный пункт"
+
+#: ../src/main/display.cc:259
+#, c-format
+msgid ""
+"Improperly encoded personal annotation label:\n"
+"'%s'"
+msgstr ""
+"Непавильно кодированная метка личного примечания:\n"
+"'%s'"
+
+#: ../src/main/display.cc:386
+msgid ""
+"An image file's size could not be determined.\n"
+"Is ImageMagick's 'identify' not installed?\n"
+"(Or possibly the image is of type other than bmp/gif/jpg/png.)\n"
+"Xiphos cannot resize images to fit window."
+msgstr ""
+"Размер изображения не может быть установлен.\n"
+"Установлена ли ImageMagick's 'identify' ?\n"
+"(или, возможно, изображение не bmp/gif/jpg/png.)\n"
+"Xiphos не может изменить размер чтобы подогнать окно."
+
+#: ../src/main/display.cc:1043
+#: ../src/main/display.cc:1095
+#: ../src/main/display.cc:1172
+#: ../ui/export-dialog.glade.h:7
+msgid "Chapter"
+msgstr "Глава"
+
+#: ../src/main/main.c:119
+msgid "Xiphos does not understand more than one argument."
+msgstr "Xiphos не понимает более одного аргумента."
+
+#: ../src/main/main.c:161
+msgid "Initiating Gecko"
+msgstr "Запуск Gecko"
+
+#: ../src/main/main.c:167
+msgid "Building Interface"
+msgstr "Создание Интерфейса"
+
+#: ../src/main/main.c:171
+msgid "Starting Sword"
+msgstr "Запускается Sword"
+
+#: ../src/main/main.c:175
+msgid "Loading Settings"
+msgstr "Загрузка Настроек"
+
+#: ../src/main/main.c:179
+msgid "Displaying Xiphos"
+msgstr "Интерфейс Xiphos"
+
+#: ../src/main/module_dialogs.cc:227
+#: ../src/main/previewer.cc:127
+#: ../src/main/previewer.cc:194
+#: ../ui/prefs.glade.h:75
+msgid "Previewer"
+msgstr "Предпросмотр"
+
+#: ../src/main/module_dialogs.cc:292
+#: ../src/main/module_dialogs.cc:416
+#: ../src/main/previewer.cc:269
+msgid "Footnote"
+msgstr "Сноска"
+
+#: ../src/main/module_dialogs.cc:298
+#: ../src/main/module_dialogs.cc:421
+#: ../src/main/previewer.cc:281
+msgid "Cross Reference"
+msgstr "Параллельные Места"
+
+#: ../src/main/module_dialogs.cc:304
+#: ../src/main/module_dialogs.cc:318
+#: ../src/main/module_dialogs.cc:426
+#: ../src/main/module_dialogs.cc:438
+#: ../src/main/previewer.cc:287
+#: ../src/main/previewer.cc:306
+msgid "Strongs"
+msgstr "Стронги"
+
+#: ../src/main/module_dialogs.cc:310
+#: ../src/main/module_dialogs.cc:329
+#: ../src/main/module_dialogs.cc:431
+#: ../src/main/module_dialogs.cc:448
+#: ../src/main/previewer.cc:293
+#: ../src/main/previewer.cc:319
+msgid "Morphology"
+msgstr "Морфология"
+
+#: ../src/main/module_dialogs.cc:1081
+#: ../src/main/url.cc:530
+msgid "Back to "
+msgstr "Назад к "
+
+#: ../src/main/parallel_view.cc:404
+#: ../ui/xi-menus.glade.h:89
+msgid "Strong's Numbers"
+msgstr "Номера Стронга"
+
+#: ../src/main/parallel_view.cc:414
+#: ../ui/search-dialog.glade.h:52
+#: ../ui/xi-menus.glade.h:40
+msgid "Footnotes"
+msgstr "Сноски"
+
+#: ../src/main/parallel_view.cc:424
+#: ../ui/search-dialog.glade.h:64
+#: ../ui/xi-menus.glade.h:55
+msgid "Morphological Tags"
+msgstr "Морфологические тэги"
+
+#: ../src/main/parallel_view.cc:434
+#: ../ui/xi-menus.glade.h:44
+msgid "Hebrew Vowel Points"
+msgstr "Пункты Гласных Иврита"
+
+#: ../src/main/parallel_view.cc:444
+#: ../ui/xi-menus.glade.h:43
+msgid "Hebrew Cantillation"
+msgstr "Повествование как в Иврите"
+
+#: ../src/main/parallel_view.cc:454
+#: ../ui/xi-menus.glade.h:41
+msgid "Greek Accents"
+msgstr "Греческие Ударения"
+
+#: ../src/main/parallel_view.cc:464
+msgid "Cross-references"
+msgstr "Параллельные места"
+
+#: ../src/main/parallel_view.cc:474
+#: ../ui/xi-menus.glade.h:50
+msgid "Lemmas"
+msgstr "Леммы"
+
+#: ../src/main/parallel_view.cc:484
+#: ../ui/xi-menus.glade.h:42
+msgid "Headings"
+msgstr "Заглавия"
+
+#: ../src/main/parallel_view.cc:494
+msgid "Morpheme Segmentation"
+msgstr "Сегментация по Морфемам"
+
+#: ../src/main/parallel_view.cc:504
+#: ../ui/xi-menus.glade.h:96
+msgid "Words of Christ in Red"
+msgstr "Слова Христа Красным"
+
+#: ../src/main/parallel_view.cc:514
+#: ../ui/xi-menus.glade.h:91
+msgid "Transliteration"
+msgstr "Транслитерация"
+
+#: ../src/main/parallel_view.cc:524
+msgid "Textual Variants"
+msgstr "Текстовые Варианты"
+
+#: ../src/main/parallel_view.cc:532
+#: ../ui/xi-menus.glade.h:70
+msgid "Primary Reading"
+msgstr "Основное Чтение"
+
+#: ../src/main/parallel_view.cc:541
+#: ../ui/xi-menus.glade.h:84
+msgid "Secondary Reading"
+msgstr "Побочное Чтение"
+
+#: ../src/main/parallel_view.cc:550
+#: ../ui/xi-menus.glade.h:9
+msgid "All Readings"
+msgstr "Все Чтения"
+
+#: ../src/main/parallel_view.cc:884
+#: ../src/main/parallel_view.cc:1136
+msgid "view context"
+msgstr "видовой контекст"
+
+#: ../src/main/prayerlists.cc:74
+msgid "January"
+msgstr "Январь"
+
+#: ../src/main/prayerlists.cc:75
+msgid "February"
+msgstr "Февраль"
+
+#: ../src/main/prayerlists.cc:76
+msgid "March"
+msgstr "Март"
+
+#: ../src/main/prayerlists.cc:77
+msgid "April"
+msgstr "Апрель"
+
+#: ../src/main/prayerlists.cc:78
+msgid "May"
+msgstr "Май"
+
+#: ../src/main/prayerlists.cc:79
+msgid "June"
+msgstr "Июнь"
+
+#: ../src/main/prayerlists.cc:80
+msgid "July"
+msgstr "Июль"
+
+#: ../src/main/prayerlists.cc:81
+msgid "August"
+msgstr "Август"
+
+#: ../src/main/prayerlists.cc:82
+msgid "September"
+msgstr "Сентябрь"
+
+#: ../src/main/prayerlists.cc:83
+msgid "October"
+msgstr "Октябрь"
+
+#: ../src/main/prayerlists.cc:84
+msgid "November"
+msgstr "Ноябрь"
+
+#: ../src/main/prayerlists.cc:85
+msgid "December"
+msgstr "Декабрь"
+
+#: ../src/main/prayerlists.cc:124
+#: ../src/main/sword_treekey.cc:332
+msgid "Growth"
+msgstr "Рост"
+
+#: ../src/main/prayerlists.cc:125
+#: ../src/main/sword_treekey.cc:333
+msgid "<b>For Growth</b><br>"
+msgstr "<b>Для Роста</b><br>"
+
+#: ../src/main/prayerlists.cc:126
+#: ../src/main/prayerlists.cc:383
+#: ../src/main/sword_treekey.cc:334
+msgid "Salvation"
+msgstr "Спасение"
+
+#: ../src/main/prayerlists.cc:127
+#: ../src/main/sword_treekey.cc:335
+msgid "<b>For Salvation</b><br>"
+msgstr "<b>Для спасения</b><br>"
+
+#: ../src/main/prayerlists.cc:128
+#: ../src/main/prayerlists.cc:387
+#: ../src/main/sword_treekey.cc:336
+msgid "Health"
+msgstr "Здоровье"
+
+#: ../src/main/prayerlists.cc:129
+#: ../src/main/sword_treekey.cc:337
+msgid "<b>For Health</b><br>"
+msgstr "<b>Для Здоровья</b><br>"
+
+#: ../src/main/prayerlists.cc:130
+msgid "Misc"
+msgstr "Разное"
+
+#: ../src/main/prayerlists.cc:131
+#: ../src/main/sword_treekey.cc:339
+msgid "<b>Miscellaneous</b><br>"
+msgstr "<b>Разное</b><br>"
+
+#: ../src/main/prayerlists.cc:139
+msgid "Point x"
+msgstr "Пункт x"
+
+#: ../src/main/prayerlists.cc:140
+msgid "<b>(x)</b><br>"
+msgstr "<b>(x)</b><br>"
+
+#: ../src/main/prayerlists.cc:141
+msgid "Point y"
+msgstr "Пункт y"
+
+#: ../src/main/prayerlists.cc:142
+msgid "<b>(y)</b><br>"
+msgstr "<b>(y)</b><br>"
+
+#: ../src/main/prayerlists.cc:143
+msgid "Point z"
+msgstr "Пункт z"
+
+#: ../src/main/prayerlists.cc:144
+msgid "<b>(z)</b><br>"
+msgstr "<b>(z)</b><br>"
+
+#: ../src/main/prayerlists.cc:152
+msgid "Minor Topic 1"
+msgstr "Тема 1"
+
+#: ../src/main/prayerlists.cc:153
+msgid "<b>Subtopic 1</b><br>"
+msgstr "<b>Подтема 1</b><br>"
+
+#: ../src/main/prayerlists.cc:155
+msgid "Minor Topic 2"
+msgstr "Тема 2"
+
+#: ../src/main/prayerlists.cc:156
+msgid "<b>Subtopic 2</b><br>"
+msgstr "<b>Подтема 2</b><br>"
+
+#: ../src/main/prayerlists.cc:158
+msgid "Minor Topic 3"
+msgstr "Тема 3"
+
+#: ../src/main/prayerlists.cc:159
+msgid "<b>Subtopic 3</b><br>"
+msgstr "<b>Подтема 3</b><br>"
+
+#: ../src/main/prayerlists.cc:161
+msgid "Minor Topic 4"
+msgstr "Тема 4"
+
+#: ../src/main/prayerlists.cc:162
+msgid "<b>Subtopic 4</b><br>"
+msgstr "<b>Подтема 4</b><br>"
+
+#: ../src/main/prayerlists.cc:242
+msgid "Name for new prayer list or journal"
+msgstr "Имя нового молитвенного списка или журнала"
+
+#: ../src/main/prayerlists.cc:273
+msgid "Xiphos finds that prayer list already."
+msgstr "Этот молитвенный список готов."
+
+#: ../src/main/prayerlists.cc:286
+#, c-format
+msgid ""
+"Xiphos cannot create module's path:\n"
+"%s"
+msgstr ""
+"Xiphos не может создать путь модуля:\n"
+"%s"
+
+#: ../src/main/prayerlists.cc:326
+msgid "A basic prayer list. \\par\\par Module created by Xiphos."
+msgstr "Базовый молитвенный список. \\par\\par Модуль создан Xiphos."
+
+#: ../src/main/prayerlists.cc:327
+msgid "BasicPrayerList"
+msgstr "BasicPrayerList"
+
+#: ../src/main/prayerlists.cc:341
+msgid "MyPrayerList"
+msgstr "MyPrayerList"
+
+#: ../src/main/prayerlists.cc:342
+msgid "<b>People:</b><br>Bob<br>Sam<br>Sue<br><br><b>Church:</b><br>pews<br>fellowship<br>Bibles for missionaries<br><br><br>"
+msgstr "<b>Люди:</b><br>Вова<br>Саша<br>Света<br><br><b>Церковь:</b><br>сиденье<br>товарищество<br>Библии для миссионеров<br><br><br>"
+
+#: ../src/main/prayerlists.cc:368
+msgid "A subject-based prayer list. \\par\\par Module created by Xiphos."
+msgstr "Молитвенный список, основанный на темах. \\par\\par Модуль создан Xiphos."
+
+#: ../src/main/prayerlists.cc:369
+msgid "SubjectPrayerList"
+msgstr "SubjectPrayerList"
+
+#: ../src/main/prayerlists.cc:384
+msgid "Bob<br>Sam<br>Sue<br>John<br>"
+msgstr "Вова<br>Саша<br>Света<br>Ваня<br>"
+
+#: ../src/main/prayerlists.cc:385
+msgid "Spiritual Growth"
+msgstr "Духовный Рост"
+
+#: ../src/main/prayerlists.cc:386
+msgid "Mike<br>Steve<br>"
+msgstr "Миша<br>Степан<br>"
+
+#: ../src/main/prayerlists.cc:388
+msgid "Sue<br>John<br>"
+msgstr "Света<br>Ваня<br>"
+
+#: ../src/main/prayerlists.cc:414
+msgid "A monthly prayer list. \\par\\par Module created by Xiphos."
+msgstr "Месячный молитвенный список. \\par\\par Модуль создан Xiphos."
+
+#: ../src/main/prayerlists.cc:415
+msgid "MonthlyPrayerList"
+msgstr "MonthlyPrayerList"
+
+#: ../src/main/prayerlists.cc:466
+msgid "A daily journal. \\par\\par Module created by Xiphos."
+msgstr "Дневной журнал. \\par\\par Модуль создан Xiphos."
+
+#: ../src/main/prayerlists.cc:467
+msgid "DailyJournal"
+msgstr "Дневной журнал"
+
+#: ../src/main/prayerlists.cc:531
+msgid "An outlined topic (e.g. sermon). \\par\\par Module created by Xiphos."
+msgstr "Выделеная тема (например, проповедь). \\par\\par Модуль создан Xiphos."
+
+#: ../src/main/prayerlists.cc:532
+msgid "OutlinedTopic"
+msgstr "OutlinedTopic"
+
+#: ../src/main/prayerlists.cc:546
+msgid "Major Topic A"
+msgstr "Главная Тема А"
+
+#: ../src/main/prayerlists.cc:547
+msgid "<b>Major Topic A</b><br>"
+msgstr "<b>Главная Тема А</b><br>"
+
+#: ../src/main/prayerlists.cc:549
+msgid "Major Topic B"
+msgstr "Главная Тема Б"
+
+#: ../src/main/prayerlists.cc:550
+msgid "<b>Major Topic B</b><br>"
+msgstr "<b>Главная Тема Б</b><br>"
+
+#: ../src/main/prayerlists.cc:552
+msgid "Major Topic C"
+msgstr "Главная Тема В"
+
+#: ../src/main/prayerlists.cc:553
+msgid "<b>Major Topic C</b><br>"
+msgstr "<b>Главная Тема В</b><br>"
+
+#: ../src/main/previewer.cc:275
+msgid "User Annotation"
+msgstr "Пользователькое Примечание"
+
+#: ../src/main/search_dialog.cc:212
+#, c-format
+msgid "Search result %s: %s"
+msgstr "Результаты поиска %s: %s"
+
+#: ../src/main/search_dialog.cc:444
+msgid "Delete Range?"
+msgstr "Удалить диапазон?"
+
+#: ../src/main/search_dialog.cc:445
+msgid "Are you sure you want to delete this range?"
+msgstr "Вы уверены, что хотите удалить этот диапазон?"
+
+#: ../src/main/search_dialog.cc:659
+#: ../src/main/search_dialog.cc:1130
+#: ../src/main/search_dialog.cc:1133
+#: ../src/main/search_dialog.cc:1155
+#: ../src/main/search_dialog.cc:1158
+msgid "Search: "
+msgstr "Поиск: "
+
+#: ../src/main/search_dialog.cc:704
+msgid "Remove Module?"
+msgstr "Удалить Модуль?"
+
+#: ../src/main/search_dialog.cc:705
+msgid "Are you sure you want to remove the selected module?"
+msgstr "Вы уверены, что хотите удалить выбранный модуль?"
+
+#: ../src/main/search_dialog.cc:1560
+#, c-format
+msgid ""
+"%s:\n"
+"No such module is installed.\n"
+"%s"
+msgstr ""
+"%s:\n"
+"Такого модуля не установлено.\n"
+"%s"
+
+#: ../src/main/search_dialog.cc:1562
+msgid "Please adjust the module list."
+msgstr "Пожалуйста подгоните список модулей."
+
+#: ../src/main/search_dialog.cc:1578
+#, c-format
+msgid "No fast-search index exists for %s.%s%s"
+msgstr "Нет базы индексов для модуля %s.%s%s"
+
+#: ../src/main/search_dialog.cc:1580
+msgid ""
+"\n"
+"Search on this module is now `multi word'."
+msgstr ""
+"\n"
+"Поиск в режиме `Свободная форма'."
+
+#: ../src/main/search_dialog.cc:1581
+msgid ""
+"\n"
+"See the Module Manager, Maintenance pane."
+msgstr ""
+"\n"
+"Посмотри Мэнеджер Модулей, пункт Обслуживание."
+
+#: ../src/main/search_dialog.cc:1644
+msgid "Search finished"
+msgstr "Поиск закончен"
+
+#: ../src/main/search_sidebar.cc:100
+msgid "matches"
+msgstr "совпадает"
+
+#: ../src/main/settings.c:60
+msgid ""
+"Welcome to Xiphos.\n"
+"\n"
+"There are no Bible modules installed. In order to initialize, Xiphos needs you to install at least one Bible.\n"
+"\n"
+"With your permission, Xiphos will invoke the Module Manager so that you may install from Crosswire:\n"
+"1. Configure remote install.\n"
+"2. Connect.\n"
+"3. Select a Bible text of your language preference.\n"
+"4. Click `install'.\n"
+"Close the Module Manager when you are done.\n"
+"\n"
+"Warning: If you live in a persecuted country, use with care.\n"
+"\n"
+"May Xiphos invoke the Module Manager so that you may install a Bible?"
+msgstr ""
+"Добро пожаловать в Xiphos.\n"
+"\n"
+"Ни одной Библии не установлено. Для начала, Xiphos нужен хотябы один модуль Библии.\n"
+"\n"
+"С вашего разрешения, Xiphos запустит Менеджер Модулей и вы сможете установливать модули из репозитория Crosswire:\n"
+"1. Настройте параметры Источников.\n"
+"2. Подключитесь.\n"
+"3. Выберите подходяций Библейский текст.\n"
+"4. Нажмите `Установить'.\n"
+"Закройте Менеджер Модуль когда вы закончите.\n"
+"\n"
+"Предупрежение: Используйте с осторожностью в странах преследующих за Слово Божие.\n"
+"\n"
+"Можно ли запустить Менеджер Модулей, для того чтобы вы могли устанавливать модули?"
+
+#: ../src/main/settings.c:105
+msgid "$HOME is not set!"
+msgstr "$HOME не настроена!"
+
+#: ../src/main/settings.c:120
+#, c-format
+msgid ""
+"Xiphos can not create  .xiphos:\n"
+"%s\n"
+"\n"
+"Xiphos cannot continue."
+msgstr ""
+"Xiphos не может создать .xiphos:\n"
+"%s\n"
+"\n"
+"Xiphos не может продолжить."
+
+#: ../src/main/settings.c:133
+#: ../src/main/settings.c:142
+#: ../src/main/settings.c:151
+msgid "can not create "
+msgstr "не может быть создано "
+
+#: ../src/main/settings.c:194
+msgid ""
+"There are still no Bibles installed.\n"
+"Evidently, you declined to install any.\n"
+"\n"
+"Without any Bible modules to display,\n"
+"Xiphos cannot proceed,\n"
+"and will now exit."
+msgstr ""
+"Ни одной Библии не установлено.\n"
+"Видимо, вы отказались от установки.\n"
+"\n"
+"Xiphos не может работать без,\n"
+"хотя бы, одного модуля Библии,\n"
+"и заканчивает работу."
+
+#: ../src/main/settings.c:198
+msgid "Bible module installation complete."
+msgstr "Установка модуля Библии выполнена."
+
+#: ../src/main/settings.c:201
+msgid ""
+"Without any Bible modules to display,\n"
+"Xiphos cannot proceed,\n"
+"and will now exit."
+msgstr ""
+"Xiphos не может работать без,\n"
+"хотя бы, одного модуля Библии,\n"
+"и заканчивает работу."
+
+#: ../src/main/sidebar.cc:399
+msgid "verse"
+msgstr "стих"
+
+#: ../src/main/sidebar.cc:461
+msgid "chapter"
+msgstr "глава"
+
+#: ../src/main/sword.cc:537
+msgid ""
+"Xiphos's file for language\n"
+"abbreviations is missing."
+msgstr ""
+"Файл Xiphos'а для языковых\n"
+"аббревиатур потерян."
+
+#: ../src/main/sword.cc:544
+msgid ""
+"Xiphos's language abbreviation\n"
+"file cannot be opened."
+msgstr ""
+"Файл языковых аббревиатур Xiphos'а\n"
+"не может быть открыт."
+
+#: ../src/main/sword.cc:557
+msgid ""
+"Xiphos cannot allocate space\n"
+"for language abbreviations."
+msgstr ""
+"Xiphos не может выделить место\n"
+"для языковых аббревиатур."
+
+#: ../src/main/sword.cc:564
+msgid ""
+"Xiphos cannot read the\n"
+"language abbreviation file."
+msgstr ""
+"Xiphos не может прочитать\n"
+"файл языковых аббревиатур."
+
+#: ../src/main/sword.cc:642
+msgid "No matching locale found for"
+msgstr "Не найдено подходящей локали для"
+
+#: ../src/main/sword.cc:644
+msgid "Book names and menus may not be translated"
+msgstr "Названия книг и меню могут быть не переведены"
+
+#: ../src/main/sword.cc:1232
+msgid "Daily devotional was requested, but there are none installed."
+msgstr "Не установлено ни одного модуля необходимого типа."
+
+#: ../src/main/tab_history.c:219
+msgid "Clear History"
+msgstr "Очистить Историю"
+
+#: ../src/main/url.cc:101
+msgid "URL not found:"
+msgstr "URL не найден:"
+
+#: ../src/main/url.cc:191
+#, c-format
+msgid "Xiphos could not execute %s"
+msgstr "Xiphos не может выполнить %s"
+
+#: ../src/main/url.cc:199
+msgid "Viewer error:\n"
+msgstr "Ошибка Просмоторщика:\n"
+
+#: ../src/main/url.cc:272
+#, c-format
+msgid "Show %s in main window"
+msgstr "Показать %s в главном окне"
+
+#: ../src/main/xml.c:80
+#: ../src/main/xml.c:464
+#, c-format
+msgid "Document not created successfully. \n"
+msgstr "Документ не создан. \n"
+
+#: ../src/main/xml.c:89
+msgid "Personal"
+msgstr "Личное"
+
+#: ../src/main/xml.c:90
+msgid "What must I do to be saved?"
+msgstr "Что Я должен делать, чтобы спастись?"
+
+#: ../src/main/xml.c:92
+#: ../src/main/xml.c:93
+msgid "Acts 16:31"
+msgstr "Деяния 16:31"
+
+#: ../src/main/xml.c:97
+#: ../src/main/xml.c:98
+msgid "Eph 2:8,9"
+msgstr "Еф 2:8,9"
+
+#: ../src/main/xml.c:102
+#: ../src/main/xml.c:103
+msgid "Romans 1:16"
+msgstr "Римлянам 1:16"
+
+#: ../src/main/xml.c:106
+msgid "What is the Gospel?"
+msgstr "Что такое Проповедь Евангелия?"
+
+#: ../src/main/xml.c:108
+#: ../src/main/xml.c:109
+msgid "1 Cor 15:1-4"
+msgstr "1 Кор 15:1-4"
+
+#: ../src/main/xml.c:413
+#: ../src/main/xml.c:1144
+#, c-format
+msgid "Document not parsed successfully. \n"
+msgstr "Документ не обработан. \n"
+
+#: ../src/main/xml.c:419
+#: ../src/main/xml.c:747
+#: ../src/main/xml.c:1025
+#: ../src/main/xml.c:1204
+#, c-format
+msgid "empty document \n"
+msgstr "пустой документ \n"
+
+#: ../src/main/xml.c:425
+#, c-format
+msgid "wrong type, root node != SwordBookmarks\n"
+msgstr "не правильный тип, корневой объект != SwordBookmarks\n"
+
+#: ../src/main/xml.c:476
+msgid "Old Testament"
+msgstr "Ветхий Завет"
+
+#: ../src/main/xml.c:477
+msgid "Gen - Mal"
+msgstr "Быт - Мал"
+
+#: ../src/main/xml.c:482
+msgid "New Testament"
+msgstr "Новый Завет"
+
+#: ../src/main/xml.c:483
+msgid "Mat - Rev"
+msgstr "Мф - Откр"
+
+#: ../src/main/xml.c:489
+msgid "Sample Module List"
+msgstr "Простой Список Модулей"
+
+#: ../src/main/xml.c:753
+#: ../src/main/xml.c:1031
+#, c-format
+msgid "wrong type, root node != %s\n"
+msgstr "неверный тип, root node != %s\n"
+
+#: ../ui/bookmarks.glade.h:1
+msgid "Add Bookmark"
+msgstr "Добавить Закладку"
+
+#: ../ui/bookmarks.glade.h:2
+#: ../ui/markverse.glade.h:1
+msgid "Bookmark Dialog"
+msgstr "Диалог Закладок"
+
+#: ../ui/bookmarks.glade.h:3
+msgid "Bookmark Folder Treeview"
+msgstr "Bookmark Folder Treeview"
+
+#: ../ui/bookmarks.glade.h:4
+#: ../ui/markverse.glade.h:2
+msgid "Cancel Bookmark"
+msgstr "Отменить Закладку"
+
+#: ../ui/bookmarks.glade.h:5
+#: ../ui/markverse.glade.h:3
+msgid "Create new folder"
+msgstr "Создать новую закладку"
+
+#: ../ui/bookmarks.glade.h:6
+msgid "Label Entry"
+msgstr "Отметить Вхождение"
+
+#: ../ui/bookmarks.glade.h:7
+msgid "Label:"
+msgstr "Вхождение:"
+
+#: ../ui/bookmarks.glade.h:8
+#: ../ui/markverse.glade.h:6
+msgid "Module Entry"
+msgstr "Вхождение Модуля"
+
+#: ../ui/bookmarks.glade.h:9
+#: ../ui/markverse.glade.h:7
+msgid "Module:"
+msgstr "Модуль:"
+
+#: ../ui/bookmarks.glade.h:10
+msgid "New ..."
+msgstr "Новый ..."
+
+#: ../ui/bookmarks.glade.h:11
+#: ../ui/markverse.glade.h:8
+#: ../ui/xi-menus.glade.h:56
+msgid "New Folder"
+msgstr "Новая Папка"
+
+#: ../ui/bookmarks.glade.h:12
+#: ../ui/markverse.glade.h:10
+msgid "Verse Entry"
+msgstr "Вхождение Стиха"
+
+#: ../ui/bookmarks.glade.h:13
+#: ../ui/markverse.glade.h:11
+msgid "Verse:"
+msgstr "Стих:"
+
+#: ../ui/editor_note.xml.h:1
+msgid "Delete the current note"
+msgstr "Удалить текущую заметку"
+
+#: ../ui/editor_note.xml.h:2
+#: ../ui/editor_studypad.xml.h:4
+#: ../ui/editor.xml.h:2
+msgid "E_xit"
+msgstr "_Выход"
+
+#: ../ui/editor_note.xml.h:3
+#: ../ui/editor_studypad.xml.h:5
+#: ../ui/editor.xml.h:3
+msgid "Exit"
+msgstr "Выход"
+
+#: ../ui/editor_note.xml.h:4
+#: ../ui/editor_studypad.xml.h:6
+#: ../ui/editor.xml.h:4
+msgid "Exit the program"
+msgstr "Выйти из программы"
+
+#: ../ui/editor_note.xml.h:5
+#: ../ui/editor_studypad.xml.h:7
+#: ../ui/editor.xml.h:5
+msgid "For_mat"
+msgstr "Для _мат"
+
+#: ../ui/editor_note.xml.h:6
+#: ../ui/editor_studypad.xml.h:8
+#: ../ui/editor.xml.h:6
+msgid "HTML Format switch"
+msgstr "Переключатель формата HTML"
+
+#: ../ui/editor_note.xml.h:7
+#: ../ui/editor_studypad.xml.h:9
+#: ../ui/editor.xml.h:7
+msgid "HTML mode"
+msgstr "HTML режим"
+
+#: ../ui/editor_note.xml.h:8
+msgid "Preview the note to be printed"
+msgstr "Просмотреть запись для печати"
+
+#: ../ui/editor_note.xml.h:10
+msgid "Print this note"
+msgstr "Печатать эту запись"
+
+#: ../ui/editor_note.xml.h:12
+msgid "Save the current note"
+msgstr "Сохранить текущую запись"
+
+#: ../ui/editor_note.xml.h:13
+msgid "_Delete Personal Comment"
+msgstr "_Удалить Личный Комментарий"
+
+#: ../ui/editor_note.xml.h:16
+msgid "_Save (Personal Comment)"
+msgstr "_Сохранить (Личный Комментарий)"
+
+#: ../ui/editor_studypad.xml.h:1
+msgid "Add this file to your bookmarks"
+msgstr "Добавить этот файл в закладки"
+
+#: ../ui/editor_studypad.xml.h:3
+#: ../ui/editor.xml.h:1
+msgid "Create a new document"
+msgstr "Создать новый документ"
+
+#: ../ui/editor_studypad.xml.h:10
+#: ../ui/editor.xml.h:8
+msgid "New Document"
+msgstr "Новый Документ"
+
+#: ../ui/editor_studypad.xml.h:11
+#: ../ui/editor.xml.h:9
+msgid "Open"
+msgstr "Открыть"
+
+#: ../ui/editor_studypad.xml.h:12
+msgid "Open a file in Studypad"
+msgstr "Открыть файл в StudyPad"
+
+#: ../ui/editor_studypad.xml.h:13
+msgid "Preview the document to be printed"
+msgstr "Просмотреть документ для печати"
+
+#: ../ui/editor_studypad.xml.h:15
+msgid "Print this document"
+msgstr "Печатать документ"
+
+#: ../ui/editor_studypad.xml.h:17
+msgid "Save AS"
+msgstr "Сохранить КАК"
+
+#: ../ui/editor_studypad.xml.h:18
+#: ../ui/editor.xml.h:12
+msgid "Save the current file"
+msgstr "Сохранить текущий файл"
+
+#: ../ui/editor_studypad.xml.h:19
+msgid "Save the current file as"
+msgstr "Сохранить текущий файл как"
+
+#: ../ui/editor.xml.h:10
+msgid "Open the file in Studypad"
+msgstr "Открыть файл в StudyPad"
+
+#: ../ui/export-dialog.glade.h:1
+msgid ": "
+msgstr ": "
+
+#: ../ui/export-dialog.glade.h:2
+msgid "<b>Copy</b>"
+msgstr "<b>Копировать</b>"
+
+#: ../ui/export-dialog.glade.h:3
+msgid "<b>Export</b>"
+msgstr "<b>Экспорт</b>"
+
+#: ../ui/export-dialog.glade.h:4
+msgid "<b>Format</b>"
+msgstr "<b>Формат</b>"
+
+#: ../ui/export-dialog.glade.h:5
+#: ../ui/prefs.glade.h:25
+msgid "Book"
+msgstr "Книга"
+
+#: ../ui/export-dialog.glade.h:6
+msgid "Book Radio Button"
+msgstr "Кнопка Выбора Книги"
+
+#: ../ui/export-dialog.glade.h:8
+msgid "Chapter Radio Button"
+msgstr "Кнопка Выбора Главы"
+
+#: ../ui/export-dialog.glade.h:9
+#: ../ui/xi-menus.glade.h:18
+msgid "Copy/Export Passage"
+msgstr "Копирование/Экспорт Отрывка"
+
+#: ../ui/export-dialog.glade.h:10
+msgid "Export Passage Cancel"
+msgstr "Отменить Экспорт Отрывка"
+
+#: ../ui/export-dialog.glade.h:11
+msgid "Export Passage OK"
+msgstr "Экспорт Отрывка Ок"
+
+#: ../ui/export-dialog.glade.h:12
+msgid "Export complete book"
+msgstr "Экспортировать книгу целиком"
+
+#: ../ui/export-dialog.glade.h:13
+msgid "Export complete chapter"
+msgstr "Экспортировать главу целиком"
+
+#: ../ui/export-dialog.glade.h:14
+msgid "Export single verse"
+msgstr "Экспортировать один стих"
+
+#: ../ui/export-dialog.glade.h:15
+msgid "HTML"
+msgstr "HTML"
+
+#: ../ui/export-dialog.glade.h:16
+msgid "HTML Radio Button"
+msgstr "HTML Кнопка Выбора"
+
+#: ../ui/export-dialog.glade.h:17
+msgid "Key"
+msgstr "Ключ"
+
+#: ../ui/export-dialog.glade.h:18
+msgid "Plain Text"
+msgstr "Простой Текст"
+
+#: ../ui/export-dialog.glade.h:19
+msgid "Plain Text Radio Button"
+msgstr "Кнопка Выбора Простого Текста"
+
+#: ../ui/export-dialog.glade.h:21
+msgid "Save Export As"
+msgstr "Сохранить Экспорт Как"
+
+#: ../ui/export-dialog.glade.h:22
+msgid "Verse"
+msgstr "Стих"
+
+#: ../ui/export-dialog.glade.h:23
+msgid "Verse Radio Button"
+msgstr "Кнопка Выбора Стиха"
+
+#: ../ui/export-dialog.glade.h:24
+msgid "Verse range"
+msgstr "Диапазон Стихов"
+
+#: ../ui/export-dialog.glade.h:25
+msgid "Version"
+msgstr "Версия"
+
+#: ../ui/markverse.glade.h:4
+msgid "Mark"
+msgstr "Отметить"
+
+#: ../ui/markverse.glade.h:5
+msgid "Mark/Unmark Verse"
+msgstr "Отметка Стиха"
+
+#: ../ui/markverse.glade.h:9
+msgid "Unmark"
+msgstr "Снять Отметку"
+
+#: ../ui/module-manager.glade.h:1
+msgid "<b>Add and Remove Sources</b>"
+msgstr "<b>Добавить или Удалить Источники</b>"
+
+#: ../ui/module-manager.glade.h:2
+msgid "<b>Install Destination</b>"
+msgstr "<b>Папка Установки</b>"
+
+#: ../ui/module-manager.glade.h:3
+msgid "<b>Install Source</b>"
+msgstr "<b>Источник Установки</b>"
+
+#: ../ui/module-manager.glade.h:4
+msgid "<b>Module Manager</b>"
+msgstr "<b>Менеджер Модулей</b>"
+
+#. do not translate <b> and </b> they are html formating
+#: ../ui/module-manager.glade.h:6
+msgid "<b>Sword</b>"
+msgstr "<b>Sword</b>"
+
+#: ../ui/module-manager.glade.h:7
+msgid "<b>WARNING:</b> If you live in a persecuted country use with care."
+msgstr ""
+"<b>ПРЕДУПРЕЖДЕНИЕ:</b> Используйте с осторожностью в странах\n"
+"преследующих за Слово Божие."
+
+#: ../ui/module-manager.glade.h:8
+msgid "<b>Warning:</b> If you live in a persecuted country and do not wish to risk detection you should NOT use  the remote installation feature! "
+msgstr "<b>Предупреждение:</b> Если вы живете в стране преследующей за Слово Божие и не хотите рисковать то, вы НЕ должны использовать возможность удаленной установки модулей! "
+
+#: ../ui/module-manager.glade.h:9
+msgid "<i>Personal area, for your use only:</i>"
+msgstr "<i>Личная зона, только для вашего использования:</i>"
+
+#: ../ui/module-manager.glade.h:10
+msgid "<i>System area, for all users:</i>"
+msgstr "<i>Системная зона, для всех пользователей:</i>"
+
+#: ../ui/module-manager.glade.h:12
+msgid "Continue"
+msgstr "Продолжить"
+
+#: ../ui/module-manager.glade.h:13
+msgid "Current Remote Sources"
+msgstr "Текущий удаленный источник:"
+
+#: ../ui/module-manager.glade.h:14
+msgid "Current local sources"
+msgstr "Текущий локальный источник:"
+
+#: ../ui/module-manager.glade.h:15
+msgid "Delete Index"
+msgstr "Удалить индекс"
+
+#: ../ui/module-manager.glade.h:16
+msgid "Home dir"
+msgstr "Домашняя папка"
+
+#: ../ui/module-manager.glade.h:19
+msgid "Load Standard"
+msgstr "Загрузить Стандарт"
+
+#: ../ui/module-manager.glade.h:20
+msgid "Local"
+msgstr "Локально"
+
+#: ../ui/module-manager.glade.h:21
+msgid "Local Install Folder"
+msgstr "Локальная Папку Установки"
+
+#: ../ui/module-manager.glade.h:22
+msgid "Module Manager"
+msgstr "Менеджер Модулей"
+
+#: ../ui/module-manager.glade.h:23
+msgid "Remote"
+msgstr "Удаленно"
+
+#: ../ui/module-manager.glade.h:24
+msgid "Sword sys dir"
+msgstr "Системная папка Sword"
+
+#: ../ui/navbar_versekey.glade.h:1
+msgid "1"
+msgstr "1"
+
+#: ../ui/navbar_versekey.glade.h:2
+msgid "<b>Revelation of John</b>"
+msgstr "<b>Откровение Иоанна Богослова</b>"
+
+#: ../ui/navbar_versekey.glade.h:3
+msgid "Book Selector Button"
+msgstr "Кнопка Выбора Книги"
+
+#: ../ui/navbar_versekey.glade.h:4
+msgid "Choose book to display"
+msgstr "Выберите Книгу"
+
+#: ../ui/navbar_versekey.glade.h:5
+msgid "Drop down history list"
+msgstr "Выпадающий список истории"
+
+#: ../ui/navbar_versekey.glade.h:6
+msgid "Reference Entry"
+msgstr "Метка Ссылки"
+
+#: ../ui/navbar_versekey.glade.h:7
+msgid "Toggle Chapter Button"
+msgstr "Переключить Кнопку Главы"
+
+#: ../ui/navbar_versekey.glade.h:8
+msgid "Toggle Verse Button"
+msgstr "Переключить Кнопку Стиха"
+
+#: ../ui/prefs.glade.h:1
+msgid ""
+"-2\n"
+"-1\n"
+"+0\n"
+"+1\n"
+"+2\n"
+"+3\n"
+"+4\n"
+"+5"
+msgstr ""
+"-2\n"
+"-1\n"
+"+0\n"
+"+1\n"
+"+2\n"
+"+3\n"
+"+4\n"
+"+5"
+
+#: ../ui/prefs.glade.h:9
+msgid "<b>Font Colors</b>"
+msgstr "<b>Цвета Шрифтов</b>"
+
+#: ../ui/prefs.glade.h:10
+msgid "<b>Font Sizes</b>"
+msgstr "<b>Размеры Шрифта</b>"
+
+#: ../ui/prefs.glade.h:11
+msgid "<b>General</b>"
+msgstr "<b>Общие</b>"
+
+#: ../ui/prefs.glade.h:12
+msgid "<b>Main Window Modules</b>"
+msgstr "<b>Окно Модуля</b>"
+
+#: ../ui/prefs.glade.h:13
+msgid "<b>Parallel View</b>"
+msgstr "<b>Параллельный Вид</b>"
+
+#: ../ui/prefs.glade.h:14
+msgid "<b>Show</b>"
+msgstr "<b>Показать</b>"
+
+#: ../ui/prefs.glade.h:15
+msgid "<b>Special Purpose Modules</b>"
+msgstr "<b>Модули Специального Назначения</b>"
+
+#: ../ui/prefs.glade.h:16
+msgid "<b>StudyPad default directory</b>"
+msgstr "<b>Пака для StudyPad по-умолчанию</b>"
+
+#: ../ui/prefs.glade.h:17
+msgid "<b>Tabs</b>"
+msgstr "<b>Вкладки</b>"
+
+#: ../ui/prefs.glade.h:18
+msgid "Apply high-contrast highlight to current verse"
+msgstr "Применять высоко-контрастную цветовую схему для текущего стиха"
+
+#: ../ui/prefs.glade.h:19
+msgid "Automatically resize commentary, book, and dictionary image content to fit subwindow"
+msgstr "Автоматически подгонять размер изображений в комментариях, книгах, и словарях к  размеру под-окна"
+
+#: ../ui/prefs.glade.h:20
+msgid "Background"
+msgstr "Фон"
+
+#: ../ui/prefs.glade.h:21
+msgid "Base font size"
+msgstr "Базовый размер шрифта"
+
+#: ../ui/prefs.glade.h:22
+msgid "Bible Texts"
+msgstr "Текст Библии"
+
+#: ../ui/prefs.glade.h:23
+msgid "Bible Texts Checkbox"
+msgstr "Флажок Текста Библии"
+
+#: ../ui/prefs.glade.h:24
+msgid "Biblical Text"
+msgstr "Библейский Текст"
+
+#: ../ui/prefs.glade.h:26
+msgid "Change Biblical Text Combo"
+msgstr "Изменить Комбо Библейского Текста"
+
+#: ../ui/prefs.glade.h:27
+msgid "Change Book Combo"
+msgstr "Изменить Комбо Книги"
+
+#: ../ui/prefs.glade.h:28
+msgid "Change Commentary Combo"
+msgstr "Изменить Комбо Комментария"
+
+#: ../ui/prefs.glade.h:29
+msgid "Change Default Dictionary Combo"
+msgstr "Изменить Комбо Словаря По-умолчанию"
+
+#: ../ui/prefs.glade.h:30
+msgid "Change Dictionary Combo"
+msgstr "Изменить Комбо Словаря"
+
+#: ../ui/prefs.glade.h:31
+msgid "Change Personal Notes Combo"
+msgstr "Изменить Комбо Личных Комментариев"
+
+#: ../ui/prefs.glade.h:32
+msgid "Choose to enable Prayer lists "
+msgstr "Выберите чтобы показать Молитвенные Списки на Боковой Панели "
+
+#: ../ui/prefs.glade.h:34
+msgid "Commentaries Checkbox"
+msgstr "Флажок Комментариев"
+
+#: ../ui/prefs.glade.h:36
+msgid "Cover"
+msgstr "Обертка"
+
+#: ../ui/prefs.glade.h:37
+msgid "Current Verse"
+msgstr "Текущий Стих"
+
+#: ../ui/prefs.glade.h:38
+msgid "Daily Devotional"
+msgstr "Стих Дня"
+
+#: ../ui/prefs.glade.h:39
+msgid "Daily Devotional Combo"
+msgstr "Комбо Стих Дня"
+
+#: ../ui/prefs.glade.h:40
+msgid "Default Dictionary"
+msgstr "Словарь По-умолчанию"
+
+#: ../ui/prefs.glade.h:41
+msgid "Dictionary"
+msgstr "Словарь"
+
+#: ../ui/prefs.glade.h:42
+msgid "Dictionary/Lexicon"
+msgstr "Словарь/Лексикон"
+
+#: ../ui/prefs.glade.h:43
+msgid "Dictionary/Lexicon Checkbox"
+msgstr "Флажок Словаря/Лексикона"
+
+#: ../ui/prefs.glade.h:44
+msgid "Enable Prayer Lists"
+msgstr "Включить Молитвенные Списки"
+
+#: ../ui/prefs.glade.h:45
+msgid "Enable Prayer Lists Checkbox"
+msgstr "Флажок Включения Молитвенных Списков"
+
+#: ../ui/prefs.glade.h:46
+msgid "Font Colors"
+msgstr "Цвета Шрифтов"
+
+#: ../ui/prefs.glade.h:47
+msgid "Font Misc"
+msgstr "Шрифт для Разного"
+
+#: ../ui/prefs.glade.h:48
+msgid "Foreground"
+msgstr "Передний План"
+
+#: ../ui/prefs.glade.h:49
+msgid "General Misc"
+msgstr "Общее Разное"
+
+#: ../ui/prefs.glade.h:50
+msgid "Greek Lexicon"
+msgstr "Греческий Лексикон"
+
+#: ../ui/prefs.glade.h:51
+msgid "Greek Lexicon Combo"
+msgstr "Комбо Греческого Лексикона"
+
+#: ../ui/prefs.glade.h:52
+msgid "Hebrew Lexicon"
+msgstr "Еврейский Лексикон"
+
+#: ../ui/prefs.glade.h:53
+msgid "Hebrew Lexicon Combo"
+msgstr "Комбо Еврейского Лексикона"
+
+#: ../ui/prefs.glade.h:54
+msgid "Highlight Background"
+msgstr "Подсветить Фон"
+
+#: ../ui/prefs.glade.h:55
+msgid "Highlight Foreground"
+msgstr "Подсветить Передний План"
+
+#: ../ui/prefs.glade.h:56
+msgid "Highlight current verse"
+msgstr "Подсветить текущий стих"
+
+#: ../ui/prefs.glade.h:57
+msgid "Highlight current verse check box"
+msgstr "Флажок подсветки текущего стиха"
+
+#: ../ui/prefs.glade.h:58
+msgid "Links"
+msgstr "Ссылки"
+
+#: ../ui/prefs.glade.h:59
+msgid "Modules Main"
+msgstr "Модули Главное"
+
+#: ../ui/prefs.glade.h:60
+msgid "Modules Misc"
+msgstr "Модули Разное"
+
+#: ../ui/prefs.glade.h:61
+msgid "Modules Parallel"
+msgstr "Модули Параллельное"
+
+#: ../ui/prefs.glade.h:62
+msgid "Parallel 1"
+msgstr "Параллель 1"
+
+#: ../ui/prefs.glade.h:63
+msgid "Parallel 1 Combo"
+msgstr "Параллель 1 Комбо"
+
+#: ../ui/prefs.glade.h:64
+msgid "Parallel 2"
+msgstr "Параллель 2"
+
+#: ../ui/prefs.glade.h:65
+msgid "Parallel 2 Combo"
+msgstr "Параллель 2 Комбо"
+
+#: ../ui/prefs.glade.h:66
+msgid "Parallel 3"
+msgstr "Параллель 3"
+
+#: ../ui/prefs.glade.h:67
+msgid "Parallel 3 Combo"
+msgstr "Параллель 3 Комбо"
+
+#: ../ui/prefs.glade.h:68
+msgid "Parallel 4"
+msgstr "Параллель 4"
+
+#: ../ui/prefs.glade.h:69
+msgid "Parallel 4 Combo"
+msgstr "Параллель 4 Комбо"
+
+#: ../ui/prefs.glade.h:70
+msgid "Parallel 5"
+msgstr "Параллель 5"
+
+#: ../ui/prefs.glade.h:71
+msgid "Parallel 5 Combo"
+msgstr "Параллель 5 Комбо"
+
+#: ../ui/prefs.glade.h:72
+msgid "Parallel View in a tab"
+msgstr "Параллельный Вид во вкладке"
+
+#: ../ui/prefs.glade.h:73
+msgid "Personal Notes"
+msgstr "Личные Заметки"
+
+#: ../ui/prefs.glade.h:76
+msgid "Previewer Checkbox"
+msgstr "Флажок Предпросмотра"
+
+#: ../ui/prefs.glade.h:77
+msgid "Resize images"
+msgstr "Изменять Размер Изображений"
+
+#: ../ui/prefs.glade.h:78
+msgid "Resize images checkbox"
+msgstr "Флажок Изменения Размера Изображений"
+
+#: ../ui/prefs.glade.h:79
+msgid "Scroll to Previous/Next Chapter"
+msgstr "Листать к Предыдущей/Следующие Главе"
+
+#: ../ui/prefs.glade.h:80
+msgid "Scroll to Previous/Next Chapter Checkbox"
+msgstr "Флажок Листания к Предыдущей/Следующие Главе"
+
+#: ../ui/prefs.glade.h:81
+msgid "Select A Directory"
+msgstr "Выбрать Директорию"
+
+#: ../ui/prefs.glade.h:82
+msgid "Show Daily Devotion at start up"
+msgstr "Показывать Стих Дня при загрузке"
+
+#: ../ui/prefs.glade.h:83
+msgid "Show splash screen at start up"
+msgstr "Показывать стартовый экран при загрузке"
+
+#: ../ui/prefs.glade.h:84
+msgid "Special Locale (requires restart)"
+msgstr "Настройка языка (перезапуск)"
+
+#: ../ui/prefs.glade.h:85
+msgid "Special Locale Combo"
+msgstr "Комбо Специальной Локали"
+
+#: ../ui/prefs.glade.h:86
+msgid "StudyPad default directory combo"
+msgstr "Комбо директории StudyPad по-умолчанию"
+
+#: ../ui/prefs.glade.h:88
+msgid "Use Bible Text scroll bar to scroll to previous or next chapter"
+msgstr "Использовать скрол-бар Текста Библии чтобы листать к предыдущей или следующей главе"
+
+#: ../ui/prefs.glade.h:89
+msgid "Use Verse Per Line"
+msgstr "Стих на Строку"
+
+#: ../ui/prefs.glade.h:90
+msgid "Use Verse Per Line Checkbox"
+msgstr "Флажок Использования Стих на Строку"
+
+#: ../ui/prefs.glade.h:91
+msgid "Use default Dictionary"
+msgstr "Использовать Словарь по-умолчанию"
+
+#: ../ui/prefs.glade.h:92
+msgid "Use default Dictionary Checkbox"
+msgstr "Флажок Использования Словаря по-умолчанию"
+
+#: ../ui/prefs.glade.h:93
+msgid "Use tabbed browsing"
+msgstr "Использовать Просмотр по вкладкам"
+
+#: ../ui/prefs.glade.h:94
+msgid "Use tabbed browsing Checkbox"
+msgstr "Флажок Использования Просмотра по вкладкам"
+
+#: ../ui/prefs.glade.h:95
+msgid "Verse Number"
+msgstr "Номер Стиха"
+
+#: ../ui/prefs.glade.h:96
+msgid "Verse number size"
+msgstr "Размер номеров стиха"
+
+#: ../ui/search-dialog.glade.h:1
+msgid "<b>Attribute</b>"
+msgstr "<b>Свойство</b>"
+
+#: ../ui/search-dialog.glade.h:2
+msgid "<b>Found</b>"
+msgstr "<b>Найдено</b>"
+
+#: ../ui/search-dialog.glade.h:3
+msgid "<b>List Name</b>"
+msgstr "<b>Имя Списка</b>"
+
+#: ../ui/search-dialog.glade.h:4
+msgid "<b>Module Lists</b>"
+msgstr "<b>Список Модулей</b>"
+
+#: ../ui/search-dialog.glade.h:5
+msgid "<b>Modules</b>"
+msgstr "<b>Модули</b>"
+
+#: ../ui/search-dialog.glade.h:6
+msgid "<b>Options</b>"
+msgstr "<b>Опции</b>"
+
+#: ../ui/search-dialog.glade.h:7
+msgid "<b>Preview</b>"
+msgstr "<b>Предпросмотр</b>"
+
+#: ../ui/search-dialog.glade.h:8
+msgid "<b>Range Definition</b>"
+msgstr "<b>Определение</b>"
+
+#: ../ui/search-dialog.glade.h:9
+msgid "<b>Range Name</b>"
+msgstr "<b>Имя Диапазона</b>"
+
+#: ../ui/search-dialog.glade.h:10
+msgid "<b>Ranges</b>"
+msgstr "<b>Диапазоны</b>"
+
+#: ../ui/search-dialog.glade.h:11
+msgid "<b>Results Display Options</b>"
+msgstr "<b>Опции Отображений Результатов</b>"
+
+#: ../ui/search-dialog.glade.h:12
+msgid "<b>Scope</b>"
+msgstr "<b>Диапазон</b>"
+
+#: ../ui/search-dialog.glade.h:13
+msgid "<b>Search Results</b>"
+msgstr "<b>Результаты Поиска</b>"
+
+#: ../ui/search-dialog.glade.h:14
+msgid "<b>Search Type</b>"
+msgstr "<b>Тип Поиска</b>"
+
+#: ../ui/search-dialog.glade.h:15
+msgid "Add Modules"
+msgstr "Добавить Модули"
+
+#: ../ui/search-dialog.glade.h:16
+msgid "Advanced Search"
+msgstr "Продвинутый Поиск"
+
+#: ../ui/search-dialog.glade.h:17
+msgid "Attribute Search"
+msgstr "Поиск Свойств"
+
+#: ../ui/search-dialog.glade.h:18
+msgid "Attributes"
+msgstr "Свойства"
+
+#: ../ui/search-dialog.glade.h:19
+msgid "Attributes radiobutton"
+msgstr "Флажок Свойств"
+
+#: ../ui/search-dialog.glade.h:20
+msgid "Clear Custom Module List Button"
+msgstr "Очистить Произвольный Список Модулей"
+
+#: ../ui/search-dialog.glade.h:21
+msgid "Clear Modules from List Button"
+msgstr "Кнопка Очистки Модулей из Списка"
+
+#: ../ui/search-dialog.glade.h:22
+msgid "Clear all modules from the list"
+msgstr "Очистить все модули из списка"
+
+#: ../ui/search-dialog.glade.h:23
+msgid "Clear lists for new search"
+msgstr "Очистить список для нового поиска"
+
+#: ../ui/search-dialog.glade.h:24
+msgid "Create a new module list"
+msgstr "Создать новый список модулей"
+
+#: ../ui/search-dialog.glade.h:25
+msgid "Create new custom range"
+msgstr "Создать новый произвольный диапазон"
+
+#: ../ui/search-dialog.glade.h:26
+msgid "Current results"
+msgstr "Текущие результаты"
+
+#: ../ui/search-dialog.glade.h:27
+msgid "Current results radiobutton"
+msgstr "Переключатель текущих результатов"
+
+#: ../ui/search-dialog.glade.h:28
+msgid "Custom Module List Combo"
+msgstr "Комбо Произвольного Списка Модулей"
+
+#: ../ui/search-dialog.glade.h:29
+msgid "Custom Module List Name Entry"
+msgstr "Пункт Имени Произвольного Списка Модулей"
+
+#: ../ui/search-dialog.glade.h:30
+msgid "Custom Module Lists"
+msgstr "Пользовательский Список"
+
+#: ../ui/search-dialog.glade.h:31
+msgid "Custom Range Preview"
+msgstr "Предпросмотр Произвольного Диапазона"
+
+#: ../ui/search-dialog.glade.h:32
+msgid "Custom Range Selector Combo"
+msgstr "Комбо Выборщика Произвольного Диапазона"
+
+#: ../ui/search-dialog.glade.h:33
+msgid "Custom Verse Ranges"
+msgstr "Диапазоны Стихов"
+
+#: ../ui/search-dialog.glade.h:34
+msgid "Custom module list"
+msgstr "Произвольный Список"
+
+#: ../ui/search-dialog.glade.h:35
+msgid "Custom module list radiobutton"
+msgstr "Переключатель произвольного списка модулей"
+
+#: ../ui/search-dialog.glade.h:36
+msgid "Custom verse range"
+msgstr "Диапазон Стихов"
+
+#: ../ui/search-dialog.glade.h:37
+msgid "Custom verse range radiobutton"
+msgstr "Переключатель произвольного диапазона стихов"
+
+#: ../ui/search-dialog.glade.h:38
+msgid "Delete Range Button"
+msgstr "Кнопка Удаления Диапазона"
+
+#: ../ui/search-dialog.glade.h:39
+msgid "Delete Selected Module From List Button"
+msgstr "Кнопка Удаления Выбранного Модуля из Списка"
+
+#: ../ui/search-dialog.glade.h:40
+msgid "Delete selected range"
+msgstr "Удалить выбранный диапазон"
+
+#: ../ui/search-dialog.glade.h:41
+msgid "Delete the selected list"
+msgstr "Удалить выбранный список"
+
+#: ../ui/search-dialog.glade.h:42
+msgid "Entire module"
+msgstr "Весь модуль"
+
+#: ../ui/search-dialog.glade.h:43
+msgid "Entire module radiobutton"
+msgstr "Переключатель Всего модуля"
+
+#: ../ui/search-dialog.glade.h:45
+msgid "Exact phrase radiobutton"
+msgstr "Переключатель Точной Фразы"
+
+#: ../ui/search-dialog.glade.h:46
+msgid "Export"
+msgstr "Экспорт"
+
+#: ../ui/search-dialog.glade.h:47
+msgid "Export current search results"
+msgstr "Экспортировать текщие результата поиска"
+
+#: ../ui/search-dialog.glade.h:48
+msgid ""
+"Fast, featureful, index-based search\n"
+"Indexes must have been built beforehand:\n"
+"See Module Manager's maintenance functions"
+msgstr ""
+"Быстрый поиск, основанный на заранее созданной базе индексов:\n"
+"Смотри функции обслуживания Менеджера Модулей"
+
+#: ../ui/search-dialog.glade.h:51
+msgid "Find Button"
+msgstr "Кнопка Найти"
+
+#: ../ui/search-dialog.glade.h:53
+msgid "Footnotes radiobutton"
+msgstr "Переключатель Сносок"
+
+#: ../ui/search-dialog.glade.h:54
+msgid "In modules that have Footnotes"
+msgstr "В модулях, которые имеют Сноски"
+
+#: ../ui/search-dialog.glade.h:55
+msgid "In modules that have Morphological Tags"
+msgstr "В модулях, имеющих Морфологические Тэги"
+
+#: ../ui/search-dialog.glade.h:56
+msgid "In modules that have Strong's Numbers"
+msgstr "В модулях, имеющих Номера Стронга"
+
+#: ../ui/search-dialog.glade.h:57
+msgid "Main Search Entry"
+msgstr "Пункт Основного Поиска"
+
+#: ../ui/search-dialog.glade.h:58
+msgid "Make selections on the Attribute Search tab"
+msgstr "Использовать выбранные аттрибуты с вкладки Поиска Свойств"
+
+#: ../ui/search-dialog.glade.h:60
+msgid "Match case checkbox"
+msgstr "Флажок Совпадения Регистра"
+
+#: ../ui/search-dialog.glade.h:61
+msgid "Module Selection"
+msgstr "Выбор Модуля"
+
+#: ../ui/search-dialog.glade.h:62
+msgid "Module list"
+msgstr "Список Модулей"
+
+#: ../ui/search-dialog.glade.h:63
+msgid "Module list radiobutton"
+msgstr "Переключатель Списка Модулей"
+
+#: ../ui/search-dialog.glade.h:65
+msgid "Morphological Tags radiobutton"
+msgstr "Переключатель Морфологических Тэгов"
+
+#: ../ui/search-dialog.glade.h:67
+msgid "Multi word radiobutton"
+msgstr "Переключатель Несколько-слов"
+
+#: ../ui/search-dialog.glade.h:68
+msgid "New Custom Module List Button"
+msgstr "Кнопка Нового Произвольного Списка Модулей"
+
+#: ../ui/search-dialog.glade.h:69
+msgid "New Range Button"
+msgstr "Кнопка Нового Диапазона"
+
+#: ../ui/search-dialog.glade.h:70
+msgid "Open Selection Dialog Button"
+msgstr "Кнопка Открытия Диалога Выбора"
+
+#: ../ui/search-dialog.glade.h:71
+msgid "Open a dialog to select modules to add to the list"
+msgstr "Открыть диалог выбора модулей, чтобы добавить из в список"
+
+#: ../ui/search-dialog.glade.h:72
+msgid "Optimized (\"Lucene\")"
+msgstr "Оптимизированный (\"Lucene\")"
+
+#: ../ui/search-dialog.glade.h:73
+msgid "Optimized (\"Lucene\") radiobutton"
+msgstr "Оптимизировано (\"Lucene\") кнопка"
+
+#: ../ui/search-dialog.glade.h:74
+msgid "Range Definition Entry"
+msgstr "Пункт Определения Диапазона"
+
+#: ../ui/search-dialog.glade.h:75
+msgid "Range Name Entry"
+msgstr "Пункт Имени Диапазона"
+
+#: ../ui/search-dialog.glade.h:77
+msgid "Regular expression radiobutton"
+msgstr "Переключатель Регулярных Выражений"
+
+#: ../ui/search-dialog.glade.h:78
+msgid "Remove the selected module from the list"
+msgstr "Удалить выбранный модуль из списка"
+
+#: ../ui/search-dialog.glade.h:79
+msgid "Result Summary Table"
+msgstr "Таблица Сводки Результатов"
+
+#: ../ui/search-dialog.glade.h:80
+msgid "Result Summary Window"
+msgstr "Окно Сводки Результатов"
+
+#: ../ui/search-dialog.glade.h:81
+msgid "Results"
+msgstr "Результаты"
+
+#: ../ui/search-dialog.glade.h:82
+msgid "Save Custom Module List Button"
+msgstr "Кнопка Сохранения Произвольного Списка Модулей"
+
+#: ../ui/search-dialog.glade.h:83
+msgid "Save Range Button"
+msgstr "Кнопка Сохранения Диапазона"
+
+#: ../ui/search-dialog.glade.h:84
+msgid "Save custom range"
+msgstr "Сохранить произвольный диапазон"
+
+#: ../ui/search-dialog.glade.h:85
+msgid "Save search results as bookmarks"
+msgstr "Сохранить результаты поиска как закладки"
+
+#: ../ui/search-dialog.glade.h:86
+msgid "Save the module list"
+msgstr "Сохранить список модулей"
+
+#: ../ui/search-dialog.glade.h:87
+msgid "Search  Criteria"
+msgstr "Критерий Поиска"
+
+#: ../ui/search-dialog.glade.h:88
+msgid "Search Criteria Treeview"
+msgstr "Деревовид Критерия Поиска"
+
+#: ../ui/search-dialog.glade.h:89
+msgid "Search entire module"
+msgstr "Искать по всему модулю"
+
+#: ../ui/search-dialog.glade.h:90
+msgid "Search for Morphological tags"
+msgstr "Искать Морфологические Тэги"
+
+#: ../ui/search-dialog.glade.h:91
+msgid "Search for Strongs Numbers like G4442 or H1121"
+msgstr "Искать Номера Стронга, подобно G4442 или H1121"
+
+#: ../ui/search-dialog.glade.h:92
+msgid "Search in footnotes"
+msgstr "Искать в сносках"
+
+#: ../ui/search-dialog.glade.h:93
+msgid "Show Footnotes"
+msgstr "Показать Сноски"
+
+#: ../ui/search-dialog.glade.h:94
+msgid "Show Footnotes checkbox"
+msgstr "Флажок Отображения Сносок"
+
+#: ../ui/search-dialog.glade.h:95
+msgid "Show Morphological Tags"
+msgstr "Показать Морфологические Тэги"
+
+#: ../ui/search-dialog.glade.h:96
+msgid "Show Morphological Tags checkbox"
+msgstr "Флажок Отображения Морфологических Тэгов"
+
+#: ../ui/search-dialog.glade.h:97
+msgid "Show Strong's Numbers"
+msgstr "Показывать Номера Стронга"
+
+#: ../ui/search-dialog.glade.h:98
+msgid "Show Strong's Numbers checkbox"
+msgstr "Флажок Отображения Номеров Стронга"
+
+#: ../ui/search-dialog.glade.h:99
+msgid "Show in main window"
+msgstr "Показать в главном окне"
+
+#: ../ui/search-dialog.glade.h:100
+msgid "Single module"
+msgstr "Модуль"
+
+#: ../ui/search-dialog.glade.h:101
+msgid "Single module radiobutton"
+msgstr "Переключатель Одиночного модуля"
+
+#: ../ui/search-dialog.glade.h:102
+msgid "Start/stop searching"
+msgstr "Начать / Остановить поиск"
+
+#: ../ui/search-dialog.glade.h:103
+msgid "Strongs Numbers"
+msgstr "Номера Стронга"
+
+#: ../ui/search-dialog.glade.h:104
+msgid "Strongs Numbers radiobutton"
+msgstr "Переключатель Номеров Стронга"
+
+#: ../ui/search-dialog.glade.h:105
+msgid "Use a custom module list for the search"
+msgstr "Использовать для поиска настраиваемый список модулей"
+
+#: ../ui/search-dialog.glade.h:106
+msgid "Use a custom range for the scope of the search"
+msgstr "Использовать пользовательский диапазон для поиска"
+
+#: ../ui/search-dialog.glade.h:107
+msgid "Use a single module for the search"
+msgstr "Использовать для поиска всего один модуль"
+
+#: ../ui/search-dialog.glade.h:108
+msgid "Use the current module list for the search"
+msgstr "Использовать для поиска текущий список модулей"
+
+#: ../ui/search-dialog.glade.h:109
+msgid "Use the results of the last search as the scope of the search"
+msgstr "Использовать результаты последнего поиска как диапазон поиска"
+
+#: ../ui/search-dialog.glade.h:110
+msgid "e.g. Matt-John;Rev4"
+msgstr "например, Мат-Иоан;Откр4"
+
+#: ../ui/search-dialog.glade.h:111
+msgid "for "
+msgstr "для "
+
+#: ../ui/xi-menus.glade.h:2
+msgid "About _Translation"
+msgstr "О _Переводе"
+
+#: ../ui/xi-menus.glade.h:3
+msgid "About _Xiphos"
+msgstr "_О Xiphos"
+
+#: ../ui/xi-menus.glade.h:4
+msgid "Add Item"
+msgstr "Добавьте материал"
+
+#: ../ui/xi-menus.glade.h:5
+msgid "Add Sub-Item"
+msgstr "Добавить Подпункт"
+
+#: ../ui/xi-menus.glade.h:6
+msgid "Add a sub-item"
+msgstr "Добавить подпункт"
+
+#: ../ui/xi-menus.glade.h:7
+msgid "Add an item"
+msgstr "Добавить пункт"
+
+#: ../ui/xi-menus.glade.h:8
+msgid "Add new folder to selected folder"
+msgstr "Добавить новую папку"
+
+#: ../ui/xi-menus.glade.h:10
+msgid "Allow Reordering"
+msgstr "Позволять Изменение Порядка"
+
+#: ../ui/xi-menus.glade.h:11
+msgid "Allow items to be moved from one folder to another"
+msgstr "Можно перемещать пункты из одной папки в другую"
+
+#: ../ui/xi-menus.glade.h:12
+msgid "Annotate Verse"
+msgstr "Комментировать Стих"
+
+#: ../ui/xi-menus.glade.h:14
+msgid "Browse in BibleMap.org"
+msgstr "Просмотреть в BibleMap.org"
+
+#: ../ui/xi-menus.glade.h:15
+msgid "Collapse All"
+msgstr "Свернуть Все"
+
+#: ../ui/xi-menus.glade.h:16
+msgid "Collapse all Bookmarks groups"
+msgstr "Свернуть все группы Закладок"
+
+#: ../ui/xi-menus.glade.h:17
+msgid "Commentary by Chapter"
+msgstr "Комментарии по Главам"
+
+#: ../ui/xi-menus.glade.h:19
+msgid "Create a new daily journal"
+msgstr "Создать новый дневной журнал"
+
+#: ../ui/xi-menus.glade.h:20
+msgid "Create a new monthly journal"
+msgstr "Создать новый месячный журнал"
+
+#: ../ui/xi-menus.glade.h:21
+msgid "Create a new outlined topic"
+msgstr "Создать новую тему"
+
+#: ../ui/xi-menus.glade.h:22
+msgid "Create a new simple prayer list"
+msgstr "Создать простой молитвенный список"
+
+#: ../ui/xi-menus.glade.h:23
+msgid "Create a new subject prayer list"
+msgstr "Создать новый предметный молитвенный список"
+
+#: ../ui/xi-menus.glade.h:24
+msgid "D_ouble-Space Text"
+msgstr "Двойной интервал для текста"
+
+#: ../ui/xi-menus.glade.h:25
+msgid "Daily"
+msgstr "Ежедневно"
+
+#: ../ui/xi-menus.glade.h:26
+msgid "Delete Item"
+msgstr "Удалить Пункт"
+
+#: ../ui/xi-menus.glade.h:27
+msgid "Delete item"
+msgstr "Удалить пункт"
+
+#: ../ui/xi-menus.glade.h:28
+msgid "Dictionar_y"
+msgstr "_Словарь"
+
+#: ../ui/xi-menus.glade.h:29
+msgid "Display Book Heading"
+msgstr "Показывать Вступление к Книгам"
+
+#: ../ui/xi-menus.glade.h:30
+msgid "Display Chapter Heading"
+msgstr "Показывать Вступление к Главам"
+
+#: ../ui/xi-menus.glade.h:31
+msgid "Dump Pers.Comm."
+msgstr "Слить Личный Комментарий"
+
+#: ../ui/xi-menus.glade.h:33
+msgid "Edit bookmark item"
+msgstr "Редактировать пункт закладки"
+
+#: ../ui/xi-menus.glade.h:34
+msgid "Edit this item"
+msgstr "Изменить этот пункт"
+
+#: ../ui/xi-menus.glade.h:35
+msgid "Expand All"
+msgstr "Развернуть Все"
+
+#: ../ui/xi-menus.glade.h:36
+msgid "Expand all Bookmarks groups"
+msgstr "Развернуть все группы Закладок"
+
+#: ../ui/xi-menus.glade.h:37
+msgid "Export Folder"
+msgstr "Папка для экспорта"
+
+#: ../ui/xi-menus.glade.h:38
+msgid "Export List"
+msgstr "Список экспорта"
+
+#: ../ui/xi-menus.glade.h:45
+msgid "Image Content"
+msgstr "Содержимое Изображения"
+
+#: ../ui/xi-menus.glade.h:46
+msgid "Import Bibletime Bookmarks"
+msgstr "Импортировать Закладки из Bibletime"
+
+#: ../ui/xi-menus.glade.h:47
+msgid "Insert Bookmark"
+msgstr "Вставить Закладку"
+
+#: ../ui/xi-menus.glade.h:48
+msgid "Insert new bookmark here"
+msgstr "Вставить новую закладку"
+
+#: ../ui/xi-menus.glade.h:49
+msgid "L_ink Tabs"
+msgstr "С_вязать Вкладки"
+
+#: ../ui/xi-menus.glade.h:51
+msgid "Load Bookmarks from Bibletime"
+msgstr "Загрузить Закладки из Bibletime"
+
+#: ../ui/xi-menus.glade.h:52
+msgid "Lookup Selection"
+msgstr "Рассмотреть Выбор"
+
+#: ../ui/xi-menus.glade.h:54
+msgid "Monthly"
+msgstr "Ежемесячно"
+
+#: ../ui/xi-menus.glade.h:57
+msgid "Note"
+msgstr "Заметка"
+
+#: ../ui/xi-menus.glade.h:58
+msgid "Open Module"
+msgstr "Открыть Модуль"
+
+#: ../ui/xi-menus.glade.h:59
+msgid "Open Study_pad"
+msgstr "О_ткрыть StudyPad"
+
+#: ../ui/xi-menus.glade.h:60
+msgid "Open in a dialog"
+msgstr "Открыть в диалоге"
+
+#: ../ui/xi-menus.glade.h:61
+msgid "Open in a separate window"
+msgstr "Открыть в отдельном окне"
+
+#: ../ui/xi-menus.glade.h:62
+msgid "Open in editor"
+msgstr "Открыть в редакторе"
+
+#: ../ui/xi-menus.glade.h:63
+msgid "Open in new tab"
+msgstr "Открыть в новой вкладке"
+
+#: ../ui/xi-menus.glade.h:64
+msgid ""
+"Open selected module in a\n"
+"\tseparate ['dialog'] window"
+msgstr ""
+"Открыть выбранный модуль в\n"
+"\tотдельном ['dialog'] окне"
+
+#: ../ui/xi-menus.glade.h:66
+msgid "Open selected module in a new tab"
+msgstr "Открыть выбранный модуль в новой вкладке"
+
+#: ../ui/xi-menus.glade.h:67
+msgid "Open this bookmark in a dialog"
+msgstr "Открыть эту закладку в новом диалоге"
+
+#: ../ui/xi-menus.glade.h:68
+msgid "Open this bookmark in a new tab"
+msgstr "Открыть эту закладку в новой вкладке"
+
+#: ../ui/xi-menus.glade.h:69
+msgid "Outlined"
+msgstr "Тематический"
+
+#: ../ui/xi-menus.glade.h:71
+msgid "Read Selection Aloud"
+msgstr "Прочесть Выделение"
+
+#: ../ui/xi-menus.glade.h:73
+msgid "Remove folder and save it"
+msgstr "Удалить папку и сохранить ее"
+
+#: ../ui/xi-menus.glade.h:74
+msgid "Remove this item"
+msgstr "Удалить этот пункт"
+
+#: ../ui/xi-menus.glade.h:75
+msgid "Rename Pers.Comm."
+msgstr "Переименовать Личные Комментарии"
+
+#: ../ui/xi-menus.glade.h:76
+msgid "Respect Font Faces"
+msgstr "Сохранять Начертания Шрифтов"
+
+#: ../ui/xi-menus.glade.h:77
+msgid "Restore Folder"
+msgstr "Восстановить Папку"
+
+#: ../ui/xi-menus.glade.h:78
+msgid "Restore saved folder"
+msgstr "Восстановить сохраненную папку"
+
+#: ../ui/xi-menus.glade.h:79
+msgid "Save list as a series of bookmarks"
+msgstr "Сохранить лист как серию закладок"
+
+#: ../ui/xi-menus.glade.h:80
+msgid "Save list as a single bookmark"
+msgstr "Сохранить лист как одну закладку"
+
+#: ../ui/xi-menus.glade.h:81
+msgid "Save these results as a series of bookmarks in their own folder"
+msgstr "Сохранить эти результаты как серию закладок в их собственной папке"
+
+#: ../ui/xi-menus.glade.h:82
+msgid "Save these results as a single bookmark"
+msgstr "Сохранить эти результаты как одну закладку"
+
+#: ../ui/xi-menus.glade.h:83
+msgid "Scripture Cross-references"
+msgstr "Параллельные места писания"
+
+#: ../ui/xi-menus.glade.h:85
+msgid "Show Parallel View in a _Tab"
+msgstr "Параллельный Просмотр во _Вкладке"
+
+#: ../ui/xi-menus.glade.h:86
+msgid "Show Previe_wer in the Sidebar"
+msgstr "Предпросм_отр в Боковой Панели"
+
+#: ../ui/xi-menus.glade.h:87
+msgid "Show Verse _Numbers"
+msgstr "Показать _Номера Стихов"
+
+#: ../ui/xi-menus.glade.h:88
+msgid "Simple"
+msgstr "Простой"
+
+#: ../ui/xi-menus.glade.h:90
+msgid "Subject"
+msgstr "Предмет"
+
+#: ../ui/xi-menus.glade.h:92
+msgid "Unlock This Module"
+msgstr "Разблокировать Этот Модуль"
+
+#: ../ui/xi-menus.glade.h:93
+msgid "Use Current Dictionary"
+msgstr "Использовать Текущий Словарь"
+
+#: ../ui/xi-menus.glade.h:94
+msgid "Use module manager to install and remove Sword modules"
+msgstr "Использовать менеджер модулей для установки и удаления модулей Sword"
+
+#: ../ui/xi-menus.glade.h:95
+msgid "Variants"
+msgstr "Варианты"
+
+#: ../ui/xi-menus.glade.h:97
+msgid "_About The SWORD Project"
+msgstr "О П_роекту SWORD"
+
+#: ../ui/xi-menus.glade.h:98
+msgid "_Advanced Search"
+msgstr "П_родвинутый Поиск"
+
+#: ../ui/xi-menus.glade.h:99
+msgid "_Attach/Detach Sidebar"
+msgstr "Плавающая Боковая Панель"
+
+#: ../ui/xi-menus.glade.h:100
+msgid "_Bible"
+msgstr "_Библия"
+
+#: ../ui/xi-menus.glade.h:101
+msgid "_Commentary/Book"
+msgstr "_Комментарий / Книга"
+
+#: ../ui/xi-menus.glade.h:102
+msgid "_Contents"
+msgstr "_Содержание"
+
+#: ../ui/xi-menus.glade.h:103
+msgid "_Daily Devotion"
+msgstr "Стих Д_ня"
+
+#: ../ui/xi-menus.glade.h:104
+msgid "_Edit"
+msgstr "_Инструменты"
+
+#: ../ui/xi-menus.glade.h:105
+msgid "_Edit Item"
+msgstr "_Редактировать"
+
+#: ../ui/xi-menus.glade.h:107
+msgid "_Help"
+msgstr "_Помощь"
+
+#: ../ui/xi-menus.glade.h:108
+msgid "_Highlight Current Verse"
+msgstr "Подс_ветить Текущий Стих"
+
+#: ../ui/xi-menus.glade.h:109
+msgid "_Live Chat"
+msgstr "_Живой Чат"
+
+#: ../ui/xi-menus.glade.h:110
+msgid "_Mailing List"
+msgstr "Список _Рассылки"
+
+#: ../ui/xi-menus.glade.h:111
+msgid "_Module Manager"
+msgstr "_Менеджер Модулей"
+
+#: ../ui/xi-menus.glade.h:112
+msgid "_Open Session"
+msgstr "_Открыть Сессию"
+
+#: ../ui/xi-menus.glade.h:113
+msgid "_Preferences"
+msgstr "_Настройки"
+
+#: ../ui/xi-menus.glade.h:114
+msgid "_Preview"
+msgstr "Предпрос_мотр"
+
+#: ../ui/xi-menus.glade.h:115
+msgid "_Read Aloud"
+msgstr "Прочитать Вслу_х"
+
+#: ../ui/xi-menus.glade.h:116
+msgid "_Report Bug"
+msgstr "_Доложить об Ошибке"
+
+#: ../ui/xi-menus.glade.h:117
+msgid "_Save Session"
+msgstr "_Сохранить Сессию"
+
+#: ../ui/xi-menus.glade.h:118
+msgid "_Search"
+msgstr "_Поиск"
+
+#: ../ui/xi-menus.glade.h:119
+msgid "_Show/Hide Attached Sidebar"
+msgstr "_Отображение Боковой Панели"
+
+#: ../ui/xi-menus.glade.h:120
+msgid "_Verse Per Line"
+msgstr "Стихов на С_троку"
+
+#: ../xiphos.desktop.in.in.h:1
+msgid "Study the Bible"
+msgstr "Изучать Библию"
+
+#: ../xiphos.desktop.in.in.h:2
+msgid "Xiphos Bible Guide"
+msgstr "Путеводитель по Библии Xiphos"
+
+#~ msgid "Xiphos could not execute archiver"
+#~ msgstr "Xiphos не может выполнить архивацию"
+#~ msgid ""
+#~ " archival result:\n"
+#~ "\n"
+#~ msgstr ""
+#~ " результат архивации:\n"
+#~ "\n"
+#~ msgid ""
+#~ "\n"
+#~ "Archive in "
+#~ msgstr ""
+#~ "\n"
+#~ "Архив в "
+#~ msgid "Text"
+#~ msgstr "Текст"
+#~ msgid "Text to render"
+#~ msgstr "Текст для обработки"
+#~ msgid "Pixbuf Object"
+#~ msgstr "Объект Pixbuf"
+#~ msgid "The pixbuf to render."
+#~ msgstr "Pixbuf для обработки."
+#~ msgid "Open in a new tab"
+#~ msgstr "Открыть в новой вкладке"
+#~ msgid "Open selected module in a separate ['dialog'] window"
+#~ msgstr "Открыть выбранный модуль в отдельном ['диалоговом'] окне"
+#~ msgid "View information about the selected dialog"
+#~ msgstr "Смотреть информацию о выбранном диалоге"
+#~ msgid "Create a new prayer list"
+#~ msgstr "Создать новый молитвенный список"
+#~ msgid "Daily Journal"
+#~ msgstr "Дневной журнал"
+#~ msgid "Outlined Topic"
+#~ msgstr "Выделенная Тема"
+#~ msgid "Open selected module in a dialog"
+#~ msgstr "Открыть выбранный модуль в диалоге"
+#~ msgid "Add Child"
+#~ msgstr "Добавить Дочерний элемент"
+#~ msgid "Add Sibling"
+#~ msgstr "Добавить Ребенка"
+#~ msgid "H_istory/<Separator>"
+#~ msgstr "И_стория/<Separator>"
+#~ msgid "H_istory/C_lear"
+#~ msgstr "И_стория/О_чистить"
+#~ msgid "Remove - Restore"
+#~ msgstr "Удалить - Восстановить"
+#~ msgid "Remove Folder"
+#~ msgstr "Удалить Папку"
+#~ msgid "Sources"
+#~ msgstr "Источники"
+#~ msgid "Xiphos has renamed .xiphos-2.0 to .xiphos"
+#~ msgstr "Xiphos переименовал .xiphos-2.0 в .xiphos"
+#~ msgid ""
+#~ "Xiphos can not rename  .xiphos-2.0 to .xiphos:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Xiphos cannot continue."
+#~ msgstr ""
+#~ "Xiphos не может переименовать .xiphos-2.0 в .xiphos:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Xiphos не может продолжать."
+#~ msgid "Move backwards through history"
+#~ msgstr "Двигаться назад по истории"
+#~ msgid "Move foward through history"
+#~ msgstr "Двигаться вперед по истории"
+#~ msgid "Select a Book of the Bible"
+#~ msgstr "Выберите Книгу Библии"
+#~ msgid "Change Chapter"
+#~ msgstr "Изменить Главу"
+#~ msgid "Enter a Verse reference in Book 1:1 format and press Return"
+#~ msgstr "Введите ссылку на Стих в формате Книга 1:1 и нажмите Ввод"
+#~ msgid "Dictionary/_Lexicon"
+#~ msgstr "Словарь/Лексикон"
+#~ msgid "_Bible Text"
+#~ msgstr "_Библейский Текст"
+
diff --git a/po/sk.po b/po/sk.po
index 1142b52..ff83c03 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -9,174 +9,195 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xiphos-3.1.sk.po\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-05 22:06+0200\n"
-"PO-Revision-Date: 2009-08-05 22:15+0200\n"
-"Last-Translator: Zdenko Podobny <zdposter@gmail.com>\n"
+"POT-Creation-Date: 2009-12-14 23:45+0000\n"
+"PO-Revision-Date: 2009-12-09 22:16+0000\n"
+"Last-Translator: zdpo <zdposter@gmail.com>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.0\n"
-"Plural-Forms:  nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Launchpad-Export-Date: 2009-12-10 04:39+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 
-#: ../src/backend/sword_main.cc:1153
+#: ../src/backend/sword_main.cc:1083
 msgid "Configuration not found"
 msgstr "Konfigurácia nebola nájdená"
 
-#: ../src/editor/bonobo-editor.c:252 ../src/editor/slib-editor.c:228
-#: ../src/gnome2/html.c:633
+#: ../src/editor/bonobo-editor.c:254 ../src/editor/slib-editor.c:234
+#: ../src/gnome2/html.c:637
 #, c-format
 msgid "Page %d of %d"
 msgstr "Strana %d z %d"
 
-#: ../src/editor/bonobo-editor.c:351
+#: ../src/editor/bonobo-editor.c:353 ../src/editor/slib-editor.c:659
 msgid "Are you sure you want to delete the note for"
 msgstr "Ste si istý, že chcete zmazať poznámku pre"
 
-#: ../src/editor/bonobo-editor.c:963 ../src/editor/bonobo-editor.c:996
-#: ../src/editor/slib-editor.c:1161 ../src/editor/slib-editor.c:1198
+#: ../src/editor/bonobo-editor.c:965 ../src/editor/bonobo-editor.c:998
+#: ../src/editor/slib-editor.c:1308 ../src/editor/slib-editor.c:1345
 msgid "Save the changes to document"
 msgstr "Uložiť zmeny v dokumente"
 
-#: ../src/editor/bonobo-editor.c:964 ../src/editor/bonobo-editor.c:997
-#: ../src/editor/slib-editor.c:1162 ../src/editor/slib-editor.c:1199
+#: ../src/editor/bonobo-editor.c:966 ../src/editor/bonobo-editor.c:999
+#: ../src/editor/slib-editor.c:1309 ../src/editor/slib-editor.c:1346
 msgid "before closing?"
 msgstr "pred zatvorením?"
 
-#: ../src/editor/bonobo-editor.c:971 ../src/editor/bonobo-editor.c:1004
-#: ../src/editor/slib-editor.c:1169 ../src/editor/slib-editor.c:1206
+#: ../src/editor/bonobo-editor.c:973 ../src/editor/bonobo-editor.c:1006
+#: ../src/editor/slib-editor.c:1316 ../src/editor/slib-editor.c:1353
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Ak ich neuložíte, zmeny sa natrvalo stratia."
 
-#: ../src/editor/bonobo-editor.c:995 ../src/editor/slib-editor.c:1197
-#: ../ui/xi-menus.glade.h:26
+#: ../src/editor/bonobo-editor.c:997 ../src/editor/slib-editor.c:1344
+#: ../ui/xi-menus.glade.h:39
 msgid "File"
 msgstr "Súbor"
 
-#: ../src/editor/bonobo-editor.c:1222 ../src/editor/slib-editor.c:1254
+#: ../src/editor/bonobo-editor.c:1224 ../src/editor/slib-editor.c:1401
 msgid "StudyPad"
 msgstr "Poznámkový blok"
 
-#: ../src/editor/bonobo-editor.c:1235 ../src/editor/slib-editor.c:1268
+#: ../src/editor/bonobo-editor.c:1237 ../src/editor/slib-editor.c:1415
 msgid "Note Editor"
 msgstr "Editor poznámok"
 
-#: ../src/editor/bonobo-editor.c:1244 ../src/editor/slib-editor.c:1282
+#: ../src/editor/bonobo-editor.c:1246 ../src/editor/slib-editor.c:1429
 msgid "Prayer List/Journal Editor"
 msgstr "Modlitebný zoznam/Editor denníka"
 
-#: ../src/editor/slib-editor.c:382 ../src/editor/slib-editor.c:429
+#: ../src/editor/slib-editor.c:401 ../src/editor/slib-editor.c:448
 msgid "Save As"
 msgstr "Uložiť ako"
 
-#: ../src/editor/slib-editor.c:400 ../src/editor/slib-editor.c:447
+#: ../src/editor/slib-editor.c:419 ../src/editor/slib-editor.c:466
+#: ../src/editor/slib-editor.c:634
 msgid "Untitled document"
 msgstr "Nepomenovaný dokument"
 
-#: ../src/editor/slib-editor.c:612
+#: ../src/editor/slib-editor.c:702
 msgid "HTML Output"
 msgstr "HTML výstup"
 
-#: ../src/editor/slib-editor.c:619
+#: ../src/editor/slib-editor.c:709
 msgid "HTML Source"
 msgstr "HTML zdroj"
 
-#: ../src/editor/slib-editor.c:626
+#: ../src/editor/slib-editor.c:716
 msgid "Plain Source"
 msgstr "Obyčajný zdroj"
 
-#: ../src/editor/slib-editor.c:633 ../ui/editor_note.xml.h:15
+#: ../src/editor/slib-editor.c:726 ../ui/editor_note.xml.h:15
 #: ../ui/editor_studypad.xml.h:21
 msgid "_Print..."
 msgstr "_Tlačiť..."
 
-#: ../src/editor/slib-editor.c:640 ../ui/editor_note.xml.h:9
+#: ../src/editor/slib-editor.c:733 ../ui/editor_note.xml.h:9
 #: ../ui/editor_studypad.xml.h:14
 msgid "Print Pre_view"
 msgstr "Náhľad pre tlačou"
 
-#: ../src/editor/slib-editor.c:647
+#: ../src/editor/slib-editor.c:740
 msgid "_Quit"
 msgstr "_Koniec"
 
-#: ../src/editor/slib-editor.c:654
+#: ../src/editor/slib-editor.c:747
 msgid "_Open"
 msgstr "_Otvoriť"
 
-#: ../src/editor/slib-editor.c:661
+#: ../src/editor/slib-editor.c:754
 msgid "_Save"
 msgstr "_Uložiť"
 
-#: ../src/editor/slib-editor.c:668
+#: ../src/editor/slib-editor.c:761
 msgid "Save _As..."
 msgstr "Uložiť _ako..."
 
-#: ../src/editor/slib-editor.c:675 ../ui/editor_note.xml.h:14
+#: ../src/editor/slib-editor.c:767
+msgid "New"
+msgstr ""
+
+#: ../src/editor/slib-editor.c:769
+msgid "Open new document"
+msgstr ""
+
+#: ../src/editor/slib-editor.c:773
+msgid "Delete"
+msgstr ""
+
+#: ../src/editor/slib-editor.c:775
+msgid "Delete current note"
+msgstr ""
+
+#: ../src/editor/slib-editor.c:780 ../ui/editor_note.xml.h:14
 #: ../ui/editor_studypad.xml.h:20 ../ui/editor.xml.h:13
-#: ../ui/xi-menus.glade.h:85
+#: ../ui/xi-menus.glade.h:106
 msgid "_File"
 msgstr "_Súbor"
 
-#: ../src/editor/slib-editor.c:730
+#: ../src/editor/slib-editor.c:835
 msgid "HTML _Output"
 msgstr "HTML _výstup"
 
-#: ../src/editor/slib-editor.c:737
+#: ../src/editor/slib-editor.c:842
 msgid "_HTML Source"
 msgstr "_HTML zdroj"
 
-#: ../src/editor/slib-editor.c:744
+#: ../src/editor/slib-editor.c:849
 msgid "_Plain Source"
 msgstr "_Obyčajný zdroj"
 
-#: ../src/editor/slib-editor.c:751 ../ui/xi-menus.glade.h:100
+#: ../src/editor/slib-editor.c:856 ../ui/xi-menus.glade.h:121
 msgid "_View"
 msgstr "_Zobrazenie"
 
-#: ../src/editor/slib-editor.c:762 ../ui/editor_note.xml.h:11
+#: ../src/editor/slib-editor.c:867 ../ui/editor_note.xml.h:11
 #: ../ui/editor_studypad.xml.h:16 ../ui/editor.xml.h:11
 msgid "Save"
 msgstr "Uložiť"
 
-#: ../src/gecko/gecko-html.cpp:178 ../src/gnome2/html.c:161
+#: ../src/editor/slib-editor.c:878 ../src/editor/slib-editor.c:885
+msgid "Insert Link"
+msgstr ""
+
+#: ../src/gecko/gecko-html.cpp:177 ../src/gnome2/html.c:165
 msgid "Unlock "
 msgstr "Odomknúť "
 
-#: ../src/gecko/gecko-print.c:171
+#: ../src/gecko/gecko-print.c:172
 msgid "Preparing to print"
 msgstr "Príprava na tlač"
 
-#: ../src/gecko/gecko-print.c:265
+#: ../src/gecko/gecko-print.c:266
 msgid "Printing is not supported on this printer"
 msgstr "Tlač nie je podporovaná na tejto tlačiarni"
 
-#: ../src/gecko/gecko-print.c:268
+#: ../src/gecko/gecko-print.c:269
 #, c-format
 msgid "Printer %s does not support PostScript printing."
 msgstr "Tlačiareň %s nepodporuje tlač v PostScript-e."
 
-#: ../src/gecko/gecko-print.c:341 ../src/gecko/gecko-print.c:369
+#: ../src/gecko/gecko-print.c:342 ../src/gecko/gecko-print.c:370
 msgid "Printing"
 msgstr "Tlač"
 
-#: ../src/gecko/gecko-print.c:371
+#: ../src/gecko/gecko-print.c:372
 msgid "Waiting to print"
 msgstr "Čakanie na tlač"
 
-#: ../src/gecko/gecko-print.c:583
+#: ../src/gecko/gecko-print.c:584
 msgid "An error occurred while printing"
 msgstr "Vyskytla sa chyba pri tlačení"
 
-#: ../src/gecko/gecko-print.c:587
+#: ../src/gecko/gecko-print.c:588
 #, c-format
 msgid "It was not possible to print your document: %s"
 msgstr "Nepodarilo sa vytlačiť váš dokument: %s"
 
-#: ../src/gnome2/about_modules.c:189
+#: ../src/gnome2/about_modules.c:195
 msgid "About Sword Module"
 msgstr "O Sword module"
 
-#: ../src/gnome2/about_modules.c:383 ../src/gnome2/mod_mgr.c:204
+#: ../src/gnome2/about_modules.c:389 ../src/gnome2/mod_mgr.c:252
 msgid "The module has no About information."
 msgstr "K modulu nie sú dostupné informácie."
 
@@ -199,15 +220,15 @@ msgstr ""
 msgid "About the SWORD Project"
 msgstr "O projekte SWORD"
 
-#: ../src/gnome2/about_sword.c:123
+#: ../src/gnome2/about_sword.c:124
 msgid "Sword Version"
 msgstr "Sword verzia"
 
-#: ../src/gnome2/about_sword.c:154
+#: ../src/gnome2/about_sword.c:155
 msgid "Books can be downloaded from the SWORD Project"
 msgstr "Knihy je možné stiahnuť z projektu SWORD"
 
-#: ../src/gnome2/about_sword.c:160
+#: ../src/gnome2/about_sword.c:161
 msgid "The SWORD Project"
 msgstr "The SWORD Project"
 
@@ -231,19 +252,19 @@ msgstr ""
 msgid "About Xiphos Translation"
 msgstr "O preklade Xiphos"
 
-#: ../src/gnome2/about_trans.c:139
+#: ../src/gnome2/about_trans.c:140
 msgid "See TRANSLATION-HOWTO in Xiphos source"
 msgstr "Pozrite si TRANSLATION-HOWTO v zdrojovom kóde Xiphosu"
 
-#: ../src/gnome2/about_trans.c:145
+#: ../src/gnome2/about_trans.c:146
 msgid "Xiphos development"
 msgstr "Xiphos vývoj"
 
-#: ../src/gnome2/about_xiphos.c:132
+#: ../src/gnome2/about_xiphos.c:131
 msgid "Copyright 2000-2009 The Xiphos Development Team"
 msgstr "Copyright 2000-2009 Xiphos Vývojový Tím"
 
-#: ../src/gnome2/about_xiphos.c:135
+#: ../src/gnome2/about_xiphos.c:134
 msgid ""
 "(formerly known as GnomeSword)\n"
 "\n"
@@ -257,83 +278,82 @@ msgstr ""
 "Ďakujeme Troyovi Griffittsovi a všetkým ostatným, ktorý vytvorili pre nás "
 "The SWORD Project."
 
-#: ../src/gnome2/bibletext_dialog.c:525
+#: ../src/gnome2/bibletext_dialog.c:358
 msgid "Go to "
 msgstr "Prejsť na "
 
 #. info->stock_icon = GTK_STOCK_OPEN;
-#: ../src/gnome2/bookmark_dialog.c:167 ../src/gnome2/bookmarks_menu.c:471
-#: ../src/gnome2/bookmarks_menu.c:897 ../src/gnome2/bookmarks_menu.c:995
-#: ../src/gnome2/bookmarks_treeview.c:131 ../ui/editor_studypad.xml.h:2
-#: ../ui/xi-menus.glade.h:9
+#: ../src/gnome2/bookmark_dialog.c:171 ../src/gnome2/bookmarks_menu.c:358
+#: ../src/gnome2/bookmarks_menu.c:765 ../src/gnome2/bookmarks_menu.c:863
+#: ../src/gnome2/bookmarks_treeview.c:133 ../ui/editor_studypad.xml.h:2
+#: ../ui/xi-menus.glade.h:13
 msgid "Bookmark"
 msgstr "Záložka"
 
-#: ../src/gnome2/bookmark_dialog.c:169 ../src/gnome2/bookmarks_menu.c:997
-#: ../src/gnome2/bookmarks_treeview.c:132
+#: ../src/gnome2/bookmark_dialog.c:173 ../src/gnome2/bookmarks_menu.c:865
+#: ../src/gnome2/bookmarks_treeview.c:134
 msgid "Enter Folder Name"
 msgstr "Vložiť názov priečinku"
 
-#: ../src/gnome2/bookmark_dialog.c:171 ../src/gnome2/bookmarks_menu.c:999
+#: ../src/gnome2/bookmark_dialog.c:175 ../src/gnome2/bookmarks_menu.c:867
 msgid "Folder Name"
 msgstr "Názov priečinku"
 
-#: ../src/gnome2/bookmark_dialog.c:172 ../src/gnome2/bookmarks_menu.c:1000
-#: ../src/gnome2/bookmarks_treeview.c:134
+#: ../src/gnome2/bookmark_dialog.c:176 ../src/gnome2/bookmarks_menu.c:868
+#: ../src/gnome2/bookmarks_treeview.c:136
 msgid "Folder: "
-msgstr "Priečinok:"
+msgstr "Priečinok: "
 
-#: ../src/gnome2/bookmarks_menu.c:457 ../src/gnome2/treekey-editor.c:322
-#: ../ui/xi-menus.glade.h:22
+#: ../src/gnome2/bookmarks_menu.c:344 ../ui/xi-menus.glade.h:32
 msgid "Edit"
 msgstr "Upraviť"
 
-#: ../src/gnome2/bookmarks_menu.c:474
+#: ../src/gnome2/bookmarks_menu.c:361
 msgid "Folder name: "
 msgstr "Názov priečinku: "
 
-#: ../src/gnome2/bookmarks_menu.c:477
+#: ../src/gnome2/bookmarks_menu.c:364
 msgid "Bookmark name: "
 msgstr "Názov záložky: "
 
-#: ../src/gnome2/bookmarks_menu.c:480 ../src/gnome2/bookmarks_menu.c:905
+#: ../src/gnome2/bookmarks_menu.c:367 ../src/gnome2/bookmarks_menu.c:773
 msgid "Verse: "
 msgstr "Verš: "
 
-#: ../src/gnome2/bookmarks_menu.c:481 ../src/gnome2/bookmarks_menu.c:906
+#: ../src/gnome2/bookmarks_menu.c:368 ../src/gnome2/bookmarks_menu.c:774
 msgid "Module: "
 msgstr "Modul: "
 
-#: ../src/gnome2/bookmarks_menu.c:665
+#: ../src/gnome2/bookmarks_menu.c:533
 msgid "Restore Bookmark Folder"
 msgstr "Obnoviť adresár záložiek"
 
-#: ../src/gnome2/bookmarks_menu.c:734
+#: ../src/gnome2/bookmarks_menu.c:602
 msgid "Remove the selected folder"
 msgstr "Odstrániť označený priečinok"
 
-#: ../src/gnome2/bookmarks_menu.c:736
+#: ../src/gnome2/bookmarks_menu.c:604
 msgid "(and all its contents)?"
 msgstr "(a všetko, čo obsahuje)?"
 
-#: ../src/gnome2/bookmarks_menu.c:739
+#: ../src/gnome2/bookmarks_menu.c:607
 msgid "Remove the selected bookmark"
 msgstr "Odstrániť označenú záložku"
 
-#: ../src/gnome2/bookmarks_menu.c:898
+#: ../src/gnome2/bookmarks_menu.c:766
 msgid "Add"
 msgstr "Pridať"
 
-#: ../src/gnome2/bookmarks_menu.c:904
+#: ../src/gnome2/bookmarks_menu.c:772
 msgid "Label: "
 msgstr "Menovka: "
 
-#: ../src/gnome2/bookmarks_treeview.c:105
+#: ../src/gnome2/bookmarks_treeview.c:107
 #, c-format
 msgid "Search result: %s"
 msgstr "Výsledky hľadania: %s"
 
-#: ../src/gnome2/bookmarks_treeview.c:934 ../src/gnome2/sidebar.c:1459
+#: ../src/gnome2/bookmarks_treeview.c:943 ../src/gnome2/sidebar.c:1389
 msgid "Bookmarks"
 msgstr "Záložky"
 
@@ -343,106 +363,178 @@ msgstr "Šifrovací kľúč?"
 
 #: ../src/gnome2/cipher_key_dialog.c:63
 msgid "for:"
-msgstr "pre: "
+msgstr "pre:"
 
 #: ../src/gnome2/cipher_key_dialog.c:66
 msgid "Enter Cipher Key: "
 msgstr "Vložiť šifrovací kľúč: "
 
-#: ../src/gnome2/dialog.c:241
+#: ../src/gnome2/dialog.c:265
 msgid "Close without Saving"
 msgstr "Zavrieť bez uloženia"
 
-#: ../src/gnome2/dialog.c:569
+#: ../src/gnome2/dialog.c:596
 msgid "Xiphos:"
 msgstr "Xiphos:"
 
-#: ../src/gnome2/dialog.c:670
+#: ../src/gnome2/dialog.c:697
 msgid "Close _without Saving"
 msgstr "Zavrieť _bez uloženia"
 
-#: ../src/gnome2/export_dialog.c:265 ../ui/export-dialog.glade.h:20
+#: ../src/gnome2/export_dialog.c:267 ../ui/export-dialog.glade.h:20
 msgid "Please check copyright before exporting!"
 msgstr "Pre exportovaní si prosím preverte autorské práva"
 
-#: ../src/gnome2/find_dialog.c:200 ../src/gnome2/find_dialog.c:369
+#: ../src/gnome2/find_dialog.c:204 ../src/gnome2/find_dialog.c:373
 msgid "Find"
 msgstr "Nájsť"
 
-#: ../src/gnome2/find_dialog.c:218
+#: ../src/gnome2/find_dialog.c:222
 msgid "Enter Word or Phrase"
 msgstr "Vložiť slovo alebo frázu"
 
-#: ../src/gnome2/find_dialog.c:234 ../src/gnome2/search_sidebar.c:303
-#: ../ui/search-dialog.glade.h:57
+#: ../src/gnome2/find_dialog.c:238 ../src/gnome2/search_sidebar.c:306
+#: ../ui/search-dialog.glade.h:59
 msgid "Match case"
 msgstr "Veľkosť písmen"
 
-#: ../src/gnome2/find_dialog.c:241
+#: ../src/gnome2/find_dialog.c:245
 msgid "Search backwards"
 msgstr "Hľadať smerom odzadu"
 
-#: ../src/gnome2/find_dialog.c:250 ../src/gnome2/search_sidebar.c:268
-#: ../ui/search-dialog.glade.h:74
+#: ../src/gnome2/find_dialog.c:254 ../src/gnome2/search_sidebar.c:271
+#: ../ui/search-dialog.glade.h:76
 msgid "Regular expression"
 msgstr "Regulárny výraz"
 
-#: ../src/gnome2/find_dialog.c:291
+#: ../src/gnome2/find_dialog.c:295
 msgid "Find Next"
 msgstr "Nájsť ďalší"
 
-#: ../src/gnome2/font_dialog.c:301
+#: ../src/gnome2/font_dialog.c:303
 msgid "Set Module Font"
 msgstr "Nastaviť písmo pre modul"
 
-#: ../src/gnome2/font_dialog.c:331
+#: ../src/gnome2/font_dialog.c:333
 msgid "Change font for"
 msgstr "Zmeniť písmo pre"
 
-#: ../src/gnome2/font_dialog.c:335
+#: ../src/gnome2/font_dialog.c:337
 msgid "Module"
 msgstr "Modul"
 
-#: ../src/gnome2/font_dialog.c:339
+#: ../src/gnome2/font_dialog.c:341
 msgid "Current font: "
 msgstr "Aktuálne písmo: "
 
-#: ../src/gnome2/font_dialog.c:376
+#: ../src/gnome2/font_dialog.c:378
 msgid "+0"
 msgstr "+0"
 
-#: ../src/gnome2/font_dialog.c:380
+#: ../src/gnome2/font_dialog.c:382
 msgid "Use the default font for this module"
 msgstr "Použiť štandardné písmo pre tento modul"
 
-#: ../src/gnome2/main_window.c:758
+#. *****************************************************************************
+#. * Name
+#. *    gconf_setup
+#. *
+#. * Synopsis
+#. *   #include "main/settings.h"
+#. *
+#. *   void gconf_setup()
+#. *
+#. * Description
+#. *   verifies and initializes the GConf subsystem, so that "sword://" and
+#. *   similar can be handled by url-comprehending programs such as browsers.
+#. *   dialogs for permission/success/failure => conditional on debug build.
+#. *
+#. * Return value
+#. *   void
+#.
+#: ../src/gnome2/gui.c:110
+msgid ""
+"URL references using \"sword://\" (similar to web page\n"
+"references) can be used by programs to look up\n"
+"scripture references. Your system currently has no\n"
+"program set to handle these references.\n"
+"\n"
+"Would you like Xiphos to set itself as the\n"
+"program to handle these references?"
+msgstr ""
+"URL odkazy používajúce  \"sword://\" (podobné odkazom\n"
+"na web stránky) môžu aplikácie využívať na prezeranie\n"
+"odkazov do Biblie. Vo vašom systéme nie je nastavený\n"
+"program, ktorý by ich vedel spracovať.\n"
+"\n"
+"Prajete si nastaviť Xiphos, aby sa stal programom\n"
+"na spracovanie takýchto odkazov?"
+
+#: ../src/gnome2/gui.c:112
+msgid ""
+"Xiphos has successfully set itself\n"
+"as the handler of sword:// and bible:// URLs.\n"
+"\n"
+"You may wish to run the program \"gconf-editor\"\n"
+"to examine keys under /desktop/gnome/url-handlers,\n"
+"if you need to change these."
+msgstr ""
+"Xiphos sa úspešne nastavil\n"
+"ako spracovateľ sword:// a bible:// URL.\n"
+"\n"
+"Ak ich potrebujete zmeniť, tak spustite program\n"
+"\"gconf-editor\" a preskúmajte kľúče umiestnené\n"
+"v /desktop/gnome/url-handlers."
+
+#: ../src/gnome2/gui.c:166
+#, c-format
+msgid ""
+"Xiphos failed to complete handler init for key #%d:\n"
+"%s"
+msgstr ""
+"Xiphos zlyhal pre nastavení obsluhy pre kľúč #%d:\n"
+"%s"
+
+#: ../src/gnome2/gui.c:212
+msgid "BUG! Xiphos is about to crash due to a \"STRDUP\" error."
+msgstr ""
+
+#: ../src/gnome2/gui.c:213 ../src/gnome2/gui.c:248
+msgid "Please report this error to the Xiphos team with:"
+msgstr ""
+
+#: ../src/gnome2/gui.c:247
+msgid "BUG! Xiphos is about to crash due to a \"STRING\" error."
+msgstr ""
+
+#: ../src/gnome2/main_window.c:789
 msgid "Xiphos - Bible Study Software"
 msgstr "Xiphos - aplikácia pre štúdium Biblie"
 
-#: ../src/gnome2/main_window.c:814
+#: ../src/gnome2/main_window.c:844
 msgid "Open a new tab"
 msgstr "Otvoriť novú kartu"
 
-#: ../src/gnome2/main_window.c:894 ../src/gnome2/sidebar.c:621
-#: ../src/gnome2/sidebar.c:627 ../src/main/sidebar.cc:643
-#: ../src/main/sidebar.cc:964 ../src/main/sidebar.cc:965
-#: ../src/main/sidebar.cc:966
+#: ../src/gnome2/main_window.c:923 ../src/gnome2/sidebar.c:627
+#: ../src/gnome2/sidebar.c:633 ../src/main/sidebar.cc:666
+#: ../src/main/sidebar.cc:1015 ../src/main/sidebar.cc:1016
+#: ../src/main/sidebar.cc:1017
 msgid "Standard View"
 msgstr "Štandardné zobrazenie"
 
-#: ../src/gnome2/main_window.c:971
+#: ../src/gnome2/main_window.c:1004
 msgid "Commentary View"
 msgstr "Zobrazenie komentára"
 
-#: ../src/gnome2/main_window.c:987
+#: ../src/gnome2/main_window.c:1020
 msgid "Book View"
 msgstr "Zobrazenie knihy"
 
-#: ../src/gnome2/main_window.c:1012
+#: ../src/gnome2/main_window.c:1045
 msgid "Welcome to Xiphos"
 msgstr "Vitajte v Xiphose"
 
-#: ../src/gnome2/menu_popup.c:1163
+#: ../src/gnome2/menu_popup.c:1168
 msgid ""
 "Renaming is not available in Windows.\n"
 "\n"
@@ -462,33 +554,33 @@ msgstr ""
 " Preto v prostredí Windows nie je dostupné\n"
 "premenovanie osobného komentára."
 
-#: ../src/gnome2/menu_popup.c:1182
+#: ../src/gnome2/menu_popup.c:1187
 msgid "Rename Commentary"
 msgstr "Premenovať komentár"
 
-#: ../src/gnome2/menu_popup.c:1185
+#: ../src/gnome2/menu_popup.c:1190
 msgid "Choose Commentary Name"
 msgstr "Vyberte názov pre komentár"
 
-#: ../src/gnome2/menu_popup.c:1187
+#: ../src/gnome2/menu_popup.c:1192
 msgid "New Name"
 msgstr "Nový názov"
 
-#: ../src/gnome2/menu_popup.c:1188 ../src/gnome2/treekey-editor.c:132
-#: ../src/gnome2/treekey-editor.c:191 ../src/gnome2/treekey-editor.c:277
-#: ../src/main/prayerlists.cc:240
+#: ../src/gnome2/menu_popup.c:1193 ../src/gnome2/treekey-editor.c:139
+#: ../src/gnome2/treekey-editor.c:198 ../src/gnome2/treekey-editor.c:284
+#: ../src/main/prayerlists.cc:243
 msgid "Name: "
 msgstr "Názov: "
 
-#: ../src/gnome2/menu_popup.c:1198 ../src/main/prayerlists.cc:254
+#: ../src/gnome2/menu_popup.c:1203 ../src/main/prayerlists.cc:257
 msgid "Module names must contain [A-Za-z0-9_] only."
 msgstr "Názvy modulov môžu obsahovať iba znaky [A-Za-z0-9_]."
 
-#: ../src/gnome2/menu_popup.c:1205 ../src/main/prayerlists.cc:261
+#: ../src/gnome2/menu_popup.c:1210 ../src/main/prayerlists.cc:264
 msgid "Xiphos already knows a module by that name."
 msgstr "Xiphos už poznám modul s takým názvom."
 
-#: ../src/gnome2/menu_popup.c:1248
+#: ../src/gnome2/menu_popup.c:1253
 #, c-format
 msgid ""
 "Failed to create new configuration:\n"
@@ -497,7 +589,7 @@ msgstr ""
 "Neporadilo sa vytvoriť novú konfiguráciu:\n"
 "%s"
 
-#: ../src/gnome2/menu_popup.c:1257
+#: ../src/gnome2/menu_popup.c:1262
 msgid ""
 "Configuration build error:\n"
 "\n"
@@ -505,19 +597,56 @@ msgstr ""
 "Chyba vytvorenia konfigurácie:\n"
 "\n"
 
-#: ../src/gnome2/mod_mgr.c:339
+#: ../src/gnome2/mod_mgr.c:169
+msgid "Remove these modules?"
+msgstr "Odstrániť tieto moduly?"
+
+#: ../src/gnome2/mod_mgr.c:170
+msgid "Preparing to remove"
+msgstr "Príprava na odstránenie"
+
+#: ../src/gnome2/mod_mgr.c:171
+msgid "Removing"
+msgstr "Mazanie"
+
+#: ../src/gnome2/mod_mgr.c:172 ../ui/xi-menus.glade.h:72
+msgid "Remove"
+msgstr "Odstrániť"
+
+#: ../src/gnome2/mod_mgr.c:175
 msgid "Install these modules?"
 msgstr "Inštalovať tieto moduly?"
 
-#: ../src/gnome2/mod_mgr.c:341
-msgid "Remove these modules?"
-msgstr "Odstrániť tieto moduly?"
+#: ../src/gnome2/mod_mgr.c:176
+msgid "Preparing to install"
+msgstr "Príprava na inštaláciu"
+
+#: ../src/gnome2/mod_mgr.c:177
+msgid "Installing"
+msgstr "Inštalácia"
 
-#: ../src/gnome2/mod_mgr.c:343
+#: ../src/gnome2/mod_mgr.c:178 ../src/gnome2/mod_mgr.c:2964
+#: ../ui/module-manager.glade.h:18
+msgid "Install"
+msgstr "Inštalovať"
+
+#: ../src/gnome2/mod_mgr.c:181
 msgid "Archive these modules?"
 msgstr "Archivovať tieto moduly?"
 
-#: ../src/gnome2/mod_mgr.c:345
+#: ../src/gnome2/mod_mgr.c:182
+msgid "Preparing to archive"
+msgstr "Príprava na archiváciu"
+
+#: ../src/gnome2/mod_mgr.c:183
+msgid "Archiving"
+msgstr "Archivovanie"
+
+#: ../src/gnome2/mod_mgr.c:184 ../ui/module-manager.glade.h:11
+msgid "Archive"
+msgstr "Archivovať"
+
+#: ../src/gnome2/mod_mgr.c:187
 msgid ""
 "Build fast-search index for these\n"
 "modules (may take minutes/module)?"
@@ -525,123 +654,132 @@ msgstr ""
 "Vytvoriť indexy pre rýchle hľadanie pre tieto\n"
 "moduly (môže to trvať aj niekoľko minút pre jeden modul)?"
 
-#: ../src/gnome2/mod_mgr.c:347
-msgid "Delete fast-search index for these modules?"
-msgstr "Odstrániť indexy pre rýchle hľadanie pre tieto moduly?"
-
-#: ../src/gnome2/mod_mgr.c:367
-msgid "Preparing to install"
-msgstr "Príprava na inštaláciu"
+#: ../src/gnome2/mod_mgr.c:188
+msgid "Preparing to index"
+msgstr "Príprava na indexovanie"
 
-#: ../src/gnome2/mod_mgr.c:369
-msgid "Preparing to remove"
-msgstr "Príprava na odstránenie"
+#: ../src/gnome2/mod_mgr.c:189
+msgid "Indexing"
+msgstr "Indexovanie"
 
-#: ../src/gnome2/mod_mgr.c:371
-msgid "Preparing to archive"
-msgstr "Príprava na archiváciu"
+#: ../src/gnome2/mod_mgr.c:190 ../ui/module-manager.glade.h:17
+msgid "Index"
+msgstr "Indexovať"
 
-#: ../src/gnome2/mod_mgr.c:373
-msgid "Preparing to index"
-msgstr "Príprava na indexovanie"
+#: ../src/gnome2/mod_mgr.c:193
+msgid "Delete fast-search index for these modules?"
+msgstr "Odstrániť indexy pre rýchle hľadanie pre tieto moduly?"
 
-#: ../src/gnome2/mod_mgr.c:375
+#: ../src/gnome2/mod_mgr.c:194
 msgid "Preparing to delete index"
 msgstr "Príprava na zmazanie indexu"
 
-#: ../src/gnome2/mod_mgr.c:401
-msgid "Installing"
-msgstr "Inštalácia"
+#: ../src/gnome2/mod_mgr.c:195
+msgid "Deleting index"
+msgstr "Zmazanie indexu"
 
-#: ../src/gnome2/mod_mgr.c:403
-msgid "Removing"
-msgstr "Mazanie"
+#: ../src/gnome2/mod_mgr.c:196
+msgid "Deletion"
+msgstr "Zmazať"
 
-#: ../src/gnome2/mod_mgr.c:405
-msgid "Archiving"
-msgstr "Archivovanie"
+#: ../src/gnome2/mod_mgr.c:427
+msgid "Module Name"
+msgstr "Názov modulu"
 
-#: ../src/gnome2/mod_mgr.c:407
-msgid "Indexing"
-msgstr "Indexovanie"
+#: ../src/gnome2/mod_mgr.c:448
+msgid "A checkmark means this module is already installed"
+msgstr "Fajka znamená, že modul už bol nainštalovaný"
 
-#: ../src/gnome2/mod_mgr.c:409
-msgid "Deleting index"
-msgstr "Zmazanie indexu"
+#: ../src/gnome2/mod_mgr.c:470
+msgid "Click the box to work on this module"
+msgstr "Pre prácu na tomto module kliknite na rámček"
 
-#: ../src/gnome2/mod_mgr.c:432
-#, c-format
-msgid ""
-"`mkdir %s' failed:\n"
-"%s."
+#: ../src/gnome2/mod_mgr.c:471
+msgid "Click the box to select this module for install/update"
 msgstr ""
-"`mkdir %s' zlyhalo:\n"
-"%s."
+"Kliknite na rámček, ak chcete označiť tento modul na inštalovanie/"
+"aktualizovanie"
 
-#: ../src/gnome2/mod_mgr.c:463
-msgid "Xiphos could not execute archiver"
-msgstr "Xiphos nevie spustiť archivačný program"
+#: ../src/gnome2/mod_mgr.c:490
+msgid "Installed"
+msgstr "Nainštalovaný"
 
-#: ../src/gnome2/mod_mgr.c:468
+#: ../src/gnome2/mod_mgr.c:500
 msgid ""
-" archival result:\n"
-"\n"
+"The index icon means you have built an optimized ('lucene') index for this "
+"module for fast searching (see the Maintenance pane for this function)"
 msgstr ""
-" výsledok vytvárania archívu:\n"
-"\n"
+"Ikona indexu znamená, že ste vytvorili optimalizovaný ('lucene') index pre "
+"tento modul pre rýchle hľadanie (Pozrite si časť Údržba)"
 
-#: ../src/gnome2/mod_mgr.c:472
+#: ../src/gnome2/mod_mgr.c:518
 msgid ""
-"\n"
-"Archive in "
+"The lock icon means this module is encrypted, and requires that you purchase "
+"an unlock key from the content owner"
 msgstr ""
-"\n"
-"Archív v "
+"Ikona zo zámkom znamená, že tento modul je zašifrovaný, a vyžaduje si, aby "
+"ste si kúpili kľúč na odomknutie od vlastníka obsahu."
 
-#: ../src/gnome2/mod_mgr.c:529
-msgid "Journals and prayer lists cannot be indexed."
-msgstr "Denník a modlitebný zoznam nie je možné indexovať."
+#: ../src/gnome2/mod_mgr.c:535 ../ui/xi-menus.glade.h:1
+msgid "About"
+msgstr "Informácie"
 
-#: ../src/gnome2/mod_mgr.c:550 ../src/gnome2/mod_mgr.c:2905
-#: ../ui/module-manager.glade.h:15
-msgid "Install"
-msgstr "Inštalovať"
+#: ../src/gnome2/mod_mgr.c:555
+msgid ""
+"The refresh icon means the Installed module is older than the newer "
+"Available module: You should update the module"
+msgstr ""
+"Ikona aktualizácie znamená, že nainštalovaný modul je starší ako je aktuálna "
+"dostupná verzia. Modul by ste mali zaktualizovať."
 
-#: ../src/gnome2/mod_mgr.c:552 ../src/gnome2/treekey-editor.c:316
-msgid "Remove"
-msgstr "Odstrániť"
+#: ../src/gnome2/mod_mgr.c:567
+msgid "Available"
+msgstr "Dostupné"
 
-#: ../src/gnome2/mod_mgr.c:554
-msgid "Archive"
-msgstr "Archivovať"
+#: ../src/gnome2/mod_mgr.c:576
+msgid "Size"
+msgstr "Veľkosť"
 
-#: ../src/gnome2/mod_mgr.c:556
-msgid "Index"
-msgstr "Indexovať"
+#: ../src/gnome2/mod_mgr.c:585
+msgid "Description"
+msgstr "Popis"
 
-#: ../src/gnome2/mod_mgr.c:558
-msgid "Deletion"
-msgstr "Zmazať"
+#: ../src/gnome2/mod_mgr.c:736
+#, c-format
+msgid ""
+"`mkdir %s' failed:\n"
+"%s."
+msgstr ""
+"`mkdir %s' zlyhalo:\n"
+"%s."
 
-#: ../src/gnome2/mod_mgr.c:560
+#: ../src/gnome2/mod_mgr.c:759
+msgid " archived in: \n"
+msgstr ""
+
+#: ../src/gnome2/mod_mgr.c:815
+msgid "Journals and prayer lists cannot be indexed."
+msgstr "Denník a modlitebný zoznam nie je možné indexovať."
+
+#: ../src/gnome2/mod_mgr.c:833
 #, c-format
 msgid "%s failed"
 msgstr "%s zlyhalo"
 
-#: ../src/gnome2/mod_mgr.c:562 ../src/gnome2/mod_mgr.c:1288
+#: ../src/gnome2/mod_mgr.c:836 ../src/gnome2/mod_mgr.c:1562
 msgid "Finished"
 msgstr "Ukončené"
 
-#: ../src/gnome2/mod_mgr.c:729 ../src/gnome2/mod_mgr.c:731
-#: ../src/gnome2/mod_mgr.c:833 ../src/gnome2/mod_mgr.c:868
-#: ../src/gnome2/mod_mgr.c:870 ../src/gnome2/utilities.c:346
-#: ../src/gnome2/utilities.c:411 ../src/gnome2/utilities.c:413
-#: ../src/gnome2/utilities.c:1032 ../src/main/sidebar.cc:801
-#: ../src/main/sidebar.cc:873 ../src/main/sidebar.cc:875
+#: ../src/gnome2/mod_mgr.c:1003 ../src/gnome2/mod_mgr.c:1005
+#: ../src/gnome2/mod_mgr.c:1107 ../src/gnome2/mod_mgr.c:1142
+#: ../src/gnome2/mod_mgr.c:1144 ../src/gnome2/utilities.c:435
+#: ../src/gnome2/utilities.c:500 ../src/gnome2/utilities.c:502
+#: ../src/gnome2/utilities.c:986 ../src/main/sidebar.cc:852
+#: ../src/main/sidebar.cc:924 ../src/main/sidebar.cc:926
 msgid "Unknown"
 msgstr "Neznáme"
 
-#: ../src/gnome2/mod_mgr.c:1032
+#: ../src/gnome2/mod_mgr.c:1301
 #, c-format
 msgid ""
 "Repository:\n"
@@ -650,7 +788,7 @@ msgstr ""
 "Úložisko:\n"
 "%s"
 
-#: ../src/gnome2/mod_mgr.c:1044
+#: ../src/gnome2/mod_mgr.c:1313
 msgid ""
 "Categorized by\n"
 "Module Type"
@@ -658,44 +796,44 @@ msgstr ""
 "Kategorizované podľa\n"
 "typu modulu"
 
-#: ../src/gnome2/mod_mgr.c:1049 ../src/gnome2/utilities.c:472
-#: ../src/main/sidebar.cc:948 ../src/main/sidebar.cc:950
+#: ../src/gnome2/mod_mgr.c:1318 ../src/gnome2/utilities.c:561
+#: ../src/main/sidebar.cc:999 ../src/main/sidebar.cc:1001
 msgid "Biblical Texts"
 msgstr "Biblické texty"
 
-#: ../src/gnome2/mod_mgr.c:1053 ../src/gnome2/utilities.c:476
-#: ../src/main/sidebar.cc:655 ../src/main/sidebar.cc:973
-#: ../src/main/sidebar.cc:975 ../ui/prefs.glade.h:33
+#: ../src/gnome2/mod_mgr.c:1322 ../src/gnome2/utilities.c:565
+#: ../src/main/sidebar.cc:678 ../src/main/sidebar.cc:1024
+#: ../src/main/sidebar.cc:1026 ../ui/prefs.glade.h:33
 msgid "Commentaries"
 msgstr "Komentáre"
 
-#: ../src/gnome2/mod_mgr.c:1057 ../src/gnome2/utilities.c:480
-#: ../src/main/sidebar.cc:982 ../src/main/sidebar.cc:984
+#: ../src/gnome2/mod_mgr.c:1326 ../src/gnome2/utilities.c:569
+#: ../src/main/sidebar.cc:1033 ../src/main/sidebar.cc:1035
 msgid "Dictionaries"
 msgstr "Slovníky"
 
-#: ../src/gnome2/mod_mgr.c:1061 ../src/gnome2/utilities.c:484
-#: ../src/main/sidebar.cc:991 ../src/main/sidebar.cc:993
+#: ../src/gnome2/mod_mgr.c:1330 ../src/gnome2/utilities.c:573
+#: ../src/main/sidebar.cc:1042 ../src/main/sidebar.cc:1044
 msgid "Daily Devotionals"
 msgstr "Denné zamyslenia"
 
-#: ../src/gnome2/mod_mgr.c:1065 ../src/gnome2/utilities.c:488
-#: ../src/main/sidebar.cc:665 ../src/main/sidebar.cc:1000
-#: ../src/main/sidebar.cc:1002
+#: ../src/gnome2/mod_mgr.c:1334 ../src/gnome2/utilities.c:577
+#: ../src/main/sidebar.cc:688 ../src/main/sidebar.cc:1051
+#: ../src/main/sidebar.cc:1053
 msgid "General Books"
 msgstr "Všeobecné knihy"
 
-#: ../src/gnome2/mod_mgr.c:1069 ../src/gnome2/utilities.c:492
-#: ../src/main/sidebar.cc:1009 ../src/main/sidebar.cc:1011
+#: ../src/gnome2/mod_mgr.c:1338 ../src/gnome2/utilities.c:581
+#: ../src/main/sidebar.cc:1060 ../src/main/sidebar.cc:1062
 msgid "Maps"
 msgstr "Mapy"
 
-#: ../src/gnome2/mod_mgr.c:1073 ../src/gnome2/utilities.c:496
-#: ../src/main/sidebar.cc:1018 ../src/main/sidebar.cc:1020
+#: ../src/gnome2/mod_mgr.c:1342 ../src/gnome2/utilities.c:585
+#: ../src/main/sidebar.cc:1069 ../src/main/sidebar.cc:1071
 msgid "Images"
 msgstr "Obrázky"
 
-#: ../src/gnome2/mod_mgr.c:1081
+#: ../src/gnome2/mod_mgr.c:1350
 msgid ""
 "Categorized by\n"
 "Availability"
@@ -703,369 +841,357 @@ msgstr ""
 "Kategorizované podľa\n"
 "dostupnosti"
 
-#: ../src/gnome2/mod_mgr.c:1086
+#: ../src/gnome2/mod_mgr.c:1355
 msgid "Updates"
 msgstr "Aktualizácie"
 
-#: ../src/gnome2/mod_mgr.c:1090
+#: ../src/gnome2/mod_mgr.c:1359
 msgid "Uninstalled"
 msgstr "Nenainštalované"
 
-#: ../src/gnome2/mod_mgr.c:1094 ../src/gnome2/sidebar.c:637
-#: ../src/gnome2/utilities.c:501 ../src/main/prayerlists.cc:238
-#: ../src/main/sidebar.cc:1028 ../src/main/sidebar.cc:1030
+#: ../src/gnome2/mod_mgr.c:1363 ../src/gnome2/sidebar.c:643
+#: ../src/gnome2/utilities.c:590 ../src/main/prayerlists.cc:241
+#: ../src/main/sidebar.cc:1079 ../src/main/sidebar.cc:1081
 msgid "Prayer List/Journal"
 msgstr "Modlitebný zoznam/Denník"
 
-#: ../src/gnome2/mod_mgr.c:1271
+#: ../src/gnome2/mod_mgr.c:1545
 msgid "Refreshing from remote source"
 msgstr "Obnovovanie vzdialeného zdroja"
 
-#: ../src/gnome2/mod_mgr.c:1282
+#: ../src/gnome2/mod_mgr.c:1556
 msgid "Remote source not found"
 msgstr "Vzdialený zdroj nebol nájdený"
 
-#: ../src/gnome2/mod_mgr.c:1415
-msgid "Module Name"
-msgstr "Názov modulu"
-
-#: ../src/gnome2/mod_mgr.c:1436
-msgid "A checkmark means this module is already installed"
-msgstr "Fajka znamená, že modul už bol nainštalovaný"
-
-#: ../src/gnome2/mod_mgr.c:1458
-msgid "Click the box to work on this module"
-msgstr "Pre prácu na tomto module kliknite na rámček"
-
-#: ../src/gnome2/mod_mgr.c:1459
-msgid "Click the box to select this module for install/update"
-msgstr ""
-"Kliknite na rámček, ak chcete označiť tento modul na inštalovanie/"
-"aktualizovanie"
-
-#: ../src/gnome2/mod_mgr.c:1478
-msgid "Installed"
-msgstr "Nainštalovaný"
-
-#: ../src/gnome2/mod_mgr.c:1488
-msgid ""
-"The index icon means you have built an optimized ('lucene') index for this "
-"module for fast searching (see the Maintenance pane for this function)"
-msgstr ""
-"Ikona indexu znamená, že ste vytvorili optimalizovaný ('lucene') index pre "
-"tento modul pre rýchle hľadanie (Pozrite si časť Údržba)"
-
-#: ../src/gnome2/mod_mgr.c:1506
-msgid ""
-"The lock icon means this module is encrypted, and requires that you purchase "
-"an unlock key from the content owner"
-msgstr ""
-"Ikona zo zámkom znamená, že tento modul je zašifrovaný, a vyžaduje si, aby "
-"ste si kúpili kľúč na odomknutie od vlastníka obsahu."
-
-#. 2
-#: ../src/gnome2/mod_mgr.c:1523 ../src/gnome2/sidebar.c:975
-#: ../src/gnome2/sidebar.c:1143 ../ui/xi-menus.glade.h:1
-msgid "About"
-msgstr "Informácie"
-
-#: ../src/gnome2/mod_mgr.c:1543
-msgid ""
-"The refresh icon means the Installed module is older than the newer "
-"Available module: You should update the module"
-msgstr ""
-"Ikona aktualizácie znamená, že nainštalovaný modul je starší ako je aktuálna "
-"dostupná verzia. Modul by ste mali zaktualizovať."
-
-#: ../src/gnome2/mod_mgr.c:1555
-msgid "Available"
-msgstr "Dostupné"
-
-#: ../src/gnome2/mod_mgr.c:1564
-msgid "Size"
-msgstr "Veľkosť"
-
-#: ../src/gnome2/mod_mgr.c:1573
-msgid "Description"
-msgstr "Popis"
-
-#: ../src/gnome2/mod_mgr.c:1605 ../src/gnome2/mod_mgr.c:1705
+#: ../src/gnome2/mod_mgr.c:1670
 msgid "Configure"
 msgstr "Konfigurácia"
 
-#: ../src/gnome2/mod_mgr.c:1636
+#: ../src/gnome2/mod_mgr.c:1701
 msgid "Type"
 msgstr "Typ"
 
-#: ../src/gnome2/mod_mgr.c:1643
+#: ../src/gnome2/mod_mgr.c:1708
 msgid "Caption"
 msgstr "Titulok"
 
-#: ../src/gnome2/mod_mgr.c:1651
+#: ../src/gnome2/mod_mgr.c:1716
 msgid "Source"
 msgstr "Zdroj"
 
-#: ../src/gnome2/mod_mgr.c:1659
+#: ../src/gnome2/mod_mgr.c:1724
 msgid "Directory"
 msgstr "Priečinok"
 
-#: ../src/gnome2/mod_mgr.c:1667
+#: ../src/gnome2/mod_mgr.c:1732
 msgid "User"
 msgstr "Používateľ"
 
-#: ../src/gnome2/mod_mgr.c:1675
+#: ../src/gnome2/mod_mgr.c:1740
 msgid "Password"
 msgstr "Heslo"
 
-#: ../src/gnome2/mod_mgr.c:1683
+#: ../src/gnome2/mod_mgr.c:1748
 msgid "UID"
 msgstr "UID"
 
-#: ../src/gnome2/mod_mgr.c:1703
-msgid "Sources"
-msgstr "Zdroje"
+#: ../src/gnome2/mod_mgr.c:1765
+msgid "Module Sources"
+msgstr ""
+
+#: ../src/gnome2/mod_mgr.c:1768
+msgid "Add/Remove"
+msgstr ""
+
+#: ../src/gnome2/mod_mgr.c:1770
+msgid "Choose"
+msgstr ""
 
-#: ../src/gnome2/mod_mgr.c:1709 ../src/gnome2/preferences_dialog.c:1784
-#: ../src/gnome2/sidebar.c:1483
+#: ../src/gnome2/mod_mgr.c:1774 ../src/gnome2/preferences_dialog.c:1793
+#: ../src/gnome2/sidebar.c:1413
 msgid "Modules"
 msgstr "Moduly"
 
-#: ../src/gnome2/mod_mgr.c:1711
+#: ../src/gnome2/mod_mgr.c:1776
 msgid "Install/Update"
 msgstr "Inštalovať/Aktualizovať"
 
-#: ../src/gnome2/mod_mgr.c:1713
+#: ../src/gnome2/mod_mgr.c:1778
 msgid "Maintenance"
 msgstr "Údržba"
 
-#: ../src/gnome2/mod_mgr.c:1933
+#: ../src/gnome2/mod_mgr.c:1999
 msgid "Please Refresh"
 msgstr "Prosím obnoviť"
 
-#: ../src/gnome2/mod_mgr.c:1934
+#: ../src/gnome2/mod_mgr.c:2000
 msgid "Your module list is not up to date!"
 msgstr "Váš zoznam modulov nie je aktuálny!"
 
-#: ../src/gnome2/mod_mgr.c:2285
+#. Zero Bibles is just not workable in Xiphos.
+#: ../src/gnome2/mod_mgr.c:2282
+msgid ""
+"You have uninstalled your last Bible.\n"
+"Xiphos requires at least one."
+msgstr ""
+
+#: ../src/gnome2/mod_mgr.c:2288
+msgid ""
+"There are still no Bibles installed.\n"
+"Xiphos cannot continue without one."
+msgstr ""
+
+#: ../src/gnome2/mod_mgr.c:2353
 msgid "Standard remote sources have been loaded."
 msgstr "Štandardné vzdialené zdroje boli načítané."
 
-#: ../src/gnome2/mod_mgr.c:2286
+#: ../src/gnome2/mod_mgr.c:2359
 msgid "Could not load standard sources from CrossWire."
 msgstr "Nie je možné načítať štandardné zdroje z CrossWire."
 
-#: ../src/gnome2/mod_mgr.c:2438 ../src/gnome2/mod_mgr.c:2687
+#: ../src/gnome2/mod_mgr.c:2510 ../src/gnome2/mod_mgr.c:2759
 msgid "Remove the selected source"
 msgstr "Odstrániť označený zdroj"
 
-#: ../src/gnome2/mod_mgr.c:2498
+#: ../src/gnome2/mod_mgr.c:2570
 msgid "Enter a remote source"
 msgstr "Vložiť vzdialený zdroj"
 
-#: ../src/gnome2/mod_mgr.c:2502
+#: ../src/gnome2/mod_mgr.c:2574
 msgid "Caption:"
 msgstr "Titulok:"
 
-#: ../src/gnome2/mod_mgr.c:2503
+#: ../src/gnome2/mod_mgr.c:2575
 msgid "Type:"
 msgstr "Typ:"
 
-#: ../src/gnome2/mod_mgr.c:2504
+#: ../src/gnome2/mod_mgr.c:2576
 msgid "Host:"
 msgstr "Hostiteľ:"
 
-#: ../src/gnome2/mod_mgr.c:2505
+#: ../src/gnome2/mod_mgr.c:2577
 msgid "Directory:"
 msgstr "Priečinok:"
 
-#: ../src/gnome2/mod_mgr.c:2507
+#: ../src/gnome2/mod_mgr.c:2579
 msgid "User (optional):"
 msgstr "Používateľ (voliteľné):"
 
-#: ../src/gnome2/mod_mgr.c:2508
+#: ../src/gnome2/mod_mgr.c:2580
 msgid "Password (optional):"
 msgstr "Heslo (voliteľné):"
 
 #. this can happen at most once
-#: ../src/gnome2/mod_mgr.c:2536
+#: ../src/gnome2/mod_mgr.c:2608
 msgid "A source by that name already exists."
 msgstr "Zdroj s týmto názvom už existuje."
 
-#: ../src/gnome2/mod_mgr.c:2684
+#: ../src/gnome2/mod_mgr.c:2756
 msgid "Delete a remote source"
 msgstr "Odstrániť vzdialený zdroj"
 
-#: ../src/gnome2/navbar_book.c:359 ../src/gnome2/navbar_book_dialog.c:299
+#. *****************************************************************************
+#. * Name
+#. *   gui_open_mod_mgr
+#. *
+#. * Synopsis
+#. *   #include "gui/mod_mgr.h"
+#. *
+#. *   void gui_open_mod_mgr(void)
+#. *
+#. * Description
+#. *
+#. *
+#. * Return value
+#. *   void
+#.
+#: ../src/gnome2/mod_mgr.c:3244
+msgid ""
+"<b>Welcome to the Module Manager.</b>\n"
+"\n"
+"This is Xiphos' mechanism to get new and updated content.\n"
+"It appears you have never been here before, so please take a moment to look "
+"it over.\n"
+"(You will see this information box just once.)\n"
+"\n"
+"Modules come from different <u>repositories</u>.  <b>Module Sources: Add/"
+"Remove</b> will show you what repositories are currently known.\n"
+"\n"
+"<b>Module Sources: Choose</b> is for deciding from where modules should "
+"come, that is, from which repository Xiphos should obtain them, as well as "
+"where they should be placed on your system. Set <i>Install Source</i> and "
+"<i>Install Destination</i>, then click <i>Refresh</i>.\n"
+"\n"
+"<b>Modules: Install/Update</b> is for selecting and obtaining modules after "
+"choosing source and destination.\n"
+"\n"
+"<b>Modules: Maintenance</b> is for archive and index creation.\n"
+"\n"
+"See section 5 of our manual for Module Manager detail, or ask for help via "
+"Live Chat, or (if no one is responsive in chat) send mail to our users' "
+"mailing list.\n"
+msgstr ""
+
+#: ../src/gnome2/navbar_book.c:359 ../src/gnome2/navbar_book_dialog.c:300
 msgid "Go outward, to the section containing this one"
 msgstr "Ísť von na sekciu, ktorá obsahuje túto položku"
 
-#: ../src/gnome2/navbar_book.c:375 ../src/gnome2/navbar_book_dialog.c:315
+#: ../src/gnome2/navbar_book.c:375 ../src/gnome2/navbar_book_dialog.c:316
 msgid "Go to previous item"
 msgstr "Ísť na predchádzajúcu položku"
 
-#: ../src/gnome2/navbar_book.c:390 ../src/gnome2/navbar_book_dialog.c:330
+#: ../src/gnome2/navbar_book.c:390 ../src/gnome2/navbar_book_dialog.c:331
 msgid "Go to next item"
 msgstr "Ísť na nasledujúcu položku"
 
-#: ../src/gnome2/navbar_book.c:406 ../src/gnome2/navbar_book_dialog.c:346
+#: ../src/gnome2/navbar_book.c:406 ../src/gnome2/navbar_book_dialog.c:347
 msgid "Go inward, to the first subsection"
 msgstr "Ísť dovnútra na prvú podsekciu"
 
-#: ../src/gnome2/navbar_versekey_dialog.c:887
-#: ../src/gnome2/navbar_versekey_editor.c:877
-#: ../src/gnome2/navbar_versekey_parallel.c:800
+#: ../src/gnome2/navbar_versekey_dialog.c:864
+#: ../src/gnome2/navbar_versekey_editor.c:879
+#: ../src/gnome2/navbar_versekey_parallel.c:810
 msgid "Synchronize this window from main window"
 msgstr "Synchronizovať toto okno s hlavným oknom"
 
-#: ../src/gnome2/parallel_dialog.c:324 ../src/gnome2/preferences_dialog.c:1790
+#: ../src/gnome2/parallel_dialog.c:328 ../src/gnome2/preferences_dialog.c:1799
 msgid "Parallel"
 msgstr "Paralelné"
 
-#: ../src/gnome2/parallel_view.c:271
+#: ../src/gnome2/parallel_view.c:275
 msgid "Copy"
 msgstr "Kopírovať"
 
-#: ../src/gnome2/parallel_view.c:281
+#: ../src/gnome2/parallel_view.c:285
 msgid "Detach/Attach"
 msgstr "Pripojiť/Odobrať"
 
-#: ../src/gnome2/parallel_view.c:287 ../ui/xi-menus.glade.h:40
+#: ../src/gnome2/parallel_view.c:291 ../ui/xi-menus.glade.h:53
 msgid "Module Options"
 msgstr "Nastavenia modulov"
 
 #. build change parallel modules submenu
-#: ../src/gnome2/parallel_view.c:302
+#: ../src/gnome2/parallel_view.c:306
 msgid "Change parallel 1"
 msgstr "Zmeniť paralelu 1"
 
-#: ../src/gnome2/parallel_view.c:304
+#: ../src/gnome2/parallel_view.c:308
 msgid "Change parallel 2"
 msgstr "Zmeniť paralelu 2"
 
-#: ../src/gnome2/parallel_view.c:306
+#: ../src/gnome2/parallel_view.c:310
 msgid "Change parallel 3"
 msgstr "Zmeniť paralelu 3"
 
-#: ../src/gnome2/parallel_view.c:308
+#: ../src/gnome2/parallel_view.c:312
 msgid "Change parallel 4"
 msgstr "Zmeniť paralelu 4"
 
-#: ../src/gnome2/parallel_view.c:310
+#: ../src/gnome2/parallel_view.c:314
 msgid "Change parallel 5"
 msgstr "Zmeniť paralelu 5"
 
-#: ../src/gnome2/parallel_view.c:467 ../src/gnome2/sidebar.c:620
-#: ../src/gnome2/sidebar.c:626 ../src/gnome2/tabbed_browser.c:231
-#: ../src/main/sidebar.cc:623 ../src/main/sidebar.cc:956
-#: ../src/main/sidebar.cc:957 ../src/main/sidebar.cc:958
+#: ../src/gnome2/parallel_view.c:471 ../src/gnome2/sidebar.c:626
+#: ../src/gnome2/sidebar.c:632 ../src/gnome2/tabbed_browser.c:262
+#: ../src/main/sidebar.cc:646 ../src/main/sidebar.cc:1007
+#: ../src/main/sidebar.cc:1008 ../src/main/sidebar.cc:1009
 msgid "Parallel View"
 msgstr "Paralelné zobrazenie"
 
-#: ../src/gnome2/preferences_cell_renderer.c:398
-msgid "Text"
-msgstr "Text"
-
-#: ../src/gnome2/preferences_cell_renderer.c:400
-msgid "Text to render"
-msgstr "Text na vykreslenie"
-
-#: ../src/gnome2/preferences_cell_renderer.c:406
-msgid "Pixbuf Object"
-msgstr "Pixbuf objekt"
-
-#: ../src/gnome2/preferences_cell_renderer.c:408
-msgid "The pixbuf to render."
-msgstr "Pixbuf objekt na vykreslenie"
-
-#: ../src/gnome2/preferences_dialog.c:1231
-#: ../src/gnome2/preferences_dialog.c:1269
-#: ../src/gnome2/preferences_dialog.c:1306
-#: ../src/gnome2/preferences_dialog.c:1341
-#: ../src/gnome2/preferences_dialog.c:1375
-#: ../src/gnome2/preferences_dialog.c:1408
-#: ../src/gnome2/preferences_dialog.c:1440
-#: ../src/gnome2/preferences_dialog.c:1473
-#: ../src/gnome2/preferences_dialog.c:1505
-#: ../src/gnome2/preferences_dialog.c:1539
-#: ../src/gnome2/preferences_dialog.c:1574
-#: ../src/gnome2/preferences_dialog.c:1609
-#: ../src/gnome2/preferences_dialog.c:1645
-#: ../src/gnome2/preferences_dialog.c:2045
+#: ../src/gnome2/preferences_dialog.c:1179
+#: ../src/gnome2/preferences_dialog.c:1217
+#: ../src/gnome2/preferences_dialog.c:1254
+#: ../src/gnome2/preferences_dialog.c:1289
+#: ../src/gnome2/preferences_dialog.c:1323
+#: ../src/gnome2/preferences_dialog.c:1356
+#: ../src/gnome2/preferences_dialog.c:1388
+#: ../src/gnome2/preferences_dialog.c:1421
+#: ../src/gnome2/preferences_dialog.c:1453
+#: ../src/gnome2/preferences_dialog.c:1487
+#: ../src/gnome2/preferences_dialog.c:1522
+#: ../src/gnome2/preferences_dialog.c:1557
+#: ../src/gnome2/preferences_dialog.c:1593
+#: ../src/gnome2/preferences_dialog.c:1631
+#: ../src/gnome2/preferences_dialog.c:2052
 msgid "-- Select --"
 msgstr "-- Výber --"
 
-#: ../src/gnome2/preferences_dialog.c:1678 ../ui/prefs.glade.h:74
+#: ../src/gnome2/preferences_dialog.c:1652
+msgid "Locale will take effect after restart."
+msgstr ""
+
+#: ../src/gnome2/preferences_dialog.c:1687 ../ui/prefs.glade.h:74
 msgid "Preferences"
 msgstr "Nastavenia"
 
-#: ../src/gnome2/preferences_dialog.c:1760
+#: ../src/gnome2/preferences_dialog.c:1769
 msgid "Fonts"
 msgstr "Písma"
 
-#: ../src/gnome2/preferences_dialog.c:1763
+#: ../src/gnome2/preferences_dialog.c:1772
 msgid "Color"
 msgstr "Farby"
 
-#: ../src/gnome2/preferences_dialog.c:1766
+#: ../src/gnome2/preferences_dialog.c:1775
 msgid "Sizes"
 msgstr "Veľkosti"
 
-#: ../src/gnome2/preferences_dialog.c:1770
+#: ../src/gnome2/preferences_dialog.c:1779
 msgid "General"
 msgstr "Všeobecné"
 
-#: ../src/gnome2/preferences_dialog.c:1773 ../ui/prefs.glade.h:85
+#: ../src/gnome2/preferences_dialog.c:1782 ../ui/prefs.glade.h:87
 msgid "Tabs and Panes"
 msgstr "Karty a výplne"
 
-#: ../src/gnome2/preferences_dialog.c:1780
+#: ../src/gnome2/preferences_dialog.c:1789
 msgid "Options"
 msgstr "Možnosti"
 
-#: ../src/gnome2/preferences_dialog.c:1787
+#: ../src/gnome2/preferences_dialog.c:1796
 msgid "Main"
 msgstr "Hlavné"
 
-#: ../src/gnome2/preferences_dialog.c:1793
+#: ../src/gnome2/preferences_dialog.c:1802
 msgid "Special"
 msgstr "Špeciálne"
 
-#: ../src/gnome2/search_dialog.c:61 ../src/main/search_dialog.cc:60
-#: ../src/main/search_sidebar.cc:54
+#: ../src/gnome2/search_dialog.c:68 ../src/main/search_dialog.cc:66
+#: ../src/main/search_sidebar.cc:61
 msgid "Searching the "
-msgstr "Prehľadávanie"
+msgstr "Prehľadávanie "
 
-#: ../src/gnome2/search_dialog.c:62 ../src/main/search_dialog.cc:61
-#: ../src/main/search_sidebar.cc:55
+#: ../src/gnome2/search_dialog.c:69 ../src/main/search_dialog.cc:67
+#: ../src/main/search_sidebar.cc:62
 msgid " Module"
 msgstr " Modul"
 
-#: ../src/gnome2/search_dialog.c:63 ../src/main/search_dialog.cc:62
-#: ../src/main/search_sidebar.cc:56
+#: ../src/gnome2/search_dialog.c:70 ../src/main/search_dialog.cc:68
+#: ../src/main/search_sidebar.cc:63
 msgid "found in "
 msgstr "nájdené v "
 
-#: ../src/gnome2/search_dialog.c:498
+#: ../src/gnome2/search_dialog.c:527
 msgid "Clear List?"
 msgstr "Vyčistiť zoznam?"
 
-#: ../src/gnome2/search_dialog.c:499
+#: ../src/gnome2/search_dialog.c:528
 msgid "Are you sure you want to clear the module list?"
 msgstr "Ste si istý, že chcete vyčistiť zoznam modulov?"
 
-#: ../src/gnome2/search_dialog.c:679
+#: ../src/gnome2/search_dialog.c:708
 msgid "The last module list may not be deleted"
 msgstr "Posledný zoznam modulov nemôže byť zmazaný"
 
-#: ../src/gnome2/search_dialog.c:697
+#: ../src/gnome2/search_dialog.c:726
 msgid "Delete list?"
 msgstr "Zmazať zoznam?"
 
-#: ../src/gnome2/search_dialog.c:698
+#: ../src/gnome2/search_dialog.c:727
 msgid "Are you sure you want to delete:"
 msgstr "Ste si istý, že chcete zmazať:"
 
-#: ../src/gnome2/search_sidebar.c:189
+#: ../src/gnome2/search_sidebar.c:192
 msgid ""
 "This is an inclusive (\"AND\") search:\n"
 "Find matches showing all words."
@@ -1073,173 +1199,93 @@ msgstr ""
 "Toto je inkluzívne  (\"AND\") hľadanie:\n"
 "Nájde výskyty zobrazujúce všetky slová."
 
-#: ../src/gnome2/search_sidebar.c:206
+#: ../src/gnome2/search_sidebar.c:209
 msgid "Search Module"
 msgstr "Hľadať v module"
 
-#: ../src/gnome2/search_sidebar.c:220
+#: ../src/gnome2/search_sidebar.c:223
 msgid "Bible"
 msgstr "Biblia"
 
-#: ../src/gnome2/search_sidebar.c:229 ../ui/prefs.glade.h:35
+#: ../src/gnome2/search_sidebar.c:232 ../ui/prefs.glade.h:35
 msgid "Commentary"
 msgstr "Komentár"
 
-#: ../src/gnome2/search_sidebar.c:243
+#: ../src/gnome2/search_sidebar.c:246
 msgid "Search Type"
 msgstr "Typ hľadania"
 
-#: ../src/gnome2/search_sidebar.c:257 ../ui/search-dialog.glade.h:64
+#: ../src/gnome2/search_sidebar.c:260 ../ui/search-dialog.glade.h:66
 msgid "Multi word"
 msgstr "Viac slov"
 
-#: ../src/gnome2/search_sidebar.c:276 ../ui/search-dialog.glade.h:44
+#: ../src/gnome2/search_sidebar.c:279 ../ui/search-dialog.glade.h:44
 msgid "Exact phrase"
 msgstr "Presná fráza"
 
-#: ../src/gnome2/search_sidebar.c:290
+#: ../src/gnome2/search_sidebar.c:293
 msgid "Search Options"
 msgstr "Možnosti vyhľadávania"
 
-#: ../src/gnome2/search_sidebar.c:318
+#: ../src/gnome2/search_sidebar.c:321
 msgid "Search Scope"
 msgstr "Záber hľadania"
 
-#: ../src/gnome2/search_sidebar.c:331
+#: ../src/gnome2/search_sidebar.c:334
 msgid "No scope"
 msgstr "Bez rozsahu"
 
-#: ../src/gnome2/search_sidebar.c:341
+#: ../src/gnome2/search_sidebar.c:344
 msgid "Use bounds"
 msgstr "Použiť ohraničenie"
 
-#: ../src/gnome2/search_sidebar.c:350
+#: ../src/gnome2/search_sidebar.c:353
 msgid "Last search"
 msgstr "Posledné hľadanie"
 
-#: ../src/gnome2/search_sidebar.c:365
+#: ../src/gnome2/search_sidebar.c:368
 msgid "Bounds"
 msgstr "Ohraničenie"
 
-#: ../src/gnome2/search_sidebar.c:379
+#: ../src/gnome2/search_sidebar.c:382
 msgid "Lower"
 msgstr "Dolné"
 
-#: ../src/gnome2/search_sidebar.c:386
+#: ../src/gnome2/search_sidebar.c:389
 msgid "Upper"
 msgstr "Horné"
 
-#. 0
-#: ../src/gnome2/sidebar.c:963 ../src/gnome2/sidebar.c:1131
-msgid "Open in a new tab"
-msgstr "Otvoriť v novej karte"
-
-#: ../src/gnome2/sidebar.c:964 ../src/gnome2/sidebar.c:1132
-msgid "Open selected module in a new tab"
-msgstr "Otvorí označený modul v novej karte"
-
-#. 1
-#: ../src/gnome2/sidebar.c:969
-msgid "Open in a separate window"
-msgstr "Otvoriť v samostatnom okne"
-
-#: ../src/gnome2/sidebar.c:970
-msgid "Open selected module in a separate ['dialog'] window"
-msgstr "Otvorí zvolený modul v samostatnom ['dialógovom'] okne"
-
-#: ../src/gnome2/sidebar.c:976 ../src/gnome2/sidebar.c:1144
-msgid "View information about the selected dialog"
-msgstr "Zobraziť informácie o zvolenom dialógu"
-
-#: ../src/gnome2/sidebar.c:1067
-msgid "Simple"
-msgstr "Jednoduchý zoznam"
-
-#: ../src/gnome2/sidebar.c:1068
-msgid "Create a new simple prayer list"
-msgstr "Vytvoriť nový jednoduchý modlitebný zoznam"
-
-#: ../src/gnome2/sidebar.c:1074
-msgid "Subject"
-msgstr "Predmet"
-
-#: ../src/gnome2/sidebar.c:1081
-msgid "Monthly"
-msgstr "Mesačný denník"
-
-#: ../src/gnome2/sidebar.c:1082 ../src/gnome2/sidebar.c:1089
-#: ../src/gnome2/sidebar.c:1096
-msgid "Create a new prayer list"
-msgstr "Vytvoriť modlitebný zoznam"
-
-#: ../src/gnome2/sidebar.c:1088
-msgid "Daily Journal"
-msgstr "Denník"
-
-#: ../src/gnome2/sidebar.c:1095
-msgid "Outlined Topic"
-msgstr "Štruktúrovaná téma"
-
-#. 1
-#: ../src/gnome2/sidebar.c:1137 ../ui/xi-menus.glade.h:47
-msgid "Open in editor"
-msgstr "Otvoriť v editore"
-
-#: ../src/gnome2/sidebar.c:1138
-msgid "Open selected module in a dialog"
-msgstr "Otvorí označený modul v dialógu"
-
-#: ../src/gnome2/sidebar.c:1467
+#: ../src/gnome2/sidebar.c:1397
 msgid "Search"
 msgstr "Hľadať"
 
-#: ../src/gnome2/sidebar.c:1475
+#: ../src/gnome2/sidebar.c:1405
 msgid "Verse List"
 msgstr "Zoznam veršov"
 
-#: ../src/gnome2/sidebar_dialog.c:136 ../src/gnome2/sidebar_dialog.c:145
+#: ../src/gnome2/sidebar_dialog.c:139 ../src/gnome2/sidebar_dialog.c:148
 msgid "Sidebar"
 msgstr "Bočný panel"
 
-#: ../src/gnome2/splash.c:363
+#: ../src/gnome2/splash.c:396
 msgid "Powered by the SWORD Project"
 msgstr "Využíva The SWORD Project."
 
-#: ../src/gnome2/treekey-editor.c:130 ../src/gnome2/treekey-editor.c:189
-#: ../src/gnome2/treekey-editor.c:275
+#: ../src/gnome2/treekey-editor.c:137 ../src/gnome2/treekey-editor.c:196
+#: ../src/gnome2/treekey-editor.c:282
 msgid "Prayer List/Journal Item"
 msgstr "Modlitebný zoznam/Položka denníka"
 
-#: ../src/gnome2/treekey-editor.c:131 ../src/gnome2/treekey-editor.c:190
-#: ../src/gnome2/treekey-editor.c:276
+#: ../src/gnome2/treekey-editor.c:138 ../src/gnome2/treekey-editor.c:197
+#: ../src/gnome2/treekey-editor.c:283
 msgid "New name"
 msgstr "Nový názov"
 
-#: ../src/gnome2/treekey-editor.c:246
+#: ../src/gnome2/treekey-editor.c:253
 msgid "Remove the selected item"
 msgstr "Odstrániť označenú položku"
 
-#: ../src/gnome2/treekey-editor.c:304
-msgid "Add Child"
-msgstr "Pridať potomka"
-
-#: ../src/gnome2/treekey-editor.c:305 ../src/gnome2/treekey-editor.c:311
-msgid "Add an item"
-msgstr "Pridať položku"
-
-#: ../src/gnome2/treekey-editor.c:310
-msgid "Add Sibling"
-msgstr "Pridať súrodenca"
-
-#: ../src/gnome2/treekey-editor.c:317
-msgid "Remove this item"
-msgstr "Odstrániť túto položku"
-
-#: ../src/gnome2/treekey-editor.c:323
-msgid "Edit this item"
-msgstr "Upraviť túto položku"
-
-#: ../src/main/display.cc:301
+#: ../src/main/display.cc:259
 #, c-format
 msgid ""
 "Improperly encoded personal annotation label:\n"
@@ -1248,7 +1294,7 @@ msgstr ""
 "Nesprávne kódovaná značka osobného komentára:\n"
 "'%s'"
 
-#: ../src/main/display.cc:427
+#: ../src/main/display.cc:386
 msgid ""
 "An image file's size could not be determined.\n"
 "Is ImageMagick's 'identify' not installed?\n"
@@ -1260,284 +1306,283 @@ msgstr ""
 "(Alebo typ obrázka je iný než bmp/gif/jpg/png.)\n"
 "Xiphos nevie zmeniť jeho veľkosť tak, aby sa obrázok zmestil do okna."
 
-#: ../src/main/display.cc:1084 ../src/main/display.cc:1146
-#: ../src/main/display.cc:1234 ../src/main/display.cc:1242
-#: ../ui/export-dialog.glade.h:7
+#: ../src/main/display.cc:1043 ../src/main/display.cc:1095
+#: ../src/main/display.cc:1172 ../ui/export-dialog.glade.h:7
 msgid "Chapter"
 msgstr "Kapitola"
 
-#: ../src/main/main.c:110
+#: ../src/main/main.c:119
 msgid "Xiphos does not understand more than one argument."
 msgstr "Xiphos nerozozná viac ako jeden argument."
 
-#: ../src/main/main.c:150
+#: ../src/main/main.c:161
 msgid "Initiating Gecko"
 msgstr "Inicializujem Gecko"
 
-#: ../src/main/main.c:156
+#: ../src/main/main.c:167
 msgid "Building Interface"
 msgstr "Vytváram rozhranie"
 
-#: ../src/main/main.c:160
+#: ../src/main/main.c:171
 msgid "Starting Sword"
 msgstr "Spúšťam Sword"
 
-#: ../src/main/main.c:164
+#: ../src/main/main.c:175
 msgid "Loading Settings"
 msgstr "Načítavam nastavenia"
 
-#: ../src/main/main.c:168
+#: ../src/main/main.c:179
 msgid "Displaying Xiphos"
 msgstr "Zobrazujem Xiphos"
 
-#: ../src/main/module_dialogs.cc:232 ../src/main/previewer.cc:122
-#: ../ui/prefs.glade.h:75
+#: ../src/main/module_dialogs.cc:227 ../src/main/previewer.cc:127
+#: ../src/main/previewer.cc:194 ../ui/prefs.glade.h:75
 msgid "Previewer"
 msgstr "Náhľad"
 
-#: ../src/main/module_dialogs.cc:298 ../src/main/module_dialogs.cc:424
-#: ../src/main/previewer.cc:197
+#: ../src/main/module_dialogs.cc:292 ../src/main/module_dialogs.cc:416
+#: ../src/main/previewer.cc:269
 msgid "Footnote"
 msgstr "Poznámka pod čiarou"
 
-#: ../src/main/module_dialogs.cc:304 ../src/main/module_dialogs.cc:429
-#: ../src/main/previewer.cc:209
+#: ../src/main/module_dialogs.cc:298 ../src/main/module_dialogs.cc:421
+#: ../src/main/previewer.cc:281
 msgid "Cross Reference"
 msgstr "Krížová referencia"
 
-#: ../src/main/module_dialogs.cc:310 ../src/main/module_dialogs.cc:324
-#: ../src/main/module_dialogs.cc:434 ../src/main/module_dialogs.cc:446
-#: ../src/main/previewer.cc:215 ../src/main/previewer.cc:234
+#: ../src/main/module_dialogs.cc:304 ../src/main/module_dialogs.cc:318
+#: ../src/main/module_dialogs.cc:426 ../src/main/module_dialogs.cc:438
+#: ../src/main/previewer.cc:287 ../src/main/previewer.cc:306
 msgid "Strongs"
 msgstr "Strongové čísla"
 
-#: ../src/main/module_dialogs.cc:316 ../src/main/module_dialogs.cc:335
-#: ../src/main/module_dialogs.cc:439 ../src/main/module_dialogs.cc:456
-#: ../src/main/previewer.cc:221 ../src/main/previewer.cc:247
+#: ../src/main/module_dialogs.cc:310 ../src/main/module_dialogs.cc:329
+#: ../src/main/module_dialogs.cc:431 ../src/main/module_dialogs.cc:448
+#: ../src/main/previewer.cc:293 ../src/main/previewer.cc:319
 msgid "Morphology"
 msgstr "Morfológia"
 
-#: ../src/main/module_dialogs.cc:1089 ../src/main/url.cc:537
+#: ../src/main/module_dialogs.cc:1081 ../src/main/url.cc:530
 msgid "Back to "
 msgstr "Späť k "
 
-#: ../src/main/parallel_view.cc:398 ../ui/xi-menus.glade.h:69
+#: ../src/main/parallel_view.cc:404 ../ui/xi-menus.glade.h:89
 msgid "Strong's Numbers"
 msgstr "Strongové čísla"
 
-#: ../src/main/parallel_view.cc:408 ../ui/search-dialog.glade.h:50
-#: ../ui/xi-menus.glade.h:27
+#: ../src/main/parallel_view.cc:414 ../ui/search-dialog.glade.h:52
+#: ../ui/xi-menus.glade.h:40
 msgid "Footnotes"
 msgstr "Poznámky pod čiarou"
 
-#: ../src/main/parallel_view.cc:418 ../ui/search-dialog.glade.h:62
-#: ../ui/xi-menus.glade.h:41
+#: ../src/main/parallel_view.cc:424 ../ui/search-dialog.glade.h:64
+#: ../ui/xi-menus.glade.h:55
 msgid "Morphological Tags"
 msgstr "Morfologické značky"
 
-#: ../src/main/parallel_view.cc:428 ../ui/xi-menus.glade.h:31
+#: ../src/main/parallel_view.cc:434 ../ui/xi-menus.glade.h:44
 msgid "Hebrew Vowel Points"
 msgstr "Body hebrejských samohlások"
 
-#: ../src/main/parallel_view.cc:438 ../ui/xi-menus.glade.h:30
+#: ../src/main/parallel_view.cc:444 ../ui/xi-menus.glade.h:43
 msgid "Hebrew Cantillation"
 msgstr "Hebrejské vokalizácia"
 
-#: ../src/main/parallel_view.cc:448 ../ui/xi-menus.glade.h:28
+#: ../src/main/parallel_view.cc:454 ../ui/xi-menus.glade.h:41
 msgid "Greek Accents"
 msgstr "Grécke akcenty"
 
-#: ../src/main/parallel_view.cc:458
+#: ../src/main/parallel_view.cc:464
 msgid "Cross-references"
 msgstr "Krížové referencie"
 
-#: ../src/main/parallel_view.cc:468 ../ui/xi-menus.glade.h:37
+#: ../src/main/parallel_view.cc:474 ../ui/xi-menus.glade.h:50
 msgid "Lemmas"
 msgstr "Lemy"
 
-#: ../src/main/parallel_view.cc:478 ../ui/xi-menus.glade.h:29
+#: ../src/main/parallel_view.cc:484 ../ui/xi-menus.glade.h:42
 msgid "Headings"
 msgstr "Nadpisy"
 
-#: ../src/main/parallel_view.cc:488
+#: ../src/main/parallel_view.cc:494
 msgid "Morpheme Segmentation"
 msgstr "Segmentácia morfém"
 
-#: ../src/main/parallel_view.cc:498 ../ui/xi-menus.glade.h:75
+#: ../src/main/parallel_view.cc:504 ../ui/xi-menus.glade.h:96
 msgid "Words of Christ in Red"
 msgstr "Kristove slová červenou farbou"
 
-#: ../src/main/parallel_view.cc:508 ../ui/xi-menus.glade.h:70
+#: ../src/main/parallel_view.cc:514 ../ui/xi-menus.glade.h:91
 msgid "Transliteration"
 msgstr "Prepis"
 
-#: ../src/main/parallel_view.cc:518
+#: ../src/main/parallel_view.cc:524
 msgid "Textual Variants"
 msgstr "Textové varianty"
 
-#: ../src/main/parallel_view.cc:526 ../ui/xi-menus.glade.h:51
+#: ../src/main/parallel_view.cc:532 ../ui/xi-menus.glade.h:70
 msgid "Primary Reading"
 msgstr "Prvoradé čítanie"
 
-#: ../src/main/parallel_view.cc:535 ../ui/xi-menus.glade.h:65
+#: ../src/main/parallel_view.cc:541 ../ui/xi-menus.glade.h:84
 msgid "Secondary Reading"
 msgstr "Pomocné čítanie"
 
-#: ../src/main/parallel_view.cc:544 ../ui/xi-menus.glade.h:5
+#: ../src/main/parallel_view.cc:550 ../ui/xi-menus.glade.h:9
 msgid "All Readings"
 msgstr "Všetky čítania"
 
-#: ../src/main/parallel_view.cc:878 ../src/main/parallel_view.cc:1130
+#: ../src/main/parallel_view.cc:884 ../src/main/parallel_view.cc:1136
 msgid "view context"
 msgstr "zobraziť kontext"
 
-#: ../src/main/prayerlists.cc:71
+#: ../src/main/prayerlists.cc:74
 msgid "January"
 msgstr "Január"
 
-#: ../src/main/prayerlists.cc:72
+#: ../src/main/prayerlists.cc:75
 msgid "February"
 msgstr "Február"
 
-#: ../src/main/prayerlists.cc:73
+#: ../src/main/prayerlists.cc:76
 msgid "March"
 msgstr "Marec"
 
-#: ../src/main/prayerlists.cc:74
+#: ../src/main/prayerlists.cc:77
 msgid "April"
 msgstr "Apríl"
 
-#: ../src/main/prayerlists.cc:75
+#: ../src/main/prayerlists.cc:78
 msgid "May"
 msgstr "Máj"
 
-#: ../src/main/prayerlists.cc:76
+#: ../src/main/prayerlists.cc:79
 msgid "June"
 msgstr "Jún"
 
-#: ../src/main/prayerlists.cc:77
+#: ../src/main/prayerlists.cc:80
 msgid "July"
 msgstr "Júl"
 
-#: ../src/main/prayerlists.cc:78
+#: ../src/main/prayerlists.cc:81
 msgid "August"
 msgstr "August"
 
-#: ../src/main/prayerlists.cc:79
+#: ../src/main/prayerlists.cc:82
 msgid "September"
 msgstr "September"
 
-#: ../src/main/prayerlists.cc:80
+#: ../src/main/prayerlists.cc:83
 msgid "October"
 msgstr "Október"
 
-#: ../src/main/prayerlists.cc:81
+#: ../src/main/prayerlists.cc:84
 msgid "November"
 msgstr "November"
 
-#: ../src/main/prayerlists.cc:82
+#: ../src/main/prayerlists.cc:85
 msgid "December"
 msgstr "December"
 
-#: ../src/main/prayerlists.cc:121 ../src/main/sword_treekey.cc:332
+#: ../src/main/prayerlists.cc:124 ../src/main/sword_treekey.cc:332
 msgid "Growth"
 msgstr "Rast"
 
-#: ../src/main/prayerlists.cc:122 ../src/main/sword_treekey.cc:333
+#: ../src/main/prayerlists.cc:125 ../src/main/sword_treekey.cc:333
 msgid "<b>For Growth</b><br>"
 msgstr "<b>Za rast</b><br>"
 
-#: ../src/main/prayerlists.cc:123 ../src/main/prayerlists.cc:380
+#: ../src/main/prayerlists.cc:126 ../src/main/prayerlists.cc:383
 #: ../src/main/sword_treekey.cc:334
 msgid "Salvation"
 msgstr "Spasenie"
 
-#: ../src/main/prayerlists.cc:124 ../src/main/sword_treekey.cc:335
+#: ../src/main/prayerlists.cc:127 ../src/main/sword_treekey.cc:335
 msgid "<b>For Salvation</b><br>"
 msgstr "<b>Za spasenie</b><br>"
 
-#: ../src/main/prayerlists.cc:125 ../src/main/prayerlists.cc:384
+#: ../src/main/prayerlists.cc:128 ../src/main/prayerlists.cc:387
 #: ../src/main/sword_treekey.cc:336
 msgid "Health"
 msgstr "Zdravie"
 
-#: ../src/main/prayerlists.cc:126 ../src/main/sword_treekey.cc:337
+#: ../src/main/prayerlists.cc:129 ../src/main/sword_treekey.cc:337
 msgid "<b>For Health</b><br>"
 msgstr "<b>Za zdravie</b><br>"
 
-#: ../src/main/prayerlists.cc:127
+#: ../src/main/prayerlists.cc:130
 msgid "Misc"
 msgstr "Rôzne"
 
-#: ../src/main/prayerlists.cc:128 ../src/main/sword_treekey.cc:339
+#: ../src/main/prayerlists.cc:131 ../src/main/sword_treekey.cc:339
 msgid "<b>Miscellaneous</b><br>"
 msgstr "<b>Rôzne</b><br>"
 
-#: ../src/main/prayerlists.cc:136
+#: ../src/main/prayerlists.cc:139
 msgid "Point x"
 msgstr "Bod x"
 
-#: ../src/main/prayerlists.cc:137
+#: ../src/main/prayerlists.cc:140
 msgid "<b>(x)</b><br>"
 msgstr "<b>(x)</b><br>"
 
-#: ../src/main/prayerlists.cc:138
+#: ../src/main/prayerlists.cc:141
 msgid "Point y"
 msgstr "Bod y"
 
-#: ../src/main/prayerlists.cc:139
+#: ../src/main/prayerlists.cc:142
 msgid "<b>(y)</b><br>"
 msgstr "<b>(y)</b><br>"
 
-#: ../src/main/prayerlists.cc:140
+#: ../src/main/prayerlists.cc:143
 msgid "Point z"
 msgstr "Bod z"
 
-#: ../src/main/prayerlists.cc:141
+#: ../src/main/prayerlists.cc:144
 msgid "<b>(z)</b><br>"
 msgstr "<b>(z)</b><br>"
 
-#: ../src/main/prayerlists.cc:149
+#: ../src/main/prayerlists.cc:152
 msgid "Minor Topic 1"
 msgstr "Vedľajšia téma 1"
 
-#: ../src/main/prayerlists.cc:150
+#: ../src/main/prayerlists.cc:153
 msgid "<b>Subtopic 1</b><br>"
 msgstr "<b>Podtéma 1</b><br>"
 
-#: ../src/main/prayerlists.cc:152
+#: ../src/main/prayerlists.cc:155
 msgid "Minor Topic 2"
 msgstr "Vedľajšia téma 2"
 
-#: ../src/main/prayerlists.cc:153
+#: ../src/main/prayerlists.cc:156
 msgid "<b>Subtopic 2</b><br>"
 msgstr "<b>Podtéma 2</b><br>"
 
-#: ../src/main/prayerlists.cc:155
+#: ../src/main/prayerlists.cc:158
 msgid "Minor Topic 3"
 msgstr "Vedľajšia téma 3"
 
-#: ../src/main/prayerlists.cc:156
+#: ../src/main/prayerlists.cc:159
 msgid "<b>Subtopic 3</b><br>"
 msgstr "<b>Podtéma 3</b><br>"
 
-#: ../src/main/prayerlists.cc:158
+#: ../src/main/prayerlists.cc:161
 msgid "Minor Topic 4"
 msgstr "Vedľajšia téma 4"
 
-#: ../src/main/prayerlists.cc:159
+#: ../src/main/prayerlists.cc:162
 msgid "<b>Subtopic 4</b><br>"
 msgstr "<b>Podtéma 4</b><br>"
 
-#: ../src/main/prayerlists.cc:239
+#: ../src/main/prayerlists.cc:242
 msgid "Name for new prayer list or journal"
 msgstr "Názov pre nový modlitebný zoznam alebo denník"
 
-#: ../src/main/prayerlists.cc:270
+#: ../src/main/prayerlists.cc:273
 msgid "Xiphos finds that prayer list already."
 msgstr "Xiphos už nášiel taký modlitebný zoznam."
 
-#: ../src/main/prayerlists.cc:283
+#: ../src/main/prayerlists.cc:286
 #, c-format
 msgid ""
 "Xiphos cannot create module's path:\n"
@@ -1546,20 +1591,20 @@ msgstr ""
 "Xiphos nemôže vytvoriť cestu pre moduly:\n"
 "%s"
 
-#: ../src/main/prayerlists.cc:323
+#: ../src/main/prayerlists.cc:326
 msgid "A basic prayer list. \\par\\par Module created by Xiphos."
 msgstr ""
 "Základný modlitebný zoznam. \\par\\par Modul vytvorený aplikáciou Xiphos."
 
-#: ../src/main/prayerlists.cc:324
+#: ../src/main/prayerlists.cc:327
 msgid "BasicPrayerList"
 msgstr "ZakladnyModlitebnyZoznam"
 
-#: ../src/main/prayerlists.cc:338
+#: ../src/main/prayerlists.cc:341
 msgid "MyPrayerList"
 msgstr "MojModlitebnyZoznam"
 
-#: ../src/main/prayerlists.cc:339
+#: ../src/main/prayerlists.cc:342
 msgid ""
 "<b>People:</b><br>Bob<br>Sam<br>Sue<br><br><b>Church:</"
 "b><br>pews<br>fellowship<br>Bibles for missionaries<br><br><br>"
@@ -1567,115 +1612,115 @@ msgstr ""
 "<b>Ľudia:</b><br>Robo<br>Samo<br>Zuzka<br><br> <b>Zbor:</"
 "b><br>lavice<br>spoločenstvo<br>Biblie pre misionárov<br><br><br>"
 
-#: ../src/main/prayerlists.cc:365
+#: ../src/main/prayerlists.cc:368
 msgid "A subject-based prayer list. \\par\\par Module created by Xiphos."
 msgstr ""
 "Modlitebný zoznam založený na predmetoch. \\par \\par Modul vytvorený v "
 "aplikácií Xiphos."
 
-#: ../src/main/prayerlists.cc:366
+#: ../src/main/prayerlists.cc:369
 msgid "SubjectPrayerList"
 msgstr "PredmetModlitieb"
 
-#: ../src/main/prayerlists.cc:381
+#: ../src/main/prayerlists.cc:384
 msgid "Bob<br>Sam<br>Sue<br>John<br>"
 msgstr "Robo<br>Samo<br>Zuzka<br>Ján<br>"
 
-#: ../src/main/prayerlists.cc:382
+#: ../src/main/prayerlists.cc:385
 msgid "Spiritual Growth"
 msgstr "Duchovný rast"
 
-#: ../src/main/prayerlists.cc:383
+#: ../src/main/prayerlists.cc:386
 msgid "Mike<br>Steve<br>"
 msgstr "Mišo<br>Števo<br>"
 
-#: ../src/main/prayerlists.cc:385
+#: ../src/main/prayerlists.cc:388
 msgid "Sue<br>John<br>"
 msgstr "Zuzka<br>Ján<br>"
 
-#: ../src/main/prayerlists.cc:411
+#: ../src/main/prayerlists.cc:414
 msgid "A monthly prayer list. \\par\\par Module created by Xiphos."
 msgstr ""
 "Mesačný modlitebný zoznam. \\par\\par Modul vytvorený v aplikácií Xiphos."
 
-#: ../src/main/prayerlists.cc:412
+#: ../src/main/prayerlists.cc:415
 msgid "MonthlyPrayerList"
 msgstr "MesacnyModlitebnyZoznam"
 
-#: ../src/main/prayerlists.cc:463
+#: ../src/main/prayerlists.cc:466
 msgid "A daily journal. \\par\\par Module created by Xiphos."
 msgstr "Denník. \\par\\par Modul vytvorený aplikáciou Xiphos."
 
-#: ../src/main/prayerlists.cc:464
+#: ../src/main/prayerlists.cc:467
 msgid "DailyJournal"
 msgstr "Dennik"
 
-#: ../src/main/prayerlists.cc:528
+#: ../src/main/prayerlists.cc:531
 msgid "An outlined topic (e.g. sermon). \\par\\par Module created by Xiphos."
 msgstr ""
 "Štruktúrovaná téma (napr. kázeň). \\par\\par Moduly vytvorený aplikáciou "
 "Xiphos."
 
-#: ../src/main/prayerlists.cc:529
+#: ../src/main/prayerlists.cc:532
 msgid "OutlinedTopic"
 msgstr "StrukturovanaTema"
 
-#: ../src/main/prayerlists.cc:543
+#: ../src/main/prayerlists.cc:546
 msgid "Major Topic A"
 msgstr "Hlavná téma A"
 
-#: ../src/main/prayerlists.cc:544
+#: ../src/main/prayerlists.cc:547
 msgid "<b>Major Topic A</b><br>"
 msgstr "<b>Hlavná téma A</b><br>"
 
-#: ../src/main/prayerlists.cc:546
+#: ../src/main/prayerlists.cc:549
 msgid "Major Topic B"
 msgstr "Hlavná téma B"
 
-#: ../src/main/prayerlists.cc:547
+#: ../src/main/prayerlists.cc:550
 msgid "<b>Major Topic B</b><br>"
 msgstr "<b>Hlavná téma B</b><br>"
 
-#: ../src/main/prayerlists.cc:549
+#: ../src/main/prayerlists.cc:552
 msgid "Major Topic C"
 msgstr "Hlavná téma C"
 
-#: ../src/main/prayerlists.cc:550
+#: ../src/main/prayerlists.cc:553
 msgid "<b>Major Topic C</b><br>"
 msgstr "<b>Hlavná téma C</b><br>"
 
-#: ../src/main/previewer.cc:203
+#: ../src/main/previewer.cc:275
 msgid "User Annotation"
 msgstr "Používateľov komentár"
 
-#: ../src/main/search_dialog.cc:129
+#: ../src/main/search_dialog.cc:212
 #, c-format
 msgid "Search result %s: %s"
 msgstr "Výsledky hľadania %s: %s"
 
-#: ../src/main/search_dialog.cc:361
+#: ../src/main/search_dialog.cc:444
 msgid "Delete Range?"
 msgstr "Odstrániť rozsah?"
 
-#: ../src/main/search_dialog.cc:362
+#: ../src/main/search_dialog.cc:445
 msgid "Are you sure you want to delete this range?"
 msgstr "Ste si istý, že chcete zmazať tento rozsah?"
 
-#: ../src/main/search_dialog.cc:576 ../src/main/search_dialog.cc:1047
-#: ../src/main/search_dialog.cc:1050 ../src/main/search_dialog.cc:1072
-#: ../src/main/search_dialog.cc:1075
+#: ../src/main/search_dialog.cc:659 ../src/main/search_dialog.cc:1130
+#: ../src/main/search_dialog.cc:1133 ../src/main/search_dialog.cc:1155
+#: ../src/main/search_dialog.cc:1158
 msgid "Search: "
 msgstr "Hľadať: "
 
-#: ../src/main/search_dialog.cc:621
+#: ../src/main/search_dialog.cc:704
 msgid "Remove Module?"
 msgstr "Odstrániť modul?"
 
-#: ../src/main/search_dialog.cc:622
+#: ../src/main/search_dialog.cc:705
 msgid "Are you sure you want to remove the selected module?"
 msgstr "Ste si istý, že chcete odstrániť zvolený modul?"
 
-#: ../src/main/search_dialog.cc:1471
+#: ../src/main/search_dialog.cc:1560
 #, c-format
 msgid ""
 "%s:\n"
@@ -1686,16 +1731,16 @@ msgstr ""
 "Taký modul nie je nainštalovaný.\n"
 "%s"
 
-#: ../src/main/search_dialog.cc:1473
+#: ../src/main/search_dialog.cc:1562
 msgid "Please adjust the module list."
 msgstr "Upravte prosím zoznam modulov."
 
-#: ../src/main/search_dialog.cc:1489
+#: ../src/main/search_dialog.cc:1578
 #, c-format
 msgid "No fast-search index exists for %s.%s%s"
 msgstr "Neexistuje index rýchleho hľadania pre %s.%s%s"
 
-#: ../src/main/search_dialog.cc:1491
+#: ../src/main/search_dialog.cc:1580
 msgid ""
 "\n"
 "Search on this module is now `multi word'."
@@ -1703,7 +1748,7 @@ msgstr ""
 "\n"
 "Hľadanie v module je teraz 'viacslovné'."
 
-#: ../src/main/search_dialog.cc:1492
+#: ../src/main/search_dialog.cc:1581
 msgid ""
 "\n"
 "See the Module Manager, Maintenance pane."
@@ -1711,15 +1756,15 @@ msgstr ""
 "\n"
 "Pozrite Správcu modulov, časť Údržba."
 
-#: ../src/main/search_dialog.cc:1553
+#: ../src/main/search_dialog.cc:1644
 msgid "Search finished"
 msgstr "Hľadanie skončilo"
 
-#: ../src/main/search_sidebar.cc:93
+#: ../src/main/search_sidebar.cc:100
 msgid "matches"
 msgstr "výsledky"
 
-#: ../src/main/settings.c:56
+#: ../src/main/settings.c:60
 msgid ""
 "Welcome to Xiphos.\n"
 "\n"
@@ -1756,28 +1801,11 @@ msgstr ""
 "\n"
 "Môže Xiphos spustiť Správcu modulov, aby ste mohli nainštalovať Bibliu?"
 
-#: ../src/main/settings.c:109
+#: ../src/main/settings.c:105
 msgid "$HOME is not set!"
 msgstr "$HOME nie je nastavené!"
 
-#: ../src/main/settings.c:124
-msgid "Xiphos has renamed .xiphos-2.0 to .xiphos"
-msgstr "Xiphos premenoval .xiphos-2.0 na .xiphos"
-
-#: ../src/main/settings.c:127
-#, c-format
-msgid ""
-"Xiphos can not rename  .xiphos-2.0 to .xiphos:\n"
-"%s\n"
-"\n"
-"Xiphos cannot continue."
-msgstr ""
-"Xiphos nemohol premenovať .xiphos-2.0 na .xiphos:\n"
-"%s\n"
-"\n"
-"Xiphos nemôže pokračovať."
-
-#: ../src/main/settings.c:135
+#: ../src/main/settings.c:120
 #, c-format
 msgid ""
 "Xiphos can not create  .xiphos:\n"
@@ -1790,12 +1818,12 @@ msgstr ""
 "\n"
 "Xiphos nemôže pokračovať."
 
-#: ../src/main/settings.c:148 ../src/main/settings.c:156
-#: ../src/main/settings.c:164
+#: ../src/main/settings.c:133 ../src/main/settings.c:142
+#: ../src/main/settings.c:151
 msgid "can not create "
 msgstr "nemôžem vytvoriť "
 
-#: ../src/main/settings.c:196
+#: ../src/main/settings.c:194
 msgid ""
 "There are still no Bibles installed.\n"
 "Evidently, you declined to install any.\n"
@@ -1811,11 +1839,11 @@ msgstr ""
 "Xiphos nemôže pokračovať,\n"
 "a preto sa ukončí."
 
-#: ../src/main/settings.c:200
+#: ../src/main/settings.c:198
 msgid "Bible module installation complete."
 msgstr "Inštalácia Biblie bola dokončená."
 
-#: ../src/main/settings.c:203
+#: ../src/main/settings.c:201
 msgid ""
 "Without any Bible modules to display,\n"
 "Xiphos cannot proceed,\n"
@@ -1825,75 +1853,15 @@ msgstr ""
 "Xiphos nemôže pokračovať,\n"
 "a preto sa ukončí."
 
-#. *****************************************************************************
-#. * Name
-#. *    gconf_setup
-#. *
-#. * Synopsis
-#. *   #include "main/settings.h"
-#. *
-#. *   void gconf_setup()
-#. *
-#. * Description
-#. *   verifies and initializes the GConf subsystem, so that "sword://" and
-#. *   similar can be handled by url-comprehending programs such as browsers.
-#. *   dialogs for permission/success/failure => conditional on debug build.
-#. *
-#. * Return value
-#. *   void
-#.
-#: ../src/main/settings.c:794
-msgid ""
-"URL references using \"sword://\" (similar to web page\n"
-"references) can be used by programs to look up\n"
-"scripture references. Your system currently has no\n"
-"program set to handle these references.\n"
-"\n"
-"Would you like Xiphos to set itself as the\n"
-"program to handle these references?"
-msgstr ""
-"URL odkazy používajúce  \"sword://\" (podobné odkazom\n"
-"na web stránky) môžu aplikácie využívať na prezeranie\n"
-"odkazov do Biblie. Vo vašom systéme nie je nastavený\n"
-"program, ktorý by ich vedel spracovať.\n"
-"\n"
-"Prajete si nastaviť Xiphos, aby sa stal programom\n"
-"na spracovanie takýchto odkazov?"
-
-#: ../src/main/settings.c:796
-msgid ""
-"Xiphos has successfully set itself\n"
-"as the handler of sword:// and bible:// URLs.\n"
-"\n"
-"You may wish to run the program \"gconf-editor\"\n"
-"to examine keys under /desktop/gnome/url-handlers,\n"
-"if you need to change these."
-msgstr ""
-"Xiphos sa úspešne nastavil\n"
-"ako spracovateľ sword:// a bible:// URL.\n"
-"\n"
-"Ak ich potrebujete zmeniť, tak spustite program\n"
-"\"gconf-editor\" a preskúmajte kľúče umiestnené\n"
-"v /desktop/gnome/url-handlers."
-
-#: ../src/main/settings.c:849
-#, c-format
-msgid ""
-"Xiphos failed to complete handler init for key #%d:\n"
-"%s"
-msgstr ""
-"Xiphos zlyhal pre nastavení obsluhy pre kľúč #%d:\n"
-"%s"
-
-#: ../src/main/sidebar.cc:376
+#: ../src/main/sidebar.cc:399
 msgid "verse"
 msgstr "verš"
 
-#: ../src/main/sidebar.cc:438
+#: ../src/main/sidebar.cc:461
 msgid "chapter"
 msgstr "kapitola"
 
-#: ../src/main/sword.cc:546
+#: ../src/main/sword.cc:537
 msgid ""
 "Xiphos's file for language\n"
 "abbreviations is missing."
@@ -1901,7 +1869,7 @@ msgstr ""
 "Chýba súbor jazykových\n"
 "skratiek pre Xiphos."
 
-#: ../src/main/sword.cc:553
+#: ../src/main/sword.cc:544
 msgid ""
 "Xiphos's language abbreviation\n"
 "file cannot be opened."
@@ -1909,7 +1877,7 @@ msgstr ""
 "Nie je možné otvoriť Xiphos\n"
 "súbor so skratkami jazykov."
 
-#: ../src/main/sword.cc:566
+#: ../src/main/sword.cc:557
 msgid ""
 "Xiphos cannot allocate space\n"
 "for language abbreviations."
@@ -1917,7 +1885,7 @@ msgstr ""
 "Xiphos nemôže alokovať miesto\n"
 "Pre jazykové skratky."
 
-#: ../src/main/sword.cc:573
+#: ../src/main/sword.cc:564
 msgid ""
 "Xiphos cannot read the\n"
 "language abbreviation file."
@@ -1925,36 +1893,36 @@ msgstr ""
 "Xiphos nevie prečítať\n"
 "súbor s jazykovými skratkami."
 
-#: ../src/main/sword.cc:1191
-msgid "Daily devotional was requested, but there are none installed."
-msgstr "Požaduje sa Denné zamyslenie, ale žiadne nebolo nainštalované."
+#: ../src/main/sword.cc:642
+msgid "No matching locale found for"
+msgstr ""
 
-#: ../src/main/tab_history.c:92
-msgid "H_istory/<Separator>"
-msgstr "H_istória/<Separator>"
+#: ../src/main/sword.cc:644
+msgid "Book names and menus may not be translated"
+msgstr ""
 
-#: ../src/main/tab_history.c:94
-msgid "H_istory/C_lear"
-msgstr "História/Vy_mazať"
+#: ../src/main/sword.cc:1232
+msgid "Daily devotional was requested, but there are none installed."
+msgstr "Požaduje sa Denné zamyslenie, ale žiadne nebolo nainštalované."
 
 #: ../src/main/tab_history.c:219
 msgid "Clear History"
 msgstr "Zmazať históriu"
 
-#: ../src/main/url.cc:99
+#: ../src/main/url.cc:101
 msgid "URL not found:"
 msgstr "URL nebola nájdená:"
 
-#: ../src/main/url.cc:194
+#: ../src/main/url.cc:191
 #, c-format
 msgid "Xiphos could not execute %s"
 msgstr "Xiphos nemôže spustiť %s"
 
-#: ../src/main/url.cc:202
+#: ../src/main/url.cc:199
 msgid "Viewer error:\n"
 msgstr "Chyba prehliadača:\n"
 
-#: ../src/main/url.cc:278
+#: ../src/main/url.cc:272
 #, c-format
 msgid "Show %s in main window"
 msgstr "Zobraziť %s v hlavnom okne"
@@ -1992,13 +1960,13 @@ msgstr "Čo je evanjelium?"
 msgid "1 Cor 15:1-4"
 msgstr "1 Kor 15:1-4"
 
-#: ../src/main/xml.c:413 ../src/main/xml.c:1071
+#: ../src/main/xml.c:413 ../src/main/xml.c:1144
 #, c-format
 msgid "Document not parsed successfully. \n"
-msgstr "Dokument nebol úspešne spracovaný.\n"
+msgstr "Dokument nebol úspešne spracovaný. \n"
 
-#: ../src/main/xml.c:419 ../src/main/xml.c:674 ../src/main/xml.c:952
-#: ../src/main/xml.c:1131
+#: ../src/main/xml.c:419 ../src/main/xml.c:747 ../src/main/xml.c:1025
+#: ../src/main/xml.c:1204
 #, c-format
 msgid "empty document \n"
 msgstr "prázdny dokument \n"
@@ -2028,7 +1996,7 @@ msgstr "Mat - Zjv"
 msgid "Sample Module List"
 msgstr "Ukážka zoznamu modulov"
 
-#: ../src/main/xml.c:680 ../src/main/xml.c:958
+#: ../src/main/xml.c:753 ../src/main/xml.c:1031
 #, c-format
 msgid "wrong type, root node != %s\n"
 msgstr "zlý typ, koreňový uzol != %s\n"
@@ -2074,7 +2042,7 @@ msgid "New ..."
 msgstr "Nový..."
 
 #: ../ui/bookmarks.glade.h:11 ../ui/markverse.glade.h:8
-#: ../ui/xi-menus.glade.h:42
+#: ../ui/xi-menus.glade.h:56
 msgid "New Folder"
 msgstr "Nový priečinok"
 
@@ -2212,7 +2180,7 @@ msgstr "Výberové pole Kniha"
 msgid "Chapter Radio Button"
 msgstr "Výberové pole Kapitola"
 
-#: ../ui/export-dialog.glade.h:9 ../ui/xi-menus.glade.h:14
+#: ../ui/export-dialog.glade.h:9 ../ui/xi-menus.glade.h:18
 msgid "Copy/Export Passage"
 msgstr "Kopírovať/Exportovať pasáž"
 
@@ -2320,7 +2288,7 @@ msgid ""
 "detection you should NOT use  the remote installation feature! "
 msgstr ""
 "<b>Varovanie:</b> Ak žije v krajine, kde je prenasledovanie, a nechcete "
-"riskovať odhalenie, tak by ste nemali použiť možnosť vzdialenej inštalácie!"
+"riskovať odhalenie, tak by ste nemali použiť možnosť vzdialenej inštalácie! "
 
 #: ../ui/module-manager.glade.h:9
 msgid "<i>Personal area, for your use only:</i>"
@@ -2330,43 +2298,47 @@ msgstr "<i>Osobná oblasť, iba pre vaše použitie:</i>"
 msgid "<i>System area, for all users:</i>"
 msgstr "<i>Systémová oblasť, pre všetkých používateľov:</i>"
 
-#: ../ui/module-manager.glade.h:11
+#: ../ui/module-manager.glade.h:12
 msgid "Continue"
 msgstr "Pokračovať"
 
-#: ../ui/module-manager.glade.h:12
+#: ../ui/module-manager.glade.h:13
 msgid "Current Remote Sources"
 msgstr "Aktuálne vzdialené zdroje"
 
-#: ../ui/module-manager.glade.h:13
+#: ../ui/module-manager.glade.h:14
 msgid "Current local sources"
 msgstr "Aktuálne lokálne zdroje"
 
-#: ../ui/module-manager.glade.h:14
+#: ../ui/module-manager.glade.h:15
+msgid "Delete Index"
+msgstr ""
+
+#: ../ui/module-manager.glade.h:16
 msgid "Home dir"
 msgstr "Domovský priečinok"
 
-#: ../ui/module-manager.glade.h:16
+#: ../ui/module-manager.glade.h:19
 msgid "Load Standard"
 msgstr "Načítať štandardné"
 
-#: ../ui/module-manager.glade.h:17
+#: ../ui/module-manager.glade.h:20
 msgid "Local"
 msgstr "Lokálne"
 
-#: ../ui/module-manager.glade.h:18
+#: ../ui/module-manager.glade.h:21
 msgid "Local Install Folder"
 msgstr "Lokálny inštalačný priečinok"
 
-#: ../ui/module-manager.glade.h:19
+#: ../ui/module-manager.glade.h:22
 msgid "Module Manager"
 msgstr "Správca modulov"
 
-#: ../ui/module-manager.glade.h:20
+#: ../ui/module-manager.glade.h:23
 msgid "Remote"
 msgstr "Vzdialené"
 
-#: ../ui/module-manager.glade.h:21
+#: ../ui/module-manager.glade.h:24
 msgid "Sword sys dir"
 msgstr "Sword systémový priečinok"
 
@@ -2516,7 +2488,7 @@ msgstr "Roletové menu Osobné poznámky"
 
 #: ../ui/prefs.glade.h:32
 msgid "Choose to enable Prayer lists "
-msgstr "Vyberte pre povolenie modlitebných zoznamov."
+msgstr "Vyberte pre povolenie modlitebných zoznamov. "
 
 #: ../ui/prefs.glade.h:34
 msgid "Commentaries Checkbox"
@@ -2707,40 +2679,52 @@ msgid "Show splash screen at start up"
 msgstr "Zobraziť pri spustení úvodný obrázok"
 
 #: ../ui/prefs.glade.h:84
+msgid "Special Locale (requires restart)"
+msgstr ""
+
+#: ../ui/prefs.glade.h:85
+msgid "Special Locale Combo"
+msgstr ""
+
+#: ../ui/prefs.glade.h:86
 msgid "StudyPad default directory combo"
 msgstr "Roletové menu Štandardný priečinok pre poznámkový blok"
 
-#: ../ui/prefs.glade.h:86
+#: ../ui/prefs.glade.h:88
 msgid "Use Bible Text scroll bar to scroll to previous or next chapter"
 msgstr ""
 "Použiť posuvnú lištu v Biblických textoch na presun do predchádzajúcej alebo "
 "nasledujúcej kapitoly"
 
-#: ../ui/prefs.glade.h:87
+#: ../ui/prefs.glade.h:89
 msgid "Use Verse Per Line"
 msgstr "Zobraziť verš v samostatnom riadku"
 
-#: ../ui/prefs.glade.h:88
+#: ../ui/prefs.glade.h:90
 msgid "Use Verse Per Line Checkbox"
 msgstr "Zaškrtávacie pole Zobraziť verš v samostatnom riadku"
 
-#: ../ui/prefs.glade.h:89
+#: ../ui/prefs.glade.h:91
 msgid "Use default Dictionary"
 msgstr "Použiť štandardný slovník"
 
-#: ../ui/prefs.glade.h:90
+#: ../ui/prefs.glade.h:92
 msgid "Use default Dictionary Checkbox"
 msgstr "Zaškrtávacie pole Použiť štandardný slovník"
 
-#: ../ui/prefs.glade.h:91
+#: ../ui/prefs.glade.h:93
 msgid "Use tabbed browsing"
 msgstr "Použiť prezeranie v kartách"
 
-#: ../ui/prefs.glade.h:92
+#: ../ui/prefs.glade.h:94
 msgid "Use tabbed browsing Checkbox"
 msgstr "Zaškrtávacie políčko Použiť prezeranie v kartách"
 
-#: ../ui/prefs.glade.h:93
+#: ../ui/prefs.glade.h:95
+msgid "Verse Number"
+msgstr ""
+
+#: ../ui/prefs.glade.h:96
 msgid "Verse number size"
 msgstr "Veľkosť čísla verša"
 
@@ -2921,6 +2905,14 @@ msgid "Exact phrase radiobutton"
 msgstr "Výberové pole Presná fráza"
 
 #: ../ui/search-dialog.glade.h:46
+msgid "Export"
+msgstr ""
+
+#: ../ui/search-dialog.glade.h:47
+msgid "Export current search results"
+msgstr ""
+
+#: ../ui/search-dialog.glade.h:48
 msgid ""
 "Fast, featureful, index-based search\n"
 "Indexes must have been built beforehand:\n"
@@ -2930,227 +2922,227 @@ msgstr ""
 "Indexy musia byť vopred vytvorené:\n"
 "Pozrite si funkcie Údržby v Správcovi modulov"
 
-#: ../ui/search-dialog.glade.h:49
+#: ../ui/search-dialog.glade.h:51
 msgid "Find Button"
 msgstr "Tlačidlo Hľadať"
 
-#: ../ui/search-dialog.glade.h:51
+#: ../ui/search-dialog.glade.h:53
 msgid "Footnotes radiobutton"
 msgstr "Výberové pole Poznámky pod čiarou"
 
-#: ../ui/search-dialog.glade.h:52
+#: ../ui/search-dialog.glade.h:54
 msgid "In modules that have Footnotes"
 msgstr "V moduloch, ktoré majú poznámky pod čiarou"
 
-#: ../ui/search-dialog.glade.h:53
+#: ../ui/search-dialog.glade.h:55
 msgid "In modules that have Morphological Tags"
 msgstr "V moduloch, ktoré majú morfologické značky"
 
-#: ../ui/search-dialog.glade.h:54
+#: ../ui/search-dialog.glade.h:56
 msgid "In modules that have Strong's Numbers"
 msgstr "V moduloch, ktoré majú Strongové čísla"
 
-#: ../ui/search-dialog.glade.h:55
+#: ../ui/search-dialog.glade.h:57
 msgid "Main Search Entry"
 msgstr "Položka Hlavné hľadanie"
 
-#: ../ui/search-dialog.glade.h:56
+#: ../ui/search-dialog.glade.h:58
 msgid "Make selections on the Attribute Search tab"
 msgstr "Vyberte si v karte Atribúty hľadania"
 
-#: ../ui/search-dialog.glade.h:58
+#: ../ui/search-dialog.glade.h:60
 msgid "Match case checkbox"
 msgstr "Zaškrtávacie pole Veľkosť písmen"
 
-#: ../ui/search-dialog.glade.h:59
+#: ../ui/search-dialog.glade.h:61
 msgid "Module Selection"
 msgstr "Výber modulu"
 
-#: ../ui/search-dialog.glade.h:60
+#: ../ui/search-dialog.glade.h:62
 msgid "Module list"
 msgstr "Zoznam modulov"
 
-#: ../ui/search-dialog.glade.h:61
+#: ../ui/search-dialog.glade.h:63
 msgid "Module list radiobutton"
 msgstr "Výberové pole Zoznam modulov"
 
-#: ../ui/search-dialog.glade.h:63
+#: ../ui/search-dialog.glade.h:65
 msgid "Morphological Tags radiobutton"
 msgstr "Výberové pole Morfologické značky"
 
-#: ../ui/search-dialog.glade.h:65
+#: ../ui/search-dialog.glade.h:67
 msgid "Multi word radiobutton"
 msgstr "Výberové pole Viac slov"
 
-#: ../ui/search-dialog.glade.h:66
+#: ../ui/search-dialog.glade.h:68
 msgid "New Custom Module List Button"
 msgstr "Tlačidlo Nový použ. zoznam modulov"
 
-#: ../ui/search-dialog.glade.h:67
+#: ../ui/search-dialog.glade.h:69
 msgid "New Range Button"
 msgstr "Tlačidlo Nový rozsah"
 
-#: ../ui/search-dialog.glade.h:68
+#: ../ui/search-dialog.glade.h:70
 msgid "Open Selection Dialog Button"
 msgstr "Tlačidlo Otvoriť dialóg výberu"
 
-#: ../ui/search-dialog.glade.h:69
+#: ../ui/search-dialog.glade.h:71
 msgid "Open a dialog to select modules to add to the list"
 msgstr "Otvoriť dialóg pre pridanie vybraných modulov do zoznam"
 
-#: ../ui/search-dialog.glade.h:70
+#: ../ui/search-dialog.glade.h:72
 msgid "Optimized (\"Lucene\")"
 msgstr "Optimalizované (\"Lucene\")"
 
-#: ../ui/search-dialog.glade.h:71
+#: ../ui/search-dialog.glade.h:73
 msgid "Optimized (\"Lucene\") radiobutton"
 msgstr "Výberové pole Optimalizované (\"Lucene\")"
 
-#: ../ui/search-dialog.glade.h:72
+#: ../ui/search-dialog.glade.h:74
 msgid "Range Definition Entry"
 msgstr "Položka Definícia rozsahu"
 
-#: ../ui/search-dialog.glade.h:73
+#: ../ui/search-dialog.glade.h:75
 msgid "Range Name Entry"
 msgstr "Položka Názov rozsahu"
 
-#: ../ui/search-dialog.glade.h:75
+#: ../ui/search-dialog.glade.h:77
 msgid "Regular expression radiobutton"
 msgstr "Výberové pople Regulárny výraz"
 
-#: ../ui/search-dialog.glade.h:76
+#: ../ui/search-dialog.glade.h:78
 msgid "Remove the selected module from the list"
 msgstr "Odstrániť označený modul zo zoznamu"
 
-#: ../ui/search-dialog.glade.h:77
+#: ../ui/search-dialog.glade.h:79
 msgid "Result Summary Table"
 msgstr "Tabuľka Sumárne výsledky"
 
-#: ../ui/search-dialog.glade.h:78
+#: ../ui/search-dialog.glade.h:80
 msgid "Result Summary Window"
 msgstr "Okno Sumárne výsledky"
 
-#: ../ui/search-dialog.glade.h:79
+#: ../ui/search-dialog.glade.h:81
 msgid "Results"
 msgstr "Výsledky"
 
-#: ../ui/search-dialog.glade.h:80
+#: ../ui/search-dialog.glade.h:82
 msgid "Save Custom Module List Button"
 msgstr "Tlačidlo Uložiť použ. zoznam modulov"
 
-#: ../ui/search-dialog.glade.h:81
+#: ../ui/search-dialog.glade.h:83
 msgid "Save Range Button"
 msgstr "Tlačidlo Uložiť rozsah"
 
-#: ../ui/search-dialog.glade.h:82
+#: ../ui/search-dialog.glade.h:84
 msgid "Save custom range"
 msgstr "Uložiť používateľský rozsah"
 
-#: ../ui/search-dialog.glade.h:83
+#: ../ui/search-dialog.glade.h:85
 msgid "Save search results as bookmarks"
 msgstr "Uložiť výsledky hľadania ako záložky"
 
-#: ../ui/search-dialog.glade.h:84
+#: ../ui/search-dialog.glade.h:86
 msgid "Save the module list"
 msgstr "Uložiť zoznam modulov"
 
-#: ../ui/search-dialog.glade.h:85
+#: ../ui/search-dialog.glade.h:87
 msgid "Search  Criteria"
 msgstr "Vyhľadávacie kritériá"
 
-#: ../ui/search-dialog.glade.h:86
+#: ../ui/search-dialog.glade.h:88
 msgid "Search Criteria Treeview"
 msgstr "Stromové zobrazenie Vyhľadávacie kritériá"
 
-#: ../ui/search-dialog.glade.h:87
+#: ../ui/search-dialog.glade.h:89
 msgid "Search entire module"
 msgstr "Prehľadať celý modul"
 
-#: ../ui/search-dialog.glade.h:88
+#: ../ui/search-dialog.glade.h:90
 msgid "Search for Morphological tags"
 msgstr "Hľadať morfologické značky"
 
-#: ../ui/search-dialog.glade.h:89
+#: ../ui/search-dialog.glade.h:91
 msgid "Search for Strongs Numbers like G4442 or H1121"
 msgstr "Hľadať Strongové čísla ako G4442 alebo H1121"
 
-#: ../ui/search-dialog.glade.h:90
+#: ../ui/search-dialog.glade.h:92
 msgid "Search in footnotes"
 msgstr "Hľadať v poznámkach pod čiarou"
 
-#: ../ui/search-dialog.glade.h:91
+#: ../ui/search-dialog.glade.h:93
 msgid "Show Footnotes"
 msgstr "Zobraziť poznámky pod čiarou"
 
-#: ../ui/search-dialog.glade.h:92
+#: ../ui/search-dialog.glade.h:94
 msgid "Show Footnotes checkbox"
 msgstr "Zaškrtávacie pole Zobraziť poznámky pod čiarou"
 
-#: ../ui/search-dialog.glade.h:93
+#: ../ui/search-dialog.glade.h:95
 msgid "Show Morphological Tags"
 msgstr "Zobraziť morfologické značky"
 
-#: ../ui/search-dialog.glade.h:94
+#: ../ui/search-dialog.glade.h:96
 msgid "Show Morphological Tags checkbox"
 msgstr "Zaškrtávacie pole Zobraziť morfologické značky"
 
-#: ../ui/search-dialog.glade.h:95
+#: ../ui/search-dialog.glade.h:97
 msgid "Show Strong's Numbers"
 msgstr "Zobraziť Strongové čísla"
 
-#: ../ui/search-dialog.glade.h:96
+#: ../ui/search-dialog.glade.h:98
 msgid "Show Strong's Numbers checkbox"
 msgstr "Zaškrtávacie pole Zobraziť Strongové čísla"
 
-#: ../ui/search-dialog.glade.h:97
+#: ../ui/search-dialog.glade.h:99
 msgid "Show in main window"
 msgstr "Zobraziť v hlavnom okne"
 
-#: ../ui/search-dialog.glade.h:98
+#: ../ui/search-dialog.glade.h:100
 msgid "Single module"
 msgstr "Jeden modul"
 
-#: ../ui/search-dialog.glade.h:99
+#: ../ui/search-dialog.glade.h:101
 msgid "Single module radiobutton"
 msgstr "Výberové pole Jeden modul"
 
-#: ../ui/search-dialog.glade.h:100
+#: ../ui/search-dialog.glade.h:102
 msgid "Start/stop searching"
 msgstr "Spustiť/Zastaviť hľadanie"
 
-#: ../ui/search-dialog.glade.h:101
+#: ../ui/search-dialog.glade.h:103
 msgid "Strongs Numbers"
 msgstr "Strongové čísla"
 
-#: ../ui/search-dialog.glade.h:102
+#: ../ui/search-dialog.glade.h:104
 msgid "Strongs Numbers radiobutton"
 msgstr "Výberové pole Strongové čísla"
 
-#: ../ui/search-dialog.glade.h:103
+#: ../ui/search-dialog.glade.h:105
 msgid "Use a custom module list for the search"
 msgstr "Použiť používateľský zoznam modulov pre vyhľadávanie"
 
-#: ../ui/search-dialog.glade.h:104
+#: ../ui/search-dialog.glade.h:106
 msgid "Use a custom range for the scope of the search"
 msgstr "Použiť používateľský záber pre vyhľadávanie"
 
-#: ../ui/search-dialog.glade.h:105
+#: ../ui/search-dialog.glade.h:107
 msgid "Use a single module for the search"
 msgstr "Použiť jeden modul pre hľadanie"
 
-#: ../ui/search-dialog.glade.h:106
+#: ../ui/search-dialog.glade.h:108
 msgid "Use the current module list for the search"
 msgstr "Použiť aktuálny zoznam modulov pre hľadanie"
 
-#: ../ui/search-dialog.glade.h:107
+#: ../ui/search-dialog.glade.h:109
 msgid "Use the results of the last search as the scope of the search"
 msgstr "Použiť výsledky posledného hľadania ako záber pre hľadanie"
 
-#: ../ui/search-dialog.glade.h:108
+#: ../ui/search-dialog.glade.h:110
 msgid "e.g. Matt-John;Rev4"
 msgstr "napr. Mat-Ján;Zjv4"
 
-#: ../ui/search-dialog.glade.h:109
+#: ../ui/search-dialog.glade.h:111
 msgid "for "
 msgstr "na "
 
@@ -3163,302 +3155,384 @@ msgid "About _Xiphos"
 msgstr "O aplikácií _Xiphos"
 
 #: ../ui/xi-menus.glade.h:4
+msgid "Add Item"
+msgstr ""
+
+#: ../ui/xi-menus.glade.h:5
+msgid "Add Sub-Item"
+msgstr ""
+
+#: ../ui/xi-menus.glade.h:6
+msgid "Add a sub-item"
+msgstr ""
+
+#: ../ui/xi-menus.glade.h:7
+msgid "Add an item"
+msgstr "Pridať položku"
+
+#: ../ui/xi-menus.glade.h:8
 msgid "Add new folder to selected folder"
 msgstr "Pridať nový priečinok do vybraného priečinku"
 
-#: ../ui/xi-menus.glade.h:6
+#: ../ui/xi-menus.glade.h:10
 msgid "Allow Reordering"
 msgstr "Povoliť preusporiadanie"
 
-#: ../ui/xi-menus.glade.h:7
+#: ../ui/xi-menus.glade.h:11
 msgid "Allow items to be moved from one folder to another"
 msgstr "Povoliť presun položiek z jedného priečinku do druhého"
 
-#: ../ui/xi-menus.glade.h:8
+#: ../ui/xi-menus.glade.h:12
 msgid "Annotate Verse"
 msgstr "Anotovať verš"
 
-#: ../ui/xi-menus.glade.h:10
+#: ../ui/xi-menus.glade.h:14
 msgid "Browse in BibleMap.org"
 msgstr "Prezerať v BibleMap.org"
 
-#: ../ui/xi-menus.glade.h:11
+#: ../ui/xi-menus.glade.h:15
 msgid "Collapse All"
 msgstr "Zbaliť všetko"
 
-#: ../ui/xi-menus.glade.h:12
+#: ../ui/xi-menus.glade.h:16
 msgid "Collapse all Bookmarks groups"
 msgstr "Zbaliť všetky skupiny záložiek"
 
-#: ../ui/xi-menus.glade.h:13
+#: ../ui/xi-menus.glade.h:17
 msgid "Commentary by Chapter"
 msgstr "Komentár podľa kapitoly"
 
-#: ../ui/xi-menus.glade.h:15
+#: ../ui/xi-menus.glade.h:19
+msgid "Create a new daily journal"
+msgstr ""
+
+#: ../ui/xi-menus.glade.h:20
+msgid "Create a new monthly journal"
+msgstr ""
+
+#: ../ui/xi-menus.glade.h:21
+msgid "Create a new outlined topic"
+msgstr ""
+
+#: ../ui/xi-menus.glade.h:22
+msgid "Create a new simple prayer list"
+msgstr "Vytvoriť nový jednoduchý modlitebný zoznam"
+
+#: ../ui/xi-menus.glade.h:23
+msgid "Create a new subject prayer list"
+msgstr ""
+
+#: ../ui/xi-menus.glade.h:24
 msgid "D_ouble-Space Text"
 msgstr "Dv_ojité riadkovanie textu"
 
-#: ../ui/xi-menus.glade.h:16
+#: ../ui/xi-menus.glade.h:25
+msgid "Daily"
+msgstr ""
+
+#: ../ui/xi-menus.glade.h:26
 msgid "Delete Item"
 msgstr "Zmazať položku"
 
-#: ../ui/xi-menus.glade.h:17
+#: ../ui/xi-menus.glade.h:27
 msgid "Delete item"
 msgstr "Zmazať položku"
 
-#: ../ui/xi-menus.glade.h:18
+#: ../ui/xi-menus.glade.h:28
 msgid "Dictionar_y"
 msgstr "S_lovník"
 
-#: ../ui/xi-menus.glade.h:19
+#: ../ui/xi-menus.glade.h:29
 msgid "Display Book Heading"
 msgstr "Zobraziť nadpis knihy"
 
-#: ../ui/xi-menus.glade.h:20
+#: ../ui/xi-menus.glade.h:30
 msgid "Display Chapter Heading"
 msgstr "Zobraziť nadpis kapitoly"
 
-#: ../ui/xi-menus.glade.h:21
+#: ../ui/xi-menus.glade.h:31
 msgid "Dump Pers.Comm."
 msgstr "Exportovať osobné komentáre"
 
-#: ../ui/xi-menus.glade.h:23
+#: ../ui/xi-menus.glade.h:33
 msgid "Edit bookmark item"
 msgstr "Upraviť položku záložky"
 
-#: ../ui/xi-menus.glade.h:24
+#: ../ui/xi-menus.glade.h:34
+msgid "Edit this item"
+msgstr "Upraviť túto položku"
+
+#: ../ui/xi-menus.glade.h:35
 msgid "Expand All"
 msgstr "Všetko rozbaliť"
 
-#: ../ui/xi-menus.glade.h:25
+#: ../ui/xi-menus.glade.h:36
 msgid "Expand all Bookmarks groups"
 msgstr "Rozbaliť všetky skupiny záložiek"
 
-#: ../ui/xi-menus.glade.h:32
+#: ../ui/xi-menus.glade.h:37
+msgid "Export Folder"
+msgstr ""
+
+#: ../ui/xi-menus.glade.h:38
+msgid "Export List"
+msgstr ""
+
+#: ../ui/xi-menus.glade.h:45
 msgid "Image Content"
 msgstr "Obsah obrázka"
 
-#: ../ui/xi-menus.glade.h:33
+#: ../ui/xi-menus.glade.h:46
 msgid "Import Bibletime Bookmarks"
 msgstr "Importovať Bibletime záložky"
 
-#: ../ui/xi-menus.glade.h:34
+#: ../ui/xi-menus.glade.h:47
 msgid "Insert Bookmark"
 msgstr "Vložiť záložku"
 
-#: ../ui/xi-menus.glade.h:35
+#: ../ui/xi-menus.glade.h:48
 msgid "Insert new bookmark here"
 msgstr "Sem vložiť novú záložku"
 
-#: ../ui/xi-menus.glade.h:36
+#: ../ui/xi-menus.glade.h:49
 msgid "L_ink Tabs"
 msgstr "Prepoj_iť karty"
 
-#: ../ui/xi-menus.glade.h:38
+#: ../ui/xi-menus.glade.h:51
 msgid "Load Bookmarks from Bibletime"
 msgstr "Načítať záložky z Bibletime"
 
-#: ../ui/xi-menus.glade.h:39
+#: ../ui/xi-menus.glade.h:52
 msgid "Lookup Selection"
 msgstr "Hľadať výber"
 
-#: ../ui/xi-menus.glade.h:43
+#: ../ui/xi-menus.glade.h:54
+msgid "Monthly"
+msgstr "Mesačný denník"
+
+#: ../ui/xi-menus.glade.h:57
 msgid "Note"
 msgstr "Poznámka"
 
-#: ../ui/xi-menus.glade.h:44
+#: ../ui/xi-menus.glade.h:58
 msgid "Open Module"
 msgstr "Otvoriť modul"
 
-#: ../ui/xi-menus.glade.h:45
+#: ../ui/xi-menus.glade.h:59
 msgid "Open Study_pad"
 msgstr "Otvoriť _poznámkový blok"
 
-#: ../ui/xi-menus.glade.h:46
+#: ../ui/xi-menus.glade.h:60
 msgid "Open in a dialog"
 msgstr "Otvoriť v dialógu"
 
-#: ../ui/xi-menus.glade.h:48
+#: ../ui/xi-menus.glade.h:61
+msgid "Open in a separate window"
+msgstr "Otvoriť v samostatnom okne"
+
+#: ../ui/xi-menus.glade.h:62
+msgid "Open in editor"
+msgstr "Otvoriť v editore"
+
+#: ../ui/xi-menus.glade.h:63
 msgid "Open in new tab"
 msgstr "Otvoriť v novej karte"
 
-#: ../ui/xi-menus.glade.h:49
+#: ../ui/xi-menus.glade.h:64
+msgid ""
+"Open selected module in a\n"
+"\tseparate ['dialog'] window"
+msgstr ""
+
+#: ../ui/xi-menus.glade.h:66
+msgid "Open selected module in a new tab"
+msgstr "Otvorí označený modul v novej karte"
+
+#: ../ui/xi-menus.glade.h:67
 msgid "Open this bookmark in a dialog"
 msgstr "Otvoriť túto záložku v dialógu"
 
-#: ../ui/xi-menus.glade.h:50
+#: ../ui/xi-menus.glade.h:68
 msgid "Open this bookmark in a new tab"
 msgstr "Otvoriť túto záložku v novej karte"
 
-#: ../ui/xi-menus.glade.h:52
+#: ../ui/xi-menus.glade.h:69
+msgid "Outlined"
+msgstr ""
+
+#: ../ui/xi-menus.glade.h:71
 msgid "Read Selection Aloud"
 msgstr "Prečítať nahlas označené"
 
-#: ../ui/xi-menus.glade.h:53
-msgid "Remove - Restore"
-msgstr "Odstrániť - Obnoviť"
-
-#: ../ui/xi-menus.glade.h:54
-msgid "Remove Folder"
-msgstr "Odstrániť priečinok"
-
-#: ../ui/xi-menus.glade.h:55
+#: ../ui/xi-menus.glade.h:73
 msgid "Remove folder and save it"
 msgstr "Odstrániť priečinok a uložiť ho"
 
-#: ../ui/xi-menus.glade.h:56
+#: ../ui/xi-menus.glade.h:74
+msgid "Remove this item"
+msgstr "Odstrániť túto položku"
+
+#: ../ui/xi-menus.glade.h:75
 msgid "Rename Pers.Comm."
 msgstr "Premenovať Osobné komentáre"
 
-#: ../ui/xi-menus.glade.h:57
+#: ../ui/xi-menus.glade.h:76
 msgid "Respect Font Faces"
 msgstr "Rešpektovať písma"
 
-#: ../ui/xi-menus.glade.h:58
+#: ../ui/xi-menus.glade.h:77
 msgid "Restore Folder"
 msgstr "Obnoviť priečinok"
 
-#: ../ui/xi-menus.glade.h:59
+#: ../ui/xi-menus.glade.h:78
 msgid "Restore saved folder"
 msgstr "Obnoviť uložený priečinok"
 
-#: ../ui/xi-menus.glade.h:60
+#: ../ui/xi-menus.glade.h:79
 msgid "Save list as a series of bookmarks"
 msgstr "Uložiť zoznam ako sériu záložiek"
 
-#: ../ui/xi-menus.glade.h:61
+#: ../ui/xi-menus.glade.h:80
 msgid "Save list as a single bookmark"
 msgstr "Uložiť zoznam ako jednu záložku"
 
-#: ../ui/xi-menus.glade.h:62
+#: ../ui/xi-menus.glade.h:81
 msgid "Save these results as a series of bookmarks in their own folder"
 msgstr "Uložiť tieto výsledky ako sériu záložiek v ich vlastnom priečinku"
 
-#: ../ui/xi-menus.glade.h:63
+#: ../ui/xi-menus.glade.h:82
 msgid "Save these results as a single bookmark"
 msgstr "Uložiť tieto výsledky ako jednu záložku"
 
-#: ../ui/xi-menus.glade.h:64
+#: ../ui/xi-menus.glade.h:83
 msgid "Scripture Cross-references"
 msgstr "Krížové referencie Písma"
 
-#: ../ui/xi-menus.glade.h:66
+#: ../ui/xi-menus.glade.h:85
 msgid "Show Parallel View in a _Tab"
 msgstr "Zobraziť paralelné zobrazenie v kar_te"
 
-#: ../ui/xi-menus.glade.h:67
+#: ../ui/xi-menus.glade.h:86
 msgid "Show Previe_wer in the Sidebar"
 msgstr "Zobraziť náhľad v bočnom panely"
 
-#: ../ui/xi-menus.glade.h:68
+#: ../ui/xi-menus.glade.h:87
 msgid "Show Verse _Numbers"
 msgstr "Zobraziť čísla veršov"
 
-#: ../ui/xi-menus.glade.h:71
+#: ../ui/xi-menus.glade.h:88
+msgid "Simple"
+msgstr "Jednoduchý zoznam"
+
+#: ../ui/xi-menus.glade.h:90
+msgid "Subject"
+msgstr "Predmet"
+
+#: ../ui/xi-menus.glade.h:92
 msgid "Unlock This Module"
 msgstr "Odomknúť tento modul"
 
-#: ../ui/xi-menus.glade.h:72
+#: ../ui/xi-menus.glade.h:93
 msgid "Use Current Dictionary"
 msgstr "Použiť štandardný slovník"
 
-#: ../ui/xi-menus.glade.h:73
+#: ../ui/xi-menus.glade.h:94
 msgid "Use module manager to install and remove Sword modules"
 msgstr "Použite správcu modulov na inštaláciu a odstránenie Sword modulov"
 
-#: ../ui/xi-menus.glade.h:74
+#: ../ui/xi-menus.glade.h:95
 msgid "Variants"
 msgstr "Varianty"
 
-#: ../ui/xi-menus.glade.h:76
+#: ../ui/xi-menus.glade.h:97
 msgid "_About The SWORD Project"
 msgstr "_O projekt The SWORD Project"
 
-#: ../ui/xi-menus.glade.h:77
+#: ../ui/xi-menus.glade.h:98
 msgid "_Advanced Search"
 msgstr "_Pokročilé vyhľadávanie"
 
-#: ../ui/xi-menus.glade.h:78
+#: ../ui/xi-menus.glade.h:99
 msgid "_Attach/Detach Sidebar"
 msgstr "_Pripojiť/Odpojiť bočný panel"
 
-#: ../ui/xi-menus.glade.h:79
+#: ../ui/xi-menus.glade.h:100
 msgid "_Bible"
 msgstr "_Biblia"
 
-#: ../ui/xi-menus.glade.h:80
+#: ../ui/xi-menus.glade.h:101
 msgid "_Commentary/Book"
 msgstr "_Komentár/Kniha"
 
-#: ../ui/xi-menus.glade.h:81
+#: ../ui/xi-menus.glade.h:102
 msgid "_Contents"
 msgstr "_Obsah"
 
-#: ../ui/xi-menus.glade.h:82
+#: ../ui/xi-menus.glade.h:103
 msgid "_Daily Devotion"
 msgstr "_Denne zamyslenie"
 
-#: ../ui/xi-menus.glade.h:83
+#: ../ui/xi-menus.glade.h:104
 msgid "_Edit"
 msgstr "_Upraviť"
 
-#: ../ui/xi-menus.glade.h:84
+#: ../ui/xi-menus.glade.h:105
 msgid "_Edit Item"
 msgstr "_Upraviť položku"
 
-#: ../ui/xi-menus.glade.h:86
+#: ../ui/xi-menus.glade.h:107
 msgid "_Help"
 msgstr "_Pomocník"
 
-#: ../ui/xi-menus.glade.h:87
+#: ../ui/xi-menus.glade.h:108
 msgid "_Highlight Current Verse"
 msgstr "_Zvýrazniť aktuálny verš"
 
-#: ../ui/xi-menus.glade.h:88
+#: ../ui/xi-menus.glade.h:109
 msgid "_Live Chat"
 msgstr "On_line komunikácia (chat)"
 
-#: ../ui/xi-menus.glade.h:89
+#: ../ui/xi-menus.glade.h:110
 msgid "_Mailing List"
 msgstr "E-mailová konferencia"
 
-#: ../ui/xi-menus.glade.h:90
+#: ../ui/xi-menus.glade.h:111
 msgid "_Module Manager"
 msgstr "Správca _modulov"
 
-#: ../ui/xi-menus.glade.h:91
+#: ../ui/xi-menus.glade.h:112
 msgid "_Open Session"
 msgstr "_Otvoriť reláciu"
 
-#: ../ui/xi-menus.glade.h:92
+#: ../ui/xi-menus.glade.h:113
 msgid "_Preferences"
 msgstr "_Nastavenia"
 
-#: ../ui/xi-menus.glade.h:93
+#: ../ui/xi-menus.glade.h:114
 msgid "_Preview"
 msgstr "_Náhľad"
 
-#: ../ui/xi-menus.glade.h:94
+#: ../ui/xi-menus.glade.h:115
 msgid "_Read Aloud"
 msgstr "P_rečítať nahlas"
 
-#: ../ui/xi-menus.glade.h:95
+#: ../ui/xi-menus.glade.h:116
 msgid "_Report Bug"
 msgstr "_Nahlásiť chybu"
 
-#: ../ui/xi-menus.glade.h:96
+#: ../ui/xi-menus.glade.h:117
 msgid "_Save Session"
 msgstr "_Uložiť sedenie"
 
-#: ../ui/xi-menus.glade.h:97
+#: ../ui/xi-menus.glade.h:118
 msgid "_Search"
 msgstr "_Vyhľadávanie"
 
-#: ../ui/xi-menus.glade.h:98
-msgid "_Show/Hide Sidebar"
-msgstr "Zobraziť/Skryť bočný panel"
+#: ../ui/xi-menus.glade.h:119
+msgid "_Show/Hide Attached Sidebar"
+msgstr ""
 
-#: ../ui/xi-menus.glade.h:99
+#: ../ui/xi-menus.glade.h:120
 msgid "_Verse Per Line"
 msgstr "Zobraziť _verše na samostatných riadkoch"
 
@@ -3470,6 +3544,94 @@ msgstr "Študovať Biblie"
 msgid "Xiphos Bible Guide"
 msgstr "Xiphos biblická príručka"
 
+#~ msgid "Xiphos could not execute archiver"
+#~ msgstr "Xiphos nevie spustiť archivačný program"
+
+#~ msgid ""
+#~ " archival result:\n"
+#~ "\n"
+#~ msgstr ""
+#~ " výsledok vytvárania archívu:\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Archive in "
+#~ msgstr ""
+#~ "\n"
+#~ "Archív v "
+
+#~ msgid "Sources"
+#~ msgstr "Zdroje"
+
+#~ msgid "Text"
+#~ msgstr "Text"
+
+#~ msgid "Text to render"
+#~ msgstr "Text na vykreslenie"
+
+#~ msgid "Pixbuf Object"
+#~ msgstr "Pixbuf objekt"
+
+#~ msgid "The pixbuf to render."
+#~ msgstr "Pixbuf objekt na vykreslenie"
+
+#~ msgid "Open in a new tab"
+#~ msgstr "Otvoriť v novej karte"
+
+#~ msgid "Open selected module in a separate ['dialog'] window"
+#~ msgstr "Otvorí zvolený modul v samostatnom ['dialógovom'] okne"
+
+#~ msgid "View information about the selected dialog"
+#~ msgstr "Zobraziť informácie o zvolenom dialógu"
+
+#~ msgid "Create a new prayer list"
+#~ msgstr "Vytvoriť modlitebný zoznam"
+
+#~ msgid "Daily Journal"
+#~ msgstr "Denník"
+
+#~ msgid "Outlined Topic"
+#~ msgstr "Štruktúrovaná téma"
+
+#~ msgid "Open selected module in a dialog"
+#~ msgstr "Otvorí označený modul v dialógu"
+
+#~ msgid "Add Child"
+#~ msgstr "Pridať potomka"
+
+#~ msgid "Add Sibling"
+#~ msgstr "Pridať súrodenca"
+
+#~ msgid "Xiphos has renamed .xiphos-2.0 to .xiphos"
+#~ msgstr "Xiphos premenoval .xiphos-2.0 na .xiphos"
+
+#~ msgid ""
+#~ "Xiphos can not rename  .xiphos-2.0 to .xiphos:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Xiphos cannot continue."
+#~ msgstr ""
+#~ "Xiphos nemohol premenovať .xiphos-2.0 na .xiphos:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Xiphos nemôže pokračovať."
+
+#~ msgid "H_istory/<Separator>"
+#~ msgstr "H_istória/<Separator>"
+
+#~ msgid "H_istory/C_lear"
+#~ msgstr "História/Vy_mazať"
+
+#~ msgid "Remove - Restore"
+#~ msgstr "Odstrániť - Obnoviť"
+
+#~ msgid "Remove Folder"
+#~ msgstr "Odstrániť priečinok"
+
+#~ msgid "_Show/Hide Sidebar"
+#~ msgstr "Zobraziť/Skryť bočný panel"
+
 #~ msgid "Move backwards through history"
 #~ msgstr "Pohyb dozadu v histórií"
 
diff --git a/po/sv_SE.po b/po/sv.po
index b7a35d8..0296690 100644
--- a/po/sv_SE.po
+++ b/po/sv.po
@@ -2,62 +2,201 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-27 20:29+0200\n"
-"PO-Revision-Date: 2008-08-21 15:25+0100\n"
-"Last-Translator: Tomas Gustavsson <tomplast@gmail.com>\n"
+"POT-Creation-Date: 2009-12-14 23:45+0000\n"
+"PO-Revision-Date: 2009-12-14 23:09+0000\n"
+"Last-Translator: Matthew Talbert <ransom1982@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@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: 2009-12-15 05:09+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 
-#: ../xiphos.desktop.in.in.h:1
-msgid "Study the Bible"
-msgstr "Studera bibeln"
-
-#: ../xiphos.desktop.in.in.h:2
-msgid "Xiphos Bible Guide"
-msgstr "Xiphos Bibelguide"
-
-#: ../src/backend/sword_main.cc:1154
+#: ../src/backend/sword_main.cc:1083
 msgid "Configuration not found"
 msgstr "Konfiguration hittades inte"
 
-#: ../src/gecko/gecko-html.cpp:178 ../src/gnome2/html.c:161
+#: ../src/editor/bonobo-editor.c:254 ../src/editor/slib-editor.c:234
+#: ../src/gnome2/html.c:637
+#, c-format
+msgid "Page %d of %d"
+msgstr "Sida %d av %d"
+
+#: ../src/editor/bonobo-editor.c:353 ../src/editor/slib-editor.c:659
+msgid "Are you sure you want to delete the note for"
+msgstr ""
+
+#: ../src/editor/bonobo-editor.c:965 ../src/editor/bonobo-editor.c:998
+#: ../src/editor/slib-editor.c:1308 ../src/editor/slib-editor.c:1345
+msgid "Save the changes to document"
+msgstr "Spara ändringarna till dokumentet"
+
+#: ../src/editor/bonobo-editor.c:966 ../src/editor/bonobo-editor.c:999
+#: ../src/editor/slib-editor.c:1309 ../src/editor/slib-editor.c:1346
+msgid "before closing?"
+msgstr ""
+
+#: ../src/editor/bonobo-editor.c:973 ../src/editor/bonobo-editor.c:1006
+#: ../src/editor/slib-editor.c:1316 ../src/editor/slib-editor.c:1353
+msgid "If you don't save, changes will be permanently lost."
+msgstr ""
+"Om du inte sparar så kommer alla förändringar du har gjort att försvinna "
+"permanent."
+
+#: ../src/editor/bonobo-editor.c:997 ../src/editor/slib-editor.c:1344
+#: ../ui/xi-menus.glade.h:39
+msgid "File"
+msgstr "Arkiv"
+
+#: ../src/editor/bonobo-editor.c:1224 ../src/editor/slib-editor.c:1401
+msgid "StudyPad"
+msgstr "StudyPad"
+
+#: ../src/editor/bonobo-editor.c:1237 ../src/editor/slib-editor.c:1415
+msgid "Note Editor"
+msgstr "Notisredigerare"
+
+#: ../src/editor/bonobo-editor.c:1246 ../src/editor/slib-editor.c:1429
+msgid "Prayer List/Journal Editor"
+msgstr "Bönelista/journal-redigerare"
+
+#: ../src/editor/slib-editor.c:401 ../src/editor/slib-editor.c:448
+msgid "Save As"
+msgstr "Spara som"
+
+#: ../src/editor/slib-editor.c:419 ../src/editor/slib-editor.c:466
+#: ../src/editor/slib-editor.c:634
+msgid "Untitled document"
+msgstr "Namnlöst dokument"
+
+#: ../src/editor/slib-editor.c:702
+msgid "HTML Output"
+msgstr "HTML-utmatning"
+
+#: ../src/editor/slib-editor.c:709
+msgid "HTML Source"
+msgstr "HTML-källa"
+
+#: ../src/editor/slib-editor.c:716
+msgid "Plain Source"
+msgstr "Vanlig källkod"
+
+#: ../src/editor/slib-editor.c:726 ../ui/editor_note.xml.h:15
+#: ../ui/editor_studypad.xml.h:21
+msgid "_Print..."
+msgstr "_Skriv ut..."
+
+#: ../src/editor/slib-editor.c:733 ../ui/editor_note.xml.h:9
+#: ../ui/editor_studypad.xml.h:14
+msgid "Print Pre_view"
+msgstr "_Förhandsgranska utskrift"
+
+#: ../src/editor/slib-editor.c:740
+msgid "_Quit"
+msgstr "_Avsluta"
+
+#: ../src/editor/slib-editor.c:747
+msgid "_Open"
+msgstr "_Öppna"
+
+#: ../src/editor/slib-editor.c:754
+msgid "_Save"
+msgstr "_Spara"
+
+#: ../src/editor/slib-editor.c:761
+msgid "Save _As..."
+msgstr "Spara _som..."
+
+#: ../src/editor/slib-editor.c:767
+msgid "New"
+msgstr "Nytt"
+
+#: ../src/editor/slib-editor.c:769
+msgid "Open new document"
+msgstr "Öppna nytt dokument"
+
+#: ../src/editor/slib-editor.c:773
+msgid "Delete"
+msgstr "Radera"
+
+#: ../src/editor/slib-editor.c:775
+msgid "Delete current note"
+msgstr ""
+
+#: ../src/editor/slib-editor.c:780 ../ui/editor_note.xml.h:14
+#: ../ui/editor_studypad.xml.h:20 ../ui/editor.xml.h:13
+#: ../ui/xi-menus.glade.h:106
+msgid "_File"
+msgstr "_Arkiv"
+
+#: ../src/editor/slib-editor.c:835
+msgid "HTML _Output"
+msgstr "HTML-_utmatning"
+
+#: ../src/editor/slib-editor.c:842
+msgid "_HTML Source"
+msgstr "_HTML-källa"
+
+#: ../src/editor/slib-editor.c:849
+msgid "_Plain Source"
+msgstr "_Vanlig källkod"
+
+#: ../src/editor/slib-editor.c:856 ../ui/xi-menus.glade.h:121
+msgid "_View"
+msgstr "_Visa"
+
+#: ../src/editor/slib-editor.c:867 ../ui/editor_note.xml.h:11
+#: ../ui/editor_studypad.xml.h:16 ../ui/editor.xml.h:11
+msgid "Save"
+msgstr "Spara"
+
+#: ../src/editor/slib-editor.c:878 ../src/editor/slib-editor.c:885
+msgid "Insert Link"
+msgstr ""
+
+#: ../src/gecko/gecko-html.cpp:177 ../src/gnome2/html.c:165
 msgid "Unlock "
 msgstr "Lås upp "
 
-#: ../src/gecko/gecko-print.c:171
+#: ../src/gecko/gecko-print.c:172
 msgid "Preparing to print"
 msgstr "Förbereder utskrift"
 
-#: ../src/gecko/gecko-print.c:265
+#: ../src/gecko/gecko-print.c:266
 msgid "Printing is not supported on this printer"
 msgstr "Utskrift stöds inte på denna skrivare"
 
-#: ../src/gecko/gecko-print.c:268
+#: ../src/gecko/gecko-print.c:269
 #, c-format
 msgid "Printer %s does not support PostScript printing."
 msgstr "Skrivare %s stödjer inte PostScript-utskrifter."
 
-#: ../src/gecko/gecko-print.c:341 ../src/gecko/gecko-print.c:369
+#: ../src/gecko/gecko-print.c:342 ../src/gecko/gecko-print.c:370
 msgid "Printing"
 msgstr "Skriver ut"
 
-#: ../src/gecko/gecko-print.c:371
+#: ../src/gecko/gecko-print.c:372
 msgid "Waiting to print"
 msgstr "Väntar på att skriva ut"
 
-#: ../src/gecko/gecko-print.c:583
+#: ../src/gecko/gecko-print.c:584
 msgid "An error occurred while printing"
 msgstr "Ett fel uppstod vid utskrift"
 
-#: ../src/gecko/gecko-print.c:587
+#: ../src/gecko/gecko-print.c:588
 #, c-format
 msgid "It was not possible to print your document: %s"
 msgstr "Det var inte möjligt att skriva ut ditt dokument: %s"
 
+#: ../src/gnome2/about_modules.c:195
+msgid "About Sword Module"
+msgstr "Om Sword-modul"
+
+#: ../src/gnome2/about_modules.c:389 ../src/gnome2/mod_mgr.c:252
+msgid "The module has no About information."
+msgstr ""
+
 #: ../src/gnome2/about_sword.c:88
-#, fuzzy
 msgid ""
 "The SWORD Project is an effort to create an ever-expanding software package "
 "for research and study of God and His Word. The SWORD Project framework "
@@ -66,44 +205,137 @@ msgid ""
 "framework. An installed set of books may be shared among all frontends using "
 "the framework."
 msgstr ""
-"SWORD Project är ett försök att skapa ett alltid expanderande programpaket "
-"för forskning och studie av GUD och Hans Ord. SWORDs bibelramverk möjliggör "
-"enkel manipulation av bibeltexter, kommentarer, lexikon, uppslagsböcker och "
-"andra böcker. Många gränssnitt är byggda på detta ramverk. En installerad "
-"modul kan delas mellan alla gränssnitt som använder sig av detta ramverk. "
 
 #: ../src/gnome2/about_sword.c:106
 msgid "About the SWORD Project"
 msgstr "Om SWORD Project"
 
-#: ../src/gnome2/about_sword.c:123
+#: ../src/gnome2/about_sword.c:124
 msgid "Sword Version"
 msgstr "Sword-version"
 
-#: ../src/gnome2/about_sword.c:154
-#, fuzzy
+#: ../src/gnome2/about_sword.c:155
 msgid "Books can be downloaded from the SWORD Project"
-msgstr "Moduler kan laddas ner från SWORD Project"
+msgstr ""
 
-#: ../src/gnome2/about_sword.c:160
+#: ../src/gnome2/about_sword.c:161
 msgid "The SWORD Project"
 msgstr "SWORD Project"
 
-#: ../src/gnome2/navbar_versekey_editor.c:877
-#: ../src/gnome2/navbar_versekey_dialog.c:887
-#: ../src/gnome2/navbar_versekey_parallel.c:801
-#, fuzzy
-msgid "Synchronize this window from main window"
-msgstr "Visa %s i huvudfönstret"
+#: ../src/gnome2/about_trans.c:84
+msgid ""
+"Do you like using Xiphos to study the Bible? Would you like to see its "
+"display using your native language? You could translate Xiphos! \n"
+"\n"
+"We are always looking for contributions of new translations of Xiphos into "
+"other languages. If you are able to translate for us, please see the link "
+"below, contact us, and get involved with our efforts."
+msgstr ""
 
-#: ../src/gnome2/about_modules.c:189
-msgid "About Sword Module"
-msgstr "Om Sword-modul"
+#: ../src/gnome2/about_trans.c:98
+msgid "About Xiphos Translation"
+msgstr ""
 
-#: ../src/gnome2/about_modules.c:383 ../src/gnome2/mod_mgr.c:198
-msgid "The module has no About information."
+#: ../src/gnome2/about_trans.c:140
+msgid "See TRANSLATION-HOWTO in Xiphos source"
+msgstr ""
+
+#: ../src/gnome2/about_trans.c:146
+msgid "Xiphos development"
+msgstr ""
+
+#: ../src/gnome2/about_xiphos.c:131
+msgid "Copyright 2000-2009 The Xiphos Development Team"
 msgstr ""
 
+#: ../src/gnome2/about_xiphos.c:134
+msgid ""
+"(formerly known as GnomeSword)\n"
+"\n"
+"Powered by The SWORD Project.\n"
+"We would like to thank Troy Griffitts and all the other folks who have given "
+"us The SWORD Project."
+msgstr ""
+
+#: ../src/gnome2/bibletext_dialog.c:358
+msgid "Go to "
+msgstr "Gå till "
+
+#. info->stock_icon = GTK_STOCK_OPEN;
+#: ../src/gnome2/bookmark_dialog.c:171 ../src/gnome2/bookmarks_menu.c:358
+#: ../src/gnome2/bookmarks_menu.c:765 ../src/gnome2/bookmarks_menu.c:863
+#: ../src/gnome2/bookmarks_treeview.c:133 ../ui/editor_studypad.xml.h:2
+#: ../ui/xi-menus.glade.h:13
+msgid "Bookmark"
+msgstr "Bokmärk"
+
+#: ../src/gnome2/bookmark_dialog.c:173 ../src/gnome2/bookmarks_menu.c:865
+#: ../src/gnome2/bookmarks_treeview.c:134
+msgid "Enter Folder Name"
+msgstr "Ange mappnamn"
+
+#: ../src/gnome2/bookmark_dialog.c:175 ../src/gnome2/bookmarks_menu.c:867
+msgid "Folder Name"
+msgstr "Mappnamn"
+
+#: ../src/gnome2/bookmark_dialog.c:176 ../src/gnome2/bookmarks_menu.c:868
+#: ../src/gnome2/bookmarks_treeview.c:136
+msgid "Folder: "
+msgstr "Mapp: "
+
+#: ../src/gnome2/bookmarks_menu.c:344 ../ui/xi-menus.glade.h:32
+msgid "Edit"
+msgstr "Redigera"
+
+#: ../src/gnome2/bookmarks_menu.c:361
+msgid "Folder name: "
+msgstr "Namn på mapp: "
+
+#: ../src/gnome2/bookmarks_menu.c:364
+msgid "Bookmark name: "
+msgstr "Namn på bokmärke: "
+
+#: ../src/gnome2/bookmarks_menu.c:367 ../src/gnome2/bookmarks_menu.c:773
+msgid "Verse: "
+msgstr "Vers: "
+
+#: ../src/gnome2/bookmarks_menu.c:368 ../src/gnome2/bookmarks_menu.c:774
+msgid "Module: "
+msgstr "Modul: "
+
+#: ../src/gnome2/bookmarks_menu.c:533
+msgid "Restore Bookmark Folder"
+msgstr "Återställ bokmärkesmapp"
+
+#: ../src/gnome2/bookmarks_menu.c:602
+msgid "Remove the selected folder"
+msgstr "Ta bort vald mapp"
+
+#: ../src/gnome2/bookmarks_menu.c:604
+msgid "(and all its contents)?"
+msgstr "(och allt av dess innehåll)?"
+
+#: ../src/gnome2/bookmarks_menu.c:607
+msgid "Remove the selected bookmark"
+msgstr "Ta bort valt bokmärke"
+
+#: ../src/gnome2/bookmarks_menu.c:766
+msgid "Add"
+msgstr "Lägg till"
+
+#: ../src/gnome2/bookmarks_menu.c:772
+msgid "Label: "
+msgstr "Etikett: "
+
+#: ../src/gnome2/bookmarks_treeview.c:107
+#, c-format
+msgid "Search result: %s"
+msgstr ""
+
+#: ../src/gnome2/bookmarks_treeview.c:943 ../src/gnome2/sidebar.c:1389
+msgid "Bookmarks"
+msgstr "Bokmärken"
+
 #: ../src/gnome2/cipher_key_dialog.c:62
 msgid "Cipher Key?"
 msgstr "Krypteringsnyckel?"
@@ -116,276 +348,393 @@ msgstr ""
 msgid "Enter Cipher Key: "
 msgstr "Ange krypteringsnyckel: "
 
-#: ../src/gnome2/parallel_view.c:271
-msgid "Copy"
-msgstr "Kopiera"
-
-#: ../src/gnome2/parallel_view.c:281
-msgid "Detach/Attach"
-msgstr "Koppla loss/fäst"
-
-#: ../src/gnome2/parallel_view.c:287 ../ui/xi-menus.glade.h:38
-msgid "Module Options"
-msgstr "Modulinställningar"
-
-#. build change parallel modules submenu
-#: ../src/gnome2/parallel_view.c:302
-msgid "Change parallel 1"
-msgstr "Ändra parallell 1"
-
-#: ../src/gnome2/parallel_view.c:304
-msgid "Change parallel 2"
-msgstr "Ändra parallell 2"
-
-#: ../src/gnome2/parallel_view.c:306
-msgid "Change parallel 3"
-msgstr "Ändra parallell 3"
+#: ../src/gnome2/dialog.c:265
+msgid "Close without Saving"
+msgstr "Stäng utan att spara"
 
-#: ../src/gnome2/parallel_view.c:308
-msgid "Change parallel 4"
-msgstr "Ändra parallell 4"
+#: ../src/gnome2/dialog.c:596
+msgid "Xiphos:"
+msgstr "Xiphos:"
 
-#: ../src/gnome2/parallel_view.c:310
-msgid "Change parallel 5"
-msgstr "Ändra parallell 5"
+#: ../src/gnome2/dialog.c:697
+msgid "Close _without Saving"
+msgstr "Stäng _utan att spara"
 
-#: ../src/gnome2/parallel_view.c:467 ../src/gnome2/sidebar.c:599
-#: ../src/gnome2/sidebar.c:605 ../src/gnome2/tabbed_browser.c:231
-#: ../src/main/sidebar.cc:618 ../src/main/sidebar.cc:956
-#: ../src/main/sidebar.cc:957 ../src/main/sidebar.cc:958
-msgid "Parallel View"
-msgstr "Parallell vy"
+#: ../src/gnome2/export_dialog.c:267 ../ui/export-dialog.glade.h:20
+msgid "Please check copyright before exporting!"
+msgstr "Vänligen kontrollera copyright före export!"
 
-#: ../src/gnome2/find_dialog.c:200 ../src/gnome2/find_dialog.c:369
+#: ../src/gnome2/find_dialog.c:204 ../src/gnome2/find_dialog.c:373
 msgid "Find"
 msgstr "Hitta"
 
-#: ../src/gnome2/find_dialog.c:218
+#: ../src/gnome2/find_dialog.c:222
 msgid "Enter Word or Phrase"
 msgstr ""
 
-#: ../src/gnome2/find_dialog.c:234 ../src/gnome2/search_sidebar.c:303
-#: ../ui/search-dialog.glade.h:57
+#: ../src/gnome2/find_dialog.c:238 ../src/gnome2/search_sidebar.c:306
+#: ../ui/search-dialog.glade.h:59
 msgid "Match case"
 msgstr "Matcha shiftläge"
 
-#: ../src/gnome2/find_dialog.c:241
+#: ../src/gnome2/find_dialog.c:245
 msgid "Search backwards"
 msgstr "Sök baklänges"
 
-#: ../src/gnome2/find_dialog.c:250 ../src/gnome2/search_sidebar.c:268
-#: ../ui/search-dialog.glade.h:74
+#: ../src/gnome2/find_dialog.c:254 ../src/gnome2/search_sidebar.c:271
+#: ../ui/search-dialog.glade.h:76
 msgid "Regular expression"
 msgstr "Regulära uttryck"
 
-#: ../src/gnome2/find_dialog.c:291
+#: ../src/gnome2/find_dialog.c:295
 msgid "Find Next"
 msgstr "Hitta nästa"
 
-#: ../src/gnome2/bibletext_dialog.c:525
-msgid "Go to "
-msgstr "Gå till "
-
-#: ../src/gnome2/dialog.c:241
-msgid "Close without Saving"
-msgstr "Stäng utan att spara"
-
-#: ../src/gnome2/dialog.c:730
-msgid "Xiphos:"
-msgstr "Xiphos:"
-
-#: ../src/gnome2/dialog.c:831
-msgid "Close _without Saving"
-msgstr "Stäng _utan att spara"
-
-#: ../src/gnome2/font_dialog.c:297
+#: ../src/gnome2/font_dialog.c:303
 msgid "Set Module Font"
 msgstr "Välj typsnitt för modul"
 
-#: ../src/gnome2/font_dialog.c:327
+#: ../src/gnome2/font_dialog.c:333
 msgid "Change font for"
 msgstr "Ändra typsnitt för"
 
-#: ../src/gnome2/font_dialog.c:331
+#: ../src/gnome2/font_dialog.c:337
 msgid "Module"
 msgstr "Modul"
 
-#: ../src/gnome2/font_dialog.c:335
+#: ../src/gnome2/font_dialog.c:341
 msgid "Current font: "
 msgstr "Nuvarande typsnitt: "
 
-#: ../src/gnome2/font_dialog.c:372
+#: ../src/gnome2/font_dialog.c:378
 msgid "+0"
 msgstr "+0"
 
-#: ../src/gnome2/font_dialog.c:376
+#: ../src/gnome2/font_dialog.c:382
 msgid "Use the default font for this module"
 msgstr "Använd standardtypsnittet för denna modul"
 
-#: ../src/gnome2/toolbar_nav.c:416
-msgid "Move backwards through history"
-msgstr "Gå bakåt genom historiken"
+#. *****************************************************************************
+#. * Name
+#. *    gconf_setup
+#. *
+#. * Synopsis
+#. *   #include "main/settings.h"
+#. *
+#. *   void gconf_setup()
+#. *
+#. * Description
+#. *   verifies and initializes the GConf subsystem, so that "sword://" and
+#. *   similar can be handled by url-comprehending programs such as browsers.
+#. *   dialogs for permission/success/failure => conditional on debug build.
+#. *
+#. * Return value
+#. *   void
+#. 
+#: ../src/gnome2/gui.c:110
+msgid ""
+"URL references using \"sword://\" (similar to web page\n"
+"references) can be used by programs to look up\n"
+"scripture references. Your system currently has no\n"
+"program set to handle these references.\n"
+"\n"
+"Would you like Xiphos to set itself as the\n"
+"program to handle these references?"
+msgstr ""
 
-#: ../src/gnome2/toolbar_nav.c:437
-msgid "Move foward through history"
-msgstr "Gå framåt i historiken"
+#: ../src/gnome2/gui.c:112
+msgid ""
+"Xiphos has successfully set itself\n"
+"as the handler of sword:// and bible:// URLs.\n"
+"\n"
+"You may wish to run the program \"gconf-editor\"\n"
+"to examine keys under /desktop/gnome/url-handlers,\n"
+"if you need to change these."
+msgstr ""
+"Xiphos lyckades ställa in sig själv som hanterare\n"
+"för sword:// och bible:// URL:er.\n"
+"\n"
+"Du kan köra programmet \"gconf-editor\"\n"
+"för att granska nycklar under /desktop/gnome/url-handlers om du behöver "
+"ändra dessa."
 
-#: ../src/gnome2/toolbar_nav.c:458
-msgid "Select a Book of the Bible"
-msgstr "Välj en bok i bibeln"
+#: ../src/gnome2/gui.c:166
+#, c-format
+msgid ""
+"Xiphos failed to complete handler init for key #%d:\n"
+"%s"
+msgstr ""
 
-#: ../src/gnome2/toolbar_nav.c:523
-msgid "Change Chapter"
-msgstr "Ändra kapitel"
+#: ../src/gnome2/gui.c:212
+msgid "BUG! Xiphos is about to crash due to a \"STRDUP\" error."
+msgstr ""
 
-#: ../src/gnome2/toolbar_nav.c:593
-msgid "Change Verse"
-msgstr "Ändra vers"
+#: ../src/gnome2/gui.c:213 ../src/gnome2/gui.c:248
+msgid "Please report this error to the Xiphos team with:"
+msgstr ""
 
-#: ../src/gnome2/toolbar_nav.c:661
-msgid "Enter a Verse reference in Book 1:1 format and press Return"
+#: ../src/gnome2/gui.c:247
+msgid "BUG! Xiphos is about to crash due to a \"STRING\" error."
 msgstr ""
-"Ange en versreferens som i Bok 1:1-formatet och tryck på Return-tangenten"
 
-#: ../src/gnome2/mod_mgr.c:333
-msgid "Install these modules:"
-msgstr "Installera följande moduler:"
+#: ../src/gnome2/main_window.c:789
+msgid "Xiphos - Bible Study Software"
+msgstr "Xiphos - Bibelstudieprogram"
 
-#: ../src/gnome2/mod_mgr.c:335
-msgid "Remove these modules:"
-msgstr "Ta bort följande moduler"
+#: ../src/gnome2/main_window.c:844
+msgid "Open a new tab"
+msgstr "Öppna en ny flik"
 
-#: ../src/gnome2/mod_mgr.c:337
-msgid "Archive these modules:"
-msgstr "Arkivera följande moduler:"
+#: ../src/gnome2/main_window.c:923 ../src/gnome2/sidebar.c:627
+#: ../src/gnome2/sidebar.c:633 ../src/main/sidebar.cc:666
+#: ../src/main/sidebar.cc:1015 ../src/main/sidebar.cc:1016
+#: ../src/main/sidebar.cc:1017
+msgid "Standard View"
+msgstr "Standardvy"
 
-#: ../src/gnome2/mod_mgr.c:339
+#: ../src/gnome2/main_window.c:1004
+msgid "Commentary View"
+msgstr "Kommentar-vy"
+
+#: ../src/gnome2/main_window.c:1020
+msgid "Book View"
+msgstr "Bok-vy"
+
+#: ../src/gnome2/main_window.c:1045
+msgid "Welcome to Xiphos"
+msgstr ""
+
+#: ../src/gnome2/menu_popup.c:1168
 msgid ""
-"Build fast-search index for these\n"
-"modules (may take minutes/module):"
+"Renaming is not available in Windows.\n"
+"\n"
+"Xiphos is limited by Windows' filesystem,\n"
+"because it disallows the renaming of filename\n"
+"components of currently-open files,\n"
+"such as the contents of this commentary.\n"
+"Therefore, personal commentary renaming is\n"
+"not available in the Windows environment."
 msgstr ""
 
-#: ../src/gnome2/mod_mgr.c:341
-msgid "Delete fast-search index for these modules:"
-msgstr "Ta bort snabbsök-index för följande moduler:"
+#: ../src/gnome2/menu_popup.c:1187
+msgid "Rename Commentary"
+msgstr ""
 
-#: ../src/gnome2/mod_mgr.c:361
-msgid "Preparing to install"
-msgstr "Förbereder för installation"
+#: ../src/gnome2/menu_popup.c:1190
+msgid "Choose Commentary Name"
+msgstr ""
+
+#: ../src/gnome2/menu_popup.c:1192
+msgid "New Name"
+msgstr "Nytt namn"
+
+#: ../src/gnome2/menu_popup.c:1193 ../src/gnome2/treekey-editor.c:139
+#: ../src/gnome2/treekey-editor.c:198 ../src/gnome2/treekey-editor.c:284
+#: ../src/main/prayerlists.cc:243
+msgid "Name: "
+msgstr "Namn: "
 
-#: ../src/gnome2/mod_mgr.c:363
+#: ../src/gnome2/menu_popup.c:1203 ../src/main/prayerlists.cc:257
+msgid "Module names must contain [A-Za-z0-9_] only."
+msgstr "Modulnamn kan endast innehålla [A-Za-z0-9_]."
+
+#: ../src/gnome2/menu_popup.c:1210 ../src/main/prayerlists.cc:264
+msgid "Xiphos already knows a module by that name."
+msgstr "Xiphos känner redan till en modul med det namnet."
+
+#: ../src/gnome2/menu_popup.c:1253
+#, c-format
+msgid ""
+"Failed to create new configuration:\n"
+"%s"
+msgstr ""
+
+#: ../src/gnome2/menu_popup.c:1262
+msgid ""
+"Configuration build error:\n"
+"\n"
+msgstr ""
+
+#: ../src/gnome2/mod_mgr.c:169
+msgid "Remove these modules?"
+msgstr ""
+
+#: ../src/gnome2/mod_mgr.c:170
 msgid "Preparing to remove"
 msgstr "Förbereder för borttagning"
 
-#: ../src/gnome2/mod_mgr.c:365
-msgid "Preparing to archive"
-msgstr "Förbereder för arkivering"
+#: ../src/gnome2/mod_mgr.c:171
+msgid "Removing"
+msgstr "Tar bort"
 
-#: ../src/gnome2/mod_mgr.c:367
-msgid "Preparing to index"
-msgstr "Förbered för indexering"
+#: ../src/gnome2/mod_mgr.c:172 ../ui/xi-menus.glade.h:72
+msgid "Remove"
+msgstr "Ta bort"
 
-#: ../src/gnome2/mod_mgr.c:369
-msgid "Preparing to delete index"
-msgstr "Förbereder för borttagning av index"
+#: ../src/gnome2/mod_mgr.c:175
+msgid "Install these modules?"
+msgstr ""
 
-#: ../src/gnome2/mod_mgr.c:394
+#: ../src/gnome2/mod_mgr.c:176
+msgid "Preparing to install"
+msgstr "Förbereder för installation"
+
+#: ../src/gnome2/mod_mgr.c:177
 msgid "Installing"
 msgstr "Installerar"
 
-#: ../src/gnome2/mod_mgr.c:396
-msgid "Removing"
-msgstr "Tar bort"
+#: ../src/gnome2/mod_mgr.c:178 ../src/gnome2/mod_mgr.c:2964
+#: ../ui/module-manager.glade.h:18
+msgid "Install"
+msgstr "Installera"
 
-#: ../src/gnome2/mod_mgr.c:398
+#: ../src/gnome2/mod_mgr.c:181
+msgid "Archive these modules?"
+msgstr ""
+
+#: ../src/gnome2/mod_mgr.c:182
+msgid "Preparing to archive"
+msgstr "Förbereder för arkivering"
+
+#: ../src/gnome2/mod_mgr.c:183
 msgid "Archiving"
 msgstr "Arkiverar"
 
-#: ../src/gnome2/mod_mgr.c:400
+#: ../src/gnome2/mod_mgr.c:184 ../ui/module-manager.glade.h:11
+msgid "Archive"
+msgstr "Arkivera"
+
+#: ../src/gnome2/mod_mgr.c:187
+msgid ""
+"Build fast-search index for these\n"
+"modules (may take minutes/module)?"
+msgstr ""
+
+#: ../src/gnome2/mod_mgr.c:188
+msgid "Preparing to index"
+msgstr "Förbered för indexering"
+
+#: ../src/gnome2/mod_mgr.c:189
 msgid "Indexing"
 msgstr "Indexerar"
 
-#: ../src/gnome2/mod_mgr.c:402
+#: ../src/gnome2/mod_mgr.c:190 ../ui/module-manager.glade.h:17
+msgid "Index"
+msgstr "Indexera"
+
+#: ../src/gnome2/mod_mgr.c:193
+msgid "Delete fast-search index for these modules?"
+msgstr ""
+
+#: ../src/gnome2/mod_mgr.c:194
+msgid "Preparing to delete index"
+msgstr "Förbereder för borttagning av index"
+
+#: ../src/gnome2/mod_mgr.c:195
 msgid "Deleting index"
 msgstr "Tar bort index"
 
-#: ../src/gnome2/mod_mgr.c:422
-#, c-format
-msgid ""
-"`mkdir %s' failed:\n"
-"%s."
-msgstr ""
-"`mkdir %s' misslyckades:\n"
-"%s."
+#: ../src/gnome2/mod_mgr.c:196
+msgid "Deletion"
+msgstr "Radering"
+
+#: ../src/gnome2/mod_mgr.c:427
+msgid "Module Name"
+msgstr "Modulnamn"
 
 #: ../src/gnome2/mod_mgr.c:448
-msgid "Xiphos could not execute archiver"
-msgstr "Xiphos kunde inte köra arkiveraren"
+msgid "A checkmark means this module is already installed"
+msgstr ""
 
-#: ../src/gnome2/mod_mgr.c:453
+#: ../src/gnome2/mod_mgr.c:470
+msgid "Click the box to work on this module"
+msgstr ""
+
+#: ../src/gnome2/mod_mgr.c:471
+msgid "Click the box to select this module for install/update"
+msgstr ""
+
+#: ../src/gnome2/mod_mgr.c:490
+msgid "Installed"
+msgstr "Installerad"
+
+#: ../src/gnome2/mod_mgr.c:500
 msgid ""
-" archival result:\n"
-"\n"
+"The index icon means you have built an optimized ('lucene') index for this "
+"module for fast searching (see the Maintenance pane for this function)"
 msgstr ""
 
-#: ../src/gnome2/mod_mgr.c:457
+#: ../src/gnome2/mod_mgr.c:518
 msgid ""
-"\n"
-"Archive in "
+"The lock icon means this module is encrypted, and requires that you purchase "
+"an unlock key from the content owner"
 msgstr ""
 
-#: ../src/gnome2/mod_mgr.c:514
-msgid "Journals and prayer lists cannot be indexed."
+#: ../src/gnome2/mod_mgr.c:535 ../ui/xi-menus.glade.h:1
+msgid "About"
+msgstr "Om"
+
+#: ../src/gnome2/mod_mgr.c:555
+msgid ""
+"The refresh icon means the Installed module is older than the newer "
+"Available module: You should update the module"
 msgstr ""
 
-#: ../src/gnome2/mod_mgr.c:535 ../src/gnome2/mod_mgr.c:2753
-#: ../ui/module-manager.glade.h:15
-msgid "Install"
-msgstr "Installera"
+#: ../src/gnome2/mod_mgr.c:567
+msgid "Available"
+msgstr "Tillgänglig"
 
-#: ../src/gnome2/mod_mgr.c:537 ../src/gnome2/treekey-editor.c:315
-msgid "Remove"
-msgstr "Ta bort"
+#: ../src/gnome2/mod_mgr.c:576
+msgid "Size"
+msgstr "Storlek"
 
-#: ../src/gnome2/mod_mgr.c:539
-msgid "Archive"
-msgstr "Arkivera"
+#: ../src/gnome2/mod_mgr.c:585
+msgid "Description"
+msgstr "Beskrivning"
 
-#: ../src/gnome2/mod_mgr.c:541
-msgid "Index"
-msgstr "Indexera"
+#: ../src/gnome2/mod_mgr.c:736
+#, c-format
+msgid ""
+"`mkdir %s' failed:\n"
+"%s."
+msgstr ""
+"`mkdir %s' misslyckades:\n"
+"%s."
 
-#: ../src/gnome2/mod_mgr.c:543
-#, fuzzy
-msgid "Deletion"
-msgstr "Tar bort index"
+#: ../src/gnome2/mod_mgr.c:759
+msgid " archived in: \n"
+msgstr ""
 
-#: ../src/gnome2/mod_mgr.c:545
+#: ../src/gnome2/mod_mgr.c:815
+msgid "Journals and prayer lists cannot be indexed."
+msgstr ""
+
+#: ../src/gnome2/mod_mgr.c:833
 #, c-format
 msgid "%s failed"
 msgstr "%s misslyckades"
 
-#: ../src/gnome2/mod_mgr.c:547 ../src/gnome2/mod_mgr.c:1267
+#: ../src/gnome2/mod_mgr.c:836 ../src/gnome2/mod_mgr.c:1562
 msgid "Finished"
 msgstr "Färdigt"
 
-#: ../src/gnome2/mod_mgr.c:712 ../src/gnome2/mod_mgr.c:714
-#: ../src/gnome2/mod_mgr.c:816 ../src/gnome2/mod_mgr.c:851
-#: ../src/gnome2/mod_mgr.c:853 ../src/gnome2/utilities.c:346
-#: ../src/gnome2/utilities.c:411 ../src/gnome2/utilities.c:413
-#: ../src/gnome2/utilities.c:1031 ../src/main/sidebar.cc:801
-#: ../src/main/sidebar.cc:873 ../src/main/sidebar.cc:875
+#: ../src/gnome2/mod_mgr.c:1003 ../src/gnome2/mod_mgr.c:1005
+#: ../src/gnome2/mod_mgr.c:1107 ../src/gnome2/mod_mgr.c:1142
+#: ../src/gnome2/mod_mgr.c:1144 ../src/gnome2/utilities.c:435
+#: ../src/gnome2/utilities.c:500 ../src/gnome2/utilities.c:502
+#: ../src/gnome2/utilities.c:986 ../src/main/sidebar.cc:852
+#: ../src/main/sidebar.cc:924 ../src/main/sidebar.cc:926
 msgid "Unknown"
-msgstr ""
+msgstr "Okänd"
 
-#: ../src/gnome2/mod_mgr.c:1012
+#: ../src/gnome2/mod_mgr.c:1301
 #, c-format
 msgid ""
 "Repository:\n"
 "%s"
 msgstr ""
 
-#: ../src/gnome2/mod_mgr.c:1024
+#: ../src/gnome2/mod_mgr.c:1313
 msgid ""
 "Categorized by\n"
 "Module Type"
@@ -393,44 +742,44 @@ msgstr ""
 "Kategoriserat via\n"
 "modultyp"
 
-#: ../src/gnome2/mod_mgr.c:1029 ../src/gnome2/utilities.c:472
-#: ../src/main/sidebar.cc:948 ../src/main/sidebar.cc:950
+#: ../src/gnome2/mod_mgr.c:1318 ../src/gnome2/utilities.c:561
+#: ../src/main/sidebar.cc:999 ../src/main/sidebar.cc:1001
 msgid "Biblical Texts"
 msgstr "Biblar"
 
-#: ../src/gnome2/mod_mgr.c:1033 ../src/gnome2/utilities.c:476
-#: ../src/main/sidebar.cc:650 ../src/main/sidebar.cc:973
-#: ../src/main/sidebar.cc:975 ../ui/prefs.glade.h:33
+#: ../src/gnome2/mod_mgr.c:1322 ../src/gnome2/utilities.c:565
+#: ../src/main/sidebar.cc:678 ../src/main/sidebar.cc:1024
+#: ../src/main/sidebar.cc:1026 ../ui/prefs.glade.h:33
 msgid "Commentaries"
 msgstr "Kommentarer"
 
-#: ../src/gnome2/mod_mgr.c:1037 ../src/gnome2/utilities.c:480
-#: ../src/main/sidebar.cc:982 ../src/main/sidebar.cc:984
+#: ../src/gnome2/mod_mgr.c:1326 ../src/gnome2/utilities.c:569
+#: ../src/main/sidebar.cc:1033 ../src/main/sidebar.cc:1035
 msgid "Dictionaries"
 msgstr "Uppslagsböcker"
 
-#: ../src/gnome2/mod_mgr.c:1041 ../src/gnome2/utilities.c:484
-#: ../src/main/sidebar.cc:991 ../src/main/sidebar.cc:993
+#: ../src/gnome2/mod_mgr.c:1330 ../src/gnome2/utilities.c:573
+#: ../src/main/sidebar.cc:1042 ../src/main/sidebar.cc:1044
 msgid "Daily Devotionals"
 msgstr "Dagliga andakter"
 
-#: ../src/gnome2/mod_mgr.c:1045 ../src/gnome2/utilities.c:488
-#: ../src/main/sidebar.cc:660 ../src/main/sidebar.cc:1000
-#: ../src/main/sidebar.cc:1002
+#: ../src/gnome2/mod_mgr.c:1334 ../src/gnome2/utilities.c:577
+#: ../src/main/sidebar.cc:688 ../src/main/sidebar.cc:1051
+#: ../src/main/sidebar.cc:1053
 msgid "General Books"
 msgstr "Allmäna böcker"
 
-#: ../src/gnome2/mod_mgr.c:1049 ../src/gnome2/utilities.c:492
-#: ../src/main/sidebar.cc:1009 ../src/main/sidebar.cc:1011
+#: ../src/gnome2/mod_mgr.c:1338 ../src/gnome2/utilities.c:581
+#: ../src/main/sidebar.cc:1060 ../src/main/sidebar.cc:1062
 msgid "Maps"
 msgstr "Kartor"
 
-#: ../src/gnome2/mod_mgr.c:1053 ../src/gnome2/utilities.c:496
-#: ../src/main/sidebar.cc:1018 ../src/main/sidebar.cc:1020
+#: ../src/gnome2/mod_mgr.c:1342 ../src/gnome2/utilities.c:585
+#: ../src/main/sidebar.cc:1069 ../src/main/sidebar.cc:1071
 msgid "Images"
 msgstr "Bilder"
 
-#: ../src/gnome2/mod_mgr.c:1061
+#: ../src/gnome2/mod_mgr.c:1350
 msgid ""
 "Categorized by\n"
 "Availability"
@@ -438,1227 +787,911 @@ msgstr ""
 "Kategoriserat via\n"
 "tillgänglighet"
 
-#: ../src/gnome2/mod_mgr.c:1066
+#: ../src/gnome2/mod_mgr.c:1355
 msgid "Updates"
 msgstr "Uppdateringar"
 
-#: ../src/gnome2/mod_mgr.c:1070
+#: ../src/gnome2/mod_mgr.c:1359
 msgid "Uninstalled"
 msgstr "Avinstallerade"
 
-#: ../src/gnome2/mod_mgr.c:1074 ../src/gnome2/sidebar.c:616
-#: ../src/gnome2/utilities.c:501 ../src/main/prayerlists.cc:238
-#: ../src/main/sidebar.cc:1028 ../src/main/sidebar.cc:1030
+#: ../src/gnome2/mod_mgr.c:1363 ../src/gnome2/sidebar.c:643
+#: ../src/gnome2/utilities.c:590 ../src/main/prayerlists.cc:241
+#: ../src/main/sidebar.cc:1079 ../src/main/sidebar.cc:1081
 msgid "Prayer List/Journal"
 msgstr "Bönelista/journal"
 
-#: ../src/gnome2/mod_mgr.c:1250
-msgid "Refreshing remote"
-msgstr "Uppdaterar fjärr-källa"
-
-#: ../src/gnome2/mod_mgr.c:1261
-msgid "Remote not found"
-msgstr "Fjärr-källa kunde inte hittas"
-
-#: ../src/gnome2/mod_mgr.c:1393
-msgid "Module Name"
-msgstr "Modulnamn"
-
-#: ../src/gnome2/mod_mgr.c:1414
-msgid "A checkmark means this module is already installed"
-msgstr ""
-
-#: ../src/gnome2/mod_mgr.c:1436
-#, fuzzy
-msgid "Click the box to work on this module"
-msgstr "Använd standardtypsnittet för denna modul"
-
-#: ../src/gnome2/mod_mgr.c:1437
-msgid "Click the box to select this module for install/update"
+#: ../src/gnome2/mod_mgr.c:1545
+msgid "Refreshing from remote source"
 msgstr ""
 
-#: ../src/gnome2/mod_mgr.c:1456
-msgid "Installed"
-msgstr "Installerad"
-
-#: ../src/gnome2/mod_mgr.c:1466
-msgid ""
-"The index icon means you have built an optimized ('lucene') index for this "
-"module for fast searching (see the Maintenance pane for this function)"
-msgstr ""
-
-#: ../src/gnome2/mod_mgr.c:1484
-msgid ""
-"The lock icon means this module is encrypted, and requires that you purchase "
-"an unlock key from the content owner"
-msgstr ""
-
-#. 2
-#: ../src/gnome2/mod_mgr.c:1501 ../src/gnome2/sidebar.c:954
-#: ../src/gnome2/sidebar.c:1122 ../ui/xi-menus.glade.h:1
-msgid "About"
-msgstr "Om"
-
-#: ../src/gnome2/mod_mgr.c:1521
-msgid ""
-"The refresh icon means the Installed module is older than the newer "
-"Available module: You should update the module"
+#: ../src/gnome2/mod_mgr.c:1556
+msgid "Remote source not found"
 msgstr ""
 
-#: ../src/gnome2/mod_mgr.c:1533
-msgid "Available"
-msgstr "Tillgänglig"
-
-#: ../src/gnome2/mod_mgr.c:1542
-msgid "Size"
-msgstr "Storlek"
-
-#: ../src/gnome2/mod_mgr.c:1551
-msgid "Description"
-msgstr "Beskrivning"
-
-#: ../src/gnome2/mod_mgr.c:1583 ../src/gnome2/mod_mgr.c:1660
+#: ../src/gnome2/mod_mgr.c:1670
 msgid "Configure"
 msgstr "Konfigurera"
 
-#: ../src/gnome2/mod_mgr.c:1614
+#: ../src/gnome2/mod_mgr.c:1701
 msgid "Type"
 msgstr "Typ"
 
-#: ../src/gnome2/mod_mgr.c:1621
+#: ../src/gnome2/mod_mgr.c:1708
 msgid "Caption"
 msgstr "Rubrik"
 
-#: ../src/gnome2/mod_mgr.c:1629
+#: ../src/gnome2/mod_mgr.c:1716
 msgid "Source"
 msgstr "Källa"
 
-#: ../src/gnome2/mod_mgr.c:1637
+#: ../src/gnome2/mod_mgr.c:1724
 msgid "Directory"
 msgstr "Mapp"
 
-#: ../src/gnome2/mod_mgr.c:1658
-msgid "Sources"
-msgstr "Källor"
+#: ../src/gnome2/mod_mgr.c:1732
+msgid "User"
+msgstr "Användare"
+
+#: ../src/gnome2/mod_mgr.c:1740
+msgid "Password"
+msgstr "Lösenord"
+
+#: ../src/gnome2/mod_mgr.c:1748
+msgid "UID"
+msgstr "UID"
+
+#: ../src/gnome2/mod_mgr.c:1765
+msgid "Module Sources"
+msgstr ""
+
+#: ../src/gnome2/mod_mgr.c:1768
+msgid "Add/Remove"
+msgstr "Lägg till/Ta bort"
+
+#: ../src/gnome2/mod_mgr.c:1770
+msgid "Choose"
+msgstr "Välj"
 
-#: ../src/gnome2/mod_mgr.c:1664 ../src/gnome2/sidebar.c:1462
-#: ../src/gnome2/preferences_dialog.c:1784
+#: ../src/gnome2/mod_mgr.c:1774 ../src/gnome2/preferences_dialog.c:1793
+#: ../src/gnome2/sidebar.c:1413
 msgid "Modules"
 msgstr "Moduler"
 
-#: ../src/gnome2/mod_mgr.c:1666
+#: ../src/gnome2/mod_mgr.c:1776
 msgid "Install/Update"
 msgstr "Installera/Uppdatera"
 
-#: ../src/gnome2/mod_mgr.c:1668
+#: ../src/gnome2/mod_mgr.c:1778
 msgid "Maintenance"
 msgstr "Underhåll"
 
-#: ../src/gnome2/mod_mgr.c:1872
+#: ../src/gnome2/mod_mgr.c:1999
 msgid "Please Refresh"
 msgstr "Vänligen uppdatera"
 
-#: ../src/gnome2/mod_mgr.c:1873
+#: ../src/gnome2/mod_mgr.c:2000
 msgid "Your module list is not up to date!"
 msgstr "Din modullista är inte uppdaterad!"
 
-#: ../src/gnome2/mod_mgr.c:2336 ../src/gnome2/mod_mgr.c:2542
+#. Zero Bibles is just not workable in Xiphos.
+#: ../src/gnome2/mod_mgr.c:2282
+msgid ""
+"You have uninstalled your last Bible.\n"
+"Xiphos requires at least one."
+msgstr ""
+
+#: ../src/gnome2/mod_mgr.c:2288
+msgid ""
+"There are still no Bibles installed.\n"
+"Xiphos cannot continue without one."
+msgstr ""
+
+#: ../src/gnome2/mod_mgr.c:2353
+msgid "Standard remote sources have been loaded."
+msgstr ""
+
+#: ../src/gnome2/mod_mgr.c:2359
+msgid "Could not load standard sources from CrossWire."
+msgstr ""
+
+#: ../src/gnome2/mod_mgr.c:2510 ../src/gnome2/mod_mgr.c:2759
 msgid "Remove the selected source"
 msgstr "Ta bort vald källa"
 
-#: ../src/gnome2/mod_mgr.c:2393
+#: ../src/gnome2/mod_mgr.c:2570
 msgid "Enter a remote source"
 msgstr "Ange en fjärr-källa"
 
-#: ../src/gnome2/mod_mgr.c:2397
+#: ../src/gnome2/mod_mgr.c:2574
 msgid "Caption:"
 msgstr "Rubrik:"
 
-#: ../src/gnome2/mod_mgr.c:2398
+#: ../src/gnome2/mod_mgr.c:2575
 msgid "Type:"
 msgstr "Typ:"
 
-#: ../src/gnome2/mod_mgr.c:2399
+#: ../src/gnome2/mod_mgr.c:2576
 msgid "Host:"
 msgstr "Klient:"
 
-#: ../src/gnome2/mod_mgr.c:2400
+#: ../src/gnome2/mod_mgr.c:2577
 msgid "Directory:"
 msgstr "Mapp:"
 
+#: ../src/gnome2/mod_mgr.c:2579
+msgid "User (optional):"
+msgstr ""
+
+#: ../src/gnome2/mod_mgr.c:2580
+msgid "Password (optional):"
+msgstr "Lösenord (valfritt):"
+
 #. this can happen at most once
-#: ../src/gnome2/mod_mgr.c:2425
+#: ../src/gnome2/mod_mgr.c:2608
 msgid "A source by that name already exists."
 msgstr "En källa med detta namnet finns redan."
 
-#: ../src/gnome2/mod_mgr.c:2539
-#, fuzzy
+#: ../src/gnome2/mod_mgr.c:2756
 msgid "Delete a remote source"
-msgstr "Ange en fjärr-källa"
-
-#: ../src/gnome2/sidebar_dialog.c:135
-msgid "Sidebar"
-msgstr "Sidomeny"
-
-#: ../src/gnome2/html.c:629
-#, c-format
-msgid "Page %d of %d"
 msgstr ""
 
-#: ../src/gnome2/main_window.c:740
-msgid "Xiphos - Bible Study Software"
-msgstr "Xiphos - Bibelstudieprogram"
-
-#: ../src/gnome2/main_window.c:794
-msgid "Open a new tab"
-msgstr "Öppna en ny flik"
-
-#: ../src/gnome2/main_window.c:880 ../src/gnome2/sidebar.c:600
-#: ../src/gnome2/sidebar.c:606 ../src/main/sidebar.cc:638
-#: ../src/main/sidebar.cc:964 ../src/main/sidebar.cc:965
-#: ../src/main/sidebar.cc:966
-msgid "Standard View"
-msgstr "Standardvy"
-
-#: ../src/gnome2/main_window.c:957
-msgid "Commentary View"
-msgstr "Kommentar-vy"
-
-#: ../src/gnome2/main_window.c:973
-msgid "Book View"
-msgstr "Bok-vy"
-
-#: ../src/gnome2/main_window.c:998
-#, fuzzy
-msgid "Welcome to Xiphos"
-msgstr "Om _Xiphos ..."
+#. *****************************************************************************
+#. * Name
+#. *   gui_open_mod_mgr
+#. *
+#. * Synopsis
+#. *   #include "gui/mod_mgr.h"
+#. *
+#. *   void gui_open_mod_mgr(void)
+#. *
+#. * Description
+#. *
+#. *
+#. * Return value
+#. *   void
+#. 
+#: ../src/gnome2/mod_mgr.c:3244
+msgid ""
+"<b>Welcome to the Module Manager.</b>\n"
+"\n"
+"This is Xiphos' mechanism to get new and updated content.\n"
+"It appears you have never been here before, so please take a moment to look "
+"it over.\n"
+"(You will see this information box just once.)\n"
+"\n"
+"Modules come from different <u>repositories</u>.  <b>Module Sources: "
+"Add/Remove</b> will show you what repositories are currently known.\n"
+"\n"
+"<b>Module Sources: Choose</b> is for deciding from where modules should "
+"come, that is, from which repository Xiphos should obtain them, as well as "
+"where they should be placed on your system. Set <i>Install Source</i> and "
+"<i>Install Destination</i>, then click <i>Refresh</i>.\n"
+"\n"
+"<b>Modules: Install/Update</b> is for selecting and obtaining modules after "
+"choosing source and destination.\n"
+"\n"
+"<b>Modules: Maintenance</b> is for archive and index creation.\n"
+"\n"
+"See section 5 of our manual for Module Manager detail, or ask for help via "
+"Live Chat, or (if no one is responsive in chat) send mail to our users' "
+"mailing list.\n"
+msgstr ""
 
-#: ../src/gnome2/navbar_book.c:359 ../src/gnome2/navbar_book_dialog.c:299
+#: ../src/gnome2/navbar_book.c:359 ../src/gnome2/navbar_book_dialog.c:300
 msgid "Go outward, to the section containing this one"
 msgstr ""
 
-#: ../src/gnome2/navbar_book.c:375 ../src/gnome2/navbar_book_dialog.c:315
+#: ../src/gnome2/navbar_book.c:375 ../src/gnome2/navbar_book_dialog.c:316
 msgid "Go to previous item"
 msgstr "Gå till föregående objekt"
 
-#: ../src/gnome2/navbar_book.c:390 ../src/gnome2/navbar_book_dialog.c:330
+#: ../src/gnome2/navbar_book.c:390 ../src/gnome2/navbar_book_dialog.c:331
 msgid "Go to next item"
 msgstr "Gå till nästa objekt"
 
-#: ../src/gnome2/navbar_book.c:406 ../src/gnome2/navbar_book_dialog.c:346
+#: ../src/gnome2/navbar_book.c:406 ../src/gnome2/navbar_book_dialog.c:347
 msgid "Go inward, to the first subsection"
 msgstr ""
 
-#. 0
-#: ../src/gnome2/sidebar.c:942 ../src/gnome2/sidebar.c:1110
-msgid "Open in a new tab"
-msgstr "Öppna i en ny flik"
+#: ../src/gnome2/navbar_versekey_dialog.c:864
+#: ../src/gnome2/navbar_versekey_editor.c:879
+#: ../src/gnome2/navbar_versekey_parallel.c:810
+msgid "Synchronize this window from main window"
+msgstr ""
 
-#: ../src/gnome2/sidebar.c:943 ../src/gnome2/sidebar.c:1111
-msgid "Open selected module in a new tab"
-msgstr "Öppna vald modul i en ny flik"
+#: ../src/gnome2/parallel_dialog.c:328 ../src/gnome2/preferences_dialog.c:1799
+msgid "Parallel"
+msgstr "Parallell"
 
-#. 1
-#: ../src/gnome2/sidebar.c:948
-msgid "Open in a separate window"
-msgstr ""
+#: ../src/gnome2/parallel_view.c:275
+msgid "Copy"
+msgstr "Kopiera"
 
-#: ../src/gnome2/sidebar.c:949
-#, fuzzy
-msgid "Open selected module in a separate ['dialog'] window"
-msgstr "Öppna vald modul i ett dialogfönster"
+#: ../src/gnome2/parallel_view.c:285
+msgid "Detach/Attach"
+msgstr "Koppla loss/fäst"
 
-#: ../src/gnome2/sidebar.c:955 ../src/gnome2/sidebar.c:1123
-msgid "View information about the selected dialog"
-msgstr "Visa information om det valda dialogfönstret"
+#: ../src/gnome2/parallel_view.c:291 ../ui/xi-menus.glade.h:53
+msgid "Module Options"
+msgstr "Modulinställningar"
 
-#: ../src/gnome2/sidebar.c:1046
-msgid "Simple"
-msgstr "Enkel"
+#. build change parallel modules submenu
+#: ../src/gnome2/parallel_view.c:306
+msgid "Change parallel 1"
+msgstr "Ändra parallell 1"
 
-#: ../src/gnome2/sidebar.c:1047
-msgid "Create a new simple prayer list"
-msgstr "Skapa en ny enkel bönelista"
+#: ../src/gnome2/parallel_view.c:308
+msgid "Change parallel 2"
+msgstr "Ändra parallell 2"
 
-#: ../src/gnome2/sidebar.c:1053
-msgid "Subject"
-msgstr "Rubrik"
+#: ../src/gnome2/parallel_view.c:310
+msgid "Change parallel 3"
+msgstr "Ändra parallell 3"
 
-#: ../src/gnome2/sidebar.c:1060
-msgid "Monthly"
-msgstr "Månatlig"
+#: ../src/gnome2/parallel_view.c:312
+msgid "Change parallel 4"
+msgstr "Ändra parallell 4"
 
-#: ../src/gnome2/sidebar.c:1061 ../src/gnome2/sidebar.c:1068
-#: ../src/gnome2/sidebar.c:1075
-msgid "Create a new prayer list"
-msgstr "Skapa en ny bönelista"
+#: ../src/gnome2/parallel_view.c:314
+msgid "Change parallel 5"
+msgstr "Ändra parallell 5"
 
-#: ../src/gnome2/sidebar.c:1067
-msgid "Daily Journal"
-msgstr "Daglig journal"
+#: ../src/gnome2/parallel_view.c:471 ../src/gnome2/sidebar.c:626
+#: ../src/gnome2/sidebar.c:632 ../src/gnome2/tabbed_browser.c:262
+#: ../src/main/sidebar.cc:646 ../src/main/sidebar.cc:1007
+#: ../src/main/sidebar.cc:1008 ../src/main/sidebar.cc:1009
+msgid "Parallel View"
+msgstr "Parallell vy"
+
+#: ../src/gnome2/preferences_dialog.c:1179
+#: ../src/gnome2/preferences_dialog.c:1217
+#: ../src/gnome2/preferences_dialog.c:1254
+#: ../src/gnome2/preferences_dialog.c:1289
+#: ../src/gnome2/preferences_dialog.c:1323
+#: ../src/gnome2/preferences_dialog.c:1356
+#: ../src/gnome2/preferences_dialog.c:1388
+#: ../src/gnome2/preferences_dialog.c:1421
+#: ../src/gnome2/preferences_dialog.c:1453
+#: ../src/gnome2/preferences_dialog.c:1487
+#: ../src/gnome2/preferences_dialog.c:1522
+#: ../src/gnome2/preferences_dialog.c:1557
+#: ../src/gnome2/preferences_dialog.c:1593
+#: ../src/gnome2/preferences_dialog.c:1631
+#: ../src/gnome2/preferences_dialog.c:2052
+msgid "-- Select --"
+msgstr "-- Välj --"
 
-#: ../src/gnome2/sidebar.c:1074
-msgid "Outlined Topic"
+#: ../src/gnome2/preferences_dialog.c:1652
+msgid "Locale will take effect after restart."
 msgstr ""
 
-#. 1
-#: ../src/gnome2/sidebar.c:1116 ../ui/xi-menus.glade.h:45
-msgid "Open in editor"
-msgstr "Öppna i redigerare"
+#: ../src/gnome2/preferences_dialog.c:1687 ../ui/prefs.glade.h:74
+msgid "Preferences"
+msgstr "Inställningar"
 
-#: ../src/gnome2/sidebar.c:1117
-msgid "Open selected module in a dialog"
-msgstr "Öppna vald modul i ett dialogfönster"
+#: ../src/gnome2/preferences_dialog.c:1769
+msgid "Fonts"
+msgstr "Typsnitt"
 
-#: ../src/gnome2/sidebar.c:1438 ../src/gnome2/bookmarks_treeview.c:934
-msgid "Bookmarks"
-msgstr "Bokmärken"
+#: ../src/gnome2/preferences_dialog.c:1772
+msgid "Color"
+msgstr "Färg"
 
-#: ../src/gnome2/sidebar.c:1446
-msgid "Search"
-msgstr "Sök"
+#: ../src/gnome2/preferences_dialog.c:1775
+msgid "Sizes"
+msgstr "Storlekar"
 
-#: ../src/gnome2/sidebar.c:1454
-msgid "Verse List"
-msgstr "Verslista"
+#: ../src/gnome2/preferences_dialog.c:1779
+msgid "General"
+msgstr "Allmänt"
+
+#: ../src/gnome2/preferences_dialog.c:1782 ../ui/prefs.glade.h:87
+msgid "Tabs and Panes"
+msgstr ""
+
+#: ../src/gnome2/preferences_dialog.c:1789
+msgid "Options"
+msgstr "Alternativ"
+
+#: ../src/gnome2/preferences_dialog.c:1796
+msgid "Main"
+msgstr "Allmänt"
+
+#: ../src/gnome2/preferences_dialog.c:1802
+msgid "Special"
+msgstr "Speciell"
 
-#: ../src/gnome2/search_dialog.c:61 ../src/main/search_dialog.cc:60
-#: ../src/main/search_sidebar.cc:54
+#: ../src/gnome2/search_dialog.c:68 ../src/main/search_dialog.cc:66
+#: ../src/main/search_sidebar.cc:61
 msgid "Searching the "
 msgstr "Söker i "
 
-#: ../src/gnome2/search_dialog.c:62 ../src/main/search_dialog.cc:61
-#: ../src/main/search_sidebar.cc:55
+#: ../src/gnome2/search_dialog.c:69 ../src/main/search_dialog.cc:67
+#: ../src/main/search_sidebar.cc:62
 msgid " Module"
-msgstr "-modulen"
+msgstr " -modulen"
 
-#: ../src/gnome2/search_dialog.c:63 ../src/main/search_dialog.cc:62
-#: ../src/main/search_sidebar.cc:56
+#: ../src/gnome2/search_dialog.c:70 ../src/main/search_dialog.cc:68
+#: ../src/main/search_sidebar.cc:63
 msgid "found in "
 msgstr "hittades i "
 
-#: ../src/gnome2/search_dialog.c:498
+#: ../src/gnome2/search_dialog.c:527
 msgid "Clear List?"
 msgstr "Rensa lista?"
 
-#: ../src/gnome2/search_dialog.c:499
+#: ../src/gnome2/search_dialog.c:528
 msgid "Are you sure you want to clear the module list?"
 msgstr "Är du säker på att du vill rensa modullistan?"
 
-#: ../src/gnome2/search_dialog.c:682
+#: ../src/gnome2/search_dialog.c:708
 msgid "The last module list may not be deleted"
 msgstr ""
 
-#: ../src/gnome2/search_dialog.c:699
+#: ../src/gnome2/search_dialog.c:726
 msgid "Delete list?"
 msgstr "Ta bort lista?"
 
-#: ../src/gnome2/search_dialog.c:700
+#: ../src/gnome2/search_dialog.c:727
 msgid "Are you sure you want to delete:"
 msgstr "Är du säker på att du vill ta bort:"
 
-#: ../src/gnome2/search_sidebar.c:189
+#: ../src/gnome2/search_sidebar.c:192
 msgid ""
 "This is an inclusive (\"AND\") search:\n"
 "Find matches showing all words."
 msgstr ""
 
-#: ../src/gnome2/search_sidebar.c:206
+#: ../src/gnome2/search_sidebar.c:209
 msgid "Search Module"
 msgstr "Sök i modul"
 
-#: ../src/gnome2/search_sidebar.c:220
+#: ../src/gnome2/search_sidebar.c:223
 msgid "Bible"
 msgstr "Bibel"
 
-#: ../src/gnome2/search_sidebar.c:229 ../ui/prefs.glade.h:35
+#: ../src/gnome2/search_sidebar.c:232 ../ui/prefs.glade.h:35
 msgid "Commentary"
 msgstr "Kommentar"
 
-#: ../src/gnome2/search_sidebar.c:243
+#: ../src/gnome2/search_sidebar.c:246
 msgid "Search Type"
 msgstr "Söktyp"
 
-#: ../src/gnome2/search_sidebar.c:257 ../ui/search-dialog.glade.h:64
+#: ../src/gnome2/search_sidebar.c:260 ../ui/search-dialog.glade.h:66
 msgid "Multi word"
 msgstr ""
 
-#: ../src/gnome2/search_sidebar.c:276 ../ui/search-dialog.glade.h:44
+#: ../src/gnome2/search_sidebar.c:279 ../ui/search-dialog.glade.h:44
 msgid "Exact phrase"
 msgstr "Specifik fras"
 
-#: ../src/gnome2/search_sidebar.c:290
+#: ../src/gnome2/search_sidebar.c:293
 msgid "Search Options"
 msgstr "Sökalternativ"
 
-#: ../src/gnome2/search_sidebar.c:318
+#: ../src/gnome2/search_sidebar.c:321
 msgid "Search Scope"
 msgstr "Sökomfattning"
 
-#: ../src/gnome2/search_sidebar.c:331
+#: ../src/gnome2/search_sidebar.c:334
 msgid "No scope"
 msgstr ""
 
-#: ../src/gnome2/search_sidebar.c:341
+#: ../src/gnome2/search_sidebar.c:344
 msgid "Use bounds"
 msgstr "Använd avgränsningar"
 
-#: ../src/gnome2/search_sidebar.c:350
+#: ../src/gnome2/search_sidebar.c:353
 msgid "Last search"
 msgstr "Föregående sökning"
 
-#: ../src/gnome2/search_sidebar.c:365
+#: ../src/gnome2/search_sidebar.c:368
 msgid "Bounds"
 msgstr "Avgränsningar"
 
-#: ../src/gnome2/search_sidebar.c:379
+#: ../src/gnome2/search_sidebar.c:382
 msgid "Lower"
 msgstr "Nedre"
 
-#: ../src/gnome2/search_sidebar.c:386
+#: ../src/gnome2/search_sidebar.c:389
 msgid "Upper"
 msgstr "Övre"
 
-#. info->stock_icon = GTK_STOCK_OPEN;
-#: ../src/gnome2/bookmark_dialog.c:145 ../src/gnome2/bookmarks_menu.c:471
-#: ../src/gnome2/bookmarks_menu.c:897 ../src/gnome2/bookmarks_menu.c:995
-#: ../src/gnome2/bookmarks_treeview.c:131 ../ui/editor_studypad.xml.h:2
-#: ../ui/xi-menus.glade.h:8
-msgid "Bookmark"
-msgstr "Bokmärk"
-
-#: ../src/gnome2/bookmark_dialog.c:147 ../src/gnome2/bookmarks_menu.c:997
-#: ../src/gnome2/bookmarks_treeview.c:132
-msgid "Enter Folder Name"
-msgstr "Ange mappnamn"
-
-#: ../src/gnome2/bookmark_dialog.c:149 ../src/gnome2/bookmarks_menu.c:999
-msgid "Folder Name"
-msgstr "Mappnamn"
-
-#: ../src/gnome2/bookmark_dialog.c:150 ../src/gnome2/bookmarks_menu.c:1000
-#: ../src/gnome2/bookmarks_treeview.c:134
-msgid "Folder: "
-msgstr "Mapp: "
-
-#: ../src/gnome2/preferences_dialog.c:1231
-#: ../src/gnome2/preferences_dialog.c:1269
-#: ../src/gnome2/preferences_dialog.c:1306
-#: ../src/gnome2/preferences_dialog.c:1341
-#: ../src/gnome2/preferences_dialog.c:1375
-#: ../src/gnome2/preferences_dialog.c:1408
-#: ../src/gnome2/preferences_dialog.c:1440
-#: ../src/gnome2/preferences_dialog.c:1473
-#: ../src/gnome2/preferences_dialog.c:1505
-#: ../src/gnome2/preferences_dialog.c:1539
-#: ../src/gnome2/preferences_dialog.c:1574
-#: ../src/gnome2/preferences_dialog.c:1609
-#: ../src/gnome2/preferences_dialog.c:1645
-#: ../src/gnome2/preferences_dialog.c:2045
-msgid "-- Select --"
-msgstr ""
-
-#: ../src/gnome2/preferences_dialog.c:1678 ../ui/prefs.glade.h:74
-msgid "Preferences"
-msgstr "Inställningar"
-
-#: ../src/gnome2/preferences_dialog.c:1760
-msgid "Fonts"
-msgstr "Typsnitt"
-
-#: ../src/gnome2/preferences_dialog.c:1763
-msgid "Color"
-msgstr "Färg"
-
-#: ../src/gnome2/preferences_dialog.c:1766
-#, fuzzy
-msgid "Sizes"
-msgstr "Storlek"
-
-#: ../src/gnome2/preferences_dialog.c:1770
-msgid "General"
-msgstr "Allmänt"
-
-#: ../src/gnome2/preferences_dialog.c:1773 ../ui/prefs.glade.h:85
-msgid "Tabs and Panes"
-msgstr ""
-
-#: ../src/gnome2/preferences_dialog.c:1780
-#, fuzzy
-msgid "Options"
-msgstr "Rubrik"
-
-#: ../src/gnome2/preferences_dialog.c:1787
-msgid "Main"
-msgstr "Allmänt"
-
-#: ../src/gnome2/preferences_dialog.c:1790 ../src/gnome2/parallel_dialog.c:635
-msgid "Parallel"
-msgstr "Parallell"
-
-#: ../src/gnome2/preferences_dialog.c:1793
-msgid "Special"
-msgstr ""
-
-#: ../src/gnome2/preferences_cell_renderer.c:398
-msgid "Text"
-msgstr "Text"
-
-#: ../src/gnome2/preferences_cell_renderer.c:400
-msgid "Text to render"
-msgstr ""
-
-#: ../src/gnome2/preferences_cell_renderer.c:406
-msgid "Pixbuf Object"
-msgstr "Pixbuf-objekt"
-
-#: ../src/gnome2/preferences_cell_renderer.c:408
-msgid "The pixbuf to render."
-msgstr ""
-
-#: ../src/gnome2/about_xiphos.c:132
-#, fuzzy
-msgid "Copyright 2000-2009 The Xiphos Development Team"
-msgstr "Copyright 2000-2008 The Xiphos Development Team"
-
-#: ../src/gnome2/about_xiphos.c:135
-#, fuzzy
-msgid ""
-"(formerly known as GnomeSword)\n"
-"\n"
-"Powered by The SWORD Project.\n"
-"We would like to thank Troy Griffitts and all the other folks who have given "
-"us The SWORD Project."
-msgstr ""
-"Vi vill tacka Troy Griffitts och alla andra som har gett oss  SWORD Project."
-
-#: ../src/gnome2/bookmarks_menu.c:457 ../src/gnome2/treekey-editor.c:321
-#: ../ui/xi-menus.glade.h:20
-msgid "Edit"
-msgstr "Redigera"
-
-#: ../src/gnome2/bookmarks_menu.c:474
-msgid "Folder name: "
-msgstr "Namn på mapp: "
-
-#: ../src/gnome2/bookmarks_menu.c:477
-msgid "Bookmark name: "
-msgstr "Namn på bokmärke: "
-
-#: ../src/gnome2/bookmarks_menu.c:480 ../src/gnome2/bookmarks_menu.c:905
-msgid "Verse: "
-msgstr "Vers: "
-
-#: ../src/gnome2/bookmarks_menu.c:481 ../src/gnome2/bookmarks_menu.c:906
-msgid "Module: "
-msgstr "Modul: "
-
-#: ../src/gnome2/bookmarks_menu.c:665
-msgid "Restore Bookmark Folder"
-msgstr "Återställ bokmärkesmapp"
-
-#: ../src/gnome2/bookmarks_menu.c:734
-msgid "Remove the selected folder"
-msgstr "Ta bort vald mapp"
-
-#: ../src/gnome2/bookmarks_menu.c:736
-msgid "(and all its contents)?"
-msgstr "(och allt av dess innehåll)?"
+#: ../src/gnome2/sidebar.c:1397
+msgid "Search"
+msgstr "Sök"
 
-#: ../src/gnome2/bookmarks_menu.c:739
-msgid "Remove the selected bookmark"
-msgstr "Ta bort valt bokmärke"
+#: ../src/gnome2/sidebar.c:1405
+msgid "Verse List"
+msgstr "Verslista"
 
-#: ../src/gnome2/bookmarks_menu.c:898
-msgid "Add"
-msgstr "Lägg till"
+#: ../src/gnome2/sidebar_dialog.c:139 ../src/gnome2/sidebar_dialog.c:148
+msgid "Sidebar"
+msgstr "Sidomeny"
 
-#: ../src/gnome2/bookmarks_menu.c:904
-msgid "Label: "
-msgstr "Etikett: "
+#: ../src/gnome2/splash.c:396
+msgid "Powered by the SWORD Project"
+msgstr "Byggt på SWORD Project"
 
-#: ../src/gnome2/treekey-editor.c:129 ../src/gnome2/treekey-editor.c:188
-#: ../src/gnome2/treekey-editor.c:274
-#, fuzzy
+#: ../src/gnome2/treekey-editor.c:137 ../src/gnome2/treekey-editor.c:196
+#: ../src/gnome2/treekey-editor.c:282
 msgid "Prayer List/Journal Item"
-msgstr "Bönelista/journal"
+msgstr ""
 
-#: ../src/gnome2/treekey-editor.c:130 ../src/gnome2/treekey-editor.c:189
-#: ../src/gnome2/treekey-editor.c:275
+#: ../src/gnome2/treekey-editor.c:138 ../src/gnome2/treekey-editor.c:197
+#: ../src/gnome2/treekey-editor.c:283
 msgid "New name"
 msgstr "Nytt namn"
 
-#: ../src/gnome2/treekey-editor.c:131 ../src/gnome2/treekey-editor.c:190
-#: ../src/gnome2/treekey-editor.c:276 ../src/main/prayerlists.cc:240
-msgid "Name: "
-msgstr "Namn: "
-
-#: ../src/gnome2/treekey-editor.c:245
+#: ../src/gnome2/treekey-editor.c:253
 msgid "Remove the selected item"
 msgstr "Ta bort markerat objekt"
 
-#: ../src/gnome2/treekey-editor.c:303
-msgid "Add Child"
+#: ../src/main/display.cc:259
+#, c-format
+msgid ""
+"Improperly encoded personal annotation label:\n"
+"'%s'"
 msgstr ""
 
-#: ../src/gnome2/treekey-editor.c:304 ../src/gnome2/treekey-editor.c:310
-msgid "Add an item"
-msgstr "Lägg till ett objekt"
-
-#: ../src/gnome2/treekey-editor.c:309
-msgid "Add Sibling"
+#: ../src/main/display.cc:386
+msgid ""
+"An image file's size could not be determined.\n"
+"Is ImageMagick's 'identify' not installed?\n"
+"(Or possibly the image is of type other than bmp/gif/jpg/png.)\n"
+"Xiphos cannot resize images to fit window."
 msgstr ""
 
-#: ../src/gnome2/treekey-editor.c:316
-msgid "Remove this item"
-msgstr "Ta bort detta objekt"
-
-#: ../src/gnome2/treekey-editor.c:322
-msgid "Edit this item"
-msgstr "Ändra detta objekt"
+#: ../src/main/display.cc:1043 ../src/main/display.cc:1095
+#: ../src/main/display.cc:1172 ../ui/export-dialog.glade.h:7
+msgid "Chapter"
+msgstr "Kapitel"
 
-#: ../src/gnome2/splash.c:363
-msgid "Powered by the SWORD Project"
-msgstr "Byggt på SWORD Project"
+#: ../src/main/main.c:119
+msgid "Xiphos does not understand more than one argument."
+msgstr "Xiphos förstår inte mer än ett argument."
 
-#: ../src/gnome2/splash.c:563
+#: ../src/main/main.c:161
 msgid "Initiating Gecko"
 msgstr "Initierar Gecko"
 
-#: ../src/gnome2/splash.c:580
-msgid "Loading settings"
-msgstr "Laddar inställningar"
-
-#: ../src/gnome2/splash.c:598
+#: ../src/main/main.c:167
 msgid "Building Interface"
 msgstr "Bygger gränssnitt"
 
-#: ../src/gnome2/splash.c:615
+#: ../src/main/main.c:171
 msgid "Starting Sword"
 msgstr "Startar Sword"
 
-#: ../src/gnome2/splash.c:632
+#: ../src/main/main.c:175
+msgid "Loading Settings"
+msgstr "Laddar inställningar"
+
+#: ../src/main/main.c:179
 msgid "Displaying Xiphos"
 msgstr "Visar Xiphos"
 
-#: ../src/gnome2/export_dialog.c:265 ../ui/export-dialog.glade.h:20
-msgid "Please check copyright before exporting!"
-msgstr "Vänligen kontrollera copyright före export!"
+#: ../src/main/module_dialogs.cc:227 ../src/main/previewer.cc:127
+#: ../src/main/previewer.cc:194 ../ui/prefs.glade.h:75
+msgid "Previewer"
+msgstr "Förhandsgranskare"
 
-#: ../src/gnome2/bookmarks_treeview.c:105
-#, fuzzy, c-format
-msgid "Search result: %s"
-msgstr "<b>Sökresultat</b>"
+#: ../src/main/module_dialogs.cc:292 ../src/main/module_dialogs.cc:416
+#: ../src/main/previewer.cc:269
+msgid "Footnote"
+msgstr "Fotnot"
 
-#: ../src/gnome2/about_trans.c:84
-msgid ""
-"Do you like using Xiphos to study the Bible? Would you like to see its "
-"display using your native language? You could translate Xiphos! \n"
-"\n"
-"We are always looking for contributions of new translations of Xiphos into "
-"other languages. If you are able to translate for us, please see the link "
-"below, contact us, and get involved with our efforts."
-msgstr ""
+#: ../src/main/module_dialogs.cc:298 ../src/main/module_dialogs.cc:421
+#: ../src/main/previewer.cc:281
+msgid "Cross Reference"
+msgstr "Korsreferens"
 
-#: ../src/gnome2/about_trans.c:98
-#, fuzzy
-msgid "About Xiphos Translation"
-msgstr "Om detta program"
+#: ../src/main/module_dialogs.cc:304 ../src/main/module_dialogs.cc:318
+#: ../src/main/module_dialogs.cc:426 ../src/main/module_dialogs.cc:438
+#: ../src/main/previewer.cc:287 ../src/main/previewer.cc:306
+msgid "Strongs"
+msgstr "Strongs"
 
-#: ../src/gnome2/about_trans.c:139
-msgid "See TRANSLATION-HOWTO in Xiphos source"
-msgstr ""
+#: ../src/main/module_dialogs.cc:310 ../src/main/module_dialogs.cc:329
+#: ../src/main/module_dialogs.cc:431 ../src/main/module_dialogs.cc:448
+#: ../src/main/previewer.cc:293 ../src/main/previewer.cc:319
+msgid "Morphology"
+msgstr "Morfologi"
 
-#: ../src/gnome2/about_trans.c:145
-msgid "Xiphos development"
-msgstr ""
+#: ../src/main/module_dialogs.cc:1081 ../src/main/url.cc:530
+msgid "Back to "
+msgstr "Tillbaka till "
 
-#: ../src/main/sword.cc:549
-msgid ""
-"Xiphos's file for language\n"
-"abbreviations is missing."
-msgstr ""
+#: ../src/main/parallel_view.cc:404 ../ui/xi-menus.glade.h:89
+msgid "Strong's Numbers"
+msgstr "Strongs nummer"
 
-#: ../src/main/sword.cc:556
-msgid ""
-"Xiphos's language abbreviation\n"
-"file cannot be opened."
-msgstr ""
+#: ../src/main/parallel_view.cc:414 ../ui/search-dialog.glade.h:52
+#: ../ui/xi-menus.glade.h:40
+msgid "Footnotes"
+msgstr "Fotnoter"
 
-#: ../src/main/sword.cc:567
-msgid ""
-"Xiphos cannot allocate space\n"
-"for language abbreviations."
+#: ../src/main/parallel_view.cc:424 ../ui/search-dialog.glade.h:64
+#: ../ui/xi-menus.glade.h:55
+msgid "Morphological Tags"
 msgstr ""
 
-#: ../src/main/sword.cc:574
-msgid ""
-"Xiphos cannot read the\n"
-"language abbreviation file."
+#: ../src/main/parallel_view.cc:434 ../ui/xi-menus.glade.h:44
+msgid "Hebrew Vowel Points"
 msgstr ""
 
-#: ../src/main/sword.cc:1202
-msgid "Daily devotional was requested, but there are none installed."
-msgstr "Dagliga andakter efterfrågades men inga är installerade."
-
-#: ../src/main/search_dialog.cc:129
-#, fuzzy, c-format
-msgid "Search result %s: %s"
-msgstr "Spara sökresultat som bokmärken"
+#: ../src/main/parallel_view.cc:444 ../ui/xi-menus.glade.h:43
+msgid "Hebrew Cantillation"
+msgstr ""
 
-#: ../src/main/search_dialog.cc:363
-msgid "Delete Range?"
-msgstr "Ta bort spännvid?"
+#: ../src/main/parallel_view.cc:454 ../ui/xi-menus.glade.h:41
+msgid "Greek Accents"
+msgstr ""
 
-#: ../src/main/search_dialog.cc:364
-msgid "Are you sure you want to delete this range?"
-msgstr "Är du säker på att du vill ta bort denna spännvidden?"
+#: ../src/main/parallel_view.cc:464
+msgid "Cross-references"
+msgstr "Korsreferens"
 
-#: ../src/main/search_dialog.cc:578 ../src/main/search_dialog.cc:1049
-#: ../src/main/search_dialog.cc:1052 ../src/main/search_dialog.cc:1074
-#: ../src/main/search_dialog.cc:1077
-msgid "Search: "
-msgstr "Sök: "
+#: ../src/main/parallel_view.cc:474 ../ui/xi-menus.glade.h:50
+msgid "Lemmas"
+msgstr ""
 
-#: ../src/main/search_dialog.cc:623
-msgid "Remove Module?"
-msgstr "Ta bort modul?"
+#: ../src/main/parallel_view.cc:484 ../ui/xi-menus.glade.h:42
+msgid "Headings"
+msgstr "Överskrifter"
 
-#: ../src/main/search_dialog.cc:624
-msgid "Are you sure you want to remove the selected module?"
-msgstr "Är du säker på att du vill ta bort vald modul?"
+#: ../src/main/parallel_view.cc:494
+msgid "Morpheme Segmentation"
+msgstr ""
 
-#: ../src/main/search_dialog.cc:1473
-#, c-format
-msgid ""
-"%s:\n"
-"No such module is installed.\n"
-"%s"
+#: ../src/main/parallel_view.cc:504 ../ui/xi-menus.glade.h:96
+msgid "Words of Christ in Red"
 msgstr ""
-"%s:\n"
-"Ingen sådan modul är installerad.\n"
-"%s"
 
-#: ../src/main/search_dialog.cc:1475
-msgid "Please adjust the module list."
-msgstr "Vänligen justera modullistan."
+#: ../src/main/parallel_view.cc:514 ../ui/xi-menus.glade.h:91
+msgid "Transliteration"
+msgstr ""
 
-#: ../src/main/search_dialog.cc:1491
-#, fuzzy, c-format
-msgid "No fast-search index exists for %s.%s%s"
-msgstr "Ta bort snabbsök-index för följande moduler:"
+#: ../src/main/parallel_view.cc:524
+msgid "Textual Variants"
+msgstr ""
 
-#: ../src/main/search_dialog.cc:1493
-msgid ""
-"\n"
-"Search on this module is now `multi word'."
+#: ../src/main/parallel_view.cc:532 ../ui/xi-menus.glade.h:70
+msgid "Primary Reading"
 msgstr ""
 
-#: ../src/main/search_dialog.cc:1494
-msgid ""
-"\n"
-"See the Module Manager, Maintenance pane."
+#: ../src/main/parallel_view.cc:541 ../ui/xi-menus.glade.h:84
+msgid "Secondary Reading"
 msgstr ""
 
-#: ../src/main/search_dialog.cc:1555
-msgid "Search finished"
-msgstr "Sökning slutförd"
+#: ../src/main/parallel_view.cc:550 ../ui/xi-menus.glade.h:9
+msgid "All Readings"
+msgstr ""
 
-#: ../src/main/main.c:109
-msgid "Xiphos does not understand more than one argument."
-msgstr "Xiphos förstår inte mer än ett argument."
+#: ../src/main/parallel_view.cc:884 ../src/main/parallel_view.cc:1136
+msgid "view context"
+msgstr "visa sammanhang"
 
-#: ../src/main/prayerlists.cc:71
+#: ../src/main/prayerlists.cc:74
 msgid "January"
 msgstr "Januari"
 
-#: ../src/main/prayerlists.cc:72
+#: ../src/main/prayerlists.cc:75
 msgid "February"
 msgstr "Februari"
 
-#: ../src/main/prayerlists.cc:73
+#: ../src/main/prayerlists.cc:76
 msgid "March"
 msgstr "Mars"
 
-#: ../src/main/prayerlists.cc:74
+#: ../src/main/prayerlists.cc:77
 msgid "April"
 msgstr "April"
 
-#: ../src/main/prayerlists.cc:75
+#: ../src/main/prayerlists.cc:78
 msgid "May"
 msgstr "Maj"
 
-#: ../src/main/prayerlists.cc:76
+#: ../src/main/prayerlists.cc:79
 msgid "June"
 msgstr "Juni"
 
-#: ../src/main/prayerlists.cc:77
+#: ../src/main/prayerlists.cc:80
 msgid "July"
 msgstr "Juli"
 
-#: ../src/main/prayerlists.cc:78
+#: ../src/main/prayerlists.cc:81
 msgid "August"
 msgstr "Augusti"
 
-#: ../src/main/prayerlists.cc:79
+#: ../src/main/prayerlists.cc:82
 msgid "September"
 msgstr "September"
 
-#: ../src/main/prayerlists.cc:80
+#: ../src/main/prayerlists.cc:83
 msgid "October"
 msgstr "Oktober"
 
-#: ../src/main/prayerlists.cc:81
+#: ../src/main/prayerlists.cc:84
 msgid "November"
 msgstr "November"
 
-#: ../src/main/prayerlists.cc:82
+#: ../src/main/prayerlists.cc:85
 msgid "December"
 msgstr "December"
 
-#: ../src/main/prayerlists.cc:121 ../src/main/sword_treekey.cc:332
+#: ../src/main/prayerlists.cc:124 ../src/main/sword_treekey.cc:332
 msgid "Growth"
 msgstr "Tillväxt"
 
-#: ../src/main/prayerlists.cc:122 ../src/main/sword_treekey.cc:333
+#: ../src/main/prayerlists.cc:125 ../src/main/sword_treekey.cc:333
 msgid "<b>For Growth</b><br>"
 msgstr "<b>För tillväxt</b><br>"
 
-#: ../src/main/prayerlists.cc:123 ../src/main/prayerlists.cc:380
+#: ../src/main/prayerlists.cc:126 ../src/main/prayerlists.cc:383
 #: ../src/main/sword_treekey.cc:334
 msgid "Salvation"
 msgstr "Frälsning"
 
-#: ../src/main/prayerlists.cc:124 ../src/main/sword_treekey.cc:335
+#: ../src/main/prayerlists.cc:127 ../src/main/sword_treekey.cc:335
 msgid "<b>For Salvation</b><br>"
 msgstr "<b>För frälsning</b><br>"
 
-#: ../src/main/prayerlists.cc:125 ../src/main/prayerlists.cc:384
+#: ../src/main/prayerlists.cc:128 ../src/main/prayerlists.cc:387
 #: ../src/main/sword_treekey.cc:336
 msgid "Health"
 msgstr "Hälsa"
 
-#: ../src/main/prayerlists.cc:126 ../src/main/sword_treekey.cc:337
+#: ../src/main/prayerlists.cc:129 ../src/main/sword_treekey.cc:337
 msgid "<b>For Health</b><br>"
 msgstr "<b>För hälsa</b><br>"
 
-#: ../src/main/prayerlists.cc:127
+#: ../src/main/prayerlists.cc:130
 msgid "Misc"
 msgstr "Övrigt"
 
-#: ../src/main/prayerlists.cc:128 ../src/main/sword_treekey.cc:339
+#: ../src/main/prayerlists.cc:131 ../src/main/sword_treekey.cc:339
 msgid "<b>Miscellaneous</b><br>"
 msgstr "<b>Övrigt</b><br>"
 
-#: ../src/main/prayerlists.cc:136
+#: ../src/main/prayerlists.cc:139
 msgid "Point x"
 msgstr "Punkt x"
 
-#: ../src/main/prayerlists.cc:137
+#: ../src/main/prayerlists.cc:140
 msgid "<b>(x)</b><br>"
 msgstr ""
 
-#: ../src/main/prayerlists.cc:138
+#: ../src/main/prayerlists.cc:141
 msgid "Point y"
 msgstr "Punkt y"
 
-#: ../src/main/prayerlists.cc:139
+#: ../src/main/prayerlists.cc:142
 msgid "<b>(y)</b><br>"
 msgstr ""
 
-#: ../src/main/prayerlists.cc:140
+#: ../src/main/prayerlists.cc:143
 msgid "Point z"
 msgstr "Punkt z"
 
-#: ../src/main/prayerlists.cc:141
+#: ../src/main/prayerlists.cc:144
 msgid "<b>(z)</b><br>"
 msgstr ""
 
-#: ../src/main/prayerlists.cc:149
+#: ../src/main/prayerlists.cc:152
 msgid "Minor Topic 1"
 msgstr ""
 
-#: ../src/main/prayerlists.cc:150
+#: ../src/main/prayerlists.cc:153
 msgid "<b>Subtopic 1</b><br>"
 msgstr ""
 
-#: ../src/main/prayerlists.cc:152
+#: ../src/main/prayerlists.cc:155
 msgid "Minor Topic 2"
 msgstr ""
 
-#: ../src/main/prayerlists.cc:153
+#: ../src/main/prayerlists.cc:156
 msgid "<b>Subtopic 2</b><br>"
 msgstr ""
 
-#: ../src/main/prayerlists.cc:155
+#: ../src/main/prayerlists.cc:158
 msgid "Minor Topic 3"
 msgstr ""
 
-#: ../src/main/prayerlists.cc:156
+#: ../src/main/prayerlists.cc:159
 msgid "<b>Subtopic 3</b><br>"
 msgstr ""
 
-#: ../src/main/prayerlists.cc:158
+#: ../src/main/prayerlists.cc:161
 msgid "Minor Topic 4"
 msgstr ""
 
-#: ../src/main/prayerlists.cc:159
+#: ../src/main/prayerlists.cc:162
 msgid "<b>Subtopic 4</b><br>"
 msgstr ""
 
-#: ../src/main/prayerlists.cc:239
+#: ../src/main/prayerlists.cc:242
 msgid "Name for new prayer list or journal"
 msgstr "Namn på ny bönelista/journal"
 
-#: ../src/main/prayerlists.cc:254
-msgid "Module names must contain [A-Za-z0-9_] only."
-msgstr "Modulnamn kan endast innehålla [A-Za-z0-9_]."
-
-#: ../src/main/prayerlists.cc:261
-msgid "Xiphos already knows a module by that name."
-msgstr "Xiphos känner redan till en modul med det namnet."
-
-#: ../src/main/prayerlists.cc:270
+#: ../src/main/prayerlists.cc:273
 msgid "Xiphos finds that prayer list already."
 msgstr ""
 
-#: ../src/main/prayerlists.cc:283
-#, fuzzy, c-format
+#: ../src/main/prayerlists.cc:286
+#, c-format
 msgid ""
 "Xiphos cannot create module's path:\n"
 "%s"
-msgstr "kan inte skapa sökväg\n"
+msgstr ""
 
-#: ../src/main/prayerlists.cc:323
+#: ../src/main/prayerlists.cc:326
 msgid "A basic prayer list. \\par\\par Module created by Xiphos."
 msgstr "En enkel bönelista. \\par\\par Modul skapad av Xiphos."
 
-#: ../src/main/prayerlists.cc:324
-#, fuzzy
+#: ../src/main/prayerlists.cc:327
 msgid "BasicPrayerList"
-msgstr "MinBönelista"
+msgstr ""
 
-#: ../src/main/prayerlists.cc:338
+#: ../src/main/prayerlists.cc:341
 msgid "MyPrayerList"
 msgstr "MinBönelista"
 
-#: ../src/main/prayerlists.cc:339
+#: ../src/main/prayerlists.cc:342
 msgid ""
-"<b>People:</b><br>Bob<br>Sam<br>Sue<br><br><b>Church:</"
-"b><br>pews<br>fellowship<br>Bibles for missionaries<br><br><br>"
+"<b>People:</b><br>Bob<br>Sam<br>Sue<br><br><b>Church:</b><br>pews<br>fellowsh"
+"ip<br>Bibles for missionaries<br><br><br>"
 msgstr ""
-"<b>Personer:</b><br>Anna<br>Johannes<br>Lars<br><br><b>Kyrkan:</"
-"b><br>pews<br>fellowship<br>Bibles for missionaries<br><br><br>"
+"<b>Personer:</b><br>Anna<br>Johannes<br>Lars<br><br><b>Kyrkan:</b><br>pews<br"
+">fellowship<br>Bibles for missionaries<br><br><br>"
 
-#: ../src/main/prayerlists.cc:365
+#: ../src/main/prayerlists.cc:368
 msgid "A subject-based prayer list. \\par\\par Module created by Xiphos."
 msgstr "En ämnebaserad bönelista. \\par\\par Modul skapad av Xiphos."
 
-#: ../src/main/prayerlists.cc:366
-#, fuzzy
+#: ../src/main/prayerlists.cc:369
 msgid "SubjectPrayerList"
-msgstr "MinBönelista"
+msgstr ""
 
-#: ../src/main/prayerlists.cc:381
+#: ../src/main/prayerlists.cc:384
 msgid "Bob<br>Sam<br>Sue<br>John<br>"
 msgstr "Bob<br>Samuel<br>Birgitta<br>Stefan<br>"
 
-#: ../src/main/prayerlists.cc:382
+#: ../src/main/prayerlists.cc:385
 msgid "Spiritual Growth"
 msgstr "Andlig tillväxt"
 
-#: ../src/main/prayerlists.cc:383
+#: ../src/main/prayerlists.cc:386
 msgid "Mike<br>Steve<br>"
 msgstr "Adam<br>Dennis<br>"
 
-#: ../src/main/prayerlists.cc:385
+#: ../src/main/prayerlists.cc:388
 msgid "Sue<br>John<br>"
 msgstr "Josefin<br>Bertil<br>"
 
-#: ../src/main/prayerlists.cc:411
+#: ../src/main/prayerlists.cc:414
 msgid "A monthly prayer list. \\par\\par Module created by Xiphos."
 msgstr "En månatlig bönelista. \\par\\par Modul skapad av Xiphos."
 
-#: ../src/main/prayerlists.cc:412
-#, fuzzy
+#: ../src/main/prayerlists.cc:415
 msgid "MonthlyPrayerList"
-msgstr "MinBönelista"
+msgstr ""
 
-#: ../src/main/prayerlists.cc:463
+#: ../src/main/prayerlists.cc:466
 msgid "A daily journal. \\par\\par Module created by Xiphos."
 msgstr "En daglig journal. \\par\\par Modul skapad av Xiphos."
 
-#: ../src/main/prayerlists.cc:464
-#, fuzzy
+#: ../src/main/prayerlists.cc:467
 msgid "DailyJournal"
-msgstr "Daglig journal"
+msgstr ""
 
-#: ../src/main/prayerlists.cc:528
+#: ../src/main/prayerlists.cc:531
 msgid "An outlined topic (e.g. sermon). \\par\\par Module created by Xiphos."
-msgstr "An outlined topic (t.ex. predikan). \\par\\par Modul skapad av Xiphos."
+msgstr ""
+"An outlined topic (t.ex. predikan). \\par\\par Modul skapad av Xiphos."
 
-#: ../src/main/prayerlists.cc:529
+#: ../src/main/prayerlists.cc:532
 msgid "OutlinedTopic"
 msgstr ""
 
-#: ../src/main/prayerlists.cc:543
+#: ../src/main/prayerlists.cc:546
 msgid "Major Topic A"
 msgstr ""
 
-#: ../src/main/prayerlists.cc:544
+#: ../src/main/prayerlists.cc:547
 msgid "<b>Major Topic A</b><br>"
 msgstr ""
 
-#: ../src/main/prayerlists.cc:546
+#: ../src/main/prayerlists.cc:549
 msgid "Major Topic B"
 msgstr ""
 
-#: ../src/main/prayerlists.cc:547
+#: ../src/main/prayerlists.cc:550
 msgid "<b>Major Topic B</b><br>"
 msgstr ""
 
-#: ../src/main/prayerlists.cc:549
+#: ../src/main/prayerlists.cc:552
 msgid "Major Topic C"
 msgstr ""
 
-#: ../src/main/prayerlists.cc:550
+#: ../src/main/prayerlists.cc:553
 msgid "<b>Major Topic C</b><br>"
 msgstr ""
 
-#: ../src/main/xml.c:80 ../src/main/xml.c:465
-#, c-format
-msgid "Document not created successfully. \n"
+#: ../src/main/previewer.cc:275
+msgid "User Annotation"
 msgstr ""
 
-#: ../src/main/xml.c:89
-msgid "Personal"
-msgstr "Personliga"
-
-#: ../src/main/xml.c:90
-msgid "What must I do to be saved?"
-msgstr "Vad måste jag göra för att bli räddad?"
-
-#: ../src/main/xml.c:92 ../src/main/xml.c:93
-msgid "Acts 16:31"
-msgstr "Apg 16:31"
-
-#: ../src/main/xml.c:97 ../src/main/xml.c:98
-msgid "Eph 2:8"
-msgstr "Ef 2:8"
-
-#: ../src/main/xml.c:102 ../src/main/xml.c:103
-msgid "Romans 1:16"
-msgstr "Romarbrevet 1:16"
-
-#: ../src/main/xml.c:106
-msgid "What is the Gospel?"
-msgstr "Vad är evangeliet?"
-
-#: ../src/main/xml.c:108 ../src/main/xml.c:109
-msgid "1 Cor 15:1-4"
-msgstr "1 Kor 15:1-4"
-
-#: ../src/main/xml.c:413 ../src/main/xml.c:1078
+#: ../src/main/search_dialog.cc:212
 #, c-format
-msgid "Document not parsed successfully. \n"
-msgstr ""
-
-#: ../src/main/xml.c:419 ../src/main/xml.c:681 ../src/main/xml.c:959
-#: ../src/main/xml.c:1138
-#, c-format
-msgid "empty document \n"
-msgstr "tomt dokument \n"
-
-#: ../src/main/xml.c:425
-#, c-format
-msgid "wrong type, root node != SwordBookmarks\n"
+msgid "Search result %s: %s"
 msgstr ""
 
-#: ../src/main/xml.c:479
-msgid "Old Testament"
-msgstr "Gamla Testamentet"
+#: ../src/main/search_dialog.cc:444
+msgid "Delete Range?"
+msgstr "Ta bort spännvid?"
 
-#: ../src/main/xml.c:481
-msgid "Gen - Mal"
-msgstr "Mos - Mal"
+#: ../src/main/search_dialog.cc:445
+msgid "Are you sure you want to delete this range?"
+msgstr "Är du säker på att du vill ta bort denna spännvidden?"
 
-#: ../src/main/xml.c:487
-msgid "New Testament"
-msgstr "Nya Testamentet"
+#: ../src/main/search_dialog.cc:659 ../src/main/search_dialog.cc:1130
+#: ../src/main/search_dialog.cc:1133 ../src/main/search_dialog.cc:1155
+#: ../src/main/search_dialog.cc:1158
+msgid "Search: "
+msgstr "Sök: "
 
-#: ../src/main/xml.c:489
-msgid "Mat - Rev"
-msgstr "Mat - Upp"
+#: ../src/main/search_dialog.cc:704
+msgid "Remove Module?"
+msgstr "Ta bort modul?"
 
-#: ../src/main/xml.c:497
-msgid "Sample Module List"
-msgstr ""
+#: ../src/main/search_dialog.cc:705
+msgid "Are you sure you want to remove the selected module?"
+msgstr "Är du säker på att du vill ta bort vald modul?"
 
-#: ../src/main/xml.c:687 ../src/main/xml.c:965
+#: ../src/main/search_dialog.cc:1560
 #, c-format
-msgid "wrong type, root node != %s\n"
-msgstr ""
-
-#: ../src/main/display.cc:278
 msgid ""
-"An image file's size could not be determined.\n"
-"Is ImageMagick's 'identify' not installed?\n"
-"(Or possibly the image is of type other than bmp/gif/jpg/png.)\n"
-"Xiphos cannot resize images to fit window."
-msgstr ""
-
-#: ../src/main/display.cc:931 ../src/main/display.cc:993
-#: ../src/main/display.cc:1081 ../src/main/display.cc:1089
-#: ../ui/export-dialog.glade.h:7
-msgid "Chapter"
-msgstr "Kapitel"
-
-#: ../src/main/previewer.cc:122 ../src/main/module_dialogs.cc:231
-#: ../ui/prefs.glade.h:75
-msgid "Previewer"
-msgstr "Förhandsgranskare"
-
-#: ../src/main/previewer.cc:197 ../src/main/module_dialogs.cc:297
-#: ../src/main/module_dialogs.cc:423
-msgid "Footnote"
-msgstr "Fotnot"
-
-#: ../src/main/previewer.cc:203 ../src/main/module_dialogs.cc:303
-#: ../src/main/module_dialogs.cc:428
-msgid "Cross Reference"
-msgstr ""
-
-#: ../src/main/previewer.cc:209 ../src/main/previewer.cc:228
-#: ../src/main/module_dialogs.cc:309 ../src/main/module_dialogs.cc:323
-#: ../src/main/module_dialogs.cc:433 ../src/main/module_dialogs.cc:445
-msgid "Strongs"
-msgstr ""
-
-#: ../src/main/previewer.cc:215 ../src/main/previewer.cc:241
-#: ../src/main/module_dialogs.cc:315 ../src/main/module_dialogs.cc:334
-#: ../src/main/module_dialogs.cc:438 ../src/main/module_dialogs.cc:455
-msgid "Morphology"
-msgstr "Morfologi"
-
-#: ../src/main/module_dialogs.cc:1104 ../src/main/url.cc:543
-msgid "Back to "
-msgstr "Tillbaka till "
-
-#: ../src/main/search_sidebar.cc:93
-msgid "matches"
-msgstr ""
-
-#: ../src/main/parallel_view.cc:398 ../ui/xi-menus.glade.h:67
-msgid "Strong's Numbers"
-msgstr ""
-
-#: ../src/main/parallel_view.cc:408 ../ui/search-dialog.glade.h:50
-#: ../ui/xi-menus.glade.h:25
-msgid "Footnotes"
-msgstr "Fotnoter"
-
-#: ../src/main/parallel_view.cc:418 ../ui/search-dialog.glade.h:62
-#: ../ui/xi-menus.glade.h:39
-msgid "Morphological Tags"
-msgstr ""
-
-#: ../src/main/parallel_view.cc:428 ../ui/xi-menus.glade.h:29
-msgid "Hebrew Vowel Points"
-msgstr ""
-
-#: ../src/main/parallel_view.cc:438 ../ui/xi-menus.glade.h:28
-msgid "Hebrew Cantillation"
-msgstr ""
-
-#: ../src/main/parallel_view.cc:448 ../ui/xi-menus.glade.h:26
-msgid "Greek Accents"
-msgstr ""
-
-#: ../src/main/parallel_view.cc:458
-#, fuzzy
-msgid "Cross-references"
-msgstr "Inställningar"
-
-#: ../src/main/parallel_view.cc:468 ../ui/xi-menus.glade.h:35
-msgid "Lemmas"
-msgstr ""
-
-#: ../src/main/parallel_view.cc:478 ../ui/xi-menus.glade.h:27
-msgid "Headings"
-msgstr "Överskrifter"
-
-#: ../src/main/parallel_view.cc:488
-msgid "Morpheme Segmentation"
-msgstr ""
-
-#: ../src/main/parallel_view.cc:498 ../ui/xi-menus.glade.h:73
-msgid "Words of Christ in Red"
-msgstr ""
-
-#: ../src/main/parallel_view.cc:508 ../ui/xi-menus.glade.h:68
-#, fuzzy
-msgid "Transliteration"
-msgstr "Om detta program"
-
-#: ../src/main/parallel_view.cc:518
-msgid "Textual Variants"
-msgstr ""
-
-#: ../src/main/parallel_view.cc:526 ../ui/xi-menus.glade.h:49
-msgid "Primary Reading"
-msgstr ""
-
-#: ../src/main/parallel_view.cc:535 ../ui/xi-menus.glade.h:63
-msgid "Secondary Reading"
-msgstr ""
-
-#: ../src/main/parallel_view.cc:544 ../ui/xi-menus.glade.h:5
-msgid "All Readings"
+"%s:\n"
+"No such module is installed.\n"
+"%s"
 msgstr ""
+"%s:\n"
+"Ingen sådan modul är installerad.\n"
+"%s"
 
-#: ../src/main/parallel_view.cc:878 ../src/main/parallel_view.cc:1130
-msgid "view context"
-msgstr "visa sammanhang"
-
-#: ../src/main/url.cc:99
-msgid "URL not found:"
-msgstr "URL hittades inte: "
+#: ../src/main/search_dialog.cc:1562
+msgid "Please adjust the module list."
+msgstr "Vänligen justera modullistan."
 
-#: ../src/main/url.cc:194
+#: ../src/main/search_dialog.cc:1578
 #, c-format
-msgid "Xiphos could not execute %s"
-msgstr "Xiphos kunde inte köra %s"
-
-#: ../src/main/url.cc:202
-msgid "Viewer error:\n"
+msgid "No fast-search index exists for %s.%s%s"
 msgstr ""
 
-#: ../src/main/url.cc:278
-#, c-format
-msgid "Show %s in main window"
-msgstr "Visa %s i huvudfönstret"
-
-#: ../src/main/tab_history.c:97
-msgid "H_istory/<Separator>"
+#: ../src/main/search_dialog.cc:1580
+msgid ""
+"\n"
+"Search on this module is now `multi word'."
 msgstr ""
 
-#: ../src/main/tab_history.c:99
-msgid "H_istory/C_lear"
-msgstr "H_istorik/Rensa"
-
-#: ../src/main/tab_history.c:224
-msgid "Clear History"
-msgstr "Rensa historik"
+#: ../src/main/search_dialog.cc:1581
+msgid ""
+"\n"
+"See the Module Manager, Maintenance pane."
+msgstr ""
 
-#: ../src/main/sidebar.cc:375
-msgid "verse"
-msgstr "vers"
+#: ../src/main/search_dialog.cc:1644
+msgid "Search finished"
+msgstr "Sökning slutförd"
 
-#: ../src/main/sidebar.cc:437
-msgid "chapter"
-msgstr "kapitel"
+#: ../src/main/search_sidebar.cc:100
+msgid "matches"
+msgstr "matchar"
 
-#: ../src/main/settings.c:56
+#: ../src/main/settings.c:60
 msgid ""
 "Welcome to Xiphos.\n"
 "\n"
@@ -1695,28 +1728,11 @@ msgstr ""
 "\n"
 "Får Xiphos starta modulhanteraren så att du kan installera en Bibel?"
 
-#: ../src/main/settings.c:109
+#: ../src/main/settings.c:105
 msgid "$HOME is not set!"
 msgstr "Miljövariabeln $HOME är inte satt!"
 
-#: ../src/main/settings.c:124
-msgid "Xiphos has renamed .xiphos-2.0 to .xiphos"
-msgstr "Xiphos har ändrat namn på .xiphos-2.0 till .xiphos"
-
-#: ../src/main/settings.c:127
-#, c-format
-msgid ""
-"Xiphos can not rename  .xiphos-2.0 to .xiphos:\n"
-"%s\n"
-"\n"
-"Xiphos cannot continue."
-msgstr ""
-"Xiphos kan inte ändra namn på  .xiphos-2.0 till .xiphos:\n"
-"%s\n"
-"\n"
-"Xiphos kan inte fortsätta."
-
-#: ../src/main/settings.c:135
+#: ../src/main/settings.c:120
 #, c-format
 msgid ""
 "Xiphos can not create  .xiphos:\n"
@@ -1729,13 +1745,12 @@ msgstr ""
 "\n"
 "Xiphos kan inte fortsätta."
 
-#: ../src/main/settings.c:148 ../src/main/settings.c:156
-#: ../src/main/settings.c:164
-#, fuzzy
+#: ../src/main/settings.c:133 ../src/main/settings.c:142
+#: ../src/main/settings.c:151
 msgid "can not create "
-msgstr "kan inte skapa sökväg\n"
+msgstr ""
 
-#: ../src/main/settings.c:196
+#: ../src/main/settings.c:194
 msgid ""
 "There are still no Bibles installed.\n"
 "Evidently, you declined to install any.\n"
@@ -1751,11 +1766,11 @@ msgstr ""
 "Xiphos cannot proceed,\n"
 "and will now exit."
 
-#: ../src/main/settings.c:200
+#: ../src/main/settings.c:198
 msgid "Bible module installation complete."
 msgstr "Installation av bibelmodul slutförd."
 
-#: ../src/main/settings.c:203
+#: ../src/main/settings.c:201
 msgid ""
 "Without any Bible modules to display,\n"
 "Xiphos cannot proceed,\n"
@@ -1765,95 +1780,179 @@ msgstr ""
 "Xiphos kan inte fortsätta,\n"
 "och kommer nu att avslutas."
 
-#. *****************************************************************************
-#. * Name
-#. *    gconf_setup
-#. *
-#. * Synopsis
-#. *   #include "main/settings.h"
-#. *
-#. *   void gconf_setup()
-#. *
-#. * Description
-#. *   verifies and initializes the GConf subsystem, so that "sword://" and
-#. *   similar can be handled by url-comprehending programs such as browsers.
-#. *   dialogs for permission/success/failure => conditional on debug build.
-#. *
-#. * Return value
-#. *   void
-#.
-#: ../src/main/settings.c:816
+#: ../src/main/sidebar.cc:399
+msgid "verse"
+msgstr "vers"
+
+#: ../src/main/sidebar.cc:461
+msgid "chapter"
+msgstr "kapitel"
+
+#: ../src/main/sword.cc:537
 msgid ""
-"URL references using \"sword://\" (similar to web page\n"
-"references) can be used by programs to look up\n"
-"scripture references. Your system currently has no\n"
-"program set to handle these references.\n"
-"\n"
-"Would you like Xiphos to set itself as the\n"
-"program to handle these references?"
+"Xiphos's file for language\n"
+"abbreviations is missing."
 msgstr ""
 
-#: ../src/main/settings.c:818
+#: ../src/main/sword.cc:544
 msgid ""
-"Xiphos has successfully set itself\n"
-"as the handler of sword:// and bible:// URLs.\n"
-"\n"
-"You may wish to run the program \"gconf-editor\"\n"
-"to examine keys under /desktop/gnome/url-handlers,\n"
-"if you need to change these."
+"Xiphos's language abbreviation\n"
+"file cannot be opened."
 msgstr ""
-"Xiphos lyckades ställa in sig själv som hanterare\n"
-"för sword:// och bible:// URL:er.\n"
-"\n"
-"Du kan köra programmet \"gconf-editor\"\n"
-"för att granska nycklar under /desktop/gnome/url-handlers om du behöver "
-"ändra dessa."
 
-#: ../src/main/settings.c:871
-#, c-format
+#: ../src/main/sword.cc:557
 msgid ""
-"Xiphos failed to complete handler init for key #%d:\n"
-"%s"
+"Xiphos cannot allocate space\n"
+"for language abbreviations."
+msgstr ""
+
+#: ../src/main/sword.cc:564
+msgid ""
+"Xiphos cannot read the\n"
+"language abbreviation file."
+msgstr ""
+
+#: ../src/main/sword.cc:642
+msgid "No matching locale found for"
+msgstr ""
+
+#: ../src/main/sword.cc:644
+msgid "Book names and menus may not be translated"
+msgstr ""
+
+#: ../src/main/sword.cc:1232
+msgid "Daily devotional was requested, but there are none installed."
+msgstr "Dagliga andakter efterfrågades men inga är installerade."
+
+#: ../src/main/tab_history.c:219
+msgid "Clear History"
+msgstr "Rensa historik"
+
+#: ../src/main/url.cc:101
+msgid "URL not found:"
+msgstr "URL hittades inte:"
+
+#: ../src/main/url.cc:191
+#, c-format
+msgid "Xiphos could not execute %s"
+msgstr "Xiphos kunde inte köra %s"
+
+#: ../src/main/url.cc:199
+msgid "Viewer error:\n"
+msgstr ""
+
+#: ../src/main/url.cc:272
+#, c-format
+msgid "Show %s in main window"
+msgstr "Visa %s i huvudfönstret"
+
+#: ../src/main/xml.c:80 ../src/main/xml.c:464
+#, c-format
+msgid "Document not created successfully. \n"
+msgstr ""
+
+#: ../src/main/xml.c:89
+msgid "Personal"
+msgstr "Personliga"
+
+#: ../src/main/xml.c:90
+msgid "What must I do to be saved?"
+msgstr "Vad måste jag göra för att bli räddad?"
+
+#: ../src/main/xml.c:92 ../src/main/xml.c:93
+msgid "Acts 16:31"
+msgstr "Apg 16:31"
+
+#: ../src/main/xml.c:97 ../src/main/xml.c:98
+msgid "Eph 2:8,9"
+msgstr ""
+
+#: ../src/main/xml.c:102 ../src/main/xml.c:103
+msgid "Romans 1:16"
+msgstr "Romarbrevet 1:16"
+
+#: ../src/main/xml.c:106
+msgid "What is the Gospel?"
+msgstr "Vad är evangeliet?"
+
+#: ../src/main/xml.c:108 ../src/main/xml.c:109
+msgid "1 Cor 15:1-4"
+msgstr "1 Kor 15:1-4"
+
+#: ../src/main/xml.c:413 ../src/main/xml.c:1144
+#, c-format
+msgid "Document not parsed successfully. \n"
+msgstr ""
+
+#: ../src/main/xml.c:419 ../src/main/xml.c:747 ../src/main/xml.c:1025
+#: ../src/main/xml.c:1204
+#, c-format
+msgid "empty document \n"
+msgstr "tomt dokument \n"
+
+#: ../src/main/xml.c:425
+#, c-format
+msgid "wrong type, root node != SwordBookmarks\n"
+msgstr ""
+
+#: ../src/main/xml.c:476
+msgid "Old Testament"
+msgstr "Gamla Testamentet"
+
+#: ../src/main/xml.c:477
+msgid "Gen - Mal"
+msgstr "Mos - Mal"
+
+#: ../src/main/xml.c:482
+msgid "New Testament"
+msgstr "Nya Testamentet"
+
+#: ../src/main/xml.c:483
+msgid "Mat - Rev"
+msgstr "Mat - Upp"
+
+#: ../src/main/xml.c:489
+msgid "Sample Module List"
+msgstr ""
+
+#: ../src/main/xml.c:753 ../src/main/xml.c:1031
+#, c-format
+msgid "wrong type, root node != %s\n"
 msgstr ""
 
 #: ../ui/bookmarks.glade.h:1
 msgid "Add Bookmark"
 msgstr "Lägg till bokmärke"
 
-#: ../ui/bookmarks.glade.h:2
-#, fuzzy
+#: ../ui/bookmarks.glade.h:2 ../ui/markverse.glade.h:1
 msgid "Bookmark Dialog"
-msgstr "Bokmärk"
+msgstr ""
 
 #: ../ui/bookmarks.glade.h:3
-#, fuzzy
 msgid "Bookmark Folder Treeview"
-msgstr "Återställ bokmärkesmapp"
+msgstr ""
 
-#: ../ui/bookmarks.glade.h:4
-#, fuzzy
+#: ../ui/bookmarks.glade.h:4 ../ui/markverse.glade.h:2
 msgid "Cancel Bookmark"
-msgstr "Infoga bokmärke"
+msgstr ""
 
-#: ../ui/bookmarks.glade.h:5
+#: ../ui/bookmarks.glade.h:5 ../ui/markverse.glade.h:3
 msgid "Create new folder"
 msgstr "Skapa ny mapp"
 
 #: ../ui/bookmarks.glade.h:6
-#, fuzzy
 msgid "Label Entry"
-msgstr "Etikett: "
+msgstr ""
 
 #: ../ui/bookmarks.glade.h:7
 msgid "Label:"
 msgstr "Etikett:"
 
-#: ../ui/bookmarks.glade.h:8
-#, fuzzy
+#: ../ui/bookmarks.glade.h:8 ../ui/markverse.glade.h:6
 msgid "Module Entry"
-msgstr "Modul: "
+msgstr ""
 
-#: ../ui/bookmarks.glade.h:9
+#: ../ui/bookmarks.glade.h:9 ../ui/markverse.glade.h:7
 msgid "Module:"
 msgstr "Modul:"
 
@@ -1861,16 +1960,16 @@ msgstr "Modul:"
 msgid "New ..."
 msgstr "Ny ..."
 
-#: ../ui/bookmarks.glade.h:11 ../ui/xi-menus.glade.h:40
+#: ../ui/bookmarks.glade.h:11 ../ui/markverse.glade.h:8
+#: ../ui/xi-menus.glade.h:56
 msgid "New Folder"
 msgstr "Ny mapp"
 
-#: ../ui/bookmarks.glade.h:12
-#, fuzzy
+#: ../ui/bookmarks.glade.h:12 ../ui/markverse.glade.h:10
 msgid "Verse Entry"
-msgstr "Verslista"
+msgstr ""
 
-#: ../ui/bookmarks.glade.h:13
+#: ../ui/bookmarks.glade.h:13 ../ui/markverse.glade.h:11
 msgid "Verse:"
 msgstr "Vers:"
 
@@ -1912,19 +2011,10 @@ msgstr "HTML-läge"
 msgid "Preview the note to be printed"
 msgstr ""
 
-#: ../ui/editor_note.xml.h:9 ../ui/editor_studypad.xml.h:14
-msgid "Print Pre_view"
-msgstr "_Förhandsgranska utskrift"
-
 #: ../ui/editor_note.xml.h:10
 msgid "Print this note"
 msgstr ""
 
-#: ../ui/editor_note.xml.h:11 ../ui/editor_studypad.xml.h:16
-#: ../ui/editor.xml.h:11
-msgid "Save"
-msgstr "Spara"
-
 #: ../ui/editor_note.xml.h:12
 msgid "Save the current note"
 msgstr ""
@@ -1933,15 +2023,6 @@ msgstr ""
 msgid "_Delete Personal Comment"
 msgstr "_Ta bort personlig kommentar"
 
-#: ../ui/editor_note.xml.h:14 ../ui/editor_studypad.xml.h:20
-#: ../ui/editor.xml.h:13 ../ui/xi-menus.glade.h:83
-msgid "_File"
-msgstr "_Arkiv"
-
-#: ../ui/editor_note.xml.h:15 ../ui/editor_studypad.xml.h:21
-msgid "_Print..."
-msgstr "_Skriv ut..."
-
 #: ../ui/editor_note.xml.h:16
 msgid "_Save (Personal Comment)"
 msgstr "_Spara (personlig kommentar)"
@@ -1995,9 +2076,8 @@ msgid ": "
 msgstr ": "
 
 #: ../ui/export-dialog.glade.h:2
-#, fuzzy
 msgid "<b>Copy</b>"
-msgstr "<b>Sökomfattning</b>"
+msgstr ""
 
 #: ../ui/export-dialog.glade.h:3
 msgid "<b>Export</b>"
@@ -2019,20 +2099,17 @@ msgstr ""
 msgid "Chapter Radio Button"
 msgstr ""
 
-#: ../ui/export-dialog.glade.h:9 ../ui/xi-menus.glade.h:12
-#, fuzzy
+#: ../ui/export-dialog.glade.h:9 ../ui/xi-menus.glade.h:18
 msgid "Copy/Export Passage"
-msgstr "Exportera avsnitt"
+msgstr ""
 
 #: ../ui/export-dialog.glade.h:10
-#, fuzzy
 msgid "Export Passage Cancel"
-msgstr "Exportera avsnitt"
+msgstr ""
 
 #: ../ui/export-dialog.glade.h:11
-#, fuzzy
 msgid "Export Passage OK"
-msgstr "Exportera avsnitt"
+msgstr ""
 
 #: ../ui/export-dialog.glade.h:12
 msgid "Export complete book"
@@ -2056,16 +2133,15 @@ msgstr ""
 
 #: ../ui/export-dialog.glade.h:17
 msgid "Key"
-msgstr ""
+msgstr "Nyckel"
 
 #: ../ui/export-dialog.glade.h:18
 msgid "Plain Text"
 msgstr "Vanlig text"
 
 #: ../ui/export-dialog.glade.h:19
-#, fuzzy
 msgid "Plain Text Radio Button"
-msgstr "Vanlig text"
+msgstr ""
 
 #: ../ui/export-dialog.glade.h:21
 msgid "Save Export As"
@@ -2080,14 +2156,25 @@ msgid "Verse Radio Button"
 msgstr ""
 
 #: ../ui/export-dialog.glade.h:24
-#, fuzzy
 msgid "Verse range"
-msgstr "Verslista"
+msgstr ""
 
 #: ../ui/export-dialog.glade.h:25
 msgid "Version"
 msgstr "Version"
 
+#: ../ui/markverse.glade.h:4
+msgid "Mark"
+msgstr "Markera"
+
+#: ../ui/markverse.glade.h:5
+msgid "Mark/Unmark Verse"
+msgstr ""
+
+#: ../ui/markverse.glade.h:9
+msgid "Unmark"
+msgstr "Avmarkera"
+
 #: ../ui/module-manager.glade.h:1
 msgid "<b>Add and Remove Sources</b>"
 msgstr "<b>Lägg till och ta bort källor</b>"
@@ -2121,7 +2208,7 @@ msgid ""
 "detection you should NOT use  the remote installation feature! "
 msgstr ""
 "<b>VARNING:</b> Om du lever i ett land med förföljelse och inte vill riskera "
-"att bli upptäckt så ska du inte använda fjärr-installations-funktionen."
+"att bli upptäckt så ska du inte använda fjärr-installations-funktionen. "
 
 #: ../ui/module-manager.glade.h:9
 msgid "<i>Personal area, for your use only:</i>"
@@ -2131,39 +2218,47 @@ msgstr ""
 msgid "<i>System area, for all users:</i>"
 msgstr ""
 
-#: ../ui/module-manager.glade.h:11
+#: ../ui/module-manager.glade.h:12
 msgid "Continue"
 msgstr "Fortsätt"
 
-#: ../ui/module-manager.glade.h:12
+#: ../ui/module-manager.glade.h:13
 msgid "Current Remote Sources"
 msgstr "Nuvarande fjärr-källor"
 
-#: ../ui/module-manager.glade.h:13
+#: ../ui/module-manager.glade.h:14
 msgid "Current local sources"
 msgstr "Nuvarande lokala källor"
 
-#: ../ui/module-manager.glade.h:14
+#: ../ui/module-manager.glade.h:15
+msgid "Delete Index"
+msgstr "Ta bort index"
+
+#: ../ui/module-manager.glade.h:16
 msgid "Home dir"
 msgstr "Hemmamapp"
 
-#: ../ui/module-manager.glade.h:16
+#: ../ui/module-manager.glade.h:19
+msgid "Load Standard"
+msgstr ""
+
+#: ../ui/module-manager.glade.h:20
 msgid "Local"
 msgstr "Lokalt"
 
-#: ../ui/module-manager.glade.h:17
+#: ../ui/module-manager.glade.h:21
 msgid "Local Install Folder"
 msgstr ""
 
-#: ../ui/module-manager.glade.h:18
+#: ../ui/module-manager.glade.h:22
 msgid "Module Manager"
 msgstr "Modulhanterare"
 
-#: ../ui/module-manager.glade.h:19
+#: ../ui/module-manager.glade.h:23
 msgid "Remote"
 msgstr "Fjärr"
 
-#: ../ui/module-manager.glade.h:20
+#: ../ui/module-manager.glade.h:24
 msgid "Sword sys dir"
 msgstr ""
 
@@ -2188,9 +2283,8 @@ msgid "Drop down history list"
 msgstr ""
 
 #: ../ui/navbar_versekey.glade.h:6
-#, fuzzy
 msgid "Reference Entry"
-msgstr "Inställningar"
+msgstr ""
 
 #: ../ui/navbar_versekey.glade.h:7
 msgid "Toggle Chapter Button"
@@ -2225,9 +2319,8 @@ msgid "<b>Font Colors</b>"
 msgstr "<b>Typsnittsfärger</b>"
 
 #: ../ui/prefs.glade.h:10
-#, fuzzy
 msgid "<b>Font Sizes</b>"
-msgstr "<b>Typsnittsfärger</b>"
+msgstr ""
 
 #: ../ui/prefs.glade.h:11
 msgid "<b>General</b>"
@@ -2246,9 +2339,8 @@ msgid "<b>Show</b>"
 msgstr "<b>Visa</b>"
 
 #: ../ui/prefs.glade.h:15
-#, fuzzy
 msgid "<b>Special Purpose Modules</b>"
-msgstr "<b>Övriga moduler</b>"
+msgstr ""
 
 #: ../ui/prefs.glade.h:16
 msgid "<b>StudyPad default directory</b>"
@@ -2273,7 +2365,7 @@ msgid "Background"
 msgstr "Bakgrund"
 
 #: ../ui/prefs.glade.h:21
-msgid "Base text size"
+msgid "Base font size"
 msgstr ""
 
 #: ../ui/prefs.glade.h:22
@@ -2281,70 +2373,60 @@ msgid "Bible Texts"
 msgstr "Bibeltexter"
 
 #: ../ui/prefs.glade.h:23
-#, fuzzy
 msgid "Bible Texts Checkbox"
-msgstr "Bibeltexter"
+msgstr ""
 
 #: ../ui/prefs.glade.h:24
 msgid "Biblical Text"
 msgstr "Bibel"
 
 #: ../ui/prefs.glade.h:26
-#, fuzzy
 msgid "Change Biblical Text Combo"
-msgstr "Bibel"
+msgstr ""
 
 #: ../ui/prefs.glade.h:27
-#, fuzzy
 msgid "Change Book Combo"
-msgstr "Ändra typsnitt för"
+msgstr ""
 
 #: ../ui/prefs.glade.h:28
-#, fuzzy
 msgid "Change Commentary Combo"
-msgstr "Ändra typsnitt för"
+msgstr ""
 
 #: ../ui/prefs.glade.h:29
-#, fuzzy
 msgid "Change Default Dictionary Combo"
-msgstr "Förvald uppslagsbok"
+msgstr ""
 
 #: ../ui/prefs.glade.h:30
-#, fuzzy
 msgid "Change Dictionary Combo"
-msgstr "Uppslagsbok"
+msgstr ""
 
 #: ../ui/prefs.glade.h:31
-#, fuzzy
 msgid "Change Personal Notes Combo"
-msgstr "Personliga anteckningar"
+msgstr ""
 
 #: ../ui/prefs.glade.h:32
 msgid "Choose to enable Prayer lists "
-msgstr "Välj för att aktivera bönelistor"
+msgstr "Välj för att aktivera bönelistor "
 
 #: ../ui/prefs.glade.h:34
-#, fuzzy
 msgid "Commentaries Checkbox"
-msgstr "Kommentarer"
+msgstr ""
 
 #: ../ui/prefs.glade.h:36
 msgid "Cover"
 msgstr "Omslag"
 
 #: ../ui/prefs.glade.h:37
-#, fuzzy
 msgid "Current Verse"
-msgstr "Aktuell verstext"
+msgstr ""
 
 #: ../ui/prefs.glade.h:38
 msgid "Daily Devotional"
 msgstr "Dagliga andakter"
 
 #: ../ui/prefs.glade.h:39
-#, fuzzy
 msgid "Daily Devotional Combo"
-msgstr "Dagliga andakter"
+msgstr ""
 
 #: ../ui/prefs.glade.h:40
 msgid "Default Dictionary"
@@ -2359,18 +2441,16 @@ msgid "Dictionary/Lexicon"
 msgstr "Uppslagsbok/Lexikon"
 
 #: ../ui/prefs.glade.h:43
-#, fuzzy
 msgid "Dictionary/Lexicon Checkbox"
-msgstr "Uppslagsbok/Lexikon"
+msgstr ""
 
 #: ../ui/prefs.glade.h:44
 msgid "Enable Prayer Lists"
 msgstr "Aktivera bönelistor"
 
 #: ../ui/prefs.glade.h:45
-#, fuzzy
 msgid "Enable Prayer Lists Checkbox"
-msgstr "Aktivera bönelistor"
+msgstr ""
 
 #: ../ui/prefs.glade.h:46
 msgid "Font Colors"
@@ -2381,9 +2461,8 @@ msgid "Font Misc"
 msgstr "Typsnitt övrigt"
 
 #: ../ui/prefs.glade.h:48
-#, fuzzy
 msgid "Foreground"
-msgstr "Markera förgrund"
+msgstr "Förgrund"
 
 #: ../ui/prefs.glade.h:49
 msgid "General Misc"
@@ -2394,18 +2473,16 @@ msgid "Greek Lexicon"
 msgstr "Grekiskt lexikon"
 
 #: ../ui/prefs.glade.h:51
-#, fuzzy
 msgid "Greek Lexicon Combo"
-msgstr "Grekiskt lexikon"
+msgstr ""
 
 #: ../ui/prefs.glade.h:52
 msgid "Hebrew Lexicon"
 msgstr "Hebreiskt lexikon"
 
 #: ../ui/prefs.glade.h:53
-#, fuzzy
 msgid "Hebrew Lexicon Combo"
-msgstr "Hebreiskt lexikon"
+msgstr ""
 
 #: ../ui/prefs.glade.h:54
 msgid "Highlight Background"
@@ -2420,9 +2497,8 @@ msgid "Highlight current verse"
 msgstr "Markera aktuell vers"
 
 #: ../ui/prefs.glade.h:57
-#, fuzzy
 msgid "Highlight current verse check box"
-msgstr "Markera aktuell vers"
+msgstr ""
 
 #: ../ui/prefs.glade.h:58
 msgid "Links"
@@ -2445,77 +2521,68 @@ msgid "Parallel 1"
 msgstr "Parallell 1"
 
 #: ../ui/prefs.glade.h:63
-#, fuzzy
 msgid "Parallel 1 Combo"
-msgstr "Parallell 1"
+msgstr ""
 
 #: ../ui/prefs.glade.h:64
 msgid "Parallel 2"
 msgstr "Parallell 2"
 
 #: ../ui/prefs.glade.h:65
-#, fuzzy
 msgid "Parallel 2 Combo"
-msgstr "Parallell 2"
+msgstr ""
 
 #: ../ui/prefs.glade.h:66
 msgid "Parallel 3"
 msgstr "Parallell 3"
 
 #: ../ui/prefs.glade.h:67
-#, fuzzy
 msgid "Parallel 3 Combo"
-msgstr "Parallell 3"
+msgstr ""
 
 #: ../ui/prefs.glade.h:68
 msgid "Parallel 4"
 msgstr "Parallell 4"
 
 #: ../ui/prefs.glade.h:69
-#, fuzzy
 msgid "Parallel 4 Combo"
-msgstr "Parallell 4"
+msgstr ""
 
 #: ../ui/prefs.glade.h:70
 msgid "Parallel 5"
 msgstr "Parallell 5"
 
 #: ../ui/prefs.glade.h:71
-#, fuzzy
 msgid "Parallel 5 Combo"
-msgstr "Parallell 5"
+msgstr ""
 
 #: ../ui/prefs.glade.h:72
-#, fuzzy
 msgid "Parallel View in a tab"
-msgstr "Parallell vy"
+msgstr ""
 
 #: ../ui/prefs.glade.h:73
 msgid "Personal Notes"
 msgstr "Personliga anteckningar"
 
 #: ../ui/prefs.glade.h:76
-#, fuzzy
 msgid "Previewer Checkbox"
-msgstr "Förhandsgranskare"
+msgstr ""
 
 #: ../ui/prefs.glade.h:77
 msgid "Resize images"
 msgstr "Ändra storlek på bilder"
 
 #: ../ui/prefs.glade.h:78
-#, fuzzy
 msgid "Resize images checkbox"
-msgstr "Ändra storlek på bilder"
+msgstr ""
 
 #: ../ui/prefs.glade.h:79
 msgid "Scroll to Previous/Next Chapter"
 msgstr "Rulla till föregående/nästa kapitel"
 
 #: ../ui/prefs.glade.h:80
-#, fuzzy
 msgid "Scroll to Previous/Next Chapter Checkbox"
-msgstr "Rulla till föregående/nästa kapitel"
+msgstr ""
 
 #: ../ui/prefs.glade.h:81
 msgid "Select A Directory"
@@ -2530,44 +2597,52 @@ msgid "Show splash screen at start up"
 msgstr ""
 
 #: ../ui/prefs.glade.h:84
-#, fuzzy
-msgid "StudyPad default directory combo"
-msgstr "<b>StudyPad standardsökväg</b>"
+msgid "Special Locale (requires restart)"
+msgstr ""
+
+#: ../ui/prefs.glade.h:85
+msgid "Special Locale Combo"
+msgstr ""
 
 #: ../ui/prefs.glade.h:86
+msgid "StudyPad default directory combo"
+msgstr ""
+
+#: ../ui/prefs.glade.h:88
 msgid "Use Bible Text scroll bar to scroll to previous or next chapter"
 msgstr ""
 
-#: ../ui/prefs.glade.h:87
+#: ../ui/prefs.glade.h:89
 msgid "Use Verse Per Line"
 msgstr ""
 
-#: ../ui/prefs.glade.h:88
+#: ../ui/prefs.glade.h:90
 msgid "Use Verse Per Line Checkbox"
 msgstr ""
 
-#: ../ui/prefs.glade.h:89
+#: ../ui/prefs.glade.h:91
 msgid "Use default Dictionary"
 msgstr "Använd förvald uppslagsbok"
 
-#: ../ui/prefs.glade.h:90
-#, fuzzy
+#: ../ui/prefs.glade.h:92
 msgid "Use default Dictionary Checkbox"
-msgstr "Använd förvald uppslagsbok"
+msgstr ""
 
-#: ../ui/prefs.glade.h:91
+#: ../ui/prefs.glade.h:93
 msgid "Use tabbed browsing"
 msgstr "Använd flikad navigation"
 
-#: ../ui/prefs.glade.h:92
-#, fuzzy
+#: ../ui/prefs.glade.h:94
 msgid "Use tabbed browsing Checkbox"
-msgstr "Använd flikad navigation"
+msgstr ""
 
-#: ../ui/prefs.glade.h:93
-#, fuzzy
+#: ../ui/prefs.glade.h:95
+msgid "Verse Number"
+msgstr ""
+
+#: ../ui/prefs.glade.h:96
 msgid "Verse number size"
-msgstr "Visa versnumrering"
+msgstr ""
 
 #: ../ui/search-dialog.glade.h:1
 msgid "<b>Attribute</b>"
@@ -2591,7 +2666,7 @@ msgstr "<b>Moduler</b>"
 
 #: ../ui/search-dialog.glade.h:6
 msgid "<b>Options</b>"
-msgstr ""
+msgstr "<b>Alternativ</b>"
 
 #: ../ui/search-dialog.glade.h:7
 msgid "<b>Preview</b>"
@@ -2642,19 +2717,16 @@ msgid "Attributes"
 msgstr "Attributer"
 
 #: ../ui/search-dialog.glade.h:19
-#, fuzzy
 msgid "Attributes radiobutton"
-msgstr "Attributer"
+msgstr ""
 
 #: ../ui/search-dialog.glade.h:20
-#, fuzzy
 msgid "Clear Custom Module List Button"
-msgstr "Egna modullistor"
+msgstr ""
 
 #: ../ui/search-dialog.glade.h:21
-#, fuzzy
 msgid "Clear Modules from List Button"
-msgstr "Ta bort alla moduler från listan"
+msgstr ""
 
 #: ../ui/search-dialog.glade.h:22
 msgid "Clear all modules from the list"
@@ -2681,23 +2753,20 @@ msgid "Current results radiobutton"
 msgstr ""
 
 #: ../ui/search-dialog.glade.h:28
-#, fuzzy
 msgid "Custom Module List Combo"
-msgstr "Egna modullistor"
+msgstr ""
 
 #: ../ui/search-dialog.glade.h:29
-#, fuzzy
 msgid "Custom Module List Name Entry"
-msgstr "Egna modullistor"
+msgstr ""
 
 #: ../ui/search-dialog.glade.h:30
 msgid "Custom Module Lists"
 msgstr "Egna modullistor"
 
 #: ../ui/search-dialog.glade.h:31
-#, fuzzy
 msgid "Custom Range Preview"
-msgstr "Egna spännvidder"
+msgstr ""
 
 #: ../ui/search-dialog.glade.h:32
 msgid "Custom Range Selector Combo"
@@ -2712,28 +2781,24 @@ msgid "Custom module list"
 msgstr "Egen modullista"
 
 #: ../ui/search-dialog.glade.h:35
-#, fuzzy
 msgid "Custom module list radiobutton"
-msgstr "Egen modullista"
+msgstr ""
 
 #: ../ui/search-dialog.glade.h:36
 msgid "Custom verse range"
 msgstr "Egen spännvid"
 
 #: ../ui/search-dialog.glade.h:37
-#, fuzzy
 msgid "Custom verse range radiobutton"
-msgstr "Egen spännvid"
+msgstr ""
 
 #: ../ui/search-dialog.glade.h:38
-#, fuzzy
 msgid "Delete Range Button"
-msgstr "Ta bort spännvid?"
+msgstr ""
 
 #: ../ui/search-dialog.glade.h:39
-#, fuzzy
 msgid "Delete Selected Module From List Button"
-msgstr "Ta bort vald modul från listan"
+msgstr ""
 
 #: ../ui/search-dialog.glade.h:40
 msgid "Delete selected range"
@@ -2748,628 +2813,749 @@ msgid "Entire module"
 msgstr "Hela modulen"
 
 #: ../ui/search-dialog.glade.h:43
-#, fuzzy
 msgid "Entire module radiobutton"
-msgstr "Hela modulen"
+msgstr ""
 
 #: ../ui/search-dialog.glade.h:45
-#, fuzzy
 msgid "Exact phrase radiobutton"
-msgstr "Specifik fras"
+msgstr ""
 
 #: ../ui/search-dialog.glade.h:46
+msgid "Export"
+msgstr "Exportera"
+
+#: ../ui/search-dialog.glade.h:47
+msgid "Export current search results"
+msgstr ""
+
+#: ../ui/search-dialog.glade.h:48
 msgid ""
 "Fast, featureful, index-based search\n"
 "Indexes must have been built beforehand:\n"
 "See Module Manager's maintenance functions"
 msgstr ""
 
-#: ../ui/search-dialog.glade.h:49
-#, fuzzy
+#: ../ui/search-dialog.glade.h:51
 msgid "Find Button"
-msgstr "Hitta nästa"
+msgstr ""
 
-#: ../ui/search-dialog.glade.h:51
-#, fuzzy
+#: ../ui/search-dialog.glade.h:53
 msgid "Footnotes radiobutton"
-msgstr "Fotnoter"
+msgstr ""
 
-#: ../ui/search-dialog.glade.h:52
+#: ../ui/search-dialog.glade.h:54
 msgid "In modules that have Footnotes"
 msgstr "I moduler som har fotnoter"
 
-#: ../ui/search-dialog.glade.h:53
+#: ../ui/search-dialog.glade.h:55
 msgid "In modules that have Morphological Tags"
 msgstr ""
 
-#: ../ui/search-dialog.glade.h:54
+#: ../ui/search-dialog.glade.h:56
 msgid "In modules that have Strong's Numbers"
 msgstr ""
 
-#: ../ui/search-dialog.glade.h:55
+#: ../ui/search-dialog.glade.h:57
 msgid "Main Search Entry"
 msgstr ""
 
-#: ../ui/search-dialog.glade.h:56
+#: ../ui/search-dialog.glade.h:58
 msgid "Make selections on the Attribute Search tab"
 msgstr ""
 
-#: ../ui/search-dialog.glade.h:58
-#, fuzzy
+#: ../ui/search-dialog.glade.h:60
 msgid "Match case checkbox"
-msgstr "Matcha shiftläge"
+msgstr ""
 
-#: ../ui/search-dialog.glade.h:59
+#: ../ui/search-dialog.glade.h:61
 msgid "Module Selection"
 msgstr ""
 
-#: ../ui/search-dialog.glade.h:60
+#: ../ui/search-dialog.glade.h:62
 msgid "Module list"
 msgstr "Modullista"
 
-#: ../ui/search-dialog.glade.h:61
-#, fuzzy
+#: ../ui/search-dialog.glade.h:63
 msgid "Module list radiobutton"
-msgstr "Modullista"
+msgstr ""
 
-#: ../ui/search-dialog.glade.h:63
+#: ../ui/search-dialog.glade.h:65
 msgid "Morphological Tags radiobutton"
 msgstr ""
 
-#: ../ui/search-dialog.glade.h:65
+#: ../ui/search-dialog.glade.h:67
 msgid "Multi word radiobutton"
 msgstr ""
 
-#: ../ui/search-dialog.glade.h:66
-#, fuzzy
+#: ../ui/search-dialog.glade.h:68
 msgid "New Custom Module List Button"
-msgstr "Egna modullistor"
+msgstr ""
 
-#: ../ui/search-dialog.glade.h:67
+#: ../ui/search-dialog.glade.h:69
 msgid "New Range Button"
 msgstr ""
 
-#: ../ui/search-dialog.glade.h:68
-#, fuzzy
+#: ../ui/search-dialog.glade.h:70
 msgid "Open Selection Dialog Button"
-msgstr "Öppna i dialogfönster"
+msgstr ""
 
-#: ../ui/search-dialog.glade.h:69
+#: ../ui/search-dialog.glade.h:71
 msgid "Open a dialog to select modules to add to the list"
 msgstr ""
 
-#: ../ui/search-dialog.glade.h:70
+#: ../ui/search-dialog.glade.h:72
 msgid "Optimized (\"Lucene\")"
 msgstr "Optimerad (\"Lucene\")"
 
-#: ../ui/search-dialog.glade.h:71
-#, fuzzy
+#: ../ui/search-dialog.glade.h:73
 msgid "Optimized (\"Lucene\") radiobutton"
-msgstr "Optimerad (\"Lucene\")"
+msgstr ""
 
-#: ../ui/search-dialog.glade.h:72
+#: ../ui/search-dialog.glade.h:74
 msgid "Range Definition Entry"
 msgstr ""
 
-#: ../ui/search-dialog.glade.h:73
-#, fuzzy
+#: ../ui/search-dialog.glade.h:75
 msgid "Range Name Entry"
-msgstr "<b>Namn på spännvid</b>"
+msgstr ""
 
-#: ../ui/search-dialog.glade.h:75
-#, fuzzy
+#: ../ui/search-dialog.glade.h:77
 msgid "Regular expression radiobutton"
-msgstr "Regulära uttryck"
+msgstr ""
 
-#: ../ui/search-dialog.glade.h:76
+#: ../ui/search-dialog.glade.h:78
 msgid "Remove the selected module from the list"
 msgstr "Ta bort vald modul från listan"
 
-#: ../ui/search-dialog.glade.h:77
+#: ../ui/search-dialog.glade.h:79
 msgid "Result Summary Table"
 msgstr ""
 
-#: ../ui/search-dialog.glade.h:78
+#: ../ui/search-dialog.glade.h:80
 msgid "Result Summary Window"
 msgstr ""
 
-#: ../ui/search-dialog.glade.h:79
+#: ../ui/search-dialog.glade.h:81
 msgid "Results"
 msgstr "Resultat"
 
-#: ../ui/search-dialog.glade.h:80
-#, fuzzy
+#: ../ui/search-dialog.glade.h:82
 msgid "Save Custom Module List Button"
-msgstr "Egna modullistor"
+msgstr ""
 
-#: ../ui/search-dialog.glade.h:81
+#: ../ui/search-dialog.glade.h:83
 msgid "Save Range Button"
 msgstr ""
 
-#: ../ui/search-dialog.glade.h:82
+#: ../ui/search-dialog.glade.h:84
 msgid "Save custom range"
 msgstr "Spara egen spännvidd"
 
-#: ../ui/search-dialog.glade.h:83
+#: ../ui/search-dialog.glade.h:85
 msgid "Save search results as bookmarks"
 msgstr "Spara sökresultat som bokmärken"
 
-#: ../ui/search-dialog.glade.h:84
+#: ../ui/search-dialog.glade.h:86
 msgid "Save the module list"
 msgstr "Spara modullistan"
 
-#: ../ui/search-dialog.glade.h:85
+#: ../ui/search-dialog.glade.h:87
 msgid "Search  Criteria"
 msgstr "Sökkriterier"
 
-#: ../ui/search-dialog.glade.h:86
-#, fuzzy
+#: ../ui/search-dialog.glade.h:88
 msgid "Search Criteria Treeview"
-msgstr "Sökkriterier"
+msgstr ""
 
-#: ../ui/search-dialog.glade.h:87
+#: ../ui/search-dialog.glade.h:89
 msgid "Search entire module"
 msgstr "Sök igenom hela modulen"
 
-#: ../ui/search-dialog.glade.h:88
+#: ../ui/search-dialog.glade.h:90
 msgid "Search for Morphological tags"
 msgstr ""
 
-#: ../ui/search-dialog.glade.h:89
+#: ../ui/search-dialog.glade.h:91
 msgid "Search for Strongs Numbers like G4442 or H1121"
 msgstr ""
 
-#: ../ui/search-dialog.glade.h:90
+#: ../ui/search-dialog.glade.h:92
 msgid "Search in footnotes"
 msgstr "Sök i fotnoter"
 
-#: ../ui/search-dialog.glade.h:91
+#: ../ui/search-dialog.glade.h:93
 msgid "Show Footnotes"
 msgstr "Visa fotnoter"
 
-#: ../ui/search-dialog.glade.h:92
-#, fuzzy
+#: ../ui/search-dialog.glade.h:94
 msgid "Show Footnotes checkbox"
-msgstr "Visa fotnoter"
+msgstr ""
 
-#: ../ui/search-dialog.glade.h:93
+#: ../ui/search-dialog.glade.h:95
 msgid "Show Morphological Tags"
 msgstr ""
 
-#: ../ui/search-dialog.glade.h:94
+#: ../ui/search-dialog.glade.h:96
 msgid "Show Morphological Tags checkbox"
 msgstr ""
 
-#: ../ui/search-dialog.glade.h:95
+#: ../ui/search-dialog.glade.h:97
 msgid "Show Strong's Numbers"
 msgstr ""
 
-#: ../ui/search-dialog.glade.h:96
-#, fuzzy
+#: ../ui/search-dialog.glade.h:98
 msgid "Show Strong's Numbers checkbox"
-msgstr "Visa versnumrering"
+msgstr ""
 
-#: ../ui/search-dialog.glade.h:97
+#: ../ui/search-dialog.glade.h:99
 msgid "Show in main window"
 msgstr "Visa i huvudfönstret"
 
-#: ../ui/search-dialog.glade.h:98
+#: ../ui/search-dialog.glade.h:100
 msgid "Single module"
 msgstr "Enskild modul"
 
-#: ../ui/search-dialog.glade.h:99
-#, fuzzy
+#: ../ui/search-dialog.glade.h:101
 msgid "Single module radiobutton"
-msgstr "Enskild modul"
+msgstr ""
 
-#: ../ui/search-dialog.glade.h:100
+#: ../ui/search-dialog.glade.h:102
 msgid "Start/stop searching"
 msgstr "Starta/stoppa sökning"
 
-#: ../ui/search-dialog.glade.h:101
+#: ../ui/search-dialog.glade.h:103
 msgid "Strongs Numbers"
 msgstr ""
 
-#: ../ui/search-dialog.glade.h:102
+#: ../ui/search-dialog.glade.h:104
 msgid "Strongs Numbers radiobutton"
 msgstr ""
 
-#: ../ui/search-dialog.glade.h:103
+#: ../ui/search-dialog.glade.h:105
 msgid "Use a custom module list for the search"
 msgstr "Använd egen modullista för sökningen"
 
-#: ../ui/search-dialog.glade.h:104
+#: ../ui/search-dialog.glade.h:106
 msgid "Use a custom range for the scope of the search"
 msgstr ""
 
-#: ../ui/search-dialog.glade.h:105
+#: ../ui/search-dialog.glade.h:107
 msgid "Use a single module for the search"
 msgstr "Använd en enskild modul för sökningen"
 
-#: ../ui/search-dialog.glade.h:106
+#: ../ui/search-dialog.glade.h:108
 msgid "Use the current module list for the search"
 msgstr "Använd den nuvarande modullistan för sökningen"
 
-#: ../ui/search-dialog.glade.h:107
+#: ../ui/search-dialog.glade.h:109
 msgid "Use the results of the last search as the scope of the search"
 msgstr ""
 "Använd resultaten från föregående sökning som omfattningen för sökningen"
 
-#: ../ui/search-dialog.glade.h:108
+#: ../ui/search-dialog.glade.h:110
 msgid "e.g. Matt-John;Rev4"
 msgstr "t.ex Rom-Ef;Upp4"
 
-#: ../ui/search-dialog.glade.h:109
+#: ../ui/search-dialog.glade.h:111
 msgid "for "
 msgstr "efter "
 
 #: ../ui/xi-menus.glade.h:2
-#, fuzzy
 msgid "About _Translation"
-msgstr "Om detta program"
+msgstr ""
 
 #: ../ui/xi-menus.glade.h:3
-#, fuzzy
 msgid "About _Xiphos"
-msgstr "Om _Xiphos ..."
+msgstr ""
 
 #: ../ui/xi-menus.glade.h:4
+msgid "Add Item"
+msgstr "Lägg till objekt"
+
+#: ../ui/xi-menus.glade.h:5
+msgid "Add Sub-Item"
+msgstr ""
+
+#: ../ui/xi-menus.glade.h:6
+msgid "Add a sub-item"
+msgstr ""
+
+#: ../ui/xi-menus.glade.h:7
+msgid "Add an item"
+msgstr "Lägg till ett objekt"
+
+#: ../ui/xi-menus.glade.h:8
 msgid "Add new folder to selected folder"
 msgstr "Lägg till en ny mapp i vald mapp"
 
-#: ../ui/xi-menus.glade.h:6
+#: ../ui/xi-menus.glade.h:10
 msgid "Allow Reordering"
 msgstr "Tillåt flyttning"
 
-#: ../ui/xi-menus.glade.h:7
+#: ../ui/xi-menus.glade.h:11
 msgid "Allow items to be moved from one folder to another"
 msgstr "Tillåt bokmärke att flyttas från en mapp till en annan"
 
-#: ../ui/xi-menus.glade.h:9
+#: ../ui/xi-menus.glade.h:12
+msgid "Annotate Verse"
+msgstr ""
+
+#: ../ui/xi-menus.glade.h:14
+msgid "Browse in BibleMap.org"
+msgstr ""
+
+#: ../ui/xi-menus.glade.h:15
 msgid "Collapse All"
 msgstr "Kollapsa alla"
 
-#: ../ui/xi-menus.glade.h:10
+#: ../ui/xi-menus.glade.h:16
 msgid "Collapse all Bookmarks groups"
 msgstr "Kollapsa alla bokmärkesgrupper"
 
-#: ../ui/xi-menus.glade.h:11
-#, fuzzy
+#: ../ui/xi-menus.glade.h:17
 msgid "Commentary by Chapter"
-msgstr "Kommentar-vy"
+msgstr ""
 
-#: ../ui/xi-menus.glade.h:13
+#: ../ui/xi-menus.glade.h:19
+msgid "Create a new daily journal"
+msgstr ""
+
+#: ../ui/xi-menus.glade.h:20
+msgid "Create a new monthly journal"
+msgstr ""
+
+#: ../ui/xi-menus.glade.h:21
+msgid "Create a new outlined topic"
+msgstr ""
+
+#: ../ui/xi-menus.glade.h:22
+msgid "Create a new simple prayer list"
+msgstr "Skapa en ny enkel bönelista"
+
+#: ../ui/xi-menus.glade.h:23
+msgid "Create a new subject prayer list"
+msgstr ""
+
+#: ../ui/xi-menus.glade.h:24
 msgid "D_ouble-Space Text"
 msgstr "_Dubbelt radavstånd"
 
-#: ../ui/xi-menus.glade.h:14
+#: ../ui/xi-menus.glade.h:25
+msgid "Daily"
+msgstr "Daglig"
+
+#: ../ui/xi-menus.glade.h:26
 msgid "Delete Item"
 msgstr "Ta bort objekt"
 
-#: ../ui/xi-menus.glade.h:15
+#: ../ui/xi-menus.glade.h:27
 msgid "Delete item"
 msgstr "Ta bort objekt"
 
-#: ../ui/xi-menus.glade.h:16
-msgid "Dictionary/_Lexicon"
-msgstr "Uppslagsbok/_Lexikon"
+#: ../ui/xi-menus.glade.h:28
+msgid "Dictionar_y"
+msgstr "Dictionar_y"
 
-#: ../ui/xi-menus.glade.h:17
+#: ../ui/xi-menus.glade.h:29
 msgid "Display Book Heading"
 msgstr "Visa boköverskrift"
 
-#: ../ui/xi-menus.glade.h:18
+#: ../ui/xi-menus.glade.h:30
 msgid "Display Chapter Heading"
 msgstr "Visa kapitelöverskrift"
 
-#: ../ui/xi-menus.glade.h:19
+#: ../ui/xi-menus.glade.h:31
 msgid "Dump Pers.Comm."
 msgstr ""
 
-#: ../ui/xi-menus.glade.h:21
+#: ../ui/xi-menus.glade.h:33
 msgid "Edit bookmark item"
 msgstr "Redigera bokmärkesobjekt"
 
-#: ../ui/xi-menus.glade.h:22
+#: ../ui/xi-menus.glade.h:34
+msgid "Edit this item"
+msgstr "Ändra detta objekt"
+
+#: ../ui/xi-menus.glade.h:35
 msgid "Expand All"
 msgstr "Expandera alla"
 
-#: ../ui/xi-menus.glade.h:23
+#: ../ui/xi-menus.glade.h:36
 msgid "Expand all Bookmarks groups"
 msgstr "Expandera alla bokmärkesgrupper"
 
-#: ../ui/xi-menus.glade.h:24
-msgid "File"
-msgstr "Arkiv"
+#: ../ui/xi-menus.glade.h:37
+msgid "Export Folder"
+msgstr "Exportera till mapp"
 
-#: ../ui/xi-menus.glade.h:30
+#: ../ui/xi-menus.glade.h:38
+msgid "Export List"
+msgstr "Exportera lista"
+
+#: ../ui/xi-menus.glade.h:45
 msgid "Image Content"
 msgstr ""
 
-#: ../ui/xi-menus.glade.h:31
+#: ../ui/xi-menus.glade.h:46
 msgid "Import Bibletime Bookmarks"
 msgstr "Importera bokmärken från Bibletime"
 
-#: ../ui/xi-menus.glade.h:32
+#: ../ui/xi-menus.glade.h:47
 msgid "Insert Bookmark"
 msgstr "Infoga bokmärke"
 
-#: ../ui/xi-menus.glade.h:33
+#: ../ui/xi-menus.glade.h:48
 msgid "Insert new bookmark here"
 msgstr "Infoga nytt bokmärke här"
 
-#: ../ui/xi-menus.glade.h:34
+#: ../ui/xi-menus.glade.h:49
 msgid "L_ink Tabs"
 msgstr "Länkade flikar"
 
-#: ../ui/xi-menus.glade.h:36
+#: ../ui/xi-menus.glade.h:51
 msgid "Load Bookmarks from Bibletime"
 msgstr "Ladda bokmärken från Bibletime"
 
-#: ../ui/xi-menus.glade.h:37
+#: ../ui/xi-menus.glade.h:52
 msgid "Lookup Selection"
 msgstr ""
 
-#: ../ui/xi-menus.glade.h:41
+#: ../ui/xi-menus.glade.h:54
+msgid "Monthly"
+msgstr "Månatlig"
+
+#: ../ui/xi-menus.glade.h:57
 msgid "Note"
 msgstr "Anteckning"
 
-#: ../ui/xi-menus.glade.h:42
+#: ../ui/xi-menus.glade.h:58
 msgid "Open Module"
 msgstr "Öppna modul"
 
-#: ../ui/xi-menus.glade.h:43
-#, fuzzy
+#: ../ui/xi-menus.glade.h:59
 msgid "Open Study_pad"
-msgstr "Öppna Study_Pad"
+msgstr ""
 
-#: ../ui/xi-menus.glade.h:44
+#: ../ui/xi-menus.glade.h:60
 msgid "Open in a dialog"
 msgstr "Öppna i ett dialogfönster"
 
-#: ../ui/xi-menus.glade.h:46
-#, fuzzy
+#: ../ui/xi-menus.glade.h:61
+msgid "Open in a separate window"
+msgstr ""
+
+#: ../ui/xi-menus.glade.h:62
+msgid "Open in editor"
+msgstr "Öppna i redigerare"
+
+#: ../ui/xi-menus.glade.h:63
 msgid "Open in new tab"
-msgstr "Öppna i en ny flik"
+msgstr "Öppna i ny flik"
 
-#: ../ui/xi-menus.glade.h:47
+#: ../ui/xi-menus.glade.h:64
+msgid ""
+"Open selected module in a\n"
+"\tseparate ['dialog'] window"
+msgstr ""
+
+#: ../ui/xi-menus.glade.h:66
+msgid "Open selected module in a new tab"
+msgstr "Öppna vald modul i en ny flik"
+
+#: ../ui/xi-menus.glade.h:67
 msgid "Open this bookmark in a dialog"
 msgstr "Öppna detta bokmärke i ett dialogfönster"
 
-#: ../ui/xi-menus.glade.h:48
-#, fuzzy
+#: ../ui/xi-menus.glade.h:68
 msgid "Open this bookmark in a new tab"
-msgstr "Öppna detta bokmärke i ett dialogfönster"
+msgstr "Öppna detta bokmärke i en ny flik"
 
-#: ../ui/xi-menus.glade.h:50
+#: ../ui/xi-menus.glade.h:69
+msgid "Outlined"
+msgstr "Konturerad"
+
+#: ../ui/xi-menus.glade.h:71
 msgid "Read Selection Aloud"
 msgstr ""
 
-#: ../ui/xi-menus.glade.h:51
-msgid "Remove - Restore"
-msgstr "Ta bort - Återställ"
-
-#: ../ui/xi-menus.glade.h:52
-msgid "Remove Folder"
-msgstr "Ta bort mapp"
-
-#: ../ui/xi-menus.glade.h:53
+#: ../ui/xi-menus.glade.h:73
 msgid "Remove folder and save it"
 msgstr "Ta bort mapp och spara den"
 
-#: ../ui/xi-menus.glade.h:54
+#: ../ui/xi-menus.glade.h:74
+msgid "Remove this item"
+msgstr "Ta bort detta objekt"
+
+#: ../ui/xi-menus.glade.h:75
 msgid "Rename Pers.Comm."
 msgstr ""
 
-#: ../ui/xi-menus.glade.h:55
+#: ../ui/xi-menus.glade.h:76
 msgid "Respect Font Faces"
 msgstr ""
 
-#: ../ui/xi-menus.glade.h:56
+#: ../ui/xi-menus.glade.h:77
 msgid "Restore Folder"
 msgstr "Återställ mapp"
 
-#: ../ui/xi-menus.glade.h:57
+#: ../ui/xi-menus.glade.h:78
 msgid "Restore saved folder"
 msgstr "Återställ sparad mapp"
 
-#: ../ui/xi-menus.glade.h:58
-#, fuzzy
+#: ../ui/xi-menus.glade.h:79
 msgid "Save list as a series of bookmarks"
-msgstr "Spara sökresultaten som bokmärken"
+msgstr ""
 
-#: ../ui/xi-menus.glade.h:59
-#, fuzzy
+#: ../ui/xi-menus.glade.h:80
 msgid "Save list as a single bookmark"
-msgstr "Spara sökresultat som bokmärken"
+msgstr ""
 
-#: ../ui/xi-menus.glade.h:60
-#, fuzzy
+#: ../ui/xi-menus.glade.h:81
 msgid "Save these results as a series of bookmarks in their own folder"
-msgstr "Spara sökresultaten som bokmärken"
+msgstr ""
 
-#: ../ui/xi-menus.glade.h:61
-#, fuzzy
+#: ../ui/xi-menus.glade.h:82
 msgid "Save these results as a single bookmark"
-msgstr "Spara sökresultaten som bokmärken"
+msgstr ""
 
-#: ../ui/xi-menus.glade.h:62
+#: ../ui/xi-menus.glade.h:83
 msgid "Scripture Cross-references"
 msgstr ""
 
-#: ../ui/xi-menus.glade.h:64
-#, fuzzy
+#: ../ui/xi-menus.glade.h:85
 msgid "Show Parallel View in a _Tab"
-msgstr "Parallell vy"
+msgstr ""
 
-#: ../ui/xi-menus.glade.h:65
+#: ../ui/xi-menus.glade.h:86
 msgid "Show Previe_wer in the Sidebar"
-msgstr ""
+msgstr "_Visa förhandsgranskare i sidomenyn"
 
-#: ../ui/xi-menus.glade.h:66
+#: ../ui/xi-menus.glade.h:87
 msgid "Show Verse _Numbers"
 msgstr "Visa versnumrering"
 
-#: ../ui/xi-menus.glade.h:69
+#: ../ui/xi-menus.glade.h:88
+msgid "Simple"
+msgstr "Enkel"
+
+#: ../ui/xi-menus.glade.h:90
+msgid "Subject"
+msgstr "Rubrik"
+
+#: ../ui/xi-menus.glade.h:92
 msgid "Unlock This Module"
 msgstr "Lås upp denna modul"
 
-#: ../ui/xi-menus.glade.h:70
+#: ../ui/xi-menus.glade.h:93
 msgid "Use Current Dictionary"
 msgstr "Använd nuvarande uppslagsbok"
 
-#: ../ui/xi-menus.glade.h:71
+#: ../ui/xi-menus.glade.h:94
 msgid "Use module manager to install and remove Sword modules"
 msgstr "Använd modulhanteraren för att installera och ta bort SWORD-moduler"
 
-#: ../ui/xi-menus.glade.h:72
+#: ../ui/xi-menus.glade.h:95
 msgid "Variants"
-msgstr ""
+msgstr "Varianter"
 
-#: ../ui/xi-menus.glade.h:74
-#, fuzzy
+#: ../ui/xi-menus.glade.h:97
 msgid "_About The SWORD Project"
-msgstr "Om SWORD Project"
+msgstr ""
 
-#: ../ui/xi-menus.glade.h:75
+#: ../ui/xi-menus.glade.h:98
 msgid "_Advanced Search"
 msgstr "_Avancerad sökning"
 
-#: ../ui/xi-menus.glade.h:76
+#: ../ui/xi-menus.glade.h:99
 msgid "_Attach/Detach Sidebar"
 msgstr "_Fäst/koppla loss sidomeny"
 
-#: ../ui/xi-menus.glade.h:77
-#, fuzzy
-msgid "_Bible Text"
-msgstr "_Bibeltexter"
+#: ../ui/xi-menus.glade.h:100
+msgid "_Bible"
+msgstr "_Bibeln"
 
-#: ../ui/xi-menus.glade.h:78
-msgid "_Commentary"
-msgstr "_Kommentar"
+#: ../ui/xi-menus.glade.h:101
+msgid "_Commentary/Book"
+msgstr ""
 
-#: ../ui/xi-menus.glade.h:79
+#: ../ui/xi-menus.glade.h:102
 msgid "_Contents"
 msgstr "_Innehåll"
 
-#: ../ui/xi-menus.glade.h:80
+#: ../ui/xi-menus.glade.h:103
 msgid "_Daily Devotion"
 msgstr "_Daglig andakt"
 
-#: ../ui/xi-menus.glade.h:81
+#: ../ui/xi-menus.glade.h:104
 msgid "_Edit"
 msgstr "_Redigera"
 
-#: ../ui/xi-menus.glade.h:82
+#: ../ui/xi-menus.glade.h:105
 msgid "_Edit Item"
 msgstr "_Redigera objekt"
 
-#: ../ui/xi-menus.glade.h:84
+#: ../ui/xi-menus.glade.h:107
 msgid "_Help"
 msgstr "_Hjälp"
 
-#: ../ui/xi-menus.glade.h:85
+#: ../ui/xi-menus.glade.h:108
 msgid "_Highlight Current Verse"
 msgstr "_Markera aktuell vers"
 
-#: ../ui/xi-menus.glade.h:86
+#: ../ui/xi-menus.glade.h:109
 msgid "_Live Chat"
 msgstr ""
 
-#: ../ui/xi-menus.glade.h:87
+#: ../ui/xi-menus.glade.h:110
 msgid "_Mailing List"
 msgstr ""
 
-#: ../ui/xi-menus.glade.h:88
+#: ../ui/xi-menus.glade.h:111
 msgid "_Module Manager"
 msgstr "_Modulhanterare"
 
-#: ../ui/xi-menus.glade.h:89
+#: ../ui/xi-menus.glade.h:112
 msgid "_Open Session"
 msgstr "_Öppna session"
 
-#: ../ui/xi-menus.glade.h:90
-#, fuzzy
+#: ../ui/xi-menus.glade.h:113
 msgid "_Preferences"
-msgstr "Inställningar"
+msgstr "In_ställningar"
 
-#: ../ui/xi-menus.glade.h:91
-#, fuzzy
+#: ../ui/xi-menus.glade.h:114
 msgid "_Preview"
-msgstr "Förhandsg_ranskning"
+msgstr "_Förhandsvisning"
 
-#: ../ui/xi-menus.glade.h:92
+#: ../ui/xi-menus.glade.h:115
 msgid "_Read Aloud"
 msgstr ""
 
-#: ../ui/xi-menus.glade.h:93
+#: ../ui/xi-menus.glade.h:116
 msgid "_Report Bug"
-msgstr ""
+msgstr "_Rapportera fel"
 
-#: ../ui/xi-menus.glade.h:94
+#: ../ui/xi-menus.glade.h:117
 msgid "_Save Session"
 msgstr "_Spara session"
 
-#: ../ui/xi-menus.glade.h:95
+#: ../ui/xi-menus.glade.h:118
 msgid "_Search"
 msgstr "_Sök"
 
-#: ../ui/xi-menus.glade.h:96
-msgid "_Show/Hide Sidebar"
-msgstr "_Visa/göm sidomeny"
+#: ../ui/xi-menus.glade.h:119
+msgid "_Show/Hide Attached Sidebar"
+msgstr ""
 
-#: ../ui/xi-menus.glade.h:97
-#, fuzzy
+#: ../ui/xi-menus.glade.h:120
 msgid "_Verse Per Line"
-msgstr "Verslista"
+msgstr ""
 
-#: ../ui/xi-menus.glade.h:98
-msgid "_View"
-msgstr "_Visa"
+#: ../xiphos.desktop.in.in.h:1
+msgid "Study the Bible"
+msgstr "Studera bibeln"
 
-#~ msgid "Save As"
-#~ msgstr "Spara som"
+#: ../xiphos.desktop.in.in.h:2
+msgid "Xiphos Bible Guide"
+msgstr "Xiphos Bibelguide"
+
+#~ msgid "Move backwards through history"
+#~ msgstr "Gå bakåt genom historiken"
+
+#~ msgid "Move foward through history"
+#~ msgstr "Gå framåt i historiken"
+
+#~ msgid "Select a Book of the Bible"
+#~ msgstr "Välj en bok i bibeln"
+
+#~ msgid "Change Chapter"
+#~ msgstr "Ändra kapitel"
+
+#~ msgid "Change Verse"
+#~ msgstr "Ändra vers"
+
+#~ msgid "Enter a Verse reference in Book 1:1 format and press Return"
+#~ msgstr ""
+#~ "Ange en versreferens som i Bok 1:1-formatet och tryck på Return-tangenten"
+
+#~ msgid "Install these modules:"
+#~ msgstr "Installera följande moduler:"
+
+#~ msgid "Remove these modules:"
+#~ msgstr "Ta bort följande moduler"
+
+#~ msgid "Archive these modules:"
+#~ msgstr "Arkivera följande moduler:"
+
+#~ msgid "Delete fast-search index for these modules:"
+#~ msgstr "Ta bort snabbsök-index för följande moduler:"
 
-#~ msgid "Untitled document"
-#~ msgstr "Namnlöst dokument"
+#~ msgid "Xiphos could not execute archiver"
+#~ msgstr "Xiphos kunde inte köra arkiveraren"
 
-#~ msgid "HTML Output"
-#~ msgstr "HTML-utmatning"
+#~ msgid "Refreshing remote"
+#~ msgstr "Uppdaterar fjärr-källa"
 
-#~ msgid "HTML Source"
-#~ msgstr "HTML-källa"
+#~ msgid "Remote not found"
+#~ msgstr "Fjärr-källa kunde inte hittas"
 
-#~ msgid "_Quit"
-#~ msgstr "_Avsluta"
+#~ msgid "Sources"
+#~ msgstr "Källor"
 
-#~ msgid "_Open"
-#~ msgstr "_Öppna"
+#~ msgid "Open in a new tab"
+#~ msgstr "Öppna i en ny flik"
 
-#~ msgid "_Save"
-#~ msgstr "_Spara"
+#~ msgid "View information about the selected dialog"
+#~ msgstr "Visa information om det valda dialogfönstret"
 
-#~ msgid "Save _As..."
-#~ msgstr "Spara _som..."
+#~ msgid "Create a new prayer list"
+#~ msgstr "Skapa en ny bönelista"
 
-#~ msgid "HTML _Output"
-#~ msgstr "HTML-_utmatning"
+#~ msgid "Daily Journal"
+#~ msgstr "Daglig journal"
 
-#~ msgid "_HTML Source"
-#~ msgstr "_HTML-källa"
+#~ msgid "Open selected module in a dialog"
+#~ msgstr "Öppna vald modul i ett dialogfönster"
 
-#~ msgid "Save the changes to document"
-#~ msgstr "Spara ändringarna till dokumentet"
+#~ msgid "Text"
+#~ msgstr "Text"
 
-#~ msgid "If you don't save, changes will be permanently lost."
+#~ msgid "Pixbuf Object"
+#~ msgstr "Pixbuf-objekt"
+
+#~ msgid "Eph 2:8"
+#~ msgstr "Ef 2:8"
+
+#~ msgid "H_istory/C_lear"
+#~ msgstr "H_istorik/Rensa"
+
+#~ msgid "Xiphos has renamed .xiphos-2.0 to .xiphos"
+#~ msgstr "Xiphos har ändrat namn på .xiphos-2.0 till .xiphos"
+
+#~ msgid ""
+#~ "Xiphos can not rename  .xiphos-2.0 to .xiphos:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Xiphos cannot continue."
 #~ msgstr ""
-#~ "Om du inte sparar så kommer alla förändringar du har gjort att försvinna "
-#~ "permanent."
+#~ "Xiphos kan inte ändra namn på  .xiphos-2.0 till .xiphos:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Xiphos kan inte fortsätta."
+
+#~ msgid "Dictionary/_Lexicon"
+#~ msgstr "Uppslagsbok/_Lexikon"
+
+#~ msgid "Remove - Restore"
+#~ msgstr "Ta bort - Återställ"
 
-#~ msgid "StudyPad"
-#~ msgstr "StudyPad"
+#~ msgid "Remove Folder"
+#~ msgstr "Ta bort mapp"
 
-#~ msgid "Prayer List/Journal Editor"
-#~ msgstr "Bönelista/journal-redigerare"
+#~ msgid "_Commentary"
+#~ msgstr "_Kommentar"
+
+#~ msgid "_Show/Hide Sidebar"
+#~ msgstr "_Visa/göm sidomeny"
 
 #~ msgid "Open StudyPad File"
 #~ msgstr "Öppna StudyPad-fil"
@@ -3386,9 +3572,6 @@ msgstr "_Visa"
 #~ msgid "_Module Options"
 #~ msgstr "_Modulinställningar"
 
-#~ msgid "New Name"
-#~ msgstr "Nytt namn"
-
 #~ msgid "Print"
 #~ msgstr "Skriv ut"
 
@@ -3437,10 +3620,6 @@ msgstr "_Visa"
 #~ msgid "Advanced search using the search dialog"
 #~ msgstr "Avancerad sökning via sökdialogen"
 
-#, fuzzy
-#~ msgid "Set user preferences"
-#~ msgstr "Inställningar"
-
 #~ msgid "C_lear"
 #~ msgstr "_Rensa"
 
@@ -3489,9 +3668,6 @@ msgstr "_Visa"
 #~ msgid "\\par\\par My prayer list \\par\\par Module created in Xiphos"
 #~ msgstr "\\par\\par Min bönelista \\par\\par Modul skapad av Xiphos"
 
-#~ msgid "Delete Index"
-#~ msgstr "Ta bort index"
-
 #~ msgid "+5"
 #~ msgstr "+5"
 
@@ -3540,10 +3716,6 @@ msgstr "_Visa"
 #~ msgid "System locale is"
 #~ msgstr "Systemspråket är"
 
-#, fuzzy
-#~ msgid "SWORD locale is"
-#~ msgstr "Systemspråket är"
-
 #~ msgid "Checking for SWORD Modules"
 #~ msgstr "Letar efter SWORD-moduler"
 
diff --git a/po/zh.po b/po/zh.po
new file mode 100644
index 0000000..cbdfc53
--- /dev/null
+++ b/po/zh.po
@@ -0,0 +1,3659 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: Xiphos 3.1.2\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-12-14 23:45+0000\n"
+"PO-Revision-Date: \n"
+"Last-Translator: Karl Kleinpaste <charcoal@users.sourceforge.net>\n"
+"Language-Team: Xiphos Development Team\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Chinese\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+#: ../src/backend/sword_main.cc:1083
+msgid "Configuration not found"
+msgstr "配置未找到"
+
+#: ../src/editor/bonobo-editor.c:254
+#: ../src/editor/slib-editor.c:234
+#: ../src/gnome2/html.c:637
+#, c-format
+msgid "Page %d of %d"
+msgstr "頁 %d 的 %d"
+
+#: ../src/editor/bonobo-editor.c:353
+#: ../src/editor/slib-editor.c:659
+msgid "Are you sure you want to delete the note for"
+msgstr "您確定要刪除說明中"
+
+#: ../src/editor/bonobo-editor.c:965
+#: ../src/editor/bonobo-editor.c:998
+#: ../src/editor/slib-editor.c:1308
+#: ../src/editor/slib-editor.c:1345
+msgid "Save the changes to document"
+msgstr "保存更改文件"
+
+#: ../src/editor/bonobo-editor.c:966
+#: ../src/editor/bonobo-editor.c:999
+#: ../src/editor/slib-editor.c:1309
+#: ../src/editor/slib-editor.c:1346
+msgid "before closing?"
+msgstr "關閉之前?"
+
+#: ../src/editor/bonobo-editor.c:973
+#: ../src/editor/bonobo-editor.c:1006
+#: ../src/editor/slib-editor.c:1316
+#: ../src/editor/slib-editor.c:1353
+msgid "If you don't save, changes will be permanently lost."
+msgstr "如果您不保存,更改將永久丟失。"
+
+#: ../src/editor/bonobo-editor.c:997
+#: ../src/editor/slib-editor.c:1344
+#: ../ui/xi-menus.glade.h:39
+msgid "File"
+msgstr "文件"
+
+#: ../src/editor/bonobo-editor.c:1224
+#: ../src/editor/slib-editor.c:1401
+msgid "StudyPad"
+msgstr "研究墊"
+
+#: ../src/editor/bonobo-editor.c:1237
+#: ../src/editor/slib-editor.c:1415
+msgid "Note Editor"
+msgstr "注意:編輯器"
+
+#: ../src/editor/bonobo-editor.c:1246
+#: ../src/editor/slib-editor.c:1429
+msgid "Prayer List/Journal Editor"
+msgstr "祈禱名單/期刊編輯"
+
+#: ../src/editor/slib-editor.c:401
+#: ../src/editor/slib-editor.c:448
+msgid "Save As"
+msgstr "另存為"
+
+#: ../src/editor/slib-editor.c:419
+#: ../src/editor/slib-editor.c:466
+#: ../src/editor/slib-editor.c:634
+msgid "Untitled document"
+msgstr "無標題文檔"
+
+#: ../src/editor/slib-editor.c:702
+msgid "HTML Output"
+msgstr "HTML輸出"
+
+#: ../src/editor/slib-editor.c:709
+msgid "HTML Source"
+msgstr "HTML源代碼"
+
+#: ../src/editor/slib-editor.c:716
+msgid "Plain Source"
+msgstr "平原源"
+
+#: ../src/editor/slib-editor.c:726
+#: ../ui/editor_note.xml.h:15
+#: ../ui/editor_studypad.xml.h:21
+msgid "_Print..."
+msgstr "打印"
+
+#: ../src/editor/slib-editor.c:733
+#: ../ui/editor_note.xml.h:9
+#: ../ui/editor_studypad.xml.h:14
+msgid "Print Pre_view"
+msgstr "打印預覽"
+
+#: ../src/editor/slib-editor.c:740
+msgid "_Quit"
+msgstr "退出"
+
+#: ../src/editor/slib-editor.c:747
+msgid "_Open"
+msgstr "打開"
+
+#: ../src/editor/slib-editor.c:754
+msgid "_Save"
+msgstr "保存"
+
+#: ../src/editor/slib-editor.c:761
+msgid "Save _As..."
+msgstr "另存為"
+
+#: ../src/editor/slib-editor.c:767
+msgid "New"
+msgstr "新的"
+
+#: ../src/editor/slib-editor.c:769
+msgid "Open new document"
+msgstr "打開新文件"
+
+#: ../src/editor/slib-editor.c:773
+msgid "Delete"
+msgstr "刪除"
+
+#: ../src/editor/slib-editor.c:775
+msgid "Delete current note"
+msgstr "刪除本說明"
+
+#: ../src/editor/slib-editor.c:780
+#: ../ui/editor_note.xml.h:14
+#: ../ui/editor_studypad.xml.h:20
+#: ../ui/editor.xml.h:13
+#: ../ui/xi-menus.glade.h:106
+msgid "_File"
+msgstr "文件"
+
+#: ../src/editor/slib-editor.c:835
+msgid "HTML _Output"
+msgstr "HTML輸出"
+
+#: ../src/editor/slib-editor.c:842
+msgid "_HTML Source"
+msgstr "HTML源代碼"
+
+#: ../src/editor/slib-editor.c:849
+msgid "_Plain Source"
+msgstr "平原源"
+
+#: ../src/editor/slib-editor.c:856
+#: ../ui/xi-menus.glade.h:121
+msgid "_View"
+msgstr "查看"
+
+#: ../src/editor/slib-editor.c:867
+#: ../ui/editor_note.xml.h:11
+#: ../ui/editor_studypad.xml.h:16
+#: ../ui/editor.xml.h:11
+msgid "Save"
+msgstr "保存"
+
+#: ../src/editor/slib-editor.c:878
+#: ../src/editor/slib-editor.c:885
+msgid "Insert Link"
+msgstr "插入鏈接"
+
+#: ../src/gecko/gecko-html.cpp:177
+#: ../src/gnome2/html.c:165
+msgid "Unlock "
+msgstr "解鎖"
+
+#: ../src/gecko/gecko-print.c:172
+msgid "Preparing to print"
+msgstr "準備打印"
+
+#: ../src/gecko/gecko-print.c:266
+msgid "Printing is not supported on this printer"
+msgstr "印刷不支持這台打印機"
+
+#: ../src/gecko/gecko-print.c:269
+#, c-format
+msgid "Printer %s does not support PostScript printing."
+msgstr "打印機 %s 不支持PostScript打印。"
+
+#: ../src/gecko/gecko-print.c:342
+#: ../src/gecko/gecko-print.c:370
+msgid "Printing"
+msgstr "印刷"
+
+#: ../src/gecko/gecko-print.c:372
+msgid "Waiting to print"
+msgstr "等待打印"
+
+#: ../src/gecko/gecko-print.c:584
+msgid "An error occurred while printing"
+msgstr "發生錯誤時打印"
+
+#: ../src/gecko/gecko-print.c:588
+#, c-format
+msgid "It was not possible to print your document: %s"
+msgstr "這是不可能的打印文檔:%s"
+
+#: ../src/gnome2/about_modules.c:195
+msgid "About Sword Module"
+msgstr "關於劍模塊"
+
+#: ../src/gnome2/about_modules.c:389
+#: ../src/gnome2/mod_mgr.c:252
+msgid "The module has no About information."
+msgstr "該模塊有沒有關於信息。"
+
+#: ../src/gnome2/about_sword.c:88
+msgid "The SWORD Project is an effort to create an ever-expanding software package for research and study of God and His Word. The SWORD Project framework allows easy use and study of Bible texts, commentaries, lexicons, dictionaries, and other books. Many frontends are built using this framework. An installed set of books may be shared among all frontends using the framework."
+msgstr "The SWORD Project 是為了創造一個不斷擴大的軟件包的研究和學習的上帝和他的話語。劍項目的框架可以輕鬆的使用和研究聖經的文本,評論，詞典,字典,和其他書籍。許多前端都採用這一框架。已安裝的一套書可能還會將在所有前端使用的框架。"
+
+#: ../src/gnome2/about_sword.c:106
+msgid "About the SWORD Project"
+msgstr "關於劍項目"
+
+#: ../src/gnome2/about_sword.c:124
+msgid "Sword Version"
+msgstr "劍版本"
+
+#: ../src/gnome2/about_sword.c:155
+msgid "Books can be downloaded from the SWORD Project"
+msgstr "書籍可以下載劍項目"
+
+#: ../src/gnome2/about_sword.c:161
+msgid "The SWORD Project"
+msgstr "The SWORD Project"
+
+#: ../src/gnome2/about_trans.c:84
+msgid ""
+"Do you like using Xiphos to study the Bible? Would you like to see its display using your native language? You could translate Xiphos! \n"
+"\n"
+"We are always looking for contributions of new translations of Xiphos into other languages. If you are able to translate for us, please see the link below, contact us, and get involved with our efforts."
+msgstr ""
+"你喜歡使用Xiphos研究聖經？你想看到它的顯示使用您的母語?你可以翻譯 Xiphos!\n"
+"\n"
+"我們一直在尋找新的貢獻的Xiphos翻譯成其他語言。如果您能為我們翻譯,請參閱以下鏈接,聯繫我們,並獲得參與我們的努力。"
+
+#: ../src/gnome2/about_trans.c:98
+msgid "About Xiphos Translation"
+msgstr "關於 Xiphos翻譯"
+
+#: ../src/gnome2/about_trans.c:140
+msgid "See TRANSLATION-HOWTO in Xiphos source"
+msgstr "見翻譯如何在Xiphos源"
+
+#: ../src/gnome2/about_trans.c:146
+msgid "Xiphos development"
+msgstr "Xiphos發展"
+
+#: ../src/gnome2/about_xiphos.c:131
+msgid "Copyright 2000-2009 The Xiphos Development Team"
+msgstr "版權所有 2000-2009的Xiphos開發團隊"
+
+#: ../src/gnome2/about_xiphos.c:134
+msgid ""
+"(formerly known as GnomeSword)\n"
+"\n"
+"Powered by The SWORD Project.\n"
+"We would like to thank Troy Griffitts and all the other folks who have given us The SWORD Project."
+msgstr ""
+"（以前稱為 GnomeSword）\n"
+"\n"
+"本站由劍項目。\n"
+"我們要感謝 Troy Griffits 和所有其他伙計誰給了我們 The SWORD Project."
+
+#: ../src/gnome2/bibletext_dialog.c:358
+msgid "Go to "
+msgstr "轉到"
+
+#. info->stock_icon = GTK_STOCK_OPEN;
+#: ../src/gnome2/bookmark_dialog.c:171
+#: ../src/gnome2/bookmarks_menu.c:358
+#: ../src/gnome2/bookmarks_menu.c:765
+#: ../src/gnome2/bookmarks_menu.c:863
+#: ../src/gnome2/bookmarks_treeview.c:133
+#: ../ui/editor_studypad.xml.h:2
+#: ../ui/xi-menus.glade.h:13
+msgid "Bookmark"
+msgstr "書籤"
+
+#: ../src/gnome2/bookmark_dialog.c:173
+#: ../src/gnome2/bookmarks_menu.c:865
+#: ../src/gnome2/bookmarks_treeview.c:134
+msgid "Enter Folder Name"
+msgstr "輸入文件夾名稱"
+
+#: ../src/gnome2/bookmark_dialog.c:175
+#: ../src/gnome2/bookmarks_menu.c:867
+msgid "Folder Name"
+msgstr "文件夾名稱"
+
+#: ../src/gnome2/bookmark_dialog.c:176
+#: ../src/gnome2/bookmarks_menu.c:868
+#: ../src/gnome2/bookmarks_treeview.c:136
+msgid "Folder: "
+msgstr "文件夾:"
+
+#: ../src/gnome2/bookmarks_menu.c:344
+#: ../ui/xi-menus.glade.h:32
+msgid "Edit"
+msgstr "編輯"
+
+#: ../src/gnome2/bookmarks_menu.c:361
+msgid "Folder name: "
+msgstr "文件夾名稱:"
+
+#: ../src/gnome2/bookmarks_menu.c:364
+msgid "Bookmark name: "
+msgstr "書籤名稱:"
+
+#: ../src/gnome2/bookmarks_menu.c:367
+#: ../src/gnome2/bookmarks_menu.c:773
+msgid "Verse: "
+msgstr "詩:"
+
+#: ../src/gnome2/bookmarks_menu.c:368
+#: ../src/gnome2/bookmarks_menu.c:774
+msgid "Module: "
+msgstr "模塊"
+
+#: ../src/gnome2/bookmarks_menu.c:533
+msgid "Restore Bookmark Folder"
+msgstr "還原書籤文件夾"
+
+#: ../src/gnome2/bookmarks_menu.c:602
+msgid "Remove the selected folder"
+msgstr "刪除所選的文件夾"
+
+#: ../src/gnome2/bookmarks_menu.c:604
+msgid "(and all its contents)?"
+msgstr "(及其所有內容)?"
+
+#: ../src/gnome2/bookmarks_menu.c:607
+msgid "Remove the selected bookmark"
+msgstr "刪除所選的書籤"
+
+#: ../src/gnome2/bookmarks_menu.c:766
+msgid "Add"
+msgstr "添加"
+
+#: ../src/gnome2/bookmarks_menu.c:772
+msgid "Label: "
+msgstr "標籤:"
+
+#: ../src/gnome2/bookmarks_treeview.c:107
+#, c-format
+msgid "Search result: %s"
+msgstr "搜尋結果:%s"
+
+#: ../src/gnome2/bookmarks_treeview.c:943
+#: ../src/gnome2/sidebar.c:1389
+msgid "Bookmarks"
+msgstr "書籤"
+
+#: ../src/gnome2/cipher_key_dialog.c:62
+msgid "Cipher Key?"
+msgstr "加密密鑰?"
+
+#: ../src/gnome2/cipher_key_dialog.c:63
+msgid "for:"
+msgstr "為:"
+
+#: ../src/gnome2/cipher_key_dialog.c:66
+msgid "Enter Cipher Key: "
+msgstr "輸入密碼的關鍵:"
+
+#: ../src/gnome2/dialog.c:265
+msgid "Close without Saving"
+msgstr "關閉而不保存"
+
+#: ../src/gnome2/dialog.c:596
+msgid "Xiphos:"
+msgstr "Xiphos:"
+
+#: ../src/gnome2/dialog.c:697
+msgid "Close _without Saving"
+msgstr "關閉而不保存"
+
+#: ../src/gnome2/export_dialog.c:267
+#: ../ui/export-dialog.glade.h:20
+msgid "Please check copyright before exporting!"
+msgstr "請檢查版權出口前!"
+
+#: ../src/gnome2/find_dialog.c:204
+#: ../src/gnome2/find_dialog.c:373
+msgid "Find"
+msgstr "查找"
+
+#: ../src/gnome2/find_dialog.c:222
+msgid "Enter Word or Phrase"
+msgstr "輸入單詞或短語"
+
+#: ../src/gnome2/find_dialog.c:238
+#: ../src/gnome2/search_sidebar.c:306
+#: ../ui/search-dialog.glade.h:59
+msgid "Match case"
+msgstr "區分大小寫"
+
+#: ../src/gnome2/find_dialog.c:245
+msgid "Search backwards"
+msgstr "向後搜索"
+
+#: ../src/gnome2/find_dialog.c:254
+#: ../src/gnome2/search_sidebar.c:271
+#: ../ui/search-dialog.glade.h:76
+msgid "Regular expression"
+msgstr "正則表達式"
+
+#: ../src/gnome2/find_dialog.c:295
+msgid "Find Next"
+msgstr "查找下一個"
+
+#: ../src/gnome2/font_dialog.c:303
+msgid "Set Module Font"
+msgstr "字體設置模塊"
+
+#: ../src/gnome2/font_dialog.c:333
+msgid "Change font for"
+msgstr "更改字體的"
+
+#: ../src/gnome2/font_dialog.c:337
+msgid "Module"
+msgstr "模塊"
+
+#: ../src/gnome2/font_dialog.c:341
+msgid "Current font: "
+msgstr "當前字體:"
+
+#: ../src/gnome2/font_dialog.c:378
+msgid "+0"
+msgstr "+0"
+
+#: ../src/gnome2/font_dialog.c:382
+msgid "Use the default font for this module"
+msgstr "使用默認字體為這個模塊"
+
+#. *****************************************************************************
+#. * Name
+#. *    gconf_setup
+#. *
+#. * Synopsis
+#. *   #include "main/settings.h"
+#. *
+#. *   void gconf_setup()
+#. *
+#. * Description
+#. *   verifies and initializes the GConf subsystem, so that "sword://" and
+#. *   similar can be handled by url-comprehending programs such as browsers.
+#. *   dialogs for permission/success/failure => conditional on debug build.
+#. *
+#. * Return value
+#. *   void
+#.
+#: ../src/gnome2/gui.c:110
+msgid ""
+"URL references using \"sword://\" (similar to web page\n"
+"references) can be used by programs to look up\n"
+"scripture references. Your system currently has no\n"
+"program set to handle these references.\n"
+"\n"
+"Would you like Xiphos to set itself as the\n"
+"program to handle these references?"
+msgstr ""
+"網址引用使用\"sword：//\"(類似網頁 \n"
+"參考文獻)可以使用程序來查找\n"
+"經典引用。您的系統目前沒有 \n"
+"程序設置為處理這些引用。\n"
+"\n"
+"你想Xiphos本身設置成\n"
+"程序來處理這些引用？"
+
+#: ../src/gnome2/gui.c:112
+msgid ""
+"Xiphos has successfully set itself\n"
+"as the handler of sword:// and bible:// URLs.\n"
+"\n"
+"You may wish to run the program \"gconf-editor\"\n"
+"to examine keys under /desktop/gnome/url-handlers,\n"
+"if you need to change these."
+msgstr ""
+"Xiphos已成功地為自己\n"
+"為處理程序根據 sword:/ /和 bible：/ / URLs。\n"
+"\n"
+"您可能希望運行程序\"gconf-editor\"\n"
+"根據審查鍵 /desktop/gnome/url-handlers，\n"
+"如果您需要更改這些。"
+
+#: ../src/gnome2/gui.c:166
+#, c-format
+msgid ""
+"Xiphos failed to complete handler init for key #%d:\n"
+"%s"
+msgstr ""
+"Xiphos未能完成處理程序初始化關鍵＃%d:\n"
+"%s"
+
+#: ../src/gnome2/gui.c:212
+msgid "BUG! Xiphos is about to crash due to a \"STRDUP\" error."
+msgstr "錯誤! Xiphos即將崩潰由於 \"STRDUP\"的錯誤。"
+
+#: ../src/gnome2/gui.c:213
+#: ../src/gnome2/gui.c:248
+msgid "Please report this error to the Xiphos team with:"
+msgstr "請將此錯誤報告給 Xiphos團隊:"
+
+#: ../src/gnome2/gui.c:247
+msgid "BUG! Xiphos is about to crash due to a \"STRING\" error."
+msgstr "錯誤! Xiphos即將崩潰由於 \"STRING\"的錯誤。"
+
+#: ../src/gnome2/main_window.c:789
+msgid "Xiphos - Bible Study Software"
+msgstr "Xiphos - 聖經學習軟件"
+
+#: ../src/gnome2/main_window.c:844
+msgid "Open a new tab"
+msgstr "打開一個新標籤"
+
+#: ../src/gnome2/main_window.c:923
+#: ../src/gnome2/sidebar.c:627
+#: ../src/gnome2/sidebar.c:633
+#: ../src/main/sidebar.cc:666
+#: ../src/main/sidebar.cc:1015
+#: ../src/main/sidebar.cc:1016
+#: ../src/main/sidebar.cc:1017
+msgid "Standard View"
+msgstr "標準視圖"
+
+#: ../src/gnome2/main_window.c:1004
+msgid "Commentary View"
+msgstr "述評看法"
+
+#: ../src/gnome2/main_window.c:1020
+msgid "Book View"
+msgstr "圖書查看"
+
+#: ../src/gnome2/main_window.c:1045
+msgid "Welcome to Xiphos"
+msgstr "歡迎 Xiphos"
+
+#: ../src/gnome2/menu_popup.c:1168
+msgid ""
+"Renaming is not available in Windows.\n"
+"\n"
+"Xiphos is limited by Windows' filesystem,\n"
+"because it disallows the renaming of filename\n"
+"components of currently-open files,\n"
+"such as the contents of this commentary.\n"
+"Therefore, personal commentary renaming is\n"
+"not available in the Windows environment."
+msgstr ""
+"命名是無法在Windows。\n"
+"\n"
+"Xiphos受限於 Windows的文件系統,\n"
+"因為它不允許重命名的文件名\n"
+"組件當前打開的文件,\n"
+"如本評注的內容。\n"
+"因此,個人的評注重命名為 \n"
+"沒有在Windows環境中。"
+
+#: ../src/gnome2/menu_popup.c:1187
+msgid "Rename Commentary"
+msgstr "重評"
+
+#: ../src/gnome2/menu_popup.c:1190
+msgid "Choose Commentary Name"
+msgstr "選擇評論的名稱"
+
+#: ../src/gnome2/menu_popup.c:1192
+msgid "New Name"
+msgstr "新名稱"
+
+#: ../src/gnome2/menu_popup.c:1193
+#: ../src/gnome2/treekey-editor.c:139
+#: ../src/gnome2/treekey-editor.c:198
+#: ../src/gnome2/treekey-editor.c:284
+#: ../src/main/prayerlists.cc:243
+msgid "Name: "
+msgstr "名稱:"
+
+#: ../src/gnome2/menu_popup.c:1203
+#: ../src/main/prayerlists.cc:257
+msgid "Module names must contain [A-Za-z0-9_] only."
+msgstr "模塊名稱必須包含[A-Za-zz0-9_]只。"
+
+#: ../src/gnome2/menu_popup.c:1210
+#: ../src/main/prayerlists.cc:264
+msgid "Xiphos already knows a module by that name."
+msgstr "Xiphos已經知道一個模塊，該名稱。"
+
+#: ../src/gnome2/menu_popup.c:1253
+#, c-format
+msgid ""
+"Failed to create new configuration:\n"
+"%s"
+msgstr ""
+"未能創造新的配置:\n"
+"%s"
+
+#: ../src/gnome2/menu_popup.c:1262
+msgid ""
+"Configuration build error:\n"
+"\n"
+msgstr ""
+"配置生成錯誤:\n"
+"\n"
+
+#: ../src/gnome2/mod_mgr.c:169
+msgid "Remove these modules?"
+msgstr "刪除這些模塊?"
+
+#: ../src/gnome2/mod_mgr.c:170
+msgid "Preparing to remove"
+msgstr "正準備刪除"
+
+#: ../src/gnome2/mod_mgr.c:171
+msgid "Removing"
+msgstr "刪除"
+
+#: ../src/gnome2/mod_mgr.c:172
+#: ../ui/xi-menus.glade.h:72
+msgid "Remove"
+msgstr "刪除"
+
+#: ../src/gnome2/mod_mgr.c:175
+msgid "Install these modules?"
+msgstr "安裝這些模塊?"
+
+#: ../src/gnome2/mod_mgr.c:176
+msgid "Preparing to install"
+msgstr "準備安裝"
+
+#: ../src/gnome2/mod_mgr.c:177
+msgid "Installing"
+msgstr "安裝"
+
+#: ../src/gnome2/mod_mgr.c:178
+#: ../src/gnome2/mod_mgr.c:2964
+#: ../ui/module-manager.glade.h:18
+msgid "Install"
+msgstr "安裝"
+
+#: ../src/gnome2/mod_mgr.c:181
+msgid "Archive these modules?"
+msgstr "這些模塊的檔案?"
+
+#: ../src/gnome2/mod_mgr.c:182
+msgid "Preparing to archive"
+msgstr "準備存檔"
+
+#: ../src/gnome2/mod_mgr.c:183
+msgid "Archiving"
+msgstr "歸檔"
+
+#: ../src/gnome2/mod_mgr.c:184
+#: ../ui/module-manager.glade.h:11
+msgid "Archive"
+msgstr "檔案"
+
+#: ../src/gnome2/mod_mgr.c:187
+msgid ""
+"Build fast-search index for these\n"
+"modules (may take minutes/module)?"
+msgstr ""
+"建立快速搜索索引這些\n"
+"模塊(可能只需要幾分鐘 /模塊)?"
+
+#: ../src/gnome2/mod_mgr.c:188
+msgid "Preparing to index"
+msgstr "準備指數"
+
+#: ../src/gnome2/mod_mgr.c:189
+msgid "Indexing"
+msgstr "索引"
+
+#: ../src/gnome2/mod_mgr.c:190
+#: ../ui/module-manager.glade.h:17
+msgid "Index"
+msgstr "指數"
+
+#: ../src/gnome2/mod_mgr.c:193
+msgid "Delete fast-search index for these modules?"
+msgstr "刪除快速搜索索引這些模塊?"
+
+#: ../src/gnome2/mod_mgr.c:194
+msgid "Preparing to delete index"
+msgstr "準備刪除索引"
+
+#: ../src/gnome2/mod_mgr.c:195
+msgid "Deleting index"
+msgstr "刪除指數"
+
+#: ../src/gnome2/mod_mgr.c:196
+msgid "Deletion"
+msgstr "刪除"
+
+#: ../src/gnome2/mod_mgr.c:427
+msgid "Module Name"
+msgstr "模塊名稱"
+
+#: ../src/gnome2/mod_mgr.c:448
+msgid "A checkmark means this module is already installed"
+msgstr "阿勾意味著這個模塊已經安裝"
+
+#: ../src/gnome2/mod_mgr.c:470
+msgid "Click the box to work on this module"
+msgstr "按一下方塊,以這方面的工作模塊"
+
+#: ../src/gnome2/mod_mgr.c:471
+msgid "Click the box to select this module for install/update"
+msgstr "單擊以選中此模塊的安裝 /更新"
+
+#: ../src/gnome2/mod_mgr.c:490
+msgid "Installed"
+msgstr "安裝"
+
+#: ../src/gnome2/mod_mgr.c:500
+msgid "The index icon means you have built an optimized ('lucene') index for this module for fast searching (see the Maintenance pane for this function)"
+msgstr "該指數圖標意味著你已經建立了優化（'Lucene'）這個模塊指數快速搜索（見維護窗格中的此功能）"
+
+#: ../src/gnome2/mod_mgr.c:518
+msgid "The lock icon means this module is encrypted, and requires that you purchase an unlock key from the content owner"
+msgstr "鎖圖標表示該模塊加密,並要求您購買解鎖密鑰從內容所有者"
+
+#: ../src/gnome2/mod_mgr.c:535
+#: ../ui/xi-menus.glade.h:1
+msgid "About"
+msgstr "大約"
+
+#: ../src/gnome2/mod_mgr.c:555
+msgid "The refresh icon means the Installed module is older than the newer Available module: You should update the module"
+msgstr "刷新圖標表示已安裝的模塊老年人較新的可用模塊：你應該更新模塊"
+
+#: ../src/gnome2/mod_mgr.c:567
+msgid "Available"
+msgstr "可用的"
+
+#: ../src/gnome2/mod_mgr.c:576
+msgid "Size"
+msgstr "大小"
+
+#: ../src/gnome2/mod_mgr.c:585
+msgid "Description"
+msgstr "描述"
+
+#: ../src/gnome2/mod_mgr.c:736
+#, c-format
+msgid ""
+"`mkdir %s' failed:\n"
+"%s."
+msgstr ""
+"`mkdir %s' 失敗:\n"
+"%s."
+
+#: ../src/gnome2/mod_mgr.c:759
+msgid " archived in: \n"
+msgstr "存檔在: \n"
+
+#: ../src/gnome2/mod_mgr.c:815
+msgid "Journals and prayer lists cannot be indexed."
+msgstr "期刊和祈禱名單不能被索引。"
+
+#: ../src/gnome2/mod_mgr.c:833
+#, c-format
+msgid "%s failed"
+msgstr "%s 失敗"
+
+#: ../src/gnome2/mod_mgr.c:836
+#: ../src/gnome2/mod_mgr.c:1562
+msgid "Finished"
+msgstr "成品"
+
+#: ../src/gnome2/mod_mgr.c:1003
+#: ../src/gnome2/mod_mgr.c:1005
+#: ../src/gnome2/mod_mgr.c:1107
+#: ../src/gnome2/mod_mgr.c:1142
+#: ../src/gnome2/mod_mgr.c:1144
+#: ../src/gnome2/utilities.c:435
+#: ../src/gnome2/utilities.c:500
+#: ../src/gnome2/utilities.c:502
+#: ../src/gnome2/utilities.c:986
+#: ../src/main/sidebar.cc:852
+#: ../src/main/sidebar.cc:924
+#: ../src/main/sidebar.cc:926
+msgid "Unknown"
+msgstr "未知"
+
+#: ../src/gnome2/mod_mgr.c:1301
+#, c-format
+msgid ""
+"Repository:\n"
+"%s"
+msgstr ""
+"庫:\n"
+"%s"
+
+#: ../src/gnome2/mod_mgr.c:1313
+msgid ""
+"Categorized by\n"
+"Module Type"
+msgstr ""
+"分類為\n"
+"模塊類型"
+
+#: ../src/gnome2/mod_mgr.c:1318
+#: ../src/gnome2/utilities.c:561
+#: ../src/main/sidebar.cc:999
+#: ../src/main/sidebar.cc:1001
+msgid "Biblical Texts"
+msgstr "經文"
+
+#: ../src/gnome2/mod_mgr.c:1322
+#: ../src/gnome2/utilities.c:565
+#: ../src/main/sidebar.cc:678
+#: ../src/main/sidebar.cc:1024
+#: ../src/main/sidebar.cc:1026
+#: ../ui/prefs.glade.h:33
+msgid "Commentaries"
+msgstr "評"
+
+#: ../src/gnome2/mod_mgr.c:1326
+#: ../src/gnome2/utilities.c:569
+#: ../src/main/sidebar.cc:1033
+#: ../src/main/sidebar.cc:1035
+msgid "Dictionaries"
+msgstr "字典"
+
+#: ../src/gnome2/mod_mgr.c:1330
+#: ../src/gnome2/utilities.c:573
+#: ../src/main/sidebar.cc:1042
+#: ../src/main/sidebar.cc:1044
+msgid "Daily Devotionals"
+msgstr "每日靈修"
+
+#: ../src/gnome2/mod_mgr.c:1334
+#: ../src/gnome2/utilities.c:577
+#: ../src/main/sidebar.cc:688
+#: ../src/main/sidebar.cc:1051
+#: ../src/main/sidebar.cc:1053
+msgid "General Books"
+msgstr "一般圖書"
+
+#: ../src/gnome2/mod_mgr.c:1338
+#: ../src/gnome2/utilities.c:581
+#: ../src/main/sidebar.cc:1060
+#: ../src/main/sidebar.cc:1062
+msgid "Maps"
+msgstr "地圖"
+
+#: ../src/gnome2/mod_mgr.c:1342
+#: ../src/gnome2/utilities.c:585
+#: ../src/main/sidebar.cc:1069
+#: ../src/main/sidebar.cc:1071
+msgid "Images"
+msgstr "圖片"
+
+#: ../src/gnome2/mod_mgr.c:1350
+msgid ""
+"Categorized by\n"
+"Availability"
+msgstr ""
+"分類為\n"
+"可用性"
+
+#: ../src/gnome2/mod_mgr.c:1355
+msgid "Updates"
+msgstr "更新"
+
+#: ../src/gnome2/mod_mgr.c:1359
+msgid "Uninstalled"
+msgstr "卸載"
+
+#: ../src/gnome2/mod_mgr.c:1363
+#: ../src/gnome2/sidebar.c:643
+#: ../src/gnome2/utilities.c:590
+#: ../src/main/prayerlists.cc:241
+#: ../src/main/sidebar.cc:1079
+#: ../src/main/sidebar.cc:1081
+msgid "Prayer List/Journal"
+msgstr "祈禱名單 /期刊"
+
+#: ../src/gnome2/mod_mgr.c:1545
+msgid "Refreshing from remote source"
+msgstr "從遠程源刷新"
+
+#: ../src/gnome2/mod_mgr.c:1556
+msgid "Remote source not found"
+msgstr "遠程源未找到"
+
+#: ../src/gnome2/mod_mgr.c:1670
+msgid "Configure"
+msgstr "配置"
+
+#: ../src/gnome2/mod_mgr.c:1701
+msgid "Type"
+msgstr "類型"
+
+#: ../src/gnome2/mod_mgr.c:1708
+msgid "Caption"
+msgstr "標題"
+
+#: ../src/gnome2/mod_mgr.c:1716
+msgid "Source"
+msgstr "來源"
+
+#: ../src/gnome2/mod_mgr.c:1724
+msgid "Directory"
+msgstr "目錄"
+
+#: ../src/gnome2/mod_mgr.c:1732
+msgid "User"
+msgstr "用戶"
+
+#: ../src/gnome2/mod_mgr.c:1740
+msgid "Password"
+msgstr "密碼"
+
+#: ../src/gnome2/mod_mgr.c:1748
+msgid "UID"
+msgstr "UID"
+
+#: ../src/gnome2/mod_mgr.c:1765
+msgid "Module Sources"
+msgstr "模塊源"
+
+#: ../src/gnome2/mod_mgr.c:1768
+msgid "Add/Remove"
+msgstr "添加/刪除"
+
+#: ../src/gnome2/mod_mgr.c:1770
+msgid "Choose"
+msgstr "選擇"
+
+#: ../src/gnome2/mod_mgr.c:1774
+#: ../src/gnome2/preferences_dialog.c:1793
+#: ../src/gnome2/sidebar.c:1413
+msgid "Modules"
+msgstr "模塊"
+
+#: ../src/gnome2/mod_mgr.c:1776
+msgid "Install/Update"
+msgstr "安裝 /更新"
+
+#: ../src/gnome2/mod_mgr.c:1778
+msgid "Maintenance"
+msgstr "維修"
+
+#: ../src/gnome2/mod_mgr.c:1999
+msgid "Please Refresh"
+msgstr "請刷新"
+
+#: ../src/gnome2/mod_mgr.c:2000
+msgid "Your module list is not up to date!"
+msgstr "模塊列表不是最新消息!"
+
+#. Zero Bibles is just not workable in Xiphos.
+#: ../src/gnome2/mod_mgr.c:2282
+msgid ""
+"You have uninstalled your last Bible.\n"
+"Xiphos requires at least one."
+msgstr ""
+"您已經卸載您的最後聖經。\n"
+"Xiphos至少需要一個。"
+
+#: ../src/gnome2/mod_mgr.c:2288
+msgid ""
+"There are still no Bibles installed.\n"
+"Xiphos cannot continue without one."
+msgstr ""
+"目前還沒有聖經安裝。\n"
+"Xiphos不能繼續無一。"
+
+#: ../src/gnome2/mod_mgr.c:2353
+msgid "Standard remote sources have been loaded."
+msgstr "標準遠程來源已經被加載。"
+
+#: ../src/gnome2/mod_mgr.c:2359
+msgid "Could not load standard sources from CrossWire."
+msgstr "無法加載標準從 CrossWire來源。"
+
+#: ../src/gnome2/mod_mgr.c:2510
+#: ../src/gnome2/mod_mgr.c:2759
+msgid "Remove the selected source"
+msgstr "刪除選定的源"
+
+#: ../src/gnome2/mod_mgr.c:2570
+msgid "Enter a remote source"
+msgstr "輸入遠程源"
+
+#: ../src/gnome2/mod_mgr.c:2574
+msgid "Caption:"
+msgstr "標題:"
+
+#: ../src/gnome2/mod_mgr.c:2575
+msgid "Type:"
+msgstr "類型:"
+
+#: ../src/gnome2/mod_mgr.c:2576
+msgid "Host:"
+msgstr "主人:"
+
+#: ../src/gnome2/mod_mgr.c:2577
+msgid "Directory:"
+msgstr "目錄:"
+
+#: ../src/gnome2/mod_mgr.c:2579
+msgid "User (optional):"
+msgstr "用戶(可選):"
+
+#: ../src/gnome2/mod_mgr.c:2580
+msgid "Password (optional):"
+msgstr "密碼(可選):"
+
+#. this can happen at most once
+#: ../src/gnome2/mod_mgr.c:2608
+msgid "A source by that name already exists."
+msgstr "據消息人士該名稱已存在。"
+
+#: ../src/gnome2/mod_mgr.c:2756
+msgid "Delete a remote source"
+msgstr "刪除遠程源"
+
+#. *****************************************************************************
+#. * Name
+#. *   gui_open_mod_mgr
+#. *
+#. * Synopsis
+#. *   #include "gui/mod_mgr.h"
+#. *
+#. *   void gui_open_mod_mgr(void)
+#. *
+#. * Description
+#. *
+#. *
+#. * Return value
+#. *   void
+#.
+#: ../src/gnome2/mod_mgr.c:3244
+msgid ""
+"<b>Welcome to the Module Manager.</b>\n"
+"\n"
+"This is Xiphos' mechanism to get new and updated content.\n"
+"It appears you have never been here before, so please take a moment to look it over.\n"
+"(You will see this information box just once.)\n"
+"\n"
+"Modules come from different <u>repositories</u>.  <b>Module Sources: Add/Remove</b> will show you what repositories are currently known.\n"
+"\n"
+"<b>Module Sources: Choose</b> is for deciding from where modules should come, that is, from which repository Xiphos should obtain them, as well as where they should be placed on your system. Set <i>Install Source</i> and <i>Install Destination</i>, then click <i>Refresh</i>.\n"
+"\n"
+"<b>Modules: Install/Update</b> is for selecting and obtaining modules after choosing source and destination.\n"
+"\n"
+"<b>Modules: Maintenance</b> is for archive and index creation.\n"
+"\n"
+"See section 5 of our manual for Module Manager detail, or ask for help via Live Chat, or (if no one is responsive in chat) send mail to our users' mailing list.\n"
+msgstr ""
+"<b>歡迎的模塊管理。</b>\n"
+"\n"
+"這是Xiphos'機制,以獲得新的和更新的內容。\n"
+"看來你從來沒有來過這裡,所以請花點時間看一下。\n"
+"(您將看到此信息框中一次。)\n"
+"\n"
+"模塊來自不同<u>庫</u>。的<b>模塊來源:添加/刪除</b>將介紹目前已知的資料庫。\n"
+"\n"
+"的<b>模塊來源:選擇</b>是決定從那裡模塊應該,也就是從中庫 Xiphos應該得到他們,以及他們應該放在您的系統。設置 <i>安裝源</i>和<i>安裝目的地</i>,然後單擊 <i>刷新</i>。\n"
+"\n"
+"的<b>模塊:安裝 /更新“</b>是選擇和獲取模塊,在選擇源和目標。\n"
+"\n"
+"的<b>模塊:維護</b>是存檔和索引創建。\n"
+"\n"
+"見的5手冊模塊管理細節,或求助通過在線聊天,或(如果沒有人響應,在聊天)郵件發送到用戶的郵件列表。\n"
+
+#: ../src/gnome2/navbar_book.c:359
+#: ../src/gnome2/navbar_book_dialog.c:300
+msgid "Go outward, to the section containing this one"
+msgstr "去向外,向包含此一節"
+
+#: ../src/gnome2/navbar_book.c:375
+#: ../src/gnome2/navbar_book_dialog.c:316
+msgid "Go to previous item"
+msgstr "轉到前一個項目"
+
+#: ../src/gnome2/navbar_book.c:390
+#: ../src/gnome2/navbar_book_dialog.c:331
+msgid "Go to next item"
+msgstr "轉到下一個項目"
+
+#: ../src/gnome2/navbar_book.c:406
+#: ../src/gnome2/navbar_book_dialog.c:347
+msgid "Go inward, to the first subsection"
+msgstr "轉到向內,第一款"
+
+#: ../src/gnome2/navbar_versekey_dialog.c:864
+#: ../src/gnome2/navbar_versekey_editor.c:879
+#: ../src/gnome2/navbar_versekey_parallel.c:810
+msgid "Synchronize this window from main window"
+msgstr "同步這個窗口從主窗口"
+
+#: ../src/gnome2/parallel_dialog.c:328
+#: ../src/gnome2/preferences_dialog.c:1799
+msgid "Parallel"
+msgstr "平行"
+
+#: ../src/gnome2/parallel_view.c:275
+msgid "Copy"
+msgstr "摹"
+
+#: ../src/gnome2/parallel_view.c:285
+msgid "Detach/Attach"
+msgstr "分離 /附加"
+
+#: ../src/gnome2/parallel_view.c:291
+#: ../ui/xi-menus.glade.h:53
+msgid "Module Options"
+msgstr "模塊選項"
+
+#. build change parallel modules submenu
+#: ../src/gnome2/parallel_view.c:306
+msgid "Change parallel 1"
+msgstr "變更並行1"
+
+#: ../src/gnome2/parallel_view.c:308
+msgid "Change parallel 2"
+msgstr "變更並行2"
+
+#: ../src/gnome2/parallel_view.c:310
+msgid "Change parallel 3"
+msgstr "變更並行3"
+
+#: ../src/gnome2/parallel_view.c:312
+msgid "Change parallel 4"
+msgstr "變更並行4"
+
+#: ../src/gnome2/parallel_view.c:314
+msgid "Change parallel 5"
+msgstr "變更並行5"
+
+#: ../src/gnome2/parallel_view.c:471
+#: ../src/gnome2/sidebar.c:626
+#: ../src/gnome2/sidebar.c:632
+#: ../src/gnome2/tabbed_browser.c:262
+#: ../src/main/sidebar.cc:646
+#: ../src/main/sidebar.cc:1007
+#: ../src/main/sidebar.cc:1008
+#: ../src/main/sidebar.cc:1009
+msgid "Parallel View"
+msgstr "並行查看"
+
+#: ../src/gnome2/preferences_dialog.c:1179
+#: ../src/gnome2/preferences_dialog.c:1217
+#: ../src/gnome2/preferences_dialog.c:1254
+#: ../src/gnome2/preferences_dialog.c:1289
+#: ../src/gnome2/preferences_dialog.c:1323
+#: ../src/gnome2/preferences_dialog.c:1356
+#: ../src/gnome2/preferences_dialog.c:1388
+#: ../src/gnome2/preferences_dialog.c:1421
+#: ../src/gnome2/preferences_dialog.c:1453
+#: ../src/gnome2/preferences_dialog.c:1487
+#: ../src/gnome2/preferences_dialog.c:1522
+#: ../src/gnome2/preferences_dialog.c:1557
+#: ../src/gnome2/preferences_dialog.c:1593
+#: ../src/gnome2/preferences_dialog.c:1631
+#: ../src/gnome2/preferences_dialog.c:2052
+msgid "-- Select --"
+msgstr "-- 選擇 --"
+
+#: ../src/gnome2/preferences_dialog.c:1652
+msgid "Locale will take effect after restart."
+msgstr "語言將重新啟動後生效。"
+
+#: ../src/gnome2/preferences_dialog.c:1687
+#: ../ui/prefs.glade.h:74
+msgid "Preferences"
+msgstr "偏好"
+
+#: ../src/gnome2/preferences_dialog.c:1769
+msgid "Fonts"
+msgstr "字體"
+
+#: ../src/gnome2/preferences_dialog.c:1772
+msgid "Color"
+msgstr "顏色"
+
+#: ../src/gnome2/preferences_dialog.c:1775
+msgid "Sizes"
+msgstr "尺寸"
+
+#: ../src/gnome2/preferences_dialog.c:1779
+msgid "General"
+msgstr "汎"
+
+#: ../src/gnome2/preferences_dialog.c:1782
+#: ../ui/prefs.glade.h:87
+msgid "Tabs and Panes"
+msgstr "標籤和窗格"
+
+#: ../src/gnome2/preferences_dialog.c:1789
+msgid "Options"
+msgstr "選項"
+
+#: ../src/gnome2/preferences_dialog.c:1796
+msgid "Main"
+msgstr "主要的"
+
+#: ../src/gnome2/preferences_dialog.c:1802
+msgid "Special"
+msgstr "特別"
+
+#: ../src/gnome2/search_dialog.c:68
+#: ../src/main/search_dialog.cc:66
+#: ../src/main/search_sidebar.cc:61
+msgid "Searching the "
+msgstr "搜索"
+
+#: ../src/gnome2/search_dialog.c:69
+#: ../src/main/search_dialog.cc:67
+#: ../src/main/search_sidebar.cc:62
+msgid " Module"
+msgstr "模塊"
+
+#: ../src/gnome2/search_dialog.c:70
+#: ../src/main/search_dialog.cc:68
+#: ../src/main/search_sidebar.cc:63
+msgid "found in "
+msgstr "發現"
+
+#: ../src/gnome2/search_dialog.c:527
+msgid "Clear List?"
+msgstr "清除列表?"
+
+#: ../src/gnome2/search_dialog.c:528
+msgid "Are you sure you want to clear the module list?"
+msgstr "您確定要清除模塊列表?"
+
+#: ../src/gnome2/search_dialog.c:708
+msgid "The last module list may not be deleted"
+msgstr "最後一個模塊列表可能不會被刪除"
+
+#: ../src/gnome2/search_dialog.c:726
+msgid "Delete list?"
+msgstr "刪除列表?"
+
+#: ../src/gnome2/search_dialog.c:727
+msgid "Are you sure you want to delete:"
+msgstr "您確定要刪除:"
+
+#: ../src/gnome2/search_sidebar.c:192
+msgid ""
+"This is an inclusive (\"AND\") search:\n"
+"Find matches showing all words."
+msgstr ""
+"這是一個包容性的(\"和\")搜索:\n"
+"查找匹配項顯示所有的話。"
+
+#: ../src/gnome2/search_sidebar.c:209
+msgid "Search Module"
+msgstr "搜索模塊"
+
+#: ../src/gnome2/search_sidebar.c:223
+msgid "Bible"
+msgstr "聖經"
+
+#: ../src/gnome2/search_sidebar.c:232
+#: ../ui/prefs.glade.h:35
+msgid "Commentary"
+msgstr "述評"
+
+#: ../src/gnome2/search_sidebar.c:246
+msgid "Search Type"
+msgstr "搜索類型"
+
+#: ../src/gnome2/search_sidebar.c:260
+#: ../ui/search-dialog.glade.h:66
+msgid "Multi word"
+msgstr "多字"
+
+#: ../src/gnome2/search_sidebar.c:279
+#: ../ui/search-dialog.glade.h:44
+msgid "Exact phrase"
+msgstr "精確短語"
+
+#: ../src/gnome2/search_sidebar.c:293
+msgid "Search Options"
+msgstr "搜索選項"
+
+#: ../src/gnome2/search_sidebar.c:321
+msgid "Search Scope"
+msgstr "搜索範圍"
+
+#: ../src/gnome2/search_sidebar.c:334
+msgid "No scope"
+msgstr "沒有範圍"
+
+#: ../src/gnome2/search_sidebar.c:344
+msgid "Use bounds"
+msgstr "使用範圍"
+
+#: ../src/gnome2/search_sidebar.c:353
+msgid "Last search"
+msgstr "最後一次搜索"
+
+#: ../src/gnome2/search_sidebar.c:368
+msgid "Bounds"
+msgstr "界下"
+
+#: ../src/gnome2/search_sidebar.c:382
+msgid "Lower"
+msgstr "下"
+
+#: ../src/gnome2/search_sidebar.c:389
+msgid "Upper"
+msgstr "上"
+
+#: ../src/gnome2/sidebar.c:1397
+msgid "Search"
+msgstr "搜索"
+
+#: ../src/gnome2/sidebar.c:1405
+msgid "Verse List"
+msgstr "詩名單"
+
+#: ../src/gnome2/sidebar_dialog.c:139
+#: ../src/gnome2/sidebar_dialog.c:148
+msgid "Sidebar"
+msgstr "側欄"
+
+#: ../src/gnome2/splash.c:396
+msgid "Powered by the SWORD Project"
+msgstr "本站由 The SWORD Project"
+
+#: ../src/gnome2/treekey-editor.c:137
+#: ../src/gnome2/treekey-editor.c:196
+#: ../src/gnome2/treekey-editor.c:282
+msgid "Prayer List/Journal Item"
+msgstr "祈禱名單 /雜誌項目"
+
+#: ../src/gnome2/treekey-editor.c:138
+#: ../src/gnome2/treekey-editor.c:197
+#: ../src/gnome2/treekey-editor.c:283
+msgid "New name"
+msgstr "新名稱"
+
+#: ../src/gnome2/treekey-editor.c:253
+msgid "Remove the selected item"
+msgstr "刪除所選項目"
+
+#: ../src/main/display.cc:259
+#, c-format
+msgid ""
+"Improperly encoded personal annotation label:\n"
+"'%s'"
+msgstr ""
+"不正確編碼的個人註釋標籤:\n"
+"'%s'"
+
+#: ../src/main/display.cc:386
+msgid ""
+"An image file's size could not be determined.\n"
+"Is ImageMagick's 'identify' not installed?\n"
+"(Or possibly the image is of type other than bmp/gif/jpg/png.)\n"
+"Xiphos cannot resize images to fit window."
+msgstr ""
+"一個圖像文件的大小不能確定。\n"
+"是ImageMagick的'確定'沒有安裝？\n"
+"(或者可能是圖像的類型以外 bmp/gif/jpg/png。)\n"
+"Xiphos無法調整圖片以適合窗口。"
+
+#: ../src/main/display.cc:1043
+#: ../src/main/display.cc:1095
+#: ../src/main/display.cc:1172
+#: ../ui/export-dialog.glade.h:7
+msgid "Chapter"
+msgstr "章"
+
+#: ../src/main/main.c:119
+msgid "Xiphos does not understand more than one argument."
+msgstr "Xiphos不理解多個參數。"
+
+#: ../src/main/main.c:161
+msgid "Initiating Gecko"
+msgstr "起爆壁虎"
+
+#: ../src/main/main.c:167
+msgid "Building Interface"
+msgstr "建築界面"
+
+#: ../src/main/main.c:171
+msgid "Starting Sword"
+msgstr "啟動 Sword"
+
+#: ../src/main/main.c:175
+msgid "Loading Settings"
+msgstr "裝載設置"
+
+#: ../src/main/main.c:179
+msgid "Displaying Xiphos"
+msgstr "顯示 Xiphos"
+
+#: ../src/main/module_dialogs.cc:227
+#: ../src/main/previewer.cc:127
+#: ../src/main/previewer.cc:194
+#: ../ui/prefs.glade.h:75
+msgid "Previewer"
+msgstr "試播"
+
+#: ../src/main/module_dialogs.cc:292
+#: ../src/main/module_dialogs.cc:416
+#: ../src/main/previewer.cc:269
+msgid "Footnote"
+msgstr "腳註"
+
+#: ../src/main/module_dialogs.cc:298
+#: ../src/main/module_dialogs.cc:421
+#: ../src/main/previewer.cc:281
+msgid "Cross Reference"
+msgstr "交叉參考"
+
+#: ../src/main/module_dialogs.cc:304
+#: ../src/main/module_dialogs.cc:318
+#: ../src/main/module_dialogs.cc:426
+#: ../src/main/module_dialogs.cc:438
+#: ../src/main/previewer.cc:287
+#: ../src/main/previewer.cc:306
+msgid "Strongs"
+msgstr "斯特朗斯"
+
+#: ../src/main/module_dialogs.cc:310
+#: ../src/main/module_dialogs.cc:329
+#: ../src/main/module_dialogs.cc:431
+#: ../src/main/module_dialogs.cc:448
+#: ../src/main/previewer.cc:293
+#: ../src/main/previewer.cc:319
+msgid "Morphology"
+msgstr "形態"
+
+#: ../src/main/module_dialogs.cc:1081
+#: ../src/main/url.cc:530
+msgid "Back to "
+msgstr "返回"
+
+#: ../src/main/parallel_view.cc:404
+#: ../ui/xi-menus.glade.h:89
+msgid "Strong's Numbers"
+msgstr "強大的數字"
+
+#: ../src/main/parallel_view.cc:414
+#: ../ui/search-dialog.glade.h:52
+#: ../ui/xi-menus.glade.h:40
+msgid "Footnotes"
+msgstr "腳註"
+
+#: ../src/main/parallel_view.cc:424
+#: ../ui/search-dialog.glade.h:64
+#: ../ui/xi-menus.glade.h:55
+msgid "Morphological Tags"
+msgstr "形態標記"
+
+#: ../src/main/parallel_view.cc:434
+#: ../ui/xi-menus.glade.h:44
+msgid "Hebrew Vowel Points"
+msgstr "希伯來語元音點"
+
+#: ../src/main/parallel_view.cc:444
+#: ../ui/xi-menus.glade.h:43
+msgid "Hebrew Cantillation"
+msgstr "希伯來語吟唱"
+
+#: ../src/main/parallel_view.cc:454
+#: ../ui/xi-menus.glade.h:41
+msgid "Greek Accents"
+msgstr "希臘口音"
+
+#: ../src/main/parallel_view.cc:464
+msgid "Cross-references"
+msgstr "交叉引用"
+
+#: ../src/main/parallel_view.cc:474
+#: ../ui/xi-menus.glade.h:50
+msgid "Lemmas"
+msgstr "引理"
+
+#: ../src/main/parallel_view.cc:484
+#: ../ui/xi-menus.glade.h:42
+msgid "Headings"
+msgstr "標題"
+
+#: ../src/main/parallel_view.cc:494
+msgid "Morpheme Segmentation"
+msgstr "語素分割"
+
+#: ../src/main/parallel_view.cc:504
+#: ../ui/xi-menus.glade.h:96
+msgid "Words of Christ in Red"
+msgstr "詞基督紅"
+
+#: ../src/main/parallel_view.cc:514
+#: ../ui/xi-menus.glade.h:91
+msgid "Transliteration"
+msgstr "音譯"
+
+#: ../src/main/parallel_view.cc:524
+msgid "Textual Variants"
+msgstr "考變種"
+
+#: ../src/main/parallel_view.cc:532
+#: ../ui/xi-menus.glade.h:70
+msgid "Primary Reading"
+msgstr "小學讀"
+
+#: ../src/main/parallel_view.cc:541
+#: ../ui/xi-menus.glade.h:84
+msgid "Secondary Reading"
+msgstr "中學讀"
+
+#: ../src/main/parallel_view.cc:550
+#: ../ui/xi-menus.glade.h:9
+msgid "All Readings"
+msgstr "所有讀"
+
+#: ../src/main/parallel_view.cc:884
+#: ../src/main/parallel_view.cc:1136
+msgid "view context"
+msgstr "視圖中的上下文"
+
+#: ../src/main/prayerlists.cc:74
+msgid "January"
+msgstr "January"
+
+#: ../src/main/prayerlists.cc:75
+msgid "February"
+msgstr "February"
+
+#: ../src/main/prayerlists.cc:76
+msgid "March"
+msgstr "March"
+
+#: ../src/main/prayerlists.cc:77
+msgid "April"
+msgstr "April"
+
+#: ../src/main/prayerlists.cc:78
+msgid "May"
+msgstr "May"
+
+#: ../src/main/prayerlists.cc:79
+msgid "June"
+msgstr "June"
+
+#: ../src/main/prayerlists.cc:80
+msgid "July"
+msgstr "July"
+
+#: ../src/main/prayerlists.cc:81
+msgid "August"
+msgstr "August"
+
+#: ../src/main/prayerlists.cc:82
+msgid "September"
+msgstr "September"
+
+#: ../src/main/prayerlists.cc:83
+msgid "October"
+msgstr "October"
+
+#: ../src/main/prayerlists.cc:84
+msgid "November"
+msgstr "November"
+
+#: ../src/main/prayerlists.cc:85
+msgid "December"
+msgstr "December"
+
+#: ../src/main/prayerlists.cc:124
+#: ../src/main/sword_treekey.cc:332
+msgid "Growth"
+msgstr "生長"
+
+#: ../src/main/prayerlists.cc:125
+#: ../src/main/sword_treekey.cc:333
+msgid "<b>For Growth</b><br>"
+msgstr "<b>促進增長</b><br>"
+
+#: ../src/main/prayerlists.cc:126
+#: ../src/main/prayerlists.cc:383
+#: ../src/main/sword_treekey.cc:334
+msgid "Salvation"
+msgstr "救世軍"
+
+#: ../src/main/prayerlists.cc:127
+#: ../src/main/sword_treekey.cc:335
+msgid "<b>For Salvation</b><br>"
+msgstr "<b>為拯救</b><br>"
+
+#: ../src/main/prayerlists.cc:128
+#: ../src/main/prayerlists.cc:387
+#: ../src/main/sword_treekey.cc:336
+msgid "Health"
+msgstr "健康"
+
+#: ../src/main/prayerlists.cc:129
+#: ../src/main/sword_treekey.cc:337
+msgid "<b>For Health</b><br>"
+msgstr "<b>衛生</b><br>"
+
+#: ../src/main/prayerlists.cc:130
+msgid "Misc"
+msgstr "船務"
+
+#: ../src/main/prayerlists.cc:131
+#: ../src/main/sword_treekey.cc:339
+msgid "<b>Miscellaneous</b><br>"
+msgstr "<b>雜項</b><br>"
+
+#: ../src/main/prayerlists.cc:139
+msgid "Point x"
+msgstr "點子 x"
+
+#: ../src/main/prayerlists.cc:140
+msgid "<b>(x)</b><br>"
+msgstr "<b>(x)</b><br>"
+
+#: ../src/main/prayerlists.cc:141
+msgid "Point y"
+msgstr "點子 y"
+
+#: ../src/main/prayerlists.cc:142
+msgid "<b>(y)</b><br>"
+msgstr "<b>(y)</b><br>"
+
+#: ../src/main/prayerlists.cc:143
+msgid "Point z"
+msgstr "點子 z"
+
+#: ../src/main/prayerlists.cc:144
+msgid "<b>(z)</b><br>"
+msgstr "<b>(z)</b><br>"
+
+#: ../src/main/prayerlists.cc:152
+msgid "Minor Topic 1"
+msgstr "小型主題 1"
+
+#: ../src/main/prayerlists.cc:153
+msgid "<b>Subtopic 1</b><br>"
+msgstr "<b>副標題 1</b><br>"
+
+#: ../src/main/prayerlists.cc:155
+msgid "Minor Topic 2"
+msgstr "小型主題 2"
+
+#: ../src/main/prayerlists.cc:156
+msgid "<b>Subtopic 2</b><br>"
+msgstr "<b>副標題 2</b><br>"
+
+#: ../src/main/prayerlists.cc:158
+msgid "Minor Topic 3"
+msgstr "小型主題 3"
+
+#: ../src/main/prayerlists.cc:159
+msgid "<b>Subtopic 3</b><br>"
+msgstr "<b>副標題 3</b><br>"
+
+#: ../src/main/prayerlists.cc:161
+msgid "Minor Topic 4"
+msgstr "小型主題 4"
+
+#: ../src/main/prayerlists.cc:162
+msgid "<b>Subtopic 4</b><br>"
+msgstr "<b>副標題 4</b><br>"
+
+#: ../src/main/prayerlists.cc:242
+msgid "Name for new prayer list or journal"
+msgstr "名稱為新祈禱列表或期刊"
+
+#: ../src/main/prayerlists.cc:273
+msgid "Xiphos finds that prayer list already."
+msgstr "Xiphos認為，名單已經祈禱。"
+
+#: ../src/main/prayerlists.cc:286
+#, c-format
+msgid ""
+"Xiphos cannot create module's path:\n"
+"%s"
+msgstr ""
+"Xiphos不能創建模塊的路徑:\n"
+"%s"
+
+#: ../src/main/prayerlists.cc:326
+msgid "A basic prayer list. \\par\\par Module created by Xiphos."
+msgstr "一個基本的祈禱名單。\\par \\par 模塊創建 Xiphos。"
+
+#: ../src/main/prayerlists.cc:327
+msgid "BasicPrayerList"
+msgstr "基本祈禱名單"
+
+#: ../src/main/prayerlists.cc:341
+msgid "MyPrayerList"
+msgstr "我的祈禱名單"
+
+#: ../src/main/prayerlists.cc:342
+msgid "<b>People:</b><br>Bob<br>Sam<br>Sue<br><br><b>Church:</b><br>pews<br>fellowship<br>Bibles for missionaries<br><br><br>"
+msgstr "<b>人們:</b><br>Bob<br>Sam<br>Sue<br><br><b>教會:</b><br>教堂的長椅<br>獎學金<br>聖經的傳教士<br><br><br>"
+
+#: ../src/main/prayerlists.cc:368
+msgid "A subject-based prayer list. \\par\\par Module created by Xiphos."
+msgstr "一個主題為基礎的祈禱名單。 \\par \\par 模塊創建 Xiphos。"
+
+#: ../src/main/prayerlists.cc:369
+msgid "SubjectPrayerList"
+msgstr "主題祈禱名單"
+
+#: ../src/main/prayerlists.cc:384
+msgid "Bob<br>Sam<br>Sue<br>John<br>"
+msgstr "Bob<br>Sam<br>Sue<br>John<br>"
+
+#: ../src/main/prayerlists.cc:385
+msgid "Spiritual Growth"
+msgstr "心靈成長"
+
+#: ../src/main/prayerlists.cc:386
+msgid "Mike<br>Steve<br>"
+msgstr "Mike<br>Steve<br>"
+
+#: ../src/main/prayerlists.cc:388
+msgid "Sue<br>John<br>"
+msgstr "Sue<br>John<br>"
+
+#: ../src/main/prayerlists.cc:414
+msgid "A monthly prayer list. \\par\\par Module created by Xiphos."
+msgstr "阿每月禱告名單。 \\par \\par 模塊創建 Xiphos。"
+
+#: ../src/main/prayerlists.cc:415
+msgid "MonthlyPrayerList"
+msgstr "每月祈禱名單"
+
+#: ../src/main/prayerlists.cc:466
+msgid "A daily journal. \\par\\par Module created by Xiphos."
+msgstr "阿日報。 \\par \\par 模塊創建 Xiphos。"
+
+#: ../src/main/prayerlists.cc:467
+msgid "DailyJournal"
+msgstr "日報"
+
+#: ../src/main/prayerlists.cc:531
+msgid "An outlined topic (e.g. sermon). \\par\\par Module created by Xiphos."
+msgstr "一個概述主題（例如講道）。 \\par \\par 模塊創建 Xiphos。"
+
+#: ../src/main/prayerlists.cc:532
+msgid "OutlinedTopic"
+msgstr "專題概述"
+
+#: ../src/main/prayerlists.cc:546
+msgid "Major Topic A"
+msgstr "重大課題 A"
+
+#: ../src/main/prayerlists.cc:547
+msgid "<b>Major Topic A</b><br>"
+msgstr "<b>重大課題 A</b><br>"
+
+#: ../src/main/prayerlists.cc:549
+msgid "Major Topic B"
+msgstr "重大課題 B"
+
+#: ../src/main/prayerlists.cc:550
+msgid "<b>Major Topic B</b><br>"
+msgstr "<b>重大課題 B</b><br>"
+
+#: ../src/main/prayerlists.cc:552
+msgid "Major Topic C"
+msgstr "重大課題 C"
+
+#: ../src/main/prayerlists.cc:553
+msgid "<b>Major Topic C</b><br>"
+msgstr "<b>重大課題 C</b><br>"
+
+#: ../src/main/previewer.cc:275
+msgid "User Annotation"
+msgstr "用戶註釋"
+
+#: ../src/main/search_dialog.cc:212
+#, c-format
+msgid "Search result %s: %s"
+msgstr "搜索結果 %s: %s"
+
+#: ../src/main/search_dialog.cc:444
+msgid "Delete Range?"
+msgstr "刪除範圍？"
+
+#: ../src/main/search_dialog.cc:445
+msgid "Are you sure you want to delete this range?"
+msgstr "您確定要刪除此範圍內？"
+
+#: ../src/main/search_dialog.cc:659
+#: ../src/main/search_dialog.cc:1130
+#: ../src/main/search_dialog.cc:1133
+#: ../src/main/search_dialog.cc:1155
+#: ../src/main/search_dialog.cc:1158
+msgid "Search: "
+msgstr "搜查:"
+
+#: ../src/main/search_dialog.cc:704
+msgid "Remove Module?"
+msgstr "刪除模塊？"
+
+#: ../src/main/search_dialog.cc:705
+msgid "Are you sure you want to remove the selected module?"
+msgstr "您確定要刪除選定的模塊？"
+
+#: ../src/main/search_dialog.cc:1560
+#, c-format
+msgid ""
+"%s:\n"
+"No such module is installed.\n"
+"%s"
+msgstr ""
+"%s:\n"
+"沒有這樣的模塊安裝.\n"
+"%s"
+
+#: ../src/main/search_dialog.cc:1562
+msgid "Please adjust the module list."
+msgstr "請調整模塊列表。"
+
+#: ../src/main/search_dialog.cc:1578
+#, c-format
+msgid "No fast-search index exists for %s.%s%s"
+msgstr "沒有快速搜索索引存在 %s.%s%s"
+
+#: ../src/main/search_dialog.cc:1580
+msgid ""
+"\n"
+"Search on this module is now `multi word'."
+msgstr ""
+"\n"
+"搜索這個模塊現在`多字'。"
+
+#: ../src/main/search_dialog.cc:1581
+msgid ""
+"\n"
+"See the Module Manager, Maintenance pane."
+msgstr ""
+"\n"
+"見模塊管理，維護窗格。"
+
+#: ../src/main/search_dialog.cc:1644
+msgid "Search finished"
+msgstr "搜索完畢"
+
+#: ../src/main/search_sidebar.cc:100
+msgid "matches"
+msgstr "比賽"
+
+#: ../src/main/settings.c:60
+msgid ""
+"Welcome to Xiphos.\n"
+"\n"
+"There are no Bible modules installed. In order to initialize, Xiphos needs you to install at least one Bible.\n"
+"\n"
+"With your permission, Xiphos will invoke the Module Manager so that you may install from Crosswire:\n"
+"1. Configure remote install.\n"
+"2. Connect.\n"
+"3. Select a Bible text of your language preference.\n"
+"4. Click `install'.\n"
+"Close the Module Manager when you are done.\n"
+"\n"
+"Warning: If you live in a persecuted country, use with care.\n"
+"\n"
+"May Xiphos invoke the Module Manager so that you may install a Bible?"
+msgstr ""
+"歡迎 Xiphos。\n"
+"\n"
+"沒有聖經模塊安裝。為了初始化，Xiphos需要您安裝至少一個聖經。\n"
+"\n"
+"你允許，Xiphos將調用模塊管理器，以便您可以安裝 Crosswire：\n"
+"1。配置遠程安裝。\n"
+"2。連接。\n"
+"3。聖經文本選擇你的語言偏好。\n"
+"4。點擊'安裝'。\n"
+"關閉模塊管理器當您完成。\n"
+"\n"
+"警告：如果你住在一個受迫害的國家，請小心使用。\n"
+"\n"
+"月Xiphos調用模塊管理器，以便您可以安裝聖經？"
+
+#: ../src/main/settings.c:105
+msgid "$HOME is not set!"
+msgstr "$HOME 沒有設置！"
+
+#: ../src/main/settings.c:120
+#, c-format
+msgid ""
+"Xiphos can not create  .xiphos:\n"
+"%s\n"
+"\n"
+"Xiphos cannot continue."
+msgstr ""
+"Xiphos不能創造 .xiphos：\n"
+"%s \n"
+"\n"
+"Xiphos無法繼續。"
+
+#: ../src/main/settings.c:133
+#: ../src/main/settings.c:142
+#: ../src/main/settings.c:151
+msgid "can not create "
+msgstr "無法創建"
+
+#: ../src/main/settings.c:194
+msgid ""
+"There are still no Bibles installed.\n"
+"Evidently, you declined to install any.\n"
+"\n"
+"Without any Bible modules to display,\n"
+"Xiphos cannot proceed,\n"
+"and will now exit."
+msgstr ""
+"目前還沒有聖經安裝。\n"
+"顯然，你拒絕安裝任何。\n"
+"\n"
+"沒有任何聖經模塊顯示，\n"
+"Xiphos無法進行，\n"
+"現在將退出。"
+
+#: ../src/main/settings.c:198
+msgid "Bible module installation complete."
+msgstr "聖經模塊安裝完成。"
+
+#: ../src/main/settings.c:201
+msgid ""
+"Without any Bible modules to display,\n"
+"Xiphos cannot proceed,\n"
+"and will now exit."
+msgstr ""
+"沒有任何聖經模塊顯示，\n"
+"Xiphos無法進行，\n"
+"現在將退出。"
+
+#: ../src/main/sidebar.cc:399
+msgid "verse"
+msgstr "詩"
+
+#: ../src/main/sidebar.cc:461
+msgid "chapter"
+msgstr "章"
+
+#: ../src/main/sword.cc:537
+msgid ""
+"Xiphos's file for language\n"
+"abbreviations is missing."
+msgstr ""
+"Xiphos的文件語言 \n"
+"縮寫是丟失。"
+
+#: ../src/main/sword.cc:544
+msgid ""
+"Xiphos's language abbreviation\n"
+"file cannot be opened."
+msgstr ""
+"Xiphos的語言縮寫 \n"
+"文件無法打開。"
+
+#: ../src/main/sword.cc:557
+msgid ""
+"Xiphos cannot allocate space\n"
+"for language abbreviations."
+msgstr ""
+"Xiphos不能分配空間 \n"
+"語言的縮寫。"
+
+#: ../src/main/sword.cc:564
+msgid ""
+"Xiphos cannot read the\n"
+"language abbreviation file."
+msgstr ""
+"Xiphos無法讀取成\n"
+"語言的縮寫文件。"
+
+#: ../src/main/sword.cc:642
+msgid "No matching locale found for"
+msgstr "沒有找到匹配的語言"
+
+#: ../src/main/sword.cc:644
+msgid "Book names and menus may not be translated"
+msgstr "圖書名稱和菜單可能不翻譯"
+
+#: ../src/main/sword.cc:1232
+msgid "Daily devotional was requested, but there are none installed."
+msgstr "每日虔誠的要求，但有沒有安裝。"
+
+#: ../src/main/tab_history.c:219
+msgid "Clear History"
+msgstr "清除歷史記錄"
+
+#: ../src/main/url.cc:101
+msgid "URL not found:"
+msgstr "URL 未找到:"
+
+#: ../src/main/url.cc:191
+#, c-format
+msgid "Xiphos could not execute %s"
+msgstr "Xiphos無法執行 %s"
+
+#: ../src/main/url.cc:199
+msgid "Viewer error:\n"
+msgstr "瀏覽器錯誤:\n"
+
+#: ../src/main/url.cc:272
+#, c-format
+msgid "Show %s in main window"
+msgstr "查看 %s 的主窗口"
+
+#: ../src/main/xml.c:80
+#: ../src/main/xml.c:464
+#, c-format
+msgid "Document not created successfully. \n"
+msgstr "文件未能成功創建。 \n"
+
+#: ../src/main/xml.c:89
+msgid "Personal"
+msgstr "個人"
+
+#: ../src/main/xml.c:90
+msgid "What must I do to be saved?"
+msgstr "我必須做什麼才可以得救？"
+
+#: ../src/main/xml.c:92
+#: ../src/main/xml.c:93
+msgid "Acts 16:31"
+msgstr "Acts 16:31"
+
+#: ../src/main/xml.c:97
+#: ../src/main/xml.c:98
+msgid "Eph 2:8,9"
+msgstr "Eph 2:8,9"
+
+#: ../src/main/xml.c:102
+#: ../src/main/xml.c:103
+msgid "Romans 1:16"
+msgstr "Romans 1:16"
+
+#: ../src/main/xml.c:106
+msgid "What is the Gospel?"
+msgstr "什麼是福音？"
+
+#: ../src/main/xml.c:108
+#: ../src/main/xml.c:109
+msgid "1 Cor 15:1-4"
+msgstr "1 Cor 15:1-4"
+
+#: ../src/main/xml.c:413
+#: ../src/main/xml.c:1144
+#, c-format
+msgid "Document not parsed successfully. \n"
+msgstr "Document not parsed successfully.\n"
+
+#: ../src/main/xml.c:419
+#: ../src/main/xml.c:747
+#: ../src/main/xml.c:1025
+#: ../src/main/xml.c:1204
+#, c-format
+msgid "empty document \n"
+msgstr "空文檔\n"
+
+#: ../src/main/xml.c:425
+#, c-format
+msgid "wrong type, root node != SwordBookmarks\n"
+msgstr "錯誤的類型，根節點 != SwordBookmarks \n"
+
+#: ../src/main/xml.c:476
+msgid "Old Testament"
+msgstr "舊約"
+
+#: ../src/main/xml.c:477
+msgid "Gen - Mal"
+msgstr "Gen - Mal"
+
+#: ../src/main/xml.c:482
+msgid "New Testament"
+msgstr "新約"
+
+#: ../src/main/xml.c:483
+msgid "Mat - Rev"
+msgstr "Mat - Rev"
+
+#: ../src/main/xml.c:489
+msgid "Sample Module List"
+msgstr "採樣模塊列表"
+
+#: ../src/main/xml.c:753
+#: ../src/main/xml.c:1031
+#, c-format
+msgid "wrong type, root node != %s\n"
+msgstr "錯誤的類型，根節點 != %s\n"
+
+#: ../ui/bookmarks.glade.h:1
+msgid "Add Bookmark"
+msgstr "添加書籤"
+
+#: ../ui/bookmarks.glade.h:2
+#: ../ui/markverse.glade.h:1
+msgid "Bookmark Dialog"
+msgstr "書籤對話框"
+
+#: ../ui/bookmarks.glade.h:3
+msgid "Bookmark Folder Treeview"
+msgstr "書籤文件夾樹視圖"
+
+#: ../ui/bookmarks.glade.h:4
+#: ../ui/markverse.glade.h:2
+msgid "Cancel Bookmark"
+msgstr "取消書籤"
+
+#: ../ui/bookmarks.glade.h:5
+#: ../ui/markverse.glade.h:3
+msgid "Create new folder"
+msgstr "創建新的文件夾"
+
+#: ../ui/bookmarks.glade.h:6
+msgid "Label Entry"
+msgstr "標籤項"
+
+#: ../ui/bookmarks.glade.h:7
+msgid "Label:"
+msgstr "標籤:"
+
+#: ../ui/bookmarks.glade.h:8
+#: ../ui/markverse.glade.h:6
+msgid "Module Entry"
+msgstr "模塊項:"
+
+#: ../ui/bookmarks.glade.h:9
+#: ../ui/markverse.glade.h:7
+msgid "Module:"
+msgstr "模塊"
+
+#: ../ui/bookmarks.glade.h:10
+msgid "New ..."
+msgstr "新的..."
+
+#: ../ui/bookmarks.glade.h:11
+#: ../ui/markverse.glade.h:8
+#: ../ui/xi-menus.glade.h:56
+msgid "New Folder"
+msgstr "新建文件夾"
+
+#: ../ui/bookmarks.glade.h:12
+#: ../ui/markverse.glade.h:10
+msgid "Verse Entry"
+msgstr "詩入"
+
+#: ../ui/bookmarks.glade.h:13
+#: ../ui/markverse.glade.h:11
+msgid "Verse:"
+msgstr "詩:"
+
+#: ../ui/editor_note.xml.h:1
+msgid "Delete the current note"
+msgstr "刪除當前的說明"
+
+#: ../ui/editor_note.xml.h:2
+#: ../ui/editor_studypad.xml.h:4
+#: ../ui/editor.xml.h:2
+msgid "E_xit"
+msgstr "走"
+
+#: ../ui/editor_note.xml.h:3
+#: ../ui/editor_studypad.xml.h:5
+#: ../ui/editor.xml.h:3
+msgid "Exit"
+msgstr "走"
+
+#: ../ui/editor_note.xml.h:4
+#: ../ui/editor_studypad.xml.h:6
+#: ../ui/editor.xml.h:4
+msgid "Exit the program"
+msgstr "退出程序"
+
+#: ../ui/editor_note.xml.h:5
+#: ../ui/editor_studypad.xml.h:7
+#: ../ui/editor.xml.h:5
+msgid "For_mat"
+msgstr "格式"
+
+#: ../ui/editor_note.xml.h:6
+#: ../ui/editor_studypad.xml.h:8
+#: ../ui/editor.xml.h:6
+msgid "HTML Format switch"
+msgstr "HTML 格式轉換"
+
+#: ../ui/editor_note.xml.h:7
+#: ../ui/editor_studypad.xml.h:9
+#: ../ui/editor.xml.h:7
+msgid "HTML mode"
+msgstr "HTML 模式"
+
+#: ../ui/editor_note.xml.h:8
+msgid "Preview the note to be printed"
+msgstr "預覽要打印的說明"
+
+#: ../ui/editor_note.xml.h:10
+msgid "Print this note"
+msgstr "打印此說明"
+
+#: ../ui/editor_note.xml.h:12
+msgid "Save the current note"
+msgstr "保存當前的說明"
+
+#: ../ui/editor_note.xml.h:13
+msgid "_Delete Personal Comment"
+msgstr "刪除個人的評論"
+
+#: ../ui/editor_note.xml.h:16
+msgid "_Save (Personal Comment)"
+msgstr "保存(個人評論)"
+
+#: ../ui/editor_studypad.xml.h:1
+msgid "Add this file to your bookmarks"
+msgstr "添加此文件到您的書籤"
+
+#: ../ui/editor_studypad.xml.h:3
+#: ../ui/editor.xml.h:1
+msgid "Create a new document"
+msgstr "建立新文件"
+
+#: ../ui/editor_studypad.xml.h:10
+#: ../ui/editor.xml.h:8
+msgid "New Document"
+msgstr "新文件"
+
+#: ../ui/editor_studypad.xml.h:11
+#: ../ui/editor.xml.h:9
+msgid "Open"
+msgstr "打開"
+
+#: ../ui/editor_studypad.xml.h:12
+msgid "Open a file in Studypad"
+msgstr "打開文件的研究墊"
+
+#: ../ui/editor_studypad.xml.h:13
+msgid "Preview the document to be printed"
+msgstr "預覽文件打印"
+
+#: ../ui/editor_studypad.xml.h:15
+msgid "Print this document"
+msgstr "打印此文件"
+
+#: ../ui/editor_studypad.xml.h:17
+msgid "Save AS"
+msgstr "另存為"
+
+#: ../ui/editor_studypad.xml.h:18
+#: ../ui/editor.xml.h:12
+msgid "Save the current file"
+msgstr "保存當前文件"
+
+#: ../ui/editor_studypad.xml.h:19
+msgid "Save the current file as"
+msgstr "保存當前文件的"
+
+#: ../ui/editor.xml.h:10
+msgid "Open the file in Studypad"
+msgstr "打開該文件在研究墊"
+
+#: ../ui/export-dialog.glade.h:1
+msgid ": "
+msgstr ":"
+
+#: ../ui/export-dialog.glade.h:2
+msgid "<b>Copy</b>"
+msgstr "<b>摹</b>"
+
+#: ../ui/export-dialog.glade.h:3
+msgid "<b>Export</b>"
+msgstr "<b?出口</b>"
+
+#: ../ui/export-dialog.glade.h:4
+msgid "<b>Format</b>"
+msgstr "<b>格式化</b>"
+
+#: ../ui/export-dialog.glade.h:5
+#: ../ui/prefs.glade.h:25
+msgid "Book"
+msgstr "書"
+
+#: ../ui/export-dialog.glade.h:6
+msgid "Book Radio Button"
+msgstr "圖書單選按鈕"
+
+#: ../ui/export-dialog.glade.h:8
+msgid "Chapter Radio Button"
+msgstr "第單選按鈕"
+
+#: ../ui/export-dialog.glade.h:9
+#: ../ui/xi-menus.glade.h:18
+msgid "Copy/Export Passage"
+msgstr "複製 /出口通道"
+
+#: ../ui/export-dialog.glade.h:10
+msgid "Export Passage Cancel"
+msgstr "取消出口通道"
+
+#: ../ui/export-dialog.glade.h:11
+msgid "Export Passage OK"
+msgstr "出口通道行"
+
+#: ../ui/export-dialog.glade.h:12
+msgid "Export complete book"
+msgstr "出口完成書"
+
+#: ../ui/export-dialog.glade.h:13
+msgid "Export complete chapter"
+msgstr "出口完成章節"
+
+#: ../ui/export-dialog.glade.h:14
+msgid "Export single verse"
+msgstr "出口單詩"
+
+#: ../ui/export-dialog.glade.h:15
+msgid "HTML"
+msgstr "HTML"
+
+#: ../ui/export-dialog.glade.h:16
+msgid "HTML Radio Button"
+msgstr "HTML 單選按鈕"
+
+#: ../ui/export-dialog.glade.h:17
+msgid "Key"
+msgstr "鑰匙"
+
+#: ../ui/export-dialog.glade.h:18
+msgid "Plain Text"
+msgstr "純文本"
+
+#: ../ui/export-dialog.glade.h:19
+msgid "Plain Text Radio Button"
+msgstr "純文本單選按鈕"
+
+#: ../ui/export-dialog.glade.h:21
+msgid "Save Export As"
+msgstr "保存導出為"
+
+#: ../ui/export-dialog.glade.h:22
+msgid "Verse"
+msgstr "詩"
+
+#: ../ui/export-dialog.glade.h:23
+msgid "Verse Radio Button"
+msgstr "詩單選按鈕"
+
+#: ../ui/export-dialog.glade.h:24
+msgid "Verse range"
+msgstr "詩範圍"
+
+#: ../ui/export-dialog.glade.h:25
+msgid "Version"
+msgstr "版本"
+
+#: ../ui/markverse.glade.h:4
+msgid "Mark"
+msgstr "馬克"
+
+#: ../ui/markverse.glade.h:5
+msgid "Mark/Unmark Verse"
+msgstr "標記 /取消標記詩"
+
+#: ../ui/markverse.glade.h:9
+msgid "Unmark"
+msgstr "取消標記"
+
+#: ../ui/module-manager.glade.h:1
+msgid "<b>Add and Remove Sources</b>"
+msgstr "<b>添加和刪除源</b>"
+
+#: ../ui/module-manager.glade.h:2
+msgid "<b>Install Destination</b>"
+msgstr "<b>安裝目的地</b>"
+
+#: ../ui/module-manager.glade.h:3
+msgid "<b>Install Source</b>"
+msgstr "<b>安裝源</b>"
+
+#: ../ui/module-manager.glade.h:4
+msgid "<b>Module Manager</b>"
+msgstr "<b>模塊管理</b>"
+
+#. do not translate <b> and </b> they are html formating
+#: ../ui/module-manager.glade.h:6
+msgid "<b>Sword</b>"
+msgstr "<b>Sword</b>"
+
+#: ../ui/module-manager.glade.h:7
+msgid "<b>WARNING:</b> If you live in a persecuted country use with care."
+msgstr "<b>警告:</b>如果你住在一個受迫害的國家使用的照顧。"
+
+#: ../ui/module-manager.glade.h:8
+msgid "<b>Warning:</b> If you live in a persecuted country and do not wish to risk detection you should NOT use  the remote installation feature! "
+msgstr "<b>警告:</b>如果你住在一個受迫害的國家，不希望冒險檢測你不應該使用遠程安裝功能！"
+
+#: ../ui/module-manager.glade.h:9
+msgid "<i>Personal area, for your use only:</i>"
+msgstr "<i>個人區域，只有您可以使用:</i>"
+
+#: ../ui/module-manager.glade.h:10
+msgid "<i>System area, for all users:</i>"
+msgstr "<i>系統方面，為所有用戶:</i>"
+
+#: ../ui/module-manager.glade.h:12
+msgid "Continue"
+msgstr "繼續"
+
+#: ../ui/module-manager.glade.h:13
+msgid "Current Remote Sources"
+msgstr "當前遠程源"
+
+#: ../ui/module-manager.glade.h:14
+msgid "Current local sources"
+msgstr "當前當地來源"
+
+#: ../ui/module-manager.glade.h:15
+msgid "Delete Index"
+msgstr "刪除索引"
+
+#: ../ui/module-manager.glade.h:16
+msgid "Home dir"
+msgstr "主目錄"
+
+#: ../ui/module-manager.glade.h:19
+msgid "Load Standard"
+msgstr "負荷標準"
+
+#: ../ui/module-manager.glade.h:20
+msgid "Local"
+msgstr "鄉土"
+
+#: ../ui/module-manager.glade.h:21
+msgid "Local Install Folder"
+msgstr "本地安裝文件夾"
+
+#: ../ui/module-manager.glade.h:22
+msgid "Module Manager"
+msgstr "模塊管理"
+
+#: ../ui/module-manager.glade.h:23
+msgid "Remote"
+msgstr "遠程"
+
+#: ../ui/module-manager.glade.h:24
+msgid "Sword sys dir"
+msgstr "Sword 系統目錄"
+
+#: ../ui/navbar_versekey.glade.h:1
+msgid "1"
+msgstr "1"
+
+#: ../ui/navbar_versekey.glade.h:2
+msgid "<b>Revelation of John</b>"
+msgstr "<b>約翰的啟示</b>"
+
+#: ../ui/navbar_versekey.glade.h:3
+msgid "Book Selector Button"
+msgstr "圖書選擇按鈕"
+
+#: ../ui/navbar_versekey.glade.h:4
+msgid "Choose book to display"
+msgstr "選擇圖書展示"
+
+#: ../ui/navbar_versekey.glade.h:5
+msgid "Drop down history list"
+msgstr "下拉歷史列表"
+
+#: ../ui/navbar_versekey.glade.h:6
+msgid "Reference Entry"
+msgstr "參考項"
+
+#: ../ui/navbar_versekey.glade.h:7
+msgid "Toggle Chapter Button"
+msgstr "切換章按鈕"
+
+#: ../ui/navbar_versekey.glade.h:8
+msgid "Toggle Verse Button"
+msgstr "切換按鈕詩"
+
+#: ../ui/prefs.glade.h:1
+msgid ""
+"-2\n"
+"-1\n"
+"+0\n"
+"+1\n"
+"+2\n"
+"+3\n"
+"+4\n"
+"+5"
+msgstr ""
+"-2\n"
+"-1\n"
+"+0\n"
+"+1\n"
+"+2\n"
+"+3\n"
+"+4\n"
+"+5"
+
+#: ../ui/prefs.glade.h:9
+msgid "<b>Font Colors</b>"
+msgstr "<b>字體顏色</b>"
+
+#: ../ui/prefs.glade.h:10
+msgid "<b>Font Sizes</b>"
+msgstr "<b>字體大小</b>"
+
+#: ../ui/prefs.glade.h:11
+msgid "<b>General</b>"
+msgstr "<b>一般圖書</b>"
+
+#: ../ui/prefs.glade.h:12
+msgid "<b>Main Window Modules</b>"
+msgstr "<b>主窗口模塊</b>"
+
+#: ../ui/prefs.glade.h:13
+msgid "<b>Parallel View</b>"
+msgstr "<b>並行查看</b>"
+
+#: ../ui/prefs.glade.h:14
+msgid "<b>Show</b>"
+msgstr "<b>擺</b>"
+
+#: ../ui/prefs.glade.h:15
+msgid "<b>Special Purpose Modules</b>"
+msgstr "<b>專用模塊</b>"
+
+#: ../ui/prefs.glade.h:16
+msgid "<b>StudyPad default directory</b>"
+msgstr "<b>研究墊默認目錄</b>"
+
+#: ../ui/prefs.glade.h:17
+msgid "<b>Tabs</b>"
+msgstr "<b>標籤</b>"
+
+#: ../ui/prefs.glade.h:18
+msgid "Apply high-contrast highlight to current verse"
+msgstr "適用於高對比度突出當前詩歌"
+
+#: ../ui/prefs.glade.h:19
+msgid "Automatically resize commentary, book, and dictionary image content to fit subwindow"
+msgstr "自動調整的評注，本書，字典圖片內容，以適應子窗口"
+
+#: ../ui/prefs.glade.h:20
+msgid "Background"
+msgstr "背景"
+
+#: ../ui/prefs.glade.h:21
+msgid "Base font size"
+msgstr "基本字體大小"
+
+#: ../ui/prefs.glade.h:22
+msgid "Bible Texts"
+msgstr "聖經文本"
+
+#: ../ui/prefs.glade.h:23
+msgid "Bible Texts Checkbox"
+msgstr "聖經文本複選框"
+
+#: ../ui/prefs.glade.h:24
+msgid "Biblical Text"
+msgstr "聖經文本"
+
+#: ../ui/prefs.glade.h:26
+msgid "Change Biblical Text Combo"
+msgstr "聖經文字組合的變化"
+
+#: ../ui/prefs.glade.h:27
+msgid "Change Book Combo"
+msgstr "周易組合"
+
+#: ../ui/prefs.glade.h:28
+msgid "Change Commentary Combo"
+msgstr "組合變化述評"
+
+#: ../ui/prefs.glade.h:29
+msgid "Change Default Dictionary Combo"
+msgstr "更改默認字典組合"
+
+#: ../ui/prefs.glade.h:30
+msgid "Change Dictionary Combo"
+msgstr "更改字典組合"
+
+#: ../ui/prefs.glade.h:31
+msgid "Change Personal Notes Combo"
+msgstr "修改個人債券組合"
+
+#: ../ui/prefs.glade.h:32
+msgid "Choose to enable Prayer lists "
+msgstr "選擇啟用禱告名單"
+
+#: ../ui/prefs.glade.h:34
+msgid "Commentaries Checkbox"
+msgstr "評複選框"
+
+#: ../ui/prefs.glade.h:36
+msgid "Cover"
+msgstr "封面"
+
+#: ../ui/prefs.glade.h:37
+msgid "Current Verse"
+msgstr "當前詩"
+
+#: ../ui/prefs.glade.h:38
+msgid "Daily Devotional"
+msgstr "每日獻身"
+
+#: ../ui/prefs.glade.h:39
+msgid "Daily Devotional Combo"
+msgstr "每日獻身組合"
+
+#: ../ui/prefs.glade.h:40
+msgid "Default Dictionary"
+msgstr "默認字典"
+
+#: ../ui/prefs.glade.h:41
+msgid "Dictionary"
+msgstr "字典"
+
+#: ../ui/prefs.glade.h:42
+msgid "Dictionary/Lexicon"
+msgstr "字典/詞典"
+
+#: ../ui/prefs.glade.h:43
+msgid "Dictionary/Lexicon Checkbox"
+msgstr "字典/詞典複選框"
+
+#: ../ui/prefs.glade.h:44
+msgid "Enable Prayer Lists"
+msgstr "啟用祈禱列表"
+
+#: ../ui/prefs.glade.h:45
+msgid "Enable Prayer Lists Checkbox"
+msgstr "祈禱列表複選框啟用"
+
+#: ../ui/prefs.glade.h:46
+msgid "Font Colors"
+msgstr "字體顏色"
+
+#: ../ui/prefs.glade.h:47
+msgid "Font Misc"
+msgstr "字體雜項"
+
+#: ../ui/prefs.glade.h:48
+msgid "Foreground"
+msgstr "前景"
+
+#: ../ui/prefs.glade.h:49
+msgid "General Misc"
+msgstr "一般雜項"
+
+#: ../ui/prefs.glade.h:50
+msgid "Greek Lexicon"
+msgstr "希臘詞典"
+
+#: ../ui/prefs.glade.h:51
+msgid "Greek Lexicon Combo"
+msgstr "希臘詞彙組合"
+
+#: ../ui/prefs.glade.h:52
+msgid "Hebrew Lexicon"
+msgstr "希伯來語詞典"
+
+#: ../ui/prefs.glade.h:53
+msgid "Hebrew Lexicon Combo"
+msgstr "希伯來語詞彙組合"
+
+#: ../ui/prefs.glade.h:54
+msgid "Highlight Background"
+msgstr "突出背景"
+
+#: ../ui/prefs.glade.h:55
+msgid "Highlight Foreground"
+msgstr "突出前景"
+
+#: ../ui/prefs.glade.h:56
+msgid "Highlight current verse"
+msgstr "突出顯示當前的詩"
+
+#: ../ui/prefs.glade.h:57
+msgid "Highlight current verse check box"
+msgstr "突出顯示當前的詩複選框"
+
+#: ../ui/prefs.glade.h:58
+msgid "Links"
+msgstr "鏈接"
+
+#: ../ui/prefs.glade.h:59
+msgid "Modules Main"
+msgstr "模塊主"
+
+#: ../ui/prefs.glade.h:60
+msgid "Modules Misc"
+msgstr "模塊雜項"
+
+#: ../ui/prefs.glade.h:61
+msgid "Modules Parallel"
+msgstr "模塊並行"
+
+#: ../ui/prefs.glade.h:62
+msgid "Parallel 1"
+msgstr "緯線1"
+
+#: ../ui/prefs.glade.h:63
+msgid "Parallel 1 Combo"
+msgstr "緯線1組合"
+
+#: ../ui/prefs.glade.h:64
+msgid "Parallel 2"
+msgstr "緯線2"
+
+#: ../ui/prefs.glade.h:65
+msgid "Parallel 2 Combo"
+msgstr "緯線2組合"
+
+#: ../ui/prefs.glade.h:66
+msgid "Parallel 3"
+msgstr "緯線3"
+
+#: ../ui/prefs.glade.h:67
+msgid "Parallel 3 Combo"
+msgstr "緯線3組合"
+
+#: ../ui/prefs.glade.h:68
+msgid "Parallel 4"
+msgstr "緯線4"
+
+#: ../ui/prefs.glade.h:69
+msgid "Parallel 4 Combo"
+msgstr "緯線4組合"
+
+#: ../ui/prefs.glade.h:70
+msgid "Parallel 5"
+msgstr "緯線5"
+
+#: ../ui/prefs.glade.h:71
+msgid "Parallel 5 Combo"
+msgstr "緯線5組合"
+
+#: ../ui/prefs.glade.h:72
+msgid "Parallel View in a tab"
+msgstr "平行查看製表"
+
+#: ../ui/prefs.glade.h:73
+msgid "Personal Notes"
+msgstr "個人筆記"
+
+#: ../ui/prefs.glade.h:76
+msgid "Previewer Checkbox"
+msgstr "試播複選框"
+
+#: ../ui/prefs.glade.h:77
+msgid "Resize images"
+msgstr "調整圖像"
+
+#: ../ui/prefs.glade.h:78
+msgid "Resize images checkbox"
+msgstr "調整圖像複選框"
+
+#: ../ui/prefs.glade.h:79
+msgid "Scroll to Previous/Next Chapter"
+msgstr "滾動到上一頁 /下一頁第"
+
+#: ../ui/prefs.glade.h:80
+msgid "Scroll to Previous/Next Chapter Checkbox"
+msgstr "滾動到上一頁 /下一頁第複選框"
+
+#: ../ui/prefs.glade.h:81
+msgid "Select A Directory"
+msgstr "選擇一個目錄"
+
+#: ../ui/prefs.glade.h:82
+msgid "Show Daily Devotion at start up"
+msgstr "展覽日報迪森在啟動"
+
+#: ../ui/prefs.glade.h:83
+msgid "Show splash screen at start up"
+msgstr "屏幕上顯示初始啟動"
+
+#: ../ui/prefs.glade.h:84
+msgid "Special Locale (requires restart)"
+msgstr "特殊的區域設置(需要重新啟動)"
+
+#: ../ui/prefs.glade.h:85
+msgid "Special Locale Combo"
+msgstr "特殊區域設置組合"
+
+#: ../ui/prefs.glade.h:86
+msgid "StudyPad default directory combo"
+msgstr "研究組合墊默認目錄"
+
+#: ../ui/prefs.glade.h:88
+msgid "Use Bible Text scroll bar to scroll to previous or next chapter"
+msgstr "聖經文本使用滾動條滾動到一個或下一個章節"
+
+#: ../ui/prefs.glade.h:89
+msgid "Use Verse Per Line"
+msgstr "使用每行詩"
+
+#: ../ui/prefs.glade.h:90
+msgid "Use Verse Per Line Checkbox"
+msgstr "使用複選框每行詩"
+
+#: ../ui/prefs.glade.h:91
+msgid "Use default Dictionary"
+msgstr "使用默認字典"
+
+#: ../ui/prefs.glade.h:92
+msgid "Use default Dictionary Checkbox"
+msgstr "使用默認字典複選框"
+
+#: ../ui/prefs.glade.h:93
+msgid "Use tabbed browsing"
+msgstr "使用分頁瀏覽"
+
+#: ../ui/prefs.glade.h:94
+msgid "Use tabbed browsing Checkbox"
+msgstr "使用標籤式瀏覽複選框"
+
+#: ../ui/prefs.glade.h:95
+msgid "Verse Number"
+msgstr "詩號碼"
+
+#: ../ui/prefs.glade.h:96
+msgid "Verse number size"
+msgstr "詩數量規模"
+
+#: ../ui/search-dialog.glade.h:1
+msgid "<b>Attribute</b>"
+msgstr "<b>屬性</b>"
+
+#: ../ui/search-dialog.glade.h:2
+msgid "<b>Found</b>"
+msgstr "<b>創立</b>"
+
+#: ../ui/search-dialog.glade.h:3
+msgid "<b>List Name</b>"
+msgstr "<b>列表名稱</b>"
+
+#: ../ui/search-dialog.glade.h:4
+msgid "<b>Module Lists</b>"
+msgstr "<b>模塊列表</b>"
+
+#: ../ui/search-dialog.glade.h:5
+msgid "<b>Modules</b>"
+msgstr "<b>模塊</b>"
+
+#: ../ui/search-dialog.glade.h:6
+msgid "<b>Options</b>"
+msgstr "<b>選項</b>"
+
+#: ../ui/search-dialog.glade.h:7
+msgid "<b>Preview</b>"
+msgstr "<b>預覽</b>"
+
+#: ../ui/search-dialog.glade.h:8
+msgid "<b>Range Definition</b>"
+msgstr "<b>範圍定義</b>"
+
+#: ../ui/search-dialog.glade.h:9
+msgid "<b>Range Name</b>"
+msgstr "<b>範圍名稱</b>"
+
+#: ../ui/search-dialog.glade.h:10
+msgid "<b>Ranges</b>"
+msgstr "<b>範圍</b>"
+
+#: ../ui/search-dialog.glade.h:11
+msgid "<b>Results Display Options</b>"
+msgstr "<b>結果顯示選項</b>"
+
+#: ../ui/search-dialog.glade.h:12
+msgid "<b>Scope</b>"
+msgstr "<b>範圍</b>"
+
+#: ../ui/search-dialog.glade.h:13
+msgid "<b>Search Results</b>"
+msgstr "<b>搜索結果</b>"
+
+#: ../ui/search-dialog.glade.h:14
+msgid "<b>Search Type</b>"
+msgstr "<b>搜索類型</b>"
+
+#: ../ui/search-dialog.glade.h:15
+msgid "Add Modules"
+msgstr "添加模塊"
+
+#: ../ui/search-dialog.glade.h:16
+msgid "Advanced Search"
+msgstr "高級搜索"
+
+#: ../ui/search-dialog.glade.h:17
+msgid "Attribute Search"
+msgstr "屬性搜索"
+
+#: ../ui/search-dialog.glade.h:18
+msgid "Attributes"
+msgstr "屬性"
+
+#: ../ui/search-dialog.glade.h:19
+msgid "Attributes radiobutton"
+msgstr "屬性單選按鈕"
+
+#: ../ui/search-dialog.glade.h:20
+msgid "Clear Custom Module List Button"
+msgstr "清除自定義模塊列表按鈕"
+
+#: ../ui/search-dialog.glade.h:21
+msgid "Clear Modules from List Button"
+msgstr "清除模塊的列表按鈕"
+
+#: ../ui/search-dialog.glade.h:22
+msgid "Clear all modules from the list"
+msgstr "清除所有模塊從列表"
+
+#: ../ui/search-dialog.glade.h:23
+msgid "Clear lists for new search"
+msgstr "明確列出了新的搜索"
+
+#: ../ui/search-dialog.glade.h:24
+msgid "Create a new module list"
+msgstr "創建一個新的模塊列表"
+
+#: ../ui/search-dialog.glade.h:25
+msgid "Create new custom range"
+msgstr "創建新的自定義範圍"
+
+#: ../ui/search-dialog.glade.h:26
+msgid "Current results"
+msgstr "當前結果"
+
+#: ../ui/search-dialog.glade.h:27
+msgid "Current results radiobutton"
+msgstr "目前的結果單選按鈕"
+
+#: ../ui/search-dialog.glade.h:28
+msgid "Custom Module List Combo"
+msgstr "目前的結果單選按鈕"
+
+#: ../ui/search-dialog.glade.h:29
+msgid "Custom Module List Name Entry"
+msgstr "自定義模塊列表名稱條目"
+
+#: ../ui/search-dialog.glade.h:30
+msgid "Custom Module Lists"
+msgstr "自定義模塊列表"
+
+#: ../ui/search-dialog.glade.h:31
+msgid "Custom Range Preview"
+msgstr "自定義範圍預覽"
+
+#: ../ui/search-dialog.glade.h:32
+msgid "Custom Range Selector Combo"
+msgstr "自定義範圍選擇組合"
+
+#: ../ui/search-dialog.glade.h:33
+msgid "Custom Verse Ranges"
+msgstr "自定義詩範圍"
+
+#: ../ui/search-dialog.glade.h:34
+msgid "Custom module list"
+msgstr "自定義模塊列表"
+
+#: ../ui/search-dialog.glade.h:35
+msgid "Custom module list radiobutton"
+msgstr "自定義模塊列表單選按鈕"
+
+#: ../ui/search-dialog.glade.h:36
+msgid "Custom verse range"
+msgstr "自定義範圍詩"
+
+#: ../ui/search-dialog.glade.h:37
+msgid "Custom verse range radiobutton"
+msgstr "自定義詩範圍單選按鈕"
+
+#: ../ui/search-dialog.glade.h:38
+msgid "Delete Range Button"
+msgstr "刪除範圍按鈕"
+
+#: ../ui/search-dialog.glade.h:39
+msgid "Delete Selected Module From List Button"
+msgstr "刪除所選模塊從列表按鈕"
+
+#: ../ui/search-dialog.glade.h:40
+msgid "Delete selected range"
+msgstr "刪除所選範圍"
+
+#: ../ui/search-dialog.glade.h:41
+msgid "Delete the selected list"
+msgstr "刪除選定的列表"
+
+#: ../ui/search-dialog.glade.h:42
+msgid "Entire module"
+msgstr "整個模塊"
+
+#: ../ui/search-dialog.glade.h:43
+msgid "Entire module radiobutton"
+msgstr "整個模塊單選按鈕"
+
+#: ../ui/search-dialog.glade.h:45
+msgid "Exact phrase radiobutton"
+msgstr "整句話單選按鈕"
+
+#: ../ui/search-dialog.glade.h:46
+msgid "Export"
+msgstr "出口"
+
+#: ../ui/search-dialog.glade.h:47
+msgid "Export current search results"
+msgstr "出口當前的搜索結果"
+
+#: ../ui/search-dialog.glade.h:48
+msgid ""
+"Fast, featureful, index-based search\n"
+"Indexes must have been built beforehand:\n"
+"See Module Manager's maintenance functions"
+msgstr ""
+"快速,多特徵的,基於索引的搜索\n"
+"索引必須事先已建成:\n"
+"見模塊管理的維護功能"
+
+#: ../ui/search-dialog.glade.h:51
+msgid "Find Button"
+msgstr "查找按鈕"
+
+#: ../ui/search-dialog.glade.h:53
+msgid "Footnotes radiobutton"
+msgstr "腳註單選按鈕"
+
+#: ../ui/search-dialog.glade.h:54
+msgid "In modules that have Footnotes"
+msgstr "在模塊的註腳"
+
+#: ../ui/search-dialog.glade.h:55
+msgid "In modules that have Morphological Tags"
+msgstr "在模塊的形態標籤"
+
+#: ../ui/search-dialog.glade.h:56
+msgid "In modules that have Strong's Numbers"
+msgstr "在模塊的 Strong's 的號碼"
+
+#: ../ui/search-dialog.glade.h:57
+msgid "Main Search Entry"
+msgstr "主要搜索項目"
+
+#: ../ui/search-dialog.glade.h:58
+msgid "Make selections on the Attribute Search tab"
+msgstr "基於屬性進行選擇搜索選項卡"
+
+#: ../ui/search-dialog.glade.h:60
+msgid "Match case checkbox"
+msgstr "區分大小寫複選框"
+
+#: ../ui/search-dialog.glade.h:61
+msgid "Module Selection"
+msgstr "模塊選擇"
+
+#: ../ui/search-dialog.glade.h:62
+msgid "Module list"
+msgstr "模塊列表"
+
+#: ../ui/search-dialog.glade.h:63
+msgid "Module list radiobutton"
+msgstr "模塊列表單選按鈕"
+
+#: ../ui/search-dialog.glade.h:65
+msgid "Morphological Tags radiobutton"
+msgstr "形態標記單選按鈕"
+
+#: ../ui/search-dialog.glade.h:67
+msgid "Multi word radiobutton"
+msgstr "多詞單選按鈕"
+
+#: ../ui/search-dialog.glade.h:68
+msgid "New Custom Module List Button"
+msgstr "新的自定義模塊列表按鈕"
+
+#: ../ui/search-dialog.glade.h:69
+msgid "New Range Button"
+msgstr "新範圍按鈕"
+
+#: ../ui/search-dialog.glade.h:70
+msgid "Open Selection Dialog Button"
+msgstr ""
+
+#: ../ui/search-dialog.glade.h:71
+msgid "Open a dialog to select modules to add to the list"
+msgstr "打開一個對話框,選擇模塊添加到列表"
+
+#: ../ui/search-dialog.glade.h:72
+msgid "Optimized (\"Lucene\")"
+msgstr "優化 (\"Lucene\")"
+
+#: ../ui/search-dialog.glade.h:73
+msgid "Optimized (\"Lucene\") radiobutton"
+msgstr "優化 (\"Lucene\") 單選按鈕"
+
+#: ../ui/search-dialog.glade.h:74
+msgid "Range Definition Entry"
+msgstr "範圍定義項"
+
+#: ../ui/search-dialog.glade.h:75
+msgid "Range Name Entry"
+msgstr "範圍名稱條目"
+
+#: ../ui/search-dialog.glade.h:77
+msgid "Regular expression radiobutton"
+msgstr "正則表達式單選按鈕"
+
+#: ../ui/search-dialog.glade.h:78
+msgid "Remove the selected module from the list"
+msgstr "刪除選定的模塊從列表"
+
+#: ../ui/search-dialog.glade.h:79
+msgid "Result Summary Table"
+msgstr "結果摘要表"
+
+#: ../ui/search-dialog.glade.h:80
+msgid "Result Summary Window"
+msgstr "結果摘要窗口"
+
+#: ../ui/search-dialog.glade.h:81
+msgid "Results"
+msgstr "結果"
+
+#: ../ui/search-dialog.glade.h:82
+msgid "Save Custom Module List Button"
+msgstr "保存自定義模塊列表按鈕"
+
+#: ../ui/search-dialog.glade.h:83
+msgid "Save Range Button"
+msgstr "保存範圍按鈕"
+
+#: ../ui/search-dialog.glade.h:84
+msgid "Save custom range"
+msgstr "保存自定義範圍"
+
+#: ../ui/search-dialog.glade.h:85
+msgid "Save search results as bookmarks"
+msgstr "保存搜索結果,書籤"
+
+#: ../ui/search-dialog.glade.h:86
+msgid "Save the module list"
+msgstr "保存該模塊列表"
+
+#: ../ui/search-dialog.glade.h:87
+msgid "Search  Criteria"
+msgstr "搜索標準"
+
+#: ../ui/search-dialog.glade.h:88
+msgid "Search Criteria Treeview"
+msgstr "搜索標準樹視圖"
+
+#: ../ui/search-dialog.glade.h:89
+msgid "Search entire module"
+msgstr "搜索整個模塊"
+
+#: ../ui/search-dialog.glade.h:90
+msgid "Search for Morphological tags"
+msgstr "搜尋形態標記"
+
+#: ../ui/search-dialog.glade.h:91
+msgid "Search for Strongs Numbers like G4442 or H1121"
+msgstr "搜索 Strong's 的號碼如 G4442 或 H1121"
+
+#: ../ui/search-dialog.glade.h:92
+msgid "Search in footnotes"
+msgstr "搜索腳註"
+
+#: ../ui/search-dialog.glade.h:93
+msgid "Show Footnotes"
+msgstr "顯示腳註"
+
+#: ../ui/search-dialog.glade.h:94
+msgid "Show Footnotes checkbox"
+msgstr "顯示腳註複選框"
+
+#: ../ui/search-dialog.glade.h:95
+msgid "Show Morphological Tags"
+msgstr "節目形態標記"
+
+#: ../ui/search-dialog.glade.h:96
+msgid "Show Morphological Tags checkbox"
+msgstr "節目形態標記複選框"
+
+#: ../ui/search-dialog.glade.h:97
+msgid "Show Strong's Numbers"
+msgstr "顯示 Strong's 的號碼"
+
+#: ../ui/search-dialog.glade.h:98
+msgid "Show Strong's Numbers checkbox"
+msgstr "顯示 Strong's 的號碼複選框"
+
+#: ../ui/search-dialog.glade.h:99
+msgid "Show in main window"
+msgstr "顯示在主窗口"
+
+#: ../ui/search-dialog.glade.h:100
+msgid "Single module"
+msgstr "單一模塊"
+
+#: ../ui/search-dialog.glade.h:101
+msgid "Single module radiobutton"
+msgstr "單一模塊單選按鈕"
+
+#: ../ui/search-dialog.glade.h:102
+msgid "Start/stop searching"
+msgstr "啟動 /停止搜尋"
+
+#: ../ui/search-dialog.glade.h:103
+msgid "Strongs Numbers"
+msgstr "Strong's 的號碼"
+
+#: ../ui/search-dialog.glade.h:104
+msgid "Strongs Numbers radiobutton"
+msgstr "Strong's 的號碼單選按鈕"
+
+#: ../ui/search-dialog.glade.h:105
+msgid "Use a custom module list for the search"
+msgstr "使用自定義模塊列表搜索"
+
+#: ../ui/search-dialog.glade.h:106
+msgid "Use a custom range for the scope of the search"
+msgstr "使用自定義範圍的範圍搜索"
+
+#: ../ui/search-dialog.glade.h:107
+msgid "Use a single module for the search"
+msgstr "使用一個模塊的搜索"
+
+#: ../ui/search-dialog.glade.h:108
+msgid "Use the current module list for the search"
+msgstr "當前模塊使用的搜索"
+
+#: ../ui/search-dialog.glade.h:109
+msgid "Use the results of the last search as the scope of the search"
+msgstr "使用結果的最後一次搜索的範圍搜索"
+
+#: ../ui/search-dialog.glade.h:110
+msgid "e.g. Matt-John;Rev4"
+msgstr "例如:"
+
+#: ../ui/search-dialog.glade.h:111
+msgid "for "
+msgstr "為了"
+
+#: ../ui/xi-menus.glade.h:2
+msgid "About _Translation"
+msgstr "關於翻譯"
+
+#: ../ui/xi-menus.glade.h:3
+msgid "About _Xiphos"
+msgstr "關於 Xiphos"
+
+#: ../ui/xi-menus.glade.h:4
+msgid "Add Item"
+msgstr "新增項目"
+
+#: ../ui/xi-menus.glade.h:5
+msgid "Add Sub-Item"
+msgstr "添加分項目"
+
+#: ../ui/xi-menus.glade.h:6
+msgid "Add a sub-item"
+msgstr "添加一個分項目"
+
+#: ../ui/xi-menus.glade.h:7
+msgid "Add an item"
+msgstr "添加項"
+
+#: ../ui/xi-menus.glade.h:8
+msgid "Add new folder to selected folder"
+msgstr "添加新的文件夾選擇文件夾"
+
+#: ../ui/xi-menus.glade.h:10
+msgid "Allow Reordering"
+msgstr "允許重新排序"
+
+#: ../ui/xi-menus.glade.h:11
+msgid "Allow items to be moved from one folder to another"
+msgstr "允許將項目從文件夾移動到另一個"
+
+#: ../ui/xi-menus.glade.h:12
+msgid "Annotate Verse"
+msgstr "註釋詩"
+
+#: ../ui/xi-menus.glade.h:14
+msgid "Browse in BibleMap.org"
+msgstr "瀏覽 BibleMap.org"
+
+#: ../ui/xi-menus.glade.h:15
+msgid "Collapse All"
+msgstr "收合"
+
+#: ../ui/xi-menus.glade.h:16
+msgid "Collapse all Bookmarks groups"
+msgstr "收合書籤組"
+
+#: ../ui/xi-menus.glade.h:17
+msgid "Commentary by Chapter"
+msgstr "評論由章"
+
+#: ../ui/xi-menus.glade.h:19
+msgid "Create a new daily journal"
+msgstr "創建一個新的日報"
+
+#: ../ui/xi-menus.glade.h:20
+msgid "Create a new monthly journal"
+msgstr "創建一個新的月刊"
+
+#: ../ui/xi-menus.glade.h:21
+msgid "Create a new outlined topic"
+msgstr "創建一個新的課題概述"
+
+#: ../ui/xi-menus.glade.h:22
+msgid "Create a new simple prayer list"
+msgstr "創建一個新的簡單的祈禱名單"
+
+#: ../ui/xi-menus.glade.h:23
+msgid "Create a new subject prayer list"
+msgstr "創建一個新的課題祈禱名單"
+
+#: ../ui/xi-menus.glade.h:24
+msgid "D_ouble-Space Text"
+msgstr "雙空間文本"
+
+#: ../ui/xi-menus.glade.h:25
+msgid "Daily"
+msgstr "每日"
+
+#: ../ui/xi-menus.glade.h:26
+msgid "Delete Item"
+msgstr "刪除項目"
+
+#: ../ui/xi-menus.glade.h:27
+msgid "Delete item"
+msgstr "刪除項目"
+
+#: ../ui/xi-menus.glade.h:28
+msgid "Dictionar_y"
+msgstr "字典"
+
+#: ../ui/xi-menus.glade.h:29
+msgid "Display Book Heading"
+msgstr "資料冊標題"
+
+#: ../ui/xi-menus.glade.h:30
+msgid "Display Chapter Heading"
+msgstr "顯示章標題"
+
+#: ../ui/xi-menus.glade.h:31
+msgid "Dump Pers.Comm."
+msgstr "轉儲個人評論"
+
+#: ../ui/xi-menus.glade.h:33
+msgid "Edit bookmark item"
+msgstr "編輯書籤項目"
+
+#: ../ui/xi-menus.glade.h:34
+msgid "Edit this item"
+msgstr "編輯此項目"
+
+#: ../ui/xi-menus.glade.h:35
+msgid "Expand All"
+msgstr "展開所有"
+
+#: ../ui/xi-menus.glade.h:36
+msgid "Expand all Bookmarks groups"
+msgstr "擴大所有書籤組"
+
+#: ../ui/xi-menus.glade.h:37
+msgid "Export Folder"
+msgstr "導出文件夾"
+
+#: ../ui/xi-menus.glade.h:38
+msgid "Export List"
+msgstr "輸出列表"
+
+#: ../ui/xi-menus.glade.h:45
+msgid "Image Content"
+msgstr "圖像內容"
+
+#: ../ui/xi-menus.glade.h:46
+msgid "Import Bibletime Bookmarks"
+msgstr "圖片 BibleTime 書籤"
+
+#: ../ui/xi-menus.glade.h:47
+msgid "Insert Bookmark"
+msgstr "插入書籤"
+
+#: ../ui/xi-menus.glade.h:48
+msgid "Insert new bookmark here"
+msgstr "這裡插入新的書籤"
+
+#: ../ui/xi-menus.glade.h:49
+msgid "L_ink Tabs"
+msgstr "鏈接標籤"
+
+#: ../ui/xi-menus.glade.h:51
+msgid "Load Bookmarks from Bibletime"
+msgstr "鏈接標籤負載的書籤 BibleTime"
+
+#: ../ui/xi-menus.glade.h:52
+msgid "Lookup Selection"
+msgstr "查找選擇"
+
+#: ../ui/xi-menus.glade.h:54
+msgid "Monthly"
+msgstr "每月"
+
+#: ../ui/xi-menus.glade.h:57
+msgid "Note"
+msgstr "注意"
+
+#: ../ui/xi-menus.glade.h:58
+msgid "Open Module"
+msgstr "開放模塊"
+
+#: ../ui/xi-menus.glade.h:59
+msgid "Open Study_pad"
+msgstr "開放性研究墊"
+
+#: ../ui/xi-menus.glade.h:60
+msgid "Open in a dialog"
+msgstr "打開一個對話框"
+
+#: ../ui/xi-menus.glade.h:61
+msgid "Open in a separate window"
+msgstr "打開一個單獨的對話"
+
+#: ../ui/xi-menus.glade.h:62
+msgid "Open in editor"
+msgstr "打開編輯器"
+
+#: ../ui/xi-menus.glade.h:63
+msgid "Open in new tab"
+msgstr "在新標籤中打開"
+
+#: ../ui/xi-menus.glade.h:64
+msgid ""
+"Open selected module in a\n"
+"\tseparate ['dialog'] window"
+msgstr ""
+"打開選定的模塊，以\n"
+"\t獨立 [`對話']窗口"
+
+#: ../ui/xi-menus.glade.h:66
+msgid "Open selected module in a new tab"
+msgstr "打開選定的模塊在新標籤"
+
+#: ../ui/xi-menus.glade.h:67
+msgid "Open this bookmark in a dialog"
+msgstr "打開此書籤對話框"
+
+#: ../ui/xi-menus.glade.h:68
+msgid "Open this bookmark in a new tab"
+msgstr "打開這個書籤在新標籤"
+
+#: ../ui/xi-menus.glade.h:69
+msgid "Outlined"
+msgstr "概述"
+
+#: ../ui/xi-menus.glade.h:71
+msgid "Read Selection Aloud"
+msgstr "選擇大聲讀"
+
+#: ../ui/xi-menus.glade.h:73
+msgid "Remove folder and save it"
+msgstr "刪除文件夾,保存"
+
+#: ../ui/xi-menus.glade.h:74
+msgid "Remove this item"
+msgstr "刪除此項目"
+
+#: ../ui/xi-menus.glade.h:75
+msgid "Rename Pers.Comm."
+msgstr "重命名的個人評論"
+
+#: ../ui/xi-menus.glade.h:76
+msgid "Respect Font Faces"
+msgstr "尊重字型臉"
+
+#: ../ui/xi-menus.glade.h:77
+msgid "Restore Folder"
+msgstr "恢復文件夾"
+
+#: ../ui/xi-menus.glade.h:78
+msgid "Restore saved folder"
+msgstr "退休保存的文件夾"
+
+#: ../ui/xi-menus.glade.h:79
+msgid "Save list as a series of bookmarks"
+msgstr "保存列為一系列書籤"
+
+#: ../ui/xi-menus.glade.h:80
+msgid "Save list as a single bookmark"
+msgstr "保存清單作為一個單一的書籤"
+
+#: ../ui/xi-menus.glade.h:81
+msgid "Save these results as a series of bookmarks in their own folder"
+msgstr "這些結果保存為一系列在自己的書籤文件夾"
+
+#: ../ui/xi-menus.glade.h:82
+msgid "Save these results as a single bookmark"
+msgstr "這些結果保存為一個書籤"
+
+#: ../ui/xi-menus.glade.h:83
+msgid "Scripture Cross-references"
+msgstr "經文交叉引用"
+
+#: ../ui/xi-menus.glade.h:85
+msgid "Show Parallel View in a _Tab"
+msgstr "並行顯示的標籤"
+
+#: ../ui/xi-menus.glade.h:86
+msgid "Show Previe_wer in the Sidebar"
+msgstr "顯示在側邊欄中試播"
+
+#: ../ui/xi-menus.glade.h:87
+msgid "Show Verse _Numbers"
+msgstr "數字顯示詩"
+
+#: ../ui/xi-menus.glade.h:88
+msgid "Simple"
+msgstr "簡單"
+
+#: ../ui/xi-menus.glade.h:90
+msgid "Subject"
+msgstr "題目"
+
+#: ../ui/xi-menus.glade.h:92
+msgid "Unlock This Module"
+msgstr "解開這個模塊"
+
+#: ../ui/xi-menus.glade.h:93
+msgid "Use Current Dictionary"
+msgstr "使用目前的字典"
+
+#: ../ui/xi-menus.glade.h:94
+msgid "Use module manager to install and remove Sword modules"
+msgstr "使用模塊管理器安裝和刪除模塊劍"
+
+#: ../ui/xi-menus.glade.h:95
+msgid "Variants"
+msgstr "變種"
+
+#: ../ui/xi-menus.glade.h:97
+msgid "_About The SWORD Project"
+msgstr "大約 The SWORD Project"
+
+#: ../ui/xi-menus.glade.h:98
+msgid "_Advanced Search"
+msgstr "高級搜索"
+
+#: ../ui/xi-menus.glade.h:99
+msgid "_Attach/Detach Sidebar"
+msgstr "連接 /分離側邊欄"
+
+#: ../ui/xi-menus.glade.h:100
+msgid "_Bible"
+msgstr "聖經"
+
+#: ../ui/xi-menus.glade.h:101
+msgid "_Commentary/Book"
+msgstr "評 /書"
+
+#: ../ui/xi-menus.glade.h:102
+msgid "_Contents"
+msgstr "內容"
+
+#: ../ui/xi-menus.glade.h:103
+msgid "_Daily Devotion"
+msgstr "每天奉獻"
+
+#: ../ui/xi-menus.glade.h:104
+msgid "_Edit"
+msgstr "編輯"
+
+#: ../ui/xi-menus.glade.h:105
+msgid "_Edit Item"
+msgstr "編輯項目"
+
+#: ../ui/xi-menus.glade.h:107
+msgid "_Help"
+msgstr "幫助"
+
+#: ../ui/xi-menus.glade.h:108
+msgid "_Highlight Current Verse"
+msgstr "突出顯示當前的詩"
+
+#: ../ui/xi-menus.glade.h:109
+msgid "_Live Chat"
+msgstr "在線聊天"
+
+#: ../ui/xi-menus.glade.h:110
+msgid "_Mailing List"
+msgstr "郵件列表"
+
+#: ../ui/xi-menus.glade.h:111
+msgid "_Module Manager"
+msgstr "模塊管理"
+
+#: ../ui/xi-menus.glade.h:112
+msgid "_Open Session"
+msgstr "公開會議"
+
+#: ../ui/xi-menus.glade.h:113
+msgid "_Preferences"
+msgstr "偏好"
+
+#: ../ui/xi-menus.glade.h:114
+msgid "_Preview"
+msgstr "預覽"
+
+#: ../ui/xi-menus.glade.h:115
+msgid "_Read Aloud"
+msgstr "朗讀"
+
+#: ../ui/xi-menus.glade.h:116
+msgid "_Report Bug"
+msgstr "報告錯誤"
+
+#: ../ui/xi-menus.glade.h:117
+msgid "_Save Session"
+msgstr "保存會議"
+
+#: ../ui/xi-menus.glade.h:118
+msgid "_Search"
+msgstr "搜索"
+
+#: ../ui/xi-menus.glade.h:119
+msgid "_Show/Hide Attached Sidebar"
+msgstr "顯示 /隱藏側邊欄附"
+
+#: ../ui/xi-menus.glade.h:120
+msgid "_Verse Per Line"
+msgstr "每行詩"
+
+#: ../xiphos.desktop.in.in.h:1
+msgid "Study the Bible"
+msgstr "學習聖經"
+
+#: ../xiphos.desktop.in.in.h:2
+msgid "Xiphos Bible Guide"
+msgstr "Xiphos 聖經指南"
+
diff --git a/src/Makefile.in b/src/Makefile.in
index 1888790..da20bd2 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 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.
@@ -15,8 +16,9 @@
 @SET_MAKE@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@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
@@ -36,12 +38,22 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gecko.m4 \
 	$(top_srcdir)/m4/gnome-doc-utils.m4 \
-	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in
+	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 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 \
@@ -53,19 +65,49 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-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
 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@
+ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AM_LDFLAGS = @AM_LDFLAGS@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-A_CPPFLAGS = @A_CPPFLAGS@
 BONOBO_IDL_INCLUDES = @BONOBO_IDL_INCLUDES@
 CATALOGS = @CATALOGS@
 CATOBJEXT = @CATOBJEXT@
@@ -83,17 +125,16 @@ DATADIRNAME = @DATADIRNAME@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DIRS = @DIRS@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
 DOC_USER_FORMATS = @DOC_USER_FORMATS@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
-EDITOR_CFLAGS = @EDITOR_CFLAGS@
-EDITOR_LIBS = @EDITOR_LIBS@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
 GECKO = @GECKO@
 GECKO_COMPONENT_CFLAGS = @GECKO_COMPONENT_CFLAGS@
 GECKO_COMPONENT_LIBS = @GECKO_COMPONENT_LIBS@
@@ -106,57 +147,26 @@ GECKO_PREFIX = @GECKO_PREFIX@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
-GNOME_CFLAGS = @GNOME_CFLAGS@
-GNOME_LIBS = @GNOME_LIBS@
 GREP = @GREP@
-GTKHTML_314_presence_CFLAGS = @GTKHTML_314_presence_CFLAGS@
-GTKHTML_314_presence_LIBS = @GTKHTML_314_presence_LIBS@
-GTKHTML_38_presence_CFLAGS = @GTKHTML_38_presence_CFLAGS@
-GTKHTML_38_presence_LIBS = @GTKHTML_38_presence_LIBS@
-GTKHTML_CFLAGS = @GTKHTML_CFLAGS@
 GTKHTML_DATA_DIR = @GTKHTML_DATA_DIR@
-GTKHTML_LIBS = @GTKHTML_LIBS@
 HELP_DIR = @HELP_DIR@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PREFIX = @INSTALL_PREFIX@
 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_ICONV = @INTLTOOL_ICONV@
-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
-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_SERVICE_RULE = @INTLTOOL_SERVICE_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_XGETTEXT = @INTLTOOL_XGETTEXT@
-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
-ImageMagick_CFLAGS = @ImageMagick_CFLAGS@
-ImageMagick_LIBS = @ImageMagick_LIBS@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
@@ -165,22 +175,18 @@ MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 MSGFMT_OPTS = @MSGFMT_OPTS@
-NO_PREFIX_PACKAGE_DATA_DIR = @NO_PREFIX_PACKAGE_DATA_DIR@
-NO_PREFIX_PACKAGE_DOC_DIR = @NO_PREFIX_PACKAGE_DOC_DIR@
-NO_PREFIX_PACKAGE_HELP_DIR = @NO_PREFIX_PACKAGE_HELP_DIR@
-NO_PREFIX_PACKAGE_MENU_DIR = @NO_PREFIX_PACKAGE_MENU_DIR@
-NO_PREFIX_PACKAGE_PIXMAPS_DIR = @NO_PREFIX_PACKAGE_PIXMAPS_DIR@
+MSGMERGE = @MSGMERGE@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 OMF_DIR = @OMF_DIR@
 ORBIT_IDL = @ORBIT_IDL@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_DATA_DIR = @PACKAGE_DATA_DIR@
-PACKAGE_DOC_DIR = @PACKAGE_DOC_DIR@
-PACKAGE_HELP_DIR = @PACKAGE_HELP_DIR@
-PACKAGE_MENU_DIR = @PACKAGE_MENU_DIR@
 PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_PIXMAPS_DIR = @PACKAGE_PIXMAPS_DIR@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
@@ -191,28 +197,24 @@ POSUB = @POSUB@
 PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
 PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
 RANLIB = @RANLIB@
-SCROLLKEEPER_BUILD_REQUIRED = @SCROLLKEEPER_BUILD_REQUIRED@
-SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-SWORD_CFLAGS = @SWORD_CFLAGS@
-SWORD_LIBS = @SWORD_LIBS@
-SWORD_MULTIVERSE_CFLAGS = @SWORD_MULTIVERSE_CFLAGS@
-SWORD_MULTIVERSE_LIBS = @SWORD_MULTIVERSE_LIBS@
-UPRINT_CFLAGS = @UPRINT_CFLAGS@
-UPRINT_LIBS = @UPRINT_LIBS@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
+WARN_CFLAGS = @WARN_CFLAGS@
+WARN_CXXFLAGS = @WARN_CXXFLAGS@
 XGETTEXT = @XGETTEXT@
+XIPHOS_CFLAGS = @XIPHOS_CFLAGS@
+XIPHOS_LIBS = @XIPHOS_LIBS@
 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@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -243,6 +245,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -255,8 +258,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-tooltiptext_CFLAGS = @tooltiptext_CFLAGS@
-tooltiptext_LIBS = @tooltiptext_LIBS@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 xiphos_exec = @xiphos_exec@
@@ -269,14 +271,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( 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'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  src/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign src/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -294,6 +296,7 @@ $(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):
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -325,7 +328,7 @@ $(RECURSIVE_TARGETS):
 	  else \
 	    local_target="$$target"; \
 	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 	  || eval $$failcom; \
 	done; \
 	if test "$$dot_seen" = "no"; then \
@@ -359,16 +362,16 @@ $(RECURSIVE_CLEAN_TARGETS):
 	  else \
 	    local_target="$$target"; \
 	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  ($(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" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
 	done
 ctags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
 	done
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -376,14 +379,14 @@ ID: $(HEADERS) $(SOURCES) $(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; } \
-	       END { for (i in files) print i; }'`; \
+	  $(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)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
 	  include_option=--etags-include; \
@@ -395,39 +398,43 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test ! -f $$subdir/TAGS || \
-	      tags="$$tags $$include_option=$$here/$$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; } \
-	       END { for (i in files) print i; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  $(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; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  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)
-	tags=; \
-	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; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  $(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) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -448,29 +455,44 @@ distdir: $(DISTFILES)
 	  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 -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
-	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
 	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
-	    distdir=`$(am__cd) $(distdir) && pwd`; \
-	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-	    (cd $$subdir && \
+	  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="$$top_distdir" \
-	        distdir="$$distdir/$$subdir" \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
 		am__remove_distdir=: \
 		am__skip_length_check=: \
+		am__skip_mode_fix=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -500,6 +522,7 @@ 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"
@@ -518,6 +541,8 @@ dvi-am:
 
 html: html-recursive
 
+html-am:
+
 info: info-recursive
 
 info-am:
@@ -526,18 +551,28 @@ 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
@@ -558,8 +593,8 @@ ps-am:
 
 uninstall-am:
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
-	install-strip
+.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 clean-libtool \
@@ -575,6 +610,7 @@ uninstall-am:
 	mostlyclean-libtool 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/src/backend/Makefile.am b/src/backend/Makefile.am
index 7d24fbc..47d1129 100644
--- a/src/backend/Makefile.am
+++ b/src/backend/Makefile.am
@@ -1,11 +1,14 @@
-INCLUDES = \
-    $(GNOME_CFLAGS) \
-    $(SWORD_CFLAGS) \
-    -I$(top_srcdir)/src
-
 noinst_LIBRARIES = libbackend.a
 
 libbackend_a_SOURCES =  \
     gs_stringmgr.cpp gs_stringmgr.h \
     module_manager.cc module_manager.hh \
     sword_main.cc sword_main.hh
+
+libbackend_a_CXXFLAGS =  \
+    -I$(top_srcdir)/src \
+    $(XIPHOS_CFLAGS) \
+	$(WARN_CXXFLAGS)
+
+EXTRA_DIST = \
+   wscript
diff --git a/src/backend/Makefile.in b/src/backend/Makefile.in
index 8775bbf..a180a8f 100644
--- a/src/backend/Makefile.in
+++ b/src/backend/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 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.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@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
@@ -37,54 +39,88 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gecko.m4 \
 	$(top_srcdir)/m4/gnome-doc-utils.m4 \
-	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in
+	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 LIBRARIES = $(noinst_LIBRARIES)
 ARFLAGS = cru
+AM_V_AR = $(am__v_AR_$(V))
+am__v_AR_ = $(am__v_AR_$(AM_DEFAULT_VERBOSITY))
+am__v_AR_0 = @echo "  AR    " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
 libbackend_a_AR = $(AR) $(ARFLAGS)
 libbackend_a_LIBADD =
-am_libbackend_a_OBJECTS = gs_stringmgr.$(OBJEXT) \
-	module_manager.$(OBJEXT) sword_main.$(OBJEXT)
+am_libbackend_a_OBJECTS = libbackend_a-gs_stringmgr.$(OBJEXT) \
+	libbackend_a-module_manager.$(OBJEXT) \
+	libbackend_a-sword_main.$(OBJEXT)
 libbackend_a_OBJECTS = $(am_libbackend_a_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 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
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CXXFLAGS) $(CXXFLAGS)
+AM_V_CXX = $(am__v_CXX_$(V))
+am__v_CXX_ = $(am__v_CXX_$(AM_DEFAULT_VERBOSITY))
+am__v_CXX_0 = @echo "  CXX   " $@;
 CXXLD = $(CXX)
-CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CXXLD = $(am__v_CXXLD_$(V))
+am__v_CXXLD_ = $(am__v_CXXLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CXXLD_0 = @echo "  CXXLD " $@;
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=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    " $@;
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=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 = $(libbackend_a_SOURCES)
 DIST_SOURCES = $(libbackend_a_SOURCES)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
+ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AM_LDFLAGS = @AM_LDFLAGS@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-A_CPPFLAGS = @A_CPPFLAGS@
 BONOBO_IDL_INCLUDES = @BONOBO_IDL_INCLUDES@
 CATALOGS = @CATALOGS@
 CATOBJEXT = @CATOBJEXT@
@@ -102,17 +138,16 @@ DATADIRNAME = @DATADIRNAME@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DIRS = @DIRS@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
 DOC_USER_FORMATS = @DOC_USER_FORMATS@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
-EDITOR_CFLAGS = @EDITOR_CFLAGS@
-EDITOR_LIBS = @EDITOR_LIBS@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
 GECKO = @GECKO@
 GECKO_COMPONENT_CFLAGS = @GECKO_COMPONENT_CFLAGS@
 GECKO_COMPONENT_LIBS = @GECKO_COMPONENT_LIBS@
@@ -125,57 +160,26 @@ GECKO_PREFIX = @GECKO_PREFIX@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
-GNOME_CFLAGS = @GNOME_CFLAGS@
-GNOME_LIBS = @GNOME_LIBS@
 GREP = @GREP@
-GTKHTML_314_presence_CFLAGS = @GTKHTML_314_presence_CFLAGS@
-GTKHTML_314_presence_LIBS = @GTKHTML_314_presence_LIBS@
-GTKHTML_38_presence_CFLAGS = @GTKHTML_38_presence_CFLAGS@
-GTKHTML_38_presence_LIBS = @GTKHTML_38_presence_LIBS@
-GTKHTML_CFLAGS = @GTKHTML_CFLAGS@
 GTKHTML_DATA_DIR = @GTKHTML_DATA_DIR@
-GTKHTML_LIBS = @GTKHTML_LIBS@
 HELP_DIR = @HELP_DIR@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PREFIX = @INSTALL_PREFIX@
 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_ICONV = @INTLTOOL_ICONV@
-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
-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_SERVICE_RULE = @INTLTOOL_SERVICE_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_XGETTEXT = @INTLTOOL_XGETTEXT@
-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
-ImageMagick_CFLAGS = @ImageMagick_CFLAGS@
-ImageMagick_LIBS = @ImageMagick_LIBS@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
@@ -184,22 +188,18 @@ MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 MSGFMT_OPTS = @MSGFMT_OPTS@
-NO_PREFIX_PACKAGE_DATA_DIR = @NO_PREFIX_PACKAGE_DATA_DIR@
-NO_PREFIX_PACKAGE_DOC_DIR = @NO_PREFIX_PACKAGE_DOC_DIR@
-NO_PREFIX_PACKAGE_HELP_DIR = @NO_PREFIX_PACKAGE_HELP_DIR@
-NO_PREFIX_PACKAGE_MENU_DIR = @NO_PREFIX_PACKAGE_MENU_DIR@
-NO_PREFIX_PACKAGE_PIXMAPS_DIR = @NO_PREFIX_PACKAGE_PIXMAPS_DIR@
+MSGMERGE = @MSGMERGE@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 OMF_DIR = @OMF_DIR@
 ORBIT_IDL = @ORBIT_IDL@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_DATA_DIR = @PACKAGE_DATA_DIR@
-PACKAGE_DOC_DIR = @PACKAGE_DOC_DIR@
-PACKAGE_HELP_DIR = @PACKAGE_HELP_DIR@
-PACKAGE_MENU_DIR = @PACKAGE_MENU_DIR@
 PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_PIXMAPS_DIR = @PACKAGE_PIXMAPS_DIR@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
@@ -210,28 +210,24 @@ POSUB = @POSUB@
 PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
 PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
 RANLIB = @RANLIB@
-SCROLLKEEPER_BUILD_REQUIRED = @SCROLLKEEPER_BUILD_REQUIRED@
-SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-SWORD_CFLAGS = @SWORD_CFLAGS@
-SWORD_LIBS = @SWORD_LIBS@
-SWORD_MULTIVERSE_CFLAGS = @SWORD_MULTIVERSE_CFLAGS@
-SWORD_MULTIVERSE_LIBS = @SWORD_MULTIVERSE_LIBS@
-UPRINT_CFLAGS = @UPRINT_CFLAGS@
-UPRINT_LIBS = @UPRINT_LIBS@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
+WARN_CFLAGS = @WARN_CFLAGS@
+WARN_CXXFLAGS = @WARN_CXXFLAGS@
 XGETTEXT = @XGETTEXT@
+XIPHOS_CFLAGS = @XIPHOS_CFLAGS@
+XIPHOS_LIBS = @XIPHOS_LIBS@
 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@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -262,6 +258,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -274,22 +271,24 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-tooltiptext_CFLAGS = @tooltiptext_CFLAGS@
-tooltiptext_LIBS = @tooltiptext_LIBS@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 xiphos_exec = @xiphos_exec@
-INCLUDES = \
-    $(GNOME_CFLAGS) \
-    $(SWORD_CFLAGS) \
-    -I$(top_srcdir)/src
-
 noinst_LIBRARIES = libbackend.a
 libbackend_a_SOURCES = \
     gs_stringmgr.cpp gs_stringmgr.h \
     module_manager.cc module_manager.hh \
     sword_main.cc sword_main.hh
 
+libbackend_a_CXXFLAGS = \
+    -I$(top_srcdir)/src \
+    $(XIPHOS_CFLAGS) \
+	$(WARN_CXXFLAGS)
+
+EXTRA_DIST = \
+   wscript
+
 all: all-am
 
 .SUFFIXES:
@@ -298,14 +297,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( 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/backend/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  src/backend/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/backend/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign src/backend/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -323,13 +322,14 @@ $(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):
 
 clean-noinstLIBRARIES:
 	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
 libbackend.a: $(libbackend_a_OBJECTS) $(libbackend_a_DEPENDENCIES) 
-	-rm -f libbackend.a
-	$(libbackend_a_AR) libbackend.a $(libbackend_a_OBJECTS) $(libbackend_a_LIBADD)
-	$(RANLIB) libbackend.a
+	$(AM_V_at)-rm -f libbackend.a
+	$(AM_V_AR)$(libbackend_a_AR) libbackend.a $(libbackend_a_OBJECTS) $(libbackend_a_LIBADD)
+	$(AM_V_at)$(RANLIB) libbackend.a
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -337,48 +337,102 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gs_stringmgr.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module_manager.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sword_main.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libbackend_a-gs_stringmgr.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libbackend_a-module_manager.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libbackend_a-sword_main.Po@am__quote@
 
 .cc.o:
-@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cc.obj:
-@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cc.lo:
-@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
 
+libbackend_a-gs_stringmgr.o: gs_stringmgr.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libbackend_a_CXXFLAGS) $(CXXFLAGS) -MT libbackend_a-gs_stringmgr.o -MD -MP -MF $(DEPDIR)/libbackend_a-gs_stringmgr.Tpo -c -o libbackend_a-gs_stringmgr.o `test -f 'gs_stringmgr.cpp' || echo '$(srcdir)/'`gs_stringmgr.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libbackend_a-gs_stringmgr.Tpo $(DEPDIR)/libbackend_a-gs_stringmgr.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='gs_stringmgr.cpp' object='libbackend_a-gs_stringmgr.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libbackend_a_CXXFLAGS) $(CXXFLAGS) -c -o libbackend_a-gs_stringmgr.o `test -f 'gs_stringmgr.cpp' || echo '$(srcdir)/'`gs_stringmgr.cpp
+
+libbackend_a-gs_stringmgr.obj: gs_stringmgr.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libbackend_a_CXXFLAGS) $(CXXFLAGS) -MT libbackend_a-gs_stringmgr.obj -MD -MP -MF $(DEPDIR)/libbackend_a-gs_stringmgr.Tpo -c -o libbackend_a-gs_stringmgr.obj `if test -f 'gs_stringmgr.cpp'; then $(CYGPATH_W) 'gs_stringmgr.cpp'; else $(CYGPATH_W) '$(srcdir)/gs_stringmgr.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libbackend_a-gs_stringmgr.Tpo $(DEPDIR)/libbackend_a-gs_stringmgr.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='gs_stringmgr.cpp' object='libbackend_a-gs_stringmgr.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libbackend_a_CXXFLAGS) $(CXXFLAGS) -c -o libbackend_a-gs_stringmgr.obj `if test -f 'gs_stringmgr.cpp'; then $(CYGPATH_W) 'gs_stringmgr.cpp'; else $(CYGPATH_W) '$(srcdir)/gs_stringmgr.cpp'; fi`
+
+libbackend_a-module_manager.o: module_manager.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libbackend_a_CXXFLAGS) $(CXXFLAGS) -MT libbackend_a-module_manager.o -MD -MP -MF $(DEPDIR)/libbackend_a-module_manager.Tpo -c -o libbackend_a-module_manager.o `test -f 'module_manager.cc' || echo '$(srcdir)/'`module_manager.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libbackend_a-module_manager.Tpo $(DEPDIR)/libbackend_a-module_manager.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='module_manager.cc' object='libbackend_a-module_manager.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libbackend_a_CXXFLAGS) $(CXXFLAGS) -c -o libbackend_a-module_manager.o `test -f 'module_manager.cc' || echo '$(srcdir)/'`module_manager.cc
+
+libbackend_a-module_manager.obj: module_manager.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libbackend_a_CXXFLAGS) $(CXXFLAGS) -MT libbackend_a-module_manager.obj -MD -MP -MF $(DEPDIR)/libbackend_a-module_manager.Tpo -c -o libbackend_a-module_manager.obj `if test -f 'module_manager.cc'; then $(CYGPATH_W) 'module_manager.cc'; else $(CYGPATH_W) '$(srcdir)/module_manager.cc'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libbackend_a-module_manager.Tpo $(DEPDIR)/libbackend_a-module_manager.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='module_manager.cc' object='libbackend_a-module_manager.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libbackend_a_CXXFLAGS) $(CXXFLAGS) -c -o libbackend_a-module_manager.obj `if test -f 'module_manager.cc'; then $(CYGPATH_W) 'module_manager.cc'; else $(CYGPATH_W) '$(srcdir)/module_manager.cc'; fi`
+
+libbackend_a-sword_main.o: sword_main.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libbackend_a_CXXFLAGS) $(CXXFLAGS) -MT libbackend_a-sword_main.o -MD -MP -MF $(DEPDIR)/libbackend_a-sword_main.Tpo -c -o libbackend_a-sword_main.o `test -f 'sword_main.cc' || echo '$(srcdir)/'`sword_main.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libbackend_a-sword_main.Tpo $(DEPDIR)/libbackend_a-sword_main.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='sword_main.cc' object='libbackend_a-sword_main.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libbackend_a_CXXFLAGS) $(CXXFLAGS) -c -o libbackend_a-sword_main.o `test -f 'sword_main.cc' || echo '$(srcdir)/'`sword_main.cc
+
+libbackend_a-sword_main.obj: sword_main.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libbackend_a_CXXFLAGS) $(CXXFLAGS) -MT libbackend_a-sword_main.obj -MD -MP -MF $(DEPDIR)/libbackend_a-sword_main.Tpo -c -o libbackend_a-sword_main.obj `if test -f 'sword_main.cc'; then $(CYGPATH_W) 'sword_main.cc'; else $(CYGPATH_W) '$(srcdir)/sword_main.cc'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libbackend_a-sword_main.Tpo $(DEPDIR)/libbackend_a-sword_main.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='sword_main.cc' object='libbackend_a-sword_main.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libbackend_a_CXXFLAGS) $(CXXFLAGS) -c -o libbackend_a-sword_main.obj `if test -f 'sword_main.cc'; then $(CYGPATH_W) 'sword_main.cc'; else $(CYGPATH_W) '$(srcdir)/sword_main.cc'; fi`
+
 .cpp.o:
-@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
@@ -394,45 +448,49 @@ ID: $(HEADERS) $(SOURCES) $(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; } \
-	       END { for (i in files) print i; }'`; \
+	  $(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)
-	tags=; \
+	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; } \
-	       END { for (i in files) print i; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  $(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; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  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)
-	tags=; \
-	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; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  $(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) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -453,13 +511,17 @@ distdir: $(DISTFILES)
 	  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 -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -487,6 +549,7 @@ 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"
@@ -508,6 +571,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -516,18 +581,28 @@ install-data-am:
 
 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
@@ -565,6 +640,7 @@ uninstall-am:
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
 	pdf pdf-am ps ps-am tags 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/src/backend/module_manager.cc b/src/backend/module_manager.cc
index e2aaf7e..3aa058e 100644
--- a/src/backend/module_manager.cc
+++ b/src/backend/module_manager.cc
@@ -43,6 +43,8 @@
 #include "main/settings.h"
 #include "main/sword.h"
 
+#include "gui/debug_glib_null.h"
+
 #ifdef DEBUG 
 static const gchar *f_message = "backend/module_manager.cc line #%d \"%s\" = %s\n";
 #endif
@@ -643,11 +645,35 @@ void backend_module_mgr_clear_config(void)
 	confPath += "/" DOTSWORD "/InstallMgr/InstallMgr.conf";
 	FileMgr::createParent(confPath.c_str());
 	remove(confPath.c_str());
-	
+
 	SWConfig config(confPath.c_str());
-	
+
 	config["General"]["PassiveFTP"] = "true";
-	config.Save();	
+	config.Save();
+	backend_module_mgr_reread_config();
+}
+
+/******************************************************************************
+ * Name
+ *   backend_module_mgr_reread_config
+ *
+ * Synopsis
+ *   #include "backend/module_manager.hh"
+ *
+ *   void backend_module_mgr_reread_config(void)
+ *
+ * Description
+ *   re-init's installMgr's sense of sources.
+ *
+ * Return value
+ *   void
+ */
+
+void backend_module_mgr_reread_config(void)
+{
+#ifdef SWORD_MULTIVERSE
+	installMgr->readInstallConf();
+#endif
 }
 
 
@@ -662,7 +688,10 @@ void backend_module_mgr_clear_config(void)
  *				   const char * type,
  *				   const char * caption,
  *				   const char * source,
- *				   const char * directory)
+ *				   const char * directory,
+ *				   const char * user,
+ *				   const char * pass,
+ *				   const char * uid)
  *
  * Description
  *   
@@ -701,76 +730,6 @@ void backend_module_mgr_add_source(const char * vtype,
 	config.Save();
 }
 
-void set_mod_mgr_locale(const char *sys_locale) {
-	char buf[32];
-	int i = 0;
-	SWLocale *sw_locale = NULL;
-	
-	if (sys_locale) {
-		if (!strncmp(sys_locale,"ru_RU",5)) {
-			sys_locale = "ru_RU-koi8-r";		
-		} else if (!strncmp(sys_locale,"ru_RU-koi8-r",10)){
-			if (strlen(sys_locale) >  12) {
-				for(i = 0; i < 12; i++) {
-					buf[i] = sys_locale[i];
-					buf[i+1] = '\0';
-				}
-				sys_locale = buf;
-			}
-			
-		} else if (!strncmp(sys_locale,"uk_UA-cp1251",10)){
-			if (strlen(sys_locale) > 12 ) {
-				for(i = 0; i < 12; i++) {
-					buf[i] = sys_locale[i];
-					buf[i+1] = '\0';
-				}
-				sys_locale = buf;
-			}
-			
-		} else if (!strncmp(sys_locale,"uk_UA-koi8-u",10)){
-			if (strlen(sys_locale) > 12 ) {
-				for(i = 0; i < 12; i++) {
-					buf[i] = sys_locale[i];
-					buf[i+1] = '\0';
-				}
-				sys_locale = buf;
-			}
-			
-		} else if (!strncmp(sys_locale,"pt_BR",5)){
-			if (strlen(sys_locale) > 5 ) {
-				for(i = 0; i < 5; i++) {
-					buf[i] = sys_locale[i];
-					buf[i+1] = '\0';
-				}
-				sys_locale = buf;
-			}
-			
-		} else if (!strncmp(sys_locale,"en_GB",5)){
-			if (strlen(sys_locale) > 5 ) {
-				for(i = 0; i < 5; i++) {
-					buf[i] = sys_locale[i];
-					buf[i+1] = '\0';
-				}
-				sys_locale = buf;
-			}
-		} else {
-			if (strlen(sys_locale) > 2 ) {
-				buf[0] = sys_locale[0];
-				buf[1] = sys_locale[1];
-				buf[2] = '\0';
-				sys_locale = buf;
-			}
-		}
-		LocaleMgr::getSystemLocaleMgr()->setDefaultLocaleName(sys_locale);
-		sw_locale = LocaleMgr::getSystemLocaleMgr()->getLocale(sys_locale);
-	}
-	if (sw_locale) {
-		OLD_CODESET = (char*)sw_locale->getEncoding();
-	} else {
-		OLD_CODESET = (char*)"iso8859-1";
-	}
-}
-
 /******************************************************************************
  * Name
  *   backend_init_module_mgr
@@ -800,6 +759,10 @@ void backend_init_module_mgr(const char *dir,
 	//                then "as sent" ([a] total list or [b] per-area list)
 	//		  else "false for local install" (always per-area)
 
+	GTimer *t;
+	double d;
+	t = g_timer_new();
+	
 	if (regular) {		// use main (regular) swmgr.
 		if (mgr)
 			delete mgr;
@@ -809,12 +772,10 @@ void backend_init_module_mgr(const char *dir,
 			delete list_mgr;
 		list_mgr = new SWMgr(dir, true, 0, false, false);
 	}
-
-	const char *lang = g_getenv("LANG");	
-	if (!lang)
-		lang="C";
-	set_mod_mgr_locale(lang);
-
+	g_timer_stop(t);
+	d = g_timer_elapsed(t, NULL);
+	GS_message(("create SWMgr time is %f", d));
+	
 	const gchar *envhomedir = g_getenv(HOMEVAR);
 	SWBuf baseDir = (envhomedir) ? envhomedir : ".";
 	baseDir += "/" DOTSWORD "/InstallMgr";
@@ -832,6 +793,7 @@ void backend_init_module_mgr(const char *dir,
 #else
 	installMgr = new InstallMgr(baseDir, statusReporter);
 #endif
+
 }
 
 /******************************************************************************
diff --git a/src/backend/module_manager.hh b/src/backend/module_manager.hh
index b563024..6cee970 100644
--- a/src/backend/module_manager.hh
+++ b/src/backend/module_manager.hh
@@ -81,6 +81,7 @@ void backend_terminate_module_mgr(void);
 void backend_init_module_mgr_config(void);
 int backend_init_module_mgr_config_extras(void);
 void backend_module_mgr_clear_config(void);	
+void backend_module_mgr_reread_config(void);
 void backend_module_mgr_add_source(const char * vtype, 
 				   const char * type, 
 				   const char * caption, 
diff --git a/src/backend/sword_main.cc b/src/backend/sword_main.cc
index 0b14def..deaab73 100644
--- a/src/backend/sword_main.cc
+++ b/src/backend/sword_main.cc
@@ -26,11 +26,12 @@
 #include <swmodule.h>
 #include <localemgr.h>
 #include <swversion.h>
+#include <filemgr.h>
 
 #include <markupfiltmgr.h>
 #include <swlocale.h>
 
-#include <gnome.h>
+#include <gtk/gtk.h>
 #include <versekey.h>
 #include <regex.h>
 #include <string.h>
@@ -46,6 +47,8 @@
 #include "main/search_dialog.h"
 #include "gui/dialog.h"
 
+#include "gui/debug_glib_null.h"
+
 using namespace sword;
 using namespace std;
 
@@ -58,12 +61,19 @@ static const char *f_message = "backend/sword_main.cc line #%d \"%s\" = %s";
 #endif
 
 BackEnd::BackEnd()
-{	
+{
+	GTimer *t;
+	double d;
+	t = g_timer_new();
+
 	main_mgr = new SWMgr(new MarkupFilterMgr(FMT_HTMLHREF));
-	display_mgr = new SWMgr(new MarkupFilterMgr(FMT_HTMLHREF));
-	
-	display_mod = NULL;	
-	tree_key = NULL;	
+
+	g_timer_stop(t);
+	d = g_timer_elapsed(t, NULL);
+	GS_message(("create main_mgr time is %f", d));
+
+	display_mod = NULL;
+	tree_key = NULL;
 	commDisplay          = 0;
 	bookDisplay          = 0;
 	dictDisplay          = 0;
@@ -73,16 +83,12 @@ BackEnd::BackEnd()
 	verselistDisplay     = 0;
 	viewerDisplay        = 0;
 }
- 
 
 BackEnd::~BackEnd()
 {
 	if(main_mgr)
 		delete main_mgr;
-	if(display_mgr)
-		delete display_mgr;
 	main_mgr = 0;
-	display_mgr = 0;
 	if (commDisplay)
 		delete commDisplay;
 	if (bookDisplay)
@@ -116,8 +122,8 @@ void BackEnd::init_SWORD(int gsType)
 	ModMap::iterator it;
 	if(gsType == 0) {
 		main_setup_displays();		
-		for (it = display_mgr->Modules.begin();
-					it != display_mgr->Modules.end(); it++) {
+		for (it = main_mgr->Modules.begin();
+					it != main_mgr->Modules.end(); it++) {
 			display_mod = (*it).second;
 			if (!strcmp(display_mod->Type(), TEXT_MODS)) {
 				display_mod->setDisplay(textDisplay);
@@ -133,7 +139,7 @@ void BackEnd::init_SWORD(int gsType)
 			}			
 		}
 	} else if(gsType == 1) { // dialogs
-		for (it = display_mgr->Modules.begin(); it != display_mgr->Modules.end(); it++) {	
+		for (it = main_mgr->Modules.begin(); it != main_mgr->Modules.end(); it++) {	
 			display_mod = (*it).second;
 			if (!strcmp(display_mod->Type(), TEXT_MODS)) {	
 				display_mod->setDisplay(chapDisplay);
@@ -142,89 +148,13 @@ void BackEnd::init_SWORD(int gsType)
 			}
 		}	
 	} else if(gsType == 2) { // search
-		for (it = display_mgr->Modules.begin(); it != display_mgr->Modules.end(); it++) {	
+		for (it = main_mgr->Modules.begin(); it != main_mgr->Modules.end(); it++) {	
 			display_mod = (*it).second;
 			display_mod->setDisplay(entryDisplay);
 		}	
 	}
 }
 
-char *BackEnd::set_sword_locale(const char *sys_locale)
-{
-	char *retval = NULL;
-	char buf[32];
-	int i = 0;
-	SWLocale *sw_locale = NULL;
-	
-	if(sys_locale) {
-		if(!strncmp(sys_locale,"ru_RU",5)) {
-			sys_locale = "ru_RU-koi8-r";		
-		} else if(!strncmp(sys_locale,"ru_RU-koi8-r",10)) {
-			if(strlen(sys_locale) >  12) {
-				for(i = 0; i < 12; i++) {
-					buf[i] = sys_locale[i];
-					buf[i+1] = '\0';
-				}
-				sys_locale = buf;
-			}
-			
-		} else if(!strncmp(sys_locale,"uk_UA-cp1251",10)) {
-			if(strlen(sys_locale) > 12 ) {
-				for(i = 0; i < 12; i++) {
-					buf[i] = sys_locale[i];
-					buf[i+1] = '\0';
-				}
-				sys_locale = buf;
-			}
-			
-		} else if(!strncmp(sys_locale,"uk_UA-koi8-u",10)) {
-			if(strlen(sys_locale) > 12 ) {
-				for(i = 0; i < 12; i++) {
-					buf[i] = sys_locale[i];
-					buf[i+1] = '\0';
-				}
-				sys_locale = buf;
-			}
-			
-		} else if(!strncmp(sys_locale,"pt_BR",5)) {
-			if(strlen(sys_locale) > 5 ) {
-				for(i = 0; i < 5; i++) {
-					buf[i] = sys_locale[i];
-					buf[i+1] = '\0';
-				}
-				sys_locale = buf;
-			}
-			
-		} else if(!strncmp(sys_locale,"en_GB",5)) {
-			if(strlen(sys_locale) > 5 ) {
-				for(i = 0; i < 5; i++) {
-					buf[i] = sys_locale[i];
-					buf[i+1] = '\0';
-				}
-				sys_locale = buf;
-			}
-		} else if(!strncmp(sys_locale,"fa",2)) {
-				sys_locale = "fa-utf8";
-		} else {
-			if(strlen(sys_locale) > 2 ) {
-				buf[0] = sys_locale[0];
-				buf[1] = sys_locale[1];
-				buf[2] = '\0';
-				sys_locale = buf;
-			}
-		}
-		retval = strdup(sys_locale);
-		LocaleMgr::getSystemLocaleMgr()->setDefaultLocaleName(sys_locale);
-		sw_locale = LocaleMgr::getSystemLocaleMgr()->getLocale(sys_locale);
-	}
-	if(sw_locale) {
-		OLD_CODESET = (char*)sw_locale->getEncoding();
-	} else {
-		OLD_CODESET = (char*)"UTF-8";
-	}
-	return retval;
-}
-
 void BackEnd::init_lists(MOD_LISTS * mods)
 {
 	ModMap::iterator it;
@@ -255,22 +185,22 @@ void BackEnd::init_lists(MOD_LISTS * mods)
 			} 
 		}
 		if (!strcmp((*it).second->Type(), DICT_MODS)) {
-			mods->dictionarymods =
-			    g_list_append(mods->dictionarymods,
-			    strdup((char *) (*it).second->Name()));
-			mods->dict_descriptions =
-			    g_list_append(mods->dict_descriptions,
-			    strdup((char *) (*it).second->
-				   Description()));
-			
 			char *feature =
 			    (char *) (*it).second->getConfigEntry("Feature");
-			if (!feature)
-				continue;
-			if (!strcmp(feature, "DailyDevotion"))
-				mods->devotionmods
-				   = g_list_append(mods->devotionmods,
-				    strdup((char *) (*it).second->Name()));
+
+			if (feature && !strcmp(feature, "DailyDevotion")) {
+				mods->devotionmods =
+				    g_list_append(mods->devotionmods,
+						  strdup((char *) (*it).second->Name()));
+			} else {
+				mods->dictionarymods =
+				    g_list_append(mods->dictionarymods,
+						  strdup((char *) (*it).second->Name()));
+				mods->dict_descriptions =
+				    g_list_append(mods->dict_descriptions,
+						  strdup((char *) (*it).second->
+							 Description()));
+			}
 		}
 		if (!strcmp((*it).second->Type(), BOOK_MODS)) {
 			if ((*it).second->getConfigEntry("GSType") && 
@@ -355,7 +285,7 @@ char *BackEnd::get_config_entry(char * module_name, char * entry)
 
 void BackEnd::set_cipher_key(char * mod_name, char * key)
 {
-	display_mgr->setCipherKey(mod_name, key);	
+	main_mgr->setCipherKey(mod_name, key);	
 }
 
 int BackEnd::is_Bible_key(const char * list, char * current_key)
@@ -373,9 +303,9 @@ char *BackEnd::get_render_text(const char *module_name, const char *key)
 	SWModule *mod;
 	ModMap::iterator it;
 	//-- iterate through the modules until we find modName  
-	it = display_mgr->Modules.find(module_name);
+	it = main_mgr->Modules.find(module_name);
 	//-- if we find the module
-	if (it != display_mgr->Modules.end()) {
+	if (it != main_mgr->Modules.end()) {
 		mod = (*it).second;
 		mod->setKey(key);
 		return strdup((char *) mod->RenderText());
@@ -388,9 +318,9 @@ char *BackEnd::get_raw_text(const char *module_name, const char *key)
 	SWModule *mod;
 	ModMap::iterator it;
 	//-- iterate through the modules until we find modName  
-	it = display_mgr->Modules.find(module_name);
+	it = main_mgr->Modules.find(module_name);
 	//-- if we find the module
-	if (it != display_mgr->Modules.end()) {
+	if (it != main_mgr->Modules.end()) {
 		mod = (*it).second;
 		mod->setKey(key);
 		return strdup((char *) mod->getRawEntry());
@@ -403,9 +333,9 @@ char *BackEnd::render_this_text(const char * module_name, const char * text)
 	SWModule *mod;
 	ModMap::iterator it;
 	//-- iterate through the modules until we find modName  
-	it = display_mgr->Modules.find(module_name);
+	it = main_mgr->Modules.find(module_name);
 	//-- if we find the module
-	if (it != display_mgr->Modules.end()) {
+	if (it != main_mgr->Modules.end()) {
 		mod = (*it).second;		
 		return strdup((char *) mod->RenderText(text));
 	}
@@ -532,7 +462,7 @@ void BackEnd::save_entry(const char * entry)
 
 void BackEnd::save_note_entry(const char * module, const char * key, const char * entry)
 {
-	display_mod = display_mgr->Modules[module];
+	display_mod = main_mgr->Modules[module];
 	
 	if (display_mod) {		
 		display_mod->setKey(key);
@@ -739,7 +669,7 @@ char *BackEnd::get_entry_attribute(const char *level1, const char *level2, const
  
 int BackEnd::set_module(const char *module_name)
 {
-	display_mod = display_mgr->Modules[module_name];
+	display_mod = main_mgr->Modules[module_name];
 	if (display_mod) 
 		return 1;
 	else 
@@ -749,7 +679,7 @@ int BackEnd::set_module(const char *module_name)
 
 int BackEnd::set_module_key(const char *module_name, const char *key)
 {
-	display_mod = display_mgr->Modules[module_name];
+	display_mod = main_mgr->Modules[module_name];
 	
 	if (display_mod) {
 		GS_message((f_message,878,"key",key));
@@ -1170,4 +1100,26 @@ void BackEnd::save_module_key(char *mod_name, char *key)
 	}
 	delete myConfig;
 }
+
+const char *BackEnd::get_osisref_from_key(const char *module, const char *key)
+{
+	ModMap::iterator it;
+
+	// we need an OSISRef in module-sensitive context.
+	// fallback positions: we hope for a supplied module.
+	// if not, assume KJV (v11n historical reasons; not anglocentric).
+	// if not, use the 1st module...by which time we're just guessing.
+
+	it = main_mgr->Modules.find((module && *module) ? module : "KJV");
+	if (it == main_mgr->Modules.end()) {
+		it = main_mgr->Modules.begin();
+		if (it == main_mgr->Modules.end())
+			return "";
+	}
+
+	VerseKey *vk = (VerseKey *)(*it).second->getKey();
+	*vk = key;
+	return vk->getOSISRef();
+}
+
 /* end of file */
diff --git a/src/backend/sword_main.hh b/src/backend/sword_main.hh
index 2e0cb1a..a106252 100644
--- a/src/backend/sword_main.hh
+++ b/src/backend/sword_main.hh
@@ -37,7 +37,6 @@ using namespace sword;
 	
 class BackEnd {
 	SWMgr *main_mgr;
-	SWMgr *display_mgr;
 	//TreeKeyIdx *tree_key;
 	ListKey results;
 	ListKey search_range;
@@ -68,7 +67,6 @@ public:
 	BackEnd();
 	~BackEnd();
 	void init_SWORD(int gsType);
-	char *set_sword_locale(const char *sys_locale);
 	void init_lists(MOD_LISTS * mods);
 	const char *get_sword_version(void);
 
@@ -140,8 +138,8 @@ public:
 	char *get_conf_file_item(const char * file, const char * mod_name, const char * item);
 	void save_conf_file_item(const char * file, const char * mod_name, const char * item, const char * value);
 	void save_module_key(char *mod_name, char *key);
-	SWMgr *get_display_mgr(void) {return(display_mgr);};
-	SWMgr *get_main_mgr(void) {return(main_mgr);};
+	SWMgr *get_mgr(void) {return(main_mgr);};
+	const char *get_osisref_from_key(const char *module, const char *key);
 };
 extern BackEnd *backend;
 
diff --git a/src/backend/wscript b/src/backend/wscript
new file mode 100644
index 0000000..6cd7bdd
--- /dev/null
+++ b/src/backend/wscript
@@ -0,0 +1,15 @@
+#!/usr/bin/env python
+# encoding: utf8
+
+def build(bld):
+
+    lib = bld.new_task_gen(
+        features='cxx cc',
+        includes = '. ../.. ../../src',
+        target='backend',
+        #uselib='GLIB GNOMEUI SWORD',
+        uselib= bld.env['ALL_LIBS'],
+    )
+
+    lib.find_sources_in_dirs('.')
+        
diff --git a/src/editor/Makefile.am b/src/editor/Makefile.am
index acdb611..8288f20 100644
--- a/src/editor/Makefile.am
+++ b/src/editor/Makefile.am
@@ -1,12 +1,3 @@
-# Basic setup
-
-INCLUDES = \
-    -I$(top_srcdir)/src \
-    $(SWORD_INCLUDES) \
-    $(GNOME_CFLAGS) \
-    $(GTKHTML_CFLAGS) \
-    $(GECKO_CFLAGS) 
-
 if USE_GTKHTML_BONOBO_EDITOR
 # CORBA stuff
 
@@ -21,8 +12,6 @@ Editor-commmon.c: $(GTKHTML_DATA_DIR)/Editor.idl
 $(HTML_EDITOR_GENERATED): $(GTKHTML_DATA_DIR)/Editor.idl
 	$(ORBIT_IDL) -I $(srcdir) $(BONOBO_IDL_INCLUDES) -I $(GTKHTML_DATA_DIR)/gtkhtml $(GTKHTML_DATA_DIR)/Editor.idl
 
-
-
 noinst_LIBRARIES = libeditor.a
 
 # The Editor Control
@@ -30,18 +19,21 @@ libeditor_a_SOURCES = $(HTML_EDITOR_GENERATED)		\
 	bonobo-editor.c bonobo-editor.h  
 # Extra stuff to distribute.
 
-EXTRA_DIST = 
-
 CLEANFILES = \
     $(HTML_EDITOR_GENERATED)
-   
 
 else
 
 noinst_LIBRARIES = libeditor.a
-libeditor_a_SOURCES = slib-editor.c slib-editor.h
-
-EXTRA_DIST = 
+libeditor_a_SOURCES = slib-editor.c slib-editor.h link_dialog.c link_dialog.h
 
 endif
 
+libeditor_a_CPPFLAGS = -DINSTALL_PREFIX=\""$(prefix)"\"
+libeditor_a_CFLAGS = \
+	-I$(top_srcdir)/src \
+	$(XIPHOS_CFLAGS) \
+	$(WARN_CFLAGS)
+
+EXTRA_DIST = \
+	wscript
diff --git a/src/editor/Makefile.in b/src/editor/Makefile.in
index f3bd825..1d21bf4 100644
--- a/src/editor/Makefile.in
+++ b/src/editor/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 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.
@@ -14,12 +15,11 @@
 
 @SET_MAKE@
 
-# Basic setup
-
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@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
@@ -39,55 +39,80 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gecko.m4 \
 	$(top_srcdir)/m4/gnome-doc-utils.m4 \
-	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in
+	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 LIBRARIES = $(noinst_LIBRARIES)
 ARFLAGS = cru
+AM_V_AR = $(am__v_AR_$(V))
+am__v_AR_ = $(am__v_AR_$(AM_DEFAULT_VERBOSITY))
+am__v_AR_0 = @echo "  AR    " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
 libeditor_a_AR = $(AR) $(ARFLAGS)
 libeditor_a_LIBADD =
-am__libeditor_a_SOURCES_DIST = slib-editor.c slib-editor.h Editor.h \
-	Editor-common.c Editor-skels.c Editor-stubs.c bonobo-editor.c \
-	bonobo-editor.h
-@USE_GTKHTML_BONOBO_EDITOR_TRUE@am__objects_1 =  \
-@USE_GTKHTML_BONOBO_EDITOR_TRUE@	Editor-common.$(OBJEXT) \
-@USE_GTKHTML_BONOBO_EDITOR_TRUE@	Editor-skels.$(OBJEXT) \
-@USE_GTKHTML_BONOBO_EDITOR_TRUE@	Editor-stubs.$(OBJEXT)
-@USE_GTKHTML_BONOBO_EDITOR_FALSE@am_libeditor_a_OBJECTS =  \
-@USE_GTKHTML_BONOBO_EDITOR_FALSE@	slib-editor.$(OBJEXT)
+am__libeditor_a_SOURCES_DIST = slib-editor.c slib-editor.h \
+	link_dialog.c link_dialog.h Editor.h Editor-common.c \
+	Editor-skels.c Editor-stubs.c bonobo-editor.c bonobo-editor.h
+@USE_GTKHTML_BONOBO_EDITOR_TRUE@am__objects_1 = libeditor_a-Editor-common.$(OBJEXT) \
+@USE_GTKHTML_BONOBO_EDITOR_TRUE@	libeditor_a-Editor-skels.$(OBJEXT) \
+@USE_GTKHTML_BONOBO_EDITOR_TRUE@	libeditor_a-Editor-stubs.$(OBJEXT)
+@USE_GTKHTML_BONOBO_EDITOR_FALSE@am_libeditor_a_OBJECTS = libeditor_a-slib-editor.$(OBJEXT) \
+@USE_GTKHTML_BONOBO_EDITOR_FALSE@	libeditor_a-link_dialog.$(OBJEXT)
 @USE_GTKHTML_BONOBO_EDITOR_TRUE@am_libeditor_a_OBJECTS =  \
 @USE_GTKHTML_BONOBO_EDITOR_TRUE@	$(am__objects_1) \
-@USE_GTKHTML_BONOBO_EDITOR_TRUE@	bonobo-editor.$(OBJEXT)
+@USE_GTKHTML_BONOBO_EDITOR_TRUE@	libeditor_a-bonobo-editor.$(OBJEXT)
 libeditor_a_OBJECTS = $(am_libeditor_a_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 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)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=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    " $@;
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=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 = $(libeditor_a_SOURCES)
 DIST_SOURCES = $(am__libeditor_a_SOURCES_DIST)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
+ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AM_LDFLAGS = @AM_LDFLAGS@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-A_CPPFLAGS = @A_CPPFLAGS@
 BONOBO_IDL_INCLUDES = @BONOBO_IDL_INCLUDES@
 CATALOGS = @CATALOGS@
 CATOBJEXT = @CATOBJEXT@
@@ -105,17 +130,16 @@ DATADIRNAME = @DATADIRNAME@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DIRS = @DIRS@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
 DOC_USER_FORMATS = @DOC_USER_FORMATS@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
-EDITOR_CFLAGS = @EDITOR_CFLAGS@
-EDITOR_LIBS = @EDITOR_LIBS@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
 GECKO = @GECKO@
 GECKO_COMPONENT_CFLAGS = @GECKO_COMPONENT_CFLAGS@
 GECKO_COMPONENT_LIBS = @GECKO_COMPONENT_LIBS@
@@ -128,57 +152,26 @@ GECKO_PREFIX = @GECKO_PREFIX@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
-GNOME_CFLAGS = @GNOME_CFLAGS@
-GNOME_LIBS = @GNOME_LIBS@
 GREP = @GREP@
-GTKHTML_314_presence_CFLAGS = @GTKHTML_314_presence_CFLAGS@
-GTKHTML_314_presence_LIBS = @GTKHTML_314_presence_LIBS@
-GTKHTML_38_presence_CFLAGS = @GTKHTML_38_presence_CFLAGS@
-GTKHTML_38_presence_LIBS = @GTKHTML_38_presence_LIBS@
-GTKHTML_CFLAGS = @GTKHTML_CFLAGS@
 GTKHTML_DATA_DIR = @GTKHTML_DATA_DIR@
-GTKHTML_LIBS = @GTKHTML_LIBS@
 HELP_DIR = @HELP_DIR@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PREFIX = @INSTALL_PREFIX@
 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_ICONV = @INTLTOOL_ICONV@
-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
-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_SERVICE_RULE = @INTLTOOL_SERVICE_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_XGETTEXT = @INTLTOOL_XGETTEXT@
-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
-ImageMagick_CFLAGS = @ImageMagick_CFLAGS@
-ImageMagick_LIBS = @ImageMagick_LIBS@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
@@ -187,22 +180,18 @@ MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 MSGFMT_OPTS = @MSGFMT_OPTS@
-NO_PREFIX_PACKAGE_DATA_DIR = @NO_PREFIX_PACKAGE_DATA_DIR@
-NO_PREFIX_PACKAGE_DOC_DIR = @NO_PREFIX_PACKAGE_DOC_DIR@
-NO_PREFIX_PACKAGE_HELP_DIR = @NO_PREFIX_PACKAGE_HELP_DIR@
-NO_PREFIX_PACKAGE_MENU_DIR = @NO_PREFIX_PACKAGE_MENU_DIR@
-NO_PREFIX_PACKAGE_PIXMAPS_DIR = @NO_PREFIX_PACKAGE_PIXMAPS_DIR@
+MSGMERGE = @MSGMERGE@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 OMF_DIR = @OMF_DIR@
 ORBIT_IDL = @ORBIT_IDL@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_DATA_DIR = @PACKAGE_DATA_DIR@
-PACKAGE_DOC_DIR = @PACKAGE_DOC_DIR@
-PACKAGE_HELP_DIR = @PACKAGE_HELP_DIR@
-PACKAGE_MENU_DIR = @PACKAGE_MENU_DIR@
 PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_PIXMAPS_DIR = @PACKAGE_PIXMAPS_DIR@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
@@ -213,28 +202,24 @@ POSUB = @POSUB@
 PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
 PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
 RANLIB = @RANLIB@
-SCROLLKEEPER_BUILD_REQUIRED = @SCROLLKEEPER_BUILD_REQUIRED@
-SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-SWORD_CFLAGS = @SWORD_CFLAGS@
-SWORD_LIBS = @SWORD_LIBS@
-SWORD_MULTIVERSE_CFLAGS = @SWORD_MULTIVERSE_CFLAGS@
-SWORD_MULTIVERSE_LIBS = @SWORD_MULTIVERSE_LIBS@
-UPRINT_CFLAGS = @UPRINT_CFLAGS@
-UPRINT_LIBS = @UPRINT_LIBS@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
+WARN_CFLAGS = @WARN_CFLAGS@
+WARN_CXXFLAGS = @WARN_CXXFLAGS@
 XGETTEXT = @XGETTEXT@
+XIPHOS_CFLAGS = @XIPHOS_CFLAGS@
+XIPHOS_LIBS = @XIPHOS_LIBS@
 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@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -265,6 +250,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -277,19 +263,10 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-tooltiptext_CFLAGS = @tooltiptext_CFLAGS@
-tooltiptext_LIBS = @tooltiptext_LIBS@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 xiphos_exec = @xiphos_exec@
-INCLUDES = \
-    -I$(top_srcdir)/src \
-    $(SWORD_INCLUDES) \
-    $(GNOME_CFLAGS) \
-    $(GTKHTML_CFLAGS) \
-    $(GECKO_CFLAGS) 
-
-
 # CORBA stuff
 @USE_GTKHTML_BONOBO_EDITOR_TRUE@HTML_EDITOR_GENERATED = \
 @USE_GTKHTML_BONOBO_EDITOR_TRUE@	Editor.h		\
@@ -299,18 +276,25 @@ INCLUDES = \
 
 @USE_GTKHTML_BONOBO_EDITOR_FALSE@noinst_LIBRARIES = libeditor.a
 @USE_GTKHTML_BONOBO_EDITOR_TRUE@noinst_LIBRARIES = libeditor.a
-@USE_GTKHTML_BONOBO_EDITOR_FALSE@libeditor_a_SOURCES = slib-editor.c slib-editor.h
+@USE_GTKHTML_BONOBO_EDITOR_FALSE@libeditor_a_SOURCES = slib-editor.c slib-editor.h link_dialog.c link_dialog.h
 
 # The Editor Control
 @USE_GTKHTML_BONOBO_EDITOR_TRUE@libeditor_a_SOURCES = $(HTML_EDITOR_GENERATED)		\
 @USE_GTKHTML_BONOBO_EDITOR_TRUE@	bonobo-editor.c bonobo-editor.h  
 
-@USE_GTKHTML_BONOBO_EDITOR_FALSE@EXTRA_DIST = 
 # Extra stuff to distribute.
-@USE_GTKHTML_BONOBO_EDITOR_TRUE@EXTRA_DIST = 
 @USE_GTKHTML_BONOBO_EDITOR_TRUE@CLEANFILES = \
 @USE_GTKHTML_BONOBO_EDITOR_TRUE@    $(HTML_EDITOR_GENERATED)
 
+libeditor_a_CPPFLAGS = -DINSTALL_PREFIX=\""$(prefix)"\"
+libeditor_a_CFLAGS = \
+	-I$(top_srcdir)/src \
+	$(XIPHOS_CFLAGS) \
+	$(WARN_CFLAGS)
+
+EXTRA_DIST = \
+	wscript
+
 all: all-am
 
 .SUFFIXES:
@@ -319,14 +303,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( 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/editor/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  src/editor/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/editor/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign src/editor/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -344,13 +328,14 @@ $(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):
 
 clean-noinstLIBRARIES:
 	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
 libeditor.a: $(libeditor_a_OBJECTS) $(libeditor_a_DEPENDENCIES) 
-	-rm -f libeditor.a
-	$(libeditor_a_AR) libeditor.a $(libeditor_a_OBJECTS) $(libeditor_a_LIBADD)
-	$(RANLIB) libeditor.a
+	$(AM_V_at)-rm -f libeditor.a
+	$(AM_V_AR)$(libeditor_a_AR) libeditor.a $(libeditor_a_OBJECTS) $(libeditor_a_LIBADD)
+	$(AM_V_at)$(RANLIB) libeditor.a
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -358,33 +343,133 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Editor-common.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Editor-skels.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Editor-stubs.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bonobo-editor.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/slib-editor.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libeditor_a-Editor-common.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libeditor_a-Editor-skels.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libeditor_a-Editor-stubs.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libeditor_a-bonobo-editor.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libeditor_a-link_dialog.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libeditor_a-slib-editor.Po@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@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@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@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) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
+libeditor_a-slib-editor.o: slib-editor.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libeditor_a_CPPFLAGS) $(CPPFLAGS) $(libeditor_a_CFLAGS) $(CFLAGS) -MT libeditor_a-slib-editor.o -MD -MP -MF $(DEPDIR)/libeditor_a-slib-editor.Tpo -c -o libeditor_a-slib-editor.o `test -f 'slib-editor.c' || echo '$(srcdir)/'`slib-editor.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libeditor_a-slib-editor.Tpo $(DEPDIR)/libeditor_a-slib-editor.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='slib-editor.c' object='libeditor_a-slib-editor.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libeditor_a_CPPFLAGS) $(CPPFLAGS) $(libeditor_a_CFLAGS) $(CFLAGS) -c -o libeditor_a-slib-editor.o `test -f 'slib-editor.c' || echo '$(srcdir)/'`slib-editor.c
+
+libeditor_a-slib-editor.obj: slib-editor.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libeditor_a_CPPFLAGS) $(CPPFLAGS) $(libeditor_a_CFLAGS) $(CFLAGS) -MT libeditor_a-slib-editor.obj -MD -MP -MF $(DEPDIR)/libeditor_a-slib-editor.Tpo -c -o libeditor_a-slib-editor.obj `if test -f 'slib-editor.c'; then $(CYGPATH_W) 'slib-editor.c'; else $(CYGPATH_W) '$(srcdir)/slib-editor.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libeditor_a-slib-editor.Tpo $(DEPDIR)/libeditor_a-slib-editor.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='slib-editor.c' object='libeditor_a-slib-editor.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libeditor_a_CPPFLAGS) $(CPPFLAGS) $(libeditor_a_CFLAGS) $(CFLAGS) -c -o libeditor_a-slib-editor.obj `if test -f 'slib-editor.c'; then $(CYGPATH_W) 'slib-editor.c'; else $(CYGPATH_W) '$(srcdir)/slib-editor.c'; fi`
+
+libeditor_a-link_dialog.o: link_dialog.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libeditor_a_CPPFLAGS) $(CPPFLAGS) $(libeditor_a_CFLAGS) $(CFLAGS) -MT libeditor_a-link_dialog.o -MD -MP -MF $(DEPDIR)/libeditor_a-link_dialog.Tpo -c -o libeditor_a-link_dialog.o `test -f 'link_dialog.c' || echo '$(srcdir)/'`link_dialog.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libeditor_a-link_dialog.Tpo $(DEPDIR)/libeditor_a-link_dialog.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='link_dialog.c' object='libeditor_a-link_dialog.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libeditor_a_CPPFLAGS) $(CPPFLAGS) $(libeditor_a_CFLAGS) $(CFLAGS) -c -o libeditor_a-link_dialog.o `test -f 'link_dialog.c' || echo '$(srcdir)/'`link_dialog.c
+
+libeditor_a-link_dialog.obj: link_dialog.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libeditor_a_CPPFLAGS) $(CPPFLAGS) $(libeditor_a_CFLAGS) $(CFLAGS) -MT libeditor_a-link_dialog.obj -MD -MP -MF $(DEPDIR)/libeditor_a-link_dialog.Tpo -c -o libeditor_a-link_dialog.obj `if test -f 'link_dialog.c'; then $(CYGPATH_W) 'link_dialog.c'; else $(CYGPATH_W) '$(srcdir)/link_dialog.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libeditor_a-link_dialog.Tpo $(DEPDIR)/libeditor_a-link_dialog.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='link_dialog.c' object='libeditor_a-link_dialog.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libeditor_a_CPPFLAGS) $(CPPFLAGS) $(libeditor_a_CFLAGS) $(CFLAGS) -c -o libeditor_a-link_dialog.obj `if test -f 'link_dialog.c'; then $(CYGPATH_W) 'link_dialog.c'; else $(CYGPATH_W) '$(srcdir)/link_dialog.c'; fi`
+
+libeditor_a-Editor-common.o: Editor-common.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libeditor_a_CPPFLAGS) $(CPPFLAGS) $(libeditor_a_CFLAGS) $(CFLAGS) -MT libeditor_a-Editor-common.o -MD -MP -MF $(DEPDIR)/libeditor_a-Editor-common.Tpo -c -o libeditor_a-Editor-common.o `test -f 'Editor-common.c' || echo '$(srcdir)/'`Editor-common.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libeditor_a-Editor-common.Tpo $(DEPDIR)/libeditor_a-Editor-common.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='Editor-common.c' object='libeditor_a-Editor-common.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libeditor_a_CPPFLAGS) $(CPPFLAGS) $(libeditor_a_CFLAGS) $(CFLAGS) -c -o libeditor_a-Editor-common.o `test -f 'Editor-common.c' || echo '$(srcdir)/'`Editor-common.c
+
+libeditor_a-Editor-common.obj: Editor-common.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libeditor_a_CPPFLAGS) $(CPPFLAGS) $(libeditor_a_CFLAGS) $(CFLAGS) -MT libeditor_a-Editor-common.obj -MD -MP -MF $(DEPDIR)/libeditor_a-Editor-common.Tpo -c -o libeditor_a-Editor-common.obj `if test -f 'Editor-common.c'; then $(CYGPATH_W) 'Editor-common.c'; else $(CYGPATH_W) '$(srcdir)/Editor-common.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libeditor_a-Editor-common.Tpo $(DEPDIR)/libeditor_a-Editor-common.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='Editor-common.c' object='libeditor_a-Editor-common.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libeditor_a_CPPFLAGS) $(CPPFLAGS) $(libeditor_a_CFLAGS) $(CFLAGS) -c -o libeditor_a-Editor-common.obj `if test -f 'Editor-common.c'; then $(CYGPATH_W) 'Editor-common.c'; else $(CYGPATH_W) '$(srcdir)/Editor-common.c'; fi`
+
+libeditor_a-Editor-skels.o: Editor-skels.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libeditor_a_CPPFLAGS) $(CPPFLAGS) $(libeditor_a_CFLAGS) $(CFLAGS) -MT libeditor_a-Editor-skels.o -MD -MP -MF $(DEPDIR)/libeditor_a-Editor-skels.Tpo -c -o libeditor_a-Editor-skels.o `test -f 'Editor-skels.c' || echo '$(srcdir)/'`Editor-skels.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libeditor_a-Editor-skels.Tpo $(DEPDIR)/libeditor_a-Editor-skels.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='Editor-skels.c' object='libeditor_a-Editor-skels.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libeditor_a_CPPFLAGS) $(CPPFLAGS) $(libeditor_a_CFLAGS) $(CFLAGS) -c -o libeditor_a-Editor-skels.o `test -f 'Editor-skels.c' || echo '$(srcdir)/'`Editor-skels.c
+
+libeditor_a-Editor-skels.obj: Editor-skels.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libeditor_a_CPPFLAGS) $(CPPFLAGS) $(libeditor_a_CFLAGS) $(CFLAGS) -MT libeditor_a-Editor-skels.obj -MD -MP -MF $(DEPDIR)/libeditor_a-Editor-skels.Tpo -c -o libeditor_a-Editor-skels.obj `if test -f 'Editor-skels.c'; then $(CYGPATH_W) 'Editor-skels.c'; else $(CYGPATH_W) '$(srcdir)/Editor-skels.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libeditor_a-Editor-skels.Tpo $(DEPDIR)/libeditor_a-Editor-skels.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='Editor-skels.c' object='libeditor_a-Editor-skels.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libeditor_a_CPPFLAGS) $(CPPFLAGS) $(libeditor_a_CFLAGS) $(CFLAGS) -c -o libeditor_a-Editor-skels.obj `if test -f 'Editor-skels.c'; then $(CYGPATH_W) 'Editor-skels.c'; else $(CYGPATH_W) '$(srcdir)/Editor-skels.c'; fi`
+
+libeditor_a-Editor-stubs.o: Editor-stubs.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libeditor_a_CPPFLAGS) $(CPPFLAGS) $(libeditor_a_CFLAGS) $(CFLAGS) -MT libeditor_a-Editor-stubs.o -MD -MP -MF $(DEPDIR)/libeditor_a-Editor-stubs.Tpo -c -o libeditor_a-Editor-stubs.o `test -f 'Editor-stubs.c' || echo '$(srcdir)/'`Editor-stubs.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libeditor_a-Editor-stubs.Tpo $(DEPDIR)/libeditor_a-Editor-stubs.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='Editor-stubs.c' object='libeditor_a-Editor-stubs.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libeditor_a_CPPFLAGS) $(CPPFLAGS) $(libeditor_a_CFLAGS) $(CFLAGS) -c -o libeditor_a-Editor-stubs.o `test -f 'Editor-stubs.c' || echo '$(srcdir)/'`Editor-stubs.c
+
+libeditor_a-Editor-stubs.obj: Editor-stubs.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libeditor_a_CPPFLAGS) $(CPPFLAGS) $(libeditor_a_CFLAGS) $(CFLAGS) -MT libeditor_a-Editor-stubs.obj -MD -MP -MF $(DEPDIR)/libeditor_a-Editor-stubs.Tpo -c -o libeditor_a-Editor-stubs.obj `if test -f 'Editor-stubs.c'; then $(CYGPATH_W) 'Editor-stubs.c'; else $(CYGPATH_W) '$(srcdir)/Editor-stubs.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libeditor_a-Editor-stubs.Tpo $(DEPDIR)/libeditor_a-Editor-stubs.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='Editor-stubs.c' object='libeditor_a-Editor-stubs.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libeditor_a_CPPFLAGS) $(CPPFLAGS) $(libeditor_a_CFLAGS) $(CFLAGS) -c -o libeditor_a-Editor-stubs.obj `if test -f 'Editor-stubs.c'; then $(CYGPATH_W) 'Editor-stubs.c'; else $(CYGPATH_W) '$(srcdir)/Editor-stubs.c'; fi`
+
+libeditor_a-bonobo-editor.o: bonobo-editor.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libeditor_a_CPPFLAGS) $(CPPFLAGS) $(libeditor_a_CFLAGS) $(CFLAGS) -MT libeditor_a-bonobo-editor.o -MD -MP -MF $(DEPDIR)/libeditor_a-bonobo-editor.Tpo -c -o libeditor_a-bonobo-editor.o `test -f 'bonobo-editor.c' || echo '$(srcdir)/'`bonobo-editor.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libeditor_a-bonobo-editor.Tpo $(DEPDIR)/libeditor_a-bonobo-editor.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='bonobo-editor.c' object='libeditor_a-bonobo-editor.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libeditor_a_CPPFLAGS) $(CPPFLAGS) $(libeditor_a_CFLAGS) $(CFLAGS) -c -o libeditor_a-bonobo-editor.o `test -f 'bonobo-editor.c' || echo '$(srcdir)/'`bonobo-editor.c
+
+libeditor_a-bonobo-editor.obj: bonobo-editor.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libeditor_a_CPPFLAGS) $(CPPFLAGS) $(libeditor_a_CFLAGS) $(CFLAGS) -MT libeditor_a-bonobo-editor.obj -MD -MP -MF $(DEPDIR)/libeditor_a-bonobo-editor.Tpo -c -o libeditor_a-bonobo-editor.obj `if test -f 'bonobo-editor.c'; then $(CYGPATH_W) 'bonobo-editor.c'; else $(CYGPATH_W) '$(srcdir)/bonobo-editor.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libeditor_a-bonobo-editor.Tpo $(DEPDIR)/libeditor_a-bonobo-editor.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='bonobo-editor.c' object='libeditor_a-bonobo-editor.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libeditor_a_CPPFLAGS) $(CPPFLAGS) $(libeditor_a_CFLAGS) $(CFLAGS) -c -o libeditor_a-bonobo-editor.obj `if test -f 'bonobo-editor.c'; then $(CYGPATH_W) 'bonobo-editor.c'; else $(CYGPATH_W) '$(srcdir)/bonobo-editor.c'; fi`
+
 mostlyclean-libtool:
 	-rm -f *.lo
 
@@ -396,45 +481,49 @@ ID: $(HEADERS) $(SOURCES) $(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; } \
-	       END { for (i in files) print i; }'`; \
+	  $(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)
-	tags=; \
+	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; } \
-	       END { for (i in files) print i; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  $(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; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  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)
-	tags=; \
-	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; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  $(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) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -455,13 +544,17 @@ distdir: $(DISTFILES)
 	  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 -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -490,6 +583,7 @@ 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"
@@ -511,6 +605,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -519,18 +615,28 @@ install-data-am:
 
 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
@@ -573,6 +679,7 @@ uninstall-am:
 
 @USE_GTKHTML_BONOBO_EDITOR_TRUE@$(HTML_EDITOR_GENERATED): $(GTKHTML_DATA_DIR)/Editor.idl
 @USE_GTKHTML_BONOBO_EDITOR_TRUE@	$(ORBIT_IDL) -I $(srcdir) $(BONOBO_IDL_INCLUDES) -I $(GTKHTML_DATA_DIR)/gtkhtml $(GTKHTML_DATA_DIR)/Editor.idl
+
 # 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/editor/bonobo-editor.c b/src/editor/bonobo-editor.c
index 1af87c5..69492d9 100644
--- a/src/editor/bonobo-editor.c
+++ b/src/editor/bonobo-editor.c
@@ -52,6 +52,8 @@
 #include "gui/treekey-editor.h"
 #include "gui/utilities.h"
 
+#include "gui/debug_glib_null.h"
+
 
 #define CONTROL_ID         "OAFIID:GNOME_GtkHTML_Editor:" GTKHTML_API_VERSION
 
diff --git a/src/editor/link_dialog.c b/src/editor/link_dialog.c
new file mode 100644
index 0000000..a46668e
--- /dev/null
+++ b/src/editor/link_dialog.c
@@ -0,0 +1,164 @@
+/*
+ * Xiphos Bible Study Tool
+ * link_dialog.c - dialog for inserting a link 
+ * 
+ * Copyright (C) 2005-2009 Xiphos Developer Team
+ *
+ * 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 Library 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+ 
+#include <config.h>
+ 
+#ifdef USE_GTKHTML3_14_23
+
+#include <gtk/gtk.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <editor/gtkhtml-editor.h>
+#include <gtkhtml/gtkhtml-stream.h>
+
+ 
+
+#include "editor/slib-editor.h"
+#include "editor/link_dialog.h"
+
+#include "main/url.hh"
+#include "main/sword.h"
+
+#include "gui/utilities.h"
+#include "gui/debug_glib_null.h"
+
+/************* begin link dialog ****************/
+static GtkWidget *window;
+static GtkWidget *entry_module;
+static GtkWidget *entry_verse;
+static GtkWidget *entry_text;
+
+
+G_MODULE_EXPORT
+void entry_verse_changed_cb(GtkObject *object, EDITOR *e)
+{
+
+	const gchar *verse_str = NULL;
+
+	verse_str = gtk_entry_get_text (GTK_ENTRY (object));
+	gtk_entry_set_text(GTK_ENTRY (entry_text),verse_str);
+
+}
+
+G_MODULE_EXPORT
+void button_ok_clicked_cb(GtkObject *object, EDITOR *e)
+{
+	const gchar *mod_str = NULL;
+	const gchar *verse_str = NULL;
+	const gchar *text_str = NULL;
+	const gchar *encoded_mod = NULL;
+	const gchar *encoded_verse = NULL;
+	GString *str = g_string_new (NULL);
+	gint type = 0;
+
+	mod_str = gtk_entry_get_text (GTK_ENTRY (entry_module));
+	verse_str = gtk_entry_get_text (GTK_ENTRY (entry_verse));
+	text_str = gtk_entry_get_text (GTK_ENTRY (entry_text));
+
+	type = main_get_mod_type((gchar*)mod_str);
+	
+	if (mod_str)
+		encoded_mod = main_url_encode(mod_str);
+	encoded_verse = main_url_encode(verse_str);
+
+	switch (type) {
+		case -1:
+		case TEXT_TYPE:
+			g_string_printf(str,"<a href=\"xiphos.url?action=showRef&type=scripRef&value=%s&module=%s\">%s</a>", encoded_verse, encoded_mod, text_str);
+			break;
+		case COMMENTARY_TYPE:
+		case DICTIONARY_TYPE:
+		case BOOK_TYPE:
+		case PRAYERLIST_TYPE:
+			g_string_printf(str,"<a href=\"sword://%s/%s\">%s</a>", encoded_mod, encoded_verse, text_str);
+			break;
+	}
+	
+	GS_message (("link: %s", str->str));
+	gtkhtml_editor_insert_html (GTKHTML_EDITOR (e->window), str->str);
+	g_string_free (str, TRUE);
+	g_free((gchar*)encoded_mod);
+	g_free((gchar*)encoded_verse);
+
+	gtk_widget_destroy(GTK_WIDGET(window));
+}
+
+G_MODULE_EXPORT
+void button_test_clicked_cb(GtkObject *object, gpointer user_data)
+{
+ 	const gchar *mod_str = NULL;
+	const gchar *verse_str = NULL;
+	const gchar *encoded_mod = NULL;
+	const gchar *encoded_verse = NULL;
+	GString *str = g_string_new (NULL);
+
+	mod_str = gtk_entry_get_text (GTK_ENTRY (entry_module));
+	verse_str = gtk_entry_get_text (GTK_ENTRY (entry_verse));
+	
+	encoded_mod = main_url_encode(mod_str);
+	encoded_verse = main_url_encode(verse_str);
+	 
+	g_string_printf(str,"passagestudy.jsp?action=showRef&type=scripRef&value=%s&module=%s", encoded_verse, encoded_mod);
+	GS_message (("link: %s", str->str));
+	main_url_handler(str->str, TRUE);
+	g_string_free (str, TRUE);
+	g_free((gchar*)encoded_mod);
+	g_free((gchar*)encoded_verse);       
+}
+
+G_MODULE_EXPORT
+void button_cancel_clicked_cb(GtkObject *object, gpointer user_data)
+{
+        gtk_widget_destroy(GTK_WIDGET(window));
+}
+
+
+void
+editor_link_dialog (EDITOR *e)
+{
+	
+        GtkBuilder *builder;
+	gchar *gbuilder_file;
+	
+	GtkHTML  *html = gtkhtml_editor_get_html (GTKHTML_EDITOR(e->window));
+	if (html->pointer_url)  /* are we in a link */
+		return;		/* if so don't do anything */
+        
+        builder = gtk_builder_new ();
+	gbuilder_file = gui_general_user_file ("editor_link_dialog.xml", FALSE);
+        gtk_builder_add_from_file (builder, gbuilder_file, NULL);
+ 
+        window = GTK_WIDGET (gtk_builder_get_object (builder, "dialog1"));
+	set_window_icon (GTK_WINDOW(window));
+        gtk_builder_connect_signals (builder,(EDITOR*) e); 
+
+	entry_module = GTK_WIDGET (gtk_builder_get_object (builder, "entry_module"));
+	entry_verse = GTK_WIDGET (gtk_builder_get_object (builder, "entry_verse"));
+	entry_text = GTK_WIDGET (gtk_builder_get_object (builder, "entry_text"));
+	
+        g_object_unref (G_OBJECT (builder));        
+        gtk_widget_show (window); 
+}
+/************* end link dialog ****************/
+
+#endif /* USE_GTKHTML3_14_23 */
diff --git a/src/gui/session.h b/src/editor/link_dialog.h
index f9942f7..3cb5c97 100644
--- a/src/gui/session.h
+++ b/src/editor/link_dialog.h
@@ -1,13 +1,8 @@
 /*
  * Xiphos Bible Study Tool
- * session.h - create and maintain a GNOME session
+ * link_dialog.f - dialog for inserting a link
  *
- * based on code from gedit
- * gedit-session - Basic session management for gedit
- * Copyright (C) 2002 Ximian, Inc.
- * Authors Federico Mena-Quintero <federico@ximian.com>
- *
- * Copyright (C) 2000-2009 Xiphos Developer Team
+ * Copyright (C) 2005-2009 Xiphos Developer Team
  *
  * 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
@@ -23,12 +18,29 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  */
+ 
+#ifndef _LINK_DIALOG_H
+#define _LINK_DIALOG_H
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
 
+#include <config.h>	
 
-#ifndef __GS_SESSION_H__
-#define __GS_SESSION_H__
+#include "editor/slib-editor.h"
+	
+ 
+void editor_link_dialog (EDITOR *e);
+void entry_verse_changed_cb(GtkObject *object, EDITOR *e);
+void button_ok_clicked_cb(GtkObject *object, EDITOR *e);
+void button_test_clicked_cb(GtkObject *object, gpointer user_data);
+void button_cancel_clicked_cb(GtkObject *object, gpointer user_data);
 
-void gs_session_init (const char *argv0);
-gboolean gs_session_is_restored (void);
 
+#ifdef __cplusplus
+}
 #endif
+
+#endif /* _LINK_DIALOG_H */	
diff --git a/src/editor/slib-editor.c b/src/editor/slib-editor.c
index bd7c667..086c4b7 100644
--- a/src/editor/slib-editor.c
+++ b/src/editor/slib-editor.c
@@ -1,7 +1,7 @@
 /*
  * Xiphos Bible Study Tool
  * html-editor.c - the html editor
- *
+ * 
  * Copyright (C) 2005-2009 Xiphos Developer Team
  *
  * This program is free software; you can redistribute it and/or modify
@@ -20,9 +20,7 @@
  */
 
 #include <config.h>
-#include <libgnome/gnome-i18n.h>
 
-#include <gnome.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
@@ -39,12 +37,15 @@
 #include <editor/gtkhtml-editor.h>
 #include <gtkhtml/gtkhtml-stream.h>
 
+
 #include "editor/slib-editor.h"
+#include "editor/link_dialog.h"
 
 
 #include "main/settings.h"
 #include "main/sword.h"
 #include "main/sword_treekey.h"
+#include "main/url.hh"
 #include "main/xml.h"
 
 #include "gui/navbar_versekey_editor.h"
@@ -54,8 +55,13 @@
 #include "gui/treekey-editor.h"
 #include "gui/utilities.h"
 
+#include "gui/debug_glib_null.h"
+
 extern gboolean do_display;
 
+static
+gboolean editor_is_dirty(EDITOR * e);
+
 static 
 int app_delete_cb(GtkWidget * widget, GdkEvent * event, gpointer data);
 
@@ -303,6 +309,7 @@ static const gchar *file_ui =
 "     <menuitem action='open'/>\n"
 "     <menuitem action='save'/>\n"
 "     <menuitem action='save-as'/>\n"
+"     <menuitem action='new'/>\n"
 "     <separator/>\n"
 "     <menuitem action='print-preview'/>\n"
 "     <menuitem action='print'/>\n"
@@ -318,6 +325,7 @@ static const gchar *note_file_ui =
 "    <menu action='file-menu'>\n"
 "     <menuitem action='save'/>\n"
 "     <menuitem action='save-as'/>\n"
+"     <menuitem action='delete'/>\n"
 "     <separator/>\n"
 "     <menuitem action='print-preview'/>\n"
 "     <menuitem action='print'/>\n"
@@ -339,17 +347,28 @@ static const gchar *view_ui =
 "</ui>";
 
 
-static const gchar *main_ui =
+static const gchar *main_ui_note =
 "<ui>\n"
 "  <toolbar name='main-toolbar'> \n"
 "    <placeholder name='pre-main-toolbar'> \n"
 "      <toolitem action='save'/> \n"
+"      <toolitem action='delete'/> \n"
 "      <separator/> \n"
 "    </placeholder> \n"
 "  </toolbar> \n"
 "</ui>";
 
 
+static const gchar *main_ui_studypad =
+"<ui>\n"
+"  <toolbar name='main-toolbar'> \n"
+"    <placeholder name='pre-main-toolbar'> \n"
+"      <toolitem action='save'/> \n"
+"      <toolitem action='new'/> \n"
+"      <separator/> \n"
+"    </placeholder> \n"
+"  </toolbar> \n"
+"</ui>";
 
 static GtkPrintOperationResult
 print (GtkhtmlEditor *editor,
@@ -419,7 +438,7 @@ open_dialog (EDITOR * e)
 
 
 static gint
-save_dialog (GtkhtmlEditor *editor)
+save_dialog (GtkhtmlEditor *editor, EDITOR * e)
 {
 	GtkWidget *dialog;
 	const gchar *filename;
@@ -454,7 +473,20 @@ save_dialog (GtkhtmlEditor *editor)
 
 		new_filename = gtk_file_chooser_get_filename (
 			GTK_FILE_CHOOSER (dialog));
+		//GS_message (("\nnew_filename: %s\n",new_filename));
 		gtkhtml_editor_set_filename (editor, new_filename);
+
+		if (e->filename)
+			g_free(e->filename);
+		e->filename = g_strdup(new_filename);
+		
+		xml_set_value("Xiphos", "studypad", "lastfile",
+			      e->filename);
+		settings.studypadfilename =
+		    xml_get_value("studypad", "lastfile");
+		
+		change_window_title(e->window, e->filename);
+		
 		g_free (new_filename);
 	}
 
@@ -588,6 +620,64 @@ action_save_cb (GtkAction *action,
 }
 
 static void
+action_new_cb (GtkAction *action,
+                EDITOR *e)	/* for studypad only */
+{
+
+	if (editor_is_dirty(e))
+		_save_file (e);
+	
+	_load_file(e, g_strdup_printf("%s/%s",settings.gSwordDir,"template.pad"));
+	
+	if (e->filename)
+		g_free(e->filename);
+	e->filename = g_strdup(_("Untitled document"));
+	
+	xml_set_value("Xiphos", "studypad", "lastfile",
+		      e->filename);
+	settings.studypadfilename =
+	    xml_get_value("studypad", "lastfile");
+	change_window_title(e->window, e->filename);
+	
+	gtkhtml_editor_set_filename(GTKHTML_EDITOR(e->window), NULL);	
+	gtkhtml_editor_set_changed (GTKHTML_EDITOR(e->window), TRUE);
+}
+
+
+static void
+action_delete_cb (GtkAction *action,
+                EDITOR *e)	/* for note only */
+{
+
+	gchar *buf;
+	
+	if (e->studypad)
+		return;
+	
+	buf = g_strdup_printf
+	    ("<span weight=\"bold\" size=\"larger\">%s %s?</span>",
+	    _("Are you sure you want to delete the note for") , e->key);
+	
+	if (gui_yes_no_dialog(buf, GTK_STOCK_DIALOG_WARNING)) {
+		main_delete_note(e->module, e->key);
+		gtkhtml_editor_set_text_html (GTKHTML_EDITOR(e->window),
+					      "",
+					      strlen(""));
+	}
+	g_free(buf);
+	
+}
+
+
+static void
+action_insert_link_cb (GtkAction *action, EDITOR *e)
+{
+	editor_link_dialog (e);
+}
+
+
+
+static void
 action_save_as_cb (GtkAction *action,
                    EDITOR *e)
 {
@@ -595,7 +685,7 @@ action_save_as_cb (GtkAction *action,
 	gboolean as_html;
 	GError *error = NULL;
 
-	if (save_dialog (GTKHTML_EDITOR(e->window)) == GTK_RESPONSE_CANCEL)
+	if (save_dialog (GTKHTML_EDITOR(e->window), e) == GTK_RESPONSE_CANCEL)
 		return;
 
 	filename = gtkhtml_editor_get_filename (GTKHTML_EDITOR(e->window));
@@ -626,6 +716,9 @@ action_view_plain_source (GtkAction *action,
 	view_source_dialog (editor, _("Plain Source"), "text/plain", FALSE);
 }
 
+
+
+
 static GtkActionEntry file_entries[] = {
 
 	{ "print",
@@ -669,6 +762,18 @@ static GtkActionEntry file_entries[] = {
 	  NULL,
 	  NULL,
 	  G_CALLBACK (action_save_as_cb) },
+	{ "new",
+	  "gtk-new",
+	  N_("New"),
+	  NULL,
+	  N_("Open new document"),
+	  G_CALLBACK (action_new_cb) },
+	{ "delete",
+	  "gtk-delete",
+	  N_("Delete"),
+	  NULL,
+	  N_("Delete current note"),
+	  G_CALLBACK (action_delete_cb) },
 
 	{ "file-menu",
 	  NULL,
@@ -766,6 +871,24 @@ static GtkActionEntry main_entries[] = {
 };
 
 
+static GtkActionEntry test_entries[] = {
+
+	{ "context-insert-link",
+	  "insert-link",
+	  N_("Insert Link"),
+	  NULL,
+	  NULL,
+	  G_CALLBACK (action_insert_link_cb) },
+
+	{ "insert-link",
+	  "insert-link",
+	  N_("Insert Link"),
+	  NULL,
+	  NULL,
+	  G_CALLBACK (action_insert_link_cb) }
+};
+
+
 GtkWidget * editor_new (const gchar * title, EDITOR *e)
 {
 	GtkActionGroup *action_group;
@@ -778,6 +901,8 @@ GtkWidget * editor_new (const gchar * title, EDITOR *e)
 	e->html_widget = GTK_WIDGET(gtkhtml_editor_get_html (GTKHTML_EDITOR (editor)));
 	gtk_window_set_title(GTK_WINDOW(editor),title);
 	
+	set_window_icon (GTK_WINDOW(editor));
+	
 	manager = gtkhtml_editor_get_ui_manager (GTKHTML_EDITOR (editor));
 	if (e->type == STUDYPAD_EDITOR) 	
 		gtk_ui_manager_add_ui_from_string (manager, file_ui, -1, &error);
@@ -786,11 +911,15 @@ GtkWidget * editor_new (const gchar * title, EDITOR *e)
 		
 	handle_error (&error);
 
-	
+		
 	gtk_ui_manager_add_ui_from_string (manager, view_ui, -1, &error);
 	handle_error (&error);
 	
-	gtk_ui_manager_add_ui_from_string (manager, main_ui, -1, &error);
+	if (e->type == STUDYPAD_EDITOR) 
+		gtk_ui_manager_add_ui_from_string (manager, main_ui_studypad, -1, &error);
+	else
+		gtk_ui_manager_add_ui_from_string (manager, main_ui_note, -1, &error);
+		
 	handle_error (&error);
 
 	action_group = gtk_action_group_new ("file");
@@ -816,6 +945,16 @@ GtkWidget * editor_new (const gchar * title, EDITOR *e)
 		action_group, main_entries,
 		G_N_ELEMENTS (main_entries), e);
 	gtk_ui_manager_insert_action_group (manager, action_group, 0);
+
+
+	action_group = gtk_action_group_new ("context-menu");
+	gtk_action_group_set_translation_domain (
+		action_group, GETTEXT_PACKAGE);
+	gtk_action_group_add_actions (
+		action_group, test_entries,
+		G_N_ELEMENTS (test_entries), e);
+	gtk_ui_manager_insert_action_group (manager, action_group, 0);
+	
 	
 	gtk_ui_manager_ensure_update (manager);
 	gtk_widget_show (editor);
@@ -825,7 +964,6 @@ GtkWidget * editor_new (const gchar * title, EDITOR *e)
 	
 	g_signal_connect(editor, "delete-event",
 			 G_CALLBACK(app_delete_cb), (EDITOR *) e);
-
 	return editor;
 
 }
@@ -860,6 +998,8 @@ _save_note(EDITOR * e)
 	main_save_note (e->module, e->key, string->str);
 	
 	g_string_free(string,TRUE);
+	gtkhtml_editor_drop_undo(GTKHTML_EDITOR(e->window));
+	gtkhtml_editor_set_changed (GTKHTML_EDITOR(e->window), FALSE);
 }
 
 
@@ -878,6 +1018,8 @@ _save_book(EDITOR * e)
 	
 	main_treekey_save_book_text(e->module, e->key, string->str);
 	g_string_free(string,TRUE);
+	gtkhtml_editor_drop_undo(GTKHTML_EDITOR(e->window));
+	gtkhtml_editor_set_changed (GTKHTML_EDITOR(e->window), FALSE);
 }	
 
 
@@ -889,14 +1031,19 @@ _save_file (EDITOR * e)
 	GError *error = NULL;
 	
 	if (gtkhtml_editor_get_filename (GTKHTML_EDITOR(e->window)) == NULL)
-		if (save_dialog (GTKHTML_EDITOR(e->window)) == GTK_RESPONSE_CANCEL)
+		if (save_dialog (GTKHTML_EDITOR(e->window), e) == GTK_RESPONSE_CANCEL)
 			return;
 
-	filename = gtkhtml_editor_get_filename (GTKHTML_EDITOR(e->window));
+	filename = gtkhtml_editor_get_filename (GTKHTML_EDITOR(e->window));	
 	as_html = gtkhtml_editor_get_html_mode (GTKHTML_EDITOR(e->window));
 
+	GS_message (("\n_save_file filename: %s\n",filename));
+
 	gtkhtml_editor_save (GTKHTML_EDITOR(e->window), filename, as_html, &error);
 	handle_error (&error);	
+	
+	gtkhtml_editor_drop_undo(GTKHTML_EDITOR(e->window));
+	gtkhtml_editor_set_changed (GTKHTML_EDITOR(e->window), FALSE);
 }	
 
 
@@ -1397,7 +1544,7 @@ gint editor_create_new(const gchar * filename, const gchar * key, gint editor_ty
 		}
 		tmp = g_list_next(tmp);
 	}
-    	GS_message (("filename %s, key %s",filename, key));
+    	GS_message (("filename %s, key %s", (filename ? filename : "-null-"), (key ? key : "-null-")));
 	return _create_new(filename, key, editor_type);
 }
 
diff --git a/src/editor/slib-editor.h b/src/editor/slib-editor.h
index b574fdf..062184b 100644
--- a/src/editor/slib-editor.h
+++ b/src/editor/slib-editor.h
@@ -27,7 +27,9 @@ extern "C"
 {
 #endif
 
-#include <config.h>	
+#include <config.h>
+
+#include <gtk/gtk.h>
 	
 #ifdef USE_GTKHTML3_14_23
 	
@@ -61,6 +63,11 @@ enum {
 	BOOK_EDITOR
 };
 
+
+/*
+void button_test_clicked_cb(GtkObject *object, gpointer user_data);
+void button_ok_clicked_cb(GtkObject *object, gpointer user_data);
+void button_cancel_clicked_cb(GtkObject *object, gpointer user_data);*/
 void editor_sync_toggled(GtkToggleButton * button, EDITOR * e);
 void editor_sync_with_main(void);
 gboolean editor_close_all(void);
@@ -69,6 +76,7 @@ void editor_load_book(EDITOR * e);
 gint editor_create_new(const gchar * filename, const gchar * key, gint note);
 void editor_save_book(EDITOR * e);
 void editor_maybe_save_all(void);
+GtkWidget * editor_new (const gchar * title, EDITOR *e);
 
 #endif /* USE_GTKHTML3_14_23 */
 
diff --git a/src/editor/wscript b/src/editor/wscript
new file mode 100644
index 0000000..8a848a8
--- /dev/null
+++ b/src/editor/wscript
@@ -0,0 +1,39 @@
+#!/usr/bin/env python
+# encoding: utf8
+
+import os, os.path
+
+
+def configure(conf):
+
+    import Utils
+    env = conf.env
+    sub = Utils.subst_vars
+
+    # bonobo editor
+    if not env['HAVE_EDITOR_IDL']:
+        # generade src files from IDL - must be run before compilation
+        src_dir =os.getcwd()
+        editor_dir = os.path.join(src_dir, 'src', 'editor')
+            
+        cmd = sub('${ORBIT_IDL} --output-dir=%s -I%s ${BONOBO_IDL_INCLUDES} -I${GTKHTML_DATA}/gtkhtml ${GTKHTML_DATA}/Editor.idl' % (editor_dir, src_dir), env)
+        print cmd
+        # generate
+        os.system(cmd)
+
+
+def build(bld):
+
+    source = 'slib-editor.c link_dialog.c' if bld.env['HAVE_EDITOR_IDL'] else \
+        'bonobo-editor.c Editor-common.c Editor-skels.c Editor-stubs.c'
+
+    bld.new_task_gen(
+        features='cc cxx', # compile C with gcc, C++ with g++
+        includes='. ../../ ../../src ../../src/editor %s' %
+            bld.env['GECKO_INCLUDE'], # ../../ for config.h
+        source=source,
+        target='editor',
+        #uselib='GLIB GNOMEUI SWORD GTKMOZEMBED GTKMOZEMBED_UNSTABLE GTKHTML GTKHTML_EDITOR'
+        uselib= bld.env['ALL_LIBS'],
+    )
+
diff --git a/src/examples/Makefile b/src/examples/Makefile
new file mode 100644
index 0000000..e9a86ac
--- /dev/null
+++ b/src/examples/Makefile
@@ -0,0 +1,31 @@
+interface_xml := ../gnome2/ipc-interface.xml
+
+pkg_packages := dbus-1 dbus-glib-1
+
+PKG_CFLAGS := $(shell pkg-config --cflags $(pkg_packages))
+PKG_LDFLAGS := $(shell pkg-config --libs $(pkg_packages))
+
+ADD_CFLAGS := -g -Wall -DG_DISABLE_DEPRECATED
+
+CFLAGS := $(PKG_CFLAGS) $(ADD_CFLAGS) $(CFLAGS)
+LDFLAGS := $(PKG_LDFLAGS) $(LDFLAGS)
+
+cleanfiles := ipc-client-stub.h
+
+targets = client
+
+.PHONY: all clean
+all: $(targets)
+
+client: receive.o
+	$(CC) $^ -o $@ $(LDFLAGS)
+
+receive.o: ipc_client.c ipc-client-stub.h
+	   $(CC) $(CFLAGS) -DPROGRNAME=\"ipc_client\" -c $< -o $@
+
+ipc-client-stub.h: $(interface_xml)
+		   dbus-binding-tool --prefix=ipc_object --mode=glib-client \
+		   $< > $@
+
+clean:
+	$(RM) $(targets) $(cleanfiles) *.o
diff --git a/src/examples/ipc_client.c b/src/examples/ipc_client.c
new file mode 100644
index 0000000..4419e0e
--- /dev/null
+++ b/src/examples/ipc_client.c
@@ -0,0 +1,117 @@
+/*  Copyright (c) 2009 Matthew Talbert
+
+ 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 AUTHORS OR COPYRIGHT
+ HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#include <dbus/dbus-glib.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "ipc-client-stub.h"
+
+//this function will be called every time the user does a sidebar search
+static gboolean
+search_performed_signal_handler (DBusGProxy *proxy,
+				 char* results,
+				 gpointer user_data)
+{
+	char *ref;
+
+	printf ("number hits: %s\n", results);
+
+	//method generated automatically in ipc-client-stub.h
+	//this method can be called anywhere in your program
+	org_xiphos_remote_get_next_search_reference(proxy, &ref, NULL);
+
+	while (strcmp (ref, "XIPHOS_SEARCH_END")) {
+		printf ("ref: %s\n", ref);
+		org_xiphos_remote_get_next_search_reference(proxy, &ref, NULL);
+	}
+	
+	return FALSE;
+}
+
+//this function will be called every time Xiphos navigates
+static gboolean
+navigation_performed_signal_handler (DBusGProxy *proxy,
+				     char* reference,
+				     gpointer user_data)
+{
+	printf ("new reference is: %s\n", reference);
+	printf ("now calling remote method just to be sure\n");
+
+	char *ref;
+
+	//method generated automatically in ipc-client-stub.h
+	//can be called anywhere in your program
+	org_xiphos_remote_get_current_reference(proxy, &ref, NULL);
+
+	//of course, this doesn't actually *check* to see if they're the same :)
+	printf ("yep! Xiphos says the new reference is %s\n", ref);
+
+	return FALSE;
+}
+
+int main (int argc, char **argv)
+{
+	DBusGConnection *bus;
+	DBusGProxy *remote_object;
+	GError *error = NULL;
+	GMainLoop *mainloop;
+
+	//not necessary if using from a gtk/gnome program
+	g_type_init ();
+
+	mainloop = g_main_loop_new (NULL, FALSE);
+
+	//get the "session" dbus
+	bus = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
+
+	//conect to xiphos
+	remote_object = dbus_g_proxy_new_for_name (bus,
+						   "org.xiphos.remote",
+						   "/org/xiphos/remote/ipc",
+						   "org.xiphos.remote");
+
+	//add and connect to the searchPerformedSignal
+	dbus_g_proxy_add_signal (remote_object, "searchPerformedSignal",
+				 G_TYPE_STRING, G_TYPE_INVALID);
+	dbus_g_proxy_connect_signal (remote_object, "searchPerformedSignal",
+				     G_CALLBACK(search_performed_signal_handler),
+				     NULL, NULL);
+	
+	//add and connect to the navigationSignal
+	dbus_g_proxy_add_signal (remote_object, "navigationSignal",
+				 G_TYPE_STRING, G_TYPE_INVALID);
+	dbus_g_proxy_connect_signal (remote_object, "navigationSignal",
+				     G_CALLBACK(navigation_performed_signal_handler),
+				     NULL, NULL);
+	
+	g_main_loop_run (mainloop);
+
+	exit (0);
+
+}
+		
+
+	
diff --git a/src/examples/ipc_client.py b/src/examples/ipc_client.py
new file mode 100755
index 0000000..9d6a553
--- /dev/null
+++ b/src/examples/ipc_client.py
@@ -0,0 +1,128 @@
+#!/usr/bin/env python
+
+#Copyright (c) 2009 Matthew Talbert
+
+#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 AUTHORS OR COPYRIGHT
+#HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+#WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+#FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+#OTHER DEALINGS IN THE SOFTWARE.
+
+import pygtk
+import gtk
+import dbus
+from dbus.mainloop.glib import DBusGMainLoop
+
+class ControlXiphos:
+
+    def receive_search_event(self, hits):
+        self.liststore = gtk.ListStore(str)
+        s = self.proxy.getNextSearchReference()
+        while s != 'XIPHOS_SEARCH_END':
+            self.liststore.append([s,])
+            s = self.proxy.getNextSearchReference()
+        self.results_tree.set_model(self.liststore)
+
+    def receive_navigation(self, reference):
+        self.label_ref.set_text(reference)
+        
+    def navigate_xiphos(self, widget, data=None):
+        self.proxy.setCurrentReference('sword://' + self.entry.get_text())
+
+    def destroy(self, widget, data=None):
+        gtk.main_quit()
+
+    def __init__(self):
+
+        DBusGMainLoop(set_as_default=True)
+
+        self.session_bus = dbus.SessionBus()
+
+        self.proxy = self.session_bus.get_object('org.xiphos.remote',
+                                                 '/org/xiphos/remote/ipc')
+        self.session_bus.add_signal_receiver(self.receive_navigation,
+                                       dbus_interface='org.xiphos.remote',
+                                       signal_name='navigationSignal')
+        self.session_bus.add_signal_receiver(self.receive_search_event,
+                                            dbus_interface='org.xiphos.remote',
+                                            signal_name='searchPerformedSignal')
+
+        self.window = gtk.Window(gtk.WINDOW_TOPLEVEL)
+
+        self.window.connect("destroy", self.destroy)
+
+        self.window.set_border_width(10)
+
+        self.vbox = gtk.VBox()
+        self.window.add(self.vbox)
+        self.vbox.show()
+        
+        self.hbox = gtk.HBox()
+        self.vbox.pack_start(self.hbox)
+        self.hbox.show()
+        
+        self.entry = gtk.Entry()
+        self.hbox.pack_start(self.entry)
+        self.entry.show()
+        
+        self.button = gtk.Button("Navigate Xiphos")
+        self.button.connect("clicked", self.navigate_xiphos, None)
+        self.hbox.pack_end(self.button)
+        self.button.show()
+
+        self.hbox_ref = gtk.HBox()
+        self.vbox.pack_end(self.hbox_ref)
+        self.hbox_ref.show()
+
+        self.label_ref_static = gtk.Label('Current Reference: ')
+        self.hbox_ref.pack_start(self.label_ref_static)
+        self.label_ref_static.show()
+
+        self.label_ref = gtk.Label(self.proxy.getCurrentReference())
+        self.hbox_ref.pack_end(self.label_ref)
+        self.label_ref.show()
+
+        self.hbox_res = gtk.HBox()
+        self.vbox.pack_end(self.hbox_res)
+        self.hbox_res.show()
+
+        self.scrollbox = gtk.ScrolledWindow()
+        self.hbox_res.pack_end(self.scrollbox)
+        self.scrollbox.show()
+        
+        self.results_tree = gtk.TreeView()
+        self.results_tree.set_size_request(-1, 200)
+
+        self.cell = gtk.CellRendererText()
+        self.column = gtk.TreeViewColumn('Reference')
+        self.column.pack_start(self.cell, True)
+        self.column.add_attribute(self.cell, 'text', 0)
+
+        self.results_tree.append_column(self.column)
+
+        self.scrollbox.add(self.results_tree)
+        self.results_tree.show()
+        
+        self.window.show()
+
+    def main(self):
+        gtk.main()
+
+if __name__ == "__main__":
+    ipc = ControlXiphos()
+    ipc.main()
diff --git a/src/gecko/Makefile.am b/src/gecko/Makefile.am
index 6724bcd..d06e09c 100644
--- a/src/gecko/Makefile.am
+++ b/src/gecko/Makefile.am
@@ -1,38 +1,4 @@
-
-mozilla_include_subdirs =	\
-	.		\
-	commandhandler  \
-	content		\
-	docshell	\
-	browser		\
-	dom		\
-	fastfind	\
-	find		\
-	gtkembedmoz	\
-	gfx		\
-	layout		\
-	necko		\
-	nspr		\
-	pref		\
-	string		\
-	uriloader	\
-	webbrwsr	\
-	webshell	\
-	widget		\
-	xpcom
-
-	
-INCLUDES =  \
-    -I$(top_srcdir)/src \
-    $(SWORD_CFLAGS) \
-    $(GNOME_CFLAGS) \
-    $(GTKHTML_CFLAGS)	\
-    $(addprefix -I$(GECKO_INCLUDE_ROOT)/,$(mozilla_include_subdirs))      \
-    $(GECKO_COMPONENT_CFLAGS) \
-    -DGECKO_HOME=\""$(GECKO_HOME)\""  \
-    $(UPRINT_CFLAGS)
- 
-if USE_GTKMOZEMBED     
+if HAVE_GECKO
 noinst_LIBRARIES = libgecko.a
 
 libgecko_a_SOURCES =  \
@@ -41,7 +7,65 @@ libgecko_a_SOURCES =  \
 	gecko-print.c		gecko-print.h		\
 	gecko-services.h   	gecko-services.cpp 	\
 	gecko-utils.cpp		gecko-utils.h			
+
+libgecko_a_CXXFLAGS = \
+	-I$(top_srcdir)/src \
+	$(GECKO_COMPONENT_CFLAGS) \
+	$(GECKO_CFLAGS) \
+	$(XIPHOS_CFLAGS) \
+	$(WARN_CXXFLAGS)
+
+libgecko_a_CFLAGS = \
+	-I$(top_srcdir)/src \
+	$(GECKO_COMPONENT_CFLAGS) \
+	$(GECKO_CFLAGS) \
+	$(XIPHOS_CFLAGS) \
+	$(WARN_CFLAGS)
+
+if HAVE_GECKO_HOME
+libgecko_a_CPPFLAGS = \
+    -DGECKO_HOME=\""$(GECKO_HOME)\""
+else
+libgecko_a_CPPFLAGS = \
+    -DGECKO_HOME=
+endif
+
+if HAVE_GECKO_1_9
+else
+if HAVE_GECKO_1_8_1
+mozilla_include_subdirs =	\
+        .		\
+        commandhandler  \
+        content		\
+        docshell	\
+        browser		\
+        dom		\
+        fastfind	\
+        find		\
+        gtkembedmoz	\
+        gfx		\
+        layout		\
+        necko		\
+        nspr		\
+        pref		\
+        string		\
+        uriloader	\
+        webbrwsr	\
+        webshell	\
+        widget		\
+        xpcom
+
+libgecko_a_CXXFLAGS += \
+	$(addprefix -I$(GECKO_INCLUDE_ROOT)/,$(mozilla_include_subdirs))
+
+libgecko_a_CFLAGS += \
+	$(addprefix -I$(GECKO_INCLUDE_ROOT)/,$(mozilla_include_subdirs))
+
+endif
+endif
+
 endif
 
 EXTRA_DIST = \
-	README
+	README \
+	wscript
diff --git a/src/gecko/Makefile.in b/src/gecko/Makefile.in
index 5f29fcf..5c5fee8 100644
--- a/src/gecko/Makefile.in
+++ b/src/gecko/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 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.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@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
@@ -32,65 +34,104 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
+@HAVE_GECKO_1_8_1_TRUE@@HAVE_GECKO_1_9_FALSE@@HAVE_GECKO_TRUE@am__append_1 = \
+@HAVE_GECKO_1_8_1_TRUE@@HAVE_GECKO_1_9_FALSE@@HAVE_GECKO_TRUE@	$(addprefix -I$(GECKO_INCLUDE_ROOT)/,$(mozilla_include_subdirs))
+
+@HAVE_GECKO_1_8_1_TRUE@@HAVE_GECKO_1_9_FALSE@@HAVE_GECKO_TRUE@am__append_2 = \
+@HAVE_GECKO_1_8_1_TRUE@@HAVE_GECKO_1_9_FALSE@@HAVE_GECKO_TRUE@	$(addprefix -I$(GECKO_INCLUDE_ROOT)/,$(mozilla_include_subdirs))
+
 subdir = src/gecko
 DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gecko.m4 \
 	$(top_srcdir)/m4/gnome-doc-utils.m4 \
-	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in
+	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 LIBRARIES = $(noinst_LIBRARIES)
 ARFLAGS = cru
+AM_V_AR = $(am__v_AR_$(V))
+am__v_AR_ = $(am__v_AR_$(AM_DEFAULT_VERBOSITY))
+am__v_AR_0 = @echo "  AR    " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
 libgecko_a_AR = $(AR) $(ARFLAGS)
 libgecko_a_LIBADD =
 am__libgecko_a_SOURCES_DIST = Yelper.cpp Yelper.h gecko-html.cpp \
 	gecko-html.h gecko-print.c gecko-print.h gecko-services.h \
 	gecko-services.cpp gecko-utils.cpp gecko-utils.h
-@USE_GTKMOZEMBED_TRUE@am_libgecko_a_OBJECTS = Yelper.$(OBJEXT) \
-@USE_GTKMOZEMBED_TRUE@	gecko-html.$(OBJEXT) \
-@USE_GTKMOZEMBED_TRUE@	gecko-print.$(OBJEXT) \
-@USE_GTKMOZEMBED_TRUE@	gecko-services.$(OBJEXT) \
-@USE_GTKMOZEMBED_TRUE@	gecko-utils.$(OBJEXT)
+@HAVE_GECKO_TRUE@am_libgecko_a_OBJECTS = libgecko_a-Yelper.$(OBJEXT) \
+@HAVE_GECKO_TRUE@	libgecko_a-gecko-html.$(OBJEXT) \
+@HAVE_GECKO_TRUE@	libgecko_a-gecko-print.$(OBJEXT) \
+@HAVE_GECKO_TRUE@	libgecko_a-gecko-services.$(OBJEXT) \
+@HAVE_GECKO_TRUE@	libgecko_a-gecko-utils.$(OBJEXT)
 libgecko_a_OBJECTS = $(am_libgecko_a_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 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)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=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    " $@;
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=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  " $@;
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CXXFLAGS) $(CXXFLAGS)
+AM_V_CXX = $(am__v_CXX_$(V))
+am__v_CXX_ = $(am__v_CXX_$(AM_DEFAULT_VERBOSITY))
+am__v_CXX_0 = @echo "  CXX   " $@;
 CXXLD = $(CXX)
-CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CXXLD = $(am__v_CXXLD_$(V))
+am__v_CXXLD_ = $(am__v_CXXLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CXXLD_0 = @echo "  CXXLD " $@;
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
 SOURCES = $(libgecko_a_SOURCES)
 DIST_SOURCES = $(am__libgecko_a_SOURCES_DIST)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
+ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AM_LDFLAGS = @AM_LDFLAGS@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-A_CPPFLAGS = @A_CPPFLAGS@
 BONOBO_IDL_INCLUDES = @BONOBO_IDL_INCLUDES@
 CATALOGS = @CATALOGS@
 CATOBJEXT = @CATOBJEXT@
@@ -108,17 +149,16 @@ DATADIRNAME = @DATADIRNAME@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DIRS = @DIRS@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
 DOC_USER_FORMATS = @DOC_USER_FORMATS@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
-EDITOR_CFLAGS = @EDITOR_CFLAGS@
-EDITOR_LIBS = @EDITOR_LIBS@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
 GECKO = @GECKO@
 GECKO_COMPONENT_CFLAGS = @GECKO_COMPONENT_CFLAGS@
 GECKO_COMPONENT_LIBS = @GECKO_COMPONENT_LIBS@
@@ -131,57 +171,26 @@ GECKO_PREFIX = @GECKO_PREFIX@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
-GNOME_CFLAGS = @GNOME_CFLAGS@
-GNOME_LIBS = @GNOME_LIBS@
 GREP = @GREP@
-GTKHTML_314_presence_CFLAGS = @GTKHTML_314_presence_CFLAGS@
-GTKHTML_314_presence_LIBS = @GTKHTML_314_presence_LIBS@
-GTKHTML_38_presence_CFLAGS = @GTKHTML_38_presence_CFLAGS@
-GTKHTML_38_presence_LIBS = @GTKHTML_38_presence_LIBS@
-GTKHTML_CFLAGS = @GTKHTML_CFLAGS@
 GTKHTML_DATA_DIR = @GTKHTML_DATA_DIR@
-GTKHTML_LIBS = @GTKHTML_LIBS@
 HELP_DIR = @HELP_DIR@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PREFIX = @INSTALL_PREFIX@
 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_ICONV = @INTLTOOL_ICONV@
-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
-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_SERVICE_RULE = @INTLTOOL_SERVICE_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_XGETTEXT = @INTLTOOL_XGETTEXT@
-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
-ImageMagick_CFLAGS = @ImageMagick_CFLAGS@
-ImageMagick_LIBS = @ImageMagick_LIBS@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
@@ -190,22 +199,18 @@ MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 MSGFMT_OPTS = @MSGFMT_OPTS@
-NO_PREFIX_PACKAGE_DATA_DIR = @NO_PREFIX_PACKAGE_DATA_DIR@
-NO_PREFIX_PACKAGE_DOC_DIR = @NO_PREFIX_PACKAGE_DOC_DIR@
-NO_PREFIX_PACKAGE_HELP_DIR = @NO_PREFIX_PACKAGE_HELP_DIR@
-NO_PREFIX_PACKAGE_MENU_DIR = @NO_PREFIX_PACKAGE_MENU_DIR@
-NO_PREFIX_PACKAGE_PIXMAPS_DIR = @NO_PREFIX_PACKAGE_PIXMAPS_DIR@
+MSGMERGE = @MSGMERGE@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 OMF_DIR = @OMF_DIR@
 ORBIT_IDL = @ORBIT_IDL@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_DATA_DIR = @PACKAGE_DATA_DIR@
-PACKAGE_DOC_DIR = @PACKAGE_DOC_DIR@
-PACKAGE_HELP_DIR = @PACKAGE_HELP_DIR@
-PACKAGE_MENU_DIR = @PACKAGE_MENU_DIR@
 PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_PIXMAPS_DIR = @PACKAGE_PIXMAPS_DIR@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
@@ -216,28 +221,24 @@ POSUB = @POSUB@
 PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
 PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
 RANLIB = @RANLIB@
-SCROLLKEEPER_BUILD_REQUIRED = @SCROLLKEEPER_BUILD_REQUIRED@
-SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-SWORD_CFLAGS = @SWORD_CFLAGS@
-SWORD_LIBS = @SWORD_LIBS@
-SWORD_MULTIVERSE_CFLAGS = @SWORD_MULTIVERSE_CFLAGS@
-SWORD_MULTIVERSE_LIBS = @SWORD_MULTIVERSE_LIBS@
-UPRINT_CFLAGS = @UPRINT_CFLAGS@
-UPRINT_LIBS = @UPRINT_LIBS@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
+WARN_CFLAGS = @WARN_CFLAGS@
+WARN_CXXFLAGS = @WARN_CXXFLAGS@
 XGETTEXT = @XGETTEXT@
+XIPHOS_CFLAGS = @XIPHOS_CFLAGS@
+XIPHOS_LIBS = @XIPHOS_LIBS@
 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@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -268,6 +269,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -280,53 +282,57 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-tooltiptext_CFLAGS = @tooltiptext_CFLAGS@
-tooltiptext_LIBS = @tooltiptext_LIBS@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 xiphos_exec = @xiphos_exec@
-mozilla_include_subdirs = \
-	.		\
-	commandhandler  \
-	content		\
-	docshell	\
-	browser		\
-	dom		\
-	fastfind	\
-	find		\
-	gtkembedmoz	\
-	gfx		\
-	layout		\
-	necko		\
-	nspr		\
-	pref		\
-	string		\
-	uriloader	\
-	webbrwsr	\
-	webshell	\
-	widget		\
-	xpcom
-
-INCLUDES = \
-    -I$(top_srcdir)/src \
-    $(SWORD_CFLAGS) \
-    $(GNOME_CFLAGS) \
-    $(GTKHTML_CFLAGS)	\
-    $(addprefix -I$(GECKO_INCLUDE_ROOT)/,$(mozilla_include_subdirs))      \
-    $(GECKO_COMPONENT_CFLAGS) \
-    -DGECKO_HOME=\""$(GECKO_HOME)\""  \
-    $(UPRINT_CFLAGS)
-
-@USE_GTKMOZEMBED_TRUE@noinst_LIBRARIES = libgecko.a
-@USE_GTKMOZEMBED_TRUE@libgecko_a_SOURCES = \
-@USE_GTKMOZEMBED_TRUE@	Yelper.cpp		Yelper.h		\
-@USE_GTKMOZEMBED_TRUE@	gecko-html.cpp		gecko-html.h		\
-@USE_GTKMOZEMBED_TRUE@	gecko-print.c		gecko-print.h		\
-@USE_GTKMOZEMBED_TRUE@	gecko-services.h   	gecko-services.cpp 	\
-@USE_GTKMOZEMBED_TRUE@	gecko-utils.cpp		gecko-utils.h			
+@HAVE_GECKO_TRUE@noinst_LIBRARIES = libgecko.a
+@HAVE_GECKO_TRUE@libgecko_a_SOURCES = \
+@HAVE_GECKO_TRUE@	Yelper.cpp		Yelper.h		\
+@HAVE_GECKO_TRUE@	gecko-html.cpp		gecko-html.h		\
+@HAVE_GECKO_TRUE@	gecko-print.c		gecko-print.h		\
+@HAVE_GECKO_TRUE@	gecko-services.h   	gecko-services.cpp 	\
+@HAVE_GECKO_TRUE@	gecko-utils.cpp		gecko-utils.h			
+
+@HAVE_GECKO_TRUE@libgecko_a_CXXFLAGS = -I$(top_srcdir)/src \
+@HAVE_GECKO_TRUE@	$(GECKO_COMPONENT_CFLAGS) $(GECKO_CFLAGS) \
+@HAVE_GECKO_TRUE@	$(XIPHOS_CFLAGS) $(WARN_CXXFLAGS) \
+@HAVE_GECKO_TRUE@	$(am__append_1)
+@HAVE_GECKO_TRUE@libgecko_a_CFLAGS = -I$(top_srcdir)/src \
+@HAVE_GECKO_TRUE@	$(GECKO_COMPONENT_CFLAGS) $(GECKO_CFLAGS) \
+@HAVE_GECKO_TRUE@	$(XIPHOS_CFLAGS) $(WARN_CFLAGS) \
+@HAVE_GECKO_TRUE@	$(am__append_2)
+@HAVE_GECKO_HOME_FALSE@@HAVE_GECKO_TRUE@libgecko_a_CPPFLAGS = \
+@HAVE_GECKO_HOME_FALSE@@HAVE_GECKO_TRUE@    -DGECKO_HOME=
+
+@HAVE_GECKO_HOME_TRUE@@HAVE_GECKO_TRUE@libgecko_a_CPPFLAGS = \
+@HAVE_GECKO_HOME_TRUE@@HAVE_GECKO_TRUE@    -DGECKO_HOME=\""$(GECKO_HOME)\""
+
+@HAVE_GECKO_1_8_1_TRUE@@HAVE_GECKO_1_9_FALSE@@HAVE_GECKO_TRUE@mozilla_include_subdirs = \
+@HAVE_GECKO_1_8_1_TRUE@@HAVE_GECKO_1_9_FALSE@@HAVE_GECKO_TRUE@        .		\
+@HAVE_GECKO_1_8_1_TRUE@@HAVE_GECKO_1_9_FALSE@@HAVE_GECKO_TRUE@        commandhandler  \
+@HAVE_GECKO_1_8_1_TRUE@@HAVE_GECKO_1_9_FALSE@@HAVE_GECKO_TRUE@        content		\
+@HAVE_GECKO_1_8_1_TRUE@@HAVE_GECKO_1_9_FALSE@@HAVE_GECKO_TRUE@        docshell	\
+@HAVE_GECKO_1_8_1_TRUE@@HAVE_GECKO_1_9_FALSE@@HAVE_GECKO_TRUE@        browser		\
+@HAVE_GECKO_1_8_1_TRUE@@HAVE_GECKO_1_9_FALSE@@HAVE_GECKO_TRUE@        dom		\
+@HAVE_GECKO_1_8_1_TRUE@@HAVE_GECKO_1_9_FALSE@@HAVE_GECKO_TRUE@        fastfind	\
+@HAVE_GECKO_1_8_1_TRUE@@HAVE_GECKO_1_9_FALSE@@HAVE_GECKO_TRUE@        find		\
+@HAVE_GECKO_1_8_1_TRUE@@HAVE_GECKO_1_9_FALSE@@HAVE_GECKO_TRUE@        gtkembedmoz	\
+@HAVE_GECKO_1_8_1_TRUE@@HAVE_GECKO_1_9_FALSE@@HAVE_GECKO_TRUE@        gfx		\
+@HAVE_GECKO_1_8_1_TRUE@@HAVE_GECKO_1_9_FALSE@@HAVE_GECKO_TRUE@        layout		\
+@HAVE_GECKO_1_8_1_TRUE@@HAVE_GECKO_1_9_FALSE@@HAVE_GECKO_TRUE@        necko		\
+@HAVE_GECKO_1_8_1_TRUE@@HAVE_GECKO_1_9_FALSE@@HAVE_GECKO_TRUE@        nspr		\
+@HAVE_GECKO_1_8_1_TRUE@@HAVE_GECKO_1_9_FALSE@@HAVE_GECKO_TRUE@        pref		\
+@HAVE_GECKO_1_8_1_TRUE@@HAVE_GECKO_1_9_FALSE@@HAVE_GECKO_TRUE@        string		\
+@HAVE_GECKO_1_8_1_TRUE@@HAVE_GECKO_1_9_FALSE@@HAVE_GECKO_TRUE@        uriloader	\
+@HAVE_GECKO_1_8_1_TRUE@@HAVE_GECKO_1_9_FALSE@@HAVE_GECKO_TRUE@        webbrwsr	\
+@HAVE_GECKO_1_8_1_TRUE@@HAVE_GECKO_1_9_FALSE@@HAVE_GECKO_TRUE@        webshell	\
+@HAVE_GECKO_1_8_1_TRUE@@HAVE_GECKO_1_9_FALSE@@HAVE_GECKO_TRUE@        widget		\
+@HAVE_GECKO_1_8_1_TRUE@@HAVE_GECKO_1_9_FALSE@@HAVE_GECKO_TRUE@        xpcom
 
 EXTRA_DIST = \
-	README
+	README \
+	wscript
 
 all: all-am
 
@@ -336,14 +342,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( 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/gecko/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  src/gecko/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/gecko/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign src/gecko/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -361,13 +367,14 @@ $(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):
 
 clean-noinstLIBRARIES:
 	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
 libgecko.a: $(libgecko_a_OBJECTS) $(libgecko_a_DEPENDENCIES) 
-	-rm -f libgecko.a
-	$(libgecko_a_AR) libgecko.a $(libgecko_a_OBJECTS) $(libgecko_a_LIBADD)
-	$(RANLIB) libgecko.a
+	$(AM_V_at)-rm -f libgecko.a
+	$(AM_V_AR)$(libgecko_a_AR) libgecko.a $(libgecko_a_OBJECTS) $(libgecko_a_LIBADD)
+	$(AM_V_at)$(RANLIB) libgecko.a
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -375,54 +382,140 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Yelper.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gecko-html.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gecko-print.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gecko-services.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gecko-utils.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgecko_a-Yelper.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgecko_a-gecko-html.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgecko_a-gecko-print.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgecko_a-gecko-services.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgecko_a-gecko-utils.Po@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@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@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@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) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
+libgecko_a-gecko-print.o: gecko-print.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgecko_a_CPPFLAGS) $(CPPFLAGS) $(libgecko_a_CFLAGS) $(CFLAGS) -MT libgecko_a-gecko-print.o -MD -MP -MF $(DEPDIR)/libgecko_a-gecko-print.Tpo -c -o libgecko_a-gecko-print.o `test -f 'gecko-print.c' || echo '$(srcdir)/'`gecko-print.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgecko_a-gecko-print.Tpo $(DEPDIR)/libgecko_a-gecko-print.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gecko-print.c' object='libgecko_a-gecko-print.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgecko_a_CPPFLAGS) $(CPPFLAGS) $(libgecko_a_CFLAGS) $(CFLAGS) -c -o libgecko_a-gecko-print.o `test -f 'gecko-print.c' || echo '$(srcdir)/'`gecko-print.c
+
+libgecko_a-gecko-print.obj: gecko-print.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgecko_a_CPPFLAGS) $(CPPFLAGS) $(libgecko_a_CFLAGS) $(CFLAGS) -MT libgecko_a-gecko-print.obj -MD -MP -MF $(DEPDIR)/libgecko_a-gecko-print.Tpo -c -o libgecko_a-gecko-print.obj `if test -f 'gecko-print.c'; then $(CYGPATH_W) 'gecko-print.c'; else $(CYGPATH_W) '$(srcdir)/gecko-print.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgecko_a-gecko-print.Tpo $(DEPDIR)/libgecko_a-gecko-print.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gecko-print.c' object='libgecko_a-gecko-print.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgecko_a_CPPFLAGS) $(CPPFLAGS) $(libgecko_a_CFLAGS) $(CFLAGS) -c -o libgecko_a-gecko-print.obj `if test -f 'gecko-print.c'; then $(CYGPATH_W) 'gecko-print.c'; else $(CYGPATH_W) '$(srcdir)/gecko-print.c'; fi`
+
 .cpp.o:
-@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
 
+libgecko_a-Yelper.o: Yelper.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgecko_a_CPPFLAGS) $(CPPFLAGS) $(libgecko_a_CXXFLAGS) $(CXXFLAGS) -MT libgecko_a-Yelper.o -MD -MP -MF $(DEPDIR)/libgecko_a-Yelper.Tpo -c -o libgecko_a-Yelper.o `test -f 'Yelper.cpp' || echo '$(srcdir)/'`Yelper.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgecko_a-Yelper.Tpo $(DEPDIR)/libgecko_a-Yelper.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='Yelper.cpp' object='libgecko_a-Yelper.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgecko_a_CPPFLAGS) $(CPPFLAGS) $(libgecko_a_CXXFLAGS) $(CXXFLAGS) -c -o libgecko_a-Yelper.o `test -f 'Yelper.cpp' || echo '$(srcdir)/'`Yelper.cpp
+
+libgecko_a-Yelper.obj: Yelper.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgecko_a_CPPFLAGS) $(CPPFLAGS) $(libgecko_a_CXXFLAGS) $(CXXFLAGS) -MT libgecko_a-Yelper.obj -MD -MP -MF $(DEPDIR)/libgecko_a-Yelper.Tpo -c -o libgecko_a-Yelper.obj `if test -f 'Yelper.cpp'; then $(CYGPATH_W) 'Yelper.cpp'; else $(CYGPATH_W) '$(srcdir)/Yelper.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgecko_a-Yelper.Tpo $(DEPDIR)/libgecko_a-Yelper.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='Yelper.cpp' object='libgecko_a-Yelper.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgecko_a_CPPFLAGS) $(CPPFLAGS) $(libgecko_a_CXXFLAGS) $(CXXFLAGS) -c -o libgecko_a-Yelper.obj `if test -f 'Yelper.cpp'; then $(CYGPATH_W) 'Yelper.cpp'; else $(CYGPATH_W) '$(srcdir)/Yelper.cpp'; fi`
+
+libgecko_a-gecko-html.o: gecko-html.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgecko_a_CPPFLAGS) $(CPPFLAGS) $(libgecko_a_CXXFLAGS) $(CXXFLAGS) -MT libgecko_a-gecko-html.o -MD -MP -MF $(DEPDIR)/libgecko_a-gecko-html.Tpo -c -o libgecko_a-gecko-html.o `test -f 'gecko-html.cpp' || echo '$(srcdir)/'`gecko-html.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgecko_a-gecko-html.Tpo $(DEPDIR)/libgecko_a-gecko-html.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='gecko-html.cpp' object='libgecko_a-gecko-html.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgecko_a_CPPFLAGS) $(CPPFLAGS) $(libgecko_a_CXXFLAGS) $(CXXFLAGS) -c -o libgecko_a-gecko-html.o `test -f 'gecko-html.cpp' || echo '$(srcdir)/'`gecko-html.cpp
+
+libgecko_a-gecko-html.obj: gecko-html.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgecko_a_CPPFLAGS) $(CPPFLAGS) $(libgecko_a_CXXFLAGS) $(CXXFLAGS) -MT libgecko_a-gecko-html.obj -MD -MP -MF $(DEPDIR)/libgecko_a-gecko-html.Tpo -c -o libgecko_a-gecko-html.obj `if test -f 'gecko-html.cpp'; then $(CYGPATH_W) 'gecko-html.cpp'; else $(CYGPATH_W) '$(srcdir)/gecko-html.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgecko_a-gecko-html.Tpo $(DEPDIR)/libgecko_a-gecko-html.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='gecko-html.cpp' object='libgecko_a-gecko-html.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgecko_a_CPPFLAGS) $(CPPFLAGS) $(libgecko_a_CXXFLAGS) $(CXXFLAGS) -c -o libgecko_a-gecko-html.obj `if test -f 'gecko-html.cpp'; then $(CYGPATH_W) 'gecko-html.cpp'; else $(CYGPATH_W) '$(srcdir)/gecko-html.cpp'; fi`
+
+libgecko_a-gecko-services.o: gecko-services.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgecko_a_CPPFLAGS) $(CPPFLAGS) $(libgecko_a_CXXFLAGS) $(CXXFLAGS) -MT libgecko_a-gecko-services.o -MD -MP -MF $(DEPDIR)/libgecko_a-gecko-services.Tpo -c -o libgecko_a-gecko-services.o `test -f 'gecko-services.cpp' || echo '$(srcdir)/'`gecko-services.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgecko_a-gecko-services.Tpo $(DEPDIR)/libgecko_a-gecko-services.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='gecko-services.cpp' object='libgecko_a-gecko-services.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgecko_a_CPPFLAGS) $(CPPFLAGS) $(libgecko_a_CXXFLAGS) $(CXXFLAGS) -c -o libgecko_a-gecko-services.o `test -f 'gecko-services.cpp' || echo '$(srcdir)/'`gecko-services.cpp
+
+libgecko_a-gecko-services.obj: gecko-services.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgecko_a_CPPFLAGS) $(CPPFLAGS) $(libgecko_a_CXXFLAGS) $(CXXFLAGS) -MT libgecko_a-gecko-services.obj -MD -MP -MF $(DEPDIR)/libgecko_a-gecko-services.Tpo -c -o libgecko_a-gecko-services.obj `if test -f 'gecko-services.cpp'; then $(CYGPATH_W) 'gecko-services.cpp'; else $(CYGPATH_W) '$(srcdir)/gecko-services.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgecko_a-gecko-services.Tpo $(DEPDIR)/libgecko_a-gecko-services.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='gecko-services.cpp' object='libgecko_a-gecko-services.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgecko_a_CPPFLAGS) $(CPPFLAGS) $(libgecko_a_CXXFLAGS) $(CXXFLAGS) -c -o libgecko_a-gecko-services.obj `if test -f 'gecko-services.cpp'; then $(CYGPATH_W) 'gecko-services.cpp'; else $(CYGPATH_W) '$(srcdir)/gecko-services.cpp'; fi`
+
+libgecko_a-gecko-utils.o: gecko-utils.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgecko_a_CPPFLAGS) $(CPPFLAGS) $(libgecko_a_CXXFLAGS) $(CXXFLAGS) -MT libgecko_a-gecko-utils.o -MD -MP -MF $(DEPDIR)/libgecko_a-gecko-utils.Tpo -c -o libgecko_a-gecko-utils.o `test -f 'gecko-utils.cpp' || echo '$(srcdir)/'`gecko-utils.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgecko_a-gecko-utils.Tpo $(DEPDIR)/libgecko_a-gecko-utils.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='gecko-utils.cpp' object='libgecko_a-gecko-utils.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgecko_a_CPPFLAGS) $(CPPFLAGS) $(libgecko_a_CXXFLAGS) $(CXXFLAGS) -c -o libgecko_a-gecko-utils.o `test -f 'gecko-utils.cpp' || echo '$(srcdir)/'`gecko-utils.cpp
+
+libgecko_a-gecko-utils.obj: gecko-utils.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgecko_a_CPPFLAGS) $(CPPFLAGS) $(libgecko_a_CXXFLAGS) $(CXXFLAGS) -MT libgecko_a-gecko-utils.obj -MD -MP -MF $(DEPDIR)/libgecko_a-gecko-utils.Tpo -c -o libgecko_a-gecko-utils.obj `if test -f 'gecko-utils.cpp'; then $(CYGPATH_W) 'gecko-utils.cpp'; else $(CYGPATH_W) '$(srcdir)/gecko-utils.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgecko_a-gecko-utils.Tpo $(DEPDIR)/libgecko_a-gecko-utils.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='gecko-utils.cpp' object='libgecko_a-gecko-utils.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgecko_a_CPPFLAGS) $(CPPFLAGS) $(libgecko_a_CXXFLAGS) $(CXXFLAGS) -c -o libgecko_a-gecko-utils.obj `if test -f 'gecko-utils.cpp'; then $(CYGPATH_W) 'gecko-utils.cpp'; else $(CYGPATH_W) '$(srcdir)/gecko-utils.cpp'; fi`
+
 mostlyclean-libtool:
 	-rm -f *.lo
 
@@ -434,45 +527,49 @@ ID: $(HEADERS) $(SOURCES) $(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; } \
-	       END { for (i in files) print i; }'`; \
+	  $(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)
-	tags=; \
+	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; } \
-	       END { for (i in files) print i; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  $(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; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  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)
-	tags=; \
-	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; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  $(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) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -493,13 +590,17 @@ distdir: $(DISTFILES)
 	  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 -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -527,6 +628,7 @@ 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"
@@ -548,6 +650,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -556,18 +660,28 @@ install-data-am:
 
 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
@@ -605,6 +719,7 @@ uninstall-am:
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
 	pdf pdf-am ps ps-am tags 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/src/gecko/Yelper.cpp b/src/gecko/Yelper.cpp
index 0b9441b..c9dc7da 100644
--- a/src/gecko/Yelper.cpp
+++ b/src/gecko/Yelper.cpp
@@ -326,7 +326,7 @@ Yelper::ProcessMouseOver (void* aEvent, int pane,
 #endif
 	PRBool aShiftKey;
 
-	GS_message(("mouse over pane: %d",pane));
+	//GS_message(("mouse over pane: %d",pane));
 	nsIDOMMouseEvent *event = (nsIDOMMouseEvent*) aEvent;	
 	//DIALOG_DATA *dialog = (DIALOG_DATA *)data;
 	event->GetShiftKey(&aShiftKey);
diff --git a/src/gecko/gecko-html.cpp b/src/gecko/gecko-html.cpp
index 00a2c76..524fbc6 100644
--- a/src/gecko/gecko-html.cpp
+++ b/src/gecko/gecko-html.cpp
@@ -133,7 +133,6 @@ static void html_link_message(GtkMozEmbed * embed)
 	
 	if (!strlen(url)) { //* moved out of url - clear appbar - info viewer*
 		gui_set_statusbar ("");
-		//gnome_appbar_set_status(GNOME_APPBAR(widgets.appbar), "");
 		in_url = FALSE;
 		//*if(GPOINTER_TO_INT(data) == TEXT_TYPE)
 		//	main_clear_viewer();*
@@ -179,7 +178,6 @@ static void html_link_message(GtkMozEmbed * embed)
 		} else //* any other link *
 			sprintf(buf, "%s", "");
 		gui_set_statusbar (buf);
-		//gnome_appbar_set_status(GNOME_APPBAR(widgets.appbar), buf);
 	}
 }
 
@@ -527,6 +525,12 @@ void gecko_html_close(GeckoHtml * html)
 					    html);
 }
 
+void gecko_html_render_data(GeckoHtml *html, const char *data, guint32 len)
+{
+	gtk_moz_embed_render_data(GTK_MOZ_EMBED(html), data, len, 
+				  "file:///sword", "text/html");
+}
+
 gboolean gecko_html_find(GeckoHtml * html, const gchar * find_string)
 {
 	return html->priv->yelper->Find(find_string);
@@ -620,10 +624,10 @@ gecko_html_print_document(GtkWindow * window, gchar * mod_name,
 	SWMgr *mgr;
 	if(dialog) {
 		BackEnd *be = (BackEnd *)dialog->backend;
-		mgr = be->get_display_mgr();
+		mgr = be->get_mgr();
 	}
 	else 
-		mgr = backend->get_display_mgr();
+		mgr = backend->get_mgr();
 	
 	SWModule *mod = mgr->Modules[mod_name];
 	
diff --git a/src/gecko/gecko-html.h b/src/gecko/gecko-html.h
index 38330a4..508afbc 100644
--- a/src/gecko/gecko-html.h
+++ b/src/gecko/gecko-html.h
@@ -84,6 +84,10 @@ void            gecko_html_printf         (GeckoHtml    *html,
 					  ...) G_GNUC_PRINTF (2,3);
 void            gecko_html_close          (GeckoHtml    *html);
 
+void            gecko_html_render_data    (GeckoHtml *html, 
+					   const char *data, 
+					   guint32 len);
+
 void            gecko_html_frames         (GeckoHtml    *html,
 					  gboolean     enable);
 
diff --git a/src/gecko/gecko-print.c b/src/gecko/gecko-print.c
index 22ab040..1b36199 100644
--- a/src/gecko/gecko-print.c
+++ b/src/gecko/gecko-print.c
@@ -26,8 +26,9 @@
 #endif
 #ifdef USE_GTKUPRINT
 #include <unistd.h>
-#include <gnome.h>
 #include <sys/stat.h>
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
 #include <glib.h>
 #include <glib/gstdio.h>
 #include <string.h>
diff --git a/src/gecko/gecko-utils.cpp b/src/gecko/gecko-utils.cpp
index 38f3cdc..ad55436 100644
--- a/src/gecko/gecko-utils.cpp
+++ b/src/gecko/gecko-utils.cpp
@@ -39,8 +39,10 @@
 #endif
 
 #ifdef HAVE_GECKO_1_9
+#ifdef XPCOM_GLUE
 #include <gtkmozembed_glue.cpp>
 #endif
+#endif
 
 #include <gtkmozembed.h>
 #include <gtkmozembed_internal.h>
diff --git a/src/gecko/wscript b/src/gecko/wscript
new file mode 100644
index 0000000..a8f85a3
--- /dev/null
+++ b/src/gecko/wscript
@@ -0,0 +1,16 @@
+#!/usr/bin/env python
+# encoding: utf8
+
+def build(bld):
+
+    lib = bld.new_task_gen(
+        features='cxx cc', # C++ with g++ and C with gcc
+        includes='. ../.. ../../src %s' % bld.env['GECKO_INCLUDE'], # ../../ for config.h
+        target='gecko',
+        #uselib='GLIB GNOMEUI SWORD GTKMOZEMBED GTKMOZEMBED_UNSTABLE UPRINT',
+        #uselib_local='backend', # needs libbackend.a
+        uselib= bld.env['ALL_LIBS'],
+    )
+
+    lib.find_sources_in_dirs('.')
+        
diff --git a/src/gnome2/Makefile.am b/src/gnome2/Makefile.am
index 1db0d4b..9235445 100644
--- a/src/gnome2/Makefile.am
+++ b/src/gnome2/Makefile.am
@@ -1,27 +1,9 @@
-mozilla_include_subdirs =	\
-	.		\
-	gtkembedmoz	\
-	xpcom
-
-INCLUDES =  \
-    $(SWORD_CFLAGS) \
-    $(GNOME_CFLAGS) \
-    $(GTKHTML_CFLAGS) \
-    $(addprefix -I$(GECKO_INCLUDE_ROOT)/,$(mozilla_include_subdirs))      \
-    $(GECKO_COMPONENT_CFLAGS) \
-    -DGECKO_HOME=\""$(GECKO_HOME)\""  \
-    -I$(top_srcdir)/src \
-    -DPREFIX=\""$(prefix)"\" \
-    -DSYSCONFDIR=\""$(sysconfdir)"\" \
-    -DDATADIR=\""$(datadir)"\" \
-    -DLIBDIR=\""$(libdir)"\" \
-    -DSHARE_DIR=\"$(pkgdatadir)\"  \
-    $(UPRINT_CFLAGS)
-
 bin_PROGRAMS = xiphos
 
 bin_SCRIPTS = gnomesword2
 
+BUILT_SOURCES = ipc-interface.h marshal.h locale_set.c
+
 xiphos_SOURCES =  \
     about_modules.c \
     about_sword.c \
@@ -40,6 +22,7 @@ xiphos_SOURCES =  \
     dictlex_dialog.c \
     display_info.c \
     dummy.cpp \
+    export_bookmarks.c \
     export_dialog.c \
     find_dialog.c \
     font_dialog.c \
@@ -47,8 +30,10 @@ xiphos_SOURCES =  \
     gbs_dialog.c \
     gui.c \
     html.c \
+    ipc.c \
     main_menu.c \
     main_window.c \
+    marshal.c \
     menu_popup.c \
     mod_mgr.c \
     navbar_book.c \
@@ -60,11 +45,9 @@ xiphos_SOURCES =  \
     parallel_dialog.c \
     parallel_tab.c \
     parallel_view.c \
-    preferences_cell_renderer.c \
     preferences_dialog.c \
     search_dialog.c \
     search_sidebar.c \
-    session.c \
     sidebar.c \
     sidebar_dialog.c \
     splash.c \
@@ -73,38 +56,85 @@ xiphos_SOURCES =  \
     utilities.c \
     xiphos.c
 
-if USE_GTKMOZEMBED
-    LIB_GECKO=$(top_builddir)/src/gecko/libgecko.a 
-else
-    LIB_GECKO=
-endif
+locale_set.c: ../../po/LINGUAS make-locale-set.sh
+	sh ./make-locale-set.sh > locale_set.c
 
-if HAVE_GECKO_1_7
-    xiphos_LDFLAGS = -R$(GECKO_HOME)
+xiphos-locale_set.o: locale_set.c
+	$(CC) $< -c -o $@
+
+marshal.c:
+	glib-genmarshal --body --prefix=ipc_marshal marshal.list \
+	$< > $@
+	sed -i -e 's;<glib-object.h>;"marshal.h";' $@
+
+marshal.h:
+	glib-genmarshal --header --prefix=ipc_marshal marshal.list \
+	$< > $@
+
+ipc-interface.h:
+	dbus-binding-tool --prefix=ipc_object --mode=glib-server ipc-interface.xml \
+	$< > $@
+
+xiphos_CPPFLAGS =  \
+	-DGECKO_HOME=\""$(GECKO_HOME)\""  \
+	-DPREFIX=\""$(prefix)"\" \
+	-DSYSCONFDIR=\""$(sysconfdir)"\" \
+	-DDATADIR=\""$(datadir)"\" \
+	-DPACKAGE_LOCALE_DIR="\"$(datadir)/locale\"" \
+	-DPACKAGE_PIXMAPS_DIR="\"$(datadir)/pixmaps/$(PACKAGE)\"" \
+	-DLIBDIR=\""$(libdir)"\" \
+	-DSHARE_DIR=\"$(pkgdatadir)\" \
+	$(DISABLE_DEPRECATED) \
+	$(AM_CPPFLAGS)
+
+xiphos_CFLAGS = \
+	-I$(top_srcdir)/src \
+	$(XIPHOS_CFLAGS) \
+	$(GECKO_CFLAGS) \
+	$(GECKO_COMPONENT_CFLAGS) \
+	$(WARN_CFLAGS) \
+	$(DBUS_CFLAGS) \
+	$(DBUS_GLIB_CFLAGS)
+
+xiphos_CXXFLAGS = \
+	-I$(top_srcdir)/src \
+	$(GECKO_CFLAGS) \
+	$(GECKO_COMPONENT_CFLAGS) \
+	$(XIPHOS_CFLAGS) \
+	$(WARN_CXXFLAGS) \
+	$(DBUS_CXXFLAGS)
+
+if HAVE_GECKO
+LIB_GECKO=$(top_builddir)/src/gecko/libgecko.a
 endif
-if HAVE_GECKO_1_8
+
+if HAVE_GECKO_1_9_1
+else
+if HAVE_GECKO_1_9
+else
+if HAVE_GECKO
     xiphos_LDFLAGS = -R$(GECKO_HOME)
 endif
-if HAVE_GECKO_1_8_1
-    xiphos_LDFLAGS = -R$(GECKO_HOME)
 endif
-if HAVE_GECKO_1_9
-    xiphos_LDFLAGS = $(AM_LDFLAGS)
 endif
 
+
 xiphos_LDADD = \
-    $(top_builddir)/src/main/libmain.a \
-    $(top_builddir)/src/backend/libbackend.a \
-    $(top_builddir)/src/editor/libeditor.a\
-    $(LIB_GECKO)\
-    $(GNOME_LIBS) \
-    $(GTKHTML_LIBS) \
-    $(GECKO_COMPONENT_LIBS) \
-    $(GNOME_SPELL_LIBS)\
-    $(SWORD_LIBS) \
-    $(ImageMagick_LIBS) \
-    $(UPRINT_LIBS)
+	$(LIB_GECKO) \
+	$(top_builddir)/src/main/libmain.a \
+	$(top_builddir)/src/backend/libbackend.a \
+	$(top_builddir)/src/editor/libeditor.a\
+	$(XIPHOS_LIBS) \
+	$(GNOME_SPELL_LIBS) \
+	$(GECKO_COMPONENT_LIBS) \
+	$(GECKO_LIBS) \
+	$(DBUS_LIBS) \
+	./xiphos-locale_set.o
 
 EXTRA_DIST = \
     $(top_builddir)/src/gui/*.h \
-    gnomesword2
+    gnomesword2 \
+    ipc-interface.xml \
+    make-locale-set.sh \
+    marshal.list \
+    wscript
diff --git a/src/gnome2/Makefile.in b/src/gnome2/Makefile.in
index 733ba4b..dcc9553 100644
--- a/src/gnome2/Makefile.in
+++ b/src/gnome2/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 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.
@@ -17,8 +18,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@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
@@ -39,88 +41,142 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gecko.m4 \
 	$(top_srcdir)/m4/gnome-doc-utils.m4 \
-	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in
+	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)"
-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS)
-am_xiphos_OBJECTS = about_modules.$(OBJEXT) about_sword.$(OBJEXT) \
-	about_trans.$(OBJEXT) about_xiphos.$(OBJEXT) \
-	bibletext.$(OBJEXT) bibletext_dialog.$(OBJEXT) \
-	bookmark_dialog.$(OBJEXT) bookmarks_menu.$(OBJEXT) \
-	bookmarks_treeview.$(OBJEXT) cipher_key_dialog.$(OBJEXT) \
-	commentary.$(OBJEXT) commentary_dialog.$(OBJEXT) \
-	dialog.$(OBJEXT) dictlex.$(OBJEXT) dictlex_dialog.$(OBJEXT) \
-	display_info.$(OBJEXT) dummy.$(OBJEXT) export_dialog.$(OBJEXT) \
-	find_dialog.$(OBJEXT) font_dialog.$(OBJEXT) gbs.$(OBJEXT) \
-	gbs_dialog.$(OBJEXT) gui.$(OBJEXT) html.$(OBJEXT) \
-	main_menu.$(OBJEXT) main_window.$(OBJEXT) menu_popup.$(OBJEXT) \
-	mod_mgr.$(OBJEXT) navbar_book.$(OBJEXT) \
-	navbar_book_dialog.$(OBJEXT) navbar_versekey.$(OBJEXT) \
-	navbar_versekey_dialog.$(OBJEXT) \
-	navbar_versekey_editor.$(OBJEXT) \
-	navbar_versekey_parallel.$(OBJEXT) parallel_dialog.$(OBJEXT) \
-	parallel_tab.$(OBJEXT) parallel_view.$(OBJEXT) \
-	preferences_cell_renderer.$(OBJEXT) \
-	preferences_dialog.$(OBJEXT) search_dialog.$(OBJEXT) \
-	search_sidebar.$(OBJEXT) session.$(OBJEXT) sidebar.$(OBJEXT) \
-	sidebar_dialog.$(OBJEXT) splash.$(OBJEXT) \
-	tabbed_browser.$(OBJEXT) treekey-editor.$(OBJEXT) \
-	utilities.$(OBJEXT) xiphos.$(OBJEXT)
+am_xiphos_OBJECTS = xiphos-about_modules.$(OBJEXT) \
+	xiphos-about_sword.$(OBJEXT) xiphos-about_trans.$(OBJEXT) \
+	xiphos-about_xiphos.$(OBJEXT) xiphos-bibletext.$(OBJEXT) \
+	xiphos-bibletext_dialog.$(OBJEXT) \
+	xiphos-bookmark_dialog.$(OBJEXT) \
+	xiphos-bookmarks_menu.$(OBJEXT) \
+	xiphos-bookmarks_treeview.$(OBJEXT) \
+	xiphos-cipher_key_dialog.$(OBJEXT) xiphos-commentary.$(OBJEXT) \
+	xiphos-commentary_dialog.$(OBJEXT) xiphos-dialog.$(OBJEXT) \
+	xiphos-dictlex.$(OBJEXT) xiphos-dictlex_dialog.$(OBJEXT) \
+	xiphos-display_info.$(OBJEXT) xiphos-dummy.$(OBJEXT) \
+	xiphos-export_bookmarks.$(OBJEXT) \
+	xiphos-export_dialog.$(OBJEXT) xiphos-find_dialog.$(OBJEXT) \
+	xiphos-font_dialog.$(OBJEXT) xiphos-gbs.$(OBJEXT) \
+	xiphos-gbs_dialog.$(OBJEXT) xiphos-gui.$(OBJEXT) \
+	xiphos-html.$(OBJEXT) xiphos-ipc.$(OBJEXT) \
+	xiphos-main_menu.$(OBJEXT) xiphos-main_window.$(OBJEXT) \
+	xiphos-marshal.$(OBJEXT) xiphos-menu_popup.$(OBJEXT) \
+	xiphos-mod_mgr.$(OBJEXT) xiphos-navbar_book.$(OBJEXT) \
+	xiphos-navbar_book_dialog.$(OBJEXT) \
+	xiphos-navbar_versekey.$(OBJEXT) \
+	xiphos-navbar_versekey_dialog.$(OBJEXT) \
+	xiphos-navbar_versekey_editor.$(OBJEXT) \
+	xiphos-navbar_versekey_parallel.$(OBJEXT) \
+	xiphos-parallel_dialog.$(OBJEXT) xiphos-parallel_tab.$(OBJEXT) \
+	xiphos-parallel_view.$(OBJEXT) \
+	xiphos-preferences_dialog.$(OBJEXT) \
+	xiphos-search_dialog.$(OBJEXT) xiphos-search_sidebar.$(OBJEXT) \
+	xiphos-sidebar.$(OBJEXT) xiphos-sidebar_dialog.$(OBJEXT) \
+	xiphos-splash.$(OBJEXT) xiphos-tabbed_browser.$(OBJEXT) \
+	xiphos-treekey-editor.$(OBJEXT) xiphos-utilities.$(OBJEXT) \
+	xiphos-xiphos.$(OBJEXT)
 xiphos_OBJECTS = $(am_xiphos_OBJECTS)
-@USE_GTKMOZEMBED_TRUE@am__DEPENDENCIES_1 =  \
-@USE_GTKMOZEMBED_TRUE@	$(top_builddir)/src/gecko/libgecko.a
-am__DEPENDENCIES_2 =
-xiphos_DEPENDENCIES = $(top_builddir)/src/main/libmain.a \
+am__DEPENDENCIES_1 =
+xiphos_DEPENDENCIES = $(LIB_GECKO) $(top_builddir)/src/main/libmain.a \
 	$(top_builddir)/src/backend/libbackend.a \
 	$(top_builddir)/src/editor/libeditor.a $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_2) \
-	$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_2) \
-	$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_2)
-xiphos_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-	$(xiphos_LDFLAGS) $(LDFLAGS) -o $@
-binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+	$(am__DEPENDENCIES_1) ./xiphos-locale_set.o
+AM_V_lt = $(am__v_lt_$(V))
+am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+am__v_lt_0 = --silent
+xiphos_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(xiphos_CXXFLAGS) \
+	$(CXXFLAGS) $(xiphos_LDFLAGS) $(LDFLAGS) -o $@
+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'
 SCRIPTS = $(bin_SCRIPTS)
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=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 = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=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  " $@;
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CXXFLAGS) $(CXXFLAGS)
+AM_V_CXX = $(am__v_CXX_$(V))
+am__v_CXX_ = $(am__v_CXX_$(AM_DEFAULT_VERBOSITY))
+am__v_CXX_0 = @echo "  CXX   " $@;
 CXXLD = $(CXX)
-CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CXXLD = $(am__v_CXXLD_$(V))
+am__v_CXXLD_ = $(am__v_CXXLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CXXLD_0 = @echo "  CXXLD " $@;
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
 SOURCES = $(xiphos_SOURCES)
 DIST_SOURCES = $(xiphos_SOURCES)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
+ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AM_LDFLAGS = @AM_LDFLAGS@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-A_CPPFLAGS = @A_CPPFLAGS@
 BONOBO_IDL_INCLUDES = @BONOBO_IDL_INCLUDES@
 CATALOGS = @CATALOGS@
 CATOBJEXT = @CATOBJEXT@
@@ -138,17 +194,16 @@ DATADIRNAME = @DATADIRNAME@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DIRS = @DIRS@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
 DOC_USER_FORMATS = @DOC_USER_FORMATS@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
-EDITOR_CFLAGS = @EDITOR_CFLAGS@
-EDITOR_LIBS = @EDITOR_LIBS@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
 GECKO = @GECKO@
 GECKO_COMPONENT_CFLAGS = @GECKO_COMPONENT_CFLAGS@
 GECKO_COMPONENT_LIBS = @GECKO_COMPONENT_LIBS@
@@ -161,57 +216,26 @@ GECKO_PREFIX = @GECKO_PREFIX@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
-GNOME_CFLAGS = @GNOME_CFLAGS@
-GNOME_LIBS = @GNOME_LIBS@
 GREP = @GREP@
-GTKHTML_314_presence_CFLAGS = @GTKHTML_314_presence_CFLAGS@
-GTKHTML_314_presence_LIBS = @GTKHTML_314_presence_LIBS@
-GTKHTML_38_presence_CFLAGS = @GTKHTML_38_presence_CFLAGS@
-GTKHTML_38_presence_LIBS = @GTKHTML_38_presence_LIBS@
-GTKHTML_CFLAGS = @GTKHTML_CFLAGS@
 GTKHTML_DATA_DIR = @GTKHTML_DATA_DIR@
-GTKHTML_LIBS = @GTKHTML_LIBS@
 HELP_DIR = @HELP_DIR@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PREFIX = @INSTALL_PREFIX@
 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_ICONV = @INTLTOOL_ICONV@
-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
-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_SERVICE_RULE = @INTLTOOL_SERVICE_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_XGETTEXT = @INTLTOOL_XGETTEXT@
-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
-ImageMagick_CFLAGS = @ImageMagick_CFLAGS@
-ImageMagick_LIBS = @ImageMagick_LIBS@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
@@ -220,22 +244,18 @@ MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 MSGFMT_OPTS = @MSGFMT_OPTS@
-NO_PREFIX_PACKAGE_DATA_DIR = @NO_PREFIX_PACKAGE_DATA_DIR@
-NO_PREFIX_PACKAGE_DOC_DIR = @NO_PREFIX_PACKAGE_DOC_DIR@
-NO_PREFIX_PACKAGE_HELP_DIR = @NO_PREFIX_PACKAGE_HELP_DIR@
-NO_PREFIX_PACKAGE_MENU_DIR = @NO_PREFIX_PACKAGE_MENU_DIR@
-NO_PREFIX_PACKAGE_PIXMAPS_DIR = @NO_PREFIX_PACKAGE_PIXMAPS_DIR@
+MSGMERGE = @MSGMERGE@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 OMF_DIR = @OMF_DIR@
 ORBIT_IDL = @ORBIT_IDL@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_DATA_DIR = @PACKAGE_DATA_DIR@
-PACKAGE_DOC_DIR = @PACKAGE_DOC_DIR@
-PACKAGE_HELP_DIR = @PACKAGE_HELP_DIR@
-PACKAGE_MENU_DIR = @PACKAGE_MENU_DIR@
 PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_PIXMAPS_DIR = @PACKAGE_PIXMAPS_DIR@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
@@ -246,28 +266,24 @@ POSUB = @POSUB@
 PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
 PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
 RANLIB = @RANLIB@
-SCROLLKEEPER_BUILD_REQUIRED = @SCROLLKEEPER_BUILD_REQUIRED@
-SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-SWORD_CFLAGS = @SWORD_CFLAGS@
-SWORD_LIBS = @SWORD_LIBS@
-SWORD_MULTIVERSE_CFLAGS = @SWORD_MULTIVERSE_CFLAGS@
-SWORD_MULTIVERSE_LIBS = @SWORD_MULTIVERSE_LIBS@
-UPRINT_CFLAGS = @UPRINT_CFLAGS@
-UPRINT_LIBS = @UPRINT_LIBS@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
+WARN_CFLAGS = @WARN_CFLAGS@
+WARN_CXXFLAGS = @WARN_CXXFLAGS@
 XGETTEXT = @XGETTEXT@
+XIPHOS_CFLAGS = @XIPHOS_CFLAGS@
+XIPHOS_LIBS = @XIPHOS_LIBS@
 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@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -298,6 +314,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -310,32 +327,12 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-tooltiptext_CFLAGS = @tooltiptext_CFLAGS@
-tooltiptext_LIBS = @tooltiptext_LIBS@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 xiphos_exec = @xiphos_exec@
-mozilla_include_subdirs = \
-	.		\
-	gtkembedmoz	\
-	xpcom
-
-INCLUDES = \
-    $(SWORD_CFLAGS) \
-    $(GNOME_CFLAGS) \
-    $(GTKHTML_CFLAGS) \
-    $(addprefix -I$(GECKO_INCLUDE_ROOT)/,$(mozilla_include_subdirs))      \
-    $(GECKO_COMPONENT_CFLAGS) \
-    -DGECKO_HOME=\""$(GECKO_HOME)\""  \
-    -I$(top_srcdir)/src \
-    -DPREFIX=\""$(prefix)"\" \
-    -DSYSCONFDIR=\""$(sysconfdir)"\" \
-    -DDATADIR=\""$(datadir)"\" \
-    -DLIBDIR=\""$(libdir)"\" \
-    -DSHARE_DIR=\"$(pkgdatadir)\"  \
-    $(UPRINT_CFLAGS)
-
 bin_SCRIPTS = gnomesword2
+BUILT_SOURCES = ipc-interface.h marshal.h locale_set.c
 xiphos_SOURCES = \
     about_modules.c \
     about_sword.c \
@@ -354,6 +351,7 @@ xiphos_SOURCES = \
     dictlex_dialog.c \
     display_info.c \
     dummy.cpp \
+    export_bookmarks.c \
     export_dialog.c \
     find_dialog.c \
     font_dialog.c \
@@ -361,8 +359,10 @@ xiphos_SOURCES = \
     gbs_dialog.c \
     gui.c \
     html.c \
+    ipc.c \
     main_menu.c \
     main_window.c \
+    marshal.c \
     menu_popup.c \
     mod_mgr.c \
     navbar_book.c \
@@ -374,11 +374,9 @@ xiphos_SOURCES = \
     parallel_dialog.c \
     parallel_tab.c \
     parallel_view.c \
-    preferences_cell_renderer.c \
     preferences_dialog.c \
     search_dialog.c \
     search_sidebar.c \
-    session.c \
     sidebar.c \
     sidebar_dialog.c \
     splash.c \
@@ -387,30 +385,59 @@ xiphos_SOURCES = \
     utilities.c \
     xiphos.c
 
-@USE_GTKMOZEMBED_FALSE@LIB_GECKO = 
-@USE_GTKMOZEMBED_TRUE@LIB_GECKO = $(top_builddir)/src/gecko/libgecko.a 
-@HAVE_GECKO_1_7_TRUE@xiphos_LDFLAGS = -R$(GECKO_HOME)
-@HAVE_GECKO_1_8_1_TRUE@xiphos_LDFLAGS = -R$(GECKO_HOME)
-@HAVE_GECKO_1_8_TRUE@xiphos_LDFLAGS = -R$(GECKO_HOME)
-@HAVE_GECKO_1_9_TRUE@xiphos_LDFLAGS = $(AM_LDFLAGS)
+xiphos_CPPFLAGS = \
+	-DGECKO_HOME=\""$(GECKO_HOME)\""  \
+	-DPREFIX=\""$(prefix)"\" \
+	-DSYSCONFDIR=\""$(sysconfdir)"\" \
+	-DDATADIR=\""$(datadir)"\" \
+	-DPACKAGE_LOCALE_DIR="\"$(datadir)/locale\"" \
+	-DPACKAGE_PIXMAPS_DIR="\"$(datadir)/pixmaps/$(PACKAGE)\"" \
+	-DLIBDIR=\""$(libdir)"\" \
+	-DSHARE_DIR=\"$(pkgdatadir)\" \
+	$(DISABLE_DEPRECATED) \
+	$(AM_CPPFLAGS)
+
+xiphos_CFLAGS = \
+	-I$(top_srcdir)/src \
+	$(XIPHOS_CFLAGS) \
+	$(GECKO_CFLAGS) \
+	$(GECKO_COMPONENT_CFLAGS) \
+	$(WARN_CFLAGS) \
+	$(DBUS_CFLAGS) \
+	$(DBUS_GLIB_CFLAGS)
+
+xiphos_CXXFLAGS = \
+	-I$(top_srcdir)/src \
+	$(GECKO_CFLAGS) \
+	$(GECKO_COMPONENT_CFLAGS) \
+	$(XIPHOS_CFLAGS) \
+	$(WARN_CXXFLAGS) \
+	$(DBUS_CXXFLAGS)
+
+@HAVE_GECKO_TRUE@LIB_GECKO = $(top_builddir)/src/gecko/libgecko.a
+@HAVE_GECKO_1_9_1_FALSE@@HAVE_GECKO_1_9_FALSE@@HAVE_GECKO_TRUE@xiphos_LDFLAGS = -R$(GECKO_HOME)
 xiphos_LDADD = \
-    $(top_builddir)/src/main/libmain.a \
-    $(top_builddir)/src/backend/libbackend.a \
-    $(top_builddir)/src/editor/libeditor.a\
-    $(LIB_GECKO)\
-    $(GNOME_LIBS) \
-    $(GTKHTML_LIBS) \
-    $(GECKO_COMPONENT_LIBS) \
-    $(GNOME_SPELL_LIBS)\
-    $(SWORD_LIBS) \
-    $(ImageMagick_LIBS) \
-    $(UPRINT_LIBS)
+	$(LIB_GECKO) \
+	$(top_builddir)/src/main/libmain.a \
+	$(top_builddir)/src/backend/libbackend.a \
+	$(top_builddir)/src/editor/libeditor.a\
+	$(XIPHOS_LIBS) \
+	$(GNOME_SPELL_LIBS) \
+	$(GECKO_COMPONENT_LIBS) \
+	$(GECKO_LIBS) \
+	$(DBUS_LIBS) \
+	./xiphos-locale_set.o
 
 EXTRA_DIST = \
     $(top_builddir)/src/gui/*.h \
-    gnomesword2
+    gnomesword2 \
+    ipc-interface.xml \
+    make-locale-set.sh \
+    marshal.list \
+    wscript
 
-all: all-am
+all: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .cpp .lo .o .obj
@@ -418,14 +445,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( 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/gnome2/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  src/gnome2/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/gnome2/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign src/gnome2/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -443,56 +470,87 @@ $(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)'; for p in $$list; do \
-	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  if test -f $$p \
-	     || test -f $$p1 \
-	  ; then \
-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
-	  else :; fi; \
-	done
+	@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 || test -f $$p1; \
+	  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) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
+	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
+	    } \
+	; done
 
 uninstall-binPROGRAMS:
 	@$(NORMAL_UNINSTALL)
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
-	done
+	@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:
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
+	@list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
 xiphos$(EXEEXT): $(xiphos_OBJECTS) $(xiphos_DEPENDENCIES) 
 	@rm -f xiphos$(EXEEXT)
-	$(xiphos_LINK) $(xiphos_OBJECTS) $(xiphos_LDADD) $(LIBS)
+	$(AM_V_CXXLD)$(xiphos_LINK) $(xiphos_OBJECTS) $(xiphos_LDADD) $(LIBS)
 install-binSCRIPTS: $(bin_SCRIPTS)
 	@$(NORMAL_INSTALL)
 	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
-	@list='$(bin_SCRIPTS)'; for p in $$list; do \
+	@list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  if test -f $$d$$p; then \
-	    f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
-	    echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \
-	    $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \
-	  else :; fi; \
-	done
+	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
+	done | \
+	sed -e 'p;s,.*/,,;n' \
+	    -e 'h;s|.*|.|' \
+	    -e 'p;x;s,.*/,,;$(transform)' | 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; \
+	      if (++n[d] == $(am__install_max)) { \
+		print "f", d, files[d]; n[d] = 0; files[d] = "" } } \
+	    else { print "f", d "/" $$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_SCRIPT) $$files '$(DESTDIR)$(bindir)$$dir'"; \
+	       $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
+	     } \
+	; done
 
 uninstall-binSCRIPTS:
 	@$(NORMAL_UNINSTALL)
-	@list='$(bin_SCRIPTS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
-	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
-	done
+	@list='$(bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \
+	files=`for p in $$list; do echo "$$p"; done | \
+	       sed -e 's,.*/,,;$(transform)'`; \
+	test -n "$$list" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(bindir)" && rm -f $$files
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -500,98 +558,905 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/about_modules.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/about_sword.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/about_trans.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/about_xiphos.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bibletext.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bibletext_dialog.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bookmark_dialog.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bookmarks_menu.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bookmarks_treeview.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cipher_key_dialog.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/commentary.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/commentary_dialog.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dialog.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dictlex.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dictlex_dialog.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/display_info.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/export_dialog.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/find_dialog.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/font_dialog.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gbs.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gbs_dialog.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gui.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/html.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main_menu.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main_window.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/menu_popup.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mod_mgr.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/navbar_book.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/navbar_book_dialog.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/navbar_versekey.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/navbar_versekey_dialog.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/navbar_versekey_editor.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/navbar_versekey_parallel.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parallel_dialog.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parallel_tab.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parallel_view.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/preferences_cell_renderer.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/preferences_dialog.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/search_dialog.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/search_sidebar.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/session.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sidebar.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sidebar_dialog.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/splash.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tabbed_browser.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/treekey-editor.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utilities.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xiphos.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xiphos-about_modules.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xiphos-about_sword.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xiphos-about_trans.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xiphos-about_xiphos.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xiphos-bibletext.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xiphos-bibletext_dialog.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xiphos-bookmark_dialog.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xiphos-bookmarks_menu.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xiphos-bookmarks_treeview.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xiphos-cipher_key_dialog.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xiphos-commentary.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xiphos-commentary_dialog.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xiphos-dialog.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xiphos-dictlex.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xiphos-dictlex_dialog.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xiphos-display_info.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xiphos-dummy.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xiphos-export_bookmarks.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xiphos-export_dialog.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xiphos-find_dialog.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xiphos-font_dialog.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xiphos-gbs.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xiphos-gbs_dialog.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xiphos-gui.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xiphos-html.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xiphos-ipc.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xiphos-main_menu.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xiphos-main_window.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xiphos-marshal.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xiphos-menu_popup.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xiphos-mod_mgr.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xiphos-navbar_book.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xiphos-navbar_book_dialog.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xiphos-navbar_versekey.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xiphos-navbar_versekey_dialog.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xiphos-navbar_versekey_editor.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xiphos-navbar_versekey_parallel.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xiphos-parallel_dialog.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xiphos-parallel_tab.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xiphos-parallel_view.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xiphos-preferences_dialog.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xiphos-search_dialog.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xiphos-search_sidebar.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xiphos-sidebar.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xiphos-sidebar_dialog.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xiphos-splash.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xiphos-tabbed_browser.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xiphos-treekey-editor.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xiphos-utilities.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xiphos-xiphos.Po@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@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@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@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) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
+xiphos-about_modules.o: about_modules.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -MT xiphos-about_modules.o -MD -MP -MF $(DEPDIR)/xiphos-about_modules.Tpo -c -o xiphos-about_modules.o `test -f 'about_modules.c' || echo '$(srcdir)/'`about_modules.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xiphos-about_modules.Tpo $(DEPDIR)/xiphos-about_modules.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='about_modules.c' object='xiphos-about_modules.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -c -o xiphos-about_modules.o `test -f 'about_modules.c' || echo '$(srcdir)/'`about_modules.c
+
+xiphos-about_modules.obj: about_modules.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -MT xiphos-about_modules.obj -MD -MP -MF $(DEPDIR)/xiphos-about_modules.Tpo -c -o xiphos-about_modules.obj `if test -f 'about_modules.c'; then $(CYGPATH_W) 'about_modules.c'; else $(CYGPATH_W) '$(srcdir)/about_modules.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xiphos-about_modules.Tpo $(DEPDIR)/xiphos-about_modules.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='about_modules.c' object='xiphos-about_modules.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -c -o xiphos-about_modules.obj `if test -f 'about_modules.c'; then $(CYGPATH_W) 'about_modules.c'; else $(CYGPATH_W) '$(srcdir)/about_modules.c'; fi`
+
+xiphos-about_sword.o: about_sword.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -MT xiphos-about_sword.o -MD -MP -MF $(DEPDIR)/xiphos-about_sword.Tpo -c -o xiphos-about_sword.o `test -f 'about_sword.c' || echo '$(srcdir)/'`about_sword.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xiphos-about_sword.Tpo $(DEPDIR)/xiphos-about_sword.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='about_sword.c' object='xiphos-about_sword.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -c -o xiphos-about_sword.o `test -f 'about_sword.c' || echo '$(srcdir)/'`about_sword.c
+
+xiphos-about_sword.obj: about_sword.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -MT xiphos-about_sword.obj -MD -MP -MF $(DEPDIR)/xiphos-about_sword.Tpo -c -o xiphos-about_sword.obj `if test -f 'about_sword.c'; then $(CYGPATH_W) 'about_sword.c'; else $(CYGPATH_W) '$(srcdir)/about_sword.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xiphos-about_sword.Tpo $(DEPDIR)/xiphos-about_sword.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='about_sword.c' object='xiphos-about_sword.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -c -o xiphos-about_sword.obj `if test -f 'about_sword.c'; then $(CYGPATH_W) 'about_sword.c'; else $(CYGPATH_W) '$(srcdir)/about_sword.c'; fi`
+
+xiphos-about_trans.o: about_trans.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -MT xiphos-about_trans.o -MD -MP -MF $(DEPDIR)/xiphos-about_trans.Tpo -c -o xiphos-about_trans.o `test -f 'about_trans.c' || echo '$(srcdir)/'`about_trans.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xiphos-about_trans.Tpo $(DEPDIR)/xiphos-about_trans.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='about_trans.c' object='xiphos-about_trans.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -c -o xiphos-about_trans.o `test -f 'about_trans.c' || echo '$(srcdir)/'`about_trans.c
+
+xiphos-about_trans.obj: about_trans.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -MT xiphos-about_trans.obj -MD -MP -MF $(DEPDIR)/xiphos-about_trans.Tpo -c -o xiphos-about_trans.obj `if test -f 'about_trans.c'; then $(CYGPATH_W) 'about_trans.c'; else $(CYGPATH_W) '$(srcdir)/about_trans.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xiphos-about_trans.Tpo $(DEPDIR)/xiphos-about_trans.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='about_trans.c' object='xiphos-about_trans.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -c -o xiphos-about_trans.obj `if test -f 'about_trans.c'; then $(CYGPATH_W) 'about_trans.c'; else $(CYGPATH_W) '$(srcdir)/about_trans.c'; fi`
+
+xiphos-about_xiphos.o: about_xiphos.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -MT xiphos-about_xiphos.o -MD -MP -MF $(DEPDIR)/xiphos-about_xiphos.Tpo -c -o xiphos-about_xiphos.o `test -f 'about_xiphos.c' || echo '$(srcdir)/'`about_xiphos.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xiphos-about_xiphos.Tpo $(DEPDIR)/xiphos-about_xiphos.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='about_xiphos.c' object='xiphos-about_xiphos.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -c -o xiphos-about_xiphos.o `test -f 'about_xiphos.c' || echo '$(srcdir)/'`about_xiphos.c
+
+xiphos-about_xiphos.obj: about_xiphos.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -MT xiphos-about_xiphos.obj -MD -MP -MF $(DEPDIR)/xiphos-about_xiphos.Tpo -c -o xiphos-about_xiphos.obj `if test -f 'about_xiphos.c'; then $(CYGPATH_W) 'about_xiphos.c'; else $(CYGPATH_W) '$(srcdir)/about_xiphos.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xiphos-about_xiphos.Tpo $(DEPDIR)/xiphos-about_xiphos.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='about_xiphos.c' object='xiphos-about_xiphos.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -c -o xiphos-about_xiphos.obj `if test -f 'about_xiphos.c'; then $(CYGPATH_W) 'about_xiphos.c'; else $(CYGPATH_W) '$(srcdir)/about_xiphos.c'; fi`
+
+xiphos-bibletext.o: bibletext.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -MT xiphos-bibletext.o -MD -MP -MF $(DEPDIR)/xiphos-bibletext.Tpo -c -o xiphos-bibletext.o `test -f 'bibletext.c' || echo '$(srcdir)/'`bibletext.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xiphos-bibletext.Tpo $(DEPDIR)/xiphos-bibletext.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='bibletext.c' object='xiphos-bibletext.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -c -o xiphos-bibletext.o `test -f 'bibletext.c' || echo '$(srcdir)/'`bibletext.c
+
+xiphos-bibletext.obj: bibletext.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -MT xiphos-bibletext.obj -MD -MP -MF $(DEPDIR)/xiphos-bibletext.Tpo -c -o xiphos-bibletext.obj `if test -f 'bibletext.c'; then $(CYGPATH_W) 'bibletext.c'; else $(CYGPATH_W) '$(srcdir)/bibletext.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xiphos-bibletext.Tpo $(DEPDIR)/xiphos-bibletext.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='bibletext.c' object='xiphos-bibletext.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -c -o xiphos-bibletext.obj `if test -f 'bibletext.c'; then $(CYGPATH_W) 'bibletext.c'; else $(CYGPATH_W) '$(srcdir)/bibletext.c'; fi`
+
+xiphos-bibletext_dialog.o: bibletext_dialog.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -MT xiphos-bibletext_dialog.o -MD -MP -MF $(DEPDIR)/xiphos-bibletext_dialog.Tpo -c -o xiphos-bibletext_dialog.o `test -f 'bibletext_dialog.c' || echo '$(srcdir)/'`bibletext_dialog.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xiphos-bibletext_dialog.Tpo $(DEPDIR)/xiphos-bibletext_dialog.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='bibletext_dialog.c' object='xiphos-bibletext_dialog.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -c -o xiphos-bibletext_dialog.o `test -f 'bibletext_dialog.c' || echo '$(srcdir)/'`bibletext_dialog.c
+
+xiphos-bibletext_dialog.obj: bibletext_dialog.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -MT xiphos-bibletext_dialog.obj -MD -MP -MF $(DEPDIR)/xiphos-bibletext_dialog.Tpo -c -o xiphos-bibletext_dialog.obj `if test -f 'bibletext_dialog.c'; then $(CYGPATH_W) 'bibletext_dialog.c'; else $(CYGPATH_W) '$(srcdir)/bibletext_dialog.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xiphos-bibletext_dialog.Tpo $(DEPDIR)/xiphos-bibletext_dialog.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='bibletext_dialog.c' object='xiphos-bibletext_dialog.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -c -o xiphos-bibletext_dialog.obj `if test -f 'bibletext_dialog.c'; then $(CYGPATH_W) 'bibletext_dialog.c'; else $(CYGPATH_W) '$(srcdir)/bibletext_dialog.c'; fi`
+
+xiphos-bookmark_dialog.o: bookmark_dialog.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -MT xiphos-bookmark_dialog.o -MD -MP -MF $(DEPDIR)/xiphos-bookmark_dialog.Tpo -c -o xiphos-bookmark_dialog.o `test -f 'bookmark_dialog.c' || echo '$(srcdir)/'`bookmark_dialog.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xiphos-bookmark_dialog.Tpo $(DEPDIR)/xiphos-bookmark_dialog.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='bookmark_dialog.c' object='xiphos-bookmark_dialog.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -c -o xiphos-bookmark_dialog.o `test -f 'bookmark_dialog.c' || echo '$(srcdir)/'`bookmark_dialog.c
+
+xiphos-bookmark_dialog.obj: bookmark_dialog.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -MT xiphos-bookmark_dialog.obj -MD -MP -MF $(DEPDIR)/xiphos-bookmark_dialog.Tpo -c -o xiphos-bookmark_dialog.obj `if test -f 'bookmark_dialog.c'; then $(CYGPATH_W) 'bookmark_dialog.c'; else $(CYGPATH_W) '$(srcdir)/bookmark_dialog.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xiphos-bookmark_dialog.Tpo $(DEPDIR)/xiphos-bookmark_dialog.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='bookmark_dialog.c' object='xiphos-bookmark_dialog.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -c -o xiphos-bookmark_dialog.obj `if test -f 'bookmark_dialog.c'; then $(CYGPATH_W) 'bookmark_dialog.c'; else $(CYGPATH_W) '$(srcdir)/bookmark_dialog.c'; fi`
+
+xiphos-bookmarks_menu.o: bookmarks_menu.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -MT xiphos-bookmarks_menu.o -MD -MP -MF $(DEPDIR)/xiphos-bookmarks_menu.Tpo -c -o xiphos-bookmarks_menu.o `test -f 'bookmarks_menu.c' || echo '$(srcdir)/'`bookmarks_menu.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xiphos-bookmarks_menu.Tpo $(DEPDIR)/xiphos-bookmarks_menu.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='bookmarks_menu.c' object='xiphos-bookmarks_menu.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -c -o xiphos-bookmarks_menu.o `test -f 'bookmarks_menu.c' || echo '$(srcdir)/'`bookmarks_menu.c
+
+xiphos-bookmarks_menu.obj: bookmarks_menu.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -MT xiphos-bookmarks_menu.obj -MD -MP -MF $(DEPDIR)/xiphos-bookmarks_menu.Tpo -c -o xiphos-bookmarks_menu.obj `if test -f 'bookmarks_menu.c'; then $(CYGPATH_W) 'bookmarks_menu.c'; else $(CYGPATH_W) '$(srcdir)/bookmarks_menu.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xiphos-bookmarks_menu.Tpo $(DEPDIR)/xiphos-bookmarks_menu.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='bookmarks_menu.c' object='xiphos-bookmarks_menu.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -c -o xiphos-bookmarks_menu.obj `if test -f 'bookmarks_menu.c'; then $(CYGPATH_W) 'bookmarks_menu.c'; else $(CYGPATH_W) '$(srcdir)/bookmarks_menu.c'; fi`
+
+xiphos-bookmarks_treeview.o: bookmarks_treeview.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -MT xiphos-bookmarks_treeview.o -MD -MP -MF $(DEPDIR)/xiphos-bookmarks_treeview.Tpo -c -o xiphos-bookmarks_treeview.o `test -f 'bookmarks_treeview.c' || echo '$(srcdir)/'`bookmarks_treeview.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xiphos-bookmarks_treeview.Tpo $(DEPDIR)/xiphos-bookmarks_treeview.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='bookmarks_treeview.c' object='xiphos-bookmarks_treeview.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -c -o xiphos-bookmarks_treeview.o `test -f 'bookmarks_treeview.c' || echo '$(srcdir)/'`bookmarks_treeview.c
+
+xiphos-bookmarks_treeview.obj: bookmarks_treeview.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -MT xiphos-bookmarks_treeview.obj -MD -MP -MF $(DEPDIR)/xiphos-bookmarks_treeview.Tpo -c -o xiphos-bookmarks_treeview.obj `if test -f 'bookmarks_treeview.c'; then $(CYGPATH_W) 'bookmarks_treeview.c'; else $(CYGPATH_W) '$(srcdir)/bookmarks_treeview.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xiphos-bookmarks_treeview.Tpo $(DEPDIR)/xiphos-bookmarks_treeview.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='bookmarks_treeview.c' object='xiphos-bookmarks_treeview.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -c -o xiphos-bookmarks_treeview.obj `if test -f 'bookmarks_treeview.c'; then $(CYGPATH_W) 'bookmarks_treeview.c'; else $(CYGPATH_W) '$(srcdir)/bookmarks_treeview.c'; fi`
+
+xiphos-cipher_key_dialog.o: cipher_key_dialog.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -MT xiphos-cipher_key_dialog.o -MD -MP -MF $(DEPDIR)/xiphos-cipher_key_dialog.Tpo -c -o xiphos-cipher_key_dialog.o `test -f 'cipher_key_dialog.c' || echo '$(srcdir)/'`cipher_key_dialog.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xiphos-cipher_key_dialog.Tpo $(DEPDIR)/xiphos-cipher_key_dialog.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cipher_key_dialog.c' object='xiphos-cipher_key_dialog.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -c -o xiphos-cipher_key_dialog.o `test -f 'cipher_key_dialog.c' || echo '$(srcdir)/'`cipher_key_dialog.c
+
+xiphos-cipher_key_dialog.obj: cipher_key_dialog.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -MT xiphos-cipher_key_dialog.obj -MD -MP -MF $(DEPDIR)/xiphos-cipher_key_dialog.Tpo -c -o xiphos-cipher_key_dialog.obj `if test -f 'cipher_key_dialog.c'; then $(CYGPATH_W) 'cipher_key_dialog.c'; else $(CYGPATH_W) '$(srcdir)/cipher_key_dialog.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xiphos-cipher_key_dialog.Tpo $(DEPDIR)/xiphos-cipher_key_dialog.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cipher_key_dialog.c' object='xiphos-cipher_key_dialog.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -c -o xiphos-cipher_key_dialog.obj `if test -f 'cipher_key_dialog.c'; then $(CYGPATH_W) 'cipher_key_dialog.c'; else $(CYGPATH_W) '$(srcdir)/cipher_key_dialog.c'; fi`
+
+xiphos-commentary.o: commentary.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -MT xiphos-commentary.o -MD -MP -MF $(DEPDIR)/xiphos-commentary.Tpo -c -o xiphos-commentary.o `test -f 'commentary.c' || echo '$(srcdir)/'`commentary.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xiphos-commentary.Tpo $(DEPDIR)/xiphos-commentary.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='commentary.c' object='xiphos-commentary.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -c -o xiphos-commentary.o `test -f 'commentary.c' || echo '$(srcdir)/'`commentary.c
+
+xiphos-commentary.obj: commentary.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -MT xiphos-commentary.obj -MD -MP -MF $(DEPDIR)/xiphos-commentary.Tpo -c -o xiphos-commentary.obj `if test -f 'commentary.c'; then $(CYGPATH_W) 'commentary.c'; else $(CYGPATH_W) '$(srcdir)/commentary.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xiphos-commentary.Tpo $(DEPDIR)/xiphos-commentary.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='commentary.c' object='xiphos-commentary.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -c -o xiphos-commentary.obj `if test -f 'commentary.c'; then $(CYGPATH_W) 'commentary.c'; else $(CYGPATH_W) '$(srcdir)/commentary.c'; fi`
+
+xiphos-commentary_dialog.o: commentary_dialog.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -MT xiphos-commentary_dialog.o -MD -MP -MF $(DEPDIR)/xiphos-commentary_dialog.Tpo -c -o xiphos-commentary_dialog.o `test -f 'commentary_dialog.c' || echo '$(srcdir)/'`commentary_dialog.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xiphos-commentary_dialog.Tpo $(DEPDIR)/xiphos-commentary_dialog.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='commentary_dialog.c' object='xiphos-commentary_dialog.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -c -o xiphos-commentary_dialog.o `test -f 'commentary_dialog.c' || echo '$(srcdir)/'`commentary_dialog.c
+
+xiphos-commentary_dialog.obj: commentary_dialog.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -MT xiphos-commentary_dialog.obj -MD -MP -MF $(DEPDIR)/xiphos-commentary_dialog.Tpo -c -o xiphos-commentary_dialog.obj `if test -f 'commentary_dialog.c'; then $(CYGPATH_W) 'commentary_dialog.c'; else $(CYGPATH_W) '$(srcdir)/commentary_dialog.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xiphos-commentary_dialog.Tpo $(DEPDIR)/xiphos-commentary_dialog.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='commentary_dialog.c' object='xiphos-commentary_dialog.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -c -o xiphos-commentary_dialog.obj `if test -f 'commentary_dialog.c'; then $(CYGPATH_W) 'commentary_dialog.c'; else $(CYGPATH_W) '$(srcdir)/commentary_dialog.c'; fi`
+
+xiphos-dialog.o: dialog.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -MT xiphos-dialog.o -MD -MP -MF $(DEPDIR)/xiphos-dialog.Tpo -c -o xiphos-dialog.o `test -f 'dialog.c' || echo '$(srcdir)/'`dialog.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xiphos-dialog.Tpo $(DEPDIR)/xiphos-dialog.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dialog.c' object='xiphos-dialog.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -c -o xiphos-dialog.o `test -f 'dialog.c' || echo '$(srcdir)/'`dialog.c
+
+xiphos-dialog.obj: dialog.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -MT xiphos-dialog.obj -MD -MP -MF $(DEPDIR)/xiphos-dialog.Tpo -c -o xiphos-dialog.obj `if test -f 'dialog.c'; then $(CYGPATH_W) 'dialog.c'; else $(CYGPATH_W) '$(srcdir)/dialog.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xiphos-dialog.Tpo $(DEPDIR)/xiphos-dialog.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dialog.c' object='xiphos-dialog.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -c -o xiphos-dialog.obj `if test -f 'dialog.c'; then $(CYGPATH_W) 'dialog.c'; else $(CYGPATH_W) '$(srcdir)/dialog.c'; fi`
+
+xiphos-dictlex.o: dictlex.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -MT xiphos-dictlex.o -MD -MP -MF $(DEPDIR)/xiphos-dictlex.Tpo -c -o xiphos-dictlex.o `test -f 'dictlex.c' || echo '$(srcdir)/'`dictlex.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xiphos-dictlex.Tpo $(DEPDIR)/xiphos-dictlex.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dictlex.c' object='xiphos-dictlex.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -c -o xiphos-dictlex.o `test -f 'dictlex.c' || echo '$(srcdir)/'`dictlex.c
+
+xiphos-dictlex.obj: dictlex.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -MT xiphos-dictlex.obj -MD -MP -MF $(DEPDIR)/xiphos-dictlex.Tpo -c -o xiphos-dictlex.obj `if test -f 'dictlex.c'; then $(CYGPATH_W) 'dictlex.c'; else $(CYGPATH_W) '$(srcdir)/dictlex.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xiphos-dictlex.Tpo $(DEPDIR)/xiphos-dictlex.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dictlex.c' object='xiphos-dictlex.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -c -o xiphos-dictlex.obj `if test -f 'dictlex.c'; then $(CYGPATH_W) 'dictlex.c'; else $(CYGPATH_W) '$(srcdir)/dictlex.c'; fi`
+
+xiphos-dictlex_dialog.o: dictlex_dialog.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -MT xiphos-dictlex_dialog.o -MD -MP -MF $(DEPDIR)/xiphos-dictlex_dialog.Tpo -c -o xiphos-dictlex_dialog.o `test -f 'dictlex_dialog.c' || echo '$(srcdir)/'`dictlex_dialog.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xiphos-dictlex_dialog.Tpo $(DEPDIR)/xiphos-dictlex_dialog.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dictlex_dialog.c' object='xiphos-dictlex_dialog.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -c -o xiphos-dictlex_dialog.o `test -f 'dictlex_dialog.c' || echo '$(srcdir)/'`dictlex_dialog.c
+
+xiphos-dictlex_dialog.obj: dictlex_dialog.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -MT xiphos-dictlex_dialog.obj -MD -MP -MF $(DEPDIR)/xiphos-dictlex_dialog.Tpo -c -o xiphos-dictlex_dialog.obj `if test -f 'dictlex_dialog.c'; then $(CYGPATH_W) 'dictlex_dialog.c'; else $(CYGPATH_W) '$(srcdir)/dictlex_dialog.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xiphos-dictlex_dialog.Tpo $(DEPDIR)/xiphos-dictlex_dialog.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dictlex_dialog.c' object='xiphos-dictlex_dialog.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -c -o xiphos-dictlex_dialog.obj `if test -f 'dictlex_dialog.c'; then $(CYGPATH_W) 'dictlex_dialog.c'; else $(CYGPATH_W) '$(srcdir)/dictlex_dialog.c'; fi`
+
+xiphos-display_info.o: display_info.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -MT xiphos-display_info.o -MD -MP -MF $(DEPDIR)/xiphos-display_info.Tpo -c -o xiphos-display_info.o `test -f 'display_info.c' || echo '$(srcdir)/'`display_info.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xiphos-display_info.Tpo $(DEPDIR)/xiphos-display_info.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='display_info.c' object='xiphos-display_info.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -c -o xiphos-display_info.o `test -f 'display_info.c' || echo '$(srcdir)/'`display_info.c
+
+xiphos-display_info.obj: display_info.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -MT xiphos-display_info.obj -MD -MP -MF $(DEPDIR)/xiphos-display_info.Tpo -c -o xiphos-display_info.obj `if test -f 'display_info.c'; then $(CYGPATH_W) 'display_info.c'; else $(CYGPATH_W) '$(srcdir)/display_info.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xiphos-display_info.Tpo $(DEPDIR)/xiphos-display_info.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='display_info.c' object='xiphos-display_info.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -c -o xiphos-display_info.obj `if test -f 'display_info.c'; then $(CYGPATH_W) 'display_info.c'; else $(CYGPATH_W) '$(srcdir)/display_info.c'; fi`
+
+xiphos-export_bookmarks.o: export_bookmarks.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -MT xiphos-export_bookmarks.o -MD -MP -MF $(DEPDIR)/xiphos-export_bookmarks.Tpo -c -o xiphos-export_bookmarks.o `test -f 'export_bookmarks.c' || echo '$(srcdir)/'`export_bookmarks.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xiphos-export_bookmarks.Tpo $(DEPDIR)/xiphos-export_bookmarks.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='export_bookmarks.c' object='xiphos-export_bookmarks.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -c -o xiphos-export_bookmarks.o `test -f 'export_bookmarks.c' || echo '$(srcdir)/'`export_bookmarks.c
+
+xiphos-export_bookmarks.obj: export_bookmarks.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -MT xiphos-export_bookmarks.obj -MD -MP -MF $(DEPDIR)/xiphos-export_bookmarks.Tpo -c -o xiphos-export_bookmarks.obj `if test -f 'export_bookmarks.c'; then $(CYGPATH_W) 'export_bookmarks.c'; else $(CYGPATH_W) '$(srcdir)/export_bookmarks.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xiphos-export_bookmarks.Tpo $(DEPDIR)/xiphos-export_bookmarks.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='export_bookmarks.c' object='xiphos-export_bookmarks.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -c -o xiphos-export_bookmarks.obj `if test -f 'export_bookmarks.c'; then $(CYGPATH_W) 'export_bookmarks.c'; else $(CYGPATH_W) '$(srcdir)/export_bookmarks.c'; fi`
+
+xiphos-export_dialog.o: export_dialog.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -MT xiphos-export_dialog.o -MD -MP -MF $(DEPDIR)/xiphos-export_dialog.Tpo -c -o xiphos-export_dialog.o `test -f 'export_dialog.c' || echo '$(srcdir)/'`export_dialog.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xiphos-export_dialog.Tpo $(DEPDIR)/xiphos-export_dialog.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='export_dialog.c' object='xiphos-export_dialog.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -c -o xiphos-export_dialog.o `test -f 'export_dialog.c' || echo '$(srcdir)/'`export_dialog.c
+
+xiphos-export_dialog.obj: export_dialog.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -MT xiphos-export_dialog.obj -MD -MP -MF $(DEPDIR)/xiphos-export_dialog.Tpo -c -o xiphos-export_dialog.obj `if test -f 'export_dialog.c'; then $(CYGPATH_W) 'export_dialog.c'; else $(CYGPATH_W) '$(srcdir)/export_dialog.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xiphos-export_dialog.Tpo $(DEPDIR)/xiphos-export_dialog.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='export_dialog.c' object='xiphos-export_dialog.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -c -o xiphos-export_dialog.obj `if test -f 'export_dialog.c'; then $(CYGPATH_W) 'export_dialog.c'; else $(CYGPATH_W) '$(srcdir)/export_dialog.c'; fi`
+
+xiphos-find_dialog.o: find_dialog.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -MT xiphos-find_dialog.o -MD -MP -MF $(DEPDIR)/xiphos-find_dialog.Tpo -c -o xiphos-find_dialog.o `test -f 'find_dialog.c' || echo '$(srcdir)/'`find_dialog.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xiphos-find_dialog.Tpo $(DEPDIR)/xiphos-find_dialog.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='find_dialog.c' object='xiphos-find_dialog.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -c -o xiphos-find_dialog.o `test -f 'find_dialog.c' || echo '$(srcdir)/'`find_dialog.c
+
+xiphos-find_dialog.obj: find_dialog.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -MT xiphos-find_dialog.obj -MD -MP -MF $(DEPDIR)/xiphos-find_dialog.Tpo -c -o xiphos-find_dialog.obj `if test -f 'find_dialog.c'; then $(CYGPATH_W) 'find_dialog.c'; else $(CYGPATH_W) '$(srcdir)/find_dialog.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xiphos-find_dialog.Tpo $(DEPDIR)/xiphos-find_dialog.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='find_dialog.c' object='xiphos-find_dialog.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -c -o xiphos-find_dialog.obj `if test -f 'find_dialog.c'; then $(CYGPATH_W) 'find_dialog.c'; else $(CYGPATH_W) '$(srcdir)/find_dialog.c'; fi`
+
+xiphos-font_dialog.o: font_dialog.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -MT xiphos-font_dialog.o -MD -MP -MF $(DEPDIR)/xiphos-font_dialog.Tpo -c -o xiphos-font_dialog.o `test -f 'font_dialog.c' || echo '$(srcdir)/'`font_dialog.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xiphos-font_dialog.Tpo $(DEPDIR)/xiphos-font_dialog.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='font_dialog.c' object='xiphos-font_dialog.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -c -o xiphos-font_dialog.o `test -f 'font_dialog.c' || echo '$(srcdir)/'`font_dialog.c
+
+xiphos-font_dialog.obj: font_dialog.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -MT xiphos-font_dialog.obj -MD -MP -MF $(DEPDIR)/xiphos-font_dialog.Tpo -c -o xiphos-font_dialog.obj `if test -f 'font_dialog.c'; then $(CYGPATH_W) 'font_dialog.c'; else $(CYGPATH_W) '$(srcdir)/font_dialog.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xiphos-font_dialog.Tpo $(DEPDIR)/xiphos-font_dialog.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='font_dialog.c' object='xiphos-font_dialog.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -c -o xiphos-font_dialog.obj `if test -f 'font_dialog.c'; then $(CYGPATH_W) 'font_dialog.c'; else $(CYGPATH_W) '$(srcdir)/font_dialog.c'; fi`
+
+xiphos-gbs.o: gbs.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -MT xiphos-gbs.o -MD -MP -MF $(DEPDIR)/xiphos-gbs.Tpo -c -o xiphos-gbs.o `test -f 'gbs.c' || echo '$(srcdir)/'`gbs.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xiphos-gbs.Tpo $(DEPDIR)/xiphos-gbs.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gbs.c' object='xiphos-gbs.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -c -o xiphos-gbs.o `test -f 'gbs.c' || echo '$(srcdir)/'`gbs.c
+
+xiphos-gbs.obj: gbs.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -MT xiphos-gbs.obj -MD -MP -MF $(DEPDIR)/xiphos-gbs.Tpo -c -o xiphos-gbs.obj `if test -f 'gbs.c'; then $(CYGPATH_W) 'gbs.c'; else $(CYGPATH_W) '$(srcdir)/gbs.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xiphos-gbs.Tpo $(DEPDIR)/xiphos-gbs.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gbs.c' object='xiphos-gbs.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -c -o xiphos-gbs.obj `if test -f 'gbs.c'; then $(CYGPATH_W) 'gbs.c'; else $(CYGPATH_W) '$(srcdir)/gbs.c'; fi`
+
+xiphos-gbs_dialog.o: gbs_dialog.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -MT xiphos-gbs_dialog.o -MD -MP -MF $(DEPDIR)/xiphos-gbs_dialog.Tpo -c -o xiphos-gbs_dialog.o `test -f 'gbs_dialog.c' || echo '$(srcdir)/'`gbs_dialog.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xiphos-gbs_dialog.Tpo $(DEPDIR)/xiphos-gbs_dialog.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gbs_dialog.c' object='xiphos-gbs_dialog.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -c -o xiphos-gbs_dialog.o `test -f 'gbs_dialog.c' || echo '$(srcdir)/'`gbs_dialog.c
+
+xiphos-gbs_dialog.obj: gbs_dialog.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -MT xiphos-gbs_dialog.obj -MD -MP -MF $(DEPDIR)/xiphos-gbs_dialog.Tpo -c -o xiphos-gbs_dialog.obj `if test -f 'gbs_dialog.c'; then $(CYGPATH_W) 'gbs_dialog.c'; else $(CYGPATH_W) '$(srcdir)/gbs_dialog.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xiphos-gbs_dialog.Tpo $(DEPDIR)/xiphos-gbs_dialog.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gbs_dialog.c' object='xiphos-gbs_dialog.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -c -o xiphos-gbs_dialog.obj `if test -f 'gbs_dialog.c'; then $(CYGPATH_W) 'gbs_dialog.c'; else $(CYGPATH_W) '$(srcdir)/gbs_dialog.c'; fi`
+
+xiphos-gui.o: gui.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -MT xiphos-gui.o -MD -MP -MF $(DEPDIR)/xiphos-gui.Tpo -c -o xiphos-gui.o `test -f 'gui.c' || echo '$(srcdir)/'`gui.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xiphos-gui.Tpo $(DEPDIR)/xiphos-gui.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gui.c' object='xiphos-gui.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -c -o xiphos-gui.o `test -f 'gui.c' || echo '$(srcdir)/'`gui.c
+
+xiphos-gui.obj: gui.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -MT xiphos-gui.obj -MD -MP -MF $(DEPDIR)/xiphos-gui.Tpo -c -o xiphos-gui.obj `if test -f 'gui.c'; then $(CYGPATH_W) 'gui.c'; else $(CYGPATH_W) '$(srcdir)/gui.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xiphos-gui.Tpo $(DEPDIR)/xiphos-gui.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gui.c' object='xiphos-gui.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -c -o xiphos-gui.obj `if test -f 'gui.c'; then $(CYGPATH_W) 'gui.c'; else $(CYGPATH_W) '$(srcdir)/gui.c'; fi`
+
+xiphos-html.o: html.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -MT xiphos-html.o -MD -MP -MF $(DEPDIR)/xiphos-html.Tpo -c -o xiphos-html.o `test -f 'html.c' || echo '$(srcdir)/'`html.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xiphos-html.Tpo $(DEPDIR)/xiphos-html.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='html.c' object='xiphos-html.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -c -o xiphos-html.o `test -f 'html.c' || echo '$(srcdir)/'`html.c
+
+xiphos-html.obj: html.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -MT xiphos-html.obj -MD -MP -MF $(DEPDIR)/xiphos-html.Tpo -c -o xiphos-html.obj `if test -f 'html.c'; then $(CYGPATH_W) 'html.c'; else $(CYGPATH_W) '$(srcdir)/html.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xiphos-html.Tpo $(DEPDIR)/xiphos-html.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='html.c' object='xiphos-html.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -c -o xiphos-html.obj `if test -f 'html.c'; then $(CYGPATH_W) 'html.c'; else $(CYGPATH_W) '$(srcdir)/html.c'; fi`
+
+xiphos-ipc.o: ipc.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -MT xiphos-ipc.o -MD -MP -MF $(DEPDIR)/xiphos-ipc.Tpo -c -o xiphos-ipc.o `test -f 'ipc.c' || echo '$(srcdir)/'`ipc.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xiphos-ipc.Tpo $(DEPDIR)/xiphos-ipc.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ipc.c' object='xiphos-ipc.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -c -o xiphos-ipc.o `test -f 'ipc.c' || echo '$(srcdir)/'`ipc.c
+
+xiphos-ipc.obj: ipc.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -MT xiphos-ipc.obj -MD -MP -MF $(DEPDIR)/xiphos-ipc.Tpo -c -o xiphos-ipc.obj `if test -f 'ipc.c'; then $(CYGPATH_W) 'ipc.c'; else $(CYGPATH_W) '$(srcdir)/ipc.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xiphos-ipc.Tpo $(DEPDIR)/xiphos-ipc.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ipc.c' object='xiphos-ipc.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -c -o xiphos-ipc.obj `if test -f 'ipc.c'; then $(CYGPATH_W) 'ipc.c'; else $(CYGPATH_W) '$(srcdir)/ipc.c'; fi`
+
+xiphos-main_menu.o: main_menu.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -MT xiphos-main_menu.o -MD -MP -MF $(DEPDIR)/xiphos-main_menu.Tpo -c -o xiphos-main_menu.o `test -f 'main_menu.c' || echo '$(srcdir)/'`main_menu.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xiphos-main_menu.Tpo $(DEPDIR)/xiphos-main_menu.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='main_menu.c' object='xiphos-main_menu.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -c -o xiphos-main_menu.o `test -f 'main_menu.c' || echo '$(srcdir)/'`main_menu.c
+
+xiphos-main_menu.obj: main_menu.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -MT xiphos-main_menu.obj -MD -MP -MF $(DEPDIR)/xiphos-main_menu.Tpo -c -o xiphos-main_menu.obj `if test -f 'main_menu.c'; then $(CYGPATH_W) 'main_menu.c'; else $(CYGPATH_W) '$(srcdir)/main_menu.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xiphos-main_menu.Tpo $(DEPDIR)/xiphos-main_menu.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='main_menu.c' object='xiphos-main_menu.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -c -o xiphos-main_menu.obj `if test -f 'main_menu.c'; then $(CYGPATH_W) 'main_menu.c'; else $(CYGPATH_W) '$(srcdir)/main_menu.c'; fi`
+
+xiphos-main_window.o: main_window.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -MT xiphos-main_window.o -MD -MP -MF $(DEPDIR)/xiphos-main_window.Tpo -c -o xiphos-main_window.o `test -f 'main_window.c' || echo '$(srcdir)/'`main_window.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xiphos-main_window.Tpo $(DEPDIR)/xiphos-main_window.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='main_window.c' object='xiphos-main_window.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -c -o xiphos-main_window.o `test -f 'main_window.c' || echo '$(srcdir)/'`main_window.c
+
+xiphos-main_window.obj: main_window.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -MT xiphos-main_window.obj -MD -MP -MF $(DEPDIR)/xiphos-main_window.Tpo -c -o xiphos-main_window.obj `if test -f 'main_window.c'; then $(CYGPATH_W) 'main_window.c'; else $(CYGPATH_W) '$(srcdir)/main_window.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xiphos-main_window.Tpo $(DEPDIR)/xiphos-main_window.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='main_window.c' object='xiphos-main_window.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -c -o xiphos-main_window.obj `if test -f 'main_window.c'; then $(CYGPATH_W) 'main_window.c'; else $(CYGPATH_W) '$(srcdir)/main_window.c'; fi`
+
+xiphos-marshal.o: marshal.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -MT xiphos-marshal.o -MD -MP -MF $(DEPDIR)/xiphos-marshal.Tpo -c -o xiphos-marshal.o `test -f 'marshal.c' || echo '$(srcdir)/'`marshal.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xiphos-marshal.Tpo $(DEPDIR)/xiphos-marshal.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='marshal.c' object='xiphos-marshal.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -c -o xiphos-marshal.o `test -f 'marshal.c' || echo '$(srcdir)/'`marshal.c
+
+xiphos-marshal.obj: marshal.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -MT xiphos-marshal.obj -MD -MP -MF $(DEPDIR)/xiphos-marshal.Tpo -c -o xiphos-marshal.obj `if test -f 'marshal.c'; then $(CYGPATH_W) 'marshal.c'; else $(CYGPATH_W) '$(srcdir)/marshal.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xiphos-marshal.Tpo $(DEPDIR)/xiphos-marshal.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='marshal.c' object='xiphos-marshal.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -c -o xiphos-marshal.obj `if test -f 'marshal.c'; then $(CYGPATH_W) 'marshal.c'; else $(CYGPATH_W) '$(srcdir)/marshal.c'; fi`
+
+xiphos-menu_popup.o: menu_popup.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -MT xiphos-menu_popup.o -MD -MP -MF $(DEPDIR)/xiphos-menu_popup.Tpo -c -o xiphos-menu_popup.o `test -f 'menu_popup.c' || echo '$(srcdir)/'`menu_popup.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xiphos-menu_popup.Tpo $(DEPDIR)/xiphos-menu_popup.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='menu_popup.c' object='xiphos-menu_popup.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -c -o xiphos-menu_popup.o `test -f 'menu_popup.c' || echo '$(srcdir)/'`menu_popup.c
+
+xiphos-menu_popup.obj: menu_popup.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -MT xiphos-menu_popup.obj -MD -MP -MF $(DEPDIR)/xiphos-menu_popup.Tpo -c -o xiphos-menu_popup.obj `if test -f 'menu_popup.c'; then $(CYGPATH_W) 'menu_popup.c'; else $(CYGPATH_W) '$(srcdir)/menu_popup.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xiphos-menu_popup.Tpo $(DEPDIR)/xiphos-menu_popup.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='menu_popup.c' object='xiphos-menu_popup.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -c -o xiphos-menu_popup.obj `if test -f 'menu_popup.c'; then $(CYGPATH_W) 'menu_popup.c'; else $(CYGPATH_W) '$(srcdir)/menu_popup.c'; fi`
+
+xiphos-mod_mgr.o: mod_mgr.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -MT xiphos-mod_mgr.o -MD -MP -MF $(DEPDIR)/xiphos-mod_mgr.Tpo -c -o xiphos-mod_mgr.o `test -f 'mod_mgr.c' || echo '$(srcdir)/'`mod_mgr.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xiphos-mod_mgr.Tpo $(DEPDIR)/xiphos-mod_mgr.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mod_mgr.c' object='xiphos-mod_mgr.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -c -o xiphos-mod_mgr.o `test -f 'mod_mgr.c' || echo '$(srcdir)/'`mod_mgr.c
+
+xiphos-mod_mgr.obj: mod_mgr.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -MT xiphos-mod_mgr.obj -MD -MP -MF $(DEPDIR)/xiphos-mod_mgr.Tpo -c -o xiphos-mod_mgr.obj `if test -f 'mod_mgr.c'; then $(CYGPATH_W) 'mod_mgr.c'; else $(CYGPATH_W) '$(srcdir)/mod_mgr.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xiphos-mod_mgr.Tpo $(DEPDIR)/xiphos-mod_mgr.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mod_mgr.c' object='xiphos-mod_mgr.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -c -o xiphos-mod_mgr.obj `if test -f 'mod_mgr.c'; then $(CYGPATH_W) 'mod_mgr.c'; else $(CYGPATH_W) '$(srcdir)/mod_mgr.c'; fi`
+
+xiphos-navbar_book.o: navbar_book.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -MT xiphos-navbar_book.o -MD -MP -MF $(DEPDIR)/xiphos-navbar_book.Tpo -c -o xiphos-navbar_book.o `test -f 'navbar_book.c' || echo '$(srcdir)/'`navbar_book.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xiphos-navbar_book.Tpo $(DEPDIR)/xiphos-navbar_book.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='navbar_book.c' object='xiphos-navbar_book.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -c -o xiphos-navbar_book.o `test -f 'navbar_book.c' || echo '$(srcdir)/'`navbar_book.c
+
+xiphos-navbar_book.obj: navbar_book.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -MT xiphos-navbar_book.obj -MD -MP -MF $(DEPDIR)/xiphos-navbar_book.Tpo -c -o xiphos-navbar_book.obj `if test -f 'navbar_book.c'; then $(CYGPATH_W) 'navbar_book.c'; else $(CYGPATH_W) '$(srcdir)/navbar_book.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xiphos-navbar_book.Tpo $(DEPDIR)/xiphos-navbar_book.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='navbar_book.c' object='xiphos-navbar_book.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -c -o xiphos-navbar_book.obj `if test -f 'navbar_book.c'; then $(CYGPATH_W) 'navbar_book.c'; else $(CYGPATH_W) '$(srcdir)/navbar_book.c'; fi`
+
+xiphos-navbar_book_dialog.o: navbar_book_dialog.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -MT xiphos-navbar_book_dialog.o -MD -MP -MF $(DEPDIR)/xiphos-navbar_book_dialog.Tpo -c -o xiphos-navbar_book_dialog.o `test -f 'navbar_book_dialog.c' || echo '$(srcdir)/'`navbar_book_dialog.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xiphos-navbar_book_dialog.Tpo $(DEPDIR)/xiphos-navbar_book_dialog.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='navbar_book_dialog.c' object='xiphos-navbar_book_dialog.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -c -o xiphos-navbar_book_dialog.o `test -f 'navbar_book_dialog.c' || echo '$(srcdir)/'`navbar_book_dialog.c
+
+xiphos-navbar_book_dialog.obj: navbar_book_dialog.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -MT xiphos-navbar_book_dialog.obj -MD -MP -MF $(DEPDIR)/xiphos-navbar_book_dialog.Tpo -c -o xiphos-navbar_book_dialog.obj `if test -f 'navbar_book_dialog.c'; then $(CYGPATH_W) 'navbar_book_dialog.c'; else $(CYGPATH_W) '$(srcdir)/navbar_book_dialog.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xiphos-navbar_book_dialog.Tpo $(DEPDIR)/xiphos-navbar_book_dialog.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='navbar_book_dialog.c' object='xiphos-navbar_book_dialog.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -c -o xiphos-navbar_book_dialog.obj `if test -f 'navbar_book_dialog.c'; then $(CYGPATH_W) 'navbar_book_dialog.c'; else $(CYGPATH_W) '$(srcdir)/navbar_book_dialog.c'; fi`
+
+xiphos-navbar_versekey.o: navbar_versekey.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -MT xiphos-navbar_versekey.o -MD -MP -MF $(DEPDIR)/xiphos-navbar_versekey.Tpo -c -o xiphos-navbar_versekey.o `test -f 'navbar_versekey.c' || echo '$(srcdir)/'`navbar_versekey.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xiphos-navbar_versekey.Tpo $(DEPDIR)/xiphos-navbar_versekey.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='navbar_versekey.c' object='xiphos-navbar_versekey.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -c -o xiphos-navbar_versekey.o `test -f 'navbar_versekey.c' || echo '$(srcdir)/'`navbar_versekey.c
+
+xiphos-navbar_versekey.obj: navbar_versekey.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -MT xiphos-navbar_versekey.obj -MD -MP -MF $(DEPDIR)/xiphos-navbar_versekey.Tpo -c -o xiphos-navbar_versekey.obj `if test -f 'navbar_versekey.c'; then $(CYGPATH_W) 'navbar_versekey.c'; else $(CYGPATH_W) '$(srcdir)/navbar_versekey.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xiphos-navbar_versekey.Tpo $(DEPDIR)/xiphos-navbar_versekey.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='navbar_versekey.c' object='xiphos-navbar_versekey.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -c -o xiphos-navbar_versekey.obj `if test -f 'navbar_versekey.c'; then $(CYGPATH_W) 'navbar_versekey.c'; else $(CYGPATH_W) '$(srcdir)/navbar_versekey.c'; fi`
+
+xiphos-navbar_versekey_dialog.o: navbar_versekey_dialog.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -MT xiphos-navbar_versekey_dialog.o -MD -MP -MF $(DEPDIR)/xiphos-navbar_versekey_dialog.Tpo -c -o xiphos-navbar_versekey_dialog.o `test -f 'navbar_versekey_dialog.c' || echo '$(srcdir)/'`navbar_versekey_dialog.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xiphos-navbar_versekey_dialog.Tpo $(DEPDIR)/xiphos-navbar_versekey_dialog.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='navbar_versekey_dialog.c' object='xiphos-navbar_versekey_dialog.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -c -o xiphos-navbar_versekey_dialog.o `test -f 'navbar_versekey_dialog.c' || echo '$(srcdir)/'`navbar_versekey_dialog.c
+
+xiphos-navbar_versekey_dialog.obj: navbar_versekey_dialog.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -MT xiphos-navbar_versekey_dialog.obj -MD -MP -MF $(DEPDIR)/xiphos-navbar_versekey_dialog.Tpo -c -o xiphos-navbar_versekey_dialog.obj `if test -f 'navbar_versekey_dialog.c'; then $(CYGPATH_W) 'navbar_versekey_dialog.c'; else $(CYGPATH_W) '$(srcdir)/navbar_versekey_dialog.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xiphos-navbar_versekey_dialog.Tpo $(DEPDIR)/xiphos-navbar_versekey_dialog.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='navbar_versekey_dialog.c' object='xiphos-navbar_versekey_dialog.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -c -o xiphos-navbar_versekey_dialog.obj `if test -f 'navbar_versekey_dialog.c'; then $(CYGPATH_W) 'navbar_versekey_dialog.c'; else $(CYGPATH_W) '$(srcdir)/navbar_versekey_dialog.c'; fi`
+
+xiphos-navbar_versekey_editor.o: navbar_versekey_editor.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -MT xiphos-navbar_versekey_editor.o -MD -MP -MF $(DEPDIR)/xiphos-navbar_versekey_editor.Tpo -c -o xiphos-navbar_versekey_editor.o `test -f 'navbar_versekey_editor.c' || echo '$(srcdir)/'`navbar_versekey_editor.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xiphos-navbar_versekey_editor.Tpo $(DEPDIR)/xiphos-navbar_versekey_editor.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='navbar_versekey_editor.c' object='xiphos-navbar_versekey_editor.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -c -o xiphos-navbar_versekey_editor.o `test -f 'navbar_versekey_editor.c' || echo '$(srcdir)/'`navbar_versekey_editor.c
+
+xiphos-navbar_versekey_editor.obj: navbar_versekey_editor.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -MT xiphos-navbar_versekey_editor.obj -MD -MP -MF $(DEPDIR)/xiphos-navbar_versekey_editor.Tpo -c -o xiphos-navbar_versekey_editor.obj `if test -f 'navbar_versekey_editor.c'; then $(CYGPATH_W) 'navbar_versekey_editor.c'; else $(CYGPATH_W) '$(srcdir)/navbar_versekey_editor.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xiphos-navbar_versekey_editor.Tpo $(DEPDIR)/xiphos-navbar_versekey_editor.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='navbar_versekey_editor.c' object='xiphos-navbar_versekey_editor.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -c -o xiphos-navbar_versekey_editor.obj `if test -f 'navbar_versekey_editor.c'; then $(CYGPATH_W) 'navbar_versekey_editor.c'; else $(CYGPATH_W) '$(srcdir)/navbar_versekey_editor.c'; fi`
+
+xiphos-navbar_versekey_parallel.o: navbar_versekey_parallel.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -MT xiphos-navbar_versekey_parallel.o -MD -MP -MF $(DEPDIR)/xiphos-navbar_versekey_parallel.Tpo -c -o xiphos-navbar_versekey_parallel.o `test -f 'navbar_versekey_parallel.c' || echo '$(srcdir)/'`navbar_versekey_parallel.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xiphos-navbar_versekey_parallel.Tpo $(DEPDIR)/xiphos-navbar_versekey_parallel.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='navbar_versekey_parallel.c' object='xiphos-navbar_versekey_parallel.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -c -o xiphos-navbar_versekey_parallel.o `test -f 'navbar_versekey_parallel.c' || echo '$(srcdir)/'`navbar_versekey_parallel.c
+
+xiphos-navbar_versekey_parallel.obj: navbar_versekey_parallel.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -MT xiphos-navbar_versekey_parallel.obj -MD -MP -MF $(DEPDIR)/xiphos-navbar_versekey_parallel.Tpo -c -o xiphos-navbar_versekey_parallel.obj `if test -f 'navbar_versekey_parallel.c'; then $(CYGPATH_W) 'navbar_versekey_parallel.c'; else $(CYGPATH_W) '$(srcdir)/navbar_versekey_parallel.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xiphos-navbar_versekey_parallel.Tpo $(DEPDIR)/xiphos-navbar_versekey_parallel.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='navbar_versekey_parallel.c' object='xiphos-navbar_versekey_parallel.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -c -o xiphos-navbar_versekey_parallel.obj `if test -f 'navbar_versekey_parallel.c'; then $(CYGPATH_W) 'navbar_versekey_parallel.c'; else $(CYGPATH_W) '$(srcdir)/navbar_versekey_parallel.c'; fi`
+
+xiphos-parallel_dialog.o: parallel_dialog.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -MT xiphos-parallel_dialog.o -MD -MP -MF $(DEPDIR)/xiphos-parallel_dialog.Tpo -c -o xiphos-parallel_dialog.o `test -f 'parallel_dialog.c' || echo '$(srcdir)/'`parallel_dialog.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xiphos-parallel_dialog.Tpo $(DEPDIR)/xiphos-parallel_dialog.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='parallel_dialog.c' object='xiphos-parallel_dialog.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -c -o xiphos-parallel_dialog.o `test -f 'parallel_dialog.c' || echo '$(srcdir)/'`parallel_dialog.c
+
+xiphos-parallel_dialog.obj: parallel_dialog.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -MT xiphos-parallel_dialog.obj -MD -MP -MF $(DEPDIR)/xiphos-parallel_dialog.Tpo -c -o xiphos-parallel_dialog.obj `if test -f 'parallel_dialog.c'; then $(CYGPATH_W) 'parallel_dialog.c'; else $(CYGPATH_W) '$(srcdir)/parallel_dialog.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xiphos-parallel_dialog.Tpo $(DEPDIR)/xiphos-parallel_dialog.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='parallel_dialog.c' object='xiphos-parallel_dialog.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -c -o xiphos-parallel_dialog.obj `if test -f 'parallel_dialog.c'; then $(CYGPATH_W) 'parallel_dialog.c'; else $(CYGPATH_W) '$(srcdir)/parallel_dialog.c'; fi`
+
+xiphos-parallel_tab.o: parallel_tab.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -MT xiphos-parallel_tab.o -MD -MP -MF $(DEPDIR)/xiphos-parallel_tab.Tpo -c -o xiphos-parallel_tab.o `test -f 'parallel_tab.c' || echo '$(srcdir)/'`parallel_tab.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xiphos-parallel_tab.Tpo $(DEPDIR)/xiphos-parallel_tab.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='parallel_tab.c' object='xiphos-parallel_tab.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -c -o xiphos-parallel_tab.o `test -f 'parallel_tab.c' || echo '$(srcdir)/'`parallel_tab.c
+
+xiphos-parallel_tab.obj: parallel_tab.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -MT xiphos-parallel_tab.obj -MD -MP -MF $(DEPDIR)/xiphos-parallel_tab.Tpo -c -o xiphos-parallel_tab.obj `if test -f 'parallel_tab.c'; then $(CYGPATH_W) 'parallel_tab.c'; else $(CYGPATH_W) '$(srcdir)/parallel_tab.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xiphos-parallel_tab.Tpo $(DEPDIR)/xiphos-parallel_tab.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='parallel_tab.c' object='xiphos-parallel_tab.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -c -o xiphos-parallel_tab.obj `if test -f 'parallel_tab.c'; then $(CYGPATH_W) 'parallel_tab.c'; else $(CYGPATH_W) '$(srcdir)/parallel_tab.c'; fi`
+
+xiphos-parallel_view.o: parallel_view.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -MT xiphos-parallel_view.o -MD -MP -MF $(DEPDIR)/xiphos-parallel_view.Tpo -c -o xiphos-parallel_view.o `test -f 'parallel_view.c' || echo '$(srcdir)/'`parallel_view.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xiphos-parallel_view.Tpo $(DEPDIR)/xiphos-parallel_view.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='parallel_view.c' object='xiphos-parallel_view.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -c -o xiphos-parallel_view.o `test -f 'parallel_view.c' || echo '$(srcdir)/'`parallel_view.c
+
+xiphos-parallel_view.obj: parallel_view.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -MT xiphos-parallel_view.obj -MD -MP -MF $(DEPDIR)/xiphos-parallel_view.Tpo -c -o xiphos-parallel_view.obj `if test -f 'parallel_view.c'; then $(CYGPATH_W) 'parallel_view.c'; else $(CYGPATH_W) '$(srcdir)/parallel_view.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xiphos-parallel_view.Tpo $(DEPDIR)/xiphos-parallel_view.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='parallel_view.c' object='xiphos-parallel_view.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -c -o xiphos-parallel_view.obj `if test -f 'parallel_view.c'; then $(CYGPATH_W) 'parallel_view.c'; else $(CYGPATH_W) '$(srcdir)/parallel_view.c'; fi`
+
+xiphos-preferences_dialog.o: preferences_dialog.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -MT xiphos-preferences_dialog.o -MD -MP -MF $(DEPDIR)/xiphos-preferences_dialog.Tpo -c -o xiphos-preferences_dialog.o `test -f 'preferences_dialog.c' || echo '$(srcdir)/'`preferences_dialog.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xiphos-preferences_dialog.Tpo $(DEPDIR)/xiphos-preferences_dialog.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='preferences_dialog.c' object='xiphos-preferences_dialog.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -c -o xiphos-preferences_dialog.o `test -f 'preferences_dialog.c' || echo '$(srcdir)/'`preferences_dialog.c
+
+xiphos-preferences_dialog.obj: preferences_dialog.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -MT xiphos-preferences_dialog.obj -MD -MP -MF $(DEPDIR)/xiphos-preferences_dialog.Tpo -c -o xiphos-preferences_dialog.obj `if test -f 'preferences_dialog.c'; then $(CYGPATH_W) 'preferences_dialog.c'; else $(CYGPATH_W) '$(srcdir)/preferences_dialog.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xiphos-preferences_dialog.Tpo $(DEPDIR)/xiphos-preferences_dialog.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='preferences_dialog.c' object='xiphos-preferences_dialog.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -c -o xiphos-preferences_dialog.obj `if test -f 'preferences_dialog.c'; then $(CYGPATH_W) 'preferences_dialog.c'; else $(CYGPATH_W) '$(srcdir)/preferences_dialog.c'; fi`
+
+xiphos-search_dialog.o: search_dialog.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -MT xiphos-search_dialog.o -MD -MP -MF $(DEPDIR)/xiphos-search_dialog.Tpo -c -o xiphos-search_dialog.o `test -f 'search_dialog.c' || echo '$(srcdir)/'`search_dialog.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xiphos-search_dialog.Tpo $(DEPDIR)/xiphos-search_dialog.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='search_dialog.c' object='xiphos-search_dialog.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -c -o xiphos-search_dialog.o `test -f 'search_dialog.c' || echo '$(srcdir)/'`search_dialog.c
+
+xiphos-search_dialog.obj: search_dialog.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -MT xiphos-search_dialog.obj -MD -MP -MF $(DEPDIR)/xiphos-search_dialog.Tpo -c -o xiphos-search_dialog.obj `if test -f 'search_dialog.c'; then $(CYGPATH_W) 'search_dialog.c'; else $(CYGPATH_W) '$(srcdir)/search_dialog.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xiphos-search_dialog.Tpo $(DEPDIR)/xiphos-search_dialog.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='search_dialog.c' object='xiphos-search_dialog.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -c -o xiphos-search_dialog.obj `if test -f 'search_dialog.c'; then $(CYGPATH_W) 'search_dialog.c'; else $(CYGPATH_W) '$(srcdir)/search_dialog.c'; fi`
+
+xiphos-search_sidebar.o: search_sidebar.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -MT xiphos-search_sidebar.o -MD -MP -MF $(DEPDIR)/xiphos-search_sidebar.Tpo -c -o xiphos-search_sidebar.o `test -f 'search_sidebar.c' || echo '$(srcdir)/'`search_sidebar.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xiphos-search_sidebar.Tpo $(DEPDIR)/xiphos-search_sidebar.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='search_sidebar.c' object='xiphos-search_sidebar.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -c -o xiphos-search_sidebar.o `test -f 'search_sidebar.c' || echo '$(srcdir)/'`search_sidebar.c
+
+xiphos-search_sidebar.obj: search_sidebar.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -MT xiphos-search_sidebar.obj -MD -MP -MF $(DEPDIR)/xiphos-search_sidebar.Tpo -c -o xiphos-search_sidebar.obj `if test -f 'search_sidebar.c'; then $(CYGPATH_W) 'search_sidebar.c'; else $(CYGPATH_W) '$(srcdir)/search_sidebar.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xiphos-search_sidebar.Tpo $(DEPDIR)/xiphos-search_sidebar.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='search_sidebar.c' object='xiphos-search_sidebar.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -c -o xiphos-search_sidebar.obj `if test -f 'search_sidebar.c'; then $(CYGPATH_W) 'search_sidebar.c'; else $(CYGPATH_W) '$(srcdir)/search_sidebar.c'; fi`
+
+xiphos-sidebar.o: sidebar.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -MT xiphos-sidebar.o -MD -MP -MF $(DEPDIR)/xiphos-sidebar.Tpo -c -o xiphos-sidebar.o `test -f 'sidebar.c' || echo '$(srcdir)/'`sidebar.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xiphos-sidebar.Tpo $(DEPDIR)/xiphos-sidebar.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='sidebar.c' object='xiphos-sidebar.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -c -o xiphos-sidebar.o `test -f 'sidebar.c' || echo '$(srcdir)/'`sidebar.c
+
+xiphos-sidebar.obj: sidebar.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -MT xiphos-sidebar.obj -MD -MP -MF $(DEPDIR)/xiphos-sidebar.Tpo -c -o xiphos-sidebar.obj `if test -f 'sidebar.c'; then $(CYGPATH_W) 'sidebar.c'; else $(CYGPATH_W) '$(srcdir)/sidebar.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xiphos-sidebar.Tpo $(DEPDIR)/xiphos-sidebar.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='sidebar.c' object='xiphos-sidebar.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -c -o xiphos-sidebar.obj `if test -f 'sidebar.c'; then $(CYGPATH_W) 'sidebar.c'; else $(CYGPATH_W) '$(srcdir)/sidebar.c'; fi`
+
+xiphos-sidebar_dialog.o: sidebar_dialog.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -MT xiphos-sidebar_dialog.o -MD -MP -MF $(DEPDIR)/xiphos-sidebar_dialog.Tpo -c -o xiphos-sidebar_dialog.o `test -f 'sidebar_dialog.c' || echo '$(srcdir)/'`sidebar_dialog.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xiphos-sidebar_dialog.Tpo $(DEPDIR)/xiphos-sidebar_dialog.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='sidebar_dialog.c' object='xiphos-sidebar_dialog.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -c -o xiphos-sidebar_dialog.o `test -f 'sidebar_dialog.c' || echo '$(srcdir)/'`sidebar_dialog.c
+
+xiphos-sidebar_dialog.obj: sidebar_dialog.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -MT xiphos-sidebar_dialog.obj -MD -MP -MF $(DEPDIR)/xiphos-sidebar_dialog.Tpo -c -o xiphos-sidebar_dialog.obj `if test -f 'sidebar_dialog.c'; then $(CYGPATH_W) 'sidebar_dialog.c'; else $(CYGPATH_W) '$(srcdir)/sidebar_dialog.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xiphos-sidebar_dialog.Tpo $(DEPDIR)/xiphos-sidebar_dialog.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='sidebar_dialog.c' object='xiphos-sidebar_dialog.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -c -o xiphos-sidebar_dialog.obj `if test -f 'sidebar_dialog.c'; then $(CYGPATH_W) 'sidebar_dialog.c'; else $(CYGPATH_W) '$(srcdir)/sidebar_dialog.c'; fi`
+
+xiphos-splash.o: splash.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -MT xiphos-splash.o -MD -MP -MF $(DEPDIR)/xiphos-splash.Tpo -c -o xiphos-splash.o `test -f 'splash.c' || echo '$(srcdir)/'`splash.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xiphos-splash.Tpo $(DEPDIR)/xiphos-splash.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='splash.c' object='xiphos-splash.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -c -o xiphos-splash.o `test -f 'splash.c' || echo '$(srcdir)/'`splash.c
+
+xiphos-splash.obj: splash.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -MT xiphos-splash.obj -MD -MP -MF $(DEPDIR)/xiphos-splash.Tpo -c -o xiphos-splash.obj `if test -f 'splash.c'; then $(CYGPATH_W) 'splash.c'; else $(CYGPATH_W) '$(srcdir)/splash.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xiphos-splash.Tpo $(DEPDIR)/xiphos-splash.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='splash.c' object='xiphos-splash.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -c -o xiphos-splash.obj `if test -f 'splash.c'; then $(CYGPATH_W) 'splash.c'; else $(CYGPATH_W) '$(srcdir)/splash.c'; fi`
+
+xiphos-tabbed_browser.o: tabbed_browser.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -MT xiphos-tabbed_browser.o -MD -MP -MF $(DEPDIR)/xiphos-tabbed_browser.Tpo -c -o xiphos-tabbed_browser.o `test -f 'tabbed_browser.c' || echo '$(srcdir)/'`tabbed_browser.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xiphos-tabbed_browser.Tpo $(DEPDIR)/xiphos-tabbed_browser.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tabbed_browser.c' object='xiphos-tabbed_browser.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -c -o xiphos-tabbed_browser.o `test -f 'tabbed_browser.c' || echo '$(srcdir)/'`tabbed_browser.c
+
+xiphos-tabbed_browser.obj: tabbed_browser.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -MT xiphos-tabbed_browser.obj -MD -MP -MF $(DEPDIR)/xiphos-tabbed_browser.Tpo -c -o xiphos-tabbed_browser.obj `if test -f 'tabbed_browser.c'; then $(CYGPATH_W) 'tabbed_browser.c'; else $(CYGPATH_W) '$(srcdir)/tabbed_browser.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xiphos-tabbed_browser.Tpo $(DEPDIR)/xiphos-tabbed_browser.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tabbed_browser.c' object='xiphos-tabbed_browser.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -c -o xiphos-tabbed_browser.obj `if test -f 'tabbed_browser.c'; then $(CYGPATH_W) 'tabbed_browser.c'; else $(CYGPATH_W) '$(srcdir)/tabbed_browser.c'; fi`
+
+xiphos-treekey-editor.o: treekey-editor.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -MT xiphos-treekey-editor.o -MD -MP -MF $(DEPDIR)/xiphos-treekey-editor.Tpo -c -o xiphos-treekey-editor.o `test -f 'treekey-editor.c' || echo '$(srcdir)/'`treekey-editor.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xiphos-treekey-editor.Tpo $(DEPDIR)/xiphos-treekey-editor.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='treekey-editor.c' object='xiphos-treekey-editor.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -c -o xiphos-treekey-editor.o `test -f 'treekey-editor.c' || echo '$(srcdir)/'`treekey-editor.c
+
+xiphos-treekey-editor.obj: treekey-editor.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -MT xiphos-treekey-editor.obj -MD -MP -MF $(DEPDIR)/xiphos-treekey-editor.Tpo -c -o xiphos-treekey-editor.obj `if test -f 'treekey-editor.c'; then $(CYGPATH_W) 'treekey-editor.c'; else $(CYGPATH_W) '$(srcdir)/treekey-editor.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xiphos-treekey-editor.Tpo $(DEPDIR)/xiphos-treekey-editor.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='treekey-editor.c' object='xiphos-treekey-editor.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -c -o xiphos-treekey-editor.obj `if test -f 'treekey-editor.c'; then $(CYGPATH_W) 'treekey-editor.c'; else $(CYGPATH_W) '$(srcdir)/treekey-editor.c'; fi`
+
+xiphos-utilities.o: utilities.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -MT xiphos-utilities.o -MD -MP -MF $(DEPDIR)/xiphos-utilities.Tpo -c -o xiphos-utilities.o `test -f 'utilities.c' || echo '$(srcdir)/'`utilities.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xiphos-utilities.Tpo $(DEPDIR)/xiphos-utilities.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='utilities.c' object='xiphos-utilities.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -c -o xiphos-utilities.o `test -f 'utilities.c' || echo '$(srcdir)/'`utilities.c
+
+xiphos-utilities.obj: utilities.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -MT xiphos-utilities.obj -MD -MP -MF $(DEPDIR)/xiphos-utilities.Tpo -c -o xiphos-utilities.obj `if test -f 'utilities.c'; then $(CYGPATH_W) 'utilities.c'; else $(CYGPATH_W) '$(srcdir)/utilities.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xiphos-utilities.Tpo $(DEPDIR)/xiphos-utilities.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='utilities.c' object='xiphos-utilities.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -c -o xiphos-utilities.obj `if test -f 'utilities.c'; then $(CYGPATH_W) 'utilities.c'; else $(CYGPATH_W) '$(srcdir)/utilities.c'; fi`
+
+xiphos-xiphos.o: xiphos.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -MT xiphos-xiphos.o -MD -MP -MF $(DEPDIR)/xiphos-xiphos.Tpo -c -o xiphos-xiphos.o `test -f 'xiphos.c' || echo '$(srcdir)/'`xiphos.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xiphos-xiphos.Tpo $(DEPDIR)/xiphos-xiphos.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='xiphos.c' object='xiphos-xiphos.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -c -o xiphos-xiphos.o `test -f 'xiphos.c' || echo '$(srcdir)/'`xiphos.c
+
+xiphos-xiphos.obj: xiphos.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -MT xiphos-xiphos.obj -MD -MP -MF $(DEPDIR)/xiphos-xiphos.Tpo -c -o xiphos-xiphos.obj `if test -f 'xiphos.c'; then $(CYGPATH_W) 'xiphos.c'; else $(CYGPATH_W) '$(srcdir)/xiphos.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xiphos-xiphos.Tpo $(DEPDIR)/xiphos-xiphos.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='xiphos.c' object='xiphos-xiphos.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CFLAGS) $(CFLAGS) -c -o xiphos-xiphos.obj `if test -f 'xiphos.c'; then $(CYGPATH_W) 'xiphos.c'; else $(CYGPATH_W) '$(srcdir)/xiphos.c'; fi`
+
 .cpp.o:
-@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
 
+xiphos-dummy.o: dummy.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CXXFLAGS) $(CXXFLAGS) -MT xiphos-dummy.o -MD -MP -MF $(DEPDIR)/xiphos-dummy.Tpo -c -o xiphos-dummy.o `test -f 'dummy.cpp' || echo '$(srcdir)/'`dummy.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xiphos-dummy.Tpo $(DEPDIR)/xiphos-dummy.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='dummy.cpp' object='xiphos-dummy.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CXXFLAGS) $(CXXFLAGS) -c -o xiphos-dummy.o `test -f 'dummy.cpp' || echo '$(srcdir)/'`dummy.cpp
+
+xiphos-dummy.obj: dummy.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CXXFLAGS) $(CXXFLAGS) -MT xiphos-dummy.obj -MD -MP -MF $(DEPDIR)/xiphos-dummy.Tpo -c -o xiphos-dummy.obj `if test -f 'dummy.cpp'; then $(CYGPATH_W) 'dummy.cpp'; else $(CYGPATH_W) '$(srcdir)/dummy.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xiphos-dummy.Tpo $(DEPDIR)/xiphos-dummy.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='dummy.cpp' object='xiphos-dummy.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xiphos_CPPFLAGS) $(CPPFLAGS) $(xiphos_CXXFLAGS) $(CXXFLAGS) -c -o xiphos-dummy.obj `if test -f 'dummy.cpp'; then $(CYGPATH_W) 'dummy.cpp'; else $(CYGPATH_W) '$(srcdir)/dummy.cpp'; fi`
+
 mostlyclean-libtool:
 	-rm -f *.lo
 
@@ -603,45 +1468,49 @@ ID: $(HEADERS) $(SOURCES) $(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; } \
-	       END { for (i in files) print i; }'`; \
+	  $(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)
-	tags=; \
+	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; } \
-	       END { for (i in files) print i; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  $(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; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  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)
-	tags=; \
-	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; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  $(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) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -662,24 +1531,30 @@ distdir: $(DISTFILES)
 	  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 -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
 check-am: all-am
-check: check-am
+check: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) check-am
 all-am: Makefile $(PROGRAMS) $(SCRIPTS)
 installdirs:
 	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
-install: install-am
+install: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) install-am
 install-exec: install-exec-am
 install-data: install-data-am
 uninstall: uninstall-am
@@ -699,10 +1574,12 @@ 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."
+	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
 clean: clean-am
 
 clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
@@ -719,6 +1596,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -727,18 +1606,28 @@ install-data-am:
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am: install-binPROGRAMS install-binSCRIPTS
 
 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
@@ -761,7 +1650,7 @@ ps-am:
 
 uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS
 
-.MAKE: install-am install-strip
+.MAKE: all check install install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
 	clean-generic clean-libtool ctags distclean distclean-compile \
@@ -778,6 +1667,26 @@ uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS
 	tags uninstall uninstall-am uninstall-binPROGRAMS \
 	uninstall-binSCRIPTS
 
+
+locale_set.c: ../../po/LINGUAS make-locale-set.sh
+	sh ./make-locale-set.sh > locale_set.c
+
+xiphos-locale_set.o: locale_set.c
+	$(CC) $< -c -o $@
+
+marshal.c:
+	glib-genmarshal --body --prefix=ipc_marshal marshal.list \
+	$< > $@
+	sed -i -e 's;<glib-object.h>;"marshal.h";' $@
+
+marshal.h:
+	glib-genmarshal --header --prefix=ipc_marshal marshal.list \
+	$< > $@
+
+ipc-interface.h:
+	dbus-binding-tool --prefix=ipc_object --mode=glib-server ipc-interface.xml \
+	$< > $@
+
 # 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/gnome2/about_modules.c b/src/gnome2/about_modules.c
index 359f1a3..de1ce66 100644
--- a/src/gnome2/about_modules.c
+++ b/src/gnome2/about_modules.c
@@ -26,7 +26,11 @@
 #include <gtk/gtk.h>
 
 #ifdef USE_GTKMOZEMBED
+#ifdef WIN32
+#include "geckowin/gecko-html.h"
+#else
 #include "gecko/gecko-html.h"
+#endif
 #else
 #include <gtkhtml/gtkhtml.h>
 #include "gui/html.h"
@@ -41,6 +45,8 @@
 #include "main/settings.h"
 #include "main/display.hh"
 
+#include "gui/debug_glib_null.h"
+
 /******************************************************************************
  * static
  */
diff --git a/src/gnome2/about_sword.c b/src/gnome2/about_sword.c
index bb817f5..35a8526 100644
--- a/src/gnome2/about_sword.c
+++ b/src/gnome2/about_sword.c
@@ -104,6 +104,7 @@ gui_create_about_sword(void)
 			    "dialog_about_sword", dialog_about_sword);
 	gtk_window_set_title(GTK_WINDOW(dialog_about_sword),
 			     _("About the SWORD Project"));
+	set_window_icon (GTK_WINDOW(dialog_about_sword));
         gtk_window_set_resizable(GTK_WINDOW(dialog_about_sword), FALSE);
 
 	dialog_vbox = GTK_DIALOG(dialog_about_sword)->vbox;
@@ -158,7 +159,6 @@ gui_create_about_sword(void)
 
 	href =  gtk_link_button_new_with_label ("http://www.crosswire.org/sword",
                                                        			_("The SWORD Project") );
-	//    gnome_href_new("http://www.crosswire.org/sword", _("The SWORD Project"));
 	gtk_widget_show(href);
 	gtk_box_pack_start(GTK_BOX(vbox), href, FALSE, FALSE, 0);
 
diff --git a/src/gnome2/about_trans.c b/src/gnome2/about_trans.c
index 8de9a0c..e982f1a 100644
--- a/src/gnome2/about_trans.c
+++ b/src/gnome2/about_trans.c
@@ -96,6 +96,7 @@ gui_create_about_trans(void)
 			    "dialog_about_trans", dialog_about_trans);
 	gtk_window_set_title(GTK_WINDOW(dialog_about_trans),
 			     _("About Xiphos Translation"));
+	set_window_icon (GTK_WINDOW(dialog_about_trans));
         gtk_window_set_resizable(GTK_WINDOW(dialog_about_trans), FALSE);
 
 	dialog_vbox = GTK_DIALOG(dialog_about_trans)->vbox;
@@ -143,7 +144,6 @@ gui_create_about_trans(void)
 
 	href =  gtk_link_button_new_with_label ("http://xiphos.org/development/",
 			   _("Xiphos development"));
-	//    gnome_href_new
 	gtk_widget_show(href);
 	gtk_box_pack_start(GTK_BOX(vbox), href, FALSE, FALSE, 0);
 
diff --git a/src/gnome2/about_xiphos.c b/src/gnome2/about_xiphos.c
index 27d3a71..73b6a99 100644
--- a/src/gnome2/about_xiphos.c
+++ b/src/gnome2/about_xiphos.c
@@ -24,6 +24,7 @@
 #endif
 
 #include <gtk/gtk.h>
+#include <glib/gi18n.h>
 
 #include "gui/about_xiphos.h"
 #include "gui/utilities.h"
@@ -83,7 +84,6 @@ on_dialog_response(GtkDialog * dialog, gint response_id,
 	gtk_widget_destroy(GTK_WIDGET(dialog));
 }
 
-
 /******************************************************************************
  * Name
  *   gui_create_about_xiphos
@@ -116,10 +116,9 @@ gui_create_about_xiphos(void)
 #endif
 		);
 
-	about1_logo_pixbuf = pixbuf_finder("about.png", NULL);
+	about1_logo_pixbuf = pixbuf_finder("about.png", 0, NULL);
 
 	about1 = gtk_about_dialog_new();
-  
 	g_signal_connect(about1, "response",
 			 G_CALLBACK(on_dialog_response), NULL);
   
@@ -144,5 +143,7 @@ gui_create_about_xiphos(void)
 	gtk_about_dialog_set_logo
 	    (GTK_ABOUT_DIALOG (about1), about1_logo_pixbuf);
 
+	set_window_icon (GTK_WINDOW(about1));
+
 	return about1;
 }
diff --git a/src/gnome2/bibletext.c b/src/gnome2/bibletext.c
index 6545542..dc187c8 100644
--- a/src/gnome2/bibletext.c
+++ b/src/gnome2/bibletext.c
@@ -26,7 +26,11 @@
 #include <gtk/gtk.h>
 
 #ifdef USE_GTKMOZEMBED
+#ifdef WIN32
+#include "geckowin/gecko-html.h"
+#else
 #include "gecko/gecko-html.h"
+#endif
 #else
 #include <gtkhtml/gtkhtml.h>
 #include "gui/html.h"
@@ -65,10 +69,6 @@ gboolean shift_key_pressed = FALSE;
 guint scroll_adj_signal;
 GtkAdjustment* adjustment;
 
-#ifndef USE_GTKMOZEMBED
-static GtkTextBuffer *text_buffer;
-#endif
-
 
 /******************************************************************************
  * Name
@@ -157,13 +157,14 @@ static gboolean on_text_button_press_event(GtkWidget * widget,
  *   gboolean
  */
 
+extern gboolean in_url;
+
 static gboolean on_text_button_release_event(GtkWidget * widget,
 					GdkEventButton * event,
 					gpointer date)
 {
 
 //#ifdef GTKHTML
-	extern gboolean in_url;
 	gchar *key;
 	const gchar *url;
 
@@ -217,50 +218,6 @@ static gboolean on_text_button_release_event(GtkWidget * widget,
 	return FALSE;
 }
 
-static gboolean textview_button_release_event(GtkWidget * widget,
-					GdkEventButton * event,
-					gpointer data)
-{
-//	extern gboolean in_url;
-//	gchar *key;
-
-	settings.whichwindow = MAIN_TEXT_WINDOW;
-	/*
-	 * set program title to current text module name
-	 */
-	gui_change_window_title(settings.MainWindowModule);
-/*
-	switch (event->button) {
-	case 1:
-		break;
-	case 2:
-		break;
-	case 3:
-		break;
-	}
-*/
-	return FALSE;
-}
-
-
-static gboolean textview_button_press_event(GtkWidget * widget,
-					GdkEventButton * event,
-					gpointer data)
-{
-	switch (event->button) {
-	case 1:
-		break;
-	case 2:
-		break;
-	case 3:
-		gui_popup_pm_text();
-		return TRUE;
-		break;
-	}
-	return FALSE;
-}
-
-
 static gboolean
 on_enter_notify_event        (GtkWidget       *widget,
                                         GdkEventCrossing *event,
@@ -323,173 +280,12 @@ static gboolean on_key_release_event         (GtkWidget       *widget,
 }
 */
 
-static gint tag_event_handler (GtkTextTag *tag, GtkWidget *widget,
-	GdkEvent *event, const GtkTextIter *iter, gpointer user_data)
-{
-	gint char_index;
-
-	char_index = gtk_text_iter_get_offset (iter);
-	//printf ("offset = %d", char_index);
-  switch (event->type)
-    {
-    case GDK_MOTION_NOTIFY:
-      printf ("Motion event at char %d tag `%s'\n",
-             char_index, tag->name);
-    	return TRUE;
-      break;
-
-    case GDK_BUTTON_PRESS:
-      printf ("Button press at char %d tag `%s'\n",
-             char_index, tag->name);
-	    switch(event->button.button){
-		    case 1:
-			//return do_something_with_tag(tag, iter, user_data);
-		        break;
-		    case 2:
-		    case 3:
-		        break;
-
-	}
-
-    	return TRUE;
-      break;
-
-    case GDK_2BUTTON_PRESS:
-      printf ("Double click at char %d tag `%s'\n",
-             char_index, tag->name);
-    	return TRUE;
-      break;
-
-    case GDK_3BUTTON_PRESS:
-      printf ("Triple click at char %d tag `%s'\n",
-             char_index, tag->name);
-    	return TRUE;
-      break;
-
-    case GDK_BUTTON_RELEASE:
-      printf ("Button release at char %d tag `%s'\n",
-             char_index, tag->name);
-    	return TRUE;
-      break;
-
-    case GDK_KEY_PRESS:
-    case GDK_KEY_RELEASE:
-      printf ("Key event at char %d tag `%s'\n",
-              char_index, tag->name);
-    	return TRUE;
-      break;
-
-    case GDK_ENTER_NOTIFY:
-      printf ("enter event at char %d tag `%s'\n",
-             char_index, tag->name);
-    	return TRUE;
-      break;
-
-    case GDK_LEAVE_NOTIFY:
-      printf ("leave event at char %d tag `%s'\n",
-             char_index, tag->name);
-    	return TRUE;
-      break;
-
-    case GDK_PROPERTY_NOTIFY:
-    case GDK_SELECTION_CLEAR:
-    case GDK_SELECTION_REQUEST:
-    case GDK_SELECTION_NOTIFY:
-    case GDK_PROXIMITY_IN:
-    case GDK_PROXIMITY_OUT:
-#if 0
-    case GDK_DRAG_ENTER:
-    case GDK_DRAG_LEAVE:
-    case GDK_DRAG_MOTION:
-    case GDK_DRAG_STATUS:
-    case GDK_DROP_START:
-    case GDK_DROP_FINISHED:
-#endif /* 0 */
-    	return FALSE;
-    default:
-    	return FALSE;
-      break;
-    }
-    return FALSE;
-}
-
-static void setup_tag (GtkTextTag *tag, gpointer user_data)
-{
-	g_signal_connect (G_OBJECT (tag),
-		    "event",
-		    G_CALLBACK (tag_event_handler),
-		    user_data);
-}
-
-static void create_text_tags(GtkTextBuffer * buffer)
-{
-	GtkTextTag *tag;
-	GdkColor color;
-	//GdkColor color2;
-	//GdkColor color_red;
-	//GdkColor colorLink;
-	//PangoFontDescription *font_desc;
-
-
-
-	/* verse number tag verse style*/
-	tag = gtk_text_buffer_create_tag (buffer, "verseNumber", NULL);
-	setup_tag (tag, buffer);
-	color.red = color.green = 0;
-	color.blue = 0xffff;
-	//	"scale", PANGO_SCALE_XX_SMALL,
-	g_object_set (G_OBJECT (tag),
-                "foreground_gdk", &color,
-                NULL);
-
-	/* verse number tag verse style*/
-	/*tag = gtk_text_buffer_create_tag (buffer, "verse", NULL);
-	setup_tag (tag, buffer);
-	g_object_set (G_OBJECT (tag),
-                NULL);	*/
-
-	/* current verse color tag */
-	tag = gtk_text_buffer_create_tag (buffer, "fg_currentverse", NULL);
-	color.blue = 0;
-	color.green = 0xbbbb;
-	color.red = 0;
-	g_object_set (G_OBJECT (tag),
-                "foreground_gdk", &color,
-                NULL);
-
-	/*  verse color tag */
-	tag = gtk_text_buffer_create_tag (buffer, "fg_verse", NULL);
-	color.blue = 0;
-	color.green = 0;
-	color.red = 0;
-	g_object_set (G_OBJECT (tag),
-                "foreground_gdk", &color,
-                NULL);
-
-	/* right to left tag */
-	tag = gtk_text_buffer_create_tag (buffer, "rtl_text", NULL);
-        g_object_set (G_OBJECT (tag),
-		//"font", rtl_font,
-                "wrap_mode", GTK_WRAP_WORD,
-                "direction", GTK_TEXT_DIR_RTL,
-                "indent", 0,
-                "left_margin", 0,
-                "right_margin", 0,
-                NULL);
-
-	/* large tag */
-	tag = gtk_text_buffer_create_tag (buffer, "large", NULL);
-        g_object_set (G_OBJECT (tag),
-		"scale", (double)1.928, //PANGO_SCALE_XX_LARGE,
-                NULL);
-}
-
+extern NAVBAR_VERSEKEY navbar_versekey;
 
 static
 void adj_changed(GtkAdjustment * adjustment1, gpointer user_data) 
 
 {
-	extern NAVBAR_VERSEKEY navbar_versekey;
 	static int scroll = 1;
 	if (!settings.chapter_scroll) return;
 	if (scroll && (adjustment1->value <= adjustment1->lower)) {
@@ -524,17 +320,28 @@ void adj_changed(GtkAdjustment * adjustment1, gpointer user_data)
 
 GtkWidget *gui_create_bible_pane(void)
 {
-	GtkWidget *notebook_text;
-#ifndef USE_GTKMOZEMBED
+	GtkWidget *vbox;
+#ifdef USE_GTKMOZEMBED
+	GtkWidget *eventbox1;
+#else
 	GtkWidget *scrolledwindow;
 #endif
-	
-	notebook_text = gtk_notebook_new();
-	gtk_widget_show(notebook_text);
+
+	vbox = gtk_vbox_new(FALSE, 0);
+	gtk_widget_show(vbox);
+
 #ifdef USE_GTKMOZEMBED
+
+	eventbox1 = gtk_event_box_new();
+	gtk_widget_show(eventbox1);
+	gtk_box_pack_start(GTK_BOX(vbox),
+			   eventbox1, TRUE,
+			   TRUE, 0);
 	widgets.html_text = GTK_WIDGET(gecko_html_new(NULL, FALSE, TEXT_TYPE)); 
 	gtk_widget_show(widgets.html_text);
-	gtk_container_add(GTK_CONTAINER(notebook_text), widgets.html_text);
+	gtk_container_add(GTK_CONTAINER(eventbox1),
+			  widgets.html_text);
+		
 	g_signal_connect((gpointer)widgets.html_text,
 		      "popupmenu_requested",
 		      G_CALLBACK (_popupmenu_requested_cb),
@@ -543,8 +350,10 @@ GtkWidget *gui_create_bible_pane(void)
 	
 	scrolledwindow = gtk_scrolled_window_new(NULL, NULL);
 	gtk_widget_show(scrolledwindow);
-	gtk_container_add(GTK_CONTAINER(notebook_text),
-			  scrolledwindow);
+	gtk_box_pack_start(GTK_BOX(vbox),
+			   scrolledwindow, 
+	                   TRUE,
+			   TRUE, 0);
 	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW
 				       (scrolledwindow),
 				       GTK_POLICY_AUTOMATIC,
@@ -573,53 +382,12 @@ GtkWidget *gui_create_bible_pane(void)
 				NULL);
 	g_signal_connect(GTK_OBJECT(widgets.html_text), "enter_notify_event",
 		    		G_CALLBACK (on_enter_notify_event),
-		       		NULL);
-/*	g_signal_connect(GTK_OBJECT(widgets.html_text), "key_press_event",
-		    		G_CALLBACK (on_key_press_event),
-		    		NULL);  
-	g_signal_connect(GTK_OBJECT(widgets.html_text), "key_release_event",
-		    		G_CALLBACK (on_key_release_event),
-		    		NULL);	*/			   
+		       		NULL);			   
 	g_signal_connect(GTK_OBJECT(widgets.html_text),
 			 "url_requested",
 			 G_CALLBACK(url_requested), NULL);
-	
-	/* gtktextview stuff */
-	scrolledwindow = gtk_scrolled_window_new(NULL, NULL);
-	gtk_widget_show(scrolledwindow);
-	gtk_container_add(GTK_CONTAINER(notebook_text),
-			  scrolledwindow);
-	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW
-				       (scrolledwindow),
-				       GTK_POLICY_AUTOMATIC,
-				       GTK_POLICY_AUTOMATIC);
-	gtk_scrolled_window_set_shadow_type((GtkScrolledWindow *)scrolledwindow,
-                                             settings.shadow_type);
-					     
-	widgets.textview = gtk_text_view_new ();
-	gtk_widget_show(widgets.textview);
-	gtk_container_add(GTK_CONTAINER(scrolledwindow),
-			  widgets.textview);
-	gtk_text_view_set_editable (GTK_TEXT_VIEW (widgets.textview), FALSE);
-	text_buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW (widgets.textview));
-
-	create_text_tags(text_buffer);
-	gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW (widgets.textview),
-						GTK_WRAP_WORD);
-
-		    
-	g_signal_connect(GTK_OBJECT(widgets.textview),
-				   "button_release_event",
-				   G_CALLBACK
-				   (textview_button_release_event),
-				  NULL);
-	g_signal_connect(GTK_OBJECT(widgets.textview),
-				   "button_press_event",
-				   G_CALLBACK
-				   (textview_button_press_event),
-					 NULL);
 #endif			 
 
-	return 	notebook_text;			   
+	return 	vbox;			   
 	
 }
diff --git a/src/gnome2/bibletext_dialog.c b/src/gnome2/bibletext_dialog.c
index fbb9bfd..94b4d89 100644
--- a/src/gnome2/bibletext_dialog.c
+++ b/src/gnome2/bibletext_dialog.c
@@ -25,7 +25,11 @@
 
 #include <gtk/gtk.h>
 #ifdef USE_GTKMOZEMBED
+#ifdef WIN32
+#include "geckowin/gecko-html.h"
+#else
 #include "gecko/gecko-html.h"
+#endif
 #else
 #include <gtkhtml/gtkhtml.h>
 #include "gui/html.h"
@@ -50,47 +54,18 @@
 #include "main/xml.h"
 #include "main/display.hh"
 
+#include "gui/debug_glib_null.h"
+
 
 /******************************************************************************
  * static - global to this file only
  */
 static DIALOG_DATA *cur_vt;
 
-GtkTextBuffer *text_buffer;
 /******************************************************************************
  * externs
  */
-extern gboolean gsI_isrunning;	/* information dialog */
 extern gboolean bible_freed;
-extern gboolean bible_apply_change;
-extern gboolean do_display;
-
-
-/******************************************************************************
- * Name
- *   gui_close_text_dialog
- *
- * Synopsis
- *   #include "bibletext_dialog.h"
- *
- *   void btn_close_clicked(GtkButton * button,DIALOG_DATA * vt)
- *
- * Description
- *   call gtk_widget_destroy to destroy the bibletext dialog
- *   set vt->dialog to NULL
- *
- * Return value
- *   void
- */
-/*
-static void close_text_dialog(DIALOG_DATA * t)
-{
-	if (t->dialog) {
-		bible_freed = FALSE;
-		gtk_widget_destroy(t->dialog);
-	}
-}
-*/
 
 #ifndef USE_GTKMOZEMBED
 /******************************************************************************
@@ -131,7 +106,7 @@ static void show_in_statusbar(GtkWidget *statusbar,
 	}
 	g_free(text);
 }
-#endif
+#endif /* !USE_GTKMOZEMBED */
 
 
 /******************************************************************************
@@ -159,152 +134,10 @@ static void link_clicked(GtkHTML *html,
 	cur_vt = vt;
 	main_dialogs_url_handler(vt, url, TRUE);
 }
-#endif
-
-/******************************************************************************
- * Name
- *   book_changed
- *
- * Synopsis
- *   #include "bibletext_dialog.h"
- *
- *   void book_changed(GtkEditable * editable, gpointer user_data)
- *
- * Description
- *   change book
- *
- * Return value
- *   void
- */
-/*
-static void book_changed(GtkEditable *editable,
-			 DIALOG_DATA *vt)
-{
-//	gchar buf[256];
-	gchar *url;
-	gchar *bookname = gtk_editable_get_chars(editable, 0, -1);
-	cur_vt = vt;
-	if (*bookname) {
-		url = g_strdup_printf("sword:///%s 1:1", bookname);
-		main_dialogs_url_handler(vt, url, TRUE);
-		g_free(url);
-	}
-}
-
-*/
-/******************************************************************************
- * Name
- *   chapter_button_release_event
- *
- * Synopsis
- *   #include "bibletext_dialog.h"
- *
- *   gboolean chapter_button_release_event(GtkWidget * widget,
- *			GdkEventButton * event,   gpointer user_data)
- *
- * Description
- *    change chapter
- *
- * Return value
- *   gboolean
- */
-/*
-static gboolean chapter_button_release_event(GtkWidget *widget,
-					     GdkEventButton *event,
-					     DIALOG_DATA *vt)
-{
-	G_CONST_RETURN gchar *bookname;
-	gchar *url;
-	gint chapter;
-	cur_vt = vt;
-
-	bookname = (gchar*)gtk_entry_get_text(GTK_ENTRY(vt->cbe_book));
-	chapter =
-	    gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON
-					     (vt->spb_chapter));
-	url = g_strdup_printf("sword:///%s %d:1", bookname, chapter);
-	main_dialogs_url_handler(vt, url, TRUE);
-	g_free(url);
-	return FALSE;
-}
-*/
-
-/******************************************************************************
- * Name
- *
- *
- * Synopsis
- *   #include "bibletext_dialog.h"
- *
- *   gboolean (GtkWidget * widget, GdkEventButton * event,  gpointer user_data)
- *
- * Description
- *    change verse
- *
- * Return value
- *   gboolean
- */
-/*
-static gboolean verse_button_release_event(GtkWidget *widget,
-					   GdkEventButton *event,
-					   DIALOG_DATA *vt)
-{
-	const gchar *bookname;
-//	gchar buf[256], *val_key;
-	gint chapter, verse;
-	gchar *url;
-	cur_vt = vt;
-
-	bookname = gtk_entry_get_text(GTK_ENTRY(vt->cbe_book));
-	chapter =
-	    gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON
-					     (vt->spb_chapter));
-	verse =
-	    gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON
-					     (vt->spb_verse));
-
-	url = g_strdup_printf("sword:///%s %d:%d", bookname, chapter, verse);
-	main_dialogs_url_handler(vt, url, TRUE);
-	g_free(url);
-	return FALSE;
-}
-*/
+#endif /* !USE_GTKMOZEMBED */
 
 /******************************************************************************
  * Name
- *   entry_key_press_event
- *
- * Synopsis
- *   #include "bibletext_dialog.h"
- *
- *   gboolean entry_key_press_event(GtkWidget * widget,
- *				GdkEventKey * event, gpointer user_data)
- *
- * Description
- *   go to verse in free form entry if user hit <enter>
- *
- * Return value
- *   gboolean
- */
-/*
-static gboolean entry_key_press_event(GtkWidget * widget,
-				      GdkEventKey * event,
-				      DIALOG_DATA * vt)
-{
-	// if <enter> key 
-	cur_vt = vt;
-	if (event->keyval == 65293 || event->keyval == 65421) {
-		const gchar *buf = gtk_entry_get_text(GTK_ENTRY(widget));
-		gchar *url = g_strdup_printf("sword:///%s", buf);
-		main_dialogs_url_handler(vt, url, TRUE);
-		g_free(url);
-	}
-	return FALSE;
-}
-*/
- 
-/******************************************************************************
- * Name
  *   dialog_destroy
  *
  * Synopsis
@@ -529,7 +362,7 @@ static void dialog_url(GtkHTML *html,
 	if (url_buf)
 		g_free(url_buf);
 }
-#endif
+#endif /* !USE_GTKMOZEMBED */
 
 
 /******************************************************************************
@@ -706,7 +539,7 @@ static gboolean on_button_release_event(GtkWidget *widget,
 	}
 	return FALSE;
 }
-#endif
+#endif /* !USE_GTKMOZEMBED */
 
 #ifdef USE_GTKMOZEMBED
 static void
@@ -717,7 +550,7 @@ _popupmenu_requested_cb (GeckoHtml *html,
 	DIALOG_DATA * d = (DIALOG_DATA *)user_data;
 	gui_text_dialog_create_menu(d);
 }
-#endif
+#endif /* USE_GTKMOZEMBED */
 
 /******************************************************************************
  * Name
@@ -740,10 +573,10 @@ void gui_create_bibletext_dialog(DIALOG_DATA * vt)
 	GtkWidget *vbox33;
 	GtkWidget *paned;
 	GtkWidget *frame;
-#ifndef USE_GTKMOZEMBED
+#ifdef USE_GTKMOZEMBED
+	GtkWidget *eventbox;
+#else
 	GtkWidget *swVText;
-	//gchar *gdk_font = NULL;
-//	gchar file[250];
 #endif
 
 	vt->dialog = gtk_window_new(GTK_WINDOW_TOPLEVEL);
@@ -775,9 +608,14 @@ void gui_create_bibletext_dialog(DIALOG_DATA * vt)
 
 #ifdef USE_GTKMOZEMBED
 	gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_IN);
+	
+	eventbox = gtk_event_box_new();
+	gtk_widget_show(eventbox);
+	gtk_container_add(GTK_CONTAINER(frame), eventbox);
+	
 	vt->html = GTK_WIDGET(gecko_html_new(vt, TRUE, DIALOG_TEXT_TYPE));
 	gtk_widget_show(vt->html);
-	gtk_container_add(GTK_CONTAINER(frame), vt->html);
+	gtk_container_add(GTK_CONTAINER(eventbox), vt->html);
 	g_signal_connect((gpointer)vt->html,
 		      "popupmenu_requested",
 		      G_CALLBACK(_popupmenu_requested_cb),
@@ -788,10 +626,14 @@ void gui_create_bibletext_dialog(DIALOG_DATA * vt)
 	gtk_paned_add2((GtkPaned *)paned,frame);
 	gtk_widget_set_size_request(frame, -1, 100);
 	gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_IN);
+	
+	eventbox = gtk_event_box_new();
+	gtk_widget_show(eventbox);
+	gtk_container_add(GTK_CONTAINER(frame), eventbox);
 
 	vt->previewer = GTK_WIDGET(gecko_html_new(vt, TRUE, VIEWER_TYPE));
 	gtk_widget_show(vt->previewer);
-	gtk_container_add(GTK_CONTAINER(frame), vt->previewer);
+	gtk_container_add(GTK_CONTAINER(eventbox), vt->previewer);
 #else
 	swVText = gtk_scrolled_window_new(NULL, NULL);
 	gtk_widget_show(swVText);
@@ -850,7 +692,8 @@ void gui_create_bibletext_dialog(DIALOG_DATA * vt)
 
 	g_signal_connect(GTK_OBJECT(vt->previewer), "link_clicked",
 				   G_CALLBACK(link_clicked), vt);
-#endif
+#endif /* !USE_GTKMOZEMBED */
+
 	vt->statusbar = gtk_statusbar_new();
 	gtk_widget_show(vt->statusbar);
 	gtk_box_pack_start(GTK_BOX(vbox33), vt->statusbar, FALSE, FALSE,
diff --git a/src/gnome2/bookmark_dialog.c b/src/gnome2/bookmark_dialog.c
index 23357cf..1dd9ac8 100644
--- a/src/gnome2/bookmark_dialog.c
+++ b/src/gnome2/bookmark_dialog.c
@@ -26,7 +26,6 @@
 #include <gtk/gtk.h>
 #include <glade/glade-xml.h>
 
-
 #include "gui/bookmark_dialog.h"
 #include "gui/bookmarks_menu.h"
 #include "gui/bookmarks_treeview.h"
@@ -38,6 +37,8 @@
 #include "main/settings.h"
 #include "main/xml.h"
 
+#include "gui/debug_glib_null.h"
+
 extern GtkTreeStore *model;
 
 static GtkWidget *treeview;
@@ -50,7 +51,10 @@ static GtkWidget *textview;
 static GtkTextBuffer *textbuffer;
 static gchar *note;
 
-void on_buffer_changed (GtkTextBuffer *textbuffer, gpointer user_data) 
+GtkWidget *bookmark_dialog;
+GtkWidget *mark_verse_dialog;
+
+void on_buffer_changed (GtkTextBuffer *textbuffer, gpointer user_data)
 {
 	GtkTextIter start;
 	GtkTextIter end;
@@ -240,6 +244,27 @@ void on_dialog_response(GtkDialog * dialog,
 
 /******************************************************************************
  * Name
+ *   on_dialog_enter
+ *
+ * Synopsis
+ *   #include "gui/bookmark_dialog.h"
+ *
+ * Description
+ *  "Enter" key route to on_dialog_response.
+ *
+ * Return value
+ *   void
+ */
+ 
+void on_dialog_enter(void)
+{
+	on_dialog_response(GTK_DIALOG(bookmark_dialog),
+			   GTK_RESPONSE_OK,
+			   NULL);
+}
+
+/******************************************************************************
+ * Name
  *   on_mark_verse_response
  *
  * Synopsis
@@ -256,18 +281,21 @@ void on_mark_verse_response(GtkDialog * dialog,
 			    gint response_id, 
 			    gpointer user_data)
 {
-	gchar reference[100];
+	gchar reference[100], *module, *key;
 
-	g_snprintf(reference, 100, "%s %s",
-		   (gchar *)gtk_entry_get_text(GTK_ENTRY(entry_module)),
-		   (gchar *)gtk_entry_get_text(GTK_ENTRY(entry_key)));
+	module = (gchar *)gtk_entry_get_text(GTK_ENTRY(entry_module));
+	key    = (gchar *)gtk_entry_get_text(GTK_ENTRY(entry_key));
+
+	g_snprintf(reference, 100, "%s %s", module,
+		   main_get_osisref_from_key((const char *)module,
+					     (const char *)key));
 
 	switch (response_id) {
 	case GTK_RESPONSE_CANCEL: /*  cancel button pressed  */
 	case GTK_RESPONSE_NONE:   /*  dialog destroyed  */
 		break;
 	case GTK_RESPONSE_ACCEPT: /*  mark the verse  */
-		xml_set_list_item("markedverses", "markedverse",
+		xml_set_list_item("osisrefmarkedverses", "markedverse",
 				  reference, (note ?
 #ifdef USE_GTKMOZEMBED
 					      note
@@ -279,7 +307,7 @@ void on_mark_verse_response(GtkDialog * dialog,
 		main_display_bible(NULL, settings.currentverse);
 		break;
 	case GTK_RESPONSE_OK:     /*  unmark the verse  */
-		xml_remove_node("markedverses", "markedverse", reference);
+		xml_remove_node("osisrefmarkedverses", "markedverse", reference);
 		marked_cache_fill(settings.MainWindowModule, settings.currentverse);
 		main_display_bible(NULL, settings.currentverse);
 		break;
@@ -289,6 +317,26 @@ void on_mark_verse_response(GtkDialog * dialog,
 	xml_save_settings_doc(settings.fnconfigure);
 }
 
+/******************************************************************************
+ * Name
+ *   on_mark_verse_enter
+ *
+ * Synopsis
+ *   #include "gui/bookmark_dialog.h"
+ *
+ * Description
+ *  "Enter" key route to on_mark_verse_response.
+ *
+ * Return value
+ *   void
+ */
+ 
+void on_mark_verse_enter(void)
+{
+	on_mark_verse_response(GTK_DIALOG(mark_verse_dialog),
+			       GTK_RESPONSE_ACCEPT,
+			       NULL);
+}
 
 /******************************************************************************
  * Name
@@ -383,14 +431,11 @@ static void setup_treeview(void)
  */
  
 static GtkWidget *_create_bookmark_dialog(gchar * label, 
-				   	gchar * module, 
-				   	gchar * key)
+					  gchar * module, 
+					  gchar * key)
 {
 	GladeXML *gxml;
 	gchar *glade_file;
-	GtkWidget *dialog;
-//	GtkWidget *chooser;
-//	gint index = 0;
 
 	glade_file = gui_general_user_file ("bookmarks.glade", TRUE);
 	g_return_val_if_fail(glade_file != NULL, NULL);
@@ -402,8 +447,8 @@ static GtkWidget *_create_bookmark_dialog(gchar * label,
 	g_return_val_if_fail(gxml != NULL, NULL);
 
 	/* lookup the root widget */
-	dialog = glade_xml_get_widget (gxml, "dialog");
-	g_signal_connect(dialog, "response",
+	bookmark_dialog = glade_xml_get_widget (gxml, "dialog");
+	g_signal_connect(bookmark_dialog, "response",
 			 G_CALLBACK(on_dialog_response), NULL);
 	
 	/* treeview */
@@ -418,15 +463,18 @@ static GtkWidget *_create_bookmark_dialog(gchar * label,
 	gtk_entry_set_text(GTK_ENTRY(entry_label), label);
 	gtk_entry_set_text(GTK_ENTRY(entry_key), key);
 	gtk_entry_set_text(GTK_ENTRY(entry_module), module);
+	g_signal_connect(entry_label, "activate",
+			 G_CALLBACK(on_dialog_enter), NULL);
+	g_signal_connect(entry_key, "activate",
+			 G_CALLBACK(on_dialog_enter), NULL);
+	g_signal_connect(entry_module, "activate",
+			 G_CALLBACK(on_dialog_enter), NULL);
 
 	/* dialog buttons */
 	button_new_folder = glade_xml_get_widget (gxml, "button1");
 	button_add_bookmark = glade_xml_get_widget (gxml, "button3");
 	
-	/* connect signals and data */
-/*	glade_xml_signal_autoconnect_full
-		(gxml, (GladeXMLConnectFunc)gui_glade_signal_connect_func, NULL);*/
-	return dialog;
+	return bookmark_dialog;
 }
 
 
@@ -449,14 +497,13 @@ static GtkWidget *_create_mark_verse_dialog(gchar * module,
 {
 	GladeXML *gxml;
 	gchar *glade_file;
-	GtkWidget *dialog;
 	GtkWidget *sw;	
-	gchar reference[100];
+	gchar osisreference[100];
 	gchar *old_note = NULL;
 
-	g_snprintf(reference, 100, "%s %s",
-		   (gchar *)module,
-		   (gchar *)key);
+	g_snprintf(osisreference,  100, "%s %s", module,
+		   main_get_osisref_from_key((const char *)module,
+					     (const char *)key));
 	note = NULL;
 	
 	glade_file = gui_general_user_file("markverse.glade", TRUE);
@@ -469,11 +516,11 @@ static GtkWidget *_create_mark_verse_dialog(gchar * module,
 	g_return_val_if_fail(gxml != NULL, NULL);
 
 	/* lookup the root widget */
-	dialog = glade_xml_get_widget(gxml, "dialog");
-	gtk_window_set_default_size (GTK_WINDOW (dialog),
+	mark_verse_dialog = glade_xml_get_widget(gxml, "dialog");
+	gtk_window_set_default_size (GTK_WINDOW (mark_verse_dialog),
                                    300, 350);
 	
-	g_signal_connect(dialog, "response",
+	g_signal_connect(mark_verse_dialog, "response",
 			 G_CALLBACK(on_mark_verse_response), NULL);
 	
 	/* entrys */	
@@ -489,15 +536,19 @@ static GtkWidget *_create_mark_verse_dialog(gchar * module,
 	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
 				      GTK_POLICY_AUTOMATIC,
 				      GTK_POLICY_AUTOMATIC);
-	
+	g_signal_connect(entry_key, "activate",
+			 G_CALLBACK(on_mark_verse_enter), NULL);
+	g_signal_connect(entry_module, "activate",
+			 G_CALLBACK(on_mark_verse_enter), NULL);
+
 
-	old_note = xml_get_list_from_label("markedverses", "markedverse", reference);
+	old_note = xml_get_list_from_label("osisrefmarkedverses", "markedverse", osisreference);
 	note = g_strdup ((old_note) ? old_note : "");
 	gtk_text_buffer_set_text (textbuffer, (old_note) ? old_note : "", -1);
 	g_signal_connect(textbuffer, "changed",
 			 G_CALLBACK(on_buffer_changed), NULL);
 
-	return dialog;
+	return mark_verse_dialog;
 }
 
 
diff --git a/src/gnome2/bookmarks_menu.c b/src/gnome2/bookmarks_menu.c
index 80df7a6..6bfd7b7 100644
--- a/src/gnome2/bookmarks_menu.c
+++ b/src/gnome2/bookmarks_menu.c
@@ -1,4 +1,4 @@
-/*
+/* 
  * Xiphos Bible Study Tool
  * bookmarks_treeview.c - gui for bookmarks using treeview
  *
@@ -37,6 +37,7 @@
 #include "gui/xiphos.h"
 #include "gui/bookmarks_menu.h"
 #include "gui/bookmarks_treeview.h"
+#include "gui/export_bookmarks.h"
 #include "gui/utilities.h"
 #include "gui/main_window.h"
 #include "gui/dialog.h"
@@ -59,128 +60,16 @@
 #include "editor/bonobo-editor.h"
 #endif
 
-BOOKMARK_MENU menu;
+#include "gui/debug_glib_null.h"
 
-gboolean bookmarks_changed;
 
 
 
-/******************************************************************************
- * Name
- *  parse_treeview
- *
- * Synopsis
- *   #include "gui/bookmarks_menu.h"
- *
- *   void parse_treeview(xmlNodePtr parent, GtkTreeIter * tree_parent)	
- *
- * Description
- *    
- *
- * Return value
- *   void
- */
+BOOKMARK_MENU menu;
 
-static void parse_treeview(xmlNodePtr parent, GtkTreeIter * tree_parent)
-{
-	static xmlNodePtr cur_node;
-	GtkTreeIter child;
-	gchar *caption = NULL;
-	gchar *key = NULL;
-	gchar *module = NULL;
-	gchar *mod_desc = NULL;
-	gchar *description = NULL;
-	
-	gtk_tree_model_iter_children(GTK_TREE_MODEL(model), &child,
-                                             tree_parent);
-	
-	do {
-		gtk_tree_model_get(GTK_TREE_MODEL(model), &child,
-			   		2, &caption, 
-					3, &key, 
-					4, &module, 
-					5, &mod_desc, 
-					6, &description,
-					-1);
-		if(gtk_tree_model_iter_has_child(GTK_TREE_MODEL(model), 
-							&child)) {
-			cur_node = xml_add_folder_to_parent(parent, 
-							caption);
-			parse_treeview(cur_node, &child);
-						     
-		}
-		else 
-			xml_add_bookmark_to_parent(parent, 
-						description,
-						key,
-						module,
-						mod_desc);
-		
-		g_free(caption);
-		g_free(key);
-		g_free(module);	
-		g_free(mod_desc);
-		g_free(description);
-	} while(gtk_tree_model_iter_next(GTK_TREE_MODEL(model), &child));
-}
+gboolean bookmarks_changed;
 
 
-/******************************************************************************
- * Name
- *   save_iter_to_xml_removed
- *
- * Synopsis
- *   #include "gui/bookmarks_menu.h"
- *
- *   void save_iter_to_xml_removed(GtkTreeIter * iter)	
- *
- * Description
- *    
- *
- * Return value
- *   void
- */
-
-static void save_iter_to_xml_removed(GtkTreeIter * iter)
-{
-	xmlNodePtr root_node = NULL;
-	xmlNodePtr cur_node = NULL;
-	xmlDocPtr root_doc;
-	xmlAttrPtr root_attr;
-	//const xmlChar *xml_filename;
-	gchar *caption = NULL;
-	gchar filename[256];
-//	GtkTreeIter child;
-	
-	if (!bookmarks_changed) 
-		return;
-	
-	gtk_tree_model_get(GTK_TREE_MODEL(model), iter,
-			   2, &caption, -1);
-	sprintf(filename, "%s/bookmarks/removed/%s.xml", settings.gSwordDir,caption);
-	//xml_filename = (const xmlChar *) buf;
-	root_doc = xmlNewDoc((const xmlChar *) "1.0");
-	
-	if (root_doc != NULL) {
-		root_node = xmlNewNode(NULL, (const xmlChar *)
-				       "SwordBookmarks");
-		root_attr =
-		    xmlNewProp(root_node, (const xmlChar *)"syntaxVersion",
-			       (const xmlChar *) "1");
-		xmlDocSetRootElement(root_doc, root_node);
-	}
-	gtk_tree_model_get(GTK_TREE_MODEL(model), iter,
-			   2, &caption, -1);
-		if( gtk_tree_model_iter_has_child(GTK_TREE_MODEL(model),iter)) {
-			cur_node = xml_add_folder_to_parent(root_node, caption);
-			parse_treeview(cur_node, iter);
-		}
-	g_free(caption);
-	xmlSaveFormatFile(filename, root_doc,1);
-	xmlFreeDoc(root_doc);
-	
-	bookmarks_changed = FALSE;
-}
 
 /******************************************************************************
  * Name
@@ -204,7 +93,6 @@ static void save_treeview_to_xml_bookmarks(GtkTreeIter * iter, gchar * filename)
 	xmlNodePtr cur_node = NULL;
 	xmlDocPtr root_doc;
 	xmlAttrPtr root_attr;
-	//const xmlChar *xml_filename;
 	gchar *caption = NULL;
 	gchar *key = NULL;
 	gchar *module = NULL;
@@ -213,8 +101,7 @@ static void save_treeview_to_xml_bookmarks(GtkTreeIter * iter, gchar * filename)
 	
 	if (!bookmarks_changed) 
 		return;
-	
-	//xml_filename = (const xmlChar *) filename;
+
 	root_doc = xmlNewDoc((const xmlChar *) "1.0");
 	
 	if (root_doc != NULL) {
@@ -236,7 +123,7 @@ static void save_treeview_to_xml_bookmarks(GtkTreeIter * iter, gchar * filename)
 					-1);
 		if( gtk_tree_model_iter_has_child(GTK_TREE_MODEL(model),iter)) {
 			cur_node = xml_add_folder_to_parent(root_node, caption);
-			parse_treeview(cur_node, iter);
+			utilities_parse_treeview(cur_node, iter, GTK_TREE_MODEL(model));
 		}
 		else 		
 			xml_add_bookmark_to_parent(root_node,  
@@ -538,7 +425,8 @@ G_MODULE_EXPORT void on_edit_item_activate(GtkMenuItem * menuitem, gpointer user
 	g_string_free(str,TRUE);
 }
 
-
+//dialog_export_bookmarks_response_cb
+//dialog_export_bookmarks_close_cb
 /******************************************************************************
  * Name
  *   on_remove_folder_activate
@@ -555,31 +443,11 @@ G_MODULE_EXPORT void on_edit_item_activate(GtkMenuItem * menuitem, gpointer user
  *   void
  */
 
-G_MODULE_EXPORT void on_remove_folder_activate(GtkMenuItem * menuitem,
+G_MODULE_EXPORT void on_export_folder_activate(GtkMenuItem * menuitem,
 			       gpointer user_data)
 {
-	GtkTreeSelection* selection;
-	GtkTreeIter selected;
-//	GtkTreeIter iter;
-	gchar buf[256];
-	gchar *caption = NULL;
-	
-	selection = gtk_tree_view_get_selection(bookmark_tree);
-	if(!gtk_tree_selection_get_selected(selection, NULL, &selected)) 
-		return;
-	gtk_tree_model_get(GTK_TREE_MODEL(model), &selected,
-				   2, &caption, -1);
-
-	sprintf(buf, "%s/removed/%s.xml", settings.swbmDir,
-		caption);
-	GS_warning(("%s", buf));
+	gui_export_bookmarks_dialog(BOOKMARKS_EXPORT,NULL);
 
-	bookmarks_changed = TRUE;
-	save_iter_to_xml_removed(&selected);
-	gtk_tree_store_remove(GTK_TREE_STORE(model), &selected);
-	bookmarks_changed = TRUE;
-	gui_save_bookmarks(NULL, NULL);
-	g_free(caption);
 }
 
 
@@ -1086,7 +954,7 @@ G_MODULE_EXPORT void on_open_in_tab_activate(GtkMenuItem * menuitem, gpointer us
  * Return value
  *   void
  */
-
+ 
 void gui_create_bookmark_menu(void)
 {
 	gchar *glade_file;
@@ -1112,7 +980,7 @@ void gui_create_bookmark_menu(void)
 	menu.reorder = glade_xml_get_widget (gxml, "allow_reordering");  // pmBookmarkTree_uiinfo[10].widget;
 
 	menu.bibletime = glade_xml_get_widget (gxml, "import_bibletime_bookmarks1");  // pmBookmarkTree_uiinfo[12].widget;
-	menu.rr_submenu = glade_xml_get_widget (gxml, "remove_restore");  // pmBookmarkTree_uiinfo[13].widget;
+	//menu.rr_submenu = glade_xml_get_widget (gxml, "remove_restore");  // pmBookmarkTree_uiinfo[13].widget;
 
 	menu.remove = glade_xml_get_widget (gxml, "remove_folder");  // rr_menu_uiinfo[0].widget;
 	menu.restore = glade_xml_get_widget (gxml, "restore_folder");  // rr_menu_uiinfo[2].widget;
@@ -1125,12 +993,11 @@ void gui_create_bookmark_menu(void)
 	gtk_widget_set_sensitive(menu.delete, FALSE);
 	gtk_widget_set_sensitive(menu.bibletime, settings.have_bibletime);
 
-	gtk_widget_set_sensitive(menu.rr_submenu, FALSE);
+	//gtk_widget_set_sensitive(menu.rr_submenu, FALSE);
 	gtk_widget_set_sensitive(menu.remove, TRUE);
 	gtk_widget_set_sensitive(menu.restore, TRUE);
-
-	gtk_widget_hide(menu.rr_submenu);
-	/* don't know what this is -- turn it off for now */
+	//gtk_widget_hide(menu.remove);
+	gtk_widget_hide(menu.restore);
 	
     	/* connect signals and data */
 	glade_xml_signal_autoconnect_full
diff --git a/src/gnome2/bookmarks_treeview.c b/src/gnome2/bookmarks_treeview.c
index b6e58f7..859327d 100644
--- a/src/gnome2/bookmarks_treeview.c
+++ b/src/gnome2/bookmarks_treeview.c
@@ -23,7 +23,7 @@
 #include <config.h>
 #endif
 
-#include <gnome.h>
+#include <gtk/gtk.h>
 #include <libxml/parser.h>
 //#include <gal/shortcut-bar/e-shortcut-bar.h>
 #include <math.h>
@@ -55,6 +55,8 @@
 #include "main/module_dialogs.h"
 #include "main/url.hh"
 
+#include "gui/debug_glib_null.h"
+
 //TreePixbufs *pixbufs;
 GtkTreeStore *model;
 GtkTreeModel *tree_model;
@@ -603,24 +605,33 @@ static void row_deleted(GtkTreeModel * treemodel, GtkTreePath * arg1,
 
 static void create_pixbufs(void)
 {
-	//GtkWidget *image;
+	GtkTextDirection dir = gtk_widget_get_direction (GTK_WIDGET(widgets.app));
 
 	bm_pixbufs = g_new0(BookMarksPixbufs, 1);
-	bm_pixbufs->pixbuf_closed =
-	    pixbuf_finder("epiphany-bookmarks.png", NULL);
 
-	if (!bm_pixbufs->pixbuf_closed)
-		bm_pixbufs->pixbuf_closed
-		    = gtk_widget_render_icon(widgets.app,
-					     GNOME_STOCK_BOOK_BLUE,
-					     GTK_ICON_SIZE_MENU, NULL);
+	if (dir == GTK_TEXT_DIR_LTR) {
+		if (!bm_pixbufs->pixbuf_closed)
+			pixbufs->pixbuf_closed =
+				pixbuf_finder("book_closed.png", 16, NULL);
+		
+		pixbufs->pixbuf_opened =
+			pixbuf_finder("book_open.png", 16, NULL);
+	}
+	else {
+		if (!bm_pixbufs->pixbuf_closed)
+			pixbufs->pixbuf_closed =
+				pixbuf_finder("book_closed_rtol.png", 16, NULL);
+		
+		pixbufs->pixbuf_opened =
+			pixbuf_finder("book_open_rtol.png", 16, NULL);
+	}
 
-	bm_pixbufs->pixbuf_opened =
-	    gtk_widget_render_icon(widgets.app,
-				   GNOME_STOCK_BOOK_OPEN,
-				   GTK_ICON_SIZE_MENU, NULL);
+	bm_pixbufs->pixbuf_closed =
+		pixbuf_finder("epiphany-bookmarks.png", 0, NULL);
+
+	
 	bm_pixbufs->pixbuf_helpdoc =
-	    pixbuf_finder("epiphany-bookmark-page.png", NULL);
+		pixbuf_finder("epiphany-bookmark-page.png", 0, NULL);
 
 	if (!bm_pixbufs->pixbuf_helpdoc)
 		bm_pixbufs->pixbuf_helpdoc
@@ -787,8 +798,7 @@ static gboolean button_release_event(GtkWidget * widget,
 			gtk_widget_set_sensitive(menu.in_dialog, !multi);
 			gtk_widget_set_sensitive(menu.new, FALSE);
 			gtk_widget_set_sensitive(menu.insert, FALSE);
-			gtk_widget_set_sensitive(menu.rr_submenu,
-						 FALSE);
+			gtk_widget_set_sensitive(menu.remove, FALSE);
 		} else {
 			/* click on treeview folder to expand or collapse it */			
 			path = gtk_tree_model_get_path(
@@ -805,7 +815,7 @@ static gboolean button_release_event(GtkWidget * widget,
 			gtk_widget_set_sensitive(menu.in_dialog, FALSE);
 			gtk_widget_set_sensitive(menu.new, TRUE);
 			gtk_widget_set_sensitive(menu.insert, TRUE);
-			gtk_widget_set_sensitive(menu.rr_submenu, TRUE);
+			gtk_widget_set_sensitive(menu.remove, TRUE);
 		}
 
 		gtk_widget_set_sensitive(menu.bibletime,
@@ -840,10 +850,9 @@ static gboolean button_release_event(GtkWidget * widget,
 			gtk_widget_set_sensitive(menu.edit, FALSE);
 			gtk_widget_set_sensitive(menu.delete, FALSE);
 			gtk_widget_set_sensitive(menu.bibletime, FALSE);
-			gtk_widget_set_sensitive(menu.rr_submenu,
-						 FALSE);
 			gtk_widget_set_sensitive(menu.remove, FALSE);
-			gtk_widget_set_sensitive(menu.restore, FALSE);
+			//gtk_widget_set_sensitive(menu.remove, FALSE);
+			//gtk_widget_set_sensitive(menu.restore, FALSE);
 			return TRUE;
 		} else {
 			gtk_widget_set_sensitive(menu.bibletime,
diff --git a/src/gnome2/commentary.c b/src/gnome2/commentary.c
index c940648..639185d 100644
--- a/src/gnome2/commentary.c
+++ b/src/gnome2/commentary.c
@@ -28,7 +28,11 @@
 
 
 #ifdef USE_GTKMOZEMBED
+#ifdef WIN32
+#include "geckowin/gecko-html.h"
+#else
 #include "gecko/gecko-html.h"
+#endif
 #else
 #include <gtkhtml/gtkhtml.h>
 #include "gui/html.h"
@@ -63,6 +67,8 @@
 #include "main/display.hh"
 #include "main/url.hh"
 
+#include "gui/debug_glib_null.h"
+
 
 /******************************************************************************
  * Name
@@ -143,12 +149,13 @@ static gboolean on_comm_button_press_event(GtkWidget * widget,
  *   gboolean
  */
 
+extern gboolean in_url;
+
 static gboolean on_comm_button_release_event(GtkWidget * widget,
 					GdkEventButton * event,
 					gpointer data)
 {
 //#ifdef GTKHTML	
-	extern gboolean in_url;
 	gchar *key;
 	const gchar *url;
 	
diff --git a/src/gnome2/commentary_dialog.c b/src/gnome2/commentary_dialog.c
index 8758f01..96021cf 100644
--- a/src/gnome2/commentary_dialog.c
+++ b/src/gnome2/commentary_dialog.c
@@ -25,7 +25,11 @@
 
 #include <gtk/gtk.h>
 #ifdef USE_GTKMOZEMBED
+#ifdef WIN32
+#include "geckowin/gecko-html.h"
+#else
 #include "gecko/gecko-html.h"
+#endif
 #else
 #include <gtkhtml/gtkhtml.h>
 #include "gui/html.h"
@@ -48,45 +52,23 @@
 #include "main/navbar_versekey.h"
 #include "main/display.hh"
 
-//static void create_menu(DIALOG_DATA * d, GdkEventButton * event);
+#include "gui/debug_glib_null.h"
+
+#ifndef USE_GTKMOZEMBED
+void commentary_prefixable_link(GtkHTML *html, const gchar *url, gpointer data);
+#endif
 
 extern gboolean dialog_freed;
 extern gboolean do_display;
+
 /****************************************************************************************
  * static - global to this file only
  */
-
 DIALOG_DATA *cur_d;
-//static gboolean apply_change;
 
 
 /******************************************************************************
  * Name
- *   gui_display_commentary_with_struct
- *
- * Synopsis
- *   #include "commentary.h"
- *
- *   void gui_display_commentary_with_struct(gchar * key)	
- *
- * Description
- *    display new key in current commentary
- *
- * Return value
- *   void
- */
-
-void gui_display_commentary_with_struct(DIALOG_DATA *d,
-					gchar *key)
-{
-	strcpy(settings.comm_key, key);
-	if (d->key)
-		g_free(d->key);
-	d->key = g_strdup(key);
-}
-
-/******************************************************************************
- * Name
  *   on_dialog_destroy
  *
  * Synopsis
@@ -252,7 +234,7 @@ void commentary_prefixable_link(GtkHTML *html,
 	*(strrchr(buf, ' ')) = '\0';
 	gui_prefixable_link_clicked(html, url, data, buf);
 }
-#endif
+#endif /* !USE_GTKMOZEMBED */
 
 
 /******************************************************************************
@@ -312,7 +294,7 @@ _popupmenu_requested_cb (GeckoHtml *html,
     	gui_menu_popup (NULL, d);
 	//gui_commentary_dialog_create_menu(d); 
 }
-#endif
+#endif /* USE_GTKMOZEMBED */
 
 /******************************************************************************
  * Name
@@ -337,7 +319,9 @@ void gui_create_commentary_dialog(DIALOG_DATA *d,
 	GtkWidget *vbox_toolbars;
 	GtkWidget *toolbar_nav;
 	GtkWidget *frame19;
-#ifndef USE_GTKMOZEMBED
+#ifdef USE_GTKMOZEMBED
+	GtkWidget *eventbox;
+#else
 	GtkWidget *scrolledwindow38;
 #endif
 	
@@ -376,8 +360,13 @@ void gui_create_commentary_dialog(DIALOG_DATA *d,
 	gtk_frame_set_shadow_type(GTK_FRAME(frame19), GTK_SHADOW_IN);
 
 #ifdef USE_GTKMOZEMBED	
+	
+	eventbox = gtk_event_box_new();
+	gtk_widget_show(eventbox);
+	gtk_container_add(GTK_CONTAINER(frame19), eventbox);
+	
 	d->html = GTK_WIDGET(gecko_html_new(((DIALOG_DATA*) d),TRUE,DIALOG_COMMENTARY_TYPE));
-	gtk_container_add(GTK_CONTAINER(frame19), d->html);
+	gtk_container_add(GTK_CONTAINER(eventbox), d->html);
 	gtk_widget_show(d->html);	
 	g_signal_connect((gpointer)d->html,
 		      "popupmenu_requested",
diff --git a/src/gnome2/dialog.c b/src/gnome2/dialog.c
index ca2752f..336dd8c 100644
--- a/src/gnome2/dialog.c
+++ b/src/gnome2/dialog.c
@@ -32,6 +32,8 @@
 #include "main/settings.h"
 #include "main/sword.h"
 
+#include "gui/debug_glib_null.h"
+
 //static GtkWidget *gs_dialog;
 static GtkWidget *entry1 = NULL;
 static GtkWidget *entry2 = NULL;
@@ -41,7 +43,8 @@ static GtkWidget *entry5 = NULL;
 static GtkWidget *entry6 = NULL;
 static gint retval = 3;
 
-
+GS_DIALOG * standard_info;
+GtkWidget * dialog_request;
 
 /******************************************************************************
  * Name
@@ -109,8 +112,7 @@ static void get_entry_text(GS_DIALOG * info)
  * Synopsis
  *   #include "gui/dialog.h"
  *
- *   void on_dialog_response(GtkDialog * dialog, gint response_id,
- *							GS_DIALOG * info)
+ *   void on_dialog_response(GtkDialog * dialog, gint response_id, GS_DIALOG * info)
  *
  * Description
  *   
@@ -119,8 +121,7 @@ static void get_entry_text(GS_DIALOG * info)
  *   void
  */
 
-static void on_dialog_response(GtkDialog * dialog, gint response_id,
-			       GS_DIALOG * info)
+static void on_dialog_response(GtkDialog * dialog, gint response_id, GS_DIALOG * info)
 {
 	GS_warning(("%d", response_id));
 	switch (response_id) {
@@ -142,6 +143,29 @@ static void on_dialog_response(GtkDialog * dialog, gint response_id,
 	}
 }
 
+/******************************************************************************
+ * Name
+ *   on_dialog_enter
+ *
+ * Synopsis
+ *   #include "gui/dialog.h"
+ *
+ *   void on_dialog_enter(void)
+ *
+ * Description
+ *   canned Enter key route to on_dialog_response
+ *
+ * Return value
+ *   void
+ */
+
+static void on_dialog_enter(void)
+{
+	on_dialog_response(GTK_DIALOG(dialog_request), GTK_RESPONSE_OK, standard_info);
+	gtk_widget_destroy(GTK_WIDGET(dialog_request));
+}
+
+
 static GtkWidget *create_dialog_alert(GS_DIALOG * info)
 {
 	GtkWidget *dialog_alert;
@@ -266,7 +290,6 @@ static GtkWidget *create_dialog_alert(GS_DIALOG * info)
 
 static GtkWidget *create_dialog_request(GS_DIALOG * info)
 {
-	GtkWidget *dialog_request;
 	GtkWidget *dialog_vbox3;
 	GtkWidget *hbox4;
 	GtkWidget *image6;
@@ -283,10 +306,9 @@ static GtkWidget *create_dialog_request(GS_DIALOG * info)
 
 	dialog_request = gtk_dialog_new();
 	info->dialog = dialog_request;
-	gtk_container_set_border_width(GTK_CONTAINER(dialog_request),
-				       6);
+	gtk_container_set_border_width(GTK_CONTAINER(dialog_request), 6);
 	gtk_window_set_title(GTK_WINDOW(dialog_request), 
-			     info->title ? info->title : " ");
+			     (info->title ? info->title : " "));
 	gtk_window_set_modal(GTK_WINDOW(dialog_request), TRUE);
 	gtk_window_set_resizable(GTK_WINDOW(dialog_request), FALSE);
 	gtk_dialog_set_has_separator(GTK_DIALOG(dialog_request), FALSE);
@@ -346,6 +368,8 @@ static GtkWidget *create_dialog_request(GS_DIALOG * info)
 		if (info->text1)
 			gtk_entry_set_text(GTK_ENTRY(entry1),
 					   info->text1);
+		g_signal_connect((gpointer) entry1, "activate",
+				 G_CALLBACK(on_dialog_enter), info);
 	}
 
 	if (info->label2) {
@@ -367,7 +391,8 @@ static GtkWidget *create_dialog_request(GS_DIALOG * info)
 		if (info->text2)
 			gtk_entry_set_text(GTK_ENTRY(entry2),
 					   info->text2);
-
+		g_signal_connect((gpointer) entry2, "activate",
+				 G_CALLBACK(on_dialog_enter), info);
 	}
 
 	if (info->label3) {
@@ -389,7 +414,8 @@ static GtkWidget *create_dialog_request(GS_DIALOG * info)
 		if (info->text3)
 			gtk_entry_set_text(GTK_ENTRY(entry3),
 					   info->text3);
-
+		g_signal_connect((gpointer) entry3, "activate",
+				 G_CALLBACK(on_dialog_enter), info);
 	}
 
 	if (info->label4) {
@@ -411,7 +437,8 @@ static GtkWidget *create_dialog_request(GS_DIALOG * info)
 		if (info->text4)
 			gtk_entry_set_text(GTK_ENTRY(entry4),
 					   info->text4);
-
+		g_signal_connect((gpointer) entry4, "activate",
+				 G_CALLBACK(on_dialog_enter), info);
 	}
 
 	if (info->label5) {
@@ -433,7 +460,8 @@ static GtkWidget *create_dialog_request(GS_DIALOG * info)
 		if (info->text5)
 			gtk_entry_set_text(GTK_ENTRY(entry5),
 					   info->text5);
-
+		g_signal_connect((gpointer) entry5, "activate",
+				 G_CALLBACK(on_dialog_enter), info);
 	}
 
 	if (info->label6) {
@@ -455,7 +483,8 @@ static GtkWidget *create_dialog_request(GS_DIALOG * info)
 		if (info->text6)
 			gtk_entry_set_text(GTK_ENTRY(entry6),
 					   info->text6);
-
+		g_signal_connect((gpointer) entry6, "activate",
+				 G_CALLBACK(on_dialog_enter), info);
 	}
 
 	dialog_action_area3 = GTK_DIALOG(dialog_request)->action_area;
@@ -503,32 +532,30 @@ static GtkWidget *create_dialog_request(GS_DIALOG * info)
 
 GS_DIALOG *gui_new_dialog(void)
 {
-	GS_DIALOG *info;
-
-	info = g_new0(GS_DIALOG, 1);
-
-	info->stock_icon = NULL;
-	info->dialog = NULL;
-	info->title = NULL;
-	info->text1 = NULL;
-	info->text2 = NULL;
-	info->text3 = NULL;
-	info->text4 = NULL;
-	info->text5 = NULL;
-	info->text6 = NULL;
-	info->label_top = NULL;
-	info->label_middle = NULL;
-	info->label1 = NULL;
-	info->label2 = NULL;
-	info->label3 = NULL;
-	info->label4 = NULL;
-	info->label5 = NULL;
-	info->label6 = NULL;
-	info->label_bottom = NULL;
-	info->ok = FALSE;
-	info->cancel = FALSE;
-	info->yes = FALSE;
-	info->no = FALSE;
+	standard_info = g_new0(GS_DIALOG, 1);
+
+	standard_info->stock_icon = NULL;
+	standard_info->dialog = NULL;
+	standard_info->title = NULL;
+	standard_info->text1 = NULL;
+	standard_info->text2 = NULL;
+	standard_info->text3 = NULL;
+	standard_info->text4 = NULL;
+	standard_info->text5 = NULL;
+	standard_info->text6 = NULL;
+	standard_info->label_top = NULL;
+	standard_info->label_middle = NULL;
+	standard_info->label1 = NULL;
+	standard_info->label2 = NULL;
+	standard_info->label3 = NULL;
+	standard_info->label4 = NULL;
+	standard_info->label5 = NULL;
+	standard_info->label6 = NULL;
+	standard_info->label_bottom = NULL;
+	standard_info->ok = FALSE;
+	standard_info->cancel = FALSE;
+	standard_info->yes = FALSE;
+	standard_info->no = FALSE;
 	/* set entrys to null */
 	entry1 = NULL;
 	entry2 = NULL;
@@ -537,7 +564,7 @@ GS_DIALOG *gui_new_dialog(void)
 	entry5 = NULL;
 	entry6 = NULL;
 
-	return info;
+	return standard_info;
 }
 
 
@@ -665,7 +692,7 @@ gint gui_close_confirmation_dialog(GS_DIALOG * info)
 	static gboolean is_running = FALSE;
 
 	if (!is_running) {
-		dialog = create_dialog_alert(info);	//gs_dialog_build(info);
+		dialog = create_dialog_alert(info);
 		gtk_dialog_add_button (GTK_DIALOG (dialog),
 				       _("Close _without Saving"),
 				       GTK_RESPONSE_NO);
diff --git a/src/gnome2/dictlex.c b/src/gnome2/dictlex.c
index d281a90..6c4ab94 100644
--- a/src/gnome2/dictlex.c
+++ b/src/gnome2/dictlex.c
@@ -26,7 +26,11 @@
 #include <gtk/gtk.h>
 
 #ifdef USE_GTKMOZEMBED
+#ifdef WIN32
+#include "geckowin/gecko-html.h"
+#else
 #include "gecko/gecko-html.h"
+#endif
 #else
 #include <gtkhtml/gtkhtml.h>
 #include "gui/html.h"
@@ -53,6 +57,8 @@
 #include "main/url.hh"
 #include "main/xml.h"
 
+#include "gui/debug_glib_null.h"
+
 /******************************************************************************
  * externs
  */
@@ -276,11 +282,12 @@ static gint html_button_pressed(GtkWidget * html,
  *   gint
  */
 
+extern gboolean in_url;
+
 static gint html_button_released(GtkWidget * html,
 				GdkEventButton * event, gpointer data)
 {
 #ifdef GTKHTML
-	extern gboolean in_url;
 	gchar *key;
 	const gchar *url;
 #endif
diff --git a/src/gnome2/dictlex_dialog.c b/src/gnome2/dictlex_dialog.c
index 6628f7a..1c8d305 100644
--- a/src/gnome2/dictlex_dialog.c
+++ b/src/gnome2/dictlex_dialog.c
@@ -25,7 +25,11 @@
 
 #include <gtk/gtk.h>
 #ifdef USE_GTKMOZEMBED
+#ifdef WIN32
+#include "geckowin/gecko-html.h"
+#else
 #include "gecko/gecko-html.h"
+#endif
 #else
 #include <gtkhtml/gtkhtml.h>
 #include "gui/html.h"
@@ -361,7 +365,9 @@ void gui_create_dictlex_dialog(DIALOG_DATA *dlg)
 	GtkWidget *btnSyncDL;
 //	GtkWidget *label205;
 	GtkWidget *frameDictHTML;
-#ifndef USE_GTKMOZEMBED
+#ifdef USE_GTKMOZEMBED
+	GtkWidget *eventbox;	
+#else
 	GtkWidget *scrolledwindowDictHTML;
 #endif /* !USE_GTKMOZEMBED */
 	GtkWidget *scrolledwindow;
@@ -454,9 +460,14 @@ void gui_create_dictlex_dialog(DIALOG_DATA *dlg)
 	gtk_paned_pack2(GTK_PANED(hpaned7), frameDictHTML, TRUE, TRUE);
 
 #ifdef USE_GTKMOZEMBED
-	gtk_frame_set_shadow_type(GTK_FRAME(frameDictHTML), GTK_SHADOW_IN);	
+	gtk_frame_set_shadow_type(GTK_FRAME(frameDictHTML), GTK_SHADOW_IN);
+	
+	eventbox = gtk_event_box_new();
+	gtk_widget_show(eventbox);
+	gtk_container_add(GTK_CONTAINER(frameDictHTML), eventbox);
+	
 	dlg->html = GTK_WIDGET(gecko_html_new((DIALOG_DATA*) dlg,TRUE,DIALOG_DICTIONARY_TYPE));
-	gtk_container_add(GTK_CONTAINER(frameDictHTML), dlg->html);
+	gtk_container_add(GTK_CONTAINER(eventbox), dlg->html);
 	gtk_widget_show(dlg->html);
 	g_signal_connect((gpointer)dlg->html,
 		      "popupmenu_requested",
diff --git a/src/gnome2/display_info.c b/src/gnome2/display_info.c
index fc11f5e..b77b23f 100644
--- a/src/gnome2/display_info.c
+++ b/src/gnome2/display_info.c
@@ -25,7 +25,11 @@
 
 #include <gtk/gtk.h>
 #ifdef USE_GTKMOZEMBED
+#ifdef WIN32
+#include "geckowin/gecko-html.h"
+#else
 #include "gecko/gecko-html.h"
+#endif
 #else
 #include <gtkhtml/gtkhtml.h>
 #endif
@@ -72,7 +76,7 @@ void gui_display_mod_and_key(const gchar * mod_name, const gchar * key)
 				   text, 
 				   (gchar*)key, 
 				   TRUE);
-		free(text);
+		g_free(text);
 	}
 }
 
diff --git a/src/gnome2/export_bookmarks.c b/src/gnome2/export_bookmarks.c
new file mode 100644
index 0000000..496a968
--- /dev/null
+++ b/src/gnome2/export_bookmarks.c
@@ -0,0 +1,728 @@
+/* 
+ * Xiphos Bible Study Tool
+ * export_bookmarks.c -
+ *
+ * Copyright (C) 2003-2009 Xiphos Developer Team
+ *
+ * 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 Library 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <gtk/gtk.h>
+#include <libxml/parser.h>
+#include <glade/glade-xml.h>
+
+#include "gui/export_bookmarks.h"
+#include "gui/xiphos.h"
+#include "gui/bookmarks_menu.h"
+#include "gui/bookmarks_treeview.h"
+#include "gui/sidebar.h"
+#include "gui/utilities.h"
+
+
+#include "main/settings.h"
+#include "main/sidebar.h"
+#include "main/search_dialog.h"
+#include "main/sword.h"
+#include "main/xml.h"
+#include "main/url.hh"
+
+
+enum {
+	BOOKMARKS,
+	HTML,
+	PLAIN
+};
+
+
+//extern GList *list_for_bookmarking;
+
+
+void dialog_export_bookmarks_response_cb (  GtkDialog * dialog,
+							gint response_id,
+							BK_EXPORT * data);
+void checkbutton_include_text_toggled_cb(GtkToggleButton * togglebutton,
+							BK_EXPORT * data);
+ void radiobutton_plain_text_toggled_cb(GtkToggleButton * togglebutton,
+							BK_EXPORT * data);
+ void radiobutton_xiphos_bookmarks_toggled_cb(GtkToggleButton * togglebutton,
+							BK_EXPORT * data);
+void radiobutton_html_toggled_cb(GtkToggleButton * togglebutton,
+							BK_EXPORT * data);
+gboolean dialog_vbox1_key_press_event_cb (GtkWidget   * widget,
+                                          GdkEventKey * event,
+                                          gpointer     user_data);
+
+
+static gchar *get_module(const gchar * key)
+{
+	if (main_is_Bible_key((gchar*)key))
+		return g_strdup(settings.MainWindowModule);
+	return NULL;
+
+}
+
+
+void gui_set_html_item (GString * str,
+			const gchar * description,
+			const gchar * module,
+			const gchar * key,
+			gboolean with_scripture)
+{
+	gchar *mod_tmp = NULL;
+	gchar *scripture = NULL;
+	gchar *text = NULL;
+	gchar *buf = NULL;
+	
+	if (with_scripture) {
+		if (strlen(module) < 2)
+			mod_tmp = get_module(key);
+		else
+			mod_tmp = g_strdup(module);
+		
+		if (main_get_mod_type(mod_tmp) == TEXT_TYPE) {
+			text = main_get_rendered_text(mod_tmp, key);
+			scripture = g_strdup_printf("<li>%s</li>", text);
+			g_free(text);
+		}
+		
+		if (mod_tmp)
+			g_free(mod_tmp);
+	}
+	else
+		scripture = g_strdup ("");
+
+	buf = g_strdup_printf("<li>%s<ul><li>%s %s</li>%s</ul></li>",
+	    			description,
+	    			module,
+	    			key,
+	    			(scripture?scripture:""));
+
+	
+	g_string_append(str,buf);
+	g_free(buf);
+	g_free(scripture);
+}
+
+
+void gui_set_plain_text_item (GString * str,
+			const gchar * description,
+			const gchar * module,
+			const gchar * key,
+			gboolean with_scripture)
+{
+	gchar *mod_tmp = NULL;
+	gchar *scripture = NULL;
+	gchar *buf = NULL;
+	
+	if (with_scripture) {
+		if (strlen(module) < 2)
+			mod_tmp = get_module(key);
+		else
+			mod_tmp = g_strdup(module);
+		
+		if (main_get_mod_type(mod_tmp) == TEXT_TYPE)
+				scripture = main_get_striptext (mod_tmp, (gchar*) key);
+		
+		if (mod_tmp)
+			g_free(mod_tmp);
+	}
+	else
+		scripture = g_strdup ("");
+
+	buf = g_strdup_printf("\t%s\n\t\t%s %s\n\t\t%s\n",
+	    			description,
+	    			module,
+	    			key,
+	    			(scripture?scripture:""));
+
+	
+	g_string_append(str,buf);
+	g_free(buf);
+	g_free(scripture);
+}
+
+
+static gboolean _save_verselist_2_xml(BK_EXPORT *data)
+{
+	xmlNodePtr root_node = NULL;
+	xmlNodePtr cur_node = NULL;
+	xmlDocPtr root_doc;
+	xmlAttrPtr root_attr;
+	gchar filename[256];
+	GString *name = g_string_new(NULL);
+	GString *str = g_string_new ("");
+	RESULTS *list_item;
+	
+	
+	sprintf(filename, "%s.xml", data->filename);
+	
+	root_doc = xmlNewDoc((const xmlChar *) "1.0");
+	
+	if (root_doc != NULL) {
+		root_node = xmlNewNode(NULL, (const xmlChar *)
+				       "SwordBookmarks");
+		root_attr =
+		    xmlNewProp(root_node, (const xmlChar *)"syntaxVersion",
+			       (const xmlChar *) "1");
+		xmlDocSetRootElement(root_doc, root_node);
+	}
+	
+	if (is_search_result)
+		g_string_printf(name, _("Search result: %s"), settings.searchText);
+	else		
+		g_string_printf(name, _("Verse List"));
+	
+	cur_node = xml_add_folder_to_parent(root_node, name->str); /* Verse List or Search result: */
+	
+	while (data->verses) {
+		list_item = (RESULTS *) data->verses->data;
+		g_string_printf(str, "%s, %s", list_item->key,
+				 list_item->module);
+		
+		xml_add_bookmark_to_parent (cur_node,
+					    str->str, // bookmark description
+					    list_item->key, // module key
+					    list_item->module, // module name
+					    main_get_module_description(list_item->module)); // module description
+		
+		data->verses = g_list_next(data->verses);
+	}
+	
+	xmlSaveFormatFile(filename, root_doc,1);
+	xmlFreeDoc(root_doc);
+	return 1;
+}
+
+
+static gboolean _save_verselist_2_html(BK_EXPORT *data)
+{
+	
+	gchar filename[256];
+	gchar *buf;
+	GString *name = g_string_new(NULL);
+	GString *str = g_string_new ("");
+	GString *des = g_string_new ("");
+	RESULTS *list_item;
+	void (*catenate)(GString * str,
+			 const gchar * description,
+			 const gchar * module,
+			 const gchar * key,
+			 gboolean with_scripture) = NULL;
+
+	switch (data->type) {
+	case HTML:
+		catenate = gui_set_html_item;
+		sprintf(filename, "%s.html", data->filename);
+		break;
+	case PLAIN:
+		catenate = gui_set_plain_text_item;
+		sprintf(filename, "%s.txt", data->filename);
+		break;
+	}
+
+	if (data->verselist == ADV_SEARCH_RESULTS_EXPORT) {
+		
+		main_export_current_adv_search (str, (data->type == HTML), data->with_scripture);
+		
+	} else {
+		
+		if (is_search_result)
+			g_string_printf(name, _("Search result: %s"), settings.searchText);
+		else		
+			g_string_printf(name, _("Verse List"));
+
+		
+		switch (data->type) {
+		case HTML:
+			buf = g_strdup_printf("<html><body><ul><b>%s</b>",name->str);
+			break;
+		case PLAIN:
+			buf = g_strdup_printf("%s\n",name->str);
+			break;
+		}
+		g_string_append(str,buf);
+		g_string_free(name,1);
+		g_free(buf);
+
+		
+		while (data->verses) {
+			list_item = (RESULTS *) data->verses->data;
+			g_string_printf(des, "%s, %s", list_item->key, list_item->module);
+			
+			(*catenate)(str, des->str, list_item->module, list_item->key, data->with_scripture);
+			data->verses = g_list_next(data->verses);
+		}
+		g_string_free(des,1);
+	}
+	
+	switch (data->type) {
+		case HTML:
+			g_string_append(str,"</ul></body></html>");
+		break;
+		case PLAIN:
+			g_string_append(str,"\n");
+		break;
+	}
+	
+	/* not sure how well this will work with windows */
+	if (!g_file_set_contents (filename, str->str, str->len, NULL))
+		GS_warning(("Unable to save %s", filename));
+	
+	g_string_free(str,1);
+	return 1;
+}
+
+
+static void _export_verselist(BK_EXPORT *data)
+{
+	switch (data->type) {
+	case BOOKMARKS:
+		_save_verselist_2_xml(data);
+		break;
+	case HTML:
+	case PLAIN:		
+		_save_verselist_2_html(data);
+		break;
+	}
+}
+
+
+/******************************************************************************
+ * Name
+ *  _parse_treeview_html
+ *
+ * Synopsis
+ *   #include "gui/bookmarks_menu.h"
+ *
+ *   void _parse_treeview_html (xmlNodePtr parent, GtkTreeIter * tree_parent)	
+ *
+ * Description
+ *
+ *
+ * Return value
+ *   void
+ */
+static
+void _parse_treeview (GString *str, GtkTreeIter * tree_parent,
+                           GtkTreeStore *model, BK_EXPORT *data)
+{
+	GtkTreeIter child;
+	gchar *caption = NULL;
+	gchar *key = NULL;
+	gchar *module = NULL;
+	gchar *mod_desc = NULL;
+	gchar *description = NULL;
+	gchar *buf = NULL;
+	void (*catenate)(GString * str,
+			 const gchar * description,
+			 const gchar * module,
+			 const gchar * key,
+			 gboolean with_scripture) = NULL;
+
+	switch (data->type) {
+	case HTML:
+		catenate = gui_set_html_item;
+		break;
+	case PLAIN:
+		catenate = gui_set_plain_text_item;
+		break;
+	}
+
+	gtk_tree_model_iter_children(GTK_TREE_MODEL(model), &child,
+                                             tree_parent);
+	
+	do {
+		gtk_tree_model_get(GTK_TREE_MODEL(model), &child,
+				   2, &caption,
+				   3, &key,
+				   4, &module,
+				   5, &mod_desc,
+				   6, &description,
+				   -1);
+		if (gtk_tree_model_iter_has_child(GTK_TREE_MODEL(model), &child)) {
+			switch (data->type) {
+			case HTML:
+				buf = g_strdup_printf("<ul><b>%s</b>",caption);
+				break;
+			case PLAIN:
+				buf = g_strdup_printf("%s\n\n",caption);
+				break;
+			}
+			g_string_append(str,buf);
+			g_free(buf);
+			_parse_treeview(str, &child, model, data);
+		}
+		if (key) {
+			(*catenate)(str, description, module, key, data->with_scripture);
+		} else {
+			switch (data->type) {
+			case HTML:
+				buf = g_strdup_printf("</ul>");
+				break;
+			case PLAIN:
+				buf = g_strdup_printf(" ");
+				break;
+			}
+			g_string_append(str,buf);
+			g_free(buf);
+		}				
+		
+		g_free(caption);
+		g_free(key);
+		g_free(module);	
+		g_free(mod_desc);
+		g_free(description);
+	} while(gtk_tree_model_iter_next(GTK_TREE_MODEL(model), &child));
+}
+
+
+/******************************************************************************
+ * Name
+ *   save_iter_to_xml
+ *
+ * Synopsis
+ *   #include "gui/bookmarks_menu.h"
+ *
+ *   void save_iter_to_xml(GtkTreeIter * iter)	
+ *
+ * Description
+ *
+ *
+ * Return value
+ *   void
+ */
+
+static void save_iter_to_xml(GtkTreeIter * iter, BK_EXPORT *data)
+{
+	xmlNodePtr root_node = NULL;
+	xmlNodePtr cur_node = NULL;
+	xmlDocPtr root_doc;
+	xmlAttrPtr root_attr;
+	gchar *caption = NULL;
+	gchar filename[256];
+	GtkTreeModel *tm;
+
+
+	if (data->verselist == VERSE_LIST_EXPORT)
+		tm = GTK_TREE_MODEL(model_verselist);
+	else
+		tm = GTK_TREE_MODEL(model);
+	
+	gtk_tree_model_get(tm, iter,
+				   2, &caption, -1);
+	sprintf(filename, "%s.xml", data->filename);
+	
+	root_doc = xmlNewDoc((const xmlChar *) "1.0");
+	
+	if (root_doc != NULL) {
+		root_node = xmlNewNode(NULL, (const xmlChar *)
+				       "SwordBookmarks");
+		root_attr =
+		    xmlNewProp(root_node, (const xmlChar *)"syntaxVersion",
+			       (const xmlChar *) "1");
+		xmlDocSetRootElement(root_doc, root_node);
+	}
+	gtk_tree_model_get(tm, iter, 2, &caption, -1);
+		if (gtk_tree_model_iter_has_child(tm,iter)) {
+			cur_node = xml_add_folder_to_parent(root_node, caption);
+			utilities_parse_treeview(cur_node, iter, tm);
+		}
+	g_free(caption);
+	xmlSaveFormatFile(filename, root_doc,1);
+	xmlFreeDoc(root_doc);
+	
+	bookmarks_changed = FALSE;
+}
+
+/******************************************************************************
+ * Name
+ *   _save_iter
+ *
+ * Synopsis
+ *   #include "gui/bookmarks_menu.h"
+ *
+ *   void save_iter_to_html(GtkTreeIter * iter, BK_EXPORT *data)
+ *
+ * Description
+ *
+ *
+ * Return value
+ *   void
+ */
+
+static void _save_iter(GtkTreeIter * iter, BK_EXPORT *data)
+{
+	gchar *caption = NULL;
+	gchar filename[256];
+	GString *str = g_string_new(NULL);
+	
+	gtk_tree_model_get(GTK_TREE_MODEL(model), iter,
+			   2, &caption, -1);
+	switch (data->type) {
+	case HTML:
+		sprintf(filename, "%s.html", data->filename);
+		break;
+	case PLAIN:
+		sprintf(filename, "%s.txt", data->filename);
+		break;
+	}
+	
+	gtk_tree_model_get(GTK_TREE_MODEL(model), iter,
+			   2, &caption, -1);
+		if (gtk_tree_model_iter_has_child(GTK_TREE_MODEL(model),iter)) {
+			switch (data->type) {
+			case HTML:
+				g_string_printf(str, "<html><body><ul><b>%s</b>", caption);
+				break;
+			case PLAIN:
+				g_string_printf(str, "%s\n\n", caption);
+				break;
+			}
+			
+			_parse_treeview (str, iter, model, data);
+		}
+	
+	g_free(caption);
+	switch (data->type) {
+	case HTML:
+		g_string_append(str,"</ul></body></html>");
+		break;
+	case PLAIN:
+		g_string_append(str,"\n");
+		break;
+	}
+	
+	/* not sure how well this will work with windows */
+	if (!g_file_set_contents (filename, str->str, str->len, NULL))
+		GS_warning(("Unable to save %s", filename));
+	
+	g_string_free(str,1);
+}
+
+
+static void export_2_bookmarks(BK_EXPORT *data)
+{
+	GtkTreeSelection* selection;
+	GtkTreeIter selected;
+	GtkTreeView *tree;
+
+	if (data->verselist == VERSE_LIST_EXPORT)
+		tree = GTK_TREE_VIEW(sidebar.results_list);
+	else
+		tree = bookmark_tree;
+	
+	selection = gtk_tree_view_get_selection(tree);
+	if (!gtk_tree_selection_get_selected(selection, NULL, &selected))
+		return;
+
+	save_iter_to_xml(&selected, data);
+}
+
+static void export_2_html(BK_EXPORT *data)
+{
+	GtkTreeSelection* selection;
+	GtkTreeIter selected;
+	gchar buf[256];
+	
+	selection = gtk_tree_view_get_selection(bookmark_tree);
+	if (!gtk_tree_selection_get_selected(selection, NULL, &selected))
+		return;
+	sprintf(buf, "%s.html", data->filename);
+	_save_iter(&selected, data);
+
+}
+
+static void export_2_text(BK_EXPORT *data)
+{
+	GtkTreeSelection* selection;
+	GtkTreeIter selected;
+	
+	selection = gtk_tree_view_get_selection(bookmark_tree);
+	if (!gtk_tree_selection_get_selected(selection, NULL, &selected))
+		return;
+	_save_iter(&selected, data);
+
+}
+
+
+static void _export (BK_EXPORT *data)
+{
+	switch (data->type) {
+	case BOOKMARKS:
+		export_2_bookmarks(data);
+		break;
+	case HTML:
+		export_2_html(data);
+		break;
+	case PLAIN:
+		export_2_text(data);
+		break;
+
+	}
+}
+
+
+static void setup_filechooserwidget (GtkFileChooser * chooser)
+{
+	GtkTreeSelection* selection;
+	GtkTreeIter selected;
+	gchar *caption = NULL;
+	
+	selection = gtk_tree_view_get_selection(bookmark_tree);
+	if (!gtk_tree_selection_get_selected(selection, NULL, &selected))
+		return;
+	gtk_tree_model_get(GTK_TREE_MODEL(model), &selected,
+				   2, &caption, -1);
+	gtk_file_chooser_set_current_name (chooser, caption);
+	
+	g_free(caption);
+}
+
+
+G_MODULE_EXPORT void
+checkbutton_include_text_toggled_cb(GtkToggleButton * togglebutton,
+							     BK_EXPORT * data)
+{
+	data->with_scripture = togglebutton->active;
+}
+
+G_MODULE_EXPORT void
+radiobutton_xiphos_bookmarks_toggled_cb(GtkToggleButton * togglebutton,
+							     BK_EXPORT * data)
+{
+	if (togglebutton->active) {
+		data->type = BOOKMARKS;
+		gtk_widget_set_sensitive (data->cb_scripture,FALSE);
+	}
+}
+
+G_MODULE_EXPORT void
+radiobutton_html_toggled_cb(GtkToggleButton * togglebutton,
+							     BK_EXPORT * data)
+{
+	if (togglebutton->active) {
+		data->type = HTML;
+		gtk_widget_set_sensitive (data->cb_scripture,TRUE);
+	}
+}
+
+
+G_MODULE_EXPORT void
+radiobutton_plain_text_toggled_cb(GtkToggleButton * togglebutton,
+							     BK_EXPORT * data)
+{
+	if (togglebutton->active) {
+		data->type = PLAIN;
+		gtk_widget_set_sensitive (data->cb_scripture,TRUE);
+	}
+}
+
+
+G_MODULE_EXPORT
+void dialog_export_bookmarks_response_cb ( GtkDialog * dialog,
+					   gint response_id,
+					   BK_EXPORT * data)
+{
+	switch (response_id) {
+	case GTK_RESPONSE_CANCEL:
+		break;
+	case GTK_RESPONSE_OK:
+		data->filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (data->filechooserwidget));
+		if (data->verselist)
+			_export_verselist(data);
+		else
+			_export(data);
+		break;
+	}
+	if (data->filename)
+		g_free(data->filename);
+	g_free(data);
+	gtk_widget_destroy(GTK_WIDGET(dialog));
+}
+
+G_MODULE_EXPORT
+gboolean dialog_vbox1_key_press_event_cb (GtkWidget   * widget,
+                                          GdkEventKey * event,
+                                          gpointer     user_data)
+{
+
+	return TRUE;
+}
+
+void gui_export_bookmarks_dialog(gint export_type, GList * verses)
+{
+        GtkBuilder *builder;
+	gchar *gbuilder_file;
+	GtkWidget *dialog;
+	GString *name = g_string_new(NULL);
+	
+	BK_EXPORT *ex_data = g_new0(BK_EXPORT,1);
+	
+	ex_data->filename = NULL;
+	ex_data->type = BOOKMARKS;
+	ex_data->verselist = export_type;
+	
+	if (ex_data->verselist == VERSE_LIST_EXPORT) {
+		ex_data->verses = verses;
+		g_string_printf(name, "%s", _("VerseList"));
+	}
+	else if (ex_data->verselist == SEARCH_RESULTS_EXPORT ||
+	         ex_data->verselist == ADV_SEARCH_RESULTS_EXPORT) {
+		ex_data->verses = verses;
+		g_string_printf(name, "%s", _("SearchResults"));
+	}
+	
+	builder = gtk_builder_new ();
+	gbuilder_file = gui_general_user_file ("xi-export-bookmarks.glade", FALSE);
+        gtk_builder_add_from_file (builder, gbuilder_file, NULL);
+
+        dialog = GTK_WIDGET (gtk_builder_get_object (builder, "dialog_export_bookmarks"));
+        ex_data->rb_bookmarks = GTK_WIDGET (gtk_builder_get_object (builder, "radiobutton_xiphos_bookmarks"));
+        ex_data->rb_html = GTK_WIDGET (gtk_builder_get_object (builder, "radiobutton_html"));
+        ex_data->rb_plain = GTK_WIDGET (gtk_builder_get_object (builder, "radiobutton_plain_text"));
+        ex_data->cb_scripture = GTK_WIDGET (gtk_builder_get_object (builder, "checkbutton_include_text"));
+	ex_data->filechooserwidget = GTK_WIDGET (gtk_builder_get_object (builder, "filechooserwidget"));
+
+	if (ex_data->verselist) {
+		gtk_file_chooser_set_current_name ((GtkFileChooser *) ex_data->filechooserwidget, name->str);
+		g_string_free(name,1);
+	}
+	else
+		setup_filechooserwidget ((GtkFileChooser *) ex_data->filechooserwidget);
+	
+	gtk_widget_set_sensitive (ex_data->cb_scripture,FALSE);
+	
+        gtk_builder_connect_signals (builder,ex_data);
+	
+	if (ex_data->verselist == ADV_SEARCH_RESULTS_EXPORT) {
+		gtk_widget_set_sensitive (ex_data->rb_bookmarks,FALSE);
+		gtk_toggle_button_set_active ((GtkToggleButton *)ex_data->rb_html,
+                                                         TRUE);
+	}
+	
+	
+	if (ex_data->verselist == ADV_SEARCH_RESULTS_EXPORT) {
+		gtk_widget_set_sensitive (ex_data->rb_bookmarks,FALSE);
+		gtk_toggle_button_set_active ((GtkToggleButton *)ex_data->rb_html,
+                                                         TRUE);
+	}
+	
+        g_object_unref (G_OBJECT (builder));
+        gtk_widget_show (dialog);
+}
diff --git a/src/gnome2/export_dialog.c b/src/gnome2/export_dialog.c
index 4c9767a..df4c2da 100644
--- a/src/gnome2/export_dialog.c
+++ b/src/gnome2/export_dialog.c
@@ -37,6 +37,8 @@
 #include "main/settings.h"
 #include "main/sword.h"
 
+#include "gui/debug_glib_null.h"
+
 
 static GtkWidget *dialog;
 static gchar *filename;
diff --git a/src/gnome2/find_dialog.c b/src/gnome2/find_dialog.c
index ac01784..56d6a10 100644
--- a/src/gnome2/find_dialog.c
+++ b/src/gnome2/find_dialog.c
@@ -31,8 +31,12 @@
 #include "main/settings.h"
 #include "main/sword.h"
 #ifdef USE_GTKMOZEMBED
+#ifdef WIN32
+#include "geckowin/gecko-html.h"
+#else
 #include "gecko/gecko-html.h"
 #endif
+#endif
 
 typedef struct _find_dialog FIND_DIALOG;
 
diff --git a/src/gnome2/font_dialog.c b/src/gnome2/font_dialog.c
index d37353a..61c34e9 100644
--- a/src/gnome2/font_dialog.c
+++ b/src/gnome2/font_dialog.c
@@ -32,6 +32,8 @@
 #include "main/sword.h"
 #include "main/settings.h"
 
+#include "gui/debug_glib_null.h"
+
 static GtkWidget *dlg;
 static GtkWidget *combo_entry_size;
 static GtkWidget *font_button;
diff --git a/src/gnome2/gbs.c b/src/gnome2/gbs.c
index fd3fa71..abfe1a2 100644
--- a/src/gnome2/gbs.c
+++ b/src/gnome2/gbs.c
@@ -25,10 +25,14 @@
 
 #include <gtk/gtk.h>
 
-#include <gnome.h>
+#include <gtk/gtk.h>
 
 #ifdef USE_GTKMOZEMBED
+#ifdef WIN32
+#include "geckowin/gecko-html.h"
+#else
 #include "gecko/gecko-html.h"
+#endif
 #else
 #include <gtkhtml/gtkhtml.h>
 #include "gui/html.h"
@@ -66,6 +70,8 @@
 #include "main/display.hh"
 #include "main/url.hh"
 
+#include "gui/debug_glib_null.h"
+
 //static void create_menu(GdkEventButton * event);
 
 
@@ -122,12 +128,13 @@ static gboolean on_book_button_press_event(GtkWidget * widget,
  *   gboolean
  */
 
+extern gboolean in_url;
+
 static gboolean on_book_button_release_event(GtkWidget * widget,
 					GdkEventButton * event,
 					gpointer data)
 {
 #ifdef GTKHTML
-	extern gboolean in_url;
 	gchar *key;
 	const gchar *url;
 #endif /*GTKHTML */
diff --git a/src/gnome2/gbs_dialog.c b/src/gnome2/gbs_dialog.c
index 069d491..25756b3 100644
--- a/src/gnome2/gbs_dialog.c
+++ b/src/gnome2/gbs_dialog.c
@@ -26,7 +26,11 @@
 #include <gtk/gtk.h>
 
 #ifdef USE_GTKMOZEMBED
+#ifdef WIN32
+#include "geckowin/gecko-html.h"
+#else
 #include "gecko/gecko-html.h"
+#endif
 #else
 #include <gtkhtml/gtkhtml.h>
 #include "gui/html.h"
@@ -332,6 +336,7 @@ void gui_create_gbs_dialog(DIALOG_DATA *dlg)
 //	GtkWidget *label243;
 #ifdef USE_GTKMOZEMBED  
 	GtkWidget *frame;
+	GtkWidget *eventbox;
 #else
 	GtkWidget *scrolledwindow_html;
 #endif /* USE_GTKMOZEMBED */
@@ -389,9 +394,12 @@ void gui_create_gbs_dialog(DIALOG_DATA *dlg)
 	gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_IN);
 	gtk_paned_pack2(GTK_PANED(hpaned), frame, FALSE, TRUE);
 	
+	eventbox = gtk_event_box_new();
+	gtk_widget_show(eventbox);
+	gtk_container_add(GTK_CONTAINER(frame), eventbox);
 	
 	dlg->html = GTK_WIDGET(gecko_html_new(((DIALOG_DATA*) dlg),TRUE,DIALOG_BOOK_TYPE));
-	gtk_container_add(GTK_CONTAINER(frame), dlg->html);
+	gtk_container_add(GTK_CONTAINER(eventbox), dlg->html);
 	gtk_widget_show(dlg->html);	
 	g_signal_connect((gpointer)dlg->html,
 		      "popupmenu_requested",
diff --git a/src/gnome2/gui.c b/src/gnome2/gui.c
index 6213dc0..9d46f46 100644
--- a/src/gnome2/gui.c
+++ b/src/gnome2/gui.c
@@ -23,35 +23,242 @@
 #include <config.h>
 #endif
 
+#ifndef WITHOUT_GNOME
 #include <gnome.h>
+#else
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
+#include <locale.h>
+#include <stdlib.h>
+#endif
+
+/* ----------------------------------------------- */
+/* do not #include "gui/debug_glib_null.h" in this */
+/* file: here we define the replacement functions, */
+/* so we need access to the real glib versions.    */
+/* ----------------------------------------------- */
 
 #include "gui/gui.h"
-#include "gui/session.h"
+#include "gui/dialog.h"
+
+#ifdef HAVE_DBUS
+#include "gui/ipc.h"
+static IpcObject* ipc;
+#endif
 
 void gui_init(int argc, char *argv[])
 {
+	static int gui_init_done = FALSE;
+
+	if (gui_init_done) return;
+	gui_init_done = TRUE;
+
 #ifdef ENABLE_NLS
-  bindtextdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR);
-  bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-  textdomain (GETTEXT_PACKAGE);
+	bindtextdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR);
+	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+	textdomain (GETTEXT_PACKAGE);
 #endif
 #ifdef WIN32
-  gchar *locale_dir = g_win32_get_package_installation_directory_of_module(NULL);
-  locale_dir = g_strconcat(locale_dir, "\0", NULL);
-  locale_dir = g_build_filename (locale_dir, "share", "locale", NULL);
-  bindtextdomain(GETTEXT_PACKAGE, locale_dir);
-  bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-  textdomain (GETTEXT_PACKAGE);
-  g_free (locale_dir);
+	gchar *locale_dir = g_win32_get_package_installation_directory_of_module(NULL);
+	locale_dir = g_strconcat(locale_dir, "\0", NULL);
+	locale_dir = g_build_filename (locale_dir, "share", "locale", NULL);
+	bindtextdomain(GETTEXT_PACKAGE, locale_dir);
+	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+	textdomain (GETTEXT_PACKAGE);
+	g_free (locale_dir);
 #endif
+#ifndef WITHOUT_GNOME	
 	gnome_program_init (PACKAGE, VERSION, LIBGNOMEUI_MODULE,
-                      argc, argv,
-                      GNOME_PROGRAM_STANDARD_PROPERTIES,
-                      NULL);
-	gs_session_init(argv[0]);
+			    argc, argv,
+			    GNOME_PROGRAM_STANDARD_PROPERTIES,
+			    NULL);
+#else
+	gtk_init(&argc, &argv);
+#endif
+#ifndef WIN32
+	gconf_setup();
+#endif
+#ifdef HAVE_DBUS
+	ipc = ipc_init_dbus_connection(ipc);
+#endif
 }
 
 void gui_main(void)
 {
 	gtk_main();
 }
+
+
+/******************************************************************************
+ * Name
+ *    gconf_setup
+ *
+ * Synopsis
+ *   #include "main/settings.h"
+ *
+ *   void gconf_setup()
+ *
+ * Description
+ *   verifies and initializes the GConf subsystem, so that "sword://" and
+ *   similar can be handled by url-comprehending programs such as browsers.
+ *   dialogs for permission/success/failure => conditional on debug build.
+ *
+ * Return value
+ *   void
+ */
+
+#define	GS_GCONF_PERMISSION	_("URL references using \"sword://\" (similar to web page\nreferences) can be used by programs to look up\nscripture references. Your system currently has no\nprogram set to handle these references.\n\nWould you like Xiphos to set itself as the\nprogram to handle these references?")
+
+#define	GS_GCONF_SUCCESS	_("Xiphos has successfully set itself\nas the handler of sword:// and bible:// URLs.\n\nYou may wish to run the program \"gconf-editor\"\nto examine keys under /desktop/gnome/url-handlers,\nif you need to change these.")
+
+char *gconf_keys[GS_GCONF_MAX][2] = {
+    { "/desktop/gnome/url-handlers/bible/command",        "xiphos \"%s\"" },
+    { "/desktop/gnome/url-handlers/bible/enabled",        (char *) 1 },
+    { "/desktop/gnome/url-handlers/bible/needs_terminal", (char *) 0 },
+    { "/desktop/gnome/url-handlers/sword/command",        "xiphos \"%s\"" },
+    { "/desktop/gnome/url-handlers/sword/enabled",        (char *) 1 },
+    { "/desktop/gnome/url-handlers/sword/needs_terminal", (char *) 0 }
+};
+
+#ifndef WIN32
+void gconf_setup()
+{
+	int i;
+	gchar *str;
+	gboolean retval;
+	GConfClient* client = gconf_client_get_default();
+
+	if (client == NULL)
+		return;		/* we're not running under GConf */
+
+	/*
+	 * This is deliberately somewhat simple-minded, at least for now.
+	 * We care about one thing: Is anything set to handle "bible://"?
+	 *
+	 * Unfortunate consequence of changing xiphos2 => xiphos:
+	 * We must fix broken keys.
+	 */
+	if ((((str = gconf_client_get_string(client, gconf_keys[0][0],
+					    NULL)) == NULL) ||
+	     (strncmp(str, "gnomesword", 10) == 0))
+#ifdef DEBUG
+	    && gui_yes_no_dialog(GS_GCONF_PERMISSION, NULL)
+#endif /* DEBUG */
+	    ) {
+		/*
+		 * Mechanical as can be, one after another.
+		 */
+		for (i = 0; i < GS_GCONF_MAX; ++i) {
+			retval = (((i % 3) == 0)	/* contrived hack */
+				  ? gconf_client_set_string
+					(client,
+					 gconf_keys[i][0],
+					 gconf_keys[i][1],
+					 NULL)
+				  : gconf_client_set_bool
+					(client,
+					 gconf_keys[i][0],
+					 (gconf_keys[i][1] ? TRUE : FALSE),
+					 NULL));
+#ifdef DEBUG
+			if (!retval) {
+				char msg[256];
+				sprintf(msg, _("Xiphos failed to complete handler init for key #%d:\n%s"),
+					i, gconf_keys[i][0]);
+				gui_generic_warning(msg);
+				return;
+			}
+#endif /* DEBUG */
+		}
+#ifdef DEBUG
+		gui_generic_warning(GS_GCONF_SUCCESS);
+#endif /* DEBUG */
+	}
+}
+#endif /* WIN32 */
+
+#ifdef DEBUG
+
+/* NOTE: these routines are here only and exactly because there is no other */
+/* code in this file that needs the real glib versions.  if there is ever a */
+/* reason for using g_str{dup,ing}_printf in this file, these functions     */
+/* will need to be moved to some other file which does not need them.  this */
+/* is because the file implementing replacements must not #include the .h   */
+/* that induces access to the replacements via #define.                     */
+
+/* this is a total mind game: we redefine the standard use of glib functions */
+/* so as to see our internal versions.  our internal versions scan for mis-  */
+/* use of %s, i.e. (char*)NULL that should (by rights) cause crashes anyhow. */
+
+/* GIVE US THE CRASHES, PLEASE!  MYSTERY BUGS ARE EVIL!  glibc.helpfulness-- */
+
+gchar*
+XI_g_strdup_printf(const char *filename,
+		   int linenumber,
+		   const gchar *format,
+		   ...)
+{
+	gchar *buffer, *next, *s;
+	va_list args;
+
+	va_start(args, format);
+	for (s = strchr(format, '%'); s; s = strchr(++s, '%'))
+	{
+		next = va_arg(args, gchar*);
+		if ((next == (gchar*) NULL) && (*(s+1) == 's'))
+		{
+			gchar *msg = g_strdup_printf
+			    ("%s\n%s\n\n%s:%d \"%s\"",
+			     _("BUG! Xiphos is about to crash due to a \"STRDUP\" error."),
+			     _("Please report this error to the Xiphos team with:"),
+			     filename, linenumber, format);
+			gui_generic_warning(msg);
+			g_free(msg);
+			abort();
+		}
+	}
+	va_end(args);
+
+	/* real g_strdup_printf content */
+	va_start (args, format);
+	buffer = g_strdup_vprintf (format, args);
+	va_end (args);
+	return buffer;
+}
+
+void
+XI_g_string_printf(const char *filename,
+		   int linenumber,
+		   GString *string,
+		   const gchar *format,
+		   ...)
+{
+	gchar *next, *s;
+	va_list args;
+
+	va_start(args, format);
+	for (s = strchr(format, '%'); s; s = strchr(++s, '%'))
+	{
+		next = va_arg(args, gchar*);
+		if ((next == (gchar*) NULL) && (*(s+1) == 's'))
+		{
+			gchar *msg = g_strdup_printf
+			    ("%s\n%s\n\n%s:%d \"%s\"",
+			     _("BUG! Xiphos is about to crash due to a \"STRING\" error."),
+			     _("Please report this error to the Xiphos team with:"),
+			     filename, linenumber, format);
+			gui_generic_warning(msg);
+			g_free(msg);
+			abort();
+		}
+	}
+	va_end(args);
+
+	/* real g_string_printf content */
+	g_string_truncate (string, 0);
+	va_start (args, format);
+	g_string_append_vprintf (string, format, args);
+	va_end (args);
+}
+
+#endif /* DEBUG */
diff --git a/src/gnome2/html.c b/src/gnome2/html.c
index 441d87a..3a7a366 100644
--- a/src/gnome2/html.c
+++ b/src/gnome2/html.c
@@ -27,6 +27,7 @@
 #include <gtkhtml/gtkhtml.h>
 #include <glib.h>
 #include <glib/gstdio.h>
+#include <unistd.h>
 
 #include <ctype.h>
 #include <fcntl.h>
@@ -52,6 +53,8 @@
 #include "main/url.hh"
 #include "main/xml.h"
 
+#include "gui/debug_glib_null.h"
+
 static GtkHTMLStream *htmlstream;
 static GtkHTMLStreamStatus status1;
 gboolean in_url;
@@ -136,10 +139,11 @@ void url_requested(GtkHTML * html, const gchar * url,
  *   void
  */
 
+extern gboolean shift_key_pressed;
+
 void gui_url(GtkHTML * html, const gchar * url, gpointer data)
 {
 	gchar buf[500];
-	extern gboolean shift_key_pressed;
 	
 	if(shift_key_pressed)
 		return;
diff --git a/src/gnome2/ipc-interface.xml b/src/gnome2/ipc-interface.xml
new file mode 100644
index 0000000..43bdd86
--- /dev/null
+++ b/src/gnome2/ipc-interface.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<!DOCTYPE node PUBLIC
+	  "-//freedesktop//DTD D-Bus Object Introspection 1.0//EN"
+	  "http://standards.freedesktop.org/dbus/1.0/introspect.dtd">
+<node>
+  <interface name="org.xiphos.remote">
+
+    <method name="setCurrentReference">
+      <arg type="s" name="reference" direction="in" />
+    </method>
+
+    <method name="getCurrentReference">
+      <arg type="s" name="reference" direction="out" />
+    </method>
+
+    <method name="getNextSearchReference">
+      <arg type="s" name="reference" direction="out" />
+    </method>
+
+    <signal name="searchPerformedSignal">
+      <arg type="s" name="reference" direction="out" />
+      <arg type="i" name="hits" direction="out" />
+    </signal>
+
+    <signal name="navigationSignal">
+      <arg type="s" name="reference" direction="out" />
+    </signal>
+  </interface>
+</node>
diff --git a/src/gnome2/ipc.c b/src/gnome2/ipc.c
new file mode 100644
index 0000000..bf5dad8
--- /dev/null
+++ b/src/gnome2/ipc.c
@@ -0,0 +1,306 @@
+/*
+ * Xiphos Bible Study Tool
+ * ipc.c - Interprocess Communication - dbus integration
+ *
+ * Copyright (C) 2000-2009 Xiphos Developer Team
+ *
+ * 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 Library 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+/**
+ * SECTION:ipc
+ * @short_description: Interprocess Communication - dbus integration
+ *
+ * An #IpcObject is a gobject that publishes signals and methods over
+ * dbus. It allows external control of Xiphos via dbus.
+ *
+ * sample client programs are in xiphos/src/examples/ipc_client.c
+ * and xiphos/src/examples/ipc_client.py
+ */
+
+#include <glib.h>
+#include <dbus/dbus-glib.h>
+#include <stdlib.h>
+#include "gui/ipc.h"
+#include "marshal.h"
+
+G_DEFINE_TYPE(IpcObject, ipc_object, G_TYPE_OBJECT)
+
+
+gboolean ipc_object_set_current_reference(IpcObject* obj,
+					  gchar* reference,
+					  GError** error);
+gboolean ipc_object_get_current_reference(IpcObject* obj,
+					  gchar** reference,
+					  GError** error);
+gboolean ipc_object_get_next_search_reference(IpcObject* obj, 
+				       gchar** reference,
+				       GError** error);
+
+#include "ipc-interface.h"
+#include "main/url.hh"
+
+static IpcObject *main_ipc_obj;
+
+static void ipc_object_init(IpcObject* obj) {
+	g_assert(obj != NULL);
+	obj->references = NULL;
+	obj->current_ref = NULL;
+}
+
+static void ipc_object_class_init(IpcObjectClass* klass) {
+
+	/**
+	 * IpcObject::search_performed_signal:
+	 * @hits: the number of search results
+	 *
+	 * The search_performed_signal is emitted any time
+	 * Xiphos performs a sidebar search; it is intended
+	 * to be listened to and handled over dbus
+	 *
+	 * Since: 3.2
+	 */
+	klass->signals[SEARCH_PERFORMED] = 
+		g_signal_new ("search-performed-signal",
+			      G_OBJECT_CLASS_TYPE(klass),
+			      G_SIGNAL_RUN_LAST,
+			      0,
+			      NULL,
+			      NULL,
+			      ipc_marshal_VOID__STRING_INT,
+			      G_TYPE_NONE,
+			      1,
+			      G_TYPE_STRING);
+	/**
+	 * IpcObject::navigation_signal:
+	 * @reference: the new reference
+	 *
+	 * The navigation_signal is emitted any time Xiphos
+	 * navigates to a new Bible reference; it is intended
+	 * to be listened to and handled over dbus
+	 *
+	 * Since: 3.2
+	 */
+	klass->signals[NAVIGATION] =
+		g_signal_new ("navigation-signal",
+			      G_OBJECT_CLASS_TYPE(klass),
+			      G_SIGNAL_RUN_LAST,
+			      0,
+			      NULL,
+			      NULL,
+			      g_cclosure_marshal_VOID__STRING,
+			      G_TYPE_NONE,
+			      1,
+			      G_TYPE_STRING);
+
+	dbus_g_object_type_install_info(IPC_TYPE_OBJECT,
+					&dbus_glib_ipc_object_object_info);
+}
+
+/**
+ * ipc_object_search_performed:
+ * @obj: an #IpcObject
+ * @search_term: the search term
+ * @hits: number of search results
+ * @error: GErorr
+ *
+ * makes the IpcObject emit a SEARCH_PERFORMED signal which is then
+ * published over dbus
+ *
+ * Since: 3.2
+ */
+gboolean ipc_object_search_performed(IpcObject* obj,
+				     const gchar* search_term,
+				     const int* hits,
+				     GError **error)
+ {
+	 
+	 IpcObjectClass* klass = IPC_OBJECT_GET_CLASS(obj);
+
+	 GString *s = g_string_new ("");
+	 g_string_printf(s, "%d", *hits);
+	 
+	 g_signal_emit(obj,
+		       klass->signals[SEARCH_PERFORMED],
+		       0,
+		       s->str,
+		       hits);
+	return FALSE;
+}
+
+/**
+ * ipc_object_navigation_signal:
+ * @obj: an #IpcObject
+ * @reference: a gchar with the new reference
+ * @error: GError (pass NULL)
+ *
+ * makes the IpcObject emit a NAVIGATION signal which is then
+ * published over dbus
+ *
+ * Since: 3.2
+ */
+
+gboolean ipc_object_navigation_signal (IpcObject* obj,
+					const gchar* reference,
+					GError** error)
+{
+	obj->current_ref = g_strdup(reference);
+
+	IpcObjectClass* klass = IPC_OBJECT_GET_CLASS(obj);
+
+	g_signal_emit(obj,
+		      klass->signals[NAVIGATION],
+		      0,
+		      reference);
+	return FALSE;
+}
+
+/**
+ * ipc_object_get_next_search_reference:
+ * @obj: an #IpcObject
+ * @reference: the return reference
+ * @error: GError
+ *
+ * to be called from dbus; returns all the current search
+ * results; returns XIPHOS_SEARCH_END when all have been retrieved
+ * 
+ * Since: 3.2
+ */
+
+gboolean ipc_object_get_next_search_reference(IpcObject* obj, 
+				       gchar** reference,
+				       GError** error)
+{
+	if (obj->references)
+		*reference = g_strdup((gchar*)obj->references->data);
+	else
+		*reference = g_strdup("XIPHOS_SEARCH_END");
+	
+	obj->references = g_list_next(obj->references);
+	return TRUE;
+}
+
+/**
+ * ipc_object_set_current_reference:
+ * @obj: an #IpcObject
+ * @reference: the reference to set
+ * @error: GError
+ *
+ * to be called from dbus; sets the current reference in Xiphos;
+ * calls main_url_handler to handle the navigation
+ * 
+ * Since: 3.2
+ */
+gboolean ipc_object_set_current_reference(IpcObject* obj,
+					  gchar* reference,
+					  GError** error)
+{
+	//easy route
+	main_url_handler((const gchar*)reference, TRUE);
+	//it should be done like this, probably
+	/* g_signal_emit(obj,
+		      "navigate-requested",
+		      reference); */
+
+	return TRUE;
+}
+
+/**
+ * ipc_object_get_current_reference:
+ * @obj: an #IpcObject
+ * @reference: the return reference
+ * @error: GError
+ *
+ * to be called from dbus; gets the current reference in Xiphos;
+ * 
+ * Since: 3.2
+ */
+gboolean ipc_object_get_current_reference(IpcObject* obj,
+					  gchar** reference,
+					  GError** error)
+{
+	*reference = g_strdup(obj->current_ref);
+	return TRUE;
+}
+
+/**
+ * ipc_init_dbus_connection
+ * @obj: an #IpcObject
+ *
+ * creates a new IpcObject and initiates the d-bus connection;
+ * sets the single static object to this new object
+ * 
+ * Since: 3.2
+ */
+IpcObject* ipc_init_dbus_connection(IpcObject* obj)
+{
+	DBusGConnection* bus = NULL;
+	DBusGProxy* busProxy = NULL;
+	obj = NULL;
+	guint result;
+	GError* error = NULL;
+
+	bus = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
+	if (error != NULL)
+		return FALSE;
+	
+	busProxy = dbus_g_proxy_new_for_name(bus,
+					     "org.freedesktop.DBus",
+					     "/org/freedesktop/DBus",
+					     "org.freedesktop.DBus");
+	if (busProxy == NULL)
+		return NULL;
+
+	if (!dbus_g_proxy_call(busProxy,
+			       "RequestName",
+			       &error,
+			       G_TYPE_STRING,
+			       "org.xiphos.remote",
+			       G_TYPE_UINT,
+			       0,
+			       G_TYPE_INVALID,
+			       G_TYPE_UINT,
+			       &result,
+			       G_TYPE_INVALID)) {
+		return NULL;
+	}
+
+	if (result != 1)
+		return NULL;
+	
+	obj = g_object_new(IPC_TYPE_OBJECT, NULL);
+
+	dbus_g_connection_register_g_object(bus,
+					    "/org/xiphos/remote/ipc",
+					    G_OBJECT(obj));
+
+	main_ipc_obj = obj;
+	
+	return obj;
+}
+
+/**
+ * ipc_get_main_ipc:
+ *
+ * returns the single static IpcObject
+ * 
+ * Since: 3.2
+ */
+IpcObject* ipc_get_main_ipc(void)
+{
+	return main_ipc_obj;
+}
+
+	
diff --git a/src/gnome2/main_menu.c b/src/gnome2/main_menu.c
index 54f03db..97855ef 100644
--- a/src/gnome2/main_menu.c
+++ b/src/gnome2/main_menu.c
@@ -23,7 +23,13 @@
 #include <config.h>
 #endif
 
+#ifndef WITHOUT_GNOME
+#include <gnome.h>
+#else
 #include <gtk/gtk.h>
+#include <unistd.h>
+#endif
+
 #include <glade/glade-xml.h>
 
 #ifdef USE_GTKHTML3_14_23
@@ -41,6 +47,7 @@
 #include "gui/main_menu.h"
 #include "gui/mod_mgr.h"
 #include "gui/preferences_dialog.h"
+#include "gui/parallel_tab.h"
 #include "gui/sidebar.h"
 #include "gui/sidebar_dialog.h"
 #include "gui/search_dialog.h"
@@ -57,6 +64,16 @@
 
 #include <glib/gstdio.h>
 
+#include "gui/debug_glib_null.h"
+
+//global function to handle gtk_uri calls
+void
+link_uri_hook(GtkLinkButton *button,
+	      const gchar *link,
+	      gpointer user_data)
+{
+	xiphos_open_default(link);
+}
 
 /******************************************************************************
  * Name
@@ -79,28 +96,32 @@ on_help_contents_activate(GtkMenuItem * menuitem, gpointer user_data)
 {	
 	GError *error = NULL;
 #ifdef WIN32
-	gchar *showstr;
-	const char *lang = getenv("LANG");
+	const char *lang = g_getenv("LANG");
 	gchar *help_file = g_win32_get_package_installation_directory_of_module(NULL);
 	help_file = g_strconcat(help_file, "\0", NULL);
-	if (strncmp(lang,"fr",2)==0)
-		help_file = g_build_filename(help_file, "share", "help", "fr", "xiphos_fr.chm", NULL);
+	if (!strncmp(lang, "fr", 2))
+		help_file = g_build_filename(help_file, "share", "help", "xiphos_fr.chm", NULL);
+	else if (!strncmp(lang, "fa", 2))
+		help_file = g_build_filename(help_file, "share", "help", "xiphos_fa.chm", NULL);
 	else
-		help_file = g_build_filename(help_file, "share", "help", "C", "xiphos.chm", NULL);
-	showstr = g_strconcat("file:///", help_file, NULL);
-	if (gnome_url_show(showstr, &error) == FALSE) {
-		GS_warning((error->message));
-		g_error_free(error);
-	}
-	g_free(showstr);
+		help_file = g_build_filename(help_file, "share", "help", "xiphos.chm", NULL);
+	xiphos_open_default(help_file);
 	g_free(help_file);
 #else
-	
+#ifndef WITHOUT_GNOME
 	if (gnome_help_display((const gchar*)"xiphos.xml", 
 			       NULL, &error) == FALSE) {
 		GS_warning(("%s",error->message));
 		g_error_free(error);        
 	}
+#else
+	gtk_show_uri (NULL, "ghelp:xiphos", gtk_get_current_event_time(), &error);
+	if (error != NULL) {
+		GS_warning(("%s", error->message));
+		g_error_free(error);
+	}
+#endif /* WITHOUT_GNOME */
+
 #endif /* WIN32 */
 }
 
@@ -123,19 +144,7 @@ on_help_contents_activate(GtkMenuItem * menuitem, gpointer user_data)
 G_MODULE_EXPORT void
 on_mailing_list_activate(GtkMenuItem * menuitem, gpointer user_data)
 {
-	GError *error = NULL;
-	/*if (gtk_show_uri (NULL,
-			"https://lists.sourceforge.net/lists/listinfo/gnomesword-users/",
-			GDK_CURRENT_TIME,
-			&error) == FALSE) {
-		GS_warning((error->message));
-		g_error_free (error);
-	}*/	
-	if (gnome_url_show("https://lists.sourceforge.net/lists/listinfo/gnomesword-users/",
-				&error) == FALSE) {
-		GS_warning(("%s",error->message));
-		g_error_free (error);
-	}
+	xiphos_open_default("https://lists.sourceforge.net/lists/listinfo/gnomesword-users/");
 }
 
 
@@ -150,7 +159,7 @@ on_mailing_list_activate(GtkMenuItem * menuitem, gpointer user_data)
  *						gpointer user_data)	
  *
  * Description
- *   open web browser to mibbit irc chat
+ *   open web browser to freenode irc chat
  *
  * Return value
  *   void
@@ -158,19 +167,15 @@ on_mailing_list_activate(GtkMenuItem * menuitem, gpointer user_data)
 G_MODULE_EXPORT void
 on_live_chat_activate(GtkMenuItem * menuitem, gpointer user_data)
 {
-	GError *error = NULL;
-	/*if (gtk_show_uri (NULL,
-			"http://webchat.freenode.net/?randomnick=1&channels=xiphos&prompt=1",
-			GDK_CURRENT_TIME,
-			&error) == FALSE) {
-		GS_warning((error->message));
-		g_error_free (error);
-	}*/
-	if (gnome_url_show("http://webchat.freenode.net/?randomnick=1&channels=xiphos&prompt=1",
-				&error) == FALSE) {
-		GS_warning(("%s",error->message));
-		g_error_free (error);
-	}
+	gchar *user = g_strdup_printf("%s", g_get_user_name()), *s, *url;
+	for (s = strchr(user, ' '); s; s = strchr(s, ' '))
+		*s = '_';
+	url = g_strdup_printf(
+	    "http://webchat.freenode.net/?nick=%s|xiphos&channels=xiphos&prompt=1",
+	    user);
+	xiphos_open_default(url);
+	g_free(url);
+	g_free(user);
 }
 
 /******************************************************************************
@@ -192,19 +197,7 @@ on_live_chat_activate(GtkMenuItem * menuitem, gpointer user_data)
 G_MODULE_EXPORT void
 on_report_bug_activate(GtkMenuItem * menuitem, gpointer user_data)
 {
-	GError *error = NULL;
-	/*if (gtk_show_uri (NULL,
-			,
-			GDK_CURRENT_TIME,
-			&error) == FALSE) {
-		GS_warning((error->message));
-		g_error_free (error);
-	}*/
-	if (gnome_url_show(PACKAGE_BUGREPORT,
-				&error) == FALSE) {
-		GS_warning(("%s",error->message));
-		g_error_free (error);
-	}
+	xiphos_open_default(PACKAGE_BUGREPORT);
 }
 
 
@@ -338,10 +331,12 @@ G_MODULE_EXPORT void on_search_activate(GtkMenuItem * menuitem, gpointer user_da
  * Return value
  *   void
  */
+
+extern gboolean style_display;
+
 G_MODULE_EXPORT void
 on_verse_style_activate(GtkCheckMenuItem * menuitem, gpointer user_data)
 {
-	extern gboolean style_display;
 	if(style_display) {
 		gchar *file = g_strdup_printf("%s/modops.conf", 
 					      settings.gSwordDir);
@@ -383,6 +378,8 @@ on_linked_tabs_activate(GtkCheckMenuItem * menuitem, gpointer user_data)
 	settings.linkedtabs = menuitem->active;
 	xml_set_value("Xiphos", "misc", "pinnedtabs",
 		      (settings.linkedtabs ? "1" : "0"));
+	if (settings.showparatab)
+		gui_force_parallel_tab_sync();
 }
 
 /******************************************************************************
@@ -485,9 +482,10 @@ gui_parallel_tab_activate(GtkCheckMenuItem * menuitem, gpointer user_data)
 	settings.showparatab = menuitem->active;
 	xml_set_value("Xiphos", "misc", "showparatab",
 		      (settings.showparatab ? "1" : "0"));
-	if(settings.showparatab)
+	if(settings.showparatab) {
 		gui_open_parallel_view_in_new_tab();
-	else 		
+		gui_force_parallel_tab_sync();
+	} else 		
 		gui_close_passage_tab  (gtk_notebook_page_num (
 					GTK_NOTEBOOK (widgets.notebook_main),
 					widgets.parallel_tab));
@@ -620,8 +618,8 @@ on_save_session_activate(GtkMenuItem * menuitem, gpointer user_data)
 
 	tabs_dir = g_strdup_printf("%s/tabs/",settings.gSwordDir);
 	
-	if (access(tabs_dir, F_OK) == -1) {
-		if ((Mkdir(tabs_dir, S_IRWXU)) == -1) {
+	if (g_access(tabs_dir, F_OK) == -1) {
+		if ((g_mkdir(tabs_dir, S_IRWXU)) == -1) {
 			fprintf(stderr, "can't create tabs dir");
 			return;
 		}
@@ -680,11 +678,13 @@ redisplay_to_realign()
 				     settings.currentverse);
 	main_url_handler(url, TRUE);		
 	g_free(url);
-	url = g_strdup_printf("sword://%s/%s",
-			      settings.DictWindowModule,
-			      settings.dictkey);
-	main_url_handler(url, TRUE);		
-	g_free(url);
+	if (settings.DictWindowModule) {
+		url = g_strdup_printf("sword://%s/%s",
+				      settings.DictWindowModule,
+				      settings.dictkey);
+		main_url_handler(url, TRUE);		
+		g_free(url);
+	}
 
 	realign_busy = FALSE;
 }
@@ -712,8 +712,8 @@ on_open_session_activate(GtkMenuItem * menuitem, gpointer user_data)
 
 	tabs_dir = g_strdup_printf("%s/tabs/",settings.gSwordDir);
 	
-	if (access(tabs_dir, F_OK) == -1) {
-		if ((Mkdir(tabs_dir, S_IRWXU)) == -1) {
+	if (g_access(tabs_dir, F_OK) == -1) {
+		if ((g_mkdir(tabs_dir, S_IRWXU)) == -1) {
 			fprintf(stderr, "can't create tabs dir");
 			return;
 		}
@@ -962,6 +962,9 @@ GtkWidget *gui_create_main_menu(void)
     	/* connect signals and data */
 	glade_xml_signal_autoconnect_full
 		(gxml, (GladeXMLConnectFunc)gui_glade_signal_connect_func, NULL);
+
+	//set up global function to handle all link buttons
+	gtk_link_button_set_uri_hook (link_uri_hook, NULL, NULL);
 	
 	return menu;
 }
diff --git a/src/gnome2/main_window.c b/src/gnome2/main_window.c
index 89f055c..3de8edd 100644
--- a/src/gnome2/main_window.c
+++ b/src/gnome2/main_window.c
@@ -26,7 +26,11 @@
 #include <gtk/gtk.h>
 
 #ifdef USE_GTKMOZEMBED
+#ifdef WIN32
+#include "geckowin/gecko-html.h"
+#else
 #include "gecko/gecko-html.h"
+#endif
 #else
 #include <gtkhtml/gtkhtml.h>
 #include "gui/html.h"
@@ -69,6 +73,8 @@
 #include "editor/bonobo-editor.h"
 #endif /* !USE_GTKHTML3_14_23 */
 
+#include "gui/debug_glib_null.h"
+
 WIDGETS widgets;
 
 
@@ -287,7 +293,7 @@ void gui_set_bible_comm_layout(void)
 	
 	gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets.notebook_comm_book),
 				      (settings.comm_showing ? 0 : 1));
-		
+  
 }
 
 
@@ -309,12 +315,37 @@ void gui_set_bible_comm_layout(void)
 
 void gui_change_window_title(gchar * module_name)
 {
-	gchar *title;//[200];
+	gchar *title;
+
+	if (cur_passage_tab) {
+		/* borrowed from tabbed_browser.c:pick_tab_label() */
+		/* echo the current tab's module (full name) in title bar */
+		if (cur_passage_tab->showtexts || cur_passage_tab->comm_showing) {
+			title = (cur_passage_tab->showtexts
+				 ? cur_passage_tab->text_mod
+				 : (cur_passage_tab->commentary_mod
+				    ? cur_passage_tab->commentary_mod
+				    : "[no commentary]"));
+		} else {
+			title = (cur_passage_tab->showcomms
+				 ? (cur_passage_tab->book_mod
+				    ? cur_passage_tab->book_mod
+				    : "[no book]")
+				 : (cur_passage_tab->dictlex_mod
+				    ? cur_passage_tab->dictlex_mod
+				    : "[no dict]"));
+		}
+	} else
+		title = module_name;
+
 	/*
 	 * set program title to current module name
 	 */
-	title = g_strdup_printf("%s - %s", main_get_module_description(module_name),
-						settings.program_title);
+	title = main_get_module_description(title);
+	if (!title)
+		title = main_get_module_description(settings.MainWindowModule);
+	title = g_strdup_printf("%s - %s", (title ? title : "[no title]"),
+				settings.program_title);
 	gtk_window_set_title(GTK_WINDOW(widgets.app), title);
 	g_free(title);
 }
@@ -732,12 +763,12 @@ void create_mainwindow(void)
 	GtkTooltips *tooltips;
 	GtkWidget *label;
 #ifdef USE_GTKMOZEMBED
-	GtkWidget *frame;	
+	GtkWidget *frame;
+	GtkWidget *eventbox;	
 #else
 	GtkWidget *scrolledwindow;
 #endif /* USE_GTKMOZEMBED */
 	GtkWidget *box_book;
-	GtkWidget *image;
 	GdkPixbuf* pixbuf;
 	/*
 	GTK_SHADOW_NONE
@@ -764,9 +795,8 @@ void create_mainwindow(void)
 	gtk_window_set_resizable(GTK_WINDOW(widgets.app), TRUE);
 
 	imagename = image_locator("gs2-48x48.png");
-	image = gtk_image_new_from_file (imagename);
+	pixbuf = gdk_pixbuf_new_from_file (imagename, NULL);
 	g_free(imagename);
-	pixbuf = gtk_image_get_pixbuf (GTK_IMAGE(image));
 	gtk_window_set_icon (GTK_WINDOW(widgets.app), pixbuf);
 
 	vbox_gs = gtk_vbox_new(FALSE, 0);
@@ -857,7 +887,7 @@ void create_mainwindow(void)
 	widgets.vbox_text = gtk_vbox_new(FALSE, 0);
 	gtk_widget_show(widgets.vbox_text);
 	gtk_paned_pack1(GTK_PANED(widgets.vpaned),
-					widgets.vbox_text, TRUE, TRUE);
+			widgets.vbox_text, TRUE, TRUE);
 
 	/*
 	 * bible/parallel notebook
@@ -867,13 +897,15 @@ void create_mainwindow(void)
 	gtk_box_pack_start(GTK_BOX(widgets.vbox_text),
 			   widgets.notebook_bible_parallel, TRUE,
 			   TRUE, 0);
-	gtk_notebook_set_tab_pos(GTK_NOTEBOOK(widgets.notebook_bible_parallel),
-                                             GTK_POS_BOTTOM);
-	gtk_notebook_set_show_tabs(GTK_NOTEBOOK(widgets.
-				    notebook_bible_parallel), TRUE);
-	gtk_notebook_set_show_border(GTK_NOTEBOOK(widgets.
-				      notebook_bible_parallel), FALSE);
-	gtk_container_set_border_width (GTK_CONTAINER (widgets.notebook_bible_parallel), 1);
+	gtk_notebook_set_tab_pos(
+		GTK_NOTEBOOK(widgets.notebook_bible_parallel),
+				 GTK_POS_BOTTOM);
+	gtk_notebook_set_show_tabs(
+		GTK_NOTEBOOK(widgets.notebook_bible_parallel), TRUE);
+	gtk_notebook_set_show_border(
+		GTK_NOTEBOOK(widgets.notebook_bible_parallel), FALSE);
+	gtk_container_set_border_width (
+		GTK_CONTAINER (widgets.notebook_bible_parallel), 1);
 
 	g_signal_connect(GTK_OBJECT(widgets.notebook_bible_parallel),
 			   "switch_page",
@@ -884,12 +916,9 @@ void create_mainwindow(void)
 	 * text notebook
 	 */
 	widgets.notebook_text = gui_create_bible_pane();
-        gtk_container_add(GTK_CONTAINER(widgets.notebook_bible_parallel),
+
+	gtk_container_add(GTK_CONTAINER(widgets.notebook_bible_parallel),
 			  widgets.notebook_text);
-	gtk_notebook_set_scrollable(GTK_NOTEBOOK
-				    (widgets.notebook_text), TRUE);
-	gtk_notebook_set_show_tabs(GTK_NOTEBOOK(widgets.notebook_text),FALSE);
-	gtk_notebook_set_show_border(GTK_NOTEBOOK(widgets.notebook_text),FALSE);
 
 	label = gtk_label_new(_("Standard View"));
 	gtk_widget_show(label);
@@ -915,12 +944,16 @@ void create_mainwindow(void)
 	gtk_widget_show(frame);
 	gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_IN);
 	gtk_box_pack_start(GTK_BOX(widgets.vbox_previewer), frame,
-				TRUE, TRUE,
-			   	0);
+				TRUE, TRUE, 0);
+	
+	
+	eventbox = gtk_event_box_new();
+	gtk_widget_show(eventbox);
+	gtk_container_add(GTK_CONTAINER(frame), eventbox);		   	
 
 	widgets.html_previewer_text
 			= GTK_WIDGET ( gecko_html_new( NULL, FALSE, VIEWER_TYPE));
-	gtk_container_add(GTK_CONTAINER(frame), widgets.html_previewer_text);
+	gtk_container_add(GTK_CONTAINER(eventbox), widgets.html_previewer_text);
 #else
 	scrolledwindow = gtk_scrolled_window_new(NULL, NULL);
 	gtk_widget_show(scrolledwindow);
diff --git a/src/gnome2/make-locale-set.sh b/src/gnome2/make-locale-set.sh
new file mode 100755
index 0000000..5f440e7
--- /dev/null
+++ b/src/gnome2/make-locale-set.sh
@@ -0,0 +1,25 @@
+#!/bin/sh
+#
+# convert LINGUAS file into a C source file containing full locale names.
+# names in LINGUAS are either 5-char full "language_LOCALE" names or
+# 2-char "language-only" names.  convert the latter.
+#
+( echo 'char *locale_set[] = { '
+sed -e 's/en_GB/& en_US/' < ../../po/LINGUAS |
+tr ' ' '\n' |
+while read l ; do
+    case "$l" in
+	*_*)
+	    ;;
+	*)  u="`echo \"$l\" | tr a-z A-Z`"
+	    [ "$u" = CS ] && u=CZ	# special case, czech.
+	    [ "$u" = FA ] && u=IR	# special case, iran.
+	    [ "$u" = ZH ] && u=CN	# special case, chinese.
+	    l="$l"_"$u"
+	    ;;
+    esac
+    echo '	"'"$l"'",'
+done
+echo '        (char*)0'
+echo '};' ) |
+uniq
diff --git a/src/gnome2/marshal.c b/src/gnome2/marshal.c
new file mode 100644
index 0000000..151ffe2
--- /dev/null
+++ b/src/gnome2/marshal.c
@@ -0,0 +1,86 @@
+
+#include	"marshal.h"
+
+
+#ifdef G_ENABLE_DEBUG
+#define g_marshal_value_peek_boolean(v)  g_value_get_boolean (v)
+#define g_marshal_value_peek_char(v)     g_value_get_char (v)
+#define g_marshal_value_peek_uchar(v)    g_value_get_uchar (v)
+#define g_marshal_value_peek_int(v)      g_value_get_int (v)
+#define g_marshal_value_peek_uint(v)     g_value_get_uint (v)
+#define g_marshal_value_peek_long(v)     g_value_get_long (v)
+#define g_marshal_value_peek_ulong(v)    g_value_get_ulong (v)
+#define g_marshal_value_peek_int64(v)    g_value_get_int64 (v)
+#define g_marshal_value_peek_uint64(v)   g_value_get_uint64 (v)
+#define g_marshal_value_peek_enum(v)     g_value_get_enum (v)
+#define g_marshal_value_peek_flags(v)    g_value_get_flags (v)
+#define g_marshal_value_peek_float(v)    g_value_get_float (v)
+#define g_marshal_value_peek_double(v)   g_value_get_double (v)
+#define g_marshal_value_peek_string(v)   (char*) g_value_get_string (v)
+#define g_marshal_value_peek_param(v)    g_value_get_param (v)
+#define g_marshal_value_peek_boxed(v)    g_value_get_boxed (v)
+#define g_marshal_value_peek_pointer(v)  g_value_get_pointer (v)
+#define g_marshal_value_peek_object(v)   g_value_get_object (v)
+#else /* !G_ENABLE_DEBUG */
+/* WARNING: This code accesses GValues directly, which is UNSUPPORTED API.
+ *          Do not access GValues directly in your code. Instead, use the
+ *          g_value_get_*() functions
+ */
+#define g_marshal_value_peek_boolean(v)  (v)->data[0].v_int
+#define g_marshal_value_peek_char(v)     (v)->data[0].v_int
+#define g_marshal_value_peek_uchar(v)    (v)->data[0].v_uint
+#define g_marshal_value_peek_int(v)      (v)->data[0].v_int
+#define g_marshal_value_peek_uint(v)     (v)->data[0].v_uint
+#define g_marshal_value_peek_long(v)     (v)->data[0].v_long
+#define g_marshal_value_peek_ulong(v)    (v)->data[0].v_ulong
+#define g_marshal_value_peek_int64(v)    (v)->data[0].v_int64
+#define g_marshal_value_peek_uint64(v)   (v)->data[0].v_uint64
+#define g_marshal_value_peek_enum(v)     (v)->data[0].v_long
+#define g_marshal_value_peek_flags(v)    (v)->data[0].v_ulong
+#define g_marshal_value_peek_float(v)    (v)->data[0].v_float
+#define g_marshal_value_peek_double(v)   (v)->data[0].v_double
+#define g_marshal_value_peek_string(v)   (v)->data[0].v_pointer
+#define g_marshal_value_peek_param(v)    (v)->data[0].v_pointer
+#define g_marshal_value_peek_boxed(v)    (v)->data[0].v_pointer
+#define g_marshal_value_peek_pointer(v)  (v)->data[0].v_pointer
+#define g_marshal_value_peek_object(v)   (v)->data[0].v_pointer
+#endif /* !G_ENABLE_DEBUG */
+
+
+/* VOID:STRING,INT (marshal.list:1) */
+void
+ipc_marshal_VOID__STRING_INT (GClosure     *closure,
+                              GValue       *return_value G_GNUC_UNUSED,
+                              guint         n_param_values,
+                              const GValue *param_values,
+                              gpointer      invocation_hint G_GNUC_UNUSED,
+                              gpointer      marshal_data)
+{
+  typedef void (*GMarshalFunc_VOID__STRING_INT) (gpointer     data1,
+                                                 gpointer     arg_1,
+                                                 gint         arg_2,
+                                                 gpointer     data2);
+  register GMarshalFunc_VOID__STRING_INT callback;
+  register GCClosure *cc = (GCClosure*) closure;
+  register gpointer data1, data2;
+
+  g_return_if_fail (n_param_values == 3);
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = g_value_peek_pointer (param_values + 0);
+    }
+  else
+    {
+      data1 = g_value_peek_pointer (param_values + 0);
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_VOID__STRING_INT) (marshal_data ? marshal_data : cc->callback);
+
+  callback (data1,
+            g_marshal_value_peek_string (param_values + 1),
+            g_marshal_value_peek_int (param_values + 2),
+            data2);
+}
+
diff --git a/src/gnome2/marshal.list b/src/gnome2/marshal.list
new file mode 100644
index 0000000..75d5d82
--- /dev/null
+++ b/src/gnome2/marshal.list
@@ -0,0 +1 @@
+VOID:STRING,INT
diff --git a/src/gnome2/menu_popup.c b/src/gnome2/menu_popup.c
index 93c90d7..8060041 100644
--- a/src/gnome2/menu_popup.c
+++ b/src/gnome2/menu_popup.c
@@ -23,12 +23,19 @@
 #include <config.h>
 #endif
 
-#include <gnome.h>
-#include <glade/glade-xml.h>
+#include <gtk/gtk.h>
+#include <glib.h>
+#include <glib/gstdio.h>
+#include <errno.h>
+#include <unistd.h>
 #include <ctype.h>
 
 #ifdef USE_GTKMOZEMBED
+#ifdef WIN32
+#include "geckowin/gecko-html.h"
+#else
 #include "gecko/gecko-html.h"
+#endif
 #else
 #include <gtkhtml/gtkhtml.h>
 #include "gui/html.h"
@@ -61,6 +68,8 @@
 #include "editor/bonobo-editor.h"
 #endif
 
+#include "gui/debug_glib_null.h"
+
 
 static gchar *menu_mod_name = NULL;
 static DIALOG_DATA * dialog = NULL;
@@ -122,7 +131,7 @@ gint  _get_type_mod_list (void)
  *   
  */
 
-gchar * _get_key (gchar * mod_name) 
+gchar * _get_key (gchar * mod_name)
 {
     	gchar *key = NULL;
     
@@ -1113,7 +1122,6 @@ G_MODULE_EXPORT void on_use_current_dictionary_activate (GtkMenuItem * menuitem,
 G_MODULE_EXPORT void on_lookup_google_activate (GtkMenuItem * menuitem, gpointer user_data)
 {			
 	gchar *dict_key, *showstr;
-	GError *error = NULL;
 
 #ifdef USE_GTKMOZEMBED
 	gecko_html_copy_selection(GECKO_HTML(_get_html()));
@@ -1129,10 +1137,7 @@ G_MODULE_EXPORT void on_lookup_google_activate (GtkMenuItem * menuitem, gpointer
 		gui_generic_warning("No selection made");
 	} else {
 		showstr = g_strconcat("http://www.biblemap.org/#", dict_key, NULL);
-		if (gnome_url_show(showstr, &error) == FALSE) {
-			GS_warning(("%s",error->message));
-			g_error_free (error);
-		}
+		xiphos_open_default (showstr);
 		g_free(showstr);
 	}
 	g_free(dict_key);
@@ -1233,7 +1238,7 @@ G_MODULE_EXPORT void on_rename_perscomm_activate (GtkMenuItem * menuitem, gpoint
 	datapath_new = s;	// ..and in with the new.
 
 	// move old data directory to new.
-	if ((chdir(sworddir) != 0) ||
+	if ((g_chdir(sworddir) != 0) ||
 	    (rename(datapath_old, datapath_new) != 0)) {
 		gui_generic_warning("Failed to rename directory.");
 		goto out2;
diff --git a/src/gnome2/mod_mgr.c b/src/gnome2/mod_mgr.c
index 5628f25..09c77e7 100644
--- a/src/gnome2/mod_mgr.c
+++ b/src/gnome2/mod_mgr.c
@@ -33,8 +33,7 @@
 #include <errno.h>
 #include <time.h>
 
-#include <bonobo.h>
-#include <gnome.h>
+#include <gtk/gtk.h>
 #include <glade/glade-xml.h>
 
 #include "gui/mod_mgr.h"
@@ -52,6 +51,8 @@
 #include "main/xml.h"
 #include "main/modulecache.hh"
 
+#include "gui/debug_glib_null.h"
+
 #include <glib/gstdio.h>
 
 #define GTK_RESPONSE_REFRESH 301
@@ -63,6 +64,7 @@
 #define GTK_RESPONSE_SOURCES 307
 /* see these codes' use in ui/module-manager.glade. */
 
+/* activity codes */
 enum {
 	REMOVE  = 0,
 	INSTALL = 1,
@@ -71,6 +73,15 @@ enum {
 	DELFAST = 4,
 };
 
+/* dialog & progress bar phrases */
+enum {
+	PHRASE_INQUIRY  = 0,
+	PHRASE_PREPARE  = 1,
+	PHRASE_DOING    = 2,
+	PHRASE_COMPLETE = 3,
+};
+
+/* treeview columns */
 enum {
 	COLUMN_NAME,
 	COLUMN_INSTALLED,
@@ -87,6 +98,7 @@ enum {
 	NUM_COLUMNS
 };
 
+/* new install source dialog fields */
 enum {
 	COLUMN_TYPE,
 	COLUMN_CAPTION,
@@ -148,6 +160,42 @@ static gboolean is_running = FALSE;
 GladeXML *gxml;
 
 static void load_module_tree(GtkTreeView * treeview, gboolean install);
+static void set_controls_to_last_use(void);
+static int load_source_treeviews(void);
+
+/* indexed by REMOVE/INSTALL/ARCHIVE/FASTMOD/DELFAST and PHRASE_* */
+char *verbs[5][4] = {
+    {
+	N_("Remove these modules?"),
+	N_("Preparing to remove"),
+	N_("Removing"),
+	N_("Remove")
+    },
+    {
+	N_("Install these modules?"),
+	N_("Preparing to install"),
+	N_("Installing"),
+	N_("Install")
+    },
+    {
+	N_("Archive these modules?"),
+	N_("Preparing to archive"),
+	N_("Archiving"),
+	N_("Archive")
+    },
+    {
+	N_("Build fast-search index for these\nmodules (may take minutes/module)?"),
+	N_("Preparing to index"),
+	N_("Indexing"),
+	N_("Index")
+    },
+    {
+	N_("Delete fast-search index for these modules?"),
+	N_("Preparing to delete index"),
+	N_("Deleting index"),
+	N_("Deletion")
+    },
+};
 
 #ifdef HAVE_WIDGET_TOOLTIP_TEXT
 static
@@ -210,7 +258,7 @@ gboolean query_tooltip (GtkWidget  *widget,
 		text = g_string_truncate (text, 1200);
 		text = g_string_append_len(text, " ...", strlen (" ..."));
 	}
-	pixbuf = pixbuf_finder("sword3.png", NULL);
+	pixbuf = pixbuf_finder("sword3.png", 0, NULL);
 	gtk_tooltip_set_icon (tooltip, pixbuf);
 	gtk_tooltip_set_text (tooltip, text->str);
 	
@@ -252,11 +300,11 @@ create_pixbufs(void)
 	INSTALLED = gtk_widget_render_icon(dialog,
 					   GTK_STOCK_APPLY,
 					   GTK_ICON_SIZE_MENU, NULL);
-	FASTICON  = pixbuf_finder("indexed-16.png", NULL);
+	FASTICON  = pixbuf_finder("indexed-16.png", 0, NULL);
 	NO_INDEX  = gtk_widget_render_icon(dialog,
 					   GTK_STOCK_CANCEL,
 					   GTK_ICON_SIZE_MENU, NULL);
-	LOCKED    = pixbuf_finder("epiphany-secure.png", NULL);
+	LOCKED    = pixbuf_finder("epiphany-secure.png", 0, NULL);
 	REFRESH   = gtk_widget_render_icon(dialog,
 					   GTK_STOCK_REFRESH,
 					   GTK_ICON_SIZE_MENU, NULL);
@@ -265,6 +313,301 @@ create_pixbufs(void)
 					   GTK_ICON_SIZE_MENU, NULL);
 }
 
+/******************************************************************************
+ * Name
+ *   create_model
+ *
+ * Synopsis
+ *   #include "gui/mod_mgr.h"
+ *
+ *   GtkTreeModel *create_model (void)
+ *
+ * Description
+ *   
+ *
+ * Return value
+ *   GtkTreeModel *
+ */
+
+static GtkTreeModel *
+create_model(void)
+{
+	GtkTreeStore *store;
+
+	/* create list store */
+	store = gtk_tree_store_new(NUM_COLUMNS,
+				   G_TYPE_STRING,	/* module name */
+				   GDK_TYPE_PIXBUF,	/* installed */
+				   G_TYPE_BOOLEAN,	/* checkbox */
+				   G_TYPE_STRING,	/* installed verssion */
+				   GDK_TYPE_PIXBUF,	/* fastready */
+				   GDK_TYPE_PIXBUF,	/* locked */
+				   G_TYPE_STRING,	/* about */
+				   GDK_TYPE_PIXBUF,	/* refresh */
+				   G_TYPE_STRING,	/* available version */
+				   G_TYPE_STRING,	/* size */
+				   G_TYPE_STRING,	/* description */
+				   G_TYPE_BOOLEAN);	/* visibility */
+	return GTK_TREE_MODEL(store);
+}
+
+/******************************************************************************
+ * Name
+ *   fixed_toggled
+ *
+ * Synopsis
+ *   #include "gui/mod_mgr.h"
+ *
+ *   void fixed_toggled (GtkCellRendererToggle *cell, gchar *path_str,
+ *							gpointer data)
+ *
+ * Description
+ *   
+ *
+ * Return value
+ *   void
+ */
+
+static void
+fixed_toggled(GtkCellRendererToggle *cell,
+	      gchar *path_str,
+	      gpointer data)
+{
+	GtkTreeView *treeview = (GtkTreeView *) data;
+	GtkTreeModel *model = gtk_tree_view_get_model(treeview);
+	GtkTreeIter iter;
+	GtkTreePath *path = gtk_tree_path_new_from_string(path_str);
+	gboolean fixed;
+
+	/* get toggled iter */
+	gtk_tree_model_get_iter(model, &iter, path);
+	gtk_tree_model_get(model, &iter, COLUMN_FIXED, &fixed, -1);
+
+	/* do something with the value */
+	fixed ^= 1;
+
+	/* set new value */
+	gtk_tree_store_set(GTK_TREE_STORE(model), &iter, COLUMN_FIXED,
+			   fixed, -1);
+	/* clean up */
+	gtk_tree_path_free(path);
+}
+
+/******************************************************************************
+ * Name
+ *   add_columns
+ *
+ * Synopsis
+ *   #include "gui/mod_mgr.h"
+ *
+ *   void add_columns (GtkTreeView *treeview)
+ *
+ * Description
+ *   
+ *
+ * Return value
+ *   void
+ */
+
+#ifndef HAVE_WIDGET_TOOLTIP_TEXT
+#define	gtk_widget_set_tooltip_text(x,y)	/* too old for this tooltip support */
+#endif /* !HAVE_WIDGET_TOOLTIP_TEXT */
+
+static void
+add_columns(GtkTreeView * treeview,
+	    gboolean remove)
+{
+	GtkCellRenderer *renderer;
+	GtkTreeViewColumn *column;
+	GtkWidget *image;
+
+	/* -- column for sword module name -- */
+	renderer = gtk_cell_renderer_text_new();
+	column =
+	    gtk_tree_view_column_new_with_attributes(_("Module Name"), renderer,
+						     "text", COLUMN_NAME,
+						     NULL);
+					/* fixed sizing (200 pixels) */
+	gtk_tree_view_column_set_sizing(GTK_TREE_VIEW_COLUMN(column),
+					GTK_TREE_VIEW_COLUMN_FIXED);
+	gtk_tree_view_column_set_fixed_width(GTK_TREE_VIEW_COLUMN
+					     (column), 200);	
+	gtk_tree_view_append_column(treeview, column);
+
+	/* -- installed -- */
+	column = gtk_tree_view_column_new();
+	image = (remove
+		 ? gtk_image_new_from_stock("gnome-stock-blank",
+					    GTK_ICON_SIZE_MENU)
+		 : gtk_image_new_from_stock(GTK_STOCK_APPLY,
+					    GTK_ICON_SIZE_MENU));
+	gtk_widget_show(image);
+	gtk_widget_set_tooltip_text(image,
+				    (remove
+				     ? ""
+				     : _("A checkmark means this module is already installed")));
+	renderer = GTK_CELL_RENDERER(gtk_cell_renderer_pixbuf_new());
+	gtk_tree_view_column_set_widget(column, image);
+	gtk_tree_view_column_pack_start(column, renderer, TRUE);
+	gtk_tree_view_column_set_attributes(column, renderer,
+					    "pixbuf", COLUMN_INSTALLED,
+					    NULL);
+	gtk_tree_view_append_column(treeview, column);
+
+	/* -- toggle choice -- */
+	renderer = gtk_cell_renderer_toggle_new();
+	g_signal_connect(renderer, "toggled",
+			 G_CALLBACK(fixed_toggled), treeview);
+
+	column = gtk_tree_view_column_new();
+	image = gtk_image_new_from_stock((remove
+					  ? "gtk-yes" //GTK_STOCK_REMOVE
+					  : GTK_STOCK_ADD),
+					 GTK_ICON_SIZE_MENU);
+	gtk_widget_show(image);
+	gtk_widget_set_tooltip_text(image,
+				    (remove
+				     ? _("Click the box to work on this module")
+				     : _("Click the box to select this module for install/update")));
+	gtk_tree_view_column_set_widget(column, image);
+	gtk_tree_view_column_pack_start(column, renderer, TRUE);
+	gtk_tree_view_column_set_attributes(column, renderer,
+					    "active",
+					    COLUMN_FIXED,
+					    "visible",
+					    COLUMN_VISIBLE, NULL);
+
+					/* fixed sizing (25 pixels) */
+	gtk_tree_view_column_set_sizing(GTK_TREE_VIEW_COLUMN(column),
+					GTK_TREE_VIEW_COLUMN_FIXED);
+	gtk_tree_view_column_set_fixed_width(GTK_TREE_VIEW_COLUMN
+					     (column), 25);
+	gtk_tree_view_append_column(treeview, column);
+
+	/* -- installed version -- */
+	renderer = gtk_cell_renderer_text_new();
+	column =
+	    gtk_tree_view_column_new_with_attributes(_("Installed"),
+						     renderer, "text",
+						     COLUMN_INSTALLED_VERSION,
+						     NULL);
+	gtk_tree_view_append_column(treeview, column);
+
+	/* -- fast index ready -- */
+	column = gtk_tree_view_column_new();
+	image = pixmap_finder("indexed-16.png");
+	gtk_widget_show(image);
+	gtk_widget_set_tooltip_text(image, _("The index icon means you have built an optimized ('lucene') index for this module for fast searching (see the Maintenance pane for this function)"));
+	renderer = GTK_CELL_RENDERER(gtk_cell_renderer_pixbuf_new());
+	gtk_tree_view_column_set_widget(column, image);
+	gtk_tree_view_column_pack_start(column, renderer, TRUE);
+	gtk_tree_view_column_set_attributes(column, renderer,
+					    "pixbuf", COLUMN_FASTREADY,
+					    NULL);
+					/* fixed sizing (25 pixels) */
+	gtk_tree_view_column_set_sizing(GTK_TREE_VIEW_COLUMN(column),
+					GTK_TREE_VIEW_COLUMN_FIXED);
+	gtk_tree_view_column_set_fixed_width(GTK_TREE_VIEW_COLUMN
+					     (column), 25);
+	gtk_tree_view_append_column(treeview, column);
+
+	/* -- locked -- */
+	column = gtk_tree_view_column_new();
+	image = pixmap_finder("epiphany-secure.png");
+	gtk_widget_show(image);
+	gtk_widget_set_tooltip_text(image, _("The lock icon means this module is encrypted, and requires that you purchase an unlock key from the content owner"));
+	renderer = GTK_CELL_RENDERER(gtk_cell_renderer_pixbuf_new());
+	gtk_tree_view_column_set_widget(column, image);
+	gtk_tree_view_column_pack_start(column, renderer, TRUE);
+	gtk_tree_view_column_set_attributes(column, renderer,
+					    "pixbuf", COLUMN_LOCKED,
+					    NULL);
+					/* fixed sizing (25 pixels) */
+	gtk_tree_view_column_set_sizing(GTK_TREE_VIEW_COLUMN(column),
+					GTK_TREE_VIEW_COLUMN_FIXED);
+	gtk_tree_view_column_set_fixed_width(GTK_TREE_VIEW_COLUMN
+					     (column), 25);
+	gtk_tree_view_append_column(treeview, column);
+
+	/* -- About content (invisible) -- */
+	renderer = gtk_cell_renderer_text_new();
+	column =
+	    gtk_tree_view_column_new_with_attributes(_("About"), renderer,
+						     "text", COLUMN_ABOUT,
+						     NULL);
+	/* column not shown */
+	gtk_tree_view_column_set_visible(column, FALSE);
+					/* fixed sizing (2 pixels) */
+	gtk_tree_view_column_set_sizing(GTK_TREE_VIEW_COLUMN(column),
+					GTK_TREE_VIEW_COLUMN_FIXED);
+	gtk_tree_view_column_set_fixed_width(GTK_TREE_VIEW_COLUMN
+					     (column), 2);	
+	gtk_tree_view_append_column(treeview, column);
+
+	if (remove)
+		return;	/* no more fields needed */
+
+	/* -- refresh/update -- */
+	column = gtk_tree_view_column_new();
+	image = gtk_image_new_from_stock(GTK_STOCK_REFRESH,
+					 GTK_ICON_SIZE_MENU);
+	gtk_widget_show(image);
+	gtk_widget_set_tooltip_text(image, _("The refresh icon means the Installed module is older than the newer Available module: You should update the module"));
+	renderer = GTK_CELL_RENDERER(gtk_cell_renderer_pixbuf_new());
+	gtk_tree_view_column_set_widget(column, image);
+	gtk_tree_view_column_pack_start(column, renderer, TRUE);
+	gtk_tree_view_column_set_attributes(column, renderer,
+					    "pixbuf", COLUMN_DIFFERENT,
+					    NULL);
+	gtk_tree_view_append_column(treeview, column);
+
+	/* -- available version -- */
+	renderer = gtk_cell_renderer_text_new();
+	column =
+	    gtk_tree_view_column_new_with_attributes(_("Available"),
+						     renderer, "text",
+						     COLUMN_AVAILABLE_VERSION,
+						     NULL);
+	gtk_tree_view_append_column(treeview, column);
+
+	/* -- install size -- */
+	renderer = gtk_cell_renderer_text_new();
+	column =
+	    gtk_tree_view_column_new_with_attributes(_("Size"),
+						     renderer, "text",
+						     COLUMN_INSTALLSIZE,
+						     NULL);
+	gtk_tree_view_append_column(treeview, column);
+
+	/* -- description -- */
+	renderer = gtk_cell_renderer_text_new();
+	column =
+	    gtk_tree_view_column_new_with_attributes(_("Description"),
+						     renderer, "text",
+						     COLUMN_DESC,
+						     NULL);
+	gtk_tree_view_append_column(treeview, column);
+}
+
+static void
+setup_treeview_install(GtkTreeView * install)
+{
+	GtkTreeModel *model;
+	model = create_model();
+	gtk_tree_view_set_model(install, NULL);
+	gtk_tree_view_set_model(install, model);
+	add_columns(install, FALSE);
+}
+
+static void
+setup_treeview_maintenance(GtkTreeView * maintenance)
+{
+	GtkTreeModel *model;
+	model =  create_model();
+	gtk_tree_view_set_model(maintenance, NULL);
+	gtk_tree_view_set_model(maintenance, model);
+	add_columns(maintenance, TRUE);
+}
 
 /******************************************************************************
  * Name
@@ -312,7 +655,6 @@ remove_install_modules(GList * modules,
 {
 	GList *tmp;
 	gchar *buf;
-	gchar *verb = "";
 	const gchar *new_dest;
 	gint failed = 1;
 	GString *mods;
@@ -333,21 +675,8 @@ remove_install_modules(GList * modules,
 		tmp = g_list_next(tmp);
 	}
 
-	switch (activity)
-	{
-	case INSTALL:
-		verb = _("Install these modules?"); break;
-	case REMOVE:
-		verb = _("Remove these modules?"); break;
-	case ARCHIVE:
-		verb = _("Archive these modules?"); break;
-	case FASTMOD:
-		verb = _("Build fast-search index for these\nmodules (may take minutes/module)?"); break;
-	case DELFAST:
-		verb = _("Delete fast-search index for these modules?"); break;
-	}
 	dialog_text = g_strdup_printf("<span weight=\"bold\">%s</span>\n\n%s",
-				      verb, mods->str);
+				      gettext (verbs[activity][PHRASE_INQUIRY]), mods->str);
 
 	if (!gui_yes_no_dialog(dialog_text, NULL)) {
 		tmp = modules; /* free list data */
@@ -355,26 +684,14 @@ remove_install_modules(GList * modules,
 			g_free((gchar*)tmp->data);
 			tmp = g_list_next(tmp);
 		}
-		g_list_free(tmp);
+		g_list_free(modules);
 		g_free(dialog_text);
 		return;
 	}
 	g_free(dialog_text);
 
-	switch (activity)
-	{
-	case INSTALL:
-		verb = _("Preparing to install"); break;
-	case REMOVE:
-		verb = _("Preparing to remove"); break;
-	case ARCHIVE:
-		verb = _("Preparing to archive"); break;
-	case FASTMOD:
-		verb = _("Preparing to index"); break;
-	case DELFAST:
-		verb = _("Preparing to delete index"); break;
-	}
-	gtk_progress_bar_set_text(GTK_PROGRESS_BAR(progressbar_refresh), verb);
+	gtk_progress_bar_set_text(GTK_PROGRESS_BAR(progressbar_refresh),
+				  gettext (verbs[activity][PHRASE_PREPARE]));
 	gtk_widget_show(progressbar_refresh);	
 	while (gtk_events_pending())
 		gtk_main_iteration();
@@ -395,20 +712,8 @@ remove_install_modules(GList * modules,
 	while (tmp) {
 		buf = (gchar *) tmp->data;
 		current_mod = buf;
-		switch (activity)
-		{
-		case INSTALL:
-			verb = _("Installing"); break;
-		case REMOVE:
-			verb = _("Removing"); break;
-		case ARCHIVE:
-			verb = _("Archiving"); break;
-		case FASTMOD:
-			verb = _("Indexing"); break;
-		case DELFAST:
-			verb = _("Deleting index"); break;
-		}
-		g_string_printf(mods, "%s: %s", verb, buf);
+		g_string_printf(mods, "%s: %s",
+				gettext (verbs[activity][PHRASE_DOING]), buf);
 		gtk_progress_bar_set_text(GTK_PROGRESS_BAR
 					  (progressbar_refresh),
 					  mods->str);
@@ -419,15 +724,14 @@ remove_install_modules(GList * modules,
 					   strlen(ZIP_DIR) + 2);
 			gchar *zipfile;
 			char *datapath, *conf_file;
-			FILE *result;
 
 			GS_print(("archive %s in %s\n", buf,
 				  (destination
 				   ? destination
 				   : settings.path_to_mods)));
 			sprintf(dir, "%s/%s", settings.homedir, ZIP_DIR);
-			if ((access(dir, F_OK) == -1) &&
-			    (Mkdir(dir, S_IRWXU) != 0)) {
+			if ((g_access(dir, F_OK) == -1) &&
+			    (g_mkdir(dir, S_IRWXU) != 0)) {
 				char msg[300];
 				sprintf(msg, _("`mkdir %s' failed:\n%s."),
 					dir, strerror(errno));
@@ -447,34 +751,16 @@ remove_install_modules(GList * modules,
 						   ? destination
 						   : settings.path_to_mods));
 			g_remove(zipfile);
-			g_string_printf(cmd,
-				"( cd \"%s\" && zip -r \"%s\" \"mods.d/%s\" \"%s\" ) 2>&1",
-				(destination
-				 ? destination
-				 : settings.path_to_mods),
-				zipfile,
-				conf_file,
-				datapath);
+
+			xiphos_create_archive(conf_file, datapath, zipfile,
+					      destination ?
+					      destination : settings.path_to_mods);
+			g_string_append(cmd, buf);
+			g_string_append(cmd, _(" archived in: \n"));
+			g_string_append(cmd, zipfile);
+			gui_generic_warning(cmd->str);
 			g_free(conf_file);
 			g_free(datapath);
-			
-			if ((result = popen(cmd->str, "r")) == NULL) {
-				gui_generic_warning
-				    (_("Xiphos could not execute archiver"));
-			} else {
-				gchar output[258];
-				g_string_truncate(cmd, 0);
-				g_string_append(cmd, buf);
-				g_string_append(cmd, _(" archival result:\n\n"));
-				while (fgets(output, 256, result) != NULL)
-					g_string_append(cmd, output);
-				pclose(result);
-				g_string_append(cmd, _("\nArchive in "));
-				g_string_append(cmd, zipfile);
-				gui_generic_warning(cmd->str);
-				while (gtk_events_pending())
-					gtk_main_iteration();
-			}
 			g_free(zipfile);
 			g_free(dir);
 			g_string_free(cmd, TRUE);
@@ -544,20 +830,8 @@ remove_install_modules(GList * modules,
 	have_changes = TRUE;
 	g_list_free(tmp);
 	if (failed) {
-		switch (activity)
-		{
-		case INSTALL:
-		    verb = _("Install"); break;
-		case REMOVE:
-		    verb = _("Remove"); break;
-		case ARCHIVE:
-		    verb = _("Archive"); break;
-		case FASTMOD:
-		    verb = _("Index"); break;
-		case DELFAST:
-		    verb = _("Deletion"); break;
-		}
-		g_string_printf(mods, _("%s failed"), verb);
+		g_string_printf(mods, _("%s failed"),
+				gettext(verbs[activity][PHRASE_COMPLETE]));
 	} else {
 		g_string_printf(mods, "%s", _("Finished"));		
 	}
@@ -966,14 +1240,7 @@ load_module_tree(GtkTreeView * treeview,
 	GList *tmp = NULL;
 	GList *tmp2 = NULL;
 	MOD_MGR *info;
-
-	mod_mgr_shut_down();
-	while (gtk_events_pending())
-		gtk_main_iteration();
-	mod_mgr_init(destination, FALSE, TRUE);
-		// false => don't augment with ~/.sword.
-		// true => use the regular swmgr.
-
+	
 	if (install) {
 		if (GTK_TOGGLE_BUTTON(radiobutton_source)->active) {
 			local = TRUE;
@@ -1017,8 +1284,10 @@ load_module_tree(GtkTreeView * treeview,
 		// true -> we must have all modules available, incl. ~/.sword content.
 	}
 
-	store = GTK_TREE_STORE(gtk_tree_view_get_model(treeview));
+	gtk_tree_view_set_model(treeview, NULL);
+	store = GTK_TREE_STORE(create_model());
 	gtk_tree_store_clear(store);
+
 	if (!g_list_length(tmp))
 		return;
 
@@ -1194,10 +1463,13 @@ load_module_tree(GtkTreeView * treeview,
 	}
 	g_list_free(tmp);
 
-	g_signal_connect((gpointer) treeview,
+	gtk_tree_view_set_model(treeview, GTK_TREE_MODEL(store));
+	
+	g_signal_connect_after((gpointer) treeview,
 			 "button_release_event",
 			 G_CALLBACK
 			 (on_modules_list_button_release), treeview);
+
 }
 
 
@@ -1231,6 +1503,8 @@ remove_install_wrapper(int activity)
 		gtk_main_iteration();
 
 	remove_install_modules(modules, activity);
+	mod_mgr_shut_down();
+	mod_mgr_init(destination, FALSE, TRUE);
 	load_module_tree(GTK_TREE_VIEW(treeview), (activity == INSTALL));
 
 	while (gtk_events_pending())
@@ -1303,50 +1577,46 @@ response_refresh(void)
 
 /******************************************************************************
  * Name
- *   response_close
+ *   check_sync_repos
  *
  * Synopsis
  *   #include "gui/mod_mgr.h"
  *
- *   void response_close(void)
+ *   void check_sync_repos(void)
  *
  * Description
- *   
+ *   verifies enough remote sources are known, and gets more if needed.
  *
  * Return value
  *   void
  */
 
 static void
-response_close(void)
+check_sync_repos(void)
 {
-	if (need_update) {
-		GString *str = g_string_new(NULL);
-		
-		gtk_widget_destroy(GTK_WIDGET(dialog));
-		g_string_printf(str, "%s/dirlist", settings.homedir);
-		if (mod_mgr_check_for_file(str->str)) {
-#ifdef DEBUG
-			g_warning("%s",str->str); /* special: no GS_warning. */
-#else
-			unlink(str->str);
-#endif
-		}
-		g_string_free(str,TRUE);
+	GList *tmp = mod_mgr_list_remote_sources();
+	/*
+	 * if too few remote sources, synchronize repos from crosswire.
+	 */
+	if (g_list_length(tmp) <= 1) {
+		char index[10];
+		mod_mgr_init_config_extras();
+		settings.mod_mgr_remote_source_index = load_source_treeviews();
+		g_snprintf(index, 10, "%d", settings.mod_mgr_remote_source_index);
+		xml_set_value("Xiphos", "modmgr", "mod_mgr_remote_source_index", index);
+		set_controls_to_last_use();
 	}
-	is_running = FALSE;
+	g_list_free(tmp);
 }
 
-
 /******************************************************************************
  * Name
- *   fixed_toggled
+ *   response_close
  *
  * Synopsis
  *   #include "gui/mod_mgr.h"
  *
- *   void fixed_toggled (GtkCellRendererToggle *cell, gchar *path_str,
- *							gpointer data)
+ *   void response_close(void)
  *
  * Description
  *   
@@ -1356,227 +1626,22 @@ response_close(void)
  */
 
 static void
-fixed_toggled(GtkCellRendererToggle *cell,
-	      gchar *path_str,
-	      gpointer data)
+response_close(void)
 {
-	GtkTreeModel *model = (GtkTreeModel *) data;
-	GtkTreeIter iter;
-	GtkTreePath *path = gtk_tree_path_new_from_string(path_str);
-	gboolean fixed;
-
-	/* get toggled iter */
-	gtk_tree_model_get_iter(model, &iter, path);
-	gtk_tree_model_get(model, &iter, COLUMN_FIXED, &fixed, -1);
-
-	/* do something with the value */
-	fixed ^= 1;
-
-	/* set new value */
-	gtk_tree_store_set(GTK_TREE_STORE(model), &iter, COLUMN_FIXED,
-			   fixed, -1);
-	/* clean up */
-	gtk_tree_path_free(path);
+	if (need_update) {
+		GString *str = g_string_new(NULL);
+		
+		gtk_widget_destroy(GTK_WIDGET(dialog));
+		g_string_printf(str, "%s/dirlist", settings.homedir);
+		if (mod_mgr_check_for_file(str->str))
+			unlink(str->str);
+		g_string_free(str,TRUE);
+	}
+	is_running = FALSE;
+	check_sync_repos();
 }
 
 
-/******************************************************************************
- * Name
- *   add_columns
- *
- * Synopsis
- *   #include "gui/mod_mgr.h"
- *
- *   void add_columns (GtkTreeView *treeview)
- *
- * Description
- *   
- *
- * Return value
- *   void
- */
-
-#ifndef HAVE_WIDGET_TOOLTIP_TEXT
-#define	gtk_widget_set_tooltip_text(x,y)	/* too old for this tooltip support */
-#endif /* !HAVE_WIDGET_TOOLTIP_TEXT */
-
-static void
-add_columns(GtkTreeView * treeview,
-	    gboolean remove)
-{
-	GtkCellRenderer *renderer;
-	GtkTreeViewColumn *column;
-	GtkTreeModel *model = gtk_tree_view_get_model(treeview);
-	GtkWidget *image;
-
-	/* -- column for sword module name -- */
-	renderer = gtk_cell_renderer_text_new();
-	column =
-	    gtk_tree_view_column_new_with_attributes(_("Module Name"), renderer,
-						     "text", COLUMN_NAME,
-						     NULL);
-					/* fixed sizing (200 pixels) */
-	gtk_tree_view_column_set_sizing(GTK_TREE_VIEW_COLUMN(column),
-					GTK_TREE_VIEW_COLUMN_FIXED);
-	gtk_tree_view_column_set_fixed_width(GTK_TREE_VIEW_COLUMN
-					     (column), 200);	
-	gtk_tree_view_append_column(treeview, column);
-
-	/* -- installed -- */
-	column = gtk_tree_view_column_new();
-	image = (remove
-		 ? gtk_image_new_from_stock("gnome-stock-blank",
-					    GTK_ICON_SIZE_MENU)
-		 : gtk_image_new_from_stock(GTK_STOCK_APPLY,
-					    GTK_ICON_SIZE_MENU));
-	gtk_widget_show(image);
-	gtk_widget_set_tooltip_text(image,
-				    (remove
-				     ? ""
-				     : _("A checkmark means this module is already installed")));
-	renderer = GTK_CELL_RENDERER(gtk_cell_renderer_pixbuf_new());
-	gtk_tree_view_column_set_widget(column, image);
-	gtk_tree_view_column_pack_start(column, renderer, TRUE);
-	gtk_tree_view_column_set_attributes(column, renderer,
-					    "pixbuf", COLUMN_INSTALLED,
-					    NULL);
-	gtk_tree_view_append_column(treeview, column);
-
-	/* -- toggle choice -- */
-	renderer = gtk_cell_renderer_toggle_new();
-	g_signal_connect(renderer, "toggled",
-			 G_CALLBACK(fixed_toggled), model);
-
-	column = gtk_tree_view_column_new();
-	image = gtk_image_new_from_stock((remove
-					  ? "gtk-yes" //GTK_STOCK_REMOVE
-					  : GTK_STOCK_ADD),
-					 GTK_ICON_SIZE_MENU);
-	gtk_widget_show(image);
-	gtk_widget_set_tooltip_text(image,
-				    (remove
-				     ? _("Click the box to work on this module")
-				     : _("Click the box to select this module for install/update")));
-	gtk_tree_view_column_set_widget(column, image);
-	gtk_tree_view_column_pack_start(column, renderer, TRUE);
-	gtk_tree_view_column_set_attributes(column, renderer,
-					    "active",
-					    COLUMN_FIXED,
-					    "visible",
-					    COLUMN_VISIBLE, NULL);
-
-					/* fixed sizing (25 pixels) */
-	gtk_tree_view_column_set_sizing(GTK_TREE_VIEW_COLUMN(column),
-					GTK_TREE_VIEW_COLUMN_FIXED);
-	gtk_tree_view_column_set_fixed_width(GTK_TREE_VIEW_COLUMN
-					     (column), 25);
-	gtk_tree_view_append_column(treeview, column);
-
-	/* -- installed version -- */
-	renderer = gtk_cell_renderer_text_new();
-	column =
-	    gtk_tree_view_column_new_with_attributes(_("Installed"),
-						     renderer, "text",
-						     COLUMN_INSTALLED_VERSION,
-						     NULL);
-	gtk_tree_view_append_column(treeview, column);
-
-	/* -- fast index ready -- */
-	column = gtk_tree_view_column_new();
-	image = pixmap_finder("indexed-16.png");
-	gtk_widget_show(image);
-	gtk_widget_set_tooltip_text(image, _("The index icon means you have built an optimized ('lucene') index for this module for fast searching (see the Maintenance pane for this function)"));
-	renderer = GTK_CELL_RENDERER(gtk_cell_renderer_pixbuf_new());
-	gtk_tree_view_column_set_widget(column, image);
-	gtk_tree_view_column_pack_start(column, renderer, TRUE);
-	gtk_tree_view_column_set_attributes(column, renderer,
-					    "pixbuf", COLUMN_FASTREADY,
-					    NULL);
-					/* fixed sizing (25 pixels) */
-	gtk_tree_view_column_set_sizing(GTK_TREE_VIEW_COLUMN(column),
-					GTK_TREE_VIEW_COLUMN_FIXED);
-	gtk_tree_view_column_set_fixed_width(GTK_TREE_VIEW_COLUMN
-					     (column), 25);
-	gtk_tree_view_append_column(treeview, column);
-
-	/* -- locked -- */
-	column = gtk_tree_view_column_new();
-	image = pixmap_finder("epiphany-secure.png");
-	gtk_widget_show(image);
-	gtk_widget_set_tooltip_text(image, _("The lock icon means this module is encrypted, and requires that you purchase an unlock key from the content owner"));
-	renderer = GTK_CELL_RENDERER(gtk_cell_renderer_pixbuf_new());
-	gtk_tree_view_column_set_widget(column, image);
-	gtk_tree_view_column_pack_start(column, renderer, TRUE);
-	gtk_tree_view_column_set_attributes(column, renderer,
-					    "pixbuf", COLUMN_LOCKED,
-					    NULL);
-					/* fixed sizing (25 pixels) */
-	gtk_tree_view_column_set_sizing(GTK_TREE_VIEW_COLUMN(column),
-					GTK_TREE_VIEW_COLUMN_FIXED);
-	gtk_tree_view_column_set_fixed_width(GTK_TREE_VIEW_COLUMN
-					     (column), 25);
-	gtk_tree_view_append_column(treeview, column);
-
-	/* -- About content (invisible) -- */
-	renderer = gtk_cell_renderer_text_new();
-	column =
-	    gtk_tree_view_column_new_with_attributes(_("About"), renderer,
-						     "text", COLUMN_ABOUT,
-						     NULL);
-	/* column not shown */
-	gtk_tree_view_column_set_visible(column, FALSE);
-					/* fixed sizing (2 pixels) */
-	gtk_tree_view_column_set_sizing(GTK_TREE_VIEW_COLUMN(column),
-					GTK_TREE_VIEW_COLUMN_FIXED);
-	gtk_tree_view_column_set_fixed_width(GTK_TREE_VIEW_COLUMN
-					     (column), 2);	
-	gtk_tree_view_append_column(treeview, column);
-
-	if (remove)
-		return;	/* no more fields needed */
-
-	/* -- refresh/update -- */
-	column = gtk_tree_view_column_new();
-	image = gtk_image_new_from_stock(GTK_STOCK_REFRESH,
-					 GTK_ICON_SIZE_MENU);
-	gtk_widget_show(image);
-	gtk_widget_set_tooltip_text(image, _("The refresh icon means the Installed module is older than the newer Available module: You should update the module"));
-	renderer = GTK_CELL_RENDERER(gtk_cell_renderer_pixbuf_new());
-	gtk_tree_view_column_set_widget(column, image);
-	gtk_tree_view_column_pack_start(column, renderer, TRUE);
-	gtk_tree_view_column_set_attributes(column, renderer,
-					    "pixbuf", COLUMN_DIFFERENT,
-					    NULL);
-	gtk_tree_view_append_column(treeview, column);
-
-	/* -- available version -- */
-	renderer = gtk_cell_renderer_text_new();
-	column =
-	    gtk_tree_view_column_new_with_attributes(_("Available"),
-						     renderer, "text",
-						     COLUMN_AVAILABLE_VERSION,
-						     NULL);
-	gtk_tree_view_append_column(treeview, column);
-
-	/* -- install size -- */
-	renderer = gtk_cell_renderer_text_new();
-	column =
-	    gtk_tree_view_column_new_with_attributes(_("Size"),
-						     renderer, "text",
-						     COLUMN_INSTALLSIZE,
-						     NULL);
-	gtk_tree_view_append_column(treeview, column);
-
-	/* -- description -- */
-	renderer = gtk_cell_renderer_text_new();
-	column =
-	    gtk_tree_view_column_new_with_attributes(_("Description"),
-						     renderer, "text",
-						     COLUMN_DESC,
-						     NULL);
-	gtk_tree_view_append_column(treeview, column);
-}
-
 
 /******************************************************************************
  * Name
@@ -1697,12 +1762,12 @@ create_model_to_first(void)
 	model = gtk_tree_store_new(2, G_TYPE_STRING, G_TYPE_INT);
 
 	gtk_tree_store_append(model, &iter, NULL);
-	gtk_tree_store_set(model, &iter, 0, "SWORD", -1);
+	gtk_tree_store_set(model, &iter, 0, _("Module Sources"), -1);
 
 	gtk_tree_store_append(model, &child_iter, &iter);
-	gtk_tree_store_set(model, &child_iter, 0, _("Sources"), 1, 1, -1);
+	gtk_tree_store_set(model, &child_iter, 0, _("Add/Remove"), 1, 1, -1);
 	gtk_tree_store_append(model, &child_iter, &iter);
-	gtk_tree_store_set(model, &child_iter, 0, _("Configure"), 1, 2, -1);
+	gtk_tree_store_set(model, &child_iter, 0, _("Choose"), 1, 2, -1);
 
 
 	gtk_tree_store_append(model, &iter, NULL);
@@ -1716,43 +1781,7 @@ create_model_to_first(void)
 }
 
 
-/******************************************************************************
- * Name
- *   create_model
- *
- * Synopsis
- *   #include "gui/mod_mgr.h"
- *
- *   GtkTreeModel *create_model (void)
- *
- * Description
- *   
- *
- * Return value
- *   GtkTreeModel *
- */
 
-static GtkTreeModel *
-create_model(void)
-{
-	GtkTreeStore *store;
-
-	/* create list store */
-	store = gtk_tree_store_new(NUM_COLUMNS,
-				   G_TYPE_STRING,	/* module name */
-				   GDK_TYPE_PIXBUF,	/* installed */
-				   G_TYPE_BOOLEAN,	/* checkbox */
-				   G_TYPE_STRING,	/* installed verssion */
-				   GDK_TYPE_PIXBUF,	/* fastready */
-				   GDK_TYPE_PIXBUF,	/* locked */
-				   G_TYPE_STRING,	/* about */
-				   GDK_TYPE_PIXBUF,	/* refresh */
-				   G_TYPE_STRING,	/* available version */
-				   G_TYPE_STRING,	/* size */
-				   G_TYPE_STRING,	/* description */
-				   G_TYPE_BOOLEAN);	/* visibility */
-	return GTK_TREE_MODEL(store);
-}
 
 static GtkTreeModel *
 create_remote_source_treeview_model(void)
@@ -1773,9 +1802,25 @@ create_remote_source_treeview_model(void)
 }
 
 
-static void
+/******************************************************************************
+ * Name
+ *   load_source_treeviews
+ *
+ * Synopsis
+ *   #include "gui/mod_mgr.h"
+ *   int load_source_treeviews(void)
+ *
+ * Description
+ *   inhale InstallMgr.conf content.  return CrossWire's position.
+ *
+ * Return value
+ *   int
+ */
+
+static int
 load_source_treeviews(void)
 {
+	int crosswire_index = 1 /* guess */, crosswire_tracker = 0 /* start */;
 	GList *tmp = NULL;
 	GList *tmp2 = NULL;
 	GtkTreeIter iter;
@@ -1796,6 +1841,8 @@ load_source_treeviews(void)
 	tmp = tmp2 = mod_mgr_list_remote_sources();
 	while (tmp) {
 		mms = (MOD_MGR_SOURCE *) tmp->data;
+		if (!strcmp(mms->caption, "CrossWire"))
+			crosswire_index = crosswire_tracker;
 		gtk_list_store_append(GTK_LIST_STORE(remote_model),
 				      &iter);
 		gtk_list_store_set(GTK_LIST_STORE(remote_model), &iter,
@@ -1822,6 +1869,7 @@ load_source_treeviews(void)
 		g_free((gchar*)mms->uid);
 		g_free(mms);
 		tmp = g_list_next(tmp);
+		crosswire_tracker++;
 	}
 	gtk_combo_box_set_active(GTK_COMBO_BOX(combo_entry2), 0);
 	g_list_free(tmp2);
@@ -1861,6 +1909,8 @@ load_source_treeviews(void)
 	}
 	gtk_combo_box_set_active(GTK_COMBO_BOX(combo_entry1), 0);
 	g_list_free(tmp2);
+
+	return crosswire_index;
 }
 
 
@@ -1913,6 +1963,22 @@ on_notebook1_switch_page(GtkNotebook * notebook,
 			 guint page_num, gpointer user_data)
 {
 	gchar *str;
+	GdkCursor *cursor;
+	GdkDisplay *display;
+	GdkWindow *window;
+	gint x, y;
+	GTimer *total;
+	double d;
+
+	total = g_timer_new();
+
+	cursor = gdk_cursor_new(GDK_WATCH);
+	display = gdk_display_get_default();
+	window = gdk_display_get_window_at_pointer(display, &x, &y);
+
+	gdk_window_set_cursor(window, cursor);
+	gdk_display_sync(display);
+	gdk_cursor_unref(cursor);
 
 	current_page = page_num;
 	clear_and_hide_progress_bar();
@@ -1959,6 +2025,11 @@ on_notebook1_switch_page(GtkNotebook * notebook,
 		load_module_tree(GTK_TREE_VIEW(treeview2), FALSE);
 		break;
 	}
+	gdk_window_set_cursor(window, NULL);
+
+	g_timer_stop(total);
+	d = g_timer_elapsed(total, NULL);
+	GS_message(("total time is %f", d));
 }
 
 
@@ -2096,6 +2167,7 @@ save_sources(void)
 		valid = gtk_tree_model_iter_next(local_model, &iter);
 	}
 
+	mod_mgr_reread_config();
 	load_source_treeviews();
 }
 
@@ -2171,7 +2243,7 @@ create_fileselection_local_source(void)
  *   void
  */
 
-void
+static void
 on_dialog_destroy(GtkObject * object, gpointer user_data)
 {
 	GList *tmp;
@@ -2193,13 +2265,7 @@ on_dialog_destroy(GtkObject * object, gpointer user_data)
 		main_load_module_tree(sidebar.module_list);
 	}
 
-	/*
-	 * if InstallMgr.conf has just been init'd, then we
-	 * want to add the rest of the standard repositories.
-	 */
-	if (g_list_length(tmp = mod_mgr_list_remote_sources()) <= 1)
-		mod_mgr_init_config_extras();
-	g_list_free(tmp);
+	check_sync_repos();
 
 	working = FALSE;
 	is_running = FALSE;
@@ -2213,14 +2279,14 @@ on_dialog_destroy(GtkObject * object, gpointer user_data)
 			main_display_bible((char *)tmp->data, settings.currentverse);
 		else {
 			/* Zero Bibles is just not workable in Xiphos. */
-			gui_generic_warning("You have uninstalled your last Bible.\n"
-					    "Xiphos requires at least one.");
+			gui_generic_warning(_("You have uninstalled your last Bible.\n"
+					      "Xiphos requires at least one."));
 			main_shutdown_list();
 			gui_open_mod_mgr_initial_run();
 			main_init_lists();
 			if (settings.havebible == 0) {
-				gui_generic_warning("There are still no Bibles installed.\n"
-						    "Xiphos cannot continue without one.");
+				gui_generic_warning(_("There are still no Bibles installed.\n"
+						      "Xiphos cannot continue without one."));
 				exit(1);
 			}
 		}		    
@@ -2281,10 +2347,16 @@ on_delete_index_clicked(GtkButton * button, gpointer  user_data)
 void
 on_load_sources_clicked(GtkButton * button, gpointer  user_data)
 {
-	gui_generic_warning((mod_mgr_init_config_extras() == 0)
-			    ? _("Standard remote sources have been loaded.")
-			    : _("Could not load standard sources from CrossWire."));
-	load_source_treeviews();
+	if (mod_mgr_init_config_extras() == 0) {
+		/* not quite identical to check_sync_repos(). */
+		char index[10];
+		gui_generic_warning(_("Standard remote sources have been loaded."));
+		settings.mod_mgr_remote_source_index = load_source_treeviews();
+		g_snprintf(index, 10, "%d", settings.mod_mgr_remote_source_index);
+		xml_set_value("Xiphos", "modmgr", "mod_mgr_remote_source_index", index);
+		set_controls_to_last_use();
+	} else
+		gui_generic_warning(_("Could not load standard sources from CrossWire."));
 }
 
 void
@@ -2834,19 +2906,6 @@ setup_treeviews_local_remote(GtkTreeView * local, GtkTreeView * remote)
 	add_columns_to_remote_treeview(remote);
 }
 
-static void
-setup_treeviews_install_remove(GtkTreeView * install, GtkTreeView * remove)
-{
-	GtkTreeModel *model;
-	
-	model = create_model();
-	gtk_tree_view_set_model(install, model);
-	add_columns(install, FALSE);
-
-	model =  create_model();
-	gtk_tree_view_set_model(remove, model);
-	add_columns(remove, TRUE);
-}
 
 static void
 set_combobox(GtkComboBox * combo)
@@ -3053,7 +3112,7 @@ create_module_manager_dialog(gboolean first_run)
 		
 		dialog = gtk_dialog_new();
 		gtk_widget_show(dialog);
-		gtk_widget_set_size_request(dialog, 500, 341);
+		gtk_widget_set_size_request(dialog, 636, 450);
 		dialog_vbox = GTK_DIALOG(dialog)->vbox;
 		gtk_widget_show(dialog_vbox);
 		gtk_box_pack_start(GTK_BOX(dialog_vbox),hpaned, TRUE, TRUE, 6);
@@ -3063,6 +3122,7 @@ create_module_manager_dialog(gboolean first_run)
 		setup_dialog_action_area(GTK_DIALOG (dialog));
 	} else {
 		dialog =  glade_xml_get_widget (gxml, "dialog");
+		gtk_widget_set_size_request(dialog, 636, 450);
 		/* response buttons */
 		button_close = glade_xml_get_widget (gxml, "button1"); /* close */
 		button_cancel = glade_xml_get_widget (gxml, "button12"); /* close */
@@ -3094,7 +3154,8 @@ create_module_manager_dialog(gboolean first_run)
 	treeview = glade_xml_get_widget (gxml, "treeview4");
 
 	treeview2 = glade_xml_get_widget (gxml, "treeview5");
-	setup_treeviews_install_remove(GTK_TREE_VIEW(treeview), GTK_TREE_VIEW(treeview2));
+	setup_treeview_install(GTK_TREE_VIEW(treeview));
+	setup_treeview_maintenance(GTK_TREE_VIEW(treeview2));
 	
 #ifdef HAVE_WIDGET_TOOLTIP_TEXT
 	gtk_widget_set_has_tooltip (treeview, TRUE);
@@ -3179,12 +3240,32 @@ create_module_manager_dialog(gboolean first_run)
  *   void
  */
 
+#define	MOD_INTRO	\
+_("<b>Welcome to the Module Manager.</b>\n\nThis is Xiphos' mechanism to get new and updated content.\nIt appears you have never been here before, so please take a moment to look it over.\n(You will see this information box just once.)\n\nModules come from different <u>repositories</u>.  <b>Module Sources: Add/Remove</b> will show you what repositories are currently known.\n\n<b>Module Sources: Choose</b> is for deciding from where modules should come, that is, from which repository Xiphos should obtain them, as well as where they should be placed on your system. Set <i>Install Source</i> and <i>Install Destination</i>, then click <i>Refresh</i>.\n\n<b>Modules: Install/Update</b> is for selecting and obtaining modules after choosing source and destination.\n\n<b>Modules: Maintenance</b> is for archive and index creation.\n\nSee section 5 of our manual for Module Manager detail, or ask for help via Live Chat, or (if no one is responsive in chat) send mail to our users' mailing list.\n")
+
 void gui_open_mod_mgr(void)
 {
 	if (!is_running) {
+		GtkWidget *dlg;
 		need_update = TRUE;
-		create_module_manager_dialog(FALSE);
+		dlg = create_module_manager_dialog(FALSE);
+		set_window_icon(GTK_WINDOW(dlg));
 		is_running = TRUE;
+		if (!settings.mod_mgr_intro) {
+			GtkWidget *dialog;
+			dialog = gtk_message_dialog_new_with_markup
+			    (GTK_WINDOW(widgets.app),
+			     GTK_DIALOG_DESTROY_WITH_PARENT,
+			     GTK_MESSAGE_INFO,
+			     GTK_BUTTONS_OK,
+			     MOD_INTRO);
+			g_signal_connect_swapped (dialog, "response",
+						  G_CALLBACK (gtk_widget_destroy),
+						  dialog);
+			gtk_widget_show(dialog);
+			settings.mod_mgr_intro = 1;
+			xml_set_value("Xiphos", "modmgr", "mod_mgr_intro", "1");
+		}
 	} else
 		gdk_window_raise(GTK_WIDGET(dialog)->window);
 }
@@ -3212,6 +3293,7 @@ void gui_open_mod_mgr_initial_run(void)
 	need_update = FALSE;
 	first_time_user = TRUE;
 	dlg = create_module_manager_dialog(TRUE);
+	set_window_icon(GTK_WINDOW(dlg));
 	gtk_dialog_run((GtkDialog *) dlg);
 	gtk_widget_destroy(dlg);
 	first_time_user = FALSE;
diff --git a/src/gnome2/navbar_book.c b/src/gnome2/navbar_book.c
index f14d676..462625c 100644
--- a/src/gnome2/navbar_book.c
+++ b/src/gnome2/navbar_book.c
@@ -23,7 +23,7 @@
 #include <config.h>
 #endif
 
-#include <gnome.h>
+#include <gtk/gtk.h>
 
 #include "gui/navbar_book.h"
 
@@ -291,7 +291,7 @@ void on_button_next_clicked(GtkButton * button, gpointer user_data)
  *   void
  */
 
-void  on_entry_activate (GtkEntry *entry, gpointer  user_data) 
+void on_entry_activate (GtkEntry *entry, gpointer  user_data)
 {
 	const gchar* entry_buf = NULL;
 	
diff --git a/src/gnome2/navbar_book_dialog.c b/src/gnome2/navbar_book_dialog.c
index 4b22209..d495f7e 100644
--- a/src/gnome2/navbar_book_dialog.c
+++ b/src/gnome2/navbar_book_dialog.c
@@ -23,7 +23,8 @@
 #include <config.h>
 #endif
 
-#include <gnome.h>
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
 
 #include "gui/navbar_book_dialog.h"
 
diff --git a/src/gnome2/navbar_versekey.c b/src/gnome2/navbar_versekey.c
index 0074ece..7debe40 100644
--- a/src/gnome2/navbar_versekey.c
+++ b/src/gnome2/navbar_versekey.c
@@ -23,7 +23,7 @@
 #include <config.h>
 #endif
 
-#include <gnome.h>
+#include <gtk/gtk.h>
 #include <glade/glade-xml.h>
 
 #ifdef USE_GTKHTML3_14_23
@@ -45,6 +45,8 @@
 #include "main/tab_history.h"
 #include "main/url.hh"
 
+#include "gui/debug_glib_null.h"
+
 NAVBAR_VERSEKEY navbar_versekey;
 
 extern PASSAGE_TAB_INFO *cur_passage_tab;
diff --git a/src/gnome2/navbar_versekey_dialog.c b/src/gnome2/navbar_versekey_dialog.c
index ea397da..02e4123 100644
--- a/src/gnome2/navbar_versekey_dialog.c
+++ b/src/gnome2/navbar_versekey_dialog.c
@@ -23,7 +23,7 @@
 #include <config.h>
 #endif
 
-#include <gnome.h>
+#include <gtk/gtk.h>
 #include <glade/glade-xml.h>
 
 #include "gui/navbar_versekey_dialog.h"
@@ -36,6 +36,9 @@
 #include "main/settings.h"
 #include "main/sword.h"
 #include "main/tab_history.h"
+#include "main/url.hh"
+
+#include "gui/debug_glib_null.h"
 
 
 /******************************************************************************
@@ -208,9 +211,7 @@ gboolean on_book_down_button_release_event(GtkWidget * widget,
 
 static void menu_deactivate_callback(GtkWidget * widget, gpointer user_data)
 {
-	GtkWidget *menu_button;
-
-	menu_button = GTK_WIDGET(user_data);
+	GtkWidget *menu_button = GTK_WIDGET(user_data);
 
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(menu_button), FALSE);
 }
@@ -428,15 +429,15 @@ static void on_entry_activate(GtkEntry * entry, DIALOG_DATA *dialog)
 	if(gkey == NULL)
 		return;
 	gchar *url = g_strdup_printf("sword:///%s", gkey);
-	
-	dialog->navbar.module_name = g_string_assign(dialog->navbar.module_name,settings.MainWindowModule);
+	                             
+	dialog->navbar.module_name = g_string_assign(dialog->navbar.module_name, dialog->mod_name);
 	main_navbar_versekey_set(dialog->navbar, gkey);
 	main_dialogs_url_handler(dialog, url, TRUE);
+	if (dialog->sync) 
+		sword_uri(url, TRUE);
 
-	if(url)
-		g_free(url);
-	if(gkey)
-		g_free((gchar*)gkey);
+	g_free(url);
+	g_free((gchar*)gkey);
 }
 
 
@@ -787,32 +788,8 @@ void _connect_signals(NAVBAR_VERSEKEY navbar, DIALOG_DATA * dialog)
 	g_signal_connect ((gpointer)navbar.button_verse_down , "leave_notify_event",
 		    G_CALLBACK (on_verse_down_leave_notify_event),
 		    dialog);		 
+
 			 
-			 
-			 
-			 
-	
-/*	
-	g_signal_connect((gpointer) navbar.button_book_up,
-			 "clicked", G_CALLBACK(on_book_button_up_clicked),
-			 dialog);
-	g_signal_connect((gpointer) navbar.button_book_down,
-			 "clicked", G_CALLBACK(on_book_button_down_clicked),
-			 dialog);
-	g_signal_connect((gpointer) navbar.button_chapter_up,
-			 "clicked", G_CALLBACK(on_chapter_button_up_clicked),
-			 dialog);
-	g_signal_connect((gpointer) navbar.button_chapter_down,
-			 "clicked", G_CALLBACK(on_chapter_button_down_clicked),
-			 dialog);
-	g_signal_connect((gpointer) navbar.button_verse_up,
-			 "clicked", G_CALLBACK(on_verse_button_up_clicked),
-			 dialog);
-	g_signal_connect((gpointer) navbar.button_verse_down,
-			 "clicked", G_CALLBACK(on_verse_button_down_clicked),
-			 dialog);
-			 
-*/
 	g_signal_connect((gpointer) navbar.button_sync,
 			 "clicked", G_CALLBACK(gui_bible_dialog_sync_toggled),
 			 dialog);
diff --git a/src/gnome2/navbar_versekey_editor.c b/src/gnome2/navbar_versekey_editor.c
index 22b54d9..d1c4cc3 100644
--- a/src/gnome2/navbar_versekey_editor.c
+++ b/src/gnome2/navbar_versekey_editor.c
@@ -23,7 +23,7 @@
 #include <config.h>
 #endif
 
-#include <gnome.h>
+#include <gtk/gtk.h>
 #include <glade/glade-xml.h>
 
 
@@ -44,6 +44,8 @@
 #include "main/sword.h"
 #include "main/tab_history.h"
 
+#include "gui/debug_glib_null.h"
+
 
 /******************************************************************************
  * Name
diff --git a/src/gnome2/navbar_versekey_parallel.c b/src/gnome2/navbar_versekey_parallel.c
index f76e2a2..c4a373b 100644
--- a/src/gnome2/navbar_versekey_parallel.c
+++ b/src/gnome2/navbar_versekey_parallel.c
@@ -23,7 +23,7 @@
 #include <config.h>
 #endif
 
-#include <gnome.h>
+#include <gtk/gtk.h>
 #include <glade/glade-xml.h>
 
 #include "gui/navbar_versekey_parallel.h"
@@ -35,7 +35,10 @@
 #include "main/sword.h"
 #include "main/url.hh"
 
+#include "gui/debug_glib_null.h"
+
 NAVBAR_VERSEKEY navbar_parallel;
+gboolean sync_on;
 
 /******************************************************************************
  * Name
@@ -280,8 +283,13 @@ static void on_entry_activate(GtkEntry * entry, gpointer user_data)
 	settings.cvparallel = (gchar*)main_get_valid_key((gchar*)buf);
 	if(settings.cvparallel == NULL)
 		return;
-	main_navbar_versekey_set(navbar_parallel, settings.cvparallel);
+	main_navbar_versekey_set(navbar_parallel, settings.cvparallel);	
 	main_update_parallel_page_detached();
+	if (sync_on) {
+		const gchar *main_window_url = g_strdup_printf("sword:///%s", settings.cvparallel);
+		sword_uri(main_window_url, TRUE);
+		g_free((gchar*)main_window_url);
+	}
 }
 
 
@@ -376,7 +384,9 @@ static void sync_with_main (GtkToggleButton * button, gpointer data)
 {
 	gchar *buf = NULL;
 	gchar *url = NULL;
+	sync_on = FALSE;
 	if (button->active) {
+		sync_on = TRUE;
 		buf = (gchar*)main_url_encode(settings.currentverse);
 		if(buf && (strlen(buf) > 3)) {
 			url =
@@ -840,6 +850,6 @@ GtkWidget *gui_navbar_versekey_parallel_new(void)
 	navbar_parallel.chapter_menu = gtk_menu_new();
 	navbar_parallel.verse_menu = gtk_menu_new();
 	_connect_signals(navbar_parallel);
-	
+	GTK_TOGGLE_BUTTON(navbar_parallel.button_sync)->active = settings.linkedtabs;
 	return navbar_parallel.navbar;
 }
diff --git a/src/gnome2/parallel_dialog.c b/src/gnome2/parallel_dialog.c
index f688250..9aea8da 100644
--- a/src/gnome2/parallel_dialog.c
+++ b/src/gnome2/parallel_dialog.c
@@ -23,10 +23,14 @@
 #  include <config.h>
 #endif
 
-#include <gnome.h>
+#include <gtk/gtk.h>
 #include <glade/glade-xml.h>
 #ifdef USE_GTKMOZEMBED
+#ifdef WIN32
+#include "geckowin/gecko-html.h"
+#else
 #include "gecko/gecko-html.h"
+#endif
 #else
 #include <gtkhtml/gtkhtml.h>
 #include "gui/html.h"
@@ -48,7 +52,7 @@
 #include "main/url.hh"
 #include "main/xml.h"
 
-
+#include "gui/debug_glib_null.h"
 
 extern gboolean do_display;
 
@@ -444,6 +448,9 @@ GtkWidget *create_parallel_dialog(void)
 	g_signal_connect(GTK_OBJECT(btnDockInt), "clicked",
 			   G_CALLBACK(gui_btnDockInt_clicked),
 			   NULL);
+
+	set_window_icon (GTK_WINDOW(dialog_parallel));
+
 	return dialog_parallel;
 }
 
diff --git a/src/gnome2/parallel_tab.c b/src/gnome2/parallel_tab.c
index 8a5e80a..1848d67 100644
--- a/src/gnome2/parallel_tab.c
+++ b/src/gnome2/parallel_tab.c
@@ -23,10 +23,14 @@
 #  include <config.h>
 #endif
 
-#include <gnome.h>
+#include <gtk/gtk.h>
 #include <glade/glade-xml.h>
 #ifdef USE_GTKMOZEMBED
+#ifdef WIN32
+#include "geckowin/gecko-html.h"
+#else
 #include "gecko/gecko-html.h"
+#endif
 #else
 #include <gtkhtml/gtkhtml.h>
 #include "gui/html.h"
@@ -48,9 +52,8 @@
 #include "main/url.hh"
 #include "main/xml.h"
 
+#include "gui/debug_glib_null.h"
 
-
-extern gboolean do_display;
 extern gboolean shift_key_pressed;
 
 GtkWidget *entrycbIntBook;
@@ -59,7 +62,7 @@ GtkWidget *sbIntVerse;
 GtkWidget *entryIntLookup;
     
 PARA_LABELS plabels;
-
+extern gboolean sync_on;
 /******************************************************************************
  * static
  */
@@ -214,6 +217,13 @@ void gui_parallel_tab_sync(const gchar * key)
 	sync_with_main(key);	
 }
 
+void gui_force_parallel_tab_sync(void)
+{
+	GTK_TOGGLE_BUTTON(navbar_parallel.button_sync)->active = settings.linkedtabs;
+	sync_on = settings.linkedtabs;
+	/* tell somebody that this button has been hacked */
+}
+
 
 /******************************************************************************
  * Name
@@ -455,6 +465,7 @@ GtkWidget *gui_create_parallel_tab(void)
 void gui_destroy_parallel_tab(void)
 {
 	settings.dockedInt = TRUE;
+	sync_on = FALSE;
 	gtk_widget_destroy(parallel_vbox);
 	gtk_widget_show(widgets.hpaned);
 }
diff --git a/src/gnome2/parallel_view.c b/src/gnome2/parallel_view.c
index b6e8043..708c711 100644
--- a/src/gnome2/parallel_view.c
+++ b/src/gnome2/parallel_view.c
@@ -23,10 +23,14 @@
 #include <config.h>
 #endif
 
-#include <gnome.h>
+#include <gtk/gtk.h>
 
 #ifdef USE_GTKMOZEMBED
+#ifdef WIN32
+#include "geckowin/gecko-html.h"
+#else
 #include "gecko/gecko-html.h"
+#endif
 #else
 #include <gtkhtml/gtkhtml.h>
 #include "gui/html.h"
diff --git a/src/gnome2/preferences_cell_renderer.c b/src/gnome2/preferences_cell_renderer.c
deleted file mode 100644
index bef2a84..0000000
--- a/src/gnome2/preferences_cell_renderer.c
+++ /dev/null
@@ -1,411 +0,0 @@
-/*
- * Xiphos Bible Study Tool
- * preferences_cell_renderer.c - 
- *
- * Copyright (C) 2002-2008 Dave Camp
- * taken form Anjuta-1.1.98
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library 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
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Foundation, Inc., 51 Franklin St, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#include <stdlib.h>
-#include "gui/preferences_cell_renderer.h"
-
-#include <bonobo/bonobo-i18n.h>
-#include <libgnome/gnome-macros.h>
-
-static void
-preferences_cell_renderer_captioned_image_instance_init
-(CellRendererCaptionedImage * cell);
-static void
-preferences_cell_renderer_captioned_image_class_init
-(CellRendererCaptionedImageClass * class);
-
-enum {
-	PROP_0,
-
-	PROP_TEXT,
-	PROP_PIXBUF
-};
-
-#define PAD 3
-#define SPACE 5
-
-GNOME_CLASS_BOILERPLATE(CellRendererCaptionedImage,
-			preferences_cell_renderer_captioned_image,
-			GtkCellRenderer, GTK_TYPE_CELL_RENDERER);
-
-
-/******************************************************************************
- * Name
- *   preferences_cell_renderer_captioned_image_get_property
- *
- * Synopsis
- *   #include "gui/preferences_cell_renderer.h"
- *
- *   	void preferences_cell_renderer_captioned_image_get_property(
- *						       GObject * object,
- *						       guint param_id,
- *						       GValue * value,
- *						       GParamSpec *
- *						       pspec)
- *
- * Description
- *
- * Return value
- *   void
- */
-
-static 
-void preferences_cell_renderer_captioned_image_get_property(
-						       GObject * object,
-						       guint param_id,
-						       GValue * value,
-						       GParamSpec *
-						       pspec)
-{
-	CellRendererCaptionedImage *cell =
-	    PREFS_CELL_RENDERER_CAPTIONED_IMAGE(object);
-
-	switch (param_id) {
-	case PROP_TEXT:
-		g_object_get_property(G_OBJECT(cell->caption),
-				      "text", value);
-		break;
-	case PROP_PIXBUF:
-		g_object_get_property(G_OBJECT(cell->image),
-				      "pixbuf", value);
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID(object, param_id,
-						  pspec);
-		break;
-	}
-}
-
-
-/******************************************************************************
- * Name
- *   preferences_cell_renderer_captioned_image_set_property
- *
- * Synopsis
- *   #include "gui/preferences_cell_renderer.h"
- *
- *   void preferences_cell_renderer_captioned_image_set_property(
- *						       GObject * object,
- *						       guint param_id,
- *						       const GValue *
- *						       value,
- *						       GParamSpec *
- *						       pspec)	
- *
- * Description
- *
- * Return value
- *   void
- */
-
-static 
-void preferences_cell_renderer_captioned_image_set_property(GObject * object,
-						       guint param_id,
-						       const GValue *
-						       value,
-						       GParamSpec *
-						       pspec)
-{
-	CellRendererCaptionedImage *cell =
-	    PREFS_CELL_RENDERER_CAPTIONED_IMAGE(object);
-
-	switch (param_id) {
-	case PROP_TEXT:
-		g_object_set_property(G_OBJECT(cell->caption), "text",
-				      value);
-		break;
-
-	case PROP_PIXBUF:
-		g_object_set_property(G_OBJECT(cell->image), "pixbuf",
-				      value);
-		break;
-
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID(object, param_id,
-						  pspec);
-		break;
-	}
-}
-
-/******************************************************************************
- * Name
- *   gui_preferences_cell_renderer_captioned_image_new
- *
- * Synopsis
- *   #include "gui/preferences_cell_renderer.h"
- *
- *   GtkCellRenderer *gui_preferences_cell_renderer_captioned_image_new(void)	
- *
- * Description
- *
- * Return value
- *   GtkCellRenderer*
- */
-
-GtkCellRenderer *gui_preferences_cell_renderer_captioned_image_new(void)
-{
-	return
-	    GTK_CELL_RENDERER(g_object_new
-			      (preferences_cell_renderer_captioned_image_get_type
-			       (), NULL));
-}
-
-/******************************************************************************
- * Name
- *   
- *
- * Synopsis
- *   #include "gui/preferences_cell_renderer.h"
- *
- *   	void preferences_cell_renderer_captioned_image_get_size(
- *						   GtkCellRenderer *
- *						   gtk_cell,
- *						   GtkWidget * widget,
- *						   GdkRectangle *
- *						   cell_area,
- *						   int *x_offset,
- *						   int *y_offset,
- *						   int *width,
- *						   int *height)
- *
- * Description
- *
- * Return value
- *   void
- */
-
-static 
-void preferences_cell_renderer_captioned_image_get_size(GtkCellRenderer *
-						   gtk_cell,
-						   GtkWidget * widget,
-						   GdkRectangle *
-						   cell_area,
-						   int *x_offset,
-						   int *y_offset,
-						   int *width,
-						   int *height)
-{
-	int text_x_offset;
-	int text_y_offset;
-	int text_width;
-	int text_height;
-
-	CellRendererCaptionedImage *cell =
-	    PREFS_CELL_RENDERER_CAPTIONED_IMAGE(gtk_cell);
-
-	gtk_cell_renderer_get_size(cell->image, widget, cell_area,
-				   NULL, NULL, width, height);
-
-	gtk_cell_renderer_get_size(cell->caption, widget, cell_area,
-				   &text_x_offset,
-				   &text_y_offset,
-				   &text_width, &text_height);
-
-
-	if (height) {
-		*height = *height + text_height + PAD;
-	}
-
-	if (width) {
-		*width = MAX(*width, text_width);
-		*width += SPACE * 2;
-	}
-}
-
-
-/******************************************************************************
- * Name
- *   preferences_cell_renderer_captioned_image_render
- *
- * Synopsis
- *   #include "gui/preferences_cell_renderer.h"
- *
- *   void preferences_cell_renderer_captioned_image_render(
- *						 GtkCellRenderer *
- *						 gtk_cell,
- *						 GdkWindow * window,
- *						 GtkWidget * widget,
- *						 GdkRectangle *
- *						 background_area,
- *						 GdkRectangle *
- *						 cell_area,
- *						 GdkRectangle *
- *						 expose_area,
- *						 guint flags)	
- *
- * Description
- *
- * Return value
- *   void
- */
-
-static 
-void preferences_cell_renderer_captioned_image_render(GtkCellRenderer *
-						 gtk_cell,
-						 GdkWindow * window,
-						 GtkWidget * widget,
-						 GdkRectangle *
-						 background_area,
-						 GdkRectangle *
-						 cell_area,
-						 GdkRectangle *
-						 expose_area,
-						 guint flags)
-{
-	CellRendererCaptionedImage *cell =
-	    PREFS_CELL_RENDERER_CAPTIONED_IMAGE(gtk_cell);
-	GdkRectangle text_area;
-	GdkRectangle pixbuf_area;
-	int width, height;
-
-	gtk_cell_renderer_get_size(cell->image, widget, cell_area,
-				   NULL, NULL, &width, &height);
-
-	pixbuf_area.y = cell_area->y;
-	pixbuf_area.x = cell_area->x;
-	pixbuf_area.height = height;
-	pixbuf_area.width = cell_area->width;
-
-	gtk_cell_renderer_get_size(cell->caption, widget, cell_area,
-				   NULL, NULL, &width, &height);
-
-	text_area.x = cell_area->x + (cell_area->width - width) / 2;
-	text_area.y = cell_area->y + (pixbuf_area.height + PAD);
-	text_area.height = height;
-	text_area.width = width;
-
-	gtk_cell_renderer_render(cell->image, window, widget,
-				 background_area, &pixbuf_area,
-				 expose_area, flags);
-
-	gtk_cell_renderer_render(cell->caption, window, widget,
-				 background_area, &text_area,
-				 expose_area, flags);
-}
-
-
-/******************************************************************************
- * Name
- *   preferences_cell_renderer_captioned_image_dispose
- *
- * Synopsis
- *   #include "gui/preferences_cell_renderer.h"
- *
- *   void preferences_cell_renderer_captioned_image_dispose(GObject * obj)	
- *
- * Description
- *
- * Return value
- *   void
- */
-
-static void preferences_cell_renderer_captioned_image_dispose(GObject * obj)
-{
-	//CellRendererCaptionedImage *cell =
-	//    PREFS_CELL_RENDERER_CAPTIONED_IMAGE(obj);
-
-	//g_object_unref (cell->image);
-	//g_object_unref (cell->caption);
-}
-
-
-/******************************************************************************
- * Name
- *   preferences_cell_renderer_captioned_image_instance_init
- *
- * Synopsis
- *   #include "gui/preferences_cell_renderer.h"
- *
- *   void preferences_cell_renderer_captioned_image_instance_init
- *					(CellRendererCaptionedImage * cell)	
- *
- * Description
- *
- * Return value
- *   void
- */
-
-static void preferences_cell_renderer_captioned_image_instance_init
-					(CellRendererCaptionedImage * cell)
-{
-	cell->image = gtk_cell_renderer_pixbuf_new();
-	cell->caption = gtk_cell_renderer_text_new();
-}
-
-
-/******************************************************************************
- * Name
- *   preferences_cell_renderer_captioned_image_class_init
- *
- * Synopsis
- *   #include "gui/preferences_cell_renderer.h"
- *
- *   	void preferences_cell_renderer_captioned_image_class_init
- *			(CellRendererCaptionedImageClass * class)
- *
- * Description
- *
- * Return value
- *   void
- */
-
-static void
-preferences_cell_renderer_captioned_image_class_init
-				(CellRendererCaptionedImageClass * class)
-{
-	GObjectClass *object_class = G_OBJECT_CLASS(class);
-	GtkCellRendererClass *cell_class =
-	    GTK_CELL_RENDERER_CLASS(class);
-
-	parent_class = g_type_class_peek_parent(class);
-
-	object_class->dispose =
-	    preferences_cell_renderer_captioned_image_dispose;
-
-	object_class->get_property =
-	    preferences_cell_renderer_captioned_image_get_property;
-	object_class->set_property =
-	    preferences_cell_renderer_captioned_image_set_property;
-
-	cell_class->get_size =
-	    preferences_cell_renderer_captioned_image_get_size;
-	cell_class->render =
-	    preferences_cell_renderer_captioned_image_render;
-
-	g_object_class_install_property(object_class,
-					PROP_TEXT,
-					g_param_spec_string("text",
-							    _("Text"),
-							    _
-							    ("Text to render"),
-							    NULL,
-							    G_PARAM_READWRITE));
-	g_object_class_install_property(object_class, PROP_PIXBUF,
-					g_param_spec_object("pixbuf",
-							    _
-							    ("Pixbuf Object"),
-							    _
-							    ("The pixbuf to render."),
-							    GDK_TYPE_PIXBUF,
-							    G_PARAM_READWRITE));
-}
diff --git a/src/gnome2/preferences_dialog.c b/src/gnome2/preferences_dialog.c
index 9d86e4a..f49a274 100644
--- a/src/gnome2/preferences_dialog.c
+++ b/src/gnome2/preferences_dialog.c
@@ -29,11 +29,12 @@
 #include <unistd.h>
 #include <string.h>
 
-#include <gnome.h>
+#include <gtk/gtk.h>
 #include <gtk/gtk.h>
 #include <glade/glade-xml.h>
 
 #include "gui/bibletext.h"
+#include "gui/dialog.h"
 #include "gui/xiphos.h"
 #include "gui/preferences_dialog.h"
 #include "gui/utilities.h"
@@ -45,7 +46,6 @@
 #include "gui/sidebar.h"
 #include "gui/tabbed_browser.h"
 #include "gui/widgets.h"
-#include "gui/preferences_cell_renderer.h"
 
 #include "main/sword.h"
 #include "main/lists.h"
@@ -56,61 +56,7 @@
 #include "main/xml.h"
 #include "main/url.hh"
 
-//gtk_toggle_button_set_active
-typedef enum {
-	SHOW_BIBLE_TABS,
-	SHOW_COMMENTARY_TABS,
-	SHOW_DICTIONARY_TABS,
-	SHOW_BOOK_TABS,
-	USE_DEFAULT_DICTIONARY,
-	USE_VERSE_STYLE,
-	USE_LINKED_TABS,
-	READ_ALOUD,
-	SHOW_VERSE_NUM,
-	VERSE_HIGHLIGHT,
-	DOUBLE_SPACE,
-	SHOW_SPLASH_SCREEN,
-	SHOW_BIBLE_PANE,
-	SHOW_COMMENTARY_PANE,
-	SHOW_DICTIONARY_PANE,
-	SHOW_IN_VIEWER,
-	SHOW_IN_DICTIONARY,
-	SHOW_DEVOTION,
-	USE_STUDYPAD,
-	USE_STUDYPAD_DIALOG,
-	USE_PERCOMM_DIALOG,
-	TABBED_BROWSING
-} which_check_button;
-
-typedef enum {
-	TEXT_FORGROUND,
-	TEXT_BACKGROUND,
-	TEXT_CURRENT_VERSE,
-	VERSE_NUMBERS,
-	HREF_LINKS,
-	HIGHLIGHT_FG,
-	HIGHLIGHT_BG
-} which_color_combo;
-
-
-typedef enum {
-	TEXT_MODULE,
-	PARALLEL_1_MODULE,
-	PARALLEL_2_MODULE,
-	PARALLEL_3_MODULE,
-	PARALLEL_4_MODULE,
-	PARALLEL_5_MODULE,
-	COMMENTARY_MODULE,
-	DICTIONARY_MODULE,
-	DEFAULT_DICTIONARY_MODULE,
-	PERCOMM_MODULE,
-	DEVOTION_MODULE,
-	GREEK_LEX__MODULE,
-	HEBREW_LEX__MODULE,
-	COMBO_ENTRY_SP_DIR,
-	BASE_FONT_SIZE,
-	VERSE_NUMBER_SIZE
-} which_entry;
+#include "gui/debug_glib_null.h"
 
 typedef struct _preferences_combo COMBOBOXS;
 struct _preferences_combo {
@@ -131,6 +77,7 @@ struct _preferences_combo {
 	GtkWidget *combo_entry_sp_dir;
 	GtkWidget *base_font_size;
 	GtkWidget *verse_number_size;
+	GtkWidget *special_locale;
 };
 
 typedef struct _preferences_color_pickers COLOR_PICKERS;
@@ -724,11 +671,12 @@ on_checkbutton4_toggled(GtkToggleButton *togglebutton,
  *   void
  */
 
+extern gboolean style_display;
+
 void
 on_checkbutton5_toggled(GtkToggleButton * togglebutton,
 			gpointer user_data)
 {
-	extern gboolean style_display;
 	xml_set_value("Xiphos", "misc", "versestyle",
 		      (togglebutton->active ? "1" : "0"));
 	settings.versestyle = togglebutton->active;
@@ -1653,6 +1601,67 @@ on_combobox15_changed(GtkComboBox * combobox,
 
 /******************************************************************************
  * Name
+ *   on_combobox16_changed
+ *
+ * Synopsis
+ *   #include "preferences_dialog.h"
+ *
+ *   void on_combobox16_changed(GtkEditable * editable, gpointer user_data)
+ *
+ * Description
+ *   combobox16 (special locale),
+ *   has changed - update settings
+ *
+ * Return value
+ *  void
+ */
+
+void
+on_combobox16_changed(GtkComboBox * combobox,
+		      gpointer user_data)
+{
+	gchar *buf = NULL;
+	GtkTreeIter iter;
+	GtkTreeModel *model = gtk_combo_box_get_model(combobox);
+	gboolean clear, set;
+	char **locale, brief_locale[3], *real_locale;
+
+	gtk_combo_box_get_active_iter(combobox, &iter);
+	gtk_tree_model_get(GTK_TREE_MODEL(model), &iter, 0, &buf, -1);
+	if (!buf || !strcmp(buf, _("-- Select --")))	/* see fill_combobox */
+		return;
+
+	/* get us back to an xx_YY locale name from the full name.  */
+	/* "buf" is necessarily an entry to be found in locale_set. */
+	for (locale = &locale_set[0]; *locale; ++locale) {
+		brief_locale[0] = (*locale)[0];
+		brief_locale[1] = (*locale)[1];
+		brief_locale[2] = '\0';
+		real_locale = (gpointer)main_get_language_map(brief_locale);
+		if (!strcmp(real_locale, buf)) {
+			g_free(buf);
+			buf = *locale;
+			break;
+		}
+	}
+
+	clear = !strcmp(buf, NONE);
+	set   = ((!settings.special_locale && strcmp(buf, NONE)) ||
+		 (settings.special_locale && (strcmp(settings.special_locale, buf))));
+	if (clear || set)
+		gui_generic_warning(_("Locale will take effect after restart."));
+
+	if (clear)
+		*buf = '\0';
+
+	xml_set_value("Xiphos", "locale", "special", (clear ? NONE : buf));
+	g_free(settings.special_locale);	/* dispose of old content */
+	settings.special_locale = (clear ? g_strdup(NONE) : g_strdup(buf));
+}
+
+
+/******************************************************************************
+ * Name
  *   add_columns
  *
  * Synopsis
@@ -1851,7 +1860,6 @@ setup_color_pickers(void)
                                         &color);
 	}
 
-/*
 	if (string_is_color(settings.bible_verse_num_color)) {
 		gdk_color_parse(settings.bible_verse_num_color, &color);
 		gtk_color_button_set_color(
@@ -1863,7 +1871,6 @@ setup_color_pickers(void)
 			GTK_COLOR_BUTTON(color_picker.verse_numbers),
                                         &color);
 	}
-*/
 
 	if (string_is_color(settings.link_color)) {
 		gdk_color_parse(settings.link_color, &color);
@@ -2176,7 +2183,34 @@ setup_module_comboboxes(void)
 			 G_CALLBACK(on_combobox13_changed), NULL);
 	g_signal_connect(combo.greek_lex__module, "changed",
 			 G_CALLBACK(on_combobox14_changed), NULL);
+}
+
+
+void
+setup_locale_combobox(void);
+void
+setup_locale_combobox(void)
+{
+	char **locale, brief_locale[3], *real_locale, *current_locale = NULL;
+	GList *list = g_list_append(NULL, NONE);
+
+	for (locale = &locale_set[0]; *locale; ++locale) {
+		brief_locale[0] = (*locale)[0];
+		brief_locale[1] = (*locale)[1];
+		brief_locale[2] = '\0';
+		real_locale = (gpointer)main_get_language_map(brief_locale);
+		list = g_list_append(list, real_locale);
+		if (settings.special_locale &&
+		    !strcmp(settings.special_locale, *locale))
+			current_locale = real_locale;
+	}
+	fill_combobox(list, GTK_COMBO_BOX(combo.special_locale),
+		      (current_locale ? current_locale : NONE),
+		      NULL, NULL);
+	g_list_free(list);
 
+	g_signal_connect(combo.special_locale, "changed",
+			 G_CALLBACK(on_combobox16_changed), NULL);
 }
 
 
@@ -2237,11 +2271,9 @@ create_preferences_dialog(void)
 	color_picker.text_current_verse = glade_xml_get_widget (gxml, "colorbutton3");
 	g_signal_connect(color_picker.text_current_verse, "color_set",
 			 G_CALLBACK(on_colorbutton3_color_set), NULL);
-/*
 	color_picker.verse_numbers = glade_xml_get_widget (gxml, "colorbutton4");
 	g_signal_connect(color_picker.verse_numbers, "color_set",
 			 G_CALLBACK(on_colorbutton4_color_set), NULL);
-*/
 	color_picker.href_links = glade_xml_get_widget (gxml, "colorbutton5");
 	g_signal_connect(color_picker.href_links, "color_set",
 			 G_CALLBACK(on_colorbutton5_color_set), NULL);
@@ -2311,6 +2343,10 @@ create_preferences_dialog(void)
 	combo.greek_lex__module = glade_xml_get_widget (gxml, "combobox14");
 	combo.book_module = glade_xml_get_widget (gxml, "combobox15");
 	setup_module_comboboxes();
+
+	combo.special_locale = glade_xml_get_widget (gxml, "combobox16");
+	setup_locale_combobox();
+
 	/* studypad directory chooserbutton */
 	chooser = glade_xml_get_widget (gxml, "filechooserbutton1");
 	gtk_file_chooser_set_current_folder((GtkFileChooser *)chooser,
diff --git a/src/gnome2/search_dialog.c b/src/gnome2/search_dialog.c
index b8640fd..644f4e2 100644
--- a/src/gnome2/search_dialog.c
+++ b/src/gnome2/search_dialog.c
@@ -23,11 +23,15 @@
 #include <config.h>
 #endif
  
-#include <gnome.h>
+#include <gtk/gtk.h>
 #include <glade/glade-xml.h>
 
 #ifdef USE_GTKMOZEMBED 
+#ifdef WIN32
+#include "geckowin/gecko-html.h"
+#else
 #include "gecko/gecko-html.h"
+#endif
 #else
 #include <gtkhtml/gtkhtml.h>
 #include "gui/html.h"
@@ -43,6 +47,7 @@
 #include "gui/utilities.h"
 #include "gui/widgets.h"
 #include "gtk/gtk.h"
+#include "gui/export_bookmarks.h"
 
 #include "main/search_dialog.h"
 #include "main/configs.h"
@@ -53,6 +58,8 @@
 #include "main/url.hh"
 #include "main/xml.h"
 
+#include "gui/debug_glib_null.h"
+
 /******************************************************************************/
 #define _BYTE   8
 #define _WORD   16
@@ -187,6 +194,28 @@ void button_save(GtkButton * button, gpointer user_data)
 
 /******************************************************************************
  * Name
+ *   button_export
+ *
+ * Synopsis
+ *   #include "gui/search_dialog.h"
+ *
+ *   void button_export(GtkButton * button, gpointer user_data)
+ *
+ * Description
+ *   calls main_save_current_adv_search_as_bookmarks() in main/search_dialog.cc
+ *   to do the work of saving current search as bookmarks
+ *
+ * Return value
+ *   void
+ */
+
+void button_export(GtkButton * button, gpointer user_data)
+{
+	gui_export_bookmarks_dialog(ADV_SEARCH_RESULTS_EXPORT, NULL);
+}
+
+/******************************************************************************
+ * Name
  *   on_destroy
  *
  * Synopsis
@@ -994,7 +1023,6 @@ static void _finds_verselist_selection_changed(GtkWidget * widget,
 	main_finds_verselist_selection_changed(selection, model, event->type == GDK_2BUTTON_PRESS);
 }
 
-
 /******************************************************************************
  * Name
  *   selection_range_lists_changed
@@ -1038,6 +1066,42 @@ static void selection_range_lists_changed(GtkTreeSelection * selection,
 
 /******************************************************************************
  * Name
+ *   
+ *
+ * Synopsis
+ *   #include "gui/search_dialog.h"
+ *
+ *   void (GtkTreeSelection * selection,
+ *		     					 gpointer data)
+ *
+ * Description
+ *   
+ *
+ * Return value
+ *   void
+ */
+
+static void selection_verselist_changed(GtkTreeSelection * selection,
+					  gpointer data)
+{
+	GtkTreeModel *model;
+	GtkTreeIter selected;
+
+	if (!gtk_tree_selection_get_selected
+	    (selection, NULL, &selected))
+		return;
+
+	model =
+	    gtk_tree_view_get_model(GTK_TREE_VIEW
+				    (search1.list_range_name));
+	main_finds_verselist_selection_changed(selection,
+					    model, 
+					    FALSE);
+}
+
+
+/******************************************************************************
+ * Name
  *   add_two_text_columns
  *
  * Synopsis
@@ -1145,6 +1209,7 @@ static
 void _setup_listviews2(GtkWidget * listview, GCallback callback)
 {
 	GtkListStore *model;
+	GObject *selection;
 
 	model = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_STRING);
 	gtk_tree_view_set_model(GTK_TREE_VIEW(listview),
@@ -1158,7 +1223,15 @@ void _setup_listviews2(GtkWidget * listview, GCallback callback)
 	g_signal_connect((gpointer) listview,
 				"button_release_event",
 				G_CALLBACK(callback), NULL);
-
+	selection =
+	    G_OBJECT(gtk_tree_view_get_selection
+		     (GTK_TREE_VIEW(listview)));
+	/*g_signal_connect((gpointer) listview,
+				"key_press_event",
+				G_CALLBACK(tree_key_press_cb), NULL);*/
+	g_signal_connect(selection, "changed", G_CALLBACK(selection_verselist_changed),
+			 NULL);
+	
 }
 
 
@@ -1393,7 +1466,10 @@ void _on_dialog_response(GtkDialog * dialog, gint response_id,
 {
 	switch (response_id) {
 	case GTK_RESPONSE_CLOSE:
-		gtk_widget_destroy(GTK_WIDGET(search1.mod_sel_dialog));
+		if (search1.mod_sel_dialog) {
+			gtk_widget_destroy(GTK_WIDGET(search1.mod_sel_dialog));
+			search1.mod_sel_dialog = NULL;
+		}
 		gtk_widget_destroy(GTK_WIDGET(dialog));
 		break;
 	}
@@ -1430,8 +1506,8 @@ void _create_search_dialog(void)
 	GtkWidget *toolbutton8;
 	GtkWidget *toolbutton10;
 	GtkWidget *toolbutton11;
-	GtkWidget *toolbutton12;
-	
+	GtkWidget *toolbutton12;	
+	GtkWidget *toolbutton13;
 	module_selected = NULL;
 	verse_selected = NULL;
 	_preview_on = TRUE;
@@ -1569,6 +1645,10 @@ void _create_search_dialog(void)
 	g_signal_connect(toolbutton12, "clicked",
 			 G_CALLBACK(on_toolbutton12_clicked), NULL);
 			 
+	toolbutton13 = glade_xml_get_widget(gxml, "toolbutton_export");
+	g_signal_connect(toolbutton13, "clicked",
+			 G_CALLBACK(button_export), NULL);
+	
 	search1.togglebutton_show_main =
 	    glade_xml_get_widget(gxml, "toggletoolbutton1");
 	g_signal_connect(search1.togglebutton_show_main, "toggled",
diff --git a/src/gnome2/search_sidebar.c b/src/gnome2/search_sidebar.c
index 965c035..eb372d4 100644
--- a/src/gnome2/search_sidebar.c
+++ b/src/gnome2/search_sidebar.c
@@ -23,7 +23,7 @@
 #include <config.h>
 #endif
 
-#include <gnome.h>
+#include <gtk/gtk.h>
 #include <regex.h>
 
 #include "gui/sidebar.h"
@@ -37,6 +37,8 @@
 #include "main/sword.h"
 #include "main/settings.h"
 
+#include "gui/debug_glib_null.h"
+
 
 SIDESEARCH ss;
 
@@ -44,12 +46,12 @@ GtkWidget *remember_search;	/* needed to change button in search stop */
 
 /******************************************************************************
  * Name
- *    on_search_botton_clicked
+ *    on_search_button_clicked
  *
  * Synopsis
  *   #include "shortcutbar_search.h"
  *
- *   void on_search_botton_clicked(GtkButton * button, gpointer user_data)
+ *   void on_search_button_clicked(GtkButton * button, gpointer user_data)
  *
  * Description
  *   prepare to begin search
@@ -58,7 +60,7 @@ GtkWidget *remember_search;	/* needed to change button in search stop */
  *   void
  */
 
-static void on_search_botton_clicked(GtkButton * button, gpointer user_data)
+static void on_search_button_clicked(GtkButton * button, gpointer user_data)
 {
 	if (search_active) {
 		terminate_search = TRUE;
@@ -102,6 +104,7 @@ static void on_search_botton_clicked(GtkButton * button, gpointer user_data)
 static void on_rrbUseBounds_toggled(GtkToggleButton * togglebutton,
 				    gpointer user_data)
 {
+	main_init_sidebar_search_backend();
 	if (togglebutton->active) {
 		gtk_widget_show(ss.frame5);
 	} else {
@@ -412,10 +415,10 @@ void gui_create_search_sidebar(void)
 			 G_CALLBACK(on_rrbUseBounds_toggled),
 			 NULL);
 	g_signal_connect(GTK_OBJECT(remember_search), "clicked",
-			 G_CALLBACK(on_search_botton_clicked), NULL);
+			 G_CALLBACK(on_search_button_clicked), NULL);
 			   
 	g_signal_connect(GTK_OBJECT(ss.entrySearch), "activate",
-			 G_CALLBACK(on_search_botton_clicked), NULL);
+			 G_CALLBACK(on_search_button_clicked), NULL);
 			   
 			   
 	gtk_object_set_data(GTK_OBJECT(widgets.app), "tooltips",
diff --git a/src/gnome2/session.c b/src/gnome2/session.c
deleted file mode 100644
index 5151877..0000000
--- a/src/gnome2/session.c
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
- * Xiphos Bible Study Tool
- * session.c - create and maintain a GNOME session
- *
- * based on code from gedit
- * gedit-session - Basic session management for gedit
- * Copyright (C) 2002 Ximian, Inc.
- * Authors Federico Mena-Quintero <federico@ximian.com>
- *
- * Copyright (C) 2000-2009 Xiphos Developer Team
- *
- * 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 Library 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <libgnome/gnome-config.h>
-#include <libgnomeui/gnome-client.h>
-#include "gui/session.h"
-#include "gui/xiphos.h"
-#include "main/sword.h"
-
-/* The master client  */
-static GnomeClient *master_client = NULL;
-
-/* argv[0] from main(); used as the command to restart the program */
-static const char *program_argv0 = NULL;
-
-static void 
-interaction_function (GnomeClient *client, gint key, GnomeDialogType dialog_type, gpointer shutdown)
-{
-	const gchar *prefix;
-
-	/* Save all unsaved files */
-
-/*	if (GPOINTER_TO_INT (shutdown))		
-		gedit_file_save_all ();*/
-
-	/* Save session data */
-
-	prefix = gnome_client_get_config_prefix (client);
-
-	gnome_config_push_prefix (prefix);
-
-	gnome_config_pop_prefix ();
-	gnome_config_sync ();
-
-	gnome_interaction_key_return (key, FALSE);
-}
-
-/* save_yourself handler for the master client */
-static gboolean
-client_save_yourself_cb (GnomeClient *client,
-			 gint phase,
-			 GnomeSaveStyle save_style,
-			 gboolean shutdown,
-			 GnomeInteractStyle interact_style,
-			 gboolean fast,
-			 gpointer data)
-{
-	const gchar *prefix;
-
-	char *argv[] = { "rm", "-r", NULL };
-
-	gnome_client_request_interaction (client, 
-					  GNOME_DIALOG_NORMAL, 
-					  interaction_function,
-					  GINT_TO_POINTER (shutdown));
-	
-	prefix = gnome_client_get_config_prefix (client);
-
-	/* Tell the session manager how to discard this save */
-
-	argv[2] = gnome_config_get_real_path (prefix);
-	gnome_client_set_discard_command (client, 3, argv);
-
-	/* Tell the session manager how to clone or restart this instance */
-
-	argv[0] = (char *) program_argv0;
-	argv[1] = NULL; /* "--debug-session"; */
-	
-	gnome_client_set_clone_command (client, 1 /*2*/, argv);
-	gnome_client_set_restart_command (client, 1 /*2*/, argv);
-
-	return TRUE;
-}
-
-/* die handler for the master client */
-static void
-client_die_cb (GnomeClient *client, gpointer data)
-{
-/*	if (!client->save_yourself_emitted)
-		gedit_file_close_all ();*/
-	
-	shutdown_frontend();
-	/* shutdown the sword stuff */
-	main_shutdown_backend();
-
-	gtk_main_quit ();
-}
-
-/**
- * gs_session_init:
- * 
- * Initializes session management support.  This function should be called near
- * the beginning of the program.
- **/
-void
-gs_session_init (const char *argv0)
-{
-	GS_print(("\nInitiating GNOME session handler\n\n"));
-	if (master_client)
-		return;
-
-	program_argv0 = argv0;
-
-	master_client = gnome_master_client ();
-
-	g_signal_connect (master_client, "save_yourself",
-			  G_CALLBACK (client_save_yourself_cb),
-			  NULL);
-	g_signal_connect (master_client, "die",
-			  G_CALLBACK (client_die_cb),
-			  NULL);
-}
-
-/**
- * gs_session_is_restored:
- * 
- * Returns whether this xiphos is running from a restarted session.
- * 
- * Return value: TRUE if the session manager restarted us, FALSE otherwise.
- * This should be used to determine whether to pay attention to command line
- * arguments in case the session was not restored.
- **/
-gboolean
-gs_session_is_restored (void)
-{
-	gboolean restored;
-
-	if (!master_client)
-		return FALSE;
-
-	restored = (gnome_client_get_flags (master_client) & GNOME_CLIENT_RESTORED) != 0;
-
-	return restored;
-}
diff --git a/src/gnome2/sidebar.c b/src/gnome2/sidebar.c
index a705aaa..af5e40e 100644
--- a/src/gnome2/sidebar.c
+++ b/src/gnome2/sidebar.c
@@ -23,7 +23,6 @@
 #include <config.h>
 #endif
 
-#include <gnome.h>
 #include <gtkhtml/gtkhtml.h>
 #include <glade/glade-xml.h>
 
@@ -36,6 +35,7 @@
 
 #include "gui/sidebar.h"
 #include "gui/bookmarks_treeview.h"
+#include "gui/export_bookmarks.h"
 #include "gui/utilities.h"
 #include "gui/about_modules.h"
 #include "gui/main_window.h"
@@ -50,10 +50,13 @@
 #include "gui/tabbed_browser.h"
 #include "gui/search_dialog.h"
 
-
 #ifdef USE_GTKMOZEMBED
+#ifdef WIN32
+#include "geckowin/gecko-html.h"
+#else
 #include "gecko/gecko-html.h"
 #endif
+#endif
 
 #include "main/sword.h"
 #include "main/settings.h"
@@ -65,6 +68,8 @@
 #include "main/xml.h"
 #include "main/module_dialogs.h"
 
+#include "gui/debug_glib_null.h"
+
 
 SIDEBAR sidebar;
 static GtkWidget *button_bookmarks;
@@ -74,13 +79,14 @@ static GtkWidget *button_modules;
 static gchar *buf_module;
 static gchar *buf_caption;
 GList *list_of_verses;
-
+GtkListStore *model_verselist;
+gboolean is_search_result;
 
 extern gboolean shift_key_pressed;
 
 
-static void create_menu_modules(void);
-
+static GtkWidget* create_menu_modules(void);
+void on_export_verselist_activate (GtkMenuItem * menuitem, gpointer user_data);
 
 
 /******************************************************************************
@@ -833,7 +839,8 @@ G_MODULE_EXPORT static void on_save_list_as_bookmarks_activate(GtkMenuItem * men
  *   void
  */
 
-static void on_open_in_dialog_activate(GtkMenuItem * menuitem,
+G_MODULE_EXPORT void
+on_open_in_dialog_activate(GtkMenuItem * menuitem,
 				       gpointer user_data)
 {
 	if (main_get_mod_type(buf_module) == PERCOM_TYPE)
@@ -868,7 +875,8 @@ static void on_open_in_dialog_activate(GtkMenuItem * menuitem,
  *   void
  */
 
-static void on_open_in_tab_activate(GtkMenuItem * menuitem,
+G_MODULE_EXPORT void
+on_open_in_tab_activate2(GtkMenuItem * menuitem,
 				    gpointer user_data)
 {
 	gui_open_module_in_new_tab(buf_module);
@@ -893,7 +901,8 @@ static void on_open_in_tab_activate(GtkMenuItem * menuitem,
  *   void
  */
 
-static void on_about2_activate(GtkMenuItem * menuitem,
+G_MODULE_EXPORT void
+on_about2_activate(GtkMenuItem * menuitem,
 			       gpointer user_data)
 {
 	gui_display_about_module_dialog(buf_module);
@@ -918,6 +927,12 @@ on_save_list_as_a_series_of_bookmarks_activate (GtkMenuItem * menuitem,
 }
 
 
+G_MODULE_EXPORT void
+on_export_verselist_activate (GtkMenuItem * menuitem,
+                                        gpointer user_data)
+{
+	gui_export_bookmarks_dialog((is_search_result?SEARCH_RESULTS_EXPORT:VERSE_LIST_EXPORT), list_of_verses);
+}
 
 /******************************************************************************
  * Name
@@ -957,29 +972,6 @@ GtkWidget *create_results_menu(void)
 	return menu;
 }
 
-
-static GnomeUIInfo menu_modules_uiinfo[] = {
-	{ /* 0 */
-	 GNOME_APP_UI_ITEM, N_("Open in a new tab"),
-	 N_("Open selected module in a new tab"),
-	 (gpointer) on_open_in_tab_activate, NULL, NULL,
-	 GNOME_APP_PIXMAP_FILENAME, NULL /* init'd in menu creation */,
-	 0, (GdkModifierType) 0, NULL},
-	{ /* 1 */
-	 GNOME_APP_UI_ITEM, N_("Open in a separate window"),
-	 N_("Open selected module in a separate ['dialog'] window"),
-	 (gpointer) on_open_in_dialog_activate, NULL, NULL,
-	 GNOME_APP_PIXMAP_FILENAME, NULL /* init'd in menu creation */,
-	 0, (GdkModifierType) 0, NULL},
-	{ /* 2 */
-	 GNOME_APP_UI_ITEM, N_("About"),
-	 N_("View information about the selected dialog"),
-	 (gpointer) on_about2_activate, NULL, NULL,
-	 GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_ABOUT,
-	 0, (GdkModifierType) 0, NULL},
-	GNOMEUIINFO_END
-};
-
 /******************************************************************************
  * Name
  *   create_menu_modules
@@ -995,130 +987,87 @@ static GnomeUIInfo menu_modules_uiinfo[] = {
  * Return value
  *   void
  */
-
 static
-void create_menu_modules(void)
+GtkWidget* create_menu_modules(void)
 {
-	GtkWidget *menu_modules;
+	gchar *glade_file;
+	GladeXML *gxml;
 
-	/*
-	 * this is total magic.  set up menu before using it.
-	 * indices are direct from GnomeUIInfo above.
-	 */
-	if (!menu_modules_uiinfo[0].pixmap_info)
-		menu_modules_uiinfo[0].pixmap_info =
-		    image_locator("new_tab_button.png");
-	if (!menu_modules_uiinfo[1].pixmap_info)
-		menu_modules_uiinfo[1].pixmap_info =
-		    image_locator("dlg-un.png");
-	/* end magic */
-
-	menu_modules = gtk_menu_new();
-	gnome_app_fill_menu(GTK_MENU_SHELL(menu_modules),
-			    menu_modules_uiinfo, NULL, FALSE, 0);
-	if (!settings.browsing)  
-		gtk_widget_hide (menu_modules_uiinfo[0].widget);
+	glade_file = gui_general_user_file ("xi-menus.glade", FALSE);
+	g_return_val_if_fail ((glade_file != NULL), NULL);
 	
-	gtk_menu_popup ((GtkMenu*)menu_modules, NULL, NULL, NULL, NULL, 2,
-		     			gtk_get_current_event_time());
-	// return menu_modules;
-    
+	gxml = glade_xml_new (glade_file, "menu_modules", NULL);
+		
+	g_free (glade_file);
+	g_return_val_if_fail ((gxml != NULL), NULL);
+	
+	GtkWidget *menu 	= glade_xml_get_widget (gxml, "menu_modules");
+	glade_xml_signal_autoconnect_full
+		(gxml, (GladeXMLConnectFunc)gui_glade_signal_connect_func, NULL);
+	
+	gtk_menu_popup ((GtkMenu*)menu, NULL, NULL, NULL, NULL, 2,
+			gtk_get_current_event_time());
+
+	return menu;
 }
 
 
-void
+G_MODULE_EXPORT void
 on_simple_activate(GtkMenuItem *menuitem,
 		   gpointer    user_data)
 {
 	main_prayerlist_basic_create();
 }
 
-void
+G_MODULE_EXPORT void
 on_subject_activate(GtkMenuItem *menuitem,
 		    gpointer    user_data)
 {
 	main_prayerlist_subject_create();
 }
 
-void
+G_MODULE_EXPORT void
 on_monthly_activate(GtkMenuItem *menuitem,
 		    gpointer    user_data)
 {
 	main_prayerlist_monthly_create();
 }
 
-void
+G_MODULE_EXPORT void
 on_journal_activate(GtkMenuItem *menuitem,
 		    gpointer    user_data)
 {
 	main_prayerlist_journal_create();
 }
 
-void
+G_MODULE_EXPORT void
 on_outlined_topic_activate(GtkMenuItem *menuitem,
 			   gpointer    user_data)
 {
 	main_prayerlist_outlined_topic_create();
 }
 
-static GnomeUIInfo new_prayerlist_menu_uiinfo[] =
-{
-  {
-    GNOME_APP_UI_ITEM, N_("Simple"),
-    N_("Create a new simple prayer list"),
-    (gpointer) on_simple_activate, NULL, NULL,
-    GNOME_APP_PIXMAP_STOCK, "gtk-edit",
-    0, (GdkModifierType) 0, NULL
-  },
-  {
-    GNOME_APP_UI_ITEM, N_("Subject"),
-    NULL,
-    (gpointer) on_subject_activate, NULL, NULL,
-    GNOME_APP_PIXMAP_STOCK, "gnome-stock-text-bulleted-list",
-    0, (GdkModifierType) 0, NULL
-  },
-  {
-    GNOME_APP_UI_ITEM, N_("Monthly"),
-    N_("Create a new prayer list"),
-    (gpointer) on_monthly_activate, NULL, NULL,
-    GNOME_APP_PIXMAP_STOCK, "gnome-stock-text-numbered-list",
-    0, (GdkModifierType) 0, NULL
-  },
-  {
-    GNOME_APP_UI_ITEM, N_("Daily Journal"),
-    N_("Create a new prayer list"),
-    (gpointer) on_journal_activate, NULL, NULL,
-    GNOME_APP_PIXMAP_STOCK, "gnome-stock-text-numbered-list",
-    0, (GdkModifierType) 0, NULL
-  },
-  {
-    GNOME_APP_UI_ITEM, N_("Outlined Topic"),
-    N_("Create a new prayer list"),
-    (gpointer) on_outlined_topic_activate, NULL, NULL,
-    GNOME_APP_PIXMAP_STOCK, "gnome-stock-text-numbered-list",
-    0, (GdkModifierType) 0, NULL
-  },
-  GNOMEUIINFO_END
-};
-
-static GnomeUIInfo menu_prayerlist_uiinfo[] =
-{
-  GNOMEUIINFO_MENU_NEW_SUBTREE (new_prayerlist_menu_uiinfo),
-  GNOMEUIINFO_END
-};
-
 GtkWidget *create_menu_prayerlist(void)
 {
 	GtkWidget *menu;
+	gchar *glade_file;
+	GladeXML *gxml;
 
-	menu = gtk_menu_new();
-	gnome_app_fill_menu(GTK_MENU_SHELL(menu),
-			    menu_prayerlist_uiinfo, NULL, FALSE, 0);
+	glade_file = gui_general_user_file ("xi-menus.glade", FALSE);
+	g_return_val_if_fail ((glade_file != NULL), NULL);
+	
+	gxml = glade_xml_new (glade_file, "menu_prayerlist", NULL);
+		
+	g_free (glade_file);
+	g_return_val_if_fail ((gxml != NULL), NULL);
+
+	menu = glade_xml_get_widget (gxml, "menu_prayerlist");
+	glade_xml_signal_autoconnect_full
+		(gxml, (GladeXMLConnectFunc)gui_glade_signal_connect_func, NULL);
 	return menu;
+	
 }
 
-
-
 void
 on_edit_activate(GtkMenuItem *menuitem,
 		 gpointer    user_data)
@@ -1126,47 +1075,23 @@ on_edit_activate(GtkMenuItem *menuitem,
 	editor_create_new(buf_module, NULL, BOOK_EDITOR);
 }
 
-static GnomeUIInfo menu_prayerlist_mod_uiinfo[] = {
-        { /* 0 */
-	 GNOME_APP_UI_ITEM, N_("Open in a new tab"),
-	 N_("Open selected module in a new tab"),
-	 (gpointer) on_open_in_tab_activate, NULL, NULL,
-	 GNOME_APP_PIXMAP_FILENAME, NULL /* init'd in menu creation */,
-	 0, (GdkModifierType) 0, NULL},
-	{ /* 1 */
-	 GNOME_APP_UI_ITEM, N_("Open in editor"),
-	 N_("Open selected module in a dialog"),
-	 (gpointer) on_open_in_dialog_activate, NULL, NULL,
-	 GNOME_APP_PIXMAP_FILENAME, NULL /* init'd in menu creation */,
-	 0, (GdkModifierType) 0, NULL},
-	{ /* 2 */
-	 GNOME_APP_UI_ITEM, N_("About"),
-	 N_("View information about the selected dialog"),
-	 (gpointer) on_about2_activate, NULL, NULL,
-	 GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_ABOUT,
-	 0, (GdkModifierType) 0, NULL},
-	GNOMEUIINFO_END
-};
-
 GtkWidget *create_menu_prayerlist_mod(void)
 {
 	GtkWidget *menu;
+	gchar *glade_file;
+	GladeXML *gxml;
 
-	/*
-	 * this is total magic.  set up menu before using it.
-	 * indices are direct from GnomeUIInfo above.
-	 */
-	if (!menu_prayerlist_mod_uiinfo[0].pixmap_info)
-		menu_prayerlist_mod_uiinfo[0].pixmap_info =
-		    image_locator("new_tab_button.png");
-	if (!menu_prayerlist_mod_uiinfo[1].pixmap_info)
-		menu_prayerlist_mod_uiinfo[1].pixmap_info =
-		    image_locator("silk-edit-bookmarks.png");
-	/* end magic */
-
-	menu = gtk_menu_new();
-	gnome_app_fill_menu(GTK_MENU_SHELL(menu),
-			    menu_prayerlist_mod_uiinfo, NULL, FALSE, 0);
+	glade_file = gui_general_user_file ("xi-menus.glade", FALSE);
+	g_return_val_if_fail ((glade_file != NULL), NULL);
+	
+	gxml = glade_xml_new (glade_file, "menu_prayerlist_mod", NULL);
+		
+	g_free (glade_file);
+	g_return_val_if_fail ((gxml != NULL), NULL);
+
+	menu = glade_xml_get_widget (gxml, "menu_prayerlist_mod");
+	glade_xml_signal_autoconnect_full
+		(gxml, (GladeXMLConnectFunc)gui_glade_signal_connect_func, NULL);
 	return menu;
 }
 
@@ -1261,7 +1186,6 @@ static gboolean tree_key_press_cb(GtkWidget * widget,
 static void create_search_results_page(GtkWidget * notebook)
 {
 	GtkWidget *scrolledwindow3;
-	GtkListStore *model;
 	GtkTreeSelection *selection;
 	sidebar.menu_item_save_search = create_results_menu();
 
@@ -1275,9 +1199,9 @@ static void create_search_results_page(GtkWidget * notebook)
 					    settings.shadow_type);
 
 	/* create list model */
-	model = gtk_list_store_new(1, G_TYPE_STRING);
+	model_verselist = gtk_list_store_new(1, G_TYPE_STRING);
 
-	sidebar.results_list = gtk_tree_view_new_with_model(GTK_TREE_MODEL(model));
+	sidebar.results_list = gtk_tree_view_new_with_model(GTK_TREE_MODEL(model_verselist));
 	gtk_widget_show(sidebar.results_list);
 	gtk_container_add(GTK_CONTAINER(scrolledwindow3), sidebar.results_list);
 	gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(sidebar.results_list), TRUE);
@@ -1287,9 +1211,7 @@ static void create_search_results_page(GtkWidget * notebook)
 
 	selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(sidebar.results_list));
 
-	//gnome_popup_menu_attach(menu, sidebar.results_list, NULL);
-	//gnome_app_install_menu_hints(GNOME_APP(widgets.app), results_menu_uiinfo);
-	//gtk_menu_attach_to_widget ((GtkMenu*)menu, sidebar.results_list,NULL);	
+		
 	g_signal_connect((gpointer) sidebar.results_list,
 			 "key_press_event",
 			 G_CALLBACK(tree_key_press_cb), NULL);
@@ -1366,6 +1288,7 @@ void gui_show_previewer_in_sidebar(gint choice)
 				       settings.biblepane_hight);
 	}
 	main_set_previewer_widget(choice);
+	main_init_previewer();
 }
 
 
@@ -1393,6 +1316,7 @@ GtkWidget *gui_create_sidebar(GtkWidget * paned)
 	GtkWidget *title_label = NULL;
 #ifdef USE_GTKMOZEMBED
 	GtkWidget *frame;
+	GtkWidget *eventbox;
 #else
 	GtkWidget *scrolledwindow;
 #endif
@@ -1409,6 +1333,7 @@ GtkWidget *gui_create_sidebar(GtkWidget * paned)
 	widgets.box_side_preview = gtk_vbox_new(FALSE, 0);	
 	gtk_paned_pack2 (GTK_PANED (widgets.paned_sidebar), 
 			widgets.box_side_preview, FALSE, TRUE);
+	gtk_container_set_border_width(GTK_CONTAINER(widgets.box_side_preview), 2);
 	g_signal_connect (GTK_OBJECT (widgets.paned_sidebar),
 			"button_release_event",
 			G_CALLBACK (paned_button_release_event),
@@ -1422,9 +1347,14 @@ GtkWidget *gui_create_sidebar(GtkWidget * paned)
 	gtk_box_pack_start(GTK_BOX(widgets.box_side_preview), frame, 
 				TRUE, TRUE,
 			   	0);
-	//widgets.html_previewer
+
+	
+	eventbox = gtk_event_box_new();
+	gtk_widget_show(eventbox);
+	gtk_container_add(GTK_CONTAINER(frame), eventbox);
+	
 	sidebar.html_viewer_widget = GTK_WIDGET(gecko_html_new(NULL, FALSE, SB_VIEWER_TYPE));//embed_new(VIEWER_TYPE);
-	gtk_container_add(GTK_CONTAINER(frame), sidebar.html_viewer_widget);
+	gtk_container_add(GTK_CONTAINER(eventbox), sidebar.html_viewer_widget);
 #else
 	scrolledwindow = gtk_scrolled_window_new(NULL, NULL);
 	gtk_widget_show(scrolledwindow);
diff --git a/src/gnome2/sidebar_dialog.c b/src/gnome2/sidebar_dialog.c
index 8c9f143..f044ebd 100644
--- a/src/gnome2/sidebar_dialog.c
+++ b/src/gnome2/sidebar_dialog.c
@@ -23,8 +23,9 @@
 #  include <config.h>
 #endif
 
-#include <gnome.h>
+#include <gtk/gtk.h>
 #include <gtkhtml/gtkhtml.h>
+#include <glib/gi18n.h>
 
 #include "gui/sidebar.h"
 #include "gui/sidebar_dialog.h"
@@ -34,6 +35,8 @@
 
 #include "main/settings.h"
 
+#include "gui/debug_glib_null.h"
+
 static GtkWidget* create_sidebar_dialog(void);
 static GtkWidget * vbox_dock; 
 
diff --git a/src/gnome2/splash.c b/src/gnome2/splash.c
index 4a5a2ab..a5ab711 100644
--- a/src/gnome2/splash.c
+++ b/src/gnome2/splash.c
@@ -25,27 +25,26 @@
 #include <config.h>
 #endif
 
-#include <gnome.h>
 #include <gtk/gtk.h>
 #include <gtk/gtkwindow.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
-
-#include "main/settings.h"
 #include "main/sword.h"
+#include "main/settings.h"
 #include "gui/splash.h"
-#include "gui/xiphos.h"
 #include "gui/utilities.h"
-#include "gui/widgets.h"
 
 /*****************************************************************************/
 /* FIXME: clean up below */
 
 #define E_TYPE_SPLASH			(e_splash_get_type ())
-#define E_SPLASH(obj)			(GTK_CHECK_CAST ((obj), E_TYPE_SPLASH, ESplash))
-#define E_SPLASH_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_TYPE_SPLASH, ESplashClass))
-#define E_IS_SPLASH(obj)			(GTK_CHECK_TYPE ((obj), E_TYPE_SPLASH))
-#define E_IS_SPLASH_CLASS(klass)		(GTK_CHECK_CLASS_TYPE ((obj), E_TYPE_SPLASH))
+#define E_SPLASH(obj)			(GTK_CHECK_CAST ((obj), \
+                                              E_TYPE_SPLASH, ESplash))
+#define E_SPLASH_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), \
+                                              E_TYPE_SPLASH, ESplashClass))
+#define E_IS_SPLASH(obj)		(GTK_CHECK_TYPE ((obj), E_TYPE_SPLASH))
+#define E_IS_SPLASH_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), \
+					      E_TYPE_SPLASH))
 
 typedef struct _ESplash ESplash;
 typedef struct _ESplashPrivate ESplashPrivate;
@@ -61,13 +60,15 @@ struct _ESplashClass {
 	GtkWindowClass parent_class;
 };
 
-GtkType e_splash_get_type(void);
-void e_splash_construct(ESplash * splash, GdkPixbuf * splash_image);
-GtkWidget *e_splash_new(void);
+GtkType    e_splash_get_type            (void);
+void       e_splash_construct           (ESplash * splash,
+					 GdkPixbuf * splash_image);
+GtkWidget *e_splash_new                 (void);
 
-int e_splash_add_icon(ESplash * splash, GdkPixbuf * icon);
-void e_splash_set_icon_highlight(ESplash * splash,
-				 int num, gboolean highlight);
+int        e_splash_add_icon            (ESplash * splash,
+					 GdkPixbuf * icon);
+void       e_splash_set_icon_highlight  (ESplash * splash,
+					 int num, gboolean highlight);
 
 #define PARENT_TYPE gtk_window_get_type ()
 static GtkWindowClass *parent_class = NULL;
@@ -75,12 +76,14 @@ static GtkWindowClass *parent_class = NULL;
 struct _Icon {
 	GdkPixbuf *dark_pixbuf;
 	GdkPixbuf *light_pixbuf;
-	GnomeCanvasItem *canvas_item;
+	double x;
+	double y;
+	gboolean light;
 };
 typedef struct _Icon Icon;
 
 struct _ESplashPrivate {
-	GnomeCanvas *canvas;
+	GtkDrawingArea *canvas;
 	GdkPixbuf *splash_image_pixbuf;
 	GtkProgressBar *progressbar;
 	GList *icons;		/* (Icon *) */
@@ -131,7 +134,6 @@ static GdkPixbuf *create_darkened_pixbuf(GdkPixbuf * pixbuf)
 static Icon *icon_new(ESplash * splash, GdkPixbuf * image_pixbuf)
 {
 	ESplashPrivate *priv;
-	GnomeCanvasGroup *canvas_root_group;
 	Icon *icon;
 
 	priv = splash->priv;
@@ -150,18 +152,7 @@ static Icon *icon_new(ESplash * splash, GdkPixbuf * image_pixbuf)
 			 GDK_INTERP_HYPER);
 
 	icon->dark_pixbuf = create_darkened_pixbuf(icon->light_pixbuf);
-
-	/* Set up the canvas item to point to the dark pixbuf initially.  */
-
-	canvas_root_group =
-	    GNOME_CANVAS_GROUP(GNOME_CANVAS(priv->canvas)->root);
-
-	icon->canvas_item = gnome_canvas_item_new(canvas_root_group,
-						  GNOME_TYPE_CANVAS_PIXBUF,
-						  "pixbuf",
-						  icon->dark_pixbuf,
-						  NULL);
-
+	
 	return icon;
 }
 
@@ -169,7 +160,6 @@ static void icon_free(Icon * icon)
 {
 	gdk_pixbuf_unref(icon->dark_pixbuf);
 	gdk_pixbuf_unref(icon->light_pixbuf);
-/*  	gtk_object_unref (GTK_OBJECT (icon->canvas_item)); */
 
 	g_free(icon);
 }
@@ -191,15 +181,14 @@ static void layout_icons(ESplash * splash)
 
 	x = (x_step - ICON_SIZE) / 2.0;
 	y = ICON_Y;
-
+	
+	/* for all icons, determine their x,y locations
+	   and store them in the icon struct */
 	for (p = priv->icons; p != NULL; p = p->next) {
 		Icon *icon;
-
 		icon = (Icon *) p->data;
-
-		gtk_object_set(GTK_OBJECT(icon->canvas_item),
-			       "x", (double) x,
-			       "y", (double) ICON_Y, NULL);
+		icon->x = x;
+		icon->y = y;
 
 		x += x_step;
 	}
@@ -229,7 +218,7 @@ static void schedule_relayout(ESplash * splash)
 	if (priv->layout_idle_id != 0)
 		return;
 
-	priv->layout_idle_id = gtk_idle_add(layout_idle_cb, splash);
+	layout_idle_cb (splash);
 }
 
 /* GtkObject methods.  */
@@ -297,6 +286,55 @@ button_press_event(GtkWidget * widget, GdkEventButton * event,
 }
 
 /**
+ * expose_event_callback
+ * @widget: The canvas #GtkWidget 
+ * @event: #GdkEventExpose
+ * @data: #gpointer which holds the ESplashPrivate struct
+ * 
+ * this function is called every time the splash screen is redrawn
+ * it draws the main image and each icon every time
+ **/
+
+gboolean
+expose_event_callback (GtkWidget *widget, GdkEventExpose *event, gpointer data)
+{
+	ESplashPrivate *priv = (ESplashPrivate *) data;
+	GtkWidget *canvas = widget;
+	GList *p;
+
+	/* draws main image */
+	gdk_draw_pixbuf(canvas->window,
+			canvas->style->fg_gc[GTK_WIDGET_STATE(canvas)],
+			GDK_PIXBUF(priv->splash_image_pixbuf),
+			0, 0, 0, 0,
+			gdk_pixbuf_get_width(priv->splash_image_pixbuf),
+			gdk_pixbuf_get_height(priv->splash_image_pixbuf),
+			GDK_RGB_DITHER_MAX,
+			0, 0);
+
+	/* draws each of the small icons */
+	for (p = priv->icons; p != NULL; p = p->next) {
+		Icon *icon;
+
+		icon = (Icon *) p->data;
+
+		gdk_draw_pixbuf(canvas->window,
+				canvas->style->fg_gc[GTK_WIDGET_STATE(canvas)],
+				GDK_PIXBUF(icon->light ?
+					   icon->light_pixbuf : icon->dark_pixbuf),
+				0, 0,
+				icon->x,
+				icon->y,
+				gdk_pixbuf_get_width(icon->light_pixbuf),
+				gdk_pixbuf_get_height(icon->light_pixbuf),
+				GDK_RGB_DITHER_MAX,
+				0, 0);
+	}
+	return TRUE;
+}
+
+
+/**
  * e_splash_construct:
  * @splash: A pointer to an ESplash widget
  * @splash_image_pixbuf: The pixbuf for the image to appear in the splash dialog
@@ -318,20 +356,21 @@ e_splash_construct(ESplash * splash, GdkPixbuf * splash_image_pixbuf)
 
 	priv->splash_image_pixbuf = gdk_pixbuf_ref(splash_image_pixbuf);
 
-	canvas = gnome_canvas_new_aa();
-	priv->canvas = GNOME_CANVAS(canvas);
-
+	canvas = gtk_drawing_area_new();
+	priv->canvas = GTK_DRAWING_AREA(canvas);
+	
 	image_width = gdk_pixbuf_get_width(splash_image_pixbuf);
 	image_height = gdk_pixbuf_get_height(splash_image_pixbuf);
 
 	gtk_widget_set_size_request(canvas, image_width, image_height);
-	gnome_canvas_set_scroll_region(GNOME_CANVAS(canvas), 0, 0,
-				       image_width, image_height);
+
+	g_signal_connect (G_OBJECT (canvas), "expose_event",
+			  G_CALLBACK (expose_event_callback), priv);
+	
 	gtk_widget_show(canvas);
 
 	frame = gtk_frame_new(NULL);
 	gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_OUT);
-	//gtk_container_add(GTK_CONTAINER(frame), canvas);
 	gtk_widget_show(frame);
 
 	gtk_container_add(GTK_CONTAINER(splash), frame);
@@ -346,18 +385,12 @@ e_splash_construct(ESplash * splash, GdkPixbuf * splash_image_pixbuf)
 	gtk_widget_show(GTK_WIDGET(priv->progressbar));
 	gtk_box_pack_start((GtkBox *)vbox, GTK_WIDGET(priv->progressbar),FALSE,TRUE,0);	
 	
-	
-	gnome_canvas_item_new(GNOME_CANVAS_GROUP(priv->canvas->root),
-			      GNOME_TYPE_CANVAS_PIXBUF,
-			      "pixbuf", splash_image_pixbuf, NULL);
-
 	g_signal_connect(GTK_OBJECT(splash), "button-press-event",
 			 G_CALLBACK(button_press_event), splash);
 
 	gtk_window_set_decorated(GTK_WINDOW(splash), FALSE);
 	gtk_window_set_position(GTK_WINDOW(splash), GTK_WIN_POS_CENTER); 
 	gtk_window_set_resizable(GTK_WINDOW(splash), FALSE);
-	//gtk_window_set_policy(GTK_WINDOW(splash), FALSE, FALSE, FALSE);
 	gtk_window_set_default_size(GTK_WINDOW(splash), image_width,
 				    image_height+20);
 	gtk_window_set_title(GTK_WINDOW(splash), _("Powered by the SWORD Project"));
@@ -376,7 +409,7 @@ GtkWidget *e_splash_new(void)
 	GError *error = NULL;
 	GdkPixbuf *splash_image_pixbuf;
 
-	splash_image_pixbuf = pixbuf_finder("splash.png", &error);
+	splash_image_pixbuf = pixbuf_finder("splash.png", 0, &error);
 	if (!splash_image_pixbuf) {
 		GS_warning(("pixmap file error: %s\n",
 			    error->message));
@@ -421,6 +454,9 @@ int e_splash_add_icon(ESplash * splash, GdkPixbuf * icon_pixbuf)
 	priv = splash->priv;
 
 	icon = icon_new(splash, icon_pixbuf);
+	icon->light = FALSE;
+	icon->x = 0;
+	icon->y = ICON_Y;
 
 	GtkTextDirection dir = gtk_widget_get_direction(GTK_WIDGET (splash));
 	
@@ -450,6 +486,8 @@ e_splash_set_icon_highlight(ESplash * splash,
 {
 	ESplashPrivate *priv;
 	Icon *icon;
+	GtkWidget *canvas;
+	GdkRectangle rectangle;
 
 	g_return_if_fail(splash != NULL);
 	g_return_if_fail(E_IS_SPLASH(splash));
@@ -466,10 +504,16 @@ e_splash_set_icon_highlight(ESplash * splash,
 	else
 		icon = (Icon *) g_list_nth(priv->icons, priv->num_icons - num -1)->data;
 
-	gtk_object_set(GTK_OBJECT(icon->canvas_item),
-		       "pixbuf",
-		       highlight ? icon->light_pixbuf : icon->
-		       dark_pixbuf, NULL);
+	icon->light = TRUE;
+
+	rectangle.x = icon->x;
+	rectangle.y = icon->y;
+	rectangle.width = gdk_pixbuf_get_width(icon->light_pixbuf);
+	rectangle.height = gdk_pixbuf_get_height(icon->light_pixbuf);
+
+	canvas = GTK_WIDGET(priv->canvas);
+	gdk_window_invalidate_rect(canvas->window, &rectangle, TRUE);
+	gdk_window_process_updates(canvas->window, TRUE);
 }
 
 E_MAKE_TYPE(e_splash, "ESplash", ESplash, class_init, init, PARENT_TYPE)
@@ -489,6 +533,7 @@ void gui_splash_init()
 			return;
 
 		gtk_widget_show(splash);
+		set_window_icon(GTK_WINDOW(splash));
 		gtk_object_ref(GTK_OBJECT(splash));
 		
 		
@@ -502,7 +547,7 @@ void gui_splash_init()
 		
 		while (icons != NULL)
 		{
-			icon_pixbuf = pixbuf_finder(icons->data, &error);
+			icon_pixbuf = pixbuf_finder(icons->data, 0, &error);
 			if (!icon_pixbuf) {
 				GS_warning(("pixmap file error: %s\n",
 					    error->message));
@@ -520,6 +565,10 @@ void gui_splash_init()
 
 		g_list_free(icons);
 	}
+	while (gtk_events_pending()) {
+			gtk_main_iteration();
+		}
+
 }
 
 
@@ -541,7 +590,7 @@ void gui_splash_step(gchar *text, gdouble progress, gint step)
 	}
 }
 
-void gui_splash_done()
+gboolean gui_splash_done()
 {
 	if (settings.showsplash) {
 
@@ -551,4 +600,5 @@ void gui_splash_done()
 		gtk_widget_unref(splash);
 		gtk_widget_destroy(splash);
 	}
+	return FALSE;
 }
diff --git a/src/gnome2/tabbed_browser.c b/src/gnome2/tabbed_browser.c
index 1d12959..397aaf9 100644
--- a/src/gnome2/tabbed_browser.c
+++ b/src/gnome2/tabbed_browser.c
@@ -23,7 +23,10 @@
 #include <config.h>
 #endif
 
-#include <gnome.h>
+#include <unistd.h>
+#include <gtk/gtk.h>
+#include <glib.h>
+#include <glib/gstdio.h>
 #include <libxml/tree.h>
 #include <libxml/parser.h>
 
@@ -60,6 +63,8 @@
 #include "main/xml.h"
 
 #include <glib/gstdio.h>
+
+#include "gui/debug_glib_null.h"
 	
 static GtkWidget* tab_widget_new(PASSAGE_TAB_INFO *tbinf,
 					const gchar *label_text);
@@ -75,6 +80,7 @@ GList *passage_list;
  * externs
  */
 
+extern gboolean sync_on;
 //extern gboolean gsI_isrunning;
 PASSAGE_TAB_INFO *cur_passage_tab;
 
@@ -257,7 +263,7 @@ pick_tab_label(PASSAGE_TAB_INFO *pt)
 		return str;
 	}
 	
-	if (pt->showtexts || pt->comm_showing) {
+	if (pt->showtexts || (pt->showcomms && pt->comm_showing)) {
 		g_string_printf(str, "%s: %s",
 				(pt->showtexts
 				 ? pt->text_mod
@@ -357,8 +363,8 @@ void gui_save_tabs(const gchar *filename)
 	
 	tabs_dir = g_strdup_printf("%s/tabs/",settings.gSwordDir);
 	
-	if (access(tabs_dir, F_OK) == -1) {
-		if ((Mkdir(tabs_dir, S_IRWXU)) == -1) {
+	if (g_access(tabs_dir, F_OK) == -1) {
+		if ((g_mkdir(tabs_dir, S_IRWXU)) == -1) {
 			gui_generic_warning("Can't create tabs dir.");
 			return;
 		}
@@ -452,8 +458,8 @@ void _save_off_tab (const gchar * filename)
 	
 	tabs_dir = g_strdup_printf("%s/tabs/",settings.gSwordDir);
 	
-	if (access(tabs_dir, F_OK) == -1) {
-		if ((Mkdir(tabs_dir, S_IRWXU)) == -1) {
+	if (g_access(tabs_dir, F_OK) == -1) {
+		if ((g_mkdir(tabs_dir, S_IRWXU)) == -1) {
 			gui_generic_warning("Can't create tabs dir.");
 			return;
 		}
@@ -544,7 +550,7 @@ void gui_load_tabs(const gchar *filename)
 	else
 	{
 		tabs_dir = g_strdup_printf("%s/tabs/",settings.gSwordDir);
-		if (access(tabs_dir, F_OK) == -1) {
+		if (g_access(tabs_dir, F_OK) == -1) {
 			GS_message(("Creating new tabs directory\n"));
 			gui_save_tabs (filename);
 			//return;
@@ -553,7 +559,7 @@ void gui_load_tabs(const gchar *filename)
 		g_free(tabs_dir);
 		
 	    	/* we need this for first time non tabbed browsing */
-	    	if (!settings.browsing && access(file, F_OK) == -1) {
+	    	if (!settings.browsing && g_access(file, F_OK) == -1) {
 			_save_off_tab (filename);
 		}
 
@@ -629,6 +635,7 @@ void gui_load_tabs(const gchar *filename)
 								gtk_widget_hide(pt->paratab);
 								gui_parallel_tab_sync((gchar*)settings.currentverse);
 								settings.showparatab = TRUE;
+								sync_on = TRUE;
 							}
 							else
 								pt->paratab = NULL;
@@ -1035,7 +1042,8 @@ void gui_update_tab_struct(const gchar * text_mod,
 	
 	if(page_change)
 		return;
-
+	if (!cur_passage_tab)
+		return;
 	cur_passage_tab->showtexts   = showtexts;
 	cur_passage_tab->showpreview = showpreview;
 	cur_passage_tab->showcomms   = showcomms;
@@ -1397,10 +1405,14 @@ void gui_close_passage_tab(gint pagenum)
 		return;
 	PASSAGE_TAB_INFO *pt = (PASSAGE_TAB_INFO*)g_list_nth_data(passage_list, (guint)pagenum);
 	if (pt->showparallel || (2 <= gtk_notebook_get_n_pages(GTK_NOTEBOOK(widgets.notebook_main)))) {
-		if (pagenum > 0)
-			gtk_notebook_set_current_page (GTK_NOTEBOOK (
-			                               widgets.notebook_main),
-                                                       0);
+		// (surely this is always true!?)
+
+		if (pagenum > 0){
+			gtk_notebook_set_current_page(
+				GTK_NOTEBOOK(widgets.notebook_main), 0);
+			cur_passage_tab = (PASSAGE_TAB_INFO*)		
+				g_list_nth_data(passage_list, (guint)0);
+		}
 	}
 	
 	stop_refresh = TRUE;
@@ -1427,7 +1439,6 @@ void gui_close_passage_tab(gint pagenum)
 	g_free(pt);
 	//cur_passage_tab = NULL;
 	removed_page = pagenum;
-	cur_passage_tab = (PASSAGE_TAB_INFO*)g_list_nth_data(passage_list, (guint)pagenum);
 	gtk_notebook_remove_page(GTK_NOTEBOOK(widgets.notebook_main), pagenum);
 }
 
diff --git a/src/gnome2/treekey-editor.c b/src/gnome2/treekey-editor.c
index 2f06fa4..e643f27 100644
--- a/src/gnome2/treekey-editor.c
+++ b/src/gnome2/treekey-editor.c
@@ -24,7 +24,7 @@
 #include <config.h>
 #endif
 
-#include <gnome.h>
+#include <glade/glade-xml.h>
 
 #ifdef USE_GTKHTML3_14_23
 #include "editor/slib-editor.h"
@@ -34,12 +34,18 @@
 
 #include "gui/treekey-editor.h"
 #include "gui/dialog.h"
+#include "gui/utilities.h"
 
 #include "main/sidebar.h"
 #include "main/sword_treekey.h"
 #include "main/sword.h"
 
+#include "gui/debug_glib_null.h"
 
+void on_add_sibling_activate (GtkMenuItem * menuitem, gpointer user_data);
+void on_add_child_activate (GtkMenuItem * menuitem, gpointer user_data);
+void on_remove_activate (GtkMenuItem * menuitem, gpointer user_data);
+void on_edit_activate2 (GtkMenuItem * menuitem, gpointer user_data);
 
 typedef struct _item_info INFO;
 struct _item_info
@@ -52,6 +58,7 @@ struct _item_info
 	GtkTreeModel *model;
 };
 
+INFO *_get_info (GtkWidget * tree);
 
 enum {
 	COL_OPEN_PIXBUF,
@@ -111,7 +118,7 @@ static void _button_one(EDITOR * e)
 	g_free(info);	
 }
 
-static void
+G_MODULE_EXPORT void
 on_add_sibling_activate (GtkMenuItem * menuitem, gpointer user_data)
 {	
 	INFO *info;
@@ -170,7 +177,7 @@ on_add_sibling_activate (GtkMenuItem * menuitem, gpointer user_data)
 
 
 
-static void
+G_MODULE_EXPORT void
 on_add_child_activate (GtkMenuItem * menuitem, gpointer user_data)
 {	
 	INFO *info;
@@ -233,7 +240,7 @@ on_add_child_activate (GtkMenuItem * menuitem, gpointer user_data)
 }
 
 
-static void
+G_MODULE_EXPORT void
 on_remove_activate (GtkMenuItem * menuitem, gpointer user_data)
 {
 	INFO *info;
@@ -259,8 +266,8 @@ on_remove_activate (GtkMenuItem * menuitem, gpointer user_data)
 }
 
 
-static void
-on_edit_activate (GtkMenuItem * menuitem, gpointer user_data)
+G_MODULE_EXPORT void
+on_edit_activate2 (GtkMenuItem * menuitem, gpointer user_data)
 {
 	INFO *info;
 	EDITOR * editor = (EDITOR*) user_data;
@@ -298,51 +305,27 @@ on_edit_activate (GtkMenuItem * menuitem, gpointer user_data)
 	g_free (d);
 }
 
-
-static GnomeUIInfo edit_tree_menu_uiinfo[] = {
-	{
-	 GNOME_APP_UI_ITEM, N_("Add Child"),
-	 N_("Add an item"),
-	 (gpointer) on_add_child_activate, NULL, NULL,
-	 GNOME_APP_PIXMAP_STOCK, "gtk-add",
-	 0, (GdkModifierType) 0, NULL},
-	{
-	 GNOME_APP_UI_ITEM, N_("Add Sibling"),
-	 N_("Add an item"),
-	 (gpointer) on_add_sibling_activate, NULL, NULL,
-	 GNOME_APP_PIXMAP_STOCK, "gtk-add",
-	 0, (GdkModifierType) 0, NULL},
-	{
-	 GNOME_APP_UI_ITEM, N_("Remove"),
-	 N_("Remove this item"),
-	 (gpointer) on_remove_activate, NULL, NULL,
-	 GNOME_APP_PIXMAP_STOCK, "gtk-remove",
-	 0, (GdkModifierType) 0, NULL},
-	{
-	 GNOME_APP_UI_ITEM, N_("Edit"),
-	 N_("Edit this item"),
-	 (gpointer) on_edit_activate, NULL, NULL,
-	 GNOME_APP_PIXMAP_STOCK, "gtk-edit",
-	 0, (GdkModifierType) 0, NULL},
-	GNOMEUIINFO_END
-};
-
 GtkWidget *
 create_edit_tree_menu (EDITOR * editor)
 {
-	GtkWidget *edit_tree_menu;
-	GtkAccelGroup *accel_group;
-
-	accel_group = gtk_accel_group_new ();
-
-	edit_tree_menu = gtk_menu_new ();
-	gnome_app_fill_menu_with_data (GTK_MENU_SHELL (edit_tree_menu),
-				       edit_tree_menu_uiinfo,
-				       accel_group, FALSE, 0, editor);
-	// gnome_app_fill_menu (GTK_MENU_SHELL (edit_tree_menu), edit_tree_menu_uiinfo, accel_group, FALSE, 0);
-	gtk_menu_set_accel_group (GTK_MENU (edit_tree_menu), accel_group);
-
-	return edit_tree_menu;
+	GtkWidget *menu;
+	gchar *glade_file;
+	GladeXML *gxml;
+	
+	glade_file = gui_general_user_file ("xi-menus.glade", FALSE);
+	g_return_val_if_fail ((glade_file != NULL), NULL);
+	
+	gxml = glade_xml_new (glade_file, "menu_edit_tree", NULL);
+		
+	g_free (glade_file);
+	g_return_val_if_fail ((gxml != NULL), NULL);
+	
+	menu = glade_xml_get_widget (gxml, "menu_edit_tree");
+    	/* connect signals and data */
+	glade_xml_signal_autoconnect_full
+		(gxml, (GladeXMLConnectFunc)gui_glade_signal_connect_func, editor);
+	
+	return menu;
 }
 
 static gboolean on_button_release(GtkWidget *widget,
diff --git a/src/gnome2/utilities.c b/src/gnome2/utilities.c
index 8e131fa..4a6ce16 100644
--- a/src/gnome2/utilities.c
+++ b/src/gnome2/utilities.c
@@ -29,7 +29,11 @@
 #include <string.h>
 #include <assert.h>
 
+#ifndef WITHOUT_GNOME
 #include <gnome.h>
+#else
+#include <gtk/gtk.h>
+#endif
 
 #include "gui/utilities.h"
 #include "gui/preferences_dialog.h"
@@ -44,14 +48,95 @@
 #include "main/configs.h"
 #include "main/sword.h"
 #include "main/url.hh"
+#include "main/xml.h"
+
+#ifdef WIN32
+#undef DATADIR
+#include <windows.h>
+#include <shellapi.h>
+#endif /* WIN32 */
 
 #ifdef USE_GTKMOZEMBED
+#ifdef WIN32
+#include "geckowin/gecko-html.h"
+#else
 #include "gecko/gecko-html.h"
+#endif /* WIN32 */
 #else
 #include <gtkhtml/gtkhtml.h>
 #include <gtkhtml/htmltypes.h>
 #endif /* USE_GTKMOZEMBED */
 
+#include <gsf/gsf-utils.h>
+#include <gsf/gsf-outfile-zip.h>
+#include <gsf/gsf-output-stdio.h>
+#include <gsf/gsf-output.h>
+#include <gsf/gsf-input.h>
+#include <gsf/gsf-outfile.h>
+#include <gsf/gsf-input-stdio.h>
+
+#include "gui/debug_glib_null.h"
+
+
+/******************************************************************************
+ * Name
+ *  utilities_parse_treeview
+ *
+ * Synopsis
+ *   #include "gui/bookmarks_menu.h"
+ *
+ *   void utilities_parse_treeview(xmlNodePtr parent, GtkTreeIter * tree_parent)	
+ *
+ * Description
+ *    
+ *
+ * Return value
+ *   void
+ */
+
+void utilities_parse_treeview(xmlNodePtr parent, GtkTreeIter * tree_parent, GtkTreeModel *model)
+{
+	static xmlNodePtr cur_node;
+	GtkTreeIter child;
+	gchar *caption = NULL;
+	gchar *key = NULL;
+	gchar *module = NULL;
+	gchar *mod_desc = NULL;
+	gchar *description = NULL;
+	
+	gtk_tree_model_iter_children(GTK_TREE_MODEL(model), &child,
+                                             tree_parent);
+	
+	do {
+		gtk_tree_model_get(GTK_TREE_MODEL(model), &child,
+			   		2, &caption, 
+					3, &key, 
+					4, &module, 
+					5, &mod_desc, 
+					6, &description,
+					-1);
+		if(gtk_tree_model_iter_has_child(GTK_TREE_MODEL(model), 
+							&child)) {
+			cur_node = xml_add_folder_to_parent(parent, 
+							caption);
+			utilities_parse_treeview(cur_node, &child, model);
+						     
+		}
+		else 
+			xml_add_bookmark_to_parent(parent, 
+						description,
+						key,
+						module,
+						mod_desc);
+		
+		g_free(caption);
+		g_free(key);
+		g_free(module);	
+		g_free(mod_desc);
+		g_free(description);
+	} while(gtk_tree_model_iter_next(GTK_TREE_MODEL(model), &child));
+}
+
 
 gint gui_of2tf(const gchar * on_off)
 {
@@ -233,7 +318,7 @@ gchar * gui_general_user_file (const char *fname, gboolean critical)
 	}
 
 	/* try the default */
-	file = g_build_filename(getenv(HOMEVAR), ".xiphos", fname, NULL);
+	file = g_build_filename(g_getenv(HOMEVAR), ".xiphos", fname, NULL);
 	
 	/* success? */
 	if (g_file_test (file, G_FILE_TEST_EXISTS))
@@ -248,7 +333,7 @@ gchar * gui_general_user_file (const char *fname, gboolean critical)
 	/* specify alternate locations in order of precedence */
 	i = 0;
 	alternative[i++] = g_strdup (fname);
-#ifdef MAINTAINER_MODE
+#ifdef DEBUG
 	GS_message(("MAINTAINER_MODE"));
 	/* generally only developers have any use for these */
 	alternative[i++] = g_build_filename("..", fname, NULL);
@@ -256,8 +341,12 @@ gchar * gui_general_user_file (const char *fname, gboolean critical)
 	alternative[i++] = g_build_filename("..", "ui", fname, NULL);
 	alternative[i++] = g_build_filename("..", "..", "ui", fname, NULL);
 #endif
+#ifdef WIN32
+	alternative[i++] = g_build_filename(xiphos_win32_get_subdir("share"),
+					    "xiphos", fname, NULL);
+#else
 	alternative[i++] = g_build_filename("..", "share", "xiphos", fname, NULL);
-	/* above line for WIN32, mostly. */
+#endif
 	alternative[i++] = g_build_filename(SHARE_DIR, fname, NULL);
 	alternative[i++] = NULL;  /* NULL terminator needed */
 	
@@ -498,7 +587,7 @@ void gui_load_module_tree(GtkWidget * tree)
 	/*  Prayer lists folder */
 	if(settings.prayerlist) {
 		gtk_tree_store_append(store, &prayerlist, NULL);
-		gtk_tree_store_set(store, &prayerlist, 0, _("Prayer List/Journal"));
+		gtk_tree_store_set(store, &prayerlist, 0, _("Prayer List/Journal"), -1);
 	}
 
 	tmp = mod_mgr_list_local_modules(settings.path_to_mods, TRUE);
@@ -705,141 +794,6 @@ gchar * remove_linefeeds(gchar * buf)
 		
 }
 
-
-/******************************************************************************
- * Name
- *   gui_add_item2gnome_menu
- *
- * Synopsis
- *   #include "gui/utilities.h
- *
- *   void gui_add_item2gnome_menu(GtkWidget * MainFrm, gchar * itemname, 
- *	gchar * itemdata, gchar * menuname, GCallback mycallback)
- *
- * Description
- *   adds an item to the main menu bar
- *
- * Return value
- *   void
- */
-
-void gui_add_item2gnome_menu(GtkWidget * MainFrm, gchar * itemname, 
-	gchar * itemdata, gchar * menuname, GCallback mycallback)
-{
-	GnomeUIInfo *menuitem;
-
-	menuitem = g_new(GnomeUIInfo, 2);
-	menuitem->type = GNOME_APP_UI_ITEM;
-	menuitem->moreinfo = (gpointer) mycallback;
-	menuitem->user_data = itemdata;
-	menuitem->label = itemname;
-	menuitem->pixmap_type = GNOME_APP_PIXMAP_STOCK;
-	menuitem->pixmap_info = GNOME_STOCK_BOOK_OPEN;
-	menuitem->accelerator_key = 0;
-	menuitem[1].type = GNOME_APP_UI_ENDOFINFO;
-	gnome_app_insert_menus_with_data(GNOME_APP(MainFrm), menuname,
-					 menuitem, NULL);
-}
-
-
-/******************************************************************************
- * Name
- *   gui_add_separator2menu
- *
- * Synopsis
- *   #include "gui/utilities.h
- *
- *   void gui_add_separator2menu(GtkWidget * MainFrm, gchar * subtreelabel)
- *
- * Description
- *   add separator line to menu
- *
- * Return value
- *   void
- */
-
-void gui_add_separator2menu(GtkWidget * MainFrm, gchar * subtreelabel)
-{
-	GnomeUIInfo *bookmarkitem;
-	bookmarkitem = g_new(GnomeUIInfo, 2);
-	bookmarkitem->type = GNOME_APP_UI_SEPARATOR;
-	bookmarkitem->pixmap_type = GNOME_APP_PIXMAP_NONE;
-	bookmarkitem->accelerator_key = 0;
-	bookmarkitem[1].type = GNOME_APP_UI_ENDOFINFO;
-	gnome_app_insert_menus_with_data(GNOME_APP(MainFrm), subtreelabel,
-					 bookmarkitem, NULL);
-	//g_free(bookmarkitem); 
-}
-
-
-/******************************************************************************
- * Name
- *   
- *
- * Synopsis
- *   #include "gui/utilities.h
- *
- *   void add_mods_to_menus(GList * modlist, gchar * menu,
- *				GCallback callback) 
- *
- * Description
- *   add a list of modules to a menu
- *
- * Return value
- *   void
- */
-
-void gui_add_mods_to_menus(GList * modlist, gchar * menu,
-				GCallback callback) 
-{	
-	gchar	
-		view_remember_last_item[80];
-	//gint	i = 0;
-	GList 	*tmp = NULL;
-
-	sprintf(view_remember_last_item,"%s", menu);
-	
-	
-	tmp = modlist;
-	while (tmp != NULL) {	
-		gui_add_item2gnome_menu(widgets.app, 
-			(gchar *) tmp->data, 
-			(gchar *) tmp->data,
-			view_remember_last_item, 
-			callback);
-		/* remember last item - so next item will be placed below it */
-		sprintf(view_remember_last_item,"%s%s", 
-				menu, 
-				(gchar *) tmp->data);	
-		//++i;
-		tmp = g_list_next(tmp);	
-	}
-	g_list_free(modlist);
-}			
-
-
-/******************************************************************************
- * Name
- *   gui_remove_menu_items
- *
- * Synopsis
- *   #include "gui/utilities.h
- *
- *   void gui_remove_menu_items(gchar * startitem, gint numberofitems)
- *
- * Description
- *   remove a number(numberofitems) of items form a menu or submenu(startitem)
- *
- * Return value
- *   void
- */
-
-void gui_remove_menu_items(gchar * startitem, gint numberofitems)
-{				
-	gnome_app_remove_menus(GNOME_APP(widgets.app), startitem,
-			       numberofitems);
-}			
-
 /******************************************************************************
  * Name
  *  add_mods_2_gtk_menu
@@ -995,7 +949,7 @@ struct language_set {
 
 /* one-shot setup during initialization. */
 void
-language_init()
+language_init(void)
 {
 	int i;
 	for (i = 0; i < N_LANGSET_MODTYPES; ++i) {
@@ -1153,13 +1107,12 @@ language_make_list(GList *modlist,
  * caller must free the returned string.
  */
 char *
-image_locator(char *image)
+image_locator(const char *image)
 {
 #ifndef WIN32
 	return g_strdup_printf("%s/%s", PACKAGE_PIXMAPS_DIR, image);
 #else
-	gchar d[PATH_MAX+2];
-	return g_build_filename(getcwd(d, PATH_MAX), "..", "share",
+	return g_build_filename(xiphos_win32_get_subdir("share"),
 				"pixmaps", "xiphos", image, NULL);
 #endif /* WIN32 */
 }
@@ -1183,18 +1136,23 @@ pixmap_finder(char *image)
  * get a pixbuf from specified file.
  */
 GdkPixbuf *
-pixbuf_finder(char *image, GError **error)
+pixbuf_finder(const char *image, int size, GError **error)
 {
 	GdkPixbuf *p;
 	char *image_file;
 
 	image_file = image_locator(image);
-	p = gdk_pixbuf_new_from_file(image_file, error);
+	if (size == 0)
+		p = gdk_pixbuf_new_from_file(image_file, error);
+	else
+		p = gdk_pixbuf_new_from_file_at_scale (image_file,
+					       size, size,
+					       TRUE,
+					       error);
 	g_free(image_file);
 	return p;
 }
 
-
 //
 // utility function to write out HTML.
 //
@@ -1213,13 +1171,14 @@ HtmlOutput(char *text,
 	gecko_html_open_stream(html,"text/html");
 #else
 	GtkHTML *html = GTK_HTML(gtkText);
-	PangoContext* pc = gtk_widget_create_pango_context(gtkText);
+	PangoContext* pc = gtk_widget_get_pango_context(gtkText);
 	PangoFontDescription *desc = pango_context_get_font_description(pc);
+
 	pango_font_description_set_family(
 	    desc, ((mf && mf->old_font) ? mf->old_font : "Serif"));
 	gtk_widget_modify_font(gtkText, desc);
+
 	GtkHTMLStream *stream = gtk_html_begin(html);
-	//GtkHTMLStreamStatus status;
 	gboolean was_editable = gtk_html_get_editable(html);
 	if (was_editable)
 		gtk_html_set_editable(html, FALSE);
@@ -1253,4 +1212,212 @@ HtmlOutput(char *text,
 #endif
 }
 
+void set_window_icon (GtkWindow *window)
+{
+	gchar *imagename;
+	GdkPixbuf *pixbuf;
+
+	imagename = image_locator("xiphos-x-16.png");
+	pixbuf = gdk_pixbuf_new_from_file (imagename, NULL);
+	g_free (imagename);
+	gtk_window_set_icon (window, pixbuf);
+
+}
+
+/**************************************************************************
+ * Name
+ *  xiphos_open_default
+ *
+ * Synopsis
+ *  #include "glib.h"
+ *  #include <gnome.h>
+ *  #include <windows.h>
+ *  #include <shellapi.h>
+ *
+ * xiphos_open_default (gchar *file)
+ *
+ * Description
+ *  this is a generic "open anything with the default program" function;
+ *  on Windows, it uses the ShellExecuteW API (more robust than the gnome
+ *  or gtk implementations on Windows)
+ *  on *nix, it uses gnome_url_show; in the future, this could be changed
+ *  to gtk_show_uri as gnome_url_show is deprecated
+ * 
+ * Return value
+ *   void
+ */
+gboolean xiphos_open_default (const gchar *file)
+{
+#ifdef WIN32
+	gunichar2 *w_file;
+	gint rt;
+	w_file = g_utf8_to_utf16(file, -1, NULL, NULL, NULL);
+	GS_message(("opening file %ls", w_file));
+	rt = (gint)ShellExecuteW(NULL, L"open", w_file, NULL, NULL, SW_SHOWDEFAULT);
+	return rt > 32;
+	
+#else
+	GError *error = NULL;
+#ifndef WITHOUT_GNOME
+	if (gnome_url_show(file, &error) == FALSE){
+		GS_warning(("%s", error->message));
+		g_error_free (error);
+		return FALSE;
+	}
+	else
+		return TRUE;
+#else
+	gtk_show_uri (NULL, file, gtk_get_current_event_time(), &error);
+	if (error != NULL) {
+		GS_warning(("%s", error->message));
+		g_error_free (error);
+		return FALSE;
+	}
+	else
+		return TRUE;
+#endif
+#endif
+}
+
+/**
+ * xiphos_win32_get_subdir
+ * @subdir: a #gchar, the name of the subdir desired
+ *
+ * get the full path of the subdir; for instance, 'bin'
+ * would return something like C:/Program Files/Crosswire/Xiphos/bin
+ *
+ * Since 3.1.2
+ */
+#ifdef WIN32
+gchar* xiphos_win32_get_subdir(const gchar *subdir)
+{
+	gchar *ret_dir = g_win32_get_package_installation_directory_of_module(NULL);
+	ret_dir = g_strconcat(ret_dir, "\0", NULL);
+	ret_dir = g_build_filename(ret_dir, subdir, NULL);
+	return ret_dir;
+}
+#endif
+
+/**
+ * archive_addfile
+ * @output: a #GsfOutfile, the parent of the desired child
+ * @file: a #gchar, the on disk path of the file to add
+ * @name: a #gchar, the name (without path) of the file to add
+ *
+ * add a single file to the #GsfOutfile
+ *
+ * Since 3.1.2
+ */
+void archive_addfile(GsfOutfile *output, const gchar *file, const gchar *name)
+{
+	GsfInput *inputchild = NULL;
+	GsfOutput *outputchild = NULL;
+
+	inputchild = GSF_INPUT(gsf_input_stdio_new(file, NULL));
+	outputchild = gsf_outfile_new_child(output, name, FALSE);
+	gsf_input_copy(inputchild, outputchild);
+	gsf_output_close(outputchild);
+	g_object_unref(inputchild);
+	g_object_unref(outputchild);
+}
+
+/**
+ * archive_adddir
+ * @output: a #GsfOutfile, the parent of the desired child
+ * @path: a #gchar, the on disk path of the desired child directory
+ * @name: a #gchar, the name (without path) of the desired child dir
+ *
+ * add a child directory and all subdirs and files to the GsfOutfile;
+ * recursive
+ *
+ * Since 3.1.2
+ */
+void archive_adddir(GsfOutfile *output, gchar *path, const gchar *name)
+{
+	GDir *dir;
+	const gchar *file;
+	gchar *complete_file;
+	GsfOutfile *child;
+
+	child = GSF_OUTFILE(gsf_outfile_new_child(output, name, TRUE));
+	dir = g_dir_open(path, 0, NULL);
+	while ((file = g_dir_read_name(dir))) {
+		complete_file = g_build_filename(path, file, NULL);
+		if (g_file_test(complete_file, G_FILE_TEST_IS_DIR))
+			archive_adddir(GSF_OUTFILE(child), complete_file, file);
+		else
+			archive_addfile(GSF_OUTFILE(child), complete_file, file);
+	}
+	g_dir_close(dir);
+}
+
+
+/**
+ * xiphos_create_archive
+ * @conf_file: a #gchar with the location of the module's .conf
+ * @datapath: a #gchar with the location of the module's data
+ * @zip: a #gchar with the name of the zip file
+ * @destination: #gchar with the location to store the zip
+ *
+ * archive the specified module in the specified location
+ *
+ * Since 3.1.2
+ */
+void xiphos_create_archive(gchar* conf_file, gchar* datapath, gchar *zip,
+			   const gchar *destination)
+{
+	GsfOutfile *outputfile;
+	GsfOutput *output;
+	GsfOutfile *tmp;
+	gchar** path;
+	gchar* moddirname;
+	GString *modpath;
+	int i;
+	gsf_init();
+	
+	/* the module dir is the last part of the path */
+	path = g_strsplit(datapath, "/", -1);
+	moddirname = g_strdup(path[g_strv_length(path) - 1]);
+
+	/* create a relative path without preceding "." */
+	/* or the trailing dir name */
+	modpath = g_string_new(NULL);
+	for (i = 1; i <= (g_strv_length(path) - 2); i++)
+	{
+		modpath = g_string_append(modpath, path[i]);
+		if (i < g_strv_length(path) -2) /* avoid a trailing / */
+			modpath = g_string_append(modpath, "/");
+	}
+	
+	/* open zip file for writing */
+	output = gsf_output_stdio_new(zip, NULL);
+	outputfile = gsf_outfile_zip_new(output, NULL);
+
+	/* add the module directory */
+	tmp = GSF_OUTFILE(gsf_outfile_new_child(outputfile, modpath->str, TRUE));
+
+	/* add all data files */
+	archive_adddir(tmp,
+		       g_build_filename(destination, datapath, NULL),
+		       moddirname);
+	gsf_output_close(GSF_OUTPUT(tmp));
+	g_object_unref(tmp);
+
+	/* add conf file */
+	tmp = GSF_OUTFILE(gsf_outfile_new_child(outputfile, "mods.d", TRUE));
+	archive_addfile(tmp,
+			g_build_filename(destination, "mods.d", conf_file, NULL),
+			conf_file);
+
+	/* cleanup */
+	gsf_output_close(GSF_OUTPUT(outputfile));
+	gsf_output_close(output);
+	g_object_unref(tmp);
+	g_object_unref(outputfile);
+	g_object_unref(output);
+	g_strfreev(path);
+	g_free(moddirname);
+	
+}
+		
 /******   end of file   ******/
diff --git a/src/gnome2/wscript b/src/gnome2/wscript
new file mode 100644
index 0000000..24e58a2
--- /dev/null
+++ b/src/gnome2/wscript
@@ -0,0 +1,119 @@
+#!/usr/bin/env python
+# encoding: utf8
+
+import os.path
+
+import Utils
+
+
+def configure(self):
+
+    ## make locale_set.c for switching language
+
+    fout_name = os.path.abspath('src/gnome2/locale_set.c')
+    Utils.pprint('CYAN', 'Making %s' % fout_name)
+
+    fin = open('po/LINGUAS')
+    fout = open(fout_name, 'w')
+    locales_old = fin.readline().strip().split()
+    fin.close()
+    locales_new = []
+
+    locales_old.append('en_US')
+
+    # convert locale names to 5 chars version
+    for loc in locales_old:
+        if loc == 'cs':    
+            loc += '_CZ'   # special case, czech.
+        elif loc == 'fa':
+            loc += '_IR'   # special case, iran.
+        elif loc == 'zh':
+            loc += '_CN'   # special case, simplified chinese.
+        elif len(loc) == 2:
+            loc = loc + '_' + loc.upper()
+        locales_new.append(loc)
+
+    # aplhabetize
+    locales_new.sort()
+
+    # write
+    fout.write('char *locale_set[] = {\n')
+    for loc in locales_new:
+        fout.write('        "%s",\n' % loc)
+    fout.write('        (char*)0\n')
+    fout.write('};\n')
+    fout.close
+
+
+
+def build(bld):
+
+    env = bld.env
+    sub = Utils.subst_vars
+    
+    # GTK
+    #gtk = 'LIBGTK_X11_2_0'
+    #if not env['HAVE_LIBGTK_X11_2_0']:
+        #gtk = 'LIBGTK_WIN32_2_0'
+
+    #gtk += ' %s' % 'GLIB GMODULEEXP'
+    
+    # use GECKO as html engine
+    objects = 'backend editor main'
+    if not bld.env['ENABLE_GTKHTML']:
+        objects += ' %s' % 'gecko'
+
+    # GTKHTML
+    gtkhtml = 'GTKHTML'
+    if env['HAVE_GTKHTML_EDITOR']:
+        gtkhtml += ' %s' % 'GTKHTML_EDITOR'
+
+    # GECKO
+    gecko = 'GTKMOZEMBED'
+    if env['HAVE_GTKMOZEMBED_UNSTABLE']:
+        gecko += ' %s' % 'GTKMOZEMBED_UNSTABLE'
+
+    # on WIN32 compile Xiphos icon into executable
+    winresource = ''
+    staticlib = []
+    if env['IS_WIN32']:
+        winresource = '../../win32/res/res.rc'
+        # staticlib = 'sword'.split()
+
+    # DATADIR direct in config.h - conflict in win32 (mingw)
+    defines = sub('''
+        PREFIX="${PREFIX}"
+        SYSCONFDIR="${SYSCONFDIR}"
+        DATADIR="${DATAROOTDIR}"
+        LIBDIR="${LIBDIR}"
+        SHARE_DIR="${DATAROOTDIR}/${PACKAGE}"
+    ''', env)
+        
+        
+    lib = bld.new_task_gen(
+        features = 'cxx cc cprogram',
+        includes = '. ../.. ../../src ../../src/editor %s' % bld.env['GECKO_INCLUDE'], # ../../ for config.h
+        defines = defines, 
+        source = '%s' % winresource, 
+        target = 'xiphos',
+        #uselib = 'GNOMEUI GECKONSPR MAGICK GECKONSS GTK GLADE GLIB GMODULEEXP UPRINT SWORD  %s %s' % (gtkhtml, gecko),
+        #uselib = 'WSOCK GNOMEUI GECKONSPR MAGICK GECKONSS GTK GLADE GLIB GMODULEEXP UPRINT SWORD  %s %s' % (gtkhtml, gecko),
+        uselib= bld.env['ALL_LIBS'],
+        staticlib = staticlib, # like cflag -lsword
+        add_objects = objects, # used instead of libbackend.a, libgecko.a, libeditor.a, libmain.a
+        install_path= '${BINDIR}',
+    )
+
+    # DBUS generate binding and marshallers
+    if env['HAVE_DBUS']:
+        lib.add_dbus_file('ipc-interface.xml', 'ipc_object', 'glib-server')
+        lib.add_marshal_file('marshal.list', 'ipc_marshal')
+        lib.find_sources_in_dirs('.')
+    else:
+        lib.find_sources_in_dirs('.', excludes=['ipc.c',])
+  
+    # notification about project name change
+    if not env['IS_WIN32']:
+        is_executable = 0755
+        bld.install_files('${BINDIR}', 'gnomesword2', chmod=is_executable)
+
diff --git a/src/gnome2/xiphos.c b/src/gnome2/xiphos.c
index 88d754b..ad2e1fd 100644
--- a/src/gnome2/xiphos.c
+++ b/src/gnome2/xiphos.c
@@ -68,8 +68,14 @@
 #include "main/xml.h"
 
 #ifdef USE_GTKMOZEMBED
+#ifdef WIN32
+#include "geckowin/gecko-html.h"
+#else
 #include "gecko/gecko-html.h"
 #endif
+#endif
+
+#include "gui/debug_glib_null.h"
 
 /******************************************************************************
  * Name
@@ -100,8 +106,6 @@ void frontend_init(void)
 	 *  setup sidebar
 	 */
 	gui_create_sidebar(widgets.epaned);
-	main_init_sidebar_search_backend();
-	main_search_sidebar_fill_bounds_combos();
 	
 	/*
 	 *  parallel stuff
@@ -213,7 +217,7 @@ void frontend_display(void)
 	if (settings.showdevotional) 
 		main_display_devotional();
 	else 
-		main_clear_viewer();
+		main_init_previewer();
 	gtk_widget_grab_focus (sidebar.module_list);
 	
 	GS_print(("%s\n\n", "done"));
diff --git a/src/gui/bookmark_dialog.h b/src/gui/bookmark_dialog.h
index a26e26d..2dd0078 100644
--- a/src/gui/bookmark_dialog.h
+++ b/src/gui/bookmark_dialog.h
@@ -33,6 +33,11 @@ void on_dialog_response(GtkDialog * dialog,
 			gpointer user_data);
 void gui_bookmark_dialog(gchar * label, gchar * module_name, gchar * key);
 void gui_mark_verse_dialog(gchar * module_name, gchar * key);
+void on_buffer_changed (GtkTextBuffer *textbuffer, gpointer user_data);
+void on_mark_verse_response(GtkDialog * dialog, gint response_id, gpointer user_data);
+void on_dialog_enter(void);
+void on_mark_verse_enter(void);
+gboolean on_treeview_button_release_event(GtkWidget *widget, GdkEventButton *event, gpointer user_data);
 
 #ifdef __cplusplus
 }
diff --git a/src/gui/bookmarks_menu.h b/src/gui/bookmarks_menu.h
index 85116d7..ce83278 100644
--- a/src/gui/bookmarks_menu.h
+++ b/src/gui/bookmarks_menu.h
@@ -52,6 +52,21 @@ extern gboolean bookmarks_changed;
 void gui_save_bookmarks(GtkMenuItem * menuitem, gpointer user_data);
 void gui_create_bookmark_menu(void);
 void gui_save_bookmarks_treeview(void);
+void bibletime_bookmarks_activate(GtkMenuItem * menuitem, gpointer user_data);
+void on_allow_reordering_activate(GtkMenuItem * menuitem, gpointer user_data);
+void on_dialog_activate(GtkMenuItem * menuitem, gpointer user_data);
+void on_edit_item_activate(GtkMenuItem * menuitem, gpointer user_data);
+void on_export_folder_activate(GtkMenuItem * menuitem, gpointer user_data);
+void restore_ok(GtkButton * button, GtkWidget * filesel);
+void restore_cancel(GtkButton * button, GtkWidget * dlg);
+void on_restore_folder_activate(GtkMenuItem * menuitem, gpointer user_data);
+void on_delete_item_activate(GtkMenuItem * menuitem, gpointer user_data);
+void on_expand_activate(GtkMenuItem * menuitem, gpointer user_data);
+void on_collapse_activate(GtkMenuItem * menuitem, gpointer user_data);
+void on_add_bookmark_activate(GtkMenuItem * menuitem, gpointer user_data);
+void on_insert_bookmark_activate(GtkMenuItem * menuitem, gpointer user_data);
+void on_new_folder_activate(GtkMenuItem * menuitem, gpointer user_data);
+void on_open_in_tab_activate(GtkMenuItem * menuitem, gpointer user_data);
 
 #ifdef __cplusplus
 }
diff --git a/src/gui/bookmarks_treeview.h b/src/gui/bookmarks_treeview.h
index 482aa08..e1d8bb4 100644
--- a/src/gui/bookmarks_treeview.h
+++ b/src/gui/bookmarks_treeview.h
@@ -25,7 +25,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include <gnome.h>
+#include <gtk/gtk.h>
 #include <libxml/parser.h>
 enum {
 	COL_OPEN_PIXBUF,
@@ -71,6 +71,8 @@ void gui_parse_bookmarks(GtkTreeView *tree, const xmlChar * file,
 			    GtkTreeIter *parent);
 GtkWidget* gui_create_dialog_add_bookmark(gchar * label,
 				gchar * module_name, gchar * key);
+void gui_save_old_bookmarks_to_new(GNode * gnode);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/gui/commentary_dialog.h b/src/gui/commentary_dialog.h
index e16d621..e90da5b 100644
--- a/src/gui/commentary_dialog.h
+++ b/src/gui/commentary_dialog.h
@@ -30,7 +30,9 @@ extern "C" {
 	
 void gui_commentary_dialog_sync_toggled(GtkToggleButton * button, DIALOG_DATA * c);
 void gui_create_commentary_dialog(DIALOG_DATA * d, gboolean do_edit);
-	
+void gui_display_commentary_with_struct(DIALOG_DATA *d, gchar *key);
+void gui_close_comm_dialog(DIALOG_DATA * d);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/gui/debug_glib_null.h b/src/gui/debug_glib_null.h
new file mode 100644
index 0000000..52dd627
--- /dev/null
+++ b/src/gui/debug_glib_null.h
@@ -0,0 +1,47 @@
+/*
+ * Xiphos Bible Study Tool
+ * utilities.h - support functions
+ *
+ * Copyright (C) 2009 Xiphos Developer Team
+ *
+ * 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 Library 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#ifdef DEBUG
+
+/* replicating real g_strdup_printf & friends for the sake of our debugging. */
+/* this is a total mind game: we redefine the standard use of glib functions */
+/* so as to use our internal versions.  our internal versions scan for mis-  */
+/* use of %s, i.e. (char*)NULL that should (by rights) cause crashes anyhow. */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define	g_strdup_printf(f, ...)		XI_g_strdup_printf(__FILE__, __LINE__, f, __VA_ARGS__)
+#define	g_string_printf(s, f, ...)	XI_g_string_printf(__FILE__, __LINE__, s, f, __VA_ARGS__)
+
+#include "gui.h"
+
+#ifdef __cplusplus
+}
+#endif
+
+/* the code implementing our versions of these is in src/gnome2/gui.c, */
+/* expressly because gui.c does not need these functions; ergo, gui.c  */
+/* does not #include this file: it gets access to real glib functions. */
+/* all other source files include this file to get the replacements.   */
+
+#endif /* DEBUG */
diff --git a/src/gui/dialog.h b/src/gui/dialog.h
index e661c42..22e3700 100644
--- a/src/gui/dialog.h
+++ b/src/gui/dialog.h
@@ -73,6 +73,7 @@ void gui_generic_warning(char *);
 gint gui_gs_dialog(GS_DIALOG * info);
 gint gui_alert_dialog(GS_DIALOG * info);
 gint gui_yes_no_dialog(char *, char *);
+gint gui_close_confirmation_dialog(GS_DIALOG * info);
 
 #ifdef __cplusplus
 }
diff --git a/src/gui/dictlex.h b/src/gui/dictlex.h
index 8559e9f..7d9fa79 100644
--- a/src/gui/dictlex.h
+++ b/src/gui/dictlex.h
@@ -37,7 +37,10 @@ void gui_lookup_dictlex_selection(GtkMenuItem * menuitem,
 void gui_set_dictlex_mod_and_key(gchar *mod, gchar *key);
 void gui_display_dictlex(gchar * key);
 GtkWidget *gui_create_dictionary_pane(void);
-	
+void on_entryDictLookup_changed(GtkEditable * editable, gpointer data);
+void dict_key_entry_changed(GtkEntry * entry, gpointer data);
+void button_back_clicked(GtkButton * button, gpointer user_data);
+void button_forward_clicked(GtkButton * button, gpointer user_data);	
 
 #ifdef __cplusplus
 }
diff --git a/src/gui/dictlex_dialog.h b/src/gui/dictlex_dialog.h
index 34eb453..07bd233 100644
--- a/src/gui/dictlex_dialog.h
+++ b/src/gui/dictlex_dialog.h
@@ -31,6 +31,7 @@ extern "C" {
 void gui_create_dictlex_dialog(DIALOG_DATA *dlg);
 void gui_lookup_dictlex_dialog_selection
     (GtkMenuItem * menuitem, gchar * dict_mod_description);
+void on_btnSyncDL_clicked(GtkButton * button, DIALOG_DATA * d);
 
 #ifdef __cplusplus
 }
diff --git a/src/gui/export_bookmarks.h b/src/gui/export_bookmarks.h
new file mode 100644
index 0000000..dc9ae97
--- /dev/null
+++ b/src/gui/export_bookmarks.h
@@ -0,0 +1,73 @@
+/*
+ * Xiphos Bible Study Tool
+ * export_bookmarks.h -  
+ *
+ * Copyright (C) 2003-2009 Xiphos Developer Team
+ *
+ * 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 Library 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#ifndef  ___EXPORT_BOOKMARKS_H_
+#define ___EXPORT_BOOKMARKS_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+	
+struct _export_bookmarks {
+	gboolean as_bookmarks;
+	gboolean as_html;
+	gboolean as_plain;
+	gboolean with_scripture;
+	gint type;
+	gint verselist;
+	GtkWidget *rb_bookmarks;
+	GtkWidget *rb_html;
+	GtkWidget *rb_plain;
+	GtkWidget *cb_scripture;
+	GtkWidget *filechooserwidget;
+	gchar *filename;
+	gchar *verselist_name;
+	GList * verses;
+};
+typedef struct  _export_bookmarks BK_EXPORT;
+
+enum {
+	BOOKMARKS_EXPORT,
+	VERSE_LIST_EXPORT,
+	SEARCH_RESULTS_EXPORT,
+	ADV_SEARCH_RESULTS_EXPORT
+};
+
+void gui_set_html_item (GString * str,  
+			const gchar * description,
+			const gchar * module, 
+			const gchar * key,
+			gboolean with_scripture);
+void gui_set_plain_text_item (GString * str, 
+			const gchar * description,
+			const gchar * module, 
+			const gchar * key,
+			gboolean with_scripture);
+void gui_export_bookmarks_dialog(gint is_verselist, GList * verses);
+gboolean dialog_vbox1_key_press_event_cb(GtkWidget   * widget,
+					 GdkEventKey * event,
+					 gpointer    user_data);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* ___EXPORT_BOOKMARKS_H_ */
diff --git a/src/gui/export_dialog.h b/src/gui/export_dialog.h
index 0b53be1..a2ed494 100644
--- a/src/gui/export_dialog.h
+++ b/src/gui/export_dialog.h
@@ -28,6 +28,9 @@ extern "C" {
 	
 gchar *gui_get_export_filename(void);
 void gui_export_dialog(void);
+void _get_export_filename(void);
+void on_dialog_export_passage_response(GtkDialog * dialog, gint response_id, gpointer user_data);
+gint _check_for_distribution_license(gchar * mod_name);
 
 #ifdef __cplusplus
 }
diff --git a/src/gui/find_dialog.h b/src/gui/find_dialog.h
index dae69d6..484cea4 100644
--- a/src/gui/find_dialog.h
+++ b/src/gui/find_dialog.h
@@ -22,7 +22,7 @@
 #ifndef _FIND_DIALOG_H_
 #define _FIND_DIALOG_H_
 
-#include <gnome.h>
+#include <gtk/gtk.h>
 
 void gui_find_dlg(GtkWidget *htmlwidget, gchar *mod_name, 
 		  gboolean regular, gchar *text);
diff --git a/src/gui/gbs.h b/src/gui/gbs.h
index e666d78..b7992a6 100644
--- a/src/gui/gbs.h
+++ b/src/gui/gbs.h
@@ -25,5 +25,6 @@
 GtkWidget *gui_create_book_pane(void);
 void gui_update_gbs_global_ops(gchar * option, gboolean choice);
 void gui_set_book_page_and_key(gchar * mod_name, gchar * key);
+void gui_set_book_mod_and_key(gchar * mod_name, gchar * key);
 
 #endif
diff --git a/src/gui/gbs_dialog.h b/src/gui/gbs_dialog.h
index 8706be2..4e4a6d9 100644
--- a/src/gui/gbs_dialog.h
+++ b/src/gui/gbs_dialog.h
@@ -29,6 +29,7 @@ extern "C" {
 #include "main/module_dialogs.h"
 	
 void gui_create_gbs_dialog(DIALOG_DATA * dlg);
+void gui_close_gbs_dialog(DIALOG_DATA * dlg);
 
 #ifdef __cplusplus
 }
diff --git a/src/gui/gui.h b/src/gui/gui.h
index 734d5f0..ff5035e 100644
--- a/src/gui/gui.h
+++ b/src/gui/gui.h
@@ -4,5 +4,27 @@
 void gui_init(int argc, char*argv[]);
 void gui_main(void);
 
+#ifndef WIN32
+#include <gconf/gconf-client.h>
+void gconf_setup(void);
 #endif
 
+#define	GS_GCONF_MAX	6
+
+#ifdef DEBUG
+
+
+gchar*	XI_g_strdup_printf (const char *filename,
+			    int linenumber,
+			    const char *format,
+			    ...) G_GNUC_PRINTF (3, 4) G_GNUC_MALLOC;
+
+void	XI_g_string_printf (const char *filename,
+			    int linenumber,
+			    GString *string,
+			    const char *format,
+			    ...) G_GNUC_PRINTF (4, 5);
+
+#endif /* DEBUG */
+
+#endif
diff --git a/src/gui/html.h b/src/gui/html.h
index abffe05..a7a115e 100644
--- a/src/gui/html.h
+++ b/src/gui/html.h
@@ -26,7 +26,6 @@
 extern "C" {
 #endif
 
-#include <gnome.h>
 #include <gtkhtml/gtkhtml.h>
 
 extern gboolean in_url;
diff --git a/src/gui/ipc.h b/src/gui/ipc.h
new file mode 100644
index 0000000..0d4c74d
--- /dev/null
+++ b/src/gui/ipc.h
@@ -0,0 +1,83 @@
+/*
+ * Xiphos Bible Study Tool
+ * ipc.h - Interprocess Communication - dbus integration
+ *
+ * Copyright (C) 2000-2009 Xiphos Developer Team
+ *
+ * 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 Library 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+
+#ifndef __XIPHOS_IPC_H__
+#define __XIPHOS_IPC_H__
+
+#include <glib.h>
+#include <dbus/dbus-glib.h>
+
+G_BEGIN_DECLS
+
+#define IPC_TYPE_OBJECT             (ipc_object_get_type())
+#define IPC_OBJECT(object) \
+	(G_TYPE_CHECK_INSTANCE_CAST ((object), \
+	 IPC_TYPE_OBJECT, IpcObject))
+#define IPC_OBJECT_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST ((klass), \
+	 IPC_TYPE_OBJECT, IpcObjectClass))
+#define IPC_IS_OBJECT(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+	 IPC_TYPE_OBJECT))
+#define IPC_IS_OBJECT_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+	 IPC_TYPE_OBJECT))
+#define IPC_OBJECT_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS ((obj), \
+	 IPC_TYPE_OBJECT, IpcObjectClass))
+
+typedef enum {
+	SEARCH_PERFORMED,
+	NAVIGATION,
+	LAST_SIGNAL
+} IpcSignalNumber;
+
+typedef struct _IpcObject IpcObject;
+typedef struct _IpcObjectClass IpcObjectClass;
+
+struct _IpcObject {
+	GObject parent;
+	GList *references;
+	gchar *current_ref;
+};
+
+struct _IpcObjectClass {
+	GObjectClass parent;
+	guint signals[LAST_SIGNAL];
+};
+
+GType ipc_object_get_type(void);
+
+gboolean ipc_object_search_performed (IpcObject* obj, 
+				      const gchar* search_term,
+				      const int* hits,
+				      GError** error);
+gboolean ipc_object_navigation_signal (IpcObject* obj,
+				       const gchar* reference,
+				       GError** error);
+
+IpcObject* ipc_init_dbus_connection(IpcObject* obj);
+IpcObject* ipc_get_main_ipc(void);
+
+G_END_DECLS
+
+#endif /* __XIPHOS_IPC_H__ */
diff --git a/src/gui/main_menu.h b/src/gui/main_menu.h
index 7d502bc..02854fc 100644
--- a/src/gui/main_menu.h
+++ b/src/gui/main_menu.h
@@ -32,6 +32,34 @@ void gui_parallel_tab_activate(GtkCheckMenuItem * menuitem, gpointer user_data);
 void on_module_manager_activate(GtkMenuItem * menuitem, gpointer user_data);
 void on_preferences_activate(GtkMenuItem * menuitem, gpointer user_data);
 void on_help_contents_activate(GtkMenuItem * menuitem, gpointer user_data);
+void on_mailing_list_activate(GtkMenuItem * menuitem, gpointer user_data);
+void on_live_chat_activate(GtkMenuItem * menuitem, gpointer user_data);
+void on_report_bug_activate(GtkMenuItem * menuitem, gpointer user_data);
+void on_about_the_sword_project_activate(GtkMenuItem * menuitem, gpointer user_data);
+void on_about_translation_activate(GtkMenuItem * menuitem, gpointer user_data);
+void on_daily_devotion_activate(GtkMenuItem * menuitem, gpointer user_data);
+void on_search_activate(GtkMenuItem * menuitem, gpointer user_data);
+void on_verse_style_activate(GtkCheckMenuItem * menuitem, gpointer user_data);
+void on_linked_tabs_activate(GtkCheckMenuItem * menuitem, gpointer user_data);
+void on_read_aloud_activate(GtkCheckMenuItem * menuitem, gpointer user_data);
+void on_show_verse_numbers_activate(GtkCheckMenuItem * menuitem, gpointer user_data);
+void on_versehighlight_activate(GtkCheckMenuItem * menuitem, gpointer user_data);
+void on_side_preview_activate(GtkCheckMenuItem * menuitem, gpointer user_data);
+void on_double_space_text_activate(GtkCheckMenuItem * menuitem, gpointer user_data);
+void on_quit_activate(GtkMenuItem * menuitem, gpointer user_data);
+void on_about_xiphos_activate(GtkMenuItem * menuitem, gpointer user_data);
+void on_save_session_activate(GtkMenuItem * menuitem, gpointer user_data);
+void on_open_session_activate(GtkMenuItem * menuitem, gpointer user_data);
+void on_show_bible_text_activate(GtkMenuItem * menuitem, gpointer user_data);
+void on_preview_activate(GtkMenuItem * menuitem, gpointer user_data);
+void on_show_commentary_activate(GtkMenuItem * menuitem, gpointer user_data);
+void on_show_dictionary_lexicon_activate(GtkMenuItem * menuitem, gpointer user_data);
+void on_open_studypad_activate(GtkMenuItem * menuitem, gpointer user_data);
+void on_advanced_search_activate(GtkMenuItem * menuitem, gpointer user_data);
+void on_attach_detach_sidebar_activate(GtkMenuItem *menuitem, gpointer user_data);
+void on_sidebar_showhide_activate(GtkMenuItem *menuitem, gpointer user_data);
+void link_uri_hook(GtkLinkButton *button, const gchar *link, gpointer user_data);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/gui/main_window.h b/src/gui/main_window.h
index 4c441a3..b48efb6 100644
--- a/src/gui/main_window.h
+++ b/src/gui/main_window.h
@@ -26,7 +26,7 @@
 extern "C" {
 #endif
 
-#include <gnome.h>
+#include <gtk/gtk.h>
 //#include "gui/toolbar_nav.h"
 #include "main/navbar_versekey.h"
 	
diff --git a/src/gui/menu_popup.h b/src/gui/menu_popup.h
index 50b57ad..6f9a267 100644
--- a/src/gui/menu_popup.h
+++ b/src/gui/menu_popup.h
@@ -26,9 +26,50 @@
 extern "C" {
 #endif
 
+#include <glade/glade-xml.h>
+
 #include "main/module_dialogs.h"
+
 void gui_menu_popup (const gchar * mod_name,
 			DIALOG_DATA * d);
+gint _get_type_mod_list (void);
+gchar * _get_key (gchar * mod_name);
+GtkWidget * _get_html (void);
+void on_popup_about_activate (GtkMenuItem * menuitem, gpointer user_data);
+void on_popup_bookmark_activate (GtkMenuItem *menuitem, gpointer user_data);
+void on_popup_export_passage_activate (GtkMenuItem *menuitem, gpointer user_data);
+void on_popup_print_activate (GtkMenuItem *menuitem, gpointer user_data);
+void on_close_activate (GtkMenuItem *menuitem, gpointer user_data);
+void on_popup_copy_activate (GtkMenuItem *menuitem, gpointer user_data);
+void on_popup_find_activate (GtkMenuItem *menuitem, gpointer user_data);
+void on_popup_font_activate (GtkMenuItem * menuitem, gpointer user_data);
+void on_words_of_christ_in_red_activate (GtkCheckMenuItem * menuitem, gpointer user_data);
+void on_strong_s_numbers_activate (GtkCheckMenuItem * menuitem, gpointer user_data);
+void on_morphological_tags_activate (GtkCheckMenuItem * menuitem, gpointer user_data);
+void on_footnotes_activate (GtkCheckMenuItem * menuitem, gpointer user_data);
+void on_greek_accents_activate (GtkCheckMenuItem * menuitem, gpointer user_data);
+void on_lemmas_activate (GtkCheckMenuItem * menuitem, gpointer user_data);
+void on_scripture_cross_references_activate (GtkCheckMenuItem * menuitem, gpointer user_data);
+void on_hebrew_vowel_points_activate (GtkCheckMenuItem * menuitem, gpointer user_data);
+void on_hebrew_cantillation_activate (GtkCheckMenuItem * menuitem, gpointer user_data);
+void on_headings_activate (GtkCheckMenuItem * menuitem, gpointer user_data);
+void on_transliteration_activate (GtkCheckMenuItem * menuitem, gpointer user_data);
+void on_commentary_by_chapter_activate (GtkCheckMenuItem * menuitem, gpointer user_data);
+void on_primary_reading_activate (GtkCheckMenuItem * menuitem, gpointer user_data);
+void on_secondary_reading_activate (GtkCheckMenuItem * menuitem, gpointer user_data);
+void on_all_readings_activate (GtkCheckMenuItem * menuitem, gpointer user_data);
+void on_image_content_activate (GtkCheckMenuItem * menuitem, gpointer user_data);
+void on_respect_font_faces_activate (GtkCheckMenuItem * menuitem, gpointer user_data);
+void on_unlock_this_module_activate (GtkMenuItem * menuitem, gpointer user_data);
+void on_display_book_heading_activate (GtkMenuItem * menuitem, gpointer user_data);
+void on_display_chapter_heading_activate (GtkMenuItem * menuitem, gpointer user_data);
+void on_use_current_dictionary_activate (GtkMenuItem * menuitem, gpointer user_data);
+void on_lookup_google_activate (GtkMenuItem * menuitem, gpointer user_data);
+void on_rename_perscomm_activate (GtkMenuItem * menuitem, gpointer user_data);
+void on_dump_perscomm_activate (GtkMenuItem * menuitem, gpointer user_data);
+void on_read_selection_aloud_activate (GtkMenuItem * menuitem, gpointer user_data);
+void on_mark_verse_activate (GtkMenuItem * menuitem, gpointer user_data);
+void _add_and_check_global_opts (GladeXML *gxml, const gchar * mod_name, GtkWidget * submenu, DIALOG_DATA * d);
 
 #ifdef __cplusplus
 }
diff --git a/src/gui/mod_mgr.h b/src/gui/mod_mgr.h
index 19f0a57..f852beb 100644
--- a/src/gui/mod_mgr.h
+++ b/src/gui/mod_mgr.h
@@ -31,6 +31,25 @@ void gui_update_install_status(glong total, glong done, const gchar *message);
 void gui_update_install_progressbar(gdouble fraction);
 void gui_open_mod_mgr(void);
 void gui_open_mod_mgr_initial_run(void);
+void clear_and_hide_progress_bar(void);
+void on_notebook1_switch_page(GtkNotebook * notebook, GtkNotebookPage * page, guint page_num, gpointer user_data);
+void on_radiobutton2_toggled(GtkToggleButton * togglebutton, gpointer user_data);
+void on_radiobutton4_toggled(GtkToggleButton * togglebutton, gpointer user_data);
+void save_sources(void);
+void on_refresh_clicked(GtkButton * button, gpointer  user_data);
+void on_install_clicked(GtkButton * button, gpointer  user_data);
+void on_remove_clicked(GtkButton * button, gpointer  user_data);
+void on_archive_clicked(GtkButton * button, gpointer  user_data);
+void on_index_clicked(GtkButton * button, gpointer  user_data);
+void on_delete_index_clicked(GtkButton * button, gpointer  user_data);
+void on_load_sources_clicked(GtkButton * button, gpointer  user_data);
+void on_cancel_clicked(GtkButton * button, gpointer  user_data);
+void on_mod_mgr_response(GtkDialog * dialog, gint response_id, gpointer user_data);
+void on_button5_clicked(GtkButton * button, gpointer user_data);
+void on_button6_clicked(GtkButton * button, gpointer user_data);
+void on_button7_clicked(GtkButton * button, gpointer user_data);
+void on_button8_clicked(GtkButton * button, gpointer user_data);
+gboolean on_treeview1_button_release_event(GtkWidget * widget, GdkEventButton * event, gpointer user_data);
 
 #ifdef __cplusplus
 }
diff --git a/src/gui/navbar_book.h b/src/gui/navbar_book.h
index 07eae78..3b7f66d 100644
--- a/src/gui/navbar_book.h
+++ b/src/gui/navbar_book.h
@@ -23,5 +23,6 @@
 #define ___NAVBAR_BOOK_H_
 
 GtkWidget *gui_navbar_book_new(void);
+void on_entry_activate (GtkEntry *entry, gpointer  user_data);
 
 #endif
diff --git a/src/gui/parallel_tab.h b/src/gui/parallel_tab.h
index db8b5bb..567c567 100644
--- a/src/gui/parallel_tab.h
+++ b/src/gui/parallel_tab.h
@@ -30,7 +30,10 @@ extern "C" {
 void gui_parallel_tab_sync(const gchar * key);
 GtkWidget *gui_create_parallel_tab(void);
 void gui_keep_parallel_tab_in_sync(void);
+void gui_force_parallel_tab_sync(void);
 void gui_destroy_parallel_tab(void);
+void gui_parallel_close_tab(GtkButton * button, gpointer user_data);
+GtkWidget *_create_parallel_tab(void);
 	
 #ifdef __cplusplus
 }
diff --git a/src/gui/parallel_view.h b/src/gui/parallel_view.h
index fe010db..2bde432 100644
--- a/src/gui/parallel_view.h
+++ b/src/gui/parallel_view.h
@@ -30,6 +30,8 @@ void gui_create_parallel_page(void);
 void gui_create_parallel_popup(void);
 void gui_popup_menu_parallel(void);
 void on_undockInt_activate(GtkMenuItem * menuitem);
+void on_paratab_activate(GtkMenuItem * menuitem);
+void on_changeint1mod_activate(GtkMenuItem * menuitem, gpointer user_data);
 	
 #ifdef __cplusplus
 }
diff --git a/src/gui/preferences_cell_renderer.h b/src/gui/preferences_cell_renderer.h
deleted file mode 100644
index 1c3ac1f..0000000
--- a/src/gui/preferences_cell_renderer.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Xiphos Bible Study Tool
- * preferences_cell_renderer.h
- *
- * Copyright (C) 2002-2008 Dave Camp
- * taken form Anjuta-1.1.98
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library 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
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-#ifndef PREFS_CELL_RENDERER_H
-#define PREFS_CELL_RENDERER_H
-
-#include <gtk/gtkcellrenderer.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkcellrendererpixbuf.h>
-
-G_BEGIN_DECLS
-
-#define PREFS_TYPE_CELL_RENDERER_CAPTIONED_IMAGE		(preferences_cell_renderer_captioned_image_get_type ())
-#define PREFS_CELL_RENDERER_CAPTIONED_IMAGE(obj)		(GTK_CHECK_CAST ((obj), PREFS_TYPE_CELL_RENDERER_CAPTIONED_IMAGE, CellRendererCaptionedImage))
-#define PREFS_CELL_RENDERER_CAPTIONED_IMAGE_CLASS(klass)	(GTK_CHECK_CLASS_CAST ((klass), PREFS_TYPE_CELL_RENDERER_CAPTIONED_IMAGE, CellRendererCaptionedImageClass))
-#define PREFS_IS_CELL_RENDERER_CAPTIONED_IMAGE(obj)		(GTK_CHECK_TYPE ((obj), PREFS_TYPE_CELL_RENDERER_CAPTIONED_IMAGE))
-#define PREFS_IS_CELL_RENDERER_CAPTIONED_IMAGE_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((klass), PREFS_TYPE_CELL_RENDERER_CAPTIONED_IMAGE))
-#define PREFS_CELL_RENDERER_CAPTIONED_IMAGE_GET_CLASS(obj)   (GTK_CHECK_GET_CLASS ((obj), PREFS_TYPE_CELL_RENDERER_CAPTIONED_IMAGE, CellRendererCaptionedImageClass))
-
-typedef struct _CellRendererCaptionedImage        CellRendererCaptionedImage;
-typedef struct _CellRendererCaptionedImageClass   CellRendererCaptionedImageClass;
-
-struct _CellRendererCaptionedImage {
-	GtkCellRenderer parent;
-
-	GtkCellRenderer *image;
-	GtkCellRenderer *caption;
-};
-
-struct _CellRendererCaptionedImageClass {
-	GtkCellRendererClass parent_class;
-};
-
-GType            preferences_cell_renderer_captioned_image_get_type (void);
-GtkCellRenderer *gui_preferences_cell_renderer_captioned_image_new      (void);
-
-G_END_DECLS
-
-#endif
diff --git a/src/gui/preferences_dialog.h b/src/gui/preferences_dialog.h
index ecefa4c..eef06f3 100644
--- a/src/gui/preferences_dialog.h
+++ b/src/gui/preferences_dialog.h
@@ -26,6 +26,12 @@
 extern "C" {
 #endif
 
+#define	NONE	_("None")
+extern char *locale_set[];
+/* for selecting special locale */
+/* autogenerated from po/LINGUAS */
+/* see src/gnome2/Makefile.am */
+
 void on_checkbutton1_toggled(GtkToggleButton * togglebutton, gpointer user_data);
 void on_checkbutton2_toggled(GtkToggleButton * togglebutton, gpointer user_data);
 void on_checkbutton3_toggled(GtkToggleButton * togglebutton, gpointer user_data);
@@ -52,7 +58,7 @@ void on_combobox12_changed(GtkComboBox * combobox, gpointer user_data);
 void on_combobox13_changed(GtkComboBox * combobox, gpointer user_data);
 void on_combobox14_changed(GtkComboBox * combobox, gpointer user_data);
 void on_combobox15_changed(GtkComboBox * combobox, gpointer user_data);
-
+void on_combobox16_changed(GtkComboBox * combobox, gpointer user_data);
 void on_colorbutton1_color_set(GtkColorButton *colorbutton, gpointer user_data);
 void on_colorbutton2_color_set(GtkColorButton * colorbutton, gpointer user_data);
 void on_colorbutton3_color_set(GtkColorButton * colorbutton, gpointer user_data);
@@ -61,9 +67,20 @@ void on_colorbutton5_color_set(GtkColorButton * colorbutton, gpointer user_data)
 
 void on_dialog_prefs_response(GtkDialog * dialog, gint response_id, gpointer user_data);
 
-
 void gui_setup_preferences_dialog(void);
 
+void on_colorbutton6_color_set(GtkColorButton * colorbutton, gpointer user_data);
+void on_colorbutton7_color_set(GtkColorButton * colorbutton, gpointer user_data);
+void on_checkbutton10_toggled(GtkToggleButton * togglebutton, gpointer user_data);
+void on_checkbutton11_toggled(GtkToggleButton * togglebutton, gpointer user_data);
+void on_checkbutton12_toggled(GtkToggleButton * togglebutton, gpointer user_data);
+void on_checkbutton_scroll_toggled(GtkToggleButton * togglebutton, gpointer user_data);
+void on_checkbutton_imageresize_toggled(GtkToggleButton * togglebutton, gpointer user_data);
+void on_checkbutton_versehighlight_toggled(GtkToggleButton * togglebutton, gpointer user_data);
+void on_checkbutton_doublespace_toggled(GtkToggleButton * togglebutton, gpointer user_data);
+void on_checkbutton_prayerlist_toggled(GtkToggleButton * togglebutton, gpointer user_data);
+void on_basecombobox1_changed(GtkComboBox * combobox, gpointer user_data);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/gui/search_dialog.h b/src/gui/search_dialog.h
index 99eb9b8..34abcba 100644
--- a/src/gui/search_dialog.h
+++ b/src/gui/search_dialog.h
@@ -25,7 +25,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include <gnome.h>	
+#include <gtk/gtk.h>	
 
 
 typedef struct _search_dialog1 SEARCH_DIALOG1;
@@ -107,6 +107,32 @@ extern gchar *verse_selected;
 
 void gui_create_search_dialog(void);
 void gui_set_drop_target(GtkWidget * target);
+void on_comboboxentry2_changed(GtkComboBox * combobox, gpointer user_data);
+void button_clean(GtkButton * button, gpointer user_data);
+void button_save(GtkButton * button, gpointer user_data);
+void button_export(GtkButton * button, gpointer user_data);
+void _on_destroy(GtkWidget * dialog, gpointer user_data);
+void on_button_begin_search(GtkButton * button, gpointer user_data);
+void on_togglebutton_show_main(GtkToggleButton * togglebutton, gpointer user_data);
+void list_name_changed(GtkEditable * editable, gpointer user_data);
+void range_name_changed(GtkEditable * editable, gpointer user_data);
+void range_text_changed(GtkEditable * editable, gpointer user_data);
+void new_modlist(GtkButton * button, gpointer user_data);
+void clear_modules(GtkButton * button, gpointer user_data);
+void delete_module(GtkButton * button, gpointer user_data);
+void save_modlist(GtkButton * button, gpointer user_data);
+void new_range(GtkButton * button, gpointer user_data);
+void save_range(GtkButton * button, gpointer user_data);
+void delete_range(GtkButton * button, gpointer user_data);
+void delete_list(GtkButton * button, gpointer user_data);
+void scope_toggled(GtkToggleButton * togglebutton, gpointer user_data);
+void mod_list_toggled(GtkToggleButton * togglebutton, gpointer user_data);
+void current_module_toggled(GtkToggleButton * togglebutton, gpointer user_data);
+gboolean _on_button_release_event(GtkWidget * widget, GdkEventButton * event, gpointer data);
+void on_closebutton2_clicked(GtkButton * button, gpointer user_data);
+void _on_dialog2_response(GtkDialog * dialog, gint response_id, gpointer user_data);
+void on_toolbutton12_clicked(GtkToolButton * toolbutton, gpointer user_data);
+void _on_dialog_response(GtkDialog * dialog, gint response_id, gpointer user_data);
 
 #ifdef __cplusplus
 }
diff --git a/src/gui/search_sidebar.h b/src/gui/search_sidebar.h
index 33976bd..f3b9b58 100644
--- a/src/gui/search_sidebar.h
+++ b/src/gui/search_sidebar.h
@@ -25,7 +25,6 @@
 #ifdef __cplusplus
 extern "C" {
 #endif	
-//#include <gnome.h>
 	
 typedef struct _sidebar_search SIDESEARCH;
 struct _sidebar_search {
diff --git a/src/gui/sidebar.h b/src/gui/sidebar.h
index 4e7db49..eadea6d 100644
--- a/src/gui/sidebar.h
+++ b/src/gui/sidebar.h
@@ -56,6 +56,8 @@ struct _search_results {
 };
 
 extern GList *list_of_verses;
+extern GtkListStore *model_verselist;
+extern gboolean is_search_result;
 
 #ifdef USE_TREEVIEW_PATH
 void gui_collapse_treeview_to_book (GtkTreeView * tree, const gchar * book_name);
@@ -73,6 +75,24 @@ gboolean vpaned_srch_rslt_button_release_event(GtkWidget * widget,
 					       GdkEventButton * event,
 					       gpointer user_data);
 void gui_show_previewer_in_sidebar(gint choice);
+void  gui_sync_module_treeview(gint direction);
+void on_save_list_as_a_single_bookmark_activate (GtkMenuItem * menuitem, gpointer user_data);
+void on_save_list_as_a_series_of_bookmarks_activate (GtkMenuItem * menuitem, gpointer user_data);
+GtkWidget *create_results_menu(void);
+void on_open_in_dialog_activate(GtkMenuItem * menuitem,
+				gpointer user_data);
+void on_open_in_tab_activate2(GtkMenuItem * menuitem,
+			     gpointer user_data);
+void on_about2_activate(GtkMenuItem * menuitem,
+			gpointer user_data);
+void on_simple_activate(GtkMenuItem *menuitem, gpointer user_data);
+void on_subject_activate(GtkMenuItem *menuitem, gpointer user_data);
+void on_monthly_activate(GtkMenuItem *menuitem, gpointer user_data);
+void on_journal_activate(GtkMenuItem *menuitem, gpointer user_data);
+void on_outlined_topic_activate(GtkMenuItem *menuitem, gpointer user_data);
+GtkWidget *create_menu_prayerlist(void);
+void on_edit_activate(GtkMenuItem *menuitem, gpointer user_data);
+GtkWidget *create_menu_prayerlist_mod(void);
 
 #ifdef __cplusplus
 }
diff --git a/src/gui/splash.h b/src/gui/splash.h
index 5d4939b..44d0ea9 100644
--- a/src/gui/splash.h
+++ b/src/gui/splash.h
@@ -27,7 +27,8 @@ GtkType l##_get_type(void)\
 }
 
 void gui_splash_init(void);
-void gui_splash_done(void);
+gboolean gui_splash_done(void);
 void gui_splash_step(gchar *text, gdouble progress, gint step);
+gboolean expose_event_callback (GtkWidget *widget, GdkEventExpose *event, gpointer data);
 
 #endif
diff --git a/src/gui/tabbed_browser.h b/src/gui/tabbed_browser.h
index 39cd486..2a6e916 100644
--- a/src/gui/tabbed_browser.h
+++ b/src/gui/tabbed_browser.h
@@ -26,7 +26,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include <gnome.h>
+#include <gtk/gtk.h>
 #include "main/tab_history.h"
 
 #define	TABHISTORYLENGTH	25
@@ -102,6 +102,12 @@ void on_notebook_main_new_tab_clicked(GtkButton *button, gpointer user_data);
 
 extern gboolean change_tabs_no_redisplay;
 
+void gui_recompute_shows(void);
+void gui_recompute_view_menu_choices(void);
+void setup_book_editor_tab(PASSAGE_TAB_INFO *pt);
+GString *pick_tab_label(PASSAGE_TAB_INFO *pt);
+void gui_notebook_main_switch_page(GtkNotebook * notebook, GtkNotebookPage * page, gint page_num, GList **tl);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/gui/treekey-editor.h b/src/gui/treekey-editor.h
index 750460d..ae9dc2b 100644
--- a/src/gui/treekey-editor.h
+++ b/src/gui/treekey-editor.h
@@ -28,6 +28,7 @@ extern "C"
 #endif
 
 GtkWidget *gui_create_editor_tree(EDITOR * editor);
+GtkWidget *create_edit_tree_menu (EDITOR * editor);
 
 #ifdef __cplusplus
 }
diff --git a/src/gui/utilities.h b/src/gui/utilities.h
index 1efcc56..fa3183a 100644
--- a/src/gui/utilities.h
+++ b/src/gui/utilities.h
@@ -26,9 +26,10 @@
 extern "C" {
 #endif
 	
-#include <gnome.h>
+#include <libxml/parser.h>
 #include "main/configs.h"
 #include "main/module_dialogs.h"
+#include <gsf/gsf-outfile.h>
 
 gint gui_of2tf(const gchar * on_off);
 gchar *gui_tf2of(gint true_false);
@@ -48,12 +49,8 @@ void gui_load_module_tree(GtkWidget * tree);
 MOD_FONT *get_font(gchar * mod_name);
 void free_font(MOD_FONT *mf);
 gchar * remove_linefeeds(gchar * buf);	
-void gui_add_item2gnome_menu(GtkWidget * MainFrm, gchar * itemname,
-     gchar * itemdata, gchar * submenuname, GCallback mycallback);
-void gui_add_separator2menu(GtkWidget * MainFrm, gchar * subtreelabel);
 void gui_add_mods_to_menus(GList * modlist, gchar * menu,
 					GCallback callback);
-void gui_remove_menu_items(gchar *startitem, gint numberofitems);
 void gui_add_mods_2_gtk_menu(gint mod_type, GtkWidget * menu,
 				GCallback callback);
 gchar *ncr_to_utf8(gchar * text);
@@ -77,11 +74,26 @@ void language_make_list(GList *modlist,
 			GtkTreeIter *uninstalled,
 			void (*add)(GtkTreeModel *, GtkTreeIter, gchar **));
 
-char *image_locator(char *image);
+char *image_locator(const char *image);
 GtkWidget *pixmap_finder(char *image);
-GdkPixbuf *pixbuf_finder(char *image, GError **error);
+GdkPixbuf *pixbuf_finder(const char *image, int size, GError **error);
 
 void HtmlOutput(char *text, GtkWidget *gtkText, MOD_FONT *mf, char *anchor);
+void set_window_icon(GtkWindow *window);
+gboolean xiphos_open_default(const gchar *file);
+	
+void archive_addfile(GsfOutfile *output, const gchar *file, const gchar *name);
+void archive_adddir(GsfOutfile *output, gchar *path, const gchar *name);
+void xiphos_create_archive(gchar* conf_file, gchar* datapath, gchar *zip,
+			   const gchar *destination);
+	
+
+#ifdef WIN32
+gchar* xiphos_win32_get_subdir(const gchar *subdir);
+#endif
+void utilities_parse_treeview(xmlNodePtr parent, 
+                              GtkTreeIter * tree_parent, 
+                              GtkTreeModel *model);
 
 enum {
 	LANGSET_BIBLE,
@@ -98,6 +110,8 @@ enum {
 
 #define	LANGSET_COUNT	200
 
+void language_init(void);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/gui/widgets.h b/src/gui/widgets.h
index b3b2400..196051f 100644
--- a/src/gui/widgets.h
+++ b/src/gui/widgets.h
@@ -29,7 +29,7 @@ typedef struct _app_widgets WIDGETS;
 struct  _app_widgets {
 	GtkWidget
 		*app,  /* main form */
-		*appbar, /* gnome status/progress bar */
+		*appbar, /* gtk status/progress bar */
 		*vboxMain, /*  */
 		*page, /*  */
 		*epaned, /* sidebar bar and main panel */
@@ -93,7 +93,7 @@ struct  _app_widgets {
 		*cb_books,
 		
 	/* textview widget */
-		*textview,
+		//*textview,
 	/* listview widget */
 		*listview_dict,
 		*store,
diff --git a/src/main/Makefile.am b/src/main/Makefile.am
index 074bf41..f98536c 100644
--- a/src/main/Makefile.am
+++ b/src/main/Makefile.am
@@ -1,36 +1,3 @@
-
-mozilla_include_subdirs =	\
-	.		\
-	commandhandler  \
-	content		\
-	docshell	\
-	browser		\
-	dom		\
-	fastfind	\
-	find		\
-	gtkembedmoz	\
-	gfx		\
-	layout		\
-	necko		\
-	nspr		\
-	pref		\
-	string		\
-	uriloader	\
-	webbrwsr	\
-	webshell	\
-	widget
-
-INCLUDES =  \
-    -I$(top_srcdir)/src \
-    $(SWORD_CFLAGS) \
-    $(ImageMagick_CFLAGS) \
-    $(GNOME_CFLAGS) \
-    $(GTKHTML_CFLAGS) \
-    $(GECKO_COMPONENT_CFLAGS) \
-    $(addprefix -I$(GECKO_INCLUDE_ROOT)/,$(mozilla_include_subdirs))      \
-    $(GECKO_CFLAGS) \
-    $(UPRINT_CFLAGS)
-
 noinst_LIBRARIES = libmain.a
 
 libmain_a_SOURCES =  \
@@ -59,3 +26,18 @@ libmain_a_SOURCES =  \
     tab_history.c tab_history.h\
     url.cc url.hh\
     xml.c xml.h
+
+libmain_a_CXXFLAGS =  \
+	-I$(top_srcdir)/src \
+	$(XIPHOS_CFLAGS) \
+	$(GECKO_COMPONENT_CFLAGS) \
+	$(GECKO_CFLAGS)
+
+libmain_a_CFLAGS =  \
+	-I$(top_srcdir)/src \
+	$(XIPHOS_CFLAGS) \
+	$(GECKO_COMPONENT_CFLAGS) \
+	$(GECKO_CFLAGS)
+
+EXTRA_DIST = \
+	wscript
diff --git a/src/main/Makefile.in b/src/main/Makefile.in
index 1350fdf..ddb306d 100644
--- a/src/main/Makefile.in
+++ b/src/main/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 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.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@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
@@ -37,62 +39,101 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gecko.m4 \
 	$(top_srcdir)/m4/gnome-doc-utils.m4 \
-	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in
+	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 LIBRARIES = $(noinst_LIBRARIES)
 ARFLAGS = cru
+AM_V_AR = $(am__v_AR_$(V))
+am__v_AR_ = $(am__v_AR_$(AM_DEFAULT_VERBOSITY))
+am__v_AR_0 = @echo "  AR    " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
 libmain_a_AR = $(AR) $(ARFLAGS)
 libmain_a_LIBADD =
-am_libmain_a_OBJECTS = configs.$(OBJEXT) display.$(OBJEXT) \
-	export_passage.$(OBJEXT) global_ops.$(OBJEXT) lists.$(OBJEXT) \
-	main.$(OBJEXT) module_dialogs.$(OBJEXT) modulecache.$(OBJEXT) \
-	mod_mgr.$(OBJEXT) navbar.$(OBJEXT) navbar_book.$(OBJEXT) \
-	navbar_book_dialog.$(OBJEXT) navbar_versekey.$(OBJEXT) \
-	parallel_view.$(OBJEXT) prayerlists.$(OBJEXT) \
-	previewer.$(OBJEXT) search_dialog.$(OBJEXT) \
-	search_sidebar.$(OBJEXT) settings.$(OBJEXT) sidebar.$(OBJEXT) \
-	sword.$(OBJEXT) sword_treekey.$(OBJEXT) tab_history.$(OBJEXT) \
-	url.$(OBJEXT) xml.$(OBJEXT)
+am_libmain_a_OBJECTS = libmain_a-configs.$(OBJEXT) \
+	libmain_a-display.$(OBJEXT) libmain_a-export_passage.$(OBJEXT) \
+	libmain_a-global_ops.$(OBJEXT) libmain_a-lists.$(OBJEXT) \
+	libmain_a-main.$(OBJEXT) libmain_a-module_dialogs.$(OBJEXT) \
+	libmain_a-modulecache.$(OBJEXT) libmain_a-mod_mgr.$(OBJEXT) \
+	libmain_a-navbar.$(OBJEXT) libmain_a-navbar_book.$(OBJEXT) \
+	libmain_a-navbar_book_dialog.$(OBJEXT) \
+	libmain_a-navbar_versekey.$(OBJEXT) \
+	libmain_a-parallel_view.$(OBJEXT) \
+	libmain_a-prayerlists.$(OBJEXT) libmain_a-previewer.$(OBJEXT) \
+	libmain_a-search_dialog.$(OBJEXT) \
+	libmain_a-search_sidebar.$(OBJEXT) \
+	libmain_a-settings.$(OBJEXT) libmain_a-sidebar.$(OBJEXT) \
+	libmain_a-sword.$(OBJEXT) libmain_a-sword_treekey.$(OBJEXT) \
+	libmain_a-tab_history.$(OBJEXT) libmain_a-url.$(OBJEXT) \
+	libmain_a-xml.$(OBJEXT)
 libmain_a_OBJECTS = $(am_libmain_a_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 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)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=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    " $@;
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=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  " $@;
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CXXFLAGS) $(CXXFLAGS)
+AM_V_CXX = $(am__v_CXX_$(V))
+am__v_CXX_ = $(am__v_CXX_$(AM_DEFAULT_VERBOSITY))
+am__v_CXX_0 = @echo "  CXX   " $@;
 CXXLD = $(CXX)
-CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CXXLD = $(am__v_CXXLD_$(V))
+am__v_CXXLD_ = $(am__v_CXXLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CXXLD_0 = @echo "  CXXLD " $@;
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
 SOURCES = $(libmain_a_SOURCES)
 DIST_SOURCES = $(libmain_a_SOURCES)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
+ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AM_LDFLAGS = @AM_LDFLAGS@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-A_CPPFLAGS = @A_CPPFLAGS@
 BONOBO_IDL_INCLUDES = @BONOBO_IDL_INCLUDES@
 CATALOGS = @CATALOGS@
 CATOBJEXT = @CATOBJEXT@
@@ -110,17 +151,16 @@ DATADIRNAME = @DATADIRNAME@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DIRS = @DIRS@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
 DOC_USER_FORMATS = @DOC_USER_FORMATS@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
-EDITOR_CFLAGS = @EDITOR_CFLAGS@
-EDITOR_LIBS = @EDITOR_LIBS@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
 GECKO = @GECKO@
 GECKO_COMPONENT_CFLAGS = @GECKO_COMPONENT_CFLAGS@
 GECKO_COMPONENT_LIBS = @GECKO_COMPONENT_LIBS@
@@ -133,57 +173,26 @@ GECKO_PREFIX = @GECKO_PREFIX@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
-GNOME_CFLAGS = @GNOME_CFLAGS@
-GNOME_LIBS = @GNOME_LIBS@
 GREP = @GREP@
-GTKHTML_314_presence_CFLAGS = @GTKHTML_314_presence_CFLAGS@
-GTKHTML_314_presence_LIBS = @GTKHTML_314_presence_LIBS@
-GTKHTML_38_presence_CFLAGS = @GTKHTML_38_presence_CFLAGS@
-GTKHTML_38_presence_LIBS = @GTKHTML_38_presence_LIBS@
-GTKHTML_CFLAGS = @GTKHTML_CFLAGS@
 GTKHTML_DATA_DIR = @GTKHTML_DATA_DIR@
-GTKHTML_LIBS = @GTKHTML_LIBS@
 HELP_DIR = @HELP_DIR@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PREFIX = @INSTALL_PREFIX@
 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_ICONV = @INTLTOOL_ICONV@
-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
-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_SERVICE_RULE = @INTLTOOL_SERVICE_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_XGETTEXT = @INTLTOOL_XGETTEXT@
-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
-ImageMagick_CFLAGS = @ImageMagick_CFLAGS@
-ImageMagick_LIBS = @ImageMagick_LIBS@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
@@ -192,22 +201,18 @@ MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 MSGFMT_OPTS = @MSGFMT_OPTS@
-NO_PREFIX_PACKAGE_DATA_DIR = @NO_PREFIX_PACKAGE_DATA_DIR@
-NO_PREFIX_PACKAGE_DOC_DIR = @NO_PREFIX_PACKAGE_DOC_DIR@
-NO_PREFIX_PACKAGE_HELP_DIR = @NO_PREFIX_PACKAGE_HELP_DIR@
-NO_PREFIX_PACKAGE_MENU_DIR = @NO_PREFIX_PACKAGE_MENU_DIR@
-NO_PREFIX_PACKAGE_PIXMAPS_DIR = @NO_PREFIX_PACKAGE_PIXMAPS_DIR@
+MSGMERGE = @MSGMERGE@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 OMF_DIR = @OMF_DIR@
 ORBIT_IDL = @ORBIT_IDL@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_DATA_DIR = @PACKAGE_DATA_DIR@
-PACKAGE_DOC_DIR = @PACKAGE_DOC_DIR@
-PACKAGE_HELP_DIR = @PACKAGE_HELP_DIR@
-PACKAGE_MENU_DIR = @PACKAGE_MENU_DIR@
 PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_PIXMAPS_DIR = @PACKAGE_PIXMAPS_DIR@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
@@ -218,28 +223,24 @@ POSUB = @POSUB@
 PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
 PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
 RANLIB = @RANLIB@
-SCROLLKEEPER_BUILD_REQUIRED = @SCROLLKEEPER_BUILD_REQUIRED@
-SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-SWORD_CFLAGS = @SWORD_CFLAGS@
-SWORD_LIBS = @SWORD_LIBS@
-SWORD_MULTIVERSE_CFLAGS = @SWORD_MULTIVERSE_CFLAGS@
-SWORD_MULTIVERSE_LIBS = @SWORD_MULTIVERSE_LIBS@
-UPRINT_CFLAGS = @UPRINT_CFLAGS@
-UPRINT_LIBS = @UPRINT_LIBS@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
+WARN_CFLAGS = @WARN_CFLAGS@
+WARN_CXXFLAGS = @WARN_CXXFLAGS@
 XGETTEXT = @XGETTEXT@
+XIPHOS_CFLAGS = @XIPHOS_CFLAGS@
+XIPHOS_LIBS = @XIPHOS_LIBS@
 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@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -270,6 +271,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -282,43 +284,10 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-tooltiptext_CFLAGS = @tooltiptext_CFLAGS@
-tooltiptext_LIBS = @tooltiptext_LIBS@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 xiphos_exec = @xiphos_exec@
-mozilla_include_subdirs = \
-	.		\
-	commandhandler  \
-	content		\
-	docshell	\
-	browser		\
-	dom		\
-	fastfind	\
-	find		\
-	gtkembedmoz	\
-	gfx		\
-	layout		\
-	necko		\
-	nspr		\
-	pref		\
-	string		\
-	uriloader	\
-	webbrwsr	\
-	webshell	\
-	widget
-
-INCLUDES = \
-    -I$(top_srcdir)/src \
-    $(SWORD_CFLAGS) \
-    $(ImageMagick_CFLAGS) \
-    $(GNOME_CFLAGS) \
-    $(GTKHTML_CFLAGS) \
-    $(GECKO_COMPONENT_CFLAGS) \
-    $(addprefix -I$(GECKO_INCLUDE_ROOT)/,$(mozilla_include_subdirs))      \
-    $(GECKO_CFLAGS) \
-    $(UPRINT_CFLAGS)
-
 noinst_LIBRARIES = libmain.a
 libmain_a_SOURCES = \
     configs.cc configs.h \
@@ -347,6 +316,21 @@ libmain_a_SOURCES = \
     url.cc url.hh\
     xml.c xml.h
 
+libmain_a_CXXFLAGS = \
+	-I$(top_srcdir)/src \
+	$(XIPHOS_CFLAGS) \
+	$(GECKO_COMPONENT_CFLAGS) \
+	$(GECKO_CFLAGS)
+
+libmain_a_CFLAGS = \
+	-I$(top_srcdir)/src \
+	$(XIPHOS_CFLAGS) \
+	$(GECKO_COMPONENT_CFLAGS) \
+	$(GECKO_CFLAGS)
+
+EXTRA_DIST = \
+	wscript
+
 all: all-am
 
 .SUFFIXES:
@@ -355,14 +339,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( 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/main/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  src/main/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/main/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign src/main/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -380,13 +364,14 @@ $(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):
 
 clean-noinstLIBRARIES:
 	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
 libmain.a: $(libmain_a_OBJECTS) $(libmain_a_DEPENDENCIES) 
-	-rm -f libmain.a
-	$(libmain_a_AR) libmain.a $(libmain_a_OBJECTS) $(libmain_a_LIBADD)
-	$(RANLIB) libmain.a
+	$(AM_V_at)-rm -f libmain.a
+	$(AM_V_AR)$(libmain_a_AR) libmain.a $(libmain_a_OBJECTS) $(libmain_a_LIBADD)
+	$(AM_V_at)$(RANLIB) libmain.a
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -394,74 +379,480 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/configs.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/display.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/export_passage.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/global_ops.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lists.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mod_mgr.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module_dialogs.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/modulecache.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/navbar.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/navbar_book.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/navbar_book_dialog.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/navbar_versekey.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parallel_view.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/prayerlists.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/previewer.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/search_dialog.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/search_sidebar.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/settings.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sidebar.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sword.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sword_treekey.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tab_history.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/url.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xml.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmain_a-configs.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmain_a-display.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmain_a-export_passage.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmain_a-global_ops.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmain_a-lists.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmain_a-main.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmain_a-mod_mgr.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmain_a-module_dialogs.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmain_a-modulecache.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmain_a-navbar.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmain_a-navbar_book.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmain_a-navbar_book_dialog.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmain_a-navbar_versekey.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmain_a-parallel_view.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmain_a-prayerlists.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmain_a-previewer.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmain_a-search_dialog.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmain_a-search_sidebar.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmain_a-settings.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmain_a-sidebar.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmain_a-sword.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmain_a-sword_treekey.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmain_a-tab_history.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmain_a-url.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmain_a-xml.Po@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@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@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@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) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
+libmain_a-main.o: main.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmain_a_CFLAGS) $(CFLAGS) -MT libmain_a-main.o -MD -MP -MF $(DEPDIR)/libmain_a-main.Tpo -c -o libmain_a-main.o `test -f 'main.c' || echo '$(srcdir)/'`main.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmain_a-main.Tpo $(DEPDIR)/libmain_a-main.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='main.c' object='libmain_a-main.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) $(libmain_a_CFLAGS) $(CFLAGS) -c -o libmain_a-main.o `test -f 'main.c' || echo '$(srcdir)/'`main.c
+
+libmain_a-main.obj: main.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmain_a_CFLAGS) $(CFLAGS) -MT libmain_a-main.obj -MD -MP -MF $(DEPDIR)/libmain_a-main.Tpo -c -o libmain_a-main.obj `if test -f 'main.c'; then $(CYGPATH_W) 'main.c'; else $(CYGPATH_W) '$(srcdir)/main.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmain_a-main.Tpo $(DEPDIR)/libmain_a-main.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='main.c' object='libmain_a-main.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) $(libmain_a_CFLAGS) $(CFLAGS) -c -o libmain_a-main.obj `if test -f 'main.c'; then $(CYGPATH_W) 'main.c'; else $(CYGPATH_W) '$(srcdir)/main.c'; fi`
+
+libmain_a-settings.o: settings.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmain_a_CFLAGS) $(CFLAGS) -MT libmain_a-settings.o -MD -MP -MF $(DEPDIR)/libmain_a-settings.Tpo -c -o libmain_a-settings.o `test -f 'settings.c' || echo '$(srcdir)/'`settings.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmain_a-settings.Tpo $(DEPDIR)/libmain_a-settings.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='settings.c' object='libmain_a-settings.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) $(libmain_a_CFLAGS) $(CFLAGS) -c -o libmain_a-settings.o `test -f 'settings.c' || echo '$(srcdir)/'`settings.c
+
+libmain_a-settings.obj: settings.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmain_a_CFLAGS) $(CFLAGS) -MT libmain_a-settings.obj -MD -MP -MF $(DEPDIR)/libmain_a-settings.Tpo -c -o libmain_a-settings.obj `if test -f 'settings.c'; then $(CYGPATH_W) 'settings.c'; else $(CYGPATH_W) '$(srcdir)/settings.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmain_a-settings.Tpo $(DEPDIR)/libmain_a-settings.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='settings.c' object='libmain_a-settings.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) $(libmain_a_CFLAGS) $(CFLAGS) -c -o libmain_a-settings.obj `if test -f 'settings.c'; then $(CYGPATH_W) 'settings.c'; else $(CYGPATH_W) '$(srcdir)/settings.c'; fi`
+
+libmain_a-tab_history.o: tab_history.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmain_a_CFLAGS) $(CFLAGS) -MT libmain_a-tab_history.o -MD -MP -MF $(DEPDIR)/libmain_a-tab_history.Tpo -c -o libmain_a-tab_history.o `test -f 'tab_history.c' || echo '$(srcdir)/'`tab_history.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmain_a-tab_history.Tpo $(DEPDIR)/libmain_a-tab_history.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tab_history.c' object='libmain_a-tab_history.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) $(libmain_a_CFLAGS) $(CFLAGS) -c -o libmain_a-tab_history.o `test -f 'tab_history.c' || echo '$(srcdir)/'`tab_history.c
+
+libmain_a-tab_history.obj: tab_history.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmain_a_CFLAGS) $(CFLAGS) -MT libmain_a-tab_history.obj -MD -MP -MF $(DEPDIR)/libmain_a-tab_history.Tpo -c -o libmain_a-tab_history.obj `if test -f 'tab_history.c'; then $(CYGPATH_W) 'tab_history.c'; else $(CYGPATH_W) '$(srcdir)/tab_history.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmain_a-tab_history.Tpo $(DEPDIR)/libmain_a-tab_history.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tab_history.c' object='libmain_a-tab_history.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) $(libmain_a_CFLAGS) $(CFLAGS) -c -o libmain_a-tab_history.obj `if test -f 'tab_history.c'; then $(CYGPATH_W) 'tab_history.c'; else $(CYGPATH_W) '$(srcdir)/tab_history.c'; fi`
+
+libmain_a-xml.o: xml.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmain_a_CFLAGS) $(CFLAGS) -MT libmain_a-xml.o -MD -MP -MF $(DEPDIR)/libmain_a-xml.Tpo -c -o libmain_a-xml.o `test -f 'xml.c' || echo '$(srcdir)/'`xml.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmain_a-xml.Tpo $(DEPDIR)/libmain_a-xml.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='xml.c' object='libmain_a-xml.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) $(libmain_a_CFLAGS) $(CFLAGS) -c -o libmain_a-xml.o `test -f 'xml.c' || echo '$(srcdir)/'`xml.c
+
+libmain_a-xml.obj: xml.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmain_a_CFLAGS) $(CFLAGS) -MT libmain_a-xml.obj -MD -MP -MF $(DEPDIR)/libmain_a-xml.Tpo -c -o libmain_a-xml.obj `if test -f 'xml.c'; then $(CYGPATH_W) 'xml.c'; else $(CYGPATH_W) '$(srcdir)/xml.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmain_a-xml.Tpo $(DEPDIR)/libmain_a-xml.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='xml.c' object='libmain_a-xml.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) $(libmain_a_CFLAGS) $(CFLAGS) -c -o libmain_a-xml.obj `if test -f 'xml.c'; then $(CYGPATH_W) 'xml.c'; else $(CYGPATH_W) '$(srcdir)/xml.c'; fi`
+
 .cc.o:
-@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cc.obj:
-@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cc.lo:
-@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
 
+libmain_a-configs.o: configs.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmain_a_CXXFLAGS) $(CXXFLAGS) -MT libmain_a-configs.o -MD -MP -MF $(DEPDIR)/libmain_a-configs.Tpo -c -o libmain_a-configs.o `test -f 'configs.cc' || echo '$(srcdir)/'`configs.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmain_a-configs.Tpo $(DEPDIR)/libmain_a-configs.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='configs.cc' object='libmain_a-configs.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmain_a_CXXFLAGS) $(CXXFLAGS) -c -o libmain_a-configs.o `test -f 'configs.cc' || echo '$(srcdir)/'`configs.cc
+
+libmain_a-configs.obj: configs.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmain_a_CXXFLAGS) $(CXXFLAGS) -MT libmain_a-configs.obj -MD -MP -MF $(DEPDIR)/libmain_a-configs.Tpo -c -o libmain_a-configs.obj `if test -f 'configs.cc'; then $(CYGPATH_W) 'configs.cc'; else $(CYGPATH_W) '$(srcdir)/configs.cc'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmain_a-configs.Tpo $(DEPDIR)/libmain_a-configs.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='configs.cc' object='libmain_a-configs.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmain_a_CXXFLAGS) $(CXXFLAGS) -c -o libmain_a-configs.obj `if test -f 'configs.cc'; then $(CYGPATH_W) 'configs.cc'; else $(CYGPATH_W) '$(srcdir)/configs.cc'; fi`
+
+libmain_a-display.o: display.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmain_a_CXXFLAGS) $(CXXFLAGS) -MT libmain_a-display.o -MD -MP -MF $(DEPDIR)/libmain_a-display.Tpo -c -o libmain_a-display.o `test -f 'display.cc' || echo '$(srcdir)/'`display.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmain_a-display.Tpo $(DEPDIR)/libmain_a-display.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='display.cc' object='libmain_a-display.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmain_a_CXXFLAGS) $(CXXFLAGS) -c -o libmain_a-display.o `test -f 'display.cc' || echo '$(srcdir)/'`display.cc
+
+libmain_a-display.obj: display.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmain_a_CXXFLAGS) $(CXXFLAGS) -MT libmain_a-display.obj -MD -MP -MF $(DEPDIR)/libmain_a-display.Tpo -c -o libmain_a-display.obj `if test -f 'display.cc'; then $(CYGPATH_W) 'display.cc'; else $(CYGPATH_W) '$(srcdir)/display.cc'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmain_a-display.Tpo $(DEPDIR)/libmain_a-display.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='display.cc' object='libmain_a-display.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmain_a_CXXFLAGS) $(CXXFLAGS) -c -o libmain_a-display.obj `if test -f 'display.cc'; then $(CYGPATH_W) 'display.cc'; else $(CYGPATH_W) '$(srcdir)/display.cc'; fi`
+
+libmain_a-export_passage.o: export_passage.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmain_a_CXXFLAGS) $(CXXFLAGS) -MT libmain_a-export_passage.o -MD -MP -MF $(DEPDIR)/libmain_a-export_passage.Tpo -c -o libmain_a-export_passage.o `test -f 'export_passage.cc' || echo '$(srcdir)/'`export_passage.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmain_a-export_passage.Tpo $(DEPDIR)/libmain_a-export_passage.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='export_passage.cc' object='libmain_a-export_passage.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmain_a_CXXFLAGS) $(CXXFLAGS) -c -o libmain_a-export_passage.o `test -f 'export_passage.cc' || echo '$(srcdir)/'`export_passage.cc
+
+libmain_a-export_passage.obj: export_passage.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmain_a_CXXFLAGS) $(CXXFLAGS) -MT libmain_a-export_passage.obj -MD -MP -MF $(DEPDIR)/libmain_a-export_passage.Tpo -c -o libmain_a-export_passage.obj `if test -f 'export_passage.cc'; then $(CYGPATH_W) 'export_passage.cc'; else $(CYGPATH_W) '$(srcdir)/export_passage.cc'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmain_a-export_passage.Tpo $(DEPDIR)/libmain_a-export_passage.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='export_passage.cc' object='libmain_a-export_passage.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmain_a_CXXFLAGS) $(CXXFLAGS) -c -o libmain_a-export_passage.obj `if test -f 'export_passage.cc'; then $(CYGPATH_W) 'export_passage.cc'; else $(CYGPATH_W) '$(srcdir)/export_passage.cc'; fi`
+
+libmain_a-global_ops.o: global_ops.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmain_a_CXXFLAGS) $(CXXFLAGS) -MT libmain_a-global_ops.o -MD -MP -MF $(DEPDIR)/libmain_a-global_ops.Tpo -c -o libmain_a-global_ops.o `test -f 'global_ops.cc' || echo '$(srcdir)/'`global_ops.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmain_a-global_ops.Tpo $(DEPDIR)/libmain_a-global_ops.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='global_ops.cc' object='libmain_a-global_ops.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmain_a_CXXFLAGS) $(CXXFLAGS) -c -o libmain_a-global_ops.o `test -f 'global_ops.cc' || echo '$(srcdir)/'`global_ops.cc
+
+libmain_a-global_ops.obj: global_ops.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmain_a_CXXFLAGS) $(CXXFLAGS) -MT libmain_a-global_ops.obj -MD -MP -MF $(DEPDIR)/libmain_a-global_ops.Tpo -c -o libmain_a-global_ops.obj `if test -f 'global_ops.cc'; then $(CYGPATH_W) 'global_ops.cc'; else $(CYGPATH_W) '$(srcdir)/global_ops.cc'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmain_a-global_ops.Tpo $(DEPDIR)/libmain_a-global_ops.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='global_ops.cc' object='libmain_a-global_ops.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmain_a_CXXFLAGS) $(CXXFLAGS) -c -o libmain_a-global_ops.obj `if test -f 'global_ops.cc'; then $(CYGPATH_W) 'global_ops.cc'; else $(CYGPATH_W) '$(srcdir)/global_ops.cc'; fi`
+
+libmain_a-lists.o: lists.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmain_a_CXXFLAGS) $(CXXFLAGS) -MT libmain_a-lists.o -MD -MP -MF $(DEPDIR)/libmain_a-lists.Tpo -c -o libmain_a-lists.o `test -f 'lists.cc' || echo '$(srcdir)/'`lists.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmain_a-lists.Tpo $(DEPDIR)/libmain_a-lists.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lists.cc' object='libmain_a-lists.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmain_a_CXXFLAGS) $(CXXFLAGS) -c -o libmain_a-lists.o `test -f 'lists.cc' || echo '$(srcdir)/'`lists.cc
+
+libmain_a-lists.obj: lists.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmain_a_CXXFLAGS) $(CXXFLAGS) -MT libmain_a-lists.obj -MD -MP -MF $(DEPDIR)/libmain_a-lists.Tpo -c -o libmain_a-lists.obj `if test -f 'lists.cc'; then $(CYGPATH_W) 'lists.cc'; else $(CYGPATH_W) '$(srcdir)/lists.cc'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmain_a-lists.Tpo $(DEPDIR)/libmain_a-lists.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lists.cc' object='libmain_a-lists.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmain_a_CXXFLAGS) $(CXXFLAGS) -c -o libmain_a-lists.obj `if test -f 'lists.cc'; then $(CYGPATH_W) 'lists.cc'; else $(CYGPATH_W) '$(srcdir)/lists.cc'; fi`
+
+libmain_a-module_dialogs.o: module_dialogs.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmain_a_CXXFLAGS) $(CXXFLAGS) -MT libmain_a-module_dialogs.o -MD -MP -MF $(DEPDIR)/libmain_a-module_dialogs.Tpo -c -o libmain_a-module_dialogs.o `test -f 'module_dialogs.cc' || echo '$(srcdir)/'`module_dialogs.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmain_a-module_dialogs.Tpo $(DEPDIR)/libmain_a-module_dialogs.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='module_dialogs.cc' object='libmain_a-module_dialogs.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmain_a_CXXFLAGS) $(CXXFLAGS) -c -o libmain_a-module_dialogs.o `test -f 'module_dialogs.cc' || echo '$(srcdir)/'`module_dialogs.cc
+
+libmain_a-module_dialogs.obj: module_dialogs.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmain_a_CXXFLAGS) $(CXXFLAGS) -MT libmain_a-module_dialogs.obj -MD -MP -MF $(DEPDIR)/libmain_a-module_dialogs.Tpo -c -o libmain_a-module_dialogs.obj `if test -f 'module_dialogs.cc'; then $(CYGPATH_W) 'module_dialogs.cc'; else $(CYGPATH_W) '$(srcdir)/module_dialogs.cc'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmain_a-module_dialogs.Tpo $(DEPDIR)/libmain_a-module_dialogs.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='module_dialogs.cc' object='libmain_a-module_dialogs.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmain_a_CXXFLAGS) $(CXXFLAGS) -c -o libmain_a-module_dialogs.obj `if test -f 'module_dialogs.cc'; then $(CYGPATH_W) 'module_dialogs.cc'; else $(CYGPATH_W) '$(srcdir)/module_dialogs.cc'; fi`
+
+libmain_a-modulecache.o: modulecache.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmain_a_CXXFLAGS) $(CXXFLAGS) -MT libmain_a-modulecache.o -MD -MP -MF $(DEPDIR)/libmain_a-modulecache.Tpo -c -o libmain_a-modulecache.o `test -f 'modulecache.cc' || echo '$(srcdir)/'`modulecache.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmain_a-modulecache.Tpo $(DEPDIR)/libmain_a-modulecache.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='modulecache.cc' object='libmain_a-modulecache.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmain_a_CXXFLAGS) $(CXXFLAGS) -c -o libmain_a-modulecache.o `test -f 'modulecache.cc' || echo '$(srcdir)/'`modulecache.cc
+
+libmain_a-modulecache.obj: modulecache.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmain_a_CXXFLAGS) $(CXXFLAGS) -MT libmain_a-modulecache.obj -MD -MP -MF $(DEPDIR)/libmain_a-modulecache.Tpo -c -o libmain_a-modulecache.obj `if test -f 'modulecache.cc'; then $(CYGPATH_W) 'modulecache.cc'; else $(CYGPATH_W) '$(srcdir)/modulecache.cc'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmain_a-modulecache.Tpo $(DEPDIR)/libmain_a-modulecache.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='modulecache.cc' object='libmain_a-modulecache.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmain_a_CXXFLAGS) $(CXXFLAGS) -c -o libmain_a-modulecache.obj `if test -f 'modulecache.cc'; then $(CYGPATH_W) 'modulecache.cc'; else $(CYGPATH_W) '$(srcdir)/modulecache.cc'; fi`
+
+libmain_a-mod_mgr.o: mod_mgr.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmain_a_CXXFLAGS) $(CXXFLAGS) -MT libmain_a-mod_mgr.o -MD -MP -MF $(DEPDIR)/libmain_a-mod_mgr.Tpo -c -o libmain_a-mod_mgr.o `test -f 'mod_mgr.cc' || echo '$(srcdir)/'`mod_mgr.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmain_a-mod_mgr.Tpo $(DEPDIR)/libmain_a-mod_mgr.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='mod_mgr.cc' object='libmain_a-mod_mgr.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmain_a_CXXFLAGS) $(CXXFLAGS) -c -o libmain_a-mod_mgr.o `test -f 'mod_mgr.cc' || echo '$(srcdir)/'`mod_mgr.cc
+
+libmain_a-mod_mgr.obj: mod_mgr.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmain_a_CXXFLAGS) $(CXXFLAGS) -MT libmain_a-mod_mgr.obj -MD -MP -MF $(DEPDIR)/libmain_a-mod_mgr.Tpo -c -o libmain_a-mod_mgr.obj `if test -f 'mod_mgr.cc'; then $(CYGPATH_W) 'mod_mgr.cc'; else $(CYGPATH_W) '$(srcdir)/mod_mgr.cc'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmain_a-mod_mgr.Tpo $(DEPDIR)/libmain_a-mod_mgr.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='mod_mgr.cc' object='libmain_a-mod_mgr.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmain_a_CXXFLAGS) $(CXXFLAGS) -c -o libmain_a-mod_mgr.obj `if test -f 'mod_mgr.cc'; then $(CYGPATH_W) 'mod_mgr.cc'; else $(CYGPATH_W) '$(srcdir)/mod_mgr.cc'; fi`
+
+libmain_a-navbar.o: navbar.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmain_a_CXXFLAGS) $(CXXFLAGS) -MT libmain_a-navbar.o -MD -MP -MF $(DEPDIR)/libmain_a-navbar.Tpo -c -o libmain_a-navbar.o `test -f 'navbar.cc' || echo '$(srcdir)/'`navbar.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmain_a-navbar.Tpo $(DEPDIR)/libmain_a-navbar.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='navbar.cc' object='libmain_a-navbar.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmain_a_CXXFLAGS) $(CXXFLAGS) -c -o libmain_a-navbar.o `test -f 'navbar.cc' || echo '$(srcdir)/'`navbar.cc
+
+libmain_a-navbar.obj: navbar.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmain_a_CXXFLAGS) $(CXXFLAGS) -MT libmain_a-navbar.obj -MD -MP -MF $(DEPDIR)/libmain_a-navbar.Tpo -c -o libmain_a-navbar.obj `if test -f 'navbar.cc'; then $(CYGPATH_W) 'navbar.cc'; else $(CYGPATH_W) '$(srcdir)/navbar.cc'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmain_a-navbar.Tpo $(DEPDIR)/libmain_a-navbar.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='navbar.cc' object='libmain_a-navbar.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmain_a_CXXFLAGS) $(CXXFLAGS) -c -o libmain_a-navbar.obj `if test -f 'navbar.cc'; then $(CYGPATH_W) 'navbar.cc'; else $(CYGPATH_W) '$(srcdir)/navbar.cc'; fi`
+
+libmain_a-navbar_book.o: navbar_book.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmain_a_CXXFLAGS) $(CXXFLAGS) -MT libmain_a-navbar_book.o -MD -MP -MF $(DEPDIR)/libmain_a-navbar_book.Tpo -c -o libmain_a-navbar_book.o `test -f 'navbar_book.cc' || echo '$(srcdir)/'`navbar_book.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmain_a-navbar_book.Tpo $(DEPDIR)/libmain_a-navbar_book.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='navbar_book.cc' object='libmain_a-navbar_book.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmain_a_CXXFLAGS) $(CXXFLAGS) -c -o libmain_a-navbar_book.o `test -f 'navbar_book.cc' || echo '$(srcdir)/'`navbar_book.cc
+
+libmain_a-navbar_book.obj: navbar_book.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmain_a_CXXFLAGS) $(CXXFLAGS) -MT libmain_a-navbar_book.obj -MD -MP -MF $(DEPDIR)/libmain_a-navbar_book.Tpo -c -o libmain_a-navbar_book.obj `if test -f 'navbar_book.cc'; then $(CYGPATH_W) 'navbar_book.cc'; else $(CYGPATH_W) '$(srcdir)/navbar_book.cc'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmain_a-navbar_book.Tpo $(DEPDIR)/libmain_a-navbar_book.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='navbar_book.cc' object='libmain_a-navbar_book.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmain_a_CXXFLAGS) $(CXXFLAGS) -c -o libmain_a-navbar_book.obj `if test -f 'navbar_book.cc'; then $(CYGPATH_W) 'navbar_book.cc'; else $(CYGPATH_W) '$(srcdir)/navbar_book.cc'; fi`
+
+libmain_a-navbar_book_dialog.o: navbar_book_dialog.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmain_a_CXXFLAGS) $(CXXFLAGS) -MT libmain_a-navbar_book_dialog.o -MD -MP -MF $(DEPDIR)/libmain_a-navbar_book_dialog.Tpo -c -o libmain_a-navbar_book_dialog.o `test -f 'navbar_book_dialog.cc' || echo '$(srcdir)/'`navbar_book_dialog.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmain_a-navbar_book_dialog.Tpo $(DEPDIR)/libmain_a-navbar_book_dialog.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='navbar_book_dialog.cc' object='libmain_a-navbar_book_dialog.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmain_a_CXXFLAGS) $(CXXFLAGS) -c -o libmain_a-navbar_book_dialog.o `test -f 'navbar_book_dialog.cc' || echo '$(srcdir)/'`navbar_book_dialog.cc
+
+libmain_a-navbar_book_dialog.obj: navbar_book_dialog.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmain_a_CXXFLAGS) $(CXXFLAGS) -MT libmain_a-navbar_book_dialog.obj -MD -MP -MF $(DEPDIR)/libmain_a-navbar_book_dialog.Tpo -c -o libmain_a-navbar_book_dialog.obj `if test -f 'navbar_book_dialog.cc'; then $(CYGPATH_W) 'navbar_book_dialog.cc'; else $(CYGPATH_W) '$(srcdir)/navbar_book_dialog.cc'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmain_a-navbar_book_dialog.Tpo $(DEPDIR)/libmain_a-navbar_book_dialog.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='navbar_book_dialog.cc' object='libmain_a-navbar_book_dialog.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmain_a_CXXFLAGS) $(CXXFLAGS) -c -o libmain_a-navbar_book_dialog.obj `if test -f 'navbar_book_dialog.cc'; then $(CYGPATH_W) 'navbar_book_dialog.cc'; else $(CYGPATH_W) '$(srcdir)/navbar_book_dialog.cc'; fi`
+
+libmain_a-navbar_versekey.o: navbar_versekey.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmain_a_CXXFLAGS) $(CXXFLAGS) -MT libmain_a-navbar_versekey.o -MD -MP -MF $(DEPDIR)/libmain_a-navbar_versekey.Tpo -c -o libmain_a-navbar_versekey.o `test -f 'navbar_versekey.cc' || echo '$(srcdir)/'`navbar_versekey.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmain_a-navbar_versekey.Tpo $(DEPDIR)/libmain_a-navbar_versekey.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='navbar_versekey.cc' object='libmain_a-navbar_versekey.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmain_a_CXXFLAGS) $(CXXFLAGS) -c -o libmain_a-navbar_versekey.o `test -f 'navbar_versekey.cc' || echo '$(srcdir)/'`navbar_versekey.cc
+
+libmain_a-navbar_versekey.obj: navbar_versekey.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmain_a_CXXFLAGS) $(CXXFLAGS) -MT libmain_a-navbar_versekey.obj -MD -MP -MF $(DEPDIR)/libmain_a-navbar_versekey.Tpo -c -o libmain_a-navbar_versekey.obj `if test -f 'navbar_versekey.cc'; then $(CYGPATH_W) 'navbar_versekey.cc'; else $(CYGPATH_W) '$(srcdir)/navbar_versekey.cc'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmain_a-navbar_versekey.Tpo $(DEPDIR)/libmain_a-navbar_versekey.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='navbar_versekey.cc' object='libmain_a-navbar_versekey.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmain_a_CXXFLAGS) $(CXXFLAGS) -c -o libmain_a-navbar_versekey.obj `if test -f 'navbar_versekey.cc'; then $(CYGPATH_W) 'navbar_versekey.cc'; else $(CYGPATH_W) '$(srcdir)/navbar_versekey.cc'; fi`
+
+libmain_a-parallel_view.o: parallel_view.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmain_a_CXXFLAGS) $(CXXFLAGS) -MT libmain_a-parallel_view.o -MD -MP -MF $(DEPDIR)/libmain_a-parallel_view.Tpo -c -o libmain_a-parallel_view.o `test -f 'parallel_view.cc' || echo '$(srcdir)/'`parallel_view.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmain_a-parallel_view.Tpo $(DEPDIR)/libmain_a-parallel_view.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='parallel_view.cc' object='libmain_a-parallel_view.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmain_a_CXXFLAGS) $(CXXFLAGS) -c -o libmain_a-parallel_view.o `test -f 'parallel_view.cc' || echo '$(srcdir)/'`parallel_view.cc
+
+libmain_a-parallel_view.obj: parallel_view.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmain_a_CXXFLAGS) $(CXXFLAGS) -MT libmain_a-parallel_view.obj -MD -MP -MF $(DEPDIR)/libmain_a-parallel_view.Tpo -c -o libmain_a-parallel_view.obj `if test -f 'parallel_view.cc'; then $(CYGPATH_W) 'parallel_view.cc'; else $(CYGPATH_W) '$(srcdir)/parallel_view.cc'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmain_a-parallel_view.Tpo $(DEPDIR)/libmain_a-parallel_view.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='parallel_view.cc' object='libmain_a-parallel_view.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmain_a_CXXFLAGS) $(CXXFLAGS) -c -o libmain_a-parallel_view.obj `if test -f 'parallel_view.cc'; then $(CYGPATH_W) 'parallel_view.cc'; else $(CYGPATH_W) '$(srcdir)/parallel_view.cc'; fi`
+
+libmain_a-prayerlists.o: prayerlists.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmain_a_CXXFLAGS) $(CXXFLAGS) -MT libmain_a-prayerlists.o -MD -MP -MF $(DEPDIR)/libmain_a-prayerlists.Tpo -c -o libmain_a-prayerlists.o `test -f 'prayerlists.cc' || echo '$(srcdir)/'`prayerlists.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmain_a-prayerlists.Tpo $(DEPDIR)/libmain_a-prayerlists.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='prayerlists.cc' object='libmain_a-prayerlists.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmain_a_CXXFLAGS) $(CXXFLAGS) -c -o libmain_a-prayerlists.o `test -f 'prayerlists.cc' || echo '$(srcdir)/'`prayerlists.cc
+
+libmain_a-prayerlists.obj: prayerlists.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmain_a_CXXFLAGS) $(CXXFLAGS) -MT libmain_a-prayerlists.obj -MD -MP -MF $(DEPDIR)/libmain_a-prayerlists.Tpo -c -o libmain_a-prayerlists.obj `if test -f 'prayerlists.cc'; then $(CYGPATH_W) 'prayerlists.cc'; else $(CYGPATH_W) '$(srcdir)/prayerlists.cc'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmain_a-prayerlists.Tpo $(DEPDIR)/libmain_a-prayerlists.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='prayerlists.cc' object='libmain_a-prayerlists.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmain_a_CXXFLAGS) $(CXXFLAGS) -c -o libmain_a-prayerlists.obj `if test -f 'prayerlists.cc'; then $(CYGPATH_W) 'prayerlists.cc'; else $(CYGPATH_W) '$(srcdir)/prayerlists.cc'; fi`
+
+libmain_a-previewer.o: previewer.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmain_a_CXXFLAGS) $(CXXFLAGS) -MT libmain_a-previewer.o -MD -MP -MF $(DEPDIR)/libmain_a-previewer.Tpo -c -o libmain_a-previewer.o `test -f 'previewer.cc' || echo '$(srcdir)/'`previewer.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmain_a-previewer.Tpo $(DEPDIR)/libmain_a-previewer.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='previewer.cc' object='libmain_a-previewer.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmain_a_CXXFLAGS) $(CXXFLAGS) -c -o libmain_a-previewer.o `test -f 'previewer.cc' || echo '$(srcdir)/'`previewer.cc
+
+libmain_a-previewer.obj: previewer.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmain_a_CXXFLAGS) $(CXXFLAGS) -MT libmain_a-previewer.obj -MD -MP -MF $(DEPDIR)/libmain_a-previewer.Tpo -c -o libmain_a-previewer.obj `if test -f 'previewer.cc'; then $(CYGPATH_W) 'previewer.cc'; else $(CYGPATH_W) '$(srcdir)/previewer.cc'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmain_a-previewer.Tpo $(DEPDIR)/libmain_a-previewer.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='previewer.cc' object='libmain_a-previewer.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmain_a_CXXFLAGS) $(CXXFLAGS) -c -o libmain_a-previewer.obj `if test -f 'previewer.cc'; then $(CYGPATH_W) 'previewer.cc'; else $(CYGPATH_W) '$(srcdir)/previewer.cc'; fi`
+
+libmain_a-search_dialog.o: search_dialog.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmain_a_CXXFLAGS) $(CXXFLAGS) -MT libmain_a-search_dialog.o -MD -MP -MF $(DEPDIR)/libmain_a-search_dialog.Tpo -c -o libmain_a-search_dialog.o `test -f 'search_dialog.cc' || echo '$(srcdir)/'`search_dialog.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmain_a-search_dialog.Tpo $(DEPDIR)/libmain_a-search_dialog.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='search_dialog.cc' object='libmain_a-search_dialog.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmain_a_CXXFLAGS) $(CXXFLAGS) -c -o libmain_a-search_dialog.o `test -f 'search_dialog.cc' || echo '$(srcdir)/'`search_dialog.cc
+
+libmain_a-search_dialog.obj: search_dialog.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmain_a_CXXFLAGS) $(CXXFLAGS) -MT libmain_a-search_dialog.obj -MD -MP -MF $(DEPDIR)/libmain_a-search_dialog.Tpo -c -o libmain_a-search_dialog.obj `if test -f 'search_dialog.cc'; then $(CYGPATH_W) 'search_dialog.cc'; else $(CYGPATH_W) '$(srcdir)/search_dialog.cc'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmain_a-search_dialog.Tpo $(DEPDIR)/libmain_a-search_dialog.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='search_dialog.cc' object='libmain_a-search_dialog.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmain_a_CXXFLAGS) $(CXXFLAGS) -c -o libmain_a-search_dialog.obj `if test -f 'search_dialog.cc'; then $(CYGPATH_W) 'search_dialog.cc'; else $(CYGPATH_W) '$(srcdir)/search_dialog.cc'; fi`
+
+libmain_a-search_sidebar.o: search_sidebar.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmain_a_CXXFLAGS) $(CXXFLAGS) -MT libmain_a-search_sidebar.o -MD -MP -MF $(DEPDIR)/libmain_a-search_sidebar.Tpo -c -o libmain_a-search_sidebar.o `test -f 'search_sidebar.cc' || echo '$(srcdir)/'`search_sidebar.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmain_a-search_sidebar.Tpo $(DEPDIR)/libmain_a-search_sidebar.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='search_sidebar.cc' object='libmain_a-search_sidebar.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmain_a_CXXFLAGS) $(CXXFLAGS) -c -o libmain_a-search_sidebar.o `test -f 'search_sidebar.cc' || echo '$(srcdir)/'`search_sidebar.cc
+
+libmain_a-search_sidebar.obj: search_sidebar.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmain_a_CXXFLAGS) $(CXXFLAGS) -MT libmain_a-search_sidebar.obj -MD -MP -MF $(DEPDIR)/libmain_a-search_sidebar.Tpo -c -o libmain_a-search_sidebar.obj `if test -f 'search_sidebar.cc'; then $(CYGPATH_W) 'search_sidebar.cc'; else $(CYGPATH_W) '$(srcdir)/search_sidebar.cc'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmain_a-search_sidebar.Tpo $(DEPDIR)/libmain_a-search_sidebar.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='search_sidebar.cc' object='libmain_a-search_sidebar.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmain_a_CXXFLAGS) $(CXXFLAGS) -c -o libmain_a-search_sidebar.obj `if test -f 'search_sidebar.cc'; then $(CYGPATH_W) 'search_sidebar.cc'; else $(CYGPATH_W) '$(srcdir)/search_sidebar.cc'; fi`
+
+libmain_a-sidebar.o: sidebar.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmain_a_CXXFLAGS) $(CXXFLAGS) -MT libmain_a-sidebar.o -MD -MP -MF $(DEPDIR)/libmain_a-sidebar.Tpo -c -o libmain_a-sidebar.o `test -f 'sidebar.cc' || echo '$(srcdir)/'`sidebar.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmain_a-sidebar.Tpo $(DEPDIR)/libmain_a-sidebar.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='sidebar.cc' object='libmain_a-sidebar.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmain_a_CXXFLAGS) $(CXXFLAGS) -c -o libmain_a-sidebar.o `test -f 'sidebar.cc' || echo '$(srcdir)/'`sidebar.cc
+
+libmain_a-sidebar.obj: sidebar.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmain_a_CXXFLAGS) $(CXXFLAGS) -MT libmain_a-sidebar.obj -MD -MP -MF $(DEPDIR)/libmain_a-sidebar.Tpo -c -o libmain_a-sidebar.obj `if test -f 'sidebar.cc'; then $(CYGPATH_W) 'sidebar.cc'; else $(CYGPATH_W) '$(srcdir)/sidebar.cc'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmain_a-sidebar.Tpo $(DEPDIR)/libmain_a-sidebar.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='sidebar.cc' object='libmain_a-sidebar.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmain_a_CXXFLAGS) $(CXXFLAGS) -c -o libmain_a-sidebar.obj `if test -f 'sidebar.cc'; then $(CYGPATH_W) 'sidebar.cc'; else $(CYGPATH_W) '$(srcdir)/sidebar.cc'; fi`
+
+libmain_a-sword.o: sword.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmain_a_CXXFLAGS) $(CXXFLAGS) -MT libmain_a-sword.o -MD -MP -MF $(DEPDIR)/libmain_a-sword.Tpo -c -o libmain_a-sword.o `test -f 'sword.cc' || echo '$(srcdir)/'`sword.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmain_a-sword.Tpo $(DEPDIR)/libmain_a-sword.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='sword.cc' object='libmain_a-sword.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmain_a_CXXFLAGS) $(CXXFLAGS) -c -o libmain_a-sword.o `test -f 'sword.cc' || echo '$(srcdir)/'`sword.cc
+
+libmain_a-sword.obj: sword.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmain_a_CXXFLAGS) $(CXXFLAGS) -MT libmain_a-sword.obj -MD -MP -MF $(DEPDIR)/libmain_a-sword.Tpo -c -o libmain_a-sword.obj `if test -f 'sword.cc'; then $(CYGPATH_W) 'sword.cc'; else $(CYGPATH_W) '$(srcdir)/sword.cc'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmain_a-sword.Tpo $(DEPDIR)/libmain_a-sword.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='sword.cc' object='libmain_a-sword.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmain_a_CXXFLAGS) $(CXXFLAGS) -c -o libmain_a-sword.obj `if test -f 'sword.cc'; then $(CYGPATH_W) 'sword.cc'; else $(CYGPATH_W) '$(srcdir)/sword.cc'; fi`
+
+libmain_a-sword_treekey.o: sword_treekey.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmain_a_CXXFLAGS) $(CXXFLAGS) -MT libmain_a-sword_treekey.o -MD -MP -MF $(DEPDIR)/libmain_a-sword_treekey.Tpo -c -o libmain_a-sword_treekey.o `test -f 'sword_treekey.cc' || echo '$(srcdir)/'`sword_treekey.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmain_a-sword_treekey.Tpo $(DEPDIR)/libmain_a-sword_treekey.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='sword_treekey.cc' object='libmain_a-sword_treekey.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmain_a_CXXFLAGS) $(CXXFLAGS) -c -o libmain_a-sword_treekey.o `test -f 'sword_treekey.cc' || echo '$(srcdir)/'`sword_treekey.cc
+
+libmain_a-sword_treekey.obj: sword_treekey.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmain_a_CXXFLAGS) $(CXXFLAGS) -MT libmain_a-sword_treekey.obj -MD -MP -MF $(DEPDIR)/libmain_a-sword_treekey.Tpo -c -o libmain_a-sword_treekey.obj `if test -f 'sword_treekey.cc'; then $(CYGPATH_W) 'sword_treekey.cc'; else $(CYGPATH_W) '$(srcdir)/sword_treekey.cc'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmain_a-sword_treekey.Tpo $(DEPDIR)/libmain_a-sword_treekey.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='sword_treekey.cc' object='libmain_a-sword_treekey.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmain_a_CXXFLAGS) $(CXXFLAGS) -c -o libmain_a-sword_treekey.obj `if test -f 'sword_treekey.cc'; then $(CYGPATH_W) 'sword_treekey.cc'; else $(CYGPATH_W) '$(srcdir)/sword_treekey.cc'; fi`
+
+libmain_a-url.o: url.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmain_a_CXXFLAGS) $(CXXFLAGS) -MT libmain_a-url.o -MD -MP -MF $(DEPDIR)/libmain_a-url.Tpo -c -o libmain_a-url.o `test -f 'url.cc' || echo '$(srcdir)/'`url.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmain_a-url.Tpo $(DEPDIR)/libmain_a-url.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='url.cc' object='libmain_a-url.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmain_a_CXXFLAGS) $(CXXFLAGS) -c -o libmain_a-url.o `test -f 'url.cc' || echo '$(srcdir)/'`url.cc
+
+libmain_a-url.obj: url.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmain_a_CXXFLAGS) $(CXXFLAGS) -MT libmain_a-url.obj -MD -MP -MF $(DEPDIR)/libmain_a-url.Tpo -c -o libmain_a-url.obj `if test -f 'url.cc'; then $(CYGPATH_W) 'url.cc'; else $(CYGPATH_W) '$(srcdir)/url.cc'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmain_a-url.Tpo $(DEPDIR)/libmain_a-url.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='url.cc' object='libmain_a-url.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmain_a_CXXFLAGS) $(CXXFLAGS) -c -o libmain_a-url.obj `if test -f 'url.cc'; then $(CYGPATH_W) 'url.cc'; else $(CYGPATH_W) '$(srcdir)/url.cc'; fi`
+
 mostlyclean-libtool:
 	-rm -f *.lo
 
@@ -473,45 +864,49 @@ ID: $(HEADERS) $(SOURCES) $(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; } \
-	       END { for (i in files) print i; }'`; \
+	  $(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)
-	tags=; \
+	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; } \
-	       END { for (i in files) print i; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  $(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; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  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)
-	tags=; \
-	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; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  $(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) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -532,13 +927,17 @@ distdir: $(DISTFILES)
 	  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 -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -566,6 +965,7 @@ 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"
@@ -587,6 +987,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -595,18 +997,28 @@ install-data-am:
 
 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
@@ -644,6 +1056,7 @@ uninstall-am:
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
 	pdf pdf-am ps ps-am tags 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/src/main/display.cc b/src/main/display.cc
index 04d654f..18f5b82 100644
--- a/src/main/display.cc
+++ b/src/main/display.cc
@@ -24,6 +24,8 @@
 #endif
 
 #include <glib.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
 #include <osishtmlhref.h>
 #include <osisvariants.h>
 #include <thmlvariants.h>
@@ -35,13 +37,12 @@
 #include <string.h>
 #include <ctype.h>
 #include <assert.h>
-#include <Magick++.h>
 
 #ifndef WIN32
 #include <sys/socket.h>
 #include <netinet/in.h>
 #else
-#include <Winsock2.h>
+#include <winsock2.h>
 #endif /* !WIN32 */
 #include <errno.h>
 
@@ -61,7 +62,11 @@
 # ifdef PACKAGE_VERSION
 #  undef PACKAGE_VERSION
 # endif
+#ifdef WIN32
+#include "geckowin/gecko-html.h"
+#else
 #include "gecko/gecko-html.h"
+#endif /* WIN32 */
 #else
 #ifdef __cplusplus
 extern "C" {
@@ -84,6 +89,8 @@ extern "C" {
 
 #include "backend/sword_main.hh"
 
+#include "gui/debug_glib_null.h"
+
 // for one-time content rendering.
 extern ModuleCache::CacheMap ModuleMap;
 
@@ -123,66 +130,16 @@ int marked_cache_chapter = -1;
 
 using namespace sword;
 using namespace std;
-using namespace Magick;
-
-#if 1
-// The easy ImageMagick API solution in Linux/UNIX environments.
 
 int
 ImageDimensions(const char *path, int *x, int *y)
 {
-	try {
-		Image image(path);
-		*x = image.baseColumns();
-		*y = image.baseRows();
+
+	if (gdk_pixbuf_get_file_info (path, x, y))
 		return 0;
-	}
-	catch (Exception &error_) {
-		GS_warning(("Caught exception: %s", error_.what()));
+	else
 		return -1;
-	}
 }
-#else
-// The ugly "shell command for `identify'" solution.
-
-// shell command to obtain size spec: prints exactly "123x456".
-// bad accommodation to Solaris (old sed): we cannot use \(this\|that\|other\).
-#define	IDENTIFY	"identify \"%s\" 2>&1 | head -1 | sed -e \"s/^.*BMP //\" -e \"s/^.*GIF //\" -e \"s/^.*JPEG //\" -e \"s/^.*PNG //\" -e \"s/ .*$//\""
-
-int
-ImageDimensions(const char *path, int *x, int *y)
-{
-	char buf[350];	// enough for path+100 bytes of command.
-	FILE *result;
-	int retval = 0;
-
-	if (strlen(path) > 250) {		// um...no.  forget it.
-		*x = *y = 1;
-		return -1;
-	}
-
-	sprintf(buf, IDENTIFY, path);
-	if (((result = popen(buf, "r")) == NULL) ||	// can't run.
-	    (fgets(buf, 384, result) == NULL)    ||	// can't read.
-	    (buf[0] < '0')                       ||	// not ...
-	    (buf[0] > '9'))   {				// ... numeric.
-		*x = *y = 1;
-		retval = -1;
-		goto out;
-	}
-	sscanf(buf, "%dx%d\n", x, y);
-
-	// cancel absurdities.
-	if ((*x < 1) || (*x > 5000))
-		*x = 1;
-	if ((*y < 1) || (*y > 5000))
-		*y = 1;
-
-out:
-	pclose(result);
-	return retval;
-}
-#endif
 
 //
 // user annotation cache filling.
@@ -208,8 +165,9 @@ struct replace {
 void
 marked_cache_fill(gchar *modname, gchar *key)
 {
-	gchar *s, *t, *err;
-	char *key_book;
+	gchar *s, *t, *err, *mhold;
+	char *key_book = g_strdup(main_get_osisref_from_key((const char *)modname,
+							    (const char *)key));
 	int key_chapter, key_verse;
 
 	// free the old cache.  first free contents, then the map itself.
@@ -224,14 +182,11 @@ marked_cache_fill(gchar *modname, gchar *key)
 	}
 	marked_cache.clear();
 
-	// tear apart the key
-	key_book = g_strdup(key);
-	*(s = strrchr(key_book, ' ')) = '\0';
-	t = ++s;
-	s = strchr(t, ':');
-	*(s++) = '\0';
-	key_chapter = atoi(t);
-	key_verse   = atoi(s);
+	// tear apart the key (e.g. "Gen.1.1").
+	*(s = strrchr(key_book, '.')) = '\0';
+	*(t = strrchr(key_book, '.')) = '\0';
+	key_chapter = atoi(t+1);
+	key_verse   = atoi(s+1);
 
 	// remember exactly what chapter this cache is for
 	g_free(marked_cache_modname);
@@ -242,7 +197,7 @@ marked_cache_fill(gchar *modname, gchar *key)
 
 	// load up the annotation content
 	marked_element *e = new marked_element;
-    	if (xml_set_section_ptr("markedverses") && xml_get_label()) {
+    	if (xml_set_section_ptr("osisrefmarkedverses") && xml_get_label()) {
 		do {
 			e->module = xml_get_label();
 			s = xml_get_list();
@@ -250,22 +205,25 @@ marked_cache_fill(gchar *modname, gchar *key)
 			g_free(s);
 
 			gchar *m = e->module;
+			mhold = g_strdup(m);
 
-			// tear apart "NASB Revelation of John 1:1"
-			if ((s = strrchr(m, ' ')) == NULL)	// rightmost space
+			// tear apart "NASB Gen.1.1"
+			if ((s = strrchr(m, '.')) == NULL)	// rightmost dot
 				goto fail;
 			*s = '\0';
-			if ((s = strchr((t = s+1), ':')) == NULL) // chapter:verse
+			if ((t = strrchr(m, '.')) == NULL)	// chapter:verse
 				goto fail;
-			*(s++) = '\0';
-			e->chapter = atoi(t);
-			e->verse   = atoi(s);
+			*t = '\0';
+			e->chapter = atoi(t+1);
+			e->verse   = atoi(s+1);
 			if ((s = strchr(m, ' ')) == NULL)	// leftmost space
 				goto fail;
 			*(s++) = '\0';
 			e->book = s;
 			// now properly delimited: module & book, plus numeric c:v.
 
+			g_free(mhold);
+
 			// for fast reference: is this annotation relevant?
 			if ((key_chapter != e->chapter) ||
 			    (*m && (strcasecmp(m, modname) != 0)) ||
@@ -278,7 +236,7 @@ marked_cache_fill(gchar *modname, gchar *key)
 				for (int i = 0; i < NUM_REPLACE; ++i) {
 					for (s = strchr(e->annotation->str, replacement[i].c);
 					     s;
-					     s = strchr(s, replacement[i].c)) {
+					     s = strchr(e->annotation->str, replacement[i].c)) {
 						(void) g_string_erase(e->annotation,
 								      s - (e->annotation->str), 1);
 						(void) g_string_insert(e->annotation,
@@ -298,7 +256,8 @@ marked_cache_fill(gchar *modname, gchar *key)
 	return;
 
 fail:
-	err = g_strdup_printf(_("Improperly encoded personal annotation label:\n'%s'"), s);
+	err = g_strdup_printf(_("Improperly encoded personal annotation label:\n'%s'"), 
+			      mhold);
 	gui_generic_warning(err);
 	g_free(err);
 	g_free(key_book);
@@ -603,7 +562,7 @@ block_dump(SWBuf& rendered,
 	if (*morph) g_free((char *)*morph);
 	*morph = NULL;
 
-	rendered += "</span> ";
+	rendered += "</span> <span class=\"word\">&nbsp;</span>";
 }
 
 //
@@ -630,7 +589,8 @@ block_render_secondary(const char *text,
 		   *strongs = NULL,
 		   *morph   = NULL;
 	int bracket;
-	const char *s, *t;
+	const char *s;
+	char *t, *u;
 
 	for (s = text; *s; ++s) {
 		switch (*s) {
@@ -652,11 +612,26 @@ block_render_secondary(const char *text,
 
 				static char end[5] = "</X>";
 				end[2] = *(s+1);
-				if ((t = strstr(s, end)) == NULL) {
+			again:
+				if ((t = strstr((char *)s, end)) == NULL) {
 					GS_warning(("No %s in %s\n", end, s));
 					break;
                                 }
 
+				// yet another nightmare:
+				// if the markup results in e.g. doubled <i>
+				// (bogus "<hi><hi>word</hi></hi>"),
+				// then we will mis-assess termination.
+				// so we search for the same markup embedded within.
+				// if we find an internal set, we just wipe it out.
+				static char embedded[4] = "<X>";
+				embedded[1] = *(s+1);
+				if ((u = g_strstr_len(s+3, t-(s+3), embedded))) {
+					*u = *(u+1) = *(u+2) =
+					    *t = *(t+1) = *(t+2) = *(t+3) = ' ';
+					goto again;	// yuck, yes, i know...
+				}
+
 				// nasb eph 5:31: whole verse is an italicized
 				// quotation of gen 2:24...containing strongs.
 				// in event of font switch, output bare switch
@@ -678,10 +653,10 @@ block_render_secondary(const char *text,
 					rendered += end;
 					s = t+3;
 				}
-                                break;
+				break;
 			} else if (!strncmp(s+1, "small>", 6)) {
 				// strongs and morph are bounded by "<small>".
-				if ((t = strstr(s, "</small>")) == NULL) {
+				if ((t = strstr((char *)s, "</small>")) == NULL) {
 					GS_warning(("No </small> in %s\n", s));
 					break;
 				}
@@ -863,9 +838,6 @@ GTKEntryDisp::DisplayByChapter(SWModule &imodule)
 	if (strongs_and_morph)
 		set_morph_order(imodule);
 
-	if (is_rtol && !ops->transliteration)
-		swbuf.append("<div align=right>");
-
 	for (key->Verse(1);
 	     (key->Book()    == curBook)    &&
 	     (key->Chapter() == curChapter) &&
@@ -898,9 +870,7 @@ GTKEntryDisp::DisplayByChapter(SWModule &imodule)
 			     : rework /* left as-is */);
 	}
 
-	if (is_rtol && !ops->transliteration)
-		swbuf.append("</div>");
-	swbuf.append("</font></body></html>");
+	swbuf.append("</div></font></body></html>");
 
 	buf = g_strdup_printf("%d", curVerse);
 	HtmlOutput((char *)swbuf.c_str(), gtkText, mf, buf);
@@ -969,6 +939,10 @@ GTKEntryDisp::Display(SWModule &imodule)
 	swbuf.append(buf);
 	g_free(buf);
 
+	swbuf.appendFormatted("<div dir=%s>",
+			      ((is_rtol && !ops->transliteration)
+			       ? "rtl"
+			       : "ltr"));
 	//
 	// the rest of this routine is irrelevant if we are
 	// instead heading off to show a whole chapter
@@ -1027,7 +1001,7 @@ GTKEntryDisp::Display(SWModule &imodule)
 					   GDK_WINDOW(gtkText->window))
 		     : rework /* left as-is */);
 
-	swbuf.append("</font></body></html>");
+	swbuf.append("</div></font></body></html>");
 
 	HtmlOutput((char *)swbuf.c_str(), gtkText, mf, NULL);
 
@@ -1044,54 +1018,36 @@ GTKChapDisp::getVerseBefore(SWModule &imodule)
 	gchar *utf8_key;
 	gchar *buf;
 	char *num;
-	SWMgr *mgr = be->get_main_mgr();
 
-	const char *ModuleName = imodule.Name();
-	SWModule *mod_top = mgr->getModule(ModuleName);
-	mod_top->setSkipConsecutiveLinks(true);
-	*mod_top = sword::TOP;
-
-	sword::VerseKey key_top( mod_top->KeyText() );
-	SWModule *mod = mgr->getModule(ModuleName);
-	mod->setKey(imodule.getKey());
-	VerseKey *key = (VerseKey *)(SWKey *)*mod;
+	sword::VerseKey *key = (VerseKey *)(SWKey *)imodule;
+	int curVerse = key->Verse();
 	int chapter = key->Chapter();
+	int curBook = key->Book();
+	int curTest = key->Testament();
+	const char *ModuleName = imodule.Name();
+
 	key->Verse(1);
+	imodule--;
 
-	if (!key->_compare(key_top)) {
-		if ((!strcmp(settings.MainWindowModule, "KJV"))){
-			buf=g_strdup_printf("<div style=\"text-align: center\">"
-					    "<b><font size=\"%+d\">%s</font></b>"
-					    "<hr></div>",
-					    1 + ((mf->old_font_size)
-						 ? atoi(mf->old_font_size) +
-						 settings.base_font_size
-						 : settings.base_font_size),
-					    mod->Description());
-			swbuf.append(buf);
-			g_free(buf);
-		}
-		else {
-			num = main_format_number(chapter);
-			buf=g_strdup_printf("<div style=\"text-align: center\">"
-					    "<p><b><font size=\"%+d\">%s</font></b></p>"
-					    "<b>%s %s</b></div>",
-					    1 + ((mf->old_font_size)
-						 ? atoi(mf->old_font_size) +
-						 settings.base_font_size
-						 : settings.base_font_size),
-					    mod->Description(),
-					    _("Chapter"),
-					    num);
-			g_free(num);
-			swbuf.append(buf);
-			g_free(buf);
-		}
+	if (imodule.Error()) {
+		num = main_format_number(chapter);
+		buf=g_strdup_printf("<div style=\"text-align: center\">"
+				    "<p><b><font size=\"%+d\">%s</font></b></p>"
+				    "<b>%s %s</b></div>",
+				    1 + ((mf->old_font_size)
+					 ? atoi(mf->old_font_size) +
+					 settings.base_font_size
+					 : settings.base_font_size),
+				    imodule.Description(),
+				    _("Chapter"),
+				    num);
+		g_free(num);
+		swbuf.append(buf);
+		g_free(buf);
 	} else {
-		(*mod)--;
 
 		if (strongs_and_morph)
-			set_morph_order(*mod);
+			set_morph_order(imodule);
 
 		ModuleCache::CacheVerse& cVerse = ModuleMap
 		    [ModuleName]
@@ -1100,26 +1056,18 @@ GTKChapDisp::getVerseBefore(SWModule &imodule)
 		    [key->Chapter()]
 		    [key->Verse()];
 
-#if 1
 		if (!cVerse.CacheIsValid(cache_flags))
 			cVerse.SetText((strongs_or_morph
-					? block_render((const char *)*mod)
-					: (const char *)*mod),
+					? block_render((const char *)imodule)
+					: (const char *)imodule),
 				       cache_flags);
-#else
-		if (!cVerse.CacheIsValid(cache_flags)) {
-			const char *text = (strongs_or_morph
-					    ? block_render((const char *)mod)
-					    : (const char *)mod);
-			CleanupContent(text, ops, imodule.Name());
-			cVerse.SetText(text, cache_flags);
-		}
-#endif
 
 		utf8_key = strdup((char*)key->getText());
 
-		if (is_rtol && !ops->transliteration)
-			swbuf.append("<div align=right>");
+		swbuf.appendFormatted("<div dir=%s>",
+				      ((is_rtol && !ops->transliteration)
+				       ? "rtl"
+				       : "ltr"));
 
 		num = main_format_number(key->Verse());
 		buf=g_strdup_printf(settings.showversenum
@@ -1148,12 +1096,12 @@ GTKChapDisp::getVerseBefore(SWModule &imodule)
 		swbuf.append(buf);
 		g_free(buf);
 
-		if (is_rtol && !ops->transliteration)
-			swbuf.append("</div>");
+		swbuf.append("</div>");
 
-		(*mod)++;
 	}
 
+	imodule++;
+	
 	if (!ops->headings)
 		return;
 
@@ -1178,28 +1126,22 @@ GTKChapDisp::getVerseBefore(SWModule &imodule)
 		    [key->Chapter()]
 		    [key->Verse()];
 
-#if 1
 		if (!cVerse.CacheIsValid(cache_flags))
 			cVerse.SetText((strongs_or_morph
-					? block_render((const char *)*mod)
-					: (const char *)*mod),
+					? block_render((const char *)imodule)
+					: (const char *)imodule),
 				       cache_flags);
-#else
-		if (!cVerse.CacheIsValid(cache_flags)) {
-			const char *text = (strongs_or_morph
-					    ? block_render((const char *)mod)
-					    : (const char *)mod);
-			CleanupContent(text, ops, imodule.Name());
-			cVerse.SetText(text, cache_flags);
-		}
-#endif
-
 		buf=g_strdup_printf("%s<br />", cVerse.GetText());
 		swbuf.append(buf);
 		g_free(buf);
 	}
 
 	key->AutoNormalize(oldAutoNorm);
+
+	key->Book(curBook);
+	key->Chapter(chapter);
+	key->Verse(curVerse);
+	key->Testament(curTest);
 }
 
 void
@@ -1207,48 +1149,36 @@ GTKChapDisp::getVerseAfter(SWModule &imodule)
 {
 	gchar *utf8_key;
 	gchar *buf;
-	SWMgr *mgr = be->get_main_mgr();
 	const char *ModuleName = imodule.Name();
-	SWModule *mod_bottom = mgr->getModule(ModuleName);
-		mod_bottom->setSkipConsecutiveLinks(true);
-	*mod_bottom = sword::BOTTOM;
-	sword::VerseKey key_bottom( mod_bottom->KeyText() );
-	SWModule *mod = mgr->getModule(ModuleName);
-	mod->setKey(imodule.getKey());
-	VerseKey *key = (VerseKey *)(SWKey *)*mod;
-
-	if (key_bottom._compare(key) < 1) {
+	sword::VerseKey *key = (VerseKey *)(SWKey *)imodule;
+
+	imodule++;
+	if (imodule.Error()) {
 		buf=g_strdup_printf(
 			"%s<hr><div style=\"text-align: center\"><p><b>%s</b></p></div>",
 			// extra break when excess strongs/morph space.
 			(strongs_or_morph ? "<br>" : ""),
-			mod->Description());
+			imodule.Description());
 		swbuf.append(buf);
 		g_free(buf);
 	} else {
+		imodule--;
 		char *num = main_format_number(key->Chapter());
-		if ((!strcmp(settings.MainWindowModule, "KJV"))){
-			buf=g_strdup_printf(
-				"%s<hr><b>%s %s.</b><br><br>",
-				(strongs_or_morph ? "<br>" : ""),
-				_("Chapter"), num);
-			swbuf.append(buf);
-			g_free(buf);
-		}
-		else {
-			buf=g_strdup_printf(
-				"%s<hr><div style=\"text-align: center\"><b>%s %s</b></div>",
-				(strongs_or_morph ? "<br>" : ""),
-				_("Chapter"), num);
-			swbuf.append(buf);
-			g_free(buf);
-		}
+
+		buf=g_strdup_printf(
+			"%s<hr><div style=\"text-align: center\"><b>%s %s</b></div>",
+			(strongs_or_morph ? "<br>" : ""),
+			_("Chapter"), num);
+		swbuf.append(buf);
+		g_free(buf);
 		g_free(num);
 
 		utf8_key = strdup((char*)key->getText());
 
-		if (is_rtol && !ops->transliteration)
-			swbuf.append("<div align=right>");
+		swbuf.appendFormatted("<div dir=%s>",
+				      ((is_rtol && !ops->transliteration)
+				       ? "rtl"
+				       : "ltr"));
 
 		num = main_format_number(key->Verse());
 		buf=g_strdup_printf(settings.showversenum
@@ -1267,7 +1197,7 @@ GTKChapDisp::getVerseAfter(SWModule &imodule)
 		g_free(buf);
 
 		if (strongs_and_morph)
-			set_morph_order(*mod);
+			set_morph_order(imodule);
 
 		ModuleCache::CacheVerse& cVerse = ModuleMap
 		    [ModuleName]
@@ -1276,25 +1206,13 @@ GTKChapDisp::getVerseAfter(SWModule &imodule)
 		    [key->Chapter()]
 		    [key->Verse()];
 
-#if 1
 		if (!cVerse.CacheIsValid(cache_flags))
 			cVerse.SetText((strongs_or_morph
-					? block_render((const char *)*mod)
-					: (const char *)*mod),
+					? block_render((const char *)imodule)
+					: (const char *)imodule),
 				       cache_flags);
-#else
-		if (!cVerse.CacheIsValid(cache_flags)) {
-			const char *text = (strongs_or_morph
-					    ? block_render((const char *)mod)
-					    : (const char *)mod);
-			CleanupContent(text, ops, imodule.Name());
-			cVerse.SetText(text, cache_flags);
-		}
-#endif
-
 		swbuf.append(cVerse.GetText());
-		if (is_rtol && !ops->transliteration)
-			swbuf.append("</div>");
+		swbuf.append("</div>");
 	}
 }
 
@@ -1523,7 +1441,6 @@ StartFestival()
 	festival_args[1] = g_strdup("--server");
 	festival_args[2] = NULL;
 #endif
-	GS_message((festival_args[0]));
 	g_spawn_async ( NULL,
 			festival_args,
 			NULL,
@@ -1620,7 +1537,6 @@ GTKChapDisp::Display(SWModule &imodule)
 		paragraphMark = "";
 
 	swbuf = "";
-	gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets.notebook_text), 0);
 
 	buf=g_strdup_printf(HTML_START
 			    "<body bgcolor=\"%s\" text=\"%s\" link=\"%s\">"
@@ -1643,8 +1559,10 @@ GTKChapDisp::Display(SWModule &imodule)
 	swbuf.append(buf);
 	g_free(buf);
 
-	if (is_rtol && !ops->transliteration)
-		swbuf.append("<div align=right>");
+	swbuf.appendFormatted("<div dir=%s>",
+			      ((is_rtol && !ops->transliteration)
+			       ? "rtl"
+			       : "ltr"));
 
 	main_set_global_options(ops);
 	getVerseBefore(imodule);
@@ -1799,9 +1717,7 @@ GTKChapDisp::Display(SWModule &imodule)
 	key->Chapter(curChapter);
 	key->Verse(curVerse);
 
-	if (is_rtol && !ops->transliteration)
-		swbuf.append("</div>");
-	swbuf.append("</font></body></html>");
+	swbuf.append("</div></font></body></html>");
 
 #ifdef USE_GTKMOZEMBED
 	if (strongs_and_morph)
@@ -1852,8 +1768,10 @@ DialogEntryDisp::DisplayByChapter(SWModule &imodule)
 	if (strongs_and_morph)
 		set_morph_order(imodule);
 
-	if (is_rtol && !ops->transliteration)
-		swbuf.append("<div align=right>");
+	swbuf.appendFormatted("<div dir=%s>",
+			      ((is_rtol && !ops->transliteration)
+			       ? "rtl"
+			       : "ltr"));
 
 	for (key->Verse(1);
 	     (key->Book()    == curBook)    &&
@@ -1887,9 +1805,7 @@ DialogEntryDisp::DisplayByChapter(SWModule &imodule)
 			     : rework /* left as-is */);
 	}
 
-	if (is_rtol && !ops->transliteration)
-		swbuf.append("</div>");
-	swbuf.append("</font></body></html>");
+	swbuf.append("</div></font></body></html>");
 
 	buf = g_strdup_printf("%d", curVerse);
 	HtmlOutput((char *)swbuf.c_str(), gtkText, mf, buf);
@@ -2069,8 +1985,10 @@ DialogChapDisp::Display(SWModule &imodule)
 	swbuf.append(buf);
 	g_free(buf);
 
-	if (is_rtol && !ops->transliteration)
-		swbuf.append("<div align=right>");
+	swbuf.appendFormatted("<div dir=%s>",
+			      ((is_rtol && !ops->transliteration)
+			       ? "rtl"
+			       : "ltr"));
 
 	for (key->Verse(1);
 	     (key->Book() == curBook) &&
@@ -2217,9 +2135,7 @@ DialogChapDisp::Display(SWModule &imodule)
 	key->Chapter(curChapter);
 	key->Verse(curVerse);
 
-	if (is_rtol && !ops->transliteration)
-		swbuf.append("</div>");
-	swbuf.append("</font></body></html>");
+	swbuf.append("</div></font></body></html>");
 
 #ifdef USE_GTKMOZEMBED
 	if (strongs_and_morph)
@@ -2339,7 +2255,6 @@ GTKPrintChapDisp::Display(SWModule &imodule)
 		paragraphMark = "";
 
 	swbuf = "";
-	gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets.notebook_text), 0);
 
 	buf=g_strdup_printf(HTML_START
 			      "<body bgcolor=\"%s\" text=\"%s\" link=\"%s\">"
@@ -2355,8 +2270,10 @@ GTKPrintChapDisp::Display(SWModule &imodule)
 	swbuf.append(buf);
 	g_free(buf);
 
-	if (is_rtol && !ops->transliteration)
-		swbuf.append("<div ALIGN=right>");
+	swbuf.appendFormatted("<div dir=%s>",
+			      ((is_rtol && !ops->transliteration)
+			       ? "rtl"
+			       : "ltr"));
 
 	gecko_html_write(html,swbuf.c_str(),swbuf.length());
 
@@ -2432,10 +2349,7 @@ GTKPrintChapDisp::Display(SWModule &imodule)
 	key->Chapter(curChapter);
 	key->Verse(curVerse);
 
-	if (is_rtol && !ops->transliteration)
-		swbuf.append("</div></font></body></html>");
-	else
-		swbuf.append("</font></body></html>");
+	swbuf.append("</div></font></body></html>");
 
 	if (swbuf.length())
 		gecko_html_write(html,swbuf.c_str(),swbuf.length());
diff --git a/src/main/export_passage.cc b/src/main/export_passage.cc
index 41e2c6d..7099f97 100644
--- a/src/main/export_passage.cc
+++ b/src/main/export_passage.cc
@@ -73,7 +73,7 @@ static void _save(char *filename, char* text,int len)
 static void _export_book(char *filename, int type)
 {
 	GString *str = g_string_new(NULL);
-	SWMgr *mgr = backend->get_main_mgr();
+	SWMgr *mgr = backend->get_mgr();
 	SWModule *mod = mgr->Modules[settings.MainWindowModule];
 	mod->setKey(settings.currentverse);
 	VerseKey *key = (VerseKey *)(SWKey *)(*mod);
@@ -83,41 +83,45 @@ static void _export_book(char *filename, int type)
 	int myverse = 1;
 	key->Chapter(1);
 	key->Verse(1);
-	
+
 	if(type == HTML)
 		g_string_append_printf(str,
-				       "%s<BR><CENTER>%s<BR>Chapter %d</CENTER><BR>", 
+				       "%s<BR><CENTER>%s<BR>Chapter %d</CENTER><BR><BR>", 
 				       HTML_START,
 				       mod->Description(),
 				       1);
 	else
-		g_string_append_printf(str,"\n%s\nChapter %d\n",
+		g_string_append_printf(str,"\n%s\nChapter %d\n\n",
 				       mod->Description(), 
 				       1);
-		
-	
+
 	while(key->Book() == curBook && !mod->Error()) {
 		if(key->Chapter() != curChapter) {
 			++mychapter;
 			myverse = 1;
 			curChapter = key->Chapter();
 			if(type == HTML)
-				g_string_append_printf(str,"<BR><CENTER>Chapter %d</CENTER><BR>", curChapter);
+				g_string_append_printf(str,"<BR><CENTER>Chapter %d</CENTER><BR><BR>", curChapter);
 			else
-				g_string_append_printf(str,"\nChapter %d\n", curChapter);
-				
+				g_string_append_printf(str,"\nChapter %d\n\n", curChapter);
 		}
+
+		if(settings.showversenum)
+			g_string_append_printf(str,
+					       ((type == HTML)
+						? "&nbsp;&nbsp;[%d]"
+						: "  [%d]"), 
+					       myverse);
+
 		if(type == HTML)
-			g_string_append_printf(str,"&nbsp;&nbsp;%d. %s%s",
-					       myverse,
+			g_string_append_printf(str, " %s%s",
 					       (char*)mod->RenderText(), 
-					       settings.versestyle ? "<BR>" : "");
+					       (settings.versestyle ? "<BR>" : ""));
 		else
-			g_string_append_printf(str,"  %d. %s%s",
-					       myverse,
+			g_string_append_printf(str, " %s%s",
 					       (char*)mod->StripText(), 
-					       settings.versestyle ? "\n" : "");
-			
+					       (settings.versestyle ? "\n" : ""));
+
 		++myverse;
 		(*mod)++;
 	}
@@ -128,53 +132,52 @@ static void _export_book(char *filename, int type)
 	else
 		_copy_to_clipboard (str->str, str->len);
 	g_string_free(str,TRUE);
-	
 }
 
 static void _export_chapter(char *filename, int type)
 {
 	GString *str = g_string_new(NULL);
 	char* book;
-	SWMgr *mgr = backend->get_main_mgr();
+	SWMgr *mgr = backend->get_mgr();
 	SWModule *mod = mgr->Modules[settings.MainWindowModule];
 	mod->setKey(settings.currentverse);
 	VerseKey *key = (VerseKey *)(SWKey *)(*mod);
 	int curChapter = key->Chapter();
 	int curBook = key->Book();
 	int myverse = 1;
-	
+
 	book = backend->key_get_book(settings.currentverse);
 	if(type == HTML)
 		g_string_append_printf(str,
-				       "%s<BR>%s: %s Chapter %d<BR>", 
+				       "%s<BR>%s: %s Chapter %d<BR><BR>", 
 				       HTML_START, 
-				       settings.MainWindowModule,
+				       mod->Description(),
 				       book, 
 				       key->Chapter());
 	else
 		g_string_append_printf(str,
-				       "\n%s: %s Chapter %d\n", 
-				       settings.MainWindowModule,
+				       "\n%s: %s Chapter %d\n\n",
+				       mod->Description(),
 				       book, 
 				       key->Chapter());		
-	
+
 	for (key->Verse(1);
 	     (key->Book() == curBook) &&
 	     (key->Chapter() == curChapter) &&
 	     !mod->Error();
 	     (*mod)++) {
 		     
+		if(settings.showversenum)
+			g_string_append_printf(str, " [%d]", myverse);
+
 		if(type == HTML)
-			g_string_append_printf(str,"%d. %s%s",
-					       myverse,
+			g_string_append_printf(str," %s%s",
 					       (char*)mod->RenderText(), 
-					       settings.versestyle ? "<BR>" : "");
+					       (settings.versestyle ? "<BR>" : ""));
 		else
-			g_string_append_printf(str,"%d. %s%s",
-					       myverse,
+			g_string_append_printf(str," %s%s",
 					       (char*)mod->StripText(), 
-					       settings.versestyle ? "\n" : "");
-			
+					       (settings.versestyle ? "\n" : ""));
 		++myverse;
 	}
 	if(type == HTML)
@@ -186,7 +189,6 @@ static void _export_chapter(char *filename, int type)
 	g_string_free(str,TRUE);
 	if(book)
 		g_free(book);
-	
 }
 
 
@@ -194,11 +196,11 @@ static void _export_verse(char *filename, int type)
 {
 	GString *str = g_string_new(NULL);
 	char* book;
-	SWMgr *mgr = backend->get_main_mgr();
+	SWMgr *mgr = backend->get_mgr();
 	SWModule *mod = mgr->Modules[settings.MainWindowModule];
 	mod->setKey(settings.currentverse);
 	VerseKey *key = (VerseKey *)(SWKey *)(*mod);
-	
+
 	book = backend->key_get_book(settings.currentverse);
 	if(type == HTML)
 		g_string_append_printf(str,
@@ -209,7 +211,7 @@ static void _export_verse(char *filename, int type)
 				       key->Chapter(),
 				       key->Verse(),
 				       (char*)mod->RenderText(), 
-				       settings.versestyle ? "<BR>" : "");
+				       (settings.versestyle ? "<BR>" : ""));
 	else
 		g_string_append_printf(str,
 				       "\n%s: %s %d:%d. %s%s", 
@@ -218,47 +220,54 @@ static void _export_verse(char *filename, int type)
 				       key->Chapter(),
 				       key->Verse(),
 				       (char*)mod->StripText(), 
-				       settings.versestyle ? "\n" : "");
-	
+				       (settings.versestyle ? "\n" : ""));
+
 	if (filename) 
 		_save(filename, str->str,str->len);
 	else
 		_copy_to_clipboard (str->str, str->len);
-	
+
 	g_string_free(str,TRUE);
-	
+
 	if(book)
 		g_free(book);
-	
 }
 
 static void _export_verse_range (EXPORT_DATA data, int type)
 {
 	GString *str = g_string_new(NULL);
 	char* book;
-	SWMgr *mgr = backend->get_main_mgr();
+	SWMgr *mgr = backend->get_mgr();
 	SWModule *mod = mgr->Modules[settings.MainWindowModule];
 	mod->setKey(settings.currentverse);
 	VerseKey *key = (VerseKey *)(SWKey *)(*mod);
 	int curChapter = key->Chapter();
 	int curBook = key->Book();
 	//int myverse = 1;
-	
+
 	book = backend->key_get_book(settings.currentverse);
 	if(type == HTML)
 		g_string_append_printf(str,
-				       "%s<BR>%s: %s Chapter %d<BR>", 
+				       (settings.showversenum
+					? "%s<BR>%s: %s Chapter %d<BR><BR>"
+					: "%s<BR>%s: %s %d:%d-%d<BR><BR>"), 
 				       HTML_START, 
 				       settings.MainWindowModule,
 				       book, 
-				       key->Chapter());
+				       key->Chapter(),
+				       data.start_verse,
+				       data.end_verse);
 	else
 		g_string_append_printf(str,
-				       "\n%s: %s Chapter %d\n", 
+				       (settings.showversenum
+					? "\n%s: %s Chapter %d\n\n"
+					: "\n%s: %s %d:%d-%d\n\n"),
 				       settings.MainWindowModule,
 				       book, 
-				       key->Chapter());		
-	
+				       key->Chapter(),
+				       data.start_verse,
+				       data.end_verse);		
+
 	for (key->Verse(data.start_verse);
 	     (key->Verse() <= data.end_verse) &&
 	     (key->Book() == curBook) &&
@@ -266,16 +275,17 @@ static void _export_verse_range (EXPORT_DATA data, int type)
 	     !mod->Error();
 	     (*mod)++) {
 		     
+		if(settings.showversenum)
+			g_string_append_printf(str, " [%d]", key->Verse());
+
 		if(type == HTML)
-			g_string_append_printf(str,"%d. %s%s",
-					       key->Verse(),
+			g_string_append_printf(str," %s%s",
 					       (char*)mod->RenderText(), 
-					       settings.versestyle ? "<BR>" : "");
+					       (settings.versestyle ? "<BR>" : ""));
 		else
-			g_string_append_printf(str,"%d. %s%s",
-					       key->Verse(),
+			g_string_append_printf(str," %s%s",
 					       (char*)mod->StripText(), 
-					       settings.versestyle ? "\n" : "");
+					       (settings.versestyle ? "\n" : ""));
 	}
 	if(type == HTML)
 		g_string_append_printf(str,"%s","</BODY></HTML>");
@@ -286,7 +296,6 @@ static void _export_verse_range (EXPORT_DATA data, int type)
 	g_string_free(str,TRUE);
 	if(book)
 		g_free(book);
-	
 }
 
 
@@ -306,7 +315,6 @@ void main_export_html(EXPORT_DATA data)
 			_export_verse_range(data, HTML);
 			break;
 	}
-	
 }
 
 void main_export_plain(EXPORT_DATA data)
@@ -325,6 +333,5 @@ void main_export_plain(EXPORT_DATA data)
 			_export_verse_range(data, PLAIN);
 			break;
 	}
-	
 }
 //#endif
diff --git a/src/main/global_ops.cc b/src/main/global_ops.cc
index 95df7ce..bf67f87 100644
--- a/src/main/global_ops.cc
+++ b/src/main/global_ops.cc
@@ -24,7 +24,7 @@
 #include <config.h>
 #endif
 
-#include <gnome.h>
+#include <gtk/gtk.h>
 #include <string.h>
 #include <swmgr.h>
 #include <swmodule.h>
@@ -40,12 +40,14 @@
 
 #include "backend/sword_main.hh"
 
+#include "gui/debug_glib_null.h"
+
 
 static void _set_dialog_global_option(BackEnd *be,
 				     const char *option,
 				     gboolean choice)
 {
-	SWMgr *mgr = be->get_display_mgr();
+	SWMgr *mgr = be->get_mgr();
 	char *on_off;
 
 	on_off = gui_tf2of(choice);
@@ -57,8 +59,7 @@ static void _set_dialog_global_textual(BackEnd *be,
 				      const char *option,
 				      const char *choice)
 {
-	SWMgr *mgr = be->get_display_mgr();
-
+	SWMgr *mgr = be->get_mgr();
 	mgr->setGlobalOption(option, choice);
 }
 
@@ -67,13 +68,11 @@ static void _set_global_option(int manager,
 			      const char *option,
 			      gboolean choice)
 {
-	SWMgr *mgr = backend->get_display_mgr();
-	SWMgr *main_mgr = backend->get_main_mgr();
+	SWMgr *mgr = backend->get_mgr();
 	char *on_off;
 
 	on_off = gui_tf2of(choice);
 	mgr->setGlobalOption(option, on_off);
-	main_mgr->setGlobalOption(option, on_off);
 }
 
 
@@ -81,11 +80,9 @@ static void _set_global_textual(int manager,
 			       const char *option,
 			       const char *choice)
 {
-	SWMgr *mgr = backend->get_display_mgr();
-	SWMgr *main_mgr = backend->get_main_mgr();
-
+	SWMgr *mgr = backend->get_mgr();
 	mgr->setGlobalOption(option, choice);
-	main_mgr->setGlobalOption(option, choice);
+
 }
 
 
diff --git a/src/main/lists.cc b/src/main/lists.cc
index 709c29b..a37543c 100644
--- a/src/main/lists.cc
+++ b/src/main/lists.cc
@@ -23,14 +23,13 @@
 #include <config.h>
 #endif
 
-#include <gnome.h>
+#include <gtk/gtk.h>
 #include <string.h>
 
 #include "main/lists.h"
 #include "main/sword.h"
 #include "main/settings.h"
 #include "main/xml.h"
-
 #include "backend/sword_main.hh"
 
 
@@ -93,7 +92,6 @@ GList *get_list(gint type)
 void main_init_lists(void)
 {	
 	gboolean start_backend = FALSE;
-	char *sword_locale = FALSE;
 	mod_lists = &mods;
 	
 	/* set glist to null */
@@ -120,17 +118,14 @@ void main_init_lists(void)
 	settings.havepercomm = FALSE;
 	settings.haveprayerlist = FALSE;
 	
-	if(backend) {
+	if (backend) {
 		mods.options = backend->get_module_options();
 	} else {
-		const char* lang = g_getenv("LANG");
 		start_backend = TRUE;
 		backend = new BackEnd();
-		sword_locale = backend->set_sword_locale(lang);
 	}
 	backend->init_lists(mod_lists);
-	if(start_backend) {
-		free((char*)sword_locale);
+	if (start_backend) {
 		delete backend;
 		backend = NULL;
 	}
diff --git a/src/main/lists.h b/src/main/lists.h
index 93bdb7d..62375d9 100644
--- a/src/main/lists.h
+++ b/src/main/lists.h
@@ -28,7 +28,7 @@ extern "C"
 #endif	
 
 
-#include <gnome.h>
+#include <gtk/gtk.h>
 
 typedef struct _module_lists MOD_LISTS;
 struct _module_lists {
diff --git a/src/main/main.c b/src/main/main.c
index 76cabdd..3cb00e4 100644
--- a/src/main/main.c
+++ b/src/main/main.c
@@ -25,6 +25,7 @@
 
 
 #include <string.h>
+#include <glib.h>
 
 #include "gui/dialog.h"
 #include "gui/gui.h"
@@ -32,15 +33,23 @@
 #include "gui/splash.h"
 #include "gui/tabbed_browser.h"
 #include "gui/xiphos.h"
+#include "gui/utilities.h"
 //#include "gui/widgets.h"
 
 #include "main/sword.h"
 #include "main/url.hh"
+#include "main/xml.h"
 #ifdef USE_GTKMOZEMBED
+#ifdef WIN32
+#include "geckowin/gecko-html.h"
+#else
 #include "gecko/gecko-html.h"
 #endif
+#endif
 //#include "backend/sword.h"
 
+#include "gui/debug_glib_null.h"
+
 #include <glib/gstdio.h>
  
 /******************************************************************************
@@ -64,8 +73,12 @@ int main(int argc, char *argv[])
 	int newbookmarks = FALSE;
 	int have_sword_url = FALSE;
 	gint base_step = 0; //needed for splash
-	
-	g_thread_init(NULL);
+	GTimer *total;
+	double d;
+
+	//	g_thread_init(NULL);
+	g_type_init();
+	total = g_timer_new();
 
 #ifdef WIN32
 	/*
@@ -74,13 +87,11 @@ int main(int argc, char *argv[])
 	 * gspawn happy.  Glib provides this nice function for us
 	 * to determine where we are (we can't depend on argv).
 	 */
-	gchar *install_dir = g_win32_get_package_installation_directory_of_module(NULL);
-	install_dir = g_strconcat(install_dir, "\0", NULL);
-	install_dir = g_build_filename (install_dir, "bin\0");
-	g_chdir (install_dir);
+	gchar *bin_dir = xiphos_win32_get_subdir("bin");
+	g_chdir (bin_dir);
 	
 	/* add this directory to $PATH for other stuff, e.g. zip */
-	g_setenv("PATH", g_strdup_printf("%s;%s", install_dir,
+	g_setenv("PATH", g_strdup_printf("%s;%s", bin_dir,
 					        g_getenv("PATH")),
 		                                TRUE);
 
@@ -104,8 +115,6 @@ int main(int argc, char *argv[])
 	g_setenv("HOME", g_getenv("APPDATA"), TRUE);
 #endif /* WIN32 */
 
-	gui_init(argc, argv);
-	
 	if (argc > 2) {
 		gui_generic_warning(_("Xiphos does not understand more than one argument."));
 		exit(1);
@@ -141,36 +150,39 @@ int main(int argc, char *argv[])
 	/* 
 	 * check for directories and files
 	 */   
-    	settings_init(newconfigs,newbookmarks);
+    	settings_init(argc, argv, newconfigs, newbookmarks);
+
+	gui_init(argc, argv);
 
 	gui_splash_init();
-	
+
 #ifdef USE_GTKMOZEMBED
 	
 	gui_splash_step(_("Initiating Gecko"), 0.0, 0);
 	
 	gecko_html_initialize();
-
+	
 	base_step = 1;
 #endif
 	gui_splash_step(_("Building Interface"), 0.2, 0 + base_step);
 
 	create_mainwindow();
-
+	
 	gui_splash_step(_("Starting Sword"), 0.5, 1 + base_step);
 
 	main_init_backend();
-	
+		
 	gui_splash_step(_("Loading Settings"), 0.8, 2 + base_step);
 
 	frontend_init();
-	
+		
 	gui_splash_step(_("Displaying Xiphos"), 1.0, 3 + base_step);
 	
-	frontend_display();
-	
-	gui_splash_done();
+	/* need to get rid of wrongly-formatted annotation labels. */
+	xml_convert_to_osisref();
 	
+	frontend_display();
+		
 	if (have_sword_url) {
 		if (!strncmp(argv[1], "sword:/", 7)) {
 			char *key = strchr(argv[1]+8, '/');
@@ -185,6 +197,13 @@ int main(int argc, char *argv[])
 
 	/*gtk_notebook_set_current_page(GTK_NOTEBOOK
 					(widgets.notebook_comm_book), 0);*/
+	g_timer_stop(total);
+	d = g_timer_elapsed(total, NULL);
+#ifdef DEBUG
+	printf("total time is %f\n", d);
+#endif
+	g_idle_add ((GSourceFunc)gui_splash_done, NULL);
+
 	gui_main();
 	return 0;
 }
diff --git a/src/main/mod_mgr.cc b/src/main/mod_mgr.cc
index 8602393..8e80819 100644
--- a/src/main/mod_mgr.cc
+++ b/src/main/mod_mgr.cc
@@ -65,7 +65,7 @@ int main_module_mgr_delete_index_mod(char * module_name)
 void main_update_module_lists(void)
 {
 	main_shutdown_list();
-	delete backend;		
+	delete backend;
 	backend = new BackEnd();
 	backend->init_SWORD(0);
 	main_init_lists();
@@ -364,6 +364,11 @@ void mod_mgr_clear_config(void)
 	backend_module_mgr_clear_config();
 }
 
+void mod_mgr_reread_config(void)
+{
+	backend_module_mgr_reread_config();
+}
+
 void mod_mgr_add_source(const char * vtype, 
 			const char * type, 
 			const char * caption, 
diff --git a/src/main/mod_mgr.h b/src/main/mod_mgr.h
index cdb797e..24ce903 100644
--- a/src/main/mod_mgr.h
+++ b/src/main/mod_mgr.h
@@ -86,6 +86,7 @@ int mod_mgr_refresh_remote_source(const char *source_name);
 void mod_mgr_init_config(void);
 int mod_mgr_init_config_extras(void);
 void mod_mgr_clear_config(void);
+void mod_mgr_reread_config(void);
 void mod_mgr_add_source(const char * vtype, 
 			const char * type, 
 			const char * caption, 
diff --git a/src/main/module_dialogs.cc b/src/main/module_dialogs.cc
index 6012e2e..3a404cd 100644
--- a/src/main/module_dialogs.cc
+++ b/src/main/module_dialogs.cc
@@ -23,14 +23,17 @@
 #include <config.h>
 #endif
 
-#include <gnome.h>
+#include <gtk/gtk.h>
 #include <swmgr.h>
 #include <swmodule.h>	
 #include <url.h>
 
 #ifdef USE_GTKMOZEMBED
-#include <gtkmozembed.h>
+#ifdef WIN32
+#include "geckowin/gecko-html.h"
+#else
 #include "gecko/gecko-html.h"
+#endif
 #else
 #ifdef __cplusplus
 extern "C" {
@@ -71,6 +74,8 @@ extern "C" {
 #include "main/url.hh"
 
 #include "backend/sword_main.hh"
+
+#include "gui/debug_glib_null.h"
 	
 #define HTML_START "<html><head><meta http-equiv=\"content-type\" content=\"text/html; charset=utf-8\"></head>"
 
@@ -94,18 +99,8 @@ enum {
 	COL_OFFSET,
 	N_COLUMNS
 }; 
-/*
-enum {
-	TYPE_URI,
-	BLANK,
-	MODULE,
-	KEY,
-	TYPE_NOTE,
-	NOTE_NUM
-};
-*/
-gboolean bible_freed;
 
+gboolean bible_freed;
 gboolean dialog_freed;
 gboolean bible_apply_change;
 
@@ -143,7 +138,7 @@ void main_dialogs_book_heading(DIALOG_DATA * d)
 {	
 	VerseKey *vkey;		
 	BackEnd* be = (BackEnd*)d->backend;
-	SWMgr *mgr = be->get_display_mgr();
+	SWMgr *mgr = be->get_mgr();
 	
 	be->display_mod = mgr->Modules[d->mod_name];
 	GS_message(("%s",(char*)be->display_mod->RenderText()));
@@ -176,7 +171,7 @@ void main_dialogs_chapter_heading(DIALOG_DATA * d)
 {	
 	VerseKey *vkey;	
 	BackEnd* be = (BackEnd*)d->backend;
-	SWMgr *mgr = be->get_display_mgr();
+	SWMgr *mgr = be->get_mgr();
 	
 	be->display_mod = mgr->Modules[d->mod_name];
 	backend->display_mod->setKey(d->key);
@@ -212,7 +207,7 @@ void main_dialogs_clear_viewer(DIALOG_DATA *d)
 	const char *buf;
 
 #ifdef USE_GTKMOZEMBED
-	GtkMozEmbed *new_browser = GTK_MOZ_EMBED(d->previewer);
+	GeckoHtml *new_browser = GECKO_HTML(d->previewer);
 #else	
 	gboolean was_editable = FALSE;
 
@@ -239,9 +234,8 @@ void main_dialogs_clear_viewer(DIALOG_DATA *d)
 
 #ifdef USE_GTKMOZEMBED
 	if (str->len)
-		gtk_moz_embed_render_data(new_browser, str->str, str->len,
-					"file:///sword", 
-					"text/html");
+		gecko_html_render_data(new_browser, str->str, str->len);
+
 #else	
 	if (str->len)
 		gtk_html_load_from_string(html,str->str,str->len);
@@ -279,7 +273,7 @@ void main_dialogs_information_viewer(DIALOG_DATA * d, gchar * mod_name,
 	GString *str;
 	MOD_FONT *mf = get_font(mod_name);
 #ifdef USE_GTKMOZEMBED
-	GtkMozEmbed *new_browser = GTK_MOZ_EMBED(sidebar.html_viewer_widget);
+	GeckoHtml *new_browser = GECKO_HTML(sidebar.html_viewer_widget);
 #else	
 	GtkHTML *html = GTK_HTML(sidebar.html_viewer_widget);
 #endif
@@ -354,9 +348,7 @@ void main_dialogs_information_viewer(DIALOG_DATA * d, gchar * mod_name,
 	
 #ifdef USE_GTKMOZEMBED
 	if (str->len)
-		gtk_moz_embed_render_data(new_browser, str->str, str->len,
-					"file:///sword", 
-					"text/html");
+		gecko_html_render_data(new_browser, str->str, str->len);
 #else	
 	if (str->len)
 		gtk_html_load_from_string(html,str->str,str->len);
@@ -1432,9 +1424,13 @@ static gint new_url_handler(DIALOG_DATA * t, const gchar * url, gboolean clicked
 
 gint main_dialogs_url_handler(DIALOG_DATA * t, const gchar * url, gboolean clicked)
 {	
+	static int handling_url = FALSE;
 	gint retval = 0;
+
+	if (handling_url) return retval;
+	handling_url = TRUE;
+
 	GS_message(("main_dialogs_url_handler url = %s",url));
-	
 
 	if (strstr(url, "sword://") ||
 	    strstr(url, "bible://")) {
@@ -1448,6 +1444,8 @@ gint main_dialogs_url_handler(DIALOG_DATA * t, const gchar * url, gboolean click
 		return new_url_handler(t,url,clicked);
 	/*if(strstr(url,"sword://"))
 		return sword_uri(t, url, clicked);*/
+
+	handling_url = FALSE;
 	return retval;
 }
 
@@ -1548,7 +1546,7 @@ DIALOG_DATA *main_dialogs_open(const gchar * mod_name ,  const gchar * key)
 		time_t curtime;
 		struct tm *loctime;
 		char *feature;
-		if ((feature = (char *)be->get_main_mgr()->
+		if ((feature = (char *)be->get_mgr()->
 					getModule(mod_name)->
 					getConfigEntry("Feature")) &&
 		    !strcmp(feature, "DailyDevotion")) {
diff --git a/src/main/modulecache.hh b/src/main/modulecache.hh
index 944c686..488f99a 100644
--- a/src/main/modulecache.hh
+++ b/src/main/modulecache.hh
@@ -35,7 +35,7 @@
 #include <config.h>
 #endif
 
-#include <gnome.h>
+#include <gtk/gtk.h>
 #include <glib.h>
 #include <assert.h>
 #include "main/global_ops.hh"
diff --git a/src/main/navbar.cc b/src/main/navbar.cc
index 09b4053..b5c5af8 100644
--- a/src/main/navbar.cc
+++ b/src/main/navbar.cc
@@ -22,7 +22,7 @@
 #ifdef HAVE_CONFIG_H
 #  include <config.h>
 #endif
-#include <gnome.h>
+#include <gtk/gtk.h>
 #include <swmgr.h>
 #include <versekey.h>
 
@@ -38,9 +38,10 @@
 #include "gui/commentary_dialog.h"
 #include "gui/bibletext_dialog.h"
 
-
 #include "backend/sword_main.hh"
 
+#include "gui/debug_glib_null.h"
+
 //#ifdef OLD_NAVBAR
 
 gboolean do_display;
diff --git a/src/main/navbar_book.cc b/src/main/navbar_book.cc
index 13e4d20..9335143 100644
--- a/src/main/navbar_book.cc
+++ b/src/main/navbar_book.cc
@@ -22,7 +22,7 @@
 #ifdef HAVE_CONFIG_H
 #  include <config.h>
 #endif
-#include <gnome.h>
+#include <gtk/gtk.h>
 #include <versekey.h>
 
 #include "main/navbar_book.h"
@@ -35,6 +35,8 @@
 
 #include "backend/sword_main.hh"
 
+#include "gui/debug_glib_null.h"
+
 
 /******************************************************************************
  * Name
diff --git a/src/main/navbar_book_dialog.cc b/src/main/navbar_book_dialog.cc
index 997c0e2..07478fc 100644
--- a/src/main/navbar_book_dialog.cc
+++ b/src/main/navbar_book_dialog.cc
@@ -22,7 +22,7 @@
 #ifdef HAVE_CONFIG_H
 #  include <config.h>
 #endif
-#include <gnome.h>
+#include <gtk/gtk.h>
 #include <versekey.h>
 #include <swmodule.h>
 
diff --git a/src/main/navbar_versekey.cc b/src/main/navbar_versekey.cc
index 4970089..aeda8f6 100644
--- a/src/main/navbar_versekey.cc
+++ b/src/main/navbar_versekey.cc
@@ -22,7 +22,7 @@
 #ifdef HAVE_CONFIG_H
 #  include <config.h>
 #endif
-#include <gnome.h>
+#include <gtk/gtk.h>
 #include <versekey.h>
 
 #include "main/module_dialogs.h"
@@ -42,6 +42,7 @@
 
 #include "backend/sword_main.hh"
 
+#include "gui/debug_glib_null.h"
 
 extern gboolean do_display;
 extern gboolean do_display_dict;
diff --git a/src/main/parallel_view.cc b/src/main/parallel_view.cc
index f3f657e..75ff106 100644
--- a/src/main/parallel_view.cc
+++ b/src/main/parallel_view.cc
@@ -23,10 +23,14 @@
 #include <config.h>
 #endif
 
-#include <gnome.h>
+#include <gtk/gtk.h>
 
 #ifdef USE_GTKMOZEMBED
+#ifdef WIN32
+#include "geckowin/gecko-html.h"
+#else
 #include "gecko/gecko-html.h"
+#endif
 #else
 #ifdef __cplusplus
 extern "C" {
@@ -53,6 +57,8 @@ extern "C" {
 #include "main/xml.h"
 #include "main/display.hh"
 
+#include "gui/debug_glib_null.h"
+
 #define HTML_START "<html><head><meta http-equiv=\"content-type\" content=\"text/html; charset=utf-8\"><STYLE type=\"text/css\"><!--A { text-decoration:none }--></STYLE></head>"
 
 extern GtkWidget *entrycbIntBook;
@@ -105,7 +111,7 @@ static const gchar *tf2of(int true_false)
 static void set_global_option(char * option, gboolean choice)
 {
 	const char *on_off = tf2of(choice);
-	SWMgr *mgr = backend_p->get_display_mgr();
+	SWMgr *mgr = backend_p->get_mgr();
 	char *buf= g_strdup (option);
 
 //	GS_message (("option://%s\n\n",option));
@@ -124,7 +130,7 @@ static void set_global_textual_reading (const char * option, int choice)
 {
 	//gboolean primary = 0, secondary = 0, all = 0;
 	char *buf= g_strdup (option);
-	SWMgr *mgr = backend_p->get_display_mgr();
+	SWMgr *mgr = backend_p->get_mgr();
 	
 	xml_set_value("Xiphos", 
 		      "parallel", 
@@ -343,7 +349,7 @@ void main_set_parallel_module_global_options(GtkCheckMenuItem * menuitem,
 void main_set_parallel_options_at_start(void)
 {
 	char *value;
-	SWMgr *mgr = backend_p->get_display_mgr();
+	SWMgr *mgr = backend_p->get_mgr();
 
 	GList *tmp = backend->get_module_options();
 	while (tmp) {
diff --git a/src/main/prayerlists.cc b/src/main/prayerlists.cc
index 0687f34..2684859 100644
--- a/src/main/prayerlists.cc
+++ b/src/main/prayerlists.cc
@@ -24,7 +24,7 @@
 #include <config.h>
 #endif
 
-#include <gnome.h>
+#include <gtk/gtk.h>
 #include <glib/gstdio.h>
 #include <swmodule.h>
 #include <swmgr.h>
@@ -34,6 +34,7 @@
 #include <iostream>
 #include <string>
 #include <stdio.h>
+#include <unistd.h>
 
 
 #include "main/mod_mgr.h"
@@ -48,6 +49,8 @@
 
 #include "backend/sword_main.hh"
 
+#include "gui/debug_glib_null.h"
+
 #ifndef NO_SWORD_NAMESPACE
 using sword::TreeKeyIdx;
 using sword::RawGenBook;
diff --git a/src/main/previewer.cc b/src/main/previewer.cc
index 8199d47..fa95410 100644
--- a/src/main/previewer.cc
+++ b/src/main/previewer.cc
@@ -23,15 +23,19 @@
 #include <config.h>
 #endif
 
-#include <gnome.h>
+#include <gtk/gtk.h>
 #include <swmgr.h>
 #include <swmodule.h>
 #include <stringmgr.h>
 #include <localemgr.h>
 
 #ifdef USE_GTKMOZEMBED
+#ifdef WIN32
+#include "geckowin/gecko-html.h"
+#else
 #include "gecko/gecko-html.h"
 #endif
+#endif
 
 #ifdef __cplusplus
 extern "C" {
@@ -51,6 +55,9 @@ extern "C" {
 #include "main/sword.h"
 #include "main/xml.h"
 #include "backend/sword_main.hh"
+
+#include "gui/debug_glib_null.h"
+
 //#define HTML_START "<html><head><meta http-equiv=\"content-type\" content=\"text/html; charset=utf-8\"></head>"
 #define HTML_START "<html><head><meta http-equiv=\"content-type\" content=\"text/html; charset=utf-8\"><STYLE type=\"text/css\"><!-- A { text-decoration:none } %s --></STYLE></head>"
 #define DOUBLE_SPACE " * { line-height: 2em ! important; }"
@@ -74,6 +81,71 @@ GtkWidget *main_get_previewer_widget(void)
 		: widgets.html_previewer_text;
 }
 
+/******************************************************************************
+ * Name
+ *   main_init_previewer
+ *
+ * Synopsis
+ *   #include "main/previewer.h"
+ *
+ *   void main_init_previewer(void)
+ *
+ * Description
+ *   clear the information viewer
+ *
+ * Return value
+ *   void
+ */ 
+
+void main_init_previewer(void)
+{
+	GString *tmp_str = g_string_new(NULL);
+	GString *str;
+	gchar *buf;
+
+#ifdef USE_GTKMOZEMBED
+	if (!GTK_WIDGET_REALIZED(GTK_WIDGET(previewer_html_widget)))
+		return;
+	GeckoHtml *html = GECKO_HTML(previewer_html_widget);
+	gecko_html_open_stream(html, "text/html");
+#else
+	/* setup gtkhtml widget */
+	GtkHTML *html = GTK_HTML(previewer_html_widget);	
+	gboolean was_editable = gtk_html_get_editable(html);
+	
+	if (was_editable)
+		gtk_html_set_editable(html, FALSE);
+#endif
+	g_string_printf(tmp_str,
+			HTML_START
+			"<body bgcolor=\"%s\" text=\"%s\" link=\"%s\">",
+			"",			
+			settings.bible_bg_color, settings.bible_text_color,
+			settings.link_color);
+
+	str = g_string_new(tmp_str->str);
+	buf = _("Previewer");
+	g_string_printf(tmp_str,
+			"<b>%s</b><br><font color=\"grey\">"
+			"<HR></font><br>", buf);
+	str = g_string_append(str, tmp_str->str);
+
+	g_string_printf(tmp_str, " %s", "</font></body></html>");
+	str = g_string_append(str, tmp_str->str);
+
+#ifdef USE_GTKMOZEMBED
+	if (str->len)
+		gecko_html_write(html, str->str, str->len);
+	gecko_html_close(html);
+#else
+	if (str->len)
+		gtk_html_load_from_string(html, str->str, str->len);
+	gtk_html_set_editable(html, was_editable);
+#endif
+	g_string_free(str, TRUE);
+	g_string_free(tmp_str, TRUE);
+}
+
 
 /******************************************************************************
  * Name
@@ -96,7 +168,6 @@ void main_clear_viewer(void)
 #ifdef USE_PREVIEWER_AUTOCLEAR
 	GString *tmp_str = g_string_new(NULL);
 	GString *str;
-	gboolean was_editable = FALSE;
 	gchar *buf;
 
 #ifdef USE_GTKMOZEMBED
@@ -106,8 +177,9 @@ void main_clear_viewer(void)
 	gecko_html_open_stream(html, "text/html");
 #else
 	/* setup gtkhtml widget */
-	GtkHTML *html = GTK_HTML(previewer_html_widget);
-	was_editable = gtk_html_get_editable(html);
+	GtkHTML *html = GTK_HTML(previewer_html_widget);	
+	gboolean was_editable = gtk_html_get_editable(html);
+	
 	if (was_editable)
 		gtk_html_set_editable(html, FALSE);
 #endif
@@ -304,12 +376,11 @@ void main_information_viewer(const gchar * mod_name, const gchar * text, const g
  *   void
  */
 
-void mark_search_words(GString * str, gboolean eliminate)
+void mark_search_words(GString * str)
 {
 	gchar *tmpbuf, *buf, *searchbuf;
-	gint len1, len2, len3, len4;
+	gint len_overall, len_word, len_tail, len_prefix;
 	gchar closestr[40], openstr[40];
-	gchar *s, *t;
 
 	/* regular expression search results         **fixme** */
 	if ((settings.searchType == 0) ||
@@ -321,53 +392,29 @@ void mark_search_words(GString * str, gboolean eliminate)
 	sprintf(closestr, "</b></font>");
 	/* open tags */
 	sprintf(openstr, "<font color=\"%s\"><b>", settings.found_color);
-	/* point buf to found verse */
-	buf = g_utf8_casefold(str->str,-1);
 	searchbuf = g_utf8_casefold(g_strdup(settings.searchText),-1);
 	if (g_str_has_prefix(searchbuf, "\"")) {
 		searchbuf = g_strdelimit(searchbuf, "\"", ' ');
 		g_strstrip(searchbuf);
 	}
 
-	if (eliminate) {
-		/* blank out html <a></a> markup, to avoid mis-marking it as matches. */
-		for (s = strchr(str->str, '<'); s; s = strchr(s, '<')) {
-			if ((*(s+1) == 'a') ||
-			    ((*(s+1) == '/') && (*(s+2) == 'a'))) {
-				if ((t = strchr(s, '>'))) {
-					while (s <= t)
-						*(s++) = ' ';
-				} else {
-					GS_message(("mark_search_words: Unmatched <> in %s\n", s));
-					goto out;
-				}
-			} else
-				++s;
-		}
-		/* move <> with excess spaces up close to their intended targets. */
-		for (s = strstr(str->str, " &gt;"); s; s = strstr(str->str, " &gt;")) {
-			memcpy(s, "&gt; ", 5);
-		}
-		for (s = strstr(str->str, "&lt; "); s; s = strstr(s, "&lt; ")) {
-			memcpy(s, " &lt;", 5);
-		}
-	}
-out:
+	buf = g_utf8_casefold(str->str,-1);
+
 	/* if we have a muti word search go here */
 	if (settings.searchType == -2 || settings.searchType == -4) {
 		char *token;
-		GList *list;
+		GList *list, *listbase;
 		gint count = 0, i = 0;
 
 		list = NULL;
 		/* seperate the search words and add them to a glist */
 		if ((token = strtok(searchbuf, " ")) != NULL) {
-			if (!isalpha(*token) && isalpha(*(token+1)))
+			if (!isalnum(*token) && isalnum(*(token+1)))
 				token++;
 			list = g_list_append(list, token);
 			++count;
 			while ((token = strtok(NULL, " ")) != NULL) {
-				if (!isalpha(*token) && isalpha(*(token+1)))
+				if (!isalnum(*token) && isalnum(*(token+1)))
 					token++;
 				list = g_list_append(list, token);
 				++count;
@@ -377,55 +424,83 @@ out:
 			list = g_list_append(list, searchbuf);
 			count = 1;
 		}
-		list = g_list_first(list);
-		/* find each word in the list and mark it */
+
+		listbase = list = g_list_first(list);
+
 		for (i = 0; i < count; i++) {
-			/* set len1 to length of verse */
-			len1 = strlen(buf);
-			/* set len2 to length of search word */
-			len2 = strlen((gchar *) list->data);
+			len_overall = strlen(buf);
+			if (settings.searchType == -4) {
+				// remove metachars and anything following ("WORD*")
+				for (tmpbuf = (gchar *)list->data;
+				     *tmpbuf && isalnum(*tmpbuf);
+				     ++tmpbuf)
+					; // nothing, just skipping to end or non-alnum
+				if ((tmpbuf != list->data) && *tmpbuf)
+					*tmpbuf = '\0';
+				else if (!sword::stricmp((gchar *)list->data, "and") ||
+					 !sword::stricmp((gchar *)list->data, "or")  ||
+					 !sword::stricmp((gchar *)list->data, "not")) {
+						// don't color boolean ops.
+						goto next_word;
+				}
+			}
+			len_word = strlen((gchar *)list->data);
+
 			/* find search word in verse */
-			while ((tmpbuf =
-			     g_strrstr(buf, (gchar *) list->data)) != NULL) {
-				/* set len3 to length of tmpbuf 
-				   (tmpbuf points to last occurance of 
-				   search word in verse) */
-				len3 = strlen(tmpbuf);
-				//-- set len4 to diff between len1 and len3
-				len4 = len1 - len3;
-				/* add end tags first 
-				   (position to add tag to is len4 + len2) */
-				str = g_string_insert(str, (len4 + len2),
-						      closestr);
-				/* then add start tags 
-				   (position to add tag to is len4) */
-				str = g_string_insert(str, len4, openstr);
-				/* prepare to search for another occurance */
-				buf[len4] = '\0';
-				len1 =len4;
+			while ((tmpbuf = g_strrstr(buf, (gchar *)list->data)) != NULL) {
+				char *angle_open, *angle_close;
+
+				len_tail = strlen(tmpbuf);
+				len_prefix = len_overall - len_tail;
+
+				// find html <> delimiters preceding this word.
+				*tmpbuf = '\0';
+				angle_open = strrchr(buf, '<');
+				angle_close = strrchr(buf, '>');
+
+				// contortions about that preceding markup.
+				// note placement of <> in good/bad examples.
+				// good: anything WORD anything [none]
+				// good: <token> anything WORD anything [outside]
+				// bad:  token> anything <token WORD anything [inside]
+				if (!angle_open ||		  // no open (safe), or
+				    (angle_close &&		  // there exists close and
+				     (angle_open < angle_close))) // open is before close
+				{
+					// add end tag first
+					str = g_string_insert(str,
+							      (len_prefix + len_word),
+							      closestr);
+					// then add start tag
+					str = g_string_insert(str,
+							      len_prefix,
+							      openstr);
+				}
+
+				len_overall = len_prefix;
 			}
-			/* point buf to changed str */
-			buf = g_utf8_casefold(str->str,-1);
-			list = g_list_next(list);
+		next_word:
+			g_free(buf);
+			if ((list = g_list_next(list)))
+				buf = g_utf8_casefold(str->str,-1);
 		}
-		g_list_free(list);
+		g_list_free(listbase);
 
 		/* else we have a phrase and only need to mark it */
 	} else {
-		len1 = strlen(buf);
-		len2 = strlen(searchbuf);
+		len_overall = strlen(buf);
+		len_word = strlen(searchbuf);
 		tmpbuf = strstr(buf, searchbuf);
 		if (tmpbuf) {
-			len3 = strlen(tmpbuf);
-			len4 = len1 - len3;
+			len_tail = strlen(tmpbuf);
+			len_prefix = len_overall - len_tail;
 			/* place end tag first */
-			str = g_string_insert(str, (len4 + len2),
+			str = g_string_insert(str, (len_prefix + len_word),
 					      closestr);
 			/* then place start tag */
-			str = g_string_insert(str, len4, openstr);
+			str = g_string_insert(str, len_prefix, openstr);
 		}
 	}
-	/* free searchbuf */
 	g_free(searchbuf);
 }
 
@@ -516,7 +591,7 @@ void main_entry_display(gpointer data, gchar * mod_name,
 
 	if (settings.displaySearchResults) {
 		search_str = g_string_new(text);
-		mark_search_words(search_str, TRUE);
+		mark_search_words(search_str);
 		str = g_string_append(str, search_str->str);
 		g_string_free(search_str, TRUE);
 	} else {
diff --git a/src/main/previewer.h b/src/main/previewer.h
index 7fd1379..cfb7fc1 100644
--- a/src/main/previewer.h
+++ b/src/main/previewer.h
@@ -26,14 +26,15 @@
 extern "C"
 {
 #endif
-
+	
+void main_init_previewer(void);
 void main_set_previewer_widget(int in_sidebar);
 GtkWidget *main_get_previewer_widget(void);
 void main_clear_viewer(void);
 void main_information_viewer(const char * mod_name, const char * text, const char * key,
 		             const char * action, const char * type, const char * morph_text,
 			     const char * morph);
-void mark_search_words(GString * str, gboolean eliminate);
+void mark_search_words(GString * str);
 void main_entry_display(gpointer data, char * mod_name,
 		   char * text, char * key, gboolean show_key);
 
diff --git a/src/main/search_dialog.cc b/src/main/search_dialog.cc
index 2481d72..5656041 100644
--- a/src/main/search_dialog.cc
+++ b/src/main/search_dialog.cc
@@ -22,12 +22,16 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include <gnome.h>
+#include <gtk/gtk.h>
 #include <regex.h>
 #include <swbuf.h>
 #include <swmodule.h>
 #ifdef USE_GTKMOZEMBED
+#ifdef WIN32
+#include "geckowin/gecko-html.h"
+#else
 #include "gecko/gecko-html.h"
+#endif
 #else
 #ifdef __cplusplus
 extern "C" {
@@ -53,10 +57,12 @@ extern "C" {
 #include "gui/widgets.h"
 #include "gui/dialog.h"
 #include "gui/utilities.h"
-
+#include "gui/export_bookmarks.h"
 
 #include "backend/sword_main.hh"
 
+#include "gui/debug_glib_null.h"
+
 #define SEARCHING _("Searching the ")
 #define SMODULE _(" Module")
 #define FINDS _("found in ")		
@@ -80,6 +86,83 @@ int drag_module_type;
 static GList *list_of_finds;
 static GList *list_for_bookmarking = NULL;
 
+
+
+/******************************************************************************
+ * Name
+ *   main_export_current_adv_search
+ *
+ * Synopsis
+ *   #include "main/search_dialog.h"
+ *
+ *   void  main_export_current_adv_search(GString * str, gboolean html)
+ *
+ * Description
+ *   exports search results to html or plain text
+ *   
+ *
+ * Return value
+ *   void
+ */
+
+gboolean main_export_current_adv_search (GString * str, gboolean html, gboolean with_scripture)
+{	
+	GList *verses = NULL;
+	GList *tmp = NULL;
+	RESULTS *list_item;
+	gboolean ret = FALSE;
+	gchar *desc;
+	
+	tmp = g_list_first(list_for_bookmarking);
+	if (html)
+		str = g_string_append(str, "<html><body>");
+	while (tmp) {
+		verses = (GList*) tmp->data;
+		
+		GString *verse_string = g_string_new("");
+		gboolean first_entry = TRUE;
+		
+		while (verses) {
+			list_item = (RESULTS *) verses->data;
+			if (main_is_Bible_key(list_item->key)) {
+				ret = TRUE;
+				if (first_entry) {					
+					if (html)
+						g_string_printf(verse_string, "<ul><b>%s</b>", list_item->module);
+					else
+						g_string_printf(verse_string, "%s\n", list_item->module);
+					first_entry = FALSE;
+					str = g_string_append(str, verse_string->str);
+				} else {
+					desc = g_strdup_printf("%s %s",
+					    			list_item->key,
+					    			list_item->module);
+					if (html) 
+						gui_set_html_item ( str,
+								desc,
+								list_item->module, 
+								list_item->key,
+								with_scripture);
+					else 
+						gui_set_plain_text_item ( str, 
+								desc,
+								list_item->module, 
+								list_item->key,
+								with_scripture);
+												
+				}
+			}
+			verses = g_list_next(verses);
+		}
+		g_string_free(verse_string, TRUE);
+		if (html)
+			str = g_string_append(str, "</ul>");
+		tmp = g_list_next(tmp);
+	}
+	return ret;
+}
+
+
 /******************************************************************************
  * Name
  *   main_save_current_adv_search_as_bookmarks
@@ -222,7 +305,7 @@ void main_range_text_changed(GtkEditable * editable)
 static void set_search_global_option(const gchar * option, gboolean choice)
 {	
 	const char *on_off;
-	SWMgr *mgr = backendSearch->get_display_mgr();
+	SWMgr *mgr = backendSearch->get_mgr();
 
 	if (choice) {
 		on_off = "On";
@@ -889,7 +972,7 @@ void main_finds_verselist_selection_changed(GtkTreeSelection * selection,
 	g_free((gchar *)temp_key);
 
 	text_str = g_string_new(backendSearch->get_render_text(module,key));
-	mark_search_words(text_str, FALSE);
+	mark_search_words(text_str);
 
 #ifdef USE_GTKMOZEMBED
 	GString *html_text = g_string_new(HTML_START);
@@ -1458,6 +1541,12 @@ void main_do_dialog_search(void)
 	terminate_search = FALSE;
 	search_active = TRUE;
 
+	// must ensure that no accents or vowel points are enabled.
+	SWMgr *mgr = backendSearch->get_mgr();
+	mgr->setGlobalOption("Greek Accents", "Off");
+	mgr->setGlobalOption("Hebrew Vowel Points", "Off");
+	mgr->setGlobalOption("Arabic Vowel Points", "Off");
+
 	while (search_mods != NULL) {
 		module = (gchar *) search_mods->data;
 
@@ -1497,8 +1586,10 @@ void main_do_dialog_search(void)
 		
 		finds = backendSearch->do_module_search(module, 
 					(attribute_search_string
-					 ? attribute_search_string
-					 : search_string),
+					 ? mgr->getModule(module)->
+						StripText(attribute_search_string)
+					 : mgr->getModule(module)->
+						StripText(search_string)),
 					search_type, 
 					search_params, 
 					TRUE);
@@ -1552,7 +1643,8 @@ void main_do_dialog_search(void)
 	g_list_free(search_mods);
 	gui_set_progressbar_text(search1.progressbar, _("Search finished"));
 	gui_set_progressbar_fraction(search1.progressbar, 0);
-	g_string_free(str, TRUE);	
+	g_string_free(str, TRUE);
+	gtk_widget_grab_focus(search1.listview_verses);
 }
 
 /******************************************************************************
diff --git a/src/main/search_dialog.h b/src/main/search_dialog.h
index 200f9bb..3b1ded6 100644
--- a/src/main/search_dialog.h
+++ b/src/main/search_dialog.h
@@ -26,6 +26,7 @@
 extern "C" {
 #endif
 
+gboolean main_export_current_adv_search (GString * str, gboolean html, gboolean with_scripture);
 void main_save_current_adv_search_as_bookmarks (void);
 void main_drag_drop_display_in_main(const char * uri);
 void main_add_mod_to_list(GtkWidget * tree_widget, gchar * mod_name);
diff --git a/src/main/search_sidebar.cc b/src/main/search_sidebar.cc
index 15ec293..3ed4da6 100644
--- a/src/main/search_sidebar.cc
+++ b/src/main/search_sidebar.cc
@@ -22,9 +22,10 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include <gnome.h>
+#include <gtk/gtk.h>
 #include <regex.h>
 #include <ctype.h>
+#include <swmodule.h>
 
 
 #ifdef __cplusplus
@@ -51,6 +52,12 @@ extern "C" {
 
 #include "backend/sword_main.hh"
 
+#include "gui/debug_glib_null.h"
+
+#ifdef HAVE_DBUS
+#include "gui/ipc.h"
+#endif
+
 #define SEARCHING N_("Searching the ")
 #define SMODULE N_(" Module")
 #define FINDS N_("found in ")		
@@ -93,6 +100,11 @@ static void fill_search_results_list(int finds)
 	gchar *buf1 = _("matches");
 	RESULTS *list_item;
 	gchar *num;
+
+	if (!backendSearch)
+		main_init_sidebar_search_backend();
+
+	is_search_result = TRUE;
 	
 	if (list_of_verses) {
 		GList *chaser = list_of_verses;
@@ -106,31 +118,32 @@ static void fill_search_results_list(int finds)
 		g_list_free(list_of_verses);
 		list_of_verses = NULL;
 	}
-	
+
 	gtk_widget_set_sensitive(sidebar.menu_item_save_search,FALSE);
 	selection = gtk_tree_view_get_selection
-                                          (GTK_TREE_VIEW(sidebar.results_list));
-	model = gtk_tree_view_get_model(GTK_TREE_VIEW(sidebar.results_list));
-	list_store = GTK_LIST_STORE(model);
-	gtk_list_store_clear(list_store);
+		(GTK_TREE_VIEW(sidebar.results_list));
+	list_store = gtk_list_store_new(1, G_TYPE_STRING);
+
 	backendSearch->set_listkey_position((char) 1);	/* TOP */
 	while ((key_buf = backendSearch->get_next_listkey()) != NULL) {
 		tmpbuf = (gchar*) key_buf;
 		gtk_list_store_append(list_store, &iter);
 		gtk_list_store_set(list_store, &iter, 0,
-					   tmpbuf, -1);
+				   tmpbuf, -1);
 		list_item = g_new(RESULTS,1);
 		list_item->module = g_strdup(settings.sb_search_mod);
 		list_item->key = g_strdup(tmpbuf);
 		list_of_verses = g_list_append(list_of_verses, 
-						(RESULTS *) list_item);
+					       (RESULTS *) list_item);
 	}
-	
+
+	model = GTK_TREE_MODEL(list_store);
+	gtk_tree_view_set_model (GTK_TREE_VIEW(sidebar.results_list), model);
+
 	num = main_format_number(finds);
 	sprintf(buf, "%s %s", num, buf1);
 	g_free(num);
 	gui_set_statusbar (buf);
-	//gnome_appbar_set_status(GNOME_APPBAR(widgets.appbar), buf);
 	gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets.notebook_sidebar),3);
 	/* cleanup progress bar */
 	gtk_progress_bar_update(GTK_PROGRESS_BAR(ss.progressbar_search),
@@ -142,23 +155,36 @@ static void fill_search_results_list(int finds)
 	gtk_widget_set_sensitive(sidebar.menu_item_save_search,TRUE);
 	path = gtk_tree_model_get_path(model,&iter);				
 	gtk_tree_selection_select_path(selection,
-                                             path);
+				       path);
 	gtk_tree_path_free(path);	 
 	gui_verselist_button_release_event(NULL,NULL,NULL);
+	return;
 }
 
+#ifdef HAVE_DBUS
+GList* get_list_of_references()
+{
+	RESULTS* list_item;
+	GList *tmp = list_of_verses;
+	GList *references = NULL;
+	while (tmp) {
+		list_item = (RESULTS*)tmp->data;
+		references = g_list_append(references, list_item->key);
+		tmp = g_list_next(tmp);
+	}
+	return g_list_first(references);
+}	
+#endif
 
 /******************************************************************************
  * Name
- *    on_search_botton_clicked
+ *    main_do_sidebar_search
  *
  * Synopsis
- *   #include "shortcutbar_search.h"
- *
- *   void on_search_botton_clicked(GtkButton * button, gpointer user_data)
+ *    main_do_sidebar_search(gpointer user_data)
  *
  * Description
- *   prepare to begin search
+ *   search from sidebar
  *
  * Return value
  *   void
@@ -167,9 +193,12 @@ static void fill_search_results_list(int finds)
 void main_do_sidebar_search(gpointer user_data)
 {
 	GString *new_search = g_string_new(NULL);
-	int search_params, finds;
+	gint search_params, finds;
 	const char *search_string = NULL;
 	char *search_module;	
+
+	if (!backendSearch)
+		main_init_sidebar_search_backend();
 	
 	gtk_widget_set_sensitive(sidebar.menu_item_save_search,FALSE);
 	search_dialog = FALSE;
@@ -237,17 +266,40 @@ void main_do_sidebar_search(gpointer user_data)
 	terminate_search = FALSE;
 	search_active = TRUE;
 
-	finds = backendSearch->do_module_search(search_module, search_string,
-				 settings.searchType, search_params, FALSE);
+	// must ensure that no accents or vowel points are enabled.
+	SWMgr *mgr = backendSearch->get_mgr();
+	mgr->setGlobalOption("Greek Accents", "Off");
+	mgr->setGlobalOption("Hebrew Vowel Points", "Off");
+	mgr->setGlobalOption("Arabic Vowel Points", "Off");
+
+	finds = backendSearch->do_module_search(search_module, 
+						mgr->getModule(search_module)->
+						     StripText(search_string),
+						settings.searchType,
+						search_params,
+						FALSE);
 	g_string_free(new_search, TRUE);
 
 	search_active = FALSE;
 
-	fill_search_results_list(finds);
+	fill_search_results_list (finds);
+
+#ifdef HAVE_DBUS
+	IpcObject *obj = ipc_get_main_ipc();
+	if (obj){
+		obj->references = get_list_of_references();
+		ipc_object_search_performed(obj, settings.searchText,
+					    &finds, NULL);
+	}
+#endif
+	
 }
 
 void main_sidebar_perscomm_dump(void)
 {
+	if (!backendSearch)
+		main_init_sidebar_search_backend();
+	
 	strcpy(settings.sb_search_mod,settings.MainWindowModule);
 	backendSearch->clear_scope();
 	backendSearch->clear_search_list();
@@ -256,19 +308,21 @@ void main_sidebar_perscomm_dump(void)
 		/* find one character */	".",
 		/* regexp */			0,
 		/* case is irrelevant */	0,
-		/* happening in sidebar */	FALSE));
+						 /* happening in sidebar */	FALSE));
 }
 
 void main_init_sidebar_search_backend(void)
 {
-	backendSearch = new BackEnd();
-	
+	if (!backendSearch)
+	{
+		backendSearch = new BackEnd();
+		main_search_sidebar_fill_bounds_combos();
+	}
 }
 
 void main_delete_sidebar_search_backend(void)
 {
 	delete backendSearch;
-	
 }
 
 void main_search_sidebar_fill_bounds_combos(void)
@@ -278,7 +332,10 @@ void main_search_sidebar_fill_bounds_combos(void)
 	char *module_name;
 	int i = 0;
 	int testaments;
-	
+
+	if (!backendSearch)
+		main_init_sidebar_search_backend();
+
 	//module_name = settings.sb_search_mod;
 	module_name = g_strdup(settings.MainWindowModule);
 
@@ -350,6 +407,8 @@ void main_sidebar_search_percent_update(char percent, void *userData)
 	float num;
 	char buf[80];
 	static char printed = 0;
+	if (!backendSearch)
+		main_init_sidebar_search_backend();
 	
 	if (terminate_search) {
 		backendSearch->terminate_search();
diff --git a/src/main/settings.c b/src/main/settings.c
index 3666797..a8aeee0 100644
--- a/src/main/settings.c
+++ b/src/main/settings.c
@@ -24,7 +24,7 @@
 #include <config.h>
 #endif
 
-#include <gnome.h>
+#include <gtk/gtk.h>
 
 #include <fcntl.h>
 #include <stdio.h>
@@ -39,6 +39,7 @@
 #include "gui/dialog.h"
 #include "gui/mod_mgr.h"
 #include "gui/utilities.h"
+#include "gui/preferences_dialog.h"
 
 #include "main/lists.h"
 #include "main/settings.h"
@@ -47,6 +48,9 @@
 
 #include <glib/gstdio.h>
 
+#include "gui/debug_glib_null.h"
+#include <locale.h>
+
 
 /******************************************************************************
  * defines
@@ -84,11 +88,10 @@ static int init_bookmarks(int new_bookmarks);
  *   gint
  */
 
-int settings_init(int new_configs, int new_bookmarks)
+int settings_init(int argc, char **argv, int new_configs, int new_bookmarks)
 {
 	int retval = 0;
 	char *sword_dir = NULL;
-	char *gs_old = NULL;
 	char *tmp = NULL;
 	char *env;
 
@@ -96,16 +99,9 @@ int settings_init(int new_configs, int new_bookmarks)
 	/* set program title */
 	strcpy(settings.program_title, "Xiphos");
 
-	/* find out what kind of peculiar language environment we have */
-	re_encode_digits = FALSE;
-	if (((env = (char*) g_getenv("LC_ALL")) != NULL) &&
-	    // for now, farsi-sensitive only
-	    (strncmp (env, "fa", 2) == 0)) {
-		re_encode_digits = TRUE;
-	}
-
 	/* Get home dir */
 	if ((settings.homedir = (char*) g_getenv(HOMEVAR)) == NULL) {
+		gui_init(argc, argv);
 		gui_generic_warning(_("$HOME is not set!"));
 		/* if not found in env exit */
 		exit(0);
@@ -118,33 +114,22 @@ int settings_init(int new_configs, int new_bookmarks)
 
 	/* if gSwordDir does not exist, create it. */
 	if (access(settings.gSwordDir, F_OK) == -1) {
-		gs_old = g_strdup_printf("%s/.xiphos-2.0", settings.homedir);
-		if (access(gs_old, F_OK) == 0) {
-			if (rename(gs_old, settings.gSwordDir) == 0)
-				gui_generic_warning(_("Xiphos has renamed .xiphos-2.0 to .xiphos"));
-			else {
-				char msg[300];
-				sprintf(msg, _("Xiphos can not rename  .xiphos-2.0 to .xiphos:\n%s\n\nXiphos cannot continue."),
-					strerror(errno));
-				gui_generic_warning(msg);
-				/* necessarily giving up. */
-				gtk_exit(1);
-			}
-		} else if ((Mkdir(settings.gSwordDir, S_IRWXU)) != 0) {
+		if ((Mkdir(settings.gSwordDir, S_IRWXU)) != 0) {
 			char msg[300];
+			gui_init(argc, argv);
 			sprintf(msg, _("Xiphos can not create  .xiphos:\n%s\n\nXiphos cannot continue."),
 				strerror(errno));
 			gui_generic_warning(msg);
 			/* if we can not create gSwordDir exit */
 			gtk_exit(1);
 		}
-		g_free(gs_old);
 	}
 
 	/* if .sword does not exist create it */
 	sword_dir = g_strdup_printf("%s/%s", settings.homedir, DOTSWORD);
 	if (access(sword_dir, F_OK) == -1) {
 		if ((Mkdir(sword_dir, S_IRWXU)) != 0) {
+			gui_init(argc, argv);
 			gui_generic_warning(_("can not create " DOTSWORD));
 		} 
 	}
@@ -153,6 +138,7 @@ int settings_init(int new_configs, int new_bookmarks)
 	sword_dir = g_strdup_printf("%s/%s", settings.homedir, DOTSWORD "/mods.d");
 	if (access(sword_dir, F_OK) == -1) {
 		if ((Mkdir(sword_dir, S_IRWXU)) != 0) {
+			gui_init(argc, argv);
 			gui_generic_warning(_("can not create " DOTSWORD "/mods.d"));
 		} 
 	}	
@@ -161,6 +147,7 @@ int settings_init(int new_configs, int new_bookmarks)
 	sword_dir = g_strdup_printf("%s/%s", settings.homedir, DOTSWORD "/modules");
 	if (access(sword_dir, F_OK) == -1) {
 		if ((Mkdir(sword_dir, S_IRWXU)) != 0) {
+			gui_init(argc, argv);
 			gui_generic_warning(_("can not create " DOTSWORD "/modules"));
 		} 
 	}
@@ -173,6 +160,10 @@ int settings_init(int new_configs, int new_bookmarks)
 
 	init_bookmarks(new_bookmarks);
 
+	/* get the first cut at the set of modules available. */
+	/* maybe insufficient, contain no bibles: ok for now. */
+	main_init_lists();
+
 	/* set fnconfigure to gSwordDir and settings.xml */
 	settings.fnconfigure = g_new(char, strlen(settings.gSwordDir) +
 				     strlen("settings.xml") + 2);
@@ -185,35 +176,33 @@ int settings_init(int new_configs, int new_bookmarks)
 		GS_print(("\nFirst Run: need to create settings!\n"));
 		settings.first_run = TRUE;
 
-		main_init_lists();
-		if (settings.havebible == 0) {
-			if (gui_yes_no_dialog(GS_NET_PERMISSION, NULL)) {
-				main_shutdown_list();
-				gui_open_mod_mgr_initial_run();
-				main_init_lists();
-				if (settings.havebible == 0) {
-					gui_generic_warning
-					    (_("There are still no Bibles installed.\nEvidently, you declined to install any.\n\nWithout any Bible modules to display,\nXiphos cannot proceed,\nand will now exit."));
-					exit(1);
-				} else
-					gui_generic_warning
-					    (_("Bible module installation complete."));
-			} else {
-				gui_generic_warning
-				    (_("Without any Bible modules to display,\nXiphos cannot proceed,\nand will now exit."));
-				exit(1);
-			}
-		}
-		main_shutdown_list();
-
-		main_init_lists();
 		xml_create_settings_file(settings.fnconfigure);
-		//retval = gui_first_run();
-		main_shutdown_list();
 		xml_save_settings_doc(settings.fnconfigure);
 		xml_free_settings_doc();
 	}
-	
+	xml_parse_settings_file(settings.fnconfigure);
+
+	/* ensure that the user has a bible with which to work */
+	if (settings.havebible == 0) {
+		gui_init(argc, argv);
+		if (gui_yes_no_dialog(GS_NET_PERMISSION, NULL)) {
+			main_shutdown_list();
+			gui_open_mod_mgr_initial_run();
+			main_init_lists();
+			if (settings.havebible == 0) {
+				gui_generic_warning
+				    (_("There are still no Bibles installed.\nEvidently, you declined to install any.\n\nWithout any Bible modules to display,\nXiphos cannot proceed,\nand will now exit."));
+				exit(1);
+			} else
+				gui_generic_warning
+				    (_("Bible module installation complete."));
+		} else {
+			gui_generic_warning
+			    (_("Without any Bible modules to display,\nXiphos cannot proceed,\nand will now exit."));
+			exit(1);
+		}
+	}
+
 	/* check for template.pad file for studypad */
 	tmp = g_new(char, strlen(settings.gSwordDir) +
 				     strlen("template.pad") + 2);
@@ -237,10 +226,32 @@ int settings_init(int new_configs, int new_bookmarks)
 		g_file_set_contents(tmp, " ", strlen(" "), NULL);
 	}
     
-	xml_parse_settings_file(settings.fnconfigure);
 	load_settings_structure();
 
-	gconf_setup();
+	/*
+	 * if the user had forced a locale, we must set it now.
+	 */
+	if (settings.special_locale && strcmp(settings.special_locale, NONE)) {
+		g_setenv("LANG", settings.special_locale, TRUE);
+		gchar *test = setlocale(LC_ALL, settings.special_locale);
+		if (test == NULL) {
+			gchar lfix[32];
+			sprintf(lfix, "%s.UTF-8", settings.special_locale); //for Ubuntu
+			test = setlocale(LC_ALL, lfix);
+		}
+		if (test != NULL) {
+			g_setenv("LC_ALL", test, TRUE);
+			GS_message(("set locale to %s", settings.special_locale));
+		}
+	}
+
+	/* find out what kind of peculiar language environment we have */
+	re_encode_digits = FALSE;
+	if (((env = (char*) g_getenv("LANG")) != NULL) &&
+	    // for now, farsi-sensitive only
+	    (strncmp (env, "fa", 2) == 0)) {
+		re_encode_digits = TRUE;
+	}
 
 	return retval;
 }
@@ -356,7 +367,10 @@ void load_settings_structure(void)
 	char *buf = NULL;
 	
 	settings.gs_version = VERSION;
-	settings.MainWindowModule = xml_get_value("modules", "bible");
+	if ((settings.MainWindowModule = xml_get_value("modules", "bible")) == NULL) {
+		/* by the time we are here, we *must* have at least 1 bible */
+		settings.MainWindowModule = g_strdup(get_list(TEXT_LIST)->data);
+	}
 	settings.CommWindowModule = xml_get_value("modules", "comm");
 	settings.DictWindowModule = xml_get_value("modules", "dict");
 	settings.parallel1Module = xml_get_value("modules", "int1");
@@ -391,7 +405,16 @@ void load_settings_structure(void)
 	settings.useDefaultDict = atoi((buf = xml_get_value("lexicons","usedefaultdict"))
 				       ? buf : "0");
 
-	/* mod mgr stuff */ 
+	/* unusual locale setting */
+	if ((buf = xml_get_value("locale", "special")))
+		settings.special_locale = g_strdup(buf);
+	else {
+		xml_add_new_section_to_settings_doc("locale");
+		xml_add_new_item_to_section("locale", "special", NONE);
+		settings.special_locale = g_strdup(NONE);
+	}	 
+
+	/* mod mgr stuff */
 	if ((buf = xml_get_value("modmgr", "mod_mgr_source")))
 		settings.mod_mgr_source = atoi(buf);
 	else {
@@ -417,6 +440,12 @@ void load_settings_structure(void)
 		xml_add_new_item_to_section("modmgr", "mod_mgr_remote_source_index", "0");
 		settings.mod_mgr_remote_source_index = 0;
 	}	
+	if ((buf = xml_get_value("modmgr", "mod_mgr_intro")))
+		settings.mod_mgr_intro = atoi(buf);
+	else {
+		xml_add_new_item_to_section("modmgr", "mod_mgr_intro", "0");
+		settings.mod_mgr_intro = 0;
+	}	
 	
 	/* end mod mgr stuff */
 	
@@ -771,90 +800,3 @@ void load_settings_structure(void)
 		settings.browsing = 1;
 	}
 }
-
-
-/******************************************************************************
- * Name
- *    gconf_setup
- *
- * Synopsis
- *   #include "main/settings.h"
- *
- *   void gconf_setup()
- *
- * Description
- *   verifies and initializes the GConf subsystem, so that "sword://" and
- *   similar can be handled by url-comprehending programs such as browsers.
- *   dialogs for permission/success/failure => conditional on debug build.
- *
- * Return value
- *   void
- */
-
-#define	GS_GCONF_PERMISSION	_("URL references using \"sword://\" (similar to web page\nreferences) can be used by programs to look up\nscripture references. Your system currently has no\nprogram set to handle these references.\n\nWould you like Xiphos to set itself as the\nprogram to handle these references?")
-
-#define	GS_GCONF_SUCCESS	_("Xiphos has successfully set itself\nas the handler of sword:// and bible:// URLs.\n\nYou may wish to run the program \"gconf-editor\"\nto examine keys under /desktop/gnome/url-handlers,\nif you need to change these.")
-
-char *gconf_keys[GS_GCONF_MAX][2] = {
-    { "/desktop/gnome/url-handlers/bible/command",        "xiphos \"%s\"" },
-    { "/desktop/gnome/url-handlers/bible/enabled",        (char *) 1 },
-    { "/desktop/gnome/url-handlers/bible/needs_terminal", (char *) 0 },
-    { "/desktop/gnome/url-handlers/sword/command",        "xiphos \"%s\"" },
-    { "/desktop/gnome/url-handlers/sword/enabled",        (char *) 1 },
-    { "/desktop/gnome/url-handlers/sword/needs_terminal", (char *) 0 }
-};
-
-void gconf_setup()
-{
-	int i;
-	gchar *str;
-	gboolean retval;
-	GConfClient* client = gconf_client_get_default();
-
-	if (client == NULL)
-		return;		/* we're not running under GConf */
-
-	/*
-	 * This is deliberately somewhat simple-minded, at least for now.
-	 * We care about one thing: Is anything set to handle "bible://"?
-	 *
-	 * Unfortunate consequence of changing xiphos2 => xiphos:
-	 * We must fix broken keys.
-	 */
-	if ((((str = gconf_client_get_string(client, gconf_keys[0][0],
-					    NULL)) == NULL) ||
-	     (strncmp(str, "gnomesword", 10) == 0))
-#ifdef DEBUG
-	    && gui_yes_no_dialog(GS_GCONF_PERMISSION, NULL)
-#endif /* DEBUG */
-	    ) {
-		/*
-		 * Mechanical as can be, one after another.
-		 */
-		for (i = 0; i < GS_GCONF_MAX; ++i) {
-			retval = (((i % 3) == 0)	/* contrived hack */
-				  ? gconf_client_set_string
-					(client,
-					 gconf_keys[i][0],
-					 gconf_keys[i][1],
-					 NULL)
-				  : gconf_client_set_bool
-					(client,
-					 gconf_keys[i][0],
-					 (gconf_keys[i][1] ? TRUE : FALSE),
-					 NULL));
-#ifdef DEBUG
-			if (!retval) {
-				char msg[256];
-				sprintf(msg, _("Xiphos failed to complete handler init for key #%d:\n%s"),
-					i, gconf_keys[i][0]);
-				gui_generic_warning(msg);
-				return;
-			}
-#endif /* DEBUG */
-		}
-#ifdef DEBUG
-		gui_generic_warning(GS_GCONF_SUCCESS);
-#endif /* DEBUG */
-	}
-}
diff --git a/src/main/settings.h b/src/main/settings.h
index 01b0d9c..71f65c2 100644
--- a/src/main/settings.h
+++ b/src/main/settings.h
@@ -22,8 +22,6 @@
 #ifndef _SETTINGS_H_
 #define _SETTINGS_H_
 
-#include <gconf/gconf-client.h>
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -70,7 +68,10 @@ struct _settings {
 		*highlight_fg,		/* special fg color for highlight */
 		*highlight_bg,		/* special bg color for highlight */
 		*verse_num_font_size_str,
-		*base_font_size_str;
+		*base_font_size_str,
+
+		*special_locale;	/* prefs dialog: pick abnormal locale */
+					/* --requires restart-- */
 		
 	int
 		verse_num_font_size,
@@ -245,7 +246,10 @@ struct _settings {
 	int mod_mgr_remote_source_index;
 	/* mod mgr destination  */
 	int mod_mgr_destination; /* if = 0 destination is .sword 
-								 else sword directory  */
+				    else sword directory  */
+	/* has user seen the quick intro? */
+	int mod_mgr_intro; /* 0 = hasn't seen explanatoin, 1 = has */
+
 	/* if true use prayerlist */
 	int prayerlist;
 
@@ -256,11 +260,8 @@ struct _settings {
 
 extern SETTINGS settings;
 
-int settings_init(int new_configs, int new_bookmarks);
+int settings_init(int argc, char **argv, int new_configs, int new_bookmarks);
 void load_settings_structure(void);
-void gconf_setup(void);
-
-#define	GS_GCONF_MAX	6
 
 #ifdef __cplusplus
 }
diff --git a/src/main/sidebar.cc b/src/main/sidebar.cc
index bd9dfef..2e1268a 100644
--- a/src/main/sidebar.cc
+++ b/src/main/sidebar.cc
@@ -28,11 +28,12 @@
 #include <unistd.h>
 #include <string.h>
 
-#include <gnome.h>
+#include <gtk/gtk.h>
 #include <swmgr.h>
 #include <swmodule.h>
 
 #include "gui/xiphos.h"
+#include "gui/main_menu.h"
 #include "gui/widgets.h"
 #include "gui/sidebar.h"
 #include "gui/tabbed_browser.h"
@@ -52,6 +53,8 @@
 
 #include "backend/sword_main.hh"
 
+#include "gui/debug_glib_null.h"
+
 
 enum {
 	COL_OPEN_PIXBUF,
@@ -142,6 +145,8 @@ void main_display_verse_list_in_sidebar(gchar * key,
 	GtkTreeIter iter;
 	RESULTS *list_item;
 
+	is_search_result = FALSE;
+	
 	GS_warning(("verse_list = %s",verse_list));
 	list_of_verses = g_list_first(list_of_verses);
 	if (list_of_verses) {
@@ -178,6 +183,13 @@ void main_display_verse_list_in_sidebar(gchar * key,
 		gtk_list_store_set(list_store, &iter, 0,
 				   (const char *) tmp->data, -1);
 		++i;
+		
+		list_item = g_new(RESULTS,1);
+		list_item->module = g_strdup(module_name);
+		list_item->key = g_strdup((const char *) tmp->data);
+		list_of_verses = g_list_append(list_of_verses, 
+					       (RESULTS *) list_item);
+		
 		tmp = g_list_next(tmp);
 	}
 
@@ -317,15 +329,26 @@ static void add_children_to_tree(GtkTreeModel * model, GtkTreeIter iter,
 
 void main_create_pixbufs(void)
 {
+	GtkTextDirection dir = gtk_widget_get_direction (GTK_WIDGET(widgets.app));
+	
 	pixbufs = g_new0(TreePixbufs, 1);
-	pixbufs->pixbuf_closed = gtk_widget_render_icon(widgets.app,
-							GNOME_STOCK_BOOK_BLUE,
-							GTK_ICON_SIZE_MENU,
-							NULL);
-	pixbufs->pixbuf_opened =
-	    gtk_widget_render_icon(widgets.app,
-				   GNOME_STOCK_BOOK_OPEN,
-				   GTK_ICON_SIZE_MENU, NULL);
+
+	if (dir == GTK_TEXT_DIR_LTR) {
+		pixbufs->pixbuf_closed =
+			pixbuf_finder("book_closed.png", 16, NULL);
+		
+		pixbufs->pixbuf_opened =
+			pixbuf_finder("book_open.png", 16, NULL);
+	}
+	else {
+		pixbufs->pixbuf_closed =
+			pixbuf_finder("book_closed_rtol.png", 16, NULL);
+		
+		pixbufs->pixbuf_opened =
+			pixbuf_finder("book_open_rtol.png", 16, NULL);
+	}
+		
+
 	pixbufs->pixbuf_helpdoc =
 	    gtk_widget_render_icon(widgets.app,
 				   GTK_STOCK_DND,
@@ -697,6 +720,12 @@ void main_mod_treeview_button_one(GtkTreeModel * model,
 			add_verses_to_chapter(model, selected, key);
 		*/
 
+		if (!GTK_CHECK_MENU_ITEM(widgets.viewtexts_item)->active) {
+			GTK_CHECK_MENU_ITEM(widgets.viewtexts_item)->active = 1;
+			on_show_bible_text_activate
+			    (GTK_MENU_ITEM(widgets.viewtexts_item), NULL);
+		}
+
 		if (key)
 			main_url_handler(key, TRUE);
 		else 
@@ -709,9 +738,23 @@ void main_mod_treeview_button_one(GtkTreeModel * model,
 					      (widgets.
 					       notebook_comm_book), 0);
 		settings.comm_showing = TRUE;
+
+		if ((!GTK_CHECK_MENU_ITEM(widgets.viewcomms_item)->active) ||
+		    (!settings.comm_showing)) {
+			GTK_CHECK_MENU_ITEM(widgets.viewcomms_item)->active = 1;
+			on_show_commentary_activate
+			    (GTK_MENU_ITEM(widgets.viewcomms_item), NULL);
+		}
+
 		main_display_commentary(mod, settings.currentverse);
 		break;
 	case DICTIONARY_TYPE:
+		if (!GTK_CHECK_MENU_ITEM(widgets.viewdicts_item)->active) {
+			GTK_CHECK_MENU_ITEM(widgets.viewdicts_item)->active = 1;
+			on_show_dictionary_lexicon_activate
+			    (GTK_MENU_ITEM(widgets.viewcomms_item), NULL);
+		}
+
 		main_display_dictionary(mod, settings.dictkey);
 		break;
 	case BOOK_TYPE:
@@ -749,6 +792,14 @@ void main_mod_treeview_button_one(GtkTreeModel * model,
 					 (sidebar.module_list), path,
 					 FALSE);
 		gtk_tree_path_free(path);
+
+		if ((!GTK_CHECK_MENU_ITEM(widgets.viewcomms_item)->active) ||
+		    (!settings.comm_showing)) {
+			GTK_CHECK_MENU_ITEM(widgets.viewcomms_item)->active = 1;
+			on_show_commentary_activate
+			    (GTK_MENU_ITEM(widgets.viewcomms_item), NULL);
+		}
+
 		main_display_book(mod, (key ? key : (gchar *) "0"));
 		main_setup_navbar_book(mod, (key ? atoi(key) : 0));
 		break;
diff --git a/src/main/sidebar.h b/src/main/sidebar.h
index a267101..7d01c70 100644
--- a/src/main/sidebar.h
+++ b/src/main/sidebar.h
@@ -27,7 +27,7 @@ extern "C" {
 #include <config.h>
 #endif
 	
-#include <gnome.h>
+#include <gtk/gtk.h>
 
 typedef struct {
 	GdkPixbuf *pixbuf_opened;
diff --git a/src/main/sword.cc b/src/main/sword.cc
index 0eaf3dc..14e2854 100644
--- a/src/main/sword.cc
+++ b/src/main/sword.cc
@@ -24,7 +24,7 @@
 #endif
 
 
-#include <gnome.h>
+#include <gtk/gtk.h>
 #include <glib.h>
 #include <glib/gstdio.h>
 
@@ -33,26 +33,6 @@
 #include <stringmgr.h>
 #include <localemgr.h>
 
-#ifdef USE_GTKMOZEMBED
-#include <gtkmozembed.h>
-
-#ifdef NS_HIDDEN
-# undef NS_HIDDEN
-#endif
-#ifdef NS_IMPORT_
-# undef NS_IMPORT_
-#endif
-#ifdef NS_EXPORT_
-# undef NS_EXPORT_
-#endif
-
-#include <gtkmozembed_internal.h>
-#include <nsIDOMMouseEvent.h>
-#ifndef HAVE_GECKO_1_9
-#include <dom/nsIDOMKeyEvent.h>
-#endif
-#endif
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -93,7 +73,12 @@ extern "C" {
 #include "backend/sword_main.hh"
 #include "backend/gs_stringmgr.h"
 
-char *OLD_CODESET;
+#include "gui/debug_glib_null.h"
+
+#ifdef HAVE_DBUS
+#include "gui/ipc.h"
+#endif
+
 using namespace sword; 
 	
 #define HTML_START "<html><head><meta http-equiv=\"content-type\" content=\"text/html; charset=utf-8\"></head>"
@@ -127,7 +112,7 @@ gboolean companion_activity = FALSE;
 void main_book_heading(char * mod_name)
 {	
 	VerseKey *vkey;	
-	SWMgr *mgr = backend->get_display_mgr();
+	SWMgr *mgr = backend->get_mgr();
 	
 	backend->display_mod = mgr->Modules[mod_name];
 	vkey = (VerseKey*)(SWKey*)(*backend->display_mod);	
@@ -158,7 +143,7 @@ void main_book_heading(char * mod_name)
 void main_chapter_heading(char * mod_name)
 {	
 	VerseKey *vkey;	
-	SWMgr *mgr = backend->get_display_mgr();
+	SWMgr *mgr = backend->get_mgr();
 	
 	backend->display_mod = mgr->Modules[mod_name];
 	backend->display_mod->setKey(settings.currentverse);
@@ -262,7 +247,7 @@ void main_delete_note(	const gchar * module_name, const gchar * key_str)
 
 void main_set_module_unlocked(char * mod_name, char * key)
 {
-	SWMgr *mgr = backend->get_display_mgr();
+	SWMgr *mgr = backend->get_mgr();
 	mgr->setCipherKey(mod_name, key);	
 }
 
@@ -322,6 +307,12 @@ gchar *main_update_nav_controls(const gchar * key)
 	main_navbar_versekey_set(navbar_versekey, val_key);
 	
 	settings.apply_change = TRUE;
+
+#ifdef HAVE_DBUS
+	IpcObject* ipc = ipc_get_main_ipc();
+	if (ipc)
+		ipc_object_navigation_signal (ipc, (const gchar*)val_key, NULL);
+#endif
 	return val_key;
 }
 
@@ -510,7 +501,7 @@ char *main_get_search_results_text(char * mod_name, char * key)
 
 char *main_get_path_to_mods(void)
 {
-	SWMgr *mgr = backend->get_main_mgr();
+	SWMgr *mgr = backend->get_mgr();
 	char *path = mgr->prefixPath;
 	return (path ? g_strdup(path) : NULL);
 }
@@ -610,6 +601,55 @@ const char *main_get_language_map(const char *language) {
 
 /******************************************************************************
  * Name
+ *   set_sword_locale
+ *
+ * Synopsis
+ *   #include "main/sword.h"
+ *
+ *   char *set_sword_locale(const char *sys_locale)	
+ *
+ * Description
+ *   set sword's idea of the locale in which the user operates
+ *
+ * Return value
+ *   char *
+ */
+char *set_sword_locale(const char *sys_locale)
+{
+	int ncmp[3] = { 100, 5, 2 };	// fixed data
+
+	if (sys_locale) {
+		SWBuf locale;
+		StringList localelist = LocaleMgr::getSystemLocaleMgr()->getAvailableLocales();
+		StringList::iterator it;
+
+		// length-limited match
+		for (int i = 0; i < 3; ++i) {
+			for (it = localelist.begin(); it != localelist.end(); ++it) {
+				locale = *it;
+				if (!strncmp(sys_locale, locale.c_str(), ncmp[i])) {
+					LocaleMgr::getSystemLocaleMgr()->
+					    setDefaultLocaleName(locale.c_str());
+					return g_strdup(locale.c_str());
+				}
+			}
+		}
+
+	}
+
+	// either we were given a null sys_locale, or it didn't match anything.
+	char *err = g_strdup_printf("%s `%s'.\n%s.",
+				    _("No matching locale found for"),
+				    sys_locale,
+				    _("Book names and menus may not be translated"));
+	gui_generic_warning(err);
+	g_free(err);
+	return NULL;
+}
+
+
+/******************************************************************************
+ * Name
  *   backend_init
  *
  * Synopsis
@@ -626,22 +666,21 @@ const char *main_get_language_map(const char *language) {
 
 void main_init_backend(void)
 {
-	const char *lang = getenv("LANG");
+	StringMgr::setSystemStringMgr( new GS_StringMgr() );
 	
+	const char *lang = getenv("LANG");
 	if (!lang) lang = "C";
-
-	StringMgr::setSystemStringMgr( new GS_StringMgr() );
+	sword_locale = set_sword_locale(lang);
+	lang = LocaleMgr::getSystemLocaleMgr()->getDefaultLocaleName();
 
 	backend = new BackEnd();
+
 	backend->init_SWORD(0);
-	sword_locale = backend->set_sword_locale(lang);
 	settings.path_to_mods = main_get_path_to_mods();
 	GS_print(("%s sword-%s\n", "Starting", backend->get_sword_version()));
 	GS_print(("%s\n", "Initiating SWORD"));
 	GS_print(("%s: %s\n","path to sword", settings.path_to_mods));
-	GS_print(("%s %s\n", "System locale is", lang));
-	GS_print(("%s %s\n", "SWORD locale is", sword_locale));
-	GS_print(("OLD_CODESET = %s\n\n", (OLD_CODESET ? OLD_CODESET : "-none-")));
+	GS_print(("%s %s\n", "SWORD locale is", lang));
 	GS_print(("%s\n", "Checking for SWORD Modules"));
 	settings.spell_language = strdup(lang);
 	main_init_lists();
@@ -843,6 +882,9 @@ void main_display_book(const char * mod_name, const char * key)     //, unsigned
 {
 	if (!settings.havebook || !mod_name)
 		return;
+	
+	if (key == NULL)  // && offset == -1)
+		key = "0";
 
 	GS_message(("main_display_book\nmod_name: %s\nkey: %s", mod_name, key));
 
@@ -855,9 +897,6 @@ void main_display_book(const char * mod_name, const char * key)     //, unsigned
 		xml_set_value("Xiphos", "modules", "book", mod_name);
 		gui_reassign_strdup(&settings.book_mod, (gchar *)mod_name);
 	}
-	
-	if (key == NULL)  // && offset == -1)
-		key = "0";
 
 	if (!isdigit(key[0])) {
 		xml_set_value("Xiphos", "keys", "book", key);
@@ -976,7 +1015,7 @@ void main_display_dictionary(const char * mod_name, const char * key)
 		time_t curtime;
 		struct tm *loctime;
 		char *feature;
-		if ((feature = (char *)backend->get_main_mgr()->
+		if ((feature = (char *)backend->get_mgr()->
 					getModule(mod_name)->
 					getConfigEntry("Feature")) &&
 		    !strcmp(feature, "DailyDevotion")) {
@@ -1087,7 +1126,6 @@ void main_display_bible(const char * mod_name, const char * key)
 	}
 	
 	settings.whichwindow = MAIN_TEXT_WINDOW;
-	gui_change_window_title(settings.MainWindowModule);
 	
 	file = g_strdup_printf("%s/modops.conf", settings.gSwordDir);
 	style = get_conf_file_item(file, mod_name, "style");
@@ -1135,6 +1173,9 @@ void main_display_bible(const char * mod_name, const char * key)
 		gui_set_tab_label(settings.currentverse, FALSE);
 	//}
 
+	gui_change_window_title(settings.MainWindowModule);
+	// (called _after_ tab data updated so not overwritten with old tab)
+
 	/*
 	 * change parallel verses
 	 */
@@ -1302,7 +1343,7 @@ int main_is_module(char * mod_name)
 
 int main_has_search_framework(char *mod_name)
 {
-	SWMgr *mgr = backend->get_main_mgr();
+	SWMgr *mgr = backend->get_mgr();
 	SWModule *mod = mgr->getModule(mod_name);
 	return (mod && mod->hasSearchFramework());
 }
@@ -1325,7 +1366,7 @@ int main_has_search_framework(char *mod_name)
 
 int main_optimal_search(char *mod_name)
 {
-	SWMgr *mgr = backend->get_main_mgr();
+	SWMgr *mgr = backend->get_mgr();
 	SWModule *mod = mgr->Modules.find(mod_name)->second;
 	return mod->isSearchOptimallySupported("God", -4, 0, 0);
 }
@@ -1697,3 +1738,23 @@ gboolean main_is_Bible_key(gchar *key)
 {
 	return (gboolean)(backend->is_Bible_key(key, settings.currentverse) != 0);
 }
+
+/******************************************************************************
+ * Name
+ *  main_get_osisref_from_key
+ *
+ * Synopsis
+ *   #include "main/sword.h"
+ *   void main_get_osisref_from_key()
+ *
+ * Description
+ *   returns OSISRef-formatted key value.
+ *
+ * Return value
+ *   const char *
+ */ 
+const char *
+main_get_osisref_from_key(const char *module, const char *key)
+{
+    return backend->get_osisref_from_key(module, key);
+}
diff --git a/src/main/sword.h b/src/main/sword.h
index 1c787dd..8b9d686 100644
--- a/src/main/sword.h
+++ b/src/main/sword.h
@@ -25,7 +25,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include <gnome.h>
+#include <gtk/gtk.h>
 #include <glib/gi18n.h>
 	
 #include "main/configs.h"	
@@ -81,6 +81,7 @@ void main_save_module_key(char * mod_name, char * key);
 gchar *main_update_nav_controls(const gchar * key);
 char *main_get_active_pane_key(void);
 char *main_get_active_pane_module(void);
+char *set_sword_locale(const char *sys_locale);
 void main_init_backend(void);
 int main_is_mod_rtol(const char * module_name);
 char *main_module_name_from_description(char *description);
@@ -117,7 +118,7 @@ char *main_format_number(int x);
 int main_deformat_number(char *digitstring);
 void main_flush_widgets_content(void);
 gboolean main_is_Bible_key(gchar *key);
-
+const char* main_get_osisref_from_key(const char *module, const char *key);
 const char *main_get_language_map(const char *language);
 void main_init_language_map(void);
 
diff --git a/src/main/sword_treekey.cc b/src/main/sword_treekey.cc
index 24958b2..47a4e06 100644
--- a/src/main/sword_treekey.cc
+++ b/src/main/sword_treekey.cc
@@ -24,7 +24,7 @@
 #include <config.h>
 #endif
 
-#include <gnome.h>
+#include <gtk/gtk.h>
 #include <glib/gstdio.h>
 #include <swmodule.h>
 #include <swmgr.h>
@@ -167,7 +167,7 @@ void setLocalName (TreeKeyIdx * treeKey, char *new_name)
 
 unsigned long main_treekey_remove (char *book, char *name, char * offset)
 {
-	SWMgr *mgr = backend->get_display_mgr ();
+	SWMgr *mgr = backend->get_mgr ();
 	SWModule *mod = mgr->Modules[book];
 	
 	if(!g_ascii_isdigit(offset[0])) return 0; /* make sure offset is a number */
@@ -186,7 +186,7 @@ unsigned long main_treekey_remove (char *book, char *name, char * offset)
 
 unsigned long main_treekey_append_sibling (char *book, char *name, char * offset)
 {
-	SWMgr *mgr = backend->get_display_mgr ();
+	SWMgr *mgr = backend->get_mgr ();
 	SWModule *mod = mgr->Modules[book];
 	
 	if(!g_ascii_isdigit(offset[0])) return 0; /* make sure offset is a number */
@@ -212,7 +212,7 @@ unsigned long main_treekey_append_sibling (char *book, char *name, char * offset
 
 unsigned long main_treekey_append_child (char *book, char *name, char * offset)
 {
-	SWMgr *mgr = backend->get_display_mgr ();
+	SWMgr *mgr = backend->get_mgr ();
 	SWModule *mod = mgr->Modules[book];
 	
 	if(!g_ascii_isdigit(offset[0])) return 0; /* make sure offset is a number */
@@ -236,7 +236,7 @@ unsigned long main_treekey_append_child (char *book, char *name, char * offset)
 
 void main_treekey_set_local_name (char *book, char *name, char * offset)
 {
-	SWMgr *mgr = backend->get_display_mgr ();
+	SWMgr *mgr = backend->get_mgr ();
 	SWModule *mod = mgr->Modules[book];
 	
 	if(!g_ascii_isdigit(offset[0])) return; /* make sure offset is a number */
@@ -256,7 +256,7 @@ void main_treekey_set_local_name (char *book, char *name, char * offset)
 
 char *main_get_book_raw_text (char *book, char * offset)
 {
-	SWMgr *mgr = backend->get_display_mgr ();
+	SWMgr *mgr = backend->get_mgr ();
 	SWModule *mod = mgr->Modules[book];
 	
 	if(!g_ascii_isdigit(offset[0])) return NULL; /* make sure offset is a number */
@@ -275,7 +275,7 @@ char *main_get_book_raw_text (char *book, char * offset)
 
 void main_treekey_save_book_text (char *book, char * offset, char * text)
 {
-	SWMgr *mgr = backend->get_display_mgr ();
+	SWMgr *mgr = backend->get_mgr ();
 	SWModule *mod = mgr->Modules[book];
 		
 	if(!offset || !g_ascii_isdigit(offset[0])) return; /* make sure offset is a number */
@@ -303,7 +303,7 @@ void main_load_book_tree_in_editor (GtkTreeView * treeview, char *book)
 {
 	GtkTreeIter parent;
 	GtkTreeStore *store;
-	SWMgr *mgr = backend->get_display_mgr ();
+	SWMgr *mgr = backend->get_mgr ();
 	SWModule *mod = mgr->Modules[book];
 
 	if (!mod)
diff --git a/src/main/tab_history.c b/src/main/tab_history.c
index 8256e63..d8d325f 100644
--- a/src/main/tab_history.c
+++ b/src/main/tab_history.c
@@ -23,7 +23,7 @@
 #include <config.h>
 #endif
 
-#include <gnome.h>
+#include <gtk/gtk.h>
 
 
 #include "gui/main_menu.h"
@@ -89,9 +89,9 @@ void main_clear_tab_history(void)
 {
 	PASSAGE_TAB_INFO *tab = cur_passage_tab;
 
-	gui_remove_menu_items(_("H_istory/<Separator>"),
-			      tab->history_items + 1);
-	gui_add_separator2menu(widgets.app, _("H_istory/C_lear"));
+	//gui_remove_menu_items(_("H_istory/<Separator>"),
+	//		      tab->history_items + 1);
+	//gui_add_separator2menu(widgets.app, _("H_istory/C_lear"));
 	
 	/* set sensitivity of history buttons */
 	gtk_widget_set_sensitive(BUTTON_BACK, FALSE);
diff --git a/src/main/tab_history.h b/src/main/tab_history.h
index c85bd4b..868cb02 100644
--- a/src/main/tab_history.h
+++ b/src/main/tab_history.h
@@ -33,6 +33,10 @@ struct _tab_history {
 };
 typedef struct _tab_history TAB_HISTORY;
 
+void on_menu_historyitem_activate(GtkMenuItem *menuitem,
+					  gpointer user_data);
+void main_update_tab_history_menu(gpointer data);
+void on_clear_activate(GtkMenuItem * menuitem, gpointer user_data);
 GtkWidget *main_versekey_drop_down_new(gpointer data);
 void main_clear_tab_history(void);
 void main_add_tab_history_item(gpointer data);
diff --git a/src/main/url.cc b/src/main/url.cc
index b3d7fc9..779447f 100644
--- a/src/main/url.cc
+++ b/src/main/url.cc
@@ -35,7 +35,7 @@
 #include <swmgr.h>
 #include <swmodule.h>
 
-#include <gnome.h>
+#include <gtk/gtk.h>
 
 #ifdef USE_GTKHTML3_14_23
 #include "editor/slib-editor.h"
@@ -66,6 +66,8 @@
 
 #include "backend/sword_main.hh"
 
+#include "gui/debug_glib_null.h"
+
 gint in_url;
 
 using namespace sword;
@@ -157,17 +159,12 @@ static gint show_separate_image(const gchar * filename, gboolean clicked)
 {
 	if (clicked) {
 #ifdef WIN32
-		// as of october 2008, gnome_url_show() doesn't behave
-		// properly on linux, because it does not respect the user's
-		// preferences properly.  so this is used on windows only.
-		// it kicks off the standard windows fax/pic viewer.
-
 		gboolean result;
-		gchar *file_as_url = g_strdup_printf("file://%s", filename);
-
-		GS_print(("file = %s\n", file_as_url));
-		result = gnome_url_show(file_as_url, NULL);
-		g_free(file_as_url);
+		gchar *win_path = g_strdup(filename);
+		//ShellExecute can handle all / or all \\ but not a combination
+		win_path = g_strdelimit(win_path,  "/", '\\');
+		result = xiphos_open_default ((const gchar*)win_path);
+		g_free(win_path);
 		if (result == FALSE) {
 			gui_generic_warning((char *)"Could not display that image");
 		}
@@ -209,7 +206,6 @@ static gint show_separate_image(const gchar * filename, gboolean clicked)
 #endif
 	} else {
 		gui_set_statusbar (filename);
-		//gnome_appbar_set_status(GNOME_APPBAR(widgets.appbar),filename);
 	}
 	return 1;
 }
@@ -243,8 +239,6 @@ static gint show_separate_image(const gchar * filename, gboolean clicked)
 		GString *desc_clean = hex_decode(description);
 		GS_print(("description = %s\n", desc_clean->str));
 		gui_set_statusbar (desc_clean->str);
-		/*gnome_appbar_set_status(GNOME_APPBAR(widgets.appbar),
-					desc_clean->str);*/
 		g_string_free(desc_clean, TRUE);
 	}
 	return 1;
@@ -277,7 +271,6 @@ static gint show_separate_image(const gchar * filename, gboolean clicked)
 			gchar *buf = g_strdup_printf( 
 				_("Show %s in main window"), svalue);
 			gui_set_statusbar (buf);
-			//gnome_appbar_set_status(GNOME_APPBAR(widgets.appbar), buf);
 			g_free(buf);
 		}
 	}
@@ -455,7 +448,7 @@ static gint show_note(const gchar * module, const gchar * passage,
 	char oldAutoNorm = 0;
 
 	if (stop_autonorm) {
-		SWMgr *mgr = backend->get_display_mgr();
+		SWMgr *mgr = backend->get_mgr();
 		backend->display_mod = mgr->Modules[module];
 		backend->display_mod->setKey(passage);
 		vkey = (VerseKey*)(SWKey*)(*backend->display_mod);
@@ -620,7 +613,6 @@ static int show_module_and_key(const char * module, const char * key,
 		module = settings.MainWindowModule;
 	}
 	if (!clicked) {
-		//gnome_appbar_set_status(GNOME_APPBAR(widgets.appbar), url);
 		return 1;
 	}
 	
@@ -721,7 +713,6 @@ static gint show_in_previewer(const gchar * url)
 	gchar *mybuf = NULL;
 
 	work_buf = g_strsplit (url,"/",4);
-	//GS_message(("work_buf :%s, %s",work_buf[MODULE],work_buf[KEY]));	
 	
 	mybuf = main_get_rendered_text(work_buf[MODULE], work_buf[KEY]);
 	
@@ -760,7 +751,7 @@ static gint show_in_previewer(const gchar * url)
  *   gint
  */
 
-static gint sword_uri(const gchar * url, gboolean clicked)
+gint sword_uri(const gchar * url, gboolean clicked)
 {
 	const gchar *key = NULL;
 	gchar *tmpkey = NULL;
@@ -768,6 +759,12 @@ static gint sword_uri(const gchar * url, gboolean clicked)
 	gint verse_count;
 	gchar **work_buf = NULL;                                                  
 		
+	// don't recurse between paratab and here.
+	static gboolean handling_uri = FALSE;
+
+	if (handling_uri) return 0;
+	handling_uri = TRUE;
+
 	if (!clicked) {
 		gchar *name = g_strstr_len(url, 10, "://");
 		if (!name)
@@ -786,14 +783,15 @@ static gint sword_uri(const gchar * url, gboolean clicked)
 			else
 				gui_set_statusbar (url);
 		}
+		handling_uri = FALSE;
 		return 1;
 	}
 	
 	work_buf = g_strsplit (url,"/",4);
-	GS_message(("work_buf: %s, %s",work_buf[MODULE],work_buf[KEY]));
 	if (!work_buf[MODULE] && !work_buf[KEY]) {
 		alert_url_not_found(url);
 		g_strfreev(work_buf);
+		handling_uri = FALSE;
 		return 0;
 	}
 	if(!work_buf[KEY]) {
@@ -801,6 +799,10 @@ static gint sword_uri(const gchar * url, gboolean clicked)
 	} else
 		tmpkey = work_buf[KEY];
 	
+	GS_message(("work_buf: %s, %s",
+		    work_buf[MODULE],
+		    (work_buf[KEY] ? work_buf[KEY] : "-null-")));
+	
 	verse_count = 1; //backend->is_Bible_key(mykey, settings.currentverse);
 	if(backend->is_module(work_buf[MODULE])) {
 		mod_type = backend->module_type(work_buf[MODULE]);
@@ -847,6 +849,7 @@ static gint sword_uri(const gchar * url, gboolean clicked)
 	} 
 	g_strfreev(work_buf);
 	settings.addhistoryitem = TRUE;
+	handling_uri = FALSE;
 	return 1;
 }
 
@@ -878,8 +881,7 @@ gint main_url_handler(const gchar * url, gboolean clicked)
 	gchar* strongs = NULL;
 	int retval = 0;		// assume failure.
 
-	GS_message(("main_url_handler()"));
-	GS_message(("url = %s", url));
+	GS_message(("main_url_handler => %s", url));
 
 	if (strstr(url, "sword://") ||
 	    strstr(url, "bible://")) {
@@ -954,9 +956,17 @@ gint main_url_handler(const gchar * url, gboolean clicked)
 		else if (!strcmp(action, "showUserNote")) {
 			module = g_strdup(m_url.getParameterValue("module"));
 			passage = g_strdup((gchar*)m_url.getParameterValue("passage"));
+
+			// need localized key, not the osisref that we've got.
+			ModMap::iterator it = backend->get_mgr()->Modules.find
+						((module && *module) ? module : "KJV");
+			SWModule *m = (*it).second;
+			VerseKey *vk = (VerseKey *)m->getKey();
+			*vk = passage;
+
 			main_information_viewer(module,
 						(gchar*)svalue,
-						(gchar*)passage, 
+						(gchar*)m->getKeyText(),
 						"showUserNote",
 						(gchar*)"u",
 						NULL,
@@ -996,7 +1006,10 @@ gint main_url_handler(const gchar * url, gboolean clicked)
 		}
 
 		else if (!strcmp(action, "showImage")) {
-			show_separate_image(svalue+5, clicked);	// skip "file:"
+			show_separate_image((!strncmp(svalue, "file:", 5)
+					     ? svalue+5
+					     : svalue),
+					    clicked);
 		}
 
 		if (action) g_free(action);
@@ -1007,7 +1020,7 @@ gint main_url_handler(const gchar * url, gboolean clicked)
 		g_string_free(tmpstr, TRUE);
 		retval = 1;
 	} else if (clicked)
-		gnome_url_show(url, NULL);
+		xiphos_open_default (url);
 
 	return retval;
 }
@@ -1076,7 +1089,7 @@ hex_decode(const gchar *url)
 						  (gchar) from_hex);
 				url_chase += 2;
 			} else {
-				// failed %xx enconding; normal character.
+				// failed %xx encoding; normal character.
 				// should we instead do nothing with this '%'?
 				g_string_append_c(url_clean, '%');
 			}
diff --git a/src/main/url.hh b/src/main/url.hh
index 2b715ef..ad68169 100644
--- a/src/main/url.hh
+++ b/src/main/url.hh
@@ -35,6 +35,7 @@ enum {
 	NOTE_NUM
 };
 //gint main_url_handler_gecko(const gchar * url);
+gint sword_uri(const gchar * url, gboolean clicked);
 gint main_url_handler(const gchar * url, gboolean clicked);
 gint main_main_get_mod_type_from_url(const gchar * url);
 const gchar *main_url_encode(const gchar * pram);	
diff --git a/src/main/wscript b/src/main/wscript
new file mode 100644
index 0000000..700e088
--- /dev/null
+++ b/src/main/wscript
@@ -0,0 +1,16 @@
+#!/usr/bin/env python
+# encoding: utf8
+
+def build(bld):
+
+    lib = bld.new_task_gen(
+        features='cxx cc',
+        includes='. ../.. ../../src %s' % bld.env['GECKO_INCLUDE'], # ../../ for config.h
+        target='main',
+        #uselib='GLIB GNOMEUI SWORD GTKMOZEMBED GTKMOZEMBED_UNSTABLE GECKONSS GECKONSPR GTKHTML UPRINT MAGICK',
+        #uselib_local='backend gecko editor',
+        uselib= bld.env['ALL_LIBS'],
+    )
+
+    lib.find_sources_in_dirs('.')
+
diff --git a/src/main/xml.c b/src/main/xml.c
index 4d013fb..c3bcc0d 100644
--- a/src/main/xml.c
+++ b/src/main/xml.c
@@ -487,10 +487,12 @@ int xml_create_settings_file(char *path)
 	xml_attr = xmlNewProp(cur_node,
 			      (const xmlChar *) "label",
 			      (const xmlChar *) _("Sample Module List"));
+	tmp = get_list(TEXT_LIST);
 	xml_attr = xmlNewProp(cur_node,
 			      (const xmlChar *) "list",
-			      (const xmlChar *)(gchar *)(get_list(TEXT_LIST)->data));
-
+			      (tmp
+			       ? (const xmlChar *)(gchar *)(tmp->data)
+			       : (const xmlChar *)(gchar *)"-ReplaceMe-"));
 
 	section_node = xmlNewChild(root_node, NULL,
 				   (const xmlChar *) "editor", NULL);
@@ -499,6 +501,15 @@ int xml_create_settings_file(char *path)
 	xmlNewTextChild(section_node, NULL, (const xmlChar *) "UseStudypadDialog", (const xmlChar *) "1");
 	xmlNewTextChild(section_node, NULL, (const xmlChar *) "spell_language", (const xmlChar *) "unknown");
 
+	section_node = xmlNewChild(root_node, NULL, (const xmlChar *) "locale", NULL);
+	xmlNewTextChild(section_node, NULL, (const xmlChar *) "special", (const xmlChar *) "");
+
+	section_node = xmlNewChild(root_node, NULL, (const xmlChar *) "modmgr", NULL);
+	xmlNewTextChild(section_node, NULL, (const xmlChar *) "mod_mgr_source", (const xmlChar *) "1");
+	xmlNewTextChild(section_node, NULL, (const xmlChar *) "mod_mgr_destination", (const xmlChar *) "0");
+	xmlNewTextChild(section_node, NULL, (const xmlChar *) "mod_mgr_local_source_index", (const xmlChar *) "0");
+	xmlNewTextChild(section_node, NULL, (const xmlChar *) "mod_mgr_remote_source_index", (const xmlChar *) "0");
+	xmlNewTextChild(section_node, NULL, (const xmlChar *) "mod_mgr_intro", (const xmlChar *) "0");
 
 	section_node = xmlNewChild(root_node, NULL, (const xmlChar *) "fontsize", NULL);
 	xmlNewTextChild(section_node, NULL, (const xmlChar *) "versenum", (const xmlChar *) "+0");
@@ -558,7 +569,7 @@ int xml_create_settings_file(char *path)
 	xmlNewTextChild(section_node, NULL, (const xmlChar *)"hebrew", NULL);
 
 	section_node = xmlNewChild(root_node, NULL,
-				   (const xmlChar *) "markedverses", NULL); /* initially empty */
+				   (const xmlChar *) "osisrefmarkedverses", NULL);
 
 	section_node = xmlNewChild(root_node, NULL, (const xmlChar *)"misc", NULL);
 	xmlNewTextChild(section_node, NULL, (const xmlChar *)"dailydevotional", (const xmlChar *)"0");
@@ -645,8 +656,70 @@ int xml_create_settings_file(char *path)
 	return 1;
 }
 
+/******************************************************************************
+ * Name
+ *   xml_convert_to_osisref
+ *
+ * Synopsis
+ *   #include "main/xml.h"
+ *
+ *   void xml_convert_to_osisref()
+ *
+ * Description
+ *   convert "Gen 1:1" format to OSISRef "Gen.1.1" format.
+ *   backward compatibility support from 3.1.1's first (bad) cut that
+ *   failed to localize.  for shame, the pain i cause myself...
+ *
+ * Return value
+ *   void
+ */
 
+void xml_convert_to_osisref(void)
+{
+	gchar *label, *content, *s, *t;
+	gchar reference[100];
+	GList *deletable = NULL, *hold;
+
+	/* pull entries from old "markedverses" set */
+	/* re-insert into new "osisrefmarkedverses" */
+    	if (xml_set_section_ptr("markedverses") && xml_get_label()) {
+		do {
+			label = xml_get_label();
+			content = g_strdup(xml_get_list());
+
+			/* detect "NASB Revelation of John 1:1" */
+			if (((s = strrchr(label, ' ')) != NULL) &&	/* rightmost space */
+			    ((s = strchr((t = s+1), ':')) != NULL) &&	/* chapter:verse */
+			    ((t = strchr(label, ' ')) < s)) {		/* leftmost space */
+
+				/* having gotten this far, we successfully */
+				/* detected a wrongly-formatted label.  convert. */
+
+				/* mark old bogus version for removal. */
+				deletable = g_list_prepend(deletable, g_strdup(label));
+
+				/* cons up a new version. */
+				*t = '\0';
+				g_snprintf(reference, 100, "%s %s",
+					   label /* this is just the module name now */,
+					   main_get_osisref_from_key((const char *)label,
+								     (const char *)t+1));
+				xml_set_list_item("osisrefmarkedverses", "markedverse",
+						  reference, content);
+			}
+			g_free(content);
+		} while (xml_next_item() && xml_get_label());
+	}
 
+	hold = deletable;
+	while (deletable) {
+		xml_remove_node("markedverses", "markedverse", deletable->data);
+		g_free(deletable->data);
+		deletable = g_list_next(deletable);
+	}
+	xml_remove_section("markedverses");
+	g_list_free(hold);
+}
 
 
 /******************************************************************************
@@ -1192,3 +1265,30 @@ void xml_remove_node(const char *section, const char *item, const char *label)
 	}	
 	
 }
+
+/******************************************************************************
+ * Name
+ *   xml_remove_section
+ *
+ * Synopsis
+ *   #include "gui/bookmarks.h"
+ *
+ *   void xml_remove_section(char *section)
+ *
+ * Description
+ *   annihilates an entire section from the document.
+ *
+ * Return value
+ *   void
+ */
+
+void xml_remove_section(const char *section)
+{
+	xmlNodePtr cur = NULL;
+
+	if ((cur = xml_find_section("Xiphos", section)) != NULL) {
+		xmlUnlinkNode(cur);
+		xmlFreeNode(cur);      
+	}	
+	
+}
diff --git a/src/main/xml.h b/src/main/xml.h
index 513c834..7a68986 100644
--- a/src/main/xml.h
+++ b/src/main/xml.h
@@ -53,6 +53,8 @@ void xml_save_settings_doc(char *file_name);
 void xml_free_settings_doc(void);
 void xml_add_new_item_to_section(char * section, char * item_name, char * value);
 void xml_remove_node(const char *section, const char *item, const char *label);
+void xml_remove_section(const char *section);
+void xml_convert_to_osisref(void);
 
 #ifdef __cplusplus
 }
diff --git a/ui/Makefile.am b/ui/Makefile.am
index e000cc2..d381398 100644
--- a/ui/Makefile.am
+++ b/ui/Makefile.am
@@ -7,6 +7,7 @@ ui_DATA = \
 	prefs.glade \
 	search-dialog.glade \
 	xi-menus.glade \
+	xi-export-bookmarks.glade \
 	arrow_down.png \
 	arrow_down_box.png \
 	arrow_up.png \
@@ -24,6 +25,7 @@ ui_DATA = \
 	translation_icon-16.png \
 	xiphos-x-16.png \
 	languages \
+	editor_link_dialog.xml \
 	editor_studypad.xml \
 	editor_note.xml 
 
diff --git a/ui/Makefile.in b/ui/Makefile.in
index 2c4a275..0135015 100644
--- a/ui/Makefile.in
+++ b/ui/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 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.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@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
@@ -37,12 +39,22 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gecko.m4 \
 	$(top_srcdir)/m4/gnome-doc-utils.m4 \
-	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in
+	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 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 =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -50,20 +62,36 @@ am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(uidir)"
-uiDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(ui_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
+ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AM_LDFLAGS = @AM_LDFLAGS@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-A_CPPFLAGS = @A_CPPFLAGS@
 BONOBO_IDL_INCLUDES = @BONOBO_IDL_INCLUDES@
 CATALOGS = @CATALOGS@
 CATOBJEXT = @CATOBJEXT@
@@ -81,17 +109,16 @@ DATADIRNAME = @DATADIRNAME@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DIRS = @DIRS@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
 DOC_USER_FORMATS = @DOC_USER_FORMATS@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
-EDITOR_CFLAGS = @EDITOR_CFLAGS@
-EDITOR_LIBS = @EDITOR_LIBS@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
 GECKO = @GECKO@
 GECKO_COMPONENT_CFLAGS = @GECKO_COMPONENT_CFLAGS@
 GECKO_COMPONENT_LIBS = @GECKO_COMPONENT_LIBS@
@@ -104,57 +131,26 @@ GECKO_PREFIX = @GECKO_PREFIX@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
-GNOME_CFLAGS = @GNOME_CFLAGS@
-GNOME_LIBS = @GNOME_LIBS@
 GREP = @GREP@
-GTKHTML_314_presence_CFLAGS = @GTKHTML_314_presence_CFLAGS@
-GTKHTML_314_presence_LIBS = @GTKHTML_314_presence_LIBS@
-GTKHTML_38_presence_CFLAGS = @GTKHTML_38_presence_CFLAGS@
-GTKHTML_38_presence_LIBS = @GTKHTML_38_presence_LIBS@
-GTKHTML_CFLAGS = @GTKHTML_CFLAGS@
 GTKHTML_DATA_DIR = @GTKHTML_DATA_DIR@
-GTKHTML_LIBS = @GTKHTML_LIBS@
 HELP_DIR = @HELP_DIR@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PREFIX = @INSTALL_PREFIX@
 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_ICONV = @INTLTOOL_ICONV@
-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
-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_SERVICE_RULE = @INTLTOOL_SERVICE_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_XGETTEXT = @INTLTOOL_XGETTEXT@
-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
-ImageMagick_CFLAGS = @ImageMagick_CFLAGS@
-ImageMagick_LIBS = @ImageMagick_LIBS@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
@@ -163,22 +159,18 @@ MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 MSGFMT_OPTS = @MSGFMT_OPTS@
-NO_PREFIX_PACKAGE_DATA_DIR = @NO_PREFIX_PACKAGE_DATA_DIR@
-NO_PREFIX_PACKAGE_DOC_DIR = @NO_PREFIX_PACKAGE_DOC_DIR@
-NO_PREFIX_PACKAGE_HELP_DIR = @NO_PREFIX_PACKAGE_HELP_DIR@
-NO_PREFIX_PACKAGE_MENU_DIR = @NO_PREFIX_PACKAGE_MENU_DIR@
-NO_PREFIX_PACKAGE_PIXMAPS_DIR = @NO_PREFIX_PACKAGE_PIXMAPS_DIR@
+MSGMERGE = @MSGMERGE@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 OMF_DIR = @OMF_DIR@
 ORBIT_IDL = @ORBIT_IDL@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_DATA_DIR = @PACKAGE_DATA_DIR@
-PACKAGE_DOC_DIR = @PACKAGE_DOC_DIR@
-PACKAGE_HELP_DIR = @PACKAGE_HELP_DIR@
-PACKAGE_MENU_DIR = @PACKAGE_MENU_DIR@
 PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_PIXMAPS_DIR = @PACKAGE_PIXMAPS_DIR@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
@@ -189,28 +181,24 @@ POSUB = @POSUB@
 PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
 PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
 RANLIB = @RANLIB@
-SCROLLKEEPER_BUILD_REQUIRED = @SCROLLKEEPER_BUILD_REQUIRED@
-SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-SWORD_CFLAGS = @SWORD_CFLAGS@
-SWORD_LIBS = @SWORD_LIBS@
-SWORD_MULTIVERSE_CFLAGS = @SWORD_MULTIVERSE_CFLAGS@
-SWORD_MULTIVERSE_LIBS = @SWORD_MULTIVERSE_LIBS@
-UPRINT_CFLAGS = @UPRINT_CFLAGS@
-UPRINT_LIBS = @UPRINT_LIBS@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
+WARN_CFLAGS = @WARN_CFLAGS@
+WARN_CXXFLAGS = @WARN_CXXFLAGS@
 XGETTEXT = @XGETTEXT@
+XIPHOS_CFLAGS = @XIPHOS_CFLAGS@
+XIPHOS_LIBS = @XIPHOS_LIBS@
 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@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -241,6 +229,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -253,8 +242,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-tooltiptext_CFLAGS = @tooltiptext_CFLAGS@
-tooltiptext_LIBS = @tooltiptext_LIBS@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 xiphos_exec = @xiphos_exec@
@@ -267,6 +255,7 @@ ui_DATA = \
 	prefs.glade \
 	search-dialog.glade \
 	xi-menus.glade \
+	xi-export-bookmarks.glade \
 	arrow_down.png \
 	arrow_down_box.png \
 	arrow_up.png \
@@ -284,6 +273,7 @@ ui_DATA = \
 	translation_icon-16.png \
 	xiphos-x-16.png \
 	languages \
+	editor_link_dialog.xml \
 	editor_studypad.xml \
 	editor_note.xml 
 
@@ -297,14 +287,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( 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  ui/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  ui/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign ui/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign ui/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -322,6 +312,7 @@ $(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):
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -331,20 +322,23 @@ clean-libtool:
 install-uiDATA: $(ui_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(uidir)" || $(MKDIR_P) "$(DESTDIR)$(uidir)"
-	@list='$(ui_DATA)'; for p in $$list; do \
+	@list='$(ui_DATA)'; test -n "$(uidir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(uiDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(uidir)/$$f'"; \
-	  $(uiDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(uidir)/$$f"; \
+	  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)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(uidir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(uidir)/$$f"; \
-	done
+	@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
 tags: TAGS
 TAGS:
 
@@ -368,13 +362,17 @@ distdir: $(DISTFILES)
 	  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 -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -405,6 +403,7 @@ 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"
@@ -423,6 +422,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -431,18 +432,28 @@ install-data-am: install-uiDATA
 
 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
@@ -477,6 +488,7 @@ uninstall-am: uninstall-uiDATA
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	uninstall uninstall-am uninstall-uiDATA
 
+
 # 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/ui/editor_link_dialog.xml b/ui/editor_link_dialog.xml
new file mode 100644
index 0000000..2a7247d
--- /dev/null
+++ b/ui/editor_link_dialog.xml
@@ -0,0 +1,244 @@
+<?xml version="1.0"?>
+<interface>
+  <!-- interface-requires gtk+ 2.12 -->
+  <!-- interface-naming-policy project-wide -->
+  <object class="GtkDialog" id="dialog1">
+    <property name="border_width">5</property>
+    <property name="title" translatable="yes">Insert Link</property>
+    <property name="default_width">402</property>
+    <property name="default_height">164</property>
+    <property name="type_hint">normal</property>
+    <property name="has_separator">False</property>
+    <child internal-child="vbox">
+      <object class="GtkVBox" id="dialog-vbox1">
+        <property name="visible">True</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">2</property>
+        <child>
+          <object class="GtkHBox" id="hbox1">
+            <property name="visible">True</property>
+            <child>
+              <object class="GtkImage" id="image2">
+                <property name="visible">True</property>
+                <property name="pixel_size">107</property>
+                <property name="icon_name">insert-link</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkVBox" id="vbox1">
+                <property name="visible">True</property>
+                <property name="orientation">vertical</property>
+                <property name="spacing">4</property>
+                <child>
+                  <object class="GtkTable" id="table1">
+                    <property name="visible">True</property>
+                    <property name="n_rows">3</property>
+                    <property name="n_columns">2</property>
+                    <child>
+                      <object class="GtkLabel" id="label2">
+                        <property name="visible">True</property>
+                        <property name="xalign">1</property>
+                        <property name="xpad">5</property>
+                        <property name="label" translatable="yes">Verse</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="label1">
+                        <property name="visible">True</property>
+                        <property name="xalign">1</property>
+                        <property name="xpad">5</property>
+                        <property name="label" translatable="yes">Module</property>
+                      </object>
+                      <packing>
+                        <property name="top_attach">1</property>
+                        <property name="bottom_attach">2</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="label3">
+                        <property name="visible">True</property>
+                        <property name="xalign">1</property>
+                        <property name="xpad">5</property>
+                        <property name="label" translatable="yes">Link Text</property>
+                      </object>
+                      <packing>
+                        <property name="top_attach">2</property>
+                        <property name="bottom_attach">3</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkEntry" id="entry_verse">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="invisible_char">&#x25CF;</property>
+                        <signal name="changed" handler="entry_verse_changed_cb"/>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="right_attach">2</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkEntry" id="entry_module">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="invisible_char">&#x25CF;</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="right_attach">2</property>
+                        <property name="top_attach">1</property>
+                        <property name="bottom_attach">2</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkEntry" id="entry_text">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="invisible_char">&#x25CF;</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="right_attach">2</property>
+                        <property name="top_attach">2</property>
+                        <property name="bottom_attach">3</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkHBox" id="hbox2">
+                    <property name="visible">True</property>
+                    <property name="homogeneous">True</property>
+                    <child>
+                      <object class="GtkRadioButton" id="radiobutton1">
+                        <property name="label" translatable="yes">Single Verse</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="active">True</property>
+                        <property name="draw_indicator">True</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkRadioButton" id="radiobutton2">
+                        <property name="label" translatable="yes">Verse list</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="yalign">0.54000002145767212</property>
+                        <property name="active">True</property>
+                        <property name="draw_indicator">True</property>
+                        <property name="group">radiobutton1</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <placeholder/>
+                </child>
+                <child>
+                  <placeholder/>
+                </child>
+              </object>
+              <packing>
+                <property name="padding">5</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
+          <placeholder/>
+        </child>
+        <child internal-child="action_area">
+          <object class="GtkHButtonBox" id="dialog-action_area1">
+            <property name="visible">True</property>
+            <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" id="button_cancel">
+                <property name="label" translatable="yes">gtk-cancel</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
+                <signal name="clicked" handler="button_cancel_clicked_cb"/>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="button_test">
+                <property name="label" translatable="yes">Test Link</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="image">image1</property>
+                <signal name="clicked" handler="button_test_clicked_cb"/>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="button_ok">
+                <property name="label" translatable="yes">gtk-ok</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
+                <signal name="clicked" handler="button_ok_clicked_cb"/>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget response="0">button_cancel</action-widget>
+      <action-widget response="1">button_test</action-widget>
+      <action-widget response="2">button_ok</action-widget>
+    </action-widgets>
+  </object>
+  <object class="GtkImage" id="image1">
+    <property name="visible">True</property>
+    <property name="icon_name">insert-link</property>
+  </object>
+</interface>
diff --git a/ui/languages b/ui/languages
index 196f62c..c2cd5dd 100644
--- a/ui/languages
+++ b/ui/languages
@@ -210,8 +210,8 @@ mr	मराठी
 ms	Bahasa Melayu
 # Maltese
 mt	Malti
-# Burmese (missing font: untranslated) မြန်မာစာ
-my	Burmese
+# Burmese (Myanmar)
+my	မြန်မာစာ
 # Nauruan
 na	Dorerin Naoero
 # correct: Norwegian Bokmål
@@ -2727,7 +2727,8 @@ hii	Hinduri
 hij	Hijuk
 hik	Seit-Kaitetu
 hil	Hiligaynon
-hin	Hindi
+# Hindi
+hin	हिन्दी
 hio	Tsoa
 hir	Himarimã
 hit	Hittite
@@ -3162,7 +3163,8 @@ kaj	Jju
 kak	Kayapa Kallahan
 kal	Kalaallisut
 kam	Kamba (Kenya)
-kan	Kannada
+# Kannada
+kan	ಕನ್ನಡ
 kao	Xaasongaxango
 kap	Bezhta
 kaq	Capanahua
@@ -4148,7 +4150,8 @@ mah	Marshallese
 mai	Maithili
 maj	Jalapa De Díaz Mazatec
 mak	Makasar
-mal	Malayalam
+# Malayalam
+mal	മലയാളം
 mam	Northern Mam
 man	Mandingo
 maq	Chiquihuitlán Mazatec
@@ -6508,7 +6511,8 @@ tah	Tahitian
 taj	Eastern Tamang
 tak	Tala
 tal	Tal
-tam	Tamil
+# Tamil
+tam	தமிழ்
 tan	Tangale
 tao	Yami
 tap	Taabwa
@@ -6601,7 +6605,8 @@ teg	Teke-Tege
 teh	Tehuelche
 tei	Torricelli
 tek	Ibali Teke
-tel	Telugu
+# Telugu
+tel	తెలుగు
 tem	Timne
 ten	Tama (Colombia)
 teo	Teso
diff --git a/ui/module-manager.glade b/ui/module-manager.glade
index a6a8798..8042550 100644
--- a/ui/module-manager.glade
+++ b/ui/module-manager.glade
@@ -10,7 +10,7 @@
   <property name="window_position">GTK_WIN_POS_NONE</property>
   <property name="modal">False</property>
   <property name="default_width">636</property>
-  <property name="default_height">341</property>
+  <property name="default_height">450</property>
   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</property>
   <property name="icon">xiphos-x-16.png</property>
@@ -162,7 +162,7 @@
 	    <widget class="GtkButton" id="button13">
 	      <property name="can_default">True</property>
 	      <property name="can_focus">True</property>
-	      <property name="label">Archive</property>
+	      <property name="label" translatable="yes">Archive</property>
 	      <property name="use_stock">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
 	      <property name="focus_on_click">True</property>
@@ -174,7 +174,7 @@
 	    <widget class="GtkButton" id="button14">
 	      <property name="can_default">True</property>
 	      <property name="can_focus">True</property>
-	      <property name="label">Index</property>
+	      <property name="label" translatable="yes">Index</property>
 	      <property name="use_stock">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
 	      <property name="focus_on_click">True</property>
@@ -186,7 +186,7 @@
 	    <widget class="GtkButton" id="button15">
 	      <property name="can_default">True</property>
 	      <property name="can_focus">True</property>
-	      <property name="label">Delete Index</property>
+	      <property name="label" translatable="yes">Delete Index</property>
 	      <property name="use_stock">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
 	      <property name="focus_on_click">True</property>
diff --git a/ui/prefs.glade b/ui/prefs.glade
index 4b65ed3..7aa54a3 100644
--- a/ui/prefs.glade
+++ b/ui/prefs.glade
@@ -336,6 +336,58 @@
 		      </child>
 
 		      <child>
+			<widget class="GtkHBox" id="hbox8">
+			  <property name="visible">True</property>
+			  <property name="homogeneous">True</property>
+			  <property name="spacing">0</property>
+
+			  <child>
+			    <widget class="GtkLabel" id="label13">
+			      <property name="visible">True</property>
+			      <property name="label" translatable="yes">Verse Number</property>
+			      <property name="use_underline">False</property>
+			      <property name="use_markup">False</property>
+			      <property name="justify">GTK_JUSTIFY_LEFT</property>
+			      <property name="wrap">False</property>
+			      <property name="selectable">False</property>
+			      <property name="xalign">0.0900000035763</property>
+			      <property name="yalign">0.5</property>
+			      <property name="xpad">0</property>
+			      <property name="ypad">0</property>
+			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			      <property name="width_chars">-1</property>
+			      <property name="single_line_mode">False</property>
+			      <property name="angle">0</property>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">True</property>
+			      <property name="fill">True</property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <widget class="GtkColorButton" id="colorbutton4">
+			      <property name="visible">True</property>
+			      <property name="can_focus">True</property>
+			      <property name="use_alpha">False</property>
+			      <property name="focus_on_click">True</property>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">True</property>
+			      <property name="fill">True</property>
+			    </packing>
+			  </child>
+			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">True</property>
+			  <property name="fill">True</property>
+			</packing>
+		      </child>
+
+		      <child>
 			<widget class="GtkHBox" id="hbox9">
 			  <property name="visible">True</property>
 			  <property name="homogeneous">True</property>
@@ -978,6 +1030,62 @@
 		      <property name="spacing">2</property>
 
 		      <child>
+			<widget class="GtkHBox" id="hbox23">
+			  <property name="visible">True</property>
+			  <property name="homogeneous">True</property>
+			  <property name="spacing">0</property>
+
+<!-- crud -->
+			  <child>
+			    <widget class="GtkLabel" id="label40">
+			      <property name="visible">True</property>
+			      <property name="label" translatable="yes">Special Locale (requires restart)</property>
+			      <property name="use_underline">False</property>
+			      <property name="use_markup">True</property>
+			      <property name="justify">GTK_JUSTIFY_LEFT</property>
+			      <property name="wrap">False</property>
+			      <property name="selectable">False</property>
+			      <property name="xalign">0</property>
+			      <property name="yalign">0.5</property>
+			      <property name="xpad">0</property>
+			      <property name="ypad">0</property>
+			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			      <property name="width_chars">-1</property>
+			      <property name="single_line_mode">False</property>
+			      <property name="angle">0</property>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">False</property>
+			      <property name="fill">True</property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <widget class="GtkComboBox" id="combobox16">
+			      <property name="visible">True</property>
+			      <property name="add_tearoffs">False</property>
+			      <property name="focus_on_click">True</property>
+			      <accessibility>
+				<atkproperty name="AtkObject::accessible_name" translatable="yes">Special Locale Combo</atkproperty>
+			      </accessibility>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">True</property>
+			      <property name="fill">True</property>
+			    </packing>
+			  </child>
+			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">True</property>
+			  <property name="fill">True</property>
+			</packing>
+		      </child>
+<!-- crud -->
+
+		      <child>
 			<widget class="GtkCheckButton" id="checkbutton5">
 			  <property name="visible">True</property>
 			  <property name="can_focus">True</property>
diff --git a/ui/search-dialog.glade b/ui/search-dialog.glade
index 62c91d0..cdd60b3 100644
--- a/ui/search-dialog.glade
+++ b/ui/search-dialog.glade
@@ -966,6 +966,24 @@ See Module Manager's maintenance functions</property>
 		      </child>
 
 		      <child>
+			<widget class="GtkToolButton" id="toolbutton_export">
+			  <property name="visible">True</property>
+			  <property name="tooltip" translatable="yes">Export current search results</property>
+			  <property name="label" translatable="yes">Export</property>
+			  <property name="use_underline">True</property>
+			  <property name="stock_id">gtk-goto-bottom</property>
+			  <property name="visible_horizontal">True</property>
+			  <property name="visible_vertical">True</property>
+			  <property name="is_important">False</property>
+			  <signal name="clicked" handler="on_toolbutton_export_clicked" last_modification_time="Tue, 17 Nov 2009 19:08:43 GMT"/>
+			</widget>
+			<packing>
+			  <property name="expand">False</property>
+			  <property name="homogeneous">True</property>
+			</packing>
+		      </child>
+
+		      <child>
 			<widget class="GtkToolButton" id="toolbutton2">
 			  <property name="visible">True</property>
 			  <property name="tooltip" translatable="yes">Clear lists for new search</property>
diff --git a/ui/xi-export-bookmarks.glade b/ui/xi-export-bookmarks.glade
new file mode 100644
index 0000000..84b30ef
--- /dev/null
+++ b/ui/xi-export-bookmarks.glade
@@ -0,0 +1,205 @@
+<?xml version="1.0"?>
+<interface>
+  <!-- interface-requires gtk+ 2.12 -->
+  <!-- interface-naming-policy project-wide -->
+  <object class="GtkDialog" id="dialog_export_bookmarks">
+    <property name="border_width">5</property>
+    <property name="title" translatable="yes">Export Bookmark Folder</property>
+    <property name="default_width">640</property>
+    <property name="default_height">640</property>
+    <property name="type_hint">normal</property>
+    <property name="has_separator">False</property>
+    <signal name="response" handler="dialog_export_bookmarks_response_cb"/>
+    <child internal-child="vbox">
+      <object class="GtkVBox" id="dialog-vbox1">
+        <property name="visible">True</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">2</property>
+        <signal name="key_press_event" handler="dialog_vbox1_key_press_event_cb"/>
+        <child>
+          <object class="GtkVBox" id="vbox1">
+            <property name="visible">True</property>
+            <property name="orientation">vertical</property>
+            <property name="spacing">10</property>
+            <child>
+              <object class="GtkLabel" id="label1">
+                <property name="visible">True</property>
+                <property name="xalign">0.019999999552965164</property>
+                <property name="label" translatable="yes">&lt;b&gt;Export to:&lt;/b&gt;</property>
+                <property name="use_markup">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkHBox" id="hbox1">
+                <property name="visible">True</property>
+                <property name="spacing">3</property>
+                <child>
+                  <object class="GtkImage" id="image1">
+                    <property name="visible">True</property>
+                    <property name="stock">gtk-goto-bottom</property>
+                    <property name="icon-size">6</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkTable" id="table1">
+                    <property name="visible">True</property>
+                    <property name="n_rows">4</property>
+                    <property name="n_columns">2</property>
+                    <property name="row_spacing">6</property>
+                    <child>
+                      <object class="GtkRadioButton" id="radiobutton_xiphos_bookmarks">
+                        <property name="label" translatable="yes">Xiphos bookmarks</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="active">True</property>
+                        <property name="draw_indicator">True</property>
+                        <signal name="toggled" handler="radiobutton_xiphos_bookmarks_toggled_cb"/>
+                      </object>
+                      <packing>
+                        <property name="x_options">GTK_FILL</property>
+                        <property name="y_options">GTK_FILL</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkRadioButton" id="radiobutton_html">
+                        <property name="label" translatable="yes">Html</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="active">True</property>
+                        <property name="draw_indicator">True</property>
+                        <property name="group">radiobutton_xiphos_bookmarks</property>
+                        <signal name="toggled" handler="radiobutton_html_toggled_cb"/>
+                      </object>
+                      <packing>
+                        <property name="top_attach">1</property>
+                        <property name="bottom_attach">2</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkRadioButton" id="radiobutton_plain_text">
+                        <property name="label" translatable="yes">Plain text</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="active">True</property>
+                        <property name="draw_indicator">True</property>
+                        <property name="group">radiobutton_xiphos_bookmarks</property>
+                        <signal name="toggled" handler="radiobutton_plain_text_toggled_cb"/>
+                      </object>
+                      <packing>
+                        <property name="top_attach">2</property>
+                        <property name="bottom_attach">3</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkCheckButton" id="checkbutton_include_text">
+                        <property name="label" translatable="yes">Include Bible text</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="draw_indicator">True</property>
+                        <signal name="toggled" handler="checkbutton_include_text_toggled_cb"/>
+                      </object>
+                      <packing>
+                        <property name="top_attach">3</property>
+                        <property name="bottom_attach">4</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkFileChooserWidget" id="filechooserwidget">
+                <property name="visible">True</property>
+                <property name="orientation">vertical</property>
+                <property name="action">save</property>
+                <property name="do_overwrite_confirmation">True</property>
+                <property name="local_only">False</property>
+                <property name="action">save</property>
+              </object>
+              <packing>
+                <property name="position">2</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child internal-child="action_area">
+          <object class="GtkHButtonBox" id="dialog-action_area1">
+            <property name="visible">True</property>
+            <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" id="button_cancel">
+                <property name="label" translatable="yes">gtk-cancel</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="button_ok">
+                <property name="label" translatable="yes">gtk-ok</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget response="-6">button_cancel</action-widget>
+      <action-widget response="-5">button_ok</action-widget>
+    </action-widgets>
+  </object>
+</interface>
diff --git a/ui/xi-menus.glade b/ui/xi-menus.glade
index 2b2e6bc..6f9cb27 100644
--- a/ui/xi-menus.glade
+++ b/ui/xi-menus.glade
@@ -384,7 +384,7 @@
 		  <child>
 		    <widget class="GtkMenuItem" id="show_hide_sidebar">
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">_Show/Hide Sidebar</property>
+		      <property name="label" translatable="yes">_Show/Hide Attached Sidebar</property>
 		      <property name="use_underline">True</property>
 		      <signal name="activate" handler="on_sidebar_showhide_activate" last_modification_time="Sat, 07 Mar 2009 00:37:01 GMT"/>
 		    </widget>
@@ -1104,7 +1104,7 @@
 	      <property name="visible">True</property>
 	      <property name="label" translatable="yes">Browse in BibleMap.org</property>
 	      <property name="use_underline">True</property>
-	      <signal name="activate" handler="on_lookup_google_activate" last_modification_time="Sat, 23 Jun 2009 11:14:54 GMT"/>
+	      <signal name="activate" handler="on_lookup_google_activate" last_modification_time="Tue, 23 Jun 2009 11:14:54 GMT"/>
 	    </widget>
 	  </child>
 
@@ -1255,7 +1255,7 @@
       <signal name="activate" handler="on_save_list_as_a_single_bookmark_activate" last_modification_time="Tue, 24 Mar 2009 12:58:06 GMT"/>
 
       <child internal-child="image">
-	<widget class="GtkImage" id="image1265">
+	<widget class="GtkImage" id="image1482">
 	  <property name="visible">True</property>
 	  <property name="stock">gtk-save-as</property>
 	  <property name="icon_size">1</property>
@@ -1277,7 +1277,7 @@
       <signal name="activate" handler="on_save_list_as_a_series_of_bookmarks_activate" last_modification_time="Tue, 24 Mar 2009 13:00:20 GMT"/>
 
       <child internal-child="image">
-	<widget class="GtkImage" id="image1266">
+	<widget class="GtkImage" id="image1483">
 	  <property name="visible">True</property>
 	  <property name="stock">gtk-save-as</property>
 	  <property name="icon_size">1</property>
@@ -1289,6 +1289,33 @@
       </child>
     </widget>
   </child>
+
+  <child>
+    <widget class="GtkSeparatorMenuItem" id="separator13">
+      <property name="visible">True</property>
+    </widget>
+  </child>
+
+  <child>
+    <widget class="GtkImageMenuItem" id="export_list1">
+      <property name="visible">True</property>
+      <property name="label" translatable="yes">Export List</property>
+      <property name="use_underline">True</property>
+      <signal name="activate" handler="on_export_verselist_activate" last_modification_time="Thu, 19 Nov 2009 01:39:17 GMT"/>
+
+      <child internal-child="image">
+	<widget class="GtkImage" id="image1484">
+	  <property name="visible">True</property>
+	  <property name="stock">gtk-goto-bottom</property>
+	  <property name="icon_size">1</property>
+	  <property name="xalign">0.5</property>
+	  <property name="yalign">0.5</property>
+	  <property name="xpad">0</property>
+	  <property name="ypad">0</property>
+	</widget>
+      </child>
+    </widget>
+  </child>
 </widget>
 
 <widget class="GtkMenu" id="menu_bookmark">
@@ -1302,7 +1329,7 @@
       <signal name="activate" handler="on_open_in_tab_activate" last_modification_time="Tue, 07 Apr 2009 23:29:59 GMT"/>
 
       <child internal-child="image">
-	<widget class="GtkImage" id="image1438">
+	<widget class="GtkImage" id="image1469">
 	  <property name="visible">True</property>
 	  <property name="pixbuf">new_tab_button.png</property>
 	  <property name="xalign">0.5</property>
@@ -1323,7 +1350,7 @@
       <signal name="activate" handler="on_dialog_activate" last_modification_time="Tue, 07 Apr 2009 23:37:07 GMT"/>
 
       <child internal-child="image">
-	<widget class="GtkImage" id="image1439">
+	<widget class="GtkImage" id="image1470">
 	  <property name="visible">True</property>
 	  <property name="pixbuf">dlg-un-16.png</property>
 	  <property name="xalign">0.5</property>
@@ -1344,7 +1371,7 @@
       <signal name="activate" handler="on_new_folder_activate" last_modification_time="Tue, 07 Apr 2009 23:37:07 GMT"/>
 
       <child internal-child="image">
-	<widget class="GtkImage" id="image1440">
+	<widget class="GtkImage" id="image1471">
 	  <property name="visible">True</property>
 	  <property name="stock">gtk-new</property>
 	  <property name="icon_size">1</property>
@@ -1366,7 +1393,7 @@
       <signal name="activate" handler="on_insert_bookmark_activate" last_modification_time="Tue, 07 Apr 2009 23:37:07 GMT"/>
 
       <child internal-child="image">
-	<widget class="GtkImage" id="image1441">
+	<widget class="GtkImage" id="image1472">
 	  <property name="visible">True</property>
 	  <property name="stock">gtk-new</property>
 	  <property name="icon_size">1</property>
@@ -1388,7 +1415,7 @@
       <signal name="activate" handler="on_edit_item_activate" last_modification_time="Tue, 07 Apr 2009 23:38:21 GMT"/>
 
       <child internal-child="image">
-	<widget class="GtkImage" id="image1442">
+	<widget class="GtkImage" id="image1473">
 	  <property name="visible">True</property>
 	  <property name="stock">gtk-edit</property>
 	  <property name="icon_size">1</property>
@@ -1410,7 +1437,7 @@
       <signal name="activate" handler="on_delete_item_activate" last_modification_time="Tue, 07 Apr 2009 23:42:54 GMT"/>
 
       <child internal-child="image">
-	<widget class="GtkImage" id="image1443">
+	<widget class="GtkImage" id="image1474">
 	  <property name="visible">True</property>
 	  <property name="stock">gtk-delete</property>
 	  <property name="icon_size">1</property>
@@ -1438,7 +1465,7 @@
       <signal name="activate" handler="on_expand_activate" last_modification_time="Wed, 08 Apr 2009 00:29:50 GMT"/>
 
       <child internal-child="image">
-	<widget class="GtkImage" id="image1444">
+	<widget class="GtkImage" id="image1475">
 	  <property name="visible">True</property>
 	  <property name="stock">gtk-sort-descending</property>
 	  <property name="icon_size">1</property>
@@ -1460,7 +1487,7 @@
       <signal name="activate" handler="on_collapse_activate" last_modification_time="Tue, 07 Apr 2009 23:46:46 GMT"/>
 
       <child internal-child="image">
-	<widget class="GtkImage" id="image1445">
+	<widget class="GtkImage" id="image1476">
 	  <property name="visible">True</property>
 	  <property name="stock">gtk-sort-ascending</property>
 	  <property name="icon_size">1</property>
@@ -1505,7 +1532,7 @@
       <signal name="activate" handler="bibletime_bookmarks_activate" last_modification_time="Tue, 07 Apr 2009 23:56:38 GMT"/>
 
       <child internal-child="image">
-	<widget class="GtkImage" id="image1446">
+	<widget class="GtkImage" id="image1477">
 	  <property name="visible">True</property>
 	  <property name="stock">gtk-add</property>
 	  <property name="icon_size">1</property>
@@ -1519,15 +1546,17 @@
   </child>
 
   <child>
-    <widget class="GtkImageMenuItem" id="remove_restore">
+    <widget class="GtkImageMenuItem" id="remove_folder">
       <property name="visible">True</property>
-      <property name="label" translatable="yes">Remove - Restore</property>
+      <property name="tooltip" translatable="yes">Remove folder and save it</property>
+      <property name="label" translatable="yes">Export Folder</property>
       <property name="use_underline">True</property>
+      <signal name="activate" handler="on_export_folder_activate" last_modification_time="Tue, 07 Apr 2009 23:56:38 GMT"/>
 
       <child internal-child="image">
-	<widget class="GtkImage" id="image1447">
+	<widget class="GtkImage" id="image1478">
 	  <property name="visible">True</property>
-	  <property name="stock">gtk-leave-fullscreen</property>
+	  <property name="stock">gtk-goto-bottom</property>
 	  <property name="icon_size">1</property>
 	  <property name="xalign">0.5</property>
 	  <property name="yalign">0.5</property>
@@ -1535,53 +1564,380 @@
 	  <property name="ypad">0</property>
 	</widget>
       </child>
+    </widget>
+  </child>
 
-      <child>
-	<widget class="GtkMenu" id="remove_restore_menu">
+  <child>
+    <widget class="GtkImageMenuItem" id="restore_folder">
+      <property name="visible">True</property>
+      <property name="tooltip" translatable="yes">Restore saved folder</property>
+      <property name="label" translatable="yes">Restore Folder</property>
+      <property name="use_underline">True</property>
+      <signal name="activate" handler="on_restore_folder_activate" last_modification_time="Tue, 07 Apr 2009 23:56:38 GMT"/>
 
-	  <child>
-	    <widget class="GtkImageMenuItem" id="remove_folder">
-	      <property name="visible">True</property>
-	      <property name="tooltip" translatable="yes">Remove folder and save it</property>
-	      <property name="label" translatable="yes">Remove Folder</property>
-	      <property name="use_underline">True</property>
-	      <signal name="activate" handler="on_remove_folder_activate" last_modification_time="Tue, 07 Apr 2009 23:56:38 GMT"/>
+      <child internal-child="image">
+	<widget class="GtkImage" id="image1479">
+	  <property name="visible">True</property>
+	  <property name="stock">gtk-goto-top</property>
+	  <property name="icon_size">1</property>
+	  <property name="xalign">0.5</property>
+	  <property name="yalign">0.5</property>
+	  <property name="xpad">0</property>
+	  <property name="ypad">0</property>
+	</widget>
+      </child>
+    </widget>
+  </child>
+</widget>
 
-	      <child internal-child="image">
-		<widget class="GtkImage" id="image1448">
-		  <property name="visible">True</property>
-		  <property name="stock">gtk-goto-bottom</property>
-		  <property name="icon_size">1</property>
-		  <property name="xalign">0.5</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		</widget>
-	      </child>
-	    </widget>
-	  </child>
+<widget class="GtkMenu" id="menu_modules">
 
-	  <child>
-	    <widget class="GtkImageMenuItem" id="restore_folder">
-	      <property name="visible">True</property>
-	      <property name="tooltip" translatable="yes">Restore saved folder</property>
-	      <property name="label" translatable="yes">Restore Folder</property>
-	      <property name="use_underline">True</property>
-	      <signal name="activate" handler="on_restore_folder_activate" last_modification_time="Tue, 07 Apr 2009 23:56:38 GMT"/>
+  <child>
+    <widget class="GtkImageMenuItem" id="open_in_new_tab">
+      <property name="visible">True</property>
+      <property name="tooltip" translatable="yes">Open selected module in a new tab</property>
+      <property name="label" translatable="yes">Open in new tab</property>
+      <property name="use_underline">True</property>
+      <signal name="activate" handler="on_open_in_tab_activate2" last_modification_time="Tue, 07 Apr 2009 23:29:59 GMT"/>
 
-	      <child internal-child="image">
-		<widget class="GtkImage" id="image1449">
-		  <property name="visible">True</property>
-		  <property name="stock">gtk-goto-top</property>
-		  <property name="icon_size">1</property>
-		  <property name="xalign">0.5</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		</widget>
-	      </child>
-	    </widget>
-	  </child>
+      <child internal-child="image">
+	<widget class="GtkImage" id="image1469">
+	  <property name="visible">True</property>
+	  <property name="pixbuf">new_tab_button.png</property>
+	  <property name="xalign">0.5</property>
+	  <property name="yalign">0.5</property>
+	  <property name="xpad">0</property>
+	  <property name="ypad">0</property>
+	</widget>
+      </child>
+    </widget>
+  </child>
+
+  <child>
+    <widget class="GtkImageMenuItem" id="open_in_a_dialog">
+      <property name="visible">True</property>
+      <property name="tooltip" translatable="yes">Open selected module in a
+	separate ['dialog'] window</property>
+      <property name="label" translatable="yes">Open in a separate window</property>
+      <property name="use_underline">True</property>
+      <signal name="activate" handler="on_open_in_dialog_activate" last_modification_time="Tue, 07 Apr 2009 23:37:07 GMT"/>
+
+      <child internal-child="image">
+	<widget class="GtkImage" id="image1470">
+	  <property name="visible">True</property>
+	  <property name="pixbuf">dlg-un-16.png</property>
+	  <property name="xalign">0.5</property>
+	  <property name="yalign">0.5</property>
+	  <property name="xpad">0</property>
+	  <property name="ypad">0</property>
+	</widget>
+      </child>
+    </widget>
+  </child>
+
+  <child>
+    <widget class="GtkImageMenuItem" id="about">
+      <property name="visible">True</property>
+      <property name="label" translatable="yes">About</property>
+      <property name="use_underline">True</property>
+      <signal name="activate" handler="on_about2_activate" last_modification_time="Fri, 06 Mar 2009 14:37:21 GMT"/>
+
+      <child internal-child="image">
+	<widget class="GtkImage" id="image1295">
+	  <property name="visible">True</property>
+	  <property name="pixbuf">sword_icon-16.png</property>
+	  <property name="xalign">0.5</property>
+	  <property name="yalign">0.5</property>
+	  <property name="xpad">0</property>
+	  <property name="ypad">0</property>
+	</widget>
+      </child>
+    </widget>
+  </child>
+</widget>
+
+<widget class="GtkMenu" id="menu_prayerlist">
+
+  <child>
+    <widget class="GtkImageMenuItem" id="create_simple_prayer_list">
+      <property name="visible">True</property>
+      <property name="tooltip"
+		translatable="yes">Create a new simple prayer list</property>
+      <property name="label" translatable="yes">Simple</property>
+      <property name="use_underline">True</property>
+      <signal name="activate" handler="on_simple_activate"
+	      last_modification_time="Tue, 07 Apr 2009 23:29:59 GMT"/>
+
+      <child internal-child="image">
+	<widget class="GtkImage" id="image1469">
+	  <property name="visible">True</property>
+	  <property name="stock">gtk-edit</property>
+	  <property name="icon_size">4</property>
+	  <property name="xalign">0.5</property>
+	  <property name="yalign">0.5</property>
+	  <property name="xpad">0</property>
+	  <property name="ypad">0</property>
+	</widget>
+      </child>
+    </widget>
+  </child>
+  
+  <child>
+    <widget class="GtkImageMenuItem" id="create_subject_prayer_list">
+      <property name="visible">True</property>
+      <property name="tooltip"
+		translatable="yes">Create a new subject prayer list</property>
+      <property name="label" translatable="yes">Subject</property>
+      <property name="use_underline">True</property>
+      <signal name="activate" handler="on_subject_activate"
+	      last_modification_time="Tue, 07 Apr 2009 23:29:59 GMT"/>
+
+      <child internal-child="image">
+	<widget class="GtkImage" id="image1469">
+	  <property name="visible">True</property>
+	  <property name="stock">gtk-edit</property>
+	  <property name="icon_size">4</property>
+	  <property name="xalign">0.5</property>
+	  <property name="yalign">0.5</property>
+	  <property name="xpad">0</property>
+	  <property name="ypad">0</property>
+	</widget>
+      </child>
+    </widget>
+  </child>
+
+  <child>
+    <widget class="GtkImageMenuItem" id="create_monthly_prayer_list">
+      <property name="visible">True</property>
+      <property name="tooltip"
+		translatable="yes">Create a new monthly journal</property>
+      <property name="label" translatable="yes">Monthly</property>
+      <property name="use_underline">True</property>
+      <signal name="activate" handler="on_monthly_activate"
+	      last_modification_time="Tue, 07 Apr 2009 23:29:59 GMT"/>
+
+      <child internal-child="image">
+	<widget class="GtkImage" id="image1469">
+	  <property name="visible">True</property>
+	  <property name="stock">gtk-edit</property>
+	  <property name="icon_size">4</property>
+	  <property name="xalign">0.5</property>
+	  <property name="yalign">0.5</property>
+	  <property name="xpad">0</property>
+	  <property name="ypad">0</property>
+	</widget>
+      </child>
+    </widget>
+  </child>
+
+  <child>
+    <widget class="GtkImageMenuItem" id="create_daily_journal">
+      <property name="visible">True</property>
+      <property name="tooltip"
+		translatable="yes">Create a new daily journal</property>
+      <property name="label" translatable="yes">Daily</property>
+      <property name="use_underline">True</property>
+      <signal name="activate" handler="on_journal_activate"
+	      last_modification_time="Tue, 07 Apr 2009 23:29:59 GMT"/>
+
+      <child internal-child="image">
+	<widget class="GtkImage" id="image1469">
+	  <property name="visible">True</property>
+	  <property name="stock">gtk-edit</property>
+	  <property name="icon_size">4</property>
+	  <property name="xalign">0.5</property>
+	  <property name="yalign">0.5</property>
+	  <property name="xpad">0</property>
+	  <property name="ypad">0</property>
+	</widget>
+      </child>
+    </widget>
+  </child>
+
+  <child>
+    <widget class="GtkImageMenuItem" id="create_outlined_topic_list">
+      <property name="visible">True</property>
+      <property name="tooltip"
+		translatable="yes">Create a new outlined topic</property>
+      <property name="label" translatable="yes">Outlined</property>
+      <property name="use_underline">True</property>
+      <signal name="activate" handler="on_outlined_topic_activate"
+	      last_modification_time="Tue, 07 Apr 2009 23:29:59 GMT"/>
+
+      <child internal-child="image">
+	<widget class="GtkImage" id="image1469">
+	  <property name="visible">True</property>
+	  <property name="stock">gtk-edit</property>
+	  <property name="icon_size">4</property>
+	  <property name="xalign">0.5</property>
+	  <property name="yalign">0.5</property>
+	  <property name="xpad">0</property>
+	  <property name="ypad">0</property>
+	</widget>
+      </child>
+    </widget>
+  </child>
+
+</widget>
+
+<widget class="GtkMenu" id="menu_prayerlist_mod">
+
+  <child>
+    <widget class="GtkImageMenuItem" id="open_in_new_tab">
+      <property name="visible">True</property>
+      <property name="tooltip" translatable="yes">Open selected module in a new tab</property>
+      <property name="label" translatable="yes">Open in new tab</property>
+      <property name="use_underline">True</property>
+      <signal name="activate" handler="on_open_in_tab_activate2" last_modification_time="Tue, 07 Apr 2009 23:29:59 GMT"/>
+
+      <child internal-child="image">
+	<widget class="GtkImage" id="image1469">
+	  <property name="visible">True</property>
+	  <property name="pixbuf">new_tab_button.png</property>
+	  <property name="xalign">0.5</property>
+	  <property name="yalign">0.5</property>
+	  <property name="xpad">0</property>
+	  <property name="ypad">0</property>
+	</widget>
+      </child>
+    </widget>
+  </child>
+
+  <child>
+    <widget class="GtkImageMenuItem" id="open_in_a_dialog">
+      <property name="visible">True</property>
+      <property name="tooltip" translatable="yes">Open in editor</property>
+      <property name="label" translatable="yes">Open in editor</property>
+      <property name="use_underline">True</property>
+      <signal name="activate" handler="on_open_in_dialog_activate" last_modification_time="Tue, 07 Apr 2009 23:37:07 GMT"/>
+
+      <child internal-child="image">
+	<widget class="GtkImage" id="image1470">
+	  <property name="visible">True</property>
+	  <property name="pixbuf">silk-edit-bookmarks.png</property>
+	  <property name="xalign">0.5</property>
+	  <property name="yalign">0.5</property>
+	  <property name="xpad">0</property>
+	  <property name="ypad">0</property>
+	</widget>
+      </child>
+    </widget>
+  </child>
+
+  <child>
+    <widget class="GtkImageMenuItem" id="about">
+      <property name="visible">True</property>
+      <property name="label" translatable="yes">About</property>
+      <property name="use_underline">True</property>
+      <signal name="activate" handler="on_about2_activate" last_modification_time="Fri, 06 Mar 2009 14:37:21 GMT"/>
+
+      <child internal-child="image">
+	<widget class="GtkImage" id="image1295">
+	  <property name="visible">True</property>
+	  <property name="pixbuf">sword_icon-16.png</property>
+	  <property name="xalign">0.5</property>
+	  <property name="yalign">0.5</property>
+	  <property name="xpad">0</property>
+	  <property name="ypad">0</property>
+	</widget>
+      </child>
+    </widget>
+  </child>
+</widget>
+
+<widget class="GtkMenu" id="menu_edit_tree">
+
+  <child>
+    <widget class="GtkImageMenuItem" id="add_child">
+      <property name="visible">True</property>
+      <property name="tooltip"
+		translatable="yes">Add a sub-item</property>
+      <property name="label" translatable="yes">Add Sub-Item</property>
+      <property name="use_underline">True</property>
+      <signal name="activate" handler="on_add_child_activate"
+	      last_modification_time="Tue, 07 Apr 2009 23:29:59 GMT"/>
+
+      <child internal-child="image">
+	<widget class="GtkImage" id="image1469">
+	  <property name="visible">True</property>
+	  <property name="stock">gtk-add</property>
+	  <property name="icon_size">4</property>
+	  <property name="xalign">0.5</property>
+	  <property name="yalign">0.5</property>
+	  <property name="xpad">0</property>
+	  <property name="ypad">0</property>
+	</widget>
+      </child>
+    </widget>
+  </child>
+  
+  <child>
+    <widget class="GtkImageMenuItem" id="add_sibling">
+      <property name="visible">True</property>
+      <property name="tooltip"
+		translatable="yes">Add an item</property>
+      <property name="label" translatable="yes">Add Item</property>
+      <property name="use_underline">True</property>
+      <signal name="activate" handler="on_add_sibling_activate"
+	      last_modification_time="Tue, 07 Apr 2009 23:29:59 GMT"/>
+
+      <child internal-child="image">
+	<widget class="GtkImage" id="image1469">
+	  <property name="visible">True</property>
+	  <property name="stock">gtk-add</property>
+	  <property name="icon_size">4</property>
+	  <property name="xalign">0.5</property>
+	  <property name="yalign">0.5</property>
+	  <property name="xpad">0</property>
+	  <property name="ypad">0</property>
+	</widget>
+      </child>
+    </widget>
+  </child>
+
+  <child>
+    <widget class="GtkImageMenuItem" id="remove">
+      <property name="visible">True</property>
+      <property name="tooltip"
+		translatable="yes">Remove this item</property>
+      <property name="label" translatable="yes">Remove</property>
+      <property name="use_underline">True</property>
+      <signal name="activate" handler="on_remove_activate"
+	      last_modification_time="Tue, 07 Apr 2009 23:29:59 GMT"/>
+
+      <child internal-child="image">
+	<widget class="GtkImage" id="image1469">
+	  <property name="visible">True</property>
+	  <property name="stock">gtk-remove</property>
+	  <property name="icon_size">4</property>
+	  <property name="xalign">0.5</property>
+	  <property name="yalign">0.5</property>
+	  <property name="xpad">0</property>
+	  <property name="ypad">0</property>
+	</widget>
+      </child>
+    </widget>
+  </child>
+  
+  <child>
+    <widget class="GtkImageMenuItem" id="edit">
+      <property name="visible">True</property>
+      <property name="tooltip"
+		translatable="yes">Edit this item</property>
+      <property name="label" translatable="yes">Edit</property>
+      <property name="use_underline">True</property>
+      <signal name="activate" handler="on_edit_activate2"
+	      last_modification_time="Tue, 07 Apr 2009 23:29:59 GMT"/>
+
+      <child internal-child="image">
+	<widget class="GtkImage" id="image1469">
+	  <property name="visible">True</property>
+	  <property name="stock">gtk-edit</property>
+	  <property name="icon_size">4</property>
+	  <property name="xalign">0.5</property>
+	  <property name="yalign">0.5</property>
+	  <property name="xpad">0</property>
+	  <property name="ypad">0</property>
 	</widget>
       </child>
     </widget>
diff --git a/waf b/waf
new file mode 100755
index 0000000..332051c
--- /dev/null
+++ b/waf
diff --git a/waffles/__init__.py b/waffles/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/waffles/__init__.py
diff --git a/waffles/editor.py b/waffles/editor.py
new file mode 100644
index 0000000..0a4e5cb
--- /dev/null
+++ b/waffles/editor.py
@@ -0,0 +1,17 @@
+"""
+Stuff to detect libs and generate Editor-* sources for editor
+"""
+
+class ComponentEditor(object):
+    '''
+    Editor is a part of Xiphos
+    '''
+
+    def detect(self):
+        pass
+
+    def generate_srcfiles(self):
+        pass
+
+    def clean(self):
+        pass
diff --git a/waffles/gecko.py b/waffles/gecko.py
new file mode 100644
index 0000000..5861bf2
--- /dev/null
+++ b/waffles/gecko.py
@@ -0,0 +1,239 @@
+"""
+Stuff to detect GECKO
+"""
+
+from os.path import join
+
+from Configure import conf
+
+from waffles.misc import *
+
+# needed for gecko 1.8
+# in libxul 1.9 all headers are in 2 folders
+# ${gecko_incldir}/stable ${gecko_incldir}/unstable
+gecko18_subdirs = '''
+        commandhandler
+	content
+	docshell
+	browser
+	dom
+	fastfind
+	find
+	gtkembedmoz
+	gfx
+	layout
+	necko
+	nspr
+	pref
+	string
+	uriloader
+	webbrwsr
+	webshell
+	widget
+	xpcom
+    '''.split()
+
+"""
+    # TODO: implement gecko detecting (rewrite gecko.m4 in python)
+
+    ## Gecko
+
+    # other HARDCODED
+    # TODO: When should be this define defined?
+    # Define if mozilla is of the toolkit flavour */
+    #dfn('HAVE_MOZILLA_TOOLKIT', 1)
+
+
+"""
+
+
+#dfn = conf.define
+#env = conf.env
+
+GECKOS = [
+        'libxul-embedding', # xul 1.9
+        'xulrunner-gtkmozembed', # xul 1.8
+        'xulrunner-windows', #windows
+    ]
+
+
+class Gecko(object):
+    """
+    Stuff related to gecko detection
+    """
+    #DISTROS = [
+            #_try_ubuntu804_xul19,
+            #_try_gentoo_xul18,
+    #]
+
+    def __init__(self, conf, incldir='', libdir=''):
+        self.incldir = incldir
+        self.libdir = libdir
+        self.conf = conf
+        self.dfn = conf.define
+        self.env = conf.env
+        
+
+    def detect(self):
+        """
+        Detect gecko in system
+        TODO: ignore pkgconfig when supplied custom
+              gecko incldir and libdir
+        """
+        #self.conf.check_cxx(cxxflags='-fshort-wchar',
+        #        errmsg='fail flag is needed for libxul 1.9')
+        #self.env['GECKO_CCFLAGS'] = '-fshort-wchar'
+
+        success = False
+
+        # try xulwin
+        if self.env['IS_WIN32']:
+            success = self.try_libxulwin()
+        
+        else:
+            # try first the latest xulrunner version
+            success = self.try_libxul19()
+
+            if not success:
+                success = self.try_xulrunner18()
+
+        return success
+
+
+    def check_version(self, name):
+
+        cfg = self.conf
+        check_pkgver(cfg, name, '1.7', var='GECKO_1_7')
+        check_pkgver(cfg, name, '1.8', var='GECKO_1_8')
+        check_pkgver(cfg, name, '1.8.1', var='GECKO_1_8_1')
+        check_pkgver(cfg, name, '1.9', var='GECKO_1_9')
+
+    
+    def get_gecko_includes(self, incldir):
+        # put gecko subdirs in string with absolute paths
+        gecko_include = ''
+        for i in gecko18_subdirs:
+            gecko_include += join(incldir, i) + ' '
+        return gecko_include
+
+
+
+    # Various configurations to try
+
+
+
+    def try_libxul19(self):
+        """
+        Should work for:
+          Ubuntu 8.04
+          Ubuntu 8.10
+          Gentoo with xulrunner-1.9
+        """
+        cfg = self.conf
+        ret = False
+        gecko = 'libxul-embedding'
+        gecko_unstable = 'libxul-embedding-unstable'
+        lib = 'GTKMOZEMBED'
+        lib_unstable = 'GTKMOZEMBED_UNSTABLE'
+
+        check_pkg(cfg, gecko, var=lib)
+        check_pkg(cfg, gecko_unstable, var=lib_unstable)
+
+        if self.env['HAVE_GTKMOZEMBED'] and self.env['HAVE_GTKMOZEMBED_UNSTABLE']:
+            #incldir = self.get_pkgvar(gecko, 'includedir')
+            self.check_version(gecko)
+            libdir = get_pkgvar(self.conf, gecko, 'sdkdir')
+            self.dfn('GECKO_HOME', libdir)
+            self.env['GECKO_INCLUDE'] = '' # header files aren't in subdirs
+
+            # NSS & NSPR
+            # TODO: are NSS and NSPR really needed both?
+            check_pkg(cfg, 'nss', var='GECKONSS')
+            check_pkg(cfg, 'nspr', var='GECKONSPR')
+
+            ret = True
+
+        return ret
+
+
+    def try_xulrunner18(self):
+        """
+        Should work for:
+            Gentoo with xulrunner-1.8
+        """
+        cfg = self.conf
+        ret = False
+        gecko = 'xulrunner-gtkmozembed'
+        lib = 'GTKMOZEMBED'
+
+        check_pkg(cfg, gecko, var=lib)
+
+        if self.env['HAVE_GTKMOZEMBED']:
+            self.check_version(gecko)
+            incldir = get_pkgvar(cfg, gecko, 'includedir')
+            libdir = get_pkgvar(cfg, gecko, 'libdir')
+            gecko_include = self.get_gecko_includes(incldir)
+            self.dfn('GECKO_HOME', libdir)
+            self.env['GECKO_INCLUDE'] = gecko_include
+
+            check_pkg(cfg, 'xulrunner-nss', var='GECKONSS')
+            check_pkg(cfg, 'xulrunner-nspr', var='GECKONSPR')
+
+            ret = True
+
+        return ret
+    
+    def try_libxulwin(self):
+        v = self.env
+        df = self.conf.define
+
+        # FIXME hardcoded values
+        #if v['IS_CROSS_WIN32']:
+        d = v['MOZILLA_DISTDIR']
+        df('HAVE_GTKMOZEMBED', 1)
+        df('USE_GTKMOZEMBED', 1)
+        df('HAVE_GECKO_1_7', 1)
+        df('HAVE_GECKO_1_8', 1)
+        df('HAVE_GECKO_1_8_1', 1)
+        df('HAVE_GECKO_1_9', 1)
+        v['ALL_LIBS'].append('GTKMOZEMBED')
+        v['CPPPATH_GTKMOZEMBED'] = ['%s/sdk/include' % d,
+                '%s/include' % d,
+                '%s/include/widget' % d,
+                '%s/include/xpcom' % d,
+                '%s/include/dom' % d,
+                '%s/include/content' % d,
+                '%s/include/layout' % d,
+                '%s/include/gfx' % d]
+        v['LIBPATH_GTKMOZEMBED'] = ['%s/sdk/lib' % d]
+        v['LIB_GTKMOZEMBED'] = ['xpcomglue_s', 'xpcom', 'xul', 'nspr4']
+        ret = True
+
+        #else:
+            #ret = False
+            #gecko = 'libxul'
+            #lib = 'GTKMOZEMBED'
+
+            #check_pkg(cfg, gecko, var=lib)
+            
+            #if self.env['HAVE_GTKMOZEMBED']:
+                #self.check_version(gecko)
+                #ret = True
+
+        return ret
+        
+
+    def try_custom_conf(self):
+        """
+        Try values for gecko includedir and libdir
+        supplied by user.
+        """
+        pass
+
+    def try_custom_conf_xul19(self):
+        """
+        Try values for gecko includedir and libdir
+        supplied by user.
+        """
+        pass
+
diff --git a/waffles/gtkhtml.py b/waffles/gtkhtml.py
new file mode 100644
index 0000000..27be847
--- /dev/null
+++ b/waffles/gtkhtml.py
@@ -0,0 +1,85 @@
+"""
+Stuff to detect GTKHTML
+and generate Editor-* sources for
+component editor
+"""
+
+from waffles.misc import *
+
+# TODO: adjust for compilation with GTKHTML backend
+class Gtkhtml(object):
+
+    def __init__(self, conf):
+        self.conf = conf
+        self.env = conf.env
+
+    def detect(self):
+        pass
+        """
+        Detect gtkhtml in system
+        """
+        #success = False
+        success = self.try_api314()
+
+        #if not success:
+            #success = self.try_38()
+
+        return success
+
+
+
+    def try_api314(self):
+
+        ret = False
+        dfn = self.conf.define
+
+        check_pkg(self.conf, 'libgtkhtml-3.14', var='GTKHTML')
+
+        if self.env['HAVE_GTKHTML']:
+            #dfn('USE_GTKHTML38', 1)
+            dfn('USE_GTKHTML3_14', 1)
+            self.set_vars('3.14')
+            self.check_version323()
+            ret = True
+
+        return ret
+
+
+    #def try_api38(self):
+ 
+        #ret = False
+#
+        #check_pkg(self.conf, 'libgtkhtml-3.8', mandatory=True, var='GTKHTML')
+
+        #if self.env['GTKHTML']:
+            #self.conf.define('USE_GTKHTML38', 1)
+            #self.set_vars('3.8')
+            #ret = True
+
+        #return ret
+
+
+    def set_vars(self, api_ver):
+
+        dfn = self.conf.define
+        api = get_pkgvar(self.conf, 'libgtkhtml-%s' % api_ver,
+                'gtkhtml_apiversion')
+        data_dir = get_pkgvar(self.conf, 'libgtkhtml-%s' % api_ver,
+                'gtkhtml_datadir')
+
+        self.env['GTKHTML_DATA'] = data_dir
+        dfn('GTKHTML_API_VERSION', api)
+        dfn('GTKHTML_DATA_DIR', data_dir)
+
+
+    def check_version323(self):
+        """
+        gtkhtml >=3.23 don't need generating sources form Editor.idl
+        """
+        check_pkgver(self.conf, 'libgtkhtml-3.14', '3.23', var='EDITOR_IDL')
+
+        if self.conf.env['HAVE_EDITOR_IDL']:
+            check_pkg(self.conf, 'gtkhtml-editor', mandatory=True, var='GTKHTML_EDITOR')
+            self.conf.define('USE_GTKHTML3_14_23', 1)
+
+
diff --git a/waffles/misc.py b/waffles/misc.py
new file mode 100644
index 0000000..2c227d4
--- /dev/null
+++ b/waffles/misc.py
@@ -0,0 +1,111 @@
+"""
+General useful functions
+"""
+
+def myokmsg(kw):
+    """
+    some customization for displaying pkg-config values on the line with ok msg
+    to be able use this function there is need for file ./wafadmin/Tools/config_c.py
+    from svn in r5753
+    """
+    return 'ok %s' % kw['success'].strip()
+
+
+# pkgconfig utils
+
+
+def get_pkgvar(conf, pkg, var):
+    """
+    Read a variable from package using pkg-config
+    """
+
+    # for cross-compilation it is necessary to prepend custom
+    # prefix for include paths
+    if conf.env['IS_CROSS_WIN32']:
+        ret = conf.check_cfg(package=pkg, args='--variable=%s --define-variable=prefix=%s'%(var, conf.env['PKG_CONFIG_PREFIX'] ), okmsg=myokmsg,
+                msg='Checking for var %s in %s' % (var, pkg)).strip()
+    else:
+        ret = conf.check_cfg(package=pkg, args='--variable=%s' % var, okmsg=myokmsg,
+                msg='Checking for var %s in %s' % (var, pkg)).strip()
+    return ret
+
+
+def check_pkg(conf, name, version='', mandatory=False, var=None):
+    """
+    Check package version and its cflags/libs
+    """
+    if not var:
+        var = name.split ('-')[0].upper ()
+
+    # for cross-compilation it is necessary to prepend custom
+    # prefix for include paths
+    if conf.env['IS_CROSS_WIN32']:
+        conf.check_cfg (package=name, uselib_store=var, args='--cflags --libs --define-variable=prefix=%s'%conf.env['PKG_CONFIG_PREFIX'],
+            atleast_version=version, mandatory=mandatory)
+    else:
+        conf.check_cfg (package=name, uselib_store=var, args='--cflags --libs',
+            atleast_version=version, mandatory=mandatory)
+
+    # make available libs to all source files
+    #(compile code with cflags from pkgconf e.g. -fshort-wchar, -mms-bitfields)
+    conf.env.append_value('ALL_LIBS', var)
+
+
+def check_pkg_msg(conf, name, version='', mandatory=False, var=None, msg=''):
+    """
+    Check package version and its cflags/libs
+    """
+    if not var:
+        var = name.split ('-')[0].upper ()
+    conf.check_cfg (package=name, uselib_store=var, args='--cflags --libs',
+        atleast_version=version, mandatory=mandatory, msg=msg)
+
+    # make available libs to all source files
+    #(compile code with cflags from pkgconf e.g. -fshort-wchar, -mms-bitfields)
+    conf.env.append_value('ALL_LIBS', var)
+
+
+
+
+def check_pkgver(conf, name, version='', mandatory=False, var=None):
+    """
+    Check package version without cflags/libs
+    """
+    if not var:
+        var = name.split ('-')[0].upper ()
+    conf.check_cfg (package=name, uselib_store=var,
+        atleast_version=version, mandatory=mandatory)
+
+
+def check_pkgver_msg(conf, name, version='', mandatory=False, var=None, msg=''):
+    """
+    Check package version without cflags/libs
+    """
+    if not var:
+        var = name.split ('-')[0].upper ()
+    conf.check_cfg (package=name, uselib_store=var,
+        atleast_version=version, mandatory=mandatory, msg=msg)
+
+
+def escape(string):
+    """
+    Escape string
+    Useful to use for string and paths before writing them to config.h
+    """
+    return string.decode('string-escape')
+
+def escpath(path):
+    """
+    Escape path - useful in win32
+    """
+    from os.path import normpath
+    normpath(path)
+
+    # double backslashes '\\' needs to be written to config.h in win32 paths in win32
+    path = '%r' % path # convert string to raw form - '%r'
+    max = len(path) - 1
+    path = path[1:max] # trim apostrophes at begin and end
+
+    return path
+    
+
diff --git a/wscript b/wscript
new file mode 100644
index 0000000..4bb5600
--- /dev/null
+++ b/wscript
@@ -0,0 +1,625 @@
+#! /usr/bin/env python
+# encoding: utf-8
+
+import sys
+if sys.version_info < (2,3):
+    raise RuntimeError("Python 2.3 or newer is required")
+
+import os, os.path
+import intltool, gnome
+from os.path import join, dirname, abspath
+
+
+# waf imports
+import Utils
+import Options
+import ccroot
+
+
+# custom imports
+from waffles.gecko import Gecko
+from waffles.gtkhtml import Gtkhtml
+from waffles.misc import *
+
+# the following two variables are used by the target "waf dist"
+VERSION='3.1.2'
+APPNAME='xiphos'
+PACKAGE='xiphos'
+
+# these variables are mandatory ('/' are converted automatically)
+srcdir = '.'
+blddir = 'build'
+
+# dir where waf will search custom (additional) files
+_tooldir = './waffles/'
+
+_prefix = '/usr/local'
+
+ROOTDIR_WIN32 = 'C:\msys'
+
+_headers = '''
+dlfcn.h
+inttypes.h
+locale.h
+memory.h
+stdint.h
+stdlib.h
+strings.h
+string.h
+sys/stat.h
+sys/types.h
+unistd.h
+sys/select.h
+sys/socket.h
+winsock.h
+'''.split()
+
+_unused_options = '''
+sbindir
+sysconfdir
+libdir
+libexecdir
+sharedstatedir
+localstatedir
+includedir
+oldincludedir
+datadir
+infodir
+mandir
+htmldir
+dvidir
+pdfdir
+psdir
+'''.split()
+
+
+def set_options(opt):
+
+
+    # options provided by the modules
+    #opt.tool_options('g++ gcc gnome intltool glib2')
+    opt.tool_options('g++ gcc gnu_dirs')
+
+    # unused options
+    for name in _unused_options:
+        option_name = '--' + name
+        opt.parser.remove_option(option_name)
+
+    opt.add_option('--enable-autoclear', action='store_true', default=False,
+            dest='autoclear', help='Use previewer autoclear [Default: disabled]')
+
+    opt.add_option('--enable-old_navbar', action='store_true', default=False,
+            dest='old_navbar', help='Use old_navbar [Default: disabled]')
+
+    opt.add_option('--enable-gtkhtml', action='store_true', default=False,
+            dest='gtkhtml',
+            help='Use gtkhtml instead of gtkmozembed [Default: disabled]')
+
+    opt.add_option('--disable-console',
+            action='store_true',
+            default=False,
+            help='Disable console window in win32 [Default: enabled]',
+            dest='no_console')
+
+    opt.add_option('-d', '--debug-level',
+		action = 'store',
+		default = ccroot.DEBUG_LEVELS.ULTRADEBUG,
+		help = "Specify the debugging level ['ultradebug', 'debug', 'release', 'optimized']",
+		choices = ['ultradebug', 'debug', 'release', 'optimized'],
+		dest = 'debug_level')
+
+    opt.add_option('--enable-delint', action='store_true', default=False,
+            dest='delint',
+            help='Use -Wall -Werror[Default: disabled]')
+
+
+    ### cross compilation from Linux/Unix for win32
+
+    opt.add_option('--target-platform-win32', action='store_true', default=False,
+            dest='cross_win32',
+            help='Cross-compile for win32 [Default: disabled]')
+
+    # FIXME - handle this option
+    #opt.add_option('--rootdir',
+		#action = 'store',
+		#help = 'Specify path where resides msys. This dir is used for finding libraries and other files',
+		#dest = 'rootdir')
+
+    opt.add_option('--pkgconf-libdir',
+		action = 'store',
+		default = os.path.join(ROOTDIR_WIN32, 'local', 'lib', 'pkgconfig'),
+		help = "Specify dir with *.pc files for cross-compilation",
+		dest = 'pkg_conf_libdir')
+
+    opt.add_option('--pkgconf-prefix',
+		action = 'store',
+		default = os.path.join(ROOTDIR_WIN32, 'local'),
+		help = "Specify prefix with folders for headers and libraries for cross-compilation",
+		dest = 'pkg_conf_prefix')
+
+    opt.add_option('--mozilla-distdir',
+		action = 'store',
+		default = os.path.join(ROOTDIR_WIN32, 'local'),
+		help = "Folder 'dist' in unpacked mozilla devel tarball. Mandatory for win32 compilation",
+		dest = 'mozilla_distdir')
+
+    opt.add_option('--disable-dbus',
+                   action = 'store_true',
+                   default = False,
+                   help = "Disable the Xiphos dbus API [Default: enabled]",
+                   dest = 'without_dbus')
+
+    opt.add_option('--without-gnome',
+                   action = 'store_true',
+                   default = False,
+                   help = "Disable GNOME [Default: enabled]",
+                   dest = 'without_gnome')
+
+    group = opt.add_option_group ('Localization and documentation', '')
+    group.add_option('--helpdir',
+		action = 'store',
+		default = '${DATAROOTDIR}/gnome/help/${PACKAGE}',
+                help = "user documentation [Default: ${DATAROOTDIR}/gnome/help/${PACKAGE}]",
+		dest = 'helpdir')
+    group.add_option('--disable-help',
+            action='store_true',
+            default=False,
+            help='Disable creating help files',
+            dest='disable_help')
+
+
+def configure(conf):
+
+    env = conf.env
+    import Utils
+    platform = Utils.detect_platform()
+    env['IS_WIN32'] = platform == 'win32'
+    env['IS_LINUX'] = platform == 'linux'
+
+    env['IS_CROSS_WIN32'] = Options.options.cross_win32
+
+    # cross-compilation for Windows
+    # behave mostly like on windows platform
+    if env['IS_CROSS_WIN32']:
+        env['IS_WIN32'] = True
+        env['IS_LINUX'] = False
+        Utils.pprint('CYAN', "Cross-compilation")
+
+    # IS_WIN32 means compiling for win32, not compiling necessary on win32
+    if env['IS_WIN32']:
+        Utils.pprint('CYAN', "Windows detected")
+    elif env['IS_LINUX']:
+        Utils.pprint('CYAN', "Linux detected")
+
+    if not (env['IS_LINUX'] or env['IS_WIN32']):
+        Utils.pprint('RED', "Unknown or unsupported platform")
+        exit(1)
+
+    ## temporary HACKS for win32
+    if env['IS_WIN32']:
+        env['PREFIX'] = escpath(os.path.abspath('win32/binaries/Xiphos'))
+    ##
+
+    if env['IS_WIN32']:
+        env['ROOTDIR'] = ROOTDIR_WIN32
+    
+    conf.check_tool('g++ gcc')
+    # cross compiler
+    if env['IS_CROSS_WIN32']:
+        conf.check_tool('cross_linux_win32', tooldir=_tooldir)
+
+    conf.check_tool('gnu_dirs misc')
+    conf.check_tool('intltool') # check for locale.h included
+
+    opt = Options.options
+
+    if not opt.disable_help:
+        conf.check_tool('documentation', tooldir=_tooldir) # stuff to create help files
+
+    # DATADIR is defined by intltool in config.h - conflict in win32 (mingw)
+    conf.undefine('DATADIR')
+
+    if env['IS_WIN32']:
+        # tool to link icon with executable
+        # use tool modified for cross-compilation support
+        conf.check_tool('winres', tooldir=_tooldir)
+        # the following line does not work because of a problem with waf
+        # conf.check_tool('intltool')
+        #env['POCOM'] = conf.find_program('msgfmt')
+        #env['INTLTOOL'] = '/usr/local/bin/intltool-merge'
+    #else:
+
+
+    # delint flags
+    env['CXXFLAGS_DELINT'] = ['-Werror', '-Wall']
+    env['CCFLAGS_DELINT'] = ['-Werror', '-Wall', '-Wmissing-prototypes',
+                             '-Wnested-externs', '-Wpointer-arith', '-Wno-sign-compare']
+
+    # gcc compiler debug levels
+    # msvc has levels predefined
+    if env['CC_NAME'] == 'gcc':
+        env['CCFLAGS']            = []
+        env['CCFLAGS_OPTIMIZED']  = ['-O2']
+        env['CCFLAGS_RELEASE']    = ['-O2']
+        env['CCFLAGS_DEBUG']      = ['-g', '-DDEBUG']
+        env['CCFLAGS_ULTRADEBUG'] = ['-g3', '-O0', '-DDEBUG']
+
+    if env['CXX_NAME'] == 'gcc':
+        env['CXXFLAGS']            = []
+        env['CXXFLAGS_OPTIMIZED']  = ['-O2']
+        env['CXXFLAGS_RELEASE']    = ['-O2']
+        env['CXXFLAGS_DEBUG']      = ['-g', '-DDEBUG', '-ftemplate-depth-25']
+        env['CXXFLAGS_ULTRADEBUG'] = ['-g3', '-O0', '-DDEBUG', '-ftemplate-depth-25']
+    
+    if env['IS_WIN32']:
+        ## setup for Winsock on Windows (required for read-aloud)
+        conf.check(lib='ws2_32', uselib='WSOCK', mandatory=True)
+        conf.check(lib='shell32', uselib='SHELLAPI', mandatory=True)
+        # this isn't supposed to be necessary
+        env['LINKFLAGS'] = ['-lws2_32']
+    
+    ### cmd line options
+
+    opt = Options.options
+    dfn = conf.define
+    env = conf.env
+
+
+    if env['IS_CROSS_WIN32']:
+        # allows to use linux pkg-config for cross-compilation
+        os.environ['PKG_CONFIG_LIBDIR'] = opt.pkg_conf_libdir
+        env['PKG_CONFIG_PREFIX'] = opt.pkg_conf_prefix
+
+    # mozilla distdir mandatory for win32 for using libxul
+    if env['IS_WIN32']:
+        if opt.mozilla_distdir:
+            env['MOZILLA_DISTDIR'] = opt.mozilla_distdir
+        else:
+            env['MOZILLA_DISTDIR'] = '%s/../..' % env['PKG_CONFIG_LIBDIR']
+
+    # appropriate cflags
+    env.append_value('CXXFLAGS', env['CXXFLAGS_%s' % opt.debug_level.upper()])
+    env.append_value('CCFLAGS', env['CCFLAGS_%s' % opt.debug_level.upper()])
+
+    if env['IS_WIN32']:
+        dfn('WIN32', 1)
+
+    if opt.delint:
+        env.append_value('CXXFLAGS', env['CXXFLAGS_DELINT'])
+        env.append_value('CCFLAGS', env['CCFLAGS_DELINT'])
+
+    if opt.autoclear:
+        dfn('USE_PREVIEWER_AUTOCLEAR', 1)
+    if opt.old_navbar:
+        dfn('OLD_NAVBAR ', 1)
+
+    # gtkhtml
+    if opt.gtkhtml:
+        env['ENABLE_GTKHTML'] = True
+        dfn('GTKHTML', 1)
+
+    # disable console window in win32
+    if opt.no_console and env['IS_WIN32']:
+        env.append_value('LINKFLAGS', '-mwindows')
+
+
+    # strip xiphos binary
+    if env['IS_CROSS_WIN32']:
+        env['STRIP'] = conf.find_program('i686-mingw32-strip', mandatory=True)
+    else:
+        env['STRIP'] = conf.find_program('strip', mandatory=True)
+
+    if not opt.without_dbus:
+        check_pkg(conf, 'dbus-glib-1', '0.60', True, var='DBUS')
+        # we need a modified version of dbus.py for running on windows
+        conf.check_tool('dbus', tooldir=_tooldir)
+        conf.check_tool('glib2')
+
+
+    ### App info, paths
+    define = conf.define
+    sub = Utils.subst_vars
+
+    env['VERSION'] = VERSION
+    env['APPNAME'] = APPNAME
+    env['PACKAGE'] = PACKAGE
+    env['HELPDIR'] = sub(opt.helpdir, env)
+
+    define('VERSION', VERSION)
+    define('PACKAGE_VERSION', VERSION)
+    define('GETTEXT_PACKAGE', PACKAGE)
+    define('PACKAGE', PACKAGE)
+    define('PACKAGE_NAME', APPNAME)
+    define('PACKAGE_STRING', '%s %s' % (APPNAME, VERSION))
+    define('PACKAGE_TARNAME', PACKAGE)
+
+    define('INSTALL_PREFIX', escpath(sub('${PREFIX}/', env)))
+    #dfn('LT_OBJDIR', '.libs') - what's the purpose?
+    define('PACKAGE_BUGREPORT','http://sourceforge.net/tracker/?group_id=5528&atid=105528' )
+    define('PACKAGE_DATA_DIR', escpath(sub('${DATAROOTDIR}/${PACKAGE}', env)))
+    define('PACKAGE_DOC_DIR', escpath(env['DOCDIR']))
+    define('PACKAGE_HELP_DIR', escpath(sub('${DATAROOTDIR}/gnome/help/${PACKAGE}', env)))
+    define('PACKAGE_LOCALE_DIR', escpath(env['LOCALEDIR']))
+    define('PACKAGE_MENU_DIR', escpath(sub('${DATAROOTDIR}/applications', env)))
+    define('PACKAGE_PIXMAPS_DIR', escpath(sub('${DATAROOTDIR}/pixmaps/${PACKAGE}', env)))
+    define('PACKAGE_SOURCE_DIR', escpath(abspath(srcdir))) # foder where was wscript executed
+
+    # some folders for final executable
+    #define('PREFIX', escpath(env['PREFIX']))
+    #define('SYSCONFDIR', escpath(env['SYSCONFDIR']))
+    #define('DATADIR', escpath(env['DATAROOTDIR']))
+    #env.append_value('CXXFLAGS', env['CXXDEFINES_ST'] % ('DATADIR='+escpath(env['DATAROOTDIR'])))
+    #env.append_value('CCFLAGS', env['CCDEFINES_ST'] % ('DATADIR='+escpath(env['DATAROOTDIR'])))
+    #define('LIBDIR', escpath(env['LIBDIR']))
+    #define('SHARE_DIR', escpath(sub('${DATAROOTDIR}/${PACKAGE}', env)))
+
+
+    ## CXX flags (compiler arguments)
+    #conf.check_cxx(cxxflags='-ftemplate-depth-25')
+    #conf.check_cxx(cxxflags='-Werror')
+    #conf.check_cxx(cxxflags='-Wall')
+    #conf.env.append_value('CCFLAGS', '-g -O2 -Werror -Wall'.split())
+    #conf.env.append_value('CXXFLAGS', '-g -O2 -ftemplate-depth-128 -Werror -Wall'.split())
+
+    # pkg-config
+    conf.check_cfg(atleast_pkgconfig_version='0.9.0')
+
+
+
+    # GTK+
+    #check_pkg(conf, 'gtk+-x11-2.0', '2.0.0', var='LIBGTK_X11_2_0')
+    #if not env['HAVE_LIBGTK_X11_2_0']:
+    #    check_pkg(conf, 'gtk+-x11-2.0', '2.0.0', True, var='LIBGTK_WIN32_2_0')
+    check_pkg(conf, 'gtk+-2.0', '2.0', True, var='GTK')
+
+
+
+    #sys.exit()
+
+
+    # tooltip function needs gtk+ >= 2.12 HAVE_WIDGET_TOOLTIP_TEXT
+    #check_pkg(conf, 'gtk+-2.0', '2.12', var='WIDGET_TOOLTIP_TEXT')
+    #conf.check_cfg(conf, 'gtk+-2.0', '2.12', var='WIDGET_TOOLTIP_TEXT')
+    #conf.check_cfg (package='gtk+-2.0', msg='Checking for widget_tooltip_text',
+        #uselib_store='WIDGET_TOOLTIP_TEXT', atleast_version='2.12')
+    check_pkgver_msg(conf, 'gtk+-2.0', '2.12', var='WIDGET_TOOLTIP_TEXT',
+        msg='Checking for gtk+-2.0 widget_tooltip_text')
+
+    # glade
+    check_pkg(conf, 'libglade-2.0', '2.0.0', var='GLADE')
+        
+
+    # gtk popup menus - dynamic loadable libs
+    #if env['IS_WIN32']:
+        #check_pkg(conf, 'gmodule-no-export-2.0', '2.0.0', True, var='GMODULEEXP')
+    #else: 
+        #check_pkg(conf, 'gmodule-export-2.0', '2.0.0', True, var='GMODULEEXP')
+    check_pkg(conf, 'gmodule-2.0', '2.0.0', True, var='GMODULEEXP')
+    check_pkg(conf, 'glib-2.0', '2.0.0', True, 'GLIB')
+
+    ## Gnome libs
+    if not opt.without_gnome:
+        check_pkg(conf, 'libgnomeui-2.0', '2.0.0', True, var='GNOMEUI')
+    else:
+        dfn('WITHOUT_GNOME', 1)
+
+    ## gfs
+    check_pkg(conf, 'libgsf-1', '1.14', True, 'GFS')
+
+    #check_pkg(conf, 'libgnomeprintui-2.2', '2.2', True, var='GNOMEPRINTUI')
+    #check_pkg(conf, 'libgnomeprint-2.2', '2.2', True, var='GNOMEPRINT')
+
+    ## Other
+    check_pkg(conf, 'libxml-2.0', '2.0.0', True, var='XML')
+
+    check_pkg(conf, 'gtk+-unix-print-2.0', '2.0.0', var='UPRINT')
+    if env['HAVE_UPRINT']:
+        dfn('USE_GTKUPRINT', 1)
+
+    ## Sword
+    check_pkg(conf, 'sword', '1.5.11', True, var='SWORD')
+
+    check_pkgver_msg(conf, 'sword', '1.5.11.99', var='MULTIVERSE',
+            msg='Checking for sword multiverse')
+    if env['HAVE_MULTIVERSE']:
+        dfn('SWORD_MULTIVERSE', 1)
+
+
+    ### gtkhtml - decide HAVE_GTKHTML3_23
+    if not Gtkhtml(conf).detect():
+        print 'Error: GTKHTML not found'
+        exit(1)
+
+
+    # bonobo editor variant, slib-editor otherwise
+    if not env['HAVE_EDITOR_IDL']:
+
+        ### editor.py
+        check_pkg(conf, 'ORBit-2.0', mandatory=True)
+        check_pkg(conf, 'libbonobo-2.0', mandatory=True)
+        check_pkg(conf, 'bonobo-activation-2.0', mandatory=True)
+
+        # ORBIT_IDL
+        env['ORBIT_IDL'] = get_pkgvar(conf, 'ORBit-2.0', 'orbit_idl')
+
+        # BONOBO_IDL_INCLUDES
+        idl1 = get_pkgvar(conf, 'libbonobo-2.0', 'idldir')
+        idl2 = get_pkgvar(conf, 'bonobo-activation-2.0', 'idldir')
+
+        env['BONOBO_IDL_INCLUDES'] = '-I%s -I%s' % (idl1, idl2)
+        ### END editor.py
+
+
+
+    ######################
+    ### gecko (xulrunner) for html rendering
+    # gtkhtml only for editor
+    if not env['ENABLE_GTKHTML']:
+        Gecko(conf).detect()
+        dfn('USE_GTKMOZEMBED', 1)
+        #env.append_value('CCFLAGS', env['GECKO_CCFLAGS'])
+        #env.append_value('CXXFLAGS', env['GECKO_CCFLAGS'])
+    ######################
+
+
+    # TODO: maybe the following checks should be in a more generic module.
+
+    #always defined to indicate that i18n is enabled */
+    dfn('ENABLE_NLS', 1)
+
+    # TODO
+    #Define to 1 if you have the `bind_textdomain_codeset' function.
+    dfn('HAVE_BIND_TEXTDOMAIN_CODESET', 1)
+
+
+    # TODO
+    #Define if the GNU gettext() function is already present or preinstalled.
+    dfn('HAVE_GETTEXT', 1)
+    #Define to 1 if you have the `dcgettext' function.
+    dfn('HAVE_DCGETTEXT', 1)
+
+
+    # Check for header files
+    for h in _headers:
+        conf.check(header_name=h)
+
+
+    # Define to 1 if you have the `strcasestr' function.
+    # this function is part of some glibc, string.h
+    # could be missing in win32
+    conf.check_cc(msg='Checking for function strcasestr', define_name="HAVE_STRCASESTR",
+            fragment='int main() {strcasestr("hello","he");}\n')
+
+
+    # TODO: What's the purpose of STDC? Is xiphos able compile without that?
+    # Define to 1 if you have the ANSI C header files. */
+    # NOT necessary?
+    dfn('STDC_HEADERS', 1)
+    # Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
+    dfn('TIME_WITH_SYS_TIME', 1)
+
+
+            # TODO: how to detect these values? is it possible to detect them?
+
+    # TODO: not necessary SELECT* defines?
+    # Define to the type of arg 1 for `select'. */
+    #dfn('SELECT_TYPE_ARG1', 'int', quote=0) # dont add quotes around 'int'
+    # Define to the type of args 2, 3 and 4 for `select'. */
+    #dfn('SELECT_TYPE_ARG234', '(fd_set *)', quote=0)
+    # Define to the type of arg 5 for `select'. */
+    #dfn('SELECT_TYPE_ARG5', '(struct timeval *)', quote=0)
+
+
+    #dfn('__cplusplus', 1)
+
+    # let compiler know that we have 'config.h'
+    
+    # portable adding define, should work gcc and msvc
+    env.append_value('CXXFLAGS', env['CXXDEFINES_ST'] % 'HAVE_CONFIG_H')
+    env.append_value('CCFLAGS', env['CCDEFINES_ST'] % 'HAVE_CONFIG_H')
+
+    conf.write_config_header('config.h')
+
+    # process configure for subfolders
+    conf.sub_config('src/editor') # generate Editor source from idl
+    conf.sub_config('src/gnome2') # generate locale_set.c
+
+
+
+def build(bld):
+
+    env = bld.env
+    opt = Options.options
+
+    # process subfolders
+    bld.add_subdirs("""
+        src/backend
+        src/editor
+        src/main
+        src/gnome2
+        ui
+    """)
+    # use GECKO
+    if not env['ENABLE_GTKHTML']:
+        if env["IS_WIN32"]:
+            bld.add_subdirs('src/geckowin')
+        else:
+            bld.add_subdirs('src/gecko')
+
+    bld.install_files('${PACKAGE_DOC_DIR}', """
+        README
+	RELEASE-NOTES
+	COPYING
+	COPYING-DOCS
+	AUTHORS
+	ChangeLog
+	INSTALL
+	NEWS
+	TODO
+	Xiphos.ogg
+        help/xiphos.pdf
+    """)
+
+    bld.install_files('${PACKAGE_PIXMAPS_DIR}','pixmaps/*')
+
+    # handle .desktop creation and installation
+    if not env["IS_WIN32"]:
+        bld.new_task_gen(
+                features='subst',
+                source='xiphos.desktop.in.in',
+                target='xiphos.desktop.in',
+                dict={'xiphos_exec': 'xiphos',
+                      'PACKAGE_PIXMAPS_DIR': env['PACKAGE_PIXMAPS_DIR'],
+                      'INSTALL_PREFIX': env['INSTALL_PREFIX']},
+        )
+        bld.new_task_gen(
+                features='intltool_in',
+                source='xiphos.desktop.in',
+                target='xiphos.desktop',
+                install_path='${PACKAGE_MENU_DIR}',
+                podir='po',
+                flags=['-d', '-q', '-u', '-c']
+        )
+
+
+    # Type of help format depends on OS.
+    # WIN32: chm
+    # Other OS: just xml
+    # FIXME create and install help doesnt work yet on windows
+    if not opt.disable_help:
+        bld.add_subdirs('help')
+
+    if bld.env['INTLTOOL']:
+        bld.add_subdirs('po')
+
+    #if env['HAVE_GTKSHARP'] and env['MCS']:
+        #bld.add_subdirs('sharp')
+
+    #if env['SGML2MAN']:
+    #	bld.add_subdirs('man')
+
+
+def shutdown():
+    # Postinstall tasks:
+    #gnome.postinstall_srrcrollkeeper('gnome-hello') # Installing the user docs
+    #gnome.postinstall_schemas('gnome-test') # Installing GConf schemas
+    #gnome.postinstall_icons() # Updating the icon cache
+    pass
+
+def distclean():
+
+    ### editor.py
+    lst = ('''
+        src/editor/Editor-common.c
+        src/editor/Editor.h
+        src/editor/Editor-skels.c
+        src/editor/Editor-stubs.c
+    ''').split()
+
+    print 'Removing files generated for editor:'
+    for i in lst:
+        if os.path.exists(i):
+            print i
+            os.remove(i)
+    ### END editor.py
+
diff --git a/xiphos.desktop.in.in b/xiphos.desktop.in.in
index b9b6034..553e4c1 100644
--- a/xiphos.desktop.in.in
+++ b/xiphos.desktop.in.in
@@ -3,11 +3,11 @@
 _Name=Xiphos Bible Guide
 _Comment=Study the Bible
 Exec=@xiphos_exec@
-Icon=@PACKAGE_PIXMAPS_DIR@/xiphos.svg
+TryExec=xiphos
+Icon=xiphos
 Terminal=false
 X-MultipleArgs=false
 Type=Application
 Categories=Utility;X-Red-Hat-Extra;
 StartupNotify=true
-TryExec=@INSTALL_PREFIX@bin/xiphos
 X-Desktop-File-Install-Version=0.15
diff --git a/xiphos.spec b/xiphos.spec
index 8e86a88..d2881dc 100644
--- a/xiphos.spec
+++ b/xiphos.spec
@@ -3,7 +3,7 @@
 Summary:	GNOME-based Bible research tool
 Name:		xiphos
 Prefix:		/usr
-Version:	3.1.1
+Version:	3.1.2
 Release:	%{release}
 License:	GPL
 URL:		http://xiphos.sourceforge.net/