[Gnucash-changes] r14238 - gnucash/branches/register-rewrite - Bump the branch root up to r14237 from trunk.

Mon May 29 15:45:24 EDT 2006

Author: chris
Date: 2006-05-29 15:45:18 -0400 (Mon, 29 May 2006)
New Revision: 14238
Trac: http://svn.gnucash.org/trac/changeset/14238

Modified:
   gnucash/branches/register-rewrite/AUTHORS
   gnucash/branches/register-rewrite/ChangeLog
   gnucash/branches/register-rewrite/Makefile.TAGS
   gnucash/branches/register-rewrite/Makefile.am
   gnucash/branches/register-rewrite/lib/libqof/backend/file/Makefile.am
   gnucash/branches/register-rewrite/lib/libqof/qof/qofsession.c
   gnucash/branches/register-rewrite/packaging/gnucash-1.9.x.ebuild
   gnucash/branches/register-rewrite/po/en_GB.po
   gnucash/branches/register-rewrite/po/es.po
   gnucash/branches/register-rewrite/po/fr.po
   gnucash/branches/register-rewrite/src/backend/file/Makefile.am
   gnucash/branches/register-rewrite/src/backend/file/gnc-backend-file.c
   gnucash/branches/register-rewrite/src/backend/file/io-gncxml-v2.c
   gnucash/branches/register-rewrite/src/backend/file/io-gncxml-v2.h
   gnucash/branches/register-rewrite/src/backend/file/sixtp.c
   gnucash/branches/register-rewrite/src/backend/file/sixtp.h
   gnucash/branches/register-rewrite/src/backend/postgres/Makefile.am
   gnucash/branches/register-rewrite/src/bin/gnucash-bin.c
   gnucash/branches/register-rewrite/src/business/business-reports/aging.scm
   gnucash/branches/register-rewrite/src/engine/gnc-engine.c
   gnucash/branches/register-rewrite/src/gnome-utils/druid-gnc-xml-import.c
   gnucash/branches/register-rewrite/src/gnome-utils/gnc-tree-view.c
   gnucash/branches/register-rewrite/src/import-export/hbci/druid-hbci-initial.c
   gnucash/branches/register-rewrite/src/import-export/hbci/gnc-hbci-utils.c
   gnucash/branches/register-rewrite/src/pixmaps/gnucash_splash.png
Log:
   Bump the branch root up to r14237 from trunk.


Modified: gnucash/branches/register-rewrite/AUTHORS
===================================================================

--- gnucash/branches/register-rewrite/AUTHORS	2006-05-29 19:24:38 UTC (rev 14237)
+++ gnucash/branches/register-rewrite/AUTHORS	2006-05-29 19:45:18 UTC (rev 14238)
@@ -130,6 +130,7 @@
 Volker Englisch <Volker at englisch.us> QA and testing
 Jonathan Ernst <jonathan at ernstfamily.ch> Translations
 Stephen Evanchik <evanchsa at clarkson.edu> Logging improvements; gtk2 conversions
+Joshua Facemyer / Impressus Art <faceman at impressusart.com>: New artwork.
 Paul Fenwick <pjf at schools.net.au> ASX support, Finance::Quote
 Hubert Figuiere <hfiguiere at teaser.fr> patch to gnc-prices
 Valek Filippov <frob at df.ru> messages Russian translation

Modified: gnucash/branches/register-rewrite/ChangeLog
===================================================================
--- gnucash/branches/register-rewrite/ChangeLog	2006-05-29 19:24:38 UTC (rev 14237)
+++ gnucash/branches/register-rewrite/ChangeLog	2006-05-29 19:45:18 UTC (rev 14238)
@@ -1,3 +1,70 @@
+2006-05-29  Joshua Sled  <jsled at asynchronous.org>
+
+	* packaging/gnucash-1.9.x.ebuild: Remove support for being a
+	dual-nature -release and -svn ebuild.  Misc cleanups.
+
+2006-05-29  Andreas KÃ¶hler  <andi5.py at gmx.net>
+
+	* src/backend/file/io-gncxml-v2.c: Add wait_for_gzip to avoid
+	  reading from a file that is still being written to by a child
+	  process, a race condition at the end of the xml import druid.
+
+2006-05-28  David Hampton  <hampton at employees.org>
+
+	* src/pixmaps/gnucash_splash.png: New splash screen from Joshua
+	Facemyer / Impressus Art <faceman at impressusart.com>.
+
+	* po/en_GB.po: Updated translation from Nigel Titley.
+
+	* src/backend/file/io-gncxml-v2.c: Fix gcc4 complaint about unused
+	return value of the write function.
+
+2006-05-28  Andreas KÃ¶hler  <andi5.py at gmx.net>
+
+	* src/backend/file/gnc-backend-file.c:
+	* src/backend/file/io-gncxml-v2.c: Move is_gzipped_file to
+	  io-gncxml-v2.c. Extend try_gz_open to read from gzipped files.
+	  Let gnc_xml2_find_ambiguous and parse_with_subst_push_handler
+	  read gzipped files.
+
+	* src/backend/file/sixtp.c:
+	* src/backend/file/sixtp.h: Add gnc_is_our_first_xml_chunk.
+
+	* src/backend/file/io-gncxml-v2.h:
+	* src/gnome-utils/druid-gnc-xml-import.c: Remove "error" from
+	  argument list of gnc_xml2_find_ambiguous.
+
+2006-05-27  Joshua Sled  <jsled at asynchronous.org>
+
+	* packaging/gnucash-1.9.x.ebuild: Add docs extraction, un-slot,
+	un-/opt-ize.
+
+2006-05-27  Andreas KÃ¶hler  <andi5.py at gmx.net>
+
+	* src/gnome-utils/druid-gnc-xml-import.c: When the user chooses
+	  another default encoding, do not recheck the file for ambiguous
+	  words, but rather just resort what has been found before.
+
+2006-05-26  Derek Atkins  <derek at ihtfp.com>
+
+	* src/engine/gnc-engine.c: load the qsf backend from the right place.
+
+	* src/engine/gnc-engine.c:
+	  force-exit gnucash if a required library can't be loaded.
+
+	* src/engine/gnc-engine.c:
+	* lib/libqof/qof/qofsession.c:
+	  QOF should load its own backend libraries.
+	  It shouldn't depend on apps to load QOF libraries.
+	  Make sure app-defined backends are used first.
+	  Fix a memory leak in qofsession.
+
+2006-05-26   Christian Stimming <stimming at tuhh.de>
+
+	* src/import-export/hbci/druid-hbci-initial.c: Simplify calling
+	the aqhbci setup wizard for aqbanking>=1.9.1 because we don't need
+	to select an aqbanking backend beforehand.
+
 2006-05-25  Chris Shoemaker <chris.shoemaker at cox.net>
 
 	* configure.in: REactivate --enable-sql by reverting part of r14175 

Modified: gnucash/branches/register-rewrite/Makefile.TAGS
===================================================================
--- gnucash/branches/register-rewrite/Makefile.TAGS	2006-05-29 19:24:38 UTC (rev 14237)
+++ gnucash/branches/register-rewrite/Makefile.TAGS	2006-05-29 19:45:18 UTC (rev 14238)
@@ -17,9 +17,9 @@
 # we don't need an etags.files dep here b/c you always call this after
 # re-generating etags.files if needed from the top-level Makefile.am.
 TAGS: $(shell cat etags.files)
-	rm TAGS
+	if [ -f TAGS ]; then rm TAGS; fi
 	cat etags.files | xargs -n 200 etags --append
 
 tags: $(shell cat etags.files)
-	rm tags
+	if [ -f TAGS ]; then rm tags; fi
 	cat etags.files | xargs -n 200 ctags --append

Modified: gnucash/branches/register-rewrite/Makefile.am
===================================================================
--- gnucash/branches/register-rewrite/Makefile.am	2006-05-29 19:24:38 UTC (rev 14237)
+++ gnucash/branches/register-rewrite/Makefile.am	2006-05-29 19:45:18 UTC (rev 14238)
@@ -156,7 +156,6 @@
   find -type f -exec sh -c 'test -f ${srcdir}/{} || echo {}' ';'
 
 dist-hook: po/POTFILES.in
-	rm -f $(distdir)/po/*.gmo
 
 distcheck-hook:
 	@e=''; \

Modified: gnucash/branches/register-rewrite/lib/libqof/backend/file/Makefile.am
===================================================================
--- gnucash/branches/register-rewrite/lib/libqof/backend/file/Makefile.am	2006-05-29 19:24:38 UTC (rev 14237)
+++ gnucash/branches/register-rewrite/lib/libqof/backend/file/Makefile.am	2006-05-29 19:45:18 UTC (rev 14238)
@@ -14,7 +14,7 @@
   qsf-xml-map.c \
   qsf-xml.c
 
-libgncqof_backend_qsf_la_LDFLAGS = -module
+libgncqof_backend_qsf_la_LDFLAGS = -module -avoid-version
 libgncqof_backend_qsf_la_LIBADD = \
  ${QOF_LIBS} \
  ${GLIB_LIBS} \

Modified: gnucash/branches/register-rewrite/lib/libqof/qof/qofsession.c
===================================================================
--- gnucash/branches/register-rewrite/lib/libqof/qof/qofsession.c	2006-05-29 19:24:38 UTC (rev 14237)
+++ gnucash/branches/register-rewrite/lib/libqof/qof/qofsession.c	2006-05-29 19:45:18 UTC (rev 14238)
@@ -52,13 +52,14 @@
 static GHookList * session_closed_hooks = NULL;
 static QofLogModule log_module = QOF_MOD_SESSION;
 static GSList *provider_list = NULL;
+static gboolean qof_providers_initialized = FALSE;
 
 /* ====================================================================== */
 
 void
 qof_backend_register_provider (QofBackendProvider *prov)
 {
-	provider_list = g_slist_prepend (provider_list, prov);
+	provider_list = g_slist_append (provider_list, prov);
 }
 
 /* ====================================================================== */
@@ -846,7 +847,7 @@
 };
 
 /* All available QOF backends need to be described here
-and the last entry must be three NULL's.
+and the last entry must be two NULL's.
 Remember: Use the libdir from the current build environment
 and use JUST the module name without .so - .so is not portable! */
 struct backend_providers backend_list[] = {
@@ -869,9 +870,10 @@
 	gboolean prov_type;
 	gboolean (*type_check) (const char*);
 	
-	ENTER (" list=%d", g_slist_length(provider_list));
+	ENTER (" list=%d, initted=%s", g_slist_length(provider_list),
+	       qof_providers_initialized ? "true" : "false");
 	prov_type = FALSE;
-	if (NULL == provider_list)
+	if (!qof_providers_initialized)
 	{
 		for (num = 0; backend_list[num].filename != NULL; num++) {
 			if(!qof_load_backend_library(backend_list[num].libdir,
@@ -881,8 +883,9 @@
 				backend_list[num].filename, backend_list[num].libdir);
 			}
 		}
+		qof_providers_initialized = TRUE;
 	}
-	p = g_slist_copy(provider_list);
+	p = provider_list;
 	while(p != NULL)
 	{
 		prov = p->data;
@@ -1204,14 +1207,15 @@
 	if(change_backend == TRUE)
 	{
 		qof_session_destroy_backend(session);
-		if (NULL == provider_list)
+		if (!qof_providers_initialized)
 		{
 			for (num = 0; backend_list[num].filename != NULL; num++) {
 				qof_load_backend_library(backend_list[num].libdir,
 					backend_list[num].filename);
 			}
+			qof_providers_initialized = TRUE;
 		}
-		p = g_slist_copy(provider_list);
+		p = provider_list;
 		while(p != NULL)
 		{
 			prov = p->data;

Modified: gnucash/branches/register-rewrite/packaging/gnucash-1.9.x.ebuild
===================================================================
--- gnucash/branches/register-rewrite/packaging/gnucash-1.9.x.ebuild	2006-05-29 19:24:38 UTC (rev 14237)
+++ gnucash/branches/register-rewrite/packaging/gnucash-1.9.x.ebuild	2006-05-29 19:45:18 UTC (rev 14238)
@@ -1,31 +1,27 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header$
 
 # This script should work fine for the whole 1.9.x (and hopefully 2.0.x)
 # releases with a simple rename. See
 # http://bugs.gentoo.org/show_bug.cgi?id=122337 for discussion and history
 # about this file.  
 
-# As well, it'll work for as an SVN ebuild; drop it into
-# ${PORTAGE_OVERLAY}/app-office/gnucash-svn/gnucash-svn-20060306.ebuild.
-# It'll install into /opt/gnucash-svn-20060306/.
-
 # -- jsled-gentoo at asynchronous.org
 
 inherit eutils gnome2 
 
+DOC_VER="1.8.5"
+
 DESCRIPTION="A personal finance manager (unstable version)."
 HOMEPAGE="http://www.gnucash.org/"
-SRC_URI=""
-if [[ "${PN}" != *-svn ]]; then
-	SRC_URI="mirror://sourceforge/gnucash/${P}.tar.gz"
-fi
+SRC_URI="mirror://sourceforge/gnucash/${P}.tar.gz
+         mirror://sourceforge/gnucash/gnucash-docs-${DOC_VER}.tar.gz"
 LICENSE="GPL-2"
-SLOT="1"
+SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="postgres ofx hbci chipcard doc debug quotes"
-# mt940 qof
+# mt940
 
 RDEPEND=">=dev-libs/glib-2.4.0
 	>=dev-util/guile-1.6
@@ -52,17 +48,10 @@
 	quotes? ( dev-perl/DateManip
 		dev-perl/Finance-Quote
 		dev-perl/HTML-TableExtract )
-	postgres? ( dev-db/postgresql )"
+	postgres? ( dev-db/postgresql )
+	app-text/docbook-xsl-stylesheets
+	=app-text/docbook-xml-dtd-4.1.2*"
 
-# See http://bugs.gentoo.org/show_bug.cgi?id=118517
-#	qof? ( >=qof-0.6.1 )
-# or... same pattern as above?
-
-# I [jsled-gentoo at asynchronous.org] don't think these are used by gnucash;
-# maybe -docs...
-#	app-text/docbook-xsl-stylesheets
-#	=app-text/docbook-xml-dtd-4.1.2
-
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	nls? ( sys-devel/gettext )"
@@ -72,30 +61,9 @@
 	built_with_use goffice gnome || die "goffice must be built with gnome"
 }
 
-src_unpack() {
-	if [[ "${PN}" == *-svn ]]; then
-		svn co http://svn.gnucash.org/repo/gnucash/trunk ${P}
-		cd ${S}
-		./autogen.sh || die "Cannot autogen."
-	else
-		unpack ${A}
-		cd ${S}
-	fi
-}
-
 src_compile() {
 	local myconf_warnings="--enable-error-on-warning --enable-compile-warnings"
-
-	# We'd like to only define --prefix, but the econf definition seems
-	# to check, but then promptly forget, that we've redefined it. :p
-	# Thus, set {man,info,data,sysconf,localstate}dir too.
 	econf \
-		--prefix /opt/${P} \
-		--mandir=/opt/${P}/man \
-		--infodir=/opt/${P}/info \
-		--datadir=/opt/${P}/share \
-		--sysconfdir=/opt/${P}/etc \
-		--localstatedir=/opt/${P}/var/lib \
 		$(use_enable debug) \
 		$(use_enable postgres sql) \
 		$(use_enable ofx) \
@@ -104,56 +72,23 @@
 		${myconf_warnings} \
 			|| die "econf failed"
 	emake -j1 || die "emake failed"
-}
 
-# copied+mods from gnome2.eclass:
-gnome2_gconf_install() {
-	if [[ -x ${GCONFTOOL_BIN} ]]; then
-		# We are ready to install the GCONF Scheme now
-		unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
-		export GCONF_CONFIG_SOURCE=$(${GCONFTOOL_BIN} --get-default-source)
-
-		einfo "Installing GNOME 2 GConf schemas"
-
-		local contents="${ROOT}/var/db/pkg/*/${PN}-${PVR}/CONTENTS"
-
-		for F in $(grep "obj /opt/${P}/etc/gconf/schemas" ${contents} | sed 's:obj \([^ ]*\) .*:\1:' ); do
-			if [[ -e "${F}" ]]; then
-				# echo "DEBUG::gconf install  ${F}"
-				${GCONFTOOL_BIN} --makefile-install-rule ${F} 1>/dev/null
-			fi
-		done
-
-		for user in `ps axuwwf | grep "gconfd-2" |grep -v "grep" | awk '{ print $1 }' | uniq`; do
-			einfo "shutting down gconfd-2 for user ${user} to sync gnucash schemas"
-			echo su ${user} -c "${GCONFTOOL_BIN} --shutdown"
-			${ROOT}/bin/su - ${user} -c "${GCONFTOOL_BIN} --shutdown"
-		done
-	fi
+    cd ${WORKDIR}/gnucash-docs-${DOC_VER}
+    econf || die "doc econf failed"
+    emake || die "doc emake failed"
 }
 
-# copied+mods from gnome2.eclass:
-gnome2_gconf_uninstall() {
-	if [[ -x ${GCONFTOOL_BIN} ]]; then
-		unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
-		export GCONF_CONFIG_SOURCE=$(${GCONFTOOL_BIN} --get-default-source)
+# See http://bugs.gentoo.org/show_bug.cgi?id=132862 regarding gconf schema install
 
-		einfo "Uninstalling GNOME 2 GConf schemas"
-
-		local contents="${ROOT}/var/db/pkg/*/${PN}-${PVR}/CONTENTS"
-
-		for F in $(grep "obj /opt/${P}/etc/gconf/schemas" ${contents} | sed 's:obj \([^ ]*\) .*:\1:' ); do
-			# echo "DEBUG::gconf install  ${F}"
-			${GCONFTOOL_BIN} --makefile-uninstall-rule ${F} 1>/dev/null
-		done
-	fi
-}
-
 src_install() {
 	gnome2_src_install || die "gnome2_src_install failed"
 	dodoc AUTHORS ChangeLog* DOCUMENTERS HACKING INSTALL LICENSE NEWS TODO README* doc/README*
-	dodir /usr/bin
-	dosym /opt/${P}/bin/gnucash /usr/bin/${P}
 	make_desktop_entry ${P} "GnuCash ${PV}" \
-		/opt/${P}/share/gnucash/pixmaps/appicon.png "Office;Finance"
+		/usr/share/${PN}/pixmaps/appicon.png "Office;Finance"
+
+	cd ${WORKDIR}/${PN}-docs-${DOC_VER}
+	make DESTDIR=${D} \
+		scrollkeeper_localstate_dir=${D}/var/lib/scrollkeeper \
+		install || die "doc install failed"
+	rm -rf ${D}/var/lib/scrollkeeper
 }

Modified: gnucash/branches/register-rewrite/po/en_GB.po
===================================================================
--- gnucash/branches/register-rewrite/po/en_GB.po	2006-05-29 19:24:38 UTC (rev 14237)
+++ gnucash/branches/register-rewrite/po/en_GB.po	2006-05-29 19:45:18 UTC (rev 14238)
@@ -1,20 +1,22 @@
+# translation of en_GB.po to English (British)
 # Messages for Gnucash in British English
 # Copyright (C) 2002, 2003, 2004, 2006 Free Software Foundation, Inc.
-#
 # Nigel Titley <nigel at titley.com>, 2002, 2003, 2004, 2006.
 # Neil Williams <linux at codehelp.co.uk>, 2006.
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: gnucash 1.9.5\n"
+"Project-Id-Version: en_GB\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2006-04-16 17:51-0600\n"
-"PO-Revision-Date: 2006-05-05 00:06+0100\n"
+"PO-Revision-Date: 2006-05-28 20:45+0100\n"
 "Last-Translator: Nigel Titley <nigel at titley.com>\n"
 "Language-Team: English (British) <en_gb at 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-Generator: KBabel 1.10.2\n"
 
 #: ../src/app-utils/gnc-exp-parser.c:139
 msgid " Variables are in the form 'name=value'"
@@ -530,11 +532,11 @@
 
 #: ../src/business/business-gnome/dialog-choose-owner.c:72
 msgid "This transaction needs to be assigned to a Customer.  Please choose the Customer below."
-msgstr ""
+msgstr "This transaction needs to be assigned to a Customer.  Please choose the Customer below."
 
 #: ../src/business/business-gnome/dialog-choose-owner.c:77
 msgid "This transaction needs to be assigned to a Vendor.  Please choose the Vendor below."
-msgstr ""
+msgstr "This transaction needs to be assigned to a Vendor.  Please choose the Vendor below."
 
 #: ../src/business/business-gnome/dialog-customer.c:268
 msgid "You must enter a company name. If this customer is an individual (and not a company) you should set the \"company name\" and \"contact name\" the same."
@@ -1419,9 +1421,8 @@
 msgstr "_Tax Included"
 
 #: ../src/business/business-gnome/glade/choose-owner.glade.h:1
-#, fuzzy
 msgid "Choose Owner Dialog"
-msgstr "Show the new user dialogue"
+msgstr "Choose Owner Dialogue"
 
 #. src/report/standard-reports/general-ledger.scm
 #. src/report/standard-reports/register.scm
@@ -3876,10 +3877,17 @@
 "\n"
 "The page is not overly complicated, just take the time until you feel comfortable with it. You can always come back and read this message again."
 msgstr ""
+"The file you tried to load does not specify an encoding, so GnuCash is unable to unambiguously interpret it. This is typical for files created with GnuCash prior to 2.0.\n"
+"\n"
+"On the next page you will be asked to select the best looking decoded string for every ambiguous word GnuCash found while trying to open your file. Therefore GnuCash has guessed what encodings you might have used. So probably everything will look just fine and you can simply click 'Forward'.\n"
+"\n"
+"If it does not work for you, try to change the default encoding at the top. Maybe you even have to edit the list of encodings by clicking on the button in the top right corner.\n"
+"\n"
+"The page is not overly complicated, just take the time until you feel comfortable with it. You can always come back and read this message again."
 
 #: ../src/gnome-utils/druid-gnc-xml-import.c:202
 msgid "Missing file encoding"
-msgstr ""
+msgstr "Missing file encoding"
 
 #: ../src/gnome-utils/druid-gnc-xml-import.c:205
 msgid ""
@@ -3887,102 +3895,102 @@
 "\n"
 "You can also go back and verify your selections by clicking on 'Back'."
 msgstr ""
+"The file has been loaded successfully. If you click 'Apply' it will be saved and reloaded into the main application. That way you will have a working file as backup in the same directory.\n"
+"\n"
+"You can also go back and verify your selections by clicking on 'Back'."
 
 #: ../src/gnome-utils/druid-gnc-xml-import.c:227
-#, fuzzy
 msgid "Unicode"
-msgstr "Income"
+msgstr "Unicode"
 
 #: ../src/gnome-utils/druid-gnc-xml-import.c:229
-#, fuzzy
 msgid "European"
-msgstr "_Europe:"
+msgstr "European"
 
 #: ../src/gnome-utils/druid-gnc-xml-import.c:230
 msgid "ISO-8859-1 (West European)"
-msgstr ""
+msgstr "ISO-8859-1 (West European)"
 
 #: ../src/gnome-utils/druid-gnc-xml-import.c:231
 msgid "ISO-8859-2 (East European)"
-msgstr ""
+msgstr "ISO-8859-2 (East European)"
 
 #: ../src/gnome-utils/druid-gnc-xml-import.c:232
 msgid "ISO-8859-3 (South European)"
-msgstr ""
+msgstr "ISO-8859-3 (South European)"
 
 #: ../src/gnome-utils/druid-gnc-xml-import.c:233
 msgid "ISO-8859-4 (North European)"
-msgstr ""
+msgstr "ISO-8859-4 (North European)"
 
 #: ../src/gnome-utils/druid-gnc-xml-import.c:234
 msgid "ISO-8859-5 (Cyrillic)"
-msgstr ""
+msgstr "ISO-8859-5 (Cyrillic)"
 
 #: ../src/gnome-utils/druid-gnc-xml-import.c:235
 msgid "ISO-8859-6 (Arabic)"
-msgstr ""
+msgstr "ISO-8859-6 (Arabic)"
 
 #: ../src/gnome-utils/druid-gnc-xml-import.c:236
 msgid "ISO-8859-7 (Greek)"
-msgstr ""
+msgstr "ISO-8859-7 (Greek)"
 
 #: ../src/gnome-utils/druid-gnc-xml-import.c:237
 msgid "ISO-8859-8 (Hebrew)"
-msgstr ""
+msgstr "ISO-8859-8 (Hebrew)"
 
 #: ../src/gnome-utils/druid-gnc-xml-import.c:238
 msgid "ISO-8859-9 (Turkish)"
-msgstr ""
+msgstr "ISO-8859-9 (Turkish)"
 
 #: ../src/gnome-utils/druid-gnc-xml-import.c:239
 msgid "ISO-8859-10 (Nordic)"
-msgstr ""
+msgstr "ISO-8859-10 (Nordic)"
 
 #: ../src/gnome-utils/druid-gnc-xml-import.c:240
 msgid "ISO-8859-11 (Thai)"
-msgstr ""
+msgstr "ISO-8859-11 (Thai)"
 
 #: ../src/gnome-utils/druid-gnc-xml-import.c:241
 msgid "ISO-8859-13 (Baltic)"
-msgstr ""
+msgstr "ISO-8859-13 (Baltic)"
 
 #: ../src/gnome-utils/druid-gnc-xml-import.c:242
 msgid "ISO-8859-14 (Celtic)"
-msgstr ""
+msgstr "ISO-8859-14 (Celtic)"
 
 #: ../src/gnome-utils/druid-gnc-xml-import.c:243
 msgid "ISO-8859-15 (West European, Euro sign)"
-msgstr ""
+msgstr "ISO-8859-15 (West European, Euro sign)"
 
 #: ../src/gnome-utils/druid-gnc-xml-import.c:244
 msgid "ISO-8859-16 (South-East European)"
-msgstr ""
+msgstr "ISO-8859-16 (South-East European)"
 
 #: ../src/gnome-utils/druid-gnc-xml-import.c:245
 msgid "Cyrillic"
-msgstr ""
+msgstr "Cyrillic"
 
 #: ../src/gnome-utils/druid-gnc-xml-import.c:246
 msgid "KOI8-R (Russian)"
-msgstr ""
+msgstr "KOI8-R (Russian)"
 
 #: ../src/gnome-utils/druid-gnc-xml-import.c:247
 msgid "KOI8-U (Ukrainian)"
-msgstr ""
+msgstr "KOI8-U (Ukrainian)"
 
 #. Translators: Please insert encodings here that are typically used in your
 #. * locale, separated by spaces. No need for ASCII or UTF-8, check `locale -m`
 #. * for assistance with spelling.
 #: ../src/gnome-utils/druid-gnc-xml-import.c:597
 msgid "ISO-8859-1 KOI8-U"
-msgstr ""
+msgstr "ISO-8859-1 KOI8-U"
 
 #. another error, cannot handle this here
 #: ../src/gnome-utils/druid-gnc-xml-import.c:712
 #: ../src/gnome-utils/druid-gnc-xml-import.c:731
-#, fuzzy
 msgid "The file could not be reopen."
-msgstr "The file %s could not be found."
+msgstr "The file could not be reopened."
 
 #. try to load once again
 #: ../src/gnome-utils/druid-gnc-xml-import.c:719
@@ -3991,14 +3999,12 @@
 msgstr "Reading file..."
 
 #: ../src/gnome-utils/druid-gnc-xml-import.c:739
-#, fuzzy
 msgid "Parsing file..."
-msgstr "Reading file..."
+msgstr "Parsing file..."
 
 #: ../src/gnome-utils/druid-gnc-xml-import.c:746
-#, fuzzy
 msgid "There was an error parsing the file."
-msgstr "There was an error parsing the file %s."
+msgstr "There was an error parsing the file."
 
 #: ../src/gnome-utils/druid-gnc-xml-import.c:769
 #: ../src/gnome-utils/gnc-file.c:963
@@ -4008,35 +4014,33 @@
 #: ../src/gnome-utils/druid-gnc-xml-import.c:847
 #, c-format
 msgid "There are %d unassigned and %d undecodable words. Please add encodings."
-msgstr ""
+msgstr "There are %d unassigned and %d undecodable words. Please add encodings."
 
 #: ../src/gnome-utils/druid-gnc-xml-import.c:853
 #, c-format
 msgid "There are %d unassigned words. Please decide on them or add encodings."
-msgstr ""
+msgstr "There are %d unassigned words. Please decide on them or add encodings."
 
 #: ../src/gnome-utils/druid-gnc-xml-import.c:861
 #, c-format
 msgid "There are %d undecodable words. Please add encodings."
-msgstr ""
+msgstr "There are %d undecodable words. Please add encodings."
 
 #: ../src/gnome-utils/druid-gnc-xml-import.c:1049
-#, fuzzy
 msgid "That GnuCash XML file is already loaded. Please select another file."
-msgstr "That QIF file is already loaded. Please select another file."
+msgstr "That GnuCash XML file is already loaded. Please select another file."
 
 #: ../src/gnome-utils/druid-gnc-xml-import.c:1347
 msgid "This encoding has been added to the list already."
-msgstr ""
+msgstr "This encoding has been added to the list already."
 
 #: ../src/gnome-utils/druid-gnc-xml-import.c:1357
-#, fuzzy
 msgid "This is an invalid encoding."
-msgstr "This is a list option"
+msgstr "This is an invalid encoding."
 
 #: ../src/gnome-utils/druid-gnc-xml-import.c:1492
 msgid "No files to merge. Please add ones by clicking on 'Load another file'."
-msgstr ""
+msgstr "No files to merge. Please add ones by clicking on 'Load another file'."
 
 #: ../src/gnome-utils/glade/commodity.glade.h:1
 msgid "1 /"
@@ -4282,68 +4286,58 @@
 msgstr "_You update the search path yourself"
 
 #: ../src/gnome-utils/glade/druid-gnc-xml-import.glade.h:1
-#, fuzzy
 msgid "<b>S_ystem input encodings</b>"
-msgstr "<b>Compounding:</b>"
+msgstr "<b>S_ystem input encodings</b>"
 
 #: ../src/gnome-utils/glade/druid-gnc-xml-import.glade.h:2
-#, fuzzy
 msgid "<b>_Custom encoding</b>"
-msgstr "<b>Compounding:</b>"
+msgstr "<b>_Custom encoding</b>"
 
 #: ../src/gnome-utils/glade/druid-gnc-xml-import.glade.h:3
-#, fuzzy
 msgid "<b>_Selected encodings</b>"
-msgstr "<b>_Selected Reports</b>"
+msgstr "<b>_Selected encodings</b>"
 
 #: ../src/gnome-utils/glade/druid-gnc-xml-import.glade.h:4
-#, fuzzy
 msgid "Choose a file to import"
-msgstr "Choose a format"
+msgstr "Choose a file to import"
 
 #: ../src/gnome-utils/glade/druid-gnc-xml-import.glade.h:5
-#, fuzzy
 msgid ""
 "Click \"Load another file\" if you have more data to import at this time. Do this if you have saved your accounts to separate GnuCash files.\n"
 "\n"
 "Click \"Forward\" to finish loading files and move to the next step of the GnuCash XML import process."
 msgstr ""
-"Click \"Load another file\" if you have more data to import at this time. Do this if you have saved your accounts to separate QIF files.\n"
+"Click \"Load another file\" if you have more data to import at this time. Do this if you have saved your accounts to separate GnuCash files.\n"
 "\n"
-"Click \"Forward\" to finish loading files and move to the next step of the QIF import process. "
+"Click \"Forward\" to finish loading files and move to the next step of the GnuCash XML import process."
 
 #: ../src/gnome-utils/glade/druid-gnc-xml-import.glade.h:8
-#, fuzzy
 msgid "Convert the file"
-msgstr "Compress the data file"
+msgstr "Convert the file"
 
 #: ../src/gnome-utils/glade/druid-gnc-xml-import.glade.h:9
-#, fuzzy
 msgid "Default encoding:"
-msgstr "Default Rate: "
+msgstr "Default encoding:"
 
 #: ../src/gnome-utils/glade/druid-gnc-xml-import.glade.h:10
-#, fuzzy
 msgid "Do not merge"
-msgstr "Do not sort"
+msgstr "Do not merge"
 
 #: ../src/gnome-utils/glade/druid-gnc-xml-import.glade.h:11
-#, fuzzy
 msgid "Edit the list of encodings"
-msgstr "View and edit the list of Billing Terms"
+msgstr "Edit the list of encodings"
 
 #: ../src/gnome-utils/glade/druid-gnc-xml-import.glade.h:12
 msgid "Finish GnuCash XML Import"
-msgstr ""
+msgstr "Finish GnuCash XML Import"
 
 #: ../src/gnome-utils/glade/druid-gnc-xml-import.glade.h:13
 msgid "GnuCash XML Import Druid"
-msgstr ""
+msgstr "GnuCash XML Import Druid"
 
 #: ../src/gnome-utils/glade/druid-gnc-xml-import.glade.h:14
-#, fuzzy
 msgid "GnuCash XML files you have loaded"
-msgstr "QIF files you have loaded"
+msgstr "GnuCash XML files you have loaded"
 
 #: ../src/gnome-utils/glade/druid-gnc-xml-import.glade.h:15
 #: ../src/import-export/qif-import/qif.glade.h:48
@@ -4351,9 +4345,8 @@
 msgstr "Load another file"
 
 #: ../src/gnome-utils/glade/druid-gnc-xml-import.glade.h:16
-#, fuzzy
 msgid "Title placeholder"
-msgstr "Placeholder"
+msgstr "Title placeholder"
 
 #: ../src/gnome-utils/glade/druid-gnc-xml-import.glade.h:17
 #: ../src/import-export/qif-import/qif.glade.h:94
@@ -4362,12 +4355,11 @@
 
 #: ../src/gnome-utils/glade/druid-gnc-xml-import.glade.h:18
 msgid "_Edit list of encodings"
-msgstr ""
+msgstr "_Edit list of encodings"
 
 #: ../src/gnome-utils/glade/druid-gnc-xml-import.glade.h:19
-#, fuzzy
 msgid "placeholder"
-msgstr "Placeholder"
+msgstr "placeholder"
 
 #: ../src/gnome-utils/glade/druid-provider-multifile.glade.h:1
 msgid "<b>Current File List</b>"
@@ -18341,3 +18333,4 @@
 #: ../doc/tip_of_the_day.list.in:82
 msgid "There is a theory that if ever anyone discovers what the Universe is for and why it is here, it will instantly disappear and be replaced with something even more bizarre and inexplicable. There is another theory that this has already happened. Douglas Adams, \"The Restaurant at the End of the Universe\""
 msgstr "There is a theory that if ever anyone discovers what the Universe is for and why it is here, it will instantly disappear and be replaced with something even more bizarre and inexplicable. There is another theory that this has already happened. Douglas Adams, \"The Restaurant at the End of the Universe\""
+

Modified: gnucash/branches/register-rewrite/po/es.po
===================================================================
--- gnucash/branches/register-rewrite/po/es.po	2006-05-29 19:24:38 UTC (rev 14237)
+++ gnucash/branches/register-rewrite/po/es.po	2006-05-29 19:45:18 UTC (rev 14238)
@@ -10,7 +10,7 @@
 "Project-Id-Version: gnucash-1.9.6\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2006-04-16 17:51-0600\n"
-"PO-Revision-Date: 2006-05-23 23:51+0200\n"
+"PO-Revision-Date: 2006-05-25 23:01+0200\n"
 "Last-Translator: Eneko Lacunza <enlar at enlar.net>\n"
 "Language-Team: spanish <es at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -1759,7 +1759,7 @@
 
 #: ../src/business/business-gnome/glade/invoice.glade.h:4
 msgid "Additional to Card:"
-msgstr ""
+msgstr "Adicional a la tarjeta:"
 
 #: ../src/business/business-gnome/glade/invoice.glade.h:8
 msgid "Customer: "
@@ -3277,18 +3277,18 @@
 
 #: ../src/engine/cap-gains.c:226
 msgid "Orphaned Gains"
-msgstr ""
+msgstr "Ganancias huérfanas"
 
 #: ../src/engine/cap-gains.c:240 ../src/engine/cap-gains.c:912
 #: ../src/engine/cap-gains.c:917 ../src/engine/cap-gains.c:918
 msgid "Realized Gain/Loss"
-msgstr ""
+msgstr "Ganancias/pérdidas ocurridas"
 
 #: ../src/engine/cap-gains.c:242
 msgid ""
 "Realized Gains or Losses from Commodity or Trading Accounts that haven't "
 "been recorded elsewhere."
-msgstr ""
+msgstr "Ganancias o pérdidas ocurridas por cuentas de valores o comercio que no se han anotado en ninguna otra parte."
 
 #: ../src/engine/cap-gains.c:570
 msgid "Lot"
@@ -4891,7 +4891,7 @@
 
 #: ../src/gnome-utils/glade/preferences.glade.h:21
 msgid "<b>Reverse Balanced Accounts</b>"
-msgstr "<b>Tipos de cuenta de balanceo inverso</b>"
+msgstr "<b>Tipos de cuenta de saldo inverso</b>"
 
 #: ../src/gnome-utils/glade/preferences.glade.h:22
 msgid "<b>Search Dialog</b>"
@@ -5309,14 +5309,14 @@
 
 #: ../src/gnome-utils/glade/preferences.glade.h:97
 msgid "Sign reverse balances on income and expense accounts."
-msgstr "Invertir el signo del balance en cuentas de ingresos y gastos."
+msgstr "Invertir el signo del saldo en cuentas de ingresos y gastos."
 
 #: ../src/gnome-utils/glade/preferences.glade.h:98
 msgid ""
 "Sign reverse balances on the following: Credit Card, Payable, Liability, "
 "Equity, and Income."
 msgstr ""
-"Invertir el signo del balance de las siguientes: Tarjeta de Crédito, Pagos "
+"Invertir el signo del saldo de las siguientes: Tarjeta de Crédito, Pagos "
 "ptes., Pasivo, Patrimonio e Ingresos."
 
 #: ../src/gnome-utils/glade/preferences.glade.h:99
@@ -6651,7 +6651,7 @@
 
 #: ../src/gnome-utils/gnc-tree-view-account.c:565
 msgid "Balance (Report)"
-msgstr "Balance (informe)"
+msgstr "Saldos (informe)"
 
 #: ../src/gnome-utils/gnc-tree-view-account.c:572
 msgid "Balance (Period)"
@@ -7784,7 +7784,7 @@
 
 #: ../src/gnome/glade/account.glade.h:67
 msgid "Ta_x related"
-msgstr ""
+msgstr "Relacionado con _impuestos"
 
 #: ../src/gnome/glade/account.glade.h:68
 msgid "This account contains read-only transactions which may not be deleted."
@@ -8284,7 +8284,7 @@
 
 #: ../src/gnome/glade/lots.glade.h:2
 msgid "<b>_Lots in This Account</b>"
-msgstr ""
+msgstr "<b>_Paquetes en esta cuenta</b>"
 
 #: ../src/gnome/glade/lots.glade.h:3
 msgid "<b>_Mini-Viewer</b>"
@@ -8300,23 +8300,23 @@
 
 #: ../src/gnome/glade/lots.glade.h:6
 msgid "A list of all of the lots in this account."
-msgstr ""
+msgstr "La lista de todos los paquetes en esta cuenta."
 
 #: ../src/gnome/glade/lots.glade.h:7
 msgid "A summary of all of the transactions in the selected lot"
-msgstr ""
+msgstr "Resumen de todos los asientos en el paquete seleccionado"
 
 #: ../src/gnome/glade/lots.glade.h:12
 msgid "Delete the highlighted lot"
-msgstr ""
+msgstr "Borrar el paquete seleccionado"
 
 #: ../src/gnome/glade/lots.glade.h:14
 msgid "Enter a name for the highlighted lot."
-msgstr ""
+msgstr "Introduzca un nombre para el paquete seleccionado."
 
 #: ../src/gnome/glade/lots.glade.h:15
 msgid "Enter any notes you want to make about this lot."
-msgstr ""
+msgstr "Introduzca notas sobre este paquete."
 
 #. src/report/standard-reports/average-balance.scm
 #: ../src/gnome/glade/lots.glade.h:16 ../intl-scm/guile-strings.c:2168
@@ -8329,11 +8329,11 @@
 
 #: ../src/gnome/glade/lots.glade.h:18
 msgid "Lot Viewer"
-msgstr ""
+msgstr "Visor de paquetes"
 
 #: ../src/gnome/glade/lots.glade.h:20
 msgid "Open a register showing the transactions in this lot"
-msgstr ""
+msgstr "Abrir una ventana de registro mostrando los asientos en este paquete"
 
 #: ../src/gnome/glade/lots.glade.h:22
 msgid "Scrub _Account"
@@ -8341,7 +8341,7 @@
 
 #: ../src/gnome/glade/lots.glade.h:23
 msgid "Scrub the highlighted lot"
-msgstr ""
+msgstr "Cuadrar el paquete seleccionado"
 
 #. src/report/standard-reports/register.scm
 #. src/report/standard-reports/general-journal.scm
@@ -8528,6 +8528,11 @@
 "Net Asset Value\n"
 "Unknown"
 msgstr ""
+"Comprador\n"
+"Vendedor\n"
+"Última\n"
+"Valor neto del activo\n"
+"Desconocido"
 
 #: ../src/gnome/glade/price.glade.h:8
 msgid "Delete _last price for a stock"
@@ -9707,7 +9712,7 @@
 
 #: ../src/gnome/glade/sched-xact.glade.h:152
 msgid "Repayment Type"
-msgstr ""
+msgstr "Tipo de amortización"
 
 #: ../src/gnome/glade/sched-xact.glade.h:153
 msgid "Repeats:"
@@ -10077,9 +10082,8 @@
 msgstr "Información de Impuestos"
 
 #: ../src/gnome/glade/tax.glade.h:9
-#, fuzzy
 msgid "Tax _Related"
-msgstr "Imponible"
+msgstr "_Relacionado con impuestos"
 
 #: ../src/gnome/glade/tax.glade.h:10
 msgid "_Expense"
@@ -10373,12 +10377,12 @@
 
 #: ../src/gnome/gnc-plugin-page-account-tree.c:183
 msgid "View _Lots..."
-msgstr ""
+msgstr "Ver _paquetes..."
 
 #: ../src/gnome/gnc-plugin-page-account-tree.c:184
 #: ../src/gnome/gnc-plugin-page-register.c:238
 msgid "Bring up the lot viewer/editor window"
-msgstr ""
+msgstr "Mostrar el visor/editor de paquetes"
 
 #: ../src/gnome/gnc-plugin-page-account-tree.c:186
 msgid "Check & Repair A_ccount"
@@ -10577,7 +10581,7 @@
 
 #: ../src/gnome/gnc-plugin-page-register.c:237
 msgid "_Lot Viewer..."
-msgstr ""
+msgstr "Visor de _paquetes..."
 
 #: ../src/gnome/gnc-plugin-page-register.c:240
 msgid "_Blank Transaction"
@@ -10606,16 +10610,16 @@
 #. Reports menu
 #: ../src/gnome/gnc-plugin-page-register.c:261
 msgid "Account Report"
-msgstr "Informe de cuentas"
+msgstr "Informe de la cuenta"
 
 #: ../src/gnome/gnc-plugin-page-register.c:262
 #: ../src/gnome/gnc-plugin-page-register.c:265
 msgid "Open a register report window for this transaction"
-msgstr ""
+msgstr "Abrir una ventana de informe de registro para este asiento"
 
 #: ../src/gnome/gnc-plugin-page-register.c:264
 msgid "Account Transaction Report"
-msgstr ""
+msgstr "Informe de asiento en cuenta"
 
 #. Translators: This is a menu item in the View menu
 #: ../src/gnome/gnc-plugin-page-register.c:290
@@ -10881,7 +10885,7 @@
 #: ../src/gnome/lot-viewer.c:589
 #, c-format
 msgid "Lots in Account %s"
-msgstr ""
+msgstr "Paquetes en la cuenta %s"
 
 #: ../src/gnome/reconcile-list.c:210
 #: ../src/register/ledger-core/split-register-layout.c:555
@@ -11124,7 +11128,7 @@
 
 #: ../src/gnome/schemas/apps_gnucash_dialog_print_checks.schemas.in.h:4
 msgid "Index of predefined check format to use"
-msgstr ""
+msgstr "Índice del formato de cheque predefinido a usar"
 
 #: ../src/gnome/schemas/apps_gnucash_dialog_print_checks.schemas.in.h:5
 msgid ""
@@ -12174,7 +12178,7 @@
 "\"Select Import Action\" allows you to change the matching transaction to "
 "reconcile, or the destination account of the auto-balance split (if "
 "required)."
-msgstr ""
+msgstr "«Seleccionar acción de importación» le permite cambiar el asiento coincidente para conciliarlo, o establecer la cuenta de destino de la anotación para auto-saldarlo (en caso necesario)."
 
 #: ../src/import-export/generic-import.glade.h:4
 msgid "(none)"
@@ -12228,7 +12232,7 @@
 
 #: ../src/import-export/generic-import.glade.h:17
 msgid "Confidence"
-msgstr ""
+msgstr "Confianza"
 
 #: ../src/import-export/generic-import.glade.h:21
 msgid "EDIT"
@@ -12421,12 +12425,12 @@
 
 #: ../src/import-export/generic-import.glade.h:63
 msgid "do not translate"
-msgstr ""
+msgstr "do not translate"
 
 #: ../src/import-export/generic-import.glade.h:64
 #: ../src/import-export/qif-import/qif.glade.h:97
 msgid "gnc-new-account"
-msgstr ""
+msgstr "gnc-new-account"
 
 #. Numeric formats
 #: ../src/import-export/gnc-import-format-gnome.c:91
@@ -12759,7 +12763,6 @@
 msgstr "Nombre para la plantilla nueva"
 
 #: ../src/import-export/hbci/glade/hbci.glade.h:39
-#, fuzzy
 msgid ""
 "Now the setup for all HBCI accounts that are matching to a GnuCash account "
 "is finished. You can now invoke HBCI actions on those accounts.\n"
@@ -12769,14 +12772,11 @@
 "\n"
 "Press \"Apply\" now."
 msgstr ""
-"La configuración de todas las cuentas HBCI que corresponden a cuentas\n"
-"GnuCash ha sido completada. Ahora puede invocar acciones HBCI sobre\n"
-"esas cuentas.\n"
+"La configuración de todas las cuentas HBCI que corresponden a cuentas GnuCash ha sido completada. Ahora puede invocar acciones HBCI sobre esas cuentas.\n"
 "\n"
-"Si quiere añadir otro banco, usuario o cuenta HBCI, puede ejecutar este\n"
-"asistente en cualquier momento.\n"
+"Si quiere añadir otro banco, usuario o cuenta HBCI, puede ejecutar este asistente en cualquier momento.\n"
 "\n"
-"Pulse «Finalizar»"
+"Pulse «Aplicar»."
 
 #: ../src/import-export/hbci/glade/hbci.glade.h:44
 msgid "Online Transaction"
@@ -12825,7 +12825,7 @@
 
 #: ../src/import-export/hbci/glade/hbci.glade.h:54
 msgid "Sort the list of transaction templates alphabetically"
-msgstr ""
+msgstr "Ordenar alfabéticamente la lista de plantillas de asientos"
 
 #: ../src/import-export/hbci/glade/hbci.glade.h:55
 msgid "Start AqHBCI Setup Wizard"
@@ -12846,7 +12846,6 @@
 "botón inferior para iniciar este programa."
 
 #: ../src/import-export/hbci/glade/hbci.glade.h:58
-#, fuzzy
 msgid ""
 "This druid helps you setting up your HBCI connection with your bank.\n"
 "\n"
@@ -12870,7 +12869,7 @@
 msgstr ""
 "Este asistente le ayuda a configurar la conexión HBCI con su banco.\n"
 "\n"
-"Lo primero que necesita es pedir acceso HBCI en su banco. Si su banco\n"
+"Lo primero que necesita es pedir acceso HBCI en su banco. Si su banco "
 "decide darle acceso HBCI, le enviará una carta, conteniendo:\n"
 "\n"
 "* El código de banco de su banco\n"
@@ -12881,13 +12880,9 @@
 "\n"
 "Está información será necesaria para lo siguiente. Pulse «Siguiente» ahora.\n"
 "\n"
-"NOTA: NO HAY GARANTÍAS DE NINGÚN TIPO. Algunos banco están \n"
-"ejecutando un HBCI pobremente implementado. No debería depender de\n"
-"transferencias críticas en el tiempo a través de HBCI, porque a veces el \n"
-"banco no le da la respuesta correcta cuando una transferencia se rechaza.\n"
+"NOTA: NO HAY GARANTÍAS DE NINGÚN TIPO. Algunos banco están ejecutando un HBCI pobremente implementado. No debería depender de transferencias críticas en el tiempo a través de HBCI, porque a veces el banco no le da la respuesta correcta cuando una transferencia se rechaza.\n"
 "\n"
-"Pulse «Cancelar» si no quiere configurar ninguna conexión\n"
-"HBCI ahora."
+"Pulse «Cancelar» si no quiere configurar ninguna conexión HBCI ahora."
 
 #: ../src/import-export/hbci/glade/hbci.glade.h:72
 msgid ""
@@ -12906,19 +12901,16 @@
 msgstr "Versión"
 
 #: ../src/import-export/hbci/glade/hbci.glade.h:76
-#, fuzzy
 msgid "_Earliest possible date"
-msgstr "Fecha más temprana posible"
+msgstr "Fecha más _temprana posible"
 
 #: ../src/import-export/hbci/glade/hbci.glade.h:77
-#, fuzzy
 msgid "_Last retrieval date"
-msgstr "Última fecha de obtención"
+msgstr "_Última fecha de obtención"
 
 #: ../src/import-export/hbci/glade/hbci.glade.h:78
-#, fuzzy
 msgid "_Now"
-msgstr "Ahora"
+msgstr "_Ahora"
 
 #: ../src/import-export/hbci/glade/hbci.glade.h:79
 msgid "at Bank"
@@ -12954,26 +12946,23 @@
 
 #: ../src/import-export/hbci/glade/hbciprefs.glade.h:1
 msgid "<b>HBCI</b>"
-msgstr ""
+msgstr "<b>HBCI</b>"
 
 #: ../src/import-export/hbci/glade/hbciprefs.glade.h:2
 msgid "Activate verbose debug messages for HBCI Online Banking."
 msgstr "Activar mensajes de diagnóstico ampliados para la banca online HBCI."
 
 #: ../src/import-export/hbci/glade/hbciprefs.glade.h:4
-#, fuzzy
 msgid "Remember _PIN"
-msgstr "HBCI: Recordar PIN en memoria"
+msgstr "Recordar _PIN"
 
 #: ../src/import-export/hbci/glade/hbciprefs.glade.h:5
-#, fuzzy
 msgid "Remember the PIN for HBCI in memory during a session."
-msgstr "Recordad el PIN para HBCI en la memoria durante una sesión"
+msgstr "Recordar el PIN para HBCI en la memoria durante una sesión."
 
 #: ../src/import-export/hbci/glade/hbciprefs.glade.h:6
-#, fuzzy
 msgid "_Verbose debug messages"
-msgstr "Mensajes de diagnóstico ampliados HBCI"
+msgstr "Mensajes de diagnóstico _ampliados"
 
 #. Translators: Strings from this file are really only
 #. * needed inside Germany (HBCI is not supported anywhere
@@ -12981,7 +12970,6 @@
 #. * import-export/hbci subdirectory in other countries.
 #.
 #: ../src/import-export/hbci/gnc-hbci-getbalance.c:265
-#, fuzzy
 msgid ""
 "The downloaded HBCI Balance was zero.\n"
 "\n"
@@ -12991,10 +12979,8 @@
 "HBCI Balance."
 msgstr ""
 "El saldo HBCI descargado ha sido cero.\n"
-"O este es el saldo correcto, o su banco no soporta la descarga \n"
-"del saldo en esta versión HBCI. Debería elegir una versión \n"
-"HBCI superior en la configuración HBCI. Después intente de \n"
-"nuevo descargar el saldo HBCI.\n"
+"\n"
+"O este es el saldo correcto, o su banco no soporta la descarga del saldo en esta versión HBCI. Debería elegir una versión HBCI superior en la configuración HBCI. Después intente de nuevo descargar el saldo HBCI."
 
 #: ../src/import-export/hbci/gnc-hbci-getbalance.c:281
 #, c-format
@@ -13006,17 +12992,15 @@
 "El saldo anotado de la cuenta es %s"
 
 #: ../src/import-export/hbci/gnc-hbci-getbalance.c:288
-#, fuzzy, c-format
+#, c-format
 msgid "For your information: This account also has a noted balance of %s\n"
-msgstr ""
-"Para su información: esta cuenta también tiene\n"
-"un balance anotado de %s\n"
+msgstr "Para su información: esta cuenta también tiene un balance anotado de %s\n"
 
 #: ../src/import-export/hbci/gnc-hbci-getbalance.c:293
 msgid ""
 "The booked balance is identical to the current reconciled balance of the "
 "account."
-msgstr ""
+msgstr "El saldo anotado es igual a su saldo conciliado actual en la cuenta."
 
 #: ../src/import-export/hbci/gnc-hbci-getbalance.c:307
 msgid "Reconcile account now?"
@@ -13037,16 +13021,17 @@
 "\n"
 "Do you want to enter the job again?"
 msgstr ""
+"El backend ha producido un error al preparar el trabajo. No es posible ejecutar este trabajo.\n"
+"\n"
+"Lo más probable es que su banco no soporte el trabajo que ha elegido o que su cuenta HBCI no tenga permisos para ejecutar el trabajo. Puede que pueda consultar más mensajes de error en su log de consola.\n"
+"\n"
+"¿Quiere introducir el trabajo otra vez?"
 
 #: ../src/import-export/hbci/gnc-hbci-transfer.c:216
-#, fuzzy
 msgid ""
 "You have changed the list of online transfer templates, but you cancelled "
 "the transfer dialog. Do you nevertheless want to store the changes?"
-msgstr ""
-"Ha cambiado la lista de plantillas de transferencias online,\n"
-"pero ha cancelado la ventana de transferencia.\n"
-"¿Quiere almacenar los cambios a pesar de todo?"
+msgstr "Ha cambiado la lista de plantillas de transferencias online, pero ha cancelado la ventana de transferencia. ¿Quiere almacenar los cambios a pesar de todo?"
 
 #: ../src/import-export/hbci/gnc-hbci-transfer.c:247
 msgid "Online HBCI Direct Debit Note"
@@ -13054,7 +13039,7 @@
 
 #: ../src/import-export/hbci/gnc-hbci-transfer.c:249
 msgid "Online HBCI Bank-Internal Transfer"
-msgstr ""
+msgstr "Transferencia bancaria interna online HBCI"
 
 #: ../src/import-export/hbci/gnc-hbci-transfer.c:252
 msgid "Online HBCI Transaction"
@@ -13079,40 +13064,28 @@
 "¿Quiere intentarlo de nuevo?"
 
 #: ../src/import-export/hbci/gnc-hbci-utils.c:303
-#, fuzzy
 msgid ""
 "Unfortunately you entered a wrong PIN for too many times. Your chip card is "
 "therefore destroyed. Aborting."
-msgstr ""
-"Desafortunadamente ha introducir un PIN incorrecto demasiadas\n"
-"veces. Por lo tanto su tarjeta chip se ha destruido. Abortando."
+msgstr "Desafortunadamente ha introducir un PIN incorrecto demasiadas veces. Por lo tanto su tarjeta chip se ha destruido. Abortando."
 
 #: ../src/import-export/hbci/gnc-hbci-utils.c:312
-#, fuzzy
 msgid ""
 "No chip card has been found in the chip card reader. Do you want to try "
 "again?"
-msgstr ""
-"No se ha encontrado tarjeta chip en el lector de tarjetas.\n"
-"¿Quiere intentarlo de nuevo?"
+msgstr "No se ha encontrado tarjeta chip en el lector de tarjetas. ¿Quiere intentarlo de nuevo?"
 
 #: ../src/import-export/hbci/gnc-hbci-utils.c:318
-#, fuzzy
 msgid ""
 "Unfortunately this HBCI job is not supported by your bank or for your "
 "account. Aborting."
-msgstr ""
-"Desafortunadamente, esta tarea HBCI no está soportada\n"
-"por su banco o para su cuenta. Abortando."
+msgstr "Desafortunadamente, esta tarea HBCI no está soportada por su banco o para su cuenta. Abortando."
 
 #: ../src/import-export/hbci/gnc-hbci-utils.c:326
-#, fuzzy
 msgid ""
 "The server of your bank refused the HBCI connection. Please try again later. "
 "Aborting."
-msgstr ""
-"El servidor de su banco ha rechazado la conexión HBCI.\n"
-"Inténtelo más tarde. Abortando."
+msgstr "El servidor de su banco ha rechazado la conexión HBCI. Inténtelo más tarde. Abortando."
 
 #. src/import-export/qif-import/qif-dialog-utils.scm
 #. src/import-export/qif-io-core/qif-invst-xtn-import.scm
@@ -13168,77 +13141,63 @@
 msgstr "Realizar una nueva transacción interna al banco online usando HBCI/AqBanking"
 
 #: ../src/import-export/hbci/gnc-plugin-hbci.c:110
-#, fuzzy
 msgid "_Direct Debit..."
-msgstr "Cargo Directo"
+msgstr "Cargo _directo..."
 
 #: ../src/import-export/hbci/gnc-plugin-hbci.c:111
-#, fuzzy
 msgid "Issue a new direct debit note online through HBCI/AqBanking"
-msgstr "Efectuar una nueva nota de cargo directo online mediante HBCI"
+msgstr "Efectuar una nueva nota de cargo directo online mediante HBCI/AqBanking"
 
 #: ../src/import-export/hbci/hbci-interaction.c:349
-#, fuzzy, c-format
+#, c-format
 msgid "The PIN needs to be at least %d characters long. Do you want to try again?"
-msgstr ""
-"El PIN debe tener al menos %d caracteres.\n"
-"¿Quiere intentarlo de nuevo?"
+msgstr "El PIN debe tener al menos %d caracteres. ¿Quiere intentarlo de nuevo?"
 
 #: ../src/import-export/hbci/hbci-interaction.c:362
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "You entered %ld characters, but the PIN must be no longer than %d "
 "characters. Do you want to try again?"
-msgstr ""
-"El PIN debe tener al menos %d caracteres.\n"
-"¿Quiere intentarlo de nuevo?"
+msgstr "Ha introducido %ld caracteres, pero el PIN no debe tener más de %d caracteres. ¿Quiere intentarlo de nuevo?"
 
 #: ../src/import-export/hbci/hbci-interaction.c:430
-#, fuzzy, c-format
+#, c-format
 msgid "This TAN needs to be at least %d characters long. Do you want to try again?"
-msgstr ""
-"Este PIN debe tener al menos %d caracteres.\n"
-"¿Quiere intentarlo de nuevo?"
+msgstr "Este TAN debe tener al menos %d caracteres. ¿Quiere intentarlo de nuevo?"
 
 #: ../src/import-export/hbci/hbci-interaction.c:443
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "You entered %ld characters, but the TAN must be no longer than %d "
 "characters. Do you want to try again?"
-msgstr ""
-"Este PIN debe tener al menos %d caracteres.\n"
-"¿Quiere intentarlo de nuevo?"
+msgstr "Ha introducido %ld caracteres, pero el TAN no debe tener más de %d caracteres. ¿Quiere intentarlo de nuevo?"
 
 #: ../src/import-export/hbci/schemas/apps_gnucash_dialog_hbci.schemas.in.h:1
-#, fuzzy
 msgid "Close dialog when finished"
-msgstr "Cerrar al finalizar"
+msgstr "Cerrar ventana al finalizar"
 
 #: ../src/import-export/hbci/schemas/apps_gnucash_dialog_hbci.schemas.in.h:2
-#, fuzzy
 msgid "Enables verbose debug messages for HBCI/AqBanking Online Banking."
-msgstr "Activar mensajes de diagnóstico ampliados para la banca online HBCI."
+msgstr "Activar mensajes de diagnóstico ampliados para la banca online HBCI/AqBanking."
 
 #: ../src/import-export/hbci/schemas/apps_gnucash_dialog_hbci.schemas.in.h:3
 msgid ""
 "If active, the PIN for HBCI/AqBanking actions will be remembered in memory "
 "during a session. Otherwise it will have to be entered again each time "
 "during a session when it is needed."
-msgstr ""
+msgstr "Si está activo, el PIN para acciones HBCI/AqBanking será guardado en memoria durante una sesión. Sino se tendrá que introducir cada vez que sea necesario durante la sesión."
 
 #: ../src/import-export/hbci/schemas/apps_gnucash_dialog_hbci.schemas.in.h:4
 msgid ""
 "If active, the window will be closed automatically when you finish the HBCI/"
 "AqBanking import process. Otherwise it will stay open."
-msgstr ""
+msgstr "Si está activo, la ventana se cerrará automáticamente cuando termine el proceso de importación HBCI/AqBanking. Sino permanecerá abierta."
 
 #: ../src/import-export/hbci/schemas/apps_gnucash_dialog_hbci.schemas.in.h:5
-#, fuzzy
 msgid "Remember the PIN in memory"
-msgstr "Recordad el PIN para HBCI en la memoria durante una sesión"
+msgstr "Recordar el PIN en memoria"
 
 #: ../src/import-export/hbci/schemas/apps_gnucash_dialog_hbci.schemas.in.h:8
-#, fuzzy
 msgid "Verbose HBCI debug messages"
 msgstr "Mensajes de diagnóstico ampliados HBCI"
 
@@ -15978,7 +15937,7 @@
 #. src/report/standard-reports/trial-balance.scm
 #: ../intl-scm/guile-strings.c:564 ../intl-scm/guile-strings.c:674
 msgid "Trial Balance"
-msgstr ""
+msgstr "Saldo de prueba"
 
 #. src/report/standard-reports/trial-balance.scm
 #. src/report/standard-reports/income-statement.scm
@@ -16037,12 +15996,12 @@
 #. src/report/standard-reports/trial-balance.scm
 #: ../intl-scm/guile-strings.c:578
 msgid "Report variation"
-msgstr ""
+msgstr "Variante de informe"
 
 #. src/report/standard-reports/trial-balance.scm
 #: ../intl-scm/guile-strings.c:580
 msgid "Kind of trial balance to generate"
-msgstr ""
+msgstr "Tipo de saldo de prueba a generar"
 
 #. src/report/standard-reports/trial-balance.scm
 #. src/report/standard-reports/income-statement.scm
@@ -16087,14 +16046,14 @@
 #. src/report/standard-reports/trial-balance.scm
 #: ../intl-scm/guile-strings.c:592
 msgid "Gross adjustment accounts"
-msgstr ""
+msgstr "Cuentas de ajuste"
 
 #. src/report/standard-reports/trial-balance.scm
 #: ../intl-scm/guile-strings.c:594
 msgid ""
 "Do not net, but show gross debit/credit adjustments to these accounts. "
 "Merchandising businesses will normally select their inventory accounts here."
-msgstr ""
+msgstr "No mostrar neto, pero mostrar ajustes de cargo/abono de esas cuentas. Las empresas de merchandising generalmente seleccionarán aquí sus cuentas de inventario."
 
 #. src/report/standard-reports/trial-balance.scm
 #: ../intl-scm/guile-strings.c:596
@@ -16107,7 +16066,7 @@
 "Adjustments made to these accounts are gross adjusted (see above) in the "
 "Adjustments, Adjusted Trial Balance, and Income Statement columns. Mostly "
 "useful for merchandising businesses."
-msgstr ""
+msgstr "Los ajustes realizados sobre estas cuentas se ajustan (ver arriba) en las columnas Ajustes, Saldo de prueba ajustado y Informe de ingresos. Útil para empresas de merchandising."
 
 #. src/report/standard-reports/trial-balance.scm
 #. src/report/standard-reports/income-statement.scm
@@ -16120,32 +16079,32 @@
 #. src/report/standard-reports/trial-balance.scm
 #: ../intl-scm/guile-strings.c:602
 msgid "Adjusting Entries pattern"
-msgstr ""
+msgstr "Patrón de ajuste de elementos"
 
 #. src/report/standard-reports/trial-balance.scm
 #: ../intl-scm/guile-strings.c:604
 msgid "Any text in the Description column which identifies adjusting entries"
-msgstr ""
+msgstr "Cualquier texto en el campo Descripción que identifique elementos de ajuste"
 
 #. src/report/standard-reports/trial-balance.scm
 #: ../intl-scm/guile-strings.c:606
 msgid "Adjusting Entries pattern is case-sensitive"
-msgstr ""
+msgstr "El patrón de elementos de ajuste distingue mayúsculas y minúsculas"
 
 #. src/report/standard-reports/trial-balance.scm
 #: ../intl-scm/guile-strings.c:608
 msgid "Causes the Adjusting Entries Pattern match to be case-sensitive"
-msgstr ""
+msgstr "Provoca que el emparejamiento del patrón de elementos de ajuste distinga mayúsculas y minúsculas"
 
 #. src/report/standard-reports/trial-balance.scm
 #: ../intl-scm/guile-strings.c:610
 msgid "Adjusting Entries Pattern is regular expression"
-msgstr ""
+msgstr "El patrón de elementos de ajuste es una expresión regular"
 
 #. src/report/standard-reports/trial-balance.scm
 #: ../intl-scm/guile-strings.c:612
 msgid "Causes the Adjusting Entries Pattern to be treated as a regular expression"
-msgstr ""
+msgstr "Provoca que el patrón de elementos de ajuste se trate como una expresión regular"
 
 #. src/report/standard-reports/trial-balance.scm
 #. src/report/standard-reports/income-statement.scm
@@ -16153,7 +16112,7 @@
 #: ../intl-scm/guile-strings.c:614 ../intl-scm/guile-strings.c:942
 #: ../intl-scm/guile-strings.c:1282
 msgid "Closing Entries pattern"
-msgstr ""
+msgstr "Patrón de elementos de cierre"
 
 #. src/report/standard-reports/trial-balance.scm
 #. src/report/standard-reports/income-statement.scm
@@ -16161,7 +16120,7 @@
 #: ../intl-scm/guile-strings.c:616 ../intl-scm/guile-strings.c:944
 #: ../intl-scm/guile-strings.c:1284
 msgid "Any text in the Description column which identifies closing entries"
-msgstr ""
+msgstr "Cualquier texto en el campo Descripción que identifique elementos de cierre"
 
 #. src/report/standard-reports/trial-balance.scm
 #. src/report/standard-reports/income-statement.scm
@@ -16169,7 +16128,7 @@
 #: ../intl-scm/guile-strings.c:618 ../intl-scm/guile-strings.c:946
 #: ../intl-scm/guile-strings.c:1286
 msgid "Closing Entries pattern is case-sensitive"
-msgstr ""
+msgstr "El patrón de elementos de cierre distingue mayúsculas y minúsculas"
 
 #. src/report/standard-reports/trial-balance.scm
 #. src/report/standard-reports/income-statement.scm
@@ -16177,7 +16136,7 @@
 #: ../intl-scm/guile-strings.c:620 ../intl-scm/guile-strings.c:948
 #: ../intl-scm/guile-strings.c:1288
 msgid "Causes the Closing Entries Pattern match to be case-sensitive"
-msgstr ""
+msgstr "Provoca que el emparejamiento del patrón de elementos de cierre distinga mayúsculas y minúsculas"
 
 #. src/report/standard-reports/trial-balance.scm
 #. src/report/standard-reports/income-statement.scm
@@ -16185,7 +16144,7 @@
 #: ../intl-scm/guile-strings.c:622 ../intl-scm/guile-strings.c:950
 #: ../intl-scm/guile-strings.c:1290
 msgid "Closing Entries Pattern is regular expression"
-msgstr ""
+msgstr "El patrón de elementos de cierre es una expresión regular"
 
 #. src/report/standard-reports/trial-balance.scm
 #. src/report/standard-reports/income-statement.scm
@@ -16193,7 +16152,7 @@
 #: ../intl-scm/guile-strings.c:624 ../intl-scm/guile-strings.c:952
 #: ../intl-scm/guile-strings.c:1292
 msgid "Causes the Closing Entries Pattern to be treated as a regular expression"
-msgstr ""
+msgstr "Provoca que el patrón de elementos de cierre se trate como una expresión regular"
 
 #. src/report/standard-reports/trial-balance.scm
 #. src/report/standard-reports/income-statement.scm
@@ -16293,7 +16252,7 @@
 #. src/report/standard-reports/trial-balance.scm
 #: ../intl-scm/guile-strings.c:652
 msgid "Current Trial Balance"
-msgstr ""
+msgstr "Saldo de prueba actual"
 
 #. src/report/standard-reports/trial-balance.scm
 #: ../intl-scm/guile-strings.c:654
@@ -16303,7 +16262,7 @@
 #. src/report/standard-reports/trial-balance.scm
 #: ../intl-scm/guile-strings.c:656
 msgid "Pre-adjustment Trial Balance"
-msgstr ""
+msgstr "Saldo de prueba anterior al ajuste"
 
 #. src/report/standard-reports/trial-balance.scm
 #: ../intl-scm/guile-strings.c:658
@@ -16360,7 +16319,7 @@
 #. src/report/standard-reports/trial-balance.scm
 #: ../intl-scm/guile-strings.c:678
 msgid "Adjusted Trial Balance"
-msgstr ""
+msgstr "Saldo de prueba ajustado"
 
 #. src/report/standard-reports/trial-balance.scm
 #. src/report/standard-reports/income-statement.scm
@@ -16752,7 +16711,7 @@
 #: ../intl-scm/guile-strings.c:902 ../intl-scm/guile-strings.c:1262
 #: ../intl-scm/guile-strings.c:1954 ../intl-scm/guile-strings.c:2060
 msgid "Show accounting-style rules"
-msgstr "Mostrar las reglas del estilo contable"
+msgstr "Mostrar líneas al estilo contable"
 
 #. src/report/standard-reports/income-statement.scm
 #. src/report/standard-reports/equity-statement.scm
@@ -16761,7 +16720,7 @@
 #: ../intl-scm/guile-strings.c:904 ../intl-scm/guile-strings.c:1264
 #: ../intl-scm/guile-strings.c:1956 ../intl-scm/guile-strings.c:2062
 msgid "Use rules beneath columns of added numbers like accountants do"
-msgstr ""
+msgstr "Usar líneas bajo columnas de cantidades sumadas como hacen los contables"
 
 #. src/report/standard-reports/income-statement.scm
 #: ../intl-scm/guile-strings.c:910
@@ -17128,7 +17087,7 @@
 #. src/report/standard-reports/advanced-portfolio.scm
 #: ../intl-scm/guile-strings.c:1150
 msgid "Show listings"
-msgstr ""
+msgstr "Mostrar índices"
 
 #. src/report/standard-reports/advanced-portfolio.scm
 #: ../intl-scm/guile-strings.c:1152
@@ -17143,7 +17102,7 @@
 #. src/report/standard-reports/advanced-portfolio.scm
 #: ../intl-scm/guile-strings.c:1156 ../intl-scm/guile-strings.c:1178
 msgid "Basis calculation method"
-msgstr ""
+msgstr "Método de cálculo de la base"
 
 #. src/report/standard-reports/advanced-portfolio.scm
 #: ../intl-scm/guile-strings.c:1158
@@ -17234,7 +17193,7 @@
 #. src/report/standard-reports/advanced-portfolio.scm
 #: ../intl-scm/guile-strings.c:1198
 msgid "Display exchange listings"
-msgstr ""
+msgstr "Mostrar índices de intercambio"
 
 #. src/report/standard-reports/advanced-portfolio.scm
 #: ../intl-scm/guile-strings.c:1200
@@ -17943,7 +17902,7 @@
 #. src/report/standard-reports/account-summary.scm
 #: ../intl-scm/guile-strings.c:1918
 msgid "Account Summary"
-msgstr "Resumen de cuenta"
+msgstr "Resumen de cuentas"
 
 #. src/report/standard-reports/account-summary.scm
 #: ../intl-scm/guile-strings.c:1938
@@ -18011,7 +17970,7 @@
 #. src/report/standard-reports/account-summary.scm
 #: ../intl-scm/guile-strings.c:2000
 msgid "Raise Accounts"
-msgstr ""
+msgstr "Alzar cuentas"
 
 #. src/report/standard-reports/account-summary.scm
 #: ../intl-scm/guile-strings.c:2002
@@ -19615,7 +19574,7 @@
 #. src/business/business-reports/invoice.scm
 #: ../intl-scm/guile-strings.c:3328 ../intl-scm/guile-strings.c:3702
 msgid "Thank you for your patronage"
-msgstr ""
+msgstr "Gracias por confiar en nosotros"
 
 #. src/business/business-reports/easy-invoice.scm
 #. src/business/business-reports/fancy-invoice.scm

Modified: gnucash/branches/register-rewrite/po/fr.po
===================================================================
--- gnucash/branches/register-rewrite/po/fr.po	2006-05-29 19:24:38 UTC (rev 14237)
+++ gnucash/branches/register-rewrite/po/fr.po	2006-05-29 19:45:18 UTC (rev 14238)
@@ -15,7 +15,7 @@
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2006-05-20 16:47+0200\n"
-"PO-Revision-Date: 2006-05-22 22:33+0200\n"
+"PO-Revision-Date: 2006-05-26 19:00+0200\n"
 "Last-Translator: Fabrice Kurz <kurzf at voila.fr>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -1606,7 +1606,7 @@
 
 #: ../src/business/business-gnome/glade/businessprefs.glade.h:8
 msgid "Ta_x included"
-msgstr "Taxes incluses"
+msgstr "Ta_xes incluses"
 
 #: ../src/business/business-gnome/glade/businessprefs.glade.h:9
 msgid ""
@@ -1657,7 +1657,7 @@
 # messages-i18n.c:171
 #: ../src/business/business-gnome/glade/businessprefs.glade.h:16
 msgid "_Open in new window"
-msgstr "Ouvrir dans une nouvelle fenÃªtre"
+msgstr "_Ouvrir dans une nouvelle fenÃªtre"
 
 #: ../src/business/business-gnome/glade/businessprefs.glade.h:17
 msgid "_Tax included"
@@ -2329,7 +2329,7 @@
 
 #: ../src/business/business-gnome/gnc-plugin-business.c:185
 msgid "Find Bi_ll..."
-msgstr "Cherche une facture fournisseur..."
+msgstr "Cherche une _facture fournisseur..."
 
 #: ../src/business/business-gnome/gnc-plugin-business.c:186
 msgid "Open the Find Bill dialog"
@@ -2673,7 +2673,7 @@
 #: ../src/business/business-gnome/gnc-plugin-page-invoice.c:159
 #: ../src/gnome/glade/register.glade.h:95
 msgid "_Standard"
-msgstr "Ordre standard"
+msgstr "Ordre _standard"
 
 # messages-i18n.c:267 po/guile_strings.txt:6
 #: ../src/business/business-gnome/gnc-plugin-page-invoice.c:160
@@ -4747,7 +4747,7 @@
 
 #: ../src/gnome/glade/account.glade.h:41
 msgid "M_ove to:"
-msgstr "Les dÃ©placer versÂ :"
+msgstr "Les _dÃ©placer versÂ :"
 
 # messages-i18n.c:190
 #: ../src/gnome/glade/account.glade.h:42
@@ -4863,7 +4863,7 @@
 
 #: ../src/gnome/glade/account.glade.h:64
 msgid "Show _zero total accounts"
-msgstr "Ne pas afficher les comptes dont le solde est nul"
+msgstr "Ne pas afficher les comptes dont le solde est _nul"
 
 # messages-i18n.c:176
 #: ../src/gnome/glade/account.glade.h:65
@@ -4976,7 +4976,7 @@
 
 #: ../src/gnome/glade/account.glade.h:82
 msgid "_Move to:"
-msgstr "Les dÃ©placer versÂ :"
+msgstr "Les _dÃ©placer versÂ :"
 
 #: ../src/gnome/glade/account.glade.h:83
 #: ../src/gnome-utils/dialog-commodity.c:260
@@ -5477,7 +5477,7 @@
 
 #: ../src/gnome/glade/lots.glade.h:2
 msgid "<b>_Lots in This Account</b>"
-msgstr "<b> lots dans ce compte</b>"
+msgstr "<b>_lots dans ce compte</b>"
 
 #: ../src/gnome/glade/lots.glade.h:3
 msgid "<b>_Mini-Viewer</b>"
@@ -5842,12 +5842,12 @@
 # src/gnome/glade-gnc-dialogs.c:1340
 #: ../src/gnome/glade/print.glade.h:1
 msgid "Amount (_numbers):"
-msgstr "Montant (en chiffres)Â :"
+msgstr "Montant (en _chiffres)Â :"
 
 # src/gnome/glade-gnc-dialogs.c:1332
 #: ../src/gnome/glade/print.glade.h:2
 msgid "Amount (_words):"
-msgstr "Montant (en lettres)Â :"
+msgstr "Montant (en _lettres)Â :"
 
 # src/gnome/glade-gnc-dialogs.c:1178
 #: ../src/gnome/glade/print.glade.h:3
@@ -5979,7 +5979,7 @@
 # messages-i18n.c:210
 #: ../src/gnome/glade/reconcile.glade.h:5
 msgid "Statement _Date:"
-msgstr "Date du relevÃ©Â :"
+msgstr "_Date du relevÃ©Â :"
 
 # messages-i18n.c:179
 #: ../src/gnome/glade/reconcile.glade.h:6
@@ -6053,7 +6053,7 @@
 # messages-i18n.c:176
 #: ../src/gnome/glade/register.glade.h:19
 msgid "Dup_licate Transaction..."
-msgstr "Dupliquer la transaction..."
+msgstr "Dup_liquer la transaction..."
 
 # messages-i18n.c:176
 #: ../src/gnome/glade/register.glade.h:21
@@ -6394,7 +6394,7 @@
 # messages-i18n.c:210
 #: ../src/gnome/glade/register.glade.h:97
 msgid "_Statement Date"
-msgstr "DateÂ du relevÃ©"
+msgstr "DateÂ du _relevÃ©"
 
 # messages-i18n.c:343
 #: ../src/gnome/glade/register.glade.h:98
@@ -7330,12 +7330,12 @@
 # messages-i18n.c:199
 #: ../src/gnome/glade/stocks.glade.h:1
 msgid "<b>A_sset Account</b>"
-msgstr "<b>Compte d'actif</b>"
+msgstr "<b>Compte d'a_ctif</b>"
 
 # messages-i18n.c:190
 #: ../src/gnome/glade/stocks.glade.h:2
 msgid "<b>_Income Account</b>"
-msgstr "<b>Compte de Revenus</b>"
+msgstr "<b>Compte de _Revenus</b>"
 
 #: ../src/gnome/glade/stocks.glade.h:4
 msgid "Cash In Lieu"
@@ -7439,7 +7439,7 @@
 # po/guile_strings.txt:266
 #: ../src/gnome/glade/stocks.glade.h:22
 msgid "_Shares:"
-msgstr "TitresÂ :"
+msgstr "_TitresÂ :"
 
 #: ../src/gnome/glade/tax.glade.h:1
 msgid "0"
@@ -7671,7 +7671,7 @@
 
 #: ../src/gnome/gnc-plugin-basic-commands.c:150
 msgid "_Security Editor"
-msgstr "Ã‰diteur de titre"
+msgstr "Ã‰diteur de _titre"
 
 #: ../src/gnome/gnc-plugin-basic-commands.c:151
 msgid "View and edit the commodities for stocks and mutual funds"
@@ -7737,7 +7737,7 @@
 # messages-i18n.c:190
 #: ../src/gnome/gnc-plugin-page-account-tree.c:149
 msgid "New Account _Hierarchy..."
-msgstr "Nouvelle hiÃ©rarchie de comptes..."
+msgstr "Nouvelle _hiÃ©rarchie de comptes..."
 
 #: ../src/gnome/gnc-plugin-page-account-tree.c:150
 msgid "Extend the current book by merging with new account type categories"
@@ -7852,7 +7852,7 @@
 # messages-i18n.c:303
 #: ../src/gnome/gnc-plugin-page-account-tree.c:184
 msgid "View _Lots..."
-msgstr "Afficher les lots..."
+msgstr "Afficher les _lots..."
 
 #: ../src/gnome/gnc-plugin-page-account-tree.c:185
 #: ../src/gnome/gnc-plugin-page-register.c:238
@@ -8168,7 +8168,7 @@
 
 #: ../src/gnome/gnc-plugin-page-register.c:249
 msgid "Sche_dule..."
-msgstr "RÃ©currence..."
+msgstr "RÃ©c_urrence..."
 
 # po/guile_strings.txt:267
 #: ../src/gnome/gnc-plugin-page-register.c:252
@@ -10357,7 +10357,7 @@
 
 #: ../src/gnome-utils/dialog-utils.c:961
 msgid "Don't _tell me again."
-msgstr "Ne plus me demander."
+msgstr "Ne plus me _demander."
 
 #: ../src/gnome-utils/dialog-utils.c:964
 msgid "Remember and don't ask me again this _session."
@@ -10977,7 +10977,7 @@
 
 #: ../src/gnome-utils/glade/druid-gnc-xml-import.glade.h:1
 msgid "<b>S_ystem input encodings</b>"
-msgstr "<b>Encodages d'entrÃ©e SystÃ¨me</b>"
+msgstr "<b>Encodages d'entrÃ©e S_ystÃ¨me</b>"
 
 #: ../src/gnome-utils/glade/druid-gnc-xml-import.glade.h:2
 msgid "<b>_Custom encoding</b>"
@@ -11423,7 +11423,7 @@
 
 #: ../src/gnome-utils/glade/preferences.glade.h:49
 msgid "Display \"_tip of the day\" dialog"
-msgstr "Afficher le Â«Â Conseil du jourÂ Â»"
+msgstr "Afficher le Â«Â _Conseil du jourÂ Â»"
 
 #: ../src/gnome-utils/glade/preferences.glade.h:50
 msgid "Display hints for using GnuCash at startup"
@@ -11546,7 +11546,7 @@
 
 #: ../src/gnome-utils/glade/preferences.glade.h:73
 msgid "Include _non-currency totals"
-msgstr "Inclure les totaux sans devises"
+msgstr "Inclure les totaux sans _devises"
 
 # src/gnome/glade-gnc-dialogs.c:300
 #: ../src/gnome-utils/glade/preferences.glade.h:74
@@ -11592,12 +11592,12 @@
 # messages-i18n.c:171
 #: ../src/gnome-utils/glade/preferences.glade.h:85
 msgid "Register opens in a new _window"
-msgstr "Ouvrir dans une nouvelle fenÃªtre"
+msgstr "Ouvrir dans une nouvelle _fenÃªtre"
 
 # messages-i18n.c:171
 #: ../src/gnome-utils/glade/preferences.glade.h:86
 msgid "Report opens in a new _window"
-msgstr "Ouvrir les rapports dans une nouvelle fenÃªtre"
+msgstr "Ouvrir les rapports dans une nouvelle _fenÃªtre"
 
 # messages-i18n.c:326
 #: ../src/gnome-utils/glade/preferences.glade.h:87
@@ -11687,7 +11687,7 @@
 # messages-i18n.c:346
 #: ../src/gnome-utils/glade/preferences.glade.h:102
 msgid "Transaction _journal"
-msgstr "Journal de transaction"
+msgstr "_Journal de transaction"
 
 #: ../src/gnome-utils/glade/preferences.glade.h:103
 msgid "US Dollars (USD)"
@@ -11862,7 +11862,7 @@
 
 #: ../src/gnome-utils/glade/preferences.glade.h:139
 msgid "_Retain log files:"
-msgstr "Garder les fichiers journaux durantÂ :"
+msgstr "_Garder les fichiers journaux durantÂ :"
 
 # po/guile_strings.txt:93
 #: ../src/gnome-utils/glade/preferences.glade.h:140
@@ -12070,7 +12070,7 @@
 #: ../src/gnome-utils/gnc-file.c:210
 #, c-format
 msgid "The URL %s is not supported by this version of GnuCash."
-msgstr "L'adresse %s n'est pas supportÃ©e dans cette version de GnuCash."
+msgstr "L'adresse URL %s n'est pas supportÃ©e dans cette version de GnuCash."
 
 # messages-i18n.c:35
 #: ../src/gnome-utils/gnc-file.c:215
@@ -12460,12 +12460,12 @@
 # messages-i18n.c:37
 #: ../src/gnome-utils/gnc-html.c:109
 msgid "The specified URL could not be loaded."
-msgstr "L'URL spÃ©cifiÃ© n'a pu Ãªtre chargÃ©."
+msgstr "L'URL spÃ©cifiÃ©e n'a pu Ãªtre chargÃ©e."
 
 # messages-i18n.c:34
 #: ../src/gnome-utils/gnc-html.c:115
 msgid "There was an error loading the specified URL."
-msgstr "Une erreur s'est produite en essayant de charger l'URL spÃ©cifiÃ©."
+msgstr "Une erreur s'est produite en essayant de charger l'URL spÃ©cifiÃ©e."
 
 #: ../src/gnome-utils/gnc-html.c:116
 msgid "Error message"
@@ -13391,7 +13391,7 @@
 # messages-i18n.c:142
 #: ../src/gnome/window-reconcile.c:1989
 msgid "_Finish"
-msgstr "Terminer"
+msgstr "_Terminer"
 
 # messages-i18n.c:103
 #: ../src/gnome/window-reconcile.c:1990
@@ -13580,8 +13580,8 @@
 "to the Auto-CLEAR threshold) will be CLEARed by default."
 msgstr ""
 "Une transaction pour laquelle le score du meilleur duplicata potentiel est "
-"dans la zone VERTE (au-dessus ou Ã©gal au seuil de RÃ‰CONCILIATION "
-"automatique) sera RÃ‰CONCILIÃ‰E par dÃ©faut"
+"dans la zone VERTE (au-dessus ou Ã©gal au seuil de POINTAGE "
+"automatique) sera POINTÃ‰E par dÃ©faut"
 
 #: ../src/import-export/generic-import.glade.h:10
 msgid ""
@@ -13599,7 +13599,7 @@
 
 #: ../src/import-export/generic-import.glade.h:14
 msgid "Auto-c_lear threshold"
-msgstr "Seuil d'effacement automatique"
+msgstr "Seuil de _pointage automatique"
 
 # src/gnome/glade-gnc-dialogs.c:1178
 #: ../src/import-export/generic-import.glade.h:15
@@ -13608,7 +13608,7 @@
 
 #: ../src/import-export/generic-import.glade.h:16
 msgid "Commercial ATM _fees threshold"
-msgstr "Seuil de frais de distributeur de billets"
+msgstr "Seuil de _frais de distributeur de billets"
 
 #: ../src/import-export/generic-import.glade.h:17
 msgid "Confidence"
@@ -13738,7 +13738,7 @@
 
 #: ../src/import-export/generic-import.glade.h:47
 msgid "R"
-msgstr "Abgl"
+msgstr "R"
 
 #: ../src/import-export/generic-import.glade.h:48
 msgid "Red"
@@ -13748,13 +13748,13 @@
 #: ../src/import-export/generic-import.glade.h:49
 msgid "Select \"A\" to add the transaction as new."
 msgstr ""
-"Selectionner \"A\" pour ajouter la transaction en tant que nouvelle "
+"Selectionner Â« A Â» pour ajouter la transaction en tant que nouvelle "
 "transaction"
 
 # messages-i18n.c:77
 #: ../src/import-export/generic-import.glade.h:50
 msgid "Select \"R\" to reconcile a matching transaction."
-msgstr "Selectionner \"R\" pour rapprocher une transaction homologue"
+msgstr "Selectionner Â« R Â» pour rapprocher une transaction homologue"
 
 # src/gnome/glade-gnc-dialogs.c:506
 #: ../src/import-export/generic-import.glade.h:52
@@ -13807,7 +13807,7 @@
 
 #: ../src/import-export/generic-import.glade.h:60
 msgid "Use _bayesian matching"
-msgstr "Utiliser la comparaison BayÃ©sienne."
+msgstr "Utiliser la comparaison _BayÃ©sienne."
 
 #: ../src/import-export/generic-import.glade.h:61
 msgid ""
@@ -15927,16 +15927,16 @@
 
 #: ../src/register/ledger-core/split-register-control.c:106
 msgid "Balance it _manually"
-msgstr "Ã‰quilibrer manuellement"
+msgstr "Ã‰quilibrer _manuellement"
 
 #: ../src/register/ledger-core/split-register-control.c:108
 msgid "Let GnuCash _add an adjusting split"
-msgstr "Laisser GnuCash ajouter une rÃ©partition d'Ã©quilibre"
+msgstr "Laisser GnuCash _ajouter une rÃ©partition d'Ã©quilibre"
 
 # po/guile_strings.txt:275
 #: ../src/register/ledger-core/split-register-control.c:113
 msgid "Adjust current account _split total"
-msgstr "Ajuster le total rÃ©parti du compte courant"
+msgstr "Ajuster le total _rÃ©parti du compte courant"
 
 #: ../src/register/ledger-core/split-register-control.c:119
 msgid "Adjust _other account split total"
@@ -16461,16 +16461,16 @@
 
 #: ../src/report/report-gnome/report.glade.h:19
 msgid "_Column span:"
-msgstr "Extension sur plusieurs colonnes"
+msgstr "Extension sur plusieurs _colonnes"
 
 #: ../src/report/report-gnome/report.glade.h:22
 msgid "_Row span:"
-msgstr "Fusion de rangÃ©eÂ :"
+msgstr "Extension sur plusieurs _lignes:"
 
 # messages-i18n.c:320
 #: ../src/report/report-gnome/report.glade.h:23
 msgid "_Template:"
-msgstr "_ModÃ¨le:"
+msgstr "_ModÃ¨le :"
 
 #: ../src/report/report-gnome/window-report.c:122
 msgid "Set the report options you want using this dialog."
@@ -16493,7 +16493,7 @@
 #: ../src/report/report-gnome/window-report.c:265
 #, c-format
 msgid "Badly formed options URL: %s"
-msgstr "OptionsÂ : URL mal formÃ©eÂ : %s"
+msgstr "Options mal formÃ©es URLÂ : %s"
 
 #: ../src/report/report-gnome/window-report.c:253
 #, c-format
@@ -17391,7 +17391,7 @@
 #. src/report/report-system/report.scm
 #: ../intl-scm/guile-strings.c:428
 msgid "_Sample & Custom"
-msgstr "Exemples & Rapports personnalisÃ©s"
+msgstr "Exemples & Rapports _personnalisÃ©s"
 
 # src/gnome/glade-gnc-dialogs.c:1219 src/gnome/glade-gnc-dialogs.c:1240
 # src/gnome/glade-gnc-dialogs.c:1276
@@ -22389,8 +22389,8 @@
 "chÃ¨que de paie avec de multiples dÃ©ductions, cliquez sur le bouton "
 "RÃ©partition dans la barre d'outils.\n"
 "\n"
-"Vous pouvez Ã©galement choisir le grand livre avec rÃ©partitions automatiques "
-"ou le journal des transactions depuis l'option du menu Grand Livre|Style."
+"Vous pouvez Ã©galement choisir le Grand livre avec rÃ©partitions automatiques "
+"ou le Journal de transactions depuis le menu Affichage."
 
 #: ../doc/tip_of_the_day.list.in:36
 msgid ""
@@ -22438,8 +22438,8 @@
 "from the menu."
 msgstr ""
 "Voulez-vous voir toutes vos transactions de sous-comptes dans un seul "
-"registreÂ ? Ã€ partir du menu principal, mettez en vidÃ©o inverse le compte "
-"parent et sÃ©lectionnez Comptes|Ouvrir sous-comptes Ã  partir du menu."
+"registreÂ ? Mettez en vidÃ©o inverse le compte "
+"parent et sÃ©lectionnez Ouvrir avec les sous-comptes Ã  partir du menu contextuel."
 
 #: ../doc/tip_of_the_day.list.in:56
 msgid ""
@@ -22495,7 +22495,7 @@
 msgstr ""
 "Les feuilles de style dÃ©finissent comment les rapports sont affichÃ©s. "
 "Choisissez une feuille de style dans les options Ã  la crÃ©ation de votre "
-"rapport et utilisez le menu Â«Â Feuille de StyleÂ Â» pour personnaliser les "
+"rapport et utilisez le menu Â«Â Ã‰diter/Feuilles de StyleÂ Â» pour personnaliser les "
 "feuilles de style existantes."
 
 #: ../doc/tip_of_the_day.list.in:78

Modified: gnucash/branches/register-rewrite/src/backend/file/Makefile.am
===================================================================
--- gnucash/branches/register-rewrite/src/backend/file/Makefile.am	2006-05-29 19:24:38 UTC (rev 14237)
+++ gnucash/branches/register-rewrite/src/backend/file/Makefile.am	2006-05-29 19:45:18 UTC (rev 14238)
@@ -57,7 +57,7 @@
   sixtp-stack.h \
   sixtp-utils.h
 
-libgnc_backend_file_la_LDFLAGS = -module
+libgnc_backend_file_la_LDFLAGS = -module -avoid-version
 libgnc_backend_file_la_LIBADD = \
    ${GLIB_LIBS} ${GCONF_LIBS} ${LIBXML2_LIBS} \
    ${top_builddir}/src/engine/libgncmod-engine.la \

Modified: gnucash/branches/register-rewrite/src/backend/file/gnc-backend-file.c
===================================================================
--- gnucash/branches/register-rewrite/src/backend/file/gnc-backend-file.c	2006-05-29 19:24:38 UTC (rev 14237)
+++ gnucash/branches/register-rewrite/src/backend/file/gnc-backend-file.c	2006-05-29 19:45:18 UTC (rev 14238)
@@ -391,30 +391,6 @@
 
 /* ================================================================= */
 
-static gboolean
-is_gzipped_file(const gchar *name)
-{
-    unsigned char buf[2];
-    int fd = open(name, O_RDONLY);
-
-    if(fd == 0)
-    {
-        return FALSE;
-    }
-
-    if(read(fd, buf, 2) != 2)
-    {
-        return FALSE;
-    }
-
-    if(buf[0] == 037 && buf[1] == 0213)
-    {
-        return TRUE;
-    }
-    
-    return FALSE;
-}
-    
 static QofBookFileType
 gnc_file_be_determine_file_type(const char *path)
 {
@@ -427,8 +403,6 @@
     }
   } else if (gnc_is_xml_data_file(path)) {
     return GNC_BOOK_XML1_FILE;
-  } else if (is_gzipped_file(path)) {
-    return GNC_BOOK_XML2_FILE;
   } else if (gnc_is_bin_file(path)) {
     return GNC_BOOK_BIN_FILE;
   }
@@ -452,7 +426,6 @@
 	if (sbuf.st_size == 0)    { PINFO (" empty file"); return TRUE; }
 	if(gnc_is_xml_data_file_v2(path, NULL)) { return TRUE; } 
 	else if(gnc_is_xml_data_file(path))     { return TRUE; } 
-	else if(is_gzipped_file(path))          { return TRUE; }
 	else if(gnc_is_bin_file(path))          { return TRUE; }
 	PINFO (" %s is not a gnc file", path);
 	return FALSE;

Modified: gnucash/branches/register-rewrite/src/backend/file/io-gncxml-v2.c
===================================================================
--- gnucash/branches/register-rewrite/src/backend/file/io-gncxml-v2.c	2006-05-29 19:24:38 UTC (rev 14237)
+++ gnucash/branches/register-rewrite/src/backend/file/io-gncxml-v2.c	2006-05-29 19:45:18 UTC (rev 14238)
@@ -23,10 +23,12 @@
 
 #include <glib.h>
 #include <stdio.h>
+#include <fcntl.h>
 #include <string.h>
 #include <unistd.h>
 #include <zlib.h>
 #include <errno.h>
+#include <sys/wait.h>
 
 #include "gnc-engine.h"
 #include "gnc-pricedb-p.h"
@@ -50,6 +52,8 @@
 
 static QofLogModule log_module = GNC_MOD_IO;
 
+static pid_t gzip_child_pid = 0;
+
 /* Callback structure */
 struct file_backend {
   gboolean        ok;
@@ -1233,7 +1237,8 @@
 #define BUFLEN 4096
 
 static FILE *
-try_gz_open (const char *filename, const char *perms, gboolean use_gzip)
+try_gz_open (const char *filename, const char *perms, gboolean use_gzip,
+             gboolean compress)
 {
   if (strstr(filename, ".gz.") != NULL) /* its got a temp extension */
       use_gzip = TRUE;
@@ -1249,7 +1254,8 @@
      the g_spawn glib wrappers. */
   {
     /* Start gzip from a command line, not by fork(). */
-    gchar *argv[] = {"gzip", NULL};
+    gchar *argv[] = {compress ? "gzip" : "gunzip",
+                     NULL};
     GPid child_pid;
     GError *error;
     int child_stdin;
@@ -1268,7 +1274,7 @@
     /* FIXME: Now need to set up the child process to write to the
        file. */
 
-    return fdopen(child_stdin, "w");
+    return fdopen(child_stdin, compress ? "w" : "r");
 
     /* Eventually the GPid must be cleanup up, but not here? */
     /* g_spawn_close_pid(child_pid); */
@@ -1279,6 +1285,10 @@
     int filedes[2];
     pid_t pid;
 
+    /* avoid reading from file that is still being written to
+       by a child process */
+    g_assert(gzip_child_pid == 0);
+
     if (pipe(filedes) < 0) {
       PWARN("Pipe call failed. Opening uncompressed file.");
       return fopen(filename, perms);
@@ -1293,29 +1303,63 @@
     case 0: /* child */ {
       char buffer[BUFLEN];
       unsigned bytes;
-      gzFile *out;
+      ssize_t written;
+      gzFile *file;
 
-      close(filedes[1]);
-      out = gzopen(filename, perms);
-      if (out == NULL) {
-	PWARN("child gzopen failed\n");
-	exit(0);
+      file = gzopen(filename, perms);
+      if (file == NULL) {
+        PWARN("child gzopen failed\n");
+        exit(0);
       }
-      while ((bytes = read(filedes[0], buffer, BUFLEN)) > 0)
-	gzwrite(out, buffer, bytes);
-      gzclose(out);
+      if (compress) {
+        close(filedes[1]);
+        while ((bytes = read(filedes[0], buffer, BUFLEN)) > 0)
+          gzwrite(file, buffer, bytes);
+      }
+      else
+      {
+        close(filedes[0]);
+        while ((bytes = gzread(file, buffer, BUFLEN)) > 0)
+          written = write(filedes[1], buffer, bytes);
+      }
+      gzclose(file);
       _exit(0);
     }
 
     default: /* parent */
+      if (compress) {
+        /* the calling code must wait_for_gzip() */
+        gzip_child_pid = pid;
+      }
       sleep(2);
-      close(filedes[0]);
-      return fdopen(filedes[1], "w");
+      if (compress) {
+        close(filedes[0]);
+        return fdopen(filedes[1], "w");
+      }
+      else
+      {
+        close(filedes[1]);
+        return fdopen(filedes[0], "r");
+      }
     }
   }
 #endif
 }
 
+static gboolean
+wait_for_gzip()
+{
+    pid_t retval;
+
+    if (gzip_child_pid == 0)
+        return TRUE;
+
+    retval = waitpid(gzip_child_pid, NULL, WUNTRACED);
+    gzip_child_pid = 0;
+
+    return retval != -1;
+}
+
 gboolean
 gnc_book_write_to_xml_file_v2(
     QofBook *book,
@@ -1324,7 +1368,7 @@
 {
     FILE *out;
 
-    out = try_gz_open(filename, "w", compress);
+    out = try_gz_open(filename, "w", compress, TRUE);
     if (out == NULL)
     {
         return FALSE;
@@ -1339,6 +1383,9 @@
         return FALSE;
     }
 
+    if (compress)
+        return wait_for_gzip();
+
     return TRUE;
 }
 
@@ -1374,10 +1421,55 @@
 }
 
 /***********************************************************************/
+static gboolean
+is_gzipped_file(const gchar *name)
+{
+    unsigned char buf[2];
+    int fd = open(name, O_RDONLY);
+
+    if (fd == -1) {
+        return FALSE;
+    }
+
+    if (read(fd, buf, 2) != 2) {
+        close(fd);
+        return FALSE;
+    }
+    close(fd);
+
+    if (buf[0] == 037 && buf[1] == 0213) {
+        return TRUE;
+    }
+
+    return FALSE;
+}
+
 gboolean
 gnc_is_xml_data_file_v2(const gchar *name, gboolean *with_encoding)
 {
-    return gnc_is_our_xml_file(name, GNC_V2_STRING, with_encoding);
+    if (gnc_is_our_xml_file(name, GNC_V2_STRING, with_encoding))
+        return TRUE;
+
+    if (is_gzipped_file(name)) {
+        gzFile *file;
+        char first_chunk[256];
+        int num_read;
+
+        file = gzopen(name, "r");
+        if (file == NULL)
+            return FALSE;
+
+        num_read = gzread(file, first_chunk, sizeof(first_chunk) - 1);
+        gzclose(file);
+
+        if (num_read < 1)
+            return FALSE;
+
+        return gnc_is_our_first_xml_chunk(first_chunk, GNC_V2_STRING,
+                                          with_encoding);
+    }
+
+    return FALSE;
 }
 
 
@@ -1447,29 +1539,25 @@
 gint
 gnc_xml2_find_ambiguous(const gchar *filename, GList *encodings,
                         GHashTable **unique, GHashTable **ambiguous,
-                        GList **impossible, GError **error)
+                        GList **impossible)
 {
-    GIOChannel *channel=NULL;
-    GIOStatus status;
+    FILE *file=NULL;
     GList *iconv_list=NULL, *conv_list=NULL, *iter;
     iconv_item_type *iconv_item=NULL, *ascii=NULL;
     const gchar *enc;
     GHashTable *processed=NULL;
     gint n_impossible = 0;
-    gboolean clean_return = FALSE;
+    GError *error=NULL;
+    gboolean is_compressed;
+    gboolean clean_return=FALSE;
 
-    channel = g_io_channel_new_file(filename, "r", error);
-    if (*error) {
+    is_compressed = is_gzipped_file(filename);
+    file = try_gz_open(filename, "r", is_compressed, FALSE);
+    if (file == NULL) {
         PWARN("Unable to open file %s", filename);
         goto cleanup_find_ambs;
     }
 
-    status = g_io_channel_set_encoding(channel, NULL, error);
-    if (status != G_IO_STATUS_NORMAL) {
-        PWARN("Error on unsetting encoding on IOChannel");
-        goto cleanup_find_ambs;
-    }
-
     /* we need ascii */
     ascii = g_new(iconv_item_type, 1);
     ascii->encoding = g_quark_from_string("ASCII");
@@ -1510,25 +1598,21 @@
 
     /* loop through lines */
     while (1) {
-        gchar *line, *word, *utf8;
+        gchar line[256], *word, *utf8;
         gchar **word_array, **word_cursor;
         conv_type *conv = NULL;
 
-        status = g_io_channel_read_line(channel, &line, NULL, NULL, error);
-        if (status == G_IO_STATUS_EOF) {
-            break;
+        if (!fgets(line, sizeof(line)-1, file)) {
+            if (feof(file)) {
+                break;
+            } else {
+                goto cleanup_find_ambs;
+            }
         }
-        if (status == G_IO_STATUS_AGAIN) {
-            continue;
-        }
-        if (status != G_IO_STATUS_NORMAL) {
-            goto cleanup_find_ambs;
-        }
 
         g_strchomp(line);
         replace_character_references(line);
         word_array = g_strsplit_set(line, "> <", 0);
-        g_free(line);
 
         /* loop through words */
         for (word_cursor = word_array; *word_cursor; word_cursor++) {
@@ -1537,14 +1621,14 @@
               continue;
 
             utf8 = g_convert_with_iconv(word, -1, ascii->iconv,
-                                        NULL, NULL, error);
+                                        NULL, NULL, &error);
             if (utf8) {
                 /* pure ascii */
                 g_free(utf8);
                 continue;
             }
-            g_error_free(*error);
-            *error = NULL;
+            g_error_free(error);
+            error = NULL;
 
             if (g_hash_table_lookup_extended(processed, word, NULL, NULL)) {
                 /* already processed */
@@ -1556,15 +1640,15 @@
             for (iter = iconv_list; iter; iter = iter->next) {
                 iconv_item = iter->data;
                 utf8 = g_convert_with_iconv(word, -1, iconv_item->iconv,
-                                            NULL, NULL, error);
+                                            NULL, NULL, &error);
                 if (utf8) {
                     conv = g_new(conv_type, 1);
                     conv->encoding = iconv_item->encoding;
                     conv->utf8_string = utf8;
                     conv_list = g_list_prepend(conv_list, conv);
                 } else {
-                    g_error_free(*error);
-                    *error = NULL;
+                    g_error_free(error);
+                    error = NULL;
                 }
             }
 
@@ -1616,8 +1700,8 @@
         g_hash_table_destroy(processed);
     if (ascii)
         g_free(ascii);
-    if (channel)
-        g_io_channel_unref(channel);
+    if (file)
+        fclose(file);
 
     return (clean_return) ? n_impossible : -1;
 }
@@ -1631,24 +1715,21 @@
 parse_with_subst_push_handler (xmlParserCtxtPtr xml_context,
                                push_data_type *push_data)
 {
-    GIOChannel *channel=NULL;
-    GIOStatus status;
+    const gchar *filename;
+    FILE *file = NULL;
     GIConv ascii=(GIConv)-1;
     GString *output=NULL;
     GError *error=NULL;
+    gboolean is_compressed;
 
-    channel = g_io_channel_new_file(push_data->filename, "r", &error);
-    if (error) {
-        PWARN("Unable to open file %s", push_data->filename);
+    filename = push_data->filename;
+    is_compressed = is_gzipped_file(filename);
+    file = try_gz_open(filename, "r", is_compressed, FALSE);
+    if (file == NULL) {
+        PWARN("Unable to open file %s", filename);
         goto cleanup_push_handler;
     }
 
-    status = g_io_channel_set_encoding(channel, NULL, &error);
-    if (status != G_IO_STATUS_NORMAL) {
-        PWARN("Error on unsetting encoding on IOChannel");
-        goto cleanup_push_handler;
-    }
-
     ascii = g_iconv_open("UTF-8", "ASCII");
     if (ascii == (GIConv) -1) {
         PWARN("Unable to open ASCII ICONV conversion descriptor");
@@ -1657,24 +1738,20 @@
 
     /* loop through lines */
     while (1) {
-        gchar *line, *word, *repl, *utf8;
+        gchar line[256], *word, *repl, *utf8;
         gint pos, len;
         gchar *start, *cursor;
 
-        status = g_io_channel_read_line(channel, &line, NULL, NULL, &error);
-        if (status == G_IO_STATUS_EOF) {
-            break;
+        if (!fgets(line, sizeof(line)-1, file)) {
+            if (feof(file)) {
+                break;
+            } else {
+                goto cleanup_push_handler;
+            }
         }
-        if (status == G_IO_STATUS_AGAIN) {
-            continue;
-        }
-        if (status != G_IO_STATUS_NORMAL) {
-            goto cleanup_push_handler;
-        }
 
         replace_character_references(line);
         output = g_string_new(line);
-        g_free(line);
 
         /* loop through words */
         cursor = output->str;
@@ -1740,8 +1817,8 @@
         g_string_free(output, TRUE);
     if (ascii != (GIConv) -1)
         g_iconv_close(ascii);
-    if (channel)
-        g_io_channel_unref(channel);
+    if (file)
+        fclose(file);
 }
 
 gboolean

Modified: gnucash/branches/register-rewrite/src/backend/file/io-gncxml-v2.h
===================================================================
--- gnucash/branches/register-rewrite/src/backend/file/io-gncxml-v2.h	2006-05-29 19:24:38 UTC (rev 14237)
+++ gnucash/branches/register-rewrite/src/backend/file/io-gncxml-v2.h	2006-05-29 19:45:18 UTC (rev 14238)
@@ -180,10 +180,10 @@
  */
 gint gnc_xml2_find_ambiguous(
     const gchar *filename, GList *encodings, GHashTable **unique,
-    GHashTable **ambiguous, GList **impossible, GError **error);
+    GHashTable **ambiguous, GList **impossible);
 typedef gint (*find_ambiguous_handler)(
     const gchar *filename, GList *encodings, GHashTable **unique,
-    GHashTable **ambiguous, GList **impossible, GError **error);
+    GHashTable **ambiguous, GList **impossible);
 
 /** Parse a file in push mode, but replace byte sequences in the file given a
  * hash table of substitutions

Modified: gnucash/branches/register-rewrite/src/backend/file/sixtp.c
===================================================================
--- gnucash/branches/register-rewrite/src/backend/file/sixtp.c	2006-05-29 19:24:38 UTC (rev 14237)
+++ gnucash/branches/register-rewrite/src/backend/file/sixtp.c	2006-05-29 19:45:18 UTC (rev 14238)
@@ -838,16 +838,11 @@
 {
   FILE *f = NULL;
   char first_chunk[256];
-  unsigned char* cursor = NULL;
   ssize_t num_read;
-  
+
   g_return_val_if_fail(filename, FALSE);
   g_return_val_if_fail(first_tag, FALSE);
 
-  if (with_encoding) {
-    *with_encoding = FALSE;
-  }
-  
   f = fopen(filename, "r");
   if (f == NULL) {
     return FALSE;
@@ -856,21 +851,34 @@
   num_read = fread(first_chunk, sizeof(char), sizeof(first_chunk) - 1, f);
   fclose(f);
 
-  if(num_read == 0) 
+  if(num_read == 0)
   {
       return FALSE;
   }
-  
+
   first_chunk[num_read] = '\0';
-  
-  cursor = first_chunk;
 
+  return gnc_is_our_first_xml_chunk(first_chunk, first_tag, with_encoding);
+}
+
+gboolean
+gnc_is_our_first_xml_chunk(char *chunk, const char *first_tag,
+                           gboolean *with_encoding)
+{
+  unsigned char* cursor = NULL;
+
+  if (with_encoding) {
+    *with_encoding = FALSE;
+  }
+
+  cursor = chunk;
+
   if(!eat_whitespace(&cursor))
   {
       return FALSE;
   }
-  
-  if(strncmp(cursor, "<?xml", 5) == 0) 
+
+  if(strncmp(cursor, "<?xml", 5) == 0)
   {
       char *tag_compare;
       gboolean result;
@@ -892,7 +900,7 @@
 
       if (result && with_encoding) {
         *cursor = '\0';
-        cursor = first_chunk;
+        cursor = chunk;
         while (search_for('e', &cursor)) {
           if (strncmp(cursor, "ncoding=", 8) == 0) {
             *with_encoding = TRUE;

Modified: gnucash/branches/register-rewrite/src/backend/file/sixtp.h
===================================================================
--- gnucash/branches/register-rewrite/src/backend/file/sixtp.h	2006-05-29 19:24:38 UTC (rev 14237)
+++ gnucash/branches/register-rewrite/src/backend/file/sixtp.h	2006-05-29 19:45:18 UTC (rev 14238)
@@ -207,5 +207,8 @@
 gboolean gnc_is_our_xml_file(const char *filename, const char *first_tag,
                              gboolean *with_encoding);
 
+gboolean gnc_is_our_first_xml_chunk(char *chunk, const char *first_tag,
+                                    gboolean *with_encoding);
 
+
 #endif /* _SIXTP_H_ */

Modified: gnucash/branches/register-rewrite/src/backend/postgres/Makefile.am
===================================================================
--- gnucash/branches/register-rewrite/src/backend/postgres/Makefile.am	2006-05-29 19:24:38 UTC (rev 14237)
+++ gnucash/branches/register-rewrite/src/backend/postgres/Makefile.am	2006-05-29 19:45:18 UTC (rev 14238)
@@ -12,7 +12,7 @@
   ${QOF_CFLAGS} \
   ${GLIB_CFLAGS}
 
-libgnc_backend_postgres_la_LDFLAGS = -module 
+libgnc_backend_postgres_la_LDFLAGS = -module -avoid-version
 libgnc_backend_postgres_la_LIBADD  =  ${PGSQL_LIBS} -lpq  \
   ${top_builddir}/src/engine/libgncmod-engine.la \
   ${QOF_LIBS} \

Modified: gnucash/branches/register-rewrite/src/bin/gnucash-bin.c
===================================================================
--- gnucash/branches/register-rewrite/src/bin/gnucash-bin.c	2006-05-29 19:24:38 UTC (rev 14237)
+++ gnucash/branches/register-rewrite/src/bin/gnucash-bin.c	2006-05-29 19:45:18 UTC (rev 14238)
@@ -373,7 +373,11 @@
             gnc_module_load_optional(modules[i].name, modules[i].version);
         else
             gnc_module_load(modules[i].name, modules[i].version);
-    } 
+    }
+    if (!gnc_engine_is_initialized()) {
+        g_error("GnuCash engine failed to initialize.  Exiting.\n");
+        exit(0);
+    }
 }
 
 static void

Modified: gnucash/branches/register-rewrite/src/business/business-reports/aging.scm
===================================================================
--- gnucash/branches/register-rewrite/src/business/business-reports/aging.scm	2006-05-29 19:24:38 UTC (rev 14237)
+++ gnucash/branches/register-rewrite/src/business/business-reports/aging.scm	2006-05-29 19:45:18 UTC (rev 14238)
@@ -203,8 +203,8 @@
 			 this-currency
 			 (company-get-currency company-info)))
 		   (cons #f (sprintf
-			     (_ "Transactions relating to company  %d contain \
-more than one currency.  This report is not designed to cope with this possibility.")))
+			     (_ "Transactions relating to '%s' contain \
+more than one currency.  This report is not designed to cope with this possibility.")  (gnc:owner-get-name owner)))
 		   (begin
 		     (gnc:debug "it's an old company")
 		     (if (gnc:numeric-negative-p value)

Modified: gnucash/branches/register-rewrite/src/engine/gnc-engine.c
===================================================================
--- gnucash/branches/register-rewrite/src/engine/gnc-engine.c	2006-05-29 19:24:38 UTC (rev 14237)
+++ gnucash/branches/register-rewrite/src/engine/gnc-engine.c	2006-05-29 19:45:18 UTC (rev 14238)
@@ -75,10 +75,15 @@
 void 
 gnc_engine_init(int argc, char ** argv)
 {
-  static gchar *names[] = {
-      QSF_BACKEND_LIB, GNC_LIB_NAME, "gnc-backend-postgres", 
-      NULL};
-  gchar **np;
+  static struct {
+    const gchar* dir;
+    const gchar* lib;
+    gboolean required;
+  } libs[] = {
+    { GNC_LIBDIR, GNC_LIB_NAME, TRUE },
+    /* shouldn't the PG gnc-module do this instead of US doing it? */
+    { GNC_LIBDIR, "gnc-backend-postgres", FALSE },
+    { NULL, NULL, FALSE } }, *lib;
   gnc_engine_init_hook_t hook;
   GList * cur;
 
@@ -98,9 +103,21 @@
   /* Now register our core types */
   cashobjects_register();
 
-  for (np = names; *np; np++) {
-      if (qof_load_backend_library(GNC_LIBDIR, *np))
+  for (lib = libs; lib->dir && lib->lib ; lib++)
+  {
+      if (qof_load_backend_library(lib->dir, lib->lib))
+      {
           engine_is_initialized = 1;
+      }
+      else
+      {
+          g_message("failed to load %s from %s\n", lib->lib, lib->dir);
+	  /* If this is a required library, stop now! */
+	  if (lib->required)
+	  {
+	      g_message("required library %s not found.\n", lib->lib);
+	  }
+      }
   }
 
   /* call any engine hooks */

Modified: gnucash/branches/register-rewrite/src/gnome-utils/druid-gnc-xml-import.c
===================================================================
--- gnucash/branches/register-rewrite/src/gnome-utils/druid-gnc-xml-import.c	2006-05-29 19:24:38 UTC (rev 14237)
+++ gnucash/branches/register-rewrite/src/gnome-utils/druid-gnc-xml-import.c	2006-05-29 19:45:18 UTC (rev 14238)
@@ -141,6 +141,7 @@
 static void gxi_ambiguous_info_destroy (GncXmlImportData *data);
 static void gxi_session_destroy (GncXmlImportData *data);
 static void gxi_check_file (GncXmlImportData *data);
+static void gxi_sort_ambiguous_list (GncXmlImportData *data);
 static gboolean gxi_parse_file (GncXmlImportData *data);
 static gboolean gxi_save_file (GncXmlImportData *data);
 static void gxi_update_progress_bar (const gchar *message, double percentage);
@@ -499,7 +500,7 @@
     }
   } else {
     if (string_b) {
-      /* b looks good, a not. pub a to the top */
+      /* b looks good, a not. put a to the top */
       return -1;
     } else {
       /* both look suboptimal, see whether one has a decision attached to it */
@@ -569,8 +570,6 @@
 static void
 gxi_check_file (GncXmlImportData *data)
 {
-  GError *error=NULL;
-
   if (!data->encodings) {
     gboolean is_utf8;
     const gchar *locale_enc;
@@ -629,19 +628,25 @@
 
   /* analyze file */
   data->n_impossible = (*find_ambiguous) (
-    data->filename, data->encodings, &data->unique, &data->ambiguous_ht,
-    NULL, &error);
+    data->filename, data->encodings, &data->unique, &data->ambiguous_ht, NULL);
 
   if (data->n_impossible != -1) {
     /* sort ambiguous words */
     g_hash_table_foreach (data->ambiguous_ht, (GHFunc)ambiguous_list_insert,
                           data);
-    data->ambiguous_list = g_list_sort_with_data (
-      data->ambiguous_list, (GCompareDataFunc) ambiguous_cmp, data);
+    gxi_sort_ambiguous_list (data);
   }
 }
 
 static void
+gxi_sort_ambiguous_list (GncXmlImportData *data)
+{
+  data->ambiguous_list = g_list_sort_with_data (
+    data->ambiguous_list, (GCompareDataFunc) ambiguous_cmp, data);
+
+}
+
+static void
 subst_insert_amb (gchar *byte_sequence, GList *conv_list, GncXmlImportData *data)
 {
   conv_type *choice;
@@ -1137,7 +1142,7 @@
   }
 
   data->default_encoding = curr_enc;
-  gxi_check_file (data);
+  gxi_sort_ambiguous_list (data);
   gxi_update_string_box (data);
   gxi_update_conversion_forward (data);
 }

Modified: gnucash/branches/register-rewrite/src/gnome-utils/gnc-tree-view.c
===================================================================
--- gnucash/branches/register-rewrite/src/gnome-utils/gnc-tree-view.c	2006-05-29 19:24:38 UTC (rev 14237)
+++ gnucash/branches/register-rewrite/src/gnome-utils/gnc-tree-view.c	2006-05-29 19:45:18 UTC (rev 14238)
@@ -617,15 +617,19 @@
   /* Set defaults, then extract data from the model */
   if (!gtk_tree_sortable_get_sort_column_id(treesortable, &id, &order)) {
     order = GTK_SORT_ASCENDING;
-    id = 0;
+    id = GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID;
   }
   column = view_column_find_by_model_id (view, id);
   column_pref_name = g_object_get_data(G_OBJECT(column), PREF_NAME);
 
+  if (!column_pref_name)
+      column_pref_name = "none";
+
   /* Store the values in gconf */
   gconf_section = priv->gconf_section;
-  gnc_gconf_set_string(gconf_section, "sort_column", column_pref_name, NULL);
-  gnc_gconf_set_string(gconf_section, "sort_order",
+  gnc_gconf_set_string(gconf_section, GCONF_KEY_SORT_COLUMN, 
+                       column_pref_name, NULL);
+  gnc_gconf_set_string(gconf_section, GCONF_KEY_SORT_ORDER,
 		       gnc_enum_to_nick(GTK_TYPE_SORT_TYPE, order), NULL);
   LEAVE(" ");
 }
@@ -900,7 +904,7 @@
   order = gnc_enum_from_nick(GTK_TYPE_SORT_TYPE, name, GTK_SORT_ASCENDING);
   if (!gtk_tree_sortable_get_sort_column_id(GTK_TREE_SORTABLE(s_model),
 					    &current, &order))
-    current = 0;
+      current = GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID;
   g_signal_handler_block(s_model, priv->sort_column_changed_cb_id);
   gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(s_model),
 				       current, order);
@@ -1644,7 +1648,9 @@
     columns = gtk_tree_view_get_columns(GTK_TREE_VIEW(view));
     for (node = columns; node; node = node->next) {
         GtkTreeViewColumn *col = GTK_TREE_VIEW_COLUMN(node->data);
-        if (gnc_tree_view_column_visible (view, col, NULL))
+        
+        if (g_object_get_data(G_OBJECT(col), DEFAULT_VISIBLE) || 
+            g_object_get_data(G_OBJECT(col), ALWAYS_VISIBLE))
             count++;
     }
     g_list_free(columns);
@@ -1733,9 +1739,8 @@
     g_object_set_data(G_OBJECT(column), PREF_NAME, (gpointer)pref_name);
   if (data_column == 0)
     g_object_set_data(G_OBJECT(column), ALWAYS_VISIBLE, GINT_TO_POINTER(1));
-  if (data_column != GNC_TREE_VIEW_COLUMN_DATA_NONE)
-    g_object_set_data(G_OBJECT(column), MODEL_COLUMN,
-		      GINT_TO_POINTER(data_column));
+  g_object_set_data(G_OBJECT(column), MODEL_COLUMN, 
+                    GINT_TO_POINTER(data_column));
 
   /* Get visibility */
   visible = gnc_tree_view_column_visible(view, NULL, pref_name);

Modified: gnucash/branches/register-rewrite/src/import-export/hbci/druid-hbci-initial.c
===================================================================
--- gnucash/branches/register-rewrite/src/import-export/hbci/druid-hbci-initial.c	2006-05-29 19:24:38 UTC (rev 14237)
+++ gnucash/branches/register-rewrite/src/import-export/hbci/druid-hbci-initial.c	2006-05-29 19:45:18 UTC (rev 14238)
@@ -45,6 +45,7 @@
 #include "gnc-component-manager.h"
 
 #include <aqbanking/banking.h>
+#include <aqbanking/version.h>
 #include <gwenhywfar/stringlist.h>
 #include <gwenhywfar/version.h>
 
@@ -443,6 +444,17 @@
   }
 }
 
+#if (AQBANKING_VERSION_MAJOR > 1) || \
+  ((AQBANKING_VERSION_MAJOR == 1) && \
+    (AQBANKING_VERSION_MINOR == 9) && \
+     (AQBANKING_VERSION_PATCHLEVEL > 0))
+/* The wizard choice has changed with aqbanking >= 1.9.1; we don't
+   need to specify a "backend" for the wizard anymore but instead
+   there is only one wizard for all backends now. */
+# define AQBANKING_WIZARD_ALLBACKENDS
+#else
+# undef AQBANKING_WIZARD_ALLBACKENDS
+#endif
 
 static void
 on_aqhbci_button (GtkButton *button,
@@ -451,8 +463,6 @@
   HBCIInitialInfo *info = user_data;
   GWEN_BUFFER *buf;
   int res;
-  GWEN_PLUGIN_DESCRIPTION_LIST2 *pluginlist;
-  const char *backend_name_nc;
   char *backend_name;
 
   /* This is the point where we look for and start an external
@@ -469,6 +479,12 @@
   AB_BANKING *banking = info->api;
   g_assert(info->druid);
 
+  /* See note above about wizard choice. */
+#ifndef AQBANKING_WIZARD_ALLBACKENDS
+  {
+  GWEN_PLUGIN_DESCRIPTION_LIST2 *pluginlist;
+  const char *backend_name_nc;
+
   /* Get list of all backends, active or inactive */
   pluginlist = AB_Banking_GetProviderDescrs (banking);
 
@@ -545,7 +561,12 @@
      gwenhywfar>=1.98.x */
   GWEN_PluginDescription_List2_free (pluginlist);
 #endif
+  }
 
+#else /* AQBANKING_WIZARD_ALLBACKENDS */
+  backend_name = g_strdup("");
+#endif /* AQBANKING_WIZARD_ALLBACKENDS */
+
   /* ***** */
 
   /* Now find out the wizard name for that backend */
@@ -603,7 +624,9 @@
     }
 
     if (res == 0) {
+#ifndef AQBANKING_WIZARD_ALLBACKENDS
       res = AB_Banking_ActivateProvider(banking, backend_name);
+#endif
       if ((res == 0) || (res == AB_ERROR_FOUND))
 	druid_enable_next_button(info);
       else {

Modified: gnucash/branches/register-rewrite/src/import-export/hbci/gnc-hbci-utils.c
===================================================================
--- gnucash/branches/register-rewrite/src/import-export/hbci/gnc-hbci-utils.c	2006-05-29 19:24:38 UTC (rev 14237)
+++ gnucash/branches/register-rewrite/src/import-export/hbci/gnc-hbci-utils.c	2006-05-29 19:45:18 UTC (rev 14238)
@@ -423,12 +423,7 @@
   do {
     if (inter) {
       GNCInteractor_show_nodelete (inter);
-#if (AQBANKING_VERSION_MAJOR > 0) || (AQBANKING_VERSION_MINOR > 9) || \
-  ((AQBANKING_VERSION_MINOR == 9) && \
-   ((AQBANKING_VERSION_PATCHLEVEL > 7) || \
-    ((AQBANKING_VERSION_PATCHLEVEL == 7) && (AQBANKING_VERSION_BUILD > 1))))
       AB_Banking_SetPinCacheEnabled (api, GNCInteractor_get_cache_valid(inter));
-#endif
     }
 
     err = AB_Banking_ExecuteQueue (api);

Modified: gnucash/branches/register-rewrite/src/pixmaps/gnucash_splash.png
===================================================================
(Binary files differ)

