r15565 - gnucash/branches/remove-group2 - Sync changes 15253:15563 into the branch.

David Hampton hampton at cvs.gnucash.org
Sun Feb 11 14:55:29 EST 2007


Author: hampton
Date: 2007-02-11 14:54:51 -0500 (Sun, 11 Feb 2007)
New Revision: 15565
Trac: http://svn.gnucash.org/trac/changeset/15565

Added:
   gnucash/branches/remove-group2/ChangeLog.2006
   gnucash/branches/remove-group2/accounts/fr_CA/
   gnucash/branches/remove-group2/lib/glib28/
   gnucash/branches/remove-group2/lib/libc/pow.h
   gnucash/branches/remove-group2/packaging/win32/exetype.pl
   gnucash/branches/remove-group2/packaging/win32/libofx-0.8.3-patch.diff
   gnucash/branches/remove-group2/packaging/win32/opensp-1.5.2-patch.diff
   gnucash/branches/remove-group2/src/app-utils/gnc-sx-instance-model.c
   gnucash/branches/remove-group2/src/app-utils/gnc-sx-instance-model.h
   gnucash/branches/remove-group2/src/app-utils/test/test-sx.c
   gnucash/branches/remove-group2/src/business/business-core/gncmod-business-core.c
   gnucash/branches/remove-group2/src/business/business-gnome/gncmod-business-gnome.c
   gnucash/branches/remove-group2/src/doc/sx.rst
   gnucash/branches/remove-group2/src/gnome-utils/gnc-dense-cal-model.c
   gnucash/branches/remove-group2/src/gnome-utils/gnc-dense-cal-model.h
   gnucash/branches/remove-group2/src/gnome-utils/gnc-dense-cal-store.c
   gnucash/branches/remove-group2/src/gnome-utils/gnc-dense-cal-store.h
   gnucash/branches/remove-group2/src/gnome-utils/gnc-sx-instance-dense-cal-adapter.c
   gnucash/branches/remove-group2/src/gnome-utils/gnc-sx-instance-dense-cal-adapter.h
   gnucash/branches/remove-group2/src/gnome-utils/test/test-sx.c
   gnucash/branches/remove-group2/src/gnome/dialog-sx-editor.c
   gnucash/branches/remove-group2/src/gnome/dialog-sx-editor.h
   gnucash/branches/remove-group2/src/gnome/dialog-sx-since-last-run.c
   gnucash/branches/remove-group2/src/gnome/dialog-sx-since-last-run.h
   gnucash/branches/remove-group2/src/gnome/gnc-plugin-page-sx-list.c
   gnucash/branches/remove-group2/src/gnome/gnc-plugin-page-sx-list.h
   gnucash/branches/remove-group2/src/gnome/gnc-sx-list-tree-model-adapter.c
   gnucash/branches/remove-group2/src/gnome/gnc-sx-list-tree-model-adapter.h
   gnucash/branches/remove-group2/src/gnome/ui/gnc-plugin-page-sx-list-ui.xml
Removed:
   gnucash/branches/remove-group2/gnucash-config.in
   gnucash/branches/remove-group2/gnucash.m4
   gnucash/branches/remove-group2/lib/glib26/
   gnucash/branches/remove-group2/lib/goffice-0.0.4/goffice/glib24_26-compat.c
   gnucash/branches/remove-group2/lib/goffice-0.0.4/goffice/glib24_26-compat.h
   gnucash/branches/remove-group2/lib/libgsf-1.12.3/gsf/glib24_26-compat.c
   gnucash/branches/remove-group2/lib/libgsf-1.12.3/gsf/glib24_26-compat.h
   gnucash/branches/remove-group2/src/business/business-core/businessmod-core.c
   gnucash/branches/remove-group2/src/business/business-gnome/businessmod-gnome.c
   gnucash/branches/remove-group2/src/gnome/dialog-scheduledxaction.c
   gnucash/branches/remove-group2/src/gnome/dialog-scheduledxaction.h
   gnucash/branches/remove-group2/src/gnome/dialog-sxsincelast.c
   gnucash/branches/remove-group2/src/gnome/dialog-sxsincelast.h
   gnucash/branches/remove-group2/src/gtk-compat.h
Modified:
   gnucash/branches/remove-group2/
   gnucash/branches/remove-group2/ChangeLog
   gnucash/branches/remove-group2/Makefile.am
   gnucash/branches/remove-group2/README.dependencies
   gnucash/branches/remove-group2/accounts/Makefile.am
   gnucash/branches/remove-group2/accounts/fr_CA/acctchrt_actifsfixes.gnucash-xea
   gnucash/branches/remove-group2/accounts/fr_CA/acctchrt_automobile.gnucash-xea
   gnucash/branches/remove-group2/accounts/fr_CA/acctchrt_basecommune.gnucash-xea
   gnucash/branches/remove-group2/accounts/fr_CA/acctchrt_cdmarchemon.gnucash-xea
   gnucash/branches/remove-group2/accounts/fr_CA/acctchrt_chequier.gnucash-xea
   gnucash/branches/remove-group2/accounts/fr_CA/acctchrt_conjointretraite.gnucash-xea
   gnucash/branches/remove-group2/accounts/fr_CA/acctchrt_conjointrev.gnucash-xea
   gnucash/branches/remove-group2/accounts/fr_CA/acctchrt_courtage.gnucash-xea
   gnucash/branches/remove-group2/accounts/fr_CA/acctchrt_etudeemprunt.gnucash-xea
   gnucash/branches/remove-group2/accounts/fr_CA/acctchrt_garderie.gnucash-xea
   gnucash/branches/remove-group2/accounts/fr_CA/acctchrt_locataire.gnucash-xea
   gnucash/branches/remove-group2/accounts/fr_CA/acctchrt_proprietaire.gnucash-xea
   gnucash/branches/remove-group2/accounts/fr_CA/acctchrt_retraite.gnucash-xea
   gnucash/branches/remove-group2/accounts/fr_CA/acctchrt_revenus.gnucash-xea
   gnucash/branches/remove-group2/autogen.sh
   gnucash/branches/remove-group2/configure.in
   gnucash/branches/remove-group2/doc/README.dependencies
   gnucash/branches/remove-group2/goffice-config.h.in
   gnucash/branches/remove-group2/gsf-config.h.in
   gnucash/branches/remove-group2/lib/Makefile.am
   gnucash/branches/remove-group2/lib/goffice-0.0.4/goffice/Makefile.am
   gnucash/branches/remove-group2/lib/goffice-0.0.4/goffice/drawing/god-drawing-renderer-gdk.c
   gnucash/branches/remove-group2/lib/goffice-0.0.4/goffice/graph/gog-chart.c
   gnucash/branches/remove-group2/lib/goffice-0.0.4/goffice/graph/gog-object.c
   gnucash/branches/remove-group2/lib/goffice-0.0.4/goffice/graph/gog-plot.c
   gnucash/branches/remove-group2/lib/goffice-0.0.4/goffice/gtk/goffice-gtk.c
   gnucash/branches/remove-group2/lib/goffice-0.0.4/goffice/utils/datetime.c
   gnucash/branches/remove-group2/lib/goffice-0.0.4/goffice/utils/go-libxml-extras.c
   gnucash/branches/remove-group2/lib/libc/Makefile.am
   gnucash/branches/remove-group2/lib/libgsf-1.12.3/gsf/Makefile.am
   gnucash/branches/remove-group2/lib/libgsf-1.12.3/gsf/gsf-input-memory.c
   gnucash/branches/remove-group2/lib/libgsf-1.12.3/gsf/gsf-input-stdio.c
   gnucash/branches/remove-group2/lib/libgsf-1.12.3/gsf/gsf-outfile-stdio.c
   gnucash/branches/remove-group2/lib/libgsf-1.12.3/gsf/gsf-outfile-zip.c
   gnucash/branches/remove-group2/lib/libgsf-1.12.3/gsf/gsf-output-stdio.c
   gnucash/branches/remove-group2/lib/libgsf-1.12.3/gsf/gsf-utils.c
   gnucash/branches/remove-group2/lib/libgsf-1.12.3/tests/test-cp-zip.c
   gnucash/branches/remove-group2/lib/libqof/backend/file/Makefile.am
   gnucash/branches/remove-group2/lib/libqof/backend/file/qsf-backend.c
   gnucash/branches/remove-group2/lib/libqof/qof/Makefile.am
   gnucash/branches/remove-group2/lib/libqof/qof/deprecated.c
   gnucash/branches/remove-group2/lib/libqof/qof/deprecated.h
   gnucash/branches/remove-group2/lib/libqof/qof/gnc-date.c
   gnucash/branches/remove-group2/lib/libqof/qof/gnc-date.h
   gnucash/branches/remove-group2/lib/libqof/qof/gnc-numeric.c
   gnucash/branches/remove-group2/lib/libqof/qof/guid.c
   gnucash/branches/remove-group2/lib/libqof/qof/kvp_frame.h
   gnucash/branches/remove-group2/lib/libqof/qof/qof.h
   gnucash/branches/remove-group2/lib/libqof/qof/qofbackend.c
   gnucash/branches/remove-group2/lib/libqof/qof/qofbackend.h
   gnucash/branches/remove-group2/lib/libqof/qof/qofbookmerge.h
   gnucash/branches/remove-group2/lib/libqof/qof/qofchoice.h
   gnucash/branches/remove-group2/lib/libqof/qof/qofclass.h
   gnucash/branches/remove-group2/lib/libqof/qof/qofid.h
   gnucash/branches/remove-group2/lib/libqof/qof/qoflog.c
   gnucash/branches/remove-group2/lib/libqof/qof/qoflog.h
   gnucash/branches/remove-group2/lib/libqof/qof/qofmath128.c
   gnucash/branches/remove-group2/lib/libqof/qof/qofobject.h
   gnucash/branches/remove-group2/lib/libqof/qof/qofquery.c
   gnucash/branches/remove-group2/lib/libqof/qof/qofquery.h
   gnucash/branches/remove-group2/lib/libqof/qof/qofsession.h
   gnucash/branches/remove-group2/lib/libqof/qof/qofsql.c
   gnucash/branches/remove-group2/lib/libqof/qof/qofutil.c
   gnucash/branches/remove-group2/lib/libqof/qof/qofutil.h
   gnucash/branches/remove-group2/macros/ac_pkg_swig.m4
   gnucash/branches/remove-group2/macros/binreloc.m4
   gnucash/branches/remove-group2/packaging/gnucash.spec.in
   gnucash/branches/remove-group2/packaging/win32/README
   gnucash/branches/remove-group2/packaging/win32/custom.sh
   gnucash/branches/remove-group2/packaging/win32/dist.sh
   gnucash/branches/remove-group2/packaging/win32/functions
   gnucash/branches/remove-group2/packaging/win32/gnucash.iss.in
   gnucash/branches/remove-group2/packaging/win32/install.sh
   gnucash/branches/remove-group2/packaging/win32/reset.sh
   gnucash/branches/remove-group2/po/de.po
   gnucash/branches/remove-group2/src/Makefile.am
   gnucash/branches/remove-group2/src/app-utils/Makefile.am
   gnucash/branches/remove-group2/src/app-utils/file-utils.c
   gnucash/branches/remove-group2/src/app-utils/file-utils.h
   gnucash/branches/remove-group2/src/app-utils/gfec.c
   gnucash/branches/remove-group2/src/app-utils/gnc-ui-util.c
   gnucash/branches/remove-group2/src/app-utils/gncmod-app-utils.c
   gnucash/branches/remove-group2/src/app-utils/prefs.scm
   gnucash/branches/remove-group2/src/app-utils/test/
   gnucash/branches/remove-group2/src/app-utils/test/Makefile.am
   gnucash/branches/remove-group2/src/app-utils/test/test-exp-parser.c
   gnucash/branches/remove-group2/src/app-utils/test/test-load-module
   gnucash/branches/remove-group2/src/backend/file/Makefile.am
   gnucash/branches/remove-group2/src/backend/file/gnc-account-xml-v2.c
   gnucash/branches/remove-group2/src/backend/file/gnc-backend-file.c
   gnucash/branches/remove-group2/src/backend/file/gnc-lot-xml-v2.c
   gnucash/branches/remove-group2/src/backend/file/gnc-schedxaction-xml-v2.c
   gnucash/branches/remove-group2/src/backend/file/gncmod-backend-file.c
   gnucash/branches/remove-group2/src/backend/file/io-example-account.c
   gnucash/branches/remove-group2/src/backend/file/io-gncxml-v2.c
   gnucash/branches/remove-group2/src/backend/file/sixtp-dom-parsers.c
   gnucash/branches/remove-group2/src/backend/file/sixtp-utils.c
   gnucash/branches/remove-group2/src/backend/file/sixtp.c
   gnucash/branches/remove-group2/src/backend/file/test/Makefile.am
   gnucash/branches/remove-group2/src/backend/file/test/test-dom-parser1.c
   gnucash/branches/remove-group2/src/backend/file/test/test-file-stuff.c
   gnucash/branches/remove-group2/src/backend/file/test/test-kvp-frames.c
   gnucash/branches/remove-group2/src/backend/file/test/test-load-backend.c
   gnucash/branches/remove-group2/src/backend/file/test/test-load-example-account.c
   gnucash/branches/remove-group2/src/backend/file/test/test-load-xml2.c
   gnucash/branches/remove-group2/src/backend/file/test/test-save-in-lang.c
   gnucash/branches/remove-group2/src/backend/file/test/test-string-converters.c
   gnucash/branches/remove-group2/src/backend/file/test/test-xml-account.c
   gnucash/branches/remove-group2/src/backend/file/test/test-xml-commodity.c
   gnucash/branches/remove-group2/src/backend/file/test/test-xml-pricedb.c
   gnucash/branches/remove-group2/src/backend/file/test/test-xml-transaction.c
   gnucash/branches/remove-group2/src/backend/file/test/test-xml2-is-file.c
   gnucash/branches/remove-group2/src/backend/postgres/Makefile.am
   gnucash/branches/remove-group2/src/backend/postgres/PostgresBackend.c
   gnucash/branches/remove-group2/src/backend/postgres/checkpoint.c
   gnucash/branches/remove-group2/src/backend/postgres/test/Makefile.am
   gnucash/branches/remove-group2/src/backend/postgres/test/test-db.c
   gnucash/branches/remove-group2/src/backend/postgres/test/test-period.c
   gnucash/branches/remove-group2/src/bin/Makefile.am
   gnucash/branches/remove-group2/src/bin/gnucash-bin.c
   gnucash/branches/remove-group2/src/bin/gnucash-valgrind.in
   gnucash/branches/remove-group2/src/bin/gnucash.in
   gnucash/branches/remove-group2/src/bin/overrides/Makefile.am
   gnucash/branches/remove-group2/src/bin/overrides/gnucash-build-env.in
   gnucash/branches/remove-group2/src/bin/overrides/gnucash-env.in
   gnucash/branches/remove-group2/src/bin/test/Makefile.am
   gnucash/branches/remove-group2/src/business/business-core/Makefile.am
   gnucash/branches/remove-group2/src/business/business-core/file/Makefile.am
   gnucash/branches/remove-group2/src/business/business-core/file/gncmod-business-backend-file.c
   gnucash/branches/remove-group2/src/business/business-core/test/Makefile.am
   gnucash/branches/remove-group2/src/business/business-core/test/test-customer.c
   gnucash/branches/remove-group2/src/business/business-core/test/test-employee.c
   gnucash/branches/remove-group2/src/business/business-core/test/test-job.c
   gnucash/branches/remove-group2/src/business/business-core/test/test-vendor.c
   gnucash/branches/remove-group2/src/business/business-gnome/Makefile.am
   gnucash/branches/remove-group2/src/business/business-gnome/dialog-invoice.c
   gnucash/branches/remove-group2/src/business/business-gnome/glade/billterms.glade
   gnucash/branches/remove-group2/src/business/business-gnome/glade/businessprefs.glade
   gnucash/branches/remove-group2/src/business/business-gnome/glade/choose-owner.glade
   gnucash/branches/remove-group2/src/business/business-gnome/glade/customer.glade
   gnucash/branches/remove-group2/src/business/business-gnome/glade/date-close.glade
   gnucash/branches/remove-group2/src/business/business-gnome/glade/employee.glade
   gnucash/branches/remove-group2/src/business/business-gnome/glade/invoice.glade
   gnucash/branches/remove-group2/src/business/business-gnome/glade/job.glade
   gnucash/branches/remove-group2/src/business/business-gnome/glade/order.glade
   gnucash/branches/remove-group2/src/business/business-gnome/glade/payment.glade
   gnucash/branches/remove-group2/src/business/business-gnome/glade/vendor.glade
   gnucash/branches/remove-group2/src/business/business-gnome/gnc-plugin-business.c
   gnucash/branches/remove-group2/src/business/business-gnome/gnc-plugin-page-invoice.c
   gnucash/branches/remove-group2/src/business/business-gnome/search-owner.c
   gnucash/branches/remove-group2/src/business/business-gnome/search-owner.h
   gnucash/branches/remove-group2/src/business/business-ledger/Makefile.am
   gnucash/branches/remove-group2/src/business/business-reports/Makefile.am
   gnucash/branches/remove-group2/src/business/business-reports/aging.scm
   gnucash/branches/remove-group2/src/business/business-reports/easy-invoice.scm
   gnucash/branches/remove-group2/src/business/business-reports/fancy-invoice.scm
   gnucash/branches/remove-group2/src/business/business-reports/invoice.scm
   gnucash/branches/remove-group2/src/business/business-utils/Makefile.am
   gnucash/branches/remove-group2/src/business/business-utils/gncmod-business-utils.c
   gnucash/branches/remove-group2/src/business/dialog-tax-table/Makefile.am
   gnucash/branches/remove-group2/src/business/dialog-tax-table/gncmod-dialog-tax-table.c
   gnucash/branches/remove-group2/src/business/dialog-tax-table/tax-tables.glade
   gnucash/branches/remove-group2/src/calculation/Makefile.am
   gnucash/branches/remove-group2/src/calculation/fin.c
   gnucash/branches/remove-group2/src/calculation/gncmod-calculation.c
   gnucash/branches/remove-group2/src/calculation/test/Makefile.am
   gnucash/branches/remove-group2/src/core-utils/Makefile.am
   gnucash/branches/remove-group2/src/core-utils/core-utils.scm
   gnucash/branches/remove-group2/src/core-utils/gnc-gkeyfile-utils.c
   gnucash/branches/remove-group2/src/core-utils/gnc-gkeyfile-utils.h
   gnucash/branches/remove-group2/src/core-utils/gnc-glib-utils.c
   gnucash/branches/remove-group2/src/core-utils/gnc-glib-utils.h
   gnucash/branches/remove-group2/src/core-utils/gnc-gtk-utils.c
   gnucash/branches/remove-group2/src/core-utils/gnc-gtk-utils.h
   gnucash/branches/remove-group2/src/doc/loans.txt
   gnucash/branches/remove-group2/src/doc/xml/gnucash-v2.rnc
   gnucash/branches/remove-group2/src/engine/FreqSpec.c
   gnucash/branches/remove-group2/src/engine/Makefile.am
   gnucash/branches/remove-group2/src/engine/SX-book-p.h
   gnucash/branches/remove-group2/src/engine/SX-book.c
   gnucash/branches/remove-group2/src/engine/SX-book.h
   gnucash/branches/remove-group2/src/engine/SchedXaction.c
   gnucash/branches/remove-group2/src/engine/SchedXaction.h
   gnucash/branches/remove-group2/src/engine/SchedXactionP.h
   gnucash/branches/remove-group2/src/engine/Split.c
   gnucash/branches/remove-group2/src/engine/TransLog.c
   gnucash/branches/remove-group2/src/engine/gnc-commodity.c
   gnucash/branches/remove-group2/src/engine/gnc-engine.c
   gnucash/branches/remove-group2/src/engine/gnc-engine.h
   gnucash/branches/remove-group2/src/engine/gnc-filepath-utils.c
   gnucash/branches/remove-group2/src/engine/gnc-hooks.c
   gnucash/branches/remove-group2/src/engine/gncmod-engine.c
   gnucash/branches/remove-group2/src/engine/iso-4217-currencies.scm
   gnucash/branches/remove-group2/src/engine/test-core/Makefile.am
   gnucash/branches/remove-group2/src/engine/test-core/gncmod-test-engine.c
   gnucash/branches/remove-group2/src/engine/test-core/test-engine-stuff.c
   gnucash/branches/remove-group2/src/engine/test-core/test-engine-stuff.h
   gnucash/branches/remove-group2/src/engine/test/Makefile.am
   gnucash/branches/remove-group2/src/engine/test/test-book-merge.c
   gnucash/branches/remove-group2/src/engine/test/test-commodities.c
   gnucash/branches/remove-group2/src/engine/test/test-freq-spec.c
   gnucash/branches/remove-group2/src/engine/test/test-group-vs-book.c
   gnucash/branches/remove-group2/src/engine/test/test-guid.c
   gnucash/branches/remove-group2/src/engine/test/test-load-engine.c
   gnucash/branches/remove-group2/src/engine/test/test-lots.c
   gnucash/branches/remove-group2/src/engine/test/test-numeric.c
   gnucash/branches/remove-group2/src/engine/test/test-object.c
   gnucash/branches/remove-group2/src/engine/test/test-period.c
   gnucash/branches/remove-group2/src/engine/test/test-query.c
   gnucash/branches/remove-group2/src/engine/test/test-querynew.c
   gnucash/branches/remove-group2/src/engine/test/test-recurrence.c
   gnucash/branches/remove-group2/src/engine/test/test-resolve-file-path.c
   gnucash/branches/remove-group2/src/engine/test/test-split-vs-account.c
   gnucash/branches/remove-group2/src/engine/test/test-transaction-reversal.c
   gnucash/branches/remove-group2/src/engine/test/test-transaction-voiding.c
   gnucash/branches/remove-group2/src/gnc-module/Makefile.am
   gnucash/branches/remove-group2/src/gnc-module/gnc-module.c
   gnucash/branches/remove-group2/src/gnc-module/gnc-module.scm
   gnucash/branches/remove-group2/src/gnc-module/test/Makefile.am
   gnucash/branches/remove-group2/src/gnc-module/test/misc-mods/Makefile.am
   gnucash/branches/remove-group2/src/gnc-module/test/misc-mods/agedver.c
   gnucash/branches/remove-group2/src/gnc-module/test/misc-mods/futuremodsys.c
   gnucash/branches/remove-group2/src/gnc-module/test/misc-mods/incompatdep.c
   gnucash/branches/remove-group2/src/gnc-module/test/mod-bar/Makefile.am
   gnucash/branches/remove-group2/src/gnc-module/test/mod-bar/gnc-mod-bar.c
   gnucash/branches/remove-group2/src/gnc-module/test/mod-baz/Makefile.am
   gnucash/branches/remove-group2/src/gnc-module/test/mod-baz/gnc-mod-baz.c
   gnucash/branches/remove-group2/src/gnc-module/test/mod-foo/Makefile.am
   gnucash/branches/remove-group2/src/gnc-module/test/mod-foo/gnc-mod-foo.c
   gnucash/branches/remove-group2/src/gnc-module/test/test-dynload.c
   gnucash/branches/remove-group2/src/gnc-module/test/test-scm-dynload
   gnucash/branches/remove-group2/src/gnc-test-env
   gnucash/branches/remove-group2/src/gnome-search/Makefile.am
   gnucash/branches/remove-group2/src/gnome-search/gnc-general-search.c
   gnucash/branches/remove-group2/src/gnome-search/gnc-general-search.h
   gnucash/branches/remove-group2/src/gnome-search/gncmod-gnome-search.c
   gnucash/branches/remove-group2/src/gnome-search/search-account.c
   gnucash/branches/remove-group2/src/gnome-search/search-account.h
   gnucash/branches/remove-group2/src/gnome-search/search-boolean.c
   gnucash/branches/remove-group2/src/gnome-search/search-boolean.h
   gnucash/branches/remove-group2/src/gnome-search/search-date.c
   gnucash/branches/remove-group2/src/gnome-search/search-date.h
   gnucash/branches/remove-group2/src/gnome-search/search-double.c
   gnucash/branches/remove-group2/src/gnome-search/search-double.h
   gnucash/branches/remove-group2/src/gnome-search/search-int64.c
   gnucash/branches/remove-group2/src/gnome-search/search-int64.h
   gnucash/branches/remove-group2/src/gnome-search/search-numeric.c
   gnucash/branches/remove-group2/src/gnome-search/search-numeric.h
   gnucash/branches/remove-group2/src/gnome-search/search-reconciled.c
   gnucash/branches/remove-group2/src/gnome-search/search-reconciled.h
   gnucash/branches/remove-group2/src/gnome-search/search-string.c
   gnucash/branches/remove-group2/src/gnome-search/search-string.h
   gnucash/branches/remove-group2/src/gnome-search/search.glade
   gnucash/branches/remove-group2/src/gnome-utils/Makefile.am
   gnucash/branches/remove-group2/src/gnome-utils/dialog-account.c
   gnucash/branches/remove-group2/src/gnome-utils/dialog-options.c
   gnucash/branches/remove-group2/src/gnome-utils/dialog-preferences.c
   gnucash/branches/remove-group2/src/gnome-utils/dialog-utils.c
   gnucash/branches/remove-group2/src/gnome-utils/dialog-utils.h
   gnucash/branches/remove-group2/src/gnome-utils/druid-gconf-setup.c
   gnucash/branches/remove-group2/src/gnome-utils/glade/commodity.glade
   gnucash/branches/remove-group2/src/gnome-utils/glade/dialog-query-list.glade
   gnucash/branches/remove-group2/src/gnome-utils/glade/dialog-reset-warnings.glade
   gnucash/branches/remove-group2/src/gnome-utils/glade/druid-gconf-setup.glade
   gnucash/branches/remove-group2/src/gnome-utils/glade/druid-gnc-xml-import.glade
   gnucash/branches/remove-group2/src/gnome-utils/glade/druid-provider-multifile.glade
   gnucash/branches/remove-group2/src/gnome-utils/glade/exchange-dialog.glade
   gnucash/branches/remove-group2/src/gnome-utils/glade/gnc-date-format.glade
   gnucash/branches/remove-group2/src/gnome-utils/glade/gnc-gui-query.glade
   gnucash/branches/remove-group2/src/gnome-utils/glade/preferences.glade
   gnucash/branches/remove-group2/src/gnome-utils/glade/totd.glade
   gnucash/branches/remove-group2/src/gnome-utils/glade/transfer.glade
   gnucash/branches/remove-group2/src/gnome-utils/gnc-date-edit.h
   gnucash/branches/remove-group2/src/gnome-utils/gnc-dense-cal.c
   gnucash/branches/remove-group2/src/gnome-utils/gnc-dense-cal.h
   gnucash/branches/remove-group2/src/gnome-utils/gnc-embedded-window.c
   gnucash/branches/remove-group2/src/gnome-utils/gnc-file.c
   gnucash/branches/remove-group2/src/gnome-utils/gnc-frequency.c
   gnucash/branches/remove-group2/src/gnome-utils/gnc-frequency.h
   gnucash/branches/remove-group2/src/gnome-utils/gnc-html-graph-gog.c
   gnucash/branches/remove-group2/src/gnome-utils/gnc-html.c
   gnucash/branches/remove-group2/src/gnome-utils/gnc-main-window.c
   gnucash/branches/remove-group2/src/gnome-utils/gnc-plugin-file-history.c
   gnucash/branches/remove-group2/src/gnome-utils/gnc-plugin-page.h
   gnucash/branches/remove-group2/src/gnome-utils/gnc-plugin.c
   gnucash/branches/remove-group2/src/gnome-utils/gnc-query-list.c
   gnucash/branches/remove-group2/src/gnome-utils/gnc-query-list.h
   gnucash/branches/remove-group2/src/gnome-utils/gnc-tree-model-account.c
   gnucash/branches/remove-group2/src/gnome-utils/gnc-tree-model-commodity.c
   gnucash/branches/remove-group2/src/gnome-utils/gnc-tree-model-selection.c
   gnucash/branches/remove-group2/src/gnome-utils/gnc-tree-view-account.c
   gnucash/branches/remove-group2/src/gnome-utils/gnc-tree-view-commodity.c
   gnucash/branches/remove-group2/src/gnome-utils/gnc-tree-view-price.c
   gnucash/branches/remove-group2/src/gnome-utils/gnc-tree-view.c
   gnucash/branches/remove-group2/src/gnome-utils/gnc-tree-view.h
   gnucash/branches/remove-group2/src/gnome-utils/gncmod-gnome-utils.c
   gnucash/branches/remove-group2/src/gnome-utils/gnctreemodelsort.c
   gnucash/branches/remove-group2/src/gnome-utils/test/
   gnucash/branches/remove-group2/src/gnome-utils/test/Makefile.am
   gnucash/branches/remove-group2/src/gnome-utils/window-main-summarybar.c
   gnucash/branches/remove-group2/src/gnome/Makefile.am
   gnucash/branches/remove-group2/src/gnome/dialog-chart-export.c
   gnucash/branches/remove-group2/src/gnome/dialog-new-user.c
   gnucash/branches/remove-group2/src/gnome/dialog-sx-from-trans.c
   gnucash/branches/remove-group2/src/gnome/druid-acct-period.c
   gnucash/branches/remove-group2/src/gnome/druid-hierarchy.c
   gnucash/branches/remove-group2/src/gnome/druid-loan.c
   gnucash/branches/remove-group2/src/gnome/glade/account.glade
   gnucash/branches/remove-group2/src/gnome/glade/acctperiod.glade
   gnucash/branches/remove-group2/src/gnome/glade/budget.glade
   gnucash/branches/remove-group2/src/gnome/glade/chart-export.glade
   gnucash/branches/remove-group2/src/gnome/glade/commodities.glade
   gnucash/branches/remove-group2/src/gnome/glade/fincalc.glade
   gnucash/branches/remove-group2/src/gnome/glade/lots.glade
   gnucash/branches/remove-group2/src/gnome/glade/merge.glade
   gnucash/branches/remove-group2/src/gnome/glade/newuser.glade
   gnucash/branches/remove-group2/src/gnome/glade/price.glade
   gnucash/branches/remove-group2/src/gnome/glade/print.glade
   gnucash/branches/remove-group2/src/gnome/glade/progress.glade
   gnucash/branches/remove-group2/src/gnome/glade/reconcile.glade
   gnucash/branches/remove-group2/src/gnome/glade/register.glade
   gnucash/branches/remove-group2/src/gnome/glade/sched-xact.glade
   gnucash/branches/remove-group2/src/gnome/glade/stocks.glade
   gnucash/branches/remove-group2/src/gnome/glade/tax.glade
   gnucash/branches/remove-group2/src/gnome/glade/userpass.glade
   gnucash/branches/remove-group2/src/gnome/gnc-plugin-basic-commands.c
   gnucash/branches/remove-group2/src/gnome/gnc-plugin-page-account-tree.c
   gnucash/branches/remove-group2/src/gnome/gnc-plugin-page-budget.c
   gnucash/branches/remove-group2/src/gnome/gnc-plugin-page-register.c
   gnucash/branches/remove-group2/src/gnome/gnc-split-reg.c
   gnucash/branches/remove-group2/src/gnome/gnc-split-reg.h
   gnucash/branches/remove-group2/src/gnome/top-level.c
   gnucash/branches/remove-group2/src/gnome/ui/Makefile.am
   gnucash/branches/remove-group2/src/gnome/window-reconcile.c
   gnucash/branches/remove-group2/src/import-export/Makefile.am
   gnucash/branches/remove-group2/src/import-export/binary-import/Makefile.am
   gnucash/branches/remove-group2/src/import-export/binary-import/binary-import.glade
   gnucash/branches/remove-group2/src/import-export/binary-import/gncmod-binary-import.c
   gnucash/branches/remove-group2/src/import-export/csv/gnc-csv2glist.c
   gnucash/branches/remove-group2/src/import-export/generic-import.glade
   gnucash/branches/remove-group2/src/import-export/gncmod-generic-import.c
   gnucash/branches/remove-group2/src/import-export/hbci/Makefile.am
   gnucash/branches/remove-group2/src/import-export/hbci/dialog-hbcitrans.c
   gnucash/branches/remove-group2/src/import-export/hbci/druid-hbci-initial.c
   gnucash/branches/remove-group2/src/import-export/hbci/glade/hbci.glade
   gnucash/branches/remove-group2/src/import-export/hbci/glade/hbcipass.glade
   gnucash/branches/remove-group2/src/import-export/hbci/glade/hbciprefs.glade
   gnucash/branches/remove-group2/src/import-export/hbci/gnc-file-aqb-import.c
   gnucash/branches/remove-group2/src/import-export/hbci/gnc-file-aqb-import.h
   gnucash/branches/remove-group2/src/import-export/hbci/gnc-hbci-getbalance.c
   gnucash/branches/remove-group2/src/import-export/hbci/gnc-hbci-gettrans.c
   gnucash/branches/remove-group2/src/import-export/hbci/gnc-hbci-transfer.c
   gnucash/branches/remove-group2/src/import-export/hbci/gnc-hbci-utils.c
   gnucash/branches/remove-group2/src/import-export/hbci/gnc-hbci-utils.h
   gnucash/branches/remove-group2/src/import-export/hbci/gnc-plugin-hbci.c
   gnucash/branches/remove-group2/src/import-export/hbci/gncmod-hbci.c
   gnucash/branches/remove-group2/src/import-export/hbci/hbci-interaction.c
   gnucash/branches/remove-group2/src/import-export/hbci/hbci-interaction.h
   gnucash/branches/remove-group2/src/import-export/hbci/hbci-interactionP.h
   gnucash/branches/remove-group2/src/import-export/hbci/schemas/apps_gnucash_dialog_hbci.schemas.in
   gnucash/branches/remove-group2/src/import-export/hbci/test/Makefile.am
   gnucash/branches/remove-group2/src/import-export/import-account-matcher.c
   gnucash/branches/remove-group2/src/import-export/import-backend.c
   gnucash/branches/remove-group2/src/import-export/import-match-map.c
   gnucash/branches/remove-group2/src/import-export/import-match-picker.c
   gnucash/branches/remove-group2/src/import-export/import-provider-format.glade
   gnucash/branches/remove-group2/src/import-export/log-replay/Makefile.am
   gnucash/branches/remove-group2/src/import-export/log-replay/gnc-log-replay.c
   gnucash/branches/remove-group2/src/import-export/log-replay/gncmod-log-replay.c
   gnucash/branches/remove-group2/src/import-export/ofx/Makefile.am
   gnucash/branches/remove-group2/src/import-export/ofx/gnc-ofx-import.c
   gnucash/branches/remove-group2/src/import-export/ofx/gncmod-ofx-import.c
   gnucash/branches/remove-group2/src/import-export/ofx/test/Makefile.am
   gnucash/branches/remove-group2/src/import-export/qif-import/Makefile.am
   gnucash/branches/remove-group2/src/import-export/qif-import/dialog-account-picker.c
   gnucash/branches/remove-group2/src/import-export/qif-import/druid-qif-import.c
   gnucash/branches/remove-group2/src/import-export/qif-import/gncmod-qif-import.c
   gnucash/branches/remove-group2/src/import-export/qif-import/qif-guess-map.scm
   gnucash/branches/remove-group2/src/import-export/qif-import/qif-import.scm
   gnucash/branches/remove-group2/src/import-export/qif-import/qif-parse.scm
   gnucash/branches/remove-group2/src/import-export/qif-import/qif.glade
   gnucash/branches/remove-group2/src/import-export/qif-import/test/Makefile.am
   gnucash/branches/remove-group2/src/import-export/qif-io-core/Makefile.am
   gnucash/branches/remove-group2/src/import-export/qif-io-core/gncmod-qifiocore.c
   gnucash/branches/remove-group2/src/import-export/qif-io-core/test/Makefile.am
   gnucash/branches/remove-group2/src/import-export/qif/Makefile.am
   gnucash/branches/remove-group2/src/import-export/qif/qif-file.c
   gnucash/branches/remove-group2/src/import-export/qif/test/Makefile.am
   gnucash/branches/remove-group2/src/import-export/qif/test/test-qif.c
   gnucash/branches/remove-group2/src/import-export/test/Makefile.am
   gnucash/branches/remove-group2/src/network-utils/Makefile.am
   gnucash/branches/remove-group2/src/network-utils/gncmod-network-utils.c
   gnucash/branches/remove-group2/src/network-utils/test/Makefile.am
   gnucash/branches/remove-group2/src/quotes/gnc-fq-check.in
   gnucash/branches/remove-group2/src/quotes/gnc-fq-dump
   gnucash/branches/remove-group2/src/quotes/gnc-fq-helper.in
   gnucash/branches/remove-group2/src/quotes/gnc-fq-update.in
   gnucash/branches/remove-group2/src/register/ledger-core/Makefile.am
   gnucash/branches/remove-group2/src/register/ledger-core/gncmod-ledger-core.c
   gnucash/branches/remove-group2/src/register/ledger-core/split-register.c
   gnucash/branches/remove-group2/src/register/ledger-core/test/Makefile.am
   gnucash/branches/remove-group2/src/register/register-core/Makefile.am
   gnucash/branches/remove-group2/src/register/register-core/gncmod-register-core.c
   gnucash/branches/remove-group2/src/register/register-core/table-allgui.c
   gnucash/branches/remove-group2/src/register/register-core/test/Makefile.am
   gnucash/branches/remove-group2/src/register/register-gnome/Makefile.am
   gnucash/branches/remove-group2/src/register/register-gnome/datecell-gnome.c
   gnucash/branches/remove-group2/src/register/register-gnome/gncmod-register-gnome.c
   gnucash/branches/remove-group2/src/register/register-gnome/gnucash-date-picker.c
   gnucash/branches/remove-group2/src/register/register-gnome/gnucash-date-picker.h
   gnucash/branches/remove-group2/src/register/register-gnome/gnucash-item-list.c
   gnucash/branches/remove-group2/src/register/register-gnome/test/Makefile.am
   gnucash/branches/remove-group2/src/report/locale-specific/us/Makefile.am
   gnucash/branches/remove-group2/src/report/locale-specific/us/gncmod-locale-reports-us.c
   gnucash/branches/remove-group2/src/report/locale-specific/us/test/Makefile.am
   gnucash/branches/remove-group2/src/report/report-gnome/Makefile.am
   gnucash/branches/remove-group2/src/report/report-gnome/gnc-plugin-page-report.c
   gnucash/branches/remove-group2/src/report/report-gnome/gncmod-report-gnome.c
   gnucash/branches/remove-group2/src/report/report-gnome/report.glade
   gnucash/branches/remove-group2/src/report/report-gnome/test/Makefile.am
   gnucash/branches/remove-group2/src/report/report-gnome/test/test-load-module
   gnucash/branches/remove-group2/src/report/report-gnome/window-report.c
   gnucash/branches/remove-group2/src/report/report-gnome/window-report.h
   gnucash/branches/remove-group2/src/report/report-system/Makefile.am
   gnucash/branches/remove-group2/src/report/report-system/gncmod-report-system.c
   gnucash/branches/remove-group2/src/report/report-system/test/Makefile.am
   gnucash/branches/remove-group2/src/report/report-system/test/test-load-module
   gnucash/branches/remove-group2/src/report/standard-reports/Makefile.am
   gnucash/branches/remove-group2/src/report/standard-reports/budget.scm
   gnucash/branches/remove-group2/src/report/standard-reports/cash-flow.scm
   gnucash/branches/remove-group2/src/report/standard-reports/gncmod-standard-reports.c
   gnucash/branches/remove-group2/src/report/standard-reports/register.scm
   gnucash/branches/remove-group2/src/report/standard-reports/standard-reports.scm
   gnucash/branches/remove-group2/src/report/standard-reports/test/Makefile.am
   gnucash/branches/remove-group2/src/report/standard-reports/transaction.scm
   gnucash/branches/remove-group2/src/report/stylesheets/Makefile.am
   gnucash/branches/remove-group2/src/report/stylesheets/gncmod-stylesheets.c
   gnucash/branches/remove-group2/src/report/stylesheets/test/Makefile.am
   gnucash/branches/remove-group2/src/report/stylesheets/test/test-load-module
   gnucash/branches/remove-group2/src/report/utility-reports/Makefile.am
   gnucash/branches/remove-group2/src/report/utility-reports/gncmod-utility-reports.c
   gnucash/branches/remove-group2/src/report/utility-reports/test/Makefile.am
   gnucash/branches/remove-group2/src/scm/fin.scm
   gnucash/branches/remove-group2/src/scm/price-quotes.scm
   gnucash/branches/remove-group2/src/tax/us/Makefile.am
   gnucash/branches/remove-group2/src/tax/us/gncmod-tax-us.c
   gnucash/branches/remove-group2/src/tax/us/test/Makefile.am
   gnucash/branches/remove-group2/src/test-core/Makefile.am
   gnucash/branches/remove-group2/src/test-core/gncmod-test.c
   gnucash/branches/remove-group2/src/valgrind-gnucash.supp
   gnucash/branches/remove-group2/util/glade-fixup
   gnucash/branches/remove-group2/util/gnc-svnversion
Log:
Sync changes 15253:15563 into the branch.


Property changes on: gnucash/branches/remove-group2
___________________________________________________________________
Name: svk:merge
   - 3889ce50-311e-0410-a464-f059747ec5d1:/local/gnucash/branches/swig-redo:802
3889ce50-311e-0410-a464-f059747ec5d1:/local/gnucash/trunk:1024
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk:13759
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk2:13366
   + 3889ce50-311e-0410-a464-f059747ec5d1:/local/gnucash/branches/swig-redo:802
3889ce50-311e-0410-a464-f059747ec5d1:/local/gnucash/trunk:1037
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk:14082
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk2:13366

Modified: gnucash/branches/remove-group2/ChangeLog
===================================================================
--- gnucash/branches/remove-group2/ChangeLog	2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/ChangeLog	2007-02-11 19:54:51 UTC (rev 15565)
@@ -114,6 +114,17 @@
 	relocation of previously compiled-in paths. With the exception of
 	the env variables in src/bin/gnucash, we're fully relocatable now.
 
+2006-09-16  Joshua Sled  <jsled at asynchronous.org>
+
+	* src/gnome/gnc-plugin-page-sx-list.c (sxsl_get_sx_vars): Add
+	variable extraction to instance-model creation.  The
+	GncSxInstances now has a hashtable of variables parsed from the
+	formula, and the GncSxInstance has a copy of that variables hash.
+	Not finished, but mostly in place.
+
+	* src/gnome/dialog-sx-since-last-run.c: New, simplified version of
+	the since-last-run dialog.  GncSxSlrTreeModelAdapter.
+
 2006-09-13  Christian Stimming <stimming at tuhh.de>
 
 	* src/import-export/hbci/gnc-plugin-hbci.c: Move the MT940
@@ -307,6 +318,30 @@
 	  preferences_dialog->Windows. Move "Show close button on notebook
 	  tabs" from General to Windows. Fixes #340299.
 
+2006-07-27  Joshua Sled  <jsled at asynchronous.org>
+
+	* src/gnome-utils/gnc-dense-cal.c
+	(gnc_dense_cal_transient_model_new): Actually implement
+	GncDenseCalTransientModel. 
+
+	* src/gnome/dialog-sx-editor.c (gnc_sxed_update_cal): 
+	* src/gnome/dialog-sx-from-trans.c (sxftd_update_example_cal):
+	Use GncDenseCalTransientModel from previous ad-hoc updaters.
+
+
+2006-07-25  Joshua Sled  <jsled at asynchronous.org>
+
+	* src/gnome-utils/gnc-dense-cal.c:
+	Add GncDenseCalModel interface, support.
+	Add unfinished GncDenseCalTransient model impl. for
+	one-off being-edited-SX calendar usage.
+
+	* src/gnome/gnc-plugin-page-sx-list.c:
+	Add GncSxInstanceDenseCalAdapter between GncSxInstanceModel and
+	GncDenseCalModel.  Start to hook up 'added' and 'removing' signals
+	on the GncSxInstanceModel.  The SX-List dense-cal works again, and
+	reflects both removed and new SXes.
+
 2006-07-24  Derek Atkins  <derek at ihtfp.com>
 
 	* [lots of Makefile.am files]:
@@ -339,6 +374,27 @@
 	extra de-quoting of path names that is done on the GNC_MODULE_PATH
 	env variable.
 
+2006-07-16  Joshua Sled  <jsled at asynchronous.org>
+
+	* src/engine/SX-book-p.h:
+	* src/engine/SX-book.h:
+	* src/engine/SX-book.c: Promote SX list from a GList to a
+	`SchedXactions` QOF Entity.  Create add/remove API that emits
+	GNC_EVENT_{INSERT,REMOVE} signals.  Correctly associate the SX
+	List with the collection of SchedXaction qof-type rather than the
+	SX template transactions qof-type.  Remove some (now-)dead
+	code.  Fix long-standing bug in registration of SX qof types.
+	
+	* src/gnome/dialog-sx-editor.[ch]:
+	* src/gnome/dialog-schedxaction.[ch]:
+	Move the SX editor dialog subset of dialog-schedxaction to
+	dialog-sx-editor.[ch].
+
+	* src/gnome/gnc-plugin-page-sx-list.c:
+	Hookup SX editor for both 'new' and 'edit' actions. Hookup
+	row-activation from tree-view.  Extend GncSxInstanceModel to
+	support SchedXactions (sx list) modification events.
+
 2006-07-16  Derek Atkins  <derek at ihtfp.com>
 
 	* configure.in:
@@ -368,6 +424,18 @@
 	* src/gnome-utils/gnc-main-window.c: Do not move windows on
 	  restoration that would be offscreen.
 
+2006-07-15  Joshua Sled  <jsled at asynchronous.org>
+
+	* src/engine/SchedXaction.h (GNC_IS_SX,GNC_SX): added for convenience.
+
+	* src/gnome/ui/gnc-plugin-page-sx-list-ui.xml:
+	* src/gnome/gnc-plugin-page-sx-list.[ch]: SX List as a plugin page.
+
+	* src/gnome/gnc-plugin-basic-commands.c: Call SX List plugin page,
+	not dialog.
+
+	* src/doc/sx.rst: Added.
+
 2006-07-15  Derek Atkins  <derek at ihtfp.com>
 
 	* src/business/business-core/gncAddress.[ch]:

Copied: gnucash/branches/remove-group2/ChangeLog.2006 (from rev 15563, gnucash/trunk/ChangeLog.2006)

Modified: gnucash/branches/remove-group2/Makefile.am
===================================================================
--- gnucash/branches/remove-group2/Makefile.am	2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/Makefile.am	2007-02-11 19:54:51 UTC (rev 15565)
@@ -12,6 +12,7 @@
   AUTHORS \
   COPYING \
   ChangeLog \
+  ChangeLog.2006 \
   ChangeLog.2005 \
   ChangeLog.2004 \
   ChangeLog.2003 \
@@ -24,9 +25,6 @@
   README.patches \
   README.dependencies
 
-m4datadir = $(datadir)/aclocal
-m4data_DATA = gnucash.m4
-
 # All the other files that go in the distribution tarfile that aren't
 # included some other way...
 
@@ -40,8 +38,6 @@
 
 EXTRA_DIST = \
   gnucash.lsm \
-  gnucash.m4 \
-  gnucash-config.in \
   make-gnucash-patch.in \
   make-gnucash-potfiles.in \
   macros/aqbanking.m4 \
@@ -79,10 +75,6 @@
   intltool-update.in \
   util/gnc-svnversion
 
-bin_SCRIPTS = gnucash-config
-
-CLEANFILES = gnucash-config
-
 ## We borrow guile's convention and use @-...-@ as the substitution
 ## brackets here, instead of the usual @... at .  This prevents autoconf
 ## from substituting the values directly into the left-hand sides of
@@ -205,6 +197,6 @@
 SVN = svn
 XSLTPROC = xsltproc
 ChangeLog.svn:
-	$(SVN) log -v --xml -r HEAD:11782 http://svn.gnucash.org/repo/gnucash | \
+	$(SVN) log -v --xml -r HEAD:15287 http://svn.gnucash.org/repo/gnucash | \
 	  $(XSLTPROC) --stringparam strip-prefix "gnucash" \
 	  --stringparam include-rev "yes" $(srcdir)/macros/svn2cl.xsl - > $@

Modified: gnucash/branches/remove-group2/README.dependencies
===================================================================
--- gnucash/branches/remove-group2/README.dependencies	2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/README.dependencies	2007-02-11 19:54:51 UTC (rev 15565)
@@ -124,7 +124,38 @@
   - libgnomeui-2.0	>= 2.0.0
   - libgsf-gnome-1	>= 1.12.2
 
+Status, 2007-01-17
+------------------
 
+1. Ubuntu
+   - 2006.10 [2006/10/26]
+     - gtk+ 2.10.6
+     - swig 1.3.28-1.1ubuntu1
+   - 2006.06 [2006/06/01]
+     - gtk+ 2.8.17
+2. Mandriva Linux
+   - 2007 [2006/10/03]
+     - gtk+ 2.10.3
+   - 2006 [2005/10/06]
+     - gtk+ 2.8.3
+3. Suse
+   - 10.2 [2006/12/07]
+     - gtk+ 2.10.6
+   - 10.1 [2006/05/11]
+     - gtk+ 2.8.10
+4. Fedora Core
+   - FC6 [2006/10/24]
+     - gtk+ 2.10.4
+   - FC5 [2006/03/20]
+     - gtk+ 2.8.15
+5. Debian GNU/Linux
+   - unstable
+     - gtk+ 2.8.20
+   - testing
+     - gtk+ 2.8.20
+   - sarge [2005/06/06]
+     - gtk+ 2.6.4
+
 Status, 2005-11-06
 ------------------
 The major distributions, as defined by http://distrowatch.com/dwres.php?resource=major, are:
@@ -172,6 +203,25 @@
     - libxml-2 libxml2_2.6.17-0ubuntu1_i386.deb
     - pango libpango1.0-0_1.8.1-0ubuntu2
 - Mandriva
+  -  2007.0 = 2007-01-03
+    [from ftp://ftp.proxad.net/pub/Distributions_Linux/MandrivaLinux/official/2007.0/i586/media/main/]
+    - aqbanking-2.2.1
+    - libcairo2-1.2.4
+    - gconf-2.14.0
+    - glib-2.12.3
+    - gtk+-2.10.3
+    - guile-1.6.8
+    - g-wrap-1.9.6
+    - libart-2.3.17
+    - libglade-2.6.0
+    - libgnomeprint-2.2-2.12.1
+    - libgnomeui-2.16.0
+    - libgsf-1.14.1
+    - libofx-0.8.0
+    - libxml-2.6.26
+    - pango-1.14.3
+    - libgtkhtml-3.8-3.12.0
+    Note: -devel packages for the libraries above must also be installed.
   -  2006 = 2005-10-06
     [from ftp://ftp.rutgers.edu/pub/Mandrakelinux/devel/2006.0/i586/media/main/]
     - aqbanking-1.2.0

Modified: gnucash/branches/remove-group2/accounts/Makefile.am
===================================================================
--- gnucash/branches/remove-group2/accounts/Makefile.am	2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/accounts/Makefile.am	2007-02-11 19:54:51 UTC (rev 15565)
@@ -1,3 +1,3 @@
 
-SUBDIRS = C da de_AT de_CH de_DE el_GR es_ES fr_CH fr_FR hu_HU it nb pt_BR pt_PT sk tr_TR
+SUBDIRS = C da de_AT de_CH de_DE el_GR es_ES fr_CH fr_CA fr_FR hu_HU it nb pt_BR pt_PT sk tr_TR
 

Copied: gnucash/branches/remove-group2/accounts/fr_CA (from rev 15563, gnucash/trunk/accounts/fr_CA)


Property changes on: gnucash/branches/remove-group2/accounts/fr_CA
___________________________________________________________________
Name: svn:ignore
   + Makefile
Makefile.in


Modified: gnucash/branches/remove-group2/accounts/fr_CA/acctchrt_actifsfixes.gnucash-xea
===================================================================
--- gnucash/trunk/accounts/fr_CA/acctchrt_actifsfixes.gnucash-xea	2007-02-11 04:22:52 UTC (rev 15563)
+++ gnucash/branches/remove-group2/accounts/fr_CA/acctchrt_actifsfixes.gnucash-xea	2007-02-11 19:54:51 UTC (rev 15565)
@@ -10,6 +10,12 @@
     Sélectionnez ce groupe de comptes si vous possédez des immobilisations ou actifs fixes importants tels que résidence, chalet, auto ou autres actifs.
   </gnc-act:long-description>    
   <gnc:account version="2.0.0">
+	  <act:name/>
+	  <act:id type="new">1972cce2e2364f95b2b0bc014502661d</act:id>
+	  <act:type>ROOT</act:type>
+	  <act:commodity-scu>0</act:commodity-scu>
+  </gnc:account>
+  <gnc:account version="2.0.0">
 	  <act:name>Actif</act:name>
 	  <act:id type="guid">b14f810bdb0b57b77acf1a5db700068c</act:id>
 	  <act:type>ASSET</act:type>
@@ -19,6 +25,7 @@
 	  </act:commodity>
 	  <act:commodity-scu>100</act:commodity-scu>
 	  <act:description>Actif</act:description>
+	  <act:parent type="guid">1972cce2e2364f95b2b0bc014502661d</act:parent>
 	  <act:slots>
 		  <slot>
 			  <slot:key>placeholder</slot:key>

Modified: gnucash/branches/remove-group2/accounts/fr_CA/acctchrt_automobile.gnucash-xea
===================================================================
--- gnucash/trunk/accounts/fr_CA/acctchrt_automobile.gnucash-xea	2007-02-11 04:22:52 UTC (rev 15563)
+++ gnucash/branches/remove-group2/accounts/fr_CA/acctchrt_automobile.gnucash-xea	2007-02-11 19:54:51 UTC (rev 15565)
@@ -10,6 +10,12 @@
 	    Sélectionnez ce groupe de comptes si vous devez suivre les frais relatifs à la possession et à l'utilisation d'une auto (assurances, carburant, emprunt, intérêts, ...).
   </gnc-act:long-description>    
   <gnc:account version="2.0.0">
+	  <act:name/>
+	  <act:id type="new">1972cce2e2364f95b2b0bc014502661d</act:id>
+	  <act:type>ROOT</act:type>
+	  <act:commodity-scu>0</act:commodity-scu>
+  </gnc:account>
+  <gnc:account version="2.0.0">
 	  <act:name>Actif</act:name>
 	  <act:id type="guid">b14f810bdb0b57b77acf1a5db700068c</act:id>
 	  <act:type>ASSET</act:type>
@@ -19,6 +25,7 @@
 	  </act:commodity>
 	  <act:commodity-scu>100</act:commodity-scu>
 	  <act:description>Actif</act:description>
+	  <act:parent type="guid">1972cce2e2364f95b2b0bc014502661d</act:parent>
 	  <act:slots>
 		  <slot>
 			  <slot:key>placeholder</slot:key>
@@ -66,6 +73,7 @@
 	  </act:commodity>
 	  <act:commodity-scu>100</act:commodity-scu>
 	  <act:description>Passif</act:description>
+	  <act:parent type="guid">1972cce2e2364f95b2b0bc014502661d</act:parent>
 	  <act:slots>
 		  <slot>
 			  <slot:key>placeholder</slot:key>
@@ -113,6 +121,7 @@
 	  </act:commodity>
 	  <act:commodity-scu>100</act:commodity-scu>
 	  <act:description>Dépenses</act:description>
+	  <act:parent type="guid">1972cce2e2364f95b2b0bc014502661d</act:parent>
 	  <act:slots>
 		  <slot>
 			  <slot:key>placeholder</slot:key>

Modified: gnucash/branches/remove-group2/accounts/fr_CA/acctchrt_basecommune.gnucash-xea
===================================================================
--- gnucash/trunk/accounts/fr_CA/acctchrt_basecommune.gnucash-xea	2007-02-11 04:22:52 UTC (rev 15563)
+++ gnucash/branches/remove-group2/accounts/fr_CA/acctchrt_basecommune.gnucash-xea	2007-02-11 19:54:51 UTC (rev 15565)
@@ -10,6 +10,12 @@
 		</gnc-act:long-description>    
 		<gnc-act:start-selected>1</gnc-act:start-selected>
 		<gnc:account version="2.0.0">
+			<act:name/>
+			<act:id type="new">1972cce2e2364f95b2b0bc014502661d</act:id>
+			<act:type>ROOT</act:type>
+			<act:commodity-scu>0</act:commodity-scu>
+		</gnc:account>
+		<gnc:account version="2.0.0">
 			<act:name>Actif</act:name>
 			<act:id type="guid">b14f810bdb0b57b77acf1a5db700068c</act:id>
 			<act:type>ASSET</act:type>
@@ -19,6 +25,7 @@
 			</act:commodity>
 			<act:commodity-scu>100</act:commodity-scu>
 			<act:description>Actif</act:description>
+			<act:parent type="guid">1972cce2e2364f95b2b0bc014502661d</act:parent>
 			<act:slots>
 				<slot>
 					<slot:key>placeholder</slot:key>
@@ -90,6 +97,7 @@
 			</act:commodity>
 			<act:commodity-scu>100</act:commodity-scu>
 			<act:description>Passif</act:description>
+			<act:parent type="guid">1972cce2e2364f95b2b0bc014502661d</act:parent>
 			<act:slots>
 				<slot>
 					<slot:key>placeholder</slot:key>
@@ -131,6 +139,7 @@
 			</act:commodity>
 			<act:commodity-scu>100</act:commodity-scu>
 			<act:description>Revenus</act:description>
+			<act:parent type="guid">1972cce2e2364f95b2b0bc014502661d</act:parent>
 			<act:slots>
 				<slot>
 					<slot:key>placeholder</slot:key>
@@ -214,6 +223,7 @@
 			</act:commodity>
 			<act:commodity-scu>100</act:commodity-scu>
 			<act:description>Dépenses</act:description>
+			<act:parent type="guid">1972cce2e2364f95b2b0bc014502661d</act:parent>
 			<act:slots>
 				<slot>
 					<slot:key>placeholder</slot:key>
@@ -711,6 +721,7 @@
 			</act:commodity>
 			<act:commodity-scu>100</act:commodity-scu>
 			<act:description>Capitaux propres</act:description>
+			<act:parent type="guid">1972cce2e2364f95b2b0bc014502661d</act:parent>
 			<act:slots>
 				<slot>
 					<slot:key>placeholder</slot:key>

Modified: gnucash/branches/remove-group2/accounts/fr_CA/acctchrt_cdmarchemon.gnucash-xea
===================================================================
--- gnucash/trunk/accounts/fr_CA/acctchrt_cdmarchemon.gnucash-xea	2007-02-11 04:22:52 UTC (rev 15563)
+++ gnucash/branches/remove-group2/accounts/fr_CA/acctchrt_cdmarchemon.gnucash-xea	2007-02-11 19:54:51 UTC (rev 15565)
@@ -10,6 +10,12 @@
 	    Sélectionnez ce groupe de comptes (CD/CPG , marché monétaire et intérêts) si vous détenez des certificats de dépôt et d'autres titres du marché monétaire.
   </gnc-act:long-description>    
   <gnc:account version="2.0.0">
+	  <act:name/>
+	  <act:id type="new">1972cce2e2364f95b2b0bc014502661d</act:id>
+	  <act:type>ROOT</act:type>
+	  <act:commodity-scu>0</act:commodity-scu>
+  </gnc:account>
+  <gnc:account version="2.0.0">
 	  <act:name>Actif</act:name>
 	  <act:id type="guid">b14f810bdb0b57b77acf1a5db700068c</act:id>
 	  <act:type>ASSET</act:type>
@@ -19,6 +25,7 @@
 	  </act:commodity>
 	  <act:commodity-scu>100</act:commodity-scu>
 	  <act:description>Actif</act:description>
+	  <act:parent type="guid">1972cce2e2364f95b2b0bc014502661d</act:parent>
 	  <act:slots>
 		  <slot>
 			  <slot:key>placeholder</slot:key>
@@ -78,6 +85,7 @@
 	  </act:commodity>
 	  <act:commodity-scu>100</act:commodity-scu>
 	  <act:description>Revenus</act:description>
+	  <act:parent type="guid">1972cce2e2364f95b2b0bc014502661d</act:parent>
 	  <act:slots>
 		  <slot>
 			  <slot:key>placeholder</slot:key>

Modified: gnucash/branches/remove-group2/accounts/fr_CA/acctchrt_chequier.gnucash-xea
===================================================================
--- gnucash/trunk/accounts/fr_CA/acctchrt_chequier.gnucash-xea	2007-02-11 04:22:52 UTC (rev 15563)
+++ gnucash/branches/remove-group2/accounts/fr_CA/acctchrt_chequier.gnucash-xea	2007-02-11 19:54:51 UTC (rev 15565)
@@ -10,6 +10,12 @@
 	    Sélectionnez ce groupe de comptes si vous ne voulez suivre que le solde de votre compte en banque.  Si le besoin s'en fait sentir plus tard, vous pourrez commencer un suivi plus serré de vos revenus et dépenses en ajoutant de nouveaux groupes de comptes.
     </gnc-act:long-description>
     <gnc:account version="2.0.0">
+	    <act:name/>
+	    <act:id type="new">1972cce2e2364f95b2b0bc014502661d</act:id>
+	    <act:type>ROOT</act:type>
+	    <act:commodity-scu>0</act:commodity-scu>
+    </gnc:account>
+    <gnc:account version="2.0.0">
 	    <act:name>Actif</act:name>
 	    <act:id type="guid">b14f810bdb0b57b77acf1a5db700068c</act:id>
 	    <act:type>ASSET</act:type>
@@ -19,6 +25,7 @@
 	    </act:commodity>
 	    <act:commodity-scu>100</act:commodity-scu>
 	    <act:description>Actif</act:description>
+	    <act:parent type="guid">1972cce2e2364f95b2b0bc014502661d</act:parent>
 	    <act:slots>
 		    <slot>
 			    <slot:key>placeholder</slot:key>
@@ -66,6 +73,7 @@
 		    </act:commodity>
 		    <act:commodity-scu>100</act:commodity-scu>
 		    <act:description>Capitaux propres</act:description>
+		    <act:parent type="guid">1972cce2e2364f95b2b0bc014502661d</act:parent>
 		    <act:slots>
 			    <slot>
 				    <slot:key>placeholder</slot:key>
@@ -95,6 +103,7 @@
 		    </act:commodity>
 		    <act:commodity-scu>100</act:commodity-scu>
 		    <act:description>Dépenses</act:description>
+		    <act:parent type="guid">1972cce2e2364f95b2b0bc014502661d</act:parent>
 	    </gnc:account>
 	    <gnc:account version="2.0.0">
 		    <act:name>Revenus</act:name>
@@ -106,6 +115,7 @@
 		    </act:commodity>
 		    <act:commodity-scu>100</act:commodity-scu>
 		    <act:description>Revenus</act:description>
+		    <act:parent type="guid">1972cce2e2364f95b2b0bc014502661d</act:parent>
 	    </gnc:account>
 </gnc-account-example>
 

Modified: gnucash/branches/remove-group2/accounts/fr_CA/acctchrt_conjointretraite.gnucash-xea
===================================================================
--- gnucash/trunk/accounts/fr_CA/acctchrt_conjointretraite.gnucash-xea	2007-02-11 04:22:52 UTC (rev 15563)
+++ gnucash/branches/remove-group2/accounts/fr_CA/acctchrt_conjointretraite.gnucash-xea	2007-02-11 19:54:51 UTC (rev 15565)
@@ -10,6 +10,12 @@
 	    Sélectionnez ce groupe si vous faites le suivi d'un compte de placements (actions, obligations, fonds communs et fonds d'indices boursiers) pour la retraite de votre conjoint(e).
     </gnc-act:long-description>    
 	    <gnc:account version="2.0.0">
+		    <act:name/>
+		    <act:id type="new">1972cce2e2364f95b2b0bc014502661d</act:id>
+		    <act:type>ROOT</act:type>
+		    <act:commodity-scu>0</act:commodity-scu>
+	    </gnc:account>
+	    <gnc:account version="2.0.0">
 		    <act:name>Actif</act:name>
 		    <act:id type="guid">b14f810bdb0b57b77acf1a5db700068c</act:id>
 		    <act:type>ASSET</act:type>
@@ -19,6 +25,7 @@
 		    </act:commodity>
 		    <act:commodity-scu>100</act:commodity-scu>
 		    <act:description>Actif</act:description>
+		    <act:parent type="guid">1972cce2e2364f95b2b0bc014502661d</act:parent>
 		    <act:slots>
 			    <slot>
 				    <slot:key>placeholder</slot:key>

Modified: gnucash/branches/remove-group2/accounts/fr_CA/acctchrt_conjointrev.gnucash-xea
===================================================================
--- gnucash/trunk/accounts/fr_CA/acctchrt_conjointrev.gnucash-xea	2007-02-11 04:22:52 UTC (rev 15563)
+++ gnucash/branches/remove-group2/accounts/fr_CA/acctchrt_conjointrev.gnucash-xea	2007-02-11 19:54:51 UTC (rev 15565)
@@ -10,6 +10,12 @@
     Sélectionnez ce groupe de comptes si vous voulez suivre séparément les revenus et dépenses d'emploi du (de la) conjoint(e).
   </gnc-act:long-description>    
   <gnc:account version="2.0.0">
+	  <act:name/>
+	  <act:id type="new">1972cce2e2364f95b2b0bc014502661d</act:id>
+	  <act:type>ROOT</act:type>
+	  <act:commodity-scu>0</act:commodity-scu>
+  </gnc:account>
+  <gnc:account version="2.0.0">
 	  <act:name>Revenus</act:name>
 	  <act:id type="guid">e5e6414e2da9abb0d11a675a1244e380</act:id>
 	  <act:type>INCOME</act:type>
@@ -19,6 +25,7 @@
 	  </act:commodity>
 	  <act:commodity-scu>100</act:commodity-scu>
 	  <act:description>Revenus</act:description>
+	  <act:parent type="guid">1972cce2e2364f95b2b0bc014502661d</act:parent>
 	  <act:slots>
 		  <slot>
 			  <slot:key>placeholder</slot:key>
@@ -96,6 +103,7 @@
 	  </act:commodity>
 	  <act:commodity-scu>100</act:commodity-scu>
 	  <act:description>Dépenses</act:description>
+	  <act:parent type="guid">1972cce2e2364f95b2b0bc014502661d</act:parent>
 	  <act:slots>
 		  <slot>
 			  <slot:key>placeholder</slot:key>

Modified: gnucash/branches/remove-group2/accounts/fr_CA/acctchrt_courtage.gnucash-xea
===================================================================
--- gnucash/trunk/accounts/fr_CA/acctchrt_courtage.gnucash-xea	2007-02-11 04:22:52 UTC (rev 15563)
+++ gnucash/branches/remove-group2/accounts/fr_CA/acctchrt_courtage.gnucash-xea	2007-02-11 19:54:51 UTC (rev 15565)
@@ -10,6 +10,12 @@
 	    Sélectionnez ce groupe de comptes si vous possédez des titres de placements (actions, obligations, fonds communs de placement, fonds d'indices boursiers).
   </gnc-act:long-description>
   <gnc:account version="2.0.0">
+	  <act:name/>
+	  <act:id type="new">1972cce2e2364f95b2b0bc014502661d</act:id>
+	  <act:type>ROOT</act:type>
+	  <act:commodity-scu>0</act:commodity-scu>
+  </gnc:account>
+  <gnc:account version="2.0.0">
   <act:name>Actif</act:name>
   <act:id type="guid">b14f810bdb0b57b77acf1a5db700068c</act:id>
   <act:type>ASSET</act:type>
@@ -19,6 +25,7 @@
   </act:commodity>
   <act:commodity-scu>100</act:commodity-scu>
   <act:description>Actif</act:description>
+	  <act:parent type="guid">1972cce2e2364f95b2b0bc014502661d</act:parent>
   <act:slots>
 	  <slot>
 		  <slot:key>placeholder</slot:key>
@@ -114,6 +121,7 @@
 	</act:commodity>
 	<act:commodity-scu>100</act:commodity-scu>
 	<act:description>Dépenses</act:description>
+	<act:parent type="guid">1972cce2e2364f95b2b0bc014502661d</act:parent>
 	<act:slots>
 		<slot>
 			<slot:key>placeholder</slot:key>
@@ -143,6 +151,7 @@
 	</act:commodity>
 	<act:commodity-scu>100</act:commodity-scu>
 	<act:description>Revenus</act:description>
+	<act:parent type="guid">1972cce2e2364f95b2b0bc014502661d</act:parent>
 	<act:slots>
 		<slot>
 			<slot:key>placeholder</slot:key>

Modified: gnucash/branches/remove-group2/accounts/fr_CA/acctchrt_etudeemprunt.gnucash-xea
===================================================================
--- gnucash/trunk/accounts/fr_CA/acctchrt_etudeemprunt.gnucash-xea	2007-02-11 04:22:52 UTC (rev 15563)
+++ gnucash/branches/remove-group2/accounts/fr_CA/acctchrt_etudeemprunt.gnucash-xea	2007-02-11 19:54:51 UTC (rev 15565)
@@ -10,6 +10,12 @@
     Selectionnez ce groupe si vous devez gérer un emprunt pour études.
   </gnc-act:long-description>    
   <gnc:account version="2.0.0">
+	  <act:name/>
+	  <act:id type="new">1972cce2e2364f95b2b0bc014502661d</act:id>
+	  <act:type>ROOT</act:type>
+	  <act:commodity-scu>0</act:commodity-scu>
+  </gnc:account>
+  <gnc:account version="2.0.0">
 	  <act:name>Passif</act:name>
 	  <act:id type="guid">daf9ad37262c7254bbdf0be5ba26e29e</act:id>
 	  <act:type>LIABILITY</act:type>
@@ -19,6 +25,7 @@
 	  </act:commodity>
 	  <act:commodity-scu>100</act:commodity-scu>
 	  <act:description>Passif</act:description>
+	  <act:parent type="guid">1972cce2e2364f95b2b0bc014502661d</act:parent>
 	  <act:slots>
 		  <slot>
 			  <slot:key>placeholder</slot:key>
@@ -66,6 +73,7 @@
 	  </act:commodity>
 	  <act:commodity-scu>100</act:commodity-scu>
 	  <act:description>Dépenses</act:description>
+	  <act:parent type="guid">1972cce2e2364f95b2b0bc014502661d</act:parent>
 	  <act:slots>
 		  <slot>
 			  <slot:key>placeholder</slot:key>

Modified: gnucash/branches/remove-group2/accounts/fr_CA/acctchrt_garderie.gnucash-xea
===================================================================
--- gnucash/trunk/accounts/fr_CA/acctchrt_garderie.gnucash-xea	2007-02-11 04:22:52 UTC (rev 15563)
+++ gnucash/branches/remove-group2/accounts/fr_CA/acctchrt_garderie.gnucash-xea	2007-02-11 19:54:51 UTC (rev 15565)
@@ -10,6 +10,12 @@
     Sélectionnez ce groupe si vous avez un jeune enfant .
   </gnc-act:long-description>    
   <gnc:account version="2.0.0">
+	  <act:name/>
+	  <act:id type="new">1972cce2e2364f95b2b0bc014502661d</act:id>
+	  <act:type>ROOT</act:type>
+	  <act:commodity-scu>0</act:commodity-scu>
+  </gnc:account>
+  <gnc:account version="2.0.0">
 	  <act:name>Dépenses</act:name>
 	  <act:id type="guid">5882be9c31d58cc589c53f94d86f82da</act:id>
 	  <act:type>EXPENSE</act:type>
@@ -19,6 +25,7 @@
 	  </act:commodity>
 	  <act:commodity-scu>100</act:commodity-scu>
 	  <act:description>Dépenses</act:description>
+	  <act:parent type="guid">1972cce2e2364f95b2b0bc014502661d</act:parent>
 	  <act:slots>
 		  <slot>
 			  <slot:key>placeholder</slot:key>

Modified: gnucash/branches/remove-group2/accounts/fr_CA/acctchrt_locataire.gnucash-xea
===================================================================
--- gnucash/trunk/accounts/fr_CA/acctchrt_locataire.gnucash-xea	2007-02-11 04:22:52 UTC (rev 15563)
+++ gnucash/branches/remove-group2/accounts/fr_CA/acctchrt_locataire.gnucash-xea	2007-02-11 19:54:51 UTC (rev 15565)
@@ -10,6 +10,12 @@
     Sélectionnez ce groupe de compte si vous louez une résidence ou un logis (Loyer, assurances, ...).
   </gnc-act:long-description>    
   <gnc:account version="2.0.0">
+	  <act:name/>
+	  <act:id type="new">1972cce2e2364f95b2b0bc014502661d</act:id>
+	  <act:type>ROOT</act:type>
+	  <act:commodity-scu>0</act:commodity-scu>
+  </gnc:account>
+  <gnc:account version="2.0.0">
 	  <act:name>Dépenses</act:name>
 	  <act:id type="guid">5882be9c31d58cc589c53f94d86f82da</act:id>
 	  <act:type>EXPENSE</act:type>
@@ -19,6 +25,7 @@
 	  </act:commodity>
 	  <act:commodity-scu>100</act:commodity-scu>
 	  <act:description>Dépenses</act:description>
+	  <act:parent type="guid">1972cce2e2364f95b2b0bc014502661d</act:parent>
 	  <act:slots>
 		  <slot>
 			  <slot:key>placeholder</slot:key>

Modified: gnucash/branches/remove-group2/accounts/fr_CA/acctchrt_proprietaire.gnucash-xea
===================================================================
--- gnucash/trunk/accounts/fr_CA/acctchrt_proprietaire.gnucash-xea	2007-02-11 04:22:52 UTC (rev 15563)
+++ gnucash/branches/remove-group2/accounts/fr_CA/acctchrt_proprietaire.gnucash-xea	2007-02-11 19:54:51 UTC (rev 15565)
@@ -10,6 +10,12 @@
     Sélectionnez ce groupe de comptes si vous êtes propriétaire d'une résidence, et voulez en suivre les frais associés (hypothèque, intérêts, entretien et réparations, taxes, ...).
   </gnc-act:long-description>    
   <gnc:account version="2.0.0">
+	  <act:name/>
+	  <act:id type="new">1972cce2e2364f95b2b0bc014502661d</act:id>
+	  <act:type>ROOT</act:type>
+	  <act:commodity-scu>0</act:commodity-scu>
+  </gnc:account>
+  <gnc:account version="2.0.0">
 	  <act:name>Actif</act:name>
 	  <act:id type="guid">b14f810bdb0b57b77acf1a5db700068c</act:id>
 	  <act:type>ASSET</act:type>
@@ -19,6 +25,7 @@
 	  </act:commodity>
 	  <act:commodity-scu>100</act:commodity-scu>
 	  <act:description>Actif</act:description>
+	  <act:parent type="guid">1972cce2e2364f95b2b0bc014502661d</act:parent>
 	  <act:slots>
 		  <slot>
 			  <slot:key>placeholder</slot:key>
@@ -66,6 +73,7 @@
 	  </act:commodity>
 	  <act:commodity-scu>100</act:commodity-scu>
 	  <act:description>Passif</act:description>
+	  <act:parent type="guid">1972cce2e2364f95b2b0bc014502661d</act:parent>
 	  <act:slots>
 		  <slot>
 			  <slot:key>placeholder</slot:key>
@@ -113,6 +121,7 @@
 	  </act:commodity>
 	  <act:commodity-scu>100</act:commodity-scu>
 	  <act:description>Dépenses</act:description>
+	  <act:parent type="guid">1972cce2e2364f95b2b0bc014502661d</act:parent>
 	  <act:slots>
 		  <slot>
 			  <slot:key>placeholder</slot:key>

Modified: gnucash/branches/remove-group2/accounts/fr_CA/acctchrt_retraite.gnucash-xea
===================================================================
--- gnucash/trunk/accounts/fr_CA/acctchrt_retraite.gnucash-xea	2007-02-11 04:22:52 UTC (rev 15563)
+++ gnucash/branches/remove-group2/accounts/fr_CA/acctchrt_retraite.gnucash-xea	2007-02-11 19:54:51 UTC (rev 15565)
@@ -10,6 +10,12 @@
     Sélectionnez ce groupe de comptes si vous faites le suivi d'un compte de placements (actions, obligations, fonds communs et fonds d'indices boursiers) pour votre retraite.
   </gnc-act:long-description>    
   <gnc:account version="2.0.0">
+	  <act:name/>
+	  <act:id type="new">1972cce2e2364f95b2b0bc014502661d</act:id>
+	  <act:type>ROOT</act:type>
+	  <act:commodity-scu>0</act:commodity-scu>
+  </gnc:account>
+  <gnc:account version="2.0.0">
 	  <act:name>Actif</act:name>
 	  <act:id type="guid">b14f810bdb0b57b77acf1a5db700068c</act:id>
 	  <act:type>ASSET</act:type>
@@ -19,6 +25,7 @@
 	  </act:commodity>
 	  <act:commodity-scu>100</act:commodity-scu>
 	  <act:description>Actif</act:description>
+	  <act:parent type="guid">1972cce2e2364f95b2b0bc014502661d</act:parent>
 	  <act:slots>
 		  <slot>
 			  <slot:key>placeholder</slot:key>

Modified: gnucash/branches/remove-group2/accounts/fr_CA/acctchrt_revenus.gnucash-xea
===================================================================
--- gnucash/trunk/accounts/fr_CA/acctchrt_revenus.gnucash-xea	2007-02-11 04:22:52 UTC (rev 15563)
+++ gnucash/branches/remove-group2/accounts/fr_CA/acctchrt_revenus.gnucash-xea	2007-02-11 19:54:51 UTC (rev 15565)
@@ -10,6 +10,12 @@
 		Sélectionnez ce groupe de comptes si vous voulez faire le suivi de vos revenus et dépenses d'emploi.
 	</gnc-act:long-description>    
 	<gnc:account version="2.0.0">
+		<act:name/>
+		<act:id type="new">1972cce2e2364f95b2b0bc014502661d</act:id>
+		<act:type>ROOT</act:type>
+		<act:commodity-scu>0</act:commodity-scu>
+	</gnc:account>
+	<gnc:account version="2.0.0">
 		<act:name>Revenus</act:name>
 		<act:id type="guid">e5e6414e2da9abb0d11a675a1244e380</act:id>
 		<act:type>INCOME</act:type>
@@ -19,6 +25,7 @@
 		</act:commodity>
 		<act:commodity-scu>100</act:commodity-scu>
 		<act:description>Revenus</act:description>
+		<act:parent type="guid">1972cce2e2364f95b2b0bc014502661d</act:parent>
 		<act:slots>
 			<slot>
 				<slot:key>placeholder</slot:key>
@@ -96,6 +103,7 @@
 			</act:commodity>
 			<act:commodity-scu>100</act:commodity-scu>
 			<act:description>Dépenses</act:description>
+			<act:parent type="guid">1972cce2e2364f95b2b0bc014502661d</act:parent>
 			<act:slots>
 				<slot>
 					<slot:key>placeholder</slot:key>

Modified: gnucash/branches/remove-group2/autogen.sh
===================================================================
--- gnucash/branches/remove-group2/autogen.sh	2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/autogen.sh	2007-02-11 19:54:51 UTC (rev 15565)
@@ -135,12 +135,17 @@
   DIE=1
 }
 
+# On MacOS, libtoolize is installed as glibtoolize, so handle that here.
 (${LIBTOOLIZE} --version) < /dev/null > /dev/null 2>&1 || {
-  echo
-  echo "**Error**: You must have \`libtoolize' installed to compile GnuCash."
-  echo "Download the appropriate package for your distribution,"
-  echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
-  DIE=1
+  LIBTOOLIZE=glibtoolize
+  (${LIBTOOLIZE} --version) < /dev/null > /dev/null 2>&1 || {
+    echo
+    echo "**Error**: You must have \`libtoolize' installed to compile GnuCash."
+    echo "Could not find either \`libtoolize' or \'glibtoolize'."
+    echo "Download the appropriate package for your distribution,"
+    echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
+    DIE=1
+  }
 }
 
 (${AUTOMAKE} --version) < /dev/null > /dev/null 2>&1 || {

Modified: gnucash/branches/remove-group2/configure.in
===================================================================
--- gnucash/branches/remove-group2/configure.in	2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/configure.in	2007-02-11 19:54:51 UTC (rev 15565)
@@ -37,6 +37,15 @@
 GNUCASH_MINOR_VERSION=`echo $GNUCASH_VERSION_STRING | [ sed -e 's/^\([^\.]*\)\.\([^.]*\)\.\(.*\)$/\2/' ]`
 GNUCASH_MICRO_VERSION=`echo $GNUCASH_VERSION_STRING | [ sed -e 's/^\([^\.]*\)\.\([^.]*\)\.\(.*\)$/\3/' ]`
 
+# save any user/environment optimization flags before we muck with them in
+# --enable-debug:
+USER_OPTIMIZATION=""
+for flag in $CFLAGS; do
+  if test -z $(echo $flag | sed -e 's,-O.,,'); then
+    USER_OPTIMIZATION="$USER_OPTIMIZATION ${flag}"
+  fi
+done
+
 ##  Do this first, because the other tests depend on it:
 
 # Check for gcc and intltool (somehow breaks the suggested content
@@ -146,11 +155,6 @@
   fi
 fi
 
-AC_CHECK_HEADERS(ltdl.h)
-if test "x$ac_cv_header_ltdl_h" = xno; then
-  AC_MSG_ERROR([Cannot find ltdl.h -- libtool-devel (or libtool-ltdl-devel) not installed?])
-fi
-
 # test whether we are building directly from SVN/SVK
 ${srcdir}/util/gnc-svnversion ${srcdir} >/dev/null 2>&1
 if test $? = 0 ; then
@@ -161,6 +165,27 @@
   AC_PROG_SWIG(1.3.28)
 else
   BUILDING_FROM_SVN=no
+  # Make sure we've got swig-runtime.h and gnc-svninfo.h
+  AC_CHECK_FILE(${srcdir}/src/swig-runtime.h, [],
+	[AC_MSG_ERROR([
+
+It looks like you are NOT building from Subversion
+but I cannot find swig-runtime.h.  Check your PATH
+and make sure we can find svnversion in your PATH!
+Either that or contact gnucash-devel at gnucash.org because
+the tarball you downloaded is broken.
+
+	])])
+  AC_CHECK_FILE(${srcdir}/src/gnome-utils/gnc-svninfo.h, [],
+	[AC_MSG_ERROR([
+
+It looks like you are NOT building from Subversion
+but I cannot find gnc-svninfo.h.  Check your PATH
+and make sure we can find svnversion in your PATH!
+Either that or contact gnucash-devel at gnucash.org because
+the tarball you downloaded is broken.
+
+	])])
 fi
 AM_CONDITIONAL(BUILDING_FROM_SVN, test "x$BUILDING_FROM_SVN" = "xyes")
 
@@ -187,8 +212,8 @@
 ### --------------------------------------------------------------------------
 ### Glib checks..
 
-AM_PATH_GLIB_2_0(2.4.0,,AC_MSG_ERROR([
-*** GLIB >= 2.4 is required to build Gnucash; please make sure you have the
+AM_PATH_GLIB_2_0(2.6.0,,AC_MSG_ERROR([
+*** GLIB >= 2.6 is required to build Gnucash; please make sure you have the
 *** development headers installed. The latest version of GLIB is
 *** always available at ftp://ftp.gnome.org/pub/gnome/sources/glib/.]),
 	gthread gobject gmodule)
@@ -198,20 +223,24 @@
   AC_MSG_ERROR([Cannot find glib. Check config.log])
 fi
 
-AC_MSG_CHECKING(for GLIB - version >= 2.6.0)
-if $PKG_CONFIG 'glib-2.0 >= 2.6.0'
+AC_MSG_CHECKING(for GLIB - version >= 2.8.0)
+if $PKG_CONFIG 'glib-2.0 >= 2.8.0'
 then
   AC_MSG_RESULT(yes)
-  AC_DEFINE(HAVE_GLIB26,1,[System has glib 2.6.0 or better])
-  HAVE_GLIB26=yes
+  AC_DEFINE(HAVE_GLIB_2_8,1,[System has glib 2.8.0 or better])
+  HAVE_GLIB_2_8=yes
 else
-  GLIB24_LIBS="$GLIB_LIBS"
-  GLIB_LIBS="\${top_builddir}/lib/glib26/libgncglib.la $GLIB_LIBS"
-  GLIB_CFLAGS="-I\${top_srcdir}/lib/glib26 $GLIB_CFLAGS"
   AC_MSG_RESULT(no)
-  AC_SUBST(GLIB24_LIBS)
+  if test "x${native_win32}" = "xyes"; then
+    AC_MSG_ERROR([*** GLIB >= 2.8 is required to build Gnucash on Windows.])
+  else
+    GLIB26_LIBS="$GLIB_LIBS"
+    GLIB_LIBS="\${top_builddir}/lib/glib28/libgnc-glib.la $GLIB_LIBS"
+    GLIB_CFLAGS="-I\${top_srcdir}/lib/glib28 $GLIB_CFLAGS"
+    AC_SUBST(GLIB26_LIBS)
+  fi
 fi
-AM_CONDITIONAL(HAVE_GLIB26, test "x$HAVE_GLIB26" = "xyes" )
+AM_CONDITIONAL(HAVE_GLIB_2_8, test "x$HAVE_GLIB_2_8" = "xyes")
 
 AC_MSG_CHECKING(for GLIB - version >= 2.9.0)
 if $PKG_CONFIG 'glib-2.0 >= 2.9.0'
@@ -511,9 +540,9 @@
   AC_MSG_NOTICE([External QOF Disabled.  Using Internal QOF Code.])
 fi
 if test x$QOF_XML_DIR = x; then
-	QOF_LIB_DIR='${libdir}'
+	QOF_LIB_DIR='${pkglibdir}'
 	QOF_CFLAGS='-I${top_builddir}/lib/libqof/qof -I${top_srcdir}/lib/libqof/qof'
-	QOF_LIBS='${top_builddir}/lib/libqof/qof/libgncqof.la'
+	QOF_LIBS='${top_builddir}/lib/libqof/qof/libgnc-qof.la'
 	QOF_VERSION="internal"
 	QOF_PREFIX="internal"
 	QOF_XML_DIR='${pkgdatadir}/xml/qsf'
@@ -542,7 +571,6 @@
 GNC_CONFIGDIR='${sysconfdir}/gnucash'
 GNC_DOC_INSTALL_DIR='${pkgdatadir}/doc'
 GNC_INCLUDE_DIR='${includedir}/gnucash'
-GNC_LIBDIR='${pkglibdir}'
 GNC_SCM_INSTALL_DIR='${pkgdatadir}/scm'
 GNC_SHAREDIR='${pkgdatadir}'
 GNC_LIBEXECDIR='${libexecdir}/gnucash'
@@ -550,7 +578,6 @@
 GNC_ACCOUNTS_DIR='${GNC_SHAREDIR}/accounts'
 GNC_GLADE_DIR='${GNC_SHAREDIR}/glade'
 GNC_UI_DIR='${GNC_SHAREDIR}/ui'
-GNC_MODULE_DIR='${pkglibdir}'
 GNC_PIXMAP_DIR='${GNC_SHAREDIR}/pixmaps'
 
 AC_SUBST(GNC_ACCOUNTS_DIR)
@@ -559,8 +586,6 @@
 AC_SUBST(GNC_GLADE_DIR)
 AC_SUBST(GNC_UI_DIR)
 AC_SUBST(GNC_INCLUDE_DIR)
-AC_SUBST(GNC_LIBDIR)
-AC_SUBST(GNC_MODULE_DIR)
 AC_SUBST(GNC_PIXMAP_DIR)
 AC_SUBST(GNC_SCM_INSTALL_DIR)
 AC_SUBST(GNC_SHAREDIR)
@@ -568,7 +593,10 @@
 
 AC_ARG_ENABLE( debug,
   [  --enable-debug               compile with debugging flags set],
-       CFLAGS="${CFLAGS} -g"
+       # remove any optimization flags...
+       CFLAGS=$(echo $CFLAGS | sed -e 's,-O.,,g')
+       # ...except for those the user wants.
+       CFLAGS="${CFLAGS} -g ${USER_OPTIMIZATION}"
        LDFLAGS="${LDFLAGS} -g"
        AC_DEFINE(DEBUG_MEMORY,1,Enable debug memory),
        AC_DEFINE(DEBUG_MEMORY,0,Enable debug memory) )
@@ -811,7 +839,7 @@
 then
     # Check for Aqbanking library
     # aqbanking-1.6.0 was released on 2005-09-22
-    PKG_CHECK_MODULES(HBCI, aqbanking >= "1.6.0", [], [
+    PKG_CHECK_MODULES(HBCI, aqbanking >= "1.6.0" gwenhywfar, [], [
       AC_AQBANKING(1,6,0)
       if test x${have_aqbanking} != xyes; 
       then
@@ -1023,7 +1051,7 @@
     fi
     GNOME_COMPILE_WARNINGS
 
-    PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.4)
+    PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.6)
     AS_SCRUB_INCLUDE(GTK_CFLAGS)
     AC_SUBST(GTK_CFLAGS)
     AC_SUBST(GTK_LIBS)
@@ -1124,18 +1152,6 @@
 ### Only test this if we're building the GUI
 if test x${gnc_build_gui} = xtrue ;
 then
-  AC_MSG_CHECKING(for GTK - version >= 2.6.0)
-  if $PKG_CONFIG 'gtk+-2.0 >= 2.6.0'
-  then
-    AC_MSG_RESULT(yes)
-    AC_DEFINE(HAVE_GTK26,1,[System has gtk 2.6.0 or better])
-    HAVE_GTK26=yes
-  else
-    AC_MSG_RESULT(no)
-  fi
-  AM_CONDITIONAL(HAVE_GTK26, test "x$HAVE_GTK26" = "xyes" )
-  
-  
   AC_MSG_CHECKING(for GTK - version >= 2.10.0)
   if $PKG_CONFIG 'gtk+-2.0 >= 2.10.0'
   then
@@ -1148,18 +1164,6 @@
   AM_CONDITIONAL(HAVE_GTK_2_10, test "x$HAVE_GTK_2_10" = "xyes" )
   
   
-  AC_MSG_CHECKING(for pango version >= 1.8.0)
-  if $PKG_CONFIG 'pango >= 1.8.0'
-  then
-    AC_MSG_RESULT(yes)
-    AC_DEFINE(HAVE_PANGO18,1,[System has pango 1.8.0 or better])
-    HAVE_PANGO18=yes
-  else
-    AC_MSG_RESULT(no)
-  fi
-  AM_CONDITIONAL(HAVE_PANGO18, test "x$HAVE_PANGO18" = "xyes" )
-  
-  
   dnl @@fixme 
   dnl use both PKG_CHECK_MODULES and `$PKG_CONFIG`; the first importantly sets
   dnl MUMBLE_{LIBS,CFLAGS}...
@@ -1254,8 +1258,8 @@
   ])
   dnl Modules common to libgsf and libgsf-gnome
   libgsf_reqs="
-      gobject-2.0 >= 2.4.0
-      glib-2.0 >= 2.4.0
+      gobject-2.0 >= 2.6.0
+      glib-2.0 >= 2.6.0
       libxml-2.0 >= 2.4.16
   "
   dnl Modules required for libgsf-gnome
@@ -1532,15 +1536,15 @@
   dnl *****************************
   #	libgsf-1		>= 1.12.2
   goffice_reqs="
-  	glib-2.0		>= 2.4.7
-  	gobject-2.0		>= 2.4.7
-  	gmodule-2.0		>= 2.4.7
+  	glib-2.0		>= 2.6.4
+  	gobject-2.0		>= 2.6.4
+  	gmodule-2.0		>= 2.6.4
   	libxml-2.0		>= 2.4.12
-  	pango			>= 1.6.0
-  	pangoft2		>= 1.6.0
+  	pango			>= 1.8.1
+  	pangoft2		>= 1.8.1
   "
   goffice_gtk_reqs="
-  	gtk+-2.0		>= 2.4.13
+  	gtk+-2.0		>= 2.6.0
   	libglade-2.0		>= 2.3.6
   	libgnomeprint-2.2	>= 2.8.0
   	libart-2.0		>= 2.3.11
@@ -1838,9 +1842,7 @@
   ### ------------------------------------------------------------------------
 else
   ### A bunch of am conditionals that need to be set
-  AM_CONDITIONAL(HAVE_GTK26, false )
   AM_CONDITIONAL(HAVE_GTK_2_10, false)
-  AM_CONDITIONAL(HAVE_PANGO18, false )
   AM_CONDITIONAL(HAVE_LIBGSF, false)
   AM_CONDITIONAL(HAVE_GOFFICE, false)
   AM_CONDITIONAL(WITH_LIBGSF_GNOME, false)
@@ -1951,7 +1953,7 @@
 ### GnuCash flags and libs configuration
 
 GNUCASH_ENGINE_BASE_LIBS="${GLIB_LIBS}"
-GNUCASH_ENGINE_LIBS="-L${GNC_MODULE_DIR} ${GNUCASH_ENGINE_BASE_LIBS} ${GUILE_LIBS} -lgncmod-engine -lgncmodule"
+GNUCASH_ENGINE_LIBS="-L${pkglibdir} ${GNUCASH_ENGINE_BASE_LIBS} ${GUILE_LIBS} -lgncmod-engine -lgnc-module"
 
 GNUCASH_ENGINE_BASE_CFLAGS="-DGNUCASH ${GLIB_CFLAGS} ${GUILE_INCS}"
 GNUCASH_ENGINE_CFLAGS="${GNUCASH_ENGINE_BASE_CFLAGS}"
@@ -2056,8 +2058,11 @@
 fi
 AC_MSG_RESULT($warnFLAGS)
 
-# Extend LDFLAGS because libtool on Windows requires this argument
-LDFLAGS="${LDFLAGS} -no-undefined"
+# Adjust CFLAGS and LDFLAGS on Windows
+if test "x${platform_win32}" = "xyes"; then
+  CFLAGS="${CFLAGS} -mms-bitfields"
+  LDFLAGS="${LDFLAGS} -no-undefined -mwindows"
+fi
 
 ### --------------------------------------------------------------------------
 ### Adjustments -- especially executables that aren't generated via
@@ -2087,6 +2092,7 @@
           accounts/de_DE/Makefile
           accounts/el_GR/Makefile
           accounts/es_ES/Makefile
+          accounts/fr_CA/Makefile
           accounts/fr_CH/Makefile
           accounts/fr_FR/Makefile
           accounts/hu_HU/Makefile
@@ -2100,7 +2106,7 @@
           doc/examples/Makefile
           intl-scm/Makefile
           lib/Makefile
-          lib/glib26/Makefile
+          lib/glib28/Makefile
           lib/guile-www/Makefile
           lib/srfi/Makefile
           lib/libc/Makefile
@@ -2216,7 +2222,7 @@
           src/register/register-gnome/test/Makefile
           src/report/Makefile
           src/report/report-gnome/Makefile
-          dnl # src/report/report-gnome/test/Makefile
+          src/report/report-gnome/test/Makefile
           src/report/report-system/Makefile
           src/report/report-system/test/Makefile
           src/report/standard-reports/Makefile
@@ -2251,9 +2257,6 @@
           dnl # non-makefiles
           dnl # Please read doc/build-system before adding *anything* here
 
-          dnl # we configure gnucash-config here because we *don't*
-          dnl # want variables to be fully expanded
-          gnucash-config
           ,
           dnl # commands go here, but we don't have any right now
 )

Modified: gnucash/branches/remove-group2/doc/README.dependencies
===================================================================
--- gnucash/branches/remove-group2/doc/README.dependencies	2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/doc/README.dependencies	2007-02-11 19:54:51 UTC (rev 15565)
@@ -15,7 +15,6 @@
 	libgnomeui-devel
 	libgsf-devel
 	libjpeg-devel
-	libtool-ltdl-devel
 	openssl-devel
 
 If you are compiling with the --enable-ofx or --enable-hbci flags,

Deleted: gnucash/branches/remove-group2/gnucash-config.in
===================================================================
--- gnucash/branches/remove-group2/gnucash-config.in	2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/gnucash-config.in	2007-02-11 19:54:51 UTC (rev 15565)
@@ -1,214 +0,0 @@
-#!/bin/sh
-
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-exec_prefix_set=no
-
-usage()
-{
-	cat <<EOF
-Usage: gnucash-config [OPTIONS] [LIBRARIES]
-Options:
-	[--prefix[=DIR]]
-	[--exec-prefix[=DIR]]
-	[--version]
-	[--libs]
-	[--cflags]
-        [--ld-library-path]
-        [--scm-module-dir]
-Libraries:
-	engine
-        network-utils
-        app-utils
-        register-core
-        gnome-utils
-        gnucash
-EOF
-	exit $1
-}
-
-if test $# -eq 0; then
-	usage 1 1>&2
-fi
-
-any_lib=no
-
-while test $# -gt 0; do
-  case "$1" in
-  -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) optarg= ;;
-  esac
-
-  case $1 in
-    --prefix=*)
-      prefix=$optarg
-      if test $exec_prefix_set = no ; then
-        exec_prefix=$optarg
-      fi
-      ;;
-    --prefix)
-      echo_prefix=yes
-      ;;
-    --exec-prefix=*)
-      exec_prefix=$optarg
-      exec_prefix_set=yes
-      ;;
-    --exec-prefix)
-      echo_exec_prefix=yes
-      ;;
-    --version)
-      echo @VERSION@
-      exit 0
-      ;;
-    --cflags)
-      echo_cflags=yes
-      ;;
-    --libs)
-      echo_libs=yes
-      ;;
-    --ld-library-path)
-      echo_ld_library_path=yes
-      ;;
-    --scm-module-dir)
-      echo_scm_module_dir=yes
-      ;;
-    engine)
-      lib_engine=yes
-      any_lib=yes
-      ;;
-    app-utils)
-      lib_app_utils=yes
-      any_lib=yes
-      ;;
-    network-utils)
-      lib_network_utils=yes
-      any_lib=yes
-      ;;
-    gnome-utils)
-      lib_gnome_utils=yes
-      any_lib=yes
-      ;;
-    register-core)
-      lib_register_core=yes
-      any_lib=yes
-      ;;
-    gnucash)
-      lib_gnucash=yes
-      any_lib=yes
-      ;;
-    *)
-      usage 1 1>&2
-      ;;
-  esac
-  shift
-done
-
-datadir=@datadir@
-libdir=@libdir@
-includedir=@includedir@
-pkgdatadir=${datadir}/@PACKAGE@
-pkglibdir=${libdir}/@PACKAGE@
-pkgincludedir=${includedir}/@PACKAGE@
-GNC_LIBDIR=@GNC_LIBDIR@
-GNC_MODULE_DIR=@GNC_MODULE_DIR@
-GNC_SHAREDIR=@GNC_SHAREDIR@
-
-# Trim the link and compile lines down.
-
-if test "$any_lib" = "no"; then
-  lib_gnucash=yes
-fi
-
-if test "$lib_app_utils" = "yes"; then
-  lib_engine=no
-fi
-
-if test "$lib_register_core" = "yes"; then
-  lib_engine=no
-  lib_network_utils=no
-  lib_app_utils=no
-  lib_gnome_utils=no
-fi
-
-if test "$lib_gnome_utils" = "yes"; then
-  lib_engine=no
-  lib_network_utils=no
-  lib_app_utils=no
-fi
-
-if test "$lib_gnucash" = "yes"; then
-  lib_engine=no
-  lib_network_utils=no
-  lib_app_utils=no
-  lib_register_core=no
-  lib_gnome_utils=no
-fi
-
-if test "$echo_prefix" = "yes"; then
-    echo $prefix
-fi
-
-if test "$echo_exec_prefix" = "yes"; then
-    echo $exec_prefix
-fi
-
-if test "$echo_cflags" = "yes"; then
-    cflags=""
-
-    if test "$lib_engine" = "yes"; then
-        cflags="$cflags @GNUCASH_ENGINE_CFLAGS@"
-    fi
-
-    if test "$lib_network_utils" = "yes"; then
-        cflags="$cflags @GNUCASH_NETWORK_UTILS_CFLAGS@"
-    fi
-
-    if test "$lib_app_utils" = "yes"; then
-        cflags="$cflags @GNUCASH_APP_UTILS_CFLAGS@"
-    fi
-
-    if test "$lib_register_core" = "yes"; then
-        cflags="$cflags @GNUCASH_REGISTER_CORE_CFLAGS@"
-    fi
-
-    if test "$lib_gnome_utils" = "yes"; then
-        cflags="$cflags @GNUCASH_GNOME_UTILS_CFLAGS@"
-    fi
-
-    echo $cflags
-fi
-
-if test "$echo_libs" = "yes"; then
-    libs="-L${libdir}"
-
-    if test "$lib_engine" = "yes"; then
-        libs="$libs @GNUCASH_ENGINE_LIBS@"
-    fi
-
-    if test "$lib_network_utils" = "yes"; then
-        libs="$libs @GNUCASH_NETWORK_UTILS_LIBS@"
-    fi
-
-    if test "$lib_app_utils" = "yes"; then
-        libs="$libs @GNUCASH_APP_UTILS_LIBS@"
-    fi
-
-    if test "$lib_register_core" = "yes"; then
-        libs="$libs @GNUCASH_REGISTER_CORE_LIBS@"
-    fi
-
-    if test "$lib_gnome_utils" = "yes"; then
-        libs="$libs @GNUCASH_GNOME_UTILS_LIBS@"
-    fi
-
-    echo $libs
-fi
-
-if test "$echo_ld_library_path" = "yes"; then
-    path="$libdir:$GNC_LIBDIR:$GNC_MODULE_DIR"
-    echo $path
-fi
-
-if test "$echo_scm_module_dir" = "yes"; then
-   echo $GNC_SHAREDIR/guile-modules
-fi

Deleted: gnucash/branches/remove-group2/gnucash.m4
===================================================================
--- gnucash/branches/remove-group2/gnucash.m4	2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/gnucash.m4	2007-02-11 19:54:51 UTC (rev 15565)
@@ -1,215 +0,0 @@
-# Configure paths for GnuCash
-# Dave Peticolas <dave at krondo.com> 2001-09-07
-# Based on glib.m4 by Owen Taylor 97-11-3
-
-dnl AM_PATH_GNUCASH([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
-dnl Test for GnuCash, and define GNUCASH_CFLAGS and GNUCASH_LIBS, if "gmodule" or 
-dnl gthread is specified in MODULES, pass to gnucash-config
-dnl
-AC_DEFUN([AM_PATH_GNUCASH],
-[dnl 
-dnl Get the cflags and libraries from the gnucash-config script
-dnl
-AC_ARG_WITH(gnucash-prefix,[  --with-gnucash-prefix=PFX   Prefix where GnuCash is installed (optional)],
-            gnucash_config_prefix="$withval", gnucash_config_prefix="")
-AC_ARG_WITH(gnucash-exec-prefix,[  --with-gnucash-exec-prefix=PFX Exec prefix where GnuCash is installed (optional)],
-            gnucash_config_exec_prefix="$withval", gnucash_config_exec_prefix="")
-AC_ARG_ENABLE(gnucashtest, [  --disable-gnucashtest       Do not try to compile and run a test GnuCash program],
-		    , enable_gnucashtest=yes)
-
-  if test x$gnucash_config_exec_prefix != x ; then
-     gnucash_config_args="$gnucash_config_args --exec-prefix=$gnucash_config_exec_prefix"
-     if test x${GNUCASH_CONFIG+set} != xset ; then
-        GNUCASH_CONFIG=$gnucash_config_exec_prefix/bin/gnucash-config
-     fi
-     if test x${GNUCASH_ENV+set} != xset ; then
-        GNUCASH_ENV=$gnucash_config_exec_prefix/bin/gnucash-env
-     fi
-     if test x${GNC_TEST_ENV+set} != xset ; then
-        GNC_TEST__ENV=$gnucash_config_exec_prefix/bin/gnc-test-env
-     fi
-  fi
-  if test x$gnucash_config_prefix != x ; then
-     gnucash_config_args="$gnucash_config_args --prefix=$gnucash_config_prefix"
-     if test x${GNUCASH_CONFIG+set} != xset ; then
-        GNUCASH_CONFIG=$gnucash_config_prefix/bin/gnucash-config
-     fi
-     if test x${GNUCASH_ENV+set} != xset ; then
-        GNUCASH_ENV=$gnucash_config_prefix/bin/gnucash-env
-     fi
-     if test x${GNC_TEST_ENV+set} != xset ; then
-        GNC_TEST__ENV=$gnucash_config_prefix/bin/gnc-test-env
-     fi
-  fi
-
-  if test "x$4" = "x"; then
-     gnucash_config_args="$gnucash_config_args gnucash"
-  else
-     gnucash_config_args="$gnucash_config_args $4"
-  fi
-
-  AC_PATH_PROG(GNUCASH_CONFIG, gnucash-config, no)
-  min_gnucash_version=ifelse([$1], ,1.7.0,$1)
-  AC_MSG_CHECKING(for GnuCash - version >= $min_gnucash_version)
-  no_gnucash=""
-  if test "$GNUCASH_CONFIG" = "no" ; then
-    no_gnucash=yes
-  else
-    GNUCASH_CFLAGS=`$GNUCASH_CONFIG $gnucash_config_args --cflags`
-    GNUCASH_LIBS=`$GNUCASH_CONFIG $gnucash_config_args --libs`
-    gnucash_config_major_version=`$GNUCASH_CONFIG $gnucash_config_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-    gnucash_config_minor_version=`$GNUCASH_CONFIG $gnucash_config_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-    gnucash_config_micro_version=`$GNUCASH_CONFIG $gnucash_config_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-    if test "x$enable_gnucashtest" = "xyes" ; then
-      ac_save_CFLAGS="$CFLAGS"
-      ac_save_LIBS="$LIBS"
-      CFLAGS="$CFLAGS $GNUCASH_CFLAGS"
-      LIBS="$GNUCASH_LIBS $LIBS"
-dnl
-dnl Now check if the installed GNUCASH is sufficiently new. (Also sanity
-dnl checks the results of gnucash-config to some extent
-dnl
-      rm -f conf.gnucashtest
-      OLD_LD_LIBRARY_PATH="$LD_LIBRARY_PATH"
-      NEW_LD_PATH=`$GNUCASH_CONFIG $gnucash_config_args --ld-library-path`
-      if test "$NEW_LD_PATH"x != x; then
-        export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$NEW_LD_PATH"
-      fi
-      AC_TRY_RUN([
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <gnc-engine.h>
-
-int
-main ()
-{
-  int major, minor, micro;
-  char *tmp_version;
-
-  system ("touch conf.gnucashtest");
-
-  /* HP/UX 9 (%@#!) writes to sscanf strings */
-  tmp_version = g_strdup("$min_gnucash_version");
-  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
-     printf("%s, bad version string\n", "$min_gnucash_version");
-     exit(1);
-  }
-
-  if ((gnucash_major_version() != $gnucash_config_major_version) ||
-      (gnucash_minor_version() != $gnucash_config_minor_version) ||
-      (gnucash_micro_version() != $gnucash_config_micro_version))
-    {
-      printf("\n*** 'gnucash-config --version' returned %d.%d.%d, but GnuCash (%d.%d.%d)\n", 
-             $gnucash_config_major_version, $gnucash_config_minor_version, $gnucash_config_micro_version,
-             gnucash_major_version(), gnucash_minor_version(), gnucash_micro_version());
-      printf ("*** was found! If gnucash-config was correct, then it is best\n");
-      printf ("*** to remove the old version of GnuCash. You may also be able to fix the error\n");
-      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
-      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
-      printf("*** required on your system.\n");
-      printf("*** If gnucash-config was wrong, set the environment variable GNUCASH_CONFIG\n");
-      printf("*** to point to the correct copy of gnucash-config, and remove the file config.cache\n");
-      printf("*** before re-running configure\n");
-    }
-/* The code below needs GNUCASH_*_VERSION defined in gnc-engine.h
-  else if ((gnucash_major_version() != GNUCASH_MAJOR_VERSION) ||
-	   (gnucash_minor_version() != GNUCASH_MINOR_VERSION) ||
-           (gnucash_micro_version() != GNUCASH_MICRO_VERSION))
-    {
-      printf("*** GnuCash header files (version %d.%d.%d) do not match\n",
-	     GNUCASH_MAJOR_VERSION, GNUCASH_MINOR_VERSION, GNUCASH_MICRO_VERSION);
-      printf("*** library (version %d.%d.%d)\n",
-	     gnucash_major_version(), gnucash_minor_version(), gnucash_micro_version());
-    }
-*/
-  else
-    {
-      if ((gnucash_major_version() > major) ||
-        ((gnucash_major_version() == major) && (gnucash_minor_version() > minor)) ||
-        ((gnucash_major_version() == major) && (gnucash_minor_version() == minor) && (gnucash_micro_version() >= micro)))
-      {
-        return 0;
-       }
-     else
-      {
-        printf("\n*** An old version of GnuCash (%d.%d.%d) was found.\n",
-               gnucash_major_version(), gnucash_minor_version(), gnucash_micro_version());
-        printf("*** You need a version of GnuCash newer than %d.%d.%d. The latest version of\n",
-	       major, minor, micro);
-        printf("*** GnuCash is always available from ftp://ftp.gnucash.org.\n");
-        printf("***\n");
-        printf("*** If you have already installed a sufficiently new version, this error\n");
-        printf("*** probably means that the wrong copy of the gnucash-config shell script is\n");
-        printf("*** being found. The easiest way to fix this is to remove the old version\n");
-        printf("*** of GnuCash, but you can also set the GNUCASH_CONFIG environment to point to the\n");
-        printf("*** correct copy of gnucash-config. (In this case, you will have to\n");
-        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
-        printf("*** so that the correct libraries are found at run-time))\n");
-      }
-    }
-  return 1;
-}
-],, no_gnucash=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-       CFLAGS="$ac_save_CFLAGS"
-       LIBS="$ac_save_LIBS"
-     fi
-  fi
-  if test "x$no_gnucash" = x ; then
-     AC_MSG_RESULT(yes)
-     ifelse([$2], , :, [$2])     
-  else
-     AC_MSG_RESULT(no)
-     if test "$GNUCASH_CONFIG" = "no" ; then
-       echo "*** The gnucash-config script installed by GnuCash could not be found"
-       echo "*** If GnuCash was installed in PREFIX, make sure PREFIX/bin is in"
-       echo "*** your path, or set the GNUCASH_CONFIG environment variable to the"
-       echo "*** full path to gnucash-config."
-     else
-       if test -f conf.gnucashtest ; then
-        :
-       else
-          echo "*** Could not run GnuCash test program, checking why..."
-          CFLAGS="$CFLAGS $GNUCASH_CFLAGS"
-          LIBS="$LIBS $GNUCASH_LIBS"
-          AC_TRY_LINK([
-#include <gnc-engine.h>
-#include <stdio.h>
-],      [ return ((gnucash_major_version()) || (gnucash_minor_version()) || (gnucash_micro_version())); ],
-        [ echo "*** The test program compiled, but did not run. This usually means"
-          echo "*** that the run-time linker is not finding GnuCash or finding the wrong"
-          echo "*** version of GnuCash. If it is not finding GnuCash, you'll need to set your"
-          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
-          echo "*** is required on your system"
-	  echo "***"
-          echo "*** If you have an old version installed, it is best to remove it, although"
-          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ],
-        [ echo "*** The test program failed to compile or link. See the file config.log for the"
-          echo "*** exact error that occured. This usually means GnuCash was incorrectly installed"
-          echo "*** or that you have moved GnuCash since it was installed. In the latter case, you"
-          echo "*** may want to edit the gnucash-config script: $GNUCASH_CONFIG" ])
-          CFLAGS="$ac_save_CFLAGS"
-          LIBS="$ac_save_LIBS"
-       fi
-     fi
-     GNUCASH_CFLAGS=""
-     GNUCASH_LIBS=""
-     ifelse([$3], , :, [$3])
-  fi
-  AC_SUBST(GNUCASH_CFLAGS)
-  AC_SUBST(GNUCASH_LIBS)
-  rm -f conf.gnucashtest
-
-  AC_PATH_PROG(GNUCASH_ENV, gnucash-env, gnucash-env)
-  AC_SUBST(GNUCASH_ENV)
-  AC_PATH_PROG(GNC_TEST_ENV, gnc-test-env, gnc-test-env)
-  AC_SUBST(GNC_TEST_ENV)
-
-  if test "$NEW_LD_PATH"x != x; then
-    export LD_LIBRARY_PATH="$OLD_LD_LIBRARY_PATH"
-  fi
-])

Modified: gnucash/branches/remove-group2/goffice-config.h.in
===================================================================
--- gnucash/branches/remove-group2/goffice-config.h.in	2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/goffice-config.h.in	2007-02-11 19:54:51 UTC (rev 15565)
@@ -1,12 +1,5 @@
 /* goffice/goffice-config.h.in.  Generated from configure.in by autoheader.  */
 
-/* Conditionally include >2.4 pieces we use. */
-#undef HAVE_GLIB26
-#undef HAVE_GTK26
-
-/* Conditionally work around exposed-in-1.8-functionality. */
-#undef HAVE_PANGO18
-
 /* always defined to indicate that i18n is enabled */
 #undef ENABLE_NLS
 

Modified: gnucash/branches/remove-group2/gsf-config.h.in
===================================================================
--- gnucash/branches/remove-group2/gsf-config.h.in	2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/gsf-config.h.in	2007-02-11 19:54:51 UTC (rev 15565)
@@ -9,9 +9,6 @@
 /* Define to 1 if you have the `bind_textdomain_codeset' function. */
 #undef HAVE_BIND_TEXTDOMAIN_CODESET
 
-/* Conditionally include glib-2.0 > 2.4 functionality. */
-#undef HAVE_GLIB26
-
 /* Is bzip2 available and enabled */
 #undef HAVE_BZ2
 

Modified: gnucash/branches/remove-group2/lib/Makefile.am
===================================================================
--- gnucash/branches/remove-group2/lib/Makefile.am	2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/lib/Makefile.am	2007-02-11 19:54:51 UTC (rev 15565)
@@ -1,5 +1,5 @@
-SUBDIRS = libc glib26 guile-www srfi
-DIST_SUBDIRS = libc glib26 guile-www srfi libgsf-1.12.3 goffice-0.0.4 libqof
+SUBDIRS = libc glib28 guile-www srfi
+DIST_SUBDIRS = libc glib28 guile-www srfi libgsf-1.12.3 goffice-0.0.4 libqof
 
 if !HAVE_GOFFICE
 if !HAVE_LIBGSF

Copied: gnucash/branches/remove-group2/lib/glib28 (from rev 15563, gnucash/trunk/lib/glib28)


Property changes on: gnucash/branches/remove-group2/lib/glib28
___________________________________________________________________
Name: svn:ignore
   + *.lo
*.la
.deps
.libs
Makefile
Makefile.in
semantic.cache
TAGS


Modified: gnucash/branches/remove-group2/lib/goffice-0.0.4/goffice/Makefile.am
===================================================================
--- gnucash/branches/remove-group2/lib/goffice-0.0.4/goffice/Makefile.am	2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/lib/goffice-0.0.4/goffice/Makefile.am	2007-02-11 19:54:51 UTC (rev 15565)
@@ -26,16 +26,10 @@
 libgoffice_1_la_SOURCES = 	\
 	goffice.c		\
 	goffice-priv.h
-if !HAVE_GLIB26
-  libgoffice_1_la_SOURCES += glib24_26-compat.c
-endif
 
 libgoffice_1_ladir = $(goffice_include_dir)
 noinst_HEADERS = 	\
 	goffice.h
-if !HAVE_GLIB26
-  noinst_HEADERS += glib24_26-compat.h
-endif
 
 # Depends on this Makefile, because it uses make variables.
 goffice-paths.h: Makefile

Modified: gnucash/branches/remove-group2/lib/goffice-0.0.4/goffice/drawing/god-drawing-renderer-gdk.c
===================================================================
--- gnucash/branches/remove-group2/lib/goffice-0.0.4/goffice/drawing/god-drawing-renderer-gdk.c	2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/lib/goffice-0.0.4/goffice/drawing/god-drawing-renderer-gdk.c	2007-02-11 19:54:51 UTC (rev 15565)
@@ -182,19 +182,12 @@
 make_absolute (PangoAttribute *attr, gpointer user_data)
 {
 	DrawTextContext *draw_context = user_data;
-#if HAVE_PANGO18
 	if (attr->klass->type == PANGO_ATTR_SIZE &&
 	    ! ((PangoAttrSize *) attr)->absolute) {
 		PangoAttrSize *size_attr = (PangoAttrSize *) attr;
 		size_attr->size = GO_PT_TO_UN ((long long) size_attr->size) / draw_context->renderer->priv->y_units_per_pixel;
 		size_attr->absolute = TRUE;
 	}
-#else
-	if (attr->klass->type == PANGO_ATTR_SIZE) {
-		PangoAttrInt *size_attr = (PangoAttrInt *) attr;
-		size_attr->value = GO_PT_TO_UN ((long long) size_attr->value) / draw_context->renderer->priv->y_units_per_pixel;
-	}
-#endif // HAVE_PANGO18
 	return FALSE;
 }
 

Deleted: gnucash/branches/remove-group2/lib/goffice-0.0.4/goffice/glib24_26-compat.c
===================================================================
--- gnucash/branches/remove-group2/lib/goffice-0.0.4/goffice/glib24_26-compat.c	2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/lib/goffice-0.0.4/goffice/glib24_26-compat.c	2007-02-11 19:54:51 UTC (rev 15565)
@@ -1,359 +0,0 @@
-#include <goffice/glib24_26-compat.h>
-
-#include <string.h>
-
-static const guint16 days_in_year[2][14] = 
-{  /* 0, jan feb mar apr may  jun  jul  aug  sep  oct  nov  dec */
-  {  0, 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334, 365 }, 
-  {  0, 0, 31, 60, 91, 121, 152, 182, 213, 244, 274, 305, 335, 366 }
-};
-
-/* "Julian days" just means an absolute number of days, where Day 1 ==
- *   Jan 1, Year 1
- */
-static void
-g_date_update_julian (const GDate *const_d)
-{
-  GDate *d = (GDate *) const_d;
-  GDateYear year;
-  gint index;
-  
-  g_return_if_fail (d != NULL);
-  g_return_if_fail (d->dmy);
-  g_return_if_fail (!d->julian);
-  g_return_if_fail (g_date_valid_dmy (d->day, d->month, d->year));
-  
-  /* What we actually do is: multiply years * 365 days in the year,
-   *  add the number of years divided by 4, subtract the number of
-   *  years divided by 100 and add the number of years divided by 400,
-   *  which accounts for leap year stuff. Code from Steffen Beyer's
-   *  DateCalc. 
-   */
-  
-  year = d->year - 1; /* we know d->year > 0 since it's valid */
-  
-  d->julian_days = year * 365U;
-  d->julian_days += (year >>= 2); /* divide by 4 and add */
-  d->julian_days -= (year /= 25); /* divides original # years by 100 */
-  d->julian_days += year >> 2;    /* divides by 4, which divides original by 400 */
-  
-  index = g_date_is_leap_year (d->year) ? 1 : 0;
-  
-  d->julian_days += days_in_year[index][d->month] + d->day;
-  
-  g_return_if_fail (g_date_valid_julian (d->julian_days));
-  
-  d->julian = TRUE;
-}
-
-/**
- * g_date_get_iso8601_week_of_year:
- * @date: a valid #GDate
- *
- * Returns the week of the year, where weeks are interpreted according
- * to ISO 8601. 
- * 
- * Returns: ISO 8601 week number of the year.
- *
- * Since: 2.6
- **/
-guint
-g_date_get_iso8601_week_of_year (const GDate *d)
-{
-  guint j, d4, L, d1, w;
-
-  g_return_val_if_fail (g_date_valid (d), 0);
-  
-  if (!d->julian)
-    g_date_update_julian (d);
-  g_return_val_if_fail (d->julian, 0);
-
-  /* Formula taken from the Calendar FAQ; the formula was for the
-   * Julian Period which starts on 1 January 4713 BC, so we add
-   * 1,721,425 to the number of days before doing the formula. 
-   */
-  j  = d->julian_days + 1721425;
-  d4 = (j + 31741 - (j % 7)) % 146097 % 36524 % 1461;
-  L  = d4 / 1460;
-  d1 = ((d4 - L) % 365) + L;
-  w  = d1 / 7 + 1;
-
-  return w;
-}
-
-/** ------------------------------------------------------------ **/
-
-/* The following is (partly) taken from the gettext package.
-   Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.  */
-
-static const gchar *
-guess_category_value (const gchar *category_name)
-{
-  const gchar *retval;
-
-  /* The highest priority value is the `LANGUAGE' environment
-     variable.  This is a GNU extension.  */
-  retval = g_getenv ("LANGUAGE");
-  if ((retval != NULL) && (retval[0] != '\0'))
-    return retval;
-
-  /* `LANGUAGE' is not set.  So we have to proceed with the POSIX
-     methods of looking to `LC_ALL', `LC_xxx', and `LANG'.  On some
-     systems this can be done by the `setlocale' function itself.  */
-
-  /* Setting of LC_ALL overwrites all other.  */
-  retval = g_getenv ("LC_ALL");  
-  if ((retval != NULL) && (retval[0] != '\0'))
-    return retval;
-
-  /* Next comes the name of the desired category.  */
-  retval = g_getenv (category_name);
-  if ((retval != NULL) && (retval[0] != '\0'))
-    return retval;
-
-  /* Last possibility is the LANG environment variable.  */
-  retval = g_getenv ("LANG");
-  if ((retval != NULL) && (retval[0] != '\0'))
-    return retval;
-
-#ifdef G_PLATFORM_WIN32
-  /* g_win32_getlocale() first checks for LC_ALL, LC_MESSAGES and
-   * LANG, which we already did above. Oh well. The main point of
-   * calling g_win32_getlocale() is to get the thread's locale as used
-   * by Windows and the Microsoft C runtime (in the "English_United
-   * States" format) translated into the Unixish format.
-   */
-  retval = g_win32_getlocale ();
-  if ((retval != NULL) && (retval[0] != '\0'))
-    return retval;
-#endif  
-
-  return NULL;
-}
-
-typedef struct _GLanguageNamesCache GLanguageNamesCache;
-
-struct _GLanguageNamesCache {
-  gchar *languages;
-  gchar **language_names;
-};
-
-static void
-language_names_cache_free (gpointer data)
-{
-  GLanguageNamesCache *cache = data;
-  g_free (cache->languages);
-  g_strfreev (cache->language_names);
-  g_free (cache);
-}
-
-static char *
-unalias_lang (char *lang)
-{
-  return lang;
-}
-
-/* Mask for components of locale spec. The ordering here is from
- * least significant to most significant
- */
-enum
-{
-  COMPONENT_CODESET =   1 << 0,
-  COMPONENT_TERRITORY = 1 << 1,
-  COMPONENT_MODIFIER =  1 << 2
-};
-
-/* Break an X/Open style locale specification into components
- */
-static guint
-explode_locale (const gchar *locale,
-		gchar      **language, 
-		gchar      **territory, 
-		gchar      **codeset, 
-		gchar      **modifier)
-{
-  const gchar *uscore_pos;
-  const gchar *at_pos;
-  const gchar *dot_pos;
-
-  guint mask = 0;
-
-  uscore_pos = strchr (locale, '_');
-  dot_pos = strchr (uscore_pos ? uscore_pos : locale, '.');
-  at_pos = strchr (dot_pos ? dot_pos : (uscore_pos ? uscore_pos : locale), '@');
-
-  if (at_pos)
-    {
-      mask |= COMPONENT_MODIFIER;
-      *modifier = g_strdup (at_pos);
-    }
-  else
-    at_pos = locale + strlen (locale);
-
-  if (dot_pos)
-    {
-      mask |= COMPONENT_CODESET;
-      *codeset = g_strndup (dot_pos, at_pos - dot_pos);
-    }
-  else
-    dot_pos = at_pos;
-
-  if (uscore_pos)
-    {
-      mask |= COMPONENT_TERRITORY;
-      *territory = g_strndup (uscore_pos, dot_pos - uscore_pos);
-    }
-  else
-    uscore_pos = dot_pos;
-
-  *language = g_strndup (locale, uscore_pos - locale);
-
-  return mask;
-}
-
-/*
- * Compute all interesting variants for a given locale name -
- * by stripping off different components of the value.
- *
- * For simplicity, we assume that the locale is in
- * X/Open format: language[_territory][.codeset][@modifier]
- *
- * TODO: Extend this to handle the CEN format (see the GNUlibc docs)
- *       as well. We could just copy the code from glibc wholesale
- *       but it is big, ugly, and complicated, so I'm reluctant
- *       to do so when this should handle 99% of the time...
- */
-static GSList *
-_g_compute_locale_variants (const gchar *locale)
-{
-  GSList *retval = NULL;
-
-  gchar *language;
-  gchar *territory = NULL;
-  gchar *codeset = NULL;
-  gchar *modifier = NULL;
-
-  guint mask;
-  guint i;
-
-  g_return_val_if_fail (locale != NULL, NULL);
-
-  mask = explode_locale (locale, &language, &territory, &codeset, &modifier);
-
-  /* Iterate through all possible combinations, from least attractive
-   * to most attractive.
-   */
-  for (i = 0; i <= mask; i++)
-    if ((i & ~mask) == 0)
-      {
-	gchar *val = g_strconcat (language,
-				  (i & COMPONENT_TERRITORY) ? territory : "",
-				  (i & COMPONENT_CODESET) ? codeset : "",
-				  (i & COMPONENT_MODIFIER) ? modifier : "",
-				  NULL);
-	retval = g_slist_prepend (retval, val);
-      }
-
-  g_free (language);
-  if (mask & COMPONENT_CODESET)
-    g_free (codeset);
-  if (mask & COMPONENT_TERRITORY)
-    g_free (territory);
-  if (mask & COMPONENT_MODIFIER)
-    g_free (modifier);
-
-  return retval;
-}
-
-/**
- * g_get_language_names:
- * 
- * Computes a list of applicable locale names, which can be used to 
- * e.g. construct locale-dependent filenames or search paths. The returned 
- * list is sorted from most desirable to least desirable and always contains 
- * the default locale "C".
- *
- * For example, if LANGUAGE=de:en_US, then the returned list is
- * "de", "en_US", "en", "C".
- *
- * This function consults the environment variables <envar>LANGUAGE</envar>, 
- * <envar>LC_ALL</envar>, <envar>LC_MESSAGES</envar> and <envar>LANG</envar> 
- * to find the list of locales specified by the user.
- * 
- * Return value: a %NULL-terminated array of strings owned by GLib 
- *    that must not be modified or freed.
- *
- * Since: 2.6
- **/
-G_CONST_RETURN gchar * G_CONST_RETURN * 
-g_get_language_names (void)
-{
-  static GStaticPrivate cache_private = G_STATIC_PRIVATE_INIT;
-  GLanguageNamesCache *cache = g_static_private_get (&cache_private);
-  const gchar *value;
-
-  if (!cache)
-    {
-      cache = g_new0 (GLanguageNamesCache, 1);
-      g_static_private_set (&cache_private, cache, language_names_cache_free);
-    }
-
-  value = guess_category_value ("LC_MESSAGES");
-  if (!value)
-    value = "C";
-
-  if (!(cache->languages && strcmp (cache->languages, value) == 0))
-    {
-      gchar **languages;
-      gchar **alist, **a;
-      GSList *list, *l;
-      gint i;
-
-      g_free (cache->languages);
-      g_strfreev (cache->language_names);
-      cache->languages = g_strdup (value);
-
-      alist = g_strsplit (value, ":", 0);
-      list = NULL;
-      for (a = alist; *a; a++)
-	{
-	  gchar *b = unalias_lang (*a);
-	  list = g_slist_concat (list, _g_compute_locale_variants (b));
-	}
-      g_strfreev (alist);
-      list = g_slist_append (list, g_strdup ("C"));
-
-      cache->language_names = languages = g_new (gchar *, g_slist_length (list) + 1);
-      for (l = list, i = 0; l; l = l->next, i++)
-	languages[i] = l->data;
-      languages[i] = NULL;
-
-      g_slist_free (list);
-    }
-
-  return (G_CONST_RETURN gchar * G_CONST_RETURN *) cache->language_names;
-}
-
-/**
- * g_strv_length:
- * @str_array: a %NULL-terminated array of strings.
- * 
- * Returns the length of the given %NULL-terminated 
- * string array @str_array.
- * 
- * Return value: length of @str_array.
- *
- * Since: 2.6
- **/
-guint
-g_strv_length (gchar **str_array)
-{
-  guint i = 0;
-
-  g_return_val_if_fail (str_array != NULL, 0);
-
-  while (str_array[i])
-    ++i;
-
-  return i;
-}

Deleted: gnucash/branches/remove-group2/lib/goffice-0.0.4/goffice/glib24_26-compat.h
===================================================================
--- gnucash/branches/remove-group2/lib/goffice-0.0.4/goffice/glib24_26-compat.h	2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/lib/goffice-0.0.4/goffice/glib24_26-compat.h	2007-02-11 19:54:51 UTC (rev 15565)
@@ -1,39 +0,0 @@
-#ifndef GLIB24_26_COMPAT_H
-#define GLIB24_26_COMPAT_H
-
-#include <glib.h>
-
-/* from glib-2.6[.6] gdate.h */
-guint        g_date_get_iso8601_week_of_year (const GDate *date);
-
-/* from glib-2.6[.6] gutils.h */
-G_CONST_RETURN gchar* G_CONST_RETURN * g_get_language_names (void);
-
-#ifdef G_OS_WIN32
-
-/* On Win32, the canonical directory separator is the backslash, and
- * the search path separator is the semicolon. Note that also the
- * (forward) slash works as directory separator.
- */
-#define G_DIR_SEPARATOR '\\'
-#define G_DIR_SEPARATOR_S "\\"
-#define G_IS_DIR_SEPARATOR(c) ((c) == G_DIR_SEPARATOR || (c) == '/')
-#define G_SEARCHPATH_SEPARATOR ';'
-#define G_SEARCHPATH_SEPARATOR_S ";"
-
-#else  /* !G_OS_WIN32 */
-
-/* Unix */
-
-#define G_DIR_SEPARATOR '/'
-#define G_DIR_SEPARATOR_S "/"
-#define G_IS_DIR_SEPARATOR(c) ((c) == G_DIR_SEPARATOR)
-#define G_SEARCHPATH_SEPARATOR ':'
-#define G_SEARCHPATH_SEPARATOR_S ":"
-
-#endif /* !G_OS_WIN32 */
-
-/* from glib-2.6[.6] gstrfuncs.h */
-guint                 g_strv_length    (gchar       **str_array);
-
-#endif // GLIB24_26_COMPAT_H

Modified: gnucash/branches/remove-group2/lib/goffice-0.0.4/goffice/graph/gog-chart.c
===================================================================
--- gnucash/branches/remove-group2/lib/goffice-0.0.4/goffice/graph/gog-chart.c	2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/lib/goffice-0.0.4/goffice/graph/gog-chart.c	2007-02-11 19:54:51 UTC (rev 15565)
@@ -41,10 +41,6 @@
 #include <gtk/gtkspinbutton.h>
 #include <gtk/gtktogglebutton.h>
 
-#ifndef HAVE_GLIB26
-#include "goffice/glib24_26-compat.h"
-#endif
-
 const struct {
 	char const *name;
 	GogAxisSet const axis_set;

Modified: gnucash/branches/remove-group2/lib/goffice-0.0.4/goffice/graph/gog-object.c
===================================================================
--- gnucash/branches/remove-group2/lib/goffice-0.0.4/goffice/graph/gog-object.c	2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/lib/goffice-0.0.4/goffice/graph/gog-object.c	2007-02-11 19:54:51 UTC (rev 15565)
@@ -39,10 +39,6 @@
 #include <gtk/gtktogglebutton.h>
 #include <gtk/gtkwidget.h>
 
-#ifndef HAVE_GLIB26
-#include "goffice/glib24_26-compat.h"
-#endif
-
 GogEditor *
 gog_editor_new (void)
 {

Modified: gnucash/branches/remove-group2/lib/goffice-0.0.4/goffice/graph/gog-plot.c
===================================================================
--- gnucash/branches/remove-group2/lib/goffice-0.0.4/goffice/graph/gog-plot.c	2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/lib/goffice-0.0.4/goffice/graph/gog-plot.c	2007-02-11 19:54:51 UTC (rev 15565)
@@ -43,10 +43,6 @@
 #include <gsf/gsf-impl-utils.h>
 #include <string.h>
 
-#ifndef HAVE_GLIB26
-#include "goffice/glib24_26-compat.h"
-#endif
-
 #define GOG_PLOT_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), GOG_PLOT_TYPE, GogPlotClass))
 
 enum {

Modified: gnucash/branches/remove-group2/lib/goffice-0.0.4/goffice/gtk/goffice-gtk.c
===================================================================
--- gnucash/branches/remove-group2/lib/goffice-0.0.4/goffice/gtk/goffice-gtk.c	2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/lib/goffice-0.0.4/goffice/gtk/goffice-gtk.c	2007-02-11 19:54:51 UTC (rev 15565)
@@ -48,15 +48,6 @@
 #include <unistd.h>
 #include <errno.h>
 
-#ifndef HAVE_GTK26
-// +jsled: maybe not needed due to cascading imports under gtk+-2.6?
-#include <gtk/gtkimage.h>
-#endif
-
-#ifndef HAVE_GLIB26
-#include "goffice/glib24_26-compat.h"
-#endif
-
 #define PREVIEW_HSIZE 150
 #define PREVIEW_VSIZE 150
 

Modified: gnucash/branches/remove-group2/lib/goffice-0.0.4/goffice/utils/datetime.c
===================================================================
--- gnucash/branches/remove-group2/lib/goffice-0.0.4/goffice/utils/datetime.c	2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/lib/goffice-0.0.4/goffice/utils/datetime.c	2007-02-11 19:54:51 UTC (rev 15565)
@@ -14,10 +14,6 @@
 
 #include <math.h>
 
-#ifndef HAVE_GLIB26
-#include "goffice/glib24_26-compat.h"
-#endif
-
 #define SECS_PER_DAY (24 * 60 * 60)
 #define HALF_SEC (0.5 / SECS_PER_DAY)
 

Modified: gnucash/branches/remove-group2/lib/goffice-0.0.4/goffice/utils/go-libxml-extras.c
===================================================================
--- gnucash/branches/remove-group2/lib/goffice-0.0.4/goffice/utils/go-libxml-extras.c	2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/lib/goffice-0.0.4/goffice/utils/go-libxml-extras.c	2007-02-11 19:54:51 UTC (rev 15565)
@@ -17,10 +17,6 @@
 #include <stdlib.h>
 #include <math.h>
 
-#ifndef HAVE_GLIB26
-#include "goffice/glib24_26-compat.h"
-#endif
-
 #define CC2XML(s) ((xmlChar const *)(s))
 #define CXML2C(s) ((char const *)(s))
 

Modified: gnucash/branches/remove-group2/lib/libc/Makefile.am
===================================================================
--- gnucash/branches/remove-group2/lib/libc/Makefile.am	2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/lib/libc/Makefile.am	2007-02-11 19:54:51 UTC (rev 15565)
@@ -2,7 +2,7 @@
 
 # All header files must be listed.
 noinst_HEADERS = \
-  localtime_r.h setenv.h strptime.h
+  localtime_r.h setenv.h strptime.h pow.h
 
 # No sources should be listed.
 libc_missing_la_SOURCES = libc-missing-noop.c

Copied: gnucash/branches/remove-group2/lib/libc/pow.h (from rev 15563, gnucash/trunk/lib/libc/pow.h)

Modified: gnucash/branches/remove-group2/lib/libgsf-1.12.3/gsf/Makefile.am
===================================================================
--- gnucash/branches/remove-group2/lib/libgsf-1.12.3/gsf/Makefile.am	2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/lib/libgsf-1.12.3/gsf/Makefile.am	2007-02-11 19:54:51 UTC (rev 15565)
@@ -70,10 +70,6 @@
 #	gsf-command-context.c	\
 #	gsf-io-context.c
 
-if !HAVE_GLIB26
-  libgsf_1_la_SOURCES += glib24_26-compat.c
-endif
-
 libgsf_1_includedir = $(includedir)/libgsf-1/gsf
 noinst_HEADERS = 	\
 	gsf.h			\
@@ -125,10 +121,6 @@
 #	gsf-command-context.h	\
 #	gsf-io-context.h
 
-if !HAVE_GLIB26
-  noinst_HEADERS += glib24_26-compat.h
-endif
-
 install-data-local: install-libtool-import-lib
 
 uninstall-local: uninstall-libtool-import-lib

Deleted: gnucash/branches/remove-group2/lib/libgsf-1.12.3/gsf/glib24_26-compat.c
===================================================================
--- gnucash/branches/remove-group2/lib/libgsf-1.12.3/gsf/glib24_26-compat.c	2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/lib/libgsf-1.12.3/gsf/glib24_26-compat.c	2007-02-11 19:54:51 UTC (rev 15565)
@@ -1,204 +0,0 @@
-/** jsled, 2005-11-08: copied from glib-2.6.6 to support libgsf compilation
-    against glib-2.4.14. **/
-
-#include <gsf/glib24_26-compat.h>
-
-/* gstdio.c - wrappers for C library functions
- *
- * Copyright 2004 Tor Lillqvist
- *
- * GLib is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * GLib is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with GLib; see the file COPYING.LIB.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include "config.h"
-
-//#include <stdio.h>
-#include <string.h>
-//#include <stdlib.h>
-
-/** ------------------------------------------------------------ **/
-/* START gconvert.c  */
-
-#include <glib/gunicode.h>
-#include <glib/gconvert.h>
-#include <glib/gthread.h>
-
-typedef struct _GFilenameCharsetCache GFilenameCharsetCache;
-
-struct _GFilenameCharsetCache {
-  gboolean is_utf8;
-  gchar *charset;
-  gchar **filename_charsets;
-};
-
-/**
- * g_get_filename_charsets:
- * @charsets: return location for the %NULL-terminated list of encoding names
- *
- * Determines the preferred character sets used for filenames.
- * The first character set from the @charsets is the filename encoding, the
- * subsequent character sets are used when trying to generate a displayable
- * representation of a filename, see g_filename_display_name().
- *
- * On Unix, the character sets are determined by consulting the
- * environment variables <envar>G_FILENAME_ENCODING</envar> and
- * <envar>G_BROKEN_FILENAMES</envar>. On Windows, the character set
- * used in the GLib API is always UTF-8 and said environment variables
- * have no effect.
- *
- * <envar>G_FILENAME_ENCODING</envar> may be set to a comma-separated list 
- * of character set names. The special token "@locale" is taken to mean the 
- * character set for the current locale. If <envar>G_FILENAME_ENCODING</envar> 
- * is not set, but <envar>G_BROKEN_FILENAMES</envar> is, the character set of 
- * the current locale is taken as the filename encoding. If neither environment
- * variable is set, UTF-8 is taken as the filename encoding, but the character
- * set of the current locale is also put in the list of encodings.
- *
- * The returned @charsets belong to GLib and must not be freed.
- *
- * Note that on Unix, regardless of the locale character set or
- * <envar>G_FILENAME_ENCODING</envar> value, the actual file names present on a
- * system might be in any random encoding or just gibberish.
- *
- * Return value: %TRUE if the filename encoding is UTF-8.
- * 
- * Since: 2.6
- */
-static gboolean
-g_get_filename_charsets (G_CONST_RETURN gchar ***filename_charsets) 
-{
-  static const gchar *charsets[] = {
-    "UTF-8",
-    NULL
-  };
-
-#ifdef G_OS_WIN32
-  /* On Windows GLib pretends that the filename charset is UTF-8 */
-  if (filename_charsets)
-    *filename_charsets = charsets;
-
-  return TRUE;
-#else
-  gboolean result;
-
-  /* Cygwin works like before */
-  result = g_get_charset (&(charsets[0]));
-
-  if (filename_charsets)
-    *filename_charsets = charsets;
-
-  return result;
-#endif
-}
-
-static gchar *
-make_valid_utf8 (const gchar *name)
-{
-  GString *string;
-  const gchar *remainder, *invalid;
-  gint remaining_bytes, valid_bytes;
-  
-  string = NULL;
-  remainder = name;
-  remaining_bytes = strlen (name);
-  
-  while (remaining_bytes != 0) 
-    {
-      if (g_utf8_validate (remainder, remaining_bytes, &invalid)) 
-	break;
-      valid_bytes = invalid - remainder;
-    
-      if (string == NULL) 
-	string = g_string_sized_new (remaining_bytes);
-
-      g_string_append_len (string, remainder, valid_bytes);
-      g_string_append_c (string, '?');
-      
-      remaining_bytes -= valid_bytes + 1;
-      remainder = invalid + 1;
-    }
-  
-  if (string == NULL)
-    return g_strdup (name);
-  
-  g_string_append (string, remainder);
-  g_string_append (string, " (invalid encoding)");
-
-  g_assert (g_utf8_validate (string->str, -1, NULL));
-  
-  return g_string_free (string, FALSE);
-}
-
-/**
- * g_filename_display_name:
- * @filename: a pathname hopefully in the GLib file name encoding
- * 
- * Converts a filename into a valid UTF-8 string. The 
- * conversion is not necessarily reversible, so you 
- * should keep the original around and use the return
- * value of this function only for display purposes.
- * Unlike g_filename_to_utf8(), the result is guaranteed 
- * to be non-NULL even if the filename actually isn't in the GLib
- * file name encoding.
- *
- * If you know the whole pathname of the file you should use
- * g_filename_display_basename(), since that allows location-based
- * translation of filenames.
- *
- * Return value: a newly allocated string containing
- *   a rendition of the filename in valid UTF-8
- *
- * Since: 2.6
- **/
-gchar *
-g_filename_display_name (const gchar *filename)
-{
-  gint i;
-  const gchar **charsets;
-  gchar *display_name = NULL;
-  gboolean is_utf8;
- 
-  is_utf8 = g_get_filename_charsets (&charsets);
-
-  if (is_utf8)
-    {
-      if (g_utf8_validate (filename, -1, NULL))
-	display_name = g_strdup (filename);
-    }
-  
-  if (!display_name)
-    {
-      /* Try to convert from the filename charsets to UTF-8.
-       * Skip the first charset if it is UTF-8.
-       */
-      for (i = is_utf8 ? 1 : 0; charsets[i]; i++)
-	{
-	  display_name = g_convert (filename, -1, "UTF-8", charsets[i], 
-				    NULL, NULL, NULL);
-
-	  if (display_name)
-	    break;
-	}
-    }
-  
-  /* if all conversions failed, we replace invalid UTF-8
-   * by a question mark
-   */
-  if (!display_name) 
-    display_name = make_valid_utf8 (filename);
-
-  return display_name;
-}

Deleted: gnucash/branches/remove-group2/lib/libgsf-1.12.3/gsf/glib24_26-compat.h
===================================================================
--- gnucash/branches/remove-group2/lib/libgsf-1.12.3/gsf/glib24_26-compat.h	2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/lib/libgsf-1.12.3/gsf/glib24_26-compat.h	2007-02-11 19:54:51 UTC (rev 15565)
@@ -1,79 +0,0 @@
-/* This file has been copied from glib-2.6.6 into libgsf-1.12.3 to support
- * compilation against glib-2.4.14. -- jsled, 2005-11-08
- */
-
-#ifndef __GLIB_24_26_COMPAT_H__
-#define __GLIB_24_26_COMPAT_H__
-
-#include <glib.h>
-
-// START from gstdio.h
-/* gstdio.h - GFilename wrappers for C library functions
- *
- * Copyright 2004 Tor Lillqvist
- *
- * GLib is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * GLib is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with GLib; see the file COPYING.LIB.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <sys/stat.h>
-
-/* Just pass on to the system functions, so there's no potential for data
- * format mismatches, especially with large file interfaces.
- */
-
-#define g_open    open
-#define g_rename  rename
-#define g_mkdir   mkdir
-#define g_stat    stat
-#define g_lstat   lstat
-#define g_unlink  unlink
-#define g_remove  remove
-#define g_rmdir   rmdir
-#define g_fopen   fopen
-#define g_freopen freopen
-
-// END from gstdio.h
-
-// START from gconvert.h
-gchar *g_filename_display_name (const gchar *filename); // G_GNUC_MALLOC;
-// END from gconvert.h
-
-/* from glib-2.6[.6] gutils.h */
-#ifdef G_OS_WIN32
-
-/* On Win32, the canonical directory separator is the backslash, and
- * the search path separator is the semicolon. Note that also the
- * (forward) slash works as directory separator.
- */
-#define G_DIR_SEPARATOR '\\'
-#define G_DIR_SEPARATOR_S "\\"
-#define G_IS_DIR_SEPARATOR(c) ((c) == G_DIR_SEPARATOR || (c) == '/')
-#define G_SEARCHPATH_SEPARATOR ';'
-#define G_SEARCHPATH_SEPARATOR_S ";"
-
-#else  /* !G_OS_WIN32 */
-
-/* Unix */
-
-#define G_DIR_SEPARATOR '/'
-#define G_DIR_SEPARATOR_S "/"
-#define G_IS_DIR_SEPARATOR(c) ((c) == G_DIR_SEPARATOR)
-#define G_SEARCHPATH_SEPARATOR ':'
-#define G_SEARCHPATH_SEPARATOR_S ":"
-
-#endif /* !G_OS_WIN32 */
-
-#endif /* __GLIB_24_26_COMPAT_H__ */

Modified: gnucash/branches/remove-group2/lib/libgsf-1.12.3/gsf/gsf-input-memory.c
===================================================================
--- gnucash/branches/remove-group2/lib/libgsf-1.12.3/gsf/gsf-input-memory.c	2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/lib/libgsf-1.12.3/gsf/gsf-input-memory.c	2007-02-11 19:54:51 UTC (rev 15565)
@@ -26,11 +26,7 @@
 #include <gsf/gsf-impl-utils.h>
 #include <gsf/gsf-utils.h>
 #include <gsf/gsf-shared-memory.h>
-#ifdef HAVE_GLIB26
 #include <glib/gstdio.h>
-#else
-#include "glib24_26-compat.h"
-#endif // HAVE_GLIB26
 
 #ifdef HAVE_MMAP
 

Modified: gnucash/branches/remove-group2/lib/libgsf-1.12.3/gsf/gsf-input-stdio.c
===================================================================
--- gnucash/branches/remove-group2/lib/libgsf-1.12.3/gsf/gsf-input-stdio.c	2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/lib/libgsf-1.12.3/gsf/gsf-input-stdio.c	2007-02-11 19:54:51 UTC (rev 15565)
@@ -24,11 +24,7 @@
 #include <gsf/gsf-input-impl.h>
 #include <gsf/gsf-impl-utils.h>
 #include <gsf/gsf-utils.h>
-#ifdef HAVE_GLIB26
 #include <glib/gstdio.h>
-#else
-#include "glib24_26-compat.h"
-#endif // HAVE_GLIB26
 
 #include <stdio.h>
 #include <errno.h>

Modified: gnucash/branches/remove-group2/lib/libgsf-1.12.3/gsf/gsf-outfile-stdio.c
===================================================================
--- gnucash/branches/remove-group2/lib/libgsf-1.12.3/gsf/gsf-outfile-stdio.c	2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/lib/libgsf-1.12.3/gsf/gsf-outfile-stdio.c	2007-02-11 19:54:51 UTC (rev 15565)
@@ -26,11 +26,7 @@
 #include <gsf/gsf-output-stdio.h>
 #include <gsf/gsf-impl-utils.h>
 #include <gsf/gsf-utils.h>
-#ifdef HAVE_GLIB26
 #include <glib/gstdio.h>
-#else
-#include "glib24_26-compat.h"
-#endif // HAVE_GLIB26
 
 #include <errno.h>
 #ifdef HAVE_UNISTD_H

Modified: gnucash/branches/remove-group2/lib/libgsf-1.12.3/gsf/gsf-outfile-zip.c
===================================================================
--- gnucash/branches/remove-group2/lib/libgsf-1.12.3/gsf/gsf-outfile-zip.c	2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/lib/libgsf-1.12.3/gsf/gsf-outfile-zip.c	2007-02-11 19:54:51 UTC (rev 15565)
@@ -30,10 +30,6 @@
 #include <time.h>
 #include <zlib.h>
 
-#ifndef HAVE_GLIB26
-#include <gsf/glib24_26-compat.h>
-#endif
-
 #undef G_LOG_DOMAIN
 #define G_LOG_DOMAIN "libgsf:zip"
 

Modified: gnucash/branches/remove-group2/lib/libgsf-1.12.3/gsf/gsf-output-stdio.c
===================================================================
--- gnucash/branches/remove-group2/lib/libgsf-1.12.3/gsf/gsf-output-stdio.c	2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/lib/libgsf-1.12.3/gsf/gsf-output-stdio.c	2007-02-11 19:54:51 UTC (rev 15565)
@@ -24,11 +24,7 @@
 #include <gsf/gsf-output-impl.h>
 #include <gsf/gsf-impl-utils.h>
 #include <gsf/gsf-utils.h>
-#ifdef HAVE_GLIB26
 #include <glib/gstdio.h>
-#else
-#include "glib24_26-compat.h"
-#endif // HAVE_GLIB26
 
 #include <stdio.h>
 #include <string.h>

Modified: gnucash/branches/remove-group2/lib/libgsf-1.12.3/gsf/gsf-utils.c
===================================================================
--- gnucash/branches/remove-group2/lib/libgsf-1.12.3/gsf/gsf-utils.c	2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/lib/libgsf-1.12.3/gsf/gsf-utils.c	2007-02-11 19:54:51 UTC (rev 15565)
@@ -29,10 +29,6 @@
 #include <stdio.h>
 #include <string.h>
 
-#ifndef HAVE_GLIB26
-#include <gsf/glib24_26-compat.h>
-#endif
-
 /*
  * Glib gets this wrong, really.  ARM's floating point format is a weird
  * mixture.

Modified: gnucash/branches/remove-group2/lib/libgsf-1.12.3/tests/test-cp-zip.c
===================================================================
--- gnucash/branches/remove-group2/lib/libgsf-1.12.3/tests/test-cp-zip.c	2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/lib/libgsf-1.12.3/tests/test-cp-zip.c	2007-02-11 19:54:51 UTC (rev 15565)
@@ -1,7 +1,3 @@
-#ifndef HAVE_GLIB26
-  #include <gsf/glib24_26-compat.h>
-#endif
-
 /* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
  * test-cp-zip.c: Test gsf-outfile-zip by cloning a file the hard way

Modified: gnucash/branches/remove-group2/lib/libqof/backend/file/Makefile.am
===================================================================
--- gnucash/branches/remove-group2/lib/libqof/backend/file/Makefile.am	2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/lib/libqof/backend/file/Makefile.am	2007-02-11 19:54:51 UTC (rev 15565)
@@ -1,6 +1,6 @@
 SUBDIRS = . 
 
-lib_LTLIBRARIES = libgncqof-backend-qsf.la
+pkglib_LTLIBRARIES = libgncqof-backend-qsf.la
 
 AM_CFLAGS = \
   -I.. -I../.. \

Modified: gnucash/branches/remove-group2/lib/libqof/backend/file/qsf-backend.c
===================================================================
--- gnucash/branches/remove-group2/lib/libqof/backend/file/qsf-backend.c	2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/lib/libqof/backend/file/qsf-backend.c	2007-02-11 19:54:51 UTC (rev 15565)
@@ -23,6 +23,7 @@
 
 #include "config.h"
 #include <glib.h>
+#include <glib/gstdio.h>
 #include "qof.h"
 #include "qofbackend-p.h"
 #include "qof-backend-qsf.h"
@@ -205,7 +206,7 @@
 
 	if (!path) { return TRUE; }
 	if (0 == safe_strcmp(path, QOF_STDOUT)) { return TRUE; }
-	if (stat(path, &sbuf) <0)    { return FALSE; }
+	if (g_stat(path, &sbuf) <0)  { return FALSE; }
 	if (sbuf.st_size == 0)       { return TRUE; }
 	if(is_our_qsf_object(path))  { return TRUE; }
 	else if(is_qsf_object(path)) { return TRUE; }
@@ -251,7 +252,7 @@
 	{
         FILE *f;
 
-        f = fopen(qsf_be->fullpath, "a+");
+        f = g_fopen(qsf_be->fullpath, "a+");
         if(f) {fclose(f); }
 		else
 		{
@@ -472,7 +473,7 @@
 	params = qsf_be->params;
 	params->book = book;
 	path = g_strdup(qsf_be->fullpath);
-	f = fopen(path, "r");
+	f = g_fopen(path, "r");
 	if(!f) { qof_backend_set_error(be, ERR_FILEIO_READ_ERROR); }
 	fclose(f);
 	params->filepath = g_strdup(path);
@@ -1287,5 +1288,6 @@
 	prov->check_data_type = qsf_determine_file_type;
 	prov->provider_free = qsf_provider_free;
 	qof_backend_register_provider (prov);
+	g_module_make_resident (module);
 	return NULL;
 }

Modified: gnucash/branches/remove-group2/lib/libqof/qof/Makefile.am
===================================================================
--- gnucash/branches/remove-group2/lib/libqof/qof/Makefile.am	2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/lib/libqof/qof/Makefile.am	2007-02-11 19:54:51 UTC (rev 15565)
@@ -1,7 +1,7 @@
-lib_LTLIBRARIES = libgncqof.la
+lib_LTLIBRARIES = libgnc-qof.la
 
-libgncqof_la_LDFLAGS= -version-info $(LIBQOF_LIBRARY_VERSION)
-libgncqof_la_LIBADD= \
+libgnc_qof_la_LDFLAGS= -version-info $(LIBQOF_LIBRARY_VERSION)
+libgnc_qof_la_LIBADD= \
   $(GLIB_LIBS) \
   $(REGEX_LIBS) \
   $(top_builddir)/lib/libc/libc-missing.la
@@ -10,7 +10,7 @@
   $(GLIB_CFLAGS) \
   -I$(top_srcdir)/lib/libc
 
-libgncqof_la_SOURCES =  \
+libgnc_qof_la_SOURCES =  \
    deprecated.c      \
    gnc-date.c        \
    gnc-numeric.c     \
@@ -94,3 +94,13 @@
 
 BUILT_SOURCES = qofla-dir.h
 CLEANFILES = $(BUILT_SOURCES)
+
+## For testing the qofmath128 routines
+# run "make check" (to build the test program) and then run test-qofmath
+check_PROGRAMS = test-qofmath
+test_qofmath_SOURCES=gnc-numeric.c
+test_qofmath_CPPFLAGS=$(libgnc_qof_la_CPPFLAGS) -DTEST_128_BIT_MULT
+test_qofmath_LDFLAGS=$(libgnc_qof_la_LDFLAGS)
+test_qofmath_LDADD=$(libgnc_qof_la_LIBADD)
+
+INCLUDES = -DG_LOG_DOMAIN=\"qof\"

Modified: gnucash/branches/remove-group2/lib/libqof/qof/deprecated.c
===================================================================
--- gnucash/branches/remove-group2/lib/libqof/qof/deprecated.c	2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/lib/libqof/qof/deprecated.c	2007-02-11 19:54:51 UTC (rev 15565)
@@ -31,23 +31,6 @@
    an initializer, and can't be declared with 'static' because that
    would give it internal linkage. (this is why it is deprecated) */
 gint __attribute__ ((unused)) gnc_trace_num_spaces = 0;
-void  gnc_log_init (void) { qof_log_init(); }
-void gnc_set_log_level(QofLogModule log_module, gncLogLevel level)
-{
-	qof_log_set_level(log_module, (QofLogLevel)level);
-}
-void gnc_set_log_level_global(gncLogLevel level)
-{
-	qof_log_set_level_registered((QofLogLevel)level);
-}
-void qof_log_set_level_global(QofLogLevel level)
-{
-	qof_log_set_level_registered((QofLogLevel)level);
-}
-void gnc_set_logfile (FILE *outfile)
-{
-	qof_log_set_file(outfile);
-}
 const char * gnc_log_prettify (const char *name)
 {
 	return qof_log_prettify(name);
@@ -55,10 +38,7 @@
 void gnc_start_clock (int a, QofLogModule b, gncLogLevel c,  const char *d, const char *e, ...) { }
 void gnc_report_clock (int a, QofLogModule b, gncLogLevel c, const char *d, const char *e, ...) { }
 void gnc_report_clock_total (int a, QofLogModule b, gncLogLevel c, const char *d, const char *e, ...) { }
-gboolean gnc_should_log(QofLogModule log_module, gncLogLevel log_level)
-{
-	return qof_log_check(log_module, log_level);
-}
+
 gint
 gnc_engine_register_event_handler (GNCEngineEventHandler handler,
                                    gpointer user_data)

Modified: gnucash/branches/remove-group2/lib/libqof/qof/deprecated.h
===================================================================
--- gnucash/branches/remove-group2/lib/libqof/qof/deprecated.h	2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/lib/libqof/qof/deprecated.h	2007-02-11 19:54:51 UTC (rev 15565)
@@ -66,21 +66,6 @@
 /** \deprecated use qof_log_check instead. */
 gboolean gnc_should_log(QofLogModule log_module, gncLogLevel log_level);
 
-/** \deprecated */
-#define GNC_LOG_FATAL   QOF_LOG_FATAL
-/** \deprecated */
-#define GNC_LOG_ERROR   QOF_LOG_ERROR
-/** \deprecated */
-#define GNC_LOG_WARNING QOF_LOG_WARNING
-/** \deprecated */
-#define GNC_LOG_INFO    QOF_LOG_INFO
-/** \deprecated */
-#define GNC_LOG_DEBUG   QOF_LOG_DEBUG
-/** \deprecated */
-#define GNC_LOG_DETAIL  QOF_LOG_DETAIL
-/** \deprecated */
-#define GNC_LOG_TRACE   QOF_LOG_TRACE
-
 /** \deprecated use qof_start_clock */
 void gnc_start_clock (int, QofLogModule, gncLogLevel, const char*, const char*, ...);
 /** \deprecated use qof_report_clock */

Modified: gnucash/branches/remove-group2/lib/libqof/qof/gnc-date.c
===================================================================
--- gnucash/branches/remove-group2/lib/libqof/qof/gnc-date.c	2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/lib/libqof/qof/gnc-date.c	2007-02-11 19:54:51 UTC (rev 15565)
@@ -297,41 +297,6 @@
   return(tm->tm_mday == date_get_last_mday(tm));
 }
 
-/* Add a number of months to a time value
-
- Add a number of months to a time value, and normalize.  Optionally
- also track the last day of the month, i.e. 1/31 -> 2/28 -> 3/30.
-
-param  tm: base time value
-param  months: The number of months to add to this time
-param  track_last_day: Coerce the date value if necessary.
-
-return void
-*/
-void date_add_months (struct tm *tm, int months, gboolean track_last_day)
-{
-  gboolean was_last_day;
-  int new_last_mday;
-
-  /* Have to do this now */
-  was_last_day = date_is_last_mday(tm);
-
-  /* Add in the months and normalize */
-  tm->tm_mon += months;
-  while (tm->tm_mon > 11) {
-    tm->tm_mon -= 12;
-    tm->tm_year++;
-  }
-
-  if (!track_last_day)
-    return;
-
-  /* Track last day of the month, i.e. 1/31 -> 2/28 -> 3/31 */
-  new_last_mday = date_get_last_mday(tm);
-  if (was_last_day || (tm->tm_mday > new_last_mday))
-    tm->tm_mday = new_last_mday;
-}
-
 /* Return the set dateFormat.
 
 return QofDateFormat: enumeration indicating preferred format
@@ -1429,61 +1394,5 @@
   return mktime(&tm);
 }
 
-gboolean
-qof_date_add_days(Timespec *ts, gint days)
-{
-	struct tm tm;
-	time_t    tt;
-
-	g_return_val_if_fail(ts, FALSE);
-	tt = timespecToTime_t(*ts);
-#ifdef HAVE_GMTIME_R
-	tm = *gmtime_r(&tt, &tm);
-#else
-	tm = *gmtime(&tt);
-#endif
-	tm.tm_mday += days;
-	/* let mktime normalise the months and year
-	because we aren't tracking last_day_of_month */
-	tt = mktime(&tm);
-	if(tt < 0) { return FALSE; }
-	timespecFromTime_t(ts, tt);
-	return TRUE;
-}
-
-gboolean
-qof_date_add_months(Timespec *ts, gint months, gboolean track_last_day)
-{
-	struct tm tm;
-	time_t    tt;
-	gint new_last_mday;
-	gboolean was_last_day;
-
-	g_return_val_if_fail(ts, FALSE);
-	tt = timespecToTime_t(*ts);
-#ifdef HAVE_GMTIME_R
-	tm = *gmtime_r(&tt, &tm);
-#else
-	tm = *gmtime(&tt);
-#endif
-	was_last_day = date_is_last_mday(&tm);
-	tm.tm_mon += months;
-	while (tm.tm_mon > 11) {
-		tm.tm_mon -= 12;
-		tm.tm_year++;
-	}
-	if (track_last_day) {
-		/* Track last day of the month, i.e. 1/31 -> 2/28 -> 3/31 */
-		new_last_mday = date_get_last_mday(&tm);
-		if (was_last_day || (tm.tm_mday > new_last_mday)) {
-			tm.tm_mday = new_last_mday;
-		}
-	}
-	tt = mktime(&tm);
-	if(tt < 0) { return FALSE; }
-	timespecFromTime_t(ts, tt);
-	return TRUE;
-}
-
 /********************** END OF FILE *********************************\
 \********************************************************************/

Modified: gnucash/branches/remove-group2/lib/libqof/qof/gnc-date.h
===================================================================
--- gnucash/branches/remove-group2/lib/libqof/qof/gnc-date.h	2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/lib/libqof/qof/gnc-date.h	2007-02-11 19:54:51 UTC (rev 15565)
@@ -243,28 +243,6 @@
  * routine might return incorrect values for dates before 1970.  */
 void gnc_timespec2dmy (Timespec ts, gint *day, gint *month, gint *year);
 
-/** \brief Add a number of days to a Timespec and normalise.
-
-Together with qof_date_add_months, replaces date_add_months.
-
-\return FALSE on error, otherwise TRUE.
-*/
-gboolean qof_date_add_days(Timespec *ts, gint days);
-
-/** \brief Add a number of months to a Timespec and normalise.
-
-Optionally track the last day of the month so that adding one
-month to 31st January returns 28th February (29th in a leap year)
-and adding three months returns 30th April.
-
-\return FALSE on error, otherwise TRUE.
-*/
-gboolean qof_date_add_months(Timespec *ts, gint months, gboolean track_last_day);
-
-/** \deprecated Add a number of months to a time value and normalize.  Optionally
- * also track the last day of the month, i.e. 1/31 -> 2/28 -> 3/31. */
-void date_add_months (struct tm *tm, gint months, gboolean track_last_day);
-
 /** \warning hack alert XXX FIXME -- these date routines return incorrect
  * values for dates before 1970.  Most of them are good only up 
  * till 2038.  This needs fixing ... 

Modified: gnucash/branches/remove-group2/lib/libqof/qof/gnc-numeric.c
===================================================================
--- gnucash/branches/remove-group2/lib/libqof/qof/gnc-numeric.c	2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/lib/libqof/qof/gnc-numeric.c	2007-02-11 19:54:51 UTC (rev 15565)
@@ -26,6 +26,9 @@
 
 #include <glib.h>
 #include <math.h>
+#ifdef G_OS_WIN32
+#include <pow.h>
+#endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

Modified: gnucash/branches/remove-group2/lib/libqof/qof/guid.c
===================================================================
--- gnucash/branches/remove-group2/lib/libqof/qof/guid.c	2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/lib/libqof/qof/guid.c	2007-02-11 19:54:51 UTC (rev 15565)
@@ -31,8 +31,8 @@
 #include <ctype.h>
 #include <dirent.h>
 #include <glib.h>
+#include <glib/gstdio.h>
 #include <stdlib.h>
-#include <stdio.h>
 #include <string.h>
 #include <sys/stat.h>
 #ifdef HAVE_SYS_TIMES_H
@@ -206,7 +206,7 @@
   FILE *fp;
 
   memset(&stats, 0, sizeof(stats));
-  if (stat(filename, &stats) != 0)
+  if (g_stat(filename, &stats) != 0)
     return 0;
 
   md5_process_bytes(&stats, sizeof(stats), &guid_context);
@@ -215,7 +215,7 @@
   if (max_size <= 0)
     return total;
 
-  fp = fopen (filename, "r");
+  fp = g_fopen (filename, "r");
   if (fp == NULL)
     return total;
 
@@ -235,16 +235,16 @@
 init_from_dir(const char *dirname, unsigned int max_files)
 {
   char filename[1024];
-  struct dirent *de;
+  const gchar *de;
   struct stat stats;
   size_t total;
   int result;
-  DIR *dir;
+  GDir *dir;
 
   if (max_files <= 0)
     return 0;
 
-  dir = opendir (dirname);
+  dir = g_dir_open(dirname, 0, NULL);
   if (dir == NULL)
     return 0;
 
@@ -252,20 +252,20 @@
 
   do
   {
-    de = readdir(dir);
+    de = g_dir_read_name(dir);
     if (de == NULL)
       break;
 
-    md5_process_bytes(de->d_name, strlen(de->d_name), &guid_context);
-    total += strlen(de->d_name);
+    md5_process_bytes(de, strlen(de), &guid_context);
+    total += strlen(de);
 
     result = snprintf(filename, sizeof(filename),
-                      "%s/%s", dirname, de->d_name);
+                      "%s/%s", dirname, de);
     if ((result < 0) || (result >= (int)sizeof(filename)))
       continue;
 
     memset(&stats, 0, sizeof(stats));
-    if (stat(filename, &stats) != 0)
+    if (g_stat(filename, &stats) != 0)
       continue;
     md5_process_bytes(&stats, sizeof(stats), &guid_context);
     total += sizeof(stats);
@@ -273,7 +273,7 @@
     max_files--;
   } while (max_files > 0);
 
-  closedir(dir);
+  g_dir_close(dir);
 
   return total;
 }
@@ -519,7 +519,7 @@
   {
     FILE *fp;
 
-    fp = fopen ("/dev/urandom", "r");
+    fp = g_fopen ("/dev/urandom", "r");
     if (fp == NULL)
       return;
 

Modified: gnucash/branches/remove-group2/lib/libqof/qof/kvp_frame.h
===================================================================
--- gnucash/branches/remove-group2/lib/libqof/qof/kvp_frame.h	2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/lib/libqof/qof/kvp_frame.h	2007-02-11 19:54:51 UTC (rev 15565)
@@ -65,7 +65,7 @@
 #include "gnc-numeric.h"
 #include "guid.h"
 
-#define QOF_MOD_KVP "qof-kvp"
+#define QOF_MOD_KVP "qof.kvp"
 
 /** Opaque frame structure */
 typedef struct _KvpFrame KvpFrame;

Modified: gnucash/branches/remove-group2/lib/libqof/qof/qof.h
===================================================================
--- gnucash/branches/remove-group2/lib/libqof/qof/qof.h	2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/lib/libqof/qof/qof.h	2007-02-11 19:54:51 UTC (rev 15565)
@@ -103,7 +103,7 @@
 #include "deprecated.h"
 
 /** allow easy logging of QSF debug messages */
-#define QOF_MOD_QSF "gncqof-backend-qsf"
+#define QOF_MOD_QSF "qof.backend.qsf"
 /** allow easy loading of the QSF backend */
 #define QSF_BACKEND_LIB "gncqof-backend-qsf"
 

Modified: gnucash/branches/remove-group2/lib/libqof/qof/qofbackend.c
===================================================================
--- gnucash/branches/remove-group2/lib/libqof/qof/qofbackend.c	2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/lib/libqof/qof/qofbackend.c	2007-02-11 19:54:51 UTC (rev 15565)
@@ -392,10 +392,12 @@
 	g_return_val_if_fail(g_module_supported(), FALSE);
 	fullpath = g_module_build_path(directory, module_name);
 	backend = g_module_open(fullpath, G_MODULE_BIND_LAZY);
-	if (!backend) { 
+	if (!backend) {
 		g_message ("%s: %s\n", PACKAGE, g_module_error ());
 		return FALSE;
 	}
+
+	/* the module should have done that already in g_module_check_init */
 	g_module_make_resident(backend);
 	return TRUE;
 }

Modified: gnucash/branches/remove-group2/lib/libqof/qof/qofbackend.h
===================================================================
--- gnucash/branches/remove-group2/lib/libqof/qof/qofbackend.h	2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/lib/libqof/qof/qofbackend.h	2007-02-11 19:54:51 UTC (rev 15565)
@@ -46,7 +46,7 @@
 
 #include "qofinstance.h"
 
-#define QOF_MOD_BACKEND "qof-backend"
+#define QOF_MOD_BACKEND "qof.backend"
 
 /** \brief The errors that can be reported to the GUI & other front-end users
  *  \warning (GnuCash) If you modify QofBackendError, please update 

Modified: gnucash/branches/remove-group2/lib/libqof/qof/qofbookmerge.h
===================================================================
--- gnucash/branches/remove-group2/lib/libqof/qof/qofbookmerge.h	2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/lib/libqof/qof/qofbookmerge.h	2007-02-11 19:54:51 UTC (rev 15565)
@@ -24,7 +24,7 @@
 #ifndef QOFBOOKMERGE_H
 #define QOFBOOKMERGE_H
 
-#define QOF_MOD_MERGE "qof-merge"
+#define QOF_MOD_MERGE "qof.merge"
 
 /** @addtogroup BookMerge
 

Modified: gnucash/branches/remove-group2/lib/libqof/qof/qofchoice.h
===================================================================
--- gnucash/branches/remove-group2/lib/libqof/qof/qofchoice.h	2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/lib/libqof/qof/qofchoice.h	2007-02-11 19:54:51 UTC (rev 15565)
@@ -93,7 +93,7 @@
 #include "qofclass.h"
 #include "qofobject.h"
 
-#define QOF_MOD_CHOICE "qof-choice"
+#define QOF_MOD_CHOICE "qof.choice"
 
 /** \note Choice
 @{

Modified: gnucash/branches/remove-group2/lib/libqof/qof/qofclass.h
===================================================================
--- gnucash/branches/remove-group2/lib/libqof/qof/qofclass.h	2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/lib/libqof/qof/qofclass.h	2007-02-11 19:54:51 UTC (rev 15565)
@@ -71,7 +71,7 @@
 
 #include "qofid.h"
 
-#define QOF_MOD_CLASS "qof-class"
+#define QOF_MOD_CLASS "qof.class"
 
 /** \name Core types
 

Modified: gnucash/branches/remove-group2/lib/libqof/qof/qofid.h
===================================================================
--- gnucash/branches/remove-group2/lib/libqof/qof/qofid.h	2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/lib/libqof/qof/qofid.h	2007-02-11 19:54:51 UTC (rev 15565)
@@ -106,7 +106,7 @@
   if ((da) && (!(db))) {                 \
     val = 1;                             \
   }                                      \
-  val; /* block assumes value of last statment */  \
+  val; /* block assumes value of last statement */  \
 })
 
 /** return TRUE if object is of the given type */

Modified: gnucash/branches/remove-group2/lib/libqof/qof/qoflog.c
===================================================================
--- gnucash/branches/remove-group2/lib/libqof/qof/qoflog.c	2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/lib/libqof/qof/qoflog.c	2007-02-11 19:54:51 UTC (rev 15565)
@@ -4,9 +4,10 @@
  *  Mon Nov 21 14:41:59 2005
  *  Author: Rob Clark (rclark at cs.hmc.edu)
  *  Copyright (C) 1997-2003 Linas Vepstas <linas at linas.org>
- *  Copyright  2005  Neil Williams
- *  linux at codehelp.co.uk
+ *  Copyright  2005  Neil Williams <linux at codehelp.co.uk>
+ *  Copyright 2007 Joshua Sled <jsled at asynchronous.org>
  *************************************************************************** */
+
 /*
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -27,14 +28,24 @@
 #include "config.h"
 
 #include <glib.h>
+#include <glib/gstdio.h>
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #else
 #warning unistd required.
 #endif
 #include <stdarg.h>
+#include <stdlib.h>
 #include <string.h>
 #include <sys/time.h>
+
+#undef G_LOG_DOMAIN
+#define G_LOG_DOMAIN "qof.log"
+
+#ifndef HAVE_LOCALTIME_R
+#include "localtime_r.h"
+#endif
+
 #include "qof.h"
 #include "qoflog.h"
 
@@ -43,137 +54,159 @@
 #define NUM_CLOCKS 10
 
 static FILE *fout = NULL;
-static gchar* filename = NULL;
 static gchar* function_buffer = NULL;
-static const int MAX_TRACE_FILENAME = 100;
+static gint qof_log_num_spaces = 0;
 static GHashTable *log_table = NULL;
-static gint qof_log_num_spaces = 0;
+static GLogFunc previous_handler = NULL;
 
-/* uses the enum_as_string macro.
-Lookups are done on the string. */
-AS_STRING_FUNC(QofLogLevel, LOG_LEVEL_LIST)
-
-FROM_STRING_FUNC(QofLogLevel, LOG_LEVEL_LIST)
-
 void
-qof_log_add_indent(void)
+qof_log_indent(void)
 {
-	qof_log_num_spaces += QOF_LOG_INDENT_WIDTH;
+     qof_log_num_spaces += QOF_LOG_INDENT_WIDTH;
 }
 
-gint 
-qof_log_get_indent(void)
+void
+qof_log_dedent(void)
 {
-	return qof_log_num_spaces;
+	qof_log_num_spaces
+         = (qof_log_num_spaces < QOF_LOG_INDENT_WIDTH)
+         ? 0
+         : qof_log_num_spaces - QOF_LOG_INDENT_WIDTH;
 }
 
 void
-qof_log_drop_indent(void)
+qof_log_set_file(FILE *outfile)
 {
-	qof_log_num_spaces = (qof_log_num_spaces < QOF_LOG_INDENT_WIDTH) ?
-		0 : qof_log_num_spaces - QOF_LOG_INDENT_WIDTH;
+     if (!outfile) { fout = stderr; return; }
+     fout = outfile;
 }
 
-static void
-fh_printer (const gchar     *log_domain,
-            GLogLevelFlags  log_level,
-            const gchar     *message,
-            gpointer        user_data)
+void 
+qof_log_init(void)
 {
-  FILE *fh = user_data;
-  fprintf (fh, "%*s%s\n", qof_log_num_spaces, "", message);
-  fflush(fh);
+     qof_log_init_filename(NULL);
 }
 
-void 
-qof_log_init (void)
+static void
+log4glib_handler(const gchar     *log_domain,
+                 GLogLevelFlags  log_level,
+                 const gchar     *message,
+                 gpointer        user_data)
 {
-   if(!fout) /* allow qof_log_set_file */
-   {
-	   fout = fopen ("/tmp/qof.trace", "w");
-   }
+     if (G_LIKELY(!qof_log_check(log_domain, log_level)))
+          return;
 
-   if(!fout && (filename = (gchar *)g_malloc(MAX_TRACE_FILENAME))) {
-      snprintf(filename, MAX_TRACE_FILENAME-1, "/tmp/qof.trace.%d", 
-	       getpid());
-      fout = fopen (filename, "w");
-      g_free(filename);
-   }
+     {
+          gboolean last_char_is_newline;
+          char timestamp_buf[10];
+          time_t now;
+          struct tm now_tm;
+          gchar *level_str = qof_log_level_to_string(log_level);
+          now = time(NULL);
+          localtime_r(&now, &now_tm);
+          strftime(timestamp_buf, 9, "%T", &now_tm);
 
-   if(!fout)
-      fout = stderr;
+          fprintf(fout, "* %s %*s <%s> %*s%s%s",
+                  timestamp_buf,
+                  5, level_str,
+                  (log_domain == NULL ? "" : log_domain),
+                  qof_log_num_spaces, "",
+                  message,
+                  (g_str_has_suffix(message, "\n") ? "" : "\n"));
+          fflush(fout);
+     }
 
-   g_log_set_handler (G_LOG_DOMAIN, G_LOG_LEVEL_MASK, fh_printer, fout);
+     /* chain?  ignore?  Only chain if it's going to be quiet...
+     else
+     {
+          // chain
+          previous_handler(log_domain, log_level, message, NULL);
+     }
+     */
 }
 
 void
-qof_log_set_level(QofLogModule log_module, QofLogLevel level)
+qof_log_init_filename(const gchar* log_filename)
 {
-	gchar* level_string;
+     if (log_table == NULL)
+          log_table = g_hash_table_new(g_str_hash, g_str_equal);
 
-	if(!log_module || level == 0) { return; }
-	level_string = g_strdup(QofLogLevelasString(level));
-	if(!log_table)
-	{
-		log_table = g_hash_table_new(g_str_hash, g_str_equal);
-	}
-	g_hash_table_insert(log_table, (gpointer)log_module, level_string);
-}
+     if (log_filename)
+     {
+          int fd;
+          gchar *fname;
 
-static void
-log_module_foreach(gpointer key, gpointer value, gpointer data)
-{
-	g_hash_table_insert(log_table, key, data);
+          if (fout != NULL && fout != stderr && fout != stdout)
+               fclose(fout);
+
+          fname = g_strconcat(log_filename, ".XXXXXX", NULL);
+
+          if ((fd = g_mkstemp(fname)) != -1)
+          {
+               g_rename(fname, log_filename);
+               fout = fdopen(fd, "w");
+          }
+          else
+          {
+               fout = stderr;
+          }
+          g_free(fname);
+     }
+
+     if (!fout)
+          fout = stderr;
+
+     // @@fixme really, the userdata is a struct { log_table, fout, previous_handler }
+     if (previous_handler == NULL)
+          previous_handler = g_log_set_default_handler(log4glib_handler, log_table);
 }
 
 void
-qof_log_set_level_registered(QofLogLevel level)
+qof_log_shutdown (void)
 {
-	gchar* level_string;
+	if (fout && fout != stderr && fout != stdout)
+    {
+         fclose(fout);
+         fout = NULL;
+    }
 
-	if(!log_table || level == 0) { return; }
-	level_string = g_strdup(QofLogLevelasString(level));
-	g_hash_table_foreach(log_table, log_module_foreach, level_string);
-}
+	if (function_buffer)
+    {
+         g_free(function_buffer);
+         function_buffer = NULL;
+    }
 
-void
-qof_log_set_file (FILE *outfile)
-{
-   if(!outfile) { fout = stderr; return; }
-   fout = outfile;
+    if (log_table != NULL)
+    {
+         g_hash_table_destroy(log_table);
+         log_table = NULL;
+    }
+
+    if (previous_handler != NULL)
+    {
+         g_log_set_default_handler(previous_handler, NULL);
+         previous_handler = NULL;
+    }
 }
 
 void
-qof_log_init_filename (const gchar* logfilename)
+qof_log_set_level(QofLogModule log_module, QofLogLevel level)
 {
-	if(!logfilename)
+	if (!log_module || level == 0) { return; }
+	if (!log_table)
 	{
-		fout = stderr;
+		log_table = g_hash_table_new(g_str_hash, g_str_equal);
 	}
-	else
-	{
-		filename = g_strdup(logfilename);
-		fout = fopen(filename, "w");
-	}
-	qof_log_init();
+	g_hash_table_insert(log_table, (gpointer)log_module, GINT_TO_POINTER((gint)level));
 }
 
-void
-qof_log_shutdown (void)
-{
-	if(fout && fout != stderr) { fclose(fout); }
-	if(filename) { g_free(filename); }
-	if(function_buffer) { g_free(function_buffer); }
-	g_hash_table_destroy(log_table);
-}
-
 const char *
 qof_log_prettify (const char *name)
 {
   gchar *p, *buffer;
   gint length;
-
-  if (!name) { return ""; }
+ 
+ if (!name) { return ""; }
   buffer = g_strndup(name, QOF_LOG_MAX_CHARS - 1);
   length = strlen(buffer);
   p = g_strstr_len(buffer, length, "(");
@@ -188,6 +221,176 @@
   return function_buffer;
 }
 
+void
+qof_log_init_filename_special(const char *log_to_filename)
+{
+     if (g_ascii_strcasecmp("stderr", log_to_filename) == 0)
+     {
+          qof_log_set_file(stderr);
+     }
+     else if (g_ascii_strcasecmp("stdout", log_to_filename) == 0)
+     {
+          qof_log_set_file(stdout);
+     }
+     else
+     {
+          qof_log_init_filename(log_to_filename);
+     }
+}
+
+void
+qof_log_parse_log_config(const char *filename)
+{
+     const gchar *levels_group = "levels", *output_group = "output";
+     GError *err;
+     GKeyFile *conf = g_key_file_new();
+
+     if (!g_key_file_load_from_file(conf, filename, G_KEY_FILE_NONE, &err))
+     {
+          g_warning("unable to parse [%s]: %s", filename, err->message);
+          g_error_free(err);
+          return;
+     }
+
+     g_debug("parsing log config from [%s]", filename);
+     if (g_key_file_has_group(conf, levels_group))
+     {
+          gsize num_levels;
+          int key_idx;
+          gchar **levels;
+
+          levels = g_key_file_get_keys(conf, levels_group, &num_levels, NULL);
+
+          for (key_idx = 0; key_idx < num_levels && levels[key_idx] != NULL; key_idx++)
+          {
+               QofLogLevel level;
+               gchar *logger_name = NULL, *level_str = NULL;
+
+               logger_name = g_strdup(levels[key_idx]);
+               level_str = g_key_file_get_string(conf, levels_group, logger_name, NULL);
+               level = qof_log_level_from_string(level_str);
+
+               g_debug("setting log [%s] to level [%s=%d]", logger_name, level_str, level);
+               qof_log_set_level(logger_name, level);
+
+               g_free(level_str);
+          }
+          g_strfreev(levels);
+     }
+
+     if (g_key_file_has_group(conf, output_group))
+     {
+          gsize num_outputs;
+          int output_idx;
+          gchar **outputs;
+          
+          outputs = g_key_file_get_keys(conf, output_group, &num_outputs, NULL);
+          for (output_idx = 0; output_idx < num_outputs && outputs[output_idx] != NULL; output_idx++)
+          {
+               gchar *key = outputs[output_idx];
+               gchar *value;
+
+               if (g_ascii_strcasecmp("to", key) != 0)
+               {
+                    g_warning("unknown key [%s] in [outputs], skipping", key);
+                    continue;
+               }
+
+               value = g_key_file_get_string(conf, output_group, key, NULL);
+               g_debug("setting [output].to=[%s]", value);
+               qof_log_init_filename_special(value);
+               g_free(value);
+          }
+          g_strfreev(outputs);
+     }
+
+     g_key_file_free(conf);
+}
+
+gboolean
+qof_log_check(QofLogModule log_domain, QofLogLevel log_level)
+{
+//#define _QLC_DBG(x) x
+#define _QLC_DBG(x)
+     GHashTable *log_levels = log_table;
+     gchar *domain_copy = g_strdup(log_domain == NULL ? "" : log_domain);
+     gchar *dot_pointer = domain_copy;
+     static const QofLogLevel default_log_thresh = QOF_LOG_WARNING;
+     QofLogLevel longest_match_level = default_log_thresh;
+
+     {
+          gpointer match_level;
+          if ((match_level = g_hash_table_lookup(log_levels, "")) != NULL)
+               longest_match_level = (QofLogLevel)GPOINTER_TO_INT(match_level);
+     }
+
+     _QLC_DBG({ printf("trying [%s] (%d):", log_domain, g_hash_table_size(log_levels)); });
+     if (G_LIKELY(log_levels))
+     {
+          // e.g., "a.b.c" -> "a\0b.c" -> "a.b\0c", "a.b.c"
+          gpointer match_level;
+          while ((dot_pointer = g_strstr_len(dot_pointer, strlen(dot_pointer), ".")) != NULL)
+          {
+               *dot_pointer = '\0';
+               _QLC_DBG({ printf(" [%s]", domain_copy); });
+               if (g_hash_table_lookup_extended(log_levels, domain_copy, NULL, &match_level))
+               {
+                    longest_match_level = (QofLogLevel)GPOINTER_TO_INT(match_level);
+                    _QLC_DBG(printf("*"););
+               }
+               *dot_pointer = '.';
+               dot_pointer++;
+          }
+
+          _QLC_DBG({ printf(" [%s]", domain_copy); });
+          if (g_hash_table_lookup_extended(log_levels, domain_copy, NULL, &match_level))
+          {
+               longest_match_level = (QofLogLevel)GPOINTER_TO_INT(match_level);
+               _QLC_DBG({ printf("*"); });
+          }
+     }
+     _QLC_DBG({ printf(" found [%d]\n", longest_match_level); });
+     g_free(domain_copy);
+
+     return log_level <= longest_match_level;
+}
+
+void
+qof_log_set_default(QofLogLevel log_level)
+{
+    qof_log_set_level("", log_level);
+    qof_log_set_level("qof", log_level);
+}
+
+gchar*
+qof_log_level_to_string(QofLogLevel log_level)
+{
+     gchar *level_str = "unknw";
+     switch (log_level)
+     {
+     case G_LOG_LEVEL_ERROR:   level_str = "ERROR"; break;
+     case G_LOG_LEVEL_CRITICAL:level_str = "CRIT"; break;
+     case G_LOG_LEVEL_WARNING: level_str = "WARN"; break;
+     case G_LOG_LEVEL_MESSAGE: level_str = "MESSG"; break;
+     case G_LOG_LEVEL_INFO:    level_str = "INFO"; break;
+     case G_LOG_LEVEL_DEBUG:   level_str = "DEBUG"; break;
+     default:                  level_str = "OTHER"; break;
+     }
+     return level_str;
+}
+
+QofLogLevel
+qof_log_level_from_string(gchar *str)
+{
+     if (g_ascii_strncasecmp("error", str, 5) == 0) return QOF_LOG_FATAL;
+     if (g_ascii_strncasecmp("crit", str, 4) == 0) return QOF_LOG_ERROR;
+     if (g_ascii_strncasecmp("warn", str, 4) == 0) return QOF_LOG_WARNING;
+     if (g_ascii_strncasecmp("mess", str, 4) == 0) return G_LOG_LEVEL_MESSAGE;
+     if (g_ascii_strncasecmp("info", str, 4) == 0) return QOF_LOG_INFO;
+     if (g_ascii_strncasecmp("debug", str, 5) == 0) return QOF_LOG_DEBUG;
+     return QOF_LOG_DEBUG;
+}
+
 static
 struct timeval qof_clock[NUM_CLOCKS] = {
    {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, 
@@ -305,67 +508,3 @@
   fprintf (fout, "\n");
   fflush (fout);
 }
-
-gboolean
-qof_log_check(QofLogModule log_module, QofLogLevel log_level)
-{
-	gchar* log_string;
-	QofLogLevel maximum; /* Any positive log_level less than this will be logged. */
-
-	log_string = NULL;
-	if (log_level > QOF_LOG_TRACE) log_level = QOF_LOG_TRACE;
-	if(!log_table || log_module == NULL || log_level < 0) { return FALSE; }
-	log_string = (gchar*)g_hash_table_lookup(log_table, log_module);
-	/* if log_module not found, do not log. */
-	if(!log_string) { return FALSE; }
-	maximum = QofLogLevelfromString(log_string);
-	if(log_level <= maximum) { return TRUE; }
-	return FALSE;
-}
-
-void qof_log_set_default(QofLogLevel log_level)
-{
-	qof_log_set_level(QOF_MOD_BACKEND, log_level);
-	qof_log_set_level(QOF_MOD_CLASS,   log_level);
-	qof_log_set_level(QOF_MOD_ENGINE,  log_level);
-	qof_log_set_level(QOF_MOD_OBJECT,  log_level);
-	qof_log_set_level(QOF_MOD_KVP,     log_level);
-	qof_log_set_level(QOF_MOD_MERGE,   log_level);
-	qof_log_set_level(QOF_MOD_QUERY,   log_level);
-	qof_log_set_level(QOF_MOD_SESSION, log_level);
-	qof_log_set_level(QOF_MOD_CHOICE,  log_level);
-	qof_log_set_level(QOF_MOD_UTIL,    log_level);
-}
-
-struct hash_s
-{
-	QofLogCB cb;
-	gpointer data;
-};
-
-static void hash_cb (gpointer key, gpointer value, gpointer data)
-{
-	struct hash_s *iter;
-
-	iter = (struct hash_s*)data;
-	if(!iter) { return; }
-	(iter->cb)(key, value, iter->data);
-}
-
-void qof_log_module_foreach(QofLogCB cb, gpointer data)
-{
-	struct hash_s iter;
-
-	if(!cb) { return; }
-	iter.cb = cb;
-	iter.data = data;
-	g_hash_table_foreach(log_table, hash_cb, (gpointer)&iter);
-}
-
-gint qof_log_module_count(void)
-{
-	if(!log_table) { return 0; }
-	return g_hash_table_size(log_table);
-}
-
-/* ************************ END OF FILE **************************** */

Modified: gnucash/branches/remove-group2/lib/libqof/qof/qoflog.h
===================================================================
--- gnucash/branches/remove-group2/lib/libqof/qof/qoflog.h	2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/lib/libqof/qof/qoflog.h	2007-02-11 19:54:51 UTC (rev 15565)
@@ -1,11 +1,10 @@
 /***************************************************************************
  *            qof-log.h
  *
- *  Mon Nov 21 14:35:26 2005
  *  Author: Rob Clark (rclark at cs.hmc.edu)
  *  Copyright (C) 1998-2003 Linas Vepstas <linas at linas.org>
- *  Copyright  2005  Neil Williams
- *  linux at codehelp.co.uk
+ *  Copyright  2005  Neil Williams <linux at codehelp.co.uk>
+ *  Copyright 2007 Joshua Sled <jsled at asynchronous.org>
  ****************************************************************************/
 /*
  *  This program is free software; you can redistribute it and/or modify
@@ -36,107 +35,80 @@
 
 #include <stdarg.h>
 #include <stdio.h>
+#include <glib.h>
 #include "qofutil.h"
 
-#define QOF_MOD_ENGINE "qof-engine"
+#define QOF_MOD_ENGINE "qof.engine"
 
 #define LOG_LEVEL_LIST(_) \
-  _(QOF_LOG_FATAL, = 0)   \
-  _(QOF_LOG_ERROR, = 1)   \
-  _(QOF_LOG_WARNING, = 2) \
-  _(QOF_LOG_INFO, = 3)    \
-  _(QOF_LOG_DEBUG, = 4)   \
-  _(QOF_LOG_DETAIL, = 5)  \
-  _(QOF_LOG_TRACE, = 6)
+  _(QOF_LOG_FATAL,   = G_LOG_LEVEL_ERROR)   \
+  _(QOF_LOG_ERROR,   = G_LOG_LEVEL_CRITICAL)   \
+  _(QOF_LOG_WARNING, = G_LOG_LEVEL_WARNING) \
+  _(QOF_LOG_INFO,    = G_LOG_LEVEL_INFO)    \
+  _(QOF_LOG_DEBUG,   = G_LOG_LEVEL_DEBUG)
 
 DEFINE_ENUM (QofLogLevel, LOG_LEVEL_LIST)
 
-AS_STRING_DEC(QofLogLevel, LOG_LEVEL_LIST) /**< Convert QofLogLevel to a string.
+gchar* qof_log_level_to_string(QofLogLevel lvl);
+QofLogLevel qof_log_level_from_string(gchar *str);
 
-The macro correlates the enum value and an
-exact copy as a string, removing the need to
-keep two separate lists in sync.
-*/
+/** indents once for each ENTER macro **/
+void qof_log_indent(void);
 
-FROM_STRING_DEC(QofLogLevel, LOG_LEVEL_LIST) /**< Convert the 
-log_string to a QofLogLevel
+/**
+ * drops back one indent for each LEAVE macro, capped at 0.
+ **/
+void qof_log_dedent(void);
 
-Only for use as a partner to ::QofLogLevelasString
-*/
-
-/** indents once for each ENTER macro */
-void qof_log_add_indent(void);
-
-/** gets the running total of the indent */
-gint qof_log_get_indent(void);
-
-/** drops back one indent for each LEAVE macro
-
-indent is reset to zero if less than a single indent would exist.
-*/
-void qof_log_drop_indent(void);
-
-/** Initialize the error logging subsystem
-
-\deprecated Applications need to call
-qof_log_set_file to set the output, otherwise
-the default of \a /tmp/qof.trace will be used.
-
-Instead, use qof_log_init_filename
-which sets the filename and initialises the
-logging subsystem in one operation.
-*/
+/**
+ * Initialize the error logging subsystem.  Defaults to a level-threshold of
+ * "warning", and logging to stderr.
+ **/
 void qof_log_init (void);
 
-/** Set the logging level of the given log_module.
-
-Registers the log_module with the qof_log hashtable and
-sets an initial value for the loglevel for that log_module.
-*/
+/**
+ * Set the logging level of the given log_module.
+ **/
 void qof_log_set_level(QofLogModule module, QofLogLevel level);
 
-/** Set the logging level for all registered log_modules.
-
-\note Unless a log_module has been registered using
-qof_log_set_level, it will be unaffected by this change because
-there will be no entry in the hashtable.
-
-"silent" log_modules are supported by the qof_log_set_level_registered
-function which only  moderates log_levels for those modules actually
-registered. The advantage is that a developer can omit existing
-log_modules from the init code and cut down the amount of unwanted logging. 
-
-e.g. if you are working in one section of the code and do not want
-the extra log information created by allowing the default modules
-to log as well. This makes the log itself easier to use when working
-in a small area of the codebase. Silent log_modules can also be
-useful where no default currently exists - again to isolate certain
-sections of the default log output - and using qof_log_set_level_registered
-allows these silent log_modules to be retained in the code without
-being logged by other developers etc.
-*/
-void qof_log_set_level_registered(QofLogLevel level);
-
-/** Specify an alternate log output, to pipe or file.
-By default, all logging goes to /tmp/qof.trace 
- 
-Needs to be called \b before qof_log_init()
-\deprecated
-*/
+/**
+ * Specify an alternate log output, to pipe or file.
+ **/
 void qof_log_set_file (FILE *outfile);
 
-/** Specify a filename for log output.
-
-Calls qof_log_init() for you.
-*/
+/**
+ * Specify a filename for log output.
+ **/
 void qof_log_init_filename (const gchar* logfilename);
 
+/**
+ * If {@param log_to_filename} is "stderr" or "stdout" (exactly,
+ * case-insensitive), then those special files are used; otherwise, the
+ * literal filename as given, as {@link qof_log_init_filename}.
+ **/
+void qof_log_init_filename_special(const char *log_to_filename);
+
+/** Parse a log-configuration file.  A GKeyFile-format file of the schema::
+ *
+ *      [levels] 
+ *      # log.ger.path=level
+ *      gnc.engine.sx=debug
+ *      gnc.gui.sx=debug
+ *      gnc.gui.freqspec=debug
+ *      [output]
+ *      # to=["stderr"|"stdout"|filename]
+ *      to=stderr
+ **/
+void qof_log_parse_log_config(const char *filename);
+
 /** Be nice, close the logfile if possible. */
 void qof_log_shutdown (void);
 
-/** qof_log_prettify() cleans up subroutine names. AIX/xlC has the habit
+/**
+ * qof_log_prettify() cleans up subroutine names. AIX/xlC has the habit
  * of printing signatures not names; clean this up. On other operating
- * systems, truncate name to QOF_LOG_MAX_CHARS chars.  */
+ * systems, truncate name to QOF_LOG_MAX_CHARS chars.
+ **/
 const gchar * qof_log_prettify (const gchar *name);
 
 /** Do not log log_modules that have not been enabled. */
@@ -148,103 +120,70 @@
 typedef void (*QofLogCB) (QofLogModule log_module, QofLogLevel* log_level, 
 			gpointer user_data);
 
-/** Iterate over each known log_module
+#define PRETTY_FUNC_NAME qof_log_prettify(__FUNCTION__)
 
-Only log_modules with log_levels set will 
-be available.
-*/
-void qof_log_module_foreach(QofLogCB cb, gpointer data);
-
-/** Number of log_modules registered*/
-gint qof_log_module_count(void);
-
-#define FUNK qof_log_prettify(__FUNCTION__)
-
-/** Log error/warning/info messages to stderr or to a file.
- *  This logging infrastructure is meant for validating the 
- *  correctness of the execution of the code.  'Info' level 
- *  messages help trace program flow. 'Error' messages are 
- *  meant to indicate internal data inconsistencies.
- * 
- * Messages can be logged to stdout, stderr, or to any desired
- * file.
- */
-
 /** Log a fatal error */
-#define FATAL(format, args...) do {                  \
-    g_log (G_LOG_DOMAIN, G_LOG_LEVEL_ERROR,          \
-      "Fatal Error: %s(): " format, FUNK , ## args); \
+#define FATAL(format, args...) do { \
+    g_log (log_module, G_LOG_LEVEL_FATAL, \
+      "[%s()] " format, PRETTY_FUNC_NAME , ## args); \
 } while (0)
 
 /** Log a serious error */
-#define PERR(format, args...) do {                   \
-  if (qof_log_check (log_module, QOF_LOG_ERROR)) {   \
-    g_log (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL,     \
-      "Error: %s(): " format, FUNK , ## args);     \
-  }                                                \
+#define PERR(format, args...) do { \
+    g_log (log_module, G_LOG_LEVEL_CRITICAL, \
+      "[%s()] " format, PRETTY_FUNC_NAME , ## args); \
 } while (0)
 
 /** Log a warning */
-#define PWARN(format, args...) do {                    \
-  if (qof_log_check (log_module, QOF_LOG_WARNING)) {   \
-    g_log (G_LOG_DOMAIN, G_LOG_LEVEL_WARNING,      \
-      "Warning: %s(): " format, FUNK , ## args);   \
-  }                                                \
+#define PWARN(format, args...) do { \
+    g_log (log_module, G_LOG_LEVEL_WARNING, \
+      "[%s()] " format, PRETTY_FUNC_NAME , ## args); \
 } while (0)
 
 /** Print an informational note */
-#define PINFO(format, args...) do {                 \
-  if (qof_log_check (log_module, QOF_LOG_INFO)) {   \
-    g_log (G_LOG_DOMAIN, G_LOG_LEVEL_INFO,         \
-      "Info: %s(): " format,                       \
-      FUNK , ## args);                             \
-  }                                                \
+#define PINFO(format, args...) do { \
+    g_log (log_module, G_LOG_LEVEL_INFO, \
+      "[%s] " format, PRETTY_FUNC_NAME , ## args); \
 } while (0)
 
 /** Print a debugging message */
-#define DEBUG(format, args...) do {                 \
-  if (qof_log_check (log_module, QOF_LOG_DEBUG)) {  \
-    g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG,        \
-      "Debug: %s(): " format,                      \
-      FUNK , ## args);                             \
-  }                                                \
+#define DEBUG(format, args...) do { \
+    g_log (log_module, G_LOG_LEVEL_DEBUG, \
+      "[%s] " format, PRETTY_FUNC_NAME , ## args); \
 } while (0)
 
 /** Print a function entry debugging message */
-#define ENTER(format, args...) do {                 \
-  if (qof_log_check (log_module, QOF_LOG_DEBUG)) {  \
-    g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG,        \
-      "Enter in %s: %s()" format, __FILE__,        \
-      FUNK , ## args);                             \
-    qof_log_add_indent();                           \
-  }                                                \
+#define ENTER(format, args...) do { \
+    if (qof_log_check(log_module, G_LOG_LEVEL_DEBUG)) { \
+      g_log (log_module, G_LOG_LEVEL_DEBUG, \
+        "[enter %s:%s()] " format, __FILE__, \
+        PRETTY_FUNC_NAME , ## args); \
+      qof_log_indent(); \
+    } \
 } while (0)
 
-/** Print a function exit debugging message */
-#define LEAVE(format, args...) do {                 \
-  if (qof_log_check (log_module, QOF_LOG_DEBUG)) {  \
-    qof_log_drop_indent();                          \
-    g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG,        \
-      "Leave: %s()" format,                        \
-      FUNK , ## args);                             \
-  }                                                \
-} while (0)
+#define gnc_leave_return_val_if_fail(test, val) do { \
+  if (! (test)) { LEAVE(""); } \
+  g_return_val_if_fail(test, val); \
+} while (0);
 
-/** Print a function trace debugging message */
-#define TRACE(format, args...) do {                 \
-  if (qof_log_check (log_module, QOF_LOG_TRACE)) {  \
-    g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG,        \
-      "Trace: %s(): " format, FUNK , ## args);     \
-  }                                                \
-} while (0)
+#define gnc_leave_return_if_fail(test) do { \
+  if (! (test)) { LEAVE(""); } \
+  g_return_if_fail(test); \
+} while (0);
 
-#define DEBUGCMD(x) do {                            \
-  if (qof_log_check (log_module, QOF_LOG_DEBUG)) {  \
-		(x);                                        \
-	}                                               \
+/** Print a function exit debugging message */
+#define LEAVE(format, args...) do { \
+    if (qof_log_check(log_module, G_LOG_LEVEL_DEBUG)) { \
+      qof_log_dedent(); \
+      g_log (log_module, G_LOG_LEVEL_DEBUG, \
+        "[leave %s()] " format, \
+        PRETTY_FUNC_NAME , ## args); \
+    } \
 } while (0)
 
 /* -------------------------------------------------------- */
+
 /** Infrastructure to make timing measurements for critical pieces 
  * of code. Used for only for performance tuning & debugging. 
  */

Modified: gnucash/branches/remove-group2/lib/libqof/qof/qofmath128.c
===================================================================
--- gnucash/branches/remove-group2/lib/libqof/qof/qofmath128.c	2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/lib/libqof/qof/qofmath128.c	2007-02-11 19:54:51 UTC (rev 15565)
@@ -329,10 +329,13 @@
 
 
 #ifdef TEST_128_BIT_MULT
+
 static void pr (gint64 a, gint64 b)
 {
    qofint128 prod = mult128 (a,b);
-   printf ("%" G_GINT64_FORMAT " * %" G_GINT64_FORMAT " = %" G_GUINT64_FORMAT " %" G_GUINT64_FORMAT " (0x%llx %llx) %hd\n",
+   printf ("%" G_GINT64_FORMAT " * %" G_GINT64_FORMAT " = %"
+	   G_GUINT64_FORMAT " %" G_GUINT64_FORMAT " (0x%"
+	   G_GINT64_MODIFIER "x %" G_GINT64_MODIFIER "x) %hd\n",
 	   a, b, prod.hi, prod.lo, prod.hi, prod.lo, prod.isbig);
 }
 
@@ -341,15 +344,24 @@
    qofint128 prod = mult128 (a,b);
    qofint128 quot = div128 (prod, c);
    gint64 rem = rem128 (prod, c);
-   printf ("%" G_GINT64_FORMAT " * %" G_GINT64_FORMAT " / %" G_GINT64_FORMAT " = %" G_GUINT64_FORMAT " %" G_GUINT64_FORMAT " + %" G_GINT64_FORMAT " (0x%llx %llx) %hd\n",
+   printf ("%" G_GINT64_FORMAT " * %" G_GINT64_FORMAT " / %" G_GINT64_FORMAT
+	   " = %" G_GUINT64_FORMAT " %" G_GUINT64_FORMAT " + %"
+	   G_GINT64_FORMAT " (0x%" G_GINT64_MODIFIER "x %"
+	   G_GINT64_MODIFIER "x) %hd\n",
 	   a, b, c, quot.hi, quot.lo, rem, quot.hi, quot.lo, quot.isbig);
 }
 
 int main ()
 {
+  gint64 x;
+  qofint128 n;
+  gint64 d;
+  qofint128 quot;
+  int i;
+
   pr (2,2);
 
-  gint64 x = 1<<30;
+  x = 1<<30;
   x <<= 2;
 
   pr (x,x);
@@ -366,7 +378,7 @@
   pr (x,x);
   pr (x,-x);
 
-  pr (1000000, 10000000000000);
+  pr (1000000, G_GINT64_CONSTANT(10000000000000));
 
   prd (x,x,2);
   prd (x,x,3);
@@ -384,17 +396,16 @@
   prd (1111,x,11);
 
   /* Really test division */
-  qofint128 n;
   n.hi = 0xdd91;
   n.lo = 0x6c5abefbb9e13480ULL;
 
-  gint64 d = 0x2ae79964d3ae1d04ULL;
+  d = 0x2ae79964d3ae1d04ULL;
   
-  int i;
   for (i=0; i<20; i++) {
 
-  qofint128 quot = div128 (n, d);
-  printf ("%d result = %llx %llx\n", i, quot.hi, quot.lo);
+  quot = div128 (n, d);
+  printf ("%d result = %" G_GINT64_MODIFIER "x %" G_GINT64_MODIFIER "x\n",
+	  i, quot.hi, quot.lo);
     d >>=1;
     n = shift128 (n);
   }

Modified: gnucash/branches/remove-group2/lib/libqof/qof/qofobject.h
===================================================================
--- gnucash/branches/remove-group2/lib/libqof/qof/qofobject.h	2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/lib/libqof/qof/qofobject.h	2007-02-11 19:54:51 UTC (rev 15565)
@@ -58,7 +58,7 @@
  */
 #define QOF_OBJECT_VERSION 3
 
-#define QOF_MOD_OBJECT "qof-object"
+#define QOF_MOD_OBJECT "qof.object"
 
 typedef struct _QofObject QofObject;
 typedef void (*QofForeachCB) (gpointer obj, gpointer user_data);

Modified: gnucash/branches/remove-group2/lib/libqof/qof/qofquery.c
===================================================================
--- gnucash/branches/remove-group2/lib/libqof/qof/qofquery.c	2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/lib/libqof/qof/qofquery.c	2007-02-11 19:54:51 UTC (rev 15565)
@@ -709,7 +709,8 @@
   }
 
   /* Maybe log this sucker */
-  if (qof_log_check (log_module, QOF_LOG_DETAIL)) qof_query_print (q);
+  if (qof_log_check (log_module, QOF_LOG_DEBUG))
+       qof_query_print (q);
 
   /* Now run the query over all the objects and save the results */
   {

Modified: gnucash/branches/remove-group2/lib/libqof/qof/qofquery.h
===================================================================
--- gnucash/branches/remove-group2/lib/libqof/qof/qofquery.h	2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/lib/libqof/qof/qofquery.h	2007-02-11 19:54:51 UTC (rev 15565)
@@ -79,7 +79,7 @@
 #include "qofquerycore.h"
 #include "qofchoice.h"
 
-#define QOF_MOD_QUERY "qof-query"
+#define QOF_MOD_QUERY "qof.query"
 
 /** A Query */
 typedef struct _QofQuery QofQuery;

Modified: gnucash/branches/remove-group2/lib/libqof/qof/qofsession.h
===================================================================
--- gnucash/branches/remove-group2/lib/libqof/qof/qofsession.h	2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/lib/libqof/qof/qofsession.h	2007-02-11 19:54:51 UTC (rev 15565)
@@ -103,7 +103,7 @@
 #include "qofclass.h"
 #include "qofobject.h"
 
-#define QOF_MOD_SESSION "qof-session"
+#define QOF_MOD_SESSION "qof.session"
 
 /* PROTOTYPES ******************************************************/
 

Modified: gnucash/branches/remove-group2/lib/libqof/qof/qofsql.c
===================================================================
--- gnucash/branches/remove-group2/lib/libqof/qof/qofsql.c	2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/lib/libqof/qof/qofsql.c	2007-02-11 19:54:51 UTC (rev 15565)
@@ -884,7 +884,7 @@
 
 	qof_query_set_book (query->qof_query, query->book);
     /* Maybe log this sucker */
-    if (gnc_should_log (log_module, GNC_LOG_DETAIL)) 
+    if (qof_should_log (log_module, QOF_LOG_DEBUG)) 
 	{
 		qof_query_print (query->qof_query);
 	}
@@ -911,7 +911,7 @@
 	qof_query_set_book (query->qof_query, query->book);
 
     /* Maybe log this sucker */
-    if (gnc_should_log (log_module, GNC_LOG_DETAIL)) 
+    if (qof_should_log (log_module, QOF_LOG_DEBUG)) 
 	{
 		qof_query_print (query->qof_query);
 	}

Modified: gnucash/branches/remove-group2/lib/libqof/qof/qofutil.c
===================================================================
--- gnucash/branches/remove-group2/lib/libqof/qof/qofutil.c	2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/lib/libqof/qof/qofutil.c	2007-02-11 19:54:51 UTC (rev 15565)
@@ -545,6 +545,7 @@
 void
 qof_init (void)
 {
+    qof_log_init();
 	qof_util_get_string_cache ();
 	guid_init ();
 	qof_object_initialize ();
@@ -559,6 +560,7 @@
 	qof_object_shutdown ();
 	guid_shutdown ();
 	qof_util_string_cache_destroy ();
+    qof_log_shutdown();
 }
 
 /* ************************ END OF FILE ***************************** */

Modified: gnucash/branches/remove-group2/lib/libqof/qof/qofutil.h
===================================================================
--- gnucash/branches/remove-group2/lib/libqof/qof/qofutil.h	2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/lib/libqof/qof/qofutil.h	2007-02-11 19:54:51 UTC (rev 15565)
@@ -56,7 +56,7 @@
 # endif
 #endif
 
-#define QOF_MOD_UTIL "qof-utilities"
+#define QOF_MOD_UTIL "qof.utilities"
 
 /** \name typedef enum as string macros
 @{

Modified: gnucash/branches/remove-group2/macros/ac_pkg_swig.m4
===================================================================
--- gnucash/branches/remove-group2/macros/ac_pkg_swig.m4	2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/macros/ac_pkg_swig.m4	2007-02-11 19:54:51 UTC (rev 15565)
@@ -28,7 +28,7 @@
 AC_DEFUN([AC_PROG_SWIG],[
         AC_PATH_PROG([SWIG],[swig])
         if test -z "$SWIG" ; then
-                AC_MSG_WARN([cannot find 'swig' program. You should look at http://www.swig.org])
+                AC_MSG_ERROR([cannot find 'swig' program. You should look at http://www.swig.org])
                 SWIG='echo "Error: SWIG is not installed. You should look at http://www.swig.org" ; false'
         elif test -n "$1" ; then
                 AC_MSG_CHECKING([for SWIG version])

Modified: gnucash/branches/remove-group2/macros/binreloc.m4
===================================================================
--- gnucash/branches/remove-group2/macros/binreloc.m4	2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/macros/binreloc.m4	2007-02-11 19:54:51 UTC (rev 15565)
@@ -20,8 +20,10 @@
 		AC_CHECK_FILE([/proc/self/maps])
 		AC_CACHE_CHECK([whether everything is installed to the same prefix],
 			       [br_cv_valid_prefixes], [
+				# datarootdir variables was introduced with autoconf-2.60
 				if test "$bindir" = '${exec_prefix}/bin' -a "$sbindir" = '${exec_prefix}/sbin' -a \
-					"$datadir" = '${prefix}/share' -a "$libdir" = '${exec_prefix}/lib' -a \
+					\( "$datadir" = '${prefix}/share' -o \( "$datadir" = '${datarootdir}' -a "$datarootdir" = '${prefix}/share' \) \) -a \
+					"$libdir" = '${exec_prefix}/lib' -a \
 					"$libexecdir" = '${exec_prefix}/libexec' -a "$sysconfdir" = '${prefix}/etc'
 				then
 					br_cv_valid_prefixes=yes

Modified: gnucash/branches/remove-group2/packaging/gnucash.spec.in
===================================================================
--- gnucash/branches/remove-group2/packaging/gnucash.spec.in	2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/packaging/gnucash.spec.in	2007-02-11 19:54:51 UTC (rev 15565)
@@ -50,7 +50,6 @@
 BuildRequires: 	bzip2-devel, expat-devel, guile-devel
 BuildRequires: 	libglade2-devel, libgsf-devel
 BuildRequires: 	libjpeg-devel, openssl-devel
-BuildRequires:  libtool-ltdl-devel
 
 %description
 GnuCash is a personal finance manager. A check-book like
@@ -207,7 +206,6 @@
 %files devel
 %defattr(444,root,root,755)
 %{_includedir}/gnucash
-%{_datadir}/aclocal/gnucash.m4
 
 %if %{_with_ofx}
 %files ofx

Modified: gnucash/branches/remove-group2/packaging/win32/README
===================================================================
--- gnucash/branches/remove-group2/packaging/win32/README	2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/packaging/win32/README	2007-02-11 19:54:51 UTC (rev 15565)
@@ -7,7 +7,7 @@
 Before you start with the automated build, you have to complete these
 steps manually. The directory variables are set in custom.sh.
 
-* Download MSYS (but *only* msys, no mingw and no msysdtk)
+* Download MSYS (but *only* msys; no mingw and no msysdtk)
 from http://www.mingw.org/download.shtml -> Current -> MSYS -> (bin, *.exe)
 to $DOWNLOAD_DIR
 
@@ -18,24 +18,34 @@
 from http://www.mingw.org/download.shtml -> Current -> mingwPORT -> (bin, wget-*)
 to $DOWNLOAD_DIR
 
-* Adjust installer.sh and/or custom.sh. Especially in the latter you
-  can comment out those build steps that have been completed already
-  and/or should not be performed now. If you want verbose output of
-  any script step, change the first line in install.sh and add the
-  "-x" switch.
+* Adjust custom.sh (install.sh doesn't need to be changed). In
+  custom.sh you should adapt the directory variables. If you want to,
+  you could also comment out those build steps that have been
+  completed already and/or should not be performed now, although the
+  script is quite intelligent not to duplicate already completed
+  work. If you want verbose output of any script step, change the
+  first line in install.sh and add the "-x" switch.
 
-Start/Enter any MSYS shell. Let the automated build begin by:
+Start/Enter any MSYS shell window. Let the automated build begin by:
 
   $INSTALLER_DIR/install.sh
 
 Good luck!
 
+To generate a self-installing setup.exe file that contains
+*everything*, run the following command after install.sh has
+completed:
+
+  $INSTALLER_DIR/dist.sh
+
 More information is collected on http://wiki.gnucash.org/wiki/Windows
 
+
 --------------------------
 
 Cross-compiling a Windows/mingw32 executable of GnuCash on a Linux
-host system.
+host system. (Note: This used to work unchangedly in Sept'2006 but
+probably not any longer.)
 
 These steps need to be performed:
 
@@ -53,13 +63,12 @@
    adjust the directories in custom.sh according to your
    preferred installation, especially $GLOBAL_DIR.
 
-3. Download the binary windows packages for "guile" and "g-wrap"
-   from http://www.tu-harburg.de/~et2cs/gnc/ and unpack them into
-   the directories $GUILE_DIR and $GWRAP_DIR as given in
-   custom.sh. (This is done because the build system for guile and
-   g-wrap doesn't support cross-compiling.)
+3. Download a binary windows packages for "guile" e.g. from
+   http://www.tu-harburg.de/~et2cs/gnc/ and unpack it into the
+   directory $GUILE_DIR as given in custom.sh. (This is done because
+   the build system for guile doesn't support cross-compiling.)
 
-4. Call install.sh which will read the directory settings from
+4. Call install.sh, which will read the directory settings from
    custom.sh. It should download, compile, and install everything
    automatically. Eventually the windows gnucash is installed into
    $GNUCASH_DIR. 

Modified: gnucash/branches/remove-group2/packaging/win32/custom.sh
===================================================================
--- gnucash/branches/remove-group2/packaging/win32/custom.sh	2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/packaging/win32/custom.sh	2007-02-11 19:54:51 UTC (rev 15565)
@@ -9,6 +9,8 @@
 GNUCASH_DIR=$GLOBAL_DIR\\gnucash
 REPOS_URL="http://svn.gnucash.org/repo/gnucash/trunk"
 REPOS_DIR=$GNUCASH_DIR\\repos
+# keep this pointing from BUILD_DIR to REPOS_DIR
+REL_REPOS_DIR=..\\repos
 BUILD_DIR=$GNUCASH_DIR\\build
 INSTALL_DIR=$GNUCASH_DIR\\inst
 
@@ -37,14 +39,21 @@
 fi
 ####
 
+# If "yes", build without optimizations (-O0) and ease debugging
+DISABLE_OPTIMIZATIONS=no
+
 MSYS_DIR=$GLOBAL_DIR\\msys
 
-WGET_DIR=$GLOBAL_DIR\\wget
+# tools here means binaries runnable without other DLLs or data files
+TOOLS_DIR=$GLOBAL_DIR\\tools
+WGET_DIR=$TOOLS_DIR
 #WGET=
 
 SF_MIRROR="http://heanet.dl.sourceforge.net/sourceforge"
 GTK_MIRROR="ftp.gtk.org/pub"
 GNOME_MIRROR="ftp.gnome.org/pub/gnome"
+GNOME_WIN32_URL="$GNOME_MIRROR/binaries/win32"
+GNOME_WIN32_DEPS_URL="$GNOME_WIN32_URL/dependencies"
 
 DTK_URL="$SF_MIRROR/mingw/msysDTK-1.0.1.exe"
 
@@ -52,20 +61,17 @@
 MINGW_DIR=$GLOBAL_DIR\\mingw
 
 UNZIP_URL="$SF_MIRROR/gnuwin32/unzip-5.51-1.exe"
-UNZIP_DIR=$GLOBAL_DIR\\unzip
+UNZIP_DIR=$TOOLS_DIR
 
 # do not use regex-gnu or regex-spencer v3.8.g3, see bug #382852
-REGEX_BIN_URL="$SF_MIRROR/gnuwin32/regex-spencer-3.8-bin.zip"
-REGEX_LIB_URL="$SF_MIRROR/gnuwin32/regex-spencer-3.8-lib.zip"
+REGEX_URL="$GNOME_WIN32_DEPS_URL/libgnurx-2.5.zip"
+REGEX_DEV_URL="$GNOME_WIN32_DEPS_URL/libgnurx-dev-2.5.zip"
 REGEX_DIR=$GLOBAL_DIR\\regex
 
 READLINE_BIN_URL="$SF_MIRROR/gnuwin32/readline-5.0-bin.zip"
 READLINE_LIB_URL="$SF_MIRROR/gnuwin32/readline-5.0-lib.zip"
 READLINE_DIR=$GLOBAL_DIR\\readline
 
-INDENT_BIN_URL="$SF_MIRROR/gnuwin32/indent-2.2.9-bin.zip"
-INDENT_DIR=$GLOBAL_DIR\\indent
-
 ACTIVE_PERL_URL="http://downloads.activestate.com/ActivePerl/Windows/5.6/ActivePerl-5.6.1.638-MSWin32-x86.zip"
 ACTIVE_PERL_DIR=$GLOBAL_DIR\\active-perl
 
@@ -78,22 +84,24 @@
 SLIB_URL="http://swiss.csail.mit.edu/ftpdir/scm/OLD/slib3a3.zip"
 GUILE_DIR=$GLOBAL_DIR\\guile
 
-OPENSSL_URL="http://www.slproweb.com/download/Win32OpenSSL-0_9_8d.exe"
+OPENSSL_BIN_URL="$SF_MIRROR/gnuwin32/openssl-0.9.7c-bin.zip"
+OPENSSL_LIB_URL="$SF_MIRROR/gnuwin32/openssl-0.9.7c-lib.zip"
 OPENSSL_DIR=$GLOBAL_DIR\\openssl
 
 PEXPORTS_URL="http://www.emmestech.com/software/cygwin/pexports-0.43/pexports-0.43.zip"
-PEXPORTS_DIR=$GLOBAL_DIR\\pexports
+PEXPORTS_DIR=$TOOLS_DIR
 
+EXETYPE_SCRIPT=`pwd`/exetype.pl
+EXETYPE_DIR=$TOOLS_DIR
+
 LIBXML2_URL="http://www.zlatkovic.com/pub/libxml/libxml2-2.6.27.win32.zip"
 LIBXML2_DIR=$GLOBAL_DIR\\gnome #avoid XML_FLAGS
 
-GNOME_WIN32_URL="$GNOME_MIRROR/binaries/win32"
-GNOME_WIN32_DEPS_URL="$GNOME_WIN32_URL/dependencies"
 GETTEXT_URL="$GNOME_WIN32_DEPS_URL/gettext-0.14.5.zip"
 GETTEXT_DEV_URL="$GNOME_WIN32_DEPS_URL/gettext-dev-0.14.5.zip"
 LIBICONV_URL="$GNOME_WIN32_DEPS_URL/libiconv-1.9.1.bin.woe32.zip"
-GLIB_URL="$GNOME_WIN32_URL/glib/2.12/glib-2.12.4.zip"
-GLIB_DEV_URL="$GNOME_WIN32_URL/glib/2.12/glib-dev-2.12.4.zip"
+GLIB_URL="$GNOME_WIN32_URL/glib/2.12/glib-2.12.9.zip"
+GLIB_DEV_URL="$GNOME_WIN32_URL/glib/2.12/glib-dev-2.12.9.zip"
 LIBJPEG_URL="$GNOME_WIN32_DEPS_URL/libjpeg-6b-4.zip"
 LIBPNG_URL="$GTK_MIRROR/gtk/v2.10/win32/dependencies/libpng-1.2.8-bin.zip"
 ZLIB_URL="$GTK_MIRROR/gtk/v2.10/win32/dependencies/zlib123-dll.zip"
@@ -103,16 +111,16 @@
 EXPAT_URL="$GNOME_WIN32_DEPS_URL/expat-2.0.0.zip"
 FONTCONFIG_URL="$GNOME_WIN32_DEPS_URL/fontconfig-2.3.2-tml-20060825.zip"
 FONTCONFIG_DEV_URL="$GNOME_WIN32_DEPS_URL/fontconfig-dev-2.3.2-tml-20060825.zip"
-FREETYPE_URL="$GNOME_WIN32_DEPS_URL/freetype-2.1.10.zip"
-FREETYPE_DEV_URL="$SF_MIRROR/gnuwin32/freetype-2.1.10-lib.zip"
+FREETYPE_URL="$GNOME_WIN32_DEPS_URL/freetype-2.2.1.zip"
+FREETYPE_DEV_URL="$GNOME_WIN32_DEPS_URL/freetype-dev-2.2.1.zip"
 ATK_URL="$GNOME_WIN32_URL/atk/1.12/atk-1.12.3.zip"
 ATK_DEV_URL="$GNOME_WIN32_URL/atk/1.12/atk-dev-1.12.3.zip"
-PANGO_URL="$GNOME_WIN32_URL/pango/1.14/pango-1.14.5.zip"
-PANGO_DEV_URL="$GNOME_WIN32_URL/pango/1.14/pango-dev-1.14.5.zip"
+PANGO_URL="$GNOME_WIN32_URL/pango/1.14/pango-1.14.9.zip"
+PANGO_DEV_URL="$GNOME_WIN32_URL/pango/1.14/pango-dev-1.14.9.zip"
 LIBART_LGPL_URL="$GNOME_WIN32_URL/libart_lgpl/2.3/libart_lgpl-2.3.17.zip"
 LIBART_LGPL_DEV_URL="$GNOME_WIN32_URL/libart_lgpl/2.3/libart_lgpl-dev-2.3.17.zip"
-GTK_URL="$GNOME_WIN32_URL/gtk+/2.10/gtk+-2.10.6.zip"
-GTK_DEV_URL="$GNOME_WIN32_URL/gtk+/2.10/gtk+-dev-2.10.6.zip"
+GTK_URL="$GNOME_WIN32_URL/gtk+/2.10/gtk+-2.10.9.zip"
+GTK_DEV_URL="$GNOME_WIN32_URL/gtk+/2.10/gtk+-dev-2.10.9.zip"
 INTLTOOL_URL="$GNOME_WIN32_URL/intltool/0.35/intltool-0.35.0.zip"
 ORBIT2_URL="$GNOME_WIN32_URL/ORBit2/2.13/ORBit2-2.13.3.zip"
 ORBIT2_DEV_URL="$GNOME_WIN32_URL/ORBit2/2.13/ORBit2-dev-2.13.3.zip"
@@ -124,8 +132,8 @@
 GCONF_DEV_URL="$GNOME_WIN32_URL/GConf/2.14/GConf-dev-2.14.0.zip"
 LIBBONOBO_URL="$GNOME_WIN32_URL/libbonobo/2.16/libbonobo-2.16.0.zip"
 LIBBONOBO_DEV_URL="$GNOME_WIN32_URL/libbonobo/2.16/libbonobo-dev-2.16.0.zip"
-GNOME_VFS_URL="$GNOME_WIN32_URL/gnome-vfs/2.14/gnome-vfs-2.14.2.zip"
-GNOME_VFS_DEV_URL="$GNOME_WIN32_URL/gnome-vfs/2.14/gnome-vfs-dev-2.14.2.zip"
+GNOME_VFS_URL="$GNOME_WIN32_URL/gnome-vfs/2.14/gnome-vfs-2.14.2-no-openssl.zip"
+GNOME_VFS_DEV_URL="$GNOME_WIN32_URL/gnome-vfs/2.14/gnome-vfs-dev-2.14.2-no-openssl.zip"
 LIBGNOME_URL="$GNOME_WIN32_URL/libgnome/2.16/libgnome-2.16.0-1.zip"
 LIBGNOME_DEV_URL="$GNOME_WIN32_URL/libgnome/2.16/libgnome-dev-2.16.0.zip"
 LIBGNOMECANVAS_URL="$GNOME_WIN32_URL/libgnomecanvas/2.14/libgnomecanvas-2.14.0.zip"
@@ -140,8 +148,8 @@
 LIBGNOMEPRINT_DEV_URL="$GNOME_WIN32_URL/libgnomeprint/2.12/libgnomeprint-dev-2.12.1.zip"
 LIBGNOMEPRINTUI_URL="$GNOME_WIN32_URL/libgnomeprintui/2.12/libgnomeprintui-2.12.1.zip"
 LIBGNOMEPRINTUI_DEV_URL="$GNOME_WIN32_URL/libgnomeprintui/2.12/libgnomeprintui-dev-2.12.1.zip"
-GTKHTML_URL="$GNOME_WIN32_URL/gtkhtml/3.12/gtkhtml-3.12.0.zip"
-GTKHTML_DEV_URL="$GNOME_WIN32_URL/gtkhtml/3.12/gtkhtml-dev-3.12.0.zip"
+GTKHTML_URL="$GNOME_WIN32_URL/gtkhtml/3.12/gtkhtml-3.12.2.zip"
+GTKHTML_DEV_URL="$GNOME_WIN32_URL/gtkhtml/3.12/gtkhtml-dev-3.12.2.zip"
 GNOME_DIR=$GLOBAL_DIR\\gnome
 
 SWIG_URL="$SF_MIRROR/swig/swigwin-1.3.31.zip"
@@ -158,12 +166,29 @@
 GLADE_URL="$GNOME_MIRROR/sources/glade3/3.0/glade3-3.1.2.tar.bz2"
 GLADE_DIR=$GLOBAL_DIR\\glade
 
-INNO_URL="http://files.jrsoftware.org/ispack/ispack-5.1.9.exe"
+INNO_URL="http://files.jrsoftware.org/is/5/isetup-5.1.9.exe"
 INNO_DIR=$GLOBAL_DIR\\inno
 
 SVN_URL="http://subversion.tigris.org/files/documents/15/35379/svn-1.4.2-setup.exe"
 SVN_DIR=$GLOBAL_DIR\\svn
 
+# OFX import in gnucash and ofx directconnect support for aqbanking
+OPENSP_URL="$SF_MIRROR/openjade/OpenSP-1.5.2.tar.gz"
+OPENSP_DIR=$GLOBAL_DIR\\opensp
+OPENSP_PATCH=`pwd`/opensp-1.5.2-patch.diff
+
+LIBOFX_URL="$SF_MIRROR/libofx/libofx-0.8.3.tar.gz"
+LIBOFX_DIR=$GLOBAL_DIR\\libofx
+LIBOFX_PATCH=`pwd`/libofx-0.8.3-patch.diff
+
+## online banking: gwenhywfar+aqbanking
+GWENHYWFAR_URL="$SF_MIRROR/gwenhywfar/gwenhywfar-2.5.3.tar.gz"
+GWENHYWFAR_DIR=$GLOBAL_DIR\\gwenhywfar
+
+AQBANKING_URL="$SF_MIRROR/aqbanking/aqbanking-2.2.7.tar.gz"
+AQBANKING_DIR=$GLOBAL_DIR\\aqbanking
+##
+
 # There is no reason to ever need to comment these out!
 # * commented out glade, as it is not needed to run gnucash
 if test x$cross_compile != xyes ; then
@@ -174,7 +199,6 @@
 fi
 add_step inst_regex
 add_step inst_readline
-add_step inst_indent
 if test x$cross_compile != xyes ; then
  add_step inst_active_perl
 fi
@@ -184,12 +208,19 @@
  add_step inst_openssl
 fi
 add_step inst_pexports
+add_step inst_exetype
 add_step inst_libxml2
 add_step inst_gnome
 add_step inst_swig
 add_step inst_libgsf
 add_step inst_goffice
 #add_step inst_glade
+add_step inst_opensp
+add_step inst_libofx
+## Online banking:
+add_step inst_gwenhywfar
+add_step inst_aqbanking
+##
 if test x$cross_compile != xyes ; then
  add_step inst_inno
 fi

Modified: gnucash/branches/remove-group2/packaging/win32/dist.sh
===================================================================
--- gnucash/branches/remove-group2/packaging/win32/dist.sh	2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/packaging/win32/dist.sh	2007-02-11 19:54:51 UTC (rev 15565)
@@ -25,22 +25,28 @@
     _AUTOTOOLS_UDIR=`unix_path $AUTOTOOLS_DIR`
     _GUILE_UDIR=`unix_path $GUILE_DIR`
     _WIN_UDIR=`unix_path $WINDIR`
+    _EXETYPE_UDIR=`unix_path $EXETYPE_DIR`
     _LIBXML2_UDIR=`unix_path $LIBXML2_DIR`
     _GNOME_UDIR=`unix_path $GNOME_DIR`
     _LIBGSF_UDIR=`unix_path $LIBGSF_DIR`
     _GOFFICE_UDIR=`unix_path $GOFFICE_DIR`
+    _OPENSP_UDIR=`unix_path $OPENSP_DIR`
+    _LIBOFX_UDIR=`unix_path $LIBOFX_DIR`
+    _GWENHYWFAR_UDIR=`unix_path $GWENHYWFAR_DIR`
+    _AQBANKING_UDIR=`unix_path $AQBANKING_DIR`
     _GNUCASH_UDIR=`unix_path $GNUCASH_DIR`
     _BUILD_UDIR=`unix_path $BUILD_DIR`
     _INSTALL_UDIR=`unix_path $INSTALL_DIR`
     _INNO_UDIR=`unix_path $INNO_DIR`
     add_to_env $_UNZIP_UDIR/bin PATH # unzip
     add_to_env $_GNOME_UDIR/bin PATH # gconftool-2
+    add_to_env $_EXETYPE_UDIR/bin PATH # exetype
 }
 
 function dist_regex() {
     setup RegEx
-    smart_wget $REGEX_BIN_URL $DOWNLOAD_DIR
-    unzip -q $LAST_FILE bin/regex.dll -d $DIST_DIR
+    smart_wget $REGEX_URL $DOWNLOAD_DIR
+    unzip -q $LAST_FILE bin/libgnurx-0.dll -d $DIST_DIR
 }
 
 function dist_autotools() {
@@ -61,8 +67,9 @@
 
 function dist_openssl() {
     setup OpenSSL
+    _OPENSSL_UDIR=`unix_path $OPENSSL_DIR`
     mkdir -p $DIST_UDIR/bin
-    cp -a $_WIN_UDIR/system32/lib{eay,ssl}*.dll $DIST_UDIR/bin
+    cp -a $_OPENSSL_UDIR/bin/lib{eay,ssl}*.dll $DIST_UDIR/bin
 }
 
 function dist_libxml2() {
@@ -127,6 +134,32 @@
     cp -a $_GOFFICE_UDIR/share/{goffice,pixmaps} $DIST_UDIR/share
 }
 
+function dist_libofx() {
+    setup OpenSP and LibOFX
+    cp -a ${_OPENSP_UDIR}/bin/*.dll ${DIST_UDIR}/bin
+    cp -a ${_OPENSP_UDIR}/share/OpenSP ${DIST_UDIR}/share
+    cp -a ${_LIBOFX_UDIR}/bin/*.dll ${DIST_UDIR}/bin
+    cp -a ${_LIBOFX_UDIR}/bin/*.exe ${DIST_UDIR}/bin
+    cp -a ${_LIBOFX_UDIR}/share/libofx ${DIST_UDIR}/share
+}
+
+function dist_gwenhywfar() {
+    setup gwenhywfar
+    cp -a ${_GWENHYWFAR_UDIR}/bin/*.dll ${DIST_UDIR}/bin
+    mkdir -p ${DIST_UDIR}/etc
+    cp -a ${_GWENHYWFAR_UDIR}/etc/* ${DIST_UDIR}/etc
+    cp -a ${_GWENHYWFAR_UDIR}/lib/gwenhywfar ${DIST_UDIR}/lib
+}
+
+function dist_aqbanking() {
+    setup aqbanking
+    cp -a ${_AQBANKING_UDIR}/bin/*.exe ${DIST_UDIR}/bin
+    cp -a ${_AQBANKING_UDIR}/bin/*.dll ${DIST_UDIR}/bin
+    cp -a ${_AQBANKING_UDIR}/lib/aqbanking ${DIST_UDIR}/lib
+    cp -a ${_AQBANKING_UDIR}/share/aqbanking ${DIST_UDIR}/share
+    cp -a ${_AQBANKING_UDIR}/share/aqhbci ${DIST_UDIR}/share
+}
+
 function dist_gnucash() {
     setup GnuCash
     mkdir -p $DIST_UDIR/bin
@@ -134,10 +167,10 @@
     mkdir -p $DIST_UDIR/etc/gconf/schemas
     cp -a $_INSTALL_UDIR/etc/gconf/schemas/* $DIST_UDIR/etc/gconf/schemas
     mkdir -p $DIST_UDIR/lib
-    cp -a $_INSTALL_UDIR/lib/{bin,locale} $DIST_UDIR/lib
-    cp -a $_INSTALL_UDIR/lib/lib*.{dll,la} $DIST_UDIR/lib
+    cp -a $_INSTALL_UDIR/lib/locale $DIST_UDIR/lib
+    cp -a $_INSTALL_UDIR/lib/lib*.la $DIST_UDIR/lib
     mkdir -p $DIST_UDIR/lib/gnucash
-    cp -a $_INSTALL_UDIR/lib/gnucash/lib*.{dll,la} $DIST_UDIR/lib/gnucash
+    cp -a $_INSTALL_UDIR/lib/gnucash/lib*.dll $DIST_UDIR/lib/gnucash
     cp -a $_INSTALL_UDIR/libexec $DIST_UDIR
     mkdir -p $DIST_UDIR/share
     cp -a $_INSTALL_UDIR/share/{gnucash,pixmaps,xml} $DIST_UDIR/share
@@ -152,15 +185,27 @@
             --install-schema-file $file >/dev/null
         echo "done"
     done
+    gconftool-2 --shutdown
 
+    exetype $DIST_UDIR/libexec/gconfd-2.exe windows
+
     # Strip redirections in distributed libtool .la files
-    for file in `find $DIST_UDIR/lib -name '*.la'`; do
+    for file in $DIST_UDIR/lib/*.la; do
         cat $file | sed 's,^libdir=,#libdir=,' > $file.new
         mv $file.new $file
     done
 
-    echo "You can now run the Inno Setup Compiler for creating the setup.exe:"
-    echo ${_INNO_UDIR}/iscc ${_GNUCASH_UDIR}/gnucash.iss
+    echo "Now running the Inno Setup Compiler for creating the setup.exe"
+    ${_INNO_UDIR}/iscc ${_GNUCASH_UDIR}/gnucash.iss
+
+    # And changing output filename
+    SVN_REV=`grep GNUCASH_SVN_REV ${_BUILD_UDIR}/src/gnome-utils/gnc-svninfo.h | cut -d" " -f3 | cut -d\" -f2 `
+    SETUP_FILENAME="gnucash-2.0.99-svn-r${SVN_REV}-setup.exe"
+    qpushd ${_GNUCASH_UDIR}
+	mv gnucash-2.0.99-setup.exe ${SETUP_FILENAME}
+    qpopd
+    echo "Final resulting Setup program is:"
+    echo ${_GNUCASH_UDIR}/${SETUP_FILENAME}
 }
 
 prepare
@@ -172,6 +217,9 @@
 dist_gnome
 dist_libgsf
 dist_goffice
+dist_libofx
+dist_gwenhywfar
+dist_aqbanking
 dist_gnucash
 finish
 qpopd

Copied: gnucash/branches/remove-group2/packaging/win32/exetype.pl (from rev 15563, gnucash/trunk/packaging/win32/exetype.pl)

Modified: gnucash/branches/remove-group2/packaging/win32/functions
===================================================================
--- gnucash/branches/remove-group2/packaging/win32/functions	2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/packaging/win32/functions	2007-02-11 19:54:51 UTC (rev 15565)
@@ -79,6 +79,9 @@
     fi
 }
 
+function assert_one_dir() {
+    [ -d $@ ] || die "Detected multiple directories where only one was expected; please delete all but the latest one: $@"
+}
 
 ### Local Variables: ***
 ### mode: shell-script ***

Modified: gnucash/branches/remove-group2/packaging/win32/gnucash.iss.in
===================================================================
--- gnucash/branches/remove-group2/packaging/win32/gnucash.iss.in	2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/packaging/win32/gnucash.iss.in	2007-02-11 19:54:51 UTC (rev 15565)
@@ -76,12 +76,37 @@
 ; Define the registry keys Setup should create (HKCU = HKEY_CURRENT_USER)
 ; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 [Registry]
-Root: HKCU; Subkey: "Software\GnuCash\Paths"; ValueType: string; ValueName: "prefix"; ValueData: "{app}"
-Root: HKCU; Subkey: "Software\GnuCash\Paths"; ValueType: string; ValueName: "libdir"; ValueData: "{app}\lib"
-Root: HKCU; Subkey: "Software\GnuCash\Paths"; ValueType: string; ValueName: "pkglibdir"; ValueData: "{app}\lib\@PACKAGE@"
-Root: HKCU; Subkey: "Software\GnuCash\Paths"; ValueType: string; ValueName: "sysconfdir"; ValueData: "{app}\etc"
-Root: HKCU; Subkey: "Software\GnuCash\Paths"; ValueType: string; ValueName: "localedir"; ValueData: "{app}\share\locale"
+Root: HKCU; Subkey: "Software\GnuCash"; ValueType: none; Flags: uninsdeletekeyifempty
+Root: HKCU; Subkey: "Software\GnuCash\Paths"; ValueType: none; Flags: uninsdeletekeyifempty
+Root: HKCU; Subkey: "Software\GnuCash\Paths"; ValueType: string; ValueName: "prefix"; ValueData: "{app}"; Flags: uninsdeletevalue
+Root: HKCU; Subkey: "Software\GnuCash\Paths"; ValueType: string; ValueName: "libdir"; ValueData: "{app}\lib"; Flags: uninsdeletevalue
+Root: HKCU; Subkey: "Software\GnuCash\Paths"; ValueType: string; ValueName: "pkglibdir"; ValueData: "{app}\lib\@PACKAGE@"; Flags: uninsdeletevalue
+Root: HKCU; Subkey: "Software\GnuCash\Paths"; ValueType: string; ValueName: "sysconfdir"; ValueData: "{app}\etc"; Flags: uninsdeletevalue
+Root: HKCU; Subkey: "Software\GnuCash\Paths"; ValueType: string; ValueName: "localedir"; ValueData: "{app}\share\locale"; Flags: uninsdeletevalue
 
+; Additionally, we have to install the paths for gwenhywfar
+Root: HKCU; Subkey: "Software\Gwenhywfar"; ValueType: none; Flags: uninsdeletekeyifempty
+Root: HKCU; Subkey: "Software\Gwenhywfar\Paths"; ValueType: none; Flags: uninsdeletekeyifempty
+Root: HKCU; Subkey: "Software\Gwenhywfar\Paths"; ValueType: string; ValueName: "prefix"; ValueData: "{app}"; Flags: uninsdeletevalue
+Root: HKCU; Subkey: "Software\Gwenhywfar\Paths"; ValueType: string; ValueName: "libdir"; ValueData: "{app}\lib"; Flags: uninsdeletevalue
+Root: HKCU; Subkey: "Software\Gwenhywfar\Paths"; ValueType: string; ValueName: "plugindir"; ValueData: "{app}\lib\gwenhywfar\plugins\38"; Flags: uninsdeletevalue
+Root: HKCU; Subkey: "Software\Gwenhywfar\Paths"; ValueType: string; ValueName: "sysconfdir"; ValueData: "{app}\etc"; Flags: uninsdeletevalue
+Root: HKCU; Subkey: "Software\Gwenhywfar\Paths"; ValueType: string; ValueName: "localedir"; ValueData: "{app}\share\locale"; Flags: uninsdeletevalue
+
+; And we also need some registry keys for aqbanking
+Root: HKCU; Subkey: "Software\Aqbanking"; ValueType: none; Flags: uninsdeletekeyifempty
+Root: HKCU; Subkey: "Software\Aqbanking\Paths"; ValueType: none; Flags: uninsdeletekeyifempty
+Root: HKCU; Subkey: "Software\Aqbanking\Paths"; ValueType: string; ValueName: "providerdir"; ValueData: "{app}\lib\aqbanking\plugins\16\providers"; Flags: uninsdeletevalue
+Root: HKCU; Subkey: "Software\Aqbanking\Paths"; ValueType: string; ValueName: "bankinfodir"; ValueData: "{app}\lib\aqbanking\plugins\16\bankinfo"; Flags: uninsdeletevalue
+Root: HKCU; Subkey: "Software\Aqbanking\Paths"; ValueType: string; ValueName: "importerdir"; ValueData: "{app}\lib\aqbanking\plugins\16\imexporters"; Flags: uninsdeletevalue
+Root: HKCU; Subkey: "Software\Aqbanking\Paths"; ValueType: string; ValueName: "pkgdatadir"; ValueData: "{app}\share\aqbanking"; Flags: uninsdeletevalue
+Root: HKCU; Subkey: "Software\Aqbanking\Paths"; ValueType: string; ValueName: "sysconfdir"; ValueData: "{app}\etc"; Flags: uninsdeletevalue
+
+; And even one for aqhbci
+Root: HKCU; Subkey: "Software\AqHbci"; ValueType: none; Flags: uninsdeletekeyifempty
+Root: HKCU; Subkey: "Software\AqHbci\Paths"; ValueType: none; Flags: uninsdeletekeyifempty
+Root: HKCU; Subkey: "Software\AqHbci\Paths"; ValueType: string; ValueName: "xmldatadir"; ValueData: "{app}\share\aqhbci\xml"; Flags: uninsdeletevalue
+
 ; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ; Delete the created config script on uninstall
 ; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -89,6 +114,7 @@
 Type: files; Name: "{app}\bin\gnucash.bat"
 Type: files; Name: "{app}\bin\guile.bat"
 Type: files; Name: "{app}\share\guile\1.6\slibcat"
+Type: filesandordirs; Name: "{app}\share\guile"
 Type: filesandordirs; Name: "{app}\etc\gconf"
 Type: dirifempty; Name: "{app}\etc"
 
@@ -125,7 +151,7 @@
 
   { Create the gnucash.bat file; #10 is the linefeed character and #13 CR }
   FileName := appdir + '\bin\gnucash.bat' ;
-  FileString := 'set PATH=' + appdir + '\bin;' + libdir + '\bin;%PATH%'#13#10 ;
+  FileString := 'set PATH=' + appdir + '\bin;' + libdir + ';' + libdir + '\gnucash;%PATH%'#13#10 ;
 
   FileString := FileString + 'set GUILE_WARN_DEPRECATED=no'#13#10 ;
   FileString := FileString + 'set GNC_MODULE_PATH=' + pkglibdir + ''#13#10 ;

Modified: gnucash/branches/remove-group2/packaging/win32/install.sh
===================================================================
--- gnucash/branches/remove-group2/packaging/win32/install.sh	2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/packaging/win32/install.sh	2007-02-11 19:54:51 UTC (rev 15565)
@@ -37,14 +37,14 @@
     level1=$(basename ${_REPOS_UDIR})
     level2=$(basename $(dirname ${_REPOS_UDIR}))"/"$level1
     for mydir in $level0 $level1 $level2; do
-        if [ -f $mydir/gnucash.m4 ]; then
+        if [ -f $mydir/make-gnucash-patch.in ]; then
             die "Do not save install.sh in the repository or one its parent directories"
         fi
     done
-    # Remove old empty install-sh files
-    if [ -f ${_REPOS_UDIR}/install-sh -a "$(cat ${_REPOS_UDIR}/install-sh &>/dev/null | wc -l)" -eq 0 ]; then
-        rm -f ${_REPOS_UDIR}/install-sh
-    fi
+#     # Remove old empty install-sh files
+#     if [ -f ${_REPOS_UDIR}/install-sh -a "$(cat ${_REPOS_UDIR}/install-sh &>/dev/null | wc -l)" -eq 0 ]; then
+#         rm -f ${_REPOS_UDIR}/install-sh
+#     fi
     # Partially remove RegEx-GNU if installed
     _REGEX_UDIR=`unix_path $REGEX_DIR`
     if [ -f ${_REGEX_UDIR}/contrib/regex-0.12-GnuWin32.README ]; then
@@ -59,20 +59,24 @@
     TMP_UDIR=`unix_path $TMP_DIR`
     mkdir -p $TMP_UDIR
     mkdir -p $DOWNLOAD_UDIR
+
+    if [ "$DISABLE_OPTIMIZATIONS" = "yes" ]; then
+        export CFLAGS="$CFLAGS -g -O0"
+    fi
 }
 
 function inst_wget() {
     setup Wget
     _WGET_UDIR=`unix_path $WGET_DIR`
+    add_to_env $_WGET_UDIR/bin PATH
     if quiet $_WGET_UDIR/wget --version || quiet wget --version
     then
         echo "already installed.  skipping."
     else
-        mkdir -p $_WGET_UDIR
-        tar -xjpf $DOWNLOAD_UDIR/wget*.tar.bz2 -C $WGET_DIR
-        cp $_WGET_UDIR/*/*/wget.exe $WGET_DIR
+        mkdir -p $_WGET_UDIR/bin
+        tar -xjpf $DOWNLOAD_UDIR/wget*.tar.bz2 -C $_WGET_UDIR
+        cp $_WGET_UDIR/*/*/wget.exe $_WGET_UDIR/bin
     fi
-    add_to_env $_WGET_UDIR PATH
     quiet wget --version || die "wget unavailable"
 }
 
@@ -84,8 +88,7 @@
         echo "msys dtk already installed.  skipping."
     else
         smart_wget $DTK_URL $DOWNLOAD_DIR
-        echo "!!! When asked for an installation path, specify $MSYS_DIR !!!"
-        $LAST_FILE
+        $LAST_FILE //SP- //SILENT //DIR="$MSYS_DIR"
         for file in \
 	    /bin/{aclocal*,auto*,ifnames,libtool*,guile*} \
 	    /share/{aclocal,aclocal-1.7,autoconf,autogen,automake-1.7,guile,libtool}
@@ -118,21 +121,21 @@
 function inst_unzip() {
     setup Unzip
     _UNZIP_UDIR=`unix_path $UNZIP_DIR`
+    add_to_env $_UNZIP_UDIR/bin PATH
     if quiet $_UNZIP_UDIR/bin/unzip --help || quiet unzip --help
     then
         echo "unzip already installed.  skipping."
     else
         smart_wget $UNZIP_URL $DOWNLOAD_DIR
-        echo "!!! When asked for an installation path, specify $UNZIP_DIR !!!"
-        $LAST_FILE
+        $LAST_FILE //SP- //SILENT //DIR="$UNZIP_DIR"
     fi
-    add_to_env $_UNZIP_UDIR/bin PATH
     quiet unzip --help || die "unzip unavailable"
 }
 
 function inst_regex() {
     setup RegEx
     _REGEX_UDIR=`unix_path $REGEX_DIR`
+    add_to_env -lregex REGEX_LDFLAGS
     add_to_env -I$_REGEX_UDIR/include REGEX_CPPFLAGS
     add_to_env -L$_REGEX_UDIR/lib REGEX_LDFLAGS
     add_to_env $_REGEX_UDIR/bin PATH
@@ -141,10 +144,10 @@
         echo "regex already installed.  skipping."
     else
         mkdir -p $_REGEX_UDIR
-        wget_unpacked $REGEX_BIN_URL $DOWNLOAD_DIR $REGEX_DIR
-        wget_unpacked $REGEX_LIB_URL $DOWNLOAD_DIR $REGEX_DIR
+        wget_unpacked $REGEX_URL $DOWNLOAD_DIR $REGEX_DIR
+        wget_unpacked $REGEX_DEV_URL $DOWNLOAD_DIR $REGEX_DIR
     fi
-    quiet ${LD} $REGEX_LDFLAGS -lregex -o $TMP_UDIR/ofile || die "regex not installed correctly"
+    quiet ${LD} $REGEX_LDFLAGS -o $TMP_UDIR/ofile || die "regex not installed correctly"
 }
 
 function inst_readline() {
@@ -164,20 +167,6 @@
     quiet ${LD} $READLINE_LDFLAGS -lreadline -o $TMP_UDIR/ofile || die "readline not installed correctly"
 }
 
-function inst_indent() {
-    setup Indent
-    _INDENT_UDIR=`unix_path $INDENT_DIR`
-    add_to_env $_INDENT_UDIR/bin PATH
-    if quiet which indent
-    then
-        echo "indent already installed.  skipping."
-    else
-        mkdir -p $_INDENT_UDIR
-        wget_unpacked $INDENT_BIN_URL $DOWNLOAD_DIR $INDENT_DIR
-    fi
-    quiet which indent || die "indent unavailable"
-}
-
 function inst_active_perl() {
     setup ActivePerl \(intltool\)
     _ACTIVE_PERL_WFSDIR=`win_fs_path $ACTIVE_PERL_DIR`
@@ -208,12 +197,14 @@
     else
         wget_unpacked $AUTOCONF_URL $DOWNLOAD_DIR $TMP_DIR
         wget_unpacked $AUTOMAKE_URL $DOWNLOAD_DIR $TMP_DIR
+        assert_one_dir $TMP_UDIR/autoconf-*
         qpushd $TMP_UDIR/autoconf-*
             echo "building autoconf..."
             ./configure --prefix=$_AUTOTOOLS_UDIR
             make
             make install
         qpopd
+        assert_one_dir $TMP_UDIR/automake-*
         qpushd $TMP_UDIR/automake-*
             echo "building automake..."
             ./configure --prefix=$_AUTOTOOLS_UDIR
@@ -226,9 +217,10 @@
         echo "libtool/libtoolize already installed.  skipping."
     else
         wget_unpacked $LIBTOOL_URL $DOWNLOAD_DIR $TMP_DIR
+        assert_one_dir $TMP_UDIR/libtool-*
         qpushd $TMP_UDIR/libtool-*
             echo "building libtool..."
-            ./configure ${HOST_XCOMPILE} --prefix=$_AUTOTOOLS_UDIR
+            ./configure ${HOST_XCOMPILE} --prefix=$_AUTOTOOLS_UDIR --disable-static
             make
             make install
         qpopd
@@ -258,6 +250,7 @@
         smart_wget $SLIB_URL $DOWNLOAD_DIR
         _SLIB_BALL=$LAST_FILE
         tar -xzpf $_GUILE_BALL -C $TMP_UDIR
+        assert_one_dir $TMP_UDIR/guile-*
         qpushd $TMP_UDIR/guile-*
             qpushd ice-9
                 cp boot-9.scm boot-9.scm.bak
@@ -275,6 +268,7 @@
                 touch upstream/ltdl.c.diff
             qpopd
             ./configure ${HOST_XCOMPILE} \
+                --disable-static \
 	        --disable-elisp \
 	        --disable-networking \
 	        --disable-dependency-tracking \
@@ -283,7 +277,7 @@
 	        -C --prefix=$_GUILE_WFSDIR \
 	        ac_cv_func_regcomp_rx=yes \
 	        CPPFLAGS="${READLINE_CPPFLAGS} ${REGEX_CPPFLAGS}" \
-	        LDFLAGS="-lwsock32 ${READLINE_LDFLAGS} ${REGEX_LDFLAGS} -lregex"
+	        LDFLAGS="-lwsock32 ${READLINE_LDFLAGS} ${REGEX_LDFLAGS}"
 	    cp config.status config.status.bak
 	    cat config.status.bak | sed 's# fileblocks[$.A-Za-z]*,#,#' > config.status
 	    ./config.status
@@ -291,7 +285,7 @@
 	      cp Makefile Makefile.bak
 	      cat Makefile.bak | sed '/-bindir-/s,:,^,g' > Makefile
 	    qpopd
-	    make LDFLAGS="-lwsock32 ${READLINE_LDFLAGS} ${REGEX_LDFLAGS} -lregex -no-undefined -avoid-version"
+	    make LDFLAGS="-lwsock32 ${READLINE_LDFLAGS} ${REGEX_LDFLAGS} -no-undefined -avoid-version"
 	    make install
 	qpopd
 	_SLIB_DIR=$_GUILE_UDIR/share/guile/1.*
@@ -318,15 +312,24 @@
 
 function inst_openssl() {
     setup OpenSSL
-    if [ -f $WINDIR\\system32\\libssl32.dll ]
-    then
+    _OPENSSL_UDIR=`unix_path $OPENSSL_DIR`
+    add_to_env $_OPENSSL_UDIR/bin PATH
+    # Make sure the files of Win32OpenSSL-0_9_8d are really gone!
+    if test -f $_OPENSSL_UDIR/unins000.exe ; then
+	die "Wrong version of OpenSSL installed! Run $_OPENSSL_UDIR/unins000.exe and start install.sh again."
+    fi
+    if [ -f $WINDIR\\system32\\libssl32.dll -o -f $WINDIR\\system32\\libeay32.dll ] ; then
+	die "You have uninstalled the Win32OpenSSL-0_9_8d version of OpenSSL, but its DLLs libssl32.dll, libeay32.dll, and ssleay32.dll are still existing in $WINDIR\\system32. You have to delete (or rename) them manually. However, if you know these DLLs are needed by some other package, please contact the gnucash authors so that we can adapt this script."
+    fi
+
+    if test -f ${_OPENSSL_UDIR}/lib/libssl.dll.a ; then
         echo "openssl already installed.  skipping."
     else
-        smart_wget $OPENSSL_URL $DOWNLOAD_DIR
-	echo "!!! When asked for an installation path, specify $OPENSSL_DIR !!!"
-        $LAST_FILE
+	mkdir -p ${_OPENSSL_UDIR}
+	wget_unpacked $OPENSSL_BIN_URL $DOWNLOAD_DIR $OPENSSL_DIR
+	wget_unpacked $OPENSSL_LIB_URL $DOWNLOAD_DIR $OPENSSL_DIR
     fi
-    [ -f $WINDIR\\system32\\libssl32.dll ] || die "openssl not installed correctly"
+    test -f ${_OPENSSL_UDIR}/lib/libssl.dll.a || die "openssl not installed correctly"
 }
 
 function inst_pexports() {
@@ -339,19 +342,33 @@
     else
         wget_unpacked $PEXPORTS_URL $DOWNLOAD_DIR $PEXPORTS_DIR
         qpushd $PEXPORTS_DIR
-	    mv pexports-* mydir
-	    mv mydir/* .
-	    rmdir mydir
+	    mkdir -p $_PEXPORTS_UDIR/bin
+	    cp pexports-*/bin/* $_PEXPORTS_UDIR/bin
 	    if test x$cross_compile = xyes ; then
-		cd src
+		cd pexports-*/src
 		make
-		cp pexports.exe ../bin/pexports
+		cp pexports.exe ../../bin/pexports
 	    fi
         qpopd
     fi
     quiet which pexports || die "pexports unavailable"
 }
 
+function inst_exetype() {
+    setup exetype
+    _EXETYPE_UDIR=`unix_path $EXETYPE_DIR`
+    add_to_env $_EXETYPE_UDIR/bin PATH
+    if quiet which exetype
+    then
+        echo "exetype already installed.  skipping."
+    else
+        mkdir -p $_EXETYPE_UDIR/bin
+        cp $EXETYPE_SCRIPT $_EXETYPE_UDIR/bin/exetype
+    fi
+    quiet which exetype || die "exetype unavailable"
+}
+
+
 function inst_libxml2() {
     setup LibXML2
     _LIBXML2_UDIR=`unix_path $LIBXML2_DIR`
@@ -464,6 +481,10 @@
                     mv libz.dll.a ../lib
                 qpopd
             fi
+            if [ ! -f libexec/gconfd-2.console.exe ]; then
+                cp libexec/gconfd-2.exe libexec/gconfd-2.console.exe
+                exetype libexec/gconfd-2.exe windows
+            fi
             # work around a bug in msys bash, adding 0x01 smilies
             cat > bin/pkg-config-msys.sh <<EOF
 #!/bin/sh
@@ -475,20 +496,6 @@
 fi
 \${PKG_CONFIG} "\$@" | tr -d \\\\r && \$res
 EOF
-            _FREETYPE_VERSION=`echo $FREETYPE_DEV_URL | sed 's#.*freetype-\(.*\)-lib.zip#\1#'`
-            cat > lib/pkgconfig/freetype2.pc <<EOF
-prefix=/ignore
-exec_prefix=\${prefix}
-libdir=\${exec_prefix}/lib
-includedir=\${prefix}/include
-
-Name: FreeType 2
-Description: A free, high-quality, and portable font engine.
-Version: $_FREETYPE_VERSION
-Requires:
-Libs: -L\${libdir} -lfreetype -lz
-Cflags: -I\${includedir}/freetype2
-EOF
         qpopd
     fi
     if test x$cross_compile = xyes ; then
@@ -537,9 +544,11 @@
 	echo "libgsf already installed.  skipping."
     else
 	wget_unpacked $LIBGSF_URL $DOWNLOAD_DIR $TMP_DIR
+	assert_one_dir $TMP_UDIR/libgsf-*
 	qpushd $TMP_UDIR/libgsf-*
 	    ./configure ${HOST_XCOMPILE} \
 	        --prefix=$_LIBGSF_UDIR \
+                --disable-static \
 	        --without-python \
 	        CPPFLAGS="${GNOME_CPPFLAGS}" \
 	        LDFLAGS="${GNOME_LDFLAGS}"
@@ -553,6 +562,7 @@
 function inst_goffice() {
     setup GOffice
     _GOFFICE_UDIR=`unix_path $GOFFICE_DIR`
+    add_to_env $_GOFFICE_UDIR/bin PATH
     add_to_env $_GOFFICE_UDIR/lib/pkgconfig PKG_CONFIG_PATH
     if quiet ${PKG_CONFIG} --exists libgoffice-0.3
     then
@@ -561,6 +571,7 @@
 	rm -rf $TMP_UDIR/goffice-*
 	wget_unpacked $GOFFICE_URL $DOWNLOAD_DIR $TMP_DIR
 	mydir=`pwd`
+	assert_one_dir $TMP_UDIR/goffice-*
 	qpushd $TMP_UDIR/goffice-*
 	    [ -n "$GOFFICE_PATCH" -a -f "$GOFFICE_PATCH" ] && \
 		patch -p1 < $GOFFICE_PATCH
@@ -589,6 +600,7 @@
         echo "glade already installed.  skipping."
     else
         wget_unpacked $GLADE_URL $DOWNLOAD_DIR $TMP_DIR
+        assert_one_dir $TMP_UDIR/glade3-*
         qpushd $TMP_UDIR/glade3-*
             ./configure ${HOST_XCOMPILE} --prefix=$_GLADE_WFSDIR
             make
@@ -607,13 +619,165 @@
         echo "Inno Setup Compiler already installed.  Skipping."
     else
         smart_wget $INNO_URL $DOWNLOAD_DIR
-        echo "!!! When asked for the installation path, specify $INNO_DIR !!!"
-	echo "!!! Also, you can deselect all optional components."
-        $LAST_FILE
+        $LAST_FILE //SP- //SILENT //DIR="$INNO_DIR"
     fi
     quiet which iscc || die "iscc (Inno Setup Compiler) not installed correctly"
 }
 
+function inst_opensp() {
+    setup Opensp
+    _OPENSP_UDIR=`unix_path ${OPENSP_DIR}`
+    add_to_env ${_OPENSP_UDIR}/bin PATH
+    if test -f ${_OPENSP_UDIR}/bin/libosp-5.dll
+    then
+	echo "Opensp already installed. Skipping."
+    else
+	wget_unpacked $OPENSP_URL $DOWNLOAD_DIR $TMP_DIR
+	assert_one_dir $TMP_UDIR/OpenSP-*
+	qpushd $TMP_UDIR/OpenSP-*
+	    [ -n "$OPENSP_PATCH" -a -f "$OPENSP_PATCH" ] && \
+		patch -p0 < $OPENSP_PATCH
+	    automake lib/Makefile
+	    ./configure \
+	        --prefix=${_OPENSP_UDIR} \
+		--disable-doc-build --disable-static
+	    # On many windows machines, none of the programs will
+	    # build, but we only need the library, so ignore the rest.
+	    make all-am
+	    make -C lib
+	    make -i
+	    make -i install
+	qpopd
+    fi
+    test -f ${_OPENSP_UDIR}/bin/libosp-5.dll || die "Opensp not installed correctly"
+}
+
+function inst_libofx() {
+    setup Libofx
+    _LIBOFX_UDIR=`unix_path ${LIBOFX_DIR}`
+    add_to_env ${_LIBOFX_UDIR}/bin PATH
+    add_to_env ${_LIBOFX_UDIR}/lib/pkgconfig PKG_CONFIG_PATH
+    if quiet ${PKG_CONFIG} --exists libofx
+    then
+	echo "Libofx already installed. Skipping."
+    else
+	wget_unpacked $LIBOFX_URL $DOWNLOAD_DIR $TMP_DIR
+	assert_one_dir $TMP_UDIR/libofx-*
+	qpushd $TMP_UDIR/libofx-*
+	    [ -n "$LIBOFX_PATCH" -a -f "$LIBOFX_PATCH" ] && \
+		patch -p1 < $LIBOFX_PATCH
+	    ./configure \
+	        --prefix=${_LIBOFX_UDIR} \
+		--with-opensp-includes=${_OPENSP_UDIR}/include/OpenSP \
+		--with-opensp-libs=${_OPENSP_UDIR}/lib \
+		CPPFLAGS="-DOS_WIN32" \
+		--disable-static
+	    make LDFLAGS="${LDFLAGS} -no-undefined"
+	    make install
+	qpopd
+    fi
+    quiet ${PKG_CONFIG} --exists libofx || die "Libofx not installed correctly"
+}
+
+function inst_gwenhywfar() {
+    setup Gwenhywfar
+    _GWENHYWFAR_UDIR=`unix_path ${GWENHYWFAR_DIR}`
+    add_to_env ${_GWENHYWFAR_UDIR}/bin PATH
+    add_to_env ${_GWENHYWFAR_UDIR}/lib/pkgconfig PKG_CONFIG_PATH
+    add_to_env "-I $_GWENHYWFAR_UDIR/share/aclocal" ACLOCAL_FLAGS
+    if quiet ${PKG_CONFIG} --exists gwenhywfar
+    then
+	echo "Gwenhywfar already installed. Skipping."
+    else
+	wget_unpacked $GWENHYWFAR_URL $DOWNLOAD_DIR $TMP_DIR
+	assert_one_dir $TMP_UDIR/gwenhywfar-*
+	qpushd $TMP_UDIR/gwenhywfar-*
+	    ./configure \
+		--with-openssl-includes=$_OPENSSL_UDIR/include \
+		ssl_libraries="-L${_OPENSSL_UDIR}/lib" \
+		ssl_lib="-lcrypto -lssl" \
+	        --prefix=$_GWENHYWFAR_UDIR \
+	        CPPFLAGS="${REGEX_CPPFLAGS}" \
+		LDFLAGS="${REGEX_LDFLAGS}"
+	    make
+	    make check
+	    make install
+	qpopd
+    fi
+    ${PKG_CONFIG} --exists gwenhywfar || die "Gwenhywfar not installed correctly"
+}
+
+function inst_qt4() {
+    # This section is not a full install, but the .la creation is
+    # already useful in itself and that's why it has already been
+    # added.
+
+    _QTDIR=`unix_path ${QTDIR}`
+    # This section creates .la files for the Qt-4 DLLs so that
+    # libtool correctly links to the DLLs.
+    if test ! -f ${_QTDIR}/lib/libQtCore4.la ; then
+	qpushd ${_QTDIR}/lib
+	    for A in lib*.a; do
+		LIBBASENAME=`basename ${A} .a`
+		OUTFILE="${LIBBASENAME}.la"
+		BASENAME=`echo ${LIBBASENAME} | sed -e"s/lib//" `
+		DLLNAME="${BASENAME}.dll"
+
+		# Create la file
+		echo "# Generated by foo bar libtool" > $OUTFILE
+		echo "dlname='../bin/${DLLNAME}'" >> $OUTFILE
+		echo "library_names='${DLLNAME}'" >> $OUTFILE
+		echo "libdir='${_QTDIR}/bin'" >> $OUTFILE
+	    done
+	qpopd
+    fi
+}
+
+function inst_aqbanking() {
+    setup AqBanking
+    _AQBANKING_UDIR=`unix_path ${AQBANKING_DIR}`
+    add_to_env ${_AQBANKING_UDIR}/bin PATH
+    add_to_env ${_AQBANKING_UDIR}/lib/pkgconfig PKG_CONFIG_PATH
+    add_to_env "-I $_AQBANKING_UDIR/share/aclocal" ACLOCAL_FLAGS
+    if quiet ${PKG_CONFIG} --exists aqbanking
+    then
+	echo "AqBanking already installed. Skipping."
+    else
+	wget_unpacked $AQBANKING_URL $DOWNLOAD_DIR $TMP_DIR
+	assert_one_dir $TMP_UDIR/aqbanking-*
+	qpushd $TMP_UDIR/aqbanking-*
+	    if test x$aqbanking_with_qt = xyes; then
+		inst_qt4
+		_QTDIR=`unix_path ${QTDIR}`
+		_AQ_LDFLAGS="-L${_LIBOFX_UDIR}/lib"
+		./configure \
+		    --with-gwen-dir=${_GWENHYWFAR_UDIR} \
+		    --with-frontends="cbanking qbanking" \
+		    --with-backends="aqdtaus aqhbci aqofxconnect" \
+		    CPPFLAGS="-I${_LIBOFX_UDIR}/include" \
+		    LDFLAGS="${_AQ_LDFLAGS}" \
+		    qt3_libs="-L${_QTDIR}/lib -L${_QTDIR}/bin -lQtCore4 -lQtGui4 -lQt3Support4" \
+		    qt3_includes="-I${_QTDIR}/include -I${_QTDIR}/include/Qt -I${_QTDIR}/include/QtCore -I${_QTDIR}/include/QtGui -I${_QTDIR}/include/Qt3Support" \
+		    --prefix=${_AQBANKING_UDIR}
+		make qt4-port
+		make clean
+	    else
+		_AQ_LDFLAGS="-L${_LIBOFX_UDIR}/lib"
+		./configure \
+		    --with-gwen-dir=${_GWENHYWFAR_UDIR} \
+		    --with-frontends="cbanking" \
+		    --with-backends="aqdtaus aqhbci aqofxconnect" \
+		    CPPFLAGS="-I${_LIBOFX_UDIR}/include" \
+		    LDFLAGS="${_AQ_LDFLAGS}" \
+	            --prefix=${_AQBANKING_UDIR}
+	    fi
+	    make LDFLAGS="${_AQ_LDFLAGS} -no-undefined"
+	    make install
+	qpopd
+    fi
+    ${PKG_CONFIG} --exists aqbanking || die "AqBanking not installed correctly"
+}
+
 function inst_svn() {
     setup Subversion
     _SVN_UDIR=`unix_path $SVN_DIR`
@@ -623,8 +787,7 @@
         echo "subversion already installed.  skipping."
     else
         smart_wget $SVN_URL $DOWNLOAD_DIR
-        echo "!!! When asked for an installation path, specify $SVN_DIR !!!"
-        $LAST_FILE
+        $LAST_FILE //SP- //SILENT //DIR="$SVN_DIR"
     fi
 }
 
@@ -648,8 +811,16 @@
     _INSTALL_WFSDIR=`win_fs_path $INSTALL_DIR`
     _INSTALL_UDIR=`unix_path $INSTALL_DIR`
     _BUILD_UDIR=`unix_path $BUILD_DIR`
+    _REL_REPOS_UDIR=`unix_path $REL_REPOS_DIR`
     mkdir -p $_BUILD_UDIR
+    add_to_env $_INSTALL_UDIR/bin PATH
 
+    # When aqbanking is enabled, uncomment this:
+    AQBANKING_OPTIONS="--enable-hbci --with-aqbanking-dir=${_AQBANKING_UDIR}"
+    AQBANKING_UPATH="${_OPENSSL_UDIR}/bin:${_GWENHYWFAR_UDIR}/bin:${_AQBANKING_UDIR}/bin"
+    AQBANKING_PATH="${OPENSSL_DIR}\\bin;${GWENHYWFAR_DIR}\\bin;${AQBANKING_DIR}\\bin"
+    LIBOFX_OPTIONS="--enable-ofx --with-ofx-prefix=${_LIBOFX_UDIR}"
+
     qpushd $REPOS_DIR
         if test "x$cross_compile" = xyes ; then
             # Set these variables manually because of cross-compiling
@@ -664,10 +835,12 @@
     qpopd
 
     qpushd $BUILD_DIR
-        $_REPOS_UDIR/configure ${HOST_XCOMPILE} ${TARGET_XCOMPILE} \
+        $_REL_REPOS_UDIR/configure ${HOST_XCOMPILE} ${TARGET_XCOMPILE} \
             --prefix=$_INSTALL_WFSDIR \
             --enable-debug \
             --enable-schemas-install=no \
+	    ${LIBOFX_OPTIONS} \
+	    ${AQBANKING_OPTIONS} \
             --enable-binreloc \
             CPPFLAGS="${AUTOTOOLS_CPPFLAGS} ${REGEX_CPPFLAGS} ${GNOME_CPPFLAGS} ${GUILE_CPPFLAGS} -D_WIN32" \
             LDFLAGS="${AUTOTOOLS_LDFLAGS} ${REGEX_LDFLAGS} ${GNOME_LDFLAGS} ${GUILE_LDFLAGS}" \
@@ -675,10 +848,6 @@
 
         # Windows DLLs don't need relinking
         grep -v "need_relink=yes" libtool   > libtool.new   ; mv libtool.new   libtool
-        # Exclude (for now) the test subdirectories from the build
-        # because executable linking is so painfully slow on mingw
-        perl -pi.instbak -e's#^(SUBDIRS.* )test( .*)?$#\1\2#' `find src -name Makefile`
-        find src -name Makefile.instbak -exec rm {} \;
 
         make
 
@@ -686,17 +855,25 @@
         qpushd src/bin
             rm gnucash
             make PATH_SEPARATOR=";" \
-                bindir="${_INSTALL_UDIR}/bin:${_INSTALL_UDIR}/lib/bin:${_GOFFICE_UDIR}/bin:${_LIBGSF_UDIR}/bin:${_GNOME_UDIR}/bin:${_LIBXML2_UDIR}/bin:${_GUILE_UDIR}/bin:${_REGEX_UDIR}/bin:${_AUTOTOOLS_UDIR}/bin" \
+                bindir="${_INSTALL_UDIR}/bin:${_INSTALL_UDIR}/lib:${_INSTALL_UDIR}/lib/gnucash:${_GOFFICE_UDIR}/bin:${_LIBGSF_UDIR}/bin:${_GNOME_UDIR}/bin:${_LIBXML2_UDIR}/bin:${_GUILE_UDIR}/bin:${_REGEX_UDIR}/bin:${_AUTOTOOLS_UDIR}/bin:${AQBANKING_UPATH}" \
                 gnucash
         qpopd
 
         make install
     qpopd
 
-    qpushd $_INSTALL_UDIR/lib/gnucash
-        # Remove the dependency_libs line from the installed .la files
-        # because otherwise loading the modules literally takes hours.
-        for A in *.la; do grep -v dependency_libs $A > tmp ; mv  tmp $A; done
+    qpushd $_INSTALL_UDIR/lib
+        # Move modules that are compiled without -module to lib/gnucash and
+        # correct the 'dlname' in the libtool archives. We do not use these
+        # files to dlopen the modules, so actually this is unneeded.
+        # Also, in all installed .la files, remove the dependency_libs line
+        mv bin/*.dll gnucash || true
+        for A in gnucash/*.la; do
+            sed '/dependency_libs/d;s#../bin/##' $A > tmp ; mv tmp $A
+        done
+        for A in *.la; do
+            sed '/dependency_libs/d' $A > tmp ; mv tmp $A
+        done
     qpopd
 
     qpushd $_INSTALL_UDIR/etc/gconf/schemas
@@ -710,7 +887,7 @@
 
     # Create a startup script that works without the msys shell
     qpushd $_INSTALL_UDIR/bin
-        echo "set PATH=${INSTALL_DIR}\\bin;${INSTALL_DIR}\\lib\\bin;${GOFFICE_DIR}\\bin;${LIBGSF_DIR}\\bin;${GNOME_DIR}\\bin;${LIBXML2_DIR}\\bin;${GUILE_DIR}\\bin;${REGEX_DIR}\\bin;${AUTOTOOLS_DIR}\\bin;%PATH%" > gnucash.bat
+        echo "set PATH=${INSTALL_DIR}\\bin;${INSTALL_DIR}\\lib;${INSTALL_DIR}\\lib\\gnucash;${GOFFICE_DIR}\\bin;${LIBGSF_DIR}\\bin;${GNOME_DIR}\\bin;${LIBXML2_DIR}\\bin;${GUILE_DIR}\\bin;${REGEX_DIR}\\bin;${AUTOTOOLS_DIR}\\bin;${AQBANKING_PATH};%PATH%" > gnucash.bat
         echo "set GUILE_WARN_DEPRECATED=no" >> gnucash.bat
         echo "set GNC_MODULE_PATH=${INSTALL_DIR}\\lib\\gnucash" >> gnucash.bat
         echo "set GUILE_LOAD_PATH=${INSTALL_DIR}\\share\\gnucash\\guile-modules;${INSTALL_DIR}\\share\\gnucash\\scm;%GUILE_LOAD_PATH%" >> gnucash.bat

Copied: gnucash/branches/remove-group2/packaging/win32/libofx-0.8.3-patch.diff (from rev 15563, gnucash/trunk/packaging/win32/libofx-0.8.3-patch.diff)

Copied: gnucash/branches/remove-group2/packaging/win32/opensp-1.5.2-patch.diff (from rev 15563, gnucash/trunk/packaging/win32/opensp-1.5.2-patch.diff)

Modified: gnucash/branches/remove-group2/packaging/win32/reset.sh
===================================================================
--- gnucash/branches/remove-group2/packaging/win32/reset.sh	2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/packaging/win32/reset.sh	2007-02-11 19:54:51 UTC (rev 15565)
@@ -33,7 +33,7 @@
 basedir=`unix_path $GLOBAL_DIR`
 qpushd $basedir
 
-rm -rf regex readline indent guile pexports gnome swig autotools
+rm -rf regex readline guile pexports gnome swig autotools
 rm -rf libgsf goffice glade gnucash tmp
 
 rm -f /etc/profile.d/installer.sh

Modified: gnucash/branches/remove-group2/po/de.po
===================================================================
--- gnucash/branches/remove-group2/po/de.po	2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/po/de.po	2007-02-11 19:54:51 UTC (rev 15565)
@@ -10,8 +10,8 @@
 msgstr ""
 "Project-Id-Version: gnucash-2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-07-04 22:29+0200\n"
-"PO-Revision-Date: 2006-07-04 22:30+0200\n"
+"POT-Creation-Date: 2007-01-28 21:37+0100\n"
+"PO-Revision-Date: 2007-01-29 15:00+0100\n"
 "Last-Translator: Christian Stimming <stimming at tuhh.de>\n"
 "Language-Team: German <de at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -62,83 +62,100 @@
 #. Translators: For the following strings, the single letters
 #. after the colon are abbreviations of the word before the
 #. colon. You should only translate the letter *after* the colon.
-#: ../src/app-utils/gnc-ui-util.c:515
+#: ../src/app-utils/gnc-ui-util.c:508
 msgid "not cleared:n"
 msgstr "not cleared:n"
 
 #. Translators: Please only translate the letter *after* the colon.
-#: ../src/app-utils/gnc-ui-util.c:517
+#: ../src/app-utils/gnc-ui-util.c:510
 msgid "cleared:c"
 msgstr "cleared:b"
 
 #. Translators: Please only translate the letter *after* the colon.
-#: ../src/app-utils/gnc-ui-util.c:519
+#: ../src/app-utils/gnc-ui-util.c:512
 msgid "reconciled:y"
 msgstr "reconciled:j"
 
 #. Translators: Please only translate the letter *after* the colon.
-#: ../src/app-utils/gnc-ui-util.c:521
+#: ../src/app-utils/gnc-ui-util.c:514
 msgid "frozen:f"
 msgstr "frozen:f"
 
 #. Translators: Please only translate the letter *after* the colon.
-#: ../src/app-utils/gnc-ui-util.c:523
+#: ../src/app-utils/gnc-ui-util.c:516
 msgid "void:v"
 msgstr "void:u"
 
-#: ../src/app-utils/gnc-ui-util.c:564 ../src/gnome/dialog-chart-export.c:44
+#: ../src/app-utils/gnc-ui-util.c:557 ../src/gnome/dialog-chart-export.c:44
 msgid "Opening Balances"
 msgstr "Anfangsbestand"
 
+#. src/report/standard-reports/gnucash/report/balance-sheet.scm
 #. src/report/standard-reports/balance-sheet.scm
 #. src/import-export/qif-io-core/qif-invst-xtn-import.scm
 #. src/import-export/qif-import/qif-dialog-utils.scm
-#: ../src/app-utils/gnc-ui-util.c:567
-#: ../src/import-export/qif/qif-defaults.c:60 ../intl-scm/guile-strings.c:1840
-#: ../intl-scm/guile-strings.c:3082 ../intl-scm/guile-strings.c:3084
-#: ../intl-scm/guile-strings.c:3104 ../intl-scm/guile-strings.c:3106
+#. src/import-export/qif-import/qif-import/qif-dialog-utils.scm
+#: ../src/app-utils/gnc-ui-util.c:560
+#: ../src/import-export/qif/qif-defaults.c:60 ../intl-scm/guile-strings.c:3174
+#: ../intl-scm/guile-strings.c:4324 ../intl-scm/guile-strings.c:5750
+#: ../intl-scm/guile-strings.c:5752 ../intl-scm/guile-strings.c:5772
+#: ../intl-scm/guile-strings.c:5774 ../intl-scm/guile-strings.c:5794
+#: ../intl-scm/guile-strings.c:5796
 msgid "Retained Earnings"
 msgstr "Gewinnrücklagen"
 
+#. src/report/standard-reports/gnucash/report/balance-sheet.scm
 #. src/report/standard-reports/balance-sheet.scm
-#: ../src/app-utils/gnc-ui-util.c:640 ../src/engine/Account.c:2141
-#: ../src/register/ledger-core/split-register.c:2029
-#: ../intl-scm/guile-strings.c:1838
+#: ../src/app-utils/gnc-ui-util.c:633 ../src/engine/Account.c:2144
+#: ../src/register/ledger-core/split-register.c:2051
+#: ../intl-scm/guile-strings.c:3172 ../intl-scm/guile-strings.c:4322
 msgid "Equity"
 msgstr "Eigenkapital"
 
-#: ../src/app-utils/gnc-ui-util.c:700 ../src/gnome/dialog-chart-export.c:45
-#: ../src/gnome/druid-hierarchy.c:905 ../src/gnome/glade/account.glade.h:48
-#: ../src/gnome-utils/dialog-account.c:267
+#: ../src/app-utils/gnc-ui-util.c:693 ../src/gnome/dialog-chart-export.c:45
+#: ../src/gnome/druid-hierarchy.c:921 ../src/gnome/glade/account.glade.h:41
+#: ../src/gnome-utils/dialog-account.c:269
 msgid "Opening Balance"
 msgstr "Anfangsbestand"
 
 #. src/report/standard-reports/general-journal.scm
 #. src/report/standard-reports/trial-balance.scm
+#. src/report/standard-reports/gnucash/report/general-journal.scm
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#. src/report/standard-reports/gnucash/report/transaction.scm
+#. src/report/standard-reports/gnucash/report/register.scm
 #. src/report/standard-reports/transaction.scm
 #. src/report/standard-reports/register.scm
-#: ../src/app-utils/guile-util.c:1099
-#: ../src/register/ledger-core/split-register.c:1879
-#: ../intl-scm/guile-strings.c:1268 ../intl-scm/guile-strings.c:1456
-#: ../intl-scm/guile-strings.c:2260 ../intl-scm/guile-strings.c:2572
+#: ../src/app-utils/guile-util.c:1086
+#: ../src/register/ledger-core/split-register.c:1901
+#: ../intl-scm/guile-strings.c:1980 ../intl-scm/guile-strings.c:2166
+#: ../intl-scm/guile-strings.c:2604 ../intl-scm/guile-strings.c:2790
+#: ../intl-scm/guile-strings.c:3594 ../intl-scm/guile-strings.c:3906
+#: ../intl-scm/guile-strings.c:4744 ../intl-scm/guile-strings.c:5056
 msgid "Debit"
 msgstr "Soll"
 
 #. src/report/standard-reports/general-journal.scm
 #. src/report/standard-reports/trial-balance.scm
+#. src/report/standard-reports/gnucash/report/general-journal.scm
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#. src/report/standard-reports/gnucash/report/transaction.scm
+#. src/report/standard-reports/gnucash/report/register.scm
 #. src/report/standard-reports/transaction.scm
 #. src/report/standard-reports/register.scm
-#: ../src/app-utils/guile-util.c:1137
-#: ../src/register/ledger-core/split-register.c:1902
-#: ../src/register/ledger-core/split-register.c:1977
-#: ../src/register/ledger-core/split-register.c:1993
-#: ../src/register/ledger-core/split-register.c:2011
-#: ../intl-scm/guile-strings.c:1270 ../intl-scm/guile-strings.c:1458
-#: ../intl-scm/guile-strings.c:2262 ../intl-scm/guile-strings.c:2574
+#: ../src/app-utils/guile-util.c:1121
+#: ../src/register/ledger-core/split-register.c:1924
+#: ../src/register/ledger-core/split-register.c:1999
+#: ../src/register/ledger-core/split-register.c:2015
+#: ../src/register/ledger-core/split-register.c:2033
+#: ../intl-scm/guile-strings.c:1982 ../intl-scm/guile-strings.c:2168
+#: ../intl-scm/guile-strings.c:2606 ../intl-scm/guile-strings.c:2792
+#: ../intl-scm/guile-strings.c:3596 ../intl-scm/guile-strings.c:3908
+#: ../intl-scm/guile-strings.c:4746 ../intl-scm/guile-strings.c:5058
 msgid "Credit"
 msgstr "Haben"
 
-#: ../src/app-utils/option-util.c:1734
+#: ../src/app-utils/option-util.c:1699
 #, c-format
 msgid ""
 "There is a problem with option %s:%s.\n"
@@ -155,178 +172,179 @@
 "wird verwendet. "
 
 #: ../src/backend/postgres/PostgresBackend.c:1988
-#: ../src/backend/postgres/putil.c:78 ../src/backend/postgres/putil.c:104
-#: ../src/backend/postgres/putil.c:146
+#: ../src/backend/postgres/putil.c:79 ../src/backend/postgres/putil.c:105
+#: ../src/backend/postgres/putil.c:147
 #, c-format
 msgid "From the Postgresql Server: %s"
 msgstr "Fehlermeldung vom Postgresql Server: %s"
 
-#: ../src/backend/postgres/putil.c:56 ../src/backend/postgres/upgrade.c:398
+#: ../src/backend/postgres/putil.c:57 ../src/backend/postgres/upgrade.c:398
 msgid "Backend connection is not available"
 msgstr "Postgresql-Verbindung nicht verfügbar"
 
-#: ../src/backend/postgres/putil.c:65
+#: ../src/backend/postgres/putil.c:66
 msgid "Query could not be executed"
 msgstr "SQL-Abfrage konnte nicht ausgeführt werden"
 
-#: ../src/bin/gnucash-bin.c:73
+#: ../src/bin/gnucash-bin.c:82
 msgid "This is a development version. It may or may not work.\n"
 msgstr ""
 "Diese Version befindet sich noch in Entwicklung.\n"
 "Sie kann funktionieren, muss aber nicht.\n"
 
-#: ../src/bin/gnucash-bin.c:74
+#: ../src/bin/gnucash-bin.c:83
 msgid "Report bugs and other problems to gnucash-devel at gnucash.org.\n"
 msgstr ""
 "Fehler und andere Probleme werden auf gnucash-devel at gnucash.org diskutiert.\n"
 
-#: ../src/bin/gnucash-bin.c:75
+#: ../src/bin/gnucash-bin.c:84
 msgid "You can also lookup and file bug reports at http://bugzilla.gnome.org\n"
 msgstr ""
 "Fehlerberichte können auf http://bugzilla.gnome.org eingeschickt werden.\n"
 
-#: ../src/bin/gnucash-bin.c:76
+#: ../src/bin/gnucash-bin.c:85
 msgid "The last stable version was "
 msgstr "Die letzte stabile Version war: "
 
-#: ../src/bin/gnucash-bin.c:77
+#: ../src/bin/gnucash-bin.c:86
 msgid "The next stable version will be "
 msgstr "Die nächste stabile Version wird sein: "
 
-#: ../src/bin/gnucash-bin.c:218 ../src/bin/gnucash-bin.c:266
+#: ../src/bin/gnucash-bin.c:204
 msgid "Show GnuCash version"
 msgstr "GnuCash Version anzeigen"
 
-#: ../src/bin/gnucash-bin.c:220 ../src/bin/gnucash-bin.c:268
+#: ../src/bin/gnucash-bin.c:206
 msgid "Enable debugging mode"
 msgstr "Debug-Modus aktivieren"
 
 #. Translators: This is the command line option autohelp
 #. text; see popt(3)
-#: ../src/bin/gnucash-bin.c:224 ../src/bin/gnucash-bin.c:272
+#: ../src/bin/gnucash-bin.c:210
 msgid "Set the logging level from 0 (least) to 6 (most)"
 msgstr "Logging-Level wählen, von 0 (am wenigsten) bis 6 (am meisten)"
 
-#. Translators: Argument description for autohelp; see popt(3)
 #. Translators: Argument description for autohelp; see
 #. http://developer.gnome.org/doc/API/2.0/glib/glib-Commandline-option-parser.html
-#: ../src/bin/gnucash-bin.c:226 ../src/bin/gnucash-bin.c:275
+#: ../src/bin/gnucash-bin.c:213
 msgid "LOGLEVEL"
 msgstr "LOGLEVEL"
 
-#: ../src/bin/gnucash-bin.c:228 ../src/bin/gnucash-bin.c:277
+#: ../src/bin/gnucash-bin.c:215
 msgid "Do not load the last file opened"
 msgstr "Zuletzt geöffnete Datei nicht öffnen"
 
-#: ../src/bin/gnucash-bin.c:230 ../src/bin/gnucash-bin.c:279
+#: ../src/bin/gnucash-bin.c:217
 msgid "Set configuration path"
 msgstr "Konfigurations-Pfad setzen"
 
-#. Translators: Argument description for autohelp; see popt(3)
 #. Translators: Argument description for autohelp; see
 #. http://developer.gnome.org/doc/API/2.0/glib/glib-Commandline-option-parser.html
-#: ../src/bin/gnucash-bin.c:232 ../src/bin/gnucash-bin.c:282
+#: ../src/bin/gnucash-bin.c:220
 msgid "CONFIGPATH"
 msgstr "CONFIGPFAD"
 
-#: ../src/bin/gnucash-bin.c:234 ../src/bin/gnucash-bin.c:284
+#: ../src/bin/gnucash-bin.c:222
 msgid "Set shared data file search path"
 msgstr "Systemweiten Suchpfad für architekturunabhängige Dateien setzen"
 
-#. Translators: Argument description for autohelp; see popt(3)
 #. Translators: Argument description for autohelp; see
 #. http://developer.gnome.org/doc/API/2.0/glib/glib-Commandline-option-parser.html
-#: ../src/bin/gnucash-bin.c:236 ../src/bin/gnucash-bin.c:287
+#: ../src/bin/gnucash-bin.c:225
 msgid "SHAREPATH"
 msgstr "SHAREPFAD"
 
 #. src/scm/command-line.scm
-#: ../src/bin/gnucash-bin.c:238 ../src/bin/gnucash-bin.c:289
-#: ../intl-scm/guile-strings.c:6
+#: ../src/bin/gnucash-bin.c:227 ../intl-scm/guile-strings.c:6
 msgid "Set the search path for documentation files"
 msgstr "Suchpfad für Hilfedateien setzen"
 
-#. Translators: Argument description for autohelp; see popt(3)
 #. Translators: Argument description for autohelp; see
 #. http://developer.gnome.org/doc/API/2.0/glib/glib-Commandline-option-parser.html
-#: ../src/bin/gnucash-bin.c:240 ../src/bin/gnucash-bin.c:292
+#: ../src/bin/gnucash-bin.c:230
 msgid "DOCPATH"
 msgstr "DOCPFAD"
 
-#: ../src/bin/gnucash-bin.c:242 ../src/bin/gnucash-bin.c:294
+#: ../src/bin/gnucash-bin.c:232
 msgid "Add price quotes to given GnuCash datafile"
 msgstr "Börsenkurse zu angegebener Datei hinzufügen"
 
-#. Translators: Argument description for autohelp; see popt(3)
 #. Translators: Argument description for autohelp; see
 #. http://developer.gnome.org/doc/API/2.0/glib/glib-Commandline-option-parser.html
-#: ../src/bin/gnucash-bin.c:244 ../src/bin/gnucash-bin.c:297
+#: ../src/bin/gnucash-bin.c:235
 msgid "FILE"
 msgstr "DATEI"
 
-#: ../src/bin/gnucash-bin.c:246 ../src/bin/gnucash-bin.c:299
+#: ../src/bin/gnucash-bin.c:237
 msgid ""
 "Regular expression determining which namespace commodities will be retrieved"
 msgstr ""
 "Regulärer Ausdruck für den Namensstandard, in dem die Aktienkurse geholt "
 "werden sollen"
 
-#. Translators: Argument description for autohelp; see popt(3)
 #. Translators: Argument description for autohelp; see
 #. http://developer.gnome.org/doc/API/2.0/glib/glib-Commandline-option-parser.html
-#: ../src/bin/gnucash-bin.c:248 ../src/bin/gnucash-bin.c:302
+#: ../src/bin/gnucash-bin.c:240
 msgid "REGEXP"
 msgstr "REGEXP"
 
 #. Translators: %s is the version number
-#: ../src/bin/gnucash-bin.c:322
+#: ../src/bin/gnucash-bin.c:259
 #, c-format
 msgid "GnuCash %s development version"
 msgstr "GnuCash Entwicklungsversion %s"
 
 #. Translators: %s is the version number
-#: ../src/bin/gnucash-bin.c:325
+#: ../src/bin/gnucash-bin.c:262
 #, c-format
 msgid "GnuCash %s"
 msgstr "GnuCash %s"
 
 #. Translators: 1st %s is the build date; 2nd %s is the SVN
 #. revision number
-#: ../src/bin/gnucash-bin.c:329
+#: ../src/bin/gnucash-bin.c:266
 #, c-format
 msgid "Built %s from r%s"
 msgstr "Build vom %s, Revision r%s"
 
-#: ../src/bin/gnucash-bin.c:405
+#: ../src/bin/gnucash-bin.c:337
 msgid "No quotes retrieved. Finance::Quote isn't installed properly.\n"
 msgstr ""
 "Keine Kurse abgerufen. Modul Finance::Quote ist nicht korrekt installiert.\n"
 
 #. Install Price Quote Sources
-#: ../src/bin/gnucash-bin.c:458
+#: ../src/bin/gnucash-bin.c:419
 msgid "Checking Finance::Quote..."
 msgstr "Modul Finance::Quote prüfen..."
 
-#: ../src/bin/gnucash-bin.c:465
+#: ../src/bin/gnucash-bin.c:426
 msgid "Loading data..."
 msgstr "Daten laden..."
 
 #. src/app-utils/prefs.scm
+#. src/report/standard-reports/gnucash/report/register.scm
 #. src/report/standard-reports/register.scm
 #. src/business/business-reports/fancy-invoice.scm
 #. src/business/business-reports/owner-report.scm
 #. src/business/business-reports/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/fancy-invoice.scm
+#. src/business/business-reports/gnucash/report/owner-report.scm
+#. src/business/business-reports/gnucash/report/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/invoice.scm
 #. src/business/business-reports/invoice.scm
-#: ../src/business/business-core/gncInvoice.c:589
-#: ../src/business/business-gnome/business-gnome-utils.c:219
-#: ../src/business/business-gnome/dialog-invoice.c:2410
-#: ../src/business/business-gnome/dialog-invoice.c:2492
-#: ../src/business/business-gnome/glade/invoice.glade.h:13
+#: ../src/business/business-core/gncInvoice.c:594
+#: ../src/business/business-gnome/business-gnome-utils.c:221
+#: ../src/business/business-gnome/dialog-invoice.c:2405
+#: ../src/business/business-gnome/dialog-invoice.c:2487
+#: ../src/business/business-gnome/glade/invoice.glade.h:12
 #: ../src/business/business-gnome/gnc-plugin-page-invoice.c:316
-#: ../src/register/ledger-core/split-register.c:2008
-#: ../intl-scm/guile-strings.c:82 ../intl-scm/guile-strings.c:2656
-#: ../intl-scm/guile-strings.c:3364 ../intl-scm/guile-strings.c:3462
-#: ../intl-scm/guile-strings.c:3678 ../intl-scm/guile-strings.c:3906
+#: ../src/register/ledger-core/split-register.c:2030
+#: ../intl-scm/guile-strings.c:130 ../intl-scm/guile-strings.c:3990
+#: ../intl-scm/guile-strings.c:5140 ../intl-scm/guile-strings.c:6090
+#: ../intl-scm/guile-strings.c:6188 ../intl-scm/guile-strings.c:6404
+#: ../intl-scm/guile-strings.c:6614 ../intl-scm/guile-strings.c:6712
+#: ../intl-scm/guile-strings.c:6928 ../intl-scm/guile-strings.c:7158
+#: ../intl-scm/guile-strings.c:7398
 msgid "Invoice"
 msgstr "Rechnung"
 
@@ -334,62 +352,70 @@
 #. src/business/business-reports/fancy-invoice.scm
 #. src/business/business-reports/owner-report.scm
 #. src/business/business-reports/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/fancy-invoice.scm
+#. src/business/business-reports/gnucash/report/owner-report.scm
+#. src/business/business-reports/gnucash/report/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/invoice.scm
 #. src/business/business-reports/invoice.scm
-#: ../src/business/business-core/gncInvoice.c:591
-#: ../src/business/business-gnome/business-gnome-utils.c:213
-#: ../src/business/business-gnome/dialog-invoice.c:2398
-#: ../intl-scm/guile-strings.c:108 ../intl-scm/guile-strings.c:3366
-#: ../intl-scm/guile-strings.c:3464 ../intl-scm/guile-strings.c:3680
-#: ../intl-scm/guile-strings.c:3908
+#: ../src/business/business-core/gncInvoice.c:596
+#: ../src/business/business-gnome/business-gnome-utils.c:215
+#: ../src/business/business-gnome/dialog-invoice.c:2393
+#: ../intl-scm/guile-strings.c:156 ../intl-scm/guile-strings.c:6092
+#: ../intl-scm/guile-strings.c:6190 ../intl-scm/guile-strings.c:6406
+#: ../intl-scm/guile-strings.c:6616 ../intl-scm/guile-strings.c:6714
+#: ../intl-scm/guile-strings.c:6930 ../intl-scm/guile-strings.c:7160
+#: ../intl-scm/guile-strings.c:7400
 msgid "Bill"
 msgstr "Rechnung"
 
 #. src/app-utils/prefs.scm
 #. src/report/standard-reports/net-barchart.scm
-#: ../src/business/business-core/gncInvoice.c:593 ../src/engine/Account.c:2140
-#: ../intl-scm/guile-strings.c:78 ../intl-scm/guile-strings.c:1242
+#. src/report/standard-reports/gnucash/report/net-barchart.scm
+#: ../src/business/business-core/gncInvoice.c:598 ../src/engine/Account.c:2143
+#: ../intl-scm/guile-strings.c:126 ../intl-scm/guile-strings.c:1954
+#: ../intl-scm/guile-strings.c:2578
 msgid "Expense"
 msgstr "Aufwendungen"
 
 #. Set memo.  action?
-#: ../src/business/business-core/gncInvoice.c:1028
+#: ../src/business/business-core/gncInvoice.c:1033
 msgid "Extra to Charge Card"
 msgstr "Zusätzliche Kosten Kreditkarte"
 
-#: ../src/business/business-core/gncInvoice.c:1067
+#: ../src/business/business-core/gncInvoice.c:1072
 msgid "Generated from an invoice.  Try unposting the invoice."
 msgstr ""
 "Aus einer Rechnung erzeugt. Für Änderungen müssen Sie die Buchung der "
 "Rechnung löschen."
 
 #. Translators: This is the memo of an auto-created split
-#: ../src/business/business-core/gncInvoice.c:1085
+#: ../src/business/business-core/gncInvoice.c:1090
 msgid "Automatic Payment Forward"
 msgstr "Automatische Zahlungsweiterleitung"
 
-#: ../src/business/business-core/gncInvoice.c:1086
+#: ../src/business/business-core/gncInvoice.c:1091
 msgid "Auto Split"
 msgstr "Automatische Buchung"
 
 #. src/app-utils/prefs.scm
-#: ../src/business/business-core/gncInvoice.c:1279
-#: ../src/business/business-core/gncInvoice.c:1373
+#: ../src/business/business-core/gncInvoice.c:1284
+#: ../src/business/business-core/gncInvoice.c:1378
 #: ../src/business/business-ledger/gncEntryLedgerModel.c:140
-#: ../src/gnome/druid-loan.c:1780 ../src/gnome/druid-loan.c:2280
-#: ../src/gnome/druid-loan.c:2343 ../src/gnome/druid-loan.c:2357
-#: ../src/register/ledger-core/split-register.c:2004
-#: ../src/register/ledger-core/split-register.c:2009
-#: ../src/register/ledger-core/split-register.c:2018
-#: ../intl-scm/guile-strings.c:64 ../intl-scm/guile-strings.c:80
-#: ../intl-scm/guile-strings.c:110
+#: ../src/gnome/druid-loan.c:1789 ../src/gnome/druid-loan.c:2293
+#: ../src/gnome/druid-loan.c:2356 ../src/gnome/druid-loan.c:2370
+#: ../src/register/ledger-core/split-register.c:2026
+#: ../src/register/ledger-core/split-register.c:2031
+#: ../src/register/ledger-core/split-register.c:2040
+#: ../intl-scm/guile-strings.c:112 ../intl-scm/guile-strings.c:128
+#: ../intl-scm/guile-strings.c:158
 msgid "Payment"
 msgstr "Zahlung"
 
-#: ../src/business/business-core/gncInvoice.c:1400
+#: ../src/business/business-core/gncInvoice.c:1405
 msgid "Pre-Payment"
 msgstr "Vorauszahlung"
 
-#: ../src/business/business-core/gncInvoice.c:1497
+#: ../src/business/business-core/gncInvoice.c:1502
 msgid " (posted)"
 msgstr " (gebucht)"
 
@@ -397,55 +423,53 @@
 msgid " (closed)"
 msgstr " (geschlossen)"
 
-#: ../src/business/business-gnome/business-gnome-utils.c:67
-#: ../src/business/business-gnome/business-gnome-utils.c:250
-#: ../src/business/business-gnome/dialog-invoice.c:1014
-#: ../src/business/business-gnome/dialog-invoice.c:1085
+#: ../src/business/business-gnome/business-gnome-utils.c:69
+#: ../src/business/business-gnome/business-gnome-utils.c:252
+#: ../src/business/business-gnome/dialog-invoice.c:1006
+#: ../src/business/business-gnome/dialog-invoice.c:1077
 #: ../src/gnome-utils/gnc-general-select.c:217
-#: ../src/import-export/qif-import/qif.glade.h:77
+#: ../src/import-export/qif-import/qif.glade.h:67
 msgid "Select..."
 msgstr "Auswählen..."
 
-#: ../src/business/business-gnome/business-gnome-utils.c:70
+#: ../src/business/business-gnome/business-gnome-utils.c:72
 #: ../src/gnome-utils/gnc-general-select.c:219
 msgid "Edit..."
 msgstr "Bearbeiten..."
 
-#: ../src/business/business-gnome/business-gnome-utils.c:216
+#: ../src/business/business-gnome/business-gnome-utils.c:218
 msgid "Voucher"
 msgstr "Auslagenerstattung"
 
+#. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../src/business/business-gnome/business-gnome-utils.c:459
-#: ../src/engine/FreqSpec.c:724 ../src/gnome/glade/sched-xact.glade.h:122
-#: ../intl-scm/guile-strings.c:2298 ../intl-scm/guile-strings.c:2324
-#: ../intl-scm/guile-strings.c:2384 ../intl-scm/guile-strings.c:2386
-#: ../intl-scm/guile-strings.c:2492 ../intl-scm/guile-strings.c:2508
+#: ../src/business/business-gnome/business-gnome-utils.c:455
+#: ../src/engine/FreqSpec.c:724 ../src/gnome/glade/sched-xact.glade.h:139
+#: ../intl-scm/guile-strings.c:3632 ../intl-scm/guile-strings.c:3658
+#: ../intl-scm/guile-strings.c:3718 ../intl-scm/guile-strings.c:3720
+#: ../intl-scm/guile-strings.c:3826 ../intl-scm/guile-strings.c:3842
+#: ../intl-scm/guile-strings.c:4782 ../intl-scm/guile-strings.c:4808
+#: ../intl-scm/guile-strings.c:4868 ../intl-scm/guile-strings.c:4870
+#: ../intl-scm/guile-strings.c:4976 ../intl-scm/guile-strings.c:4992
 #, c-format
 msgid "None"
 msgstr "Keine"
 
-#: ../src/business/business-gnome/business-gnome-utils.c:635
+#: ../src/business/business-gnome/business-gnome-utils.c:631
 msgid "Yes"
 msgstr "Ja"
 
-#: ../src/business/business-gnome/business-gnome-utils.c:640
+#: ../src/business/business-gnome/business-gnome-utils.c:636
 msgid "No"
 msgstr "Nein"
 
-#: ../src/business/business-gnome/business-gnome-utils.c:645
+#: ../src/business/business-gnome/business-gnome-utils.c:641
 msgid "Use Global"
 msgstr "Voreinstellung benutzen"
 
-#. src/business/business-utils/business-utils.scm
-#: ../src/business/business-gnome/businessmod-gnome.c:122
-#: ../intl-scm/guile-strings.c:3160
-msgid "Business"
-msgstr "Geschäft"
-
 #: ../src/business/business-gnome/business-urls.c:58
 #: ../src/business/business-gnome/business-urls.c:190
-#: ../src/gnome/top-level.c:191
+#: ../src/gnome/top-level.c:192
 #, c-format
 msgid "Badly formed URL %s"
 msgstr "Fehlerhafte URL %s"
@@ -487,21 +511,21 @@
 msgid "No such Account entity: %s"
 msgstr "Ungültige Konto Entity: %s"
 
-#: ../src/business/business-gnome/dialog-billterms.c:256
-#: ../src/business/dialog-tax-table/dialog-tax-table.c:119
+#: ../src/business/business-gnome/dialog-billterms.c:262
+#: ../src/business/dialog-tax-table/dialog-tax-table.c:129
 msgid "Negative amounts are not allowed."
 msgstr "Negative Beträge sind hier nicht möglich."
 
-#: ../src/business/business-gnome/dialog-billterms.c:261
-#: ../src/business/dialog-tax-table/dialog-tax-table.c:126
+#: ../src/business/business-gnome/dialog-billterms.c:267
+#: ../src/business/dialog-tax-table/dialog-tax-table.c:136
 msgid "Percentage amount must be between 0 and 100."
 msgstr "Die Prozentzahl muss zwischen 0 und 100 liegen."
 
-#: ../src/business/business-gnome/dialog-billterms.c:284
+#: ../src/business/business-gnome/dialog-billterms.c:290
 msgid "You must provide a name for this Billing Term."
 msgstr "Sie müssen einen Namen für diese Zahlungsbedingungen angeben."
 
-#: ../src/business/business-gnome/dialog-billterms.c:290
+#: ../src/business/business-gnome/dialog-billterms.c:296
 #, c-format
 msgid ""
 "You must provide a unique name for this Billing Term. Your choice \"%s\" is "
@@ -511,32 +535,36 @@
 "Ihre Auswahl »%s« wird bereits benutzt."
 
 #. src/report/standard-reports/price-scatter.scm
-#: ../src/business/business-gnome/dialog-billterms.c:495
-#: ../src/business/business-gnome/glade/billterms.glade.h:11
-#: ../src/gnome/glade/sched-xact.glade.h:68
-#: ../src/gnome-utils/gnc-date-delta.c:217 ../intl-scm/guile-strings.c:1168
+#. src/report/standard-reports/gnucash/report/price-scatter.scm
+#: ../src/business/business-gnome/dialog-billterms.c:465
+#: ../src/business/business-gnome/glade/billterms.glade.h:9
+#: ../src/gnome/glade/sched-xact.glade.h:75
+#: ../src/gnome-utils/gnc-date-delta.c:214 ../intl-scm/guile-strings.c:1880
+#: ../intl-scm/guile-strings.c:2504
 msgid "Days"
 msgstr "Tage"
 
-#: ../src/business/business-gnome/dialog-billterms.c:498
-#: ../src/business/business-gnome/glade/billterms.glade.h:22
+#: ../src/business/business-gnome/dialog-billterms.c:468
+#: ../src/business/business-gnome/glade/billterms.glade.h:21
 msgid "Proximo"
 msgstr "Im nächsten Monat"
 
 #. src/business/business-reports/owner-report.scm
-#: ../src/business/business-gnome/dialog-billterms.c:501
-#: ../src/engine/FreqSpec.c:983 ../intl-scm/guile-strings.c:3420
+#. src/business/business-reports/gnucash/report/owner-report.scm
+#: ../src/business/business-gnome/dialog-billterms.c:471
+#: ../src/engine/FreqSpec.c:983 ../intl-scm/guile-strings.c:6146
+#: ../intl-scm/guile-strings.c:6670
 #, c-format
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: ../src/business/business-gnome/dialog-billterms.c:625
+#: ../src/business/business-gnome/dialog-billterms.c:592
 #, c-format
 msgid "Term \"%s\" is in use.  You cannot delete it."
 msgstr "Zahlungsbedingung »%s« ist in Benutzung. Sie können sie nicht löschen."
 
-#: ../src/business/business-gnome/dialog-billterms.c:631
-#: ../src/business/dialog-tax-table/dialog-tax-table.c:556
+#: ../src/business/business-gnome/dialog-billterms.c:598
+#: ../src/business/dialog-tax-table/dialog-tax-table.c:542
 #, c-format
 msgid "Are you sure you want to delete \"%s\"?"
 msgstr "Sind Sie sicher, dass Sie »%s« löschen möchten?"
@@ -583,7 +611,7 @@
 #: ../src/business/business-gnome/dialog-employee.c:301
 #: ../src/business/business-gnome/dialog-job.c:230
 #: ../src/business/business-gnome/dialog-vendor.c:287
-#: ../src/gnome-utils/dialog-account.c:1349
+#: ../src/gnome-utils/dialog-account.c:1300
 msgid "<No name>"
 msgstr "<Kein Name>"
 
@@ -592,7 +620,7 @@
 msgstr "Kunde bearbeiten"
 
 #: ../src/business/business-gnome/dialog-customer.c:374
-#: ../src/business/business-gnome/glade/customer.glade.h:16
+#: ../src/business/business-gnome/glade/customer.glade.h:15
 msgid "New Customer"
 msgstr "Neuer Kunde"
 
@@ -611,10 +639,10 @@
 
 #: ../src/business/business-gnome/dialog-customer.c:785
 #: ../src/business/business-gnome/dialog-employee.c:684
+#: ../src/business/business-gnome/dialog-invoice.c:2197
 #: ../src/business/business-gnome/dialog-invoice.c:2202
-#: ../src/business/business-gnome/dialog-invoice.c:2207
-#: ../src/business/business-gnome/dialog-invoice.c:2214
-#: ../src/business/business-gnome/dialog-invoice.c:2460
+#: ../src/business/business-gnome/dialog-invoice.c:2209
+#: ../src/business/business-gnome/dialog-invoice.c:2455
 #: ../src/business/business-gnome/dialog-job.c:516
 msgid "Process Payment"
 msgstr "Zahlung verarbeiten"
@@ -632,10 +660,11 @@
 msgid "Customer ID"
 msgstr "Kundennummer"
 
+#. src/business/business-utils/gnucash/business-utils.scm
 #. src/business/business-utils/business-utils.scm
 #: ../src/business/business-gnome/dialog-customer.c:800
 #: ../src/business/business-gnome/dialog-vendor.c:663
-#: ../intl-scm/guile-strings.c:3162
+#: ../intl-scm/guile-strings.c:5870 ../intl-scm/guile-strings.c:5888
 msgid "Company Name"
 msgstr "Firmenname"
 
@@ -645,14 +674,17 @@
 msgstr "Kontaktadresse"
 
 #. src/business/business-reports/owner-report.scm
+#. src/business/business-reports/gnucash/report/owner-report.scm
+#. src/business/business-reports/gnucash/report/aging.scm
 #. src/business/business-reports/aging.scm
 #: ../src/business/business-gnome/dialog-customer.c:808
-#: ../src/business/business-gnome/dialog-invoice.c:2323
-#: ../src/business/business-gnome/dialog-invoice.c:2468
+#: ../src/business/business-gnome/dialog-invoice.c:2318
+#: ../src/business/business-gnome/dialog-invoice.c:2463
 #: ../src/business/business-gnome/dialog-job.c:540
 #: ../src/business/business-gnome/dialog-order.c:826
 #: ../src/business/business-gnome/dialog-vendor.c:671
-#: ../intl-scm/guile-strings.c:3396 ../intl-scm/guile-strings.c:3746
+#: ../intl-scm/guile-strings.c:6122 ../intl-scm/guile-strings.c:6646
+#: ../intl-scm/guile-strings.c:6996 ../intl-scm/guile-strings.c:7236
 msgid "Company"
 msgstr "Firma"
 
@@ -688,7 +720,7 @@
 msgstr "Mitarbeiter bearbeiten"
 
 #: ../src/business/business-gnome/dialog-employee.c:310
-#: ../src/business/business-gnome/glade/employee.glade.h:19
+#: ../src/business/business-gnome/glade/employee.glade.h:18
 msgid "New Employee"
 msgstr "Neuer Mitarbeiter"
 
@@ -709,7 +741,7 @@
 msgstr "Mitarbeiter Benutzername"
 
 #: ../src/business/business-gnome/dialog-employee.c:696
-#: ../src/business/business-gnome/dialog-invoice.c:2304
+#: ../src/business/business-gnome/dialog-invoice.c:2299
 msgid "Employee Name"
 msgstr "Mitarbeitername"
 
@@ -717,15 +749,16 @@
 msgid "Username"
 msgstr "Benutzername"
 
+#. src/business/business-reports/gnucash/report/aging.scm
 #. src/business/business-reports/aging.scm
 #: ../src/business/business-gnome/dialog-employee.c:706
-#: ../src/gnome/dialog-scheduledxaction.c:2573
-#: ../src/gnome/glade/sched-xact.glade.h:118
-#: ../src/gnome-utils/glade/gnc-date-format.glade.h:10
-#: ../src/gnome-utils/gnc-dense-cal.c:280
+#: ../src/gnome/dialog-sx-editor.c:1674
+#: ../src/gnome/glade/sched-xact.glade.h:136
+#: ../src/gnome-utils/glade/gnc-date-format.glade.h:9
+#: ../src/gnome-utils/gnc-dense-cal.c:263
 #: ../src/gnome-utils/gnc-tree-model-budget.c:96
 #: ../src/gnome-utils/gnc-tree-view-commodity.c:405
-#: ../intl-scm/guile-strings.c:3720
+#: ../intl-scm/guile-strings.c:6970 ../intl-scm/guile-strings.c:7210
 msgid "Name"
 msgstr "Name"
 
@@ -738,31 +771,31 @@
 #. * label in the frame and means
 #. * e.g. customer i.e. the company being
 #. * invoiced.
-#: ../src/business/business-gnome/dialog-invoice.c:344
+#: ../src/business/business-gnome/dialog-invoice.c:340
 #: ../src/business/business-gnome/dialog-order.c:174
 msgid "You need to supply Billing Information."
 msgstr "Sie müssen Rechnungsdaten eingeben."
 
-#: ../src/business/business-gnome/dialog-invoice.c:499
+#: ../src/business/business-gnome/dialog-invoice.c:495
 msgid "Are you sure you want to delete the selected entry?"
 msgstr "Sind Sie sicher, dass Sie den gewählten Posten löschen möchten?"
 
-#: ../src/business/business-gnome/dialog-invoice.c:501
+#: ../src/business/business-gnome/dialog-invoice.c:497
 msgid ""
 "This entry is attached to an order and will be deleted from that as well!"
 msgstr ""
 "Dieser Posten ist mit einer Bestellung verbunden und würde dadurch auch von "
 "der Bestellung gelöscht."
 
-#: ../src/business/business-gnome/dialog-invoice.c:609
+#: ../src/business/business-gnome/dialog-invoice.c:605
 msgid "The Invoice must have at least one Entry."
 msgstr "Die Rechnung muss mindestens einen Posten enthalten."
 
-#: ../src/business/business-gnome/dialog-invoice.c:616
+#: ../src/business/business-gnome/dialog-invoice.c:612
 msgid "You may not post an invoice with a negative total value."
 msgstr "Sie können keine Rechnung buchen, die einen negativen Saldo hat."
 
-#: ../src/business/business-gnome/dialog-invoice.c:623
+#: ../src/business/business-gnome/dialog-invoice.c:619
 msgid "You may not post an expense voucher with a negative total cash value."
 msgstr ""
 "Sie können keine Auslagenerstattung buchen, die einen negativen Saldo hat."
@@ -770,293 +803,334 @@
 #. Ok, we can post this invoice.  Ask for verification, set the due date,
 #. * post date, and posted account
 #.
-#: ../src/business/business-gnome/dialog-invoice.c:630
+#: ../src/business/business-gnome/dialog-invoice.c:626
 msgid "Do you really want to post the invoice?"
 msgstr "Wollen Sie diese Rechnung wirklich buchen?"
 
 #. src/business/business-reports/owner-report.scm
 #. src/business/business-reports/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/owner-report.scm
+#. src/business/business-reports/gnucash/report/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/invoice.scm
 #. src/business/business-reports/invoice.scm
-#: ../src/business/business-gnome/dialog-invoice.c:631
+#: ../src/business/business-gnome/dialog-invoice.c:627
 #: ../src/register/ledger-core/split-register-model.c:109
-#: ../intl-scm/guile-strings.c:3400 ../intl-scm/guile-strings.c:3596
-#: ../intl-scm/guile-strings.c:3916
+#: ../intl-scm/guile-strings.c:6126 ../intl-scm/guile-strings.c:6322
+#: ../intl-scm/guile-strings.c:6650 ../intl-scm/guile-strings.c:6846
+#: ../intl-scm/guile-strings.c:7168 ../intl-scm/guile-strings.c:7408
 msgid "Due Date"
 msgstr "Fälligkeitsdatum"
 
-#: ../src/business/business-gnome/dialog-invoice.c:632
+#: ../src/business/business-gnome/dialog-invoice.c:628
 msgid "Post Date"
 msgstr "Buchungsdatum"
 
-#: ../src/business/business-gnome/dialog-invoice.c:633
+#: ../src/business/business-gnome/dialog-invoice.c:629
 msgid "Post to Account"
 msgstr "Buchen nach Konto"
 
-#: ../src/business/business-gnome/dialog-invoice.c:634
+#: ../src/business/business-gnome/dialog-invoice.c:630
 msgid "Accumulate Splits?"
 msgstr "Buchungen kumulieren?"
 
-#: ../src/business/business-gnome/dialog-invoice.c:928
-#: ../src/gnome/window-reconcile.c:1051
+#: ../src/business/business-gnome/dialog-invoice.c:920
+#: ../src/gnome/window-reconcile.c:1050
 msgid "Total:"
 msgstr "Betrag:"
 
-#: ../src/business/business-gnome/dialog-invoice.c:933
+#: ../src/business/business-gnome/dialog-invoice.c:925
 msgid "Subtotal:"
 msgstr "Zwischensumme:"
 
-#: ../src/business/business-gnome/dialog-invoice.c:934
+#: ../src/business/business-gnome/dialog-invoice.c:926
 msgid "Tax:"
 msgstr "Steuern:"
 
-#: ../src/business/business-gnome/dialog-invoice.c:938
+#: ../src/business/business-gnome/dialog-invoice.c:930
 msgid "Total Cash:"
 msgstr "Betrag Bar:"
 
-#: ../src/business/business-gnome/dialog-invoice.c:939
+#: ../src/business/business-gnome/dialog-invoice.c:931
 msgid "Total Charge:"
 msgstr "Gesamt Belastung:"
 
-#: ../src/business/business-gnome/dialog-invoice.c:1555
-#: ../src/business/business-gnome/glade/invoice.glade.h:19
+#: ../src/business/business-gnome/dialog-invoice.c:1547
+#: ../src/business/business-gnome/glade/invoice.glade.h:18
 msgid "New Invoice"
 msgstr "Neue Rechnung"
 
-#: ../src/business/business-gnome/dialog-invoice.c:1559
+#: ../src/business/business-gnome/dialog-invoice.c:1551
 msgid "Edit Invoice"
 msgstr "Rechnung bearbeiten"
 
-#: ../src/business/business-gnome/dialog-invoice.c:1562
+#: ../src/business/business-gnome/dialog-invoice.c:1554
 msgid "View Invoice"
 msgstr "Rechnung anzeigen"
 
-#: ../src/business/business-gnome/dialog-invoice.c:1570
+#: ../src/business/business-gnome/dialog-invoice.c:1562
 msgid "New Bill"
 msgstr "Neue Rechnung"
 
-#: ../src/business/business-gnome/dialog-invoice.c:1574
+#: ../src/business/business-gnome/dialog-invoice.c:1566
 msgid "Edit Bill"
 msgstr "Rechnung bearbeiten"
 
-#: ../src/business/business-gnome/dialog-invoice.c:1577
+#: ../src/business/business-gnome/dialog-invoice.c:1569
 msgid "View Bill"
 msgstr "Rechnung anzeigen"
 
-#: ../src/business/business-gnome/dialog-invoice.c:1585
+#: ../src/business/business-gnome/dialog-invoice.c:1577
 msgid "New Expense Voucher"
 msgstr "Neue Auslagenerstattung"
 
-#: ../src/business/business-gnome/dialog-invoice.c:1589
+#: ../src/business/business-gnome/dialog-invoice.c:1581
 msgid "Edit Expense Voucher"
 msgstr "Auslagenerstattung bearbeiten"
 
-#: ../src/business/business-gnome/dialog-invoice.c:1592
+#: ../src/business/business-gnome/dialog-invoice.c:1584
 msgid "View Expense Voucher"
 msgstr "Auslagenerstattung anzeigen"
 
-#: ../src/business/business-gnome/dialog-invoice.c:2201
+#: ../src/business/business-gnome/dialog-invoice.c:2196
 msgid "View/Edit Invoice"
 msgstr "Rechnung anzeigen/bearbeiten"
 
-#: ../src/business/business-gnome/dialog-invoice.c:2206
-#: ../src/business/business-gnome/dialog-invoice.c:2459
+#: ../src/business/business-gnome/dialog-invoice.c:2201
+#: ../src/business/business-gnome/dialog-invoice.c:2454
 msgid "View/Edit Bill"
 msgstr "Rechnung anzeigen/bearbeiten"
 
 #. Translators: The terms 'Voucher' and 'Expense Voucher' are used
 #. interchangeably in gnucash and mean the same thing.
-#: ../src/business/business-gnome/dialog-invoice.c:2213
+#: ../src/business/business-gnome/dialog-invoice.c:2208
 msgid "View/Edit Voucher"
 msgstr "Auslagenerstattung anzeigen/bearbeiten"
 
-#: ../src/business/business-gnome/dialog-invoice.c:2223
+#: ../src/business/business-gnome/dialog-invoice.c:2218
 msgid "Invoice Owner"
 msgstr "Rechnungsmandant"
 
 #. src/business/business-reports/fancy-invoice.scm
 #. src/business/business-reports/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/fancy-invoice.scm
+#. src/business/business-reports/gnucash/report/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/invoice.scm
 #. src/business/business-reports/invoice.scm
-#: ../src/business/business-gnome/dialog-invoice.c:2226
-#: ../intl-scm/guile-strings.c:3296 ../intl-scm/guile-strings.c:3638
-#: ../intl-scm/guile-strings.c:3872
+#: ../src/business/business-gnome/dialog-invoice.c:2221
+#: ../intl-scm/guile-strings.c:6022 ../intl-scm/guile-strings.c:6364
+#: ../intl-scm/guile-strings.c:6546 ../intl-scm/guile-strings.c:6888
+#: ../intl-scm/guile-strings.c:7124 ../intl-scm/guile-strings.c:7364
 msgid "Invoice Notes"
 msgstr "Bemerkungen Rechnung"
 
 #. src/business/business-reports/fancy-invoice.scm
 #. src/business/business-reports/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/fancy-invoice.scm
+#. src/business/business-reports/gnucash/report/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/invoice.scm
 #. src/business/business-reports/invoice.scm
-#: ../src/business/business-gnome/dialog-invoice.c:2229
-#: ../src/business/business-gnome/dialog-invoice.c:2259
-#: ../src/business/business-gnome/dialog-invoice.c:2289
-#: ../src/business/business-gnome/dialog-invoice.c:2314
+#: ../src/business/business-gnome/dialog-invoice.c:2224
+#: ../src/business/business-gnome/dialog-invoice.c:2254
+#: ../src/business/business-gnome/dialog-invoice.c:2284
+#: ../src/business/business-gnome/dialog-invoice.c:2309
 #: ../src/business/business-gnome/dialog-job.c:528
 #: ../src/business/business-gnome/dialog-job.c:538
 #: ../src/business/business-gnome/dialog-order.c:824
-#: ../src/business/business-gnome/glade/invoice.glade.h:5
-#: ../src/business/business-gnome/glade/job.glade.h:3
-#: ../intl-scm/guile-strings.c:3290 ../intl-scm/guile-strings.c:3632
-#: ../intl-scm/guile-strings.c:3690 ../intl-scm/guile-strings.c:3866
+#: ../src/business/business-gnome/glade/invoice.glade.h:4
+#: ../src/business/business-gnome/glade/job.glade.h:2
+#: ../intl-scm/guile-strings.c:6016 ../intl-scm/guile-strings.c:6358
+#: ../intl-scm/guile-strings.c:6416 ../intl-scm/guile-strings.c:6540
+#: ../intl-scm/guile-strings.c:6882 ../intl-scm/guile-strings.c:6940
+#: ../intl-scm/guile-strings.c:7118 ../intl-scm/guile-strings.c:7358
 msgid "Billing ID"
 msgstr "Rechnungsnummer"
 
-#: ../src/business/business-gnome/dialog-invoice.c:2232
-#: ../src/business/business-gnome/dialog-invoice.c:2262
-#: ../src/business/business-gnome/dialog-invoice.c:2292
+#: ../src/business/business-gnome/dialog-invoice.c:2227
+#: ../src/business/business-gnome/dialog-invoice.c:2257
+#: ../src/business/business-gnome/dialog-invoice.c:2287
 msgid "Is Paid?"
 msgstr "Bezahlt?"
 
-#: ../src/business/business-gnome/dialog-invoice.c:2235
-#: ../src/business/business-gnome/dialog-invoice.c:2265
-#: ../src/business/business-gnome/dialog-invoice.c:2295
-#: ../src/business/business-gnome/glade/invoice.glade.h:10
+#: ../src/business/business-gnome/dialog-invoice.c:2230
+#: ../src/business/business-gnome/dialog-invoice.c:2260
+#: ../src/business/business-gnome/dialog-invoice.c:2290
+#: ../src/business/business-gnome/glade/invoice.glade.h:9
 #: ../src/gnome/dialog-find-transactions.c:117
 msgid "Date Posted"
 msgstr "Buchungsdatum"
 
-#: ../src/business/business-gnome/dialog-invoice.c:2238
-#: ../src/business/business-gnome/dialog-invoice.c:2268
-#: ../src/business/business-gnome/dialog-invoice.c:2298
+#: ../src/business/business-gnome/dialog-invoice.c:2233
+#: ../src/business/business-gnome/dialog-invoice.c:2263
+#: ../src/business/business-gnome/dialog-invoice.c:2293
 msgid "Is Posted?"
 msgstr "Ist Gebucht?"
 
-#: ../src/business/business-gnome/dialog-invoice.c:2241
-#: ../src/business/business-gnome/dialog-invoice.c:2271
-#: ../src/business/business-gnome/dialog-invoice.c:2301
+#: ../src/business/business-gnome/dialog-invoice.c:2236
+#: ../src/business/business-gnome/dialog-invoice.c:2266
+#: ../src/business/business-gnome/dialog-invoice.c:2296
 #: ../src/business/business-gnome/dialog-order.c:814
-#: ../src/business/business-gnome/glade/invoice.glade.h:9
-#: ../src/business/business-gnome/glade/order.glade.h:7
+#: ../src/business/business-gnome/glade/invoice.glade.h:8
+#: ../src/business/business-gnome/glade/order.glade.h:6
 msgid "Date Opened"
 msgstr "Eröffnungsdatum"
 
-#: ../src/business/business-gnome/dialog-invoice.c:2244
-#: ../src/business/business-gnome/dialog-invoice.c:2274
+#: ../src/business/business-gnome/dialog-invoice.c:2239
+#: ../src/business/business-gnome/dialog-invoice.c:2269
 msgid "Company Name "
 msgstr "Firmenname "
 
-#: ../src/business/business-gnome/dialog-invoice.c:2248
-#: ../src/business/business-gnome/glade/invoice.glade.h:15
+#: ../src/business/business-gnome/dialog-invoice.c:2243
+#: ../src/business/business-gnome/glade/invoice.glade.h:14
 msgid "Invoice ID"
 msgstr "Rechnungsnummer"
 
-#: ../src/business/business-gnome/dialog-invoice.c:2253
+#: ../src/business/business-gnome/dialog-invoice.c:2248
 msgid "Bill Owner"
 msgstr "Rechnungsmandant"
 
-#: ../src/business/business-gnome/dialog-invoice.c:2256
+#: ../src/business/business-gnome/dialog-invoice.c:2251
 msgid "Bill Notes"
 msgstr "Bemerkungen Rechnung"
 
-#: ../src/business/business-gnome/dialog-invoice.c:2278
+#: ../src/business/business-gnome/dialog-invoice.c:2273
 msgid "Bill ID"
 msgstr "Rechnungsnummer"
 
-#: ../src/business/business-gnome/dialog-invoice.c:2283
+#: ../src/business/business-gnome/dialog-invoice.c:2278
 msgid "Voucher Owner"
 msgstr "Auslagenerstattung Mandant"
 
-#: ../src/business/business-gnome/dialog-invoice.c:2286
+#: ../src/business/business-gnome/dialog-invoice.c:2281
 msgid "Voucher Notes"
 msgstr "Bemerkungen Auslagenerstattung"
 
-#: ../src/business/business-gnome/dialog-invoice.c:2308
+#: ../src/business/business-gnome/dialog-invoice.c:2303
 msgid "Voucher ID"
 msgstr "Nummer Auslagenerstattung"
 
+#. src/report/standard-reports/gnucash/report/account-summary.scm
 #. src/report/standard-reports/account-summary.scm
 #. src/business/business-reports/owner-report.scm
-#: ../src/business/business-gnome/dialog-invoice.c:2316
-#: ../src/gnome-utils/gnc-tree-view-account.c:519
+#. src/business/business-reports/gnucash/report/owner-report.scm
+#: ../src/business/business-gnome/dialog-invoice.c:2311
+#: ../src/gnome-utils/gnc-tree-view-account.c:515
 #: ../src/gnome-utils/gnc-tree-view-price.c:459
 #: ../src/register/ledger-core/split-register-model.c:198
-#: ../intl-scm/guile-strings.c:1944 ../intl-scm/guile-strings.c:3404
+#: ../intl-scm/guile-strings.c:3278 ../intl-scm/guile-strings.c:4428
+#: ../intl-scm/guile-strings.c:6130 ../intl-scm/guile-strings.c:6654
 msgid "Type"
 msgstr "Art"
 
-#: ../src/business/business-gnome/dialog-invoice.c:2318
+#: ../src/business/business-gnome/dialog-invoice.c:2313
 #: ../src/register/ledger-core/split-register-model.c:152
 msgid "Paid"
 msgstr "Bezahlt"
 
-#: ../src/business/business-gnome/dialog-invoice.c:2321
+#: ../src/business/business-gnome/dialog-invoice.c:2316
 msgid "Posted"
 msgstr "Gebucht"
 
-#: ../src/business/business-gnome/dialog-invoice.c:2326
+#: ../src/business/business-gnome/dialog-invoice.c:2321
 #: ../src/business/business-gnome/dialog-order.c:831
-#: ../src/gnome/glade/lots.glade.h:21
+#: ../src/gnome/lot-viewer.c:610
 msgid "Opened"
 msgstr "Geöffnet"
 
 #. src/report/standard-reports/general-journal.scm
 #. src/report/standard-reports/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/general-journal.scm
+#. src/report/standard-reports/gnucash/report/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/transaction.scm
+#. src/report/standard-reports/gnucash/report/register.scm
 #. src/report/standard-reports/transaction.scm
 #. src/report/standard-reports/register.scm
-#: ../src/business/business-gnome/dialog-invoice.c:2328
+#: ../src/business/business-gnome/dialog-invoice.c:2323
 #: ../src/business/business-gnome/dialog-order.c:833
-#: ../src/business/business-gnome/glade/payment.glade.h:5
-#: ../src/gnome/glade/lots.glade.h:19 ../src/gnome/reconcile-list.c:222
+#: ../src/business/business-gnome/glade/payment.glade.h:4
+#: ../src/gnome/glade/lots.glade.h:15 ../src/gnome/reconcile-list.c:222
 #: ../src/register/ledger-core/split-register-model.c:123
-#: ../intl-scm/guile-strings.c:1278 ../intl-scm/guile-strings.c:1480
-#: ../intl-scm/guile-strings.c:2182 ../intl-scm/guile-strings.c:2244
-#: ../intl-scm/guile-strings.c:2436 ../intl-scm/guile-strings.c:2556
-#: ../intl-scm/guile-strings.c:2592
+#: ../intl-scm/guile-strings.c:1988 ../intl-scm/guile-strings.c:2190
+#: ../intl-scm/guile-strings.c:2612 ../intl-scm/guile-strings.c:2814
+#: ../intl-scm/guile-strings.c:3516 ../intl-scm/guile-strings.c:3578
+#: ../intl-scm/guile-strings.c:3770 ../intl-scm/guile-strings.c:3890
+#: ../intl-scm/guile-strings.c:3926 ../intl-scm/guile-strings.c:4666
+#: ../intl-scm/guile-strings.c:4728 ../intl-scm/guile-strings.c:4920
+#: ../intl-scm/guile-strings.c:5040 ../intl-scm/guile-strings.c:5076
 msgid "Num"
 msgstr "Nr"
 
-#: ../src/business/business-gnome/dialog-invoice.c:2397
+#: ../src/business/business-gnome/dialog-invoice.c:2392
 msgid "Find Bill"
 msgstr "Rechnung suchen"
 
-#: ../src/business/business-gnome/dialog-invoice.c:2403
+#: ../src/business/business-gnome/dialog-invoice.c:2398
 msgid "Find Expense Voucher"
 msgstr "Auslagenerstattung suchen"
 
 #. src/business/business-reports/fancy-invoice.scm
 #. src/business/business-reports/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/fancy-invoice.scm
+#. src/business/business-reports/gnucash/report/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/invoice.scm
 #. src/business/business-reports/invoice.scm
-#: ../src/business/business-gnome/dialog-invoice.c:2404
-#: ../intl-scm/guile-strings.c:3368 ../intl-scm/guile-strings.c:3682
-#: ../intl-scm/guile-strings.c:3910
+#: ../src/business/business-gnome/dialog-invoice.c:2399
+#: ../intl-scm/guile-strings.c:6094 ../intl-scm/guile-strings.c:6408
+#: ../intl-scm/guile-strings.c:6618 ../intl-scm/guile-strings.c:6932
+#: ../intl-scm/guile-strings.c:7162 ../intl-scm/guile-strings.c:7402
 msgid "Expense Voucher"
 msgstr "Auslagenerstattung"
 
-#: ../src/business/business-gnome/dialog-invoice.c:2409
+#: ../src/business/business-gnome/dialog-invoice.c:2404
 msgid "Find Invoice"
 msgstr "Rechnung suchen"
 
 #. src/report/report-system/options-utilities.scm
 #. src/report/standard-reports/general-journal.scm
 #. src/report/standard-reports/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/general-journal.scm
+#. src/report/standard-reports/gnucash/report/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/transaction.scm
+#. src/report/standard-reports/gnucash/report/register.scm
 #. src/report/standard-reports/transaction.scm
 #. src/report/standard-reports/register.scm
 #. src/business/business-reports/owner-report.scm
-#: ../src/business/business-gnome/dialog-invoice.c:2466
-#: ../src/business/business-gnome/glade/payment.glade.h:2
-#: ../src/gnome/glade/lots.glade.h:8 ../src/gnome/reconcile-list.c:215
-#: ../src/import-export/generic-import.glade.h:12
+#. src/business/business-reports/gnucash/report/owner-report.scm
+#: ../src/business/business-gnome/dialog-invoice.c:2461
+#: ../src/business/business-gnome/glade/payment.glade.h:1
+#: ../src/gnome/glade/lots.glade.h:6 ../src/gnome/reconcile-list.c:215
+#: ../src/import-export/generic-import.glade.h:10
 #: ../src/import-export/hbci/glade/hbci.glade.h:8
-#: ../src/import-export/qif-import/qif.glade.h:5
-#: ../intl-scm/guile-strings.c:778 ../intl-scm/guile-strings.c:1288
-#: ../intl-scm/guile-strings.c:1502 ../intl-scm/guile-strings.c:2206
-#: ../intl-scm/guile-strings.c:2258 ../intl-scm/guile-strings.c:2360
-#: ../intl-scm/guile-strings.c:2488 ../intl-scm/guile-strings.c:2622
-#: ../intl-scm/guile-strings.c:2660 ../intl-scm/guile-strings.c:3408
+#: ../src/import-export/import-main-matcher.c:420
+#: ../src/import-export/import-match-picker.c:334
+#: ../src/import-export/import-match-picker.c:374
+#: ../src/import-export/qif-import/druid-qif-import.c:2171
+#: ../src/import-export/qif-import/druid-qif-import.c:2203
+#: ../intl-scm/guile-strings.c:1290 ../intl-scm/guile-strings.c:1998
+#: ../intl-scm/guile-strings.c:2212 ../intl-scm/guile-strings.c:2622
+#: ../intl-scm/guile-strings.c:2836 ../intl-scm/guile-strings.c:3540
+#: ../intl-scm/guile-strings.c:3592 ../intl-scm/guile-strings.c:3694
+#: ../intl-scm/guile-strings.c:3822 ../intl-scm/guile-strings.c:3956
+#: ../intl-scm/guile-strings.c:3994 ../intl-scm/guile-strings.c:4690
+#: ../intl-scm/guile-strings.c:4742 ../intl-scm/guile-strings.c:4844
+#: ../intl-scm/guile-strings.c:4972 ../intl-scm/guile-strings.c:5106
+#: ../intl-scm/guile-strings.c:5144 ../intl-scm/guile-strings.c:6134
+#: ../intl-scm/guile-strings.c:6658
 msgid "Amount"
 msgstr "Betrag"
 
-#: ../src/business/business-gnome/dialog-invoice.c:2470
+#: ../src/business/business-gnome/dialog-invoice.c:2465
 msgid "Due"
 msgstr "Fällig"
 
-#: ../src/business/business-gnome/dialog-invoice.c:2512
+#: ../src/business/business-gnome/dialog-invoice.c:2507
 msgid "Due Bills Reminder"
 msgstr "Erinnerung an fällige Rechnungen"
 
-#: ../src/business/business-gnome/dialog-invoice.c:2514
+#: ../src/business/business-gnome/dialog-invoice.c:2509
 msgid "The following bills are due"
 msgstr "Die folgenden Rechnungen sind fällig"
 
-#: ../src/business/business-gnome/dialog-invoice.c:2515
+#: ../src/business/business-gnome/dialog-invoice.c:2510
 msgid "The following bill is due"
 msgstr "Die folgende Rechnung ist fällig"
 
@@ -1093,13 +1167,13 @@
 msgstr "Nur aktive?"
 
 #: ../src/business/business-gnome/dialog-job.c:530
-#: ../src/business/business-gnome/glade/job.glade.h:8
+#: ../src/business/business-gnome/glade/job.glade.h:7
 msgid "Job Number"
 msgstr "Auftragsnummer"
 
 #: ../src/business/business-gnome/dialog-job.c:532
 #: ../src/business/business-gnome/dialog-job.c:542
-#: ../src/business/business-gnome/glade/job.glade.h:7
+#: ../src/business/business-gnome/glade/job.glade.h:6
 msgid "Job Name"
 msgstr "Auftragsname"
 
@@ -1145,7 +1219,7 @@
 msgstr "Bemerkungen Bestellung"
 
 #: ../src/business/business-gnome/dialog-order.c:810
-#: ../src/business/business-gnome/glade/order.glade.h:6
+#: ../src/business/business-gnome/glade/order.glade.h:5
 msgid "Date Closed"
 msgstr "Schlussdatum"
 
@@ -1158,12 +1232,12 @@
 msgstr "Mandantname"
 
 #: ../src/business/business-gnome/dialog-order.c:818
-#: ../src/business/business-gnome/glade/order.glade.h:13
+#: ../src/business/business-gnome/glade/order.glade.h:12
 msgid "Order ID"
 msgstr "Bestellungsnummer"
 
 #: ../src/business/business-gnome/dialog-order.c:829
-#: ../src/gnome/glade/lots.glade.h:10
+#: ../src/gnome/lot-viewer.c:615
 msgid "Closed"
 msgstr "Geschlossen"
 
@@ -1171,31 +1245,31 @@
 msgid "Find Order"
 msgstr "Bestellung suchen"
 
-#: ../src/business/business-gnome/dialog-payment.c:226
+#: ../src/business/business-gnome/dialog-payment.c:228
 msgid ""
 "You must enter the amount of the payment.  The payment amount must be "
 "greater than zero."
 msgstr ""
 "Sie müssen den Zahlungsbetrag angeben. Der Betrag muss größer als Null sein."
 
-#: ../src/business/business-gnome/dialog-payment.c:235
+#: ../src/business/business-gnome/dialog-payment.c:237
 msgid "You must select a company for payment processing."
 msgstr "Sie müssen eine Firma für die Zahlungsverarbeitung auswählen."
 
-#: ../src/business/business-gnome/dialog-payment.c:243
+#: ../src/business/business-gnome/dialog-payment.c:245
 msgid "You must select a transfer account from the account tree."
 msgstr "Sie müssen ein Herkunftskonto aus der Kontenhierarchie wählen."
 
-#: ../src/business/business-gnome/dialog-payment.c:251
+#: ../src/business/business-gnome/dialog-payment.c:253
 msgid "You must enter an account name for posting."
 msgstr "Sie müssen einen Kontonamen zum Buchen eingeben."
 
-#: ../src/business/business-gnome/dialog-payment.c:260
+#: ../src/business/business-gnome/dialog-payment.c:262
 #, c-format
 msgid "Your selected post account, %s, does not exist"
 msgstr "Das gewählte Buchungskonto %s existiert nicht"
 
-#: ../src/business/business-gnome/dialog-payment.c:460
+#: ../src/business/business-gnome/dialog-payment.c:463
 #, c-format
 msgid ""
 "You have no valid \"Post To\" accounts.  Please create an account of type \"%"
@@ -1224,7 +1298,7 @@
 msgstr "Zulieferer bearbeiten"
 
 #: ../src/business/business-gnome/dialog-vendor.c:296
-#: ../src/business/business-gnome/glade/vendor.glade.h:10
+#: ../src/business/business-gnome/glade/vendor.glade.h:9
 msgid "New Vendor"
 msgstr "Neuer Zulieferer"
 
@@ -1266,33 +1340,32 @@
 msgstr "<b>Zahlungsbedingungen</b>"
 
 #: ../src/business/business-gnome/glade/billterms.glade.h:4
-msgid "Absolute Day-of-the-month"
-msgstr "Absoluter Tag des Monats"
-
-#: ../src/business/business-gnome/glade/billterms.glade.h:5
 msgid "Cancel your changes"
 msgstr "Änderungen verwerfen"
 
-#: ../src/business/business-gnome/glade/billterms.glade.h:6
-msgid "Choose the type of Billing Term"
-msgstr "Wählen Sie die Art der Zahlungsbedingungen"
-
-#: ../src/business/business-gnome/glade/billterms.glade.h:7
+#: ../src/business/business-gnome/glade/billterms.glade.h:5
 msgid "Close this window"
 msgstr "Dieses Fenster schließen"
 
-#: ../src/business/business-gnome/glade/billterms.glade.h:8
+#: ../src/business/business-gnome/glade/billterms.glade.h:6
 msgid "Commit this Billing Term"
 msgstr "Zahlungsbedingungen abspeichern"
 
-#: ../src/business/business-gnome/glade/billterms.glade.h:9
+#: ../src/business/business-gnome/glade/billterms.glade.h:7
 msgid "Create a new Billing Term"
 msgstr "Neue Zahlungsbedingungen erstellen"
 
-#: ../src/business/business-gnome/glade/billterms.glade.h:10
+#: ../src/business/business-gnome/glade/billterms.glade.h:8
 msgid "Cutoff Day: "
 msgstr "Stichtag Monatswechsel: "
 
+#: ../src/business/business-gnome/glade/billterms.glade.h:10
+#, fuzzy
+msgid ""
+"Days\n"
+"Proximo"
+msgstr "Im nächsten Monat"
+
 #: ../src/business/business-gnome/glade/billterms.glade.h:12
 msgid "De_scription:"
 msgstr "_Beschreibung:"
@@ -1326,25 +1399,25 @@
 msgid "Edit the current Billing Term"
 msgstr "Ausgewählte Zahlungsbedingungen bearbeiten"
 
-#: ../src/business/business-gnome/glade/billterms.glade.h:21
-msgid "Number of days from now"
-msgstr "Anzahl Tage von jetzt an gerechnet"
-
-#: ../src/business/business-gnome/glade/billterms.glade.h:23
+#: ../src/business/business-gnome/glade/billterms.glade.h:22
 msgid "Table"
 msgstr "Tabelle"
 
 #. src/business/business-reports/fancy-invoice.scm
 #. src/business/business-reports/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/fancy-invoice.scm
+#. src/business/business-reports/gnucash/report/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/invoice.scm
 #. src/business/business-reports/invoice.scm
-#: ../src/business/business-gnome/glade/billterms.glade.h:24
-#: ../src/business/business-gnome/glade/invoice.glade.h:24
-#: ../intl-scm/guile-strings.c:3382 ../intl-scm/guile-strings.c:3692
-#: ../intl-scm/guile-strings.c:3922
+#: ../src/business/business-gnome/glade/billterms.glade.h:23
+#: ../src/business/business-gnome/glade/invoice.glade.h:23
+#: ../intl-scm/guile-strings.c:6108 ../intl-scm/guile-strings.c:6418
+#: ../intl-scm/guile-strings.c:6632 ../intl-scm/guile-strings.c:6942
+#: ../intl-scm/guile-strings.c:7174 ../intl-scm/guile-strings.c:7414
 msgid "Terms"
 msgstr "Bedingungen"
 
-#: ../src/business/business-gnome/glade/billterms.glade.h:25
+#: ../src/business/business-gnome/glade/billterms.glade.h:24
 msgid ""
 "The cutoff day for applying bills to the next month.  After the cutoff, "
 "bills are applied to the following month.  Negative values count backwards "
@@ -1354,29 +1427,29 @@
 "nach dem Stichtag werden im folgenden Monat berechnet. Negative Werte zählen "
 "vom Monatsende rückwärts."
 
-#: ../src/business/business-gnome/glade/billterms.glade.h:26
+#: ../src/business/business-gnome/glade/billterms.glade.h:25
 msgid "The day of the month bills are due"
 msgstr "Tag des Monats, an dem Rechnungen fällig werden"
 
-#: ../src/business/business-gnome/glade/billterms.glade.h:27
+#: ../src/business/business-gnome/glade/billterms.glade.h:26
 msgid "The description of the Billing Term, printed on invoices"
 msgstr ""
 "Beschreibung der Zahlungsbedingungen, wie sie auf eine Rechnung gedruckt "
 "werden"
 
-#: ../src/business/business-gnome/glade/billterms.glade.h:28
+#: ../src/business/business-gnome/glade/billterms.glade.h:27
 msgid "The discount percentage applied if paid early."
 msgstr "Prozent Skonto bei früher Zahlung"
 
-#: ../src/business/business-gnome/glade/billterms.glade.h:29
+#: ../src/business/business-gnome/glade/billterms.glade.h:28
 msgid "The internal name of the Billing Term."
 msgstr "Interner Name für die Zahlungsbedingungen."
 
-#: ../src/business/business-gnome/glade/billterms.glade.h:30
+#: ../src/business/business-gnome/glade/billterms.glade.h:29
 msgid "The last day of the month for the early payment discount."
 msgstr "Letzter Tag im Monat für Frühzahlungs-Skonto."
 
-#: ../src/business/business-gnome/glade/billterms.glade.h:31
+#: ../src/business/business-gnome/glade/billterms.glade.h:30
 msgid ""
 "The number of days after the post date during which a discount will be "
 "applied for early payment."
@@ -1384,28 +1457,24 @@
 "Die Anzahl der Tage nach dem Rechnungsdatum, in denen ein Skonto für "
 "frühzeitige Zahlung gewährt wird."
 
-#: ../src/business/business-gnome/glade/billterms.glade.h:32
+#: ../src/business/business-gnome/glade/billterms.glade.h:31
 msgid "The number of days to pay the bill after the post date."
 msgstr ""
 "Die Anzahl der Tage nach Ausstellung, in denen die Rechnung gezahlt werden "
 "soll."
 
-#: ../src/business/business-gnome/glade/billterms.glade.h:33
+#: ../src/business/business-gnome/glade/billterms.glade.h:32
 msgid "The percentage discount applied for early payment."
 msgstr "Prozent Skonto bei früher Zahlung."
 
-#: ../src/business/business-gnome/glade/billterms.glade.h:34
-msgid "Type Menu"
-msgstr "Typ-Menü"
-
-#: ../src/business/business-gnome/glade/billterms.glade.h:35
-#: ../src/report/report-gnome/report.glade.h:21
+#: ../src/business/business-gnome/glade/billterms.glade.h:33
+#: ../src/report/report-gnome/report.glade.h:18
 msgid "_Name:"
 msgstr "_Name:"
 
-#: ../src/business/business-gnome/glade/billterms.glade.h:36
+#: ../src/business/business-gnome/glade/billterms.glade.h:34
 #: ../src/gnome/glade/price.glade.h:25
-#: ../src/gnome-utils/glade/commodity.glade.h:23
+#: ../src/gnome-utils/glade/commodity.glade.h:22
 msgid "_Type:"
 msgstr "_Typ:"
 
@@ -1436,15 +1505,15 @@
 "geöffnet."
 
 #: ../src/business/business-gnome/glade/businessprefs.glade.h:6
-#: ../src/gnome-utils/glade/preferences.glade.h:76
+#: ../src/gnome-utils/glade/preferences.glade.h:83
 msgid "Number of _rows:"
 msgstr "Anzahl der _Zeilen:"
 
 #: ../src/business/business-gnome/glade/businessprefs.glade.h:7
-#: ../src/gnome/glade/sched-xact.glade.h:142
-#: ../src/import-export/generic-import.glade.h:46
+#: ../src/gnome/glade/sched-xact.glade.h:168
+#: ../src/import-export/generic-import.glade.h:40
 #: ../src/import-export/hbci/glade/hbciprefs.glade.h:3
-#: ../src/import-export/qif-import/qif.glade.h:64
+#: ../src/import-export/qif-import/qif.glade.h:57
 msgid "Preferences"
 msgstr "Einstellungen"
 
@@ -1511,175 +1580,184 @@
 
 #. src/report/standard-reports/general-journal.scm
 #. src/report/standard-reports/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/general-journal.scm
+#. src/report/standard-reports/gnucash/report/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/account-summary.scm
+#. src/report/standard-reports/gnucash/report/transaction.scm
+#. src/report/standard-reports/gnucash/report/register.scm
 #. src/report/standard-reports/account-summary.scm
 #. src/report/standard-reports/transaction.scm
 #. src/report/standard-reports/register.scm
 #. src/business/business-reports/fancy-invoice.scm
 #. src/business/business-reports/owner-report.scm
 #. src/business/business-reports/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/fancy-invoice.scm
+#. src/business/business-reports/gnucash/report/owner-report.scm
+#. src/business/business-reports/gnucash/report/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/invoice.scm
 #. src/business/business-reports/invoice.scm
 #: ../src/business/business-gnome/glade/choose-owner.glade.h:2
-#: ../src/business/business-gnome/glade/date-close.glade.h:2
+#: ../src/business/business-gnome/glade/date-close.glade.h:1
 #: ../src/business/business-ledger/gncEntryLedgerModel.c:75
 #: ../src/gnome/dialog-find-transactions.c:128
-#: ../src/gnome/dialog-tax-info.c:727 ../src/gnome/glade/lots.glade.h:13
+#: ../src/gnome/dialog-tax-info.c:719 ../src/gnome/glade/lots.glade.h:10
 #: ../src/gnome/reconcile-list.c:219
 #: ../src/gnome-utils/gnc-tree-model-budget.c:102
-#: ../src/gnome-utils/gnc-tree-view-account.c:535
-#: ../src/import-export/generic-import.glade.h:19
-#: ../src/import-export/qif-import/qif.glade.h:19
+#: ../src/gnome-utils/gnc-tree-view-account.c:531
+#: ../src/import-export/generic-import.glade.h:16
+#: ../src/import-export/import-main-matcher.c:421
+#: ../src/import-export/import-match-picker.c:335
+#: ../src/import-export/import-match-picker.c:375
+#: ../src/import-export/qif-import/druid-qif-import.c:2164
+#: ../src/import-export/qif-import/druid-qif-import.c:2196
 #: ../src/register/ledger-core/split-register-model.c:139
-#: ../intl-scm/guile-strings.c:1280 ../intl-scm/guile-strings.c:1482
-#: ../intl-scm/guile-strings.c:1946 ../intl-scm/guile-strings.c:2186
-#: ../intl-scm/guile-strings.c:2246 ../intl-scm/guile-strings.c:2364
-#: ../intl-scm/guile-strings.c:2440 ../intl-scm/guile-strings.c:2558
-#: ../intl-scm/guile-strings.c:2598 ../intl-scm/guile-strings.c:3190
-#: ../intl-scm/guile-strings.c:3218 ../intl-scm/guile-strings.c:3406
-#: ../intl-scm/guile-strings.c:3508 ../intl-scm/guile-strings.c:3536
-#: ../intl-scm/guile-strings.c:3766 ../intl-scm/guile-strings.c:3794
+#: ../intl-scm/guile-strings.c:1990 ../intl-scm/guile-strings.c:2192
+#: ../intl-scm/guile-strings.c:2614 ../intl-scm/guile-strings.c:2816
+#: ../intl-scm/guile-strings.c:3280 ../intl-scm/guile-strings.c:3520
+#: ../intl-scm/guile-strings.c:3580 ../intl-scm/guile-strings.c:3698
+#: ../intl-scm/guile-strings.c:3774 ../intl-scm/guile-strings.c:3892
+#: ../intl-scm/guile-strings.c:3932 ../intl-scm/guile-strings.c:4430
+#: ../intl-scm/guile-strings.c:4670 ../intl-scm/guile-strings.c:4730
+#: ../intl-scm/guile-strings.c:4848 ../intl-scm/guile-strings.c:4924
+#: ../intl-scm/guile-strings.c:5042 ../intl-scm/guile-strings.c:5082
+#: ../intl-scm/guile-strings.c:5916 ../intl-scm/guile-strings.c:5944
+#: ../intl-scm/guile-strings.c:6132 ../intl-scm/guile-strings.c:6234
+#: ../intl-scm/guile-strings.c:6262 ../intl-scm/guile-strings.c:6440
+#: ../intl-scm/guile-strings.c:6468 ../intl-scm/guile-strings.c:6656
+#: ../intl-scm/guile-strings.c:6758 ../intl-scm/guile-strings.c:6786
+#: ../intl-scm/guile-strings.c:7018 ../intl-scm/guile-strings.c:7046
+#: ../intl-scm/guile-strings.c:7258 ../intl-scm/guile-strings.c:7286
 msgid "Description"
 msgstr "Beschreibung"
 
 #: ../src/business/business-gnome/glade/customer.glade.h:1
-#: ../src/business/business-gnome/glade/date-close.glade.h:1
-#: ../src/business/business-gnome/glade/employee.glade.h:1
+#: ../src/business/business-gnome/glade/employee.glade.h:3
 #: ../src/business/business-gnome/glade/invoice.glade.h:2
 #: ../src/business/business-gnome/glade/job.glade.h:1
 #: ../src/business/business-gnome/glade/order.glade.h:2
-#: ../src/business/business-gnome/glade/payment.glade.h:1
 #: ../src/business/business-gnome/glade/vendor.glade.h:1
-#: ../src/gnome/glade/acctperiod.glade.h:1 ../src/gnome/glade/lots.glade.h:1
-#: ../src/gnome-utils/glade/gnc-date-format.glade.h:3
-#: ../src/gnome-utils/glade/transfer.glade.h:1
-msgid "*"
-msgstr "*"
+msgid "Active"
+msgstr "Aktiv"
 
 #: ../src/business/business-gnome/glade/customer.glade.h:2
 #: ../src/business/business-gnome/glade/employee.glade.h:4
-#: ../src/business/business-gnome/glade/invoice.glade.h:3
-#: ../src/business/business-gnome/glade/job.glade.h:2
-#: ../src/business/business-gnome/glade/order.glade.h:3
 #: ../src/business/business-gnome/glade/vendor.glade.h:2
-msgid "Active"
-msgstr "Aktiv"
-
-#: ../src/business/business-gnome/glade/customer.glade.h:3
-#: ../src/business/business-gnome/glade/employee.glade.h:5
-#: ../src/business/business-gnome/glade/vendor.glade.h:3
 msgid "Address: "
 msgstr "Adresse: "
 
-#: ../src/business/business-gnome/glade/customer.glade.h:4
+#: ../src/business/business-gnome/glade/customer.glade.h:3
 msgid "Billing Address"
 msgstr "Rechnungsadresse"
 
-#: ../src/business/business-gnome/glade/customer.glade.h:5
-#: ../src/business/business-gnome/glade/invoice.glade.h:6
-#: ../src/business/business-gnome/glade/order.glade.h:4
+#: ../src/business/business-gnome/glade/customer.glade.h:4
+#: ../src/business/business-gnome/glade/invoice.glade.h:5
+#: ../src/business/business-gnome/glade/order.glade.h:3
 msgid "Billing Information"
 msgstr "Rechnungs-Informationen"
 
-#: ../src/business/business-gnome/glade/customer.glade.h:6
-#: ../src/business/business-gnome/glade/vendor.glade.h:4
+#: ../src/business/business-gnome/glade/customer.glade.h:5
+#: ../src/business/business-gnome/glade/vendor.glade.h:3
 msgid "Company Name: "
 msgstr "Firmenname: "
 
-#: ../src/business/business-gnome/glade/customer.glade.h:7
+#: ../src/business/business-gnome/glade/customer.glade.h:6
 msgid "Credit Limit: "
 msgstr "Kreditrahmen: "
 
-#: ../src/business/business-gnome/glade/customer.glade.h:8
-#: ../src/business/business-gnome/glade/employee.glade.h:8
-#: ../src/business/business-gnome/glade/vendor.glade.h:5
+#: ../src/business/business-gnome/glade/customer.glade.h:7
+#: ../src/business/business-gnome/glade/employee.glade.h:7
+#: ../src/business/business-gnome/glade/vendor.glade.h:4
 msgid "Currency: "
 msgstr "Währung: "
 
 #. src/business/business-reports/owner-report.scm
-#: ../src/business/business-gnome/glade/customer.glade.h:9
-#: ../src/business/business-gnome/glade/invoice.glade.h:7
-#: ../src/business/business-gnome/search-owner.c:251
+#. src/business/business-reports/gnucash/report/owner-report.scm
+#: ../src/business/business-gnome/glade/customer.glade.h:8
+#: ../src/business/business-gnome/glade/invoice.glade.h:6
+#: ../src/business/business-gnome/search-owner.c:236
 #: ../src/register/ledger-core/split-register-model.c:135
-#: ../intl-scm/guile-strings.c:3472
+#: ../intl-scm/guile-strings.c:6198 ../intl-scm/guile-strings.c:6722
 msgid "Customer"
 msgstr "Kunde"
 
-#: ../src/business/business-gnome/glade/customer.glade.h:10
+#: ../src/business/business-gnome/glade/customer.glade.h:9
 msgid "Customer Number: "
 msgstr "Kundennummer: "
 
-#: ../src/business/business-gnome/glade/customer.glade.h:11
+#: ../src/business/business-gnome/glade/customer.glade.h:10
 msgid "Discount: "
 msgstr "Skonto: "
 
-#: ../src/business/business-gnome/glade/customer.glade.h:12
-#: ../src/business/business-gnome/glade/employee.glade.h:11
-#: ../src/business/business-gnome/glade/vendor.glade.h:6
+#: ../src/business/business-gnome/glade/customer.glade.h:11
+#: ../src/business/business-gnome/glade/employee.glade.h:10
+#: ../src/business/business-gnome/glade/vendor.glade.h:5
 msgid "Email: "
 msgstr "E-Mail: "
 
+#: ../src/business/business-gnome/glade/customer.glade.h:12
+#: ../src/business/business-gnome/glade/employee.glade.h:13
+#: ../src/business/business-gnome/glade/vendor.glade.h:6
+msgid "Fax: "
+msgstr "Fax: "
+
 #: ../src/business/business-gnome/glade/customer.glade.h:13
 #: ../src/business/business-gnome/glade/employee.glade.h:14
 #: ../src/business/business-gnome/glade/vendor.glade.h:7
-msgid "Fax: "
-msgstr "Fax: "
+msgid "Identification"
+msgstr "Identifizierung"
 
 #: ../src/business/business-gnome/glade/customer.glade.h:14
-#: ../src/business/business-gnome/glade/employee.glade.h:15
+#: ../src/business/business-gnome/glade/employee.glade.h:17
 #: ../src/business/business-gnome/glade/vendor.glade.h:8
-msgid "Identification"
-msgstr "Identifizierung"
-
-#: ../src/business/business-gnome/glade/customer.glade.h:15
-#: ../src/business/business-gnome/glade/employee.glade.h:18
-#: ../src/business/business-gnome/glade/vendor.glade.h:9
 msgid "Name: "
 msgstr "Name: "
 
+#. src/report/standard-reports/gnucash/report/account-summary.scm
 #. src/report/standard-reports/account-summary.scm
-#: ../src/business/business-gnome/glade/customer.glade.h:17
-#: ../src/business/business-gnome/glade/invoice.glade.h:21
-#: ../src/business/business-gnome/glade/order.glade.h:10
-#: ../src/business/business-gnome/glade/vendor.glade.h:11
+#: ../src/business/business-gnome/glade/customer.glade.h:16
+#: ../src/business/business-gnome/glade/invoice.glade.h:20
+#: ../src/business/business-gnome/glade/order.glade.h:9
+#: ../src/business/business-gnome/glade/vendor.glade.h:10
 #: ../src/gnome/dialog-find-transactions.c:120
-#: ../src/gnome-utils/gnc-tree-view-account.c:637
+#: ../src/gnome-utils/gnc-tree-view-account.c:633
 #: ../src/register/ledger-core/split-register-model.c:310
-#: ../intl-scm/guile-strings.c:1952
+#: ../intl-scm/guile-strings.c:3286 ../intl-scm/guile-strings.c:4436
 msgid "Notes"
 msgstr "Bemerkung"
 
-#: ../src/business/business-gnome/glade/customer.glade.h:18
-#: ../src/business/business-gnome/glade/vendor.glade.h:12
+#: ../src/business/business-gnome/glade/customer.glade.h:17
+#: ../src/business/business-gnome/glade/vendor.glade.h:11
 msgid "Override the global Tax Table?"
 msgstr "Globale Steuertabelle ignorieren?"
 
-#: ../src/business/business-gnome/glade/customer.glade.h:19
-#: ../src/business/business-gnome/glade/employee.glade.h:21
-#: ../src/business/business-gnome/glade/vendor.glade.h:15
+#: ../src/business/business-gnome/glade/customer.glade.h:18
+#: ../src/business/business-gnome/glade/employee.glade.h:20
+#: ../src/business/business-gnome/glade/vendor.glade.h:14
 msgid "Phone: "
 msgstr "Telefon: "
 
-#: ../src/business/business-gnome/glade/customer.glade.h:20
+#: ../src/business/business-gnome/glade/customer.glade.h:19
 msgid "Shipping Address"
 msgstr "Lieferadresse"
 
-#: ../src/business/business-gnome/glade/customer.glade.h:21
+#: ../src/business/business-gnome/glade/customer.glade.h:20
 msgid "Shipping Information"
 msgstr "Lieferadresse"
 
-#: ../src/business/business-gnome/glade/customer.glade.h:22
+#: ../src/business/business-gnome/glade/customer.glade.h:21
 msgid "Tax Included: "
 msgstr "Inkl. Steuern: "
 
-#: ../src/business/business-gnome/glade/customer.glade.h:23
+#: ../src/business/business-gnome/glade/customer.glade.h:22
 msgid "Tax Table: "
 msgstr "Steuertabelle: "
 
-#: ../src/business/business-gnome/glade/customer.glade.h:24
-#: ../src/business/business-gnome/glade/vendor.glade.h:18
+#: ../src/business/business-gnome/glade/customer.glade.h:23
+#: ../src/business/business-gnome/glade/vendor.glade.h:17
 msgid "Terms: "
 msgstr "Bedingungen: "
 
-#: ../src/business/business-gnome/glade/customer.glade.h:25
+#: ../src/business/business-gnome/glade/customer.glade.h:24
 msgid ""
 "The customer ID number.  If left blank a reasonable number will be chosen "
 "for you"
@@ -1687,80 +1765,81 @@
 "Die Kundennummer. Falls keine angegeben wird, wird automatisch ein "
 "sinnvoller Wert gewählt."
 
-#: ../src/business/business-gnome/glade/customer.glade.h:26
+#: ../src/business/business-gnome/glade/customer.glade.h:25
 msgid "What Tax Table should be applied to this customer?"
 msgstr "Welche Steuertabelle soll bei diesem Kunden angewendet werden?"
 
-#: ../src/business/business-gnome/glade/date-close.glade.h:3
+#: ../src/business/business-gnome/glade/date-close.glade.h:2
 msgid "Question"
 msgstr "Frage"
 
-#: ../src/business/business-gnome/glade/date-close.glade.h:4
+#: ../src/business/business-gnome/glade/date-close.glade.h:3
 msgid "acct"
 msgstr "Konto"
 
-#: ../src/business/business-gnome/glade/date-close.glade.h:5
+#: ../src/business/business-gnome/glade/date-close.glade.h:4
 msgid "duedate"
 msgstr "Fällig"
 
-#: ../src/business/business-gnome/glade/date-close.glade.h:6
+#: ../src/business/business-gnome/glade/date-close.glade.h:5
 msgid "postd"
 msgstr "Gebucht"
 
-#: ../src/business/business-gnome/glade/date-close.glade.h:7
+#: ../src/business/business-gnome/glade/date-close.glade.h:6
 msgid "question"
 msgstr "Frage"
 
-#: ../src/business/business-gnome/glade/employee.glade.h:2
+#: ../src/business/business-gnome/glade/employee.glade.h:1
 msgid "Access Control"
 msgstr "Zugriffskontrolle"
 
-#: ../src/business/business-gnome/glade/employee.glade.h:3
+#: ../src/business/business-gnome/glade/employee.glade.h:2
 msgid "Access Control List"
 msgstr "Zugriffskontroll-Liste"
 
-#: ../src/business/business-gnome/glade/employee.glade.h:6
+#: ../src/business/business-gnome/glade/employee.glade.h:5
 msgid "Billing"
 msgstr "Rechnung ausstellen"
 
-#: ../src/business/business-gnome/glade/employee.glade.h:7
-#: ../src/gnome-utils/dialog-transfer.c:1734
+#: ../src/business/business-gnome/glade/employee.glade.h:6
+#: ../src/gnome-utils/dialog-transfer.c:1736
 msgid "Credit Account"
 msgstr "Habenkonto"
 
-#: ../src/business/business-gnome/glade/employee.glade.h:9
+#: ../src/business/business-gnome/glade/employee.glade.h:8
 msgid "Default Hours per Day: "
 msgstr "Voreinstellung Stunden pro Tag: "
 
-#: ../src/business/business-gnome/glade/employee.glade.h:10
+#: ../src/business/business-gnome/glade/employee.glade.h:9
 msgid "Default Rate: "
 msgstr "Voreinstellung Stundenlohn: "
 
 #. src/business/business-reports/owner-report.scm
-#: ../src/business/business-gnome/glade/employee.glade.h:12
-#: ../src/business/business-gnome/search-owner.c:254
-#: ../intl-scm/guile-strings.c:3476
+#. src/business/business-reports/gnucash/report/owner-report.scm
+#: ../src/business/business-gnome/glade/employee.glade.h:11
+#: ../src/business/business-gnome/search-owner.c:238
+#: ../intl-scm/guile-strings.c:6202 ../intl-scm/guile-strings.c:6726
 msgid "Employee"
 msgstr "Mitarbeiter"
 
-#: ../src/business/business-gnome/glade/employee.glade.h:13
+#: ../src/business/business-gnome/glade/employee.glade.h:12
 msgid "Employee Number: "
 msgstr "Mitarbeiternummer: "
 
-#: ../src/business/business-gnome/glade/employee.glade.h:16
+#: ../src/business/business-gnome/glade/employee.glade.h:15
 msgid "Interface"
 msgstr "Interface"
 
-#: ../src/business/business-gnome/glade/employee.glade.h:17
+#: ../src/business/business-gnome/glade/employee.glade.h:16
 msgid "Language: "
 msgstr "Sprache: "
 
-#: ../src/business/business-gnome/glade/employee.glade.h:20
-#: ../src/business/business-gnome/glade/vendor.glade.h:13
+#: ../src/business/business-gnome/glade/employee.glade.h:19
+#: ../src/business/business-gnome/glade/vendor.glade.h:12
 msgid "Payment Address"
 msgstr "Zahlungsadresse"
 
-#: ../src/business/business-gnome/glade/employee.glade.h:22
+#: ../src/business/business-gnome/glade/employee.glade.h:21
 msgid ""
 "The employee ID number.  If left blank a reasonable number will be chosen "
 "for you"
@@ -1768,7 +1847,7 @@
 "Die Mitarbeiternummer. Falls keine angegeben wird, wird automatisch ein "
 "sinnvoller Wert gewählt."
 
-#: ../src/business/business-gnome/glade/employee.glade.h:23
+#: ../src/business/business-gnome/glade/employee.glade.h:22
 msgid "Username: "
 msgstr "Benutzername: "
 
@@ -1777,52 +1856,52 @@
 msgid "(owner)"
 msgstr "(Mandant)"
 
-#: ../src/business/business-gnome/glade/invoice.glade.h:4
+#: ../src/business/business-gnome/glade/invoice.glade.h:3
 msgid "Additional to Card:"
 msgstr "Zusätzlich auf Karte:"
 
-#: ../src/business/business-gnome/glade/invoice.glade.h:8
+#: ../src/business/business-gnome/glade/invoice.glade.h:7
 msgid "Customer: "
 msgstr "Kunde: "
 
-#: ../src/business/business-gnome/glade/invoice.glade.h:11
+#: ../src/business/business-gnome/glade/invoice.glade.h:10
 msgid "Default Chargeback Project"
 msgstr "Standard-Auftrag zur Rückzahlung"
 
-#: ../src/business/business-gnome/glade/invoice.glade.h:12
+#: ../src/business/business-gnome/glade/invoice.glade.h:11
 msgid "Extra Payments"
 msgstr "Zusätzliche Zahlungen"
 
-#: ../src/business/business-gnome/glade/invoice.glade.h:14
+#: ../src/business/business-gnome/glade/invoice.glade.h:13
 msgid "Invoice Entries"
 msgstr "Rechnungseinträge"
 
-#: ../src/business/business-gnome/glade/invoice.glade.h:16
+#: ../src/business/business-gnome/glade/invoice.glade.h:15
 msgid "Invoice Information"
 msgstr "Rechnungs-Informationen"
 
-#: ../src/business/business-gnome/glade/invoice.glade.h:17
-#: ../src/business/business-gnome/search-owner.c:255
+#: ../src/business/business-gnome/glade/invoice.glade.h:16
+#: ../src/business/business-gnome/search-owner.c:239
 msgid "Job"
 msgstr "Auftrag"
 
-#: ../src/business/business-gnome/glade/invoice.glade.h:18
+#: ../src/business/business-gnome/glade/invoice.glade.h:17
 msgid "Job: "
 msgstr "Auftrag: "
 
-#: ../src/business/business-gnome/glade/invoice.glade.h:20
+#: ../src/business/business-gnome/glade/invoice.glade.h:19
 msgid "No, keep them as they are"
 msgstr "Nein, unverändert beibehalten"
 
-#: ../src/business/business-gnome/glade/invoice.glade.h:22
+#: ../src/business/business-gnome/glade/invoice.glade.h:21
 msgid "Posted Account"
 msgstr "Gebuchtes Konto"
 
-#: ../src/business/business-gnome/glade/invoice.glade.h:23
+#: ../src/business/business-gnome/glade/invoice.glade.h:22
 msgid "Reset Tax Tables to present Values?"
 msgstr "Steuertabellen zu eingegebenen Werten aktualisieren?"
 
-#: ../src/business/business-gnome/glade/invoice.glade.h:25
+#: ../src/business/business-gnome/glade/invoice.glade.h:24
 msgid ""
 "The invoice ID number.  If left blank a reasonable number will be chosen for "
 "you."
@@ -1830,7 +1909,7 @@
 "Die Rechnungsnummer. Falls keine angegeben wird, wird automatisch ein "
 "sinnvoller Wert gewählt."
 
-#: ../src/business/business-gnome/glade/invoice.glade.h:26
+#: ../src/business/business-gnome/glade/invoice.glade.h:25
 msgid ""
 "Unposting this Invoice will delete the posted transaction.\n"
 "Are you sure you want to unpost it?"
@@ -1838,67 +1917,71 @@
 "Das Rückgängigmachen dieser Rechnung wird die gespeicherte Buchung\n"
 "löschen. Wollen Sie sie wirklich rückgängig machen?"
 
-#: ../src/business/business-gnome/glade/invoice.glade.h:28
+#: ../src/business/business-gnome/glade/invoice.glade.h:27
 msgid "Yes, reset the Tax Tables"
 msgstr "Ja, Steuertabellen zurücksetzen"
 
-#: ../src/business/business-gnome/glade/job.glade.h:4
+#: ../src/business/business-gnome/glade/job.glade.h:3
 msgid "Job Active"
 msgstr "Auftrag aktiv"
 
-#: ../src/business/business-gnome/glade/job.glade.h:5
+#: ../src/business/business-gnome/glade/job.glade.h:4
 msgid "Job Dialog"
 msgstr "Auftrag-Dialog"
 
-#: ../src/business/business-gnome/glade/job.glade.h:6
+#: ../src/business/business-gnome/glade/job.glade.h:5
 msgid "Job Information"
 msgstr "Auftragsinformationen"
 
-#: ../src/business/business-gnome/glade/job.glade.h:9
+#: ../src/business/business-gnome/glade/job.glade.h:8
 msgid "Owner Information"
 msgstr "Mandanteninformationen"
 
-#: ../src/business/business-gnome/glade/job.glade.h:10
+#: ../src/business/business-gnome/glade/job.glade.h:9
 msgid ""
 "The job ID number.  If left blank a reasonable number will be chosen for you"
 msgstr ""
 "Die Auftragsnummer. Falls keine angegeben wird, wird automatisch ein "
 "sinnvoller Wert gewählt."
 
-#: ../src/business/business-gnome/glade/order.glade.h:5
+#: ../src/business/business-gnome/glade/order.glade.h:4
 msgid "Close Order"
 msgstr "Bestellung schließen"
 
-#: ../src/business/business-gnome/glade/order.glade.h:8
+#: ../src/business/business-gnome/glade/order.glade.h:7
 msgid "Invoices"
 msgstr "Rechnungen"
 
-#: ../src/business/business-gnome/glade/order.glade.h:9
+#: ../src/business/business-gnome/glade/order.glade.h:8
 msgid "New Order"
 msgstr "Neue Bestellung"
 
-#: ../src/business/business-gnome/glade/order.glade.h:11
+#: ../src/business/business-gnome/glade/order.glade.h:10
 msgid "Order Entries"
 msgstr "Bestellungsposten"
 
-#: ../src/business/business-gnome/glade/order.glade.h:12
+#: ../src/business/business-gnome/glade/order.glade.h:11
 msgid "Order Entry"
 msgstr "Bestellungsposten"
 
-#: ../src/business/business-gnome/glade/order.glade.h:14
+#: ../src/business/business-gnome/glade/order.glade.h:13
 msgid "Order Information"
 msgstr "Bestellungsinformationen"
 
 #. src/business/business-reports/fancy-invoice.scm
 #. src/business/business-reports/owner-report.scm
+#. src/business/business-reports/gnucash/report/fancy-invoice.scm
+#. src/business/business-reports/gnucash/report/owner-report.scm
+#. src/business/business-reports/gnucash/report/invoice.scm
 #. src/business/business-reports/invoice.scm
-#: ../src/business/business-gnome/glade/order.glade.h:15
-#: ../intl-scm/guile-strings.c:3380 ../intl-scm/guile-strings.c:3402
-#: ../intl-scm/guile-strings.c:3920
+#: ../src/business/business-gnome/glade/order.glade.h:14
+#: ../intl-scm/guile-strings.c:6106 ../intl-scm/guile-strings.c:6128
+#: ../intl-scm/guile-strings.c:6630 ../intl-scm/guile-strings.c:6652
+#: ../intl-scm/guile-strings.c:7172 ../intl-scm/guile-strings.c:7412
 msgid "Reference"
 msgstr "Referenz"
 
-#: ../src/business/business-gnome/glade/order.glade.h:16
+#: ../src/business/business-gnome/glade/order.glade.h:15
 msgid ""
 "The order ID number.  If left blank a reasonable number will be chosen for "
 "you"
@@ -1906,9 +1989,17 @@
 "Die Bestellungsnummer. Falls keine angegeben wird, wird automatisch ein "
 "sinnvoller Wert gewählt."
 
+#. Add the columns
 #. src/report/standard-reports/general-journal.scm
 #. src/report/standard-reports/general-ledger.scm
 #. src/report/standard-reports/portfolio.scm
+#. src/report/standard-reports/gnucash/report/general-journal.scm
+#. src/report/standard-reports/gnucash/report/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/portfolio.scm
+#. src/report/standard-reports/gnucash/report/account-summary.scm
+#. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
+#. src/report/standard-reports/gnucash/report/transaction.scm
+#. src/report/standard-reports/gnucash/report/register.scm
 #. src/report/standard-reports/account-summary.scm
 #. src/report/standard-reports/advanced-portfolio.scm
 #. src/report/standard-reports/transaction.scm
@@ -1916,63 +2007,86 @@
 #. src/business/business-reports/fancy-invoice.scm
 #. src/business/business-reports/owner-report.scm
 #. src/business/business-reports/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/fancy-invoice.scm
+#. src/business/business-reports/gnucash/report/owner-report.scm
+#. src/business/business-reports/gnucash/report/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/invoice.scm
 #. src/business/business-reports/invoice.scm
-#: ../src/business/business-gnome/glade/payment.glade.h:3
+#: ../src/business/business-gnome/glade/payment.glade.h:2
 #: ../src/business/business-ledger/gncEntryLedgerModel.c:70
-#: ../src/gnome/druid-loan.c:1779 ../src/gnome/glade/lots.glade.h:11
+#: ../src/gnome/druid-loan.c:1783 ../src/gnome/glade/lots.glade.h:8
 #: ../src/gnome/glade/register.glade.h:14 ../src/gnome/reconcile-list.c:226
 #: ../src/gnome-utils/gnc-tree-view-price.c:447
-#: ../src/import-export/generic-import.glade.h:18
-#: ../src/import-export/qif-import/qif.glade.h:18
+#: ../src/import-export/generic-import.glade.h:15
+#: ../src/import-export/import-main-matcher.c:417
+#: ../src/import-export/import-match-picker.c:333
+#: ../src/import-export/import-match-picker.c:373
+#: ../src/import-export/qif-import/druid-qif-import.c:2158
+#: ../src/import-export/qif-import/druid-qif-import.c:2190
 #: ../src/register/ledger-core/split-register-model.c:102
-#: ../intl-scm/guile-strings.c:1276 ../intl-scm/guile-strings.c:1476
-#: ../intl-scm/guile-strings.c:1718 ../intl-scm/guile-strings.c:1862
-#: ../intl-scm/guile-strings.c:1976 ../intl-scm/guile-strings.c:2174
-#: ../intl-scm/guile-strings.c:2240 ../intl-scm/guile-strings.c:2336
-#: ../intl-scm/guile-strings.c:2428 ../intl-scm/guile-strings.c:2554
-#: ../intl-scm/guile-strings.c:2586 ../intl-scm/guile-strings.c:2654
-#: ../intl-scm/guile-strings.c:3188 ../intl-scm/guile-strings.c:3212
-#: ../intl-scm/guile-strings.c:3398 ../intl-scm/guile-strings.c:3506
-#: ../intl-scm/guile-strings.c:3530 ../intl-scm/guile-strings.c:3764
-#: ../intl-scm/guile-strings.c:3788
+#: ../intl-scm/guile-strings.c:1986 ../intl-scm/guile-strings.c:2186
+#: ../intl-scm/guile-strings.c:2428 ../intl-scm/guile-strings.c:2610
+#: ../intl-scm/guile-strings.c:2810 ../intl-scm/guile-strings.c:3052
+#: ../intl-scm/guile-strings.c:3196 ../intl-scm/guile-strings.c:3310
+#: ../intl-scm/guile-strings.c:3508 ../intl-scm/guile-strings.c:3574
+#: ../intl-scm/guile-strings.c:3670 ../intl-scm/guile-strings.c:3762
+#: ../intl-scm/guile-strings.c:3888 ../intl-scm/guile-strings.c:3920
+#: ../intl-scm/guile-strings.c:3988 ../intl-scm/guile-strings.c:4346
+#: ../intl-scm/guile-strings.c:4460 ../intl-scm/guile-strings.c:4658
+#: ../intl-scm/guile-strings.c:4724 ../intl-scm/guile-strings.c:4820
+#: ../intl-scm/guile-strings.c:4912 ../intl-scm/guile-strings.c:5038
+#: ../intl-scm/guile-strings.c:5070 ../intl-scm/guile-strings.c:5138
+#: ../intl-scm/guile-strings.c:5914 ../intl-scm/guile-strings.c:5938
+#: ../intl-scm/guile-strings.c:6124 ../intl-scm/guile-strings.c:6232
+#: ../intl-scm/guile-strings.c:6256 ../intl-scm/guile-strings.c:6438
+#: ../intl-scm/guile-strings.c:6462 ../intl-scm/guile-strings.c:6648
+#: ../intl-scm/guile-strings.c:6756 ../intl-scm/guile-strings.c:6780
+#: ../intl-scm/guile-strings.c:7016 ../intl-scm/guile-strings.c:7040
+#: ../intl-scm/guile-strings.c:7256 ../intl-scm/guile-strings.c:7280
 msgid "Date"
 msgstr "Datum"
 
 #. src/report/standard-reports/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../src/business/business-gnome/glade/payment.glade.h:4
+#: ../src/business/business-gnome/glade/payment.glade.h:3
 #: ../src/gnome/dialog-find-transactions.c:126
-#: ../src/import-export/generic-import.glade.h:40
+#: ../src/import-export/import-main-matcher.c:422
+#: ../src/import-export/import-match-picker.c:336
+#: ../src/import-export/import-match-picker.c:376
 #: ../src/register/ledger-core/split-register-model.c:191
-#: ../intl-scm/guile-strings.c:1484 ../intl-scm/guile-strings.c:2218
-#: ../intl-scm/guile-strings.c:2248 ../intl-scm/guile-strings.c:2372
-#: ../intl-scm/guile-strings.c:2444
+#: ../intl-scm/guile-strings.c:2194 ../intl-scm/guile-strings.c:2818
+#: ../intl-scm/guile-strings.c:3552 ../intl-scm/guile-strings.c:3582
+#: ../intl-scm/guile-strings.c:3706 ../intl-scm/guile-strings.c:3778
+#: ../intl-scm/guile-strings.c:4702 ../intl-scm/guile-strings.c:4732
+#: ../intl-scm/guile-strings.c:4856 ../intl-scm/guile-strings.c:4928
 msgid "Memo"
 msgstr "Buchungstext"
 
-#: ../src/business/business-gnome/glade/payment.glade.h:6
-#: ../src/business/business-gnome/glade/vendor.glade.h:14
-#: ../src/gnome/window-reconcile.c:443
+#: ../src/business/business-gnome/glade/payment.glade.h:5
+#: ../src/business/business-gnome/glade/vendor.glade.h:13
+#: ../src/gnome/window-reconcile.c:442
 msgid "Payment Information"
 msgstr "Zahlungsinformation"
 
-#: ../src/business/business-gnome/glade/payment.glade.h:7
+#: ../src/business/business-gnome/glade/payment.glade.h:6
 msgid "Post To"
 msgstr "Buchen nach"
 
-#: ../src/business/business-gnome/glade/payment.glade.h:8
+#: ../src/business/business-gnome/glade/payment.glade.h:7
 msgid "Transfer Account"
 msgstr "Herkunftskonto"
 
-#: ../src/business/business-gnome/glade/vendor.glade.h:16
+#: ../src/business/business-gnome/glade/vendor.glade.h:15
 msgid "Tax Included:"
 msgstr "Inkl. Steuern:"
 
-#: ../src/business/business-gnome/glade/vendor.glade.h:17
+#: ../src/business/business-gnome/glade/vendor.glade.h:16
 msgid "Tax Table:"
 msgstr "Steuertabelle:"
 
-#: ../src/business/business-gnome/glade/vendor.glade.h:19
+#: ../src/business/business-gnome/glade/vendor.glade.h:18
 msgid ""
 "The vendor ID number.  If left blank a reasonable number will be chosen for "
 "you"
@@ -1981,27 +2095,36 @@
 "sinnvoller Wert gewählt."
 
 #. src/business/business-reports/owner-report.scm
-#: ../src/business/business-gnome/glade/vendor.glade.h:20
-#: ../src/business/business-gnome/search-owner.c:253
+#. src/business/business-reports/gnucash/report/owner-report.scm
+#: ../src/business/business-gnome/glade/vendor.glade.h:19
+#: ../src/business/business-gnome/search-owner.c:237
 #: ../src/register/ledger-core/split-register-model.c:137
-#: ../intl-scm/guile-strings.c:3474
+#: ../intl-scm/guile-strings.c:6200 ../intl-scm/guile-strings.c:6724
 msgid "Vendor"
 msgstr "Zulieferer"
 
-#: ../src/business/business-gnome/glade/vendor.glade.h:21
+#: ../src/business/business-gnome/glade/vendor.glade.h:20
 msgid "Vendor Number: "
 msgstr "Zulieferer Nummer: "
 
-#: ../src/business/business-gnome/glade/vendor.glade.h:22
+#: ../src/business/business-gnome/glade/vendor.glade.h:21
 msgid "What Tax Table should be applied to this vendor?"
 msgstr "Welche Steuertabelle soll bei diesem Zulieferer angewendet werden?"
 
+#. src/business/business-utils/gnucash/business-utils.scm
+#. src/business/business-utils/business-utils.scm
+#: ../src/business/business-gnome/gncmod-business-gnome.c:133
+#: ../intl-scm/guile-strings.c:5868 ../intl-scm/guile-strings.c:5886
+msgid "Business"
+msgstr "Geschäft"
+
 #. Toplevel
 #. Extensions Menu
 #. src/business/business-reports/business-reports.scm
+#. src/business/business-reports/gnucash/report/business-reports.scm
 #: ../src/business/business-gnome/gnc-plugin-business.c:148
 #: ../src/business/business-gnome/gnc-plugin-business.c:241
-#: ../intl-scm/guile-strings.c:3392
+#: ../intl-scm/guile-strings.c:6118 ../intl-scm/guile-strings.c:6642
 msgid "_Business"
 msgstr "_Geschäft"
 
@@ -2301,9 +2424,9 @@
 msgstr "Kopieren"
 
 #: ../src/business/business-gnome/gnc-plugin-page-invoice.c:115
-#: ../src/gnome/gnc-plugin-page-register.c:179
-#: ../src/gnome-utils/gnc-main-window.c:248
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:941
+#: ../src/gnome/gnc-plugin-page-register.c:176
+#: ../src/gnome-utils/gnc-main-window.c:252
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:951
 msgid "_Paste"
 msgstr "E_infügen"
 
@@ -2344,7 +2467,7 @@
 msgstr "Aktuellen Posten speichern"
 
 #: ../src/business/business-gnome/gnc-plugin-page-invoice.c:132
-#: ../src/gnome/glade/register.glade.h:79 ../src/gnome/window-reconcile.c:2000
+#: ../src/gnome/glade/register.glade.h:79 ../src/gnome/window-reconcile.c:2002
 msgid "_Cancel"
 msgstr "_Abbrechen"
 
@@ -2353,7 +2476,7 @@
 msgstr "Aktuellen Posten abbrechen"
 
 #: ../src/business/business-gnome/gnc-plugin-page-invoice.c:135
-#: ../src/gnome/glade/register.glade.h:82 ../src/gnome/window-reconcile.c:2028
+#: ../src/gnome/glade/register.glade.h:82 ../src/gnome/window-reconcile.c:2030
 msgid "_Delete"
 msgstr "_Löschen"
 
@@ -2416,8 +2539,8 @@
 msgstr "_Anzahl"
 
 #: ../src/business/business-gnome/gnc-plugin-page-invoice.c:163
-#: ../src/register/ledger-core/split-register.c:1693
-#: ../src/register/ledger-core/split-register.c:1695
+#: ../src/register/ledger-core/split-register.c:1715
+#: ../src/register/ledger-core/split-register.c:1717
 msgid "_Price"
 msgstr "_Preis"
 
@@ -2428,33 +2551,34 @@
 
 #: ../src/business/business-gnome/gnc-plugin-page-invoice.c:193
 #: ../src/gnome/glade/register.glade.h:25
-#: ../src/gnome/gnc-plugin-page-register.c:327
+#: ../src/gnome/gnc-plugin-page-register.c:324
 msgid "Enter"
 msgstr "Eingeben"
 
 #: ../src/business/business-gnome/gnc-plugin-page-invoice.c:194
 #: ../src/gnome/glade/register.glade.h:6
-#: ../src/gnome/gnc-plugin-page-register.c:328
+#: ../src/gnome/gnc-plugin-page-register.c:325
 msgid "Cancel"
 msgstr "Abbrechen"
 
 #: ../src/business/business-gnome/gnc-plugin-page-invoice.c:195
 #: ../src/gnome/glade/register.glade.h:16
 #: ../src/gnome/gnc-plugin-page-account-tree.c:221
-#: ../src/gnome/gnc-plugin-page-budget.c:169
-#: ../src/gnome/gnc-plugin-page-register.c:329
+#: ../src/gnome/gnc-plugin-page-budget.c:165
+#: ../src/gnome/gnc-plugin-page-register.c:326
+#: ../src/gnome/gnc-plugin-page-sx-list.c:120
 msgid "Delete"
 msgstr "Löschen"
 
 #: ../src/business/business-gnome/gnc-plugin-page-invoice.c:196
 #: ../src/gnome/glade/register.glade.h:20
-#: ../src/gnome/gnc-plugin-page-register.c:330
+#: ../src/gnome/gnc-plugin-page-register.c:327
 msgid "Duplicate"
 msgstr "Duplizieren"
 
 #: ../src/business/business-gnome/gnc-plugin-page-invoice.c:197
 #: ../src/gnome/glade/register.glade.h:3
-#: ../src/gnome/gnc-plugin-page-register.c:333
+#: ../src/gnome/gnc-plugin-page-register.c:330
 msgid "Blank"
 msgstr "Neu"
 
@@ -2542,7 +2666,7 @@
 msgstr "Erinnerung an fällige Rechnungen für diese Anzahl von Tagen im Voraus"
 
 #: ../src/business/business-gnome/schemas/apps_gnucash_dialog_business_common.schemas.in.h:12
-#: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:42
+#: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:44
 msgid "The number of rows in an invoice"
 msgstr "Standardanzahl von Zeilen, die in Rechnungen angezeigt werden sollen"
 
@@ -2581,32 +2705,31 @@
 msgid "Window position and size"
 msgstr "Fensterposition und Größe"
 
-#: ../src/business/business-gnome/search-owner.c:160
+#: ../src/business/business-gnome/search-owner.c:163
 msgid "You have not selected an owner"
 msgstr "Sie haben keinen Mandanten ausgewählt"
 
-#: ../src/business/business-gnome/search-owner.c:301
-#: ../src/gnome-search/search-boolean.c:201
-#: ../src/gnome-search/search-reconciled.c:209
+#: ../src/business/business-gnome/search-owner.c:256
+#: ../src/gnome-search/search-boolean.c:177
+#: ../src/gnome-search/search-reconciled.c:185
 msgid "is"
 msgstr "ist"
 
-#. Force one
-#: ../src/business/business-gnome/search-owner.c:303
-#: ../src/gnome-search/search-boolean.c:203
-#: ../src/gnome-search/search-reconciled.c:211
+#: ../src/business/business-gnome/search-owner.c:257
+#: ../src/gnome-search/search-boolean.c:178
+#: ../src/gnome-search/search-reconciled.c:186
 msgid "is not"
 msgstr "ist nicht"
 
 #: ../src/business/business-ledger/gncEntryLedger.c:81
-#: ../src/gnome-utils/dialog-transfer.c:1377
-#: ../src/register/ledger-core/split-register.c:1474
+#: ../src/gnome-utils/dialog-transfer.c:1378
+#: ../src/register/ledger-core/split-register.c:1496
 #, c-format
 msgid "The account %s does not allow transactions."
 msgstr "Das Konto %s kann keine Buchungen enthalten."
 
 #: ../src/business/business-ledger/gncEntryLedger.c:82
-#: ../src/register/ledger-core/split-register.c:1475
+#: ../src/register/ledger-core/split-register.c:1497
 #, c-format
 msgid "The account %s does not exist. Would you like to create it?"
 msgstr "Das Konto %s existiert nicht. Möchten Sie es erstellen?"
@@ -2624,12 +2747,12 @@
 msgid "Material"
 msgstr "Material"
 
-#: ../src/business/business-ledger/gncEntryLedger.c:802
+#: ../src/business/business-ledger/gncEntryLedger.c:805
 #: ../src/business/business-ledger/gncEntryLedgerControl.c:485
 msgid "Save the current entry?"
 msgstr "Aktueller Eintrag speichern?"
 
-#: ../src/business/business-ledger/gncEntryLedger.c:804
+#: ../src/business/business-ledger/gncEntryLedger.c:807
 msgid ""
 "The current transaction has been changed. Would you like to record the "
 "changes before duplicating this entry, or cancel the duplication?"
@@ -2638,10 +2761,10 @@
 "bevor Sie die Kopie erstellen, oder soll der Kopiervorgang abgebrochen "
 "werden?"
 
-#: ../src/business/business-ledger/gncEntryLedger.c:819
+#: ../src/business/business-ledger/gncEntryLedger.c:822
 #: ../src/business/business-ledger/gncEntryLedgerControl.c:504
 #: ../src/gnome/gnc-split-reg.c:727
-#: ../src/register/ledger-core/split-register.c:405
+#: ../src/register/ledger-core/split-register.c:423
 msgid "_Record"
 msgstr "_Speichern"
 
@@ -2759,10 +2882,15 @@
 
 #. src/business/business-reports/fancy-invoice.scm
 #. src/business/business-reports/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/fancy-invoice.scm
+#. src/business/business-reports/gnucash/report/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/invoice.scm
 #. src/business/business-reports/invoice.scm
 #: ../src/business/business-ledger/gncEntryLedgerLoad.c:50
-#: ../src/gnome/glade/sched-xact.glade.h:3 ../intl-scm/guile-strings.c:3206
-#: ../intl-scm/guile-strings.c:3524 ../intl-scm/guile-strings.c:3782
+#: ../src/gnome/glade/sched-xact.glade.h:3 ../intl-scm/guile-strings.c:5932
+#: ../intl-scm/guile-strings.c:6250 ../intl-scm/guile-strings.c:6456
+#: ../intl-scm/guile-strings.c:6774 ../intl-scm/guile-strings.c:7034
+#: ../intl-scm/guile-strings.c:7274
 #, no-c-format
 msgid "%"
 msgstr "%"
@@ -2783,17 +2911,18 @@
 #: ../src/business/business-ledger/gncEntryLedgerLoad.c:119
 #: ../src/business/business-ledger/gncEntryLedgerModel.c:510
 #: ../src/business/business-ledger/gncEntryLedgerModel.c:1036
-#: ../src/engine/Account.c:2132 ../intl-scm/guile-strings.c:850
+#: ../src/engine/Account.c:2135 ../intl-scm/guile-strings.c:1364
 msgid "Cash"
 msgstr "Bargeld"
 
 #. src/app-utils/prefs.scm
+#. src/report/standard-reports/gnucash/report/register.scm
 #. src/report/standard-reports/register.scm
 #: ../src/business/business-ledger/gncEntryLedgerLoad.c:122
 #: ../src/business/business-ledger/gncEntryLedgerModel.c:512
 #: ../src/business/business-ledger/gncEntryLedgerModel.c:1038
-#: ../intl-scm/guile-strings.c:76 ../intl-scm/guile-strings.c:92
-#: ../intl-scm/guile-strings.c:2658
+#: ../intl-scm/guile-strings.c:124 ../intl-scm/guile-strings.c:140
+#: ../intl-scm/guile-strings.c:3992 ../intl-scm/guile-strings.c:5142
 msgid "Charge"
 msgstr "Belastung"
 
@@ -2807,22 +2936,32 @@
 
 #. src/business/business-reports/fancy-invoice.scm
 #. src/business/business-reports/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/fancy-invoice.scm
+#. src/business/business-reports/gnucash/report/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/invoice.scm
 #. src/business/business-reports/invoice.scm
 #: ../src/business/business-ledger/gncEntryLedgerModel.c:65
 #: ../src/gnome/dialog-find-transactions.c:122
 #: ../src/register/ledger-core/split-register-model.c:170
-#: ../intl-scm/guile-strings.c:3224 ../intl-scm/guile-strings.c:3542
-#: ../intl-scm/guile-strings.c:3800
+#: ../intl-scm/guile-strings.c:5950 ../intl-scm/guile-strings.c:6268
+#: ../intl-scm/guile-strings.c:6474 ../intl-scm/guile-strings.c:6792
+#: ../intl-scm/guile-strings.c:7052 ../intl-scm/guile-strings.c:7292
 msgid "Action"
 msgstr "Aktion"
 
 #. src/business/business-reports/fancy-invoice.scm
 #. src/business/business-reports/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/fancy-invoice.scm
+#. src/business/business-reports/gnucash/report/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/invoice.scm
 #. src/business/business-reports/invoice.scm
 #: ../src/business/business-ledger/gncEntryLedgerModel.c:80
-#: ../intl-scm/guile-strings.c:3198 ../intl-scm/guile-strings.c:3242
-#: ../intl-scm/guile-strings.c:3516 ../intl-scm/guile-strings.c:3560
-#: ../intl-scm/guile-strings.c:3774 ../intl-scm/guile-strings.c:3818
+#: ../intl-scm/guile-strings.c:5924 ../intl-scm/guile-strings.c:5968
+#: ../intl-scm/guile-strings.c:6242 ../intl-scm/guile-strings.c:6286
+#: ../intl-scm/guile-strings.c:6448 ../intl-scm/guile-strings.c:6492
+#: ../intl-scm/guile-strings.c:6766 ../intl-scm/guile-strings.c:6810
+#: ../intl-scm/guile-strings.c:7026 ../intl-scm/guile-strings.c:7070
+#: ../intl-scm/guile-strings.c:7266 ../intl-scm/guile-strings.c:7310
 msgid "Discount"
 msgstr "Skonto"
 
@@ -2836,20 +2975,30 @@
 
 #. src/business/business-reports/fancy-invoice.scm
 #. src/business/business-reports/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/fancy-invoice.scm
+#. src/business/business-reports/gnucash/report/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/invoice.scm
 #. src/business/business-reports/invoice.scm
 #: ../src/business/business-ledger/gncEntryLedgerModel.c:95
-#: ../intl-scm/guile-strings.c:3196 ../intl-scm/guile-strings.c:3514
-#: ../intl-scm/guile-strings.c:3772
+#: ../intl-scm/guile-strings.c:5922 ../intl-scm/guile-strings.c:6240
+#: ../intl-scm/guile-strings.c:6446 ../intl-scm/guile-strings.c:6764
+#: ../intl-scm/guile-strings.c:7024 ../intl-scm/guile-strings.c:7264
 msgid "Unit Price"
 msgstr "Stückpreis"
 
 #. src/business/business-reports/fancy-invoice.scm
 #. src/business/business-reports/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/fancy-invoice.scm
+#. src/business/business-reports/gnucash/report/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/invoice.scm
 #. src/business/business-reports/invoice.scm
 #: ../src/business/business-ledger/gncEntryLedgerModel.c:100
-#: ../intl-scm/guile-strings.c:3194 ../intl-scm/guile-strings.c:3230
-#: ../intl-scm/guile-strings.c:3512 ../intl-scm/guile-strings.c:3548
-#: ../intl-scm/guile-strings.c:3770 ../intl-scm/guile-strings.c:3806
+#: ../intl-scm/guile-strings.c:5920 ../intl-scm/guile-strings.c:5956
+#: ../intl-scm/guile-strings.c:6238 ../intl-scm/guile-strings.c:6274
+#: ../intl-scm/guile-strings.c:6444 ../intl-scm/guile-strings.c:6480
+#: ../intl-scm/guile-strings.c:6762 ../intl-scm/guile-strings.c:6798
+#: ../intl-scm/guile-strings.c:7022 ../intl-scm/guile-strings.c:7058
+#: ../intl-scm/guile-strings.c:7262 ../intl-scm/guile-strings.c:7298
 msgid "Quantity"
 msgstr "Anzahl"
 
@@ -2872,21 +3021,32 @@
 #. src/report/report-system/options-utilities.scm
 #. src/business/business-reports/fancy-invoice.scm
 #. src/business/business-reports/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/fancy-invoice.scm
+#. src/business/business-reports/gnucash/report/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/invoice.scm
 #. src/business/business-reports/invoice.scm
 #: ../src/business/business-ledger/gncEntryLedgerModel.c:125
-#: ../intl-scm/guile-strings.c:788 ../intl-scm/guile-strings.c:3348
-#: ../intl-scm/guile-strings.c:3614 ../intl-scm/guile-strings.c:3670
-#: ../intl-scm/guile-strings.c:3898
+#: ../intl-scm/guile-strings.c:1300 ../intl-scm/guile-strings.c:6074
+#: ../intl-scm/guile-strings.c:6340 ../intl-scm/guile-strings.c:6396
+#: ../intl-scm/guile-strings.c:6598 ../intl-scm/guile-strings.c:6864
+#: ../intl-scm/guile-strings.c:6920 ../intl-scm/guile-strings.c:7150
+#: ../intl-scm/guile-strings.c:7390
 msgid "Subtotal"
 msgstr "Zwischensumme"
 
 #. src/tax/us/de_DE.scm
+#. src/tax/us/gnucash/tax/de_DE.scm
 #. src/business/business-reports/fancy-invoice.scm
 #. src/business/business-reports/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/fancy-invoice.scm
+#. src/business/business-reports/gnucash/report/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/invoice.scm
 #. src/business/business-reports/invoice.scm
 #: ../src/business/business-ledger/gncEntryLedgerModel.c:130
-#: ../intl-scm/guile-strings.c:52 ../intl-scm/guile-strings.c:3350
-#: ../intl-scm/guile-strings.c:3672 ../intl-scm/guile-strings.c:3900
+#: ../intl-scm/guile-strings.c:96 ../intl-scm/guile-strings.c:100
+#: ../intl-scm/guile-strings.c:6076 ../intl-scm/guile-strings.c:6398
+#: ../intl-scm/guile-strings.c:6600 ../intl-scm/guile-strings.c:6922
+#: ../intl-scm/guile-strings.c:7152 ../intl-scm/guile-strings.c:7392
 msgid "Tax"
 msgstr "Steuern"
 
@@ -2998,11 +3158,11 @@
 msgid "How did you pay for this item?"
 msgstr "Wie wurde dieser Artikel bezahlt?"
 
-#: ../src/business/dialog-tax-table/dialog-tax-table.c:102
+#: ../src/business/dialog-tax-table/dialog-tax-table.c:112
 msgid "You must provide a name for this Tax Table."
 msgstr "Sie müssen einen Namen für diese Steuertabelle angeben."
 
-#: ../src/business/dialog-tax-table/dialog-tax-table.c:108
+#: ../src/business/dialog-tax-table/dialog-tax-table.c:118
 #, c-format
 msgid ""
 "You must provide a unique name for this Tax Table. Your choice \"%s\" is "
@@ -3011,25 +3171,16 @@
 "Sie müssen einen eindeutigen Namen für diese Steuertabelle angeben. Ihre "
 "Wahl »%s« ist bereits in Benutzung."
 
-#: ../src/business/dialog-tax-table/dialog-tax-table.c:134
+#: ../src/business/dialog-tax-table/dialog-tax-table.c:144
 msgid "You must choose a Tax Account."
 msgstr "Sie müssen ein steuerrelevantes Konto wählen."
 
-#: ../src/business/dialog-tax-table/dialog-tax-table.c:205
-msgid "Value $"
-msgstr "Wert"
-
-#: ../src/business/dialog-tax-table/dialog-tax-table.c:207
-#, no-c-format
-msgid "Percent %"
-msgstr "Prozent (%)"
-
-#: ../src/business/dialog-tax-table/dialog-tax-table.c:548
+#: ../src/business/dialog-tax-table/dialog-tax-table.c:534
 #, c-format
 msgid "Tax table \"%s\" is in use.  You cannot delete it."
 msgstr "Steuertabelle »%s« ist in Benutzung. Sie können sie nicht löschen."
 
-#: ../src/business/dialog-tax-table/dialog-tax-table.c:594
+#: ../src/business/dialog-tax-table/dialog-tax-table.c:580
 msgid ""
 "You cannot remove the last entry from the tax table. Try deleting the tax "
 "table if you want to do that."
@@ -3038,7 +3189,7 @@
 "Stattdessen müssten Sie die ganze Steuertabelle löschen, falls Sie das "
 "möchten."
 
-#: ../src/business/dialog-tax-table/dialog-tax-table.c:601
+#: ../src/business/dialog-tax-table/dialog-tax-table.c:587
 msgid "Are you sure you want to delete this entry?"
 msgstr "Sind Sie sicher, dass Sie diesen Eintrag löschen möchten?"
 
@@ -3058,18 +3209,16 @@
 msgid "<b>Tax Tables</b>"
 msgstr "<b>Steuertabellen</b>"
 
-#: ../src/business/dialog-tax-table/tax-tables.glade.h:6
-#, no-c-format
-msgid "Percent (%)"
-msgstr "Prozent (%)"
-
-#: ../src/business/dialog-tax-table/tax-tables.glade.h:7
+#: ../src/business/dialog-tax-table/tax-tables.glade.h:5
 msgid "Tax Tables"
 msgstr "Steuertabellen"
 
-#: ../src/business/dialog-tax-table/tax-tables.glade.h:8
-msgid "Value ($)"
-msgstr "Geldbetrag"
+#: ../src/business/dialog-tax-table/tax-tables.glade.h:7
+#, fuzzy, no-c-format
+msgid ""
+"Value $\n"
+"Percent %"
+msgstr "Prozent (%)"
 
 #: ../src/business/dialog-tax-table/tax-tables.glade.h:9
 msgid "_Account:"
@@ -3088,32 +3237,32 @@
 msgstr "_Wert: "
 
 #. src/report/report-system/report-utilities.scm
-#: ../src/engine/Account.c:2131 ../src/import-export/hbci/gnc-hbci-utils.c:593
-#: ../intl-scm/guile-strings.c:848
+#: ../src/engine/Account.c:2134 ../src/import-export/hbci/gnc-hbci-utils.c:594
+#: ../intl-scm/guile-strings.c:1362
 msgid "Bank"
 msgstr "Bank"
 
-#: ../src/engine/Account.c:2133
+#: ../src/engine/Account.c:2136
 msgid "Asset"
 msgstr "Aktiva"
 
-#: ../src/engine/Account.c:2134
+#: ../src/engine/Account.c:2137
 msgid "Credit Card"
 msgstr "Kreditkarte"
 
-#: ../src/engine/Account.c:2135
+#: ../src/engine/Account.c:2138
 msgid "Liability"
 msgstr "Passiva"
 
-#: ../src/engine/Account.c:2136
+#: ../src/engine/Account.c:2139
 msgid "Stock"
 msgstr "Aktienkonto"
 
-#: ../src/engine/Account.c:2137
+#: ../src/engine/Account.c:2140
 msgid "Mutual Fund"
 msgstr "Investmentfonds"
 
-#: ../src/engine/Account.c:2138 ../src/gnome-utils/dialog-commodity.c:731
+#: ../src/engine/Account.c:2141 ../src/gnome-utils/dialog-commodity.c:756
 #: ../src/gnome-utils/gnc-tree-view-price.c:441
 msgid "Currency"
 msgstr "Währung"
@@ -3121,31 +3270,32 @@
 #. src/app-utils/prefs.scm
 #. src/report/report-system/report-utilities.scm
 #. src/report/standard-reports/net-barchart.scm
-#: ../src/engine/Account.c:2139
-#: ../src/register/ledger-core/split-register.c:2045
-#: ../intl-scm/guile-strings.c:104 ../intl-scm/guile-strings.c:864
-#: ../intl-scm/guile-strings.c:1240
+#. src/report/standard-reports/gnucash/report/net-barchart.scm
+#: ../src/engine/Account.c:2142
+#: ../src/register/ledger-core/split-register.c:2067
+#: ../intl-scm/guile-strings.c:152 ../intl-scm/guile-strings.c:1378
+#: ../intl-scm/guile-strings.c:1952 ../intl-scm/guile-strings.c:2576
 msgid "Income"
 msgstr "Erträge"
 
-#: ../src/engine/Account.c:2142
+#: ../src/engine/Account.c:2145
 msgid "A/Receivable"
 msgstr "Forderungen"
 
-#: ../src/engine/Account.c:2143
+#: ../src/engine/Account.c:2146
 msgid "A/Payable"
 msgstr "Verbindlichkeit"
 
-#: ../src/engine/cap-gains.c:237
+#: ../src/engine/cap-gains.c:238
 msgid "Orphaned Gains"
 msgstr "Unverknüpfte Gewinne"
 
-#: ../src/engine/cap-gains.c:251 ../src/engine/cap-gains.c:974
-#: ../src/engine/cap-gains.c:979 ../src/engine/cap-gains.c:980
+#: ../src/engine/cap-gains.c:252 ../src/engine/cap-gains.c:975
+#: ../src/engine/cap-gains.c:980 ../src/engine/cap-gains.c:981
 msgid "Realized Gain/Loss"
 msgstr "Realisierter Gewinn/Verlust"
 
-#: ../src/engine/cap-gains.c:253
+#: ../src/engine/cap-gains.c:254
 msgid ""
 "Realized Gains or Losses from Commodity or Trading Accounts that haven't "
 "been recorded elsewhere."
@@ -3153,7 +3303,7 @@
 "Realisierter Gewinn/Verlust von Aktienkonten, die nicht woanders gespeichert "
 "worden sind."
 
-#: ../src/engine/cap-gains.c:584
+#: ../src/engine/cap-gains.c:585
 msgid "Lot"
 msgstr "Posten"
 
@@ -3174,7 +3324,7 @@
 msgid "Daily (x%u)"
 msgstr "Täglich (%u Mal)"
 
-#: ../src/engine/FreqSpec.c:748 ../src/gnome/glade/sched-xact.glade.h:64
+#: ../src/engine/FreqSpec.c:748 ../src/gnome/glade/sched-xact.glade.h:65
 #, c-format
 msgid "Daily"
 msgstr "Täglich"
@@ -3299,11 +3449,11 @@
 msgid "Yearly: %s/%u"
 msgstr "Jährlich: %2$u. %1$s"
 
-#: ../src/engine/gnc-budget.c:106 ../src/gnome/gnc-plugin-page-budget.c:850
+#: ../src/engine/gnc-budget.c:109 ../src/gnome/gnc-plugin-page-budget.c:846
 msgid "Unnamed Budget"
 msgstr "Unbenanntes Budget"
 
-#: ../src/engine/gnc-filepath-utils.c:332
+#: ../src/engine/gnc-filepath-utils.c:316
 #, c-format
 msgid ""
 "An error occurred while creating the directory:\n"
@@ -3317,7 +3467,7 @@
 "starten Sie GnuCash neu. \n"
 "Nennen Sie bitte diesen Fehlertext: »%s« (errno %d)\n"
 
-#: ../src/engine/gnc-filepath-utils.c:344
+#: ../src/engine/gnc-filepath-utils.c:328
 #, c-format
 msgid ""
 "The directory\n"
@@ -3332,8 +3482,8 @@
 "Programm muss alle Zugriffrechte (Lesen/Schreiben/Ausführen) zu diesem\n"
 "Verzeichnis besitzen, um korrekt zu funktionieren.\n"
 
-#: ../src/engine/gnc-filepath-utils.c:354
-#: ../src/engine/gnc-filepath-utils.c:375
+#: ../src/engine/gnc-filepath-utils.c:338
+#: ../src/engine/gnc-filepath-utils.c:359
 #, c-format
 msgid ""
 "The path\n"
@@ -3346,7 +3496,7 @@
 "existiert, ist aber kein Verzeichnis. Bitte löschen Sie diese Datei\n"
 "oder wählen einen anderen Pfad. Starten Sie dann GnuCash neu.\n"
 
-#: ../src/engine/gnc-filepath-utils.c:363
+#: ../src/engine/gnc-filepath-utils.c:347
 #, c-format
 msgid ""
 "An unknown error occurred when validating that the\n"
@@ -3362,7 +3512,7 @@
 "starten Sie GnuCash neu. \n"
 "Nennen Sie bitte diesen Fehlertext: »%s« (errno %d)"
 
-#: ../src/engine/gnc-filepath-utils.c:384
+#: ../src/engine/gnc-filepath-utils.c:368
 #, c-format
 msgid ""
 "The permissions are wrong on the directory\n"
@@ -3378,36 +3528,40 @@
 msgid "Orphan"
 msgstr "Ausbuchungskonto"
 
-#: ../src/engine/Scrub.c:430 ../src/import-export/generic-import.glade.h:35
+#: ../src/engine/Scrub.c:430
 msgid "Imbalance"
 msgstr "Ausgleichskonto"
 
+#. src/report/standard-reports/gnucash/report/transaction.scm
+#. src/report/standard-reports/gnucash/report/register.scm
 #. src/report/standard-reports/transaction.scm
 #. src/report/standard-reports/register.scm
-#: ../src/engine/Split.c:1220 ../src/engine/Split.c:1237
-#: ../intl-scm/guile-strings.c:2548 ../intl-scm/guile-strings.c:2570
+#: ../src/engine/Split.c:1229 ../src/engine/Split.c:1246
+#: ../intl-scm/guile-strings.c:3882 ../intl-scm/guile-strings.c:3904
+#: ../intl-scm/guile-strings.c:5032 ../intl-scm/guile-strings.c:5054
 msgid "-- Split Transaction --"
 msgstr "-- Mehrteilige Buchung --"
 
+#. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../src/engine/Split.c:1253 ../src/gnome/druid-stock-split.c:448
+#: ../src/engine/Split.c:1262 ../src/gnome/druid-stock-split.c:455
 #: ../src/gnome/glade/register.glade.h:67
-#: ../src/gnome/gnc-plugin-page-register.c:331
-#: ../src/register/ledger-core/split-register.c:2048
-#: ../intl-scm/guile-strings.c:2166
+#: ../src/gnome/gnc-plugin-page-register.c:328
+#: ../src/register/ledger-core/split-register.c:2070
+#: ../intl-scm/guile-strings.c:3500 ../intl-scm/guile-strings.c:4650
 msgid "Split"
 msgstr "Vollständig"
 
-#: ../src/engine/Transaction.c:1733
+#: ../src/engine/Transaction.c:1728
 msgid "Voided transaction"
 msgstr "Ungültige Buchung"
 
 #. Dirtying taken care of by SetReadOnly
-#: ../src/engine/Transaction.c:1744
+#: ../src/engine/Transaction.c:1739
 msgid "Transaction Voided"
 msgstr "Buchung ungültig gemacht"
 
-#: ../src/gnome/dialog-chart-export.c:234
+#: ../src/gnome/dialog-chart-export.c:233
 msgid "Export Chart of Accounts to QSF XML"
 msgstr "Kontenhierarchie nach QSF XML exportieren"
 
@@ -3435,7 +3589,7 @@
 msgid "Delete commodity?"
 msgstr "Währung/Aktie löschen?"
 
-#: ../src/gnome/dialog-fincalc.c:315
+#: ../src/gnome/dialog-fincalc.c:308
 msgid ""
 "This program can only calculate one value at a time. You must enter values "
 "for all but one quantity."
@@ -3443,7 +3597,7 @@
 "Es kann nur einer der Werte berechnet werden. Sie müssen für alle Werte "
 "außer einem jeweils eine Zahl eintragen."
 
-#: ../src/gnome/dialog-fincalc.c:317
+#: ../src/gnome/dialog-fincalc.c:310
 msgid ""
 "GnuCash cannot determine the value in one of the fields. You must enter a "
 "valid expression."
@@ -3451,15 +3605,15 @@
 "Die eingegebenen Werte können nicht ausgewertet werden. Sie müssen einen "
 "korrekten Zahlenausdruck eingeben."
 
-#: ../src/gnome/dialog-fincalc.c:356
+#: ../src/gnome/dialog-fincalc.c:349
 msgid "The interest rate cannot be zero."
 msgstr "Der Zinssatz kann nicht Null sein."
 
-#: ../src/gnome/dialog-fincalc.c:375
+#: ../src/gnome/dialog-fincalc.c:368
 msgid "The number of payments cannot be zero."
 msgstr "Die Anzahl der Zahlungen kann nicht Null sein"
 
-#: ../src/gnome/dialog-fincalc.c:380
+#: ../src/gnome/dialog-fincalc.c:373
 msgid "The number of payments cannot be negative."
 msgstr "Die Anzahl der Zahlungen kann nicht negativ sein"
 
@@ -3470,33 +3624,47 @@
 #. src/report/standard-reports/general-journal.scm
 #. src/report/standard-reports/cash-flow.scm
 #. src/report/standard-reports/portfolio.scm
+#. src/report/standard-reports/gnucash/report/general-journal.scm
+#. src/report/standard-reports/gnucash/report/cash-flow.scm
+#. src/report/standard-reports/gnucash/report/portfolio.scm
+#. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
+#. src/report/standard-reports/gnucash/report/transaction.scm
+#. src/report/standard-reports/gnucash/report/register.scm
+#. src/report/standard-reports/gnucash/report/budget.scm
 #. src/report/standard-reports/advanced-portfolio.scm
 #. src/report/standard-reports/transaction.scm
 #. src/report/standard-reports/register.scm
 #. src/report/standard-reports/budget.scm
 #. src/business/business-reports/owner-report.scm
+#. src/business/business-reports/gnucash/report/owner-report.scm
 #: ../src/gnome/dialog-find-transactions.c:103
-#: ../src/gnome/glade/stocks.glade.h:3 ../src/gnome-utils/dialog-account.c:647
-#: ../src/gnome-utils/gnc-icons.c:16
-#: ../src/import-export/generic-import.glade.h:11
-#: ../src/import-export/hbci/gnc-hbci-utils.c:592
-#: ../src/import-export/qif-import/qif.glade.h:2
+#: ../src/gnome/druid-stock-split.c:610 ../src/gnome-utils/gnc-icons.c:16
+#: ../src/import-export/hbci/gnc-hbci-utils.c:593
+#: ../src/import-export/import-main-matcher.c:418
+#: ../src/import-export/import-match-picker.c:332
+#: ../src/import-export/qif-import/dialog-account-picker.c:288
+#: ../src/import-export/qif-import/druid-qif-import.c:2130
 #: ../src/register/ledger-core/split-register-model.c:177
-#: ../intl-scm/guile-strings.c:1282 ../intl-scm/guile-strings.c:1304
-#: ../intl-scm/guile-strings.c:1730 ../intl-scm/guile-strings.c:2028
-#: ../intl-scm/guile-strings.c:2250 ../intl-scm/guile-strings.c:2560
-#: ../intl-scm/guile-strings.c:2604 ../intl-scm/guile-strings.c:2670
-#: ../intl-scm/guile-strings.c:3394
+#: ../intl-scm/guile-strings.c:1992 ../intl-scm/guile-strings.c:2014
+#: ../intl-scm/guile-strings.c:2440 ../intl-scm/guile-strings.c:2616
+#: ../intl-scm/guile-strings.c:2638 ../intl-scm/guile-strings.c:3064
+#: ../intl-scm/guile-strings.c:3362 ../intl-scm/guile-strings.c:3584
+#: ../intl-scm/guile-strings.c:3894 ../intl-scm/guile-strings.c:3938
+#: ../intl-scm/guile-strings.c:4004 ../intl-scm/guile-strings.c:4512
+#: ../intl-scm/guile-strings.c:4734 ../intl-scm/guile-strings.c:5044
+#: ../intl-scm/guile-strings.c:5088 ../intl-scm/guile-strings.c:5154
+#: ../intl-scm/guile-strings.c:6120 ../intl-scm/guile-strings.c:6644
 msgid "Account"
 msgstr "Konto"
 
 #: ../src/gnome/dialog-find-transactions.c:106
+#: ../src/import-export/import-match-picker.c:337
 msgid "Balanced"
 msgstr "Ausgeglichene Buchungen"
 
 #: ../src/gnome/dialog-find-transactions.c:109
-#: ../src/gnome/gnc-plugin-page-register.c:334
-#: ../src/gnome/window-reconcile.c:1174
+#: ../src/gnome/gnc-plugin-page-register.c:331
+#: ../src/gnome/window-reconcile.c:1173
 msgid "Reconcile"
 msgstr "Abgleichen"
 
@@ -3506,50 +3674,63 @@
 
 #. src/report/standard-reports/general-journal.scm
 #. src/report/standard-reports/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/general-journal.scm
+#. src/report/standard-reports/gnucash/report/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
+#. src/report/standard-reports/gnucash/report/transaction.scm
+#. src/report/standard-reports/gnucash/report/register.scm
 #. src/report/standard-reports/advanced-portfolio.scm
 #. src/report/standard-reports/transaction.scm
 #. src/report/standard-reports/register.scm
 #: ../src/gnome/dialog-find-transactions.c:113
-#: ../src/gnome/glade/stocks.glade.h:13
+#: ../src/gnome/druid-stock-split.c:622
 #: ../src/register/ledger-core/split-register-model.c:240
-#: ../intl-scm/guile-strings.c:1284 ../intl-scm/guile-strings.c:1498
-#: ../intl-scm/guile-strings.c:2036 ../intl-scm/guile-strings.c:2198
-#: ../intl-scm/guile-strings.c:2254 ../intl-scm/guile-strings.c:2472
-#: ../intl-scm/guile-strings.c:2564 ../intl-scm/guile-strings.c:2610
+#: ../intl-scm/guile-strings.c:1994 ../intl-scm/guile-strings.c:2208
+#: ../intl-scm/guile-strings.c:2618 ../intl-scm/guile-strings.c:2832
+#: ../intl-scm/guile-strings.c:3370 ../intl-scm/guile-strings.c:3532
+#: ../intl-scm/guile-strings.c:3588 ../intl-scm/guile-strings.c:3806
+#: ../intl-scm/guile-strings.c:3898 ../intl-scm/guile-strings.c:3944
+#: ../intl-scm/guile-strings.c:4520 ../intl-scm/guile-strings.c:4682
+#: ../intl-scm/guile-strings.c:4738 ../intl-scm/guile-strings.c:4956
+#: ../intl-scm/guile-strings.c:5048 ../intl-scm/guile-strings.c:5094
 msgid "Shares"
 msgstr "Anteile"
 
 #. src/report/standard-reports/portfolio.scm
+#. src/report/standard-reports/gnucash/report/portfolio.scm
+#. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
 #. src/report/standard-reports/advanced-portfolio.scm
 #: ../src/gnome/dialog-find-transactions.c:115
-#: ../src/gnome/glade/lots.glade.h:25
-#: ../src/gnome/glade/sched-xact.glade.h:190 ../intl-scm/guile-strings.c:1740
-#: ../intl-scm/guile-strings.c:2042
+#: ../src/gnome/glade/lots.glade.h:18
+#: ../src/gnome/glade/sched-xact.glade.h:215 ../intl-scm/guile-strings.c:2450
+#: ../intl-scm/guile-strings.c:3074 ../intl-scm/guile-strings.c:3376
+#: ../intl-scm/guile-strings.c:4526
 msgid "Value"
 msgstr "Wert"
 
+#. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
 #: ../src/gnome/dialog-find-transactions.c:124
-#: ../src/gnome-utils/glade/gnc-date-format.glade.h:11
-#: ../intl-scm/guile-strings.c:2368
+#: ../src/gnome-utils/glade/gnc-date-format.glade.h:10
+#: ../intl-scm/guile-strings.c:3702 ../intl-scm/guile-strings.c:4852
 msgid "Number"
 msgstr "Nummer"
 
 #: ../src/gnome/dialog-find-transactions.c:169
-#: ../src/gnome-search/dialog-search.c:1076
+#: ../src/gnome-search/dialog-search.c:1085
 msgid "Find Transaction"
 msgstr "Buchungen suchen"
 
 #. Translators: %d is the number of prices. This
 #. is a ngettext(3) message.
-#: ../src/gnome/dialog-price-edit-db.c:171
+#: ../src/gnome/dialog-price-edit-db.c:172
 #, c-format
 msgid "Are you sure you want to delete the %d selected price?"
 msgid_plural "Are you sure you want to delete the %d selected prices?"
 msgstr[0] "Sind Sie sicher, dass Sie den %d gewählten Preis löschen wollen?"
 msgstr[1] "Sind Sie sicher, dass Sie die %d gewählten Preise löschen wollen?"
 
-#: ../src/gnome/dialog-price-edit-db.c:179
+#: ../src/gnome/dialog-price-edit-db.c:180
 msgid "Delete prices?"
 msgstr "Preise löschen?"
 
@@ -3562,7 +3743,7 @@
 msgstr "Sie müssen eine Währung auswählen."
 
 #: ../src/gnome/dialog-price-editor.c:190
-#: ../src/gnome-utils/dialog-transfer.c:1403
+#: ../src/gnome-utils/dialog-transfer.c:1404
 msgid "You must enter a valid amount."
 msgstr "Sie müssen einen gültigen Betrag eingeben."
 
@@ -3570,58 +3751,49 @@
 msgid "Complete"
 msgstr "Komplett"
 
-#. Toplevel
-#: ../src/gnome/dialog-scheduledxaction.c:242
-#: ../src/gnome/dialog-sxsincelast.c:401 ../src/gnome/glade/price.glade.h:22
+#: ../src/gnome/dialog-sx-editor.c:176 ../src/gnome/glade/price.glade.h:22
 #: ../src/gnome/glade/register.glade.h:85
-#: ../src/gnome/glade/sched-xact.glade.h:203
-#: ../src/gnome-utils/gnc-main-window.c:212
-#: ../src/gnome/window-reconcile.c:2025
-#: ../src/report/report-gnome/report.glade.h:20
+#: ../src/gnome-utils/gnc-main-window.c:216
+#: ../src/gnome/window-reconcile.c:2027
+#: ../src/report/report-gnome/report.glade.h:17
 msgid "_Edit"
 msgstr "_Bearbeiten"
 
-#: ../src/gnome/dialog-scheduledxaction.c:243
-#: ../src/gnome/dialog-sxsincelast.c:402 ../src/gnome/window-reconcile.c:1985
+#: ../src/gnome/dialog-sx-editor.c:177 ../src/gnome/window-reconcile.c:1987
 msgid "_Transaction"
 msgstr "_Buchung"
 
-#: ../src/gnome/dialog-scheduledxaction.c:244
-#: ../src/gnome/dialog-sxsincelast.c:403 ../src/gnome/glade/lots.glade.h:27
-#: ../src/gnome/glade/register.glade.h:101
-#: ../src/gnome-utils/gnc-main-window.c:213
+#: ../src/gnome/dialog-sx-editor.c:178 ../src/gnome/glade/register.glade.h:101
+#: ../src/gnome-utils/gnc-main-window.c:217
 msgid "_View"
 msgstr "_Ansicht"
 
-#: ../src/gnome/dialog-scheduledxaction.c:245
-#: ../src/gnome/dialog-sxsincelast.c:404
-#: ../src/gnome/glade/register.glade.h:74
-#: ../src/gnome-utils/gnc-main-window.c:214
+#: ../src/gnome/dialog-sx-editor.c:179 ../src/gnome/glade/register.glade.h:74
+#: ../src/gnome-utils/gnc-main-window.c:218
 msgid "_Actions"
 msgstr "A_ktionen"
 
-#: ../src/gnome/dialog-scheduledxaction.c:328
+#: ../src/gnome/dialog-sx-editor.c:211
 msgid "This SX has changed; are you sure you want to cancel?"
 msgstr ""
 "Diese terminierte Buchung wurde geändert. Sind Sie sicher, dass Sie\n"
 "abbrechen wollen?"
 
-#: ../src/gnome/dialog-scheduledxaction.c:794
+#: ../src/gnome/dialog-sx-editor.c:631
 #, c-format
 msgid "Couldn't parse credit formula for split \"%s\"."
 msgstr ""
 "Die Berechnungsformel für die Minderungsbuchung konnte nicht verarbeitet "
 "werden im Buchungsteil »%s«. "
 
-#: ../src/gnome/dialog-scheduledxaction.c:820
+#: ../src/gnome/dialog-sx-editor.c:657
 #, c-format
 msgid "Couldn't parse debit formula for split \"%s\"."
 msgstr ""
 "Die Berechnungsformel für die Mehrungsbuchung konnte nicht verarbeitet "
 "werden im Buchungsteil »%s«. "
 
-#: ../src/gnome/dialog-scheduledxaction.c:858
-#: ../src/gnome/dialog-sx-from-trans.c:269
+#: ../src/gnome/dialog-sx-editor.c:694 ../src/gnome/dialog-sx-from-trans.c:258
 msgid ""
 "The Scheduled Transaction Editor cannot automatically balance this "
 "transaction. Should it still be entered?"
@@ -3629,11 +3801,11 @@
 "Der Terminierte-Buchungen-Editor kann diese Buchung nicht automatisch "
 "ausgeglichen erstellen. Soll sie trotzdem erstellt werden?"
 
-#: ../src/gnome/dialog-scheduledxaction.c:877
+#: ../src/gnome/dialog-sx-editor.c:713
 msgid "Please name the Scheduled Transaction."
 msgstr "Bitte geben Sie der terminierten Buchung einen Namen."
 
-#: ../src/gnome/dialog-scheduledxaction.c:903
+#: ../src/gnome/dialog-sx-editor.c:739
 #, c-format
 msgid ""
 "A Scheduled Transaction with the name \"%s\" already exists. Are you sure "
@@ -3642,12 +3814,12 @@
 "Eine terminierte Buchung mit dem Namen »%s« existiert bereits. Sind Sie "
 "sicher, dass die aktuelle den gleichen Namen erhalten soll?"
 
-#: ../src/gnome/dialog-scheduledxaction.c:932
+#: ../src/gnome/dialog-sx-editor.c:768
 msgid "Scheduled Transactions with variables cannot be automatically created."
 msgstr ""
 "Terminierte Buchungen mit Variablen können nicht automatisch erstellt werden."
 
-#: ../src/gnome/dialog-scheduledxaction.c:941
+#: ../src/gnome/dialog-sx-editor.c:777
 msgid ""
 "Scheduled Transactions without a template transaction cannot be "
 "automatically created."
@@ -3655,15 +3827,15 @@
 "Terminierte Buchungen ohne Buchungsvorlage können nicht automatisch erstellt "
 "werden."
 
-#: ../src/gnome/dialog-scheduledxaction.c:955
+#: ../src/gnome/dialog-sx-editor.c:791
 msgid "Please provide a valid end selection."
 msgstr "Bitte geben Sie ein gültiges Enddatum ein."
 
-#: ../src/gnome/dialog-scheduledxaction.c:971
+#: ../src/gnome/dialog-sx-editor.c:807
 msgid "There must be some number of occurrences."
 msgstr "Es muss eine Anzahl des Auftretens geben."
 
-#: ../src/gnome/dialog-scheduledxaction.c:979
+#: ../src/gnome/dialog-sx-editor.c:815
 #, c-format
 msgid ""
 "The number of remaining occurrences (%d) is greater than the number of total "
@@ -3672,7 +3844,7 @@
 "Die Zahl des verbleibenden Auftretens (%d) ist größer als die Zahl des "
 "totalen Auftretens (%d)."
 
-#: ../src/gnome/dialog-scheduledxaction.c:1013
+#: ../src/gnome/dialog-sx-editor.c:849
 msgid ""
 "You have attempted to create a Scheduled Transaction which will never run. "
 "Do you really want to do this?"
@@ -3680,40 +3852,23 @@
 "Sie versuchen gerade, eine Terminierte Buchung zu erstellen, die nie "
 "auftritt. Wollen Sie wirklich fortsetzen?"
 
-#: ../src/gnome/dialog-scheduledxaction.c:1677
+#: ../src/gnome/dialog-sx-editor.c:1318
 msgid "(never)"
 msgstr "(niemals)"
 
-#: ../src/gnome/dialog-scheduledxaction.c:1838
+#: ../src/gnome/dialog-sx-editor.c:1466
 msgid ""
-"The following transactions are presently being edited; are you sure you want "
-"to delete them?"
-msgstr ""
-"Die folgenden Buchungssätze werden zur Zeit bearbeitet; wollen Sie diese "
-"wirklich löschen?"
-
-#: ../src/gnome/dialog-scheduledxaction.c:1841
-msgid "Delete the selected Scheduled Transactions?"
-msgstr "Ausgewählte terminierte Buchung löschen?"
-
-#: ../src/gnome/dialog-scheduledxaction.c:2089
-#: ../src/gnome/glade/sched-xact.glade.h:123
-msgid "Not scheduled"
-msgstr "Nicht vorgemerkt"
-
-#: ../src/gnome/dialog-scheduledxaction.c:2183
-msgid ""
 "The current template transaction has been changed. Would you like to record "
 "the changes?"
 msgstr ""
 "Die aktuelle Buchungsvorlage wurde verändert. Soll sie gespeichert werden?"
 
-#: ../src/gnome/dialog-scheduledxaction.c:2594
-#: ../src/gnome/glade/sched-xact.glade.h:157
+#: ../src/gnome/dialog-sx-editor.c:1695
+#: ../src/gnome/gnc-plugin-page-sx-list.c:194
 msgid "Scheduled Transactions"
 msgstr "Terminierte Buchungen"
 
-#: ../src/gnome/dialog-sx-from-trans.c:566
+#: ../src/gnome/dialog-sx-from-trans.c:550
 msgid ""
 "The Scheduled Transaction is unbalanced. You are strongly encouraged to "
 "correct this situation."
@@ -3721,7 +3876,7 @@
 "Diese Terminierte Buchung ist nicht ausgeglichen. Bitte korrigieren Sie "
 "diese Buchung."
 
-#: ../src/gnome/dialog-sx-from-trans.c:811
+#: ../src/gnome/dialog-sx-from-trans.c:754
 msgid ""
 "Cannot create a Scheduled Transaction from a Transaction currently being "
 "edited. Please Enter the Transaction before Scheduling."
@@ -3732,8 +3887,8 @@
 
 #. Translators: %d is the number of transactions. This is a
 #. ngettext(3) message.
-#: ../src/gnome/dialog-sxsincelast.c:424
-#: ../src/gnome/gnc-plugin-basic-commands.c:459
+#: ../src/gnome/dialog-sx-since-last-run.c:818
+#: ../src/gnome/gnc-plugin-basic-commands.c:473
 #, c-format
 msgid ""
 "There are no Scheduled Transactions to be entered at this time. (%d "
@@ -3748,45 +3903,11 @@
 "Es gibt keine terminierten Buchungen, die erstellt werden sollen. (%d "
 "Buchungen automatisch erstellt)"
 
-#: ../src/gnome/dialog-sxsincelast.c:1438
-msgid ""
-"Canceling the Since-Last-Run dialog will revert all changes. Are you sure "
-"you want to lose all Scheduled Transaction changes?"
-msgstr ""
-"Wenn Sie den Seit-Letztem-Aufruf Dialog abbrechen, werden alle Änderungen "
-"rückgängig gemacht. Sind Sie sicher, dass Sie alle Änderungen in den "
-"Terminierten Buchungen verwerfen wollen?"
+#: ../src/gnome/dialog-sx-since-last-run.c:1016
+msgid "Created Transactions"
+msgstr "Buchungen erstellt"
 
-#: ../src/gnome/dialog-sxsincelast.c:1871
-msgid "Ready to create"
-msgstr "Bereit zum Erstellen"
-
-#. READY_TEXT
-#: ../src/gnome/dialog-sxsincelast.c:1872
-msgid "Needs values for variables"
-msgstr "Werte für Variablen benötigt"
-
-#: ../src/gnome/dialog-sxsincelast.c:1876
-msgid "Ignored"
-msgstr "Ignoriert"
-
-#: ../src/gnome/dialog-sxsincelast.c:1879
-msgid "Postponed"
-msgstr "Auf später verschoben"
-
-#: ../src/gnome/dialog-sxsincelast.c:1989
-msgid "Obsolete"
-msgstr "Veraltet"
-
-#: ../src/gnome/dialog-sxsincelast.c:4021
-msgid ""
-"The following errors were encountered while creating the Scheduled "
-"Transactions:\n"
-msgstr ""
-"Die folgenden Fehler sind aufgetreten, als die Terminierten Buchungen "
-"erstellt werden sollen:\n"
-
-#: ../src/gnome/dialog-tax-info.c:723
+#: ../src/gnome/dialog-tax-info.c:715
 msgid "Form"
 msgstr "Formular"
 
@@ -3839,7 +3960,7 @@
 #. replaced by one single message? Either this closing went
 #. successfully ("success", "congratulations") or something else
 #. should be displayed anyway.
-#: ../src/gnome/druid-acct-period.c:492
+#: ../src/gnome/druid-acct-period.c:493
 #, c-format
 msgid ""
 "%s\n"
@@ -3849,154 +3970,147 @@
 "Sie sind mit dem Schließen der Bücher fertig."
 
 #. Change the text so that its more mainingful for this druid
-#: ../src/gnome/druid-acct-period.c:547
+#: ../src/gnome/druid-acct-period.c:548
 msgid "Period:"
 msgstr "Periode:"
 
-#: ../src/gnome/druid-acct-period.c:548
+#: ../src/gnome/druid-acct-period.c:549
 msgid "Closing Date:"
 msgstr "Abschlußdatum:"
 
-#: ../src/gnome/druid-hierarchy.c:389
+#: ../src/gnome/druid-hierarchy.c:399
 msgid "Selected"
 msgstr "Ausgewähltes"
 
-#: ../src/gnome/druid-hierarchy.c:401
-#: ../src/gnome-utils/gnc-tree-view-account.c:1879
+#: ../src/gnome/druid-hierarchy.c:411
+#: ../src/gnome-utils/gnc-tree-view-account.c:1875
 msgid "Account Types"
 msgstr "Kontoarten"
 
-#: ../src/gnome/druid-hierarchy.c:477
+#. Translators: '%s' is the name of the selected account hierarchy template.
+#: ../src/gnome/druid-hierarchy.c:489
 #, c-format
-msgid "<b>Accounts in '%s'</b>"
-msgstr "<b>Konten in »%s«</b>"
+msgid "Accounts in '%s'"
+msgstr "Konten in »%s«"
 
-#: ../src/gnome/druid-hierarchy.c:494
-msgid "<b>Accounts in Category</b>"
-msgstr "<b>Konten in Kategorie</b>"
+#: ../src/gnome/druid-hierarchy.c:508
+msgid "Accounts in Category"
+msgstr "Konten in Kategorie"
 
-#: ../src/gnome/druid-hierarchy.c:703
+#: ../src/gnome/druid-hierarchy.c:719
 msgid "zero"
 msgstr "Null"
 
-#: ../src/gnome/druid-hierarchy.c:714
+#: ../src/gnome/druid-hierarchy.c:730
 msgid "existing account"
 msgstr "Existierendes Konto"
 
-#: ../src/gnome/druid-hierarchy.c:888
-#: ../src/gnome-utils/gnc-tree-view-account.c:647
+#: ../src/gnome/druid-hierarchy.c:904
+#: ../src/gnome-utils/gnc-tree-view-account.c:643
 msgid "Placeholder"
 msgstr "Platzhalter"
 
-#: ../src/gnome/druid-hierarchy.c:919
+#: ../src/gnome/druid-hierarchy.c:935
 msgid "Use Existing"
 msgstr "Existierendes verwenden"
 
-#: ../src/gnome/druid-loan.c:552
-msgid "Fixed"
-msgstr "Festverzinslich"
+#. { name, default txn memo, throughEscrowP, specSrcAcctP }
+#: ../src/gnome/druid-loan.c:161
+msgid "Taxes"
+msgstr "Steuern"
 
-#: ../src/gnome/druid-loan.c:552
-msgid "A Fixed-Rate loan"
-msgstr "Ein festverzinsliches Darlehen"
+#: ../src/gnome/druid-loan.c:161
+msgid "Tax Payment"
+msgstr "Steuern"
 
-#: ../src/gnome/druid-loan.c:553
-msgid "3/1 Year"
-msgstr "3/1 ARM"
+#: ../src/gnome/druid-loan.c:162
+msgid "Insurance"
+msgstr "Versicherung"
 
-#. Translators: ARM = Adjustable Rate Mortgage; that is a
-#. loan where the rate is constant for the period before
-#. the '/', e.g. 5 years, and then may change. See also
-#. http://www.fanniemae.com/tools/glossary.jhtml
-#: ../src/gnome/druid-loan.c:558
-msgid "A 3/1 Year ARM"
-msgstr "3/1 jährige Adjustable Rate Mortgage (zinsvariable Hypothek)"
+#: ../src/gnome/druid-loan.c:162
+msgid "Insurance Payment"
+msgstr "Versicherung"
 
-#: ../src/gnome/druid-loan.c:559
-msgid "5/1 Year"
-msgstr "5/1 ARM"
+#. Translators: PMI stands for Private Mortgage Insurance.
+#: ../src/gnome/druid-loan.c:164
+msgid "PMI"
+msgstr "Hypothekenversicherung"
 
-#: ../src/gnome/druid-loan.c:559
-msgid "A 5/1 Year ARM"
-msgstr "5/1 jährige Adjustable Rate Mortgage (zinsvariable Hypothek)"
+#: ../src/gnome/druid-loan.c:164
+msgid "PMI Payment"
+msgstr "Hypothekenversicherung"
 
-#: ../src/gnome/druid-loan.c:560
-msgid "7/1 Year"
-msgstr "7/1 ARM"
+#: ../src/gnome/druid-loan.c:165
+msgid "Other Expense"
+msgstr "Anderes"
 
-#: ../src/gnome/druid-loan.c:560
-msgid "A 7/1 Year ARM"
-msgstr "7/1 jährige Adjustable Rate Mortgage (zinsvariable Hypothek)"
+#: ../src/gnome/druid-loan.c:165
+msgid "Miscellaneous Payment"
+msgstr "Anderes"
 
-#: ../src/gnome/druid-loan.c:561
-msgid "10/1 Year"
-msgstr "10/1 ARM"
-
-#: ../src/gnome/druid-loan.c:561
-msgid "A 10/1 Year ARM"
-msgstr "10/1 jährige Adjustable Rate Mortgage (zinsvariable Hypothek)"
-
 #. Add payment checkbox.
 #. Translators: %s is "Taxes",
 #. * "Insurance", or similar.
-#: ../src/gnome/druid-loan.c:644
+#: ../src/gnome/druid-loan.c:632
 #, c-format
 msgid "... pay \"%s\"?"
 msgstr "... »%s« zahlen?"
 
-#: ../src/gnome/druid-loan.c:656
+#: ../src/gnome/druid-loan.c:644
 msgid "via Escrow account?"
 msgstr "über Treuhandkonto?"
 
-#: ../src/gnome/druid-loan.c:820
-#: ../src/register/ledger-core/split-register.c:2002
+#: ../src/gnome/druid-loan.c:808
+#: ../src/register/ledger-core/split-register.c:2024
 msgid "Loan"
 msgstr "Darlehen"
 
-#: ../src/gnome/druid-loan.c:1048
+#: ../src/gnome/druid-loan.c:1038
 msgid "Are you sure you want to cancel the Mortgage/Loan Setup Druid?"
 msgstr "Wollen Sie den Darlehen-Assistent wirklich abbrechen?"
 
-#: ../src/gnome/druid-loan.c:1165
+#: ../src/gnome/druid-loan.c:1157
 msgid "Please select a valid loan account."
 msgstr "Sie müssen ein gültiges Darlehen-Konto auswählen."
 
-#: ../src/gnome/druid-loan.c:1251
+#: ../src/gnome/druid-loan.c:1243
 msgid "Please select a valid Escrow Account."
 msgstr "Sie müssen ein gültiges Treuhand-Konto auswählen."
 
-#: ../src/gnome/druid-loan.c:1317 ../src/gnome/druid-loan.c:1536
+#: ../src/gnome/druid-loan.c:1309 ../src/gnome/druid-loan.c:1528
 msgid "Please select a valid \"from\" account."
 msgstr "Sie müssen ein gültiges Herkunftskonto angeben."
 
-#: ../src/gnome/druid-loan.c:1324 ../src/gnome/druid-loan.c:1545
+#: ../src/gnome/druid-loan.c:1316 ../src/gnome/druid-loan.c:1537
 msgid "Please select a valid \"to\" account."
 msgstr "Sie müssen ein gültiges Zielkonto angeben."
 
-#: ../src/gnome/druid-loan.c:1331
+#: ../src/gnome/druid-loan.c:1323
 msgid "Please select a valid \"interest\" account."
 msgstr "Sie müssen ein gültiges Zinskonto angeben."
 
 #. Translators: %s is "Taxes", or "Insurance", or similar
-#: ../src/gnome/druid-loan.c:1443
+#: ../src/gnome/druid-loan.c:1435
 #, c-format
 msgid "Payment: \"%s\""
 msgstr "Zahlung: »%s«"
 
-#: ../src/gnome/druid-loan.c:1781 ../src/gnome/druid-loan.c:2378
+#: ../src/gnome/druid-loan.c:1795 ../src/gnome/druid-loan.c:2391
 msgid "Principal"
 msgstr "Endbetrag Kapital"
 
 #. src/import-export/qif-io-core/qif-invst-xtn-import.scm
 #. src/import-export/qif-import/qif-dialog-utils.scm
-#: ../src/gnome/druid-loan.c:1782 ../src/gnome/druid-loan.c:2399
+#. src/import-export/qif-import/qif-import/qif-dialog-utils.scm
+#: ../src/gnome/druid-loan.c:1801 ../src/gnome/druid-loan.c:2412
 #: ../src/import-export/qif/qif-defaults.c:130
-#: ../src/register/ledger-core/split-register.c:2010
-#: ../intl-scm/guile-strings.c:3072 ../intl-scm/guile-strings.c:3094
+#: ../src/register/ledger-core/split-register.c:2032
+#: ../intl-scm/guile-strings.c:5740 ../intl-scm/guile-strings.c:5762
+#: ../intl-scm/guile-strings.c:5784
 msgid "Interest"
 msgstr "Zinsen"
 
-#: ../src/gnome/druid-loan.c:2279
+#: ../src/gnome/druid-loan.c:2292
 msgid "Escrow "
 msgstr "Treuhand "
 
@@ -4014,7 +4128,8 @@
 "gespeichert werden."
 
 #: ../src/gnome/druid-merge.c:223
-msgid "Error: the Commit operation failed."
+#, fuzzy, c-format
+msgid "Error: the Commit operation failed, error code %d."
 msgstr "Fehler: Das Speichern der Änderung ist fehlgeschlagen."
 
 #. Translators: %i is the number of conflicts. This is a
@@ -4054,216 +4169,221 @@
 msgid "Original data : %s\n"
 msgstr "Originaldaten : %s\n"
 
-#: ../src/gnome/druid-stock-split.c:268
-#: ../src/gnome-utils/dialog-transfer.c:541 ../src/gnome-utils/gnc-html.c:113
+#: ../src/gnome/druid-stock-split.c:275
+#: ../src/gnome-utils/dialog-transfer.c:542 ../src/gnome-utils/gnc-html.c:114
 msgid "Error"
 msgstr "Fehler"
 
-#: ../src/gnome/druid-stock-split.c:293
+#: ../src/gnome/druid-stock-split.c:300
 msgid "You must enter a valid distribution amount."
 msgstr "Sie müssen einen gültigen Betrag eingeben."
 
-#: ../src/gnome/druid-stock-split.c:302
+#: ../src/gnome/druid-stock-split.c:309
 msgid "You must enter a distribution amount."
 msgstr "Sie müssen einen Betrag angeben."
 
-#: ../src/gnome/druid-stock-split.c:310
+#: ../src/gnome/druid-stock-split.c:317
 msgid "You must either enter a valid price or leave it blank."
 msgstr ""
 "Sie müssen entweder einen gültigen Preis angeben oder das Feld frei lassen."
 
-#: ../src/gnome/druid-stock-split.c:319
+#: ../src/gnome/druid-stock-split.c:326
 msgid "The price must be positive."
 msgstr "Der Preis muss eine positive Zahl sein."
 
-#: ../src/gnome/druid-stock-split.c:357
+#: ../src/gnome/druid-stock-split.c:364
 msgid "You must either enter a valid cash amount or leave it blank."
 msgstr ""
 "Sie müssen entweder einen gültigen Betrag eingeben oder das Eingabefeld leer "
 "lassen."
 
-#: ../src/gnome/druid-stock-split.c:366
+#: ../src/gnome/druid-stock-split.c:373
 msgid "The cash distribution must be positive."
 msgstr "Der Ausgleichsbetrag muss positiv sein."
 
-#: ../src/gnome/druid-stock-split.c:378
+#: ../src/gnome/druid-stock-split.c:385
 msgid "You must select an income account for the cash distribution."
 msgstr "Sie müssen ein Ertragskonto für den Ausgleichsbetrag angeben."
 
-#: ../src/gnome/druid-stock-split.c:387
+#: ../src/gnome/druid-stock-split.c:394
 msgid "You must select an asset account for the cash distribution."
 msgstr "Sie müssen ein Aktiva-Konto für den Ausgleichsbetrag angeben."
 
-#: ../src/gnome/druid-stock-split.c:479
+#: ../src/gnome/druid-stock-split.c:486
 msgid "Error adding price."
 msgstr "Fehler beim Hinzufügen des Preises."
 
-#: ../src/gnome/druid-stock-split.c:754
+#. src/report/standard-reports/portfolio.scm
+#. src/report/standard-reports/gnucash/report/portfolio.scm
+#. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
+#. src/report/standard-reports/advanced-portfolio.scm
+#: ../src/gnome/druid-stock-split.c:616
+#: ../src/gnome-utils/gnc-tree-view-commodity.c:399
+#: ../intl-scm/guile-strings.c:2442 ../intl-scm/guile-strings.c:3066
+#: ../intl-scm/guile-strings.c:3366 ../intl-scm/guile-strings.c:4516
+msgid "Symbol"
+msgstr "Symbol"
+
+#: ../src/gnome/druid-stock-split.c:789
 msgid "You don't have any stock accounts with balances!"
 msgstr "Sie haben keine Aktienkonten mit mehr als Null Aktien."
 
 #: ../src/gnome/glade/account.glade.h:1
-msgid "1"
-msgstr "1"
-
-#: ../src/gnome/glade/account.glade.h:2
-msgid "1/10"
-msgstr "1/10"
-
-#: ../src/gnome/glade/account.glade.h:3
-msgid "1/100"
-msgstr "1/100"
-
-#: ../src/gnome/glade/account.glade.h:4
-msgid "1/1000"
-msgstr "1/1000"
-
-#: ../src/gnome/glade/account.glade.h:5
-msgid "1/10000"
-msgstr "1/10000"
-
-#: ../src/gnome/glade/account.glade.h:6
-msgid "1/100000"
-msgstr "1/100000"
-
-#: ../src/gnome/glade/account.glade.h:7
-msgid "1/1000000"
-msgstr "1/1000000"
-
-#: ../src/gnome/glade/account.glade.h:8
 msgid "<b>Acco_unt Type</b>"
 msgstr "<b>Konto_art</b>"
 
-#: ../src/gnome/glade/account.glade.h:9
+#: ../src/gnome/glade/account.glade.h:2
 msgid "<b>Balance Information</b>"
 msgstr "<b>Saldo-Informationen</b>"
 
-#: ../src/gnome/glade/account.glade.h:10
+#: ../src/gnome/glade/account.glade.h:3
 msgid "<b>Categories</b>"
 msgstr "<b>Kategorien</b>"
 
-#: ../src/gnome/glade/account.glade.h:11
+#: ../src/gnome/glade/account.glade.h:4
 msgid "<b>Category Description</b>"
 msgstr "<b>Kategorie-Beschreibung</b>"
 
-#: ../src/gnome/glade/account.glade.h:12
+#: ../src/gnome/glade/account.glade.h:5
 msgid "<b>Contained Accounts</b>"
 msgstr "<b>Enthaltene Konten</b>"
 
-#: ../src/gnome/glade/account.glade.h:13
+#: ../src/gnome/glade/account.glade.h:6
 msgid "<b>Description</b>"
 msgstr "<b>Beschreibung</b>"
 
-#: ../src/gnome/glade/account.glade.h:14
+#: ../src/gnome/glade/account.glade.h:7
 msgid "<b>Identification</b>"
 msgstr "<b>Identifizierung</b>"
 
-#: ../src/gnome/glade/account.glade.h:15
+#: ../src/gnome/glade/account.glade.h:8
 msgid "<b>Initial Balance Transfer</b>"
 msgstr "<b>Buchung Anfangssaldo</b>"
 
-#: ../src/gnome/glade/account.glade.h:16
+#: ../src/gnome/glade/account.glade.h:9
 msgid "<b>New Account Currency</b>"
 msgstr "<b>Standardwährung für neue Konten</b>"
 
-#: ../src/gnome/glade/account.glade.h:17
+#: ../src/gnome/glade/account.glade.h:10
 msgid "<b>Sub-account Transactions</b>"
-msgstr "<b>Buchungen in Unterkonten"
+msgstr "<b>Buchungen in Unterkonten</b>"
 
-#: ../src/gnome/glade/account.glade.h:18
+#: ../src/gnome/glade/account.glade.h:11
 msgid "<b>Sub-accounts</b>"
 msgstr "<b>Unterkonten</b>"
 
-#: ../src/gnome/glade/account.glade.h:19
-#: ../src/gnome/glade/sched-xact.glade.h:40
+#: ../src/gnome/glade/account.glade.h:12
+#: ../src/gnome/glade/sched-xact.glade.h:43
 msgid "<b>Transactions</b>"
 msgstr "<b>Buchungen</b>"
 
-#: ../src/gnome/glade/account.glade.h:20
+#: ../src/gnome/glade/account.glade.h:13
 msgid "<b>_Parent Account</b>"
 msgstr "<b>_Hauptkonto</b>"
 
+#. src/report/standard-reports/gnucash/report/account-summary.scm
 #. src/report/standard-reports/account-summary.scm
-#: ../src/gnome/glade/account.glade.h:21 ../intl-scm/guile-strings.c:1904
+#: ../src/gnome/glade/account.glade.h:14 ../intl-scm/guile-strings.c:3238
+#: ../intl-scm/guile-strings.c:4388
 msgid "Account Type"
 msgstr "Kontoart"
 
-#: ../src/gnome/glade/account.glade.h:22
+#: ../src/gnome/glade/account.glade.h:15
 msgid "Account _name:"
 msgstr "Konto_bezeichnung:"
 
-#: ../src/gnome/glade/account.glade.h:23
+#: ../src/gnome/glade/account.glade.h:16
 msgid "C_lear All"
 msgstr "_Keine auswählen"
 
-#: ../src/gnome/glade/account.glade.h:24
+#: ../src/gnome/glade/account.glade.h:17
 msgid "Choose Currency"
 msgstr "Währung wählen"
 
-#: ../src/gnome/glade/account.glade.h:25
+#: ../src/gnome/glade/account.glade.h:18
 msgid "Choose accounts to create"
 msgstr "Zu erstellende Konten wählen"
 
-#: ../src/gnome/glade/account.glade.h:26
+#: ../src/gnome/glade/account.glade.h:19
 msgid "Delete Account"
 msgstr "Konto löschen"
 
-#: ../src/gnome/glade/account.glade.h:27
+#: ../src/gnome/glade/account.glade.h:20
 msgid "Delete all _subaccounts"
 msgstr "Alle _Unterkonten löschen"
 
-#: ../src/gnome/glade/account.glade.h:28
+#: ../src/gnome/glade/account.glade.h:21
 msgid "Delete all _transactions"
 msgstr "Alle _Buchungen löschen"
 
-#: ../src/gnome/glade/account.glade.h:29
+#: ../src/gnome/glade/account.glade.h:22
 msgid "Examples:"
 msgstr "Beispiele:"
 
-#: ../src/gnome/glade/account.glade.h:30
+#: ../src/gnome/glade/account.glade.h:23
 msgid "Filter By..."
 msgstr "Filtern nach..."
 
-#: ../src/gnome/glade/account.glade.h:31
+#: ../src/gnome/glade/account.glade.h:24
 msgid "Finish Account Setup"
 msgstr "Konteneinrichten fertigstellen"
 
 #. src/report/stylesheets/stylesheet-fancy.scm
 #. src/report/stylesheets/stylesheet-easy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-plain.scm
 #. src/report/stylesheets/stylesheet-plain.scm
 #. src/report/report-system/report.scm
 #. src/report/utility-reports/view-column.scm
+#. src/report/utility-reports/gnucash/report/view-column.scm
 #. src/report/standard-reports/trial-balance.scm
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#. src/report/standard-reports/gnucash/report/equity-statement.scm
+#. src/report/standard-reports/gnucash/report/register.scm
 #. src/report/standard-reports/equity-statement.scm
 #. src/report/standard-reports/register.scm
-#: ../src/gnome/glade/account.glade.h:32
-#: ../src/gnome-utils/glade/preferences.glade.h:63
-#: ../intl-scm/guile-strings.c:194 ../intl-scm/guile-strings.c:200
-#: ../intl-scm/guile-strings.c:206 ../intl-scm/guile-strings.c:212
-#: ../intl-scm/guile-strings.c:320 ../intl-scm/guile-strings.c:324
-#: ../intl-scm/guile-strings.c:328 ../intl-scm/guile-strings.c:332
-#: ../intl-scm/guile-strings.c:406 ../intl-scm/guile-strings.c:412
-#: ../intl-scm/guile-strings.c:418 ../intl-scm/guile-strings.c:424
-#: ../intl-scm/guile-strings.c:532 ../intl-scm/guile-strings.c:536
-#: ../intl-scm/guile-strings.c:540 ../intl-scm/guile-strings.c:544
-#: ../intl-scm/guile-strings.c:618 ../intl-scm/guile-strings.c:624
-#: ../intl-scm/guile-strings.c:630 ../intl-scm/guile-strings.c:820
-#: ../intl-scm/guile-strings.c:928 ../intl-scm/guile-strings.c:934
-#: ../intl-scm/guile-strings.c:1420 ../intl-scm/guile-strings.c:1422
-#: ../intl-scm/guile-strings.c:2110 ../intl-scm/guile-strings.c:2112
-#: ../intl-scm/guile-strings.c:2576
+#: ../src/gnome/glade/account.glade.h:25
+#: ../src/gnome-utils/glade/preferences.glade.h:70
+#: ../intl-scm/guile-strings.c:242 ../intl-scm/guile-strings.c:248
+#: ../intl-scm/guile-strings.c:254 ../intl-scm/guile-strings.c:260
+#: ../intl-scm/guile-strings.c:368 ../intl-scm/guile-strings.c:372
+#: ../intl-scm/guile-strings.c:376 ../intl-scm/guile-strings.c:380
+#: ../intl-scm/guile-strings.c:454 ../intl-scm/guile-strings.c:460
+#: ../intl-scm/guile-strings.c:466 ../intl-scm/guile-strings.c:472
+#: ../intl-scm/guile-strings.c:580 ../intl-scm/guile-strings.c:584
+#: ../intl-scm/guile-strings.c:588 ../intl-scm/guile-strings.c:592
+#: ../intl-scm/guile-strings.c:666 ../intl-scm/guile-strings.c:672
+#: ../intl-scm/guile-strings.c:678 ../intl-scm/guile-strings.c:684
+#: ../intl-scm/guile-strings.c:792 ../intl-scm/guile-strings.c:796
+#: ../intl-scm/guile-strings.c:800 ../intl-scm/guile-strings.c:804
+#: ../intl-scm/guile-strings.c:878 ../intl-scm/guile-strings.c:884
+#: ../intl-scm/guile-strings.c:890 ../intl-scm/guile-strings.c:896
+#: ../intl-scm/guile-strings.c:1004 ../intl-scm/guile-strings.c:1008
+#: ../intl-scm/guile-strings.c:1012 ../intl-scm/guile-strings.c:1016
+#: ../intl-scm/guile-strings.c:1090 ../intl-scm/guile-strings.c:1096
+#: ../intl-scm/guile-strings.c:1102 ../intl-scm/guile-strings.c:1130
+#: ../intl-scm/guile-strings.c:1136 ../intl-scm/guile-strings.c:1142
+#: ../intl-scm/guile-strings.c:1332 ../intl-scm/guile-strings.c:1450
+#: ../intl-scm/guile-strings.c:1456 ../intl-scm/guile-strings.c:1472
+#: ../intl-scm/guile-strings.c:1478 ../intl-scm/guile-strings.c:2130
+#: ../intl-scm/guile-strings.c:2132 ../intl-scm/guile-strings.c:2754
+#: ../intl-scm/guile-strings.c:2756 ../intl-scm/guile-strings.c:3444
+#: ../intl-scm/guile-strings.c:3446 ../intl-scm/guile-strings.c:3910
+#: ../intl-scm/guile-strings.c:4594 ../intl-scm/guile-strings.c:4596
+#: ../intl-scm/guile-strings.c:5060
 msgid "General"
 msgstr "Allgemein"
 
-#: ../src/gnome/glade/account.glade.h:33
+#: ../src/gnome/glade/account.glade.h:26
 msgid "H_idden"
 msgstr "_Versteckt"
 
-#: ../src/gnome/glade/account.glade.h:34
+#: ../src/gnome/glade/account.glade.h:27
 msgid "Hide accounts which have a zero total value."
 msgstr "Konten nicht anzeigen, die Kontostand Null haben."
 
-#: ../src/gnome/glade/account.glade.h:35
+#: ../src/gnome/glade/account.glade.h:28
 msgid ""
 "If you would like an account to have an opening balance, click on the "
 "account and enter the starting balance in the box on the right. All accounts "
@@ -4274,7 +4394,7 @@
 "rechten Kasten ein. Jede Kontoart außer Eigenkapital und Platzhalter kann "
 "einen Anfangsbestand haben."
 
-#: ../src/gnome/glade/account.glade.h:36
+#: ../src/gnome/glade/account.glade.h:29
 msgid ""
 "If you would like an account to have an opening balance, click on the row "
 "containing the account, click again in the opening balances column, and then "
@@ -4292,32 +4412,32 @@
 "Wenn Sie ein Konto als Platzhalter verwenden wollen, klicken Sie auf das "
 "entsprechende Häkchen in der Kontozeile.\n"
 
-#: ../src/gnome/glade/account.glade.h:40
+#: ../src/gnome/glade/account.glade.h:33
 msgid "Interval:"
 msgstr "Intervall:"
 
-#: ../src/gnome/glade/account.glade.h:41
+#: ../src/gnome/glade/account.glade.h:34
 msgid "M_ove to:"
 msgstr "_Verschieben nach:"
 
-#: ../src/gnome/glade/account.glade.h:42
-#: ../src/gnome-utils/dialog-account.c:1400
+#: ../src/gnome/glade/account.glade.h:35
+#: ../src/gnome-utils/dialog-account.c:1351
 msgid "New Account"
 msgstr "_Neues Konto"
 
-#: ../src/gnome/glade/account.glade.h:43
+#: ../src/gnome/glade/account.glade.h:36
 msgid "New Account (not implemented)"
 msgstr "Neues Konto (unfertig)"
 
-#: ../src/gnome/glade/account.glade.h:44
+#: ../src/gnome/glade/account.glade.h:37
 msgid "New Account Hierarchy Setup"
 msgstr "Neuen Kontenrahmen erstellen"
 
-#: ../src/gnome/glade/account.glade.h:45
+#: ../src/gnome/glade/account.glade.h:38
 msgid "No_tes:"
 msgstr "Be_merkung:"
 
-#: ../src/gnome/glade/account.glade.h:46
+#: ../src/gnome/glade/account.glade.h:39
 msgid ""
 "One or more sub-accounts contain read-only transactions which may not be "
 "deleted."
@@ -4325,7 +4445,7 @@
 "Ein Unterkonto (oder mehrere) dieses Kontos enthalten schreibgeschützte "
 "Buchungen. Sie können diese nicht löschen. "
 
-#: ../src/gnome/glade/account.glade.h:47
+#: ../src/gnome/glade/account.glade.h:40
 msgid ""
 "One or more sub-accounts contain transactions. What would you like to do "
 "with these transactions?"
@@ -4334,26 +4454,29 @@
 "Sie mit diesen Buchungen machen?"
 
 #. src/report/standard-reports/category-barchart.scm
+#. src/report/standard-reports/gnucash/report/category-barchart.scm
+#. src/report/standard-reports/gnucash/report/account-piecharts.scm
 #. src/report/standard-reports/account-piecharts.scm
-#: ../src/gnome/glade/account.glade.h:49
-#: ../src/gnome/glade/sched-xact.glade.h:134 ../intl-scm/guile-strings.c:1706
-#: ../intl-scm/guile-strings.c:2882
+#: ../src/gnome/glade/account.glade.h:42
+#: ../src/gnome/glade/sched-xact.glade.h:160 ../intl-scm/guile-strings.c:2416
+#: ../intl-scm/guile-strings.c:3040 ../intl-scm/guile-strings.c:4220
+#: ../intl-scm/guile-strings.c:5370
 msgid "Other"
 msgstr "Weitere"
 
-#: ../src/gnome/glade/account.glade.h:50
+#: ../src/gnome/glade/account.glade.h:43
 msgid "Placeholde_r"
 msgstr "_Platzhalter"
 
-#: ../src/gnome/glade/account.glade.h:51
+#: ../src/gnome/glade/account.glade.h:44
 msgid "Please choose the currency to use for new accounts."
 msgstr "Wählen Sie eine Währung für neue Konten."
 
-#: ../src/gnome/glade/account.glade.h:52
+#: ../src/gnome/glade/account.glade.h:45
 msgid "Prefix:"
 msgstr "Prefix:"
 
-#: ../src/gnome/glade/account.glade.h:53
+#: ../src/gnome/glade/account.glade.h:46
 msgid ""
 "Press `Apply' to create your new accounts.\n"
 "\n"
@@ -4368,17 +4491,17 @@
 "Drücken Sie »Abbrechen«, um den Assistenten zu schließen, ohne neue Konten "
 "zu erstellen."
 
-#: ../src/gnome/glade/account.glade.h:58
+#: ../src/gnome/glade/account.glade.h:51
 msgid "Renumber sub-accounts"
 msgstr "Unterkonten neu nummerieren"
 
-#: ../src/gnome/glade/account.glade.h:59
-#: ../src/import-export/generic-import.glade.h:51
-#: ../src/import-export/qif-import/qif.glade.h:73
+#: ../src/gnome/glade/account.glade.h:52
+#: ../src/import-export/generic-import.glade.h:44
+#: ../src/import-export/qif-import/qif.glade.h:63
 msgid "Select Account"
 msgstr "Konto auswählen"
 
-#: ../src/gnome/glade/account.glade.h:60
+#: ../src/gnome/glade/account.glade.h:53
 msgid ""
 "Select categories that correspond to the ways that you will use GnuCash.  "
 "Each category you select will cause several accounts to be created.  Select "
@@ -4389,36 +4512,36 @@
 "gewählte Kategorie wird einige Konten erzeugen. Sie können jederzeit auch "
 "später Konten anlegen. "
 
-#: ../src/gnome/glade/account.glade.h:61
-#: ../src/import-export/qif-import/qif.glade.h:75
+#: ../src/gnome/glade/account.glade.h:54
+#: ../src/import-export/qif-import/qif.glade.h:65
 msgid "Select or add a GnuCash account"
 msgstr "Auswählen oder Hinzufügen eines GnuCash Kontos"
 
-#: ../src/gnome/glade/account.glade.h:62
+#: ../src/gnome/glade/account.glade.h:55
 msgid "Setup new accounts"
 msgstr "Neue Konten einrichten"
 
-#: ../src/gnome/glade/account.glade.h:63
+#: ../src/gnome/glade/account.glade.h:56
 msgid "Show _hidden accounts"
 msgstr "_Versteckte Konten anzeigen"
 
-#: ../src/gnome/glade/account.glade.h:64
+#: ../src/gnome/glade/account.glade.h:57
 msgid "Show _zero total accounts"
 msgstr "Konten mit Saldo _Null anzeigen"
 
-#: ../src/gnome/glade/account.glade.h:65
+#: ../src/gnome/glade/account.glade.h:58
 msgid "Smallest _fraction:"
 msgstr "Kleinste _Stückelung:"
 
-#: ../src/gnome/glade/account.glade.h:66
+#: ../src/gnome/glade/account.glade.h:59
 msgid "Smallest fraction of this commodity that can be referenced."
 msgstr "Kleinste Stückelung, in der diese Währung/Aktie gehandelt werden kann."
 
-#: ../src/gnome/glade/account.glade.h:67
+#: ../src/gnome/glade/account.glade.h:60
 msgid "Ta_x related"
 msgstr "Steuer_relevant"
 
-#: ../src/gnome/glade/account.glade.h:68
+#: ../src/gnome/glade/account.glade.h:61
 msgid ""
 "This account (and any sub-accounts) will be hidden in the account tree and "
 "will not appear in the popup account list in the register.  To reset this "
@@ -4437,25 +4560,25 @@
 "versteckten Konten wieder angezeigt und Sie können diese bearbeiten, um "
 "diese Option wieder zu deaktivieren."
 
-#: ../src/gnome/glade/account.glade.h:69
+#: ../src/gnome/glade/account.glade.h:62
 msgid "This account contains read-only transactions which may not be deleted."
 msgstr ""
 "Dieses Konto enthält schreibgeschützte Buchungen.  Sie können diese nicht "
 "löschen."
 
-#: ../src/gnome/glade/account.glade.h:70
+#: ../src/gnome/glade/account.glade.h:63
 msgid ""
 "This account contains sub-accounts.  What would you like to do with these "
 "sub-accounts?"
 msgstr "Dieses Konto enthält Unterkonten. Was möchten Sie mit diesen machen?"
 
-#: ../src/gnome/glade/account.glade.h:71
+#: ../src/gnome/glade/account.glade.h:64
 msgid ""
 "This account contains transactions. What would you like to do with these "
 "transactions?"
 msgstr "Dieses Konto enthält Buchungen. Was möchten Sie mit diesen machen?"
 
-#: ../src/gnome/glade/account.glade.h:72
+#: ../src/gnome/glade/account.glade.h:65
 msgid ""
 "This account is present solely as a placeholder in the hierarchy.  "
 "Transactions may not be posted to this account, only to sub-accounts of this "
@@ -4464,7 +4587,7 @@
 "Dieses Konto dient als Platzhalter in der Kontenhierarchie. Buchungen können "
 "nicht auf dieses Konto gebucht werden, sondern nur auf Unterkonten davon."
 
-#: ../src/gnome/glade/account.glade.h:73
+#: ../src/gnome/glade/account.glade.h:66
 msgid ""
 "This druid will help you create a set of GnuCash accounts for your assets "
 "(such as investments, checking or savings accounts), liabilities (such as "
@@ -4478,9 +4601,17 @@
 "\n"
 "Drücken Sie »Abbrechen«, wenn Sie keine neuen Konten erstellen möchten."
 
-#: ../src/gnome/glade/account.glade.h:76
-msgid "Use Commodity Value"
-msgstr "Währungseinstellung benutzen"
+#: ../src/gnome/glade/account.glade.h:69
+msgid ""
+"Use Commodity Value\n"
+"1\n"
+"1/10\n"
+"1/100\n"
+"1/1000\n"
+"1/10000\n"
+"1/100000\n"
+"1/1000000"
+msgstr ""
 
 #: ../src/gnome/glade/account.glade.h:77
 msgid "_Account code:"
@@ -4492,7 +4623,7 @@
 
 #: ../src/gnome/glade/account.glade.h:79 ../src/gnome/glade/price.glade.h:21
 #: ../src/gnome/glade/print.glade.h:22 ../src/gnome/glade/register.glade.h:81
-#: ../src/gnome/glade/stocks.glade.h:20
+#: ../src/gnome/glade/stocks.glade.h:17
 #: ../src/gnome-utils/glade/exchange-dialog.glade.h:5
 msgid "_Date:"
 msgstr "_Datum:"
@@ -4510,49 +4641,53 @@
 msgstr "_Verschieben nach:"
 
 #: ../src/gnome/glade/account.glade.h:83
-#: ../src/gnome-utils/dialog-commodity.c:260
+msgid "_Renumber"
+msgstr "Neu _nummerieren"
+
+#: ../src/gnome/glade/account.glade.h:84
+#: ../src/gnome-utils/dialog-commodity.c:270
 msgid "_Security/currency:"
 msgstr "_Aktie/Währung:"
 
-#: ../src/gnome/glade/account.glade.h:84
+#: ../src/gnome/glade/account.glade.h:85
 #: ../src/gnome-utils/glade/dialog-reset-warnings.glade.h:6
 msgid "_Select All"
 msgstr "_Alle auswählen"
 
-#: ../src/gnome/glade/account.glade.h:85
+#: ../src/gnome/glade/account.glade.h:86
 msgid "_Select transfer account"
 msgstr "_Herkunftskonto auswählen"
 
-#: ../src/gnome/glade/account.glade.h:86
+#: ../src/gnome/glade/account.glade.h:87
 msgid "_Use equity 'Opening Balances' account"
 msgstr "Benutze _Ausgleichskonto für Anfangsbestand"
 
-#: ../src/gnome/glade/acctperiod.glade.h:2
+#: ../src/gnome/glade/acctperiod.glade.h:1
 msgid "Book Closing Dates"
 msgstr "Datum Buchabschluß"
 
-#: ../src/gnome/glade/acctperiod.glade.h:3
+#: ../src/gnome/glade/acctperiod.glade.h:2
 msgid "Close Book"
 msgstr "Buch abschließen"
 
-#: ../src/gnome/glade/acctperiod.glade.h:4
+#: ../src/gnome/glade/acctperiod.glade.h:3
 msgid "Enter a title for this book."
 msgstr "Geben Sie einen beschreibenden Namen für dieses Buch ein."
 
-#: ../src/gnome/glade/acctperiod.glade.h:5
+#: ../src/gnome/glade/acctperiod.glade.h:4
 msgid "Enter notes that describe this book."
 msgstr "Geben Sie Bemerkungen ein, die dieses Buch beschreiben."
 
-#: ../src/gnome/glade/acctperiod.glade.h:6
+#: ../src/gnome/glade/acctperiod.glade.h:5
 msgid "Finish Closing Books"
 msgstr "Buchabschluß abgeschlossen"
 
-#: ../src/gnome/glade/acctperiod.glade.h:7
+#: ../src/gnome/glade/acctperiod.glade.h:6
 #: ../src/gnome/glade/budget.glade.h:13
 msgid "Notes:"
 msgstr "Bemerkung:"
 
-#: ../src/gnome/glade/acctperiod.glade.h:8
+#: ../src/gnome/glade/acctperiod.glade.h:7
 msgid ""
 "Select an accounting period and the closing date for the period.  Books will "
 "be closed on midnight of the selected date."
@@ -4560,11 +4695,11 @@
 "Wählen Sie einen Buchungszeitraum und ein Abschlußdatum für diesen Zeitraum. "
 "Der Buchabschluß wird für Mitternacht jenes Datums gespeichert."
 
-#: ../src/gnome/glade/acctperiod.glade.h:9
+#: ../src/gnome/glade/acctperiod.glade.h:8
 msgid "Setup Accounting Periods"
 msgstr "Buchführungsperioden einrichten"
 
-#: ../src/gnome/glade/acctperiod.glade.h:10
+#: ../src/gnome/glade/acctperiod.glade.h:9
 msgid ""
 "This druid will help you setup and use accouting periods. \n"
 " \n"
@@ -4578,11 +4713,11 @@
 "wahrscheinlich nur krass falsch. Es könnte sogar Ihre Daten absolut kaputt "
 "machen. Bitte sorgen Sie für ein konkret rechtzeitiges Backup."
 
-#: ../src/gnome/glade/acctperiod.glade.h:13
+#: ../src/gnome/glade/acctperiod.glade.h:12
 msgid "Title:"
 msgstr "Titel:"
 
-#: ../src/gnome/glade/acctperiod.glade.h:14
+#: ../src/gnome/glade/acctperiod.glade.h:13
 msgid "xxx"
 msgstr "xxx"
 
@@ -4599,8 +4734,8 @@
 msgstr "Budgetname:"
 
 #: ../src/gnome/glade/budget.glade.h:4
-#: ../src/gnome/gnc-plugin-page-budget.c:143
-#: ../src/gnome/gnc-plugin-page-budget.c:829
+#: ../src/gnome/gnc-plugin-page-budget.c:139
+#: ../src/gnome/gnc-plugin-page-budget.c:825
 msgid "Budget Options"
 msgstr "Budget Optionen"
 
@@ -4625,7 +4760,7 @@
 msgstr "Budget abschätzen"
 
 #: ../src/gnome/glade/budget.glade.h:10
-#: ../src/gnome/glade/sched-xact.glade.h:79
+#: ../src/gnome/glade/sched-xact.glade.h:85
 msgid "Every "
 msgstr "Alle "
 
@@ -4663,9 +4798,9 @@
 msgstr "Gewähltes Budget öffnen"
 
 #: ../src/gnome/glade/budget.glade.h:17 ../src/gnome/glade/print.glade.h:10
-#: ../src/gnome/glade/sched-xact.glade.h:133
-#: ../src/gnome/gnc-plugin-page-budget.c:170
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:976
+#: ../src/gnome/glade/sched-xact.glade.h:159
+#: ../src/gnome/gnc-plugin-page-budget.c:166
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:986
 msgid "Options"
 msgstr "Optionen"
 
@@ -4674,7 +4809,7 @@
 msgstr "Signifikante Dezimalstellen:"
 
 #: ../src/gnome/glade/budget.glade.h:19
-#: ../src/gnome/glade/sched-xact.glade.h:169
+#: ../src/gnome/glade/sched-xact.glade.h:194
 msgid "Start Date:"
 msgstr "Anfangsdatum:"
 
@@ -4772,6 +4907,8 @@
 
 #: ../src/gnome/glade/commodities.glade.h:3
 #: ../src/gnome/gnc-plugin-page-account-tree.c:219
+#: ../src/gnome/gnc-plugin-page-sx-list.c:118
+#: ../src/import-export/import-main-matcher.c:427
 msgid "Edit"
 msgstr "Bearbeiten"
 
@@ -4812,233 +4949,241 @@
 msgstr "Jährlich"
 
 #: ../src/gnome/glade/fincalc.glade.h:7
+msgid ""
+"Annual\n"
+"Semi-annual\n"
+"Tri-annual\n"
+"Quarterly\n"
+"Bi-monthly\n"
+"Monthly\n"
+"Semi-monthly\n"
+"Bi-weekly\n"
+"Weekly\n"
+"Daily (360)\n"
+"Daily (365)"
+msgstr ""
+
+#: ../src/gnome/glade/fincalc.glade.h:18
 msgid "Beginning"
 msgstr "Anfangend an"
 
-#: ../src/gnome/glade/fincalc.glade.h:8
+#: ../src/gnome/glade/fincalc.glade.h:19
 msgid "Bi-monthly"
 msgstr "Zweimonatlich"
 
-#: ../src/gnome/glade/fincalc.glade.h:9
+#: ../src/gnome/glade/fincalc.glade.h:20
 msgid "Bi-weekly"
 msgstr "Zweiwöchentlich"
 
-#: ../src/gnome/glade/fincalc.glade.h:10
+#: ../src/gnome/glade/fincalc.glade.h:21
 msgid "Calculate"
 msgstr "Berechnen"
 
-#: ../src/gnome/glade/fincalc.glade.h:11
+#: ../src/gnome/glade/fincalc.glade.h:22
 msgid "Clear the entry"
 msgstr "Löschen des Eintrages"
 
-#: ../src/gnome/glade/fincalc.glade.h:12
+#: ../src/gnome/glade/fincalc.glade.h:23
 msgid "Co_mpounding:"
 msgstr "Ver_zinsung:"
 
-#: ../src/gnome/glade/fincalc.glade.h:13
+#: ../src/gnome/glade/fincalc.glade.h:24
 msgid "Continuous"
 msgstr "Kontinuierlich"
 
-#: ../src/gnome/glade/fincalc.glade.h:14
+#: ../src/gnome/glade/fincalc.glade.h:25
 msgid "Daily (360)"
 msgstr "Täglich (360)"
 
-#: ../src/gnome/glade/fincalc.glade.h:15
+#: ../src/gnome/glade/fincalc.glade.h:26
 msgid "Daily (365)"
 msgstr "Täglich (365)"
 
-#: ../src/gnome/glade/fincalc.glade.h:16
+#: ../src/gnome/glade/fincalc.glade.h:27
 msgid "Discrete"
 msgstr "Schrittweise"
 
-#: ../src/gnome/glade/fincalc.glade.h:17
+#: ../src/gnome/glade/fincalc.glade.h:28
 msgid "End"
 msgstr "Ende"
 
-#: ../src/gnome/glade/fincalc.glade.h:18
+#: ../src/gnome/glade/fincalc.glade.h:29
 msgid "Financial Calculator"
 msgstr "Finanzrechner"
 
-#: ../src/gnome/glade/fincalc.glade.h:19
-#: ../src/gnome/glade/sched-xact.glade.h:88
+#: ../src/gnome/glade/fincalc.glade.h:30
+#: ../src/gnome/glade/sched-xact.glade.h:95
 msgid "Frequency:"
 msgstr "Häufigkeit:"
 
-#: ../src/gnome/glade/fincalc.glade.h:20
+#: ../src/gnome/glade/fincalc.glade.h:31
 msgid "Future value"
 msgstr "Zukünftiger Wert"
 
-#: ../src/gnome/glade/fincalc.glade.h:21
+#: ../src/gnome/glade/fincalc.glade.h:32
 msgid "Interest rate"
 msgstr "Zinssatz"
 
+#. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../src/gnome/glade/fincalc.glade.h:22
-#: ../src/gnome/glade/sched-xact.glade.h:114 ../intl-scm/guile-strings.c:2388
-#: ../intl-scm/guile-strings.c:2390
+#: ../src/gnome/glade/fincalc.glade.h:33
+#: ../src/gnome/glade/sched-xact.glade.h:132 ../intl-scm/guile-strings.c:3722
+#: ../intl-scm/guile-strings.c:3724 ../intl-scm/guile-strings.c:4872
+#: ../intl-scm/guile-strings.c:4874
 msgid "Monthly"
 msgstr "Monatlich"
 
-#: ../src/gnome/glade/fincalc.glade.h:23
+#: ../src/gnome/glade/fincalc.glade.h:34
 msgid "Payment Total:"
 msgstr "Zahlungsbetrag:"
 
-#: ../src/gnome/glade/fincalc.glade.h:24
+#: ../src/gnome/glade/fincalc.glade.h:35
 msgid "Payment periods"
 msgstr "Zahlungsintervalle"
 
-#: ../src/gnome/glade/fincalc.glade.h:25
+#: ../src/gnome/glade/fincalc.glade.h:36
 msgid "Periodic payment"
 msgstr "Periodische Zahlung"
 
-#: ../src/gnome/glade/fincalc.glade.h:26
+#: ../src/gnome/glade/fincalc.glade.h:37
 msgid "Present value"
 msgstr "Aktueller Wert"
 
+#. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../src/gnome/glade/fincalc.glade.h:27
-#: ../src/gnome/glade/sched-xact.glade.h:146 ../intl-scm/guile-strings.c:2392
-#: ../intl-scm/guile-strings.c:2394
+#: ../src/gnome/glade/fincalc.glade.h:38
+#: ../src/gnome/glade/sched-xact.glade.h:172 ../intl-scm/guile-strings.c:3726
+#: ../intl-scm/guile-strings.c:3728 ../intl-scm/guile-strings.c:4876
+#: ../intl-scm/guile-strings.c:4878
 msgid "Quarterly"
 msgstr "Vierteljährlich"
 
-#: ../src/gnome/glade/fincalc.glade.h:28
+#: ../src/gnome/glade/fincalc.glade.h:39
 msgid "Recalculate the (single) blank entry in the above fields."
 msgstr "Den einen leeren Eintrag in den Feldern ausrechnen."
 
-#: ../src/gnome/glade/fincalc.glade.h:29
+#: ../src/gnome/glade/fincalc.glade.h:40
 #: ../src/gnome/glade/register.glade.h:41
-#: ../src/gnome/gnc-plugin-page-register.c:332
+#: ../src/gnome/gnc-plugin-page-register.c:329
 msgid "Schedule"
 msgstr "Terminiert"
 
-#: ../src/gnome/glade/fincalc.glade.h:30
+#: ../src/gnome/glade/fincalc.glade.h:41
 msgid "Semi-annual"
 msgstr "Halbjährlich"
 
-#: ../src/gnome/glade/fincalc.glade.h:31
+#: ../src/gnome/glade/fincalc.glade.h:42
 msgid "Semi-monthly"
 msgstr "Halbmonatlich"
 
-#: ../src/gnome/glade/fincalc.glade.h:32
+#: ../src/gnome/glade/fincalc.glade.h:43
 msgid "Tri-annual"
 msgstr "Dreimal pro Jahr"
 
-#: ../src/gnome/glade/fincalc.glade.h:33
-#: ../src/gnome/glade/sched-xact.glade.h:186
+#: ../src/gnome/glade/fincalc.glade.h:44
+#: ../src/gnome/glade/sched-xact.glade.h:211
 msgid "Type:"
 msgstr "Typ:"
 
-#: ../src/gnome/glade/fincalc.glade.h:34
-#: ../src/gnome/glade/sched-xact.glade.h:195
+#: ../src/gnome/glade/fincalc.glade.h:45
+#: ../src/gnome/glade/sched-xact.glade.h:220
 msgid "Weekly"
 msgstr "Wöchentlich"
 
-#: ../src/gnome/glade/fincalc.glade.h:35
+#: ../src/gnome/glade/fincalc.glade.h:46
 msgid "When paid:"
 msgstr "Zahlungsdatum:"
 
-#: ../src/gnome/glade/fincalc.glade.h:36
+#: ../src/gnome/glade/fincalc.glade.h:47
 msgid "_Effective Date:"
 msgstr "_Tatsächliches Datum:"
 
-#: ../src/gnome/glade/fincalc.glade.h:37
+#: ../src/gnome/glade/fincalc.glade.h:48
 msgid "_Initial Payment:"
 msgstr "_Anfängliche Zahlung:"
 
-#: ../src/gnome/glade/fincalc.glade.h:38
+#: ../src/gnome/glade/fincalc.glade.h:49
 msgid "_Payments:"
 msgstr "Z_ahlungen:"
 
-#: ../src/gnome/glade/fincalc.glade.h:39
+#: ../src/gnome/glade/fincalc.glade.h:50
 msgid "total"
 msgstr "Betrag"
 
-#: ../src/gnome/glade/lots.glade.h:2
+#: ../src/gnome/glade/lots.glade.h:1
 msgid "<b>_Lots in This Account</b>"
 msgstr "<b>_Posten in diesem Konto</b>"
 
-#: ../src/gnome/glade/lots.glade.h:3
+#: ../src/gnome/glade/lots.glade.h:2
 msgid "<b>_Mini-Viewer</b>"
 msgstr "<b>_Mini-Anzeige</b>"
 
-#: ../src/gnome/glade/lots.glade.h:4
+#: ../src/gnome/glade/lots.glade.h:3
 msgid "<b>_Notes</b>"
 msgstr "<b>Be_schreibung</b>"
 
-#: ../src/gnome/glade/lots.glade.h:5
+#: ../src/gnome/glade/lots.glade.h:4
 msgid "<b>_Title</b>"
 msgstr "<b>_Name</b>"
 
-#: ../src/gnome/glade/lots.glade.h:6
-msgid "A list of all of the lots in this account."
-msgstr "Eine Liste der Posten in diesem Konto."
-
-#: ../src/gnome/glade/lots.glade.h:7
+#: ../src/gnome/glade/lots.glade.h:5
 msgid "A summary of all of the transactions in the selected lot"
 msgstr "Eine Zusammenfassung aller Buchungen in dem gewählten Posten"
 
 #. src/report/report-system/html-utilities.scm
+#. src/report/standard-reports/gnucash/report/account-summary.scm
+#. src/report/standard-reports/gnucash/report/transaction.scm
+#. src/report/standard-reports/gnucash/report/register.scm
 #. src/report/standard-reports/account-summary.scm
 #. src/report/standard-reports/transaction.scm
 #. src/report/standard-reports/register.scm
 #. src/business/business-reports/owner-report.scm
-#: ../src/gnome/glade/lots.glade.h:9
-#: ../src/gnome-utils/gnc-tree-view-account.c:558
+#. src/business/business-reports/gnucash/report/owner-report.scm
+#: ../src/gnome/glade/lots.glade.h:7 ../src/gnome/lot-viewer.c:625
+#: ../src/gnome-utils/gnc-tree-view-account.c:554
 #: ../src/register/ledger-core/split-register-model.c:163
 #: ../src/register/ledger-core/split-register-model.c:303
-#: ../intl-scm/guile-strings.c:890 ../intl-scm/guile-strings.c:1950
-#: ../intl-scm/guile-strings.c:2264 ../intl-scm/guile-strings.c:2568
-#: ../intl-scm/guile-strings.c:3422
+#: ../intl-scm/guile-strings.c:1404 ../intl-scm/guile-strings.c:3284
+#: ../intl-scm/guile-strings.c:3598 ../intl-scm/guile-strings.c:3902
+#: ../intl-scm/guile-strings.c:4434 ../intl-scm/guile-strings.c:4748
+#: ../intl-scm/guile-strings.c:5052 ../intl-scm/guile-strings.c:6148
+#: ../intl-scm/guile-strings.c:6672
 msgid "Balance"
 msgstr "Saldo"
 
-#: ../src/gnome/glade/lots.glade.h:12
+#: ../src/gnome/glade/lots.glade.h:9
 msgid "Delete the highlighted lot"
 msgstr "Ausgewählter Posten löschen"
 
-#: ../src/gnome/glade/lots.glade.h:14
+#: ../src/gnome/glade/lots.glade.h:11
 msgid "Enter a name for the highlighted lot."
 msgstr "Bitte geben Sie einen Namen für den Posten ein"
 
-#: ../src/gnome/glade/lots.glade.h:15
+#: ../src/gnome/glade/lots.glade.h:12
 msgid "Enter any notes you want to make about this lot."
 msgstr ""
 "Geben Sie hier alle Notizen ein, die Sie zu diesem Posten speichern wollen."
 
+#. src/report/standard-reports/gnucash/report/average-balance.scm
 #. src/report/standard-reports/average-balance.scm
-#: ../src/gnome/glade/lots.glade.h:16 ../intl-scm/guile-strings.c:2726
+#: ../src/gnome/glade/lots.glade.h:13 ../intl-scm/guile-strings.c:4064
+#: ../intl-scm/guile-strings.c:5214
 msgid "Gain/Loss"
 msgstr "Wertzuwachs/Verlust"
 
-#: ../src/gnome/glade/lots.glade.h:17
-msgid "Gains"
-msgstr "Wertzuwachs"
-
-#: ../src/gnome/glade/lots.glade.h:18
+#: ../src/gnome/glade/lots.glade.h:14
 msgid "Lot Viewer"
 msgstr "Posten anzeigen"
 
-#: ../src/gnome/glade/lots.glade.h:20
-msgid "Open a register showing the transactions in this lot"
-msgstr "Ein Kontofenster öffnen, das alle Buchungen in diesem Posten anzeigt"
-
-#: ../src/gnome/glade/lots.glade.h:22
+#: ../src/gnome/glade/lots.glade.h:16
 msgid "Scrub _Account"
 msgstr "K_onto überprüfen"
 
-#: ../src/gnome/glade/lots.glade.h:23
+#: ../src/gnome/glade/lots.glade.h:17
 msgid "Scrub the highlighted lot"
 msgstr "Den gewählten Posten überprüfen und reparieren"
 
-#. src/report/standard-reports/general-journal.scm
-#. src/report/standard-reports/register.scm
-#: ../src/gnome/glade/lots.glade.h:24 ../intl-scm/guile-strings.c:1272
-#: ../intl-scm/guile-strings.c:2578
-msgid "Title"
-msgstr "Titel"
-
-#: ../src/gnome/glade/lots.glade.h:26
+#: ../src/gnome/glade/lots.glade.h:19
 msgid "_Scrub"
 msgstr "Über_prüfen"
 
@@ -5224,7 +5369,7 @@
 "Unbekannt"
 
 #: ../src/gnome/glade/price.glade.h:7
-#: ../src/gnome-utils/dialog-commodity.c:269
+#: ../src/gnome-utils/dialog-commodity.c:279
 msgid "Cu_rrency:"
 msgstr "_Währung:"
 
@@ -5297,7 +5442,7 @@
 msgstr "_Preis:"
 
 #: ../src/gnome/glade/price.glade.h:24
-#: ../src/gnome-utils/dialog-commodity.c:264
+#: ../src/gnome-utils/dialog-commodity.c:274
 msgid "_Security:"
 msgstr "_Aktie:"
 
@@ -5369,7 +5514,7 @@
 msgid "_Date format:"
 msgstr "_Datumsformat:"
 
-#: ../src/gnome/glade/print.glade.h:23 ../src/gnome/glade/stocks.glade.h:21
+#: ../src/gnome/glade/print.glade.h:23 ../src/gnome/glade/stocks.glade.h:18
 msgid "_Memo:"
 msgstr "Buchungs_text:"
 
@@ -5405,7 +5550,7 @@
 msgid "<b>Reconcile Information</b>"
 msgstr "<b>Informationen zum Kontenabgleich</b>"
 
-#: ../src/gnome/glade/reconcile.glade.h:2 ../src/gnome/window-reconcile.c:721
+#: ../src/gnome/glade/reconcile.glade.h:2 ../src/gnome/window-reconcile.c:720
 msgid "Enter _Interest Payment..."
 msgstr "Zahlung Haben_zins eingeben..."
 
@@ -5414,7 +5559,7 @@
 msgstr "_Unterkonten mit einbeziehen"
 
 #. starting balance title/value
-#: ../src/gnome/glade/reconcile.glade.h:4 ../src/gnome/window-reconcile.c:1663
+#: ../src/gnome/glade/reconcile.glade.h:4 ../src/gnome/window-reconcile.c:1664
 msgid "Starting Balance:"
 msgstr "Anfangssaldo:"
 
@@ -5443,7 +5588,7 @@
 msgstr "Bes_tätigt"
 
 #: ../src/gnome/glade/register.glade.h:7
-#: ../src/gnome/gnc-plugin-page-register.c:210
+#: ../src/gnome/gnc-plugin-page-register.c:207
 msgid "Cancel the current transaction"
 msgstr "Aktuelle Buchung abbrechen"
 
@@ -5460,7 +5605,7 @@
 msgstr "Ausgewählte Buchung kopieren"
 
 #: ../src/gnome/glade/register.glade.h:11
-#: ../src/gnome/gnc-plugin-page-register.c:250
+#: ../src/gnome/gnc-plugin-page-register.c:247
 msgid ""
 "Create a Scheduled Transaction with the current transaction as a template"
 msgstr "Terminierte Buchung erstellen mit aktuellem Buchungssatz als Vorlage"
@@ -5474,7 +5619,7 @@
 msgstr "Ausgewählten Buchungssatz ausschneiden"
 
 #: ../src/gnome/glade/register.glade.h:17
-#: ../src/gnome/gnc-plugin-page-register.c:201
+#: ../src/gnome/gnc-plugin-page-register.c:198
 msgid "Delete the current transaction"
 msgstr "Aktuellen Buchungssatz löschen"
 
@@ -5483,7 +5628,7 @@
 msgstr "Buchung duplizieren..."
 
 #: ../src/gnome/glade/register.glade.h:21
-#: ../src/import-export/generic-import.glade.h:20
+#: ../src/import-export/generic-import.glade.h:17
 msgid "Duplicate Transaction"
 msgstr "Doppelte Buchung"
 
@@ -5512,7 +5657,7 @@
 msgstr "Gegen"
 
 #: ../src/gnome/glade/register.glade.h:29
-#: ../src/gnome/gnc-plugin-page-register.c:247
+#: ../src/gnome/gnc-plugin-page-register.c:244
 msgid "Jump to the corresponding transaction in the other account"
 msgstr "Zur passenden Gegenbuchung im Gegenkonto gehen"
 
@@ -5521,12 +5666,12 @@
 msgstr "Beibehalten der normalen Kontoreihenfolge"
 
 #: ../src/gnome/glade/register.glade.h:31
-#: ../src/gnome/gnc-plugin-page-register.c:198
+#: ../src/gnome/gnc-plugin-page-register.c:195
 msgid "Make a copy of the current transaction"
 msgstr "Eine Kopie des aktuellen Buchungssatze erstellen"
 
 #: ../src/gnome/glade/register.glade.h:32
-#: ../src/gnome/gnc-plugin-page-register.c:241
+#: ../src/gnome/gnc-plugin-page-register.c:238
 msgid "Move to the blank transaction at the bottom of the register"
 msgstr "Zur freien Buchungszeile am Ende dieses Kontobuchs gehen"
 
@@ -5539,7 +5684,7 @@
 msgstr "Buchung einfügen"
 
 #: ../src/gnome/glade/register.glade.h:35
-#: ../src/gnome/gnc-plugin-page-register.c:195
+#: ../src/gnome/gnc-plugin-page-register.c:192
 msgid "Paste the transaction from the clipboard"
 msgstr "Den Buchungssatz von der Zwischenablage einfügen"
 
@@ -5548,7 +5693,7 @@
 msgstr "Begründung für Buchung ungültig machen:"
 
 #: ../src/gnome/glade/register.glade.h:37
-#: ../src/gnome/gnc-plugin-page-register.c:207
+#: ../src/gnome/gnc-plugin-page-register.c:204
 msgid "Record the current transaction"
 msgstr "Änderungen des aktuellen Buchungssatzes übernehmen"
 
@@ -5557,7 +5702,7 @@
 msgstr "Buchungsteile entfernen"
 
 #: ../src/gnome/glade/register.glade.h:39
-#: ../src/gnome/gnc-plugin-page-register.c:275
+#: ../src/gnome/gnc-plugin-page-register.c:272
 #: ../src/gnome-utils/gnc-icons.c:22
 msgid "S_plit Transaction"
 msgstr "Mehrteilige Buchung"
@@ -5583,22 +5728,22 @@
 msgstr "_Alle anzeigen"
 
 #: ../src/gnome/glade/register.glade.h:46
-#: ../src/gnome/gnc-plugin-page-register.c:276
+#: ../src/gnome/gnc-plugin-page-register.c:273
 msgid "Show all splits in the current transaction"
 msgstr "Alle Buchungen im aktuellen Buchungssatz anzeigen"
 
 #: ../src/gnome/glade/register.glade.h:47
-#: ../src/gnome/gnc-plugin-page-register.c:291
+#: ../src/gnome/gnc-plugin-page-register.c:288
 msgid "Show expanded transactions with all splits"
 msgstr "Alle Buchungssätze vollständig mit allen Teilen anzeigen"
 
 #: ../src/gnome/glade/register.glade.h:48
-#: ../src/gnome/gnc-plugin-page-register.c:285
+#: ../src/gnome/gnc-plugin-page-register.c:282
 msgid "Show transactions on one or two lines"
 msgstr "Alle Buchungssätze einzeilig anzeigen"
 
 #: ../src/gnome/glade/register.glade.h:49
-#: ../src/gnome/gnc-plugin-page-register.c:288
+#: ../src/gnome/gnc-plugin-page-register.c:285
 msgid ""
 "Show transactions on one or two lines and expand the current transaction"
 msgstr ""
@@ -5606,8 +5751,8 @@
 "Buchungssatz vollständig anzeigen."
 
 #: ../src/gnome/glade/register.glade.h:50
-#: ../src/gnome/gnc-plugin-page-register.c:272
-#: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:36
+#: ../src/gnome/gnc-plugin-page-register.c:269
+#: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:38
 msgid "Show two lines of information for each transaction"
 msgstr ""
 "Alle Buchungssätze mit Bemerkung anzeigen, also zwei Zeilen pro Buchung "
@@ -5637,23 +5782,31 @@
 msgid "Sort by action field"
 msgstr "Sortiere nach Aktion"
 
+#. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../src/gnome/glade/register.glade.h:58 ../intl-scm/guile-strings.c:2362
+#: ../src/gnome/glade/register.glade.h:58 ../intl-scm/guile-strings.c:3696
+#: ../intl-scm/guile-strings.c:4846
 msgid "Sort by amount"
 msgstr "Sortieren nach Summe"
 
+#. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../src/gnome/glade/register.glade.h:59 ../intl-scm/guile-strings.c:2338
+#: ../src/gnome/glade/register.glade.h:59 ../intl-scm/guile-strings.c:3672
+#: ../intl-scm/guile-strings.c:4822
 msgid "Sort by date"
 msgstr "Nach Datum sortieren"
 
+#. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../src/gnome/glade/register.glade.h:60 ../intl-scm/guile-strings.c:2366
+#: ../src/gnome/glade/register.glade.h:60 ../intl-scm/guile-strings.c:3700
+#: ../intl-scm/guile-strings.c:4850
 msgid "Sort by description"
 msgstr "Sortieren nach Beschreibung"
 
+#. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../src/gnome/glade/register.glade.h:61 ../intl-scm/guile-strings.c:2374
+#: ../src/gnome/glade/register.glade.h:61 ../intl-scm/guile-strings.c:3708
+#: ../intl-scm/guile-strings.c:4858
 msgid "Sort by memo"
 msgstr "Sortiere nach Buchungstext"
 
@@ -5709,18 +5862,18 @@
 
 #. Translators: This is a menu item in the View menu
 #: ../src/gnome/glade/register.glade.h:76
-#: ../src/gnome/gnc-plugin-page-register.c:287
+#: ../src/gnome/gnc-plugin-page-register.c:284
 msgid "_Auto-Split Ledger"
 msgstr "_Aktive vollständig"
 
 #. Translators: This is a menu item in the View menu
 #: ../src/gnome/glade/register.glade.h:77
-#: ../src/gnome/gnc-plugin-page-register.c:284
+#: ../src/gnome/gnc-plugin-page-register.c:281
 msgid "_Basic Ledger"
 msgstr "_Einzeilig"
 
 #: ../src/gnome/glade/register.glade.h:83
-#: ../src/gnome/gnc-plugin-page-register.c:271
+#: ../src/gnome/gnc-plugin-page-register.c:268
 msgid "_Double Line"
 msgstr "_Bemerkung anzeigen"
 
@@ -5733,7 +5886,7 @@
 msgstr "_Fixiert"
 
 #: ../src/gnome/glade/register.glade.h:88
-#: ../src/gnome/gnc-plugin-page-register.c:246
+#: ../src/gnome/gnc-plugin-page-register.c:243
 #: ../src/gnome-utils/gnc-icons.c:23
 msgid "_Jump"
 msgstr "Gegenbuchung"
@@ -5795,644 +5948,552 @@
 msgstr "... Treuhandkonto für Zahlungen verwenden?"
 
 #: ../src/gnome/glade/sched-xact.glade.h:5
-msgid "10th"
-msgstr "10."
+msgid ""
+"1st\n"
+"2nd\n"
+"3rd\n"
+"4th\n"
+"5th\n"
+"6th\n"
+"7th\n"
+"8th\n"
+"9th\n"
+"10th\n"
+"11th\n"
+"12th\n"
+"13th\n"
+"14th\n"
+"15th\n"
+"16th\n"
+"17th\n"
+"18th\n"
+"19th\n"
+"20th\n"
+"21st\n"
+"22nd\n"
+"23rd\n"
+"24th\n"
+"25th\n"
+"26th\n"
+"27th\n"
+"28th\n"
+"[29th/last]\n"
+"[30th/last]\n"
+"[31st/last]"
+msgstr ""
 
-#: ../src/gnome/glade/sched-xact.glade.h:6
-msgid "11th"
-msgstr "11."
-
-#: ../src/gnome/glade/sched-xact.glade.h:7
-msgid "12th"
-msgstr "12."
-
-#: ../src/gnome/glade/sched-xact.glade.h:8
-msgid "13th"
-msgstr "13."
-
-#: ../src/gnome/glade/sched-xact.glade.h:9
-msgid "14th"
-msgstr "14."
-
-#: ../src/gnome/glade/sched-xact.glade.h:10
-msgid "15th"
-msgstr "15."
-
-#: ../src/gnome/glade/sched-xact.glade.h:11
-msgid "16th"
-msgstr "16."
-
-#: ../src/gnome/glade/sched-xact.glade.h:12
-msgid "17th"
-msgstr "17."
-
-#: ../src/gnome/glade/sched-xact.glade.h:13
-msgid "18th"
-msgstr "18."
-
-#: ../src/gnome/glade/sched-xact.glade.h:14
-msgid "19th"
-msgstr "19."
-
-#: ../src/gnome/glade/sched-xact.glade.h:15
-msgid "1st"
-msgstr "1."
-
-#: ../src/gnome/glade/sched-xact.glade.h:16
-msgid "20th"
-msgstr "20."
-
-#: ../src/gnome/glade/sched-xact.glade.h:17
-msgid "21st"
-msgstr "21."
-
-#: ../src/gnome/glade/sched-xact.glade.h:18
-msgid "22nd"
-msgstr "22."
-
-#: ../src/gnome/glade/sched-xact.glade.h:19
-msgid "23rd"
-msgstr "23."
-
-#: ../src/gnome/glade/sched-xact.glade.h:20
-msgid "24th"
-msgstr "24."
-
-#: ../src/gnome/glade/sched-xact.glade.h:21
-msgid "25th"
-msgstr "25."
-
-#: ../src/gnome/glade/sched-xact.glade.h:22
-msgid "26th"
-msgstr "26."
-
-#: ../src/gnome/glade/sched-xact.glade.h:23
-msgid "27th"
-msgstr "27."
-
-#: ../src/gnome/glade/sched-xact.glade.h:24
-msgid "28th"
-msgstr "28."
-
-#: ../src/gnome/glade/sched-xact.glade.h:25
-msgid "2nd"
-msgstr "2."
-
-#: ../src/gnome/glade/sched-xact.glade.h:26
-msgid "3rd"
-msgstr "3."
-
-#: ../src/gnome/glade/sched-xact.glade.h:27
-msgid "4th"
-msgstr "4."
-
-#: ../src/gnome/glade/sched-xact.glade.h:28
-msgid "5th"
-msgstr "5."
-
-#: ../src/gnome/glade/sched-xact.glade.h:29
-msgid "6th"
-msgstr "6."
-
-#: ../src/gnome/glade/sched-xact.glade.h:30
-msgid "7th"
-msgstr "7."
-
-#: ../src/gnome/glade/sched-xact.glade.h:31
-msgid "8th"
-msgstr "8."
-
-#: ../src/gnome/glade/sched-xact.glade.h:32
-msgid "9th"
-msgstr "9."
-
-#: ../src/gnome/glade/sched-xact.glade.h:33
+#: ../src/gnome/glade/sched-xact.glade.h:36
 msgid "<b>Name</b>"
 msgstr "<b>Name</b>"
 
-#: ../src/gnome/glade/sched-xact.glade.h:34
+#: ../src/gnome/glade/sched-xact.glade.h:37
 msgid "<b>Occurrences</b>"
 msgstr "<b>Auftreten</b>"
 
-#: ../src/gnome/glade/sched-xact.glade.h:35
+#: ../src/gnome/glade/sched-xact.glade.h:38
 msgid "<b>Options</b>"
 msgstr "<b>Optionen</b>"
 
-#: ../src/gnome/glade/sched-xact.glade.h:36
+#: ../src/gnome/glade/sched-xact.glade.h:39
 msgid "<b>Recurrence Frequency</b>"
 msgstr "<b>Häufigkeit der Wiederholung</b>"
 
-#: ../src/gnome/glade/sched-xact.glade.h:37
+#: ../src/gnome/glade/sched-xact.glade.h:40
 msgid "<b>Since Last Run Dialog</b>"
 msgstr "<b>Seit-letztem-Aufruf Fenster</b>"
 
-#: ../src/gnome/glade/sched-xact.glade.h:38
+#: ../src/gnome/glade/sched-xact.glade.h:41
 msgid "<b>Template Transaction</b>"
 msgstr "<b>Buchungsvorlage</b>"
 
-#: ../src/gnome/glade/sched-xact.glade.h:39
+#: ../src/gnome/glade/sched-xact.glade.h:42
 msgid "<b>Transaction Editor Defaults</b>"
 msgstr "<b>Voreinstellungen Buchungseditor</b>"
 
-#: ../src/gnome/glade/sched-xact.glade.h:41
+#: ../src/gnome/glade/sched-xact.glade.h:44
 msgid "<b>Upcoming</b>"
 msgstr "<b>Bevorstehend</b>"
 
-#: ../src/gnome/glade/sched-xact.glade.h:42
+#: ../src/gnome/glade/sched-xact.glade.h:45
 msgid "Account Deletion"
 msgstr "Kontenlöschung"
 
-#: ../src/gnome/glade/sched-xact.glade.h:43
+#: ../src/gnome/glade/sched-xact.glade.h:46
 msgid "Advanced..."
 msgstr "Erweitert..."
 
-#: ../src/gnome/glade/sched-xact.glade.h:44
-#: ../src/gnome-utils/glade/transfer.glade.h:6
+#: ../src/gnome/glade/sched-xact.glade.h:47
+#: ../src/gnome-utils/glade/transfer.glade.h:5
 msgid "Amount:"
 msgstr "Betrag:"
 
-#: ../src/gnome/glade/sched-xact.glade.h:45
-msgid "Apr, Aug, Dec"
-msgstr "Apr, Aug, Dez"
-
-#: ../src/gnome/glade/sched-xact.glade.h:46
-msgid "Apr, Oct"
-msgstr "Apr, Okt"
-
-#: ../src/gnome/glade/sched-xact.glade.h:47
-msgid "April"
-msgstr "April"
-
 #: ../src/gnome/glade/sched-xact.glade.h:48
-msgid "August"
-msgstr "August"
-
-#: ../src/gnome/glade/sched-xact.glade.h:49
 msgid "Auto-Created Transactions Notification"
 msgstr "Benachrichtigung über automatisch erstellte Buchungen"
 
-#: ../src/gnome/glade/sched-xact.glade.h:50
+#: ../src/gnome/glade/sched-xact.glade.h:49
 msgid "Begin notifications this many days before the transaction is created."
 msgstr ""
 "Benachrichtigung bereits diese Anzahl Tage vor der Erstellung der Buchungen "
 "anzeigen."
 
-#: ../src/gnome/glade/sched-xact.glade.h:51
+#: ../src/gnome/glade/sched-xact.glade.h:50
 msgid "Bi-Weekly"
 msgstr "Zweiwöchentlich"
 
-#: ../src/gnome/glade/sched-xact.glade.h:52
+#: ../src/gnome/glade/sched-xact.glade.h:51
 msgid "Conditional on splits not having variables"
 msgstr "Abhängig davon, dass Buchungen keine Variablen haben"
 
-#: ../src/gnome/glade/sched-xact.glade.h:53
+#: ../src/gnome/glade/sched-xact.glade.h:52
 msgid "Crea_te in advance, days:"
 msgstr "Anzahl Tage, um im _Voraus zu erstellen:"
 
-#: ../src/gnome/glade/sched-xact.glade.h:54
+#: ../src/gnome/glade/sched-xact.glade.h:53
 msgid "Create"
 msgstr "Erstellen"
 
-#: ../src/gnome/glade/sched-xact.glade.h:55
+#: ../src/gnome/glade/sched-xact.glade.h:54
 msgid "Create as scheduled"
 msgstr "Erstellen wie terminiert"
 
-#: ../src/gnome/glade/sched-xact.glade.h:56
+#: ../src/gnome/glade/sched-xact.glade.h:55
 msgid "Create automatically"
 msgstr "Automatisch erstellen"
 
-#: ../src/gnome/glade/sched-xact.glade.h:57
+#: ../src/gnome/glade/sched-xact.glade.h:56
 msgid "Create in advance:"
 msgstr "Im Voraus erstellen:"
 
-#: ../src/gnome/glade/sched-xact.glade.h:58
+#: ../src/gnome/glade/sched-xact.glade.h:57
 msgid "Create the transaction this many days before its effective date."
 msgstr ""
 "Buchungen um diese Anzahl der Tage im Voraus vor dem eigentlichen "
 "Buchungsdatum erstellen."
 
-#: ../src/gnome/glade/sched-xact.glade.h:59
+#: ../src/gnome/glade/sched-xact.glade.h:58
 msgid "Created Transaction Review"
 msgstr "Buchungsübersicht erstellt"
 
-#: ../src/gnome/glade/sched-xact.glade.h:60
+#: ../src/gnome/glade/sched-xact.glade.h:59
 msgid "Creating transactions..."
 msgstr "Buchungen erstellen..."
 
-#: ../src/gnome/glade/sched-xact.glade.h:61
+#: ../src/gnome/glade/sched-xact.glade.h:60
 msgid "Creation State"
 msgstr "Erstellen Status"
 
-#: ../src/gnome/glade/sched-xact.glade.h:62
-msgid "Current Year"
-msgstr "Dieses Jahr"
+#: ../src/gnome/glade/sched-xact.glade.h:61
+msgid ""
+"Current Year\n"
+"Now + 1 Year\n"
+"Whole Loan\n"
+"Custom"
+msgstr ""
 
-#: ../src/gnome/glade/sched-xact.glade.h:63
-msgid "Custom"
-msgstr "Benutzerdefiniert"
+#: ../src/gnome/glade/sched-xact.glade.h:66
+msgid ""
+"Daily\n"
+"Weekly\n"
+"Bi-Weekly\n"
+"Monthly\n"
+"Quarterly\n"
+"Yearly"
+msgstr ""
 
-#: ../src/gnome/glade/sched-xact.glade.h:65
+#: ../src/gnome/glade/sched-xact.glade.h:72
 msgid "Daily [M-F]"
 msgstr "Täglich [Mo-Fr]"
 
 #. src/business/business-reports/owner-report.scm
-#: ../src/gnome/glade/sched-xact.glade.h:66 ../intl-scm/guile-strings.c:3488
+#. src/business/business-reports/gnucash/report/owner-report.scm
+#: ../src/gnome/glade/sched-xact.glade.h:73 ../intl-scm/guile-strings.c:6214
+#: ../intl-scm/guile-strings.c:6738
 msgid "Date Range"
 msgstr "Datumsbereich"
 
 #. src/report/report-system/options-utilities.scm
-#: ../src/gnome/glade/sched-xact.glade.h:67 ../intl-scm/guile-strings.c:666
-#: ../intl-scm/guile-strings.c:668
+#: ../src/gnome/glade/sched-xact.glade.h:74 ../intl-scm/guile-strings.c:1178
+#: ../intl-scm/guile-strings.c:1180
 msgid "Day"
 msgstr "Tag"
 
-#: ../src/gnome/glade/sched-xact.glade.h:69
+#: ../src/gnome/glade/sched-xact.glade.h:76
 msgid "Days Away"
 msgstr "Tage in der Zukunft"
 
-#: ../src/gnome/glade/sched-xact.glade.h:70
-msgid "December"
-msgstr "Dezember"
-
-#: ../src/gnome/glade/sched-xact.glade.h:71
+#: ../src/gnome/glade/sched-xact.glade.h:77
 msgid "Disposition?"
 msgstr "Auswahl:"
 
-#: ../src/gnome/glade/sched-xact.glade.h:72
+#: ../src/gnome/glade/sched-xact.glade.h:78
 msgid "Do you..."
 msgstr "Möchten Sie..."
 
-#: ../src/gnome/glade/sched-xact.glade.h:73
+#: ../src/gnome/glade/sched-xact.glade.h:79
 msgid "Edit Scheduled Transaction"
 msgstr "Terminierte Buchungen bearbeiten"
 
-#: ../src/gnome/glade/sched-xact.glade.h:74
+#: ../src/gnome/glade/sched-xact.glade.h:80
 msgid "End "
 msgstr "Ende "
 
-#: ../src/gnome/glade/sched-xact.glade.h:75
+#: ../src/gnome/glade/sched-xact.glade.h:81
 msgid "End Date:"
 msgstr "Enddatum:"
 
-#: ../src/gnome/glade/sched-xact.glade.h:76
+#: ../src/gnome/glade/sched-xact.glade.h:82
 msgid "Ended On"
 msgstr "Beendet am"
 
-#: ../src/gnome/glade/sched-xact.glade.h:77
+#: ../src/gnome/glade/sched-xact.glade.h:83
 msgid "Escrow Account:"
 msgstr "Treuhandkonto:"
 
-#: ../src/gnome/glade/sched-xact.glade.h:78
+#: ../src/gnome/glade/sched-xact.glade.h:84
 msgid "Every"
 msgstr "Alle"
 
-#: ../src/gnome/glade/sched-xact.glade.h:80
-msgid "Feb, Aug"
-msgstr "Feb, Aug"
-
-#: ../src/gnome/glade/sched-xact.glade.h:81
-msgid "Feb, Jun, Oct"
-msgstr "Feb, Jun, Okt"
-
-#: ../src/gnome/glade/sched-xact.glade.h:82
-msgid "Feb, May, Aug, Nov"
-msgstr "Feb, Mai, Aug, Nov"
-
-#: ../src/gnome/glade/sched-xact.glade.h:83
-msgid "February"
-msgstr "Februar"
-
-#: ../src/gnome/glade/sched-xact.glade.h:84
+#: ../src/gnome/glade/sched-xact.glade.h:86
 msgid "First on the:"
 msgstr "Zuerst am:"
 
-#: ../src/gnome/glade/sched-xact.glade.h:85
+#: ../src/gnome/glade/sched-xact.glade.h:87
+msgid ""
+"Fixed Rate\n"
+"3/1 Year ARM\n"
+"5/1 Year ARM\n"
+"7/1 Year ARM\n"
+"10/1 Year ARM"
+msgstr ""
+
+#: ../src/gnome/glade/sched-xact.glade.h:92
 msgid "For:"
 msgstr "Für:"
 
-#: ../src/gnome/glade/sched-xact.glade.h:86
+#: ../src/gnome/glade/sched-xact.glade.h:93
 msgid "Forever"
 msgstr "Immer"
 
-#: ../src/gnome/glade/sched-xact.glade.h:87
-#: ../src/gnome-utils/gnc-dense-cal.c:281
+#: ../src/gnome/glade/sched-xact.glade.h:94
+#: ../src/gnome-utils/gnc-dense-cal.c:264
 msgid "Frequency"
 msgstr "Häufigkeit"
 
+#. src/report/standard-reports/gnucash/report/daily-reports.scm
 #. src/report/standard-reports/daily-reports.scm
-#: ../src/gnome/glade/sched-xact.glade.h:89 ../intl-scm/guile-strings.c:2818
+#: ../src/gnome/glade/sched-xact.glade.h:96 ../intl-scm/guile-strings.c:4156
+#: ../intl-scm/guile-strings.c:5306
 msgid "Friday"
 msgstr "Freitag"
 
-#: ../src/gnome/glade/sched-xact.glade.h:90
+#: ../src/gnome/glade/sched-xact.glade.h:97
 msgid "Ignore"
 msgstr "Ignorieren"
 
-#: ../src/gnome/glade/sched-xact.glade.h:91
+#: ../src/gnome/glade/sched-xact.glade.h:98
 msgid "Interest Rate Change Frequency"
 msgstr "Änderungshäufigkeit des Zinssatzes"
 
-#: ../src/gnome/glade/sched-xact.glade.h:92
+#: ../src/gnome/glade/sched-xact.glade.h:99
 msgid "Interest Rate:"
 msgstr "Zinssatz:"
 
-#: ../src/gnome/glade/sched-xact.glade.h:93
+#: ../src/gnome/glade/sched-xact.glade.h:100
 msgid "Interest To:"
 msgstr "Zinsen nach:"
 
-#: ../src/gnome/glade/sched-xact.glade.h:94
-msgid "Jan, Apr, Jul, Oct"
-msgstr "Jan, Apr, Jul, Okt"
+#: ../src/gnome/glade/sched-xact.glade.h:101
+msgid ""
+"Jan, Apr, Jul, Oct\n"
+"Feb, May, Aug, Nov\n"
+"Mar, Jun, Sep, Dec"
+msgstr ""
 
-#: ../src/gnome/glade/sched-xact.glade.h:95
-msgid "Jan, Jul"
-msgstr "Jan, Jul"
+#: ../src/gnome/glade/sched-xact.glade.h:104
+msgid ""
+"Jan, Jul\n"
+"Feb, Aug\n"
+"Mar, Sep\n"
+"Apr, Oct\n"
+"May, Nov\n"
+"Jun, Dec"
+msgstr ""
 
-#: ../src/gnome/glade/sched-xact.glade.h:96
-msgid "Jan, May, Sep"
-msgstr "Jan, Mai, Sep"
+#: ../src/gnome/glade/sched-xact.glade.h:110
+msgid ""
+"Jan, May, Sep\n"
+"Feb, Jun, Oct\n"
+"Mar, Jul, Nov"
+msgstr ""
 
-#: ../src/gnome/glade/sched-xact.glade.h:97
-msgid "January"
-msgstr "Januar"
+#: ../src/gnome/glade/sched-xact.glade.h:113
+msgid ""
+"January\n"
+"February\n"
+"March\n"
+"April\n"
+"May\n"
+"June\n"
+"July\n"
+"August\n"
+"September\n"
+"October\n"
+"November\n"
+"December"
+msgstr ""
 
-#: ../src/gnome/glade/sched-xact.glade.h:98
-msgid "July"
-msgstr "Juli"
-
-#: ../src/gnome/glade/sched-xact.glade.h:99
-msgid "Jun, Dec"
-msgstr "Jun, Dez"
-
-#: ../src/gnome/glade/sched-xact.glade.h:100
-msgid "June"
-msgstr "Juni"
-
-#: ../src/gnome/glade/sched-xact.glade.h:101
+#: ../src/gnome/glade/sched-xact.glade.h:125
 msgid "Last Occurred: "
 msgstr "Zuletzt aufgetreten: "
 
-#: ../src/gnome/glade/sched-xact.glade.h:102
+#: ../src/gnome/glade/sched-xact.glade.h:126
 msgid "Length:"
 msgstr "Länge:"
 
-#: ../src/gnome/glade/sched-xact.glade.h:103
+#: ../src/gnome/glade/sched-xact.glade.h:127
 msgid "Loan Account:"
 msgstr "Darlehenskonto:"
 
-#: ../src/gnome/glade/sched-xact.glade.h:104
+#: ../src/gnome/glade/sched-xact.glade.h:128
 msgid "Loan Information"
 msgstr "Darlehen Informationen"
 
-#: ../src/gnome/glade/sched-xact.glade.h:105
+#: ../src/gnome/glade/sched-xact.glade.h:129
 msgid "Make Scheduled Transaction"
 msgstr "Terminierte Buchung erstellen"
 
-#: ../src/gnome/glade/sched-xact.glade.h:106
-msgid "Mar, Jul, Nov"
-msgstr "Mär, Jul, Nov"
-
-#: ../src/gnome/glade/sched-xact.glade.h:107
-msgid "Mar, Jun, Sep, Dec"
-msgstr "Mär, Jun, Sep, Dez"
-
-#: ../src/gnome/glade/sched-xact.glade.h:108
-msgid "Mar, Sep"
-msgstr "Mär, Sep"
-
-#: ../src/gnome/glade/sched-xact.glade.h:109
-msgid "March"
-msgstr "März"
-
-#: ../src/gnome/glade/sched-xact.glade.h:110
-msgid "May"
-msgstr "Mai"
-
-#: ../src/gnome/glade/sched-xact.glade.h:111
-msgid "May, Nov"
-msgstr "Mai, Nov"
-
+#. src/report/standard-reports/gnucash/report/daily-reports.scm
 #. src/report/standard-reports/daily-reports.scm
-#: ../src/gnome/glade/sched-xact.glade.h:112 ../intl-scm/guile-strings.c:2810
+#: ../src/gnome/glade/sched-xact.glade.h:130 ../intl-scm/guile-strings.c:4148
+#: ../intl-scm/guile-strings.c:5298
 msgid "Monday"
 msgstr "Montag"
 
 #. src/report/report-system/options-utilities.scm
-#: ../src/gnome/glade/sched-xact.glade.h:113 ../intl-scm/guile-strings.c:678
-#: ../intl-scm/guile-strings.c:680
+#: ../src/gnome/glade/sched-xact.glade.h:131 ../intl-scm/guile-strings.c:1190
+#: ../intl-scm/guile-strings.c:1192
 msgid "Month"
 msgstr "Monat"
 
-#: ../src/gnome/glade/sched-xact.glade.h:115
+#: ../src/gnome/glade/sched-xact.glade.h:133
 msgid "Months Remaining:"
 msgstr "Restliche Monate:"
 
-#: ../src/gnome/glade/sched-xact.glade.h:116
+#: ../src/gnome/glade/sched-xact.glade.h:134
 msgid "Mortgage/Loan Druid"
-msgstr "Hypothek/Darlehen Druide"
+msgstr "Hypothek/Darlehen Assistent"
 
-#: ../src/gnome/glade/sched-xact.glade.h:117
+#: ../src/gnome/glade/sched-xact.glade.h:135
 msgid "Mortgage/Loan Repayment Setup"
 msgstr "Einrichtung Hypothek/Darlehen-Tilgung"
 
-#: ../src/gnome/glade/sched-xact.glade.h:119
+#: ../src/gnome/glade/sched-xact.glade.h:137
 msgid "Name:"
 msgstr "Name:"
 
-#: ../src/gnome/glade/sched-xact.glade.h:120
+#: ../src/gnome/glade/sched-xact.glade.h:138
 msgid "Never End"
 msgstr "Endet nicht"
 
-#: ../src/gnome/glade/sched-xact.glade.h:121
-msgid "Next Occurrence"
-msgstr "Nächstes Auftreten"
+#: ../src/gnome/glade/sched-xact.glade.h:140
+msgid ""
+"None\n"
+"Once\n"
+"Daily\n"
+"Daily [M-F]\n"
+"Weekly\n"
+"Bi-Weekly\n"
+"Semi-Monthly\n"
+"Monthly\n"
+"Quarterly\n"
+"Tri-Yearly\n"
+"Semi-Yearly\n"
+"Yearly"
+msgstr ""
 
-#: ../src/gnome/glade/sched-xact.glade.h:124
+#: ../src/gnome/glade/sched-xact.glade.h:152
+msgid "Not scheduled"
+msgstr "Nicht vorgemerkt"
+
+#: ../src/gnome/glade/sched-xact.glade.h:153
 msgid "Notify me when created"
 msgstr "Bei Erstellung benachrichtigen"
 
-#: ../src/gnome/glade/sched-xact.glade.h:125
-msgid "November"
-msgstr "November"
-
-#: ../src/gnome/glade/sched-xact.glade.h:126
-msgid "Now + 1 Year"
-msgstr "Heute plus ein Jahr"
-
-#: ../src/gnome/glade/sched-xact.glade.h:127
+#: ../src/gnome/glade/sched-xact.glade.h:154
 msgid "Number of Occurrences:"
 msgstr "Anzahl des Auftretens:"
 
-#: ../src/gnome/glade/sched-xact.glade.h:128
+#: ../src/gnome/glade/sched-xact.glade.h:155
 msgid "Obsolete Scheduled Transactions"
 msgstr "Terminierte Buchung löschen"
 
-#: ../src/gnome/glade/sched-xact.glade.h:129
+#: ../src/gnome/glade/sched-xact.glade.h:156
 msgid "Occuring in"
 msgstr "In den Monaten"
 
-#: ../src/gnome/glade/sched-xact.glade.h:130
-msgid "October"
-msgstr "Oktober"
-
-#: ../src/gnome/glade/sched-xact.glade.h:131
+#: ../src/gnome/glade/sched-xact.glade.h:157
 msgid "On the"
 msgstr "Am"
 
-#: ../src/gnome/glade/sched-xact.glade.h:132
+#: ../src/gnome/glade/sched-xact.glade.h:158
 msgid "Once"
 msgstr "Einmal"
 
-#: ../src/gnome/glade/sched-xact.glade.h:135
+#: ../src/gnome/glade/sched-xact.glade.h:161
 msgid "Part of Payment Transaction"
 msgstr "Teil einer Zahlung"
 
-#: ../src/gnome/glade/sched-xact.glade.h:136
+#: ../src/gnome/glade/sched-xact.glade.h:162
 msgid "Payment Frequency"
 msgstr "Zahlungshäufigkeit"
 
-#: ../src/gnome/glade/sched-xact.glade.h:137
+#: ../src/gnome/glade/sched-xact.glade.h:163
 msgid "Payment From (Escrow):"
 msgstr "Zahlung von (Treuhandkonto):"
 
-#: ../src/gnome/glade/sched-xact.glade.h:138
+#: ../src/gnome/glade/sched-xact.glade.h:164
 msgid "Payment From:"
 msgstr "Zahlung von:"
 
-#: ../src/gnome/glade/sched-xact.glade.h:139
+#: ../src/gnome/glade/sched-xact.glade.h:165
 msgid "Payment To (Escrow):"
 msgstr "Zahlung an (Treuhandkonto):"
 
-#: ../src/gnome/glade/sched-xact.glade.h:140
+#: ../src/gnome/glade/sched-xact.glade.h:166
 msgid "Payment To:"
 msgstr "Zahlung an:"
 
-#: ../src/gnome/glade/sched-xact.glade.h:141
+#: ../src/gnome/glade/sched-xact.glade.h:167
 msgid "Postpone"
 msgstr "Zurückstellen"
 
-#: ../src/gnome/glade/sched-xact.glade.h:143
+#: ../src/gnome/glade/sched-xact.glade.h:169
 msgid "Press Apply to create these transactions."
 msgstr "Klicken Sie »Anwenden«, um diese Buchungen zu erstellen."
 
-#: ../src/gnome/glade/sched-xact.glade.h:144
+#: ../src/gnome/glade/sched-xact.glade.h:170
 msgid "Press apply to commit these changes."
 msgstr "Klicken Sie »Anwenden«, um die Änderungen zu speichern."
 
-#: ../src/gnome/glade/sched-xact.glade.h:145
+#: ../src/gnome/glade/sched-xact.glade.h:171
 msgid "Principal To:"
 msgstr "Endbetrag Kapital an:"
 
-#: ../src/gnome/glade/sched-xact.glade.h:147
+#: ../src/gnome/glade/sched-xact.glade.h:173
 msgid "R_emind in advance, days:"
 msgstr "Anzahl Tage, um im v_oraus zu erinnern:"
 
-#: ../src/gnome/glade/sched-xact.glade.h:148
+#: ../src/gnome/glade/sched-xact.glade.h:174
 msgid "Range: "
 msgstr "Bereich: "
 
-#: ../src/gnome/glade/sched-xact.glade.h:149
+#: ../src/gnome/glade/sched-xact.glade.h:175
 msgid "Remind in advance:"
 msgstr "Im Voraus erinnern:"
 
-#: ../src/gnome/glade/sched-xact.glade.h:150
+#: ../src/gnome/glade/sched-xact.glade.h:176
 msgid "Repayment"
 msgstr "Tilgung"
 
-#: ../src/gnome/glade/sched-xact.glade.h:151
+#: ../src/gnome/glade/sched-xact.glade.h:177
 msgid "Repayment Frequency"
 msgstr "Tilgungshäufigkeit"
 
-#: ../src/gnome/glade/sched-xact.glade.h:152
+#: ../src/gnome/glade/sched-xact.glade.h:178
 msgid "Repayment Type"
 msgstr "Rückzahlungsart"
 
-#: ../src/gnome/glade/sched-xact.glade.h:153
+#: ../src/gnome/glade/sched-xact.glade.h:179
 msgid "Repeats:"
 msgstr "Wiederholungen:"
 
-#: ../src/gnome/glade/sched-xact.glade.h:154
+#: ../src/gnome/glade/sched-xact.glade.h:180
 msgid "Review"
 msgstr "Kontrolle"
 
+#. src/report/standard-reports/gnucash/report/daily-reports.scm
 #. src/report/standard-reports/daily-reports.scm
-#: ../src/gnome/glade/sched-xact.glade.h:155 ../intl-scm/guile-strings.c:2820
+#: ../src/gnome/glade/sched-xact.glade.h:181 ../intl-scm/guile-strings.c:4158
+#: ../intl-scm/guile-strings.c:5308
 msgid "Saturday"
 msgstr "Samstag"
 
-#: ../src/gnome/glade/sched-xact.glade.h:156
+#: ../src/gnome/glade/sched-xact.glade.h:182
 msgid "Scheduled Transaction"
 msgstr "Terminierte Buchung"
 
-#: ../src/gnome/glade/sched-xact.glade.h:158
-#: ../src/gnome-utils/dialog-options.c:883
-#: ../src/gnome-utils/dialog-options.c:1010
+#: ../src/gnome/glade/sched-xact.glade.h:183
+#: ../src/gnome-utils/dialog-options.c:870
+#: ../src/gnome-utils/dialog-options.c:988
 msgid "Select All"
 msgstr "Alle auswählen"
 
-#: ../src/gnome/glade/sched-xact.glade.h:159
+#: ../src/gnome/glade/sched-xact.glade.h:184
 msgid "Select initial date, above."
 msgstr "Wählen Sie oben ein Anfangsdatum."
 
-#: ../src/gnome/glade/sched-xact.glade.h:160
+#: ../src/gnome/glade/sched-xact.glade.h:185
 msgid "Select occurrence date above."
 msgstr "Wählen Sie oben ein Datum des Auftretens."
 
-#: ../src/gnome/glade/sched-xact.glade.h:161
+#: ../src/gnome/glade/sched-xact.glade.h:186
 msgid "Semi-Monthly"
 msgstr "Halbmonatlich"
 
-#: ../src/gnome/glade/sched-xact.glade.h:162
+#: ../src/gnome/glade/sched-xact.glade.h:187
 msgid "Semi-Yearly"
 msgstr "Halbjährlich"
 
-#: ../src/gnome/glade/sched-xact.glade.h:163
-msgid "September"
-msgstr "September"
-
-#: ../src/gnome/glade/sched-xact.glade.h:164
+#: ../src/gnome/glade/sched-xact.glade.h:188
 msgid "Set the 'auto-create' flag on newly created scheduled transactions."
 msgstr ""
 "»Automatisch erstellen« für neue terminierte Buchungen als Voreinstellung "
 "wählen."
 
-#: ../src/gnome/glade/sched-xact.glade.h:165
+#: ../src/gnome/glade/sched-xact.glade.h:189
 msgid "Set the 'notify' flag on newly created scheduled transactions."
 msgstr ""
 "»Benachrichtigen« für neue terminierte Buchungen als Voreinstellung wählen."
 
-#: ../src/gnome/glade/sched-xact.glade.h:166
+#: ../src/gnome/glade/sched-xact.glade.h:190
 msgid "Show the \"since last run\" window when a file is opened."
 msgstr ""
 "Das Fenster »Seit letztem Aufruf« anzeigen, wenn eine Datei geöffnet wird "
 "oder beim Programmstart von GnuCash."
 
-#: ../src/gnome/glade/sched-xact.glade.h:167
+#: ../src/gnome/glade/sched-xact.glade.h:191
 msgid "Since Last Run"
 msgstr "Seit letztem Aufruf"
 
-#: ../src/gnome/glade/sched-xact.glade.h:168
+#: ../src/gnome/glade/sched-xact.glade.h:192
+msgid "Since Last Run..."
+msgstr "Seit letztem Aufruf..."
+
+#: ../src/gnome/glade/sched-xact.glade.h:193
 msgid "Specify Source Account"
 msgstr "Herkunftskonto auswählen"
 
-#: ../src/gnome/glade/sched-xact.glade.h:170
+#: ../src/gnome/glade/sched-xact.glade.h:195
 msgid "Start Date: "
 msgstr "Anfangsdatum: "
 
-#: ../src/gnome/glade/sched-xact.glade.h:171
+#: ../src/gnome/glade/sched-xact.glade.h:196
 msgid "State"
 msgstr "Status"
 
+#. src/report/standard-reports/gnucash/report/daily-reports.scm
 #. src/report/standard-reports/daily-reports.scm
-#: ../src/gnome/glade/sched-xact.glade.h:172 ../intl-scm/guile-strings.c:2808
+#: ../src/gnome/glade/sched-xact.glade.h:197 ../intl-scm/guile-strings.c:4146
+#: ../intl-scm/guile-strings.c:5296
 msgid "Sunday"
 msgstr "Sonntag"
 
-#: ../src/gnome/glade/sched-xact.glade.h:173
+#: ../src/gnome/glade/sched-xact.glade.h:198
 msgid "Template Transaction (Read-Only)"
 msgstr "Buchungsvorlage (schreibgeschützt)"
 
-#: ../src/gnome/glade/sched-xact.glade.h:174
+#: ../src/gnome/glade/sched-xact.glade.h:199
 msgid ""
 "The following Scheduled Transactions reference the deleted account, and must "
 "now be corrected.  Press OK to edit them."
@@ -6440,7 +6501,7 @@
 "Die folgenden terminierten Buchungen gehören zu dem gelöschten Konto und "
 "müssen nun geändert werden. Klicken Sie Ok, um sie zu ändern."
 
-#: ../src/gnome/glade/sched-xact.glade.h:175
+#: ../src/gnome/glade/sched-xact.glade.h:200
 msgid ""
 "The following scheduled transactions have expired.  Select those you wish to "
 "delete."
@@ -6448,7 +6509,7 @@
 "Die folgenden terminierten Buchungen sind abgelaufen. Bitte wählen Sie jene, "
 "die Sie löschen möchten."
 
-#: ../src/gnome/glade/sched-xact.glade.h:176
+#: ../src/gnome/glade/sched-xact.glade.h:201
 msgid ""
 "The listed Scheduled Transactions are to-be created soon.  Select any which "
 "you would like to create now, and click \"Forward\" to create them."
@@ -6457,7 +6518,7 @@
 "Wählen Sie jene, die jetzt erstellt werden sollen, und klicken Sie »Vor«, um "
 "Sie jetzt erstellen zu lassen."
 
-#: ../src/gnome/glade/sched-xact.glade.h:177
+#: ../src/gnome/glade/sched-xact.glade.h:202
 msgid ""
 "This druid will walk you through any scheduled transactions that should be "
 "created."
@@ -6465,7 +6526,7 @@
 "Dieser Assistent führt Sie schrittweise durch die Erstellung neuer "
 "terminierter Buchungen."
 
-#: ../src/gnome/glade/sched-xact.glade.h:178
+#: ../src/gnome/glade/sched-xact.glade.h:203
 msgid ""
 "This is a step-by-step method of creating a loan repayment setup within "
 "GnuCash.  In this Druid, you can input the parameters of your loan and its "
@@ -6483,136 +6544,133 @@
 "Wenn Sie einen Irrtum machen oder später Änderungen machen möchten, können "
 "Sie die erstellte Terminierte Buchung direkt ändern."
 
+#. src/report/standard-reports/gnucash/report/daily-reports.scm
 #. src/report/standard-reports/daily-reports.scm
-#: ../src/gnome/glade/sched-xact.glade.h:181 ../intl-scm/guile-strings.c:2816
+#: ../src/gnome/glade/sched-xact.glade.h:206 ../intl-scm/guile-strings.c:4154
+#: ../intl-scm/guile-strings.c:5304
 msgid "Thursday"
 msgstr "Donnerstag"
 
-#: ../src/gnome/glade/sched-xact.glade.h:182
+#: ../src/gnome/glade/sched-xact.glade.h:207
 msgid "To-Create Transaction Preparation"
 msgstr "Vorbereitung der zu erstellenden Buchungen"
 
-#: ../src/gnome/glade/sched-xact.glade.h:183
+#: ../src/gnome/glade/sched-xact.glade.h:208
 msgid "Transaction Reminders"
 msgstr "Buchungserinnerungen"
 
-#: ../src/gnome/glade/sched-xact.glade.h:184
+#: ../src/gnome/glade/sched-xact.glade.h:209
 msgid "Tri-Yearly"
 msgstr "Dreimal pro Jahr"
 
+#. src/report/standard-reports/gnucash/report/daily-reports.scm
 #. src/report/standard-reports/daily-reports.scm
-#: ../src/gnome/glade/sched-xact.glade.h:185 ../intl-scm/guile-strings.c:2812
+#: ../src/gnome/glade/sched-xact.glade.h:210 ../intl-scm/guile-strings.c:4150
+#: ../intl-scm/guile-strings.c:5300
 msgid "Tuesday"
 msgstr "Dienstag"
 
-#: ../src/gnome/glade/sched-xact.glade.h:187
+#: ../src/gnome/glade/sched-xact.glade.h:212
 msgid "Unselect All"
 msgstr "Keine auswählen"
 
-#: ../src/gnome/glade/sched-xact.glade.h:188
+#: ../src/gnome/glade/sched-xact.glade.h:213
 msgid "Until:"
 msgstr "Bis:"
 
-#: ../src/gnome/glade/sched-xact.glade.h:189
+#: ../src/gnome/glade/sched-xact.glade.h:214
 msgid "Use Escrow Account"
 msgstr "Treuhandkonto benutzen"
 
-#: ../src/gnome/glade/sched-xact.glade.h:191
+#: ../src/gnome/glade/sched-xact.glade.h:216
 msgid "Value:"
 msgstr "Wert:"
 
-#: ../src/gnome/glade/sched-xact.glade.h:192
+#: ../src/gnome/glade/sched-xact.glade.h:217
 msgid "Variable"
 msgstr "Variable"
 
-#: ../src/gnome/glade/sched-xact.glade.h:193
+#: ../src/gnome/glade/sched-xact.glade.h:218
 msgid "Variables"
 msgstr "Variablen"
 
+#. src/report/standard-reports/gnucash/report/daily-reports.scm
 #. src/report/standard-reports/daily-reports.scm
-#: ../src/gnome/glade/sched-xact.glade.h:194 ../intl-scm/guile-strings.c:2814
+#: ../src/gnome/glade/sched-xact.glade.h:219 ../intl-scm/guile-strings.c:4152
+#: ../intl-scm/guile-strings.c:5302
 msgid "Wednesday"
 msgstr "Mittwoch"
 
-#: ../src/gnome/glade/sched-xact.glade.h:196
+#: ../src/gnome/glade/sched-xact.glade.h:221
 msgid "What to do, what to do?"
 msgstr "Was ist zu tun?"
 
-#: ../src/gnome/glade/sched-xact.glade.h:197
-msgid "Whole Loan"
-msgstr "Vollständiges Darlehen"
-
+#. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../src/gnome/glade/sched-xact.glade.h:198 ../intl-scm/guile-strings.c:2396
-#: ../intl-scm/guile-strings.c:2398
+#: ../src/gnome/glade/sched-xact.glade.h:222 ../intl-scm/guile-strings.c:3730
+#: ../intl-scm/guile-strings.c:3732 ../intl-scm/guile-strings.c:4880
+#: ../intl-scm/guile-strings.c:4882
 msgid "Yearly"
 msgstr "Jährlich"
 
-#: ../src/gnome/glade/sched-xact.glade.h:199
-msgid "[29th/last]"
-msgstr "(29./Monatsende)"
-
-#: ../src/gnome/glade/sched-xact.glade.h:200
-msgid "[30th/last]"
-msgstr "(30./Monatsende)"
-
-#: ../src/gnome/glade/sched-xact.glade.h:201
-msgid "[31st/last]"
-msgstr "(31./Monatsende)"
-
-#: ../src/gnome/glade/sched-xact.glade.h:202
+#: ../src/gnome/glade/sched-xact.glade.h:223
 msgid "_Auto-create new transactions"
 msgstr "Neue Buchungen _automatisch erstellen"
 
-#: ../src/gnome/glade/sched-xact.glade.h:204
+#: ../src/gnome/glade/sched-xact.glade.h:224
 msgid "_Notify before transactions are created "
 msgstr "Be_nachrichtigen, bevor neue Buchungen erstellt werden"
 
-#: ../src/gnome/glade/sched-xact.glade.h:205
+#: ../src/gnome/glade/sched-xact.glade.h:225
+#, fuzzy
+msgid "_Review created transactions"
+msgstr "Bestätigte Buchungen automatisch abgleichen"
+
+#: ../src/gnome/glade/sched-xact.glade.h:226
 msgid "_Run when data file opened"
 msgstr "Seit-Letztem-Aufruf Fenster starten, wenn eine _Datei geöffnet wird"
 
-#: ../src/gnome/glade/sched-xact.glade.h:206
-#: ../src/gnome-utils/glade/preferences.glade.h:144
+#: ../src/gnome/glade/sched-xact.glade.h:227
+#: ../src/gnome-utils/glade/preferences.glade.h:156
 msgid "days"
 msgstr "Tage"
 
-#: ../src/gnome/glade/sched-xact.glade.h:207
+#: ../src/gnome/glade/sched-xact.glade.h:228
 msgid "days."
 msgstr "Tage."
 
-#: ../src/gnome/glade/sched-xact.glade.h:208
-msgid "months"
-msgstr "Monate"
+#: ../src/gnome/glade/sched-xact.glade.h:229
+msgid ""
+"months\n"
+"years"
+msgstr ""
+"Monate\n"
+"Jahre"
 
-#: ../src/gnome/glade/sched-xact.glade.h:209
+#: ../src/gnome/glade/sched-xact.glade.h:231
 msgid "months."
 msgstr "Monate."
 
-#: ../src/gnome/glade/sched-xact.glade.h:210
+#: ../src/gnome/glade/sched-xact.glade.h:232
 msgid "occurrences"
 msgstr "Auftreten"
 
-#: ../src/gnome/glade/sched-xact.glade.h:211
+#: ../src/gnome/glade/sched-xact.glade.h:233
 msgid "remaining"
 msgstr "verbleibende"
 
-#: ../src/gnome/glade/sched-xact.glade.h:212
+#: ../src/gnome/glade/sched-xact.glade.h:234
 msgid "then on the:"
 msgstr "dann am:"
 
-#: ../src/gnome/glade/sched-xact.glade.h:213
+#: ../src/gnome/glade/sched-xact.glade.h:235
 msgid "weeks."
 msgstr "Wochen."
 
-#: ../src/gnome/glade/sched-xact.glade.h:214
+#: ../src/gnome/glade/sched-xact.glade.h:236
 msgid "year(s)."
 msgstr "Jahre."
 
-#: ../src/gnome/glade/sched-xact.glade.h:215
-msgid "years"
-msgstr "Jahre"
-
 #: ../src/gnome/glade/stocks.glade.h:1
 msgid "<b>A_sset Account</b>"
 msgstr "<b>_Aktiva Konto</b>"
@@ -6621,19 +6679,19 @@
 msgid "<b>_Income Account</b>"
 msgstr "<b>_Ertragskonto</b>"
 
-#: ../src/gnome/glade/stocks.glade.h:4
+#: ../src/gnome/glade/stocks.glade.h:3
 msgid "Cash In Lieu"
 msgstr "Ausgleichsbetrag"
 
-#: ../src/gnome/glade/stocks.glade.h:5
+#: ../src/gnome/glade/stocks.glade.h:4
 msgid "Currenc_y:"
 msgstr "_Währung:"
 
-#: ../src/gnome/glade/stocks.glade.h:6
+#: ../src/gnome/glade/stocks.glade.h:5
 msgid "Desc_ription:"
 msgstr "_Beschreibung:"
 
-#: ../src/gnome/glade/stocks.glade.h:7
+#: ../src/gnome/glade/stocks.glade.h:6
 msgid ""
 "Enter the date and the number of shares you gained or lost from the stock "
 "split or merger. For stock mergers (negative splits) use a negative value "
@@ -6645,7 +6703,7 @@
 "Sie eine negative Zahl ein.  Sie können auch eine Beschreibung des "
 "Buchungssatzes eingeben."
 
-#: ../src/gnome/glade/stocks.glade.h:8
+#: ../src/gnome/glade/stocks.glade.h:7
 msgid ""
 "If you are finished creating the stock split or merger, press `Apply'. You "
 "may also press `Back' to review your choices, or `Cancel' to quit without "
@@ -6656,7 +6714,7 @@
 "oder »Abbrechen«, um diesen Dialog zu beenden, ohne die Änderungen zu "
 "speichern."
 
-#: ../src/gnome/glade/stocks.glade.h:9
+#: ../src/gnome/glade/stocks.glade.h:8
 msgid ""
 "If you received a cash disbursement as a result of the stock split, enter "
 "the details of that payment here. Otherwise, just click `Forward'."
@@ -6665,7 +6723,7 @@
 "erhalten haben, geben Sie diese Zahlung hier ein. Wenn Sie keinen "
 "Ausgleichsbetrag erhalten haben, klicken Sie »Vor«."
 
-#: ../src/gnome/glade/stocks.glade.h:10
+#: ../src/gnome/glade/stocks.glade.h:9
 msgid ""
 "If you want to record a stock price for the split, enter it below. You may "
 "safely leave it blank."
@@ -6673,47 +6731,39 @@
 "Wenn Sie einen Aktienkurs für die Buchung eingeben wollen, geben Sie den "
 "Kurs unten an. Sie können das Kurseingabefeld auch leer lassen."
 
-#: ../src/gnome/glade/stocks.glade.h:11
+#: ../src/gnome/glade/stocks.glade.h:10
 msgid "New _Price:"
 msgstr "Neuer _Preis:"
 
-#: ../src/gnome/glade/stocks.glade.h:12
+#: ../src/gnome/glade/stocks.glade.h:11
 msgid ""
 "Select the account for which you want to record a stock split or merger."
 msgstr "Wählen Sie das Konto, für das Sie eine Aktienteilung eingeben möchten."
 
-#: ../src/gnome/glade/stocks.glade.h:14
+#: ../src/gnome/glade/stocks.glade.h:12
 msgid "Stock Account"
 msgstr "Aktiendepot"
 
-#: ../src/gnome/glade/stocks.glade.h:15
+#: ../src/gnome/glade/stocks.glade.h:13
 msgid "Stock Split"
 msgstr "Aktienteilung"
 
-#: ../src/gnome/glade/stocks.glade.h:16
+#: ../src/gnome/glade/stocks.glade.h:14
 msgid "Stock Split Details"
 msgstr "Aktienteilung Details"
 
-#. src/report/standard-reports/portfolio.scm
-#. src/report/standard-reports/advanced-portfolio.scm
-#: ../src/gnome/glade/stocks.glade.h:17
-#: ../src/gnome-utils/gnc-tree-view-commodity.c:399
-#: ../intl-scm/guile-strings.c:1732 ../intl-scm/guile-strings.c:2032
-msgid "Symbol"
-msgstr "Symbol"
-
-#: ../src/gnome/glade/stocks.glade.h:18
+#: ../src/gnome/glade/stocks.glade.h:15
 msgid "This druid will help you record a stock split or stock merger."
 msgstr ""
 "Dieser Assistent hilft Ihnen, eine Aktienteilung oder einen "
 "Aktienzusammenschluß einzugeben."
 
-#: ../src/gnome/glade/stocks.glade.h:19
+#: ../src/gnome/glade/stocks.glade.h:16
 #: ../src/gnome-utils/glade/exchange-dialog.glade.h:4
 msgid "_Amount:"
 msgstr "_Betrag:"
 
-#: ../src/gnome/glade/stocks.glade.h:22
+#: ../src/gnome/glade/stocks.glade.h:19
 msgid "_Shares:"
 msgstr "_Anteile:"
 
@@ -6794,154 +6844,159 @@
 msgstr "Neue Konto-Hierarchie Ansicht öffnen"
 
 #. File menu
-#: ../src/gnome/gnc-plugin-basic-commands.c:103
+#: ../src/gnome/gnc-plugin-basic-commands.c:96
 msgid "New _File"
 msgstr "Neue _Datei"
 
-#: ../src/gnome/gnc-plugin-basic-commands.c:104
+#: ../src/gnome/gnc-plugin-basic-commands.c:97
 msgid "Create a new file"
 msgstr "Eine neue Datei anlegen"
 
-#: ../src/gnome/gnc-plugin-basic-commands.c:106
+#: ../src/gnome/gnc-plugin-basic-commands.c:99
 msgid "_Open..."
 msgstr "Ö_ffnen..."
 
-#: ../src/gnome/gnc-plugin-basic-commands.c:107
+#: ../src/gnome/gnc-plugin-basic-commands.c:100
 msgid "Open an existing GnuCash file"
 msgstr "Eine existierende GnuCash-Datei öffnen"
 
-#: ../src/gnome/gnc-plugin-basic-commands.c:109
+#: ../src/gnome/gnc-plugin-basic-commands.c:102
 msgid "_Save"
 msgstr "_Speichern"
 
-#: ../src/gnome/gnc-plugin-basic-commands.c:110
+#: ../src/gnome/gnc-plugin-basic-commands.c:103
 msgid "Save the current file"
 msgstr "Aktuelle Datei speichern"
 
-#: ../src/gnome/gnc-plugin-basic-commands.c:112
+#: ../src/gnome/gnc-plugin-basic-commands.c:105
 msgid "Save _As..."
 msgstr "Speichern _unter..."
 
-#: ../src/gnome/gnc-plugin-basic-commands.c:117
+#: ../src/gnome/gnc-plugin-basic-commands.c:109
 msgid "_QSF Import"
 msgstr "_QSF-Import"
 
-#: ../src/gnome/gnc-plugin-basic-commands.c:118
+#: ../src/gnome/gnc-plugin-basic-commands.c:110
 msgid "Import a QSF object file"
 msgstr "QSF-Datei importieren"
 
-#: ../src/gnome/gnc-plugin-basic-commands.c:122
+#: ../src/gnome/gnc-plugin-basic-commands.c:113
 msgid "Export _Accounts"
 msgstr "_Konten exportieren"
 
-#: ../src/gnome/gnc-plugin-basic-commands.c:123
+#: ../src/gnome/gnc-plugin-basic-commands.c:114
 msgid "Export the account hierarchy to a new GnuCash datafile"
 msgstr "Die Konten-Hierarchie in eine neue GnuCash-Datei exportieren"
 
-#: ../src/gnome/gnc-plugin-basic-commands.c:127
+#: ../src/gnome/gnc-plugin-basic-commands.c:117
 msgid "Export _Chart of Accounts to QSF"
 msgstr "Kontenhierarchie nach _QSF XML exportieren"
 
-#: ../src/gnome/gnc-plugin-basic-commands.c:128
+#: ../src/gnome/gnc-plugin-basic-commands.c:118
 msgid "Export the chart of accounts for a date with balances as QSF"
 msgstr "Kontenhierarchie mit Salden eines bestimmten Tages als QSF exportieren"
 
 #. Edit menu
-#: ../src/gnome/gnc-plugin-basic-commands.c:134
+#: ../src/gnome/gnc-plugin-basic-commands.c:123
 msgid "_Find..."
 msgstr "_Suchen..."
 
-#: ../src/gnome/gnc-plugin-basic-commands.c:135
+#: ../src/gnome/gnc-plugin-basic-commands.c:124
 msgid "Find transactions with a search"
 msgstr "Finde Buchungssätze"
 
-#: ../src/gnome/gnc-plugin-basic-commands.c:137
+#: ../src/gnome/gnc-plugin-basic-commands.c:126
 msgid "Ta_x Options"
 msgstr "Steuer_relevante Optionen"
 
-#: ../src/gnome/gnc-plugin-basic-commands.c:138
+#: ../src/gnome/gnc-plugin-basic-commands.c:127
 msgid "Setup tax information for all income and expense accounts"
 msgstr ""
 "Steuerrelevante Informationen für Ertrags- und Aufwandskonten einrichten"
 
 #. Actions menu
-#: ../src/gnome/gnc-plugin-basic-commands.c:143
+#: ../src/gnome/gnc-plugin-basic-commands.c:132
 msgid "_Scheduled Transactions"
 msgstr "_Terminierte Buchungen"
 
-#: ../src/gnome/gnc-plugin-basic-commands.c:144
+#: ../src/gnome/gnc-plugin-basic-commands.c:133
 msgid "_Scheduled Transaction Editor"
 msgstr "Terminierte Buchungen Editor"
 
-#: ../src/gnome/gnc-plugin-basic-commands.c:145
+#: ../src/gnome/gnc-plugin-basic-commands.c:134
 msgid "The list of Scheduled Transactions"
 msgstr "Die Liste der terminierten Buchungen"
 
-#: ../src/gnome/gnc-plugin-basic-commands.c:147
-msgid "_Since Last Run..."
-msgstr "Seit letztem Aufruf..."
+#: ../src/gnome/gnc-plugin-basic-commands.c:136
+msgid "Since _Last Run..."
+msgstr "Seit _letztem Aufruf..."
 
-#: ../src/gnome/gnc-plugin-basic-commands.c:148
+#: ../src/gnome/gnc-plugin-basic-commands.c:137
 msgid "Create Scheduled Transactions since the last time run"
 msgstr ""
 "Alle terminierten Buchungen seit dem letzten Aufruf von GnuCash erstellen."
 
-#: ../src/gnome/gnc-plugin-basic-commands.c:150
+#: ../src/gnome/gnc-plugin-basic-commands.c:139
 msgid "_Mortgage & Loan Repayment..."
-msgstr "_Hypothek & Darlehen Druide..."
+msgstr "_Hypothek & Darlehen Assistent..."
 
-#: ../src/gnome/gnc-plugin-basic-commands.c:151
+#: ../src/gnome/gnc-plugin-basic-commands.c:140
 msgid "Setup scheduled transactions for repayment of a loan"
 msgstr "Terminierte Buchungen einrichten, die ein Darlehen tilgen sollen"
 
-#: ../src/gnome/gnc-plugin-basic-commands.c:154
+#: ../src/gnome/gnc-plugin-basic-commands.c:142
 msgid "Close _Books"
 msgstr "_Buchabschluß"
 
-#: ../src/gnome/gnc-plugin-basic-commands.c:155
+#: ../src/gnome/gnc-plugin-basic-commands.c:143
 msgid "Archive old data using accounting periods"
 msgstr "Alte Daten abschließen und in vorigen Buchführungsperioden speichern."
 
 #. Tools menu
-#: ../src/gnome/gnc-plugin-basic-commands.c:161
+#: ../src/gnome/gnc-plugin-basic-commands.c:148
 msgid "_Price Editor"
 msgstr "_Preis-Editor"
 
-#: ../src/gnome/gnc-plugin-basic-commands.c:162
+#: ../src/gnome/gnc-plugin-basic-commands.c:149
 msgid "View and edit the prices for stocks and mutual funds"
 msgstr "Preise für Währungen/Wertpapiere anzeigen und bearbeiten"
 
-#: ../src/gnome/gnc-plugin-basic-commands.c:164
+#: ../src/gnome/gnc-plugin-basic-commands.c:151
 msgid "_Security Editor"
 msgstr "_Aktien-Editor"
 
-#: ../src/gnome/gnc-plugin-basic-commands.c:165
+#: ../src/gnome/gnc-plugin-basic-commands.c:152
 msgid "View and edit the commodities for stocks and mutual funds"
 msgstr ""
 "Wertpapiere für Aktienkonten und Investmentfonds anzeigen und bearbeiten"
 
-#: ../src/gnome/gnc-plugin-basic-commands.c:167
+#: ../src/gnome/gnc-plugin-basic-commands.c:154
 msgid "_Financial Calculator"
 msgstr "_Finanzrechner"
 
-#: ../src/gnome/gnc-plugin-basic-commands.c:168
+#: ../src/gnome/gnc-plugin-basic-commands.c:155
 msgid "Use the financial calculator"
 msgstr "Den Finanzrechner benutzen"
 
 #. Help menu
-#: ../src/gnome/gnc-plugin-basic-commands.c:173
+#: ../src/gnome/gnc-plugin-basic-commands.c:160
 msgid "_Tips Of The Day"
 msgstr "_Tipp des Tages"
 
-#: ../src/gnome/gnc-plugin-basic-commands.c:174
+#: ../src/gnome/gnc-plugin-basic-commands.c:161
 msgid "View the Tips of the Day"
 msgstr "Anzeigen des »Tipp des Tages?«"
 
-#: ../src/gnome/gnc-plugin-basic-commands.c:392
+#: ../src/gnome/gnc-plugin-basic-commands.c:372
+#, c-format
+msgid "Error: Loading failed, error code %d - %s."
+msgstr ""
+
+#: ../src/gnome/gnc-plugin-basic-commands.c:394
 msgid "Select the QSF file to import into GnuCash"
 msgstr "Zu ladende QIF-Datei auswählen"
 
-#: ../src/gnome/gnc-plugin-basic-commands.c:447
+#: ../src/gnome/gnc-plugin-basic-commands.c:449
 msgid "There are no Scheduled Transactions to be entered at this time."
 msgstr "Es gibt keine terminierten Buchungen, die gebucht werden sollten."
 
@@ -6979,33 +7034,33 @@
 
 #. File menu
 #: ../src/gnome/gnc-plugin-page-account-tree.c:153
-#: ../src/gnome/gnc-plugin-page-budget.c:131
+#: ../src/gnome/gnc-plugin-page-budget.c:127
 msgid "Open _Account"
 msgstr "_Konto öffnen"
 
 #: ../src/gnome/gnc-plugin-page-account-tree.c:154
-#: ../src/gnome/gnc-plugin-page-budget.c:132
+#: ../src/gnome/gnc-plugin-page-budget.c:128
 msgid "Open the selected account"
 msgstr "Gewähltes Konto öffnen"
 
 #: ../src/gnome/gnc-plugin-page-account-tree.c:156
-#: ../src/gnome/gnc-plugin-page-budget.c:135
+#: ../src/gnome/gnc-plugin-page-budget.c:131
 msgid "Open _Subaccounts"
 msgstr "_Unterkonten öffnen"
 
 #: ../src/gnome/gnc-plugin-page-account-tree.c:157
-#: ../src/gnome/gnc-plugin-page-budget.c:136
+#: ../src/gnome/gnc-plugin-page-budget.c:132
 msgid "Open the selected account and all its subaccounts"
 msgstr "Öffne das gewählte Konto und alle Unterkonten"
 
 #. Edit menu
 #: ../src/gnome/gnc-plugin-page-account-tree.c:161
-#: ../src/gnome-utils/gnc-icons.c:18 ../src/gnome/window-reconcile.c:2009
-msgid "_Edit Account"
+#: ../src/gnome/gnc-plugin-page-register.c:179
+msgid "Edit _Account"
 msgstr "Konto _bearbeiten"
 
 #: ../src/gnome/gnc-plugin-page-account-tree.c:162
-#: ../src/gnome/gnc-plugin-page-register.c:183
+#: ../src/gnome/gnc-plugin-page-register.c:180
 msgid "Edit the selected account"
 msgstr "Ausgewähltes Konto bearbeiten"
 
@@ -7027,43 +7082,43 @@
 
 #. View menu
 #: ../src/gnome/gnc-plugin-page-account-tree.c:172
-#: ../src/gnome/gnc-plugin-page-budget.c:152
-#: ../src/gnome/gnc-plugin-page-register.c:223
-#: ../src/gnome-utils/gnc-main-window.c:259
+#: ../src/gnome/gnc-plugin-page-budget.c:148
+#: ../src/gnome/gnc-plugin-page-register.c:220
+#: ../src/gnome-utils/gnc-main-window.c:263
 msgid "_Filter By..."
 msgstr "_Filtern nach..."
 
 #. Actions menu
 #: ../src/gnome/gnc-plugin-page-account-tree.c:176
-#: ../src/gnome/gnc-plugin-page-register.c:231
+#: ../src/gnome/gnc-plugin-page-register.c:228
 msgid "_Reconcile..."
 msgstr "Ab_gleichen..."
 
 #: ../src/gnome/gnc-plugin-page-account-tree.c:177
-#: ../src/gnome/gnc-plugin-page-register.c:232
+#: ../src/gnome/gnc-plugin-page-register.c:229
 msgid "Reconcile the selected account"
 msgstr "Gewähltes Konto abgleichen"
 
 #. Actions menu
 #: ../src/gnome/gnc-plugin-page-account-tree.c:179
-#: ../src/gnome/gnc-plugin-page-register.c:228
-#: ../src/gnome-utils/gnc-icons.c:21 ../src/gnome/window-reconcile.c:2012
+#: ../src/gnome/gnc-plugin-page-register.c:225
+#: ../src/gnome-utils/gnc-icons.c:21 ../src/gnome/window-reconcile.c:2014
 msgid "_Transfer..."
 msgstr "_Buchen..."
 
 #: ../src/gnome/gnc-plugin-page-account-tree.c:180
-#: ../src/gnome/gnc-plugin-page-register.c:229
-#: ../src/gnome/window-reconcile.c:2013
+#: ../src/gnome/gnc-plugin-page-register.c:226
+#: ../src/gnome/window-reconcile.c:2015
 msgid "Transfer funds from one account to another"
 msgstr "Beträge von einem Konto zu einem anderen umbuchen"
 
 #: ../src/gnome/gnc-plugin-page-account-tree.c:182
-#: ../src/gnome/gnc-plugin-page-register.c:234
+#: ../src/gnome/gnc-plugin-page-register.c:231
 msgid "Stoc_k Split..."
 msgstr "A_ktienteilung..."
 
 #: ../src/gnome/gnc-plugin-page-account-tree.c:183
-#: ../src/gnome/gnc-plugin-page-register.c:235
+#: ../src/gnome/gnc-plugin-page-register.c:232
 msgid "Record a stock split or a stock merger"
 msgstr "Buchen einer Aktienteilung oder eines Aktienzusammenschlusses"
 
@@ -7072,7 +7127,7 @@
 msgstr "_Posten anzeigen..."
 
 #: ../src/gnome/gnc-plugin-page-account-tree.c:186
-#: ../src/gnome/gnc-plugin-page-register.c:238
+#: ../src/gnome/gnc-plugin-page-register.c:235
 msgid "Bring up the lot viewer/editor window"
 msgstr "Den Editor für die Posten dieses Kontos öffnen"
 
@@ -7081,7 +7136,7 @@
 msgstr "_Konto überprüfen"
 
 #: ../src/gnome/gnc-plugin-page-account-tree.c:189
-#: ../src/gnome/window-reconcile.c:2016
+#: ../src/gnome/window-reconcile.c:2018
 msgid ""
 "Check for and repair unbalanced transactions and orphan splits in this "
 "account"
@@ -7089,7 +7144,7 @@
 "Überprüfen und Reparieren von unvollständigen Buchungssätzen in diesem Konto"
 
 #: ../src/gnome/gnc-plugin-page-account-tree.c:191
-msgid "Check & Repair Su_baccount"
+msgid "Check & Repair Su_baccounts"
 msgstr "_Unterkonten überprüfen"
 
 #: ../src/gnome/gnc-plugin-page-account-tree.c:192
@@ -7112,13 +7167,14 @@
 "Überprüfen und Reparieren von unvollständigen Buchungssätzen in allen Konten"
 
 #: ../src/gnome/gnc-plugin-page-account-tree.c:218
-#: ../src/gnome/gnc-plugin-page-budget.c:168 ../src/gnome/lot-viewer.c:436
-#: ../src/gnome-utils/gnc-file.c:97 ../src/gnome-utils/gnc-file.c:839
+#: ../src/gnome/gnc-plugin-page-budget.c:164 ../src/gnome/lot-viewer.c:434
+#: ../src/gnome-utils/gnc-file.c:95 ../src/gnome-utils/gnc-file.c:841
 #: ../src/gnome/window-reconcile.c:1564
 msgid "Open"
 msgstr "Öffnen"
 
 #: ../src/gnome/gnc-plugin-page-account-tree.c:220
+#: ../src/gnome/gnc-plugin-page-sx-list.c:116
 msgid "New"
 msgstr "Neu"
 
@@ -7126,289 +7182,299 @@
 #. src/report/standard-reports/net-barchart.scm
 #. src/report/standard-reports/category-barchart.scm
 #. src/report/standard-reports/portfolio.scm
+#. src/report/standard-reports/gnucash/report/net-barchart.scm
+#. src/report/standard-reports/gnucash/report/category-barchart.scm
+#. src/report/standard-reports/gnucash/report/portfolio.scm
+#. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
+#. src/report/standard-reports/gnucash/report/average-balance.scm
+#. src/report/standard-reports/gnucash/report/daily-reports.scm
+#. src/report/standard-reports/gnucash/report/account-piecharts.scm
 #. src/report/standard-reports/advanced-portfolio.scm
 #. src/report/standard-reports/average-balance.scm
 #. src/report/standard-reports/daily-reports.scm
 #. src/report/standard-reports/account-piecharts.scm
 #: ../src/gnome/gnc-plugin-page-account-tree.c:309
-#: ../src/gnome-utils/glade/preferences.glade.h:31
-#: ../intl-scm/guile-strings.c:822 ../intl-scm/guile-strings.c:1214
-#: ../intl-scm/guile-strings.c:1676 ../intl-scm/guile-strings.c:1724
-#: ../intl-scm/guile-strings.c:2022 ../intl-scm/guile-strings.c:2702
-#: ../intl-scm/guile-strings.c:2750 ../intl-scm/guile-strings.c:2782
-#: ../intl-scm/guile-strings.c:2856
+#: ../src/gnome-utils/glade/preferences.glade.h:33
+#: ../intl-scm/guile-strings.c:1334 ../intl-scm/guile-strings.c:1926
+#: ../intl-scm/guile-strings.c:2386 ../intl-scm/guile-strings.c:2434
+#: ../intl-scm/guile-strings.c:2550 ../intl-scm/guile-strings.c:3010
+#: ../intl-scm/guile-strings.c:3058 ../intl-scm/guile-strings.c:3356
+#: ../intl-scm/guile-strings.c:4040 ../intl-scm/guile-strings.c:4088
+#: ../intl-scm/guile-strings.c:4120 ../intl-scm/guile-strings.c:4194
+#: ../intl-scm/guile-strings.c:4506 ../intl-scm/guile-strings.c:5190
+#: ../intl-scm/guile-strings.c:5238 ../intl-scm/guile-strings.c:5270
+#: ../intl-scm/guile-strings.c:5344
 msgid "Accounts"
 msgstr "Konten"
 
-#: ../src/gnome/gnc-plugin-page-account-tree.c:917
+#: ../src/gnome/gnc-plugin-page-account-tree.c:867
 msgid "(no name)"
 msgstr "(unbenannt)"
 
-#: ../src/gnome/gnc-plugin-page-account-tree.c:939
+#: ../src/gnome/gnc-plugin-page-account-tree.c:889
 #, c-format
 msgid "Deleting account %s"
 msgstr "Konto %s löschen"
 
-#: ../src/gnome/gnc-plugin-page-account-tree.c:1031
+#: ../src/gnome/gnc-plugin-page-account-tree.c:981
 #, c-format
 msgid "The account %s will be deleted."
 msgstr "Das Konto %s wird gelöscht."
 
-#: ../src/gnome/gnc-plugin-page-account-tree.c:1041
+#: ../src/gnome/gnc-plugin-page-account-tree.c:991
 #, c-format
 msgid "All transactions in this account will be moved to the account %s."
 msgstr "Alle Buchungen in diesem Konto werden in das Konto %s verschoben."
 
-#: ../src/gnome/gnc-plugin-page-account-tree.c:1045
+#: ../src/gnome/gnc-plugin-page-account-tree.c:995
 msgid "All transactions in this account will be deleted."
 msgstr "Alle Buchungen in diesem Konto werden gelöscht."
 
-#: ../src/gnome/gnc-plugin-page-account-tree.c:1052
+#: ../src/gnome/gnc-plugin-page-account-tree.c:1002
 #, c-format
 msgid "All of its sub-accounts will be moved to the account %s."
 msgstr "Alle Unterkonten werden zum Konto %s verschoben."
 
-#: ../src/gnome/gnc-plugin-page-account-tree.c:1056
+#: ../src/gnome/gnc-plugin-page-account-tree.c:1006
 msgid "All of its subaccounts will be deleted."
 msgstr "Alle Unterkonten werden ebenfalls gelöscht."
 
-#: ../src/gnome/gnc-plugin-page-account-tree.c:1060
+#: ../src/gnome/gnc-plugin-page-account-tree.c:1010
 #, c-format
 msgid "All sub-account transactions will be moved to the account %s."
 msgstr "Alle Buchungen in Unterkonten werden in das Konto %s verschoben."
 
-#: ../src/gnome/gnc-plugin-page-account-tree.c:1064
+#: ../src/gnome/gnc-plugin-page-account-tree.c:1014
 msgid "All sub-account transactions will be deleted."
 msgstr "Alle Buchungen in Unterkonten werden ebenfalls gelöscht."
 
-#: ../src/gnome/gnc-plugin-page-account-tree.c:1069
+#: ../src/gnome/gnc-plugin-page-account-tree.c:1019
 msgid "Are you sure you want to do this?"
 msgstr "Soll diese Aktion durchgeführt werden?"
 
 #. Edit menu
-#: ../src/gnome/gnc-plugin-page-budget.c:140
+#: ../src/gnome/gnc-plugin-page-budget.c:136
 msgid "_Delete Budget"
 msgstr "Budget _löschen"
 
-#: ../src/gnome/gnc-plugin-page-budget.c:141
+#: ../src/gnome/gnc-plugin-page-budget.c:137
 msgid "Delete this budget"
 msgstr "Dieses Budget löschen"
 
-#: ../src/gnome/gnc-plugin-page-budget.c:144
+#: ../src/gnome/gnc-plugin-page-budget.c:140
 msgid "Edit this budget's options"
 msgstr "Budget-Optionen ändern"
 
-#: ../src/gnome/gnc-plugin-page-budget.c:146
+#: ../src/gnome/gnc-plugin-page-budget.c:142
 msgid "Estimate Budget"
 msgstr "Budget abschätzen"
 
-#: ../src/gnome/gnc-plugin-page-budget.c:148
+#: ../src/gnome/gnc-plugin-page-budget.c:144
 msgid ""
 "Estimate a budget value for the selected accounts from past transactions"
 msgstr ""
 "Die Budgetwerte für die gewählten Konten abschätzen, basierenden auf den "
 "früheren Buchungen"
 
-#: ../src/gnome/gnc-plugin-page-budget.c:171
+#: ../src/gnome/gnc-plugin-page-budget.c:167
 msgid "Estimate"
 msgstr "Abschätzen"
 
+#. src/report/standard-reports/gnucash/report/budget.scm
 #. src/report/standard-reports/budget.scm
-#: ../src/gnome/gnc-plugin-page-budget.c:279 ../intl-scm/guile-strings.c:2678
-#: ../intl-scm/guile-strings.c:2680
+#: ../src/gnome/gnc-plugin-page-budget.c:275 ../intl-scm/guile-strings.c:4012
+#: ../intl-scm/guile-strings.c:4014 ../intl-scm/guile-strings.c:5162
+#: ../intl-scm/guile-strings.c:5164
 msgid "Budget"
 msgstr "Budget"
 
-#: ../src/gnome/gnc-plugin-page-budget.c:774
+#: ../src/gnome/gnc-plugin-page-budget.c:770
 msgid "Set the budget options using this dialog."
 msgstr "Mit diesem Dialog können Sie die Budgetoptionen bearbeiten."
 
-#: ../src/gnome/gnc-plugin-page-budget.c:853
+#: ../src/gnome/gnc-plugin-page-budget.c:849
 #, c-format
 msgid "Delete %s?"
 msgstr "»%s« löschen?"
 
-#: ../src/gnome/gnc-plugin-page-budget.c:917
+#: ../src/gnome/gnc-plugin-page-budget.c:913
 msgid "You must select at least one account to estimate."
 msgstr "Sie müssen mindestens ein Konto auswählen, das geschätzt werden soll."
 
 #. File menu
-#: ../src/gnome/gnc-plugin-page-register.c:168
+#: ../src/gnome/gnc-plugin-page-register.c:165
 msgid "_Print Check..."
-msgstr "_Scheck drucken..."
+msgstr "Schec_k drucken..."
 
 #. Edit menu
-#: ../src/gnome/gnc-plugin-page-register.c:173
-#: ../src/gnome-utils/gnc-main-window.c:242
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:935
+#: ../src/gnome/gnc-plugin-page-register.c:170
+#: ../src/gnome-utils/gnc-main-window.c:246
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:945
 msgid "Cu_t"
 msgstr "_Ausschneiden"
 
-#: ../src/gnome/gnc-plugin-page-register.c:174
-#: ../src/gnome-utils/gnc-main-window.c:243
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:936
+#: ../src/gnome/gnc-plugin-page-register.c:171
+#: ../src/gnome-utils/gnc-main-window.c:247
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:946
 msgid "Cut the current selection and copy it to clipboard"
 msgstr "Auswahl ausschneiden und in die Zwischenablage kopieren"
 
-#: ../src/gnome/gnc-plugin-page-register.c:176
-#: ../src/gnome-utils/gnc-main-window.c:245
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:938
+#: ../src/gnome/gnc-plugin-page-register.c:173
+#: ../src/gnome-utils/gnc-main-window.c:249
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:948
 msgid "_Copy"
 msgstr "_Kopieren"
 
-#: ../src/gnome/gnc-plugin-page-register.c:177
-#: ../src/gnome-utils/gnc-main-window.c:246
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:939
+#: ../src/gnome/gnc-plugin-page-register.c:174
+#: ../src/gnome-utils/gnc-main-window.c:250
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:949
 msgid "Copy the current selection to clipboard"
 msgstr "Auswahl in die Zwischenablage kopieren"
 
-#: ../src/gnome/gnc-plugin-page-register.c:180
-#: ../src/gnome-utils/gnc-main-window.c:249
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:942
+#: ../src/gnome/gnc-plugin-page-register.c:177
+#: ../src/gnome-utils/gnc-main-window.c:253
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:952
 msgid "Paste the clipboard content at the cursor position"
 msgstr "Zwischenablage an Cursor-Position einfügen"
 
-#: ../src/gnome/gnc-plugin-page-register.c:182
-#: ../src/gnome-utils/dialog-account.c:1387
-msgid "Edit Account"
-msgstr "Konto bearbeiten"
-
 #. Transaction menu
-#: ../src/gnome/gnc-plugin-page-register.c:188
+#: ../src/gnome/gnc-plugin-page-register.c:185
 msgid "Cu_t Transaction"
 msgstr "Buchung auss_chneiden"
 
-#: ../src/gnome/gnc-plugin-page-register.c:189
+#: ../src/gnome/gnc-plugin-page-register.c:186
 msgid "Cut the selected transaction into clipboard"
 msgstr "Buchung ausschneiden und in die Zwischenablage kopieren"
 
-#: ../src/gnome/gnc-plugin-page-register.c:191
+#: ../src/gnome/gnc-plugin-page-register.c:188
 msgid "_Copy Transaction"
 msgstr "Buchung _kopieren"
 
-#: ../src/gnome/gnc-plugin-page-register.c:192
+#: ../src/gnome/gnc-plugin-page-register.c:189
 msgid "Copy the selected transaction into clipboard"
 msgstr "Buchung in die Zwischenablage kopieren"
 
-#: ../src/gnome/gnc-plugin-page-register.c:194
+#: ../src/gnome/gnc-plugin-page-register.c:191
 msgid "_Paste Transaction"
 msgstr "Buchung _einfügen"
 
-#: ../src/gnome/gnc-plugin-page-register.c:197
+#: ../src/gnome/gnc-plugin-page-register.c:194
 msgid "Dup_licate Transaction"
 msgstr "Buchung dupli_zieren"
 
-#: ../src/gnome/gnc-plugin-page-register.c:200
+#: ../src/gnome/gnc-plugin-page-register.c:197
 #: ../src/gnome/gnc-split-reg.c:1164
 msgid "_Delete Transaction"
 msgstr "_Buchung löschen"
 
-#: ../src/gnome/gnc-plugin-page-register.c:203
+#: ../src/gnome/gnc-plugin-page-register.c:200
 msgid "Remo_ve Transaction Splits"
 msgstr "Buchungsteile entfernen"
 
-#: ../src/gnome/gnc-plugin-page-register.c:204
+#: ../src/gnome/gnc-plugin-page-register.c:201
 msgid "Remove all splits in the current transaction"
 msgstr "Alle Buchungsteile im aktuellen Buchungssatz entfernen"
 
-#: ../src/gnome/gnc-plugin-page-register.c:206
+#: ../src/gnome/gnc-plugin-page-register.c:203
 msgid "_Enter Transaction"
 msgstr "Buchung eingeben"
 
-#: ../src/gnome/gnc-plugin-page-register.c:209
+#: ../src/gnome/gnc-plugin-page-register.c:206
 msgid "Ca_ncel Transaction"
 msgstr "Buchung _abbrechen"
 
-#: ../src/gnome/gnc-plugin-page-register.c:212
+#: ../src/gnome/gnc-plugin-page-register.c:209
 msgid "_Void Transaction"
 msgstr "Buchung _ungültig machen"
 
-#: ../src/gnome/gnc-plugin-page-register.c:214
+#: ../src/gnome/gnc-plugin-page-register.c:211
 msgid "_Unvoid Transaction"
 msgstr "Ungültige Buchung wieder_herstellen"
 
-#: ../src/gnome/gnc-plugin-page-register.c:216
+#: ../src/gnome/gnc-plugin-page-register.c:213
 msgid "Add _Reversing Transaction"
 msgstr "Stornierungsbuchung _hinzufügen"
 
 #. View menu
-#: ../src/gnome/gnc-plugin-page-register.c:221
-#: ../src/gnome-utils/gnc-main-window.c:257
+#: ../src/gnome/gnc-plugin-page-register.c:218
+#: ../src/gnome-utils/gnc-main-window.c:261
 msgid "_Sort By..."
 msgstr "_Sortieren nach..."
 
-#: ../src/gnome/gnc-plugin-page-register.c:237
+#: ../src/gnome/gnc-plugin-page-register.c:234
 msgid "_Lot Viewer..."
 msgstr "_Posten anzeigen..."
 
-#: ../src/gnome/gnc-plugin-page-register.c:240
+#: ../src/gnome/gnc-plugin-page-register.c:237
 msgid "_Blank Transaction"
 msgstr "_Leere Buchung"
 
-#: ../src/gnome/gnc-plugin-page-register.c:243
+#: ../src/gnome/gnc-plugin-page-register.c:240
 msgid "Edit E_xchange Rate"
 msgstr "Wechsel_kurs bearbeiten"
 
-#: ../src/gnome/gnc-plugin-page-register.c:244
-msgid "Exit the exchange rate for the current transaction"
+#: ../src/gnome/gnc-plugin-page-register.c:241
+msgid "Edit the exchange rate for the current transaction"
 msgstr "Den Wechselkurs für die gewählte Buchung bearbeiten"
 
-#: ../src/gnome/gnc-plugin-page-register.c:249
+#: ../src/gnome/gnc-plugin-page-register.c:246
 msgid "Sche_dule..."
 msgstr "_Terminiert..."
 
-#: ../src/gnome/gnc-plugin-page-register.c:252
+#: ../src/gnome/gnc-plugin-page-register.c:249
 msgid "_All transactions"
 msgstr "Alle Buchungssätze"
 
-#: ../src/gnome/gnc-plugin-page-register.c:255
+#: ../src/gnome/gnc-plugin-page-register.c:252
 msgid "_This transaction"
 msgstr "_Dieser Buchungssatz"
 
 #. Reports menu
-#: ../src/gnome/gnc-plugin-page-register.c:261
+#: ../src/gnome/gnc-plugin-page-register.c:258
 msgid "Account Report"
 msgstr "Kontenbericht"
 
+#: ../src/gnome/gnc-plugin-page-register.c:259
 #: ../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 "Kontobuch als Bericht für diesen Buchungssatz öffnen"
 
-#: ../src/gnome/gnc-plugin-page-register.c:264
+#: ../src/gnome/gnc-plugin-page-register.c:261
 msgid "Account Transaction Report"
 msgstr "Buchungsbericht"
 
 #. Translators: This is a menu item in the View menu
-#: ../src/gnome/gnc-plugin-page-register.c:290
+#: ../src/gnome/gnc-plugin-page-register.c:287
 msgid "Transaction _Journal"
 msgstr "_Vollständig"
 
+#. src/report/standard-reports/gnucash/report/register.scm
 #. src/report/standard-reports/register.scm
-#: ../src/gnome/gnc-plugin-page-register.c:326
-#: ../src/register/ledger-core/split-register.c:1979
+#: ../src/gnome/gnc-plugin-page-register.c:323
+#: ../src/register/ledger-core/split-register.c:2001
 #: ../src/register/ledger-core/split-register-layout.c:571
 #: ../src/register/ledger-core/split-register-model.c:184
-#: ../intl-scm/guile-strings.c:2562
+#: ../intl-scm/guile-strings.c:3896 ../intl-scm/guile-strings.c:5046
 msgid "Transfer"
 msgstr "Buchen"
 
 #. src/report/standard-reports/general-ledger.scm
-#: ../src/gnome/gnc-plugin-page-register.c:544
-#: ../src/gnome/gnc-plugin-page-register.c:1144
-#: ../src/gnome/gnc-plugin-page-register.c:1676
-#: ../intl-scm/guile-strings.c:1468
+#. src/report/standard-reports/gnucash/report/general-ledger.scm
+#: ../src/gnome/gnc-plugin-page-register.c:541
+#: ../src/gnome/gnc-plugin-page-register.c:1141
+#: ../src/gnome/gnc-plugin-page-register.c:1673
+#: ../intl-scm/guile-strings.c:2178 ../intl-scm/guile-strings.c:2802
 msgid "General Ledger"
 msgstr "Journal"
 
 #. Translators: %s is the name
 #. of the tab page
-#: ../src/gnome/gnc-plugin-page-register.c:1083
+#: ../src/gnome/gnc-plugin-page-register.c:1080
 #, c-format
 msgid "Save changes to %s?"
 msgstr "Änderungen in %s speichern?"
 
-#: ../src/gnome/gnc-plugin-page-register.c:1087
+#: ../src/gnome/gnc-plugin-page-register.c:1084
 msgid ""
 "This register has pending changes to a transaction.  Would you like to save "
 "the changes to this transaction, discard the transaction, or cancel the "
@@ -7418,85 +7484,111 @@
 "Schließen der Seite die Änderungen in der Buchung speichern oder verwerfen "
 "oder möchten Sie abbrechen?"
 
-#: ../src/gnome/gnc-plugin-page-register.c:1090
+#: ../src/gnome/gnc-plugin-page-register.c:1087
 msgid "_Discard Transaction"
 msgstr "Buchungsänderungen ver_werfen"
 
-#: ../src/gnome/gnc-plugin-page-register.c:1094
+#: ../src/gnome/gnc-plugin-page-register.c:1091
 msgid "_Save Transaction"
 msgstr "Buchung _speichern"
 
-#: ../src/gnome/gnc-plugin-page-register.c:1125
-#: ../src/gnome/gnc-plugin-page-register.c:1157
-#: ../src/import-export/hbci/gnc-hbci-utils.c:577
-#: ../src/import-export/hbci/gnc-hbci-utils.c:579
+#: ../src/gnome/gnc-plugin-page-register.c:1122
+#: ../src/gnome/gnc-plugin-page-register.c:1154
+#: ../src/import-export/hbci/gnc-hbci-utils.c:578
+#: ../src/import-export/hbci/gnc-hbci-utils.c:580
 msgid "unknown"
 msgstr "unbekannt"
 
-#: ../src/gnome/gnc-plugin-page-register.c:1146
-#: ../src/gnome/gnc-plugin-page-register.c:1682
+#: ../src/gnome/gnc-plugin-page-register.c:1143
+#: ../src/gnome/gnc-plugin-page-register.c:1679
 msgid "Portfolio"
 msgstr "Portfolio"
 
-#: ../src/gnome/gnc-plugin-page-register.c:1148
-#: ../src/gnome/gnc-plugin-page-register.c:1688
+#: ../src/gnome/gnc-plugin-page-register.c:1145
+#: ../src/gnome/gnc-plugin-page-register.c:1685
 msgid "Search Results"
 msgstr "Suchergebnisse"
 
-#: ../src/gnome/gnc-plugin-page-register.c:1678
+#: ../src/gnome/gnc-plugin-page-register.c:1675
 msgid "General Ledger Report"
 msgstr "Journal Bericht"
 
-#: ../src/gnome/gnc-plugin-page-register.c:1684
+#: ../src/gnome/gnc-plugin-page-register.c:1681
 msgid "Portfolio Report"
 msgstr "Portfolio Bericht"
 
-#: ../src/gnome/gnc-plugin-page-register.c:1690
+#: ../src/gnome/gnc-plugin-page-register.c:1687
 msgid "Search Results Report"
 msgstr "Suchergebnisse Bericht"
 
 #. src/report/standard-reports/general-journal.scm
+#. src/report/standard-reports/gnucash/report/general-journal.scm
+#. src/report/standard-reports/gnucash/report/register.scm
 #. src/report/standard-reports/register.scm
-#: ../src/gnome/gnc-plugin-page-register.c:1694
-#: ../src/gnome-utils/glade/preferences.glade.h:83
-#: ../intl-scm/guile-strings.c:1266 ../intl-scm/guile-strings.c:2662
+#: ../src/gnome/gnc-plugin-page-register.c:1691
+#: ../src/gnome-utils/glade/preferences.glade.h:91
+#: ../intl-scm/guile-strings.c:1978 ../intl-scm/guile-strings.c:2602
+#: ../intl-scm/guile-strings.c:3996 ../intl-scm/guile-strings.c:5146
 msgid "Register"
 msgstr "Kontobuch"
 
+#. src/report/standard-reports/gnucash/report/register.scm
 #. src/report/standard-reports/register.scm
-#: ../src/gnome/gnc-plugin-page-register.c:1696
-#: ../intl-scm/guile-strings.c:2582
+#: ../src/gnome/gnc-plugin-page-register.c:1693
+#: ../intl-scm/guile-strings.c:3916 ../intl-scm/guile-strings.c:5066
 msgid "Register Report"
 msgstr "Bericht zum Kontobuch"
 
-#: ../src/gnome/gnc-plugin-page-register.c:1712
+#: ../src/gnome/gnc-plugin-page-register.c:1709
 msgid "and subaccounts"
 msgstr "und Unterkonten"
 
-#: ../src/gnome/gnc-plugin-page-register.c:1978
+#: ../src/gnome/gnc-plugin-page-register.c:1975
 msgid "You cannot void a transaction with reconciled or cleared splits."
 msgstr ""
 "Sie können eine Buchung mit abgeglichenen oder bestätigten Buchungsteilen "
 "nicht ungültig machen."
 
-#: ../src/gnome/gnc-plugin-page-register.c:2046
+#: ../src/gnome/gnc-plugin-page-register.c:2043
 #: ../src/gnome/gnc-split-reg.c:908
 msgid "A reversing entry has already been created for this transaction."
 msgstr "Zu dieser Buchung wurde bereits eine Stornierungsbuchung hinzugefügt."
 
 #. Translations: The %s is the name of the plugin page
-#: ../src/gnome/gnc-plugin-page-register.c:2094
+#: ../src/gnome/gnc-plugin-page-register.c:2091
 #, c-format
 msgid "Sort %s by..."
 msgstr "%s sortieren nach..."
 
 #. Translators: The %s is the name of the plugin page
-#: ../src/gnome/gnc-plugin-page-register.c:2146
-#: ../src/gnome-utils/gnc-tree-view-account.c:1842
+#: ../src/gnome/gnc-plugin-page-register.c:2143
+#: ../src/gnome-utils/gnc-tree-view-account.c:1838
 #, c-format
 msgid "Filter %s by..."
 msgstr "%s filtern nach..."
 
+#. This seems to be the one that initially gets used, the InactiveDateCell
+#. is set to, and subsequently displayed.
+#: ../src/gnome/gnc-plugin-page-sx-list.c:115
+#: ../src/register/ledger-core/split-register-model.c:806
+msgid "Scheduled"
+msgstr "Terminiert"
+
+#: ../src/gnome/gnc-plugin-page-sx-list.c:117
+#, fuzzy
+msgid "Create a new scheduled transaction"
+msgstr "Bitte geben Sie der terminierten Buchung einen Namen."
+
+#: ../src/gnome/gnc-plugin-page-sx-list.c:119
+#, fuzzy
+msgid "Edit the selected scheduled transaction"
+msgstr "Ausgewählte terminierte Buchung löschen?"
+
+#: ../src/gnome/gnc-plugin-page-sx-list.c:121
+#, fuzzy
+msgid "Delete the selected scheduled transaction"
+msgstr "Ausgewählte terminierte Buchung löschen?"
+
 #: ../src/gnome/gnc-plugin-register.c:48
 msgid "_General Ledger"
 msgstr "_Journal"
@@ -7607,39 +7699,39 @@
 "Beachten Sie, dass Sie einen Buchungssatz mit abgeglichenen Buchungen "
 "löschen würden. Dies bedeutet, dass ihr abgeglichener Saldo verändert wird."
 
-#: ../src/gnome/gnc-split-reg.c:1795
+#: ../src/gnome/gnc-split-reg.c:1794
 msgid "Present:"
 msgstr "Aktueller Wert:"
 
-#: ../src/gnome/gnc-split-reg.c:1796
+#: ../src/gnome/gnc-split-reg.c:1795
 msgid "Future:"
 msgstr "Zukünftiger Wert:"
 
-#: ../src/gnome/gnc-split-reg.c:1797
+#: ../src/gnome/gnc-split-reg.c:1796
 msgid "Cleared:"
 msgstr "Bestätigt:"
 
-#: ../src/gnome/gnc-split-reg.c:1798
+#: ../src/gnome/gnc-split-reg.c:1797
 msgid "Reconciled:"
 msgstr "Abgeglichen:"
 
-#: ../src/gnome/gnc-split-reg.c:1799
+#: ../src/gnome/gnc-split-reg.c:1798
 msgid "Projected Minimum:"
 msgstr "Voraussichtliches Minimum:"
 
-#: ../src/gnome/gnc-split-reg.c:1803
+#: ../src/gnome/gnc-split-reg.c:1802
 msgid "Shares:"
 msgstr "Anteile:"
 
-#: ../src/gnome/gnc-split-reg.c:1804
+#: ../src/gnome/gnc-split-reg.c:1803
 msgid "Current Value:"
 msgstr "Aktueller Wert:"
 
-#: ../src/gnome/gnc-split-reg.c:1876
+#: ../src/gnome/gnc-split-reg.c:1875
 msgid "This account register is read-only."
 msgstr "Dieses Konto ist schreibgeschützt."
 
-#: ../src/gnome/gnc-split-reg.c:1910
+#: ../src/gnome/gnc-split-reg.c:1909
 msgid ""
 "This account may not be edited.  If you want to edit transactions in this "
 "register, please open the account options and turn off the placeholder "
@@ -7649,7 +7741,7 @@
 "Konto bearbeiten möchten, öffnen Sie bitte das Dialogfenster »Konto "
 "Eigenschaften« und deaktivieren Sie die Option »Platzhalter-Konto«."
 
-#: ../src/gnome/gnc-split-reg.c:1917
+#: ../src/gnome/gnc-split-reg.c:1916
 msgid ""
 "One of the sub-accounts selected may not be edited.  If you want to edit "
 "transactions in this register, please open the sub-account options and turn "
@@ -7669,7 +7761,21 @@
 msgid "Manage your finances, accounts, and investments"
 msgstr "Der Finanzmanager für Buchführung, Online-Banking und Investments"
 
-#: ../src/gnome/lot-viewer.c:596
+#. src/report/standard-reports/general-journal.scm
+#. src/report/standard-reports/gnucash/report/general-journal.scm
+#. src/report/standard-reports/gnucash/report/register.scm
+#. src/report/standard-reports/register.scm
+#: ../src/gnome/lot-viewer.c:620 ../intl-scm/guile-strings.c:1984
+#: ../intl-scm/guile-strings.c:2608 ../intl-scm/guile-strings.c:3912
+#: ../intl-scm/guile-strings.c:5062
+msgid "Title"
+msgstr "Titel"
+
+#: ../src/gnome/lot-viewer.c:630
+msgid "Gains"
+msgstr "Wertzuwachs"
+
+#: ../src/gnome/lot-viewer.c:652
 #, c-format
 msgid "Lots in Account %s"
 msgstr "Posten im Konto %s"
@@ -7756,7 +7862,7 @@
 "unterschritten wurde."
 
 #: ../src/gnome/schemas/apps_gnucash_dialog_common.schemas.in.h:3
-#: ../src/gnome-utils/glade/preferences.glade.h:47
+#: ../src/gnome-utils/glade/preferences.glade.h:50
 msgid "Default to 'new search' if fewer than this number of items is returned."
 msgstr ""
 "Voreinstellung 'Neue Suche' wählen, wenn diese Anzahl an Ergebnissen "
@@ -7794,7 +7900,7 @@
 msgstr "Spalten aufsteigend oder absteigend sortieren"
 
 #: ../src/gnome/schemas/apps_gnucash_dialog_common.schemas.in.h:11
-#: ../src/import-export/hbci/schemas/apps_gnucash_dialog_hbci.schemas.in.h:6
+#: ../src/import-export/hbci/schemas/apps_gnucash_dialog_hbci.schemas.in.h:10
 #: ../src/import-export/schemas/apps_gnucash_import_generic_matcher.schemas.in.h:10
 msgid ""
 "The X,Y coordinates of the top left corner of the dialog when it was last "
@@ -7804,7 +7910,7 @@
 "geöffnet war."
 
 #: ../src/gnome/schemas/apps_gnucash_dialog_common.schemas.in.h:12
-#: ../src/import-export/hbci/schemas/apps_gnucash_dialog_hbci.schemas.in.h:7
+#: ../src/import-export/hbci/schemas/apps_gnucash_dialog_hbci.schemas.in.h:11
 #: ../src/import-export/schemas/apps_gnucash_import_generic_matcher.schemas.in.h:11
 msgid "The width and size of the dialog when it was last closed."
 msgstr "Größe des Dialogs beim letzten Schließen"
@@ -7844,13 +7950,13 @@
 "sortiert wird. Mögliche Werte sind die Namen der Spalten oder »none« (keine)."
 
 #: ../src/gnome/schemas/apps_gnucash_dialog_common.schemas.in.h:17
-#: ../src/import-export/hbci/schemas/apps_gnucash_dialog_hbci.schemas.in.h:9
+#: ../src/import-export/hbci/schemas/apps_gnucash_dialog_hbci.schemas.in.h:17
 #: ../src/import-export/schemas/apps_gnucash_import_generic_matcher.schemas.in.h:17
 msgid "Window geometry"
 msgstr "Fenstergröße"
 
 #: ../src/gnome/schemas/apps_gnucash_dialog_common.schemas.in.h:18
-#: ../src/import-export/hbci/schemas/apps_gnucash_dialog_hbci.schemas.in.h:10
+#: ../src/import-export/hbci/schemas/apps_gnucash_dialog_hbci.schemas.in.h:18
 #: ../src/import-export/schemas/apps_gnucash_import_generic_matcher.schemas.in.h:18
 msgid "Window position"
 msgstr "Fensterposition"
@@ -8052,7 +8158,7 @@
 msgstr "Bestätigte Buchungen zum Abgleichen vorwählen"
 
 #: ../src/gnome/schemas/apps_gnucash_dialog_reconcile.schemas.in.h:4
-#: ../src/gnome-utils/glade/preferences.glade.h:81
+#: ../src/gnome-utils/glade/preferences.glade.h:88
 msgid ""
 "Prior to reconciling an account which charges or pays interest, prompt the "
 "user to enter a transaction for the interest charge or payment. Currently "
@@ -8072,6 +8178,66 @@
 msgid "Prompt for interest charges"
 msgstr "Nach Eingabe Sollzins fragen"
 
+#: ../src/gnome/schemas/apps_gnucash_dialog_scheduled_transctions.schemas.in.h:1
+msgid "How many days in advance to notify the user."
+msgstr ""
+"Anzahl der Tage im Voraus, mit denen über die Terminierte Buchungen "
+"benachrichtigt werden soll."
+
+#: ../src/gnome/schemas/apps_gnucash_dialog_scheduled_transctions.schemas.in.h:2
+msgid "How many days in advance to remind the user."
+msgstr ""
+"Anzahl der Tage im Voraus, die an Terminierte Buchungen erinnert werden soll."
+
+#: ../src/gnome/schemas/apps_gnucash_dialog_scheduled_transctions.schemas.in.h:3
+msgid ""
+"If active, any newly created scheduled transaction will have its 'auto "
+"create' flag set active by default. The user can change this flag during "
+"transaction creation, or at any later time by editing the scheduled "
+"transaction."
+msgstr ""
+"Wenn aktiviert, werden neu erstellte Terminierte Buchungen »Automatisch "
+"erstellen« als Voreinstellung aktiviert haben. Diese Einstellung kann bei "
+"jeder Terminierten Buchung geändert werden."
+
+#: ../src/gnome/schemas/apps_gnucash_dialog_scheduled_transctions.schemas.in.h:4
+msgid ""
+"If active, any newly created scheduled transaction will have its 'notify' "
+"flag set by default. The user can change this flag during transaction "
+"creation, or at any later time by editing the scheduled transaction. This "
+"setting only has meaning if the create_auto setting is active."
+msgstr ""
+"Wenn aktiviert, werden neu erstellte Terminierte Buchungen »Benachrichtigen« "
+"als Voreinstellung aktiviert haben. Diese Einstellung kann bei jeder "
+"Terminierten Buchung geändert werden. Diese Einstellung hat nur Bedeutung, "
+"wenn »Automatisch erstellen« aktiviert ist."
+
+#: ../src/gnome/schemas/apps_gnucash_dialog_scheduled_transctions.schemas.in.h:5
+msgid "Set the \"auto create\" flag by default"
+msgstr ""
+"»Automatisch erstellen« für neue terminierte Buchungen als Voreinstellung "
+"wählen."
+
+#: ../src/gnome/schemas/apps_gnucash_dialog_scheduled_transctions.schemas.in.h:6
+msgid "Set the \"notify\" flag by default"
+msgstr ""
+"»Benachrichtigen« für neue terminierte Buchungen als Voreinstellung wählen."
+
+#: ../src/gnome/schemas/apps_gnucash_dialog_scheduled_transctions.schemas.in.h:7
+msgid "Show \"since last run\" dialog when a file is opened."
+msgstr ""
+"Das Fenster »Seit letztem Aufruf« anzeigen, wenn eine Datei geöffnet wird "
+"oder beim Programmstart von GnuCash."
+
+#: ../src/gnome/schemas/apps_gnucash_dialog_scheduled_transctions.schemas.in.h:8
+msgid ""
+"This setting controls whether the scheduled transactions \"since last run\" "
+"dialog is shown automatically when a data file is opened. This includes the "
+"initial opening of the data file when GnuCash starts. If this setting is "
+"active, show the dialog, otherwise it is not shown."
+msgstr ""
+"Ob das Fenster »Seit letztem Aufruf« beim Öffnen einer Datei angezeigt wird."
+
 #: ../src/gnome/schemas/apps_gnucash_dialog_totd.schemas.in.h:1
 msgid ""
 "Enables the \"Tip Of The Day\" when GnuCash starts up. If active, the dialog "
@@ -8151,7 +8317,7 @@
 msgstr "Alte Log/Sicherungsdateien nach so vielen Tagen löschen (0 = niemals)."
 
 #: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:16
-#: ../src/gnome-utils/glade/preferences.glade.h:52
+#: ../src/gnome-utils/glade/preferences.glade.h:55
 msgid "Display negative amounts in red"
 msgstr "Negative Beträge in rot anzeigen"
 
@@ -8268,16 +8434,21 @@
 msgstr "Anzahl automatische Dezimalstellen"
 
 #: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:32
+#, fuzzy
+msgid "Position of the notebook tabs"
+msgstr "Position der Datumszeile"
+
+#: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:33
 msgid "Save window sizes and locations"
 msgstr "Fenstergröße und -positionen speichern"
 
-#: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:33
+#: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:34
 msgid "Show close buttons on notebook tabs"
 msgstr "Den Knopf »Schließen« bei Karteikarten-Ansicht anzeigen"
 
-#: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:34
+#: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:35
 msgid ""
-"Show horizontal borders between cells in a register. If active the border "
+"Show horizontal borders between rows in a register. If active the border "
 "between cells will be indicated with a heavy line. Otherwise the border "
 "between cells will not be marked."
 msgstr ""
@@ -8285,11 +8456,15 @@
 "deutlichen Linie gezeichnet. Andernfalls wird die Begrenzung zwischen Zeilen "
 "nicht mit einer Linie markiert."
 
-#: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:35
+#: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:36
 msgid "Show horizontal borders in a register"
 msgstr "Horizontale Begrenzungen im Kontofenster anzeigen"
 
 #: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:37
+msgid "Show splash screen"
+msgstr ""
+
+#: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:39
 msgid ""
 "Show two lines of information for each transaction in a register. This is "
 "the default setting for when a register is first opened. The setting can be "
@@ -8300,9 +8475,9 @@
 "Kontofenster kann diese Einstellung jederzeit über das Menü »Anzeige/Zwei "
 "Zeilen« geändert werden."
 
-#: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:38
+#: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:40
 msgid ""
-"Show vertical borders between cells in a register. If active the border "
+"Show vertical borders between columns in a register. If active the border "
 "between cells will be indicated with a heavy line. Otherwise the border "
 "between cells will not be marked."
 msgstr ""
@@ -8310,19 +8485,19 @@
 "deutlichen Linie gezeichnet. Andernfalls wird die Begrenzung zwischen "
 "Spalten nicht mit einer Linie markiert."
 
-#: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:39
+#: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:41
 msgid "Show vertical borders in a register"
 msgstr "Vertikale Begrenzungen im Kontofenster anzeigen"
 
-#: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:40
+#: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:42
 msgid "Source of default account currency"
 msgstr "Auswahl Standardwährung für Konten"
 
-#: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:41
+#: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:43
 msgid "Source of default report currency"
 msgstr "Auswahl Standardwährung für Berichte"
 
-#: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:43
+#: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:45
 msgid ""
 "This field sets the number of rows to show in a register. It does not "
 "actually affect the display of the contents of the window. It is only used "
@@ -8332,7 +8507,7 @@
 "Kontofenster gezeigt werden. Diese Zahl wird nur verwendet, wenn das Fenster "
 "das erste Mal neu geöffnet wird."
 
-#: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:44
+#: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:46
 msgid ""
 "This field specifies the default view style when opening a new register "
 "window. Possible values are \"ledger\", \"auto-ledger\" and \"journal\". The "
@@ -8345,13 +8520,13 @@
 "Kontenfenster an. Mögliche Werte sind »ledger« (Einzeilig), »auto-"
 "ledger« (Aktive vollständig) und »journal« (Vollständig)."
 
-#: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:45
+#: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:47
 msgid ""
 "This field specifies the number of automatic decimal places that will be "
 "filled in."
 msgstr "Diese Einstellung gibt die Anzahl der automatischen Dezimalstellen an."
 
-#: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:46
+#: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:48
 msgid ""
 "This setting allows certain accounts to have their balances reversed in sign "
 "from positive to negative, or vice versa. The setting \"income_expense\" is "
@@ -8365,7 +8540,7 @@
 "Einnahme-/Ausgabenkonten, »credit« für Aktiva-/Passivakonten und »none« für "
 "keine Vorzeichenumkehr."
 
-#: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:47
+#: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:49
 msgid ""
 "This setting chooses the way dates are displayed in GnuCash. Possible values "
 "for this setting are \"locale\" to use the system locale setting, \"ce\" for "
@@ -8377,7 +8552,7 @@
 "Kontinentaleuropa, »iso« für den ISO-8601 Standard, »uk« für Großbritannien "
 "und »us« für den USA-Stil für die Datumsanzeige."
 
-#: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:48
+#: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:50
 msgid ""
 "This setting controls how the labels on toolbar buttons are shown. If set to "
 "\"system\" then GnuCash will use the desktop setting for how to draw toolbar "
@@ -8392,7 +8567,7 @@
 "für alle Symbole, wobei die wichtigsten Knöpfe noch einen nebenstehenden "
 "Text zeigen."
 
-#: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:49
+#: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:51
 msgid ""
 "This setting controls the default currency used for reports. If set to "
 "\"locale\" then GnuCash will retrieve the default currency from the user's "
@@ -8404,7 +8579,7 @@
 "voreingestellte Währung der Systemeinstellungen (locale). Wenn auf »other« "
 "gesetzt, wird die Einstellung von »currency_other« verwendet."
 
-#: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:50
+#: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:52
 msgid ""
 "This setting controls the source of the default currency for new accounts. "
 "If set to \"locale\" then GnuCash will retrieve the default currency from "
@@ -8416,7 +8591,7 @@
 "Währung der Systemeinstellungen (locale). Wenn auf »other« gesetzt, wird die "
 "Einstellung von »currency_other« verwendet."
 
-#: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:51
+#: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:53
 msgid ""
 "This setting determines the character that will be used between components "
 "of an account name. Possible values are any single non-alphanumeric unicode "
@@ -8427,8 +8602,20 @@
 "Zeichen wählen, das kein Buchstabe oder Zahl ist, zum Beispiel »:«, »/« oder "
 "»-«."
 
-#: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:52
+#: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:54
 msgid ""
+"This setting determines the edge at which the tabs for switching pages in "
+"notebooks are drawn. Possible values are \"top\", \"left\", \"bottom\" and "
+"\"right\". It defaults to \"top\"."
+msgstr ""
+
+#: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:55
+msgid ""
+"This setting determines whether GnuCash will show a splash screen at startup."
+msgstr ""
+
+#: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:56
+msgid ""
 "This setting specifies the default currency used for new accounts if the "
 "currency_choice setting is set to \"other\". This field must contain the "
 "three letter ISO 4217 code for a currency (e.g. USD, GBP, RUB)."
@@ -8438,7 +8625,7 @@
 "muss den Drei-Buchstaben-Code aus ISO 4217 für die Währung enthalten, z. B. "
 "EUR, USD oder RUB."
 
-#: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:53
+#: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:57
 msgid ""
 "This setting specifies the default currency used for reports if the "
 "currency_choice setting is set to \"other\". This field must contain the "
@@ -8449,7 +8636,7 @@
 "Einstellung muss den Drei-Buchstaben-Code aus ISO 4217 für die Währung "
 "enthalten, z. B. EUR, USD oder RUB."
 
-#: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:54
+#: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:58
 msgid ""
 "This setting specifies the number of days after which old log/backup files "
 "will be deleted (0 = never)."
@@ -8457,11 +8644,11 @@
 "Diese Einstellung gibt die Anzahl Tage an, nach denen alte Log/Backup-"
 "Dateien gelöscht werden. 0 entspricht niemals Löschen."
 
-#: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:55
+#: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:59
 msgid "Use 24 hour time format"
 msgstr "24-Stunden-Format zur Zeitanzeige"
 
-#: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:56
+#: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:60
 msgid "Use formal account labels"
 msgstr "Ãœberschriften aus Rechnungswesen verwenden"
 
@@ -8573,8 +8760,9 @@
 "des Kontos verändern."
 
 #: ../src/gnome/schemas/apps_gnucash_warnings.schemas.in.h:21
+#, fuzzy
 msgid ""
-"This dialog is presented before allowing you to remove a reconciled splits "
+"This dialog is presented before allowing you to remove a reconciled split "
 "from a transaction. Doing so will throw off the reconciled value of the "
 "register and can make it hard to perform future reconciliations."
 msgstr ""
@@ -8774,132 +8962,131 @@
 msgid "Width of a column in the dialog"
 msgstr "Spaltenbreite in einem Dialog"
 
-#: ../src/gnome-search/dialog-search.c:147
+#: ../src/gnome-search/dialog-search.c:155
 msgid "You must select an item from the list"
 msgstr "Sie müssen ein Kriterium der Liste auswählen"
 
-#: ../src/gnome-search/dialog-search.c:264
+#: ../src/gnome-search/dialog-search.c:272
 msgid "Select"
 msgstr "Auswählen"
 
-#: ../src/gnome-search/dialog-search.c:787
+#: ../src/gnome-search/dialog-search.c:806
 msgid "all criteria are met"
 msgstr "Alle Kriterien werden erfüllt"
 
-#: ../src/gnome-search/dialog-search.c:792
+#: ../src/gnome-search/dialog-search.c:807
 msgid "any criteria are met"
 msgstr "Irgendeines der Kriterien wird erfüllt"
 
 #. Translators: %s is either "item" or the name of some other
 #. * item, e.g. "Customer" or "Invoice".
-#: ../src/gnome-search/dialog-search.c:833
+#: ../src/gnome-search/dialog-search.c:842
 #, c-format
 msgid "New %s"
 msgstr "Neu: %s"
 
-#: ../src/gnome-search/dialog-search.c:833
+#: ../src/gnome-search/dialog-search.c:842
 msgid "item"
 msgstr "Kriterium"
 
-#: ../src/gnome-search/search-account.c:167
+#: ../src/gnome-search/search-account.c:170
 msgid "You have not selected any accounts"
 msgstr "Sie haben keine Konten ausgewählt"
 
-#: ../src/gnome-search/search-account.c:212
+#: ../src/gnome-search/search-account.c:190
 msgid "matches all accounts"
 msgstr "entspricht allen Konten"
 
-#: ../src/gnome-search/search-account.c:215
+#: ../src/gnome-search/search-account.c:193
 msgid "matches any account"
 msgstr "entspricht irgendeinem Konto"
 
-#. Force one
-#: ../src/gnome-search/search-account.c:217
+#: ../src/gnome-search/search-account.c:194
 msgid "matches no accounts"
 msgstr "entspricht keinem Konto"
 
 #. src/report/standard-reports/cash-flow.scm
-#: ../src/gnome-search/search-account.c:236 ../intl-scm/guile-strings.c:1324
+#. src/report/standard-reports/gnucash/report/cash-flow.scm
+#: ../src/gnome-search/search-account.c:211 ../intl-scm/guile-strings.c:2034
+#: ../intl-scm/guile-strings.c:2658
 msgid "Selected Accounts"
 msgstr "Ausgewählte Konten"
 
-#: ../src/gnome-search/search-account.c:237
+#: ../src/gnome-search/search-account.c:212
 msgid "Choose Accounts"
 msgstr "Konten wählen"
 
 #. Create the label
-#: ../src/gnome-search/search-account.c:269
+#: ../src/gnome-search/search-account.c:244
 msgid "Select Accounts to Match"
 msgstr "Konten wählen, die den Kriterien entsprechen"
 
-#: ../src/gnome-search/search-account.c:273
+#: ../src/gnome-search/search-account.c:248
 msgid "Select the Accounts to Compare"
 msgstr "Konten wählen, die verglichen werden sollen"
 
 #. Build and connect the toggle
-#: ../src/gnome-search/search-boolean.c:230
+#: ../src/gnome-search/search-boolean.c:201
 msgid "set true"
 msgstr "auf wahr setzen"
 
-#: ../src/gnome-search/search-date.c:214
+#: ../src/gnome-search/search-date.c:191
 msgid "is before"
 msgstr "vor"
 
-#. Force one
-#: ../src/gnome-search/search-date.c:216
+#: ../src/gnome-search/search-date.c:192
 msgid "is before or on"
 msgstr "vor oder am"
 
-#: ../src/gnome-search/search-date.c:217
+#: ../src/gnome-search/search-date.c:193
 msgid "is on"
 msgstr "am"
 
-#: ../src/gnome-search/search-date.c:218
+#: ../src/gnome-search/search-date.c:194
 msgid "is not on"
 msgstr "nicht am"
 
-#: ../src/gnome-search/search-date.c:219
+#: ../src/gnome-search/search-date.c:195
 msgid "is after"
 msgstr "nach"
 
-#: ../src/gnome-search/search-date.c:220
+#: ../src/gnome-search/search-date.c:196
 msgid "is on or after"
 msgstr "nach oder am"
 
-#: ../src/gnome-search/search-double.c:206
-#: ../src/gnome-search/search-int64.c:209
-#: ../src/gnome-search/search-numeric.c:246
+#: ../src/gnome-search/search-double.c:183
+#: ../src/gnome-search/search-int64.c:185
+#: ../src/gnome-search/search-numeric.c:216
 msgid "is less than"
 msgstr "weniger als"
 
-#. Force one
-#: ../src/gnome-search/search-double.c:208
-#: ../src/gnome-search/search-int64.c:211
-#: ../src/gnome-search/search-numeric.c:251
+#: ../src/gnome-search/search-double.c:184
+#: ../src/gnome-search/search-int64.c:186
+#: ../src/gnome-search/search-numeric.c:220
 msgid "is less than or equal to"
 msgstr "weniger als oder gleich"
 
-#: ../src/gnome-search/search-double.c:209
-#: ../src/gnome-search/search-int64.c:212
-#: ../src/gnome-search/search-numeric.c:254
+#: ../src/gnome-search/search-double.c:185
+#: ../src/gnome-search/search-int64.c:187
+#: ../src/gnome-search/search-numeric.c:223
 msgid "equals"
 msgstr "gleich"
 
-#: ../src/gnome-search/search-double.c:210
-#: ../src/gnome-search/search-int64.c:213
-#: ../src/gnome-search/search-numeric.c:257
+#: ../src/gnome-search/search-double.c:186
+#: ../src/gnome-search/search-int64.c:188
+#: ../src/gnome-search/search-numeric.c:226
 msgid "does not equal"
 msgstr "nicht gleich"
 
-#: ../src/gnome-search/search-double.c:211
-#: ../src/gnome-search/search-int64.c:214
-#: ../src/gnome-search/search-numeric.c:260
+#: ../src/gnome-search/search-double.c:187
+#: ../src/gnome-search/search-int64.c:189
+#: ../src/gnome-search/search-numeric.c:229
 msgid "is greater than"
 msgstr "größer als"
 
-#: ../src/gnome-search/search-double.c:212
-#: ../src/gnome-search/search-int64.c:215
-#: ../src/gnome-search/search-numeric.c:264
+#: ../src/gnome-search/search-double.c:188
+#: ../src/gnome-search/search-int64.c:190
+#: ../src/gnome-search/search-numeric.c:233
 msgid "is greater than or equal to"
 msgstr "größer als oder gleich"
 
@@ -8951,74 +9138,73 @@
 msgstr "Suchtyp"
 
 #: ../src/gnome-search/search.glade.h:12
-msgid "_New item ..."
+msgid "_New item..."
 msgstr "_Neuer Eintrag..."
 
-#: ../src/gnome-search/search-numeric.c:246
+#: ../src/gnome-search/search-numeric.c:216
 msgid "less than"
 msgstr "kleiner"
 
-#: ../src/gnome-search/search-numeric.c:250
+#: ../src/gnome-search/search-numeric.c:219
 msgid "less than or equal to"
 msgstr "kleiner oder gleich"
 
-#: ../src/gnome-search/search-numeric.c:254
+#: ../src/gnome-search/search-numeric.c:223
 msgid "equal to"
 msgstr "gleich"
 
-#: ../src/gnome-search/search-numeric.c:257
+#: ../src/gnome-search/search-numeric.c:226
 msgid "not equal to"
 msgstr "ungleich"
 
-#: ../src/gnome-search/search-numeric.c:260
+#: ../src/gnome-search/search-numeric.c:229
 msgid "greater than"
 msgstr "größer"
 
-#: ../src/gnome-search/search-numeric.c:263
+#: ../src/gnome-search/search-numeric.c:232
 msgid "greater than or equal to"
 msgstr "größer oder gleich"
 
-#: ../src/gnome-search/search-numeric.c:285
+#: ../src/gnome-search/search-numeric.c:249
 msgid "has credits or debits"
 msgstr "hat Haben oder Soll"
 
-#. Force one
-#: ../src/gnome-search/search-numeric.c:288
+#: ../src/gnome-search/search-numeric.c:250
 msgid "has debits"
 msgstr "hat Soll"
 
-#: ../src/gnome-search/search-numeric.c:290
+#: ../src/gnome-search/search-numeric.c:251
 msgid "has credits"
 msgstr "hat Haben"
 
 #. Build and connect the toggles
-#: ../src/gnome-search/search-reconciled.c:251
+#: ../src/gnome-search/search-reconciled.c:222
 msgid "Not Cleared"
 msgstr "Unbestätigt"
 
-#: ../src/gnome-search/search-reconciled.c:254
-#: ../src/gnome-utils/gnc-tree-view-account.c:578
+#: ../src/gnome-search/search-reconciled.c:225
+#: ../src/gnome-utils/gnc-tree-view-account.c:574
 msgid "Cleared"
 msgstr "Bestätigt"
 
-#: ../src/gnome-search/search-reconciled.c:257
-#: ../src/gnome-utils/gnc-tree-view-account.c:591
+#: ../src/gnome-search/search-reconciled.c:228
+#: ../src/gnome-utils/gnc-tree-view-account.c:587
 msgid "Reconciled"
 msgstr "Abgeglichen"
 
-#: ../src/gnome-search/search-reconciled.c:260
+#: ../src/gnome-search/search-reconciled.c:231
 msgid "Frozen"
 msgstr "Fixiert"
 
-#: ../src/gnome-search/search-reconciled.c:263
+#: ../src/gnome-search/search-reconciled.c:234
 msgid "Voided"
 msgstr "Storniert"
 
-#: ../src/gnome-search/search-string.c:183
+#: ../src/gnome-search/search-string.c:186
 msgid "You need to enter a string value"
 msgstr "Sie müssen einen Suchausdruck angeben"
 
-#: ../src/gnome-search/search-string.c:210
+#: ../src/gnome-search/search-string.c:213
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -9027,24 +9213,20 @@
 "Fehler im regulären Ausdruck '%s':\n"
 "%s"
 
-#: ../src/gnome-search/search-string.c:274
+#: ../src/gnome-search/search-string.c:257
 msgid "contains"
 msgstr "enthält"
 
-#: ../src/gnome-search/search-string.c:277
-msgid "does not contain"
-msgstr "enthält nicht"
-
-#: ../src/gnome-search/search-string.c:281
+#: ../src/gnome-search/search-string.c:258
 msgid "matches regex"
 msgstr "entspricht regulärem Ausdruck"
 
-#: ../src/gnome-search/search-string.c:285
+#: ../src/gnome-search/search-string.c:260
 msgid "does not match regex"
 msgstr "entspricht nicht regulärem Ausdruck"
 
 #. Build and connect the toggle button
-#: ../src/gnome-search/search-string.c:353
+#: ../src/gnome-search/search-string.c:322
 msgid "Case Insensitive?"
 msgstr "Groß-/Kleinschreibung ignorieren?"
 
@@ -9053,22 +9235,22 @@
 msgid "Entity Not Found: %s"
 msgstr "Entity nicht gefunden: %s"
 
-#: ../src/gnome/top-level.c:143
+#: ../src/gnome/top-level.c:144
 #, c-format
 msgid "Transaction with no Accounts: %s"
 msgstr "Buchungssatz ohne Konto: %s"
 
-#: ../src/gnome/top-level.c:154
+#: ../src/gnome/top-level.c:155
 #, c-format
 msgid "Unsupported entity type: %s"
 msgstr "Unbekannter Entity Typ: %s"
 
-#: ../src/gnome/top-level.c:184
+#: ../src/gnome/top-level.c:185
 #, c-format
 msgid "No such price: %s"
 msgstr "Kein Preis gefunden: %s"
 
-#: ../src/gnome/top-level.c:369
+#: ../src/gnome/top-level.c:353
 #, c-format
 msgid ""
 "Error: Failure saving state file.\n"
@@ -9077,57 +9259,66 @@
 "Fehler beim Speichern des Status-file.\n"
 "  %s"
 
-#: ../src/gnome-utils/dialog-account.c:411
+#: ../src/gnome-utils/dialog-account.c:420
 msgid "Could not create opening balance."
 msgstr "Anfangsbestand kann nicht erstellt werden."
 
-#: ../src/gnome-utils/dialog-account.c:648
-msgid "Field"
-msgstr "Feld"
+#. primary label
+#: ../src/gnome-utils/dialog-account.c:612
+msgid "Give the children the same type?"
+msgstr ""
+"Soll die Kontoart der Unterkonten zur gleichen Kontoart geändert werden?"
 
-#: ../src/gnome-utils/dialog-account.c:649
-msgid "Old Value"
-msgstr "Alter Wert"
+#. secondary label
+#: ../src/gnome-utils/dialog-account.c:630
+#, c-format
+msgid ""
+"The children of the edited account have to be changed to type \"%s\" to make "
+"them compatible."
+msgstr ""
+"Die Kontoart der Unterkonten des aktuell bearbeiteten Kontos muss zur "
+"Kontoart »%s« geändert werden, damit die Kontoarten wieder zueinander passen."
 
-#: ../src/gnome-utils/dialog-account.c:650
-msgid "New Value"
-msgstr "Neuer Wert"
+#. children
+#: ../src/gnome-utils/dialog-account.c:641
+msgid "_Show children accounts"
+msgstr "_Unterkonten anzeigen"
 
-#: ../src/gnome-utils/dialog-account.c:676
-msgid "Verify Changes"
-msgstr "Änderungen überprüfen"
-
-#: ../src/gnome-utils/dialog-account.c:689
-msgid "The following changes must be made. Continue?"
-msgstr "Die folgenden Änderungen müssen gemacht werden. Fortsetzen?"
-
-#: ../src/gnome-utils/dialog-account.c:757
+#: ../src/gnome-utils/dialog-account.c:714
 msgid "The account must be given a name."
 msgstr "Das Konto muss einen Namen erhalten."
 
-#: ../src/gnome-utils/dialog-account.c:779
+#: ../src/gnome-utils/dialog-account.c:736
 msgid "There is already an account with that name."
 msgstr "Es gibt bereits ein Konto mit diesem Namen."
 
-#: ../src/gnome-utils/dialog-account.c:787
+#: ../src/gnome-utils/dialog-account.c:744
 msgid "You must choose a valid parent account."
 msgstr "Wählen Sie ein gültiges Hauptkonto"
 
-#: ../src/gnome-utils/dialog-account.c:795
+#: ../src/gnome-utils/dialog-account.c:752
 msgid "You must select an account type."
 msgstr "Wählen Sie eine Kontoart"
 
-#: ../src/gnome-utils/dialog-account.c:805
+#: ../src/gnome-utils/dialog-account.c:761
+msgid ""
+"The selected account type is incompatible with the one of the selected "
+"parent."
+msgstr ""
+"Die gewählte Kontoart passt nicht zu der Kontoart des Hauptkontos von diesem "
+"Konto."
+
+#: ../src/gnome-utils/dialog-account.c:772
 msgid "You must choose a commodity."
 msgstr "Sie müssen eine Währung/Aktie auswählen."
 
-#: ../src/gnome-utils/dialog-account.c:928
+#: ../src/gnome-utils/dialog-account.c:824
 msgid "You must enter a valid opening balance or leave it blank."
 msgstr ""
 "Sie müssen entweder einen gültigen Anfangsbestand angeben \n"
 "oder das Feld freilassen."
 
-#: ../src/gnome-utils/dialog-account.c:952
+#: ../src/gnome-utils/dialog-account.c:848
 msgid ""
 "You must select a transfer account or choose the opening balances equity "
 "account."
@@ -9135,12 +9326,16 @@
 "Sie müssen ein Herkunftskonto wählen oder das Ausgleichskonto für den "
 "Anfangsbestand benutzen."
 
-#: ../src/gnome-utils/dialog-account.c:1390
+#: ../src/gnome-utils/dialog-account.c:1338
+msgid "Edit Account"
+msgstr "Konto bearbeiten"
+
+#: ../src/gnome-utils/dialog-account.c:1341
 #, c-format
 msgid "(%d) New Accounts"
 msgstr "(%d) Neue Konten"
 
-#: ../src/gnome-utils/dialog-account.c:1897
+#: ../src/gnome-utils/dialog-account.c:1846
 #, c-format
 msgid ""
 "Renumber the immediate sub-accounts of %s?  This will replace the account "
@@ -9149,7 +9344,7 @@
 "Das Unterkonto von %s neu nummerieren?  Dies wird das Kontonummer-Feld von "
 "jedem Unterkonto mit dem entsprechenden neuen Wert überschreiben."
 
-#: ../src/gnome-utils/dialog-commodity.c:161
+#: ../src/gnome-utils/dialog-commodity.c:166
 msgid ""
 "\n"
 "Please select a commodity to match:"
@@ -9157,7 +9352,7 @@
 "\n"
 "Geben Sie eine Währung/Aktie an, die passt:"
 
-#: ../src/gnome-utils/dialog-commodity.c:168
+#: ../src/gnome-utils/dialog-commodity.c:173
 msgid ""
 "\n"
 "Commodity: "
@@ -9165,7 +9360,7 @@
 "\n"
 "Währung/Aktie: "
 
-#: ../src/gnome-utils/dialog-commodity.c:170
+#: ../src/gnome-utils/dialog-commodity.c:175
 msgid ""
 "\n"
 "Exchange code (CUSIP or similar): "
@@ -9173,7 +9368,7 @@
 "\n"
 "Tickersymbol (CUSIP oder ähnliches): "
 
-#: ../src/gnome-utils/dialog-commodity.c:172
+#: ../src/gnome-utils/dialog-commodity.c:177
 msgid ""
 "\n"
 "Mnemonic(Ticker symbol or similar): "
@@ -9181,57 +9376,57 @@
 "\n"
 "Abkürzung/Tickersymbol: "
 
-#: ../src/gnome-utils/dialog-commodity.c:259
+#: ../src/gnome-utils/dialog-commodity.c:269
 msgid "Select security/currency"
 msgstr "Bitte wählen Sie die Aktie/Währung"
 
-#: ../src/gnome-utils/dialog-commodity.c:263
+#: ../src/gnome-utils/dialog-commodity.c:273
 msgid "Select security"
 msgstr "Bitte wählen Sie die Aktie"
 
-#: ../src/gnome-utils/dialog-commodity.c:268
+#: ../src/gnome-utils/dialog-commodity.c:278
 msgid "Select currency"
 msgstr "Bitte wählen Sie die Währung"
 
-#: ../src/gnome-utils/dialog-commodity.c:487
+#: ../src/gnome-utils/dialog-commodity.c:510
 msgid "You must select a commodity. To create a new one, click \"New\""
 msgstr ""
 "Sie müssen eine Währung/Aktie auswählen. Wenn Sie eine neue anlegen möchten, "
 "klicken Sie auf »Neu«."
 
-#: ../src/gnome-utils/dialog-commodity.c:812
+#: ../src/gnome-utils/dialog-commodity.c:841
 msgid "Use local time"
 msgstr "Lokale Zeit benutzen"
 
-#: ../src/gnome-utils/dialog-commodity.c:935
+#: ../src/gnome-utils/dialog-commodity.c:955
 msgid "Edit currency"
 msgstr "Währung bearbeiten"
 
-#: ../src/gnome-utils/dialog-commodity.c:936
+#: ../src/gnome-utils/dialog-commodity.c:956
 msgid "Currency Information"
 msgstr "Währungsinformationen"
 
-#: ../src/gnome-utils/dialog-commodity.c:939
+#: ../src/gnome-utils/dialog-commodity.c:959
 msgid "Edit security"
 msgstr "Aktie bearbeiten"
 
-#: ../src/gnome-utils/dialog-commodity.c:939
+#: ../src/gnome-utils/dialog-commodity.c:959
 msgid "New security"
 msgstr "Neue Aktie/Währung"
 
-#: ../src/gnome-utils/dialog-commodity.c:940
+#: ../src/gnome-utils/dialog-commodity.c:960
 msgid "Security Information"
 msgstr "Aktieninformationen"
 
-#: ../src/gnome-utils/dialog-commodity.c:1184
+#: ../src/gnome-utils/dialog-commodity.c:1206
 msgid "You may not create a new national currency."
 msgstr "Sie können keine neue nationale Währung erstellen."
 
-#: ../src/gnome-utils/dialog-commodity.c:1196
+#: ../src/gnome-utils/dialog-commodity.c:1218
 msgid "That commodity already exists."
 msgstr "Diese Währung/Aktie existiert bereits."
 
-#: ../src/gnome-utils/dialog-commodity.c:1238
+#: ../src/gnome-utils/dialog-commodity.c:1261
 msgid ""
 "You must enter a non-empty \"Full name\", \"Symbol/abbreviation\", and \"Type"
 "\" for the commodity."
@@ -9239,70 +9434,65 @@
 "Sie müssen in den Feldern »Voller Name«, »Symbol/Abkürzung« und »Typ« für "
 "die Währung/Aktie etwas angeben."
 
-#: ../src/gnome-utils/dialog-options.c:885
+#: ../src/gnome-utils/dialog-options.c:872
 msgid "Select all accounts."
 msgstr "Alle Konten auswählen."
 
-#: ../src/gnome-utils/dialog-options.c:890
-#: ../src/gnome-utils/dialog-options.c:1017
+#: ../src/gnome-utils/dialog-options.c:877
+#: ../src/gnome-utils/dialog-options.c:995
 msgid "Clear All"
 msgstr "Keine auswählen"
 
-#: ../src/gnome-utils/dialog-options.c:892
+#: ../src/gnome-utils/dialog-options.c:879
 msgid "Clear the selection and unselect all accounts."
 msgstr "Auswahl löschen und gar keine Konten auswählen."
 
-#: ../src/gnome-utils/dialog-options.c:898
-#: ../src/gnome-utils/dialog-options.c:1024
+#: ../src/gnome-utils/dialog-options.c:885
+#: ../src/gnome-utils/dialog-options.c:1002
 msgid "Select Default"
 msgstr "Voreinstellung"
 
-#: ../src/gnome-utils/dialog-options.c:900
+#: ../src/gnome-utils/dialog-options.c:887
 msgid "Select the default account selection."
 msgstr "Die voreingestellte Kontenauswahl auswählen."
 
-#: ../src/gnome-utils/dialog-options.c:1012
+#: ../src/gnome-utils/dialog-options.c:990
 msgid "Select all entries."
 msgstr "Alle Einträge auswählen."
 
-#: ../src/gnome-utils/dialog-options.c:1019
+#: ../src/gnome-utils/dialog-options.c:997
 msgid "Clear the selection and unselect all entries."
 msgstr "Auswahl löschen und gar keine Einträge auswählen."
 
-#: ../src/gnome-utils/dialog-options.c:1026
+#: ../src/gnome-utils/dialog-options.c:1004
 msgid "Select the default selection."
 msgstr "Die voreingestellte Auswahl auswählen."
 
 #. The reset button on each option page
-#: ../src/gnome-utils/dialog-options.c:1178
+#: ../src/gnome-utils/dialog-options.c:1156
 msgid "Defaults"
 msgstr "Voreinstellung"
 
-#: ../src/gnome-utils/dialog-options.c:1180
+#: ../src/gnome-utils/dialog-options.c:1158
 msgid "Reset all values to their defaults."
 msgstr "Alle Werte auf ihre Voreinstellung zurücksetzen."
 
-#: ../src/gnome-utils/dialog-options.c:2038
+#: ../src/gnome-utils/dialog-options.c:1998
 msgid "Clear"
 msgstr "Zurücksetzen"
 
-#: ../src/gnome-utils/dialog-options.c:2039
+#: ../src/gnome-utils/dialog-options.c:1999
 msgid "Clear any selected image file."
 msgstr "Auswahl der Bilddatei wieder löschen."
 
-#: ../src/gnome-utils/dialog-options.c:2042
+#: ../src/gnome-utils/dialog-options.c:2001
 msgid "Select image"
 msgstr "Bild auswählen"
 
-#: ../src/gnome-utils/dialog-options.c:2044
-#: ../src/gnome-utils/dialog-options.c:2060
+#: ../src/gnome-utils/dialog-options.c:2003
 msgid "Select an image file."
 msgstr "Bilddatei auswählen."
 
-#: ../src/gnome-utils/dialog-options.c:2058
-msgid "Select pixmap"
-msgstr "Bild auswählen"
-
 #. Translators: Both %s will be the account separator character; the
 #. resulting string is a demonstration how the account separator
 #. character will look like. You can replace these three account
@@ -9314,11 +9504,11 @@
 msgid "Income%sSalary%sTaxable"
 msgstr "Erträge%sEinkommen%szu versteuern"
 
-#: ../src/gnome-utils/dialog-transfer.c:448
+#: ../src/gnome-utils/dialog-transfer.c:449
 msgid "Show the income and expense accounts"
 msgstr "Anzeige der Ertrags- und Aufwand-Konten"
 
-#: ../src/gnome-utils/dialog-transfer.c:1356
+#: ../src/gnome-utils/dialog-transfer.c:1357
 msgid ""
 "You must specify an account to transfer from, or to, or both, for this "
 "transaction. Otherwise, it will not be recorded."
@@ -9326,11 +9516,11 @@
 "Sie müssen ein Konto angeben, zu dem oder von dem umgebucht werden soll. "
 "Andernfalls wird kein Buchungssatz gespeichert."
 
-#: ../src/gnome-utils/dialog-transfer.c:1366
+#: ../src/gnome-utils/dialog-transfer.c:1367
 msgid "You can't transfer from and to the same account!"
 msgstr "Herkunfts- und Zielkonto können nicht identisch sein."
 
-#: ../src/gnome-utils/dialog-transfer.c:1392
+#: ../src/gnome-utils/dialog-transfer.c:1393
 msgid ""
 "You can't transfer from a non-currency account.  Try reversing the \"from\" "
 "and \"to\" accounts and making the \"amount\" negative."
@@ -9339,56 +9529,56 @@
 "normaler Währung. Sie sollten Sie die Von/Nach-Konten vertauschen und den "
 "Betrag negativ eingeben."
 
-#: ../src/gnome-utils/dialog-transfer.c:1417
+#: ../src/gnome-utils/dialog-transfer.c:1418
 msgid "You must enter an amount to transfer."
 msgstr "Sie müssen einen Betrag angeben."
 
-#: ../src/gnome-utils/dialog-transfer.c:1432
+#: ../src/gnome-utils/dialog-transfer.c:1433
 msgid "You must enter a valid price."
 msgstr "Sie müssen einen gültigen Preis angeben."
 
-#: ../src/gnome-utils/dialog-transfer.c:1444
+#: ../src/gnome-utils/dialog-transfer.c:1445
 msgid "You must enter a valid `to' amount."
 msgstr "Sie müssen einen gültigen Betrag eingeben."
 
-#: ../src/gnome-utils/dialog-transfer.c:1738
+#: ../src/gnome-utils/dialog-transfer.c:1740
 msgid "Debit Account"
 msgstr "Sollkonto"
 
-#: ../src/gnome-utils/dialog-transfer.c:1755
+#: ../src/gnome-utils/dialog-transfer.c:1757
 msgid "Transfer From"
 msgstr "Herkunftskonto"
 
-#: ../src/gnome-utils/dialog-transfer.c:1759
+#: ../src/gnome-utils/dialog-transfer.c:1761
 msgid "Transfer To"
 msgstr "Buchen nach"
 
-#: ../src/gnome-utils/dialog-transfer.c:1820
+#: ../src/gnome-utils/dialog-transfer.c:1822
 msgid "Debit Amount:"
 msgstr "Soll Betrag:"
 
-#: ../src/gnome-utils/dialog-transfer.c:1824
-#: ../src/gnome-utils/glade/transfer.glade.h:14
+#: ../src/gnome-utils/dialog-transfer.c:1826
+#: ../src/gnome-utils/glade/transfer.glade.h:13
 msgid "To Amount:"
 msgstr "zum Betrag:"
 
-#: ../src/gnome-utils/dialog-utils.c:959
+#: ../src/gnome-utils/dialog-utils.c:955
 msgid "Remember and don't _ask me again."
 msgstr "_Antwort speichern und nicht wieder anzeigen."
 
-#: ../src/gnome-utils/dialog-utils.c:960
+#: ../src/gnome-utils/dialog-utils.c:956
 msgid "Don't _tell me again."
 msgstr "_Nicht wieder anzeigen."
 
-#: ../src/gnome-utils/dialog-utils.c:963
+#: ../src/gnome-utils/dialog-utils.c:959
 msgid "Remember and don't ask me again this _session."
 msgstr "Antwort speichern und in _dieser Sitzung nicht wieder anzeigen."
 
-#: ../src/gnome-utils/dialog-utils.c:964
+#: ../src/gnome-utils/dialog-utils.c:960
 msgid "Don't tell me again this _session."
 msgstr "In dieser _Sitzung nicht wieder anzeigen."
 
-#: ../src/gnome-utils/druid-gconf-setup.c:403
+#: ../src/gnome-utils/druid-gconf-setup.c:409
 msgid ""
 "When you click Apply, GnuCash will modify your ~/.gconf.path file and "
 "restart the gconf backend."
@@ -9396,7 +9586,7 @@
 "Wenn Sie »Anwenden« klicken, wird GnuCash Ihre ~/.gconf.path Datei anpassen "
 "und den gconf-Server neu starten."
 
-#: ../src/gnome-utils/druid-gconf-setup.c:406
+#: ../src/gnome-utils/druid-gconf-setup.c:412
 #, c-format
 msgid ""
 "When you click Apply, GnuCash will install the gconf data into your local ~/."
@@ -9407,7 +9597,7 @@
 "gconf Datei schreiben und den gconf-Server neu starten. Das Skript %s muss "
 "dazu in Ihrem Suchpfad zu finden sein, damit dies korrekt funktioniert."
 
-#: ../src/gnome-utils/druid-gconf-setup.c:410
+#: ../src/gnome-utils/druid-gconf-setup.c:416
 msgid ""
 "You have chosen to correct the problem by yourself.  When you click Apply, "
 "GnuCash will exit.  Please correct the problem and restart the gconf backend "
@@ -9421,7 +9611,7 @@
 "dem Kommando »gconftool-2 --shutdown«. Sie können noch den Knopf »Zurück« "
 "klicken, um den notwendigen Text zu kopieren."
 
-#: ../src/gnome-utils/druid-gconf-setup.c:416
+#: ../src/gnome-utils/druid-gconf-setup.c:422
 #, c-format
 msgid ""
 "You have chosen to correct the problem by yourself.  When you click Apply, "
@@ -9432,7 +9622,7 @@
 "klicken, wird sich GnuCash beenden. Bitte starten Sie das Skript %s was die "
 "notwendigen Daten schreibt und den gconf-Server neu startet."
 
-#: ../src/gnome-utils/druid-gconf-setup.c:420
+#: ../src/gnome-utils/druid-gconf-setup.c:426
 msgid ""
 "You have already corrected the problem and restarted the gconf backend with "
 "the command 'gconftool-2 --shutdown'.  When you click Apply, GnuCash will "
@@ -9444,21 +9634,24 @@
 
 #: ../src/gnome-utils/druid-gnc-xml-import.c:189
 msgid ""
-"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"
+"The file you are trying to load is from an older version of GnuCash. The "
+"file format in the older versions was missing the detailed specification of "
+"the character encoding being used. This means the text in your data file "
+"could be read in multiple ambiguous ways. This ambiguity cannot be resolved "
+"automatically, but the new GnuCash 2.0.0 file format will include all "
+"necessary specifications so that you do not have to go through this step "
+"again.\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"
+"GnuCash will try to guess the correct character encoding for your data file. "
+"On the next page GnuCash will show the resulting texts when using this "
+"guess. You have to check whether the words look as expected. Either "
+"everything looks fine and you can simply press 'Forward'. Or the words "
+"contain unexpected characters, in which case you should select different "
+"character encodings to see different results. You may have to edit the list "
+"of character encodings by clicking on the respective button.\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."
+"Press 'Forward' now to select the correct character encoding for your data "
+"file."
 msgstr ""
 "Die zu öffnende Datei enthält keine Angaben zu der verwendeten "
 "Zeichenkodierung. Dies ist bei allen Dateien der GnuCash-Version 1.9 oder "
@@ -9482,11 +9675,11 @@
 "\n"
 "Klicken Sie nun »Vor«."
 
-#: ../src/gnome-utils/druid-gnc-xml-import.c:203
-msgid "Missing file encoding"
+#: ../src/gnome-utils/druid-gnc-xml-import.c:209
+msgid "Ambiguous character encoding"
 msgstr "Zeichenkodierung der Datei unbekannt"
 
-#: ../src/gnome-utils/druid-gnc-xml-import.c:206
+#: ../src/gnome-utils/druid-gnc-xml-import.c:212
 msgid ""
 "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 "
@@ -9500,153 +9693,153 @@
 "\n"
 "Wenn Sie die Einstellungen noch ändern möchten, können Sie »Zurück« klicken."
 
-#: ../src/gnome-utils/druid-gnc-xml-import.c:228
+#: ../src/gnome-utils/druid-gnc-xml-import.c:234
 msgid "Unicode"
 msgstr "Unicode"
 
-#: ../src/gnome-utils/druid-gnc-xml-import.c:230
+#: ../src/gnome-utils/druid-gnc-xml-import.c:236
 msgid "European"
 msgstr "Europäisch"
 
-#: ../src/gnome-utils/druid-gnc-xml-import.c:231
+#: ../src/gnome-utils/druid-gnc-xml-import.c:237
 msgid "ISO-8859-1 (West European)"
 msgstr "ISO-8859-1 (Westeuropäisch)"
 
-#: ../src/gnome-utils/druid-gnc-xml-import.c:232
+#: ../src/gnome-utils/druid-gnc-xml-import.c:238
 msgid "ISO-8859-2 (East European)"
 msgstr "ISO-8859-2 (Osteuropäisch)"
 
-#: ../src/gnome-utils/druid-gnc-xml-import.c:233
+#: ../src/gnome-utils/druid-gnc-xml-import.c:239
 msgid "ISO-8859-3 (South European)"
 msgstr "ISO-8859-3 (Südeuropäisch)"
 
-#: ../src/gnome-utils/druid-gnc-xml-import.c:234
+#: ../src/gnome-utils/druid-gnc-xml-import.c:240
 msgid "ISO-8859-4 (North European)"
 msgstr "ISO-8859-4 (Nordeuropäisch)"
 
-#: ../src/gnome-utils/druid-gnc-xml-import.c:235
+#: ../src/gnome-utils/druid-gnc-xml-import.c:241
 msgid "ISO-8859-5 (Cyrillic)"
 msgstr "ISO-8859-5 (Kyrillisch)"
 
-#: ../src/gnome-utils/druid-gnc-xml-import.c:236
+#: ../src/gnome-utils/druid-gnc-xml-import.c:242
 msgid "ISO-8859-6 (Arabic)"
 msgstr "ISO-8859-6 (Arabisch)"
 
-#: ../src/gnome-utils/druid-gnc-xml-import.c:237
+#: ../src/gnome-utils/druid-gnc-xml-import.c:243
 msgid "ISO-8859-7 (Greek)"
 msgstr "ISO-8859-7 (Griechisch)"
 
-#: ../src/gnome-utils/druid-gnc-xml-import.c:238
+#: ../src/gnome-utils/druid-gnc-xml-import.c:244
 msgid "ISO-8859-8 (Hebrew)"
 msgstr "ISO-8859-8 (Hebräisch)"
 
-#: ../src/gnome-utils/druid-gnc-xml-import.c:239
+#: ../src/gnome-utils/druid-gnc-xml-import.c:245
 msgid "ISO-8859-9 (Turkish)"
 msgstr "ISO-8859-9 (Türkisch)"
 
-#: ../src/gnome-utils/druid-gnc-xml-import.c:240
+#: ../src/gnome-utils/druid-gnc-xml-import.c:246
 msgid "ISO-8859-10 (Nordic)"
 msgstr "ISO-8859-10 (Skandinavisch)"
 
-#: ../src/gnome-utils/druid-gnc-xml-import.c:241
+#: ../src/gnome-utils/druid-gnc-xml-import.c:247
 msgid "ISO-8859-11 (Thai)"
 msgstr "ISO-8859-11 (Thai)"
 
-#: ../src/gnome-utils/druid-gnc-xml-import.c:242
+#: ../src/gnome-utils/druid-gnc-xml-import.c:248
 msgid "ISO-8859-13 (Baltic)"
 msgstr "ISO-8859-13 (Baltisch)"
 
-#: ../src/gnome-utils/druid-gnc-xml-import.c:243
+#: ../src/gnome-utils/druid-gnc-xml-import.c:249
 msgid "ISO-8859-14 (Celtic)"
 msgstr "ISO-8859-14 (Keltisch)"
 
-#: ../src/gnome-utils/druid-gnc-xml-import.c:244
+#: ../src/gnome-utils/druid-gnc-xml-import.c:250
 msgid "ISO-8859-15 (West European, Euro sign)"
 msgstr "ISO-8859-15 (Westeuropäisch, Euro-Zeichen)"
 
-#: ../src/gnome-utils/druid-gnc-xml-import.c:245
+#: ../src/gnome-utils/druid-gnc-xml-import.c:251
 msgid "ISO-8859-16 (South-East European)"
 msgstr "ISO-8859-16 (Südost-Europäisch)"
 
-#: ../src/gnome-utils/druid-gnc-xml-import.c:246
+#: ../src/gnome-utils/druid-gnc-xml-import.c:252
 msgid "Cyrillic"
 msgstr "Kyrillisch"
 
-#: ../src/gnome-utils/druid-gnc-xml-import.c:247
+#: ../src/gnome-utils/druid-gnc-xml-import.c:253
 msgid "KOI8-R (Russian)"
 msgstr "KOI8-R (Russisch)"
 
-#: ../src/gnome-utils/druid-gnc-xml-import.c:248
+#: ../src/gnome-utils/druid-gnc-xml-import.c:254
 msgid "KOI8-U (Ukrainian)"
 msgstr "KOI8-U (Ukraninisch)"
 
 #. 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:571
+#: ../src/gnome-utils/druid-gnc-xml-import.c:577
 msgid "ISO-8859-1 KOI8-U"
 msgstr "ISO-8859-1 ISO-8859-15"
 
 #. another error, cannot handle this here
-#: ../src/gnome-utils/druid-gnc-xml-import.c:692
-#: ../src/gnome-utils/druid-gnc-xml-import.c:711
-msgid "The file could not be reopen."
+#: ../src/gnome-utils/druid-gnc-xml-import.c:698
+#: ../src/gnome-utils/druid-gnc-xml-import.c:717
+msgid "The file could not be reopened."
 msgstr "Die Datei konnte nicht neu geöffnet werden."
 
 #. try to load once again
-#: ../src/gnome-utils/druid-gnc-xml-import.c:699
-#: ../src/gnome-utils/gnc-file.c:746 ../src/gnome-utils/gnc-file.c:758
+#: ../src/gnome-utils/druid-gnc-xml-import.c:705
+#: ../src/gnome-utils/gnc-file.c:748 ../src/gnome-utils/gnc-file.c:760
 msgid "Reading file..."
 msgstr "Datei wird gelesen..."
 
-#: ../src/gnome-utils/druid-gnc-xml-import.c:719
+#: ../src/gnome-utils/druid-gnc-xml-import.c:725
 msgid "Parsing file..."
 msgstr "Datei wird verarbeitet..."
 
-#: ../src/gnome-utils/druid-gnc-xml-import.c:726
+#: ../src/gnome-utils/druid-gnc-xml-import.c:732
 msgid "There was an error parsing the file."
 msgstr "Beim Verarbeiten der Datei ist ein Fehler aufgetreten."
 
-#: ../src/gnome-utils/druid-gnc-xml-import.c:749
-#: ../src/gnome-utils/gnc-file.c:972
+#: ../src/gnome-utils/druid-gnc-xml-import.c:755
+#: ../src/gnome-utils/gnc-file.c:970
 msgid "Writing file..."
 msgstr "Datei wird geschrieben..."
 
-#: ../src/gnome-utils/druid-gnc-xml-import.c:827
+#: ../src/gnome-utils/druid-gnc-xml-import.c:833
 #, c-format
 msgid "There are %d unassigned and %d undecodable words. Please add encodings."
 msgstr ""
 "Es gibt %d nicht zugewiesene und %d nicht dekodierbare Worte. Bitte wählen "
 "Sie jeweils eine Zeichenkodierung aus."
 
-#: ../src/gnome-utils/druid-gnc-xml-import.c:833
+#: ../src/gnome-utils/druid-gnc-xml-import.c:839
 #, c-format
 msgid "There are %d unassigned words. Please decide on them or add encodings."
 msgstr ""
 "Es gibt %d nicht zugewiesene Worte. Bitte wählen Sie jeweils einen der "
 "Wortvorschläge oder wählen eine Zeichenkodierung."
 
-#: ../src/gnome-utils/druid-gnc-xml-import.c:841
+#: ../src/gnome-utils/druid-gnc-xml-import.c:847
 #, c-format
 msgid "There are %d undecodable words. Please add encodings."
 msgstr ""
 "Es gibt %d nicht dekodierbare Worte. Bitte wählen Sie eine Zeichenkodierung "
 "aus."
 
-#: ../src/gnome-utils/druid-gnc-xml-import.c:1029
+#: ../src/gnome-utils/druid-gnc-xml-import.c:1035
 msgid "That GnuCash XML file is already loaded. Please select another file."
 msgstr ""
 "Diese GnuCash-Datei ist bereits geöffnet. Bitte wählen Sie eine andere Datei."
 
-#: ../src/gnome-utils/druid-gnc-xml-import.c:1330
+#: ../src/gnome-utils/druid-gnc-xml-import.c:1336
 msgid "This encoding has been added to the list already."
 msgstr "Diese Zeichenkodierung existiert bereits in der Liste."
 
-#: ../src/gnome-utils/druid-gnc-xml-import.c:1340
+#: ../src/gnome-utils/druid-gnc-xml-import.c:1346
 msgid "This is an invalid encoding."
 msgstr "Dies ist keine gültige Zeichenkodierung."
 
-#: ../src/gnome-utils/druid-gnc-xml-import.c:1475
+#: ../src/gnome-utils/druid-gnc-xml-import.c:1481
 msgid "No files to merge. Please add ones by clicking on 'Load another file'."
 msgstr ""
 "Keine Dateien, die zusammengefügt werden können. Bitte wählen Sie welche, "
@@ -9700,32 +9893,22 @@
 "entsprechen, inklusive Groß/Kleinschreibung."
 
 #: ../src/gnome-utils/glade/commodity.glade.h:8
-msgid ""
-"Enter the type of commodity. For stocks, this is often an exchange on which "
-"the stock is traded. You can choose an existing type from the list or enter "
-"a new type with the keyboard."
-msgstr ""
-"Geben Sie den Typ der Währung/Aktie an. Für Aktien ist dies in der Regel die "
-"Börse, an der die Aktie gehandelt wird. Sie können einen Typ aus der Liste "
-"auswählen oder einen neuen Typ eingeben."
-
-#: ../src/gnome-utils/glade/commodity.glade.h:9
 msgid "F_raction traded:"
 msgstr "_Handelbare Stückelung:"
 
-#: ../src/gnome-utils/glade/commodity.glade.h:10
+#: ../src/gnome-utils/glade/commodity.glade.h:9
 msgid "Select security/currency "
 msgstr "Bitte wählen Sie die Aktie/Währung"
 
-#: ../src/gnome-utils/glade/commodity.glade.h:11
+#: ../src/gnome-utils/glade/commodity.glade.h:10
 msgid "Select user information here..."
 msgstr "Benutzerinformationen hier wählen..."
 
-#: ../src/gnome-utils/glade/commodity.glade.h:12
+#: ../src/gnome-utils/glade/commodity.glade.h:11
 msgid "Si_ngle:"
 msgstr "_Einzel:"
 
-#: ../src/gnome-utils/glade/commodity.glade.h:13
+#: ../src/gnome-utils/glade/commodity.glade.h:12
 msgid ""
 "These are F::Q quote sources that retrieve information from a single site on "
 "the internet.  If that site is unavailable, you will not be able to retrieve "
@@ -9735,7 +9918,7 @@
 "einzigen Webseite im Internet ab. Falls diese Webseite nicht verfügbar ist, "
 "können Sie keine Kurse abrufen."
 
-#: ../src/gnome-utils/glade/commodity.glade.h:14
+#: ../src/gnome-utils/glade/commodity.glade.h:13
 msgid ""
 "These are F::Q quote sources that retrieve information from multiple sites "
 "on the internet.  If one of the sites is unavailable, F::Q will attempt to "
@@ -9745,7 +9928,7 @@
 "Internetseiten ab. Wenn eine Seite nicht verfügbar ist, versucht Finance::"
 "Quote, von den anderen Seiten abzurufen."
 
-#: ../src/gnome-utils/glade/commodity.glade.h:15
+#: ../src/gnome-utils/glade/commodity.glade.h:14
 msgid ""
 "These are quote sources that were recently added to F::Q.  GnuCash does not "
 "know if these sources retrieve information from a single site or from "
@@ -9755,35 +9938,35 @@
 "nicht bekannt, ob diese Kursquellen von einer oder mehreren Internetseiten "
 "ihre Informationen beziehen."
 
-#: ../src/gnome-utils/glade/commodity.glade.h:16
+#: ../src/gnome-utils/glade/commodity.glade.h:15
 msgid "Time_zone:"
 msgstr "_Zeitzone"
 
-#: ../src/gnome-utils/glade/commodity.glade.h:17
+#: ../src/gnome-utils/glade/commodity.glade.h:16
 msgid "Type of quote source:"
 msgstr "Art der Kursabruf-Quelle:"
 
-#: ../src/gnome-utils/glade/commodity.glade.h:18
+#: ../src/gnome-utils/glade/commodity.glade.h:17
 msgid "Warning: Finance::Quote not installed properly."
 msgstr "Warnung: Modul Finance::Quote ist nicht korrekt installiert."
 
-#: ../src/gnome-utils/glade/commodity.glade.h:19
+#: ../src/gnome-utils/glade/commodity.glade.h:18
 msgid "_Full name:"
 msgstr "_Voller Name:"
 
-#: ../src/gnome-utils/glade/commodity.glade.h:20
+#: ../src/gnome-utils/glade/commodity.glade.h:19
 msgid "_Get Online Quotes"
 msgstr "_Börsenkurse online abrufen"
 
-#: ../src/gnome-utils/glade/commodity.glade.h:21
+#: ../src/gnome-utils/glade/commodity.glade.h:20
 msgid "_Multiple:"
 msgstr "_Mehrere Kursquellen"
 
-#: ../src/gnome-utils/glade/commodity.glade.h:22
+#: ../src/gnome-utils/glade/commodity.glade.h:21
 msgid "_Symbol/abbreviation:"
 msgstr "_Symbol/Abkürzung:"
 
-#: ../src/gnome-utils/glade/commodity.glade.h:24
+#: ../src/gnome-utils/glade/commodity.glade.h:23
 msgid "_Unknown:"
 msgstr "_Unbekannt:"
 
@@ -10010,7 +10193,7 @@
 "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."
+"GnuCash Datafile import process."
 msgstr ""
 "Wenn Sie jetzt noch mehr Dateien importieren möchten, klicken Sie bitte "
 "»Eine andere Datei laden«. Das ist insbesondere sinnvoll, wenn Sie Ihre "
@@ -10036,24 +10219,24 @@
 msgstr "Die Liste der Zeichenkodierungen bearbeiten"
 
 #: ../src/gnome-utils/glade/druid-gnc-xml-import.glade.h:12
-msgid "Finish GnuCash XML Import"
+msgid "Finish GnuCash Datafile Import"
 msgstr "GnuCash-Datei Import abschließen"
 
 #: ../src/gnome-utils/glade/druid-gnc-xml-import.glade.h:13
-msgid "GnuCash XML Import Druid"
+msgid "GnuCash Datafile Import Druid"
 msgstr "GnuCash-Datei Import-Assistent"
 
 #: ../src/gnome-utils/glade/druid-gnc-xml-import.glade.h:14
-msgid "GnuCash XML files you have loaded"
+msgid "GnuCash data files you have loaded"
 msgstr "GnuCash-Dateien, die Sie geladen haben"
 
 #: ../src/gnome-utils/glade/druid-gnc-xml-import.glade.h:15
-#: ../src/import-export/qif-import/qif.glade.h:48
+#: ../src/import-export/qif-import/qif.glade.h:42
 msgid "Load another file"
 msgstr "Eine weitere Datei öffnen"
 
 #: ../src/gnome-utils/glade/druid-gnc-xml-import.glade.h:16
-#: ../src/import-export/qif-import/qif.glade.h:94
+#: ../src/import-export/qif-import/qif.glade.h:84
 msgid "Unload selected file"
 msgstr "Gewählte Datei wieder entladen"
 
@@ -10114,37 +10297,37 @@
 msgid "%Y-%m-%d"
 msgstr "%Y-%m-%d"
 
-#: ../src/gnome-utils/glade/gnc-date-format.glade.h:4
+#: ../src/gnome-utils/glade/gnc-date-format.glade.h:3
 msgid "Abbreviation"
 msgstr "Abkürzung"
 
-#: ../src/gnome-utils/glade/gnc-date-format.glade.h:5
+#: ../src/gnome-utils/glade/gnc-date-format.glade.h:4
 msgid "Date format:"
 msgstr "Datumsformat:"
 
-#: ../src/gnome-utils/glade/gnc-date-format.glade.h:6
+#: ../src/gnome-utils/glade/gnc-date-format.glade.h:5
 msgid "December 31, 2000"
 msgstr "December 31, 2000"
 
-#: ../src/gnome-utils/glade/gnc-date-format.glade.h:7
-#: ../src/import-export/generic-import.glade.h:32
+#: ../src/gnome-utils/glade/gnc-date-format.glade.h:6
+#: ../src/import-export/generic-import.glade.h:28
 msgid "Format:"
 msgstr "Format:"
 
-#: ../src/gnome-utils/glade/gnc-date-format.glade.h:8
+#: ../src/gnome-utils/glade/gnc-date-format.glade.h:7
 msgid "Include Century"
 msgstr "Jahrhundert angeben"
 
-#: ../src/gnome-utils/glade/gnc-date-format.glade.h:9
+#: ../src/gnome-utils/glade/gnc-date-format.glade.h:8
 msgid "Months:"
 msgstr "Monate:"
 
-#: ../src/gnome-utils/glade/gnc-date-format.glade.h:12
-#: ../src/gnome-utils/glade/preferences.glade.h:88
+#: ../src/gnome-utils/glade/gnc-date-format.glade.h:11
+#: ../src/gnome-utils/glade/preferences.glade.h:96
 msgid "Sample:"
 msgstr "Beispiel:"
 
-#: ../src/gnome-utils/glade/gnc-date-format.glade.h:13
+#: ../src/gnome-utils/glade/gnc-date-format.glade.h:12
 msgid ""
 "US (12/31/2001)\n"
 "UK (31/12/2001)\n"
@@ -10162,7 +10345,7 @@
 "Länderspezifisch (Locale)\n"
 "Benutzerdefiniert\n"
 
-#: ../src/gnome-utils/glade/gnc-date-format.glade.h:21
+#: ../src/gnome-utils/glade/gnc-date-format.glade.h:20
 msgid "Years:"
 msgstr "Jahre:"
 
@@ -10187,20 +10370,20 @@
 msgstr "Mit 'Eingabe' gehen Sie zur leeren Buchung"
 
 #: ../src/gnome-utils/glade/preferences.glade.h:2
-msgid "07/31/05"
-msgstr "07/31/05"
+msgid "07/31/2005"
+msgstr "07/31/2005"
 
 #: ../src/gnome-utils/glade/preferences.glade.h:3
 msgid "2005-07-31"
 msgstr "2005-07-31"
 
 #: ../src/gnome-utils/glade/preferences.glade.h:4
-msgid "31.07.05"
-msgstr "31.07.05"
+msgid "31.07.2005"
+msgstr "31.07.2005"
 
 #: ../src/gnome-utils/glade/preferences.glade.h:5
-msgid "31/07/05"
-msgstr "31/07/05"
+msgid "31/07/2005"
+msgstr "31/07/2005"
 
 #: ../src/gnome-utils/glade/preferences.glade.h:6
 #: ../src/import-export/generic-import.glade.h:5
@@ -10208,102 +10391,112 @@
 msgstr "<b>Aktionen</b>"
 
 #: ../src/gnome-utils/glade/preferences.glade.h:7
+#, fuzzy
+msgid "<b>Close Button</b>"
+msgstr "<b>Farben</b>"
+
+#: ../src/gnome-utils/glade/preferences.glade.h:8
 msgid "<b>Date Format</b>"
 msgstr "<b>Datum</b>"
 
-#: ../src/gnome-utils/glade/preferences.glade.h:8
+#: ../src/gnome-utils/glade/preferences.glade.h:9
 msgid "<b>Default Currency</b>"
 msgstr "<b>Standardwährung</b>"
 
-#: ../src/gnome-utils/glade/preferences.glade.h:9
+#: ../src/gnome-utils/glade/preferences.glade.h:10
 msgid "<b>Default Report Currency</b>"
 msgstr "<b>Standardwährung für Berichte</b>"
 
-#: ../src/gnome-utils/glade/preferences.glade.h:10
+#: ../src/gnome-utils/glade/preferences.glade.h:11
 msgid "<b>Default Style</b>"
 msgstr "<b>Voreinstellung Buchungsansicht</b>"
 
-#: ../src/gnome-utils/glade/preferences.glade.h:11
+#: ../src/gnome-utils/glade/preferences.glade.h:12
 msgid "<b>End Date</b>"
 msgstr "<b>Enddatum</b>"
 
-#: ../src/gnome-utils/glade/preferences.glade.h:12
+#: ../src/gnome-utils/glade/preferences.glade.h:13
 msgid "<b>Fancy Date Format</b>"
 msgstr "<b>Ausführliches Datumsformat</b>"
 
-#: ../src/gnome-utils/glade/preferences.glade.h:13
+#: ../src/gnome-utils/glade/preferences.glade.h:14
 msgid "<b>Files</b>"
 msgstr "<b>Dateien</b>"
 
-#: ../src/gnome-utils/glade/preferences.glade.h:14
+#: ../src/gnome-utils/glade/preferences.glade.h:15
 msgid "<b>General</b>"
 msgstr "<b>Allgemein</b>"
 
-#: ../src/gnome-utils/glade/preferences.glade.h:15
+#: ../src/gnome-utils/glade/preferences.glade.h:16
 msgid "<b>Graphics</b>"
 msgstr "<b>Grafik</b>"
 
-#: ../src/gnome-utils/glade/preferences.glade.h:16
+#: ../src/gnome-utils/glade/preferences.glade.h:17
 msgid "<b>Labels</b>"
 msgstr "<b>Beschriftungen</b>"
 
-#: ../src/gnome-utils/glade/preferences.glade.h:17
+#: ../src/gnome-utils/glade/preferences.glade.h:18
 msgid "<b>Location</b>"
 msgstr "<b>Position</b>"
 
-#: ../src/gnome-utils/glade/preferences.glade.h:18
+#: ../src/gnome-utils/glade/preferences.glade.h:19
 msgid "<b>Numbers</b>"
 msgstr "<b>Zahlen</b>"
 
-#: ../src/gnome-utils/glade/preferences.glade.h:19
+#: ../src/gnome-utils/glade/preferences.glade.h:20
 msgid "<b>Other Defaults</b>"
 msgstr "<b>Andere Voreinstellungen</b>"
 
-#: ../src/gnome-utils/glade/preferences.glade.h:20
+#: ../src/gnome-utils/glade/preferences.glade.h:21
 msgid "<b>Reconciling</b>"
 msgstr "<b>Kontenabgleich</b>"
 
-#: ../src/gnome-utils/glade/preferences.glade.h:21
+#: ../src/gnome-utils/glade/preferences.glade.h:22
 msgid "<b>Reverse Balanced Accounts</b>"
 msgstr "<b>Betrags-Vorzeichen umkehren für Kontentypen</b>"
 
-#: ../src/gnome-utils/glade/preferences.glade.h:22
+#: ../src/gnome-utils/glade/preferences.glade.h:23
 msgid "<b>Search Dialog</b>"
 msgstr "<b>Such-Dialog</b>"
 
-#: ../src/gnome-utils/glade/preferences.glade.h:23
+#: ../src/gnome-utils/glade/preferences.glade.h:24
 msgid "<b>Separator Character</b>"
 msgstr "<b>Trennzeichen</b>"
 
-#: ../src/gnome-utils/glade/preferences.glade.h:24
+#: ../src/gnome-utils/glade/preferences.glade.h:25
 msgid "<b>Start Date</b>"
 msgstr "<b>Anfangsdatum</b>"
 
-#: ../src/gnome-utils/glade/preferences.glade.h:25
+#: ../src/gnome-utils/glade/preferences.glade.h:26
 msgid "<b>Summarybar Content</b>"
 msgstr "<b>Inhalt Zusammenfassungsleiste</b>"
 
-#: ../src/gnome-utils/glade/preferences.glade.h:26
+#: ../src/gnome-utils/glade/preferences.glade.h:27
+#, fuzzy
+msgid "<b>Tab Position</b>"
+msgstr "<b>Buchungen</b>"
+
+#: ../src/gnome-utils/glade/preferences.glade.h:28
 msgid "<b>Time Format</b>"
 msgstr "<b>Zeit</b>"
 
-#: ../src/gnome-utils/glade/preferences.glade.h:27
+#: ../src/gnome-utils/glade/preferences.glade.h:29
 msgid "<b>Toolbar Style</b>"
 msgstr "<b>Werkzeugleiste</b>"
 
-#: ../src/gnome-utils/glade/preferences.glade.h:28
+#: ../src/gnome-utils/glade/preferences.glade.h:30
 msgid "<b>Window Geometry</b>"
 msgstr "<b>Fenster-Einstellungen</b>"
 
-#: ../src/gnome-utils/glade/preferences.glade.h:29
+#: ../src/gnome-utils/glade/preferences.glade.h:31
 msgid "Ab_solute:"
 msgstr "Ab_solut:"
 
-#: ../src/gnome-utils/glade/preferences.glade.h:30
+#: ../src/gnome-utils/glade/preferences.glade.h:32
 msgid "Accounting Period"
 msgstr "Buchführungsperioden"
 
-#: ../src/gnome-utils/glade/preferences.glade.h:32
+#: ../src/gnome-utils/glade/preferences.glade.h:34
 msgid ""
 "After reconciling a credit card statement, prompt the user to enter a credit "
 "card payment."
@@ -10311,13 +10504,13 @@
 "Nach Abgleich einer Kreditkartenrechnung eine Ãœberweisung zum Bezahlen "
 "vorschlagen."
 
-#: ../src/gnome-utils/glade/preferences.glade.h:33
+#: ../src/gnome-utils/glade/preferences.glade.h:35
 msgid "All transactions are expanded to show all splits."
 msgstr ""
 "Alle Buchungen werden vollständig angezeigt, so dass alle Buchungszeilen "
 "sichtbar sind."
 
-#: ../src/gnome-utils/glade/preferences.glade.h:34
+#: ../src/gnome-utils/glade/preferences.glade.h:36
 msgid ""
 "Alternate the primary and secondary colors by transaction instead of by "
 "alternating by row."
@@ -10325,15 +10518,15 @@
 "Im Zweizeilenstil Farben nur mit jedem Buchungssatz abwechseln, anstatt mit "
 "jeder Zeile."
 
-#: ../src/gnome-utils/glade/preferences.glade.h:35
+#: ../src/gnome-utils/glade/preferences.glade.h:37
 msgid "Automatic _interest transfer"
 msgstr "Automatische _Zinsbuchungen"
 
-#: ../src/gnome-utils/glade/preferences.glade.h:36
+#: ../src/gnome-utils/glade/preferences.glade.h:38
 msgid "Automatic credit card _payment"
 msgstr "Automatische _Kreditkartenbezahlungen"
 
-#: ../src/gnome-utils/glade/preferences.glade.h:37
+#: ../src/gnome-utils/glade/preferences.glade.h:39
 msgid ""
 "Automatically expand the current transaction to show all splits.  All other "
 "transactions are shown on one line. (Two in double line mode.)"
@@ -10342,7 +10535,7 @@
 "Alle anderen Buchungen werden einzeilig angezeigt. (Bzw. zweizeilig, wenn "
 "die Bemerkung angezeigt werden soll.)"
 
-#: ../src/gnome-utils/glade/preferences.glade.h:38
+#: ../src/gnome-utils/glade/preferences.glade.h:40
 msgid ""
 "Automatically insert a decimal point into values that are entered without "
 "one."
@@ -10350,115 +10543,140 @@
 "Automatisches Einfügen eines Kommas, sobald Werte ohne Komma eingegeben "
 "werden. (Z.B. '2000' wird zu '20,00'.)"
 
-#: ../src/gnome-utils/glade/preferences.glade.h:39
+#: ../src/gnome-utils/glade/preferences.glade.h:41
 msgid "Automatically raise the list of accounts or actions during input."
 msgstr ""
 "Automatisches Öffnen der Konten- oder Auswahlliste während der Eingabe."
 
-#: ../src/gnome-utils/glade/preferences.glade.h:40
+#: ../src/gnome-utils/glade/preferences.glade.h:42
+#, fuzzy
+msgid "B_ottom"
+msgstr "_Drehung"
+
+#: ../src/gnome-utils/glade/preferences.glade.h:43
 msgid "C_redit accounts"
 msgstr "_Habenkonten"
 
-#: ../src/gnome-utils/glade/preferences.glade.h:41
+#: ../src/gnome-utils/glade/preferences.glade.h:44
 msgid "Ch_oose:"
 msgstr "_Auswahl:"
 
-#: ../src/gnome-utils/glade/preferences.glade.h:42
+#: ../src/gnome-utils/glade/preferences.glade.h:45
 msgid "Character:"
 msgstr "Zeichen:"
 
-#: ../src/gnome-utils/glade/preferences.glade.h:43
+#: ../src/gnome-utils/glade/preferences.glade.h:46
 msgid "Check cleared _transactions"
 msgstr "Bestätigte Buchungen automatisch abgleichen"
 
-#: ../src/gnome-utils/glade/preferences.glade.h:44
+#: ../src/gnome-utils/glade/preferences.glade.h:47
 msgid "Com_press files"
 msgstr "Datei _komprimieren"
 
-#: ../src/gnome-utils/glade/preferences.glade.h:45
+#: ../src/gnome-utils/glade/preferences.glade.h:48
 msgid "Compress the data file with gzip when saving it to disk."
 msgstr "Die Datei mit den Kontodaten mit gzip komprimiert speichern."
 
-#: ../src/gnome-utils/glade/preferences.glade.h:46
+#: ../src/gnome-utils/glade/preferences.glade.h:49
 msgid "Date/Time"
 msgstr "Datum und Zeit"
 
-#: ../src/gnome-utils/glade/preferences.glade.h:48
+#: ../src/gnome-utils/glade/preferences.glade.h:51
 msgid "Delete old log/backup files after this many days (0 = never)."
 msgstr "Alte Log/Sicherungsdateien nach so vielen Tagen löschen (0 = niemals)."
 
-#: ../src/gnome-utils/glade/preferences.glade.h:49
+#: ../src/gnome-utils/glade/preferences.glade.h:52
 msgid "Display \"_tip of the day\" dialog"
 msgstr "Anzeigen des »Tipp des Tages«"
 
-#: ../src/gnome-utils/glade/preferences.glade.h:50
+#: ../src/gnome-utils/glade/preferences.glade.h:53
 msgid "Display hints for using GnuCash at startup"
 msgstr "Anzeigen von Hinweisen beim Start von GnuCash"
 
-#: ../src/gnome-utils/glade/preferences.glade.h:51
+#: ../src/gnome-utils/glade/preferences.glade.h:54
 msgid "Display ne_gative amounts in red"
 msgstr "Negative Beträge in rot anzeigen"
 
-#: ../src/gnome-utils/glade/preferences.glade.h:53
+#: ../src/gnome-utils/glade/preferences.glade.h:56
+#, fuzzy
+msgid "Display the notebook tabs at the bottom of the window."
+msgstr "Zur freien Zeile am Ende dieser Rechnung gehen"
+
+#: ../src/gnome-utils/glade/preferences.glade.h:57
+msgid "Display the notebook tabs at the left of the window."
+msgstr ""
+
+#: ../src/gnome-utils/glade/preferences.glade.h:58
+msgid "Display the notebook tabs at the right of the window."
+msgstr ""
+
+#: ../src/gnome-utils/glade/preferences.glade.h:59
+msgid "Display the notebook tabs at the top of the window."
+msgstr ""
+
+#: ../src/gnome-utils/glade/preferences.glade.h:60
 msgid "Display this many rows when a register is created."
 msgstr ""
 "Anzahl der Zeilen, die beim Öffnen eines neuen Kontofensters angezeigt "
 "werden."
 
-#: ../src/gnome-utils/glade/preferences.glade.h:54
+#: ../src/gnome-utils/glade/preferences.glade.h:61
 msgid "Display toolbar items as icons only."
 msgstr "Nur Icons in der Werkzeugleiste anzeigen"
 
-#: ../src/gnome-utils/glade/preferences.glade.h:55
+#: ../src/gnome-utils/glade/preferences.glade.h:62
 msgid "Display toolbar items as text only."
 msgstr "Nur Texte in der Werkzeugleiste anzeigen"
 
-#: ../src/gnome-utils/glade/preferences.glade.h:56
+#: ../src/gnome-utils/glade/preferences.glade.h:63
 msgid ""
 "Display toolbar items with the text label below the icon.  Labels are show "
 "for all items."
 msgstr ""
-"Unterhalb jedes Icons in der Werkzeugleiste seine Beschreibung anzeigen"
+"Unterhalb jedes Icons in der Werkzeugleiste seine Beschreibung anzeigen.  "
+"Beschreibungen werden für alle Icons angezeigt."
 
-#: ../src/gnome-utils/glade/preferences.glade.h:57
+#: ../src/gnome-utils/glade/preferences.glade.h:64
 msgid ""
 "Display toolbar items with the text label beside the icon.  Labels are only "
-"shown for the most frequently used items."
-msgstr "Neben jedem Icon in der Werkzeugleiste seine Beschreibung anzeigen"
+"shown for the most important items."
+msgstr ""
+"Neben jedem Icon in der Werkzeugleiste seine Beschreibung anzeigen.  "
+"Beschreibungen werden aber nur für die wichtigsten Icons angezeigt."
 
-#: ../src/gnome-utils/glade/preferences.glade.h:58
+#: ../src/gnome-utils/glade/preferences.glade.h:65
 msgid "Don't sign reverse any accounts."
 msgstr "Keine Vorzeichenumkehr"
 
-#: ../src/gnome-utils/glade/preferences.glade.h:59
+#: ../src/gnome-utils/glade/preferences.glade.h:66
 msgid "Double _mode colors alternate with transactions"
 msgstr "Zweizeilenstil: Farben abwechselnd pro Buchungssatz"
 
-#: ../src/gnome-utils/glade/preferences.glade.h:60
+#: ../src/gnome-utils/glade/preferences.glade.h:67
 msgid "Draw _vertical lines between columns"
 msgstr "_Vertikale Linien zwischen Spalten zeichnen"
 
-#: ../src/gnome-utils/glade/preferences.glade.h:61
+#: ../src/gnome-utils/glade/preferences.glade.h:68
 msgid "Draw hori_zontal lines between rows"
 msgstr "_Horizontale Linien zwischen Zeilen zeichnen"
 
-#: ../src/gnome-utils/glade/preferences.glade.h:62
+#: ../src/gnome-utils/glade/preferences.glade.h:69
 msgid "Enables support for the European Union EURO currency."
 msgstr "Aktiviert die Unterstützung der Währung EURO"
 
-#: ../src/gnome-utils/glade/preferences.glade.h:64
+#: ../src/gnome-utils/glade/preferences.glade.h:71
 msgid "GnuCash Options"
 msgstr "GnuCash Optionen"
 
-#: ../src/gnome-utils/glade/preferences.glade.h:65
+#: ../src/gnome-utils/glade/preferences.glade.h:72
 msgid "GnuCash Preferences"
 msgstr "GnuCash Einstellungen"
 
-#: ../src/gnome-utils/glade/preferences.glade.h:66
+#: ../src/gnome-utils/glade/preferences.glade.h:73
 msgid "How many automatic decimal places will be filled in."
 msgstr "Wieviele Dezimalstellen automatisch ausgefüllt werden."
 
-#: ../src/gnome-utils/glade/preferences.glade.h:67
+#: ../src/gnome-utils/glade/preferences.glade.h:74
 msgid ""
 "If checked, each register will be opened in its own top level window.  If "
 "clear, the register will be opened in the current window."
@@ -10467,7 +10685,7 @@
 "Wenn nicht aktiviert, wird jedes Kontofenster als Karteikarte im aktuellen "
 "Fenster geöffnet."
 
-#: ../src/gnome-utils/glade/preferences.glade.h:68
+#: ../src/gnome-utils/glade/preferences.glade.h:75
 msgid ""
 "If checked, each report will be opened in its own top level window.  If "
 "clear, the report will be opened in the current window."
@@ -10475,7 +10693,7 @@
 "Falls angeklickt wird jeder Bericht in einem neuen Top-Level-Fenster "
 "angezeigt. Ansonsten wird er in dem aktuellen Fenster geöffnet."
 
-#: ../src/gnome-utils/glade/preferences.glade.h:69
+#: ../src/gnome-utils/glade/preferences.glade.h:76
 msgid ""
 "If checked, non-currency commodities will be shown in the summary bar.  If "
 "clear, only currencies will be shown."
@@ -10483,7 +10701,7 @@
 "Wenn aktiviert, werden Aktien in der Zusammenfassungs-Zeile angezeigt, die "
 "keine Währungen sind. Wenn nicht aktiviert, werden nur Währungen angezeigt."
 
-#: ../src/gnome-utils/glade/preferences.glade.h:70
+#: ../src/gnome-utils/glade/preferences.glade.h:77
 msgid ""
 "If checked, pressing the 'Enter' key will move to the blank transaction at "
 "the bottom of the register.  If clear, pressing the 'Enter' key will move "
@@ -10492,7 +10710,7 @@
 "Wenn aktiviert, nach Drücken von 'Eingabe' zum leeren Buchungssatz gehen. "
 "Ansonsten nur eine Zeile nach unten gehen."
 
-#: ../src/gnome-utils/glade/preferences.glade.h:71
+#: ../src/gnome-utils/glade/preferences.glade.h:78
 msgid ""
 "If checked, the system color theme will be applied to register windows.  If "
 "clear, the original GnuCash register colors will be used."
@@ -10501,35 +10719,35 @@
 "Kontofenstern verwendet. Wenn nicht aktiviert, werden GnuCash-spezifische "
 "Farben in den Kontofenstern verwendet."
 
-#: ../src/gnome-utils/glade/preferences.glade.h:72
+#: ../src/gnome-utils/glade/preferences.glade.h:79
 msgid "Include _grand total"
 msgstr "_Gesamtsumme anzeigen"
 
-#: ../src/gnome-utils/glade/preferences.glade.h:73
+#: ../src/gnome-utils/glade/preferences.glade.h:80
 msgid "Include _non-currency totals"
 msgstr "_Aktien-Gesamtsumme anzeigen"
 
-#: ../src/gnome-utils/glade/preferences.glade.h:74
+#: ../src/gnome-utils/glade/preferences.glade.h:81
 msgid "Loc_ale:"
 msgstr "_Systemeinstellung:"
 
-#: ../src/gnome-utils/glade/preferences.glade.h:75
+#: ../src/gnome-utils/glade/preferences.glade.h:82
 msgid "New search _limit:"
 msgstr "Ergebnisanzahl für Neue Suche:"
 
-#: ../src/gnome-utils/glade/preferences.glade.h:77
+#: ../src/gnome-utils/glade/preferences.glade.h:84
 msgid "Number of _transactions:"
 msgstr "Anzahl Buchungen:"
 
-#: ../src/gnome-utils/glade/preferences.glade.h:78
+#: ../src/gnome-utils/glade/preferences.glade.h:85
 msgid "Perform account list _setup on new file"
 msgstr "Konteneinrichtung bei neuer Datei"
 
-#: ../src/gnome-utils/glade/preferences.glade.h:79
+#: ../src/gnome-utils/glade/preferences.glade.h:86
 msgid "Pre-check cleared transactions when creating a reconcile dialog."
 msgstr "Bestätigte Buchungen automatisch als Abgeglichen markieren."
 
-#: ../src/gnome-utils/glade/preferences.glade.h:80
+#: ../src/gnome-utils/glade/preferences.glade.h:87
 msgid ""
 "Present the new account list dialog when you choose \"New File\" from the "
 "\"File\" menu"
@@ -10537,27 +10755,31 @@
 "Assistent für neue Konteneinrichtung öffnen, wenn »Neue Datei« im Menü "
 "»Datei« gewählt wird"
 
-#: ../src/gnome-utils/glade/preferences.glade.h:82
+#: ../src/gnome-utils/glade/preferences.glade.h:89
+msgid "Priority text besi_de icons"
+msgstr "Text _neben wichtigen Icons"
+
+#: ../src/gnome-utils/glade/preferences.glade.h:90
 msgid "Re_lative:"
 msgstr "Re_lativ:"
 
-#: ../src/gnome-utils/glade/preferences.glade.h:84
+#: ../src/gnome-utils/glade/preferences.glade.h:92
 msgid "Register Defaults"
 msgstr "Voreinstellungen Kontobuch"
 
-#: ../src/gnome-utils/glade/preferences.glade.h:85
+#: ../src/gnome-utils/glade/preferences.glade.h:93
 msgid "Register opens in a new _window"
 msgstr "Kontobuch in neuem Fenster öffnen"
 
-#: ../src/gnome-utils/glade/preferences.glade.h:86
+#: ../src/gnome-utils/glade/preferences.glade.h:94
 msgid "Report opens in a new _window"
 msgstr "Bericht in neuem _Fenster öffnen"
 
-#: ../src/gnome-utils/glade/preferences.glade.h:87
+#: ../src/gnome-utils/glade/preferences.glade.h:95
 msgid "Reports"
 msgstr "Berichte"
 
-#: ../src/gnome-utils/glade/preferences.glade.h:89
+#: ../src/gnome-utils/glade/preferences.glade.h:97
 msgid ""
 "Show a close button on each notebook tab.  These function identically to the "
 "'Close' menu item."
@@ -10565,28 +10787,37 @@
 "Einen Knopf »Schließen« auf jeder Karteikarte anzeigen. Die Schließen-"
 "Funktion kann auch im gleichnamigen Menüpunkt erreicht werden."
 
-#: ../src/gnome-utils/glade/preferences.glade.h:90
+#: ../src/gnome-utils/glade/preferences.glade.h:98
 msgid ""
 "Show a grand total of all accounts converted to the default report currency."
 msgstr ""
 "Gesamtsumme für alle Konten anzeigen, umgerechnet in die voreingestellte "
 "Währung für Berichte."
 
-#: ../src/gnome-utils/glade/preferences.glade.h:91
+#: ../src/gnome-utils/glade/preferences.glade.h:99
 msgid "Show all transactions on one line. (Two in double line mode.)"
 msgstr ""
 "Alle Buchungssätze einzeilig anzeigen. (Zweizeilig, wenn die Bemerkung "
 "angezeigt werden soll.)"
 
-#: ../src/gnome-utils/glade/preferences.glade.h:92
+#: ../src/gnome-utils/glade/preferences.glade.h:100
 msgid "Show close button on _notebook tabs"
 msgstr "Den Knopf »Schließen« bei _Karteikarten-Ansicht anzeigen"
 
-#: ../src/gnome-utils/glade/preferences.glade.h:93
+#: ../src/gnome-utils/glade/preferences.glade.h:101
 msgid "Show horizontal borders on the cells."
 msgstr "Horizontale Begrenzungen anzeigen."
 
-#: ../src/gnome-utils/glade/preferences.glade.h:94
+#: ../src/gnome-utils/glade/preferences.glade.h:102
+msgid "Show splash scree_n"
+msgstr ""
+
+#: ../src/gnome-utils/glade/preferences.glade.h:103
+#, fuzzy
+msgid "Show splash screen at startup."
+msgstr "Tipps beim Programmstart _anzeigen"
+
+#: ../src/gnome-utils/glade/preferences.glade.h:104
 msgid ""
 "Show this many transactions in a register. A value of zero means show all "
 "transactions."
@@ -10594,7 +10825,7 @@
 "Diese Anzahl Buchungen in einem Kontofenster anzeigen. Der Wert Null "
 "bedeutet alle Buchungen."
 
-#: ../src/gnome-utils/glade/preferences.glade.h:95
+#: ../src/gnome-utils/glade/preferences.glade.h:105
 msgid ""
 "Show two lines of information for each transaction instead of one.  Does not "
 "affect expanded transactions."
@@ -10602,32 +10833,28 @@
 "Zwei Zeilen pro Buchung anzeigen anstatt einer. Dies betrifft nicht die "
 "ausgeklappten Buchungen."
 
-#: ../src/gnome-utils/glade/preferences.glade.h:96
+#: ../src/gnome-utils/glade/preferences.glade.h:106
 msgid "Show vertical borders on the cells."
 msgstr "Vertikale Begrenzungen anzeigen."
 
-#: ../src/gnome-utils/glade/preferences.glade.h:97
+#: ../src/gnome-utils/glade/preferences.glade.h:107
 msgid "Sign reverse balances on income and expense accounts."
 msgstr "Ertrags- und Aufwandskonten mit umgekehrten Vorzeichen"
 
-#: ../src/gnome-utils/glade/preferences.glade.h:98
+#: ../src/gnome-utils/glade/preferences.glade.h:108
 msgid ""
 "Sign reverse balances on the following: Credit Card, Payable, Liability, "
 "Equity, and Income."
 msgstr "Passiva-, Eigenkapitals- und Ertragskonten mit umgekehrten Vorzeichen"
 
-#: ../src/gnome-utils/glade/preferences.glade.h:99
+#: ../src/gnome-utils/glade/preferences.glade.h:109
 msgid "Text _below icons"
 msgstr "Text _unter Icons"
 
-#: ../src/gnome-utils/glade/preferences.glade.h:100
-msgid "Text besi_de icons"
-msgstr "Text _neben Icons"
-
-#: ../src/gnome-utils/glade/preferences.glade.h:101
+#: ../src/gnome-utils/glade/preferences.glade.h:110
 msgid ""
-"The character that will be used between components of an account name.  "
-"Legal values are any single non-alphanumeric unicode character, or any of "
+"The character that will be used between components of an account name.  A "
+"legal value is any single character except letters and numbers, or any of "
 "the following strings: \"colon\" \"slash\", \"backslash\", \"dash\" and "
 "\"period\"."
 msgstr ""
@@ -10635,178 +10862,196 @@
 "Zeichen wählen, das kein Buchstabe oder Zahl ist, zum Beispiel »:«, »/« oder "
 "»-«."
 
-#: ../src/gnome-utils/glade/preferences.glade.h:102
+#: ../src/gnome-utils/glade/preferences.glade.h:111
+#, fuzzy
+msgid "To_p"
+msgstr "Bis"
+
+#: ../src/gnome-utils/glade/preferences.glade.h:112
 msgid "Transaction _journal"
 msgstr "Buchungsjournal"
 
-#: ../src/gnome-utils/glade/preferences.glade.h:103
+#: ../src/gnome-utils/glade/preferences.glade.h:113
 msgid "US Dollars (USD)"
 msgstr "US Dollars (USD)"
 
-#: ../src/gnome-utils/glade/preferences.glade.h:104
+#: ../src/gnome-utils/glade/preferences.glade.h:114
 msgid "U_K:"
 msgstr "U_K:"
 
-#: ../src/gnome-utils/glade/preferences.glade.h:105
+#: ../src/gnome-utils/glade/preferences.glade.h:115
 msgid "U_se 24-hour clock"
 msgstr "24-Stunden-_Format"
 
-#: ../src/gnome-utils/glade/preferences.glade.h:106
+#: ../src/gnome-utils/glade/preferences.glade.h:116
 msgid "Use _formal accounting labels"
 msgstr "Buchungsüberschriften aus _Rechnungswesen"
 
-#: ../src/gnome-utils/glade/preferences.glade.h:107
+#: ../src/gnome-utils/glade/preferences.glade.h:117
 msgid "Use a 24 hour (instead of a 12 hour) time format."
 msgstr "24 Stunden-Format statt 12 Stunden-Format"
 
-#: ../src/gnome-utils/glade/preferences.glade.h:108
+#: ../src/gnome-utils/glade/preferences.glade.h:118
 msgid "Use only 'debit' and 'credit' instead of informal synonyms"
 msgstr "Nur 'Soll' und 'Haben' anstatt informeller Bezeichnungen benutzen"
 
-#: ../src/gnome-utils/glade/preferences.glade.h:109
-msgid "Use s_ystem _default"
+#: ../src/gnome-utils/glade/preferences.glade.h:119
+#, fuzzy
+msgid "Use s_ystem default"
 msgstr "_GNOME-Voreinstellung"
 
-#: ../src/gnome-utils/glade/preferences.glade.h:110
-msgid "Use the date format comon in continental Europe."
-msgstr "Das auf dem europäischen Kontinent übliche Datumsformat benutzen"
+#: ../src/gnome-utils/glade/preferences.glade.h:120
+msgid "Use the date format common in continental Europe."
+msgstr "Das auf dem europäischen Kontinent übliche Datumsformat benutzen."
 
-#: ../src/gnome-utils/glade/preferences.glade.h:111
-msgid "Use the date format comon in the United Kingdom."
-msgstr "Das in Großbritannien übliche Datumsformat benutzen"
+#: ../src/gnome-utils/glade/preferences.glade.h:121
+msgid "Use the date format common in the United Kingdom."
+msgstr "Das in Großbritannien übliche Datumsformat benutzen."
 
-#: ../src/gnome-utils/glade/preferences.glade.h:112
-msgid "Use the date format comon in the United States."
+#: ../src/gnome-utils/glade/preferences.glade.h:122
+msgid "Use the date format common in the United States."
 msgstr ""
-"Das in den Vereinigten Staaten von Amerika übliche Datumsformat benutzen"
+"Das in den Vereinigten Staaten von Amerika übliche Datumsformat benutzen."
 
-#: ../src/gnome-utils/glade/preferences.glade.h:113
+#: ../src/gnome-utils/glade/preferences.glade.h:123
 msgid "Use the date format specified by the ISO-8601 standard."
-msgstr "Das in dem ISO-Standard 8601 beschriebene Datumsformat benutzen"
+msgstr "Das in dem ISO-Standard 8601 beschriebene Datumsformat benutzen."
 
-#: ../src/gnome-utils/glade/preferences.glade.h:114
+#: ../src/gnome-utils/glade/preferences.glade.h:124
 msgid "Use the date format specified by the system locale."
-msgstr "Das Datumsformat aus den Systemeinstellungen übernehmen"
+msgstr "Das Datumsformat aus den Systemeinstellungen übernehmen."
 
-#: ../src/gnome-utils/glade/preferences.glade.h:115
+#: ../src/gnome-utils/glade/preferences.glade.h:125
 msgid ""
 "Use the specified absolute ending date for profit/loss calculations.  Also "
 "use this date for net assets calculations."
-msgstr "Absolutes Enddatum für Gewinn/Verlustrechnung und Datum für Bilanz"
+msgstr ""
+"Absolutes Enddatum für Gewinn/Verlustrechnung und Datum für Bilanz.  Ebenso "
+"Enddatum für die Berechnung des Reingewinns."
 
-#: ../src/gnome-utils/glade/preferences.glade.h:116
+#: ../src/gnome-utils/glade/preferences.glade.h:126
 msgid "Use the specified absolute starting date for profit/loss calculations."
-msgstr "Absolutes Anfangsdatum für Gewinn/Verlustrechnung"
+msgstr "Absolutes Anfangsdatum für Gewinn/Verlustrechnung."
 
-#: ../src/gnome-utils/glade/preferences.glade.h:117
+#: ../src/gnome-utils/glade/preferences.glade.h:127
 msgid "Use the specified currency for all newly created accounts."
 msgstr "Standard-Währung für neue Konten."
 
-#: ../src/gnome-utils/glade/preferences.glade.h:118
+#: ../src/gnome-utils/glade/preferences.glade.h:128
 msgid "Use the specified currency for all newly created reports."
 msgstr "Standard-Währung für neue Berichte."
 
-#: ../src/gnome-utils/glade/preferences.glade.h:119
+#: ../src/gnome-utils/glade/preferences.glade.h:129
 msgid ""
 "Use the specified relative ending date for profit/loss calculations.  Also "
 "use this date for net assets calculations."
 msgstr "Relatives Enddatum für Gewinn/Verlustrechnung und Datum für Bilanz"
 
-#: ../src/gnome-utils/glade/preferences.glade.h:120
+#: ../src/gnome-utils/glade/preferences.glade.h:130
 msgid "Use the specified relative starting date for profit/loss calculations."
 msgstr "Relatives Anfangsdatum für Gewinn/Verlustrechnung"
 
-#: ../src/gnome-utils/glade/preferences.glade.h:121
+#: ../src/gnome-utils/glade/preferences.glade.h:131
 msgid "Use the system locale currency for all newly created accounts."
 msgstr "Die systemweit voreingestellte Währung für neue Konten benutzen."
 
-#: ../src/gnome-utils/glade/preferences.glade.h:122
+#: ../src/gnome-utils/glade/preferences.glade.h:132
 msgid "Use the system locale currency for all newly created reports."
 msgstr "Die systemweit voreingestellte Währung für neue Berichte benutzen."
 
-#: ../src/gnome-utils/glade/preferences.glade.h:123
+#: ../src/gnome-utils/glade/preferences.glade.h:133
 msgid "Use the system setting for displaying toolbar items."
 msgstr ""
 "Die GNOME-Voreinstellung für die Anzeige der Icons in der Werkzeugleiste "
 "benutzen"
 
-#: ../src/gnome-utils/glade/preferences.glade.h:124
+#: ../src/gnome-utils/glade/preferences.glade.h:134
 msgid "Windows"
 msgstr "Fenster"
 
-#: ../src/gnome-utils/glade/preferences.glade.h:125
+#: ../src/gnome-utils/glade/preferences.glade.h:135
 msgid "_Absolute:"
 msgstr "_Absolut:"
 
-#: ../src/gnome-utils/glade/preferences.glade.h:126
+#: ../src/gnome-utils/glade/preferences.glade.h:136
 msgid "_Auto-raise lists"
 msgstr "Listen automatisch aufklappen"
 
-#: ../src/gnome-utils/glade/preferences.glade.h:127
+#: ../src/gnome-utils/glade/preferences.glade.h:137
 msgid "_Auto-split ledger"
 msgstr "_Aktive vollständig"
 
-#: ../src/gnome-utils/glade/preferences.glade.h:128
+#: ../src/gnome-utils/glade/preferences.glade.h:138
 msgid "_Automatic decimal point"
 msgstr "Automatische _Dezimalstellen"
 
-#: ../src/gnome-utils/glade/preferences.glade.h:129
+#: ../src/gnome-utils/glade/preferences.glade.h:139
 msgid "_Basic ledger"
 msgstr "_Einzeilig"
 
-#: ../src/gnome-utils/glade/preferences.glade.h:130
+#: ../src/gnome-utils/glade/preferences.glade.h:140
 msgid "_Decimal places:"
 msgstr "Komma_stellen:"
 
-#: ../src/gnome-utils/glade/preferences.glade.h:131
+#: ../src/gnome-utils/glade/preferences.glade.h:141
 msgid "_Double line mode"
 msgstr "_Bemerkung anzeigen"
 
-#: ../src/gnome-utils/glade/preferences.glade.h:132
+#: ../src/gnome-utils/glade/preferences.glade.h:142
 msgid "_Enable euro support"
 msgstr "_EURO-Unterstützung aktivieren"
 
-#: ../src/gnome-utils/glade/preferences.glade.h:133
+#: ../src/gnome-utils/glade/preferences.glade.h:143
 msgid "_Europe:"
 msgstr "_Europa:"
 
-#: ../src/gnome-utils/glade/preferences.glade.h:134
+#: ../src/gnome-utils/glade/preferences.glade.h:144
 msgid "_ISO:"
 msgstr "_ISO:"
 
-#: ../src/gnome-utils/glade/preferences.glade.h:135
+#: ../src/gnome-utils/glade/preferences.glade.h:145
 msgid "_Icons only"
 msgstr "Nur _Icons"
 
-#: ../src/gnome-utils/glade/preferences.glade.h:136
+#: ../src/gnome-utils/glade/preferences.glade.h:146
 msgid "_Income & expense"
 msgstr "_Erträge & Aufwendungen"
 
-#: ../src/gnome-utils/glade/preferences.glade.h:137
+#: ../src/gnome-utils/glade/preferences.glade.h:147
+#, fuzzy
+msgid "_Left"
+msgstr "Links"
+
+#: ../src/gnome-utils/glade/preferences.glade.h:148
 msgid "_None"
 msgstr "_Keine"
 
-#: ../src/gnome-utils/glade/preferences.glade.h:138
+#: ../src/gnome-utils/glade/preferences.glade.h:149
 msgid "_Relative:"
 msgstr "_Relativ:"
 
-#: ../src/gnome-utils/glade/preferences.glade.h:139
+#: ../src/gnome-utils/glade/preferences.glade.h:150
 msgid "_Retain log files:"
 msgstr "Logdateien au_fbewahren"
 
-#: ../src/gnome-utils/glade/preferences.glade.h:140
+#: ../src/gnome-utils/glade/preferences.glade.h:151
+#, fuzzy
+msgid "_Right"
+msgstr "Rechts"
+
+#: ../src/gnome-utils/glade/preferences.glade.h:152
 msgid "_Save window size and position"
 msgstr "_Fenstergrößen und -positionen speichern"
 
-#: ../src/gnome-utils/glade/preferences.glade.h:141
+#: ../src/gnome-utils/glade/preferences.glade.h:153
 msgid "_Text only"
 msgstr "Nur _Text"
 
-#: ../src/gnome-utils/glade/preferences.glade.h:142
+#: ../src/gnome-utils/glade/preferences.glade.h:154
 msgid "_US:"
 msgstr "_USA:"
 
-#: ../src/gnome-utils/glade/preferences.glade.h:143
+#: ../src/gnome-utils/glade/preferences.glade.h:155
 msgid "_Use system theme colors"
 msgstr "Farben der _systemweiten Einstellungen verwenden"
 
@@ -10822,82 +11067,91 @@
 msgid "_Show tips at startup"
 msgstr "Tipps beim Programmstart _anzeigen"
 
-#: ../src/gnome-utils/glade/transfer.glade.h:2
+#: ../src/gnome-utils/glade/transfer.glade.h:1
 msgid "<b>Basic Information</b>"
 msgstr "<b>Informationen</b>"
 
-#: ../src/gnome-utils/glade/transfer.glade.h:3
+#: ../src/gnome-utils/glade/transfer.glade.h:2
 msgid "<b>Currency Transfer</b>"
 msgstr "<b>Währungsbuchung</b>"
 
-#: ../src/gnome-utils/glade/transfer.glade.h:4
+#: ../src/gnome-utils/glade/transfer.glade.h:3
 msgid "<b>Transfer From</b>"
 msgstr "<b>Herkunftskonto</b>"
 
-#: ../src/gnome-utils/glade/transfer.glade.h:5
+#: ../src/gnome-utils/glade/transfer.glade.h:4
 msgid "<b>Transfer To</b>"
 msgstr "<b>Buchen nach</b>"
 
-#: ../src/gnome-utils/glade/transfer.glade.h:7
+#: ../src/gnome-utils/glade/transfer.glade.h:6
 msgid "Currency:"
 msgstr "Währung:"
 
-#: ../src/gnome-utils/glade/transfer.glade.h:8
+#: ../src/gnome-utils/glade/transfer.glade.h:7
 msgid "Date:"
 msgstr "Datum:"
 
-#: ../src/gnome-utils/glade/transfer.glade.h:9
+#: ../src/gnome-utils/glade/transfer.glade.h:8
 msgid "Description:"
 msgstr "Beschreibung:"
 
-#: ../src/gnome-utils/glade/transfer.glade.h:10
+#: ../src/gnome-utils/glade/transfer.glade.h:9
 msgid "Exchange Rate:"
 msgstr "Wechselkurs:"
 
-#: ../src/gnome-utils/glade/transfer.glade.h:11
+#: ../src/gnome-utils/glade/transfer.glade.h:10
 msgid "Memo:"
 msgstr "Buchungstext:"
 
-#: ../src/gnome-utils/glade/transfer.glade.h:12
+#: ../src/gnome-utils/glade/transfer.glade.h:11
 msgid "Num:"
 msgstr "Nummer:"
 
 #. src/report/standard-reports/price-scatter.scm
 #. src/report/standard-reports/net-barchart.scm
-#: ../src/gnome-utils/glade/transfer.glade.h:13
-#: ../intl-scm/guile-strings.c:1132 ../intl-scm/guile-strings.c:1216
+#. src/report/standard-reports/gnucash/report/price-scatter.scm
+#. src/report/standard-reports/gnucash/report/net-barchart.scm
+#: ../src/gnome-utils/glade/transfer.glade.h:12
+#: ../intl-scm/guile-strings.c:1844 ../intl-scm/guile-strings.c:1928
+#: ../intl-scm/guile-strings.c:2468 ../intl-scm/guile-strings.c:2552
 msgid "Show Income/Expense"
 msgstr "Erträge/Aufwendungen anzeigen"
 
-#: ../src/gnome-utils/glade/transfer.glade.h:15
+#: ../src/gnome-utils/glade/transfer.glade.h:14
 msgid "Transfer Funds"
 msgstr "Buchen"
 
 #. create the button.
-#: ../src/gnome-utils/gnc-account-sel.c:476
+#: ../src/gnome-utils/gnc-account-sel.c:382
 msgid "New..."
 msgstr "Neu..."
 
 #. src/report/standard-reports/price-scatter.scm
-#: ../src/gnome-utils/gnc-date-delta.c:218 ../intl-scm/guile-strings.c:1170
+#. src/report/standard-reports/gnucash/report/price-scatter.scm
+#: ../src/gnome-utils/gnc-date-delta.c:216 ../intl-scm/guile-strings.c:1882
+#: ../intl-scm/guile-strings.c:2506
 msgid "Weeks"
 msgstr "Wochen"
 
 #. src/report/standard-reports/price-scatter.scm
-#: ../src/gnome-utils/gnc-date-delta.c:219 ../intl-scm/guile-strings.c:1174
+#. src/report/standard-reports/gnucash/report/price-scatter.scm
+#: ../src/gnome-utils/gnc-date-delta.c:218 ../intl-scm/guile-strings.c:1886
+#: ../intl-scm/guile-strings.c:2510
 msgid "Months"
 msgstr "Monate"
 
 #. src/report/standard-reports/price-scatter.scm
-#: ../src/gnome-utils/gnc-date-delta.c:220 ../intl-scm/guile-strings.c:1176
+#. src/report/standard-reports/gnucash/report/price-scatter.scm
+#: ../src/gnome-utils/gnc-date-delta.c:220 ../intl-scm/guile-strings.c:1888
+#: ../intl-scm/guile-strings.c:2512
 msgid "Years"
 msgstr "Jahre"
 
-#: ../src/gnome-utils/gnc-date-delta.c:263
+#: ../src/gnome-utils/gnc-date-delta.c:244
 msgid "Ago"
 msgstr "Vor"
 
-#: ../src/gnome-utils/gnc-date-delta.c:264
+#: ../src/gnome-utils/gnc-date-delta.c:246
 msgid "From Now"
 msgstr "Von jetzt"
 
@@ -10908,12 +11162,15 @@
 
 #. src/report/stylesheets/stylesheet-fancy.scm
 #. src/report/stylesheets/stylesheet-easy.scm
-#: ../src/gnome-utils/gnc-dense-cal.c:286 ../intl-scm/guile-strings.c:400
-#: ../intl-scm/guile-strings.c:612
+#. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
+#: ../src/gnome-utils/gnc-dense-cal.c:252 ../intl-scm/guile-strings.c:448
+#: ../intl-scm/guile-strings.c:660 ../intl-scm/guile-strings.c:872
+#: ../intl-scm/guile-strings.c:1084
 msgid "Date: "
 msgstr "Datum:"
 
-#: ../src/gnome-utils/gnc-dense-cal.c:1065
+#: ../src/gnome-utils/gnc-dense-cal.c:1057
 msgid "(unnamed)"
 msgstr "(unbenannt)"
 
@@ -10922,74 +11179,74 @@
 msgid "Failed to process file: %s"
 msgstr "Kann Datei nicht verarbeiten: %s"
 
-#: ../src/gnome-utils/gnc-druid-provider-file-gnome.c:131
+#: ../src/gnome-utils/gnc-druid-provider-file-gnome.c:132
 #, c-format
 msgid "Failed to open file: %s: %s"
 msgstr "Kann Datei %s nicht öffnen: %s"
 
-#: ../src/gnome-utils/gnc-file.c:101 ../src/gnome-utils/gnc-main-window.c:226
+#: ../src/gnome-utils/gnc-file.c:99 ../src/gnome-utils/gnc-main-window.c:230
 msgid "_Import"
 msgstr "_Importieren"
 
-#: ../src/gnome-utils/gnc-file.c:103 ../src/gnome-utils/gnc-file.c:261
+#: ../src/gnome-utils/gnc-file.c:101 ../src/gnome-utils/gnc-file.c:254
 msgid "Import"
 msgstr "Import"
 
-#: ../src/gnome-utils/gnc-file.c:109 ../src/gnome-utils/gnc-file.c:1020
+#: ../src/gnome-utils/gnc-file.c:107 ../src/gnome-utils/gnc-file.c:1018
 msgid "Save"
 msgstr "Speichern"
 
-#: ../src/gnome-utils/gnc-file.c:113 ../src/gnome-utils/gnc-main-window.c:227
+#: ../src/gnome-utils/gnc-file.c:111 ../src/gnome-utils/gnc-main-window.c:231
 msgid "_Export"
 msgstr "E_xportieren"
 
-#: ../src/gnome-utils/gnc-file.c:116 ../src/gnome-utils/gnc-file.c:277
-#: ../src/gnome-utils/gnc-file.c:877
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:975
+#: ../src/gnome-utils/gnc-file.c:114 ../src/gnome-utils/gnc-file.c:270
+#: ../src/gnome-utils/gnc-file.c:876
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:985
 msgid "Export"
 msgstr "Exportieren"
 
-#: ../src/gnome-utils/gnc-file.c:159
+#: ../src/gnome-utils/gnc-file.c:152
 msgid "All files"
 msgstr "Alle Dateien"
 
 #. Just in case
-#: ../src/gnome-utils/gnc-file.c:201
+#: ../src/gnome-utils/gnc-file.c:194
 #: ../src/import-export/hbci/druid-hbci-utils.c:159
 #: ../src/import-export/hbci/druid-hbci-utils.c:173
 msgid "(null)"
 msgstr "(keine)"
 
-#: ../src/gnome-utils/gnc-file.c:210
+#: ../src/gnome-utils/gnc-file.c:203
 #, c-format
 msgid "No suitable backend was found for %s."
 msgstr "Kein passendes Dateimodul wurde gefunden für %s."
 
-#: ../src/gnome-utils/gnc-file.c:215
+#: ../src/gnome-utils/gnc-file.c:208
 #, c-format
 msgid "The URL %s is not supported by this version of GnuCash."
 msgstr "Die URL »%s« kann von dieser GnuCash Version nicht verarbeitet werden."
 
-#: ../src/gnome-utils/gnc-file.c:220
+#: ../src/gnome-utils/gnc-file.c:213
 #, c-format
 msgid "Can't parse the URL %s."
 msgstr "Folgende URL konnte nicht verarbeitet werden: %s"
 
-#: ../src/gnome-utils/gnc-file.c:225
+#: ../src/gnome-utils/gnc-file.c:218
 #, c-format
 msgid "Can't connect to %s. The host, username or password were incorrect."
 msgstr ""
 "Verbindung konnte nicht aufgebaut werden zu Rechner »%s«. Der Rechnername, "
 "Benutzername oder Passwort waren falsch."
 
-#: ../src/gnome-utils/gnc-file.c:231
+#: ../src/gnome-utils/gnc-file.c:224
 #, c-format
 msgid "Can't connect to %s. Connection was lost, unable to send data."
 msgstr ""
 "Verbindung konnte nicht aufgebaut werden zu Rechner »%s«. Verbindung "
 "verloren. Daten konnten nicht gesendet werden."
 
-#: ../src/gnome-utils/gnc-file.c:237
+#: ../src/gnome-utils/gnc-file.c:230
 msgid ""
 "This file/URL appears to be from a newer version of GnuCash. You must "
 "upgrade your version of GnuCash to work with this data."
@@ -10997,13 +11254,13 @@
 "Diese Datei scheint von einer neueren Version von GnuCash zu sein. Sie "
 "brauchen eine neuere GnuCash Version, um die Datei lesen zu können."
 
-#: ../src/gnome-utils/gnc-file.c:244
+#: ../src/gnome-utils/gnc-file.c:237
 #, c-format
 msgid "The database %s doesn't seem to exist. Do you want to create it?"
 msgstr ""
 "Die Datenbank oder Datei »%s« existiert nicht. Möchten Sie sie erstellen?"
 
-#: ../src/gnome-utils/gnc-file.c:254
+#: ../src/gnome-utils/gnc-file.c:247
 #, c-format
 msgid ""
 "GnuCash could not obtain the lock for %s. That database may be in use by "
@@ -11016,7 +11273,7 @@
 "\n"
 "Möchten Sie trotzdem mit dem Öffnen der Datenbank fortfahren?"
 
-#: ../src/gnome-utils/gnc-file.c:262
+#: ../src/gnome-utils/gnc-file.c:255
 #, c-format
 msgid ""
 "GnuCash could not obtain the lock for %s. That database may be in use by "
@@ -11029,7 +11286,7 @@
 "\n"
 "Möchten Sie trotzdem mit dem Importieren der Datenbank fortfahren?"
 
-#: ../src/gnome-utils/gnc-file.c:270
+#: ../src/gnome-utils/gnc-file.c:263
 #, c-format
 msgid ""
 "GnuCash could not obtain the lock for %s. That database may be in use by "
@@ -11042,7 +11299,7 @@
 "\n"
 "Möchten Sie trotzdem mit dem Speichern der Datenbank fortfahren?"
 
-#: ../src/gnome-utils/gnc-file.c:278
+#: ../src/gnome-utils/gnc-file.c:271
 #, c-format
 msgid ""
 "GnuCash could not obtain the lock for %s. That database may be in use by "
@@ -11055,7 +11312,7 @@
 "\n"
 "Möchten Sie trotzdem mit dem Öffnen der Datei fortfahren?"
 
-#: ../src/gnome-utils/gnc-file.c:301
+#: ../src/gnome-utils/gnc-file.c:294
 #, c-format
 msgid ""
 "GnuCash could not write to %s. That database may be on a read-only file "
@@ -11065,14 +11322,14 @@
 "einem schreibgeschützten Dateisystem befinden oder Sie haben keine "
 "Schreibberechtigung in das Verzeichnis. "
 
-#: ../src/gnome-utils/gnc-file.c:308
+#: ../src/gnome-utils/gnc-file.c:301
 #, c-format
 msgid "The file/URL %s does not contain GnuCash data or the data is corrupt."
 msgstr ""
 "Die Datei/URL »%s« verweist nicht auf GnuCash-Daten oder diese Daten sind "
 "fehlerhaft."
 
-#: ../src/gnome-utils/gnc-file.c:314
+#: ../src/gnome-utils/gnc-file.c:307
 #, c-format
 msgid ""
 "The server at URL %s experienced an error or encountered bad or corrupt data."
@@ -11080,19 +11337,19 @@
 "Der Server unter der URL »%s« stiess auf einen Fehler oder benutzte falsche "
 "oder fehlerhafte Daten."
 
-#: ../src/gnome-utils/gnc-file.c:320
+#: ../src/gnome-utils/gnc-file.c:313
 #, c-format
 msgid "You do not have permission to access %s."
 msgstr "Sie haben keine Zugriffsberechtigung für die Datei »%s«."
 
-#: ../src/gnome-utils/gnc-file.c:325
+#: ../src/gnome-utils/gnc-file.c:318
 #: ../src/register/register-core/formulacell.c:116
 #: ../src/register/register-core/pricecell.c:180
 #, c-format
 msgid "An error occurred while processing %s."
 msgstr "Fehler aufgetreten beim Verarbeiten von »%s«."
 
-#: ../src/gnome-utils/gnc-file.c:331
+#: ../src/gnome-utils/gnc-file.c:324
 #, c-format
 msgid ""
 "Invalid QSF Object file! The QSF object file %s failed to validate against "
@@ -11103,7 +11360,7 @@
 "verglichen mit dem QSF Objekt-Schema. Die XML-Struktur ist entweder nicht "
 "wohlgeformt oder enthält ungültige Daten."
 
-#: ../src/gnome-utils/gnc-file.c:338
+#: ../src/gnome-utils/gnc-file.c:331
 #, c-format
 msgid ""
 "Invalid QSF Map file! The QSF map file %s failed to validate against the QSF "
@@ -11114,7 +11371,7 @@
 "Format, verglichen mit dem QSF Map-Schema. Die XML-Struktur ist entweder "
 "nicht wohlgeformt oder enthält ungültige Daten."
 
-#: ../src/gnome-utils/gnc-file.c:345
+#: ../src/gnome-utils/gnc-file.c:338
 #, c-format
 msgid ""
 "The QSF Map file %s was written for a different version of QOF.  It may need "
@@ -11125,7 +11382,7 @@
 "Sie in der Dokumentation der anderen Version, ob Sie Konvertierungsschritte "
 "durchführen müssen, um sie mit dieser Version zu lesen."
 
-#: ../src/gnome-utils/gnc-file.c:352
+#: ../src/gnome-utils/gnc-file.c:345
 #, c-format
 msgid ""
 "The selected QSF map %s contains unusable data. This is usually because not "
@@ -11136,7 +11393,7 @@
 "sein, wenn nicht für alle erforderlichen Parameter für die gewünschten "
 "Objekte alle notwendigen Berechnungsformeln in der Zuordnung angegeben waren."
 
-#: ../src/gnome-utils/gnc-file.c:359
+#: ../src/gnome-utils/gnc-file.c:352
 #, c-format
 msgid ""
 "The selected QSF object file %s contains one or more invalid GUIDs. The file "
@@ -11146,14 +11403,14 @@
 "GUIDs. Die Datei kann nicht verarbeitet werden. Versuchen Sie, eine "
 "korrigierte Datei zu erhalten."
 
-#: ../src/gnome-utils/gnc-file.c:366
+#: ../src/gnome-utils/gnc-file.c:359
 #, c-format
 msgid "The selected QSF Object file %s requires a map but it was not provided."
 msgstr ""
 "Die gewählte QSF-Objekt-Datei »%s« erfordert eine QSF-Zuordnung (Map), aber "
 "es ist keine verfügbar."
 
-#: ../src/gnome-utils/gnc-file.c:372
+#: ../src/gnome-utils/gnc-file.c:365
 #, c-format
 msgid ""
 "Wrong QSF map selected. The selected map %s validates but was written for "
@@ -11165,14 +11422,14 @@
 "in dieser Zuordnung enthält nicht alle Objekte, die in der aktuellen QSF-"
 "Objekt-Datei zu finden sind."
 
-#: ../src/gnome-utils/gnc-file.c:380
+#: ../src/gnome-utils/gnc-file.c:373
 #, c-format
 msgid "The selected file %s is a QSF map and cannot be opened as a QSF object."
 msgstr ""
 "Die gewählte Datei »%s« ist eine QSF-Zuordnung (Map) und kann nicht als QSF-"
 "Objekt geöffnet werden."
 
-#: ../src/gnome-utils/gnc-file.c:386
+#: ../src/gnome-utils/gnc-file.c:379
 #, c-format
 msgid ""
 "When converting XML strings into numbers, an overflow has been detected. The "
@@ -11183,7 +11440,7 @@
 "QSF-Datei »%s« enthält ungültige Daten in einem Feld, das eine Zahl "
 "enthalten soll."
 
-#: ../src/gnome-utils/gnc-file.c:393
+#: ../src/gnome-utils/gnc-file.c:386
 #, c-format
 msgid ""
 "The QSF object file %s is valid and contains GnuCash objects. However, "
@@ -11197,52 +11454,57 @@
 "GnuCash-Buch fusioniert werden muss. Bitte öffnen Sie eine GnuCash-Datei "
 "oder erstellen eine neue, und importieren dann diese QSF-Datei."
 
-#: ../src/gnome-utils/gnc-file.c:403
+#: ../src/gnome-utils/gnc-file.c:396
 msgid "There was an error reading the file. Do you want to continue?"
 msgstr "Es gab einen Fehler beim Öffnen der Datei. Möchten Sie fortfahren?"
 
-#: ../src/gnome-utils/gnc-file.c:409
+#: ../src/gnome-utils/gnc-file.c:402
 #, c-format
 msgid "There was an error parsing the file %s."
-msgstr "Beim Leser der Datei »%s« ist ein Fehler aufgetreten."
+msgstr "Beim Lesen der Datei »%s« ist ein Fehler aufgetreten."
 
-#: ../src/gnome-utils/gnc-file.c:414
+#: ../src/gnome-utils/gnc-file.c:407
 #, c-format
 msgid "The file %s is empty."
 msgstr "Die Datei »%s« ist leer."
 
-#: ../src/gnome-utils/gnc-file.c:419
+#: ../src/gnome-utils/gnc-file.c:415
 #, c-format
 msgid "The file %s could not be found."
 msgstr "Die Datei »%s« konnte nicht gefunden werden."
 
-#: ../src/gnome-utils/gnc-file.c:424
+#: ../src/gnome-utils/gnc-file.c:421
 msgid "This file is from an older version of GnuCash. Do you want to continue?"
 msgstr ""
 "Diese Datei ist von einer älteren Version von GnuCash. Möchten Sie "
 "fortfahren?"
 
-#: ../src/gnome-utils/gnc-file.c:430
+#: ../src/gnome-utils/gnc-file.c:427
 #, c-format
 msgid "The file type of file %s is unknown."
 msgstr "Der Dateityp der Datei »%s« ist unbekannt."
 
-#: ../src/gnome-utils/gnc-file.c:435
+#: ../src/gnome-utils/gnc-file.c:432
 #, c-format
 msgid "Could not make a backup of the file %s"
 msgstr "Von der Datei »%s« konnte kein Backup erstellt werden."
 
-#: ../src/gnome-utils/gnc-file.c:440
+#: ../src/gnome-utils/gnc-file.c:437
 #, c-format
 msgid ""
-"Could not write to file %s Check that you have permission to write to this "
+"Could not write to file %s.  Check that you have permission to write to this "
 "file and that there is sufficient space to create it."
 msgstr ""
 "Es konnte nicht in die Datei »%s« geschrieben werden. Stellen Sie sicher, "
 "dass Sie Schreibberechtigung für das Verzeichnis und diese Datei haben und "
 "dass genug Platz auf dem Datenträger frei ist."
 
-#: ../src/gnome-utils/gnc-file.c:447
+#: ../src/gnome-utils/gnc-file.c:444
+#, c-format
+msgid "No read permission to read from file %s."
+msgstr "Sie haben keine Leseberechtigung für die Datei »%s«."
+
+#: ../src/gnome-utils/gnc-file.c:449
 msgid ""
 "This database is from an older version of GnuCash. Do you want to want to "
 "upgrade the database to the current version?"
@@ -11250,7 +11512,7 @@
 "Diese Datei ist von einer älteren Version von GnuCash.  Möchten Sie die "
 "Datei zur aktuellen GnuCash-Version aktualisieren?"
 
-#: ../src/gnome-utils/gnc-file.c:454
+#: ../src/gnome-utils/gnc-file.c:456
 msgid ""
 "The SQL database is in use by other users, and the upgrade cannot be "
 "performed until they logoff. If there are currently no other users, consult "
@@ -11263,32 +11525,32 @@
 "Wenn keine anderen Anwender mehr im System sind, konsultieren Sie bitte das "
 "Handbuch, um Anweisungen zum Löschen von 'dangling login sessions' zu finden."
 
-#: ../src/gnome-utils/gnc-file.c:464
+#: ../src/gnome-utils/gnc-file.c:466
 #, c-format
 msgid "An unknown I/O error (%d) occurred."
 msgstr "Ein unbekannter Eingabe/Ausgabefehler (%d) ist aufgetreten."
 
-#: ../src/gnome-utils/gnc-file.c:553
+#: ../src/gnome-utils/gnc-file.c:555
 msgid "Save changes to the file?"
 msgstr "Änderungen in Datei speichern?"
 
-#: ../src/gnome-utils/gnc-file.c:556 ../src/gnome-utils/gnc-main-window.c:892
+#: ../src/gnome-utils/gnc-file.c:558 ../src/gnome-utils/gnc-main-window.c:966
 #, c-format
 msgid "If you don't save, changes from the past %d minutes will be discarded."
 msgstr ""
 "Wenn Sie nicht speichern, gehen die Änderungen der letzten %d Minuten "
 "verloren."
 
-#: ../src/gnome-utils/gnc-file.c:570
+#: ../src/gnome-utils/gnc-file.c:572
 msgid "Continue _Without Saving"
 msgstr "Schließen _ohne zu speichern"
 
-#: ../src/gnome-utils/gnc-file.c:650
+#: ../src/gnome-utils/gnc-file.c:652
 #, c-format
 msgid "GnuCash could not obtain the lock for %s."
 msgstr "GnuCash konnte keine exklusive Schreibberechtigung für %s erreichen."
 
-#: ../src/gnome-utils/gnc-file.c:652
+#: ../src/gnome-utils/gnc-file.c:654
 msgid ""
 "That database may be in use by another user, in which case you should not "
 "open the database. What would you like to do?"
@@ -11302,7 +11564,7 @@
 "\n"
 "Was möchten Sie tun?"
 
-#: ../src/gnome-utils/gnc-file.c:655
+#: ../src/gnome-utils/gnc-file.c:657
 msgid ""
 "That database may be on a read-only file system, or you may not have write "
 "permission for the directory. If you proceed you may not be able to save any "
@@ -11317,28 +11579,28 @@
 "\n"
 "Was möchten Sie tun?"
 
-#: ../src/gnome-utils/gnc-file.c:672
+#: ../src/gnome-utils/gnc-file.c:674
 msgid "_Open Anyway"
 msgstr "Tr_otzdem öffnen"
 
-#: ../src/gnome-utils/gnc-file.c:674
+#: ../src/gnome-utils/gnc-file.c:676
 msgid "_Create New File"
 msgstr "_Neue Datei anlegen"
 
-#: ../src/gnome-utils/gnc-file.c:913 ../src/gnome-utils/gnc-file.c:1109
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:1327
+#: ../src/gnome-utils/gnc-file.c:911 ../src/gnome-utils/gnc-file.c:1107
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:1341
 #, c-format
 msgid "The file %s already exists. Are you sure you want to overwrite it?"
 msgstr ""
 "Die Datei »%s« existiert bereits. Sind Sie sicher, dass sie überschrieben "
 "werden soll?"
 
-#: ../src/gnome-utils/gnc-file.c:928
+#: ../src/gnome-utils/gnc-file.c:926
 msgid "Exporting file..."
 msgstr "Datei exportieren..."
 
 #. %s is the strerror(3) error string of the error that occurred.
-#: ../src/gnome-utils/gnc-file.c:941
+#: ../src/gnome-utils/gnc-file.c:939
 #, c-format
 msgid ""
 "There was an error saving the file.\n"
@@ -11353,23 +11615,32 @@
 msgid "View..."
 msgstr "Ansicht..."
 
-#: ../src/gnome-utils/gnc-html.c:107
+#: ../src/gnome-utils/gnc-gnome-utils.c:247
+msgid ""
+"GnuCash could not find the files for the help documentation.  This is likely "
+"because the 'gnucash-docs' package is not installed."
+msgstr ""
+"Die Dateien für die Hilfe-Dokumentation konnten nicht gefunden werden. Das "
+"liegt vermutlich daran, dass das Paket »gnucash-docs« noch nicht installiert "
+"ist."
+
+#: ../src/gnome-utils/gnc-html.c:108
 msgid "Not found"
 msgstr "Nicht gefunden"
 
-#: ../src/gnome-utils/gnc-html.c:109
+#: ../src/gnome-utils/gnc-html.c:110
 msgid "The specified URL could not be loaded."
 msgstr "Die angegebene URL konnte nicht geladen werden."
 
-#: ../src/gnome-utils/gnc-html.c:115
+#: ../src/gnome-utils/gnc-html.c:116
 msgid "There was an error loading the specified URL."
 msgstr "Beim Laden der URL ist ein Fehler aufgetreten."
 
-#: ../src/gnome-utils/gnc-html.c:116
+#: ../src/gnome-utils/gnc-html.c:117
 msgid "Error message"
 msgstr "Fehlermeldung"
 
-#: ../src/gnome-utils/gnc-html.c:605 ../src/gnome-utils/gnc-html.c:1064
+#: ../src/gnome-utils/gnc-html.c:610 ../src/gnome-utils/gnc-html.c:1070
 msgid ""
 "Secure HTTP access is disabled. You can enable it in the Network section of "
 "the Preferences dialog."
@@ -11378,7 +11649,7 @@
 "Sie den Netzwerk Abschnitt der Einstellungen und aktivieren die "
 "entsprechende Option."
 
-#: ../src/gnome-utils/gnc-html.c:614 ../src/gnome-utils/gnc-html.c:1074
+#: ../src/gnome-utils/gnc-html.c:619 ../src/gnome-utils/gnc-html.c:1080
 msgid ""
 "Network HTTP access is disabled. You can enable it in the Network section of "
 "the Preferences dialog."
@@ -11387,7 +11658,7 @@
 "Menü »Voreinstellungen«einschalten"
 
 #. %s is a URL (some location somewhere).
-#: ../src/gnome-utils/gnc-html.c:1005
+#: ../src/gnome-utils/gnc-html.c:1010
 #, c-format
 msgid "There was an error accessing %s."
 msgstr "Beim Zugriff auf %s ist ein Fehler aufgetreten."
@@ -11396,320 +11667,298 @@
 msgid "_Delete Account"
 msgstr "_Konto löschen"
 
+#: ../src/gnome-utils/gnc-icons.c:18 ../src/gnome/window-reconcile.c:2011
+msgid "_Edit Account"
+msgstr "Konto _bearbeiten"
+
 #: ../src/gnome-utils/gnc-icons.c:19
 msgid "_New Account"
 msgstr "_Neues Konto"
 
 #. Account menu
-#: ../src/gnome-utils/gnc-icons.c:20 ../src/gnome/window-reconcile.c:2006
+#: ../src/gnome-utils/gnc-icons.c:20 ../src/gnome/window-reconcile.c:2008
 msgid "_Open Account"
 msgstr "_Konto öffnen"
 
 #. Toplevel
-#: ../src/gnome-utils/gnc-main-window.c:211
+#: ../src/gnome-utils/gnc-main-window.c:215
 msgid "_File"
 msgstr "_Datei"
 
-#: ../src/gnome-utils/gnc-main-window.c:215
+#: ../src/gnome-utils/gnc-main-window.c:219
 msgid "Tra_nsaction"
-msgstr "_Buchung"
+msgstr "B_uchung"
 
-#: ../src/gnome-utils/gnc-main-window.c:216
+#: ../src/gnome-utils/gnc-main-window.c:220
 msgid "_Reports"
 msgstr "Be_richte"
 
-#: ../src/gnome-utils/gnc-main-window.c:217
+#: ../src/gnome-utils/gnc-main-window.c:221
 msgid "_Tools"
 msgstr "_Werkzeuge"
 
-#: ../src/gnome-utils/gnc-main-window.c:218
+#: ../src/gnome-utils/gnc-main-window.c:222
 msgid "E_xtensions"
 msgstr "Er_weiterungen"
 
-#: ../src/gnome-utils/gnc-main-window.c:219
+#: ../src/gnome-utils/gnc-main-window.c:223
 msgid "_Windows"
 msgstr "_Fenster"
 
 #. Help menu
-#: ../src/gnome-utils/gnc-main-window.c:220
-#: ../src/gnome/window-reconcile.c:1986 ../src/gnome/window-reconcile.c:2034
+#: ../src/gnome-utils/gnc-main-window.c:224
+#: ../src/gnome/window-reconcile.c:1988 ../src/gnome/window-reconcile.c:2036
 msgid "_Help"
 msgstr "_Hilfe"
 
 #. File menu
 #. Transaction menu
-#: ../src/gnome-utils/gnc-main-window.c:224
-#: ../src/gnome/window-reconcile.c:2022
+#: ../src/gnome-utils/gnc-main-window.c:228
+#: ../src/gnome/window-reconcile.c:2024
 msgid "_New"
 msgstr "_Neu"
 
-#: ../src/gnome-utils/gnc-main-window.c:225
+#: ../src/gnome-utils/gnc-main-window.c:229
 msgid "_Open"
 msgstr "Ö_ffnen"
 
-#: ../src/gnome-utils/gnc-main-window.c:228
+#: ../src/gnome-utils/gnc-main-window.c:232
 msgid "_Print..."
 msgstr "_Drucken..."
 
-#: ../src/gnome-utils/gnc-main-window.c:229
+#: ../src/gnome-utils/gnc-main-window.c:233
 msgid "Print the currently active page"
 msgstr "Aktuelle Seite drucken"
 
-#: ../src/gnome-utils/gnc-main-window.c:230
+#: ../src/gnome-utils/gnc-main-window.c:234
 msgid "Proper_ties"
 msgstr "_Eigenschaften"
 
-#: ../src/gnome-utils/gnc-main-window.c:231
+#: ../src/gnome-utils/gnc-main-window.c:235
 msgid "Edit the properties of the current file"
 msgstr "Eigenschaften dieser Datei anzeigen und bearbeiten."
 
-#: ../src/gnome-utils/gnc-main-window.c:233
+#: ../src/gnome-utils/gnc-main-window.c:237
 msgid "_Close"
 msgstr "S_chließen"
 
-#: ../src/gnome-utils/gnc-main-window.c:234
+#: ../src/gnome-utils/gnc-main-window.c:238
 msgid "Close the currently active page"
 msgstr "Aktuelle Seite schließen"
 
-#: ../src/gnome-utils/gnc-main-window.c:236
+#: ../src/gnome-utils/gnc-main-window.c:240
 msgid "_Quit"
 msgstr "_Beenden"
 
-#: ../src/gnome-utils/gnc-main-window.c:237
+#: ../src/gnome-utils/gnc-main-window.c:241
 msgid "Quit this application"
 msgstr "GnuCash beenden"
 
-#: ../src/gnome-utils/gnc-main-window.c:251
+#: ../src/gnome-utils/gnc-main-window.c:255
 msgid "Pr_eferences"
 msgstr "_Einstellungen"
 
-#: ../src/gnome-utils/gnc-main-window.c:252
+#: ../src/gnome-utils/gnc-main-window.c:256
 msgid "Edit the global preferences of GnuCash"
 msgstr "Die globalen Einstellungen von GnuCash bearbeiten"
 
-#: ../src/gnome-utils/gnc-main-window.c:258
+#: ../src/gnome-utils/gnc-main-window.c:262
 msgid "Select sorting criteria for this page view"
 msgstr "Sortierungskriterien für die aktuelle Ansicht wählen"
 
-#: ../src/gnome-utils/gnc-main-window.c:260
+#: ../src/gnome-utils/gnc-main-window.c:264
 msgid "Select the account types that should be displayed."
 msgstr "Wählen Sie die Kontoarten, die in der Kontenansicht angezeigt werden."
 
-#: ../src/gnome-utils/gnc-main-window.c:261
+#: ../src/gnome-utils/gnc-main-window.c:265
 msgid "_Refresh"
 msgstr "Aktualisie_ren"
 
-#: ../src/gnome-utils/gnc-main-window.c:262
+#: ../src/gnome-utils/gnc-main-window.c:266
 msgid "Refresh this window"
 msgstr "Dieses Fenster aktualisieren"
 
 #. Actions menu
-#: ../src/gnome-utils/gnc-main-window.c:267
-#: ../src/gnome/window-reconcile.c:2015
+#: ../src/gnome-utils/gnc-main-window.c:271
+#: ../src/gnome/window-reconcile.c:2017
 msgid "_Check & Repair"
 msgstr "Überprüfen"
 
-#: ../src/gnome-utils/gnc-main-window.c:268
+#: ../src/gnome-utils/gnc-main-window.c:272
 msgid "Reset _Warnings..."
 msgstr "_Warnungen zurücksetzen..."
 
-#: ../src/gnome-utils/gnc-main-window.c:269
+#: ../src/gnome-utils/gnc-main-window.c:273
 msgid "Reset the state of all warning message so they will be shown again."
 msgstr ""
 "Den gespeicherten Status aller Warnungsmeldungen zurücksetzen, so dass alle "
 "wieder angezeigt werden."
 
-#: ../src/gnome-utils/gnc-main-window.c:271
+#: ../src/gnome-utils/gnc-main-window.c:275
 msgid "Re_name Page"
 msgstr "Seite umbe_nennen"
 
-#: ../src/gnome-utils/gnc-main-window.c:272
+#: ../src/gnome-utils/gnc-main-window.c:276
 msgid "Rename this page."
 msgstr "Diese Seite umbenennen."
 
 #. Windows menu
-#: ../src/gnome-utils/gnc-main-window.c:277
+#: ../src/gnome-utils/gnc-main-window.c:281
 msgid "_New Window"
 msgstr "_Neues Fenster"
 
-#: ../src/gnome-utils/gnc-main-window.c:278
+#: ../src/gnome-utils/gnc-main-window.c:282
 msgid "Open a new top-level GnuCash window."
 msgstr "Ein neues Top-Level GnuCash Fenster öffnen."
 
-#: ../src/gnome-utils/gnc-main-window.c:280
+#: ../src/gnome-utils/gnc-main-window.c:284
 msgid "New Window with _Page"
 msgstr "Neues Fenster mit _Seite"
 
-#: ../src/gnome-utils/gnc-main-window.c:281
+#: ../src/gnome-utils/gnc-main-window.c:285
 msgid "Move the current page to a new top-level GnuCash window."
 msgstr "Aktuelle Seite in ein neues Top-Level GnuCash Fenster verschieben."
 
 #. Help menu
-#: ../src/gnome-utils/gnc-main-window.c:286
+#: ../src/gnome-utils/gnc-main-window.c:290
 msgid "Tutorial and Concepts _Guide"
 msgstr "GnuCash-_Kurs und Konzepte"
 
-#: ../src/gnome-utils/gnc-main-window.c:287
+#: ../src/gnome-utils/gnc-main-window.c:291
 msgid "Open the GnuCash Tutorial"
 msgstr "Den GnuCash-Online-Kurs öffnen"
 
-#: ../src/gnome-utils/gnc-main-window.c:289
+#: ../src/gnome-utils/gnc-main-window.c:293
 msgid "_Contents"
 msgstr "I_nhalt"
 
-#: ../src/gnome-utils/gnc-main-window.c:290
+#: ../src/gnome-utils/gnc-main-window.c:294
 msgid "Open the GnuCash Help"
 msgstr "Die GnuCash-Hilfe öffnen"
 
-#: ../src/gnome-utils/gnc-main-window.c:292
+#: ../src/gnome-utils/gnc-main-window.c:296
 msgid "_About"
 msgstr "_Info"
 
-#: ../src/gnome-utils/gnc-main-window.c:293
+#: ../src/gnome-utils/gnc-main-window.c:297
 msgid "About GnuCash"
 msgstr "Info zu GnuCash"
 
-#: ../src/gnome-utils/gnc-main-window.c:303
+#: ../src/gnome-utils/gnc-main-window.c:307
 msgid "_Toolbar"
 msgstr "_Werkzeugleiste"
 
-#: ../src/gnome-utils/gnc-main-window.c:304
+#: ../src/gnome-utils/gnc-main-window.c:308
 msgid "Show/hide the toolbar on this window"
 msgstr "Die Werkzeugleiste in diesem Fenster anzeigen/verbergen"
 
-#: ../src/gnome-utils/gnc-main-window.c:306
+#: ../src/gnome-utils/gnc-main-window.c:310
 msgid "Su_mmary Bar"
 msgstr "_Zusammenfassungsleiste"
 
-#: ../src/gnome-utils/gnc-main-window.c:307
+#: ../src/gnome-utils/gnc-main-window.c:311
 msgid "Show/hide the summary bar on this window"
 msgstr "Die Zusammenfassungs-Leiste in diesem Fenster anzeigen/verbergen"
 
-#: ../src/gnome-utils/gnc-main-window.c:309
+#: ../src/gnome-utils/gnc-main-window.c:313
 msgid "Stat_us Bar"
 msgstr "_Statusleiste"
 
-#: ../src/gnome-utils/gnc-main-window.c:310
+#: ../src/gnome-utils/gnc-main-window.c:314
 msgid "Show/hide the status bar on this window"
 msgstr "Die Statusleiste in diesem Fenster anzeigen/verbergen"
 
-#: ../src/gnome-utils/gnc-main-window.c:320
+#: ../src/gnome-utils/gnc-main-window.c:324
 msgid "Window _1"
 msgstr "Fenster _1"
 
-#: ../src/gnome-utils/gnc-main-window.c:321
+#: ../src/gnome-utils/gnc-main-window.c:325
 msgid "Window _2"
 msgstr "Fenster _2"
 
-#: ../src/gnome-utils/gnc-main-window.c:322
+#: ../src/gnome-utils/gnc-main-window.c:326
 msgid "Window _3"
 msgstr "Fenster _3"
 
-#: ../src/gnome-utils/gnc-main-window.c:323
+#: ../src/gnome-utils/gnc-main-window.c:327
 msgid "Window _4"
 msgstr "Fenster _4"
 
-#: ../src/gnome-utils/gnc-main-window.c:324
+#: ../src/gnome-utils/gnc-main-window.c:328
 msgid "Window _5"
 msgstr "Fenster _5"
 
-#: ../src/gnome-utils/gnc-main-window.c:325
+#: ../src/gnome-utils/gnc-main-window.c:329
 msgid "Window _6"
 msgstr "Fenster _6"
 
-#: ../src/gnome-utils/gnc-main-window.c:326
+#: ../src/gnome-utils/gnc-main-window.c:330
 msgid "Window _7"
 msgstr "Fenster _7"
 
-#: ../src/gnome-utils/gnc-main-window.c:327
+#: ../src/gnome-utils/gnc-main-window.c:331
 msgid "Window _8"
 msgstr "Fenster _8"
 
-#: ../src/gnome-utils/gnc-main-window.c:328
+#: ../src/gnome-utils/gnc-main-window.c:332
 msgid "Window _9"
 msgstr "Fenster _9"
 
-#: ../src/gnome-utils/gnc-main-window.c:329
+#: ../src/gnome-utils/gnc-main-window.c:333
 msgid "Window _0"
 msgstr "Fenster _0"
 
-#: ../src/gnome-utils/gnc-main-window.c:889
+#: ../src/gnome-utils/gnc-main-window.c:963
 #, c-format
 msgid "Save changes to file %s before closing?"
 msgstr "Änderungen der Datei %s vor dem Schließen speichern?"
 
-#: ../src/gnome-utils/gnc-main-window.c:900
+#: ../src/gnome-utils/gnc-main-window.c:974
 msgid "<unknown>"
 msgstr "<unbekannt>"
 
-#: ../src/gnome-utils/gnc-main-window.c:916
+#: ../src/gnome-utils/gnc-main-window.c:990
 msgid "Close _Without Saving"
 msgstr "Schließen _ohne zu speichern"
 
-#: ../src/gnome-utils/gnc-main-window.c:987
-msgid "Quit GnuCash?"
-msgstr "GnuCash beenden?"
-
-#: ../src/gnome-utils/gnc-main-window.c:988
-msgid ""
-"You are attempting to close the last GnuCash window.  Doing so will quit the "
-"application.  Are you sure that this is what you want to do?"
-msgstr ""
-"Sie sind im Begriff, das letzte geöffnete GnuCash-Fenster zu schließen. Dies "
-"wird GnuCash beenden. Sind Sie sich sicher, dass Sie das wollen?"
-
-#: ../src/gnome-utils/gnc-main-window.c:1123
+#: ../src/gnome-utils/gnc-main-window.c:1178
 msgid "<no file>"
 msgstr "<Keine Datei>"
 
-#: ../src/gnome-utils/gnc-main-window.c:3215
+#: ../src/gnome-utils/gnc-main-window.c:3339
 msgid "The GnuCash personal finance manager. The GNU way to manage your money!"
 msgstr ""
 "GnuCash: Ihr privater Finanzmanager. Die freie Lösung zur Finanzverwaltung."
 
 #. Development version
-#: ../src/gnome-utils/gnc-main-window.c:3228
+#: ../src/gnome-utils/gnc-main-window.c:3352
 #, c-format
 msgid "%s  This copy was built from svn r%s on %s."
 msgstr "%s  Dieses Programm wurde aus SVN r%s am %s erstellt."
 
-#: ../src/gnome-utils/gnc-main-window.c:3231
+#: ../src/gnome-utils/gnc-main-window.c:3355
 #, c-format
 msgid "%s  This copy was built from r%s on %s."
 msgstr "%s  Dieses Programm wurde aus r%s am %s erstellt."
 
-#. Translators: Insert your translator's credits here so that
-#. they will be shown in the "About" dialog.
-#: ../src/gnome-utils/gnc-main-window.c:3243
-#: ../src/gnome-utils/gnc-main-window.c:3282
+#: ../src/gnome-utils/gnc-main-window.c:3367
 msgid "translator_credits"
 msgstr "Christian Stimming <stimming at tuhh.de>"
 
-#. Translators: This is the "About" message.
-#: ../src/gnome-utils/gnc-main-window.c:3260
-msgid ""
-"The GnuCash personal finance manager.\n"
-"The GNU way to manage your money!\n"
-"http://www.gnucash.org/"
-msgstr ""
-"GnuCash: Ihr privater Finanzmanager.\n"
-"Die freie Lösung zur Finanzverwaltung.\n"
-"http://www.gnucash.org"
-
 #. CY Strings
 #. src/app-utils/date-utilities.scm
 #: ../src/gnome-utils/gnc-period-select.c:66
-#: ../src/gnome-utils/gnc-period-select.c:81 ../intl-scm/guile-strings.c:170
+#: ../src/gnome-utils/gnc-period-select.c:81 ../intl-scm/guile-strings.c:218
 msgid "Today"
 msgstr "Heute"
 
 #. src/app-utils/date-utilities.scm
-#: ../src/gnome-utils/gnc-period-select.c:67 ../intl-scm/guile-strings.c:138
+#: ../src/gnome-utils/gnc-period-select.c:67 ../intl-scm/guile-strings.c:186
 msgid "Start of this month"
 msgstr "Anfang dieses Monats"
 
 #. src/app-utils/date-utilities.scm
-#: ../src/gnome-utils/gnc-period-select.c:68 ../intl-scm/guile-strings.c:146
+#: ../src/gnome-utils/gnc-period-select.c:68 ../intl-scm/guile-strings.c:194
 msgid "Start of previous month"
 msgstr "Anfang des vorherigen Monats"
 
@@ -11718,7 +11967,7 @@
 msgstr "Anfang dieses Quartals"
 
 #. src/app-utils/date-utilities.scm
-#: ../src/gnome-utils/gnc-period-select.c:70 ../intl-scm/guile-strings.c:162
+#: ../src/gnome-utils/gnc-period-select.c:70 ../intl-scm/guile-strings.c:210
 msgid "Start of previous quarter"
 msgstr "Anfang des vorherigen Quartals"
 
@@ -11740,12 +11989,12 @@
 msgstr "Anfang des vorherigen Haushaltsjahres"
 
 #. src/app-utils/date-utilities.scm
-#: ../src/gnome-utils/gnc-period-select.c:82 ../intl-scm/guile-strings.c:142
+#: ../src/gnome-utils/gnc-period-select.c:82 ../intl-scm/guile-strings.c:190
 msgid "End of this month"
 msgstr "Ende dieses Monats"
 
 #. src/app-utils/date-utilities.scm
-#: ../src/gnome-utils/gnc-period-select.c:83 ../intl-scm/guile-strings.c:150
+#: ../src/gnome-utils/gnc-period-select.c:83 ../intl-scm/guile-strings.c:198
 msgid "End of previous month"
 msgstr "Ende des vorherigen Monats"
 
@@ -11754,7 +12003,7 @@
 msgstr "Ende dieses Quartals"
 
 #. src/app-utils/date-utilities.scm
-#: ../src/gnome-utils/gnc-period-select.c:85 ../intl-scm/guile-strings.c:166
+#: ../src/gnome-utils/gnc-period-select.c:85 ../intl-scm/guile-strings.c:214
 msgid "End of previous quarter"
 msgstr "Ende des vorherigen Quartals"
 
@@ -11797,139 +12046,167 @@
 
 #. src/report/standard-reports/trial-balance.scm
 #. src/report/standard-reports/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#. src/report/standard-reports/gnucash/report/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
 #. src/report/locale-specific/us/taxtxf.scm
 #. src/report/locale-specific/us/taxtxf-de_DE.scm
-#: ../src/gnome-utils/gnc-tree-view-account.c:514
-#: ../intl-scm/guile-strings.c:1460 ../intl-scm/guile-strings.c:1486
-#: ../intl-scm/guile-strings.c:2190 ../intl-scm/guile-strings.c:2328
-#: ../intl-scm/guile-strings.c:2448 ../intl-scm/guile-strings.c:2954
-#: ../intl-scm/guile-strings.c:3044
+#. src/report/locale-specific/us/gnucash/report/taxtxf.scm
+#. src/report/locale-specific/us/gnucash/report/taxtxf-de_DE.scm
+#: ../src/gnome-utils/gnc-tree-view-account.c:510
+#: ../intl-scm/guile-strings.c:2170 ../intl-scm/guile-strings.c:2196
+#: ../intl-scm/guile-strings.c:2794 ../intl-scm/guile-strings.c:2820
+#: ../intl-scm/guile-strings.c:3524 ../intl-scm/guile-strings.c:3662
+#: ../intl-scm/guile-strings.c:3782 ../intl-scm/guile-strings.c:4674
+#: ../intl-scm/guile-strings.c:4812 ../intl-scm/guile-strings.c:4932
+#: ../intl-scm/guile-strings.c:5442 ../intl-scm/guile-strings.c:5532
+#: ../intl-scm/guile-strings.c:5622 ../intl-scm/guile-strings.c:5712
 msgid "Account Name"
 msgstr "Kontobezeichnung"
 
-#: ../src/gnome-utils/gnc-tree-view-account.c:523
+#: ../src/gnome-utils/gnc-tree-view-account.c:519
 msgid "Commodity"
 msgstr "Währung/Aktie"
 
 #. src/report/report-system/options-utilities.scm
 #. src/report/standard-reports/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/account-summary.scm
+#. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/account-summary.scm
 #. src/report/standard-reports/transaction.scm
-#: ../src/gnome-utils/gnc-tree-view-account.c:529
-#: ../intl-scm/guile-strings.c:770 ../intl-scm/guile-strings.c:1490
-#: ../intl-scm/guile-strings.c:1900 ../intl-scm/guile-strings.c:2222
-#: ../intl-scm/guile-strings.c:2332 ../intl-scm/guile-strings.c:2456
+#: ../src/gnome-utils/gnc-tree-view-account.c:525
+#: ../intl-scm/guile-strings.c:1282 ../intl-scm/guile-strings.c:2200
+#: ../intl-scm/guile-strings.c:2824 ../intl-scm/guile-strings.c:3234
+#: ../intl-scm/guile-strings.c:3556 ../intl-scm/guile-strings.c:3666
+#: ../intl-scm/guile-strings.c:3790 ../intl-scm/guile-strings.c:4384
+#: ../intl-scm/guile-strings.c:4706 ../intl-scm/guile-strings.c:4816
+#: ../intl-scm/guile-strings.c:4940
 msgid "Account Code"
 msgstr "Kontonummer"
 
-#: ../src/gnome-utils/gnc-tree-view-account.c:540
+#: ../src/gnome-utils/gnc-tree-view-account.c:536
 msgid "Last Num"
 msgstr "Letzte Nummer"
 
-#: ../src/gnome-utils/gnc-tree-view-account.c:545
+#: ../src/gnome-utils/gnc-tree-view-account.c:541
 msgid "Present"
 msgstr "Aktuell"
 
-#: ../src/gnome-utils/gnc-tree-view-account.c:552
+#: ../src/gnome-utils/gnc-tree-view-account.c:548
 msgid "Present (Report)"
 msgstr "Aktuell (als Bericht)"
 
-#: ../src/gnome-utils/gnc-tree-view-account.c:565
+#: ../src/gnome-utils/gnc-tree-view-account.c:561
 msgid "Balance (Report)"
 msgstr "Bilanz (als Bericht)"
 
-#: ../src/gnome-utils/gnc-tree-view-account.c:572
+#: ../src/gnome-utils/gnc-tree-view-account.c:568
 msgid "Balance (Period)"
 msgstr "Bilanz (Periodenbezogen)"
 
-#: ../src/gnome-utils/gnc-tree-view-account.c:585
+#: ../src/gnome-utils/gnc-tree-view-account.c:581
 msgid "Cleared (Report)"
 msgstr "Bestätigt (als Bericht)"
 
-#: ../src/gnome-utils/gnc-tree-view-account.c:598
+#: ../src/gnome-utils/gnc-tree-view-account.c:594
 msgid "Reconciled (Report)"
 msgstr "Abgeglichen (als Bericht)"
 
-#: ../src/gnome-utils/gnc-tree-view-account.c:604
+#: ../src/gnome-utils/gnc-tree-view-account.c:600
 msgid "Future Minimum"
 msgstr "Zukünftiges Minimum"
 
-#: ../src/gnome-utils/gnc-tree-view-account.c:611
+#: ../src/gnome-utils/gnc-tree-view-account.c:607
 msgid "Future Minimum (Report)"
 msgstr "Zukünftiges Minimum (als Bericht)"
 
 #. src/report/report-system/html-acct-table.scm
 #. src/report/report-system/html-utilities.scm
 #. src/report/standard-reports/portfolio.scm
+#. src/report/standard-reports/gnucash/report/portfolio.scm
+#. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
 #. src/report/standard-reports/advanced-portfolio.scm
 #. src/report/locale-specific/us/taxtxf.scm
 #. src/report/locale-specific/us/taxtxf-de_DE.scm
+#. src/report/locale-specific/us/gnucash/report/taxtxf.scm
+#. src/report/locale-specific/us/gnucash/report/taxtxf-de_DE.scm
 #. src/business/business-reports/fancy-invoice.scm
 #. src/business/business-reports/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/fancy-invoice.scm
+#. src/business/business-reports/gnucash/report/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/aging.scm
+#. src/business/business-reports/gnucash/report/invoice.scm
 #. src/business/business-reports/aging.scm
 #. src/business/business-reports/invoice.scm
-#: ../src/gnome-utils/gnc-tree-view-account.c:617
-#: ../intl-scm/guile-strings.c:846 ../intl-scm/guile-strings.c:886
-#: ../intl-scm/guile-strings.c:1742 ../intl-scm/guile-strings.c:2030
-#: ../intl-scm/guile-strings.c:2956 ../intl-scm/guile-strings.c:3046
-#: ../intl-scm/guile-strings.c:3204 ../intl-scm/guile-strings.c:3260
-#: ../intl-scm/guile-strings.c:3522 ../intl-scm/guile-strings.c:3578
-#: ../intl-scm/guile-strings.c:3756 ../intl-scm/guile-strings.c:3760
-#: ../intl-scm/guile-strings.c:3780 ../intl-scm/guile-strings.c:3836
+#: ../src/gnome-utils/gnc-tree-view-account.c:613
+#: ../intl-scm/guile-strings.c:1360 ../intl-scm/guile-strings.c:1400
+#: ../intl-scm/guile-strings.c:2452 ../intl-scm/guile-strings.c:3076
+#: ../intl-scm/guile-strings.c:3364 ../intl-scm/guile-strings.c:4514
+#: ../intl-scm/guile-strings.c:5444 ../intl-scm/guile-strings.c:5534
+#: ../intl-scm/guile-strings.c:5624 ../intl-scm/guile-strings.c:5714
+#: ../intl-scm/guile-strings.c:5930 ../intl-scm/guile-strings.c:5986
+#: ../intl-scm/guile-strings.c:6248 ../intl-scm/guile-strings.c:6304
+#: ../intl-scm/guile-strings.c:6454 ../intl-scm/guile-strings.c:6510
+#: ../intl-scm/guile-strings.c:6772 ../intl-scm/guile-strings.c:6828
+#: ../intl-scm/guile-strings.c:7006 ../intl-scm/guile-strings.c:7010
+#: ../intl-scm/guile-strings.c:7032 ../intl-scm/guile-strings.c:7088
+#: ../intl-scm/guile-strings.c:7246 ../intl-scm/guile-strings.c:7250
+#: ../intl-scm/guile-strings.c:7272 ../intl-scm/guile-strings.c:7328
 msgid "Total"
 msgstr "Betrag"
 
-#: ../src/gnome-utils/gnc-tree-view-account.c:624
+#: ../src/gnome-utils/gnc-tree-view-account.c:620
 msgid "Total (Report)"
 msgstr "Saldo (als Bericht)"
 
-#: ../src/gnome-utils/gnc-tree-view-account.c:630
+#: ../src/gnome-utils/gnc-tree-view-account.c:626
 msgid "Total (Period)"
 msgstr "Saldo (Periodenbezogen)"
 
-#: ../src/gnome-utils/gnc-tree-view-account.c:642
+#: ../src/gnome-utils/gnc-tree-view-account.c:638
 msgid "Tax Info"
 msgstr "Steuerrelevante Information"
 
 #. Translators: This string has a context prefix; the translation
 #. must only contain the part after the | character.
-#: ../src/gnome-utils/gnc-tree-view-account.c:650
+#: ../src/gnome-utils/gnc-tree-view-account.c:646
 msgid "Column letter for 'Placeholder'|P"
 msgstr "P"
 
 #. Translators: %s is a currency mnemonic.
-#: ../src/gnome-utils/gnc-tree-view-account.c:1409
+#: ../src/gnome-utils/gnc-tree-view-account.c:1405
 #, c-format
 msgid "Present (%s)"
 msgstr "Aktuell (%s)"
 
 #. Translators: %s is a currency mnemonic.
-#: ../src/gnome-utils/gnc-tree-view-account.c:1412
+#: ../src/gnome-utils/gnc-tree-view-account.c:1408
 #, c-format
 msgid "Balance (%s)"
 msgstr "Saldo (%s)"
 
 #. Translators: %s is a currency mnemonic.
-#: ../src/gnome-utils/gnc-tree-view-account.c:1415
+#: ../src/gnome-utils/gnc-tree-view-account.c:1411
 #, c-format
 msgid "Cleared (%s)"
 msgstr "Bestätigt (%s)"
 
 #. Translators: %s is a currency mnemonic.
-#: ../src/gnome-utils/gnc-tree-view-account.c:1418
+#: ../src/gnome-utils/gnc-tree-view-account.c:1414
 #, c-format
 msgid "Reconciled (%s)"
 msgstr "Abgeglichen (%s)"
 
 #. Translators: %s is a currency mnemonic.
-#: ../src/gnome-utils/gnc-tree-view-account.c:1421
+#: ../src/gnome-utils/gnc-tree-view-account.c:1417
 #, c-format
 msgid "Future Minimum (%s)"
 msgstr "Zukünftiges Minimum (%s)"
 
 #. Translators: %s is a currency mnemonic.
-#: ../src/gnome-utils/gnc-tree-view-account.c:1424
+#: ../src/gnome-utils/gnc-tree-view-account.c:1420
 #, c-format
 msgid "Total (%s)"
 msgstr "Gesamt (%s)"
@@ -11981,22 +12258,39 @@
 #. src/report/standard-reports/general-journal.scm
 #. src/report/standard-reports/general-ledger.scm
 #. src/report/standard-reports/portfolio.scm
+#. src/report/standard-reports/gnucash/report/price-scatter.scm
+#. src/report/standard-reports/gnucash/report/general-journal.scm
+#. src/report/standard-reports/gnucash/report/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/portfolio.scm
+#. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
+#. src/report/standard-reports/gnucash/report/transaction.scm
+#. src/report/standard-reports/gnucash/report/register.scm
 #. src/report/standard-reports/advanced-portfolio.scm
 #. src/report/standard-reports/transaction.scm
 #. src/report/standard-reports/register.scm
 #. src/business/business-reports/fancy-invoice.scm
 #. src/business/business-reports/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/fancy-invoice.scm
+#. src/business/business-reports/gnucash/report/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/invoice.scm
 #. src/business/business-reports/invoice.scm
 #: ../src/gnome-utils/gnc-tree-view-price.c:465
-#: ../src/register/ledger-core/split-register.c:2036
+#: ../src/register/ledger-core/split-register.c:2058
 #: ../src/register/ledger-core/split-register-model.c:228
-#: ../intl-scm/guile-strings.c:1124 ../intl-scm/guile-strings.c:1198
-#: ../intl-scm/guile-strings.c:1286 ../intl-scm/guile-strings.c:1500
-#: ../intl-scm/guile-strings.c:1738 ../intl-scm/guile-strings.c:2038
-#: ../intl-scm/guile-strings.c:2202 ../intl-scm/guile-strings.c:2256
-#: ../intl-scm/guile-strings.c:2476 ../intl-scm/guile-strings.c:2566
-#: ../intl-scm/guile-strings.c:2616 ../intl-scm/guile-strings.c:3236
-#: ../intl-scm/guile-strings.c:3554 ../intl-scm/guile-strings.c:3812
+#: ../intl-scm/guile-strings.c:1836 ../intl-scm/guile-strings.c:1910
+#: ../intl-scm/guile-strings.c:1996 ../intl-scm/guile-strings.c:2210
+#: ../intl-scm/guile-strings.c:2448 ../intl-scm/guile-strings.c:2460
+#: ../intl-scm/guile-strings.c:2534 ../intl-scm/guile-strings.c:2620
+#: ../intl-scm/guile-strings.c:2834 ../intl-scm/guile-strings.c:3072
+#: ../intl-scm/guile-strings.c:3372 ../intl-scm/guile-strings.c:3536
+#: ../intl-scm/guile-strings.c:3590 ../intl-scm/guile-strings.c:3810
+#: ../intl-scm/guile-strings.c:3900 ../intl-scm/guile-strings.c:3950
+#: ../intl-scm/guile-strings.c:4522 ../intl-scm/guile-strings.c:4686
+#: ../intl-scm/guile-strings.c:4740 ../intl-scm/guile-strings.c:4960
+#: ../intl-scm/guile-strings.c:5050 ../intl-scm/guile-strings.c:5100
+#: ../intl-scm/guile-strings.c:5962 ../intl-scm/guile-strings.c:6280
+#: ../intl-scm/guile-strings.c:6486 ../intl-scm/guile-strings.c:6804
+#: ../intl-scm/guile-strings.c:7064 ../intl-scm/guile-strings.c:7304
 msgid "Price"
 msgstr "Preis"
 
@@ -12040,18 +12334,18 @@
 "deaktivieren. Dieser Wert kann maximal 10 betragen."
 
 #: ../src/gnome-utils/window-main-summarybar.c:316
-#, c-format
-msgid "%s, total:"
+#, fuzzy, c-format
+msgid "%s, Total:"
 msgstr "%s, Summe:"
 
 #: ../src/gnome-utils/window-main-summarybar.c:319
-#, c-format
-msgid "%s, non currency commodities total:"
+#, fuzzy, c-format
+msgid "%s, Non Currency Commodities Total:"
 msgstr "%s, Aktien gesamt:"
 
 #: ../src/gnome-utils/window-main-summarybar.c:322
-#, c-format
-msgid "%s, grand total:"
+#, fuzzy, c-format
+msgid "%s, Grand Total:"
 msgstr "%s, Gesamt:"
 
 #: ../src/gnome-utils/window-main-summarybar.c:326
@@ -12067,79 +12361,79 @@
 msgid "Profits:"
 msgstr "Gewinn:"
 
-#: ../src/gnome/window-reconcile.c:432
+#: ../src/gnome/window-reconcile.c:431
 msgid "Interest Payment"
 msgstr "Habenzinsen"
 
-#: ../src/gnome/window-reconcile.c:435
+#: ../src/gnome/window-reconcile.c:434
 msgid "Interest Charge"
 msgstr "Sollzinsen"
 
-#: ../src/gnome/window-reconcile.c:453
+#: ../src/gnome/window-reconcile.c:452
 msgid "Payment From"
 msgstr "Zahlung von"
 
-#: ../src/gnome/window-reconcile.c:457 ../src/gnome/window-reconcile.c:467
+#: ../src/gnome/window-reconcile.c:456 ../src/gnome/window-reconcile.c:466
 msgid "Reconcile Account"
 msgstr "Konto abgleichen"
 
-#: ../src/gnome/window-reconcile.c:472
+#: ../src/gnome/window-reconcile.c:471
 msgid "Payment To"
 msgstr "Zahlung an"
 
-#: ../src/gnome/window-reconcile.c:483
+#: ../src/gnome/window-reconcile.c:482
 msgid "No Auto Interest Payments for this Account"
 msgstr "Keine automatischen Habenzins-Zahlungen für dieses Konto"
 
-#: ../src/gnome/window-reconcile.c:484
+#: ../src/gnome/window-reconcile.c:483
 msgid "No Auto Interest Charges for this Account"
 msgstr "Keine automatischen Sollzins-Zahlungen für dieses Konto"
 
-#: ../src/gnome/window-reconcile.c:723
+#: ../src/gnome/window-reconcile.c:722
 msgid "Enter _Interest Charge..."
 msgstr "Zahlung _Sollzins eingeben..."
 
-#: ../src/gnome/window-reconcile.c:981
+#: ../src/gnome/window-reconcile.c:980
 msgid "Debits"
 msgstr "Soll"
 
 #. src/report/report-system/report-utilities.scm
-#: ../src/gnome/window-reconcile.c:991 ../intl-scm/guile-strings.c:852
+#: ../src/gnome/window-reconcile.c:990 ../intl-scm/guile-strings.c:1366
 msgid "Credits"
 msgstr "Haben"
 
-#: ../src/gnome/window-reconcile.c:1130
+#: ../src/gnome/window-reconcile.c:1129
 msgid "Are you sure you want to delete the selected transaction?"
 msgstr ""
 "Sind Sie sicher, dass Sie den ausgewählten Buchungssatz löschen wollen?"
 
 #. ending balance title/value
-#: ../src/gnome/window-reconcile.c:1673
+#: ../src/gnome/window-reconcile.c:1674
 msgid "Ending Balance:"
 msgstr "Schlußsaldo:"
 
 #. reconciled balance title/value
-#: ../src/gnome/window-reconcile.c:1683
+#: ../src/gnome/window-reconcile.c:1684
 msgid "Reconciled Balance:"
 msgstr "Abgeglichener Saldo:"
 
 #. difference title/value
-#: ../src/gnome/window-reconcile.c:1693
+#: ../src/gnome/window-reconcile.c:1694
 msgid "Difference:"
 msgstr "Differenz:"
 
-#: ../src/gnome/window-reconcile.c:1875
+#: ../src/gnome/window-reconcile.c:1877
 msgid "The account is not balanced. Are you sure you want to finish?"
 msgstr ""
 "Das Konto ist nicht ausgeglichen. Sind Sie sicher, dass Sie das Abgleichen "
 "beenden wollen?"
 
-#: ../src/gnome/window-reconcile.c:1932
+#: ../src/gnome/window-reconcile.c:1934
 msgid "Do you want to postpone this reconciliation and finish it later?"
 msgstr ""
 "Möchten Sie dieses Abgleichen jetzt unterbrechen und später fertigstellen?"
 
-#: ../src/gnome/window-reconcile.c:1966
+#: ../src/gnome/window-reconcile.c:1968
 msgid ""
 "You have made changes to this reconcile window. Are you sure you want to "
 "cancel?"
@@ -12148,67 +12442,67 @@
 "wollen?"
 
 #. Toplevel
-#: ../src/gnome/window-reconcile.c:1983
+#: ../src/gnome/window-reconcile.c:1985
 msgid "_Reconcile"
 msgstr "Ab_gleichen"
 
-#: ../src/gnome/window-reconcile.c:1984
+#: ../src/gnome/window-reconcile.c:1986
 msgid "_Account"
 msgstr "_Konto"
 
 #. Reconcile menu
-#: ../src/gnome/window-reconcile.c:1990
+#: ../src/gnome/window-reconcile.c:1992
 msgid "_Reconcile Information..."
 msgstr "_Informationen zum Abgleich..."
 
-#: ../src/gnome/window-reconcile.c:1991
+#: ../src/gnome/window-reconcile.c:1993
 msgid ""
 "Change the reconcile information including statement date and ending balance."
 msgstr ""
 "Informationen zum Abgleich ändern, zum Beispiel das Datum und der "
 "Schlußsaldo des Kontoauszugs."
 
-#: ../src/gnome/window-reconcile.c:1994
+#: ../src/gnome/window-reconcile.c:1996
 msgid "_Finish"
 msgstr "_Fertig"
 
-#: ../src/gnome/window-reconcile.c:1995
+#: ../src/gnome/window-reconcile.c:1997
 msgid "Finish the reconciliation of this account"
 msgstr "Kontoabstimmung beenden"
 
-#: ../src/gnome/window-reconcile.c:1997
+#: ../src/gnome/window-reconcile.c:1999
 msgid "_Postpone"
 msgstr "_Unterbrechen"
 
-#: ../src/gnome/window-reconcile.c:1998
+#: ../src/gnome/window-reconcile.c:2000
 msgid "Postpone the reconciliation of this account"
 msgstr "Das Abgleichen des Kontos unterbrechen"
 
-#: ../src/gnome/window-reconcile.c:2001
+#: ../src/gnome/window-reconcile.c:2003
 msgid "Cancel the reconciliation of this account"
 msgstr "Die Abstimmung dieses Kontos abbrechen"
 
-#: ../src/gnome/window-reconcile.c:2007
+#: ../src/gnome/window-reconcile.c:2009
 msgid "Open the account"
 msgstr "Konto öffnen"
 
-#: ../src/gnome/window-reconcile.c:2010
+#: ../src/gnome/window-reconcile.c:2012
 msgid "Edit the main account for this register"
 msgstr "Bearbeiten des Hauptkonto für dieses Kontobuch"
 
-#: ../src/gnome/window-reconcile.c:2023
+#: ../src/gnome/window-reconcile.c:2025
 msgid "Add a new transaction to the account"
 msgstr "Dem Konto einen neuen Buchungssatz hinzufügen"
 
-#: ../src/gnome/window-reconcile.c:2026
+#: ../src/gnome/window-reconcile.c:2028
 msgid "Edit the current transaction"
 msgstr "Aktuellen Buchungssatz bearbeiten"
 
-#: ../src/gnome/window-reconcile.c:2029
+#: ../src/gnome/window-reconcile.c:2031
 msgid "Delete the selected transaction"
 msgstr "Ausgewählten Buchungssatz löschen"
 
-#: ../src/gnome/window-reconcile.c:2035
+#: ../src/gnome/window-reconcile.c:2037
 msgid "Open the GnuCash help window"
 msgstr "Das GnuCash-Hilfe-Fenster öffnen"
 
@@ -12242,10 +12536,6 @@
 msgstr "<b>Buchungen importieren</b>"
 
 #: ../src/import-export/generic-import.glade.h:8
-msgid "A"
-msgstr "Neu"
-
-#: ../src/import-export/generic-import.glade.h:9
 msgid ""
 "A transaction whose best match's score is in the green zone (above or equal "
 "to the Auto-CLEAR threshold) will be CLEARed by default."
@@ -12254,7 +12544,7 @@
 "grünen Bereich liegt (größer oder gleich der Auto-Abgleich-Schwelle) hat als "
 "Voreinstellung 'Abgleichen'."
 
-#: ../src/import-export/generic-import.glade.h:10
+#: ../src/import-export/generic-import.glade.h:9
 msgid ""
 "A transaction whose best match's score is in the red zone (above the display "
 "threshold but below or equal to the Auto-ADD threshold) will be ADDed by "
@@ -12264,44 +12554,36 @@
 "roten Bereich liegt (größer als Anzeige-Schwelle, aber kleiner oder gleich "
 "der Auto-Hinzufügen-Schwelle), hat als Voreinstellung 'Hinzufügen'."
 
-#: ../src/import-export/generic-import.glade.h:13
+#: ../src/import-export/generic-import.glade.h:11
 msgid "Auto-_add threshold"
 msgstr "Entscheidungsschwelle für automatisches Hinzufügen"
 
-#: ../src/import-export/generic-import.glade.h:14
+#: ../src/import-export/generic-import.glade.h:12
 msgid "Auto-c_lear threshold"
 msgstr "Entscheidungsschwelle für automatisches Abgleichen"
 
-#: ../src/import-export/generic-import.glade.h:15
+#: ../src/import-export/generic-import.glade.h:13
 msgid "Choose a format"
 msgstr "Wählen Sie das Export-Format"
 
-#: ../src/import-export/generic-import.glade.h:16
+#: ../src/import-export/generic-import.glade.h:14
 msgid "Commercial ATM _fees threshold"
 msgstr "Auszahlungsgebühren"
 
-#: ../src/import-export/generic-import.glade.h:17
-msgid "Confidence"
-msgstr "Genauigkeit"
-
-#: ../src/import-export/generic-import.glade.h:21
-msgid "EDIT"
-msgstr "Bearbeiten"
-
-#: ../src/import-export/generic-import.glade.h:22
+#: ../src/import-export/generic-import.glade.h:18
 msgid "Enable edit match action"
 msgstr "»Bearbeiten«-Aktion aktivieren"
 
-#: ../src/import-export/generic-import.glade.h:23
+#: ../src/import-export/generic-import.glade.h:19
 msgid "Enable skip transaction action"
 msgstr "»Überspringen«-Aktion aktivieren "
 
-#: ../src/import-export/generic-import.glade.h:24
+#: ../src/import-export/generic-import.glade.h:20
 msgid "Enable the EDIT action in the transaction matcher.  NOT YET SUPPORTED"
 msgstr ""
 "»Bearbeiten«-Aktion im Buchungsimporter aktivieren. Noch nicht implementiert"
 
-#: ../src/import-export/generic-import.glade.h:25
+#: ../src/import-export/generic-import.glade.h:21
 msgid ""
 "Enable the SKIP action in the transaction matcher.  If enabled, a "
 "transaction whose best match's score is in the yellow zone (above the Auto-"
@@ -12312,7 +12594,7 @@
 "liegt (größer als die Auto-Hinzufügen-Schwelle, aber kleiner als die Auto-"
 "Abgleichen-Schwelle), hat als Voreinstellung »Überspringen«."
 
-#: ../src/import-export/generic-import.glade.h:26
+#: ../src/import-export/generic-import.glade.h:22
 msgid ""
 "For a new transaction, click on the \"Other Account\" entry to choose the "
 "other (destination) account of this transaction.\n"
@@ -12334,19 +12616,19 @@
 "Wenn allen neuen Buchungen ein »Anderes Konto« zugeordnet wurde und alle "
 "Duplikate richtig erkannt wurden, klicken Sie »Ok«."
 
-#: ../src/import-export/generic-import.glade.h:33
+#: ../src/import-export/generic-import.glade.h:29
 msgid "Generic import transaction matcher"
 msgstr "Buchungszuordnung für Allgemeinen Import"
 
-#: ../src/import-export/generic-import.glade.h:34
+#: ../src/import-export/generic-import.glade.h:30
 msgid "Green"
 msgstr "Grün"
 
-#: ../src/import-export/generic-import.glade.h:36
+#: ../src/import-export/generic-import.glade.h:31
 msgid "Imported transaction's first split:"
 msgstr "Erster Teil der importierten Buchung"
 
-#: ../src/import-export/generic-import.glade.h:37
+#: ../src/import-export/generic-import.glade.h:32
 msgid ""
 "In some places commercial ATMs (not belonging to a financial institution) "
 "are installed in places like convienience store.  These ATM add its fee "
@@ -12362,66 +12644,59 @@
 "existierende Buchung richtig zuzuordnen, können Sie hier die Höhe für solche "
 "zusätzlichen Auszahlungsgebühren in Ihrer lokalen Währung angeben."
 
-#: ../src/import-export/generic-import.glade.h:38
+#: ../src/import-export/generic-import.glade.h:33
 msgid "List of downloaded transactions (source split shown):"
 msgstr ""
 "Liste der importierten Buchungen (angezeigt wird die Herkunftsbuchung):"
 
-#: ../src/import-export/generic-import.glade.h:39
+#: ../src/import-export/generic-import.glade.h:34
 msgid "Match _display threshold"
 msgstr "Entscheidungsschwelle für Anzeige in Zuordnung"
 
-#: ../src/import-export/generic-import.glade.h:41
-#: ../src/import-export/hbci/glade/hbci.glade.h:38
-#: ../src/import-export/qif-import/qif.glade.h:53
+#: ../src/import-export/generic-import.glade.h:35
+#: ../src/import-export/hbci/druid-hbci-initial.c:707
+#: ../src/import-export/qif-import/dialog-account-picker.c:296
+#: ../src/import-export/qif-import/druid-qif-import.c:1056
 msgid "New?"
 msgstr "Neu?"
 
-#: ../src/import-export/generic-import.glade.h:42
+#: ../src/import-export/generic-import.glade.h:36
 msgid "Online account ID here..."
 msgstr "Online Kontonummer hier..."
 
-#: ../src/import-export/generic-import.glade.h:43
+#: ../src/import-export/generic-import.glade.h:37
 msgid "Other Account"
 msgstr "Anderes Konto"
 
-#: ../src/import-export/generic-import.glade.h:44
+#: ../src/import-export/generic-import.glade.h:38
 msgid "Please select or create an appropriate GnuCash account for:"
 msgstr "Auswählen oder Hinzufügen des passenden GnuCash Kontos:"
 
-#: ../src/import-export/generic-import.glade.h:45
+#: ../src/import-export/generic-import.glade.h:39
 msgid "Potential splits matching the selected transaction: "
 msgstr "Mögliche Buchungen, die zum aktuellen Buchungssatz passen: "
 
-#: ../src/import-export/generic-import.glade.h:47
-msgid "R"
-msgstr "Abgl"
-
-#: ../src/import-export/generic-import.glade.h:48
+#: ../src/import-export/generic-import.glade.h:41
 msgid "Red"
 msgstr "Rot"
 
-#: ../src/import-export/generic-import.glade.h:49
+#: ../src/import-export/generic-import.glade.h:42
 msgid "Select \"A\" to add the transaction as new."
 msgstr "Wählen Sie »Neu«, um die Buchung als neue Buchung zu importieren."
 
-#: ../src/import-export/generic-import.glade.h:50
+#: ../src/import-export/generic-import.glade.h:43
 msgid "Select \"R\" to reconcile a matching transaction."
 msgstr "Wählen Sie »Abgl«, um eine existierende Buchung abzugleichen"
 
-#: ../src/import-export/generic-import.glade.h:52
-msgid "Select Import Action"
-msgstr "Import-Aktion auswählen"
-
-#: ../src/import-export/generic-import.glade.h:53
+#: ../src/import-export/generic-import.glade.h:45
 msgid "Select matching existing transaction"
 msgstr "Wählen Sie die zugeordnete, schon existierende Buchung"
 
-#: ../src/import-export/generic-import.glade.h:54
+#: ../src/import-export/generic-import.glade.h:46
 msgid "Select neither to skip the transaction (it won't be imported at all)."
 msgstr "Ist keines der beiden gewählt, wird die Buchung nicht importiert."
 
-#: ../src/import-export/generic-import.glade.h:55
+#: ../src/import-export/generic-import.glade.h:47
 msgid ""
 "The minimum score a potential match must have to be displayed in the match "
 "list."
@@ -12430,116 +12705,121 @@
 "existierenden Buchung im Buchungs-Import überhaupt berücksichtigt und "
 "angezeigt wird."
 
-#: ../src/import-export/generic-import.glade.h:56
+#: ../src/import-export/generic-import.glade.h:48
 msgid ""
 "This transaction probably requires your intervention or it will be imported "
 "unbalanced."
 msgstr ""
 "Diese Buchung benötigt Ihre Auswahl oder sie würde unausgeglichen importiert."
 
-#: ../src/import-export/generic-import.glade.h:57
+#: ../src/import-export/generic-import.glade.h:49
 msgid "This transaction requires your intervention or it will NOT be imported."
 msgstr "Diese Buchung benötigt Ihre Auswahl oder sie würde nicht importiert."
 
-#: ../src/import-export/generic-import.glade.h:58
+#: ../src/import-export/generic-import.glade.h:50
 msgid ""
 "This transaction will be imported balanced (you may still want to double "
 "check the match or destination account)."
 msgstr "Diese Buchung wird ausgeglichen importiert."
 
-#: ../src/import-export/generic-import.glade.h:59
+#: ../src/import-export/generic-import.glade.h:51
 msgid "Transaction List Help"
 msgstr "Buchungsimport Hilfe"
 
-#: ../src/import-export/generic-import.glade.h:60
+#: ../src/import-export/generic-import.glade.h:52
 msgid "Use _bayesian matching"
 msgstr "_Bayes-Algorithmus verwenden"
 
-#: ../src/import-export/generic-import.glade.h:61
+#: ../src/import-export/generic-import.glade.h:53
 msgid ""
 "Use bayesian algorithms to match new transactions with existing accounts."
 msgstr ""
 "Bayes-Algorithmus verwenden, um importierte Buchungen mit existierenden "
 "abzugleichen."
 
-#: ../src/import-export/generic-import.glade.h:62
+#: ../src/import-export/generic-import.glade.h:54
 msgid "Yellow"
 msgstr "Gelb"
 
-#: ../src/import-export/generic-import.glade.h:63
+#: ../src/import-export/generic-import.glade.h:55
 msgid "do not translate"
 msgstr "do not translate"
 
-#: ../src/import-export/generic-import.glade.h:64
-#: ../src/import-export/qif-import/qif.glade.h:97
+#: ../src/import-export/generic-import.glade.h:56
+#: ../src/import-export/qif-import/qif.glade.h:87
 msgid "gnc-new-account"
 msgstr "gnc-new-account"
 
 #. Numeric formats
-#: ../src/import-export/gnc-import-format-gnome.c:91
+#: ../src/import-export/gnc-import-format-gnome.c:106
 msgid "Period-as-decimal (1,000.00)"
 msgstr "Punkt als Kommastelle (Englisch: 1,000.00)"
 
-#: ../src/import-export/gnc-import-format-gnome.c:92
+#: ../src/import-export/gnc-import-format-gnome.c:107
 msgid "Comma-as-decimal (1.000,00)"
 msgstr "Komma als Kommastelle (1.000,00)"
 
 #. Date formats
-#: ../src/import-export/gnc-import-format-gnome.c:95
+#: ../src/import-export/gnc-import-format-gnome.c:110
 msgid "m-d-y"
 msgstr "Monat-Tag-Jahr"
 
-#: ../src/import-export/gnc-import-format-gnome.c:96
+#: ../src/import-export/gnc-import-format-gnome.c:111
 msgid "d-m-y"
 msgstr "Tag-Monat-Jahr"
 
-#: ../src/import-export/gnc-import-format-gnome.c:97
+#: ../src/import-export/gnc-import-format-gnome.c:112
 msgid "y-m-d"
 msgstr "Jahr-Monat-Tag"
 
-#: ../src/import-export/gnc-import-format-gnome.c:98
+#: ../src/import-export/gnc-import-format-gnome.c:113
 msgid "y-d-m"
 msgstr "Jahr-Tag-Monat"
 
-#. Translators: Strings from this file are really only
-#. * needed inside Germany (HBCI is not supported anywhere
-#. * else). You may safely ignore strings from the
-#. * import-export/hbci subdirectory in other countries.
-#: ../src/import-export/hbci/dialog-hbcitrans.c:372
+#. Translators: Strings from this file are needed only in
+#. * countries that have one of aqbanking's Online Banking
+#. * techniques available. This is 'OFX DirectConnect'
+#. * (U.S. and others), 'HBCI' (in Germany), or 'YellowNet'
+#. * (Switzerland). If none of these techniques are available
+#. * in your country, you may safely ignore strings from the
+#. * import-export/hbci subdirectory.
+#: ../src/import-export/hbci/dialog-hbcitrans.c:375
 msgid "Enter an Online Direct Debit Note"
 msgstr "Online-Lastschrift eingeben"
 
-#: ../src/import-export/hbci/dialog-hbcitrans.c:375
+#: ../src/import-export/hbci/dialog-hbcitrans.c:378
 msgid "Debited Account Owner"
 msgstr "Zahlungspflichtiger"
 
-#: ../src/import-export/hbci/dialog-hbcitrans.c:377
+#: ../src/import-export/hbci/dialog-hbcitrans.c:380
 msgid "Debited Account Number"
 msgstr "Konto-Nr. des Zahlungspflichtigen"
 
-#: ../src/import-export/hbci/dialog-hbcitrans.c:379
+#: ../src/import-export/hbci/dialog-hbcitrans.c:382
 msgid "Debited Account Bank Code"
 msgstr "BLZ des Zahlungspflichtigen"
 
-#: ../src/import-export/hbci/dialog-hbcitrans.c:382
+#: ../src/import-export/hbci/dialog-hbcitrans.c:385
 msgid "Credited Account Owner"
 msgstr "Auftraggeber"
 
-#: ../src/import-export/hbci/dialog-hbcitrans.c:384
+#: ../src/import-export/hbci/dialog-hbcitrans.c:387
 msgid "Credited Account Number"
 msgstr "Konto-Nr. des Auftraggebers"
 
-#: ../src/import-export/hbci/dialog-hbcitrans.c:386
+#: ../src/import-export/hbci/dialog-hbcitrans.c:389
 msgid "Credited Account Bank Code"
 msgstr "BLZ des Auftraggebers"
 
-#: ../src/import-export/hbci/dialog-hbcitrans.c:405
-#: ../src/import-export/hbci/dialog-hbcitrans.c:879
-#: ../src/import-export/hbci/dialog-hbcitrans.c:889
+#. Conversion was erroneous, so don't use the string
+#: ../src/import-export/hbci/dialog-hbcitrans.c:415
+#: ../src/import-export/hbci/dialog-hbcitrans.c:901
+#: ../src/import-export/hbci/dialog-hbcitrans.c:905
+#: ../src/import-export/hbci/dialog-hbcitrans.c:915
 msgid "(unknown)"
 msgstr "(unbekannt)"
 
-#: ../src/import-export/hbci/dialog-hbcitrans.c:536
+#: ../src/import-export/hbci/dialog-hbcitrans.c:549
 msgid ""
 "The amount is zero or the amount field could not be interpreted correctly. "
 "You might have mixed up decimal point and comma, compared to your locale "
@@ -12555,7 +12835,7 @@
 "Dies ergibt keinen zulässigen Zahlungsauftrag. Wollen Sie den Auftrag erneut "
 "eingeben?"
 
-#: ../src/import-export/hbci/dialog-hbcitrans.c:558
+#: ../src/import-export/hbci/dialog-hbcitrans.c:571
 msgid ""
 "You did not enter any transaction purpose. A purpose is required for an "
 "online transfer.\n"
@@ -12567,7 +12847,7 @@
 "\n"
 "Wollen Sie den Auftrag erneut eingeben?"
 
-#: ../src/import-export/hbci/dialog-hbcitrans.c:693
+#: ../src/import-export/hbci/dialog-hbcitrans.c:706
 #, c-format
 msgid ""
 "The internal check of the destination account number '%s' at the specified "
@@ -12580,7 +12860,7 @@
 "Fehler enthält. Wollen Sie den Auftrag trotzdem mit dieser Kontonummer "
 "abschicken?"
 
-#: ../src/import-export/hbci/dialog-hbcitrans.c:799
+#: ../src/import-export/hbci/dialog-hbcitrans.c:812
 msgid ""
 "The job was sent to the bank successfully, but the bank is refusing to "
 "execute the job. Please check the log window for the exact error message of "
@@ -12600,37 +12880,43 @@
 msgid "The two passwords didn't match. Please try again."
 msgstr "Die beiden PINs haben nicht übereingestimmt. Bitte erneut eingeben."
 
-#: ../src/import-export/hbci/druid-hbci-initial.c:145
+#: ../src/import-export/hbci/druid-hbci-initial.c:133
 #, c-format
 msgid "%s at %s (code %s)"
 msgstr "%s bei %s (BLZ %s)"
 
-#: ../src/import-export/hbci/druid-hbci-initial.c:150
+#: ../src/import-export/hbci/druid-hbci-initial.c:138
 #, c-format
 msgid "%s at bank code %s"
 msgstr "%s bei %s"
 
-#: ../src/import-export/hbci/druid-hbci-initial.c:522
+#: ../src/import-export/hbci/druid-hbci-initial.c:478
 msgid "Choose AqBanking Backend"
 msgstr "AqBanking-Modul wählen"
 
-#: ../src/import-export/hbci/druid-hbci-initial.c:523
+#: ../src/import-export/hbci/druid-hbci-initial.c:479
 msgid "Please choose an AqBanking backend to be configured"
 msgstr "Wählen Sie das Modul von AqBanking, das Sie einrichten möchten."
 
-#: ../src/import-export/hbci/druid-hbci-initial.c:524
+#: ../src/import-export/hbci/druid-hbci-initial.c:480
 msgid "Co_nfigure"
 msgstr "_Einrichten"
 
-#. Each of the %s is the name of the backend, e.g. "aqhbci".
-#: ../src/import-export/hbci/druid-hbci-initial.c:642
+#: ../src/import-export/hbci/druid-hbci-initial.c:552
 #, c-format
 msgid ""
-"The external program \"%s Setup Wizard\" returned a nonzero exit code which "
-"means it has not been finished successfully. The further HBCI setup can only "
-"be finished if the %s Setup Wizard is run successfully. Please try to start "
-"and successfully finish the %s Setup Wizard program again."
+"The Windows version of GnuCash does not (yet) have the capability to start "
+"the external program \"%s Setup Wizard\". Please start it yourself from the "
+"location \"%s\" before you continue."
 msgstr ""
+
+#: ../src/import-export/hbci/druid-hbci-initial.c:616
+#, fuzzy
+msgid ""
+"The external program \"AqBanking Setup Wizard\" failed to run successfully.  "
+"Online Banking can only be setup if this wizard has run successfully.  "
+"Please try running the \"AqBanking Setup Wizard\" again."
+msgstr ""
 "Das externe Programm »%s Einrichtungs-Assistent« hat einen Fehlercode "
 "zurückgegeben, was bedeutet, dass die Einrichtung nicht erfolgreich "
 "abgeschlossen worden ist. Die weitere HBCI Einrichtung in GnuCash kann nur "
@@ -12639,13 +12925,14 @@
 "auszuführen."
 
 #. Each of the %s is the name of the backend, e.g. "aqhbci".
-#: ../src/import-export/hbci/druid-hbci-initial.c:655
-#, c-format
+#: ../src/import-export/hbci/druid-hbci-initial.c:627
+#, fuzzy
 msgid ""
-"The external program \"%s Setup Wizard\" has not been found. \n"
+"The external program \"AqBanking Setup Wizard\" has not been found. \n"
 "\n"
-"The package aqbanking is supposed to install the program \"%s-qt3-wizard\". "
-"Please check your installation of aqbanking."
+"The aqbanking package should include the program \"qt3-wizard\".  Please "
+"check your installation to ensure this program is present.  On some "
+"distributions this may require installing additional packages."
 msgstr ""
 "Das externe Programm »%s Einrichtungs-Assistent« konnte nicht gefunden "
 "werden. \n"
@@ -12654,6 +12941,15 @@
 "dann ein Programm namens »%s-qt3-wizard« installiert ist. Bitte "
 "kontrollieren Sie Ihre Installation der Bibliothek aqbanking."
 
+#: ../src/import-export/hbci/druid-hbci-initial.c:692
+#, fuzzy
+msgid "Online Banking Account Name"
+msgstr "Name des Gegenkontos"
+
+#: ../src/import-export/hbci/druid-hbci-initial.c:699
+msgid "GnuCash Account Name"
+msgstr "GnuCash Kontoname"
+
 #: ../src/import-export/hbci/druid-hbci-utils.c:158
 #, c-format
 msgid "The file %s does not exist. Would you like to create it now?"
@@ -12697,293 +12993,266 @@
 msgstr "Aktuelle Online-Buchung als neue Überweisungsvorlage hinzufügen"
 
 #: ../src/import-export/hbci/glade/hbci.glade.h:9
-msgid ""
-"AqHBCI \n"
-"Setup"
-msgstr ""
-"AqHBCI \n"
-"Einrichtung"
-
-#: ../src/import-export/hbci/glade/hbci.glade.h:11
 msgid "Bank Code"
 msgstr "Bankleitzahl"
 
-#: ../src/import-export/hbci/glade/hbci.glade.h:12
-msgid "Choose a HBCI Version to use with the selected bank:"
+#: ../src/import-export/hbci/glade/hbci.glade.h:10
+#, fuzzy
+msgid "Choose an Online Banking Version to use with the selected bank:"
 msgstr "Wählen Sie eine HBCI-Version, die benutzt werden soll:"
 
-#: ../src/import-export/hbci/glade/hbci.glade.h:13
+#: ../src/import-export/hbci/glade/hbci.glade.h:11
+#, fuzzy
 msgid ""
-"Click on the line of a HBCI account name if you want to match it to a "
-"GnuCash account. Click \"Forward\" when all desired accounts are matching."
+"Click on the line of an Online Banking account name if you want to match it "
+"to a GnuCash account. Click \"Forward\" when all desired accounts are "
+"matching."
 msgstr ""
 "Klicken Sie auf die Zeile eines HBCI-Kontos, um diesem HBCI-Konto ein "
 "GnuCash-Konto zuzuordnen. Klicken Sie »Vor«, wenn alle gewünschten Konten "
 "zugeordnet sind."
 
-#: ../src/import-export/hbci/glade/hbci.glade.h:14
+#: ../src/import-export/hbci/glade/hbci.glade.h:12
 msgid "Close when finished"
 msgstr "Fenster nach Verbindungsende schließen"
 
-#: ../src/import-export/hbci/glade/hbci.glade.h:15
+#: ../src/import-export/hbci/glade/hbci.glade.h:13
 msgid "Current Action"
 msgstr "Momentane Aktion"
 
-#: ../src/import-export/hbci/glade/hbci.glade.h:16
+#: ../src/import-export/hbci/glade/hbci.glade.h:14
 msgid "Current Job"
 msgstr "Momentaner Auftrag"
 
-#: ../src/import-export/hbci/glade/hbci.glade.h:17
+#: ../src/import-export/hbci/glade/hbci.glade.h:15
 msgid "Date range of transactions to retrieve:"
 msgstr "Datumsbereich der abzurufenden Buchungen:"
 
-#: ../src/import-export/hbci/glade/hbci.glade.h:18
+#: ../src/import-export/hbci/glade/hbci.glade.h:16
 msgid "Delete the currently selected transaction template"
 msgstr "Ausgewählte Überweisungsvorlage löschen"
 
-#: ../src/import-export/hbci/glade/hbci.glade.h:19
+#: ../src/import-export/hbci/glade/hbci.glade.h:17
 msgid "E_nter date:"
 msgstr "D_atum eingeben:"
 
-#: ../src/import-export/hbci/glade/hbci.glade.h:20
+#: ../src/import-export/hbci/glade/hbci.glade.h:18
 msgid "Ente_r date:"
 msgstr "Datum _eingeben:"
 
-#: ../src/import-export/hbci/glade/hbci.glade.h:21
+#: ../src/import-export/hbci/glade/hbci.glade.h:19
 msgid "Enter an Online Transaction"
 msgstr "Online-Ãœberweisung eingeben"
 
-#: ../src/import-export/hbci/glade/hbci.glade.h:22
+#: ../src/import-export/hbci/glade/hbci.glade.h:20
 msgid "Enter name for new template:"
 msgstr "Bitte geben Sie einen Namen für die neue Überweisungsvorlage ein:"
 
-#: ../src/import-export/hbci/glade/hbci.glade.h:23
+#: ../src/import-export/hbci/glade/hbci.glade.h:21
 msgid "Execute Now"
 msgstr "Jetzt ausführen"
 
-#: ../src/import-export/hbci/glade/hbci.glade.h:24
+#: ../src/import-export/hbci/glade/hbci.glade.h:22
 msgid "Execute later (unimpl.)"
 msgstr "Später ausführen (unfertig)"
 
-#: ../src/import-export/hbci/glade/hbci.glade.h:25
+#: ../src/import-export/hbci/glade/hbci.glade.h:23
 msgid "Execute this online transaction now"
 msgstr "Diesen Auftrag jetzt online abschicken"
 
-#: ../src/import-export/hbci/glade/hbci.glade.h:26
+#: ../src/import-export/hbci/glade/hbci.glade.h:24
 msgid "Get Transactions Online"
 msgstr "Online Kontoumsätze abfragen"
 
-#: ../src/import-export/hbci/glade/hbci.glade.h:27
-#: ../src/import-export/qif-import/qif.glade.h:22
-msgid "GnuCash account name"
-msgstr "GnuCash Kontobezeichnung"
-
-#: ../src/import-export/hbci/glade/hbci.glade.h:28
-msgid "HBCI Connection Window"
-msgstr "HBCI Verbindungsfenster"
-
-#: ../src/import-export/hbci/glade/hbci.glade.h:29
-msgid "HBCI Setup"
-msgstr "HBCI Einrichtung"
-
-#: ../src/import-export/hbci/glade/hbci.glade.h:30
-msgid "HBCI Setup Finished"
-msgstr "HBCI Einrichtung beendet"
-
-#: ../src/import-export/hbci/glade/hbci.glade.h:31
-msgid "HBCI Version"
-msgstr "HBCI Version"
-
-#: ../src/import-export/hbci/glade/hbci.glade.h:32
-msgid "HBCI account name"
-msgstr "HBCI Kontobezeichnung"
-
-#: ../src/import-export/hbci/glade/hbci.glade.h:33
-msgid "Initial HBCI Setup"
+#: ../src/import-export/hbci/glade/hbci.glade.h:25
+#, fuzzy
+msgid "Initial Online Banking Setup"
 msgstr "Grundlegende HBCI Einrichtung"
 
-#: ../src/import-export/hbci/glade/hbci.glade.h:34
-msgid "Match HBCI accounts with GnuCash accounts"
+#: ../src/import-export/hbci/glade/hbci.glade.h:26
+#, fuzzy
+msgid "Match Online Banking accounts with GnuCash accounts"
 msgstr "HBCI Konten mit GnuCash Konten zuordnen"
 
-#: ../src/import-export/hbci/glade/hbci.glade.h:35
+#: ../src/import-export/hbci/glade/hbci.glade.h:27
 msgid "Move the selected transaction template one row down"
 msgstr "Gewählte Überweisungsvorlage eine Zeile nach unten umsortieren"
 
-#: ../src/import-export/hbci/glade/hbci.glade.h:36
+#: ../src/import-export/hbci/glade/hbci.glade.h:28
 msgid "Move the selected transaction template one row up"
 msgstr "Gewählte Überweisungsvorlage eine Zeile nach oben umsortieren"
 
-#: ../src/import-export/hbci/glade/hbci.glade.h:37
+#: ../src/import-export/hbci/glade/hbci.glade.h:29
 msgid "Name for new template"
 msgstr "Namen für neue Überweisungsvorlage"
 
-#: ../src/import-export/hbci/glade/hbci.glade.h:39
-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"
-"\n"
-"If you want to add another HBCI bank, user, or account, you can start this "
-"druid again anytime.\n"
-"\n"
-"Press \"Apply\" now."
-msgstr ""
-"Die Einrichtung des HBCI Zugangs und die Zuordnung zu den passenden GnuCash "
-"Konten ist fertig gestellt. Sie können nun HBCI-Aktionen in diesen Konten "
-"aufrufen (Menü Aktionen: Online Aktionen).\n"
-"\n"
-"Wenn Sie eine neue HBCI-Bank, einen neuen Benutzer oder ein neues Konto "
-"hinzufügen möchten, können Sie diesen Assistenten (Druiden) jederzeit wieder "
-"aufrufen.\n"
-"\n"
-"Klicken Sie jetzt »Anwenden«."
+#: ../src/import-export/hbci/glade/hbci.glade.h:30
+msgid "Online Banking Connection Window"
+msgstr "Onlinebanking Verbindungsfenster"
 
-#: ../src/import-export/hbci/glade/hbci.glade.h:44
+#: ../src/import-export/hbci/glade/hbci.glade.h:31
+#, fuzzy
+msgid "Online Banking Setup Finished"
+msgstr "HBCI Einrichtung beendet"
+
+#: ../src/import-export/hbci/glade/hbci.glade.h:32
+#, fuzzy
+msgid "Online Banking Version"
+msgstr "Online-Auftrag Einzelüberweisung"
+
+#: ../src/import-export/hbci/glade/hbci.glade.h:33
 msgid "Online Transaction"
 msgstr "Online-Auftrag Einzelüberweisung"
 
-#: ../src/import-export/hbci/glade/hbci.glade.h:45
+#: ../src/import-export/hbci/glade/hbci.glade.h:34
 msgid "Originator Account Number"
 msgstr "Konto-Nr. des Auftraggebers"
 
-#: ../src/import-export/hbci/glade/hbci.glade.h:46
+#: ../src/import-export/hbci/glade/hbci.glade.h:35
 msgid "Originator Name"
 msgstr "Auftraggeber: Name, Vorname"
 
-#: ../src/import-export/hbci/glade/hbci.glade.h:47
+#: ../src/import-export/hbci/glade/hbci.glade.h:36
 msgid "Payment Purpose (only for recipient)"
 msgstr "Verwendungszweck - z.B. Kunden-Referenznummer - (nur für Empfänger)"
 
-#: ../src/import-export/hbci/glade/hbci.glade.h:48
+#: ../src/import-export/hbci/glade/hbci.glade.h:37
 msgid "Payment Purpose continued"
 msgstr "noch Verwendungszweck (ggf. noch Anschrift des Auftraggebers)"
 
+#. src/import-export/qif-import/qif-import/qif-file.scm
+#. src/import-export/qif-import/qif-import/qif-to-gnc.scm
+#. src/import-export/qif-import/qif-import/qif-merge-groups.scm
 #. src/import-export/qif-import/qif-file.scm
 #. src/import-export/qif-import/qif-to-gnc.scm
 #. src/import-export/qif-import/qif-merge-groups.scm
-#: ../src/import-export/hbci/glade/hbci.glade.h:49
-#: ../intl-scm/guile-strings.c:3114 ../intl-scm/guile-strings.c:3120
-#: ../intl-scm/guile-strings.c:3128
+#: ../src/import-export/hbci/glade/hbci.glade.h:38
+#: ../intl-scm/guile-strings.c:5804 ../intl-scm/guile-strings.c:5810
+#: ../intl-scm/guile-strings.c:5818 ../intl-scm/guile-strings.c:5822
+#: ../intl-scm/guile-strings.c:5828 ../intl-scm/guile-strings.c:5836
 msgid "Progress"
 msgstr "Verlauf"
 
-#: ../src/import-export/hbci/glade/hbci.glade.h:50
+#: ../src/import-export/hbci/glade/hbci.glade.h:39
 msgid "Recipient Account Number"
 msgstr "Konto-Nr. des Empfängers"
 
-#: ../src/import-export/hbci/glade/hbci.glade.h:51
+#: ../src/import-export/hbci/glade/hbci.glade.h:40
 msgid "Recipient Bank Code"
 msgstr "Bankleitzahl"
 
-#: ../src/import-export/hbci/glade/hbci.glade.h:52
+#: ../src/import-export/hbci/glade/hbci.glade.h:41
 msgid "Recipient Name"
 msgstr "Empfänger: Name, Vorname / Firma"
 
-#: ../src/import-export/hbci/glade/hbci.glade.h:53
+#: ../src/import-export/hbci/glade/hbci.glade.h:42
 msgid "Sort"
 msgstr "Sortieren"
 
-#: ../src/import-export/hbci/glade/hbci.glade.h:54
+#: ../src/import-export/hbci/glade/hbci.glade.h:43
 msgid "Sort the list of transaction templates alphabetically"
 msgstr "Die Liste der Ãœberweisungsvorlagen alphabetisch sortieren"
 
-#: ../src/import-export/hbci/glade/hbci.glade.h:55
-msgid "Start AqHBCI Setup Wizard"
-msgstr "AqHBCI Einrichtungs-Assistent starten"
+#: ../src/import-export/hbci/glade/hbci.glade.h:44
+msgid "Start AqBanking Setup Wizard"
+msgstr "AqBanking Einrichtungs-Assistent starten"
 
-#: ../src/import-export/hbci/glade/hbci.glade.h:56
-msgid "Start AqHBCI Wizard"
-msgstr "AqHBCI Einrichtungs-Assistenten starten"
+#: ../src/import-export/hbci/glade/hbci.glade.h:45
+msgid "Start AqBanking Wizard"
+msgstr "AqBanking Einrichtungs-Assistenten starten"
 
-#: ../src/import-export/hbci/glade/hbci.glade.h:57
+#: ../src/import-export/hbci/glade/hbci.glade.h:46
+msgid "Start Online Banking Wizard"
+msgstr "Onlinebanking Einrichtungs-Assistenten starten"
+
+#: ../src/import-export/hbci/glade/hbci.glade.h:47
 msgid ""
-"The Setup of your HBCI connection is handled by the external program "
-"\"AqHBCI Setup Wizard\". Please press the button below to start this program."
-"\t"
+"The Setup of your Online Banking connection is handled by the external "
+"program \"AqBanking Setup Wizard\". Please press the button below to start "
+"this program.\t"
+msgstr "Die Einrichtung Ihrer Onlinebanking-Verbindung (HBCI) wird von dem externen Programm »AqBanking Einrichtungs-Assistent« durchgeführt. Bitte klicken Sie den Knopf, um dieses Programm zu starten."
+
+#: ../src/import-export/hbci/glade/hbci.glade.h:48
+msgid ""
+"The setup for matching Online Banking accounts to GnuCash accounts is now "
+"finished.  You can now invoke Online Banking actions on those accounts.\n"
+"\n"
+"If you want to add another bank, user, or account, you can start this druid "
+"again anytime.\n"
+"\n"
+"Press \"Apply\" now."
 msgstr ""
-"Die Einrichtung Ihrer HBCI-Verbindung wird von dem externen Programm »AqHBCI "
-"Einrichtungs-Assistent« durchgeführt. Bitte klicken Sie den Knopf, um dieses "
-"Programm zu starten."
+"Die Einrichtung des Onlinebanking-Zugangs und die Zuordnung zu den passenden GnuCash Konten ist fertig gestellt. Sie können nun Onlinebanking-Aktionen in diesen Konten aufrufen (Menü Aktionen: Online Aktionen).\n"
+"\n"
+"Wenn Sie eine neue Bank, einen neuen Benutzer oder ein neues Konto hinzufügen möchten, können Sie diesen Assistenten (Druiden) jederzeit wieder aufrufen.\n"
+"\n"
+"Klicken Sie jetzt »Anwenden«."
 
-#: ../src/import-export/hbci/glade/hbci.glade.h:58
+#: ../src/import-export/hbci/glade/hbci.glade.h:53
 msgid ""
-"This druid helps you setting up your HBCI connection with your bank.\n"
+"This druid helps you setting up your Online Banking connection with your "
+"bank.\n"
 "\n"
-"You first need to apply for HBCI access at your bank. If your bank  decides "
-"to grant you HBCI access, the bank will send you a letter,  containing \n"
+"You first need to apply for Online Banking access at your bank. If your "
+"bank  decides to grant you electronic access, they will send you a letter "
+"containing \n"
 "\n"
 "* The bank code of your bank\n"
 "* The user ID that identifies you to your bank\n"
-"* The Internet address of your bank's HBCI server\n"
-"* Information about the cryptographic public key of your bank (\"Ini-Letter"
-"\").\n"
+"* The Internet address of your bank's Online Banking server\n"
+"* For HBCI Online Banking, information about the cryptographic public key of "
+"your bank (\"Ini-Letter\").\n"
 "\n"
 "This information will be needed in the following. Press \"Forward\" now.\n"
 "\n"
-"NOTE: NO WARRANTIES FOR ANYTHING. Some banks are running a poorly "
-"implemented HBCI. You should not rely on time-critical transfers through "
-"HBCI, since sometimes your bank does not give you correct feedback when a "
-"transfer has been rejected.\n"
+"NOTE: NO WARRANTIES FOR ANYTHING. Some banks run a poorly implemented Online "
+"Banking server. You should not rely on time-critical transfers through "
+"Online Banking, because sometimes the bank does not give you correct "
+"feedback when a transfer is rejected.\n"
 "\n"
-"Press \"Cancel\" if you do not wish to setup any HBCI connection now."
+"Press \"Cancel\" if you do not wish to setup any Online Banking connection "
+"now."
 msgstr ""
-"Dieser Assistent hilft Ihnen, die HBCI Verbindung mit Ihrer Bank "
-"einzurichten.\n"
+"Dieser Assistent hilft Ihnen, die Online-Verbindung (HBCI) mit Ihrer Bank einzurichten.\n"
 "\n"
-"Zunächst müssen Sie bei Ihrer Bank die Freischaltung des HBCI Zugangs "
-"beantragt haben. Ihre Bank müsste Ihnen dann einen Brief zugesandt haben, "
-"der u.a. folgende Angaben enthält:\n"
+"Zunächst müssen Sie bei Ihrer Bank die Freischaltung des HBCI-Zugangs beantragt haben. Ihre Bank müsste Ihnen dann einen Brief zugesandt haben, der u.a. folgende Angaben enthält:\n"
 "\n"
 "* Die Bankleitzahl Ihrer Bank\n"
 "* Die Benutzerkennung, die Sie gegenüber Ihrer Bank identifiziert\n"
 "* Die Internetadresse des Bank-Servers \n"
-"* Informationen über die öffentlichen kryptographischen Schlüssel Ihrer Bank "
-"(»Ini-Brief«)\n"
+"* Informationen über die öffentlichen kryptographischen Schlüssel Ihrer Bank (»Ini-Brief«)\n"
 "\n"
 "Diese Informationen werden im folgenden benötigt. Klicken Sie jetzt »Vor«.\n"
 "\n"
-"ACHTUNG: Die Programmierer geben keine Garantie auf korrekte Funktion. "
-"Insbesondere kann bei manchen Bank-Servern eine schlechte HBCI-"
-"Implementierung dazu führen, dass Sie keine Fehlermeldung bei "
-"zurückgewiesenen Aufträgen erhalten. Sie sollten sich daher bei "
-"zeitkritischen Aufträgen nicht auf HBCI allein verlassen.\n"
+"ACHTUNG: Die Programmierer geben keine Garantie auf korrekte Funktion. Insbesondere kann bei manchen Bank-Servern eine schlechte HBCI-Implementierung dazu führen, dass Sie keine Fehlermeldung bei zurückgewiesenen Aufträgen erhalten. Sie sollten sich daher bei zeitkritischen Aufträgen nicht auf HBCI allein verlassen.\n"
 "\n"
-"Klicken Sie »Abbrechen«, wenn Sie jetzt keine HBCI Verbindung einrichten "
-"möchten."
+"Klicken Sie »Abbrechen«, wenn Sie jetzt keine HBCI Verbindung einrichten möchten."
 
-#: ../src/import-export/hbci/glade/hbci.glade.h:72
-msgid ""
-"Update \n"
-"account list"
-msgstr ""
-"Kontoliste\n"
-"aktualisieren"
-
-#: ../src/import-export/hbci/glade/hbci.glade.h:74
+#: ../src/import-export/hbci/glade/hbci.glade.h:67
 msgid "Use Transaction Template"
 msgstr "Ãœberweisungsvorlage:"
 
-#: ../src/import-export/hbci/glade/hbci.glade.h:75
+#: ../src/import-export/hbci/glade/hbci.glade.h:68
 msgid "Version"
 msgstr "Version"
 
-#: ../src/import-export/hbci/glade/hbci.glade.h:76
+#: ../src/import-export/hbci/glade/hbci.glade.h:69
 msgid "_Earliest possible date"
 msgstr "_Frühestes mögliches Datum"
 
-#: ../src/import-export/hbci/glade/hbci.glade.h:77
+#: ../src/import-export/hbci/glade/hbci.glade.h:70
 msgid "_Last retrieval date"
 msgstr "_Letztes Abrufdatum"
 
-#: ../src/import-export/hbci/glade/hbci.glade.h:78
+#: ../src/import-export/hbci/glade/hbci.glade.h:71
 msgid "_Now"
 msgstr "_Jetzt"
 
-#: ../src/import-export/hbci/glade/hbci.glade.h:79
+#: ../src/import-export/hbci/glade/hbci.glade.h:72
 msgid "at Bank"
 msgstr "der Bank"
 
-#: ../src/import-export/hbci/glade/hbci.glade.h:80
+#: ../src/import-export/hbci/glade/hbci.glade.h:73
 msgid "something"
 msgstr "irgendwas"
 
@@ -13012,63 +13281,128 @@
 msgstr "Passwort:"
 
 #: ../src/import-export/hbci/glade/hbciprefs.glade.h:1
-msgid "<b>HBCI</b>"
-msgstr "<b>HBCI</b>"
+msgid "<b>Online Banking</b>"
+msgstr "<b>Onlinebanking</b>"
 
 #: ../src/import-export/hbci/glade/hbciprefs.glade.h:2
-msgid "Activate verbose debug messages for HBCI Online Banking."
-msgstr "Ausführliche Fehlermeldungen für HBCI Online Banking aktivieren."
+msgid "Activate verbose debug messages for Online Banking."
+msgstr "Ausführliche Fehlermeldungen für Onlinebanking aktivieren."
 
 #: ../src/import-export/hbci/glade/hbciprefs.glade.h:4
 msgid "Remember _PIN"
 msgstr "_PIN merken"
 
 #: ../src/import-export/hbci/glade/hbciprefs.glade.h:5
-msgid "Remember the PIN for HBCI in memory during a session."
-msgstr "Die PIN für HBCI während einer GnuCash-Sitzung im Speicher merken."
+msgid "Remember the Online Banking PIN in memory during a session."
+msgstr "Die PIN für Onlinebanking während einer GnuCash-Sitzung im Speicher merken."
 
 #: ../src/import-export/hbci/glade/hbciprefs.glade.h:6
 msgid "_Verbose debug messages"
 msgstr "Ausführliche _Fehlermeldungen"
 
-#. Translators: Strings from this file are really only
-#. * needed inside Germany (HBCI is not supported anywhere
-#. * else). You may safely ignore strings from the
-#. * import-export/hbci subdirectory in other countries.
-#.
-#: ../src/import-export/hbci/gnc-hbci-getbalance.c:265
+#: ../src/import-export/hbci/gnc-file-aqb-import.c:156
+#, fuzzy
+msgid "Select an DTAUS file to process"
+msgstr "Zu verarbeitende MT940-Datei auswählen"
+
+#: ../src/import-export/hbci/gnc-file-aqb-import.c:336
 msgid ""
-"The downloaded HBCI Balance was zero.\n"
+"No Online Banking account found for this gnucash account. These transactions "
+"will not be executed by Online Banking."
+msgstr ""
+
+#: ../src/import-export/hbci/gnc-file-aqb-import.c:384
+#: ../src/import-export/hbci/gnc-hbci-transfer.c:136
+#, fuzzy
+msgid ""
+"The backend found an error during the preparation of the job. It is not "
+"possible to execute this job. \n"
 "\n"
+"Most probable the bank does not support your chosen job or your Online "
+"Banking account does not have the permission to execute this job. More error "
+"messages might be visible on your console log.\n"
+"\n"
+"Do you want to enter the job again?"
+msgstr ""
+"Das AqBanking-Modul hat einen Fehler während der Vorbereitung des Auftrags "
+"gefunden. Es ist nicht möglich, den Auftrag auszuführen.\n"
+"\n"
+"Wahrscheinlich wird dieser HBCI Geschäftsvorfall von Ihrer Bank leider nicht "
+"unterstützt oder ist für Ihren HBCI-Zugang nicht freigeschaltet. Weitere "
+"Fehlermeldungen könnten auf dem Console-Log sichtbar sein.\n"
+"\n"
+"Wollen Sie den Auftrag erneut eingeben?"
+
+#: ../src/import-export/hbci/gnc-file-aqb-import.c:420
+msgid ""
+"Executing the Online Banking outbox failed. Please check the log window."
+msgstr ""
+
+#: ../src/import-export/hbci/gnc-file-aqb-import.c:447
+#, c-format
+msgid ""
+"A debit note has been refused by the bank. The refused debit note has the "
+"following data:\n"
+"Remote bank code: \"%s\"\n"
+"Remote account number: \"%s\"\n"
+"Description and remote name: \"%s\"\n"
+"Value: \"%s\"\n"
+msgstr ""
+
+#: ../src/import-export/hbci/gnc-file-aqb-import.c:463
+msgid ""
+"One of the jobs was sent to the bank successfully, but the bank is refusing "
+"to execute the job. Please check the log window for the exact error message "
+"of the bank. The line with the error message contains a code number that is "
+"greater than 9000.\n"
+"\n"
+"The job has been removed from the queue."
+msgstr ""
+"Der Auftrag wurde erfolgreich an die Bank geschickt, aber die Bank "
+"verweigert die Ausführung. Bitte überprüfen Sie die Ausgaben im Protokoll-"
+"Fenster, um die genaue Fehlermeldung zu lesen. Die Zeile mit der genauen "
+"Fehlermeldung enthält eine Code-Nummer, die größer als 9000 ist.\n"
+"\n"
+"Wollen Sie den Auftrag erneut eingeben?"
+
+#. Translators: Strings from this file are needed only in
+#. * countries that have one of aqbanking's Online Banking
+#. * techniques available. This is 'OFX DirectConnect'
+#. * (U.S. and others), 'HBCI' (in Germany), or 'YellowNet'
+#. * (Switzerland). If none of these techniques are available
+#. * in your country, you may safely ignore strings from the
+#. * import-export/hbci subdirectory.
+#: ../src/import-export/hbci/gnc-hbci-getbalance.c:271
+msgid ""
+"The downloaded Online Banking Balance was zero.\n"
+"\n"
 "Either this is the correct balance, or your bank does not support Balance "
-"download in this HBCI version. In the latter case you should choose a higher "
-"HBCI version number in the HBCI Setup. After that, try again to download the "
-"HBCI Balance."
+"download in this Online Banking version. In the latter case you should "
+"choose a different Online Banking version number in the Online Banking "
+"(AqBanking or HBCI) Setup. After that, try again to download the Online "
+"Banking Balance."
 msgstr ""
 "Der abgefragte Saldo war Null. \n"
 "\n"
-"Entweder war dies der korrekte Saldo, oder Ihre Bank bietet anscheinend "
-"keine Saldenabfrage in der gewählten HBCI-Version an. Im letzteren Fall "
-"können Sie im HBCI-Einrichtungs-Assistent eine höhere HBCI-Version "
-"auswählen. Versuchen Sie anschließend erneut, den Saldo abzufragen."
+"Entweder war dies der korrekte Saldo, oder Ihre Bank bietet anscheinend keine Saldenabfrage in der gewählten HBCI-Version an. Im letzteren Fall können Sie im Onlinebanking-Einrichtungs-Assistent eine höhere HBCI-Version auswählen. Versuchen Sie anschließend erneut, den Saldo abzufragen."
 
-#: ../src/import-export/hbci/gnc-hbci-getbalance.c:281
+#: ../src/import-export/hbci/gnc-hbci-getbalance.c:289
 #, c-format
 msgid ""
-"Result of HBCI job: \n"
+"Result of Online Banking job: \n"
 "Account booked balance is %s"
 msgstr ""
-"Ergebnis des HBCI Auftrag:\n"
+"Ergebnis der Saldenabfrage:\n"
 "Gebuchter Saldo des Kontos ist %s"
 
-#: ../src/import-export/hbci/gnc-hbci-getbalance.c:288
+#: ../src/import-export/hbci/gnc-hbci-getbalance.c:296
 #, c-format
 msgid "For your information: This account also has a noted balance of %s\n"
 msgstr ""
 "Zu Ihrer Information: Dieses Konto hat außerdem folgenden Saldo an zur "
 "Ausführung vorgemerkten Aufträgen: %s\n"
 
-#: ../src/import-export/hbci/gnc-hbci-getbalance.c:293
+#: ../src/import-export/hbci/gnc-hbci-getbalance.c:301
 msgid ""
 "The booked balance is identical to the current reconciled balance of the "
 "account."
@@ -13076,36 +13410,18 @@
 "Dieser gebuchte Saldo stimmt mit dem aktuellen abgeglichenen Saldo Ihres "
 "Kontos überein."
 
-#: ../src/import-export/hbci/gnc-hbci-getbalance.c:307
+#: ../src/import-export/hbci/gnc-hbci-getbalance.c:315
 msgid "Reconcile account now?"
 msgstr "Konto jetzt abgleichen?"
 
 #: ../src/import-export/hbci/gnc-hbci-gettrans.c:207
-msgid "The HBCI import returned no transactions for the selected time period."
+msgid ""
+"The Online Banking import returned no transactions for the selected time "
+"period."
 msgstr "Es liegen keine Buchungen für die gewählte Zeitspanne vor."
 
-#: ../src/import-export/hbci/gnc-hbci-transfer.c:133
+#: ../src/import-export/hbci/gnc-hbci-transfer.c:219
 msgid ""
-"The backend found an error during the preparation of the job. It is not "
-"possible to execute this job. \n"
-"\n"
-"Most probable the bank does not support your chosen job or your HBCI account "
-"does not have the permission to execute this job. More error messages might "
-"be visible on your console log.\n"
-"\n"
-"Do you want to enter the job again?"
-msgstr ""
-"Das AqBanking-Modul hat einen Fehler während der Vorbereitung des Auftrags "
-"gefunden. Es ist nicht möglich, den Auftrag auszuführen.\n"
-"\n"
-"Wahrscheinlich wird dieser HBCI Geschäftsvorfall von Ihrer Bank leider nicht "
-"unterstützt oder ist für Ihren HBCI-Zugang nicht freigeschaltet. Weitere "
-"Fehlermeldungen könnten auf dem Console-Log sichtbar sein.\n"
-"\n"
-"Wollen Sie den Auftrag erneut eingeben?"
-
-#: ../src/import-export/hbci/gnc-hbci-transfer.c:216
-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 ""
@@ -13113,19 +13429,19 @@
 "Überweisungsdialog abgebrochen. Möchten Sie die Liste der "
 "Ãœberweisungsvorlagen trotzdem speichern?"
 
-#: ../src/import-export/hbci/gnc-hbci-transfer.c:247
-msgid "Online HBCI Direct Debit Note"
+#: ../src/import-export/hbci/gnc-hbci-transfer.c:250
+msgid "Online Banking Direct Debit Note"
 msgstr "Online-Auftrag Einzellastschrift"
 
-#: ../src/import-export/hbci/gnc-hbci-transfer.c:249
-msgid "Online HBCI Bank-Internal Transfer"
+#: ../src/import-export/hbci/gnc-hbci-transfer.c:252
+msgid "Online Banking Bank-Internal Transfer"
 msgstr "Online-Auftrag Einzelumbuchung"
 
-#: ../src/import-export/hbci/gnc-hbci-transfer.c:252
-msgid "Online HBCI Transaction"
+#: ../src/import-export/hbci/gnc-hbci-transfer.c:255
+msgid "Online Banking Transaction"
 msgstr "Online-Auftrag Einzelüberweisung"
 
-#: ../src/import-export/hbci/gnc-hbci-utils.c:291
+#: ../src/import-export/hbci/gnc-hbci-utils.c:290
 msgid ""
 "The PIN you entered was wrong.\n"
 "Do you want to try again?"
@@ -13133,7 +13449,7 @@
 "Die eingegebene PIN war falsch.\n"
 "Möchten Sie erneut versuchen?"
 
-#: ../src/import-export/hbci/gnc-hbci-utils.c:297
+#: ../src/import-export/hbci/gnc-hbci-utils.c:296
 msgid ""
 "The PIN you entered was wrong.\n"
 "ATTENTION: You have zero further wrong retries left!\n"
@@ -13143,7 +13459,7 @@
 "VORSICHT: Es ist kein weiterer Fehlversuch möglich!\n"
 "Möchten Sie erneut versuchen?"
 
-#: ../src/import-export/hbci/gnc-hbci-utils.c:304
+#: ../src/import-export/hbci/gnc-hbci-utils.c:303
 msgid ""
 "Unfortunately you entered a wrong PIN for too many times. Your chip card is "
 "therefore destroyed. Aborting."
@@ -13151,97 +13467,152 @@
 "Sie haben zu oft eine falsche PIN eingegeben. Ihre Chipkarte ist damit "
 "leider unbrauchbar geworden. Aktion wird abgebrochen."
 
-#: ../src/import-export/hbci/gnc-hbci-utils.c:313
+#: ../src/import-export/hbci/gnc-hbci-utils.c:312
 msgid ""
 "No chip card has been found in the chip card reader. Do you want to try "
 "again?"
 msgstr ""
 "Im Kartenleser wurde keine Chipkarte erkannt. Möchten Sie erneut versuchen?"
 
-#: ../src/import-export/hbci/gnc-hbci-utils.c:319
+#: ../src/import-export/hbci/gnc-hbci-utils.c:318
 msgid ""
-"Unfortunately this HBCI job is not supported by your bank or for your "
-"account. Aborting."
+"Unfortunately this Online Banking job is not supported by your bank or for "
+"your account. Aborting."
 msgstr ""
 "Dieser HBCI Geschäftsvorfall wird von Ihrer Bank leider nicht unterstützt "
 "oder ist Ihnen nicht gestattet. Aktion wird abgebrochen."
 
-#: ../src/import-export/hbci/gnc-hbci-utils.c:327
+#: ../src/import-export/hbci/gnc-hbci-utils.c:326
 msgid ""
-"The server of your bank refused the HBCI connection. Please try again later. "
-"Aborting."
-msgstr ""
-"Der HBCI Server der Bank hat die Verbindung abgewiesen. Bitte versuchen Sie "
-"es später noch einmal. Aktion wird abgebrochen."
+"The server of your bank refused the Online Banking connection. Please try "
+"again later. Aborting."
+msgstr "Der Onlinebanking-Server der Bank hat die Verbindung abgewiesen. Bitte versuchen Sie es später noch einmal. Aktion wird abgebrochen."
 
 #. src/import-export/qif-io-core/qif-invst-xtn-import.scm
 #. src/import-export/qif-import/qif-dialog-utils.scm
-#: ../src/import-export/hbci/gnc-hbci-utils.c:533
-#: ../intl-scm/guile-strings.c:3090 ../intl-scm/guile-strings.c:3112
+#. src/import-export/qif-import/qif-import/qif-dialog-utils.scm
+#: ../src/import-export/hbci/gnc-hbci-utils.c:534
+#: ../intl-scm/guile-strings.c:5758 ../intl-scm/guile-strings.c:5780
+#: ../intl-scm/guile-strings.c:5802
 msgid "Unspecified"
 msgstr "Nicht spezifiziert"
 
 #. Menus
-#: ../src/import-export/hbci/gnc-plugin-hbci.c:85
+#: ../src/import-export/hbci/gnc-plugin-hbci.c:96
 msgid "_Online Actions"
 msgstr "_Online Aktionen"
 
 #. Menu Items
-#: ../src/import-export/hbci/gnc-plugin-hbci.c:88
-msgid "_HBCI Setup..."
-msgstr "_HBCI Einrichtung..."
+#: ../src/import-export/hbci/gnc-plugin-hbci.c:99
+msgid "_Online Banking Setup..."
+msgstr "_Onlinebanking Einrichtung..."
 
-#: ../src/import-export/hbci/gnc-plugin-hbci.c:89
-msgid "Initial setup of HBCI/AqBanking access"
-msgstr "Grundlegende HBCI/AqBanking Einrichtung"
+#: ../src/import-export/hbci/gnc-plugin-hbci.c:100
+msgid ""
+"Initial setup of Online Banking access (HBCI, or OFX DirectConnect, using "
+"AqBanking)"
+msgstr ""
 
-#: ../src/import-export/hbci/gnc-plugin-hbci.c:91
+#: ../src/import-export/hbci/gnc-plugin-hbci.c:102
 msgid "Get _Balance"
 msgstr "_Saldenabfrage"
 
-#: ../src/import-export/hbci/gnc-plugin-hbci.c:92
-msgid "Get the account balance online through HBCI/AqBanking"
-msgstr "Kontosaldo online abfragen via HBCI/AqBanking"
+#: ../src/import-export/hbci/gnc-plugin-hbci.c:103
+msgid "Get the account balance online through Online Banking"
+msgstr "Kontosaldo online abfragen via HBCI/Onlinebanking"
 
-#: ../src/import-export/hbci/gnc-plugin-hbci.c:94
+#: ../src/import-export/hbci/gnc-plugin-hbci.c:105
 msgid "Get _Transactions..."
 msgstr "Abfrage Konto_umsätze..."
 
-#: ../src/import-export/hbci/gnc-plugin-hbci.c:95
-msgid "Get the transactions online through HBCI/AqBanking"
-msgstr "Kontoumsätze online abfragen via HBCI/AqBanking"
+#: ../src/import-export/hbci/gnc-plugin-hbci.c:106
+msgid "Get the transactions online through Online Banking"
+msgstr "Kontoumsätze online abfragen via HBCI/Onlinebanking"
 
-#: ../src/import-export/hbci/gnc-plugin-hbci.c:97
+#: ../src/import-export/hbci/gnc-plugin-hbci.c:108
 msgid "_Issue Transaction..."
 msgstr "_Einzelüberweisung..."
 
-#: ../src/import-export/hbci/gnc-plugin-hbci.c:98
-msgid "Issue a new transaction online through HBCI"
+#: ../src/import-export/hbci/gnc-plugin-hbci.c:109
+msgid "Issue a new transaction online through Online Banking"
 msgstr "Neue Einzelüberweisung mit HBCI online absenden"
 
-#: ../src/import-export/hbci/gnc-plugin-hbci.c:106
+#: ../src/import-export/hbci/gnc-plugin-hbci.c:117
 msgid "I_nternal Transaction..."
 msgstr "Interne _Umbuchung..."
 
-#: ../src/import-export/hbci/gnc-plugin-hbci.c:107
-msgid "Issue a new bank-internal transaction online through HBCI/AqBanking"
-msgstr "Neue bankinterne Einzelumbuchung mit HBCI/AqBanking online absenden"
+#: ../src/import-export/hbci/gnc-plugin-hbci.c:118
+msgid "Issue a new bank-internal transaction online through Online Banking"
+msgstr "Neue bankinterne Einzelumbuchung mit HBCI/Onlinebanking online absenden"
 
-#: ../src/import-export/hbci/gnc-plugin-hbci.c:110
+#: ../src/import-export/hbci/gnc-plugin-hbci.c:121
 msgid "_Direct Debit..."
 msgstr "Einzel_lastschrift..."
 
-#: ../src/import-export/hbci/gnc-plugin-hbci.c:111
-msgid "Issue a new direct debit note online through HBCI/AqBanking"
-msgstr "Neue Einzellastschrift online mit HBCI/AqBanking absenden"
+#: ../src/import-export/hbci/gnc-plugin-hbci.c:122
+msgid "Issue a new direct debit note online through Online Banking"
+msgstr "Neue Einzellastschrift online mit HBCI/Onlinebanking absenden"
 
-#: ../src/import-export/hbci/hbci-interaction.c:358
+#. File -> Import menu item
+#: ../src/import-export/hbci/gnc-plugin-hbci.c:126
+msgid "Import _MT940"
+msgstr "_MT940 importieren"
+
+#: ../src/import-export/hbci/gnc-plugin-hbci.c:127
+msgid "Import a MT940 file into GnuCash"
+msgstr ""
+
+#: ../src/import-export/hbci/gnc-plugin-hbci.c:129
+msgid "Import MT94_2"
+msgstr "MT94_2 importieren"
+
+#: ../src/import-export/hbci/gnc-plugin-hbci.c:130
+msgid "Import a MT942 file into GnuCash"
+msgstr ""
+
+#: ../src/import-export/hbci/gnc-plugin-hbci.c:132
+msgid "Import _DTAUS"
+msgstr "_DTAUS importieren"
+
+#: ../src/import-export/hbci/gnc-plugin-hbci.c:133
+msgid "Import a DTAUS file into GnuCash"
+msgstr ""
+
+#: ../src/import-export/hbci/gnc-plugin-hbci.c:135
+msgid "Import _CSV"
+msgstr "_CSV importieren"
+
+#: ../src/import-export/hbci/gnc-plugin-hbci.c:136
+msgid "Import a CSV file into GnuCash"
+msgstr ""
+
+#: ../src/import-export/hbci/gnc-plugin-hbci.c:138
+msgid "Import DTAUS and _send..."
+msgstr "DTAUS importieren und _senden..."
+
+#: ../src/import-export/hbci/gnc-plugin-hbci.c:139
+msgid ""
+"Import a DTAUS file into GnuCash and send the transfers online through "
+"Online Banking"
+msgstr ""
+
+#: ../src/import-export/hbci/gnc-plugin-hbci.c:141
+msgid "Import CSV and s_end..."
+msgstr "CSV importieren und _senden..."
+
+#: ../src/import-export/hbci/gnc-plugin-hbci.c:142
+msgid ""
+"Import a CSV file into GnuCash and send the transfers online through Online "
+"Banking"
+msgstr ""
+
+#: ../src/import-export/hbci/hbci-interaction.c:389
 #, c-format
 msgid ""
 "The PIN needs to be at least %d characters long. Do you want to try again?"
 msgstr "Die PIN muss mindestens %d Zeichen lang sein.  Erneut versuchen?"
 
-#: ../src/import-export/hbci/hbci-interaction.c:371
+#: ../src/import-export/hbci/hbci-interaction.c:402
 #, c-format
 msgid ""
 "You entered %ld characters, but the PIN must be no longer than %d "
@@ -13250,13 +13621,13 @@
 "Sie haben %ld Zeichen eingegeben, aber die PIN darf nicht länger als %d "
 "Zeichen sein.  Erneut versuchen?"
 
-#: ../src/import-export/hbci/hbci-interaction.c:439
+#: ../src/import-export/hbci/hbci-interaction.c:470
 #, c-format
 msgid ""
 "This TAN needs to be at least %d characters long. Do you want to try again?"
 msgstr "Diese TAN muss mindestens %d Zeichen lang sein.  Erneut versuchen?"
 
-#: ../src/import-export/hbci/hbci-interaction.c:452
+#: ../src/import-export/hbci/hbci-interaction.c:483
 #, c-format
 msgid ""
 "You entered %ld characters, but the TAN must be no longer than %d "
@@ -13266,14 +13637,22 @@
 "Zeichen sein.  Erneut versuchen?"
 
 #: ../src/import-export/hbci/schemas/apps_gnucash_dialog_hbci.schemas.in.h:1
+msgid "CSV import data format"
+msgstr ""
+
+#: ../src/import-export/hbci/schemas/apps_gnucash_dialog_hbci.schemas.in.h:2
 msgid "Close dialog when finished"
 msgstr "Fenster nach Verbindungsende schließen"
 
-#: ../src/import-export/hbci/schemas/apps_gnucash_dialog_hbci.schemas.in.h:2
+#: ../src/import-export/hbci/schemas/apps_gnucash_dialog_hbci.schemas.in.h:3
+msgid "DTAUS import data format"
+msgstr ""
+
+#: ../src/import-export/hbci/schemas/apps_gnucash_dialog_hbci.schemas.in.h:4
 msgid "Enables verbose debug messages for HBCI/AqBanking Online Banking."
 msgstr "Ausführliche Fehlermeldungen für HBCI Online Banking aktivieren."
 
-#: ../src/import-export/hbci/schemas/apps_gnucash_dialog_hbci.schemas.in.h:3
+#: ../src/import-export/hbci/schemas/apps_gnucash_dialog_hbci.schemas.in.h:5
 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 "
@@ -13284,7 +13663,7 @@
 "Wenn nicht aktiviert, muss die PIN bei jeder einzelnen Aktion von HBCI/"
 "AqBanking eingegeben werden und wird nicht im Speicher gehalten."
 
-#: ../src/import-export/hbci/schemas/apps_gnucash_dialog_hbci.schemas.in.h:4
+#: ../src/import-export/hbci/schemas/apps_gnucash_dialog_hbci.schemas.in.h:6
 msgid ""
 "If active, the window will be closed automatically when you finish the HBCI/"
 "AqBanking import process. Otherwise it will stay open."
@@ -13292,11 +13671,47 @@
 "Wenn aktiviert, wird das Fenster automatisch geschlossen, wenn der HBCI/"
 "AqBanking-Import beendet ist. Andernfalls bleibt das Fenster geöffnet."
 
-#: ../src/import-export/hbci/schemas/apps_gnucash_dialog_hbci.schemas.in.h:5
+#: ../src/import-export/hbci/schemas/apps_gnucash_dialog_hbci.schemas.in.h:7
 msgid "Remember the PIN in memory"
 msgstr "HBCI PIN im Speicher merken"
 
 #: ../src/import-export/hbci/schemas/apps_gnucash_dialog_hbci.schemas.in.h:8
+msgid "SWIFT MT940 import data format"
+msgstr ""
+
+#: ../src/import-export/hbci/schemas/apps_gnucash_dialog_hbci.schemas.in.h:9
+msgid "SWIFT MT942 import data format"
+msgstr ""
+
+#: ../src/import-export/hbci/schemas/apps_gnucash_dialog_hbci.schemas.in.h:12
+msgid ""
+"This setting specifies the data format when importing CSV files. The "
+"AqBanking library offers various import formats (called \"profiles\") of "
+"which you can choose one here."
+msgstr ""
+
+#: ../src/import-export/hbci/schemas/apps_gnucash_dialog_hbci.schemas.in.h:13
+msgid ""
+"This setting specifies the data format when importing DTAUS files. The "
+"AqBanking library offers various import formats (called \"profiles\") of "
+"which you can choose one here."
+msgstr ""
+
+#: ../src/import-export/hbci/schemas/apps_gnucash_dialog_hbci.schemas.in.h:14
+msgid ""
+"This setting specifies the data format when importing SWIFT MT940 files. The "
+"AqBanking library offers various import formats (called \"profiles\") of "
+"which you can choose one here."
+msgstr ""
+
+#: ../src/import-export/hbci/schemas/apps_gnucash_dialog_hbci.schemas.in.h:15
+msgid ""
+"This setting specifies the data format when importing SWIFT MT942 files. The "
+"AqBanking library offers various import formats (called \"profiles\") of "
+"which you can choose one here."
+msgstr ""
+
+#: ../src/import-export/hbci/schemas/apps_gnucash_dialog_hbci.schemas.in.h:16
 msgid "Verbose HBCI debug messages"
 msgstr "Ausführliche HBCI-Fehlermeldungen"
 
@@ -13304,11 +13719,11 @@
 msgid "Account ID"
 msgstr "Kontonummer"
 
-#: ../src/import-export/import-account-matcher.c:197
+#: ../src/import-export/import-account-matcher.c:209
 msgid "(Full account ID: "
 msgstr "(Komplette Kontonummer: "
 
-#: ../src/import-export/import-account-matcher.c:220
+#: ../src/import-export/import-account-matcher.c:234
 #, c-format
 msgid ""
 "The account %s is a placeholder account and does not allow transactions. "
@@ -13351,56 +13766,72 @@
 msgid "y/d/m"
 msgstr "Jahr/Tag/Monat"
 
-#: ../src/import-export/import-main-matcher.c:304
+#: ../src/import-export/import-main-matcher.c:208
 msgid "Destination account for the auto-balance split."
 msgstr "Gegenkonto für Ausgleichsbuchung."
 
-#: ../src/import-export/import-main-matcher.c:651
+#: ../src/import-export/import-main-matcher.c:423
+msgid "A"
+msgstr "Neu"
+
+#: ../src/import-export/import-main-matcher.c:425
+msgid "R"
+msgstr "Abgl"
+
+#: ../src/import-export/import-main-matcher.c:435
+msgid "Info"
+msgstr "Information"
+
+#: ../src/import-export/import-main-matcher.c:586
 msgid "New, already balanced"
 msgstr "Neu (und ausgeglichen)"
 
 #. Translators: %1$s is the amount to be
 #. transferred. %2$s is the destination account.
-#: ../src/import-export/import-main-matcher.c:677
+#: ../src/import-export/import-main-matcher.c:610
 #, c-format
 msgid "New, transfer %s to (manual) \"%s\""
 msgstr "Neu (Buchung von %s nach »%s«, manuell gewählt)"
 
 #. Translators: %1$s is the amount to be
 #. transferred. %2$s is the destination account.
-#: ../src/import-export/import-main-matcher.c:685
+#: ../src/import-export/import-main-matcher.c:618
 #, c-format
 msgid "New, transfer %s to (auto) \"%s\""
 msgstr "Neu (Buchung von %s nach »%s«, automatisch gewählt)"
 
 #. Translators: %s is the amount to be transferred.
-#: ../src/import-export/import-main-matcher.c:697
+#: ../src/import-export/import-main-matcher.c:629
 #, c-format
 msgid "New, UNBALANCED (need acct to transfer %s)!"
 msgstr "Neu (Nicht ausgeglichen, %s noch auszugleichen)"
 
-#: ../src/import-export/import-main-matcher.c:711
+#: ../src/import-export/import-main-matcher.c:641
 msgid "Reconcile (manual) match"
 msgstr "Abgleichen (mit manuell gewählter Zuordnung)"
 
-#: ../src/import-export/import-main-matcher.c:716
+#: ../src/import-export/import-main-matcher.c:645
 msgid "Reconcile (auto) match"
 msgstr "Abgleichen (mit automatisch gewählter Zuordnung)"
 
-#: ../src/import-export/import-main-matcher.c:724
+#: ../src/import-export/import-main-matcher.c:651
 msgid "Match missing!"
 msgstr "Zuordnung fehlt"
 
-#: ../src/import-export/import-main-matcher.c:732
+#: ../src/import-export/import-main-matcher.c:660
 msgid "Do not import (no action selected)"
 msgstr "Nicht importieren (keine Import-Aktion gewählt)"
 
+#: ../src/import-export/import-match-picker.c:363
+msgid "Confidence"
+msgstr "Genauigkeit"
+
 #: ../src/import-export/import-provider-format.glade.h:1
 msgid "(no)"
 msgstr "(kein(e))"
 
 #: ../src/import-export/import-provider-format.glade.h:2
-#: ../src/import-export/qif-import/qif.glade.h:11
+#: ../src/import-export/qif-import/qif.glade.h:9
 msgid "Click \"Back\" to cancel the loading of this file and choose another."
 msgstr ""
 "Drücken Sie »Zurück«, um nicht diese Datei zu laden, sondern eine andere "
@@ -13411,12 +13842,12 @@
 msgstr "Beispieldatum:"
 
 #: ../src/import-export/import-provider-format.glade.h:4
-#: ../src/import-export/qif-import/qif.glade.h:78
+#: ../src/import-export/qif-import/qif.glade.h:68
 msgid "Set a date format for this QIF file"
 msgstr "Ein Datumsformat für diese QIF-Datei setzen"
 
 #: ../src/import-export/import-provider-format.glade.h:5
-#: ../src/import-export/qif-import/qif.glade.h:81
+#: ../src/import-export/qif-import/qif.glade.h:71
 msgid ""
 "The QIF file format does not specify which order the day, month, and year "
 "components of a date are printed.  In most cases, it is possible to "
@@ -13426,7 +13857,7 @@
 "\n"
 "Please select a date format for the file.  QIF files created by European "
 "software are likely  to be in \"d-m-y\" or day-month-year format, where US "
-"QIF files are likely to be \"m-d-y\" or month-year-day.    \n"
+"QIF files are likely to be \"m-d-y\" or month-day-year.    \n"
 msgstr ""
 "Das QIF-Dateiformat macht keine Angaben darüber, in welcher Reihenfolge Tag, "
 "Monat und Jahr gespeichert sind. In den meisten Fällen kann dies automatisch "
@@ -13438,12 +13869,12 @@
 "Monat-Jahr), wogegen Dateien aus dem amerikanischen Raum eher das Format »m-"
 "d-y« (Monat-Tag-Jahr) haben.\n"
 
-#: ../src/import-export/log-replay/gnc-log-replay.c:525
+#: ../src/import-export/log-replay/gnc-log-replay.c:522
 msgid "Select a .log file to replay"
 msgstr "Zu ladende Log-Datei auswählen"
 
 #. Translators: %s is the file name.
-#: ../src/import-export/log-replay/gnc-log-replay.c:542
+#: ../src/import-export/log-replay/gnc-log-replay.c:541
 #, c-format
 msgid "Cannot open the current log file: %s"
 msgstr "Kann nicht die aktuelle Log-Datei öffnen: %s"
@@ -13452,16 +13883,16 @@
 #. * First argument is the filename,
 #. * second argument is the error.
 #.
-#: ../src/import-export/log-replay/gnc-log-replay.c:555
+#: ../src/import-export/log-replay/gnc-log-replay.c:554
 #, c-format
 msgid "Failed to open log file: %s: %s"
 msgstr "Kann Log-Datei nicht öffnen: %s: %s"
 
-#: ../src/import-export/log-replay/gnc-log-replay.c:562
+#: ../src/import-export/log-replay/gnc-log-replay.c:561
 msgid "The log file you selected was empty."
 msgstr "Die gewählte Log-Datei ist leer."
 
-#: ../src/import-export/log-replay/gnc-log-replay.c:568
+#: ../src/import-export/log-replay/gnc-log-replay.c:567
 msgid ""
 "The log file you selected cannot be read.  The file header was not "
 "recognized."
@@ -13479,18 +13910,6 @@
 "Einträge aus Logdatei nach einem Programmabsturz abspielen. Dies kann nicht "
 "rückgängig gemacht werden."
 
-#: ../src/import-export/mt940/gnc-mt940-import.c:143
-msgid "Select an MT940 file to process"
-msgstr "Zu verarbeitende MT940-Datei auswählen"
-
-#: ../src/import-export/mt940/gnc-plugin-mt940.c:47
-msgid "Import MT940"
-msgstr "MT940 importieren"
-
-#: ../src/import-export/mt940/gnc-plugin-mt940.c:48
-msgid "Process an MT940 response file"
-msgstr "Eine MT940 Datei verarbeiten"
-
 #. This string is a default account
 #. name. It MUST NOT contain the
 #. character ':' anywhere in it or
@@ -13537,7 +13956,7 @@
 msgid "Unknown OFX investment account"
 msgstr "Unbekanntes OFX Investment-Konto"
 
-#: ../src/import-export/ofx/gnc-ofx-import.c:653
+#: ../src/import-export/ofx/gnc-ofx-import.c:651
 msgid "Select an OFX/QFX file to process"
 msgstr "Zu verarbeitende OFX/QFX-Datei auswählen"
 
@@ -13549,57 +13968,61 @@
 msgid "Process an OFX/QFX response file"
 msgstr "Eine OFX/QFX Datei verarbeiten"
 
-#: ../src/import-export/qif-import/dialog-account-picker.c:164
+#: ../src/import-export/qif-import/dialog-account-picker.c:167
 msgid "Enter a name for the account"
 msgstr "Bitte geben Sie einen Namen für das Konto ein"
 
-#: ../src/import-export/qif-import/druid-qif-import.c:363
+#: ../src/import-export/qif-import/druid-qif-import.c:389
 msgid "Select QIF File"
 msgstr "QIF-Datei auswählen"
 
 #. stay here if no file specified
-#: ../src/import-export/qif-import/druid-qif-import.c:457
+#: ../src/import-export/qif-import/druid-qif-import.c:480
 msgid "Please select a file to load."
 msgstr "Sie müssen eine Datei angeben, die geladen werden soll"
 
-#: ../src/import-export/qif-import/druid-qif-import.c:463
+#: ../src/import-export/qif-import/druid-qif-import.c:486
 msgid "File not found or read permission denied. Please select another file."
 msgstr ""
 "Datei nicht gefunden oder Zugriffsberechtigung liegt nicht vor. Bitte wählen "
 "Sie eine andere Datei."
 
-#: ../src/import-export/qif-import/druid-qif-import.c:475
+#: ../src/import-export/qif-import/druid-qif-import.c:498
 msgid "That QIF file is already loaded. Please select another file."
 msgstr "Diese QIF Datei ist bereits geladen. Bitte wählen Sie eine andere."
 
-#: ../src/import-export/qif-import/druid-qif-import.c:505
+#: ../src/import-export/qif-import/druid-qif-import.c:528
 #, c-format
 msgid "QIF file load warning: %s"
 msgstr "Warnung beim Laden der QIF Datei: %s"
 
-#: ../src/import-export/qif-import/druid-qif-import.c:512
+#: ../src/import-export/qif-import/druid-qif-import.c:535
 msgid "An error occurred while loading the QIF file."
 msgstr "Beim Laden der QIF Datei ist ein Fehler aufgetreten."
 
-#: ../src/import-export/qif-import/druid-qif-import.c:520
+#: ../src/import-export/qif-import/druid-qif-import.c:543
 #, c-format
 msgid "QIF file load failed: %s"
 msgstr "Fehler beim Laden der QIF-Datei:%s"
 
-#: ../src/import-export/qif-import/druid-qif-import.c:584
+#: ../src/import-export/qif-import/druid-qif-import.c:606
 msgid "An error occurred while parsing the QIF file."
 msgstr "Beim Verarbeiten der QIF Datei ist ein Fehler aufgetreten."
 
-#: ../src/import-export/qif-import/druid-qif-import.c:594
+#: ../src/import-export/qif-import/druid-qif-import.c:616
 #, c-format
 msgid "QIF file parse failed: %s"
 msgstr "QIF-Datei Analyse fehlerhaft: %s"
 
-#: ../src/import-export/qif-import/druid-qif-import.c:823
+#: ../src/import-export/qif-import/druid-qif-import.c:865
 msgid "You must enter an account name."
 msgstr "Sie müssen einen Kontonamen eingeben."
 
-#: ../src/import-export/qif-import/druid-qif-import.c:1183
+#: ../src/import-export/qif-import/druid-qif-import.c:1048
+msgid "GnuCash account name"
+msgstr "GnuCash Kontobezeichnung"
+
+#: ../src/import-export/qif-import/druid-qif-import.c:1298
 msgid ""
 "An error occurred while importing QIF transactions into GnuCash. Your "
 "accounts are unchanged."
@@ -13607,43 +14030,43 @@
 "Es ist ein Fehler während des QIF Imports aufgetreten. Ihre Konten wurden "
 "nicht geändert."
 
-#: ../src/import-export/qif-import/druid-qif-import.c:1230
-#: ../src/import-export/qif-import/druid-qif-import.c:1674
+#: ../src/import-export/qif-import/druid-qif-import.c:1342
+#: ../src/import-export/qif-import/druid-qif-import.c:1794
 msgid "(split)"
 msgstr "(Buchung)"
 
-#: ../src/import-export/qif-import/druid-qif-import.c:1394
+#: ../src/import-export/qif-import/druid-qif-import.c:1513
 msgid "You must enter a Type for the commodity."
 msgstr "Sie müssen einen Typ für die Währung/Aktie angeben."
 
-#: ../src/import-export/qif-import/druid-qif-import.c:1399
+#: ../src/import-export/qif-import/druid-qif-import.c:1520
 msgid "You must enter a name for the commodity."
 msgstr "Sie müssen einen Namen für die Währung/Aktie angeben."
 
-#: ../src/import-export/qif-import/druid-qif-import.c:1404
+#: ../src/import-export/qif-import/druid-qif-import.c:1525
 msgid "You must enter an abbreviation for the commodity."
 msgstr "Sie müssen eine Abkürzung für die Währung/Aktie angeben."
 
-#: ../src/import-export/qif-import/druid-qif-import.c:1413
+#: ../src/import-export/qif-import/druid-qif-import.c:1534
 msgid "You must enter an existing national currency or enter a different type."
 msgstr ""
 "Sie müssen entweder eine existierende Währung angeben oder einen anderen Typ "
 "wählen."
 
-#: ../src/import-export/qif-import/druid-qif-import.c:1547
+#: ../src/import-export/qif-import/druid-qif-import.c:1672
 #, c-format
 msgid "Enter information about \"%s\""
 msgstr "Informationen über »%s«"
 
-#: ../src/import-export/qif-import/druid-qif-import.c:1559
+#: ../src/import-export/qif-import/druid-qif-import.c:1684
 msgid "Pick the commodity's exchange or listing (NASDAQ, NYSE, etc)."
 msgstr "Wählen Sie das Börsenplatzkürzel für die Aktie (NASDAQ, NYSE, etc)."
 
-#: ../src/import-export/qif-import/druid-qif-import.c:1583
+#: ../src/import-export/qif-import/druid-qif-import.c:1708
 msgid "Enter the full name of the commodity, such as \"Red Hat Stock\""
 msgstr "Geben Sie den vollen Namen der Aktie an, z.B. »Deutsche Telekom«"
 
-#: ../src/import-export/qif-import/druid-qif-import.c:1605
+#: ../src/import-export/qif-import/druid-qif-import.c:1730
 msgid ""
 "Enter the ticker symbol (such as \"RHAT\") or other unique abbreviation for "
 "the name."
@@ -13651,11 +14074,27 @@
 "Geben Sie das Tickersymbol (z.B. »DTE«) der Aktie oder eine andere "
 "eindeutige Abkürzung an."
 
-#: ../src/import-export/qif-import/druid-qif-import.c:1626
+#: ../src/import-export/qif-import/druid-qif-import.c:1751
 msgid "Click \"Next\" to accept the information and move on."
 msgstr ""
 "Wenn Sie fertig gelesen haben, klicken Sie bitte »Vor«, um fortzufahren."
 
+#: ../src/import-export/qif-import/druid-qif-import.c:2140
+msgid "QIF account name"
+msgstr "QIF-Kontobezeichnung"
+
+#: ../src/import-export/qif-import/druid-qif-import.c:2143
+msgid "QIF category name"
+msgstr "QIF Kategorie"
+
+#: ../src/import-export/qif-import/druid-qif-import.c:2146
+msgid "QIF payee/memo"
+msgstr "QIF Empfänger/Text"
+
+#: ../src/import-export/qif-import/druid-qif-import.c:2209
+msgid "Dup?"
+msgstr "Duplikat?"
+
 #: ../src/import-export/qif-import/gnc-plugin-qif-import.c:48
 msgid "Import _QIF..."
 msgstr "_QIF-Datei importieren..."
@@ -13668,15 +14107,15 @@
 msgid "<b>QIF Import</b>"
 msgstr "<b>QIF Import</b>"
 
-#: ../src/import-export/qif-import/qif.glade.h:3
+#: ../src/import-export/qif-import/qif.glade.h:2
 msgid "Account name:"
 msgstr "Kontobezeichnung:"
 
-#: ../src/import-export/qif-import/qif.glade.h:4
+#: ../src/import-export/qif-import/qif.glade.h:3
 msgid "Accounts and stock holdings"
 msgstr "Konten und Aktienanteile"
 
-#: ../src/import-export/qif-import/qif.glade.h:6
+#: ../src/import-export/qif-import/qif.glade.h:4
 msgid ""
 "Click \"Apply\" to import data from the staging area and update your GnuCash "
 "accounts. The account and category matching information you have entered "
@@ -13700,13 +14139,13 @@
 "\n"
 "Klicken Sie auf »Abbrechen«, um den QIF-Import-Prozess abzubrechen."
 
-#: ../src/import-export/qif-import/qif.glade.h:12
+#: ../src/import-export/qif-import/qif.glade.h:10
 msgid "Click \"Forward\" to check matchings for QIF categories. "
 msgstr ""
 "Klicken Sie bitte auf »Vor«, um passende Zuordnungen für QIF\n"
 "Kategorien zu prüfen."
 
-#: ../src/import-export/qif-import/qif.glade.h:13
+#: ../src/import-export/qif-import/qif.glade.h:11
 msgid ""
 "Click \"Forward\" to enter information about stocks and mutual funds in the "
 "imported data."
@@ -13714,7 +14153,7 @@
 "Klicken Sie nun auf »Vor«, um Informationen über die Aktien und Aktienfonds "
 "einzugeben, die aus den importierten Daten stammen."
 
-#: ../src/import-export/qif-import/qif.glade.h:14
+#: ../src/import-export/qif-import/qif.glade.h:12
 msgid ""
 "Click \"Forward\" to enter information about the currency used in your QIF "
 "files."
@@ -13722,7 +14161,7 @@
 "Bitte klicken Sie »Vor«, um Informationen über Währungen in Ihren\n"
 "QIF-Dateien einzugeben."
 
-#: ../src/import-export/qif-import/qif.glade.h:15
+#: ../src/import-export/qif-import/qif.glade.h:13
 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 QIF files.\n"
@@ -13737,15 +14176,11 @@
 "Klicken Sie auf »Vor«, um das Laden von Dateien zu beenden und zum nächsten "
 "Schritt des QIF-Importprozesses zu gehen."
 
-#: ../src/import-export/qif-import/qif.glade.h:20
-msgid "Dup?"
-msgstr "Duplikat?"
-
-#: ../src/import-export/qif-import/qif.glade.h:21
+#: ../src/import-export/qif-import/qif.glade.h:16
 msgid "Enter the currency used for new accounts"
 msgstr "Standard-Währung für neue Konten"
 
-#: ../src/import-export/qif-import/qif.glade.h:23
+#: ../src/import-export/qif-import/qif.glade.h:17
 msgid ""
 "GnuCash can import financial data from QIF (Quicken Interchange Format) "
 "files written by Quicken/QuickBooks, MS Money, Moneydance, and many other "
@@ -13767,7 +14202,8 @@
 "Klicken Sie jetzt »Vor«, um mit dem Laden Ihrer QIF Daten zu beginnen. Sie "
 "können den Import jederzeit mit »Abbrechen« ohne Änderungen beenden."
 
-#: ../src/import-export/qif-import/qif.glade.h:28
+#: ../src/import-export/qif-import/qif.glade.h:22
+#, fuzzy
 msgid ""
 "GnuCash uses separate Income and Expense accounts rather than categories to "
 "classify your transactions. Each of the categories in your QIF file will be "
@@ -13775,7 +14211,8 @@
 "\n"
 "On the next page, you will have an opportunity to look at the suggested "
 "matches between QIF categories and GnuCash accounts. You may change matches "
-"that you do not like by clicking on the line containing the category name.\n"
+"that you do not like by double-clicking on the line containing the category "
+"name.\n"
 "\n"
 "If you change your mind later, you can reorganize the account structure "
 "safely within GnuCash."
@@ -13791,7 +14228,8 @@
 "\n"
 "Sie können jederzeit auch später in GnuCash Änderungen vornehmen."
 
-#: ../src/import-export/qif-import/qif.glade.h:33
+#: ../src/import-export/qif-import/qif.glade.h:27
+#, fuzzy
 msgid ""
 "If you are importing a QIF file downloaded from a bank or other financial "
 "institution, some of the information in the QIF file may duplicate "
@@ -13803,7 +14241,8 @@
 "left side of the page, and possible  matches for the selected left-hand "
 "transaction are shown  to the right.  There may be several old transactions "
 "that could match an imported transaction; you will be able to select the "
-"correct one by clicking in the \"Dup?\" column of the correct transaction.\n"
+"correct one by double-clicking in the \"Dup?\" column of the correct "
+"transaction.\n"
 "\n"
 "You can control the rules used by GnuCash to find duplicate transactions in "
 "the \"QIF Import\" section of the GnuCash Preferences dialog.\n"
@@ -13827,15 +14266,15 @@
 "\n"
 "Klicken Sie nun auf »Vor«, um doppelte Buchungen zu finden."
 
-#: ../src/import-export/qif-import/qif.glade.h:40
+#: ../src/import-export/qif-import/qif.glade.h:34
 msgid "Import QIF files"
 msgstr "QIF-Datei importieren"
 
-#: ../src/import-export/qif-import/qif.glade.h:41
+#: ../src/import-export/qif-import/qif.glade.h:35
 msgid "Imported transactions with duplicates"
 msgstr "Importierte Buchungen mit Duplikaten"
 
-#: ../src/import-export/qif-import/qif.glade.h:42
+#: ../src/import-export/qif-import/qif.glade.h:36
 msgid ""
 "In the next pages, you will be asked to provide information about stocks, "
 "mutual funds, and other tradable commodities that appear in the QIF file(s) "
@@ -13865,34 +14304,35 @@
 "exakte Tickersymbol für die Aktie, das bei der offiziellen Börsennotierung "
 "benutzt wird."
 
-#: ../src/import-export/qif-import/qif.glade.h:47
+#: ../src/import-export/qif-import/qif.glade.h:41
 msgid "Income and Expense categories"
 msgstr "Erträge und Aufwendungen"
 
-#: ../src/import-export/qif-import/qif.glade.h:49
+#: ../src/import-export/qif-import/qif.glade.h:43
 msgid "Match QIF accounts with GnuCash accounts"
 msgstr "Füge QIF-Konten in GnuCash Konten ein"
 
-#: ../src/import-export/qif-import/qif.glade.h:50
+#: ../src/import-export/qif-import/qif.glade.h:44
 msgid "Match QIF categories with GnuCash accounts"
 msgstr "Vereine QIF-Kategorien mit GnuCash Konten"
 
-#: ../src/import-export/qif-import/qif.glade.h:51
+#: ../src/import-export/qif-import/qif.glade.h:45
 msgid "Match duplicate transactions"
 msgstr "Doppelte Buchungssätze suchen"
 
-#: ../src/import-export/qif-import/qif.glade.h:52
+#: ../src/import-export/qif-import/qif.glade.h:46
 msgid "Match payees/memos to GnuCash accounts"
 msgstr "Finde passende GnuCash Konten für QIF-Zahlungsempfänger/Buchungstext"
 
-#: ../src/import-export/qif-import/qif.glade.h:54
+#: ../src/import-export/qif-import/qif.glade.h:47
+#, fuzzy
 msgid ""
 "On the next page, the accounts in your QIF files and any stocks or mutual "
 "funds you own will be matched with GnuCash accounts. If a GnuCash account "
 "already exists with the same name, or a similar name and compatible type, "
 "that account will be used as a match; otherwise, GnuCash will create a new "
 "account with the same name and type as the QIF account. If you do not like "
-"the suggested GnuCash account, click to change it.\n"
+"the suggested GnuCash account, double-click to change it.\n"
 "\n"
 "Note that GnuCash will be creating many accounts that did not exist on your "
 "other personal finance program, including a separate account for each stock "
@@ -13916,11 +14356,11 @@
 "nächsten Seite können Sie diese Konten bearbeiten. Allerdings wird "
 "empfohlen, die Auswahl zu übernehmen.\n"
 
-#: ../src/import-export/qif-import/qif.glade.h:58
+#: ../src/import-export/qif-import/qif.glade.h:51
 msgid "Payees and memos"
 msgstr "Zahlungsempfänger, Buchungstext"
 
-#: ../src/import-export/qif-import/qif.glade.h:59
+#: ../src/import-export/qif-import/qif.glade.h:52
 msgid ""
 "Please select a file to load. When you click \"Forward\", the file will be "
 "loaded and analyzed. You may need to answer some questions about the account"
@@ -13936,23 +14376,15 @@
 "Sie können soviele Dateien laden, wie Sie möchten. Es ist kein Problem, "
 "falls sich Ihre Daten in mehreren Dateien befinden.\n"
 
-#: ../src/import-export/qif-import/qif.glade.h:63
+#: ../src/import-export/qif-import/qif.glade.h:56
 msgid "Possible duplicates for selected new transaction"
 msgstr "Mögliche Duplikate für ausgewählte neue Buchungen"
 
-#: ../src/import-export/qif-import/qif.glade.h:65
+#: ../src/import-export/qif-import/qif.glade.h:58
 msgid "QIF Import"
 msgstr "QIF-Import"
 
-#: ../src/import-export/qif-import/qif.glade.h:66
-msgid "QIF account name"
-msgstr "QIF-Kontobezeichnung"
-
-#: ../src/import-export/qif-import/qif.glade.h:67
-msgid "QIF category name"
-msgstr "QIF Kategorie"
-
-#: ../src/import-export/qif-import/qif.glade.h:68
+#: ../src/import-export/qif-import/qif.glade.h:59
 msgid ""
 "QIF files downloaded from banks and other financial institutions may not "
 "have information about Accounts and Categories which would allow them to be "
@@ -13974,32 +14406,28 @@
 "zugeordnet. Wenn Sie nun die Buchungssätze einem anderen Konto zuweisen, "
 "wird diese Auswahl für zukünftige Importvorgänge gespeichert."
 
-#: ../src/import-export/qif-import/qif.glade.h:71
+#: ../src/import-export/qif-import/qif.glade.h:62
 msgid "QIF files you have loaded"
 msgstr "QIF-Datei, die geladen wurde"
 
-#: ../src/import-export/qif-import/qif.glade.h:72
-msgid "QIF payee/memo"
-msgstr "QIF Empfänger/Text"
-
-#: ../src/import-export/qif-import/qif.glade.h:74
+#: ../src/import-export/qif-import/qif.glade.h:64
 msgid "Select a QIF file to load"
 msgstr "Zu ladende QIF-Datei auswählen"
 
-#: ../src/import-export/qif-import/qif.glade.h:76
+#: ../src/import-export/qif-import/qif.glade.h:66
 msgid "Select possible duplicates"
 msgstr "Mögliche Duplikate auswählen"
 
-#: ../src/import-export/qif-import/qif.glade.h:79
+#: ../src/import-export/qif-import/qif.glade.h:69
 msgid "Set the default QIF account name"
 msgstr "Den Namen des Standard QIF Konto setzen"
 
-#: ../src/import-export/qif-import/qif.glade.h:80
+#: ../src/import-export/qif-import/qif.glade.h:70
 msgid "Show some documentation-only pages in QIF Import druid."
 msgstr ""
 "Seiten im QIF-Import anzeigen, die ausschließlich Dokumentation enthalten."
 
-#: ../src/import-export/qif-import/qif.glade.h:85
+#: ../src/import-export/qif-import/qif.glade.h:75
 msgid ""
 "The QIF file that you just loaded appears to contain transactions for just "
 "one account, but the file does not specify a name for that account.  \n"
@@ -14015,7 +14443,7 @@
 "anderen Finanzprogramm exportiert wurde, sollten Sie den gleichen Kontonamen "
 "wie dort verwenden.\n"
 
-#: ../src/import-export/qif-import/qif.glade.h:89
+#: ../src/import-export/qif-import/qif.glade.h:79
 msgid ""
 "The QIF importer cannot currently handle multi-currency QIF files. All the "
 "accounts in the QIF file(s) you are importing must be denominated in the "
@@ -14031,64 +14459,75 @@
 "Bitte wählen Sie die Währung für die Buchungssätze aus der Datei/den "
 "Dateien: \n"
 
-#: ../src/import-export/qif-import/qif.glade.h:93
+#: ../src/import-export/qif-import/qif.glade.h:83
 msgid "Tradable commodities"
 msgstr "Handelbare Währungen/Aktien"
 
-#: ../src/import-export/qif-import/qif.glade.h:95
+#: ../src/import-export/qif-import/qif.glade.h:85
 msgid "Update your GnuCash accounts"
 msgstr "Aktualisieren Ihrer GnuCash Konten"
 
-#: ../src/import-export/qif-import/qif.glade.h:96
+#: ../src/import-export/qif-import/qif.glade.h:86
 msgid "_Show documentation"
 msgstr "_Erklärungsseiten anzeigen"
 
 #. src/import-export/qif-io-core/qif-invst-xtn-import.scm
 #. src/import-export/qif-import/qif-dialog-utils.scm
-#: ../src/import-export/qif/qif-defaults.c:66 ../intl-scm/guile-strings.c:3088
-#: ../intl-scm/guile-strings.c:3110
+#. src/import-export/qif-import/qif-import/qif-dialog-utils.scm
+#: ../src/import-export/qif/qif-defaults.c:66 ../intl-scm/guile-strings.c:5756
+#: ../intl-scm/guile-strings.c:5778 ../intl-scm/guile-strings.c:5800
 msgid "Margin Interest"
 msgstr "Zinsmarge"
 
 #. src/import-export/qif-io-core/qif-invst-xtn-import.scm
 #. src/import-export/qif-import/qif-dialog-utils.scm
-#: ../src/import-export/qif/qif-defaults.c:74 ../intl-scm/guile-strings.c:3086
-#: ../intl-scm/guile-strings.c:3108
+#. src/import-export/qif-import/qif-import/qif-dialog-utils.scm
+#: ../src/import-export/qif/qif-defaults.c:74 ../intl-scm/guile-strings.c:5754
+#: ../intl-scm/guile-strings.c:5776 ../intl-scm/guile-strings.c:5798
 msgid "Commissions"
 msgstr "Kommissionen"
 
 #. src/import-export/qif-io-core/qif-invst-xtn-import.scm
 #. src/import-export/qif-import/qif-dialog-utils.scm
-#: ../src/import-export/qif/qif-defaults.c:90 ../intl-scm/guile-strings.c:3076
-#: ../intl-scm/guile-strings.c:3098
+#. src/import-export/qif-import/qif-import/qif-dialog-utils.scm
+#: ../src/import-export/qif/qif-defaults.c:90 ../intl-scm/guile-strings.c:5744
+#: ../intl-scm/guile-strings.c:5766 ../intl-scm/guile-strings.c:5788
 msgid "Cap. gain (long)"
 msgstr "Kapitalertrag (langfristig)"
 
 #. src/import-export/qif-io-core/qif-invst-xtn-import.scm
 #. src/import-export/qif-import/qif-dialog-utils.scm
+#. src/import-export/qif-import/qif-import/qif-dialog-utils.scm
 #: ../src/import-export/qif/qif-defaults.c:100
-#: ../intl-scm/guile-strings.c:3078 ../intl-scm/guile-strings.c:3100
+#: ../intl-scm/guile-strings.c:5746 ../intl-scm/guile-strings.c:5768
+#: ../intl-scm/guile-strings.c:5790
 msgid "Cap. gain (mid)"
 msgstr "Kapitalertrag (mittelfristig)"
 
 #. src/import-export/qif-io-core/qif-invst-xtn-import.scm
 #. src/import-export/qif-import/qif-dialog-utils.scm
+#. src/import-export/qif-import/qif-import/qif-dialog-utils.scm
 #: ../src/import-export/qif/qif-defaults.c:110
-#: ../intl-scm/guile-strings.c:3080 ../intl-scm/guile-strings.c:3102
+#: ../intl-scm/guile-strings.c:5748 ../intl-scm/guile-strings.c:5770
+#: ../intl-scm/guile-strings.c:5792
 msgid "Cap. gain (short)"
 msgstr "Kapitalertrag (kurzfristig)"
 
 #. src/import-export/qif-io-core/qif-invst-xtn-import.scm
 #. src/import-export/qif-import/qif-dialog-utils.scm
+#. src/import-export/qif-import/qif-import/qif-dialog-utils.scm
 #: ../src/import-export/qif/qif-defaults.c:120
-#: ../intl-scm/guile-strings.c:3070 ../intl-scm/guile-strings.c:3092
+#: ../intl-scm/guile-strings.c:5738 ../intl-scm/guile-strings.c:5760
+#: ../intl-scm/guile-strings.c:5782
 msgid "Dividends"
 msgstr "Dividenden"
 
 #. src/import-export/qif-io-core/qif-invst-xtn-import.scm
 #. src/import-export/qif-import/qif-dialog-utils.scm
+#. src/import-export/qif-import/qif-import/qif-dialog-utils.scm
 #: ../src/import-export/qif/qif-defaults.c:140
-#: ../intl-scm/guile-strings.c:3074 ../intl-scm/guile-strings.c:3096
+#: ../intl-scm/guile-strings.c:5742 ../intl-scm/guile-strings.c:5764
+#: ../intl-scm/guile-strings.c:5786
 msgid "Cap Return"
 msgstr "Kapitalverzinsung"
 
@@ -14146,7 +14585,7 @@
 msgid "clear:autoswitch"
 msgstr "clear:autoswitch"
 
-#: ../src/import-export/qif/qif-parse.c:660
+#: ../src/import-export/qif/qif-parse.c:666
 msgid "The Date format is ambiguous.  Please choose the correct format."
 msgstr "Das Datumsformat ist mehrdeutig. Bitte wählen Sie das richtige Format."
 
@@ -14254,11 +14693,20 @@
 msgid "Use bayesian matching"
 msgstr "Bayes-Algorithmus verwenden"
 
-#: ../src/register/ledger-core/split-register.c:390
+#: ../src/register/ledger-core/split-register.c:159
+msgid ""
+"This transaction is already being edited in another register. Please finish "
+"editing it there first."
+msgstr ""
+"Diese Buchung wird bereits von einem anderen Kontofenster aus bearbeitet. "
+"Bitte beenden Sie zuerst diese Bearbeitung, indem Sie in dem anderen "
+"Kontofenster »Eingabe« oder »Abbrechen« wählen. "
+
+#: ../src/register/ledger-core/split-register.c:408
 msgid "Save transaction before duplicating?"
 msgstr "Buchungsänderungen vor Kopieren speichern?"
 
-#: ../src/register/ledger-core/split-register.c:392
+#: ../src/register/ledger-core/split-register.c:410
 msgid ""
 "The current transaction has been changed. Would you like to record the "
 "changes before duplicating the transaction, or cancel the duplication?"
@@ -14266,7 +14714,7 @@
 "Die aktuelle Buchung wurde geändert. Möchten Sie vor dem Kopieren die "
 "Änderungen in der Buchung speichern, oder möchten Sie abbrechen?"
 
-#: ../src/register/ledger-core/split-register.c:699
+#: ../src/register/ledger-core/split-register.c:717
 msgid ""
 "You are about to overwrite an existing split. Are you sure you want to do "
 "that?"
@@ -14274,7 +14722,7 @@
 "Sie sind dabei, einen bestehenden Buchungsteil zu überschreiben. Möchten Sie "
 "das wirklich?"
 
-#: ../src/register/ledger-core/split-register.c:728
+#: ../src/register/ledger-core/split-register.c:746
 msgid ""
 "You are about to overwrite an existing transaction. Are you sure you want to "
 "do that?"
@@ -14282,11 +14730,11 @@
 "Sie sind dabei, einen bestehenden Buchungssatz zu überschreiben. Möchten Sie "
 "das wirklich?"
 
-#: ../src/register/ledger-core/split-register.c:1678
+#: ../src/register/ledger-core/split-register.c:1700
 msgid "Recalculate Transaction"
 msgstr "Buchung neu berechnen"
 
-#: ../src/register/ledger-core/split-register.c:1679
+#: ../src/register/ledger-core/split-register.c:1701
 msgid ""
 "The values entered for this transaction are inconsistent. Which value would "
 "you like to have recalculated?"
@@ -14294,141 +14742,141 @@
 "Die eingegebenen Werte für diese Buchung passen nicht zueinander. Welcher "
 "Wert soll neu berechnet werden?"
 
-#: ../src/register/ledger-core/split-register.c:1686
-#: ../src/register/ledger-core/split-register.c:1688
+#: ../src/register/ledger-core/split-register.c:1708
+#: ../src/register/ledger-core/split-register.c:1710
 msgid "_Shares"
 msgstr "_Anteile"
 
-#: ../src/register/ledger-core/split-register.c:1686
-#: ../src/register/ledger-core/split-register.c:1693
-#: ../src/register/ledger-core/split-register.c:1700
+#: ../src/register/ledger-core/split-register.c:1708
+#: ../src/register/ledger-core/split-register.c:1715
+#: ../src/register/ledger-core/split-register.c:1722
 msgid "Changed"
 msgstr "Geändert"
 
-#: ../src/register/ledger-core/split-register.c:1700
-#: ../src/register/ledger-core/split-register.c:1702
+#: ../src/register/ledger-core/split-register.c:1722
+#: ../src/register/ledger-core/split-register.c:1724
 msgid "_Value"
 msgstr "_Wert"
 
-#: ../src/register/ledger-core/split-register.c:1711
+#: ../src/register/ledger-core/split-register.c:1733
 msgid "_Recalculate"
 msgstr "_Berechnen"
 
 #. src/app-utils/prefs.scm
-#: ../src/register/ledger-core/split-register.c:1964
-#: ../intl-scm/guile-strings.c:60
+#: ../src/register/ledger-core/split-register.c:1986
+#: ../intl-scm/guile-strings.c:108
 msgid "Deposit"
 msgstr "Einzahlung"
 
-#: ../src/register/ledger-core/split-register.c:1965
+#: ../src/register/ledger-core/split-register.c:1987
 msgid "Withdraw"
 msgstr "Belastung"
 
-#: ../src/register/ledger-core/split-register.c:1966
+#: ../src/register/ledger-core/split-register.c:1988
 msgid "Check"
 msgstr "Scheck"
 
-#: ../src/register/ledger-core/split-register.c:1967
-#: ../src/register/ledger-core/split-register.c:1995
-#: ../src/register/ledger-core/split-register.c:2003
+#: ../src/register/ledger-core/split-register.c:1989
 #: ../src/register/ledger-core/split-register.c:2017
-#: ../src/register/ledger-core/split-register.c:2040
+#: ../src/register/ledger-core/split-register.c:2025
+#: ../src/register/ledger-core/split-register.c:2039
+#: ../src/register/ledger-core/split-register.c:2062
 msgid "Int"
 msgstr "Zins"
 
-#: ../src/register/ledger-core/split-register.c:1968
-#: ../src/register/ledger-core/split-register.c:1991
+#: ../src/register/ledger-core/split-register.c:1990
+#: ../src/register/ledger-core/split-register.c:2013
 msgid "ATM"
 msgstr "Geldautomat"
 
-#: ../src/register/ledger-core/split-register.c:1969
+#: ../src/register/ledger-core/split-register.c:1991
 msgid "Teller"
 msgstr "Bankschalter"
 
 #. Action: Point Of Sale
-#: ../src/register/ledger-core/split-register.c:1971
+#: ../src/register/ledger-core/split-register.c:1993
 msgid "POS"
 msgstr "Karten-Terminal"
 
-#: ../src/register/ledger-core/split-register.c:1972
+#: ../src/register/ledger-core/split-register.c:1994
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/register/ledger-core/split-register.c:1973
-#: ../src/register/ledger-core/split-register.c:1996
+#: ../src/register/ledger-core/split-register.c:1995
+#: ../src/register/ledger-core/split-register.c:2018
 msgid "Online"
 msgstr "Online"
 
 #. Action: Automatic Deposit ?!?
-#: ../src/register/ledger-core/split-register.c:1975
+#: ../src/register/ledger-core/split-register.c:1997
 msgid "AutoDep"
 msgstr "Gutschrift"
 
-#: ../src/register/ledger-core/split-register.c:1976
+#: ../src/register/ledger-core/split-register.c:1998
 msgid "Wire"
 msgstr "Ãœberweisung"
 
-#: ../src/register/ledger-core/split-register.c:1978
+#: ../src/register/ledger-core/split-register.c:2000
 msgid "Direct Debit"
 msgstr "Lastschrift"
 
 #. src/app-utils/prefs.scm
-#: ../src/register/ledger-core/split-register.c:1982
-#: ../src/register/ledger-core/split-register.c:1986
-#: ../src/register/ledger-core/split-register.c:1992
-#: ../src/register/ledger-core/split-register.c:2000
-#: ../src/register/ledger-core/split-register.c:2015
+#: ../src/register/ledger-core/split-register.c:2004
+#: ../src/register/ledger-core/split-register.c:2008
+#: ../src/register/ledger-core/split-register.c:2014
 #: ../src/register/ledger-core/split-register.c:2022
-#: ../src/register/ledger-core/split-register.c:2027
-#: ../src/register/ledger-core/split-register.c:2052
-#: ../intl-scm/guile-strings.c:70 ../intl-scm/guile-strings.c:72
-#: ../intl-scm/guile-strings.c:74
+#: ../src/register/ledger-core/split-register.c:2037
+#: ../src/register/ledger-core/split-register.c:2044
+#: ../src/register/ledger-core/split-register.c:2049
+#: ../src/register/ledger-core/split-register.c:2074
+#: ../intl-scm/guile-strings.c:118 ../intl-scm/guile-strings.c:120
+#: ../intl-scm/guile-strings.c:122
 msgid "Buy"
 msgstr "Kauf"
 
 #. src/app-utils/prefs.scm
-#: ../src/register/ledger-core/split-register.c:1983
-#: ../src/register/ledger-core/split-register.c:1987
-#: ../src/register/ledger-core/split-register.c:1997
-#: ../src/register/ledger-core/split-register.c:2001
-#: ../src/register/ledger-core/split-register.c:2016
+#: ../src/register/ledger-core/split-register.c:2005
+#: ../src/register/ledger-core/split-register.c:2009
+#: ../src/register/ledger-core/split-register.c:2019
 #: ../src/register/ledger-core/split-register.c:2023
-#: ../src/register/ledger-core/split-register.c:2028
-#: ../src/register/ledger-core/split-register.c:2053
-#: ../intl-scm/guile-strings.c:98 ../intl-scm/guile-strings.c:100
-#: ../intl-scm/guile-strings.c:102
+#: ../src/register/ledger-core/split-register.c:2038
+#: ../src/register/ledger-core/split-register.c:2045
+#: ../src/register/ledger-core/split-register.c:2050
+#: ../src/register/ledger-core/split-register.c:2075
+#: ../intl-scm/guile-strings.c:146 ../intl-scm/guile-strings.c:148
+#: ../intl-scm/guile-strings.c:150
 msgid "Sell"
 msgstr "Verkauf"
 
-#: ../src/register/ledger-core/split-register.c:1988
-#: ../src/register/ledger-core/split-register.c:1994
-#: ../src/register/ledger-core/split-register.c:2037
+#: ../src/register/ledger-core/split-register.c:2010
+#: ../src/register/ledger-core/split-register.c:2016
+#: ../src/register/ledger-core/split-register.c:2059
 msgid "Fee"
 msgstr "Gebühr"
 
 #. src/app-utils/prefs.scm
-#: ../src/register/ledger-core/split-register.c:2019
-#: ../intl-scm/guile-strings.c:106
+#: ../src/register/ledger-core/split-register.c:2041
+#: ../intl-scm/guile-strings.c:154
 msgid "Rebate"
 msgstr "Rabatt"
 
 #. Action: Dividend
-#: ../src/register/ledger-core/split-register.c:2039
+#: ../src/register/ledger-core/split-register.c:2061
 msgid "Div"
 msgstr "Dividende"
 
 #. Action: Long Term Capital Gains
-#: ../src/register/ledger-core/split-register.c:2042
+#: ../src/register/ledger-core/split-register.c:2064
 msgid "LTCG"
 msgstr "Zinsen aus langfristigen Kapitalanlagen"
 
 #. Action: Short Term Capital Gains
-#: ../src/register/ledger-core/split-register.c:2044
+#: ../src/register/ledger-core/split-register.c:2066
 msgid "STCG"
 msgstr "Zinsen aus kurzfristigen Anlagen"
 
 #. Action: Distribution
-#: ../src/register/ledger-core/split-register.c:2047
+#: ../src/register/ledger-core/split-register.c:2069
 msgid "Dist"
 msgstr "Ausschüttung"
 
@@ -14460,18 +14908,18 @@
 msgid "_Rebalance"
 msgstr "_Anpassen"
 
-#: ../src/register/ledger-core/split-register-control.c:1036
+#: ../src/register/ledger-core/split-register-control.c:1043
 msgid ""
 "You need to expand the transaction in order to modify its exchange rates."
 msgstr ""
 "Sie müssen den Buchungssatz in die »Vollständig«-Ansicht aufklappen, um die "
 "Wechselkurse zu bearbeiten."
 
-#: ../src/register/ledger-core/split-register-control.c:1159
+#: ../src/register/ledger-core/split-register-control.c:1166
 msgid "Save the changed transaction?"
 msgstr "Geänderte Buchung speichern?"
 
-#: ../src/register/ledger-core/split-register-control.c:1161
+#: ../src/register/ledger-core/split-register-control.c:1168
 msgid ""
 "The current transaction has been changed.  Would you like to record the "
 "changes before moving to a new transaction, discard the changes, or return "
@@ -14481,19 +14929,19 @@
 "abbrechen und zu der aktuellen Buchung zurückkehren, oder die Änderungen in "
 "dieser Buchung speichern?"
 
-#: ../src/register/ledger-core/split-register-control.c:1174
+#: ../src/register/ledger-core/split-register-control.c:1181
 msgid "_Discard Changes"
 msgstr "Änderungen ver_werfen"
 
-#: ../src/register/ledger-core/split-register-control.c:1176
+#: ../src/register/ledger-core/split-register-control.c:1183
 msgid "_Record Changes"
 msgstr "Änderungen _speichern"
 
-#: ../src/register/ledger-core/split-register-control.c:1457
+#: ../src/register/ledger-core/split-register-control.c:1464
 msgid "Mark split as unreconciled?"
 msgstr "Buchungsteil als nicht abgeglichen markieren?"
 
-#: ../src/register/ledger-core/split-register-control.c:1459
+#: ../src/register/ledger-core/split-register-control.c:1466
 msgid ""
 "You are about to mark a reconciled split as unreconciled.  Doing so might "
 "make future reconciliation difficult!  Continue with this change?"
@@ -14501,7 +14949,7 @@
 "Wollen Sie diesen Buchungssatz wirklich als nicht abgeglichen markieren?  "
 "Dies kann das nächste Abgleichen erschweren.  Trotzdem fortsetzen?"
 
-#: ../src/register/ledger-core/split-register-control.c:1476
+#: ../src/register/ledger-core/split-register-control.c:1483
 msgid "_Unreconcile"
 msgstr "_Nicht abgeglichen"
 
@@ -14581,12 +15029,6 @@
 msgid "Credit Formula"
 msgstr "Soll-Formel"
 
-#. This seems to be the one that initially gets used, the InactiveDateCell
-#. is set to, and subsequently displayed.
-#: ../src/register/ledger-core/split-register-model.c:806
-msgid "Scheduled"
-msgstr "Terminiert"
-
 #: ../src/register/ledger-core/split-register-model.c:837
 msgid "Enter the transaction reference, such as the invoice or check number"
 msgstr ""
@@ -14681,50 +15123,68 @@
 msgid "Chan_ge Split"
 msgstr "Buchungs_teil ändern"
 
-#: ../src/register/ledger-core/split-register-model.c:1773
+#: ../src/register/ledger-core/split-register-model.c:1772
 msgid "Enter debit formula for real transaction"
 msgstr ""
 "Geben Sie die Formel zur Haben-Berechnung der tatsächlichen Buchung ein"
 
-#: ../src/register/ledger-core/split-register-model.c:1803
+#: ../src/register/ledger-core/split-register-model.c:1802
 msgid "Enter credit formula for real transaction"
 msgstr "Geben Sie die Formel zur Soll-Berechnung der tatsächlichen Buchung ein"
 
-#: ../src/register/register-gnome/gnucash-item-list.c:474
+#: ../src/register/register-gnome/gnucash-item-list.c:476
 msgid "List"
 msgstr "Liste"
 
-#: ../src/report/report-gnome/dialog-column-view.c:291
+#: ../src/report/report-gnome/dialog-column-view.c:332
 msgid "Contents"
 msgstr "Inhalt"
 
-#: ../src/report/report-gnome/dialog-style-sheet.c:138
+#. src/report/report-gnome/report-gnome.scm
+#. src/report/report-gnome/gnucash/report/report-gnome.scm
+#. src/business/business-reports/owner-report.scm
+#. src/business/business-reports/gnucash/report/owner-report.scm
+#: ../src/report/report-gnome/dialog-column-view.c:361
+#: ../intl-scm/guile-strings.c:1432 ../intl-scm/guile-strings.c:1442
+#: ../intl-scm/guile-strings.c:6204 ../intl-scm/guile-strings.c:6728
+msgid "Report"
+msgstr "Bericht"
+
+#: ../src/report/report-gnome/dialog-column-view.c:367
+msgid "Cols"
+msgstr "Spalten"
+
+#: ../src/report/report-gnome/dialog-column-view.c:373
+msgid "Rows"
+msgstr "Zeilen"
+
+#: ../src/report/report-gnome/dialog-style-sheet.c:140
 #, c-format
 msgid "HTML Style Sheet Properties: %s"
 msgstr "Eigenschaften HTML-Stilvorlage %s"
 
-#: ../src/report/report-gnome/dialog-style-sheet.c:369
+#: ../src/report/report-gnome/dialog-style-sheet.c:372
 msgid "Style Sheet Name"
 msgstr "Name der Stilvorlage"
 
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:276
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:277
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:273
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:274
 msgid "The numeric ID of the report."
 msgstr "Die Nummer des Berichts."
 
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:932
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:942
 msgid "_Print Report..."
 msgstr "Bericht _drucken..."
 
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:933
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:943
 msgid "Print the current report"
 msgstr "Aktuellen Bericht drucken"
 
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:944
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:954
 msgid "Add _Report"
 msgstr "_Bericht hinzufügen..."
 
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:945
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:955
 msgid ""
 "Add the current report to the `Custom' menu for later use. The report will "
 "be saved in the file ~/.gnucash/saved-reports-2.0. It will be accessible as "
@@ -14734,82 +15194,82 @@
 "Datei ~/.gnucash/saved-reports-2.0 gespeichert. Der Bericht wird beim "
 "nächsten Programmstart von GnuCash im Menü verfügbar sein."
 
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:950
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:960
 msgid "Export _Report"
 msgstr "_Bericht exportieren"
 
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:951
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:961
 msgid "Export HTML-formatted report to file"
 msgstr "HTML-formatierten Bericht in Datei exportieren"
 
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:953
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:963
 msgid "_Report Options"
 msgstr "Berichts_optionen"
 
 #. src/report/report-system/html-utilities.scm
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:954
-#: ../intl-scm/guile-strings.c:900 ../intl-scm/guile-strings.c:906
-#: ../intl-scm/guile-strings.c:912
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:964
+#: ../intl-scm/guile-strings.c:1412 ../intl-scm/guile-strings.c:1418
+#: ../intl-scm/guile-strings.c:1424
 msgid "Edit report options"
 msgstr "Berichtsoptionen ändern"
 
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:957
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:967
 msgid "Back"
 msgstr "Zurück"
 
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:958
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:968
 msgid "Move back one step in the history"
 msgstr "Einen Schritt zurück"
 
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:960
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:970
 msgid "Forward"
 msgstr "Vorwärts"
 
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:961
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:971
 msgid "Move forward one step in the history"
 msgstr "Einen Schritt vorwärts"
 
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:963
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:973
 msgid "Reload"
 msgstr "Erneut laden"
 
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:964
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:974
 msgid "Reload the current page"
 msgstr "Aktuelle Seite neu laden"
 
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:966
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:976
 msgid "Stop"
 msgstr "Abbrechen"
 
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:967
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:977
 msgid "Cancel outstanding HTML requests"
 msgstr "Unbeantwortete HTML-Anfragen abbrechen "
 
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:974
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:984
 msgid "Print"
 msgstr "Drucken"
 
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:1249
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:1286
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:1263
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:1300
 msgid "HTML"
 msgstr "HTML"
 
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:1252
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:1266
 msgid "Choose export format"
 msgstr "Wählen Sie das Export-Format"
 
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:1253
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:1267
 msgid "Choose the export format for this report:"
 msgstr "Wählen Sie das Export-Format für diesen Bericht:"
 
 #. %s is the type of what is about to be saved, e.g. "HTML".
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:1293
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:1307
 #, c-format
 msgid "Save %s To File"
 msgstr "%s in Datei speichern"
 
 #. %s is the strerror(3) string of the error that occurred.
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:1308
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:1322
 #, c-format
 msgid ""
 "You cannot save to that filename.\n"
@@ -14820,16 +15280,16 @@
 "\n"
 "%s"
 
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:1318
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:1332
 msgid "You cannot save to that file."
 msgstr "Sie können nicht in diese Datei speichern."
 
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:1399
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:1413
 #, c-format
 msgid "Could not open the file %s. The error is: %s"
 msgstr "Kann Datei %s nicht öffnen. Fehlermeldung: %s"
 
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:1430
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:1444
 msgid "There are no options for this report."
 msgstr "Es gibt für diesen Bericht keine Optionen."
 
@@ -14864,87 +15324,74 @@
 msgstr "Hinzufügen >>"
 
 #: ../src/report/report-gnome/report.glade.h:8
-msgid "Cols"
-msgstr "Spalten"
-
-#: ../src/report/report-gnome/report.glade.h:9
 msgid "Enter report row/column span"
 msgstr "Ausdehnung des Bericht in Tabellen-Spalten oder -Zeilen"
 
-#: ../src/report/report-gnome/report.glade.h:10
+#: ../src/report/report-gnome/report.glade.h:9
 msgid "HTML Style Sheets"
 msgstr "HTML-Stilvorlage"
 
-#: ../src/report/report-gnome/report.glade.h:11
+#: ../src/report/report-gnome/report.glade.h:10
 msgid "Move _up"
 msgstr "Nach _oben"
 
-#: ../src/report/report-gnome/report.glade.h:12
+#: ../src/report/report-gnome/report.glade.h:11
 msgid "Move dow_n"
 msgstr "Nach _unten"
 
-#: ../src/report/report-gnome/report.glade.h:13
+#: ../src/report/report-gnome/report.glade.h:12
 msgid "New Style Sheet"
 msgstr "Neue Stilvorlage"
 
-#. src/report/report-gnome/report-gnome.scm
-#. src/business/business-reports/owner-report.scm
-#: ../src/report/report-gnome/report.glade.h:14
-#: ../intl-scm/guile-strings.c:920 ../intl-scm/guile-strings.c:3478
-msgid "Report"
-msgstr "Bericht"
-
-#: ../src/report/report-gnome/report.glade.h:15
+#: ../src/report/report-gnome/report.glade.h:13
 msgid "Report Size"
 msgstr "Berichtsgröße"
 
-#: ../src/report/report-gnome/report.glade.h:16
-msgid "Rows"
-msgstr "Zeilen"
-
-#: ../src/report/report-gnome/report.glade.h:17
+#: ../src/report/report-gnome/report.glade.h:14
 msgid "Select HTML Style Sheet"
 msgstr "HTML-Stilvorlage auswählen"
 
-#: ../src/report/report-gnome/report.glade.h:18
+#: ../src/report/report-gnome/report.glade.h:15
 msgid "Si_ze..."
 msgstr "G_röße..."
 
-#: ../src/report/report-gnome/report.glade.h:19
+#: ../src/report/report-gnome/report.glade.h:16
 msgid "_Column span:"
 msgstr "_Spaltenausdehnung:"
 
-#: ../src/report/report-gnome/report.glade.h:22
+#: ../src/report/report-gnome/report.glade.h:19
 msgid "_Row span:"
 msgstr "_Zeilenausdehnung:"
 
-#: ../src/report/report-gnome/report.glade.h:23
+#: ../src/report/report-gnome/report.glade.h:20
 msgid "_Template:"
 msgstr "_Vorlage:"
 
-#: ../src/report/report-gnome/window-report.c:122
+#: ../src/report/report-gnome/window-report.c:101
 msgid "Set the report options you want using this dialog."
 msgstr "Mit diesem Dialog können Sie die Berichtsoptionen bearbeiten."
 
 #. src/report/utility-reports/view-column.scm
-#: ../src/report/report-gnome/window-report.c:217
-#: ../intl-scm/guile-strings.c:938
+#. src/report/utility-reports/gnucash/report/view-column.scm
+#: ../src/report/report-gnome/window-report.c:202
+#: ../intl-scm/guile-strings.c:1460 ../intl-scm/guile-strings.c:1482
 msgid "Report error"
 msgstr "Fehler im Bericht"
 
 #. src/report/utility-reports/view-column.scm
-#: ../src/report/report-gnome/window-report.c:218
-#: ../intl-scm/guile-strings.c:940
+#. src/report/utility-reports/gnucash/report/view-column.scm
+#: ../src/report/report-gnome/window-report.c:203
+#: ../intl-scm/guile-strings.c:1462 ../intl-scm/guile-strings.c:1484
 msgid "An error occurred while running the report."
 msgstr "Beim Erstellen des Berichts ist ein Fehler aufgetreten."
 
-#: ../src/report/report-gnome/window-report.c:250
-#: ../src/report/report-gnome/window-report.c:272
+#: ../src/report/report-gnome/window-report.c:236
+#: ../src/report/report-gnome/window-report.c:258
 #, c-format
 msgid "Badly formed options URL: %s"
 msgstr "Fehlerhafte Optionen-URL: %s"
 
-#: ../src/report/report-gnome/window-report.c:260
+#: ../src/report/report-gnome/window-report.c:246
 #, c-format
 msgid "Badly report id: %s"
 msgstr "Fehlerhafte Berichts ID: %s"
@@ -14952,17 +15399,17 @@
 #. Menu Items
 #: ../src/report/stylesheets/gnc-plugin-stylesheets.c:49
 msgid "St_yle Sheets"
-msgstr "_Stilvorlagen"
+msgstr "Stil_vorlagen"
 
 #: ../src/report/stylesheets/gnc-plugin-stylesheets.c:50
 msgid "Edit report style sheets."
 msgstr "Stilvorlagen für Berichte bearbeiten."
 
-#: ../lib/libqof/backend/file/qsf-backend.c:102
+#: ../lib/libqof/backend/file/qsf-backend.c:107
 msgid "Level of compression to use: 0 for none, 9 for highest."
 msgstr "Kompressionsaufwand: 0 für gar keinen, 9 für höchsten."
 
-#: ../lib/libqof/backend/file/qsf-backend.c:103
+#: ../lib/libqof/backend/file/qsf-backend.c:108
 msgid ""
 "QOF can compress QSF XML files using gzip. Note that compression is not used "
 "when outputting to STDOUT."
@@ -14970,13 +15417,13 @@
 "QOF kann die QSF XML-Dateien mit gzip komprimieren. Dies wird aber nicht "
 "gemacht, wenn die Ausgabe nach STDOUT geleitet ist."
 
-#: ../lib/libqof/backend/file/qsf-backend.c:111
+#: ../lib/libqof/backend/file/qsf-backend.c:116
 msgid "List of QSF map files to use for this session."
 msgstr ""
 "Liste der QSF-Zuordnungs-Dateien (Map), die in dieser Sietzung verwendet "
 "werden."
 
-#: ../lib/libqof/backend/file/qsf-backend.c:112
+#: ../lib/libqof/backend/file/qsf-backend.c:117
 msgid ""
 "QOF can convert objects within QSF XML files using a map of the changes "
 "required."
@@ -14984,16 +15431,16 @@
 "QOF kann Objekte aus QSF XML-Dateien konvertieren, wenn eine Liste von "
 "Zuordnungen (Maps) für die notwendigen Änderungen existieren."
 
-#: ../lib/libqof/backend/file/qsf-backend.c:120
-msgid "Encoding string to use when writing the XML file."
+#: ../lib/libqof/backend/file/qsf-backend.c:125
+msgid "String encoding to use when writing the XML file."
 msgstr ""
 "Wählen Sie die Zeichencodierung (Encoding), die in die XML-Datei geschrieben "
 "werden soll."
 
-#: ../lib/libqof/backend/file/qsf-backend.c:121
+#: ../lib/libqof/backend/file/qsf-backend.c:126
 msgid ""
-"QSF defaults to UTF-8. Other encodings are supported by passing the encoding "
-"string in this option."
+"QSF defaults to UTF-8. Other encodings are supported by passing the string "
+"encoding in this option."
 msgstr ""
 "Die voreingestellte Zeichenkodierung in QSF ist UTF-8. Andere Kodierungen "
 "können verwendet werden, indem Sie den Namen der Zeichencodierung in dieser "
@@ -15020,20 +15467,27 @@
 "sind."
 
 #. src/scm/price-quotes.scm
+#. src/scm/gnucash/price-quotes.scm
 #: ../intl-scm/guile-strings.c:8 ../intl-scm/guile-strings.c:10
+#: ../intl-scm/guile-strings.c:52 ../intl-scm/guile-strings.c:54
 msgid "No commodities marked for quote retrieval."
 msgstr "Keine Aktien zum Börsenkurs-Abruf markiert."
 
 #. src/scm/price-quotes.scm
+#. src/scm/gnucash/price-quotes.scm
 #: ../intl-scm/guile-strings.c:12 ../intl-scm/guile-strings.c:14
 #: ../intl-scm/guile-strings.c:30 ../intl-scm/guile-strings.c:32
+#: ../intl-scm/guile-strings.c:56 ../intl-scm/guile-strings.c:58
+#: ../intl-scm/guile-strings.c:74 ../intl-scm/guile-strings.c:76
 msgid "Unable to get quotes or diagnose the problem."
 msgstr ""
 "Abrufen der Börsenkurse fehlgeschlagen. Genauere Diagnose ebenfalls "
 "fehlgeschlagen."
 
 #. src/scm/price-quotes.scm
+#. src/scm/gnucash/price-quotes.scm
 #: ../intl-scm/guile-strings.c:16 ../intl-scm/guile-strings.c:19
+#: ../intl-scm/guile-strings.c:60 ../intl-scm/guile-strings.c:63
 msgid ""
 "You are missing some needed Perl libraries.\n"
 "Run 'gnc-fq-update' as root to install them."
@@ -15042,731 +15496,959 @@
 "Führen Sie 'gnc-fq-update' als root aus, um diese zu installieren."
 
 #. src/scm/price-quotes.scm
+#. src/scm/gnucash/price-quotes.scm
 #: ../intl-scm/guile-strings.c:22 ../intl-scm/guile-strings.c:24
+#: ../intl-scm/guile-strings.c:66 ../intl-scm/guile-strings.c:68
 msgid "There was a system error while retrieving the price quotes."
 msgstr "Beim Herunterladen der Börsenkurse ist ein Systemfehler aufgetreten."
 
 #. src/scm/price-quotes.scm
+#. src/scm/gnucash/price-quotes.scm
 #: ../intl-scm/guile-strings.c:26 ../intl-scm/guile-strings.c:28
+#: ../intl-scm/guile-strings.c:70 ../intl-scm/guile-strings.c:72
 msgid "There was an unknown error while retrieving the price quotes."
 msgstr ""
 "Beim Herunterladen der Börsenkurse ist ein unbekannter Fehler aufgetreten."
 
 #. src/scm/price-quotes.scm
+#. src/scm/gnucash/price-quotes.scm
 #: ../intl-scm/guile-strings.c:34 ../intl-scm/guile-strings.c:38
-#: ../intl-scm/guile-strings.c:40
+#: ../intl-scm/guile-strings.c:40 ../intl-scm/guile-strings.c:78
+#: ../intl-scm/guile-strings.c:82 ../intl-scm/guile-strings.c:84
 msgid "Unable to retrieve quotes for these items:"
 msgstr "Abrufen von Börsenkursen für diese Werte fehlgeschlagen:"
 
 #. src/scm/price-quotes.scm
-#: ../intl-scm/guile-strings.c:36
+#. src/scm/gnucash/price-quotes.scm
+#: ../intl-scm/guile-strings.c:36 ../intl-scm/guile-strings.c:80
 msgid "Continue using only the good quotes?"
 msgstr "Mit den benutzbaren Kursen fortsetzen?"
 
 #. src/scm/price-quotes.scm
-#: ../intl-scm/guile-strings.c:42
+#. src/scm/gnucash/price-quotes.scm
+#: ../intl-scm/guile-strings.c:42 ../intl-scm/guile-strings.c:86
 msgid "Continuing with good quotes."
 msgstr "Es wird mit den benutzbaren Kursen fortgesetzt."
 
 #. src/scm/price-quotes.scm
+#. src/scm/gnucash/price-quotes.scm
 #: ../intl-scm/guile-strings.c:44 ../intl-scm/guile-strings.c:48
+#: ../intl-scm/guile-strings.c:88 ../intl-scm/guile-strings.c:92
 msgid "Unable to create prices for these items:"
 msgstr "Preis-Eintrag für folgende Werte fehlgeschlagen:"
 
 #. src/scm/price-quotes.scm
-#: ../intl-scm/guile-strings.c:46
+#. src/scm/gnucash/price-quotes.scm
+#: ../intl-scm/guile-strings.c:46 ../intl-scm/guile-strings.c:90
 msgid "Add remaining good quotes?"
 msgstr "Ãœbrige benutzbare Kurse eintragen?"
 
 #. src/scm/price-quotes.scm
-#: ../intl-scm/guile-strings.c:50
+#. src/scm/gnucash/price-quotes.scm
+#: ../intl-scm/guile-strings.c:50 ../intl-scm/guile-strings.c:94
 msgid "Adding remaining good quotes."
 msgstr "Benutzbare Kurse werden eingetragen."
 
 #. src/tax/us/de_DE.scm
-#: ../intl-scm/guile-strings.c:54
+#. src/tax/us/gnucash/tax/de_DE.scm
+#: ../intl-scm/guile-strings.c:98 ../intl-scm/guile-strings.c:102
 msgid "Tax Number"
 msgstr "Steuernummer"
 
 #. src/tax/us/txf-de_DE.scm
-#: ../intl-scm/guile-strings.c:56
+#: ../intl-scm/guile-strings.c:104
 msgid "The electronic tax number of your business"
 msgstr "Die Elster-Steuernummer Ihrer Unternehmung"
 
 #. src/app-utils/prefs.scm
-#: ../intl-scm/guile-strings.c:58
+#: ../intl-scm/guile-strings.c:106
 msgid "Funds In"
 msgstr "Gutschrift"
 
 #. src/app-utils/prefs.scm
-#: ../intl-scm/guile-strings.c:62
+#: ../intl-scm/guile-strings.c:110
 msgid "Receive"
 msgstr "Empfangen"
 
 #. src/app-utils/prefs.scm
-#: ../intl-scm/guile-strings.c:66 ../intl-scm/guile-strings.c:96
-#: ../intl-scm/guile-strings.c:112
+#: ../intl-scm/guile-strings.c:114 ../intl-scm/guile-strings.c:144
+#: ../intl-scm/guile-strings.c:160
 msgid "Increase"
 msgstr "Zunahme"
 
 #. src/app-utils/prefs.scm
-#: ../intl-scm/guile-strings.c:68 ../intl-scm/guile-strings.c:84
-#: ../intl-scm/guile-strings.c:94
+#: ../intl-scm/guile-strings.c:116 ../intl-scm/guile-strings.c:132
+#: ../intl-scm/guile-strings.c:142
 msgid "Decrease"
 msgstr "Abnahme"
 
 #. src/app-utils/prefs.scm
-#: ../intl-scm/guile-strings.c:86
+#: ../intl-scm/guile-strings.c:134
 msgid "Funds Out"
 msgstr "Belastung"
 
 #. src/app-utils/prefs.scm
-#: ../intl-scm/guile-strings.c:88
+#: ../intl-scm/guile-strings.c:136
 msgid "Withdrawal"
 msgstr "Abhebung"
 
 #. src/app-utils/prefs.scm
-#: ../intl-scm/guile-strings.c:90
+#: ../intl-scm/guile-strings.c:138
 msgid "Spend"
 msgstr "Ausgabe"
 
 #. src/app-utils/date-utilities.scm
-#: ../intl-scm/guile-strings.c:114
+#: ../intl-scm/guile-strings.c:162
 msgid "Current Year Start"
 msgstr "Anfang dieses Jahres"
 
 #. src/app-utils/date-utilities.scm
-#: ../intl-scm/guile-strings.c:116
+#: ../intl-scm/guile-strings.c:164
 msgid "Start of the current calendar year"
 msgstr "Beginn des momentanen Kalenderjahres"
 
 #. src/app-utils/date-utilities.scm
-#: ../intl-scm/guile-strings.c:118
+#: ../intl-scm/guile-strings.c:166
 msgid "Current Year End"
 msgstr "Ende dieses Jahres"
 
 #. src/app-utils/date-utilities.scm
-#: ../intl-scm/guile-strings.c:120
+#: ../intl-scm/guile-strings.c:168
 msgid "End of the current calendar year"
 msgstr "Ende des momentanen Kalenderjahres"
 
 #. src/app-utils/date-utilities.scm
-#: ../intl-scm/guile-strings.c:122
+#: ../intl-scm/guile-strings.c:170
 msgid "Previous Year Start"
 msgstr "Anfang des vorherigen Jahres"
 
 #. src/app-utils/date-utilities.scm
-#: ../intl-scm/guile-strings.c:124
+#: ../intl-scm/guile-strings.c:172
 msgid "Beginning of the previous calendar year"
 msgstr "Anfang des vorherigen Kalenderjahres"
 
 #. src/app-utils/date-utilities.scm
-#: ../intl-scm/guile-strings.c:126
+#: ../intl-scm/guile-strings.c:174
 msgid "Previous Year End"
 msgstr "Ende des vorherigen Jahres"
 
 #. src/app-utils/date-utilities.scm
-#: ../intl-scm/guile-strings.c:128
+#: ../intl-scm/guile-strings.c:176
 msgid "End of the Previous Year"
 msgstr "Ende des vorherigen Jahres"
 
 #. src/app-utils/date-utilities.scm
-#: ../intl-scm/guile-strings.c:130
+#: ../intl-scm/guile-strings.c:178
 msgid "Start of Financial Period"
 msgstr "Start der Buchführungsperiode"
 
 #. src/app-utils/date-utilities.scm
-#: ../intl-scm/guile-strings.c:132
+#: ../intl-scm/guile-strings.c:180
 msgid "Start of the accounting period, as set in the global preferences"
 msgstr ""
 "Start der Buchführungsperiode, wie in den programmweiten Einstellungen "
 "festgelegt"
 
 #. src/app-utils/date-utilities.scm
-#: ../intl-scm/guile-strings.c:134
+#: ../intl-scm/guile-strings.c:182
 msgid "End of Financial Period"
 msgstr "Ende der Buchführungsperiode"
 
 #. src/app-utils/date-utilities.scm
-#: ../intl-scm/guile-strings.c:136
+#: ../intl-scm/guile-strings.c:184
 msgid "End of the accounting period, as set in the global preferences"
 msgstr ""
 "Ende der Buchführungsperiode, wie in den programmweiten Einstellungen "
 "festgelegt"
 
 #. src/app-utils/date-utilities.scm
-#: ../intl-scm/guile-strings.c:140
+#: ../intl-scm/guile-strings.c:188
 msgid "Start of the current month"
 msgstr "Beginn des momentanen Monats"
 
 #. src/app-utils/date-utilities.scm
-#: ../intl-scm/guile-strings.c:144
+#: ../intl-scm/guile-strings.c:192
 msgid "End of the current month"
 msgstr "Ende des momentanen Monats"
 
 #. src/app-utils/date-utilities.scm
-#: ../intl-scm/guile-strings.c:148
+#: ../intl-scm/guile-strings.c:196
 msgid "The beginning of the previous month"
 msgstr "Beginn des vorherigen Monats"
 
 #. src/app-utils/date-utilities.scm
-#: ../intl-scm/guile-strings.c:152
+#: ../intl-scm/guile-strings.c:200
 msgid "Last day of previous month"
 msgstr "Letzter Tag des vorherigen Monats"
 
 #. src/app-utils/date-utilities.scm
-#: ../intl-scm/guile-strings.c:154
+#: ../intl-scm/guile-strings.c:202
 msgid "Start of current quarter"
 msgstr "Beginn des momentanen Quartals"
 
 #. src/app-utils/date-utilities.scm
-#: ../intl-scm/guile-strings.c:156
+#: ../intl-scm/guile-strings.c:204
 msgid "The start of the latest quarterly accounting period"
 msgstr "Beginn des letzten Finanzquartals"
 
 #. src/app-utils/date-utilities.scm
-#: ../intl-scm/guile-strings.c:158
+#: ../intl-scm/guile-strings.c:206
 msgid "End of current quarter"
 msgstr "Ende des momentanen Quartals"
 
 #. src/app-utils/date-utilities.scm
-#: ../intl-scm/guile-strings.c:160
+#: ../intl-scm/guile-strings.c:208
 msgid "The end of the latest quarterly accounting period"
 msgstr "Ende des letzten Finanzquartals"
 
 #. src/app-utils/date-utilities.scm
-#: ../intl-scm/guile-strings.c:164
+#: ../intl-scm/guile-strings.c:212
 msgid "The start of the previous quarterly accounting period"
 msgstr "Beginn des vorherigen Finanzquartals"
 
 #. src/app-utils/date-utilities.scm
-#: ../intl-scm/guile-strings.c:168
+#: ../intl-scm/guile-strings.c:216
 msgid "End of previous quarterly accounting period"
 msgstr "Ende des vorherigen Finanzquartals"
 
 #. src/app-utils/date-utilities.scm
-#: ../intl-scm/guile-strings.c:172
+#: ../intl-scm/guile-strings.c:220
 msgid "The current date"
 msgstr "Das aktuelle Datum"
 
 #. src/app-utils/date-utilities.scm
-#: ../intl-scm/guile-strings.c:174 ../intl-scm/guile-strings.c:176
+#: ../intl-scm/guile-strings.c:222 ../intl-scm/guile-strings.c:224
 msgid "One Month Ago"
 msgstr "Einen Monat zuvor"
 
 #. src/app-utils/date-utilities.scm
-#: ../intl-scm/guile-strings.c:178 ../intl-scm/guile-strings.c:180
+#: ../intl-scm/guile-strings.c:226 ../intl-scm/guile-strings.c:228
 msgid "One Week Ago"
 msgstr "Eine Woche zuvor"
 
 #. src/app-utils/date-utilities.scm
-#: ../intl-scm/guile-strings.c:182 ../intl-scm/guile-strings.c:184
+#: ../intl-scm/guile-strings.c:230 ../intl-scm/guile-strings.c:232
 msgid "Three Months Ago"
 msgstr "Drei Monate zuvor"
 
 #. src/app-utils/date-utilities.scm
-#: ../intl-scm/guile-strings.c:186 ../intl-scm/guile-strings.c:188
+#: ../intl-scm/guile-strings.c:234 ../intl-scm/guile-strings.c:236
 msgid "Six Months Ago"
 msgstr "sechs Monate zuvor"
 
 #. src/app-utils/date-utilities.scm
-#: ../intl-scm/guile-strings.c:190 ../intl-scm/guile-strings.c:192
+#: ../intl-scm/guile-strings.c:238 ../intl-scm/guile-strings.c:240
 msgid "One Year Ago"
 msgstr "Ein Jahr zuvor"
 
 #. src/report/stylesheets/stylesheet-fancy.scm
 #. src/report/stylesheets/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:196 ../intl-scm/guile-strings.c:322
-#: ../intl-scm/guile-strings.c:408 ../intl-scm/guile-strings.c:534
+#. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
+#: ../intl-scm/guile-strings.c:244 ../intl-scm/guile-strings.c:370
+#: ../intl-scm/guile-strings.c:456 ../intl-scm/guile-strings.c:582
+#: ../intl-scm/guile-strings.c:668 ../intl-scm/guile-strings.c:794
+#: ../intl-scm/guile-strings.c:880 ../intl-scm/guile-strings.c:1006
 msgid "Preparer"
 msgstr "Sachbearbeiter"
 
 #. src/report/stylesheets/stylesheet-fancy.scm
 #. src/report/stylesheets/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:198 ../intl-scm/guile-strings.c:410
+#. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
+#: ../intl-scm/guile-strings.c:246 ../intl-scm/guile-strings.c:458
+#: ../intl-scm/guile-strings.c:670 ../intl-scm/guile-strings.c:882
 msgid "Name of person preparing the report"
 msgstr "Name der Person, die den Bericht erstellt."
 
 #. src/report/stylesheets/stylesheet-fancy.scm
 #. src/report/stylesheets/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:202 ../intl-scm/guile-strings.c:326
-#: ../intl-scm/guile-strings.c:414 ../intl-scm/guile-strings.c:538
+#. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
+#: ../intl-scm/guile-strings.c:250 ../intl-scm/guile-strings.c:374
+#: ../intl-scm/guile-strings.c:462 ../intl-scm/guile-strings.c:586
+#: ../intl-scm/guile-strings.c:674 ../intl-scm/guile-strings.c:798
+#: ../intl-scm/guile-strings.c:886 ../intl-scm/guile-strings.c:1010
 msgid "Prepared for"
 msgstr "Erstellt für"
 
 #. src/report/stylesheets/stylesheet-fancy.scm
 #. src/report/stylesheets/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:204 ../intl-scm/guile-strings.c:416
+#. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
+#: ../intl-scm/guile-strings.c:252 ../intl-scm/guile-strings.c:464
+#: ../intl-scm/guile-strings.c:676 ../intl-scm/guile-strings.c:888
 msgid "Name of organization or company prepared for"
 msgstr "Name der Organisation/Firma, für die der Bericht erstellt wird."
 
 #. src/report/stylesheets/stylesheet-fancy.scm
 #. src/report/stylesheets/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:208 ../intl-scm/guile-strings.c:330
-#: ../intl-scm/guile-strings.c:420 ../intl-scm/guile-strings.c:542
+#. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
+#: ../intl-scm/guile-strings.c:256 ../intl-scm/guile-strings.c:378
+#: ../intl-scm/guile-strings.c:468 ../intl-scm/guile-strings.c:590
+#: ../intl-scm/guile-strings.c:680 ../intl-scm/guile-strings.c:802
+#: ../intl-scm/guile-strings.c:892 ../intl-scm/guile-strings.c:1014
 msgid "Show preparer info"
 msgstr "Personen-Information anzeigen"
 
 #. src/report/stylesheets/stylesheet-fancy.scm
 #. src/report/stylesheets/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:210 ../intl-scm/guile-strings.c:422
+#. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
+#: ../intl-scm/guile-strings.c:258 ../intl-scm/guile-strings.c:470
+#: ../intl-scm/guile-strings.c:682 ../intl-scm/guile-strings.c:894
 msgid "Name of organization or company"
 msgstr "Name der Organisation/Firma"
 
 #. src/report/stylesheets/stylesheet-fancy.scm
 #. src/report/stylesheets/stylesheet-easy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-plain.scm
 #. src/report/stylesheets/stylesheet-plain.scm
-#: ../intl-scm/guile-strings.c:214 ../intl-scm/guile-strings.c:334
-#: ../intl-scm/guile-strings.c:426 ../intl-scm/guile-strings.c:546
-#: ../intl-scm/guile-strings.c:632
+#: ../intl-scm/guile-strings.c:262 ../intl-scm/guile-strings.c:382
+#: ../intl-scm/guile-strings.c:474 ../intl-scm/guile-strings.c:594
+#: ../intl-scm/guile-strings.c:686 ../intl-scm/guile-strings.c:806
+#: ../intl-scm/guile-strings.c:898 ../intl-scm/guile-strings.c:1018
+#: ../intl-scm/guile-strings.c:1104 ../intl-scm/guile-strings.c:1144
 msgid "Enable Links"
 msgstr "Hyperlinks aktivieren"
 
 #. src/report/stylesheets/stylesheet-fancy.scm
 #. src/report/stylesheets/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:216 ../intl-scm/guile-strings.c:428
+#. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
+#: ../intl-scm/guile-strings.c:264 ../intl-scm/guile-strings.c:476
+#: ../intl-scm/guile-strings.c:688 ../intl-scm/guile-strings.c:900
 msgid "Enable hyperlinks in reports"
 msgstr "Klickbare Hyperlinks in Berichten aktivieren"
 
 #. src/report/stylesheets/stylesheet-fancy.scm
 #. src/report/stylesheets/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:218 ../intl-scm/guile-strings.c:224
-#: ../intl-scm/guile-strings.c:230 ../intl-scm/guile-strings.c:248
-#: ../intl-scm/guile-strings.c:368 ../intl-scm/guile-strings.c:372
-#: ../intl-scm/guile-strings.c:376 ../intl-scm/guile-strings.c:380
-#: ../intl-scm/guile-strings.c:430 ../intl-scm/guile-strings.c:436
-#: ../intl-scm/guile-strings.c:442 ../intl-scm/guile-strings.c:460
-#: ../intl-scm/guile-strings.c:580 ../intl-scm/guile-strings.c:584
-#: ../intl-scm/guile-strings.c:588 ../intl-scm/guile-strings.c:592
+#. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
+#: ../intl-scm/guile-strings.c:266 ../intl-scm/guile-strings.c:272
+#: ../intl-scm/guile-strings.c:278 ../intl-scm/guile-strings.c:296
+#: ../intl-scm/guile-strings.c:416 ../intl-scm/guile-strings.c:420
+#: ../intl-scm/guile-strings.c:424 ../intl-scm/guile-strings.c:428
+#: ../intl-scm/guile-strings.c:478 ../intl-scm/guile-strings.c:484
+#: ../intl-scm/guile-strings.c:490 ../intl-scm/guile-strings.c:508
+#: ../intl-scm/guile-strings.c:628 ../intl-scm/guile-strings.c:632
+#: ../intl-scm/guile-strings.c:636 ../intl-scm/guile-strings.c:640
+#: ../intl-scm/guile-strings.c:690 ../intl-scm/guile-strings.c:696
+#: ../intl-scm/guile-strings.c:702 ../intl-scm/guile-strings.c:720
+#: ../intl-scm/guile-strings.c:840 ../intl-scm/guile-strings.c:844
+#: ../intl-scm/guile-strings.c:848 ../intl-scm/guile-strings.c:852
+#: ../intl-scm/guile-strings.c:902 ../intl-scm/guile-strings.c:908
+#: ../intl-scm/guile-strings.c:914 ../intl-scm/guile-strings.c:932
+#: ../intl-scm/guile-strings.c:1052 ../intl-scm/guile-strings.c:1056
+#: ../intl-scm/guile-strings.c:1060 ../intl-scm/guile-strings.c:1064
 msgid "Images"
 msgstr "Bilder"
 
 #. src/report/stylesheets/stylesheet-fancy.scm
 #. src/report/stylesheets/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:220 ../intl-scm/guile-strings.c:370
-#: ../intl-scm/guile-strings.c:432 ../intl-scm/guile-strings.c:582
+#. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
+#: ../intl-scm/guile-strings.c:268 ../intl-scm/guile-strings.c:418
+#: ../intl-scm/guile-strings.c:480 ../intl-scm/guile-strings.c:630
+#: ../intl-scm/guile-strings.c:692 ../intl-scm/guile-strings.c:842
+#: ../intl-scm/guile-strings.c:904 ../intl-scm/guile-strings.c:1054
 msgid "Background Tile"
 msgstr "Hintergrundbild"
 
 #. src/report/stylesheets/stylesheet-fancy.scm
 #. src/report/stylesheets/stylesheet-easy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-plain.scm
 #. src/report/stylesheets/stylesheet-plain.scm
-#: ../intl-scm/guile-strings.c:222 ../intl-scm/guile-strings.c:434
-#: ../intl-scm/guile-strings.c:628
+#: ../intl-scm/guile-strings.c:270 ../intl-scm/guile-strings.c:482
+#: ../intl-scm/guile-strings.c:694 ../intl-scm/guile-strings.c:906
+#: ../intl-scm/guile-strings.c:1100 ../intl-scm/guile-strings.c:1140
 msgid "Background tile for reports."
 msgstr "Hintergrundbild für Berichte."
 
 #. src/report/stylesheets/stylesheet-fancy.scm
 #. src/report/stylesheets/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:226 ../intl-scm/guile-strings.c:374
-#: ../intl-scm/guile-strings.c:438 ../intl-scm/guile-strings.c:586
+#. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
+#: ../intl-scm/guile-strings.c:274 ../intl-scm/guile-strings.c:422
+#: ../intl-scm/guile-strings.c:486 ../intl-scm/guile-strings.c:634
+#: ../intl-scm/guile-strings.c:698 ../intl-scm/guile-strings.c:846
+#: ../intl-scm/guile-strings.c:910 ../intl-scm/guile-strings.c:1058
 msgid "Heading Banner"
 msgstr "Titel"
 
 #. src/report/stylesheets/stylesheet-fancy.scm
 #. src/report/stylesheets/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:228 ../intl-scm/guile-strings.c:234
-#: ../intl-scm/guile-strings.c:440 ../intl-scm/guile-strings.c:446
+#. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
+#: ../intl-scm/guile-strings.c:276 ../intl-scm/guile-strings.c:282
+#: ../intl-scm/guile-strings.c:488 ../intl-scm/guile-strings.c:494
+#: ../intl-scm/guile-strings.c:700 ../intl-scm/guile-strings.c:706
+#: ../intl-scm/guile-strings.c:912 ../intl-scm/guile-strings.c:918
 msgid "Banner for top of report."
 msgstr "Titel für die Titelzeile des Berichts"
 
 #. src/report/stylesheets/stylesheet-fancy.scm
 #. src/report/stylesheets/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:232 ../intl-scm/guile-strings.c:382
-#: ../intl-scm/guile-strings.c:444 ../intl-scm/guile-strings.c:594
+#. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
+#: ../intl-scm/guile-strings.c:280 ../intl-scm/guile-strings.c:430
+#: ../intl-scm/guile-strings.c:492 ../intl-scm/guile-strings.c:642
+#: ../intl-scm/guile-strings.c:704 ../intl-scm/guile-strings.c:854
+#: ../intl-scm/guile-strings.c:916 ../intl-scm/guile-strings.c:1066
 msgid "Heading Alignment"
 msgstr "Ausrichtung Ãœberschrift"
 
 #. src/report/stylesheets/stylesheet-fancy.scm
 #. src/report/stylesheets/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:236 ../intl-scm/guile-strings.c:448
+#. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
+#: ../intl-scm/guile-strings.c:284 ../intl-scm/guile-strings.c:496
+#: ../intl-scm/guile-strings.c:708 ../intl-scm/guile-strings.c:920
 msgid "Left"
 msgstr "Links"
 
 #. src/report/stylesheets/stylesheet-fancy.scm
 #. src/report/stylesheets/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:238 ../intl-scm/guile-strings.c:450
+#. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
+#: ../intl-scm/guile-strings.c:286 ../intl-scm/guile-strings.c:498
+#: ../intl-scm/guile-strings.c:710 ../intl-scm/guile-strings.c:922
 msgid "Align the banner to the left"
 msgstr "Logo linksbündig ausrichten"
 
 #. src/report/stylesheets/stylesheet-fancy.scm
 #. src/report/stylesheets/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:240 ../intl-scm/guile-strings.c:452
+#. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
+#: ../intl-scm/guile-strings.c:288 ../intl-scm/guile-strings.c:500
+#: ../intl-scm/guile-strings.c:712 ../intl-scm/guile-strings.c:924
 msgid "Center"
 msgstr "Zentriert"
 
 #. src/report/stylesheets/stylesheet-fancy.scm
 #. src/report/stylesheets/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:242 ../intl-scm/guile-strings.c:454
+#. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
+#: ../intl-scm/guile-strings.c:290 ../intl-scm/guile-strings.c:502
+#: ../intl-scm/guile-strings.c:714 ../intl-scm/guile-strings.c:926
 msgid "Align the banner in the center"
 msgstr "Logo zentriert ausrichten"
 
 #. src/report/stylesheets/stylesheet-fancy.scm
 #. src/report/stylesheets/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:244 ../intl-scm/guile-strings.c:456
+#. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
+#: ../intl-scm/guile-strings.c:292 ../intl-scm/guile-strings.c:504
+#: ../intl-scm/guile-strings.c:716 ../intl-scm/guile-strings.c:928
 msgid "Right"
 msgstr "Rechts"
 
 #. src/report/stylesheets/stylesheet-fancy.scm
 #. src/report/stylesheets/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:246 ../intl-scm/guile-strings.c:458
+#. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
+#: ../intl-scm/guile-strings.c:294 ../intl-scm/guile-strings.c:506
+#: ../intl-scm/guile-strings.c:718 ../intl-scm/guile-strings.c:930
 msgid "Align the banner to the right"
 msgstr "Logo rechtsbündig ausrichten"
 
 #. src/report/stylesheets/stylesheet-fancy.scm
 #. src/report/stylesheets/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:250 ../intl-scm/guile-strings.c:378
-#: ../intl-scm/guile-strings.c:462 ../intl-scm/guile-strings.c:590
+#. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
+#: ../intl-scm/guile-strings.c:298 ../intl-scm/guile-strings.c:426
+#: ../intl-scm/guile-strings.c:510 ../intl-scm/guile-strings.c:638
+#: ../intl-scm/guile-strings.c:722 ../intl-scm/guile-strings.c:850
+#: ../intl-scm/guile-strings.c:934 ../intl-scm/guile-strings.c:1062
 msgid "Logo"
 msgstr "Logo"
 
 #. src/report/stylesheets/stylesheet-fancy.scm
 #. src/report/stylesheets/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:252 ../intl-scm/guile-strings.c:464
+#. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
+#: ../intl-scm/guile-strings.c:300 ../intl-scm/guile-strings.c:512
+#: ../intl-scm/guile-strings.c:724 ../intl-scm/guile-strings.c:936
 msgid "Company logo image."
 msgstr "Bild für das Firmenlogo."
 
 #. src/report/stylesheets/stylesheet-fancy.scm
 #. src/report/stylesheets/stylesheet-easy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
+#. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:254 ../intl-scm/guile-strings.c:260
-#: ../intl-scm/guile-strings.c:266 ../intl-scm/guile-strings.c:272
-#: ../intl-scm/guile-strings.c:278 ../intl-scm/guile-strings.c:284
-#: ../intl-scm/guile-strings.c:290 ../intl-scm/guile-strings.c:296
-#: ../intl-scm/guile-strings.c:336 ../intl-scm/guile-strings.c:340
-#: ../intl-scm/guile-strings.c:344 ../intl-scm/guile-strings.c:348
-#: ../intl-scm/guile-strings.c:352 ../intl-scm/guile-strings.c:356
-#: ../intl-scm/guile-strings.c:360 ../intl-scm/guile-strings.c:364
-#: ../intl-scm/guile-strings.c:466 ../intl-scm/guile-strings.c:472
-#: ../intl-scm/guile-strings.c:478 ../intl-scm/guile-strings.c:484
-#: ../intl-scm/guile-strings.c:490 ../intl-scm/guile-strings.c:496
-#: ../intl-scm/guile-strings.c:502 ../intl-scm/guile-strings.c:508
-#: ../intl-scm/guile-strings.c:548 ../intl-scm/guile-strings.c:552
-#: ../intl-scm/guile-strings.c:556 ../intl-scm/guile-strings.c:560
-#: ../intl-scm/guile-strings.c:564 ../intl-scm/guile-strings.c:568
-#: ../intl-scm/guile-strings.c:572 ../intl-scm/guile-strings.c:576
-#: ../intl-scm/guile-strings.c:2522 ../intl-scm/guile-strings.c:2526
-#: ../intl-scm/guile-strings.c:2530 ../intl-scm/guile-strings.c:2534
-#: ../intl-scm/guile-strings.c:2538
+#: ../intl-scm/guile-strings.c:302 ../intl-scm/guile-strings.c:308
+#: ../intl-scm/guile-strings.c:314 ../intl-scm/guile-strings.c:320
+#: ../intl-scm/guile-strings.c:326 ../intl-scm/guile-strings.c:332
+#: ../intl-scm/guile-strings.c:338 ../intl-scm/guile-strings.c:344
+#: ../intl-scm/guile-strings.c:384 ../intl-scm/guile-strings.c:388
+#: ../intl-scm/guile-strings.c:392 ../intl-scm/guile-strings.c:396
+#: ../intl-scm/guile-strings.c:400 ../intl-scm/guile-strings.c:404
+#: ../intl-scm/guile-strings.c:408 ../intl-scm/guile-strings.c:412
+#: ../intl-scm/guile-strings.c:514 ../intl-scm/guile-strings.c:520
+#: ../intl-scm/guile-strings.c:526 ../intl-scm/guile-strings.c:532
+#: ../intl-scm/guile-strings.c:538 ../intl-scm/guile-strings.c:544
+#: ../intl-scm/guile-strings.c:550 ../intl-scm/guile-strings.c:556
+#: ../intl-scm/guile-strings.c:596 ../intl-scm/guile-strings.c:600
+#: ../intl-scm/guile-strings.c:604 ../intl-scm/guile-strings.c:608
+#: ../intl-scm/guile-strings.c:612 ../intl-scm/guile-strings.c:616
+#: ../intl-scm/guile-strings.c:620 ../intl-scm/guile-strings.c:624
+#: ../intl-scm/guile-strings.c:726 ../intl-scm/guile-strings.c:732
+#: ../intl-scm/guile-strings.c:738 ../intl-scm/guile-strings.c:744
+#: ../intl-scm/guile-strings.c:750 ../intl-scm/guile-strings.c:756
+#: ../intl-scm/guile-strings.c:762 ../intl-scm/guile-strings.c:768
+#: ../intl-scm/guile-strings.c:808 ../intl-scm/guile-strings.c:812
+#: ../intl-scm/guile-strings.c:816 ../intl-scm/guile-strings.c:820
+#: ../intl-scm/guile-strings.c:824 ../intl-scm/guile-strings.c:828
+#: ../intl-scm/guile-strings.c:832 ../intl-scm/guile-strings.c:836
+#: ../intl-scm/guile-strings.c:938 ../intl-scm/guile-strings.c:944
+#: ../intl-scm/guile-strings.c:950 ../intl-scm/guile-strings.c:956
+#: ../intl-scm/guile-strings.c:962 ../intl-scm/guile-strings.c:968
+#: ../intl-scm/guile-strings.c:974 ../intl-scm/guile-strings.c:980
+#: ../intl-scm/guile-strings.c:1020 ../intl-scm/guile-strings.c:1024
+#: ../intl-scm/guile-strings.c:1028 ../intl-scm/guile-strings.c:1032
+#: ../intl-scm/guile-strings.c:1036 ../intl-scm/guile-strings.c:1040
+#: ../intl-scm/guile-strings.c:1044 ../intl-scm/guile-strings.c:1048
+#: ../intl-scm/guile-strings.c:3856 ../intl-scm/guile-strings.c:3860
+#: ../intl-scm/guile-strings.c:3864 ../intl-scm/guile-strings.c:3868
+#: ../intl-scm/guile-strings.c:3872 ../intl-scm/guile-strings.c:5006
+#: ../intl-scm/guile-strings.c:5010 ../intl-scm/guile-strings.c:5014
+#: ../intl-scm/guile-strings.c:5018 ../intl-scm/guile-strings.c:5022
 msgid "Colors"
 msgstr "Farben"
 
 #. src/report/stylesheets/stylesheet-fancy.scm
 #. src/report/stylesheets/stylesheet-easy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-plain.scm
 #. src/report/stylesheets/stylesheet-plain.scm
+#. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:256 ../intl-scm/guile-strings.c:338
-#: ../intl-scm/guile-strings.c:468 ../intl-scm/guile-strings.c:550
-#: ../intl-scm/guile-strings.c:620 ../intl-scm/guile-strings.c:1018
+#: ../intl-scm/guile-strings.c:304 ../intl-scm/guile-strings.c:386
+#: ../intl-scm/guile-strings.c:516 ../intl-scm/guile-strings.c:598
+#: ../intl-scm/guile-strings.c:728 ../intl-scm/guile-strings.c:810
+#: ../intl-scm/guile-strings.c:940 ../intl-scm/guile-strings.c:1022
+#: ../intl-scm/guile-strings.c:1092 ../intl-scm/guile-strings.c:1132
+#: ../intl-scm/guile-strings.c:1562 ../intl-scm/guile-strings.c:1730
 msgid "Background Color"
 msgstr "Hintergrund Farbe"
 
 #. src/report/stylesheets/stylesheet-fancy.scm
 #. src/report/stylesheets/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:258 ../intl-scm/guile-strings.c:470
+#. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
+#: ../intl-scm/guile-strings.c:306 ../intl-scm/guile-strings.c:518
+#: ../intl-scm/guile-strings.c:730 ../intl-scm/guile-strings.c:942
 msgid "General background color for report."
 msgstr "Standard Hintergrundfarbe für Bericht."
 
 #. src/report/stylesheets/stylesheet-fancy.scm
 #. src/report/stylesheets/stylesheet-easy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
+#. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:262 ../intl-scm/guile-strings.c:342
-#: ../intl-scm/guile-strings.c:474 ../intl-scm/guile-strings.c:554
-#: ../intl-scm/guile-strings.c:1024
+#: ../intl-scm/guile-strings.c:310 ../intl-scm/guile-strings.c:390
+#: ../intl-scm/guile-strings.c:522 ../intl-scm/guile-strings.c:602
+#: ../intl-scm/guile-strings.c:734 ../intl-scm/guile-strings.c:814
+#: ../intl-scm/guile-strings.c:946 ../intl-scm/guile-strings.c:1026
+#: ../intl-scm/guile-strings.c:1568 ../intl-scm/guile-strings.c:1736
 msgid "Text Color"
 msgstr "Textfarbe"
 
 #. src/report/stylesheets/stylesheet-fancy.scm
 #. src/report/stylesheets/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:264 ../intl-scm/guile-strings.c:476
+#. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
+#: ../intl-scm/guile-strings.c:312 ../intl-scm/guile-strings.c:524
+#: ../intl-scm/guile-strings.c:736 ../intl-scm/guile-strings.c:948
 msgid "Normal body text color."
 msgstr "Normale Textfarbe"
 
 #. src/report/stylesheets/stylesheet-fancy.scm
 #. src/report/stylesheets/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:268 ../intl-scm/guile-strings.c:346
-#: ../intl-scm/guile-strings.c:480 ../intl-scm/guile-strings.c:558
+#. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
+#: ../intl-scm/guile-strings.c:316 ../intl-scm/guile-strings.c:394
+#: ../intl-scm/guile-strings.c:528 ../intl-scm/guile-strings.c:606
+#: ../intl-scm/guile-strings.c:740 ../intl-scm/guile-strings.c:818
+#: ../intl-scm/guile-strings.c:952 ../intl-scm/guile-strings.c:1030
 msgid "Link Color"
 msgstr "Link-Farbe"
 
 #. src/report/stylesheets/stylesheet-fancy.scm
 #. src/report/stylesheets/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:270 ../intl-scm/guile-strings.c:482
+#. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
+#: ../intl-scm/guile-strings.c:318 ../intl-scm/guile-strings.c:530
+#: ../intl-scm/guile-strings.c:742 ../intl-scm/guile-strings.c:954
 msgid "Link text color."
 msgstr "Link-Textfarbe"
 
 #. src/report/stylesheets/stylesheet-fancy.scm
 #. src/report/stylesheets/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:274 ../intl-scm/guile-strings.c:350
-#: ../intl-scm/guile-strings.c:486 ../intl-scm/guile-strings.c:562
+#. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
+#: ../intl-scm/guile-strings.c:322 ../intl-scm/guile-strings.c:398
+#: ../intl-scm/guile-strings.c:534 ../intl-scm/guile-strings.c:610
+#: ../intl-scm/guile-strings.c:746 ../intl-scm/guile-strings.c:822
+#: ../intl-scm/guile-strings.c:958 ../intl-scm/guile-strings.c:1034
 msgid "Table Cell Color"
 msgstr "Farbe für Tabellenzelle"
 
 #. src/report/stylesheets/stylesheet-fancy.scm
 #. src/report/stylesheets/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:276 ../intl-scm/guile-strings.c:488
+#. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
+#: ../intl-scm/guile-strings.c:324 ../intl-scm/guile-strings.c:536
+#: ../intl-scm/guile-strings.c:748 ../intl-scm/guile-strings.c:960
 msgid "Default background for table cells."
 msgstr "Standard Hintergrundfarbe für Tabellenzellen."
 
 #. src/report/stylesheets/stylesheet-fancy.scm
 #. src/report/stylesheets/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:280 ../intl-scm/guile-strings.c:354
-#: ../intl-scm/guile-strings.c:492 ../intl-scm/guile-strings.c:566
+#. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
+#: ../intl-scm/guile-strings.c:328 ../intl-scm/guile-strings.c:402
+#: ../intl-scm/guile-strings.c:540 ../intl-scm/guile-strings.c:614
+#: ../intl-scm/guile-strings.c:752 ../intl-scm/guile-strings.c:826
+#: ../intl-scm/guile-strings.c:964 ../intl-scm/guile-strings.c:1038
 msgid "Alternate Table Cell Color"
 msgstr "Zweite Farbe für Tabellenzelle"
 
 #. src/report/stylesheets/stylesheet-fancy.scm
 #. src/report/stylesheets/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:282 ../intl-scm/guile-strings.c:494
+#. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
+#: ../intl-scm/guile-strings.c:330 ../intl-scm/guile-strings.c:542
+#: ../intl-scm/guile-strings.c:754 ../intl-scm/guile-strings.c:966
 msgid "Default alternate background for table cells."
 msgstr "Standard Hintergrundfarbe für Tabellenzellen."
 
 #. src/report/stylesheets/stylesheet-fancy.scm
 #. src/report/stylesheets/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:286 ../intl-scm/guile-strings.c:358
-#: ../intl-scm/guile-strings.c:498 ../intl-scm/guile-strings.c:570
+#. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
+#: ../intl-scm/guile-strings.c:334 ../intl-scm/guile-strings.c:406
+#: ../intl-scm/guile-strings.c:546 ../intl-scm/guile-strings.c:618
+#: ../intl-scm/guile-strings.c:758 ../intl-scm/guile-strings.c:830
+#: ../intl-scm/guile-strings.c:970 ../intl-scm/guile-strings.c:1042
 msgid "Subheading/Subtotal Cell Color"
 msgstr "Farbe für Zwischenüberschrift/-summe"
 
 #. src/report/stylesheets/stylesheet-fancy.scm
 #. src/report/stylesheets/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:288 ../intl-scm/guile-strings.c:500
+#. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
+#: ../intl-scm/guile-strings.c:336 ../intl-scm/guile-strings.c:548
+#: ../intl-scm/guile-strings.c:760 ../intl-scm/guile-strings.c:972
 msgid "Default color for subtotal rows."
 msgstr "Standard Hintergrundfarbe für Zwischensummen."
 
 #. src/report/stylesheets/stylesheet-fancy.scm
 #. src/report/stylesheets/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:292 ../intl-scm/guile-strings.c:362
-#: ../intl-scm/guile-strings.c:504 ../intl-scm/guile-strings.c:574
+#. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
+#: ../intl-scm/guile-strings.c:340 ../intl-scm/guile-strings.c:410
+#: ../intl-scm/guile-strings.c:552 ../intl-scm/guile-strings.c:622
+#: ../intl-scm/guile-strings.c:764 ../intl-scm/guile-strings.c:834
+#: ../intl-scm/guile-strings.c:976 ../intl-scm/guile-strings.c:1046
 msgid "Sub-subheading/total Cell Color"
 msgstr "Farbe für Zwischen-Zwischenüberschriften/-summen"
 
 #. src/report/stylesheets/stylesheet-fancy.scm
 #. src/report/stylesheets/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:294 ../intl-scm/guile-strings.c:506
+#. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
+#: ../intl-scm/guile-strings.c:342 ../intl-scm/guile-strings.c:554
+#: ../intl-scm/guile-strings.c:766 ../intl-scm/guile-strings.c:978
 msgid "Color for subsubtotals"
 msgstr "Farbe für Zwischen-Zwischensummen"
 
 #. src/report/stylesheets/stylesheet-fancy.scm
 #. src/report/stylesheets/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:298 ../intl-scm/guile-strings.c:366
-#: ../intl-scm/guile-strings.c:510 ../intl-scm/guile-strings.c:578
+#. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
+#: ../intl-scm/guile-strings.c:346 ../intl-scm/guile-strings.c:414
+#: ../intl-scm/guile-strings.c:558 ../intl-scm/guile-strings.c:626
+#: ../intl-scm/guile-strings.c:770 ../intl-scm/guile-strings.c:838
+#: ../intl-scm/guile-strings.c:982 ../intl-scm/guile-strings.c:1050
 msgid "Grand Total Cell Color"
 msgstr "Farbe für Gesamtsumme"
 
 #. src/report/stylesheets/stylesheet-fancy.scm
 #. src/report/stylesheets/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:300 ../intl-scm/guile-strings.c:512
+#. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
+#: ../intl-scm/guile-strings.c:348 ../intl-scm/guile-strings.c:560
+#: ../intl-scm/guile-strings.c:772 ../intl-scm/guile-strings.c:984
 msgid "Color for grand totals"
 msgstr "Farbe für Gesamtsummen"
 
 #. src/report/stylesheets/stylesheet-fancy.scm
 #. src/report/stylesheets/stylesheet-easy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-plain.scm
 #. src/report/stylesheets/stylesheet-plain.scm
-#: ../intl-scm/guile-strings.c:302 ../intl-scm/guile-strings.c:308
-#: ../intl-scm/guile-strings.c:314 ../intl-scm/guile-strings.c:384
-#: ../intl-scm/guile-strings.c:388 ../intl-scm/guile-strings.c:392
-#: ../intl-scm/guile-strings.c:514 ../intl-scm/guile-strings.c:520
-#: ../intl-scm/guile-strings.c:526 ../intl-scm/guile-strings.c:596
-#: ../intl-scm/guile-strings.c:600 ../intl-scm/guile-strings.c:604
-#: ../intl-scm/guile-strings.c:636 ../intl-scm/guile-strings.c:642
-#: ../intl-scm/guile-strings.c:648
+#: ../intl-scm/guile-strings.c:350 ../intl-scm/guile-strings.c:356
+#: ../intl-scm/guile-strings.c:362 ../intl-scm/guile-strings.c:432
+#: ../intl-scm/guile-strings.c:436 ../intl-scm/guile-strings.c:440
+#: ../intl-scm/guile-strings.c:562 ../intl-scm/guile-strings.c:568
+#: ../intl-scm/guile-strings.c:574 ../intl-scm/guile-strings.c:644
+#: ../intl-scm/guile-strings.c:648 ../intl-scm/guile-strings.c:652
+#: ../intl-scm/guile-strings.c:774 ../intl-scm/guile-strings.c:780
+#: ../intl-scm/guile-strings.c:786 ../intl-scm/guile-strings.c:856
+#: ../intl-scm/guile-strings.c:860 ../intl-scm/guile-strings.c:864
+#: ../intl-scm/guile-strings.c:986 ../intl-scm/guile-strings.c:992
+#: ../intl-scm/guile-strings.c:998 ../intl-scm/guile-strings.c:1068
+#: ../intl-scm/guile-strings.c:1072 ../intl-scm/guile-strings.c:1076
+#: ../intl-scm/guile-strings.c:1108 ../intl-scm/guile-strings.c:1114
+#: ../intl-scm/guile-strings.c:1120 ../intl-scm/guile-strings.c:1148
+#: ../intl-scm/guile-strings.c:1154 ../intl-scm/guile-strings.c:1160
 msgid "Tables"
 msgstr "Tabellen"
 
 #. src/report/stylesheets/stylesheet-fancy.scm
 #. src/report/stylesheets/stylesheet-easy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-plain.scm
 #. src/report/stylesheets/stylesheet-plain.scm
-#: ../intl-scm/guile-strings.c:304 ../intl-scm/guile-strings.c:386
-#: ../intl-scm/guile-strings.c:516 ../intl-scm/guile-strings.c:598
-#: ../intl-scm/guile-strings.c:638
+#: ../intl-scm/guile-strings.c:352 ../intl-scm/guile-strings.c:434
+#: ../intl-scm/guile-strings.c:564 ../intl-scm/guile-strings.c:646
+#: ../intl-scm/guile-strings.c:776 ../intl-scm/guile-strings.c:858
+#: ../intl-scm/guile-strings.c:988 ../intl-scm/guile-strings.c:1070
+#: ../intl-scm/guile-strings.c:1110 ../intl-scm/guile-strings.c:1150
 msgid "Table cell spacing"
 msgstr "Zellen-Abstand"
 
 #. src/report/stylesheets/stylesheet-fancy.scm
 #. src/report/stylesheets/stylesheet-easy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-plain.scm
 #. src/report/stylesheets/stylesheet-plain.scm
-#: ../intl-scm/guile-strings.c:306 ../intl-scm/guile-strings.c:312
-#: ../intl-scm/guile-strings.c:518 ../intl-scm/guile-strings.c:524
-#: ../intl-scm/guile-strings.c:640 ../intl-scm/guile-strings.c:646
+#: ../intl-scm/guile-strings.c:354 ../intl-scm/guile-strings.c:360
+#: ../intl-scm/guile-strings.c:566 ../intl-scm/guile-strings.c:572
+#: ../intl-scm/guile-strings.c:778 ../intl-scm/guile-strings.c:784
+#: ../intl-scm/guile-strings.c:990 ../intl-scm/guile-strings.c:996
+#: ../intl-scm/guile-strings.c:1112 ../intl-scm/guile-strings.c:1118
+#: ../intl-scm/guile-strings.c:1152 ../intl-scm/guile-strings.c:1158
 msgid "Space between table cells"
 msgstr "Abstand zwischen Zellen einer Tabelle"
 
 #. src/report/stylesheets/stylesheet-fancy.scm
 #. src/report/stylesheets/stylesheet-easy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-plain.scm
 #. src/report/stylesheets/stylesheet-plain.scm
-#: ../intl-scm/guile-strings.c:310 ../intl-scm/guile-strings.c:390
-#: ../intl-scm/guile-strings.c:522 ../intl-scm/guile-strings.c:602
-#: ../intl-scm/guile-strings.c:644
+#: ../intl-scm/guile-strings.c:358 ../intl-scm/guile-strings.c:438
+#: ../intl-scm/guile-strings.c:570 ../intl-scm/guile-strings.c:650
+#: ../intl-scm/guile-strings.c:782 ../intl-scm/guile-strings.c:862
+#: ../intl-scm/guile-strings.c:994 ../intl-scm/guile-strings.c:1074
+#: ../intl-scm/guile-strings.c:1116 ../intl-scm/guile-strings.c:1156
 msgid "Table cell padding"
 msgstr "Zellen-Füllung"
 
 #. src/report/stylesheets/stylesheet-fancy.scm
 #. src/report/stylesheets/stylesheet-easy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-plain.scm
 #. src/report/stylesheets/stylesheet-plain.scm
-#: ../intl-scm/guile-strings.c:316 ../intl-scm/guile-strings.c:394
-#: ../intl-scm/guile-strings.c:528 ../intl-scm/guile-strings.c:606
-#: ../intl-scm/guile-strings.c:650
+#: ../intl-scm/guile-strings.c:364 ../intl-scm/guile-strings.c:442
+#: ../intl-scm/guile-strings.c:576 ../intl-scm/guile-strings.c:654
+#: ../intl-scm/guile-strings.c:788 ../intl-scm/guile-strings.c:866
+#: ../intl-scm/guile-strings.c:1000 ../intl-scm/guile-strings.c:1078
+#: ../intl-scm/guile-strings.c:1122 ../intl-scm/guile-strings.c:1162
 msgid "Table border width"
 msgstr "Tabellen-Randbreite"
 
 #. src/report/stylesheets/stylesheet-fancy.scm
 #. src/report/stylesheets/stylesheet-easy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-plain.scm
 #. src/report/stylesheets/stylesheet-plain.scm
-#: ../intl-scm/guile-strings.c:318 ../intl-scm/guile-strings.c:530
-#: ../intl-scm/guile-strings.c:652
+#: ../intl-scm/guile-strings.c:366 ../intl-scm/guile-strings.c:578
+#: ../intl-scm/guile-strings.c:790 ../intl-scm/guile-strings.c:1002
+#: ../intl-scm/guile-strings.c:1124 ../intl-scm/guile-strings.c:1164
 msgid "Bevel depth on tables"
 msgstr "Breite der Tabellenkanten"
 
 #. src/report/stylesheets/stylesheet-fancy.scm
 #. src/report/stylesheets/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:396 ../intl-scm/guile-strings.c:608
+#. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
+#: ../intl-scm/guile-strings.c:444 ../intl-scm/guile-strings.c:656
+#: ../intl-scm/guile-strings.c:868 ../intl-scm/guile-strings.c:1080
 msgid "Prepared by: "
 msgstr "Erstellt von:"
 
 #. src/report/stylesheets/stylesheet-fancy.scm
 #. src/report/stylesheets/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:398 ../intl-scm/guile-strings.c:610
+#. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
+#: ../intl-scm/guile-strings.c:446 ../intl-scm/guile-strings.c:658
+#: ../intl-scm/guile-strings.c:870 ../intl-scm/guile-strings.c:1082
 msgid "Prepared for: "
 msgstr "Erstellt für:"
 
 #. src/report/stylesheets/stylesheet-fancy.scm
-#: ../intl-scm/guile-strings.c:402
+#. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
+#: ../intl-scm/guile-strings.c:450 ../intl-scm/guile-strings.c:874
 msgid "Fancy"
 msgstr "Elegant"
 
 #. src/report/stylesheets/stylesheet-fancy.scm
-#: ../intl-scm/guile-strings.c:404
+#. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
+#: ../intl-scm/guile-strings.c:452 ../intl-scm/guile-strings.c:876
 msgid "Technicolor"
 msgstr "Bunt"
 
 #. src/report/stylesheets/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:614 ../intl-scm/guile-strings.c:616
+#. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
+#: ../intl-scm/guile-strings.c:662 ../intl-scm/guile-strings.c:664
+#: ../intl-scm/guile-strings.c:1086 ../intl-scm/guile-strings.c:1088
 msgid "Easy"
 msgstr "Einfach"
 
+#. src/report/stylesheets/gnucash/report/stylesheet-plain.scm
 #. src/report/stylesheets/stylesheet-plain.scm
-#: ../intl-scm/guile-strings.c:622
+#: ../intl-scm/guile-strings.c:1094 ../intl-scm/guile-strings.c:1134
 msgid "Background color for reports."
 msgstr "Hintergrundfarbe für Berichte."
 
+#. src/report/stylesheets/gnucash/report/stylesheet-plain.scm
 #. src/report/stylesheets/stylesheet-plain.scm
-#: ../intl-scm/guile-strings.c:626
+#: ../intl-scm/guile-strings.c:1098 ../intl-scm/guile-strings.c:1138
 msgid "Background Pixmap"
 msgstr "Hintergrundbild"
 
+#. src/report/stylesheets/gnucash/report/stylesheet-plain.scm
 #. src/report/stylesheets/stylesheet-plain.scm
-#: ../intl-scm/guile-strings.c:634
+#: ../intl-scm/guile-strings.c:1106 ../intl-scm/guile-strings.c:1146
 msgid "Enable hyperlinks in reports."
 msgstr "Hyperlinks in Berichten aktivieren."
 
+#. src/report/stylesheets/gnucash/report/stylesheet-plain.scm
 #. src/report/stylesheets/stylesheet-plain.scm
-#: ../intl-scm/guile-strings.c:654
+#: ../intl-scm/guile-strings.c:1126 ../intl-scm/guile-strings.c:1166
 msgid "Plain"
 msgstr "Einfach"
 
+#. src/report/stylesheets/gnucash/report/stylesheet-plain.scm
 #. src/report/stylesheets/stylesheet-plain.scm
 #. src/report/report-system/report.scm
 #. src/report/report-system/html-style-sheet.scm
-#: ../intl-scm/guile-strings.c:656 ../intl-scm/guile-strings.c:834
-#: ../intl-scm/guile-strings.c:916
+#: ../intl-scm/guile-strings.c:1128 ../intl-scm/guile-strings.c:1168
+#: ../intl-scm/guile-strings.c:1348 ../intl-scm/guile-strings.c:1428
 msgid "Default"
 msgstr "Voreinstellung"
 
 #. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:658
+#: ../intl-scm/guile-strings.c:1170
 msgid "Select a date to report on"
 msgstr "Datum des Berichts"
 
 #. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:660
+#: ../intl-scm/guile-strings.c:1172
 msgid "Start of reporting period"
 msgstr "Start der Berichtsperiode"
 
 #. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:662
+#: ../intl-scm/guile-strings.c:1174
 msgid "End of reporting period"
 msgstr "Ende der Berichtsperiode"
 
 #. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:664
+#: ../intl-scm/guile-strings.c:1176
 msgid "The amount of time between data points"
 msgstr "Die Zeitspanne zwischen den Datenpunkten"
 
 #. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:670 ../intl-scm/guile-strings.c:672
+#: ../intl-scm/guile-strings.c:1182 ../intl-scm/guile-strings.c:1184
 msgid "Week"
 msgstr "Woche"
 
 #. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:674
+#: ../intl-scm/guile-strings.c:1186
 msgid "2Week"
 msgstr "2 Wochen"
 
 #. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:676
+#: ../intl-scm/guile-strings.c:1188
 msgid "Two Weeks"
 msgstr "Zwei Wochen"
 
 #. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:682 ../intl-scm/guile-strings.c:684
+#: ../intl-scm/guile-strings.c:1194 ../intl-scm/guile-strings.c:1196
 msgid "Quarter"
 msgstr "Quartal"
 
 #. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:686 ../intl-scm/guile-strings.c:688
+#: ../intl-scm/guile-strings.c:1198 ../intl-scm/guile-strings.c:1200
 msgid "Half Year"
 msgstr "Halbjahr"
 
 #. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:690 ../intl-scm/guile-strings.c:692
+#: ../intl-scm/guile-strings.c:1202 ../intl-scm/guile-strings.c:1204
 msgid "Year"
 msgstr "Jahr"
 
 #. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:694
+#: ../intl-scm/guile-strings.c:1206
 msgid "All"
 msgstr "Alle"
 
 #. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:696
+#: ../intl-scm/guile-strings.c:1208
 msgid "All accounts"
 msgstr "Alle Konten"
 
 #. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:698
+#: ../intl-scm/guile-strings.c:1210
 msgid "Top-level"
 msgstr "Jeweils neues Fenster"
 
 #. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:700
+#: ../intl-scm/guile-strings.c:1212
 msgid "Second-level"
 msgstr "Zweite Ebene"
 
 #. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:702
+#: ../intl-scm/guile-strings.c:1214
 msgid "Third-level"
 msgstr "Dritte Ebene"
 
 #. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:704 ../intl-scm/guile-strings.c:706
+#: ../intl-scm/guile-strings.c:1216 ../intl-scm/guile-strings.c:1218
 msgid "Fourth-level"
 msgstr "Vierte Ebene"
 
 #. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:708
+#: ../intl-scm/guile-strings.c:1220
 msgid "Sixth-level"
 msgstr "Sechste Ebene"
 
 #. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:710
+#: ../intl-scm/guile-strings.c:1222
 msgid "Show accounts to this depth, overriding any other option."
 msgstr ""
 "Konten nur bis zu dieser Verschachtelungstiefe anzeigen (überstimmt alle "
 "anderen Optionen)."
 
 #. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:712
+#: ../intl-scm/guile-strings.c:1224
 msgid ""
 "Override account-selection and show sub-accounts of all selected accounts?"
 msgstr ""
@@ -15775,183 +16457,205 @@
 
 #. src/report/report-system/options-utilities.scm
 #. src/report/standard-reports/income-statement.scm
+#. src/report/standard-reports/gnucash/report/income-statement.scm
+#. src/report/standard-reports/gnucash/report/balance-sheet.scm
+#. src/report/standard-reports/gnucash/report/account-summary.scm
 #. src/report/standard-reports/balance-sheet.scm
 #. src/report/standard-reports/account-summary.scm
-#: ../intl-scm/guile-strings.c:714 ../intl-scm/guile-strings.c:1548
-#: ../intl-scm/guile-strings.c:1762 ../intl-scm/guile-strings.c:1866
+#: ../intl-scm/guile-strings.c:1226 ../intl-scm/guile-strings.c:2258
+#: ../intl-scm/guile-strings.c:2882 ../intl-scm/guile-strings.c:3096
+#: ../intl-scm/guile-strings.c:3200 ../intl-scm/guile-strings.c:4246
+#: ../intl-scm/guile-strings.c:4350
 msgid "Report on these accounts, if display depth allows."
 msgstr ""
 "Bericht für diese Konten erstellen, solange die Verschachtelungstiefe "
 "eingehalten wird."
 
 #. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:716
+#: ../intl-scm/guile-strings.c:1228
 msgid "Include sub-account balances in printed balance?"
 msgstr "Unterkonten zum angezeigten Kontostand addieren?"
 
 #. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:718
+#: ../intl-scm/guile-strings.c:1230
 msgid "Group the accounts in main categories?"
 msgstr "Konten in Kategorien gruppieren?"
 
 #. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:720
+#: ../intl-scm/guile-strings.c:1232
 msgid "Select the currency to display the values of this report in."
 msgstr ""
 "Wählen Sie die Währung, in der die Beträge in diesem Bericht angezeigt "
 "werden."
 
 #. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:722
+#: ../intl-scm/guile-strings.c:1234
 msgid "Display the account's foreign currency amount?"
 msgstr "Kontostände zusätzlich in Fremdwährung anzeigen?"
 
 #. src/report/report-system/options-utilities.scm
 #. src/report/standard-reports/price-scatter.scm
+#. src/report/standard-reports/gnucash/report/price-scatter.scm
+#. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
 #. src/report/standard-reports/advanced-portfolio.scm
-#: ../intl-scm/guile-strings.c:724 ../intl-scm/guile-strings.c:1150
-#: ../intl-scm/guile-strings.c:1980
+#: ../intl-scm/guile-strings.c:1236 ../intl-scm/guile-strings.c:1862
+#: ../intl-scm/guile-strings.c:2486 ../intl-scm/guile-strings.c:3314
+#: ../intl-scm/guile-strings.c:4464
 msgid "The source of price information"
 msgstr "Quelle der Preisinformationen"
 
 #. src/report/report-system/options-utilities.scm
 #. src/report/standard-reports/price-scatter.scm
-#: ../intl-scm/guile-strings.c:726 ../intl-scm/guile-strings.c:1152
+#. src/report/standard-reports/gnucash/report/price-scatter.scm
+#: ../intl-scm/guile-strings.c:1238 ../intl-scm/guile-strings.c:1864
+#: ../intl-scm/guile-strings.c:2488
 msgid "Weighted Average"
 msgstr "Gewichteter Durchschnitt"
 
 #. src/report/report-system/options-utilities.scm
 #. src/report/standard-reports/price-scatter.scm
-#: ../intl-scm/guile-strings.c:728 ../intl-scm/guile-strings.c:1154
+#. src/report/standard-reports/gnucash/report/price-scatter.scm
+#: ../intl-scm/guile-strings.c:1240 ../intl-scm/guile-strings.c:1866
+#: ../intl-scm/guile-strings.c:2490
 msgid "The weighted average of all currency transactions of the past"
 msgstr ""
 "Der gewichtete Durchschnitt aller bisherigen Währungsbuchungen der "
 "Vergangenheit"
 
 #. src/report/report-system/options-utilities.scm
+#. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
 #. src/report/standard-reports/advanced-portfolio.scm
-#: ../intl-scm/guile-strings.c:730 ../intl-scm/guile-strings.c:1982
+#: ../intl-scm/guile-strings.c:1242 ../intl-scm/guile-strings.c:3316
+#: ../intl-scm/guile-strings.c:4466
 msgid "Most recent"
 msgstr "Neuester"
 
 #. src/report/report-system/options-utilities.scm
+#. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
 #. src/report/standard-reports/advanced-portfolio.scm
-#: ../intl-scm/guile-strings.c:732 ../intl-scm/guile-strings.c:1984
+#: ../intl-scm/guile-strings.c:1244 ../intl-scm/guile-strings.c:3318
+#: ../intl-scm/guile-strings.c:4468
 msgid "The most recent recorded price"
 msgstr "Der neueste aufgezeichnete Preis"
 
 #. src/report/report-system/options-utilities.scm
+#. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
 #. src/report/standard-reports/advanced-portfolio.scm
-#: ../intl-scm/guile-strings.c:734 ../intl-scm/guile-strings.c:1986
+#: ../intl-scm/guile-strings.c:1246 ../intl-scm/guile-strings.c:3320
+#: ../intl-scm/guile-strings.c:4470
 msgid "Nearest in time"
 msgstr "Zeitlich nächster"
 
 #. src/report/report-system/options-utilities.scm
+#. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
 #. src/report/standard-reports/advanced-portfolio.scm
-#: ../intl-scm/guile-strings.c:736 ../intl-scm/guile-strings.c:1988
+#: ../intl-scm/guile-strings.c:1248 ../intl-scm/guile-strings.c:3322
+#: ../intl-scm/guile-strings.c:4472
 msgid "The price recorded nearest in time to the report date"
 msgstr "Der Preis, der dem Berichtsdatum am nächsten kommt"
 
 #. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:738
+#: ../intl-scm/guile-strings.c:1250
 msgid "Width of plot in pixels."
 msgstr "Breite der Grafik in Pixeln."
 
 #. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:740
+#: ../intl-scm/guile-strings.c:1252
 msgid "Height of plot in pixels."
 msgstr "Höhe der Grafik in Pixeln."
 
 #. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:742
+#: ../intl-scm/guile-strings.c:1254
 msgid "Choose the marker for each data point."
 msgstr "Wählen Sie die Markierung für jeden Datenpunkt"
 
 #. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:744 ../intl-scm/guile-strings.c:746
+#: ../intl-scm/guile-strings.c:1256 ../intl-scm/guile-strings.c:1258
 msgid "Circle"
 msgstr "Kreis"
 
 #. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:748 ../intl-scm/guile-strings.c:750
+#: ../intl-scm/guile-strings.c:1260 ../intl-scm/guile-strings.c:1262
 msgid "Cross"
 msgstr "Kreuz"
 
 #. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:752 ../intl-scm/guile-strings.c:754
+#: ../intl-scm/guile-strings.c:1264 ../intl-scm/guile-strings.c:1266
 msgid "Square"
 msgstr "Quadrat"
 
 #. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:756 ../intl-scm/guile-strings.c:758
+#: ../intl-scm/guile-strings.c:1268 ../intl-scm/guile-strings.c:1270
 msgid "Asterisk"
 msgstr "Stern"
 
 #. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:760
+#: ../intl-scm/guile-strings.c:1272
 msgid "Filled circle"
 msgstr "Ausgefüllter Kreis"
 
 #. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:762
+#: ../intl-scm/guile-strings.c:1274
 msgid "Circle filled with color"
 msgstr "Ausgefüllter Kreis"
 
 #. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:764
+#: ../intl-scm/guile-strings.c:1276
 msgid "Filled square"
 msgstr "Ausgefülltes Rechteck"
 
 #. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:766
+#: ../intl-scm/guile-strings.c:1278
 msgid "Square filled with color"
 msgstr "Ausgefülltes Rechteck"
 
 #. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:768
+#: ../intl-scm/guile-strings.c:1280
 msgid "Choose the method for sorting accounts."
 msgstr "Wählen Sie eine Sortierreihenfolge für die Konten."
 
 #. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:772
+#: ../intl-scm/guile-strings.c:1284
 msgid "Alphabetical by account code"
 msgstr "Nach Kontocode alphabetisch sortieren"
 
 #. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:774
+#: ../intl-scm/guile-strings.c:1286
 msgid "Alphabetical"
 msgstr "Alphabetisch"
 
 #. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:776
+#: ../intl-scm/guile-strings.c:1288
 msgid "Alphabetical by account name"
 msgstr "Nach Kontonamen alphabetisch sortieren"
 
 #. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:780
+#: ../intl-scm/guile-strings.c:1292
 msgid "By amount, largest to smallest"
 msgstr "Nach Betrag sortieren, vom größten zum kleinsten"
 
 #. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:782
+#: ../intl-scm/guile-strings.c:1294
 msgid "How to show the balances of parent accounts"
 msgstr "Anzeige der Salden von Hauptkonten"
 
 #. src/report/report-system/options-utilities.scm
+#. src/report/standard-reports/gnucash/report/account-summary.scm
 #. src/report/standard-reports/account-summary.scm
-#: ../intl-scm/guile-strings.c:784 ../intl-scm/guile-strings.c:1896
+#: ../intl-scm/guile-strings.c:1296 ../intl-scm/guile-strings.c:3230
+#: ../intl-scm/guile-strings.c:4380
 msgid "Account Balance"
 msgstr "Kontosaldo"
 
 #. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:786
+#: ../intl-scm/guile-strings.c:1298
 msgid "Show only the balance in the parent account, excluding any subaccounts"
 msgstr ""
 "Nur unmittelbare Saldo von Hauptkonten anzeigen und dabei Unterkonten "
 "ignorieren"
 
 #. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:790
+#: ../intl-scm/guile-strings.c:1302
 msgid ""
 "Calculate the subtotal for this parent account and all of its subaccounts, "
 "and show this as the parent account balance"
@@ -15960,42 +16664,42 @@
 "und als Hauptkonto-Saldo anzeigen"
 
 #. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:792 ../intl-scm/guile-strings.c:802
+#: ../intl-scm/guile-strings.c:1304 ../intl-scm/guile-strings.c:1314
 msgid "Do not show"
 msgstr "Nicht anzeigen"
 
 #. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:794
+#: ../intl-scm/guile-strings.c:1306
 msgid "Do not show any balances of parent accounts"
 msgstr "Salden von Hauptkonten nicht anzeigen"
 
 #. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:796
+#: ../intl-scm/guile-strings.c:1308
 msgid "How to show account subtotals for parent accounts"
 msgstr "Anzeige der Zwischensummen für Hauptkonten mit Unterkonten"
 
 #. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:798
+#: ../intl-scm/guile-strings.c:1310
 msgid "Show subtotals"
 msgstr "Zwischensummen anzeigen"
 
 #. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:800
+#: ../intl-scm/guile-strings.c:1312
 msgid "Show subtotals for selected parent accounts which have subaccounts"
 msgstr "Zwischensummen für Hauptkonten anzeigen, die Unterkonten haben"
 
 #. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:804
+#: ../intl-scm/guile-strings.c:1316
 msgid "Do not show any subtotals for parent accounts"
 msgstr "Keine Zwischensummen von Hauptkonten anzeigen"
 
 #. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:806
+#: ../intl-scm/guile-strings.c:1318
 msgid "Text book style (experimental)"
 msgstr "Rechnungswesen-Stil (experimentell)"
 
 #. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:808
+#: ../intl-scm/guile-strings.c:1320
 msgid ""
 "Show parent account subtotals, indented per accounting text book practice "
 "(experimental)"
@@ -16004,234 +16708,301 @@
 "Stil (experimentell)"
 
 #. src/report/report-system/report.scm
-#: ../intl-scm/guile-strings.c:810
+#: ../intl-scm/guile-strings.c:1322
 msgid "_Assets & Liabilities"
 msgstr "_Aktiva & Passiva"
 
 #. src/report/report-system/report.scm
-#: ../intl-scm/guile-strings.c:812
+#: ../intl-scm/guile-strings.c:1324
 msgid "_Income & Expense"
 msgstr "_Erträge & Aufwendungen"
 
 #. src/report/report-system/report.scm
-#: ../intl-scm/guile-strings.c:814
+#: ../intl-scm/guile-strings.c:1326
 msgid "_Taxes"
 msgstr "_Steuern"
 
 #. src/report/report-system/report.scm
-#: ../intl-scm/guile-strings.c:816
+#: ../intl-scm/guile-strings.c:1328
 msgid "_Sample & Custom"
 msgstr "Bei_spiel & Benutzerdefiniert"
 
 #. src/report/report-system/report.scm
-#: ../intl-scm/guile-strings.c:818
+#: ../intl-scm/guile-strings.c:1330
 msgid "_Custom"
 msgstr "Benutzer_definiert"
 
 #. src/report/report-system/report.scm
+#. src/report/standard-reports/gnucash/report/transaction.scm
+#. src/report/standard-reports/gnucash/report/register.scm
 #. src/report/standard-reports/transaction.scm
 #. src/report/standard-reports/register.scm
 #. src/business/business-reports/fancy-invoice.scm
 #. src/business/business-reports/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/fancy-invoice.scm
+#. src/business/business-reports/gnucash/report/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/invoice.scm
 #. src/business/business-reports/invoice.scm
-#: ../intl-scm/guile-strings.c:824 ../intl-scm/guile-strings.c:2172
-#: ../intl-scm/guile-strings.c:2176 ../intl-scm/guile-strings.c:2180
-#: ../intl-scm/guile-strings.c:2184 ../intl-scm/guile-strings.c:2188
-#: ../intl-scm/guile-strings.c:2192 ../intl-scm/guile-strings.c:2196
-#: ../intl-scm/guile-strings.c:2200 ../intl-scm/guile-strings.c:2204
-#: ../intl-scm/guile-strings.c:2208 ../intl-scm/guile-strings.c:2212
-#: ../intl-scm/guile-strings.c:2216 ../intl-scm/guile-strings.c:2220
-#: ../intl-scm/guile-strings.c:2224 ../intl-scm/guile-strings.c:2228
-#: ../intl-scm/guile-strings.c:2542 ../intl-scm/guile-strings.c:2584
-#: ../intl-scm/guile-strings.c:2590 ../intl-scm/guile-strings.c:2596
-#: ../intl-scm/guile-strings.c:2602 ../intl-scm/guile-strings.c:2608
-#: ../intl-scm/guile-strings.c:2614 ../intl-scm/guile-strings.c:2620
-#: ../intl-scm/guile-strings.c:2634 ../intl-scm/guile-strings.c:2640
-#: ../intl-scm/guile-strings.c:3264 ../intl-scm/guile-strings.c:3270
-#: ../intl-scm/guile-strings.c:3276 ../intl-scm/guile-strings.c:3282
-#: ../intl-scm/guile-strings.c:3288 ../intl-scm/guile-strings.c:3294
-#: ../intl-scm/guile-strings.c:3300 ../intl-scm/guile-strings.c:3306
-#: ../intl-scm/guile-strings.c:3312 ../intl-scm/guile-strings.c:3318
-#: ../intl-scm/guile-strings.c:3324 ../intl-scm/guile-strings.c:3332
-#: ../intl-scm/guile-strings.c:3338 ../intl-scm/guile-strings.c:3582
-#: ../intl-scm/guile-strings.c:3588 ../intl-scm/guile-strings.c:3594
-#: ../intl-scm/guile-strings.c:3600 ../intl-scm/guile-strings.c:3606
-#: ../intl-scm/guile-strings.c:3612 ../intl-scm/guile-strings.c:3618
-#: ../intl-scm/guile-strings.c:3624 ../intl-scm/guile-strings.c:3630
-#: ../intl-scm/guile-strings.c:3636 ../intl-scm/guile-strings.c:3642
-#: ../intl-scm/guile-strings.c:3648 ../intl-scm/guile-strings.c:3840
-#: ../intl-scm/guile-strings.c:3846 ../intl-scm/guile-strings.c:3852
-#: ../intl-scm/guile-strings.c:3858 ../intl-scm/guile-strings.c:3864
-#: ../intl-scm/guile-strings.c:3870 ../intl-scm/guile-strings.c:3876
-#: ../intl-scm/guile-strings.c:3882 ../intl-scm/guile-strings.c:3890
+#: ../intl-scm/guile-strings.c:1336 ../intl-scm/guile-strings.c:3506
+#: ../intl-scm/guile-strings.c:3510 ../intl-scm/guile-strings.c:3514
+#: ../intl-scm/guile-strings.c:3518 ../intl-scm/guile-strings.c:3522
+#: ../intl-scm/guile-strings.c:3526 ../intl-scm/guile-strings.c:3530
+#: ../intl-scm/guile-strings.c:3534 ../intl-scm/guile-strings.c:3538
+#: ../intl-scm/guile-strings.c:3542 ../intl-scm/guile-strings.c:3546
+#: ../intl-scm/guile-strings.c:3550 ../intl-scm/guile-strings.c:3554
+#: ../intl-scm/guile-strings.c:3558 ../intl-scm/guile-strings.c:3562
+#: ../intl-scm/guile-strings.c:3876 ../intl-scm/guile-strings.c:3918
+#: ../intl-scm/guile-strings.c:3924 ../intl-scm/guile-strings.c:3930
+#: ../intl-scm/guile-strings.c:3936 ../intl-scm/guile-strings.c:3942
+#: ../intl-scm/guile-strings.c:3948 ../intl-scm/guile-strings.c:3954
+#: ../intl-scm/guile-strings.c:3968 ../intl-scm/guile-strings.c:3974
+#: ../intl-scm/guile-strings.c:4656 ../intl-scm/guile-strings.c:4660
+#: ../intl-scm/guile-strings.c:4664 ../intl-scm/guile-strings.c:4668
+#: ../intl-scm/guile-strings.c:4672 ../intl-scm/guile-strings.c:4676
+#: ../intl-scm/guile-strings.c:4680 ../intl-scm/guile-strings.c:4684
+#: ../intl-scm/guile-strings.c:4688 ../intl-scm/guile-strings.c:4692
+#: ../intl-scm/guile-strings.c:4696 ../intl-scm/guile-strings.c:4700
+#: ../intl-scm/guile-strings.c:4704 ../intl-scm/guile-strings.c:4708
+#: ../intl-scm/guile-strings.c:4712 ../intl-scm/guile-strings.c:5026
+#: ../intl-scm/guile-strings.c:5068 ../intl-scm/guile-strings.c:5074
+#: ../intl-scm/guile-strings.c:5080 ../intl-scm/guile-strings.c:5086
+#: ../intl-scm/guile-strings.c:5092 ../intl-scm/guile-strings.c:5098
+#: ../intl-scm/guile-strings.c:5104 ../intl-scm/guile-strings.c:5118
+#: ../intl-scm/guile-strings.c:5124 ../intl-scm/guile-strings.c:5990
+#: ../intl-scm/guile-strings.c:5996 ../intl-scm/guile-strings.c:6002
+#: ../intl-scm/guile-strings.c:6008 ../intl-scm/guile-strings.c:6014
+#: ../intl-scm/guile-strings.c:6020 ../intl-scm/guile-strings.c:6026
+#: ../intl-scm/guile-strings.c:6032 ../intl-scm/guile-strings.c:6038
+#: ../intl-scm/guile-strings.c:6044 ../intl-scm/guile-strings.c:6050
+#: ../intl-scm/guile-strings.c:6058 ../intl-scm/guile-strings.c:6064
+#: ../intl-scm/guile-strings.c:6308 ../intl-scm/guile-strings.c:6314
+#: ../intl-scm/guile-strings.c:6320 ../intl-scm/guile-strings.c:6326
+#: ../intl-scm/guile-strings.c:6332 ../intl-scm/guile-strings.c:6338
+#: ../intl-scm/guile-strings.c:6344 ../intl-scm/guile-strings.c:6350
+#: ../intl-scm/guile-strings.c:6356 ../intl-scm/guile-strings.c:6362
+#: ../intl-scm/guile-strings.c:6368 ../intl-scm/guile-strings.c:6374
+#: ../intl-scm/guile-strings.c:6514 ../intl-scm/guile-strings.c:6520
+#: ../intl-scm/guile-strings.c:6526 ../intl-scm/guile-strings.c:6532
+#: ../intl-scm/guile-strings.c:6538 ../intl-scm/guile-strings.c:6544
+#: ../intl-scm/guile-strings.c:6550 ../intl-scm/guile-strings.c:6556
+#: ../intl-scm/guile-strings.c:6562 ../intl-scm/guile-strings.c:6568
+#: ../intl-scm/guile-strings.c:6574 ../intl-scm/guile-strings.c:6582
+#: ../intl-scm/guile-strings.c:6588 ../intl-scm/guile-strings.c:6832
+#: ../intl-scm/guile-strings.c:6838 ../intl-scm/guile-strings.c:6844
+#: ../intl-scm/guile-strings.c:6850 ../intl-scm/guile-strings.c:6856
+#: ../intl-scm/guile-strings.c:6862 ../intl-scm/guile-strings.c:6868
+#: ../intl-scm/guile-strings.c:6874 ../intl-scm/guile-strings.c:6880
+#: ../intl-scm/guile-strings.c:6886 ../intl-scm/guile-strings.c:6892
+#: ../intl-scm/guile-strings.c:6898 ../intl-scm/guile-strings.c:7092
+#: ../intl-scm/guile-strings.c:7098 ../intl-scm/guile-strings.c:7104
+#: ../intl-scm/guile-strings.c:7110 ../intl-scm/guile-strings.c:7116
+#: ../intl-scm/guile-strings.c:7122 ../intl-scm/guile-strings.c:7128
+#: ../intl-scm/guile-strings.c:7134 ../intl-scm/guile-strings.c:7142
+#: ../intl-scm/guile-strings.c:7332 ../intl-scm/guile-strings.c:7338
+#: ../intl-scm/guile-strings.c:7344 ../intl-scm/guile-strings.c:7350
+#: ../intl-scm/guile-strings.c:7356 ../intl-scm/guile-strings.c:7362
+#: ../intl-scm/guile-strings.c:7368 ../intl-scm/guile-strings.c:7374
+#: ../intl-scm/guile-strings.c:7382
 msgid "Display"
 msgstr "Anzeige"
 
 #. src/report/report-system/report.scm
-#: ../intl-scm/guile-strings.c:826
+#: ../intl-scm/guile-strings.c:1338
 msgid "Report name"
 msgstr "Berichtsname"
 
 #. src/report/report-system/report.scm
-#: ../intl-scm/guile-strings.c:828
+#: ../intl-scm/guile-strings.c:1340
+msgid ""
+"A custom report with this name already exists. Either rename the report to "
+"store it with a different name, or edit your saved-reports file and delete "
+"the section with the following name: "
+msgstr ""
+"Ein benutzerdefinierter Bericht mit diesem Namen existiert bereit.  Entweder "
+"Sie benennen diesen Bericht um, oder Sie editieren die Datei ~/.gnucash/"
+"saved-reports-2.0 und entfernen den Abschnitt mit folgenden Namen: "
+
+#. src/report/report-system/report.scm
+#: ../intl-scm/guile-strings.c:1342
 msgid "Enter a descriptive name for this report"
 msgstr "Geben Sie einen beschreibenden Namen für diesen Bericht an"
 
 #. src/report/report-system/report.scm
-#: ../intl-scm/guile-strings.c:830 ../intl-scm/guile-strings.c:838
-#: ../intl-scm/guile-strings.c:840
+#: ../intl-scm/guile-strings.c:1344 ../intl-scm/guile-strings.c:1352
+#: ../intl-scm/guile-strings.c:1354
 msgid "Stylesheet"
 msgstr "Stilvorlage"
 
 #. src/report/report-system/report.scm
-#: ../intl-scm/guile-strings.c:832
+#: ../intl-scm/guile-strings.c:1346
 msgid "Select a stylesheet for the report."
 msgstr "Wählen Sie einen Stil für diesen Bericht."
 
 #. src/report/report-system/report.scm
-#: ../intl-scm/guile-strings.c:836
+#: ../intl-scm/guile-strings.c:1350
 msgid " Stylesheet"
 msgstr " Stilvorlage"
 
 #. src/report/report-system/html-acct-table.scm
 #. src/report/standard-reports/trial-balance.scm
 #. src/report/standard-reports/income-statement.scm
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#. src/report/standard-reports/gnucash/report/income-statement.scm
+#. src/report/standard-reports/gnucash/report/equity-statement.scm
 #. src/report/standard-reports/equity-statement.scm
-#: ../intl-scm/guile-strings.c:842 ../intl-scm/guile-strings.c:1438
-#: ../intl-scm/guile-strings.c:1622 ../intl-scm/guile-strings.c:2114
+#: ../intl-scm/guile-strings.c:1356 ../intl-scm/guile-strings.c:2148
+#: ../intl-scm/guile-strings.c:2332 ../intl-scm/guile-strings.c:2772
+#: ../intl-scm/guile-strings.c:2956 ../intl-scm/guile-strings.c:3448
+#: ../intl-scm/guile-strings.c:4598
 msgid "Closing Entries"
 msgstr "Abschlussbuchungen"
 
 #. src/report/report-system/html-acct-table.scm
 #. src/report/standard-reports/trial-balance.scm
-#: ../intl-scm/guile-strings.c:844 ../intl-scm/guile-strings.c:1436
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#: ../intl-scm/guile-strings.c:1358 ../intl-scm/guile-strings.c:2146
+#: ../intl-scm/guile-strings.c:2770
 msgid "Adjusting Entries"
 msgstr "Anpassungsbuchungen"
 
 #. src/report/report-system/report-utilities.scm
 #. src/report/standard-reports/net-barchart.scm
+#. src/report/standard-reports/gnucash/report/net-barchart.scm
+#. src/report/standard-reports/gnucash/report/balance-sheet.scm
+#. src/report/standard-reports/gnucash/report/account-piecharts.scm
 #. src/report/standard-reports/balance-sheet.scm
 #. src/report/standard-reports/account-piecharts.scm
-#: ../intl-scm/guile-strings.c:854 ../intl-scm/guile-strings.c:1244
-#: ../intl-scm/guile-strings.c:1830 ../intl-scm/guile-strings.c:2844
+#: ../intl-scm/guile-strings.c:1368 ../intl-scm/guile-strings.c:1956
+#: ../intl-scm/guile-strings.c:2580 ../intl-scm/guile-strings.c:3164
+#: ../intl-scm/guile-strings.c:4182 ../intl-scm/guile-strings.c:4314
+#: ../intl-scm/guile-strings.c:5332
 msgid "Assets"
 msgstr "Aktiva"
 
 #. src/report/report-system/report-utilities.scm
 #. src/report/standard-reports/net-barchart.scm
+#. src/report/standard-reports/gnucash/report/net-barchart.scm
+#. src/report/standard-reports/gnucash/report/balance-sheet.scm
+#. src/report/standard-reports/gnucash/report/account-piecharts.scm
 #. src/report/standard-reports/balance-sheet.scm
 #. src/report/standard-reports/account-piecharts.scm
-#: ../intl-scm/guile-strings.c:856 ../intl-scm/guile-strings.c:1246
-#: ../intl-scm/guile-strings.c:1834 ../intl-scm/guile-strings.c:2846
+#: ../intl-scm/guile-strings.c:1370 ../intl-scm/guile-strings.c:1958
+#: ../intl-scm/guile-strings.c:2582 ../intl-scm/guile-strings.c:3168
+#: ../intl-scm/guile-strings.c:4184 ../intl-scm/guile-strings.c:4318
+#: ../intl-scm/guile-strings.c:5334
 msgid "Liabilities"
 msgstr "Passiva"
 
 #. src/report/report-system/report-utilities.scm
-#: ../intl-scm/guile-strings.c:858
+#: ../intl-scm/guile-strings.c:1372
 msgid "Stocks"
 msgstr "Aktienkonten"
 
 #. src/report/report-system/report-utilities.scm
-#: ../intl-scm/guile-strings.c:860
+#: ../intl-scm/guile-strings.c:1374
 msgid "Mutual Funds"
 msgstr "Investmentfonds"
 
 #. src/report/report-system/report-utilities.scm
-#: ../intl-scm/guile-strings.c:862
+#: ../intl-scm/guile-strings.c:1376
 msgid "Currencies"
 msgstr "Währungen"
 
 #. src/report/report-system/report-utilities.scm
 #. src/report/standard-reports/income-statement.scm
-#: ../intl-scm/guile-strings.c:866 ../intl-scm/guile-strings.c:1634
+#. src/report/standard-reports/gnucash/report/income-statement.scm
+#: ../intl-scm/guile-strings.c:1380 ../intl-scm/guile-strings.c:2344
+#: ../intl-scm/guile-strings.c:2968
 msgid "Expenses"
 msgstr "Aufwendungen"
 
 #. src/report/report-system/report-utilities.scm
-#: ../intl-scm/guile-strings.c:868
+#: ../intl-scm/guile-strings.c:1382
 msgid "Equities"
 msgstr "Eigenkapital"
 
 #. src/report/report-system/report-utilities.scm
-#: ../intl-scm/guile-strings.c:870
+#: ../intl-scm/guile-strings.c:1384
 msgid "Checking"
 msgstr "Girokonto"
 
 #. src/report/report-system/report-utilities.scm
-#: ../intl-scm/guile-strings.c:872
+#: ../intl-scm/guile-strings.c:1386
 msgid "Savings"
 msgstr "Sparkonten"
 
 #. src/report/report-system/report-utilities.scm
-#: ../intl-scm/guile-strings.c:874
+#: ../intl-scm/guile-strings.c:1388
 msgid "Money Market"
 msgstr "Geldmarktfond"
 
 #. src/report/report-system/report-utilities.scm
-#: ../intl-scm/guile-strings.c:876
+#: ../intl-scm/guile-strings.c:1390
 msgid "Accounts Receivable"
 msgstr "Forderungen Konten"
 
 #. src/report/report-system/report-utilities.scm
-#: ../intl-scm/guile-strings.c:878
+#: ../intl-scm/guile-strings.c:1392
 msgid "Accounts Payable"
 msgstr "Verbindlichkeiten Konten"
 
 #. src/report/report-system/report-utilities.scm
-#: ../intl-scm/guile-strings.c:880
+#: ../intl-scm/guile-strings.c:1394
 msgid "Credit Lines"
 msgstr "Kreditrahmen"
 
 #. src/report/report-system/report-utilities.scm
-#: ../intl-scm/guile-strings.c:882
+#: ../intl-scm/guile-strings.c:1396
 #, c-format
 msgid "Building '%s' report ..."
 msgstr "Bericht '%s' berechnen..."
 
 #. src/report/report-system/report-utilities.scm
-#: ../intl-scm/guile-strings.c:884
+#: ../intl-scm/guile-strings.c:1398
 #, c-format
 msgid "Rendering '%s' report ..."
 msgstr "Bericht '%s' erstellen..."
 
 #. src/report/report-system/html-utilities.scm
-#: ../intl-scm/guile-strings.c:888
+#: ../intl-scm/guile-strings.c:1402
 msgid "Account name"
 msgstr "Kontobezeichnung"
 
 #. src/report/report-system/html-utilities.scm
-#: ../intl-scm/guile-strings.c:892
+#: ../intl-scm/guile-strings.c:1406
 msgid "Exchange rate"
 msgstr "Wechselkurs"
 
 #. src/report/report-system/html-utilities.scm
-#: ../intl-scm/guile-strings.c:894
+#: ../intl-scm/guile-strings.c:1408
 msgid "Exchange rates"
 msgstr "Wechselkurse"
 
 #. src/report/report-system/html-utilities.scm
-#: ../intl-scm/guile-strings.c:898
+#: ../intl-scm/guile-strings.c:1410
 msgid "This report requires you to specify certain report options."
 msgstr "Für diesen Bericht müssen einige Optionen ausgewählt werden."
 
 #. src/report/report-system/html-utilities.scm
-#: ../intl-scm/guile-strings.c:902
+#: ../intl-scm/guile-strings.c:1414
 msgid "No accounts selected"
 msgstr "Keine Konten ausgewählt"
 
 #. src/report/report-system/html-utilities.scm
-#: ../intl-scm/guile-strings.c:904
+#: ../intl-scm/guile-strings.c:1416
 msgid "This report requires accounts to be selected."
 msgstr "Für diesen Bericht müssen Konten ausgewählt werden."
 
 #. src/report/report-system/html-utilities.scm
 #. src/report/standard-reports/price-scatter.scm
-#: ../intl-scm/guile-strings.c:908 ../intl-scm/guile-strings.c:1190
+#. src/report/standard-reports/gnucash/report/price-scatter.scm
+#: ../intl-scm/guile-strings.c:1420 ../intl-scm/guile-strings.c:1902
+#: ../intl-scm/guile-strings.c:2526
 msgid "No data"
 msgstr "Keine Daten gefunden"
 
 #. src/report/report-system/html-utilities.scm
-#: ../intl-scm/guile-strings.c:910
+#: ../intl-scm/guile-strings.c:1422
 msgid ""
 "The selected accounts contain no data/transactions (or only zeroes) for the "
 "selected time period"
@@ -16240,276 +17011,337 @@
 "Nullen) für die gewählte Zeitspanne."
 
 #. src/report/report-system/html-style-sheet.scm
-#: ../intl-scm/guile-strings.c:914
+#: ../intl-scm/guile-strings.c:1426
 msgid "Can't save style sheet"
 msgstr "Stilvorlage kann nicht gespeichert werden"
 
 #. src/report/report-gnome/report-gnome.scm
-#: ../intl-scm/guile-strings.c:918
+#. src/report/report-gnome/gnucash/report/report-gnome.scm
+#: ../intl-scm/guile-strings.c:1430 ../intl-scm/guile-strings.c:1440
 msgid "This report has no options."
 msgstr "Dieser Bericht hat keine Optionen."
 
 #. src/report/report-gnome/report-gnome.scm
-#: ../intl-scm/guile-strings.c:922
+#. src/report/report-gnome/gnucash/report/report-gnome.scm
+#: ../intl-scm/guile-strings.c:1434 ../intl-scm/guile-strings.c:1444
 #, c-format
 msgid "Display the %s report"
 msgstr "%s-Bericht anzeigen"
 
 #. src/report/report-gnome/report-gnome.scm
-#: ../intl-scm/guile-strings.c:924
+#. src/report/report-gnome/gnucash/report/report-gnome.scm
+#: ../intl-scm/guile-strings.c:1436 ../intl-scm/guile-strings.c:1446
 msgid "Welcome Sample Report"
 msgstr "Einführungs-Beispielbericht"
 
 #. src/report/report-gnome/report-gnome.scm
-#: ../intl-scm/guile-strings.c:926
+#. src/report/report-gnome/gnucash/report/report-gnome.scm
+#: ../intl-scm/guile-strings.c:1438 ../intl-scm/guile-strings.c:1448
 msgid "Welcome-to-GnuCash report screen"
 msgstr "Eine Demonstration verschiedener Berichte als Begrüßung"
 
 #. src/report/utility-reports/view-column.scm
-#: ../intl-scm/guile-strings.c:930 ../intl-scm/guile-strings.c:936
+#. src/report/utility-reports/gnucash/report/view-column.scm
+#: ../intl-scm/guile-strings.c:1452 ../intl-scm/guile-strings.c:1458
+#: ../intl-scm/guile-strings.c:1474 ../intl-scm/guile-strings.c:1480
 msgid "Number of columns"
 msgstr "Anzahl der Spalten"
 
 #. src/report/utility-reports/view-column.scm
-#: ../intl-scm/guile-strings.c:932
+#. src/report/utility-reports/gnucash/report/view-column.scm
+#: ../intl-scm/guile-strings.c:1454 ../intl-scm/guile-strings.c:1476
 msgid "Number of columns before wrapping to a new row"
 msgstr "Anzahl Spalten, bevor eine neue Zeile begonnen wird"
 
 #. src/report/utility-reports/view-column.scm
-#: ../intl-scm/guile-strings.c:942
+#. src/report/utility-reports/gnucash/report/view-column.scm
+#: ../intl-scm/guile-strings.c:1464 ../intl-scm/guile-strings.c:1486
 msgid "Edit Options"
 msgstr "Optionen"
 
 #. src/report/utility-reports/view-column.scm
-#: ../intl-scm/guile-strings.c:944
+#. src/report/utility-reports/gnucash/report/view-column.scm
+#: ../intl-scm/guile-strings.c:1466 ../intl-scm/guile-strings.c:1488
 msgid "Single Report"
 msgstr "Einzelner Bericht"
 
 #. src/report/utility-reports/view-column.scm
-#: ../intl-scm/guile-strings.c:946
+#. src/report/utility-reports/gnucash/report/view-column.scm
+#: ../intl-scm/guile-strings.c:1468 ../intl-scm/guile-strings.c:1490
 msgid "Multicolumn View"
 msgstr "Mehrspaltige Anzeige"
 
 #. src/report/utility-reports/view-column.scm
-#: ../intl-scm/guile-strings.c:948
+#. src/report/utility-reports/gnucash/report/view-column.scm
+#: ../intl-scm/guile-strings.c:1470 ../intl-scm/guile-strings.c:1492
 msgid "Custom Multicolumn Report"
 msgstr "Benutzerdefiniert Mehrspaltig"
 
+#. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:950 ../intl-scm/guile-strings.c:956
-#: ../intl-scm/guile-strings.c:978 ../intl-scm/guile-strings.c:986
-#: ../intl-scm/guile-strings.c:992 ../intl-scm/guile-strings.c:998
-#: ../intl-scm/guile-strings.c:1004 ../intl-scm/guile-strings.c:1010
-#: ../intl-scm/guile-strings.c:1016 ../intl-scm/guile-strings.c:1022
+#: ../intl-scm/guile-strings.c:1494 ../intl-scm/guile-strings.c:1500
+#: ../intl-scm/guile-strings.c:1522 ../intl-scm/guile-strings.c:1530
+#: ../intl-scm/guile-strings.c:1536 ../intl-scm/guile-strings.c:1542
+#: ../intl-scm/guile-strings.c:1548 ../intl-scm/guile-strings.c:1554
+#: ../intl-scm/guile-strings.c:1560 ../intl-scm/guile-strings.c:1566
+#: ../intl-scm/guile-strings.c:1662 ../intl-scm/guile-strings.c:1668
+#: ../intl-scm/guile-strings.c:1690 ../intl-scm/guile-strings.c:1698
+#: ../intl-scm/guile-strings.c:1704 ../intl-scm/guile-strings.c:1710
+#: ../intl-scm/guile-strings.c:1716 ../intl-scm/guile-strings.c:1722
+#: ../intl-scm/guile-strings.c:1728 ../intl-scm/guile-strings.c:1734
 msgid "Hello, World!"
 msgstr "Hallo Welt!"
 
+#. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:952
+#: ../intl-scm/guile-strings.c:1496 ../intl-scm/guile-strings.c:1664
 msgid "Boolean Option"
 msgstr "Boolsche Option"
 
+#. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:954
+#: ../intl-scm/guile-strings.c:1498 ../intl-scm/guile-strings.c:1666
 msgid "This is a boolean option."
 msgstr "Dies ist eine boolsche Option"
 
+#. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:958
+#: ../intl-scm/guile-strings.c:1502 ../intl-scm/guile-strings.c:1670
 msgid "Multi Choice Option"
 msgstr "Multi-Auswahl"
 
+#. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:960
+#: ../intl-scm/guile-strings.c:1504 ../intl-scm/guile-strings.c:1672
 msgid "This is a multi choice option."
 msgstr "Dies ist eine Multi-Auswahl"
 
+#. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:962
+#: ../intl-scm/guile-strings.c:1506 ../intl-scm/guile-strings.c:1674
 msgid "First Option"
 msgstr "Erste Option"
 
+#. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:964
+#: ../intl-scm/guile-strings.c:1508 ../intl-scm/guile-strings.c:1676
 msgid "Help for first option"
 msgstr "Hilfe für die erste Option"
 
+#. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:966
+#: ../intl-scm/guile-strings.c:1510 ../intl-scm/guile-strings.c:1678
 msgid "Second Option"
 msgstr "Zweite Option"
 
+#. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:968
+#: ../intl-scm/guile-strings.c:1512 ../intl-scm/guile-strings.c:1680
 msgid "Help for second option"
 msgstr "Hilfe für die zweite Option"
 
+#. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:970
+#: ../intl-scm/guile-strings.c:1514 ../intl-scm/guile-strings.c:1682
 msgid "Third Option"
 msgstr "Dritte Sortier-Option"
 
+#. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:972
+#: ../intl-scm/guile-strings.c:1516 ../intl-scm/guile-strings.c:1684
 msgid "Help for third option"
 msgstr "Hilfe für die dritte Option"
 
+#. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:974
+#: ../intl-scm/guile-strings.c:1518 ../intl-scm/guile-strings.c:1686
 msgid "Fourth Options"
 msgstr "Vierte Option"
 
+#. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:976
+#: ../intl-scm/guile-strings.c:1520 ../intl-scm/guile-strings.c:1688
 msgid "The fourth option rules!"
 msgstr "Die vierte Option übertrifft alle!"
 
+#. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:980
+#: ../intl-scm/guile-strings.c:1524 ../intl-scm/guile-strings.c:1692
 msgid "String Option"
 msgstr "String Option"
 
+#. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:982
+#: ../intl-scm/guile-strings.c:1526 ../intl-scm/guile-strings.c:1694
 msgid "This is a string option"
 msgstr "Dies ist eine String-Option"
 
+#. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:984 ../intl-scm/guile-strings.c:1058
-#: ../intl-scm/guile-strings.c:1104
+#: ../intl-scm/guile-strings.c:1528 ../intl-scm/guile-strings.c:1602
+#: ../intl-scm/guile-strings.c:1648 ../intl-scm/guile-strings.c:1696
+#: ../intl-scm/guile-strings.c:1770 ../intl-scm/guile-strings.c:1816
 msgid "Hello, World"
 msgstr "Hallo Welt"
 
+#. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:988
+#: ../intl-scm/guile-strings.c:1532 ../intl-scm/guile-strings.c:1700
 msgid "Just a Date Option"
 msgstr "Nur eine Datums-Option"
 
+#. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:990
+#: ../intl-scm/guile-strings.c:1534 ../intl-scm/guile-strings.c:1702
 msgid "This is a date option"
 msgstr "Dies ist eine Datums-Option"
 
+#. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:994
+#: ../intl-scm/guile-strings.c:1538 ../intl-scm/guile-strings.c:1706
 msgid "Time and Date Option"
 msgstr "Zeit und Datums Option"
 
+#. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:996
+#: ../intl-scm/guile-strings.c:1540 ../intl-scm/guile-strings.c:1708
 msgid "This is a date option with time"
 msgstr "Das ist eine Datums-Option mit Einbeziehung der Zeit"
 
+#. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1000
+#: ../intl-scm/guile-strings.c:1544 ../intl-scm/guile-strings.c:1712
 msgid "Combo Date Option"
 msgstr "Kombo-Datums Option"
 
+#. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1002
+#: ../intl-scm/guile-strings.c:1546 ../intl-scm/guile-strings.c:1714
 msgid "This is a combination date option"
 msgstr "Dies ist eine Kombinations-Datums-Option"
 
+#. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1006
+#: ../intl-scm/guile-strings.c:1550 ../intl-scm/guile-strings.c:1718
 msgid "Relative Date Option"
 msgstr "Relative Datums Option"
 
+#. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1008
+#: ../intl-scm/guile-strings.c:1552 ../intl-scm/guile-strings.c:1720
 msgid "This is a relative date option"
 msgstr "Dies ist eine relative Datums-Option"
 
+#. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1012
+#: ../intl-scm/guile-strings.c:1556 ../intl-scm/guile-strings.c:1724
 msgid "Number Option"
 msgstr "Zahlenoptionen"
 
+#. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1014
+#: ../intl-scm/guile-strings.c:1558 ../intl-scm/guile-strings.c:1726
 msgid "This is a number option."
 msgstr "Dies ist eine Zahlen Option"
 
+#. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1020 ../intl-scm/guile-strings.c:1026
+#: ../intl-scm/guile-strings.c:1564 ../intl-scm/guile-strings.c:1570
+#: ../intl-scm/guile-strings.c:1732 ../intl-scm/guile-strings.c:1738
 msgid "This is a color option"
 msgstr "Farbauswahl"
 
+#. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1028 ../intl-scm/guile-strings.c:1034
+#: ../intl-scm/guile-strings.c:1572 ../intl-scm/guile-strings.c:1578
+#: ../intl-scm/guile-strings.c:1740 ../intl-scm/guile-strings.c:1746
 msgid "Hello Again"
 msgstr "Hallo mal wieder.."
 
+#. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1030
+#: ../intl-scm/guile-strings.c:1574 ../intl-scm/guile-strings.c:1742
 msgid "An account list option"
 msgstr "Eine Kontenlisten-Option"
 
+#. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1032
+#: ../intl-scm/guile-strings.c:1576 ../intl-scm/guile-strings.c:1744
 msgid "This is an account list option"
 msgstr "Dies ist eine Kontoaufzählungsoption"
 
+#. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1036
+#: ../intl-scm/guile-strings.c:1580 ../intl-scm/guile-strings.c:1748
 msgid "A list option"
 msgstr "Eine Auflistungsoption"
 
+#. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1038
+#: ../intl-scm/guile-strings.c:1582 ../intl-scm/guile-strings.c:1750
 msgid "This is a list option"
 msgstr "Dies ist eine Aufzählungsoption"
 
+#. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1040
+#: ../intl-scm/guile-strings.c:1584 ../intl-scm/guile-strings.c:1752
 msgid "The Good"
 msgstr "Das Gute"
 
+#. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1042
+#: ../intl-scm/guile-strings.c:1586 ../intl-scm/guile-strings.c:1754
 msgid "Good option"
 msgstr "Gute Option"
 
+#. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1044
+#: ../intl-scm/guile-strings.c:1588 ../intl-scm/guile-strings.c:1756
 msgid "The Bad"
 msgstr "Das Schlechte"
 
+#. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1046
+#: ../intl-scm/guile-strings.c:1590 ../intl-scm/guile-strings.c:1758
 msgid "Bad option"
 msgstr "Falsche Auswahl"
 
+#. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1048
+#: ../intl-scm/guile-strings.c:1592 ../intl-scm/guile-strings.c:1760
 msgid "The Ugly"
 msgstr "Das Hässliche"
 
+#. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1050
+#: ../intl-scm/guile-strings.c:1594 ../intl-scm/guile-strings.c:1762
 msgid "Ugly option"
 msgstr "Hässliche Option"
 
+#. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1052
+#: ../intl-scm/guile-strings.c:1596 ../intl-scm/guile-strings.c:1764
 msgid "Testing"
 msgstr "Test"
 
+#. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1054
+#: ../intl-scm/guile-strings.c:1598 ../intl-scm/guile-strings.c:1766
 msgid "Crash the report"
 msgstr "Verwerfe den Bericht"
 
+#. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1056
+#: ../intl-scm/guile-strings.c:1600 ../intl-scm/guile-strings.c:1768
 msgid ""
 "This is for testing. Your reports probably shouldn't have an option like "
 "this."
 msgstr ""
 "Diese Option ist nur zum Testen, Ihre Berichte sollten sowas nicht haben.."
 
+#. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1060
+#: ../intl-scm/guile-strings.c:1604 ../intl-scm/guile-strings.c:1772
 msgid ""
 "This is a sample GnuCash report. See the guile (scheme) source code in the "
 "scm/report directory for details on writing your own reports, or extending "
@@ -16519,8 +17351,9 @@
 "Quelltext im scm/report Verzeichnis ansehen, um mehr darüber zu erfahren, "
 "wie Sie ihre eigenen Berichte verfassen oder die bestehenden abändern können."
 
+#. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1062
+#: ../intl-scm/guile-strings.c:1606 ../intl-scm/guile-strings.c:1774
 #, c-format
 msgid ""
 "For help on writing reports, or to contribute your brand new, totally cool "
@@ -16529,140 +17362,166 @@
 "Um Hilfe beim Schreiben von Berichten zu bekommen oder Ihren eigenen, "
 "brandneuen Bericht uns zu senden, wenden Sie sich an die Mailingliste %s."
 
+#. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1064
+#: ../intl-scm/guile-strings.c:1608 ../intl-scm/guile-strings.c:1776
 #, c-format
 msgid "For details on subscribing to that list, see %s."
 msgstr "Einzelheiten zum Abonnieren der Liste siehe %s."
 
+#. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1066
+#: ../intl-scm/guile-strings.c:1610 ../intl-scm/guile-strings.c:1778
 #, c-format
 msgid "You can learn more about writing scheme using this %s."
 msgstr "Mehr über die Programmiersprache Scheme unter %s."
 
+#. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1068
+#: ../intl-scm/guile-strings.c:1612 ../intl-scm/guile-strings.c:1780
 msgid "online book"
 msgstr "Onlinebuch"
 
+#. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1070
+#: ../intl-scm/guile-strings.c:1614 ../intl-scm/guile-strings.c:1782
 #, c-format
 msgid "The current time is %s."
 msgstr "Es ist jetzt %s Uhr."
 
+#. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1072
+#: ../intl-scm/guile-strings.c:1616 ../intl-scm/guile-strings.c:1784
 #, c-format
 msgid "The boolean option is %s."
 msgstr "Diese boolsche Option ist %s."
 
+#. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1074
+#: ../intl-scm/guile-strings.c:1618 ../intl-scm/guile-strings.c:1786
 msgid "true"
 msgstr "wahr"
 
+#. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1076
+#: ../intl-scm/guile-strings.c:1620 ../intl-scm/guile-strings.c:1788
 msgid "false"
 msgstr "falsch"
 
+#. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1078
+#: ../intl-scm/guile-strings.c:1622 ../intl-scm/guile-strings.c:1790
 #, c-format
 msgid "The multi-choice option is %s."
 msgstr "Die Multi-Auswahl ist %s."
 
+#. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1080
+#: ../intl-scm/guile-strings.c:1624 ../intl-scm/guile-strings.c:1792
 #, c-format
 msgid "The string option is %s."
 msgstr "Die String-Option ist %s."
 
+#. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1082
+#: ../intl-scm/guile-strings.c:1626 ../intl-scm/guile-strings.c:1794
 #, c-format
 msgid "The date option is %s."
 msgstr "Die Datums-Option ist %s."
 
+#. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1084
+#: ../intl-scm/guile-strings.c:1628 ../intl-scm/guile-strings.c:1796
 #, c-format
 msgid "The date and time option is %s."
 msgstr "Die Datums und Zeit-Option ist %s."
 
+#. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1086
+#: ../intl-scm/guile-strings.c:1630 ../intl-scm/guile-strings.c:1798
 #, c-format
 msgid "The relative date option is %s."
 msgstr "Die relative Datums-Option ist %s."
 
+#. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1088
+#: ../intl-scm/guile-strings.c:1632 ../intl-scm/guile-strings.c:1800
 #, c-format
 msgid "The combination date option is %s."
 msgstr "Die Kombinations-Datums-Option ist %s."
 
+#. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1090
+#: ../intl-scm/guile-strings.c:1634 ../intl-scm/guile-strings.c:1802
 #, c-format
 msgid "The number option is %s."
 msgstr "Die Zahlen-Option ist %s."
 
+#. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1092
+#: ../intl-scm/guile-strings.c:1636 ../intl-scm/guile-strings.c:1804
 #, c-format
 msgid "The number option formatted as currency is %s."
 msgstr "Die Nummernoption, die als Währung formatiert ist, ist %s."
 
+#. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1094
+#: ../intl-scm/guile-strings.c:1638 ../intl-scm/guile-strings.c:1806
 msgid "Items you selected:"
 msgstr "Ausgewählte Punkte:"
 
+#. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1096
+#: ../intl-scm/guile-strings.c:1640 ../intl-scm/guile-strings.c:1808
 msgid "List items selected"
 msgstr "Ausgewählte Listeneinträge:"
 
+#. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1098
+#: ../intl-scm/guile-strings.c:1642 ../intl-scm/guile-strings.c:1810
 msgid "(You selected no list items.)"
 msgstr "Sie haben keine Werte aus der Liste gewählt."
 
+#. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1100
+#: ../intl-scm/guile-strings.c:1644 ../intl-scm/guile-strings.c:1812
 msgid "You have selected no accounts."
 msgstr "Sie haben kein Konto ausgewählt"
 
+#. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1102
+#: ../intl-scm/guile-strings.c:1646 ../intl-scm/guile-strings.c:1814
 msgid "Have a nice day!"
 msgstr "Einen schönen Tag noch."
 
+#. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1106
+#: ../intl-scm/guile-strings.c:1650 ../intl-scm/guile-strings.c:1818
 msgid "Sample Report with Examples"
 msgstr "Beispielbericht"
 
+#. src/report/utility-reports/gnucash/report/hello-world.scm
 #. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1108
+#: ../intl-scm/guile-strings.c:1652 ../intl-scm/guile-strings.c:1820
 msgid "A sample report with examples."
 msgstr "Ein Beispielbericht."
 
+#. src/report/utility-reports/gnucash/report/welcome-to-gnucash.scm
 #. src/report/utility-reports/welcome-to-gnucash.scm
-#: ../intl-scm/guile-strings.c:1110 ../intl-scm/guile-strings.c:1116
+#: ../intl-scm/guile-strings.c:1654 ../intl-scm/guile-strings.c:1660
+#: ../intl-scm/guile-strings.c:1822 ../intl-scm/guile-strings.c:1828
 msgid "Welcome to GnuCash"
 msgstr "Willkommen zu GnuCash"
 
+#. src/report/utility-reports/gnucash/report/welcome-to-gnucash.scm
 #. src/report/utility-reports/welcome-to-gnucash.scm
-#: ../intl-scm/guile-strings.c:1112
+#: ../intl-scm/guile-strings.c:1656 ../intl-scm/guile-strings.c:1824
 msgid "Welcome to GnuCash 2.0!"
 msgstr "Willkommen zu GnuCash 2.0"
 
+#. src/report/utility-reports/gnucash/report/welcome-to-gnucash.scm
 #. src/report/utility-reports/welcome-to-gnucash.scm
-#: ../intl-scm/guile-strings.c:1114
+#: ../intl-scm/guile-strings.c:1658 ../intl-scm/guile-strings.c:1826
 msgid "GnuCash 2.0 has lots of nice features. Here are a few."
 msgstr ""
 "GnuCash 2.0 hat viele neue Funktionen. Hier werden einige Beispiele gegeben."
@@ -16671,19 +17530,36 @@
 #. src/report/standard-reports/net-barchart.scm
 #. src/report/standard-reports/cash-flow.scm
 #. src/report/standard-reports/category-barchart.scm
+#. src/report/standard-reports/gnucash/report/price-scatter.scm
+#. src/report/standard-reports/gnucash/report/net-barchart.scm
+#. src/report/standard-reports/gnucash/report/cash-flow.scm
+#. src/report/standard-reports/gnucash/report/category-barchart.scm
+#. src/report/standard-reports/gnucash/report/transaction.scm
+#. src/report/standard-reports/gnucash/report/average-balance.scm
+#. src/report/standard-reports/gnucash/report/daily-reports.scm
+#. src/report/standard-reports/gnucash/report/account-piecharts.scm
 #. src/report/standard-reports/transaction.scm
 #. src/report/standard-reports/average-balance.scm
 #. src/report/standard-reports/daily-reports.scm
 #. src/report/standard-reports/account-piecharts.scm
 #. src/report/locale-specific/us/taxtxf.scm
 #. src/report/locale-specific/us/taxtxf-de_DE.scm
+#. src/report/locale-specific/us/gnucash/report/taxtxf.scm
+#. src/report/locale-specific/us/gnucash/report/taxtxf-de_DE.scm
 #. src/business/business-reports/owner-report.scm
-#: ../intl-scm/guile-strings.c:1118 ../intl-scm/guile-strings.c:1204
-#: ../intl-scm/guile-strings.c:1296 ../intl-scm/guile-strings.c:1666
-#: ../intl-scm/guile-strings.c:2266 ../intl-scm/guile-strings.c:2688
-#: ../intl-scm/guile-strings.c:2774 ../intl-scm/guile-strings.c:2848
-#: ../intl-scm/guile-strings.c:2892 ../intl-scm/guile-strings.c:2982
-#: ../intl-scm/guile-strings.c:3432 ../intl-scm/guile-strings.c:3468
+#. src/business/business-reports/gnucash/report/owner-report.scm
+#: ../intl-scm/guile-strings.c:1830 ../intl-scm/guile-strings.c:1916
+#: ../intl-scm/guile-strings.c:2006 ../intl-scm/guile-strings.c:2376
+#: ../intl-scm/guile-strings.c:2454 ../intl-scm/guile-strings.c:2540
+#: ../intl-scm/guile-strings.c:2630 ../intl-scm/guile-strings.c:3000
+#: ../intl-scm/guile-strings.c:3600 ../intl-scm/guile-strings.c:4026
+#: ../intl-scm/guile-strings.c:4112 ../intl-scm/guile-strings.c:4186
+#: ../intl-scm/guile-strings.c:4750 ../intl-scm/guile-strings.c:5176
+#: ../intl-scm/guile-strings.c:5262 ../intl-scm/guile-strings.c:5336
+#: ../intl-scm/guile-strings.c:5380 ../intl-scm/guile-strings.c:5470
+#: ../intl-scm/guile-strings.c:5560 ../intl-scm/guile-strings.c:5650
+#: ../intl-scm/guile-strings.c:6158 ../intl-scm/guile-strings.c:6194
+#: ../intl-scm/guile-strings.c:6682 ../intl-scm/guile-strings.c:6718
 msgid "From"
 msgstr "Von"
 
@@ -16691,30 +17567,55 @@
 #. src/report/standard-reports/net-barchart.scm
 #. src/report/standard-reports/cash-flow.scm
 #. src/report/standard-reports/category-barchart.scm
+#. src/report/standard-reports/gnucash/report/price-scatter.scm
+#. src/report/standard-reports/gnucash/report/net-barchart.scm
+#. src/report/standard-reports/gnucash/report/cash-flow.scm
+#. src/report/standard-reports/gnucash/report/category-barchart.scm
+#. src/report/standard-reports/gnucash/report/transaction.scm
+#. src/report/standard-reports/gnucash/report/average-balance.scm
+#. src/report/standard-reports/gnucash/report/daily-reports.scm
+#. src/report/standard-reports/gnucash/report/account-piecharts.scm
 #. src/report/standard-reports/transaction.scm
 #. src/report/standard-reports/average-balance.scm
 #. src/report/standard-reports/daily-reports.scm
 #. src/report/standard-reports/account-piecharts.scm
 #. src/report/locale-specific/us/taxtxf.scm
 #. src/report/locale-specific/us/taxtxf-de_DE.scm
+#. src/report/locale-specific/us/gnucash/report/taxtxf.scm
+#. src/report/locale-specific/us/gnucash/report/taxtxf-de_DE.scm
 #. src/business/business-reports/owner-report.scm
+#. src/business/business-reports/gnucash/report/owner-report.scm
+#. src/business/business-reports/gnucash/report/aging.scm
 #. src/business/business-reports/aging.scm
-#: ../intl-scm/guile-strings.c:1120 ../intl-scm/guile-strings.c:1206
-#: ../intl-scm/guile-strings.c:1298 ../intl-scm/guile-strings.c:1668
-#: ../intl-scm/guile-strings.c:2268 ../intl-scm/guile-strings.c:2690
-#: ../intl-scm/guile-strings.c:2776 ../intl-scm/guile-strings.c:2850
-#: ../intl-scm/guile-strings.c:2894 ../intl-scm/guile-strings.c:2984
-#: ../intl-scm/guile-strings.c:3434 ../intl-scm/guile-strings.c:3470
-#: ../intl-scm/guile-strings.c:3702 ../intl-scm/guile-strings.c:3758
+#: ../intl-scm/guile-strings.c:1832 ../intl-scm/guile-strings.c:1918
+#: ../intl-scm/guile-strings.c:2008 ../intl-scm/guile-strings.c:2378
+#: ../intl-scm/guile-strings.c:2456 ../intl-scm/guile-strings.c:2542
+#: ../intl-scm/guile-strings.c:2632 ../intl-scm/guile-strings.c:3002
+#: ../intl-scm/guile-strings.c:3602 ../intl-scm/guile-strings.c:4028
+#: ../intl-scm/guile-strings.c:4114 ../intl-scm/guile-strings.c:4188
+#: ../intl-scm/guile-strings.c:4752 ../intl-scm/guile-strings.c:5178
+#: ../intl-scm/guile-strings.c:5264 ../intl-scm/guile-strings.c:5338
+#: ../intl-scm/guile-strings.c:5382 ../intl-scm/guile-strings.c:5472
+#: ../intl-scm/guile-strings.c:5562 ../intl-scm/guile-strings.c:5652
+#: ../intl-scm/guile-strings.c:6160 ../intl-scm/guile-strings.c:6196
+#: ../intl-scm/guile-strings.c:6684 ../intl-scm/guile-strings.c:6720
+#: ../intl-scm/guile-strings.c:6952 ../intl-scm/guile-strings.c:7008
+#: ../intl-scm/guile-strings.c:7192 ../intl-scm/guile-strings.c:7248
 msgid "To"
 msgstr "Bis"
 
 #. src/report/standard-reports/price-scatter.scm
 #. src/report/standard-reports/net-barchart.scm
 #. src/report/standard-reports/category-barchart.scm
+#. src/report/standard-reports/gnucash/report/price-scatter.scm
+#. src/report/standard-reports/gnucash/report/net-barchart.scm
+#. src/report/standard-reports/gnucash/report/category-barchart.scm
+#. src/report/standard-reports/gnucash/report/average-balance.scm
 #. src/report/standard-reports/average-balance.scm
-#: ../intl-scm/guile-strings.c:1122 ../intl-scm/guile-strings.c:1208
-#: ../intl-scm/guile-strings.c:1670 ../intl-scm/guile-strings.c:2692
+#: ../intl-scm/guile-strings.c:1834 ../intl-scm/guile-strings.c:1920
+#: ../intl-scm/guile-strings.c:2380 ../intl-scm/guile-strings.c:2458
+#: ../intl-scm/guile-strings.c:2544 ../intl-scm/guile-strings.c:3004
+#: ../intl-scm/guile-strings.c:4030 ../intl-scm/guile-strings.c:5180
 msgid "Step Size"
 msgstr "Schrittgrösse"
 
@@ -16724,25 +17625,45 @@
 #. src/report/standard-reports/trial-balance.scm
 #. src/report/standard-reports/income-statement.scm
 #. src/report/standard-reports/category-barchart.scm
+#. src/report/standard-reports/gnucash/report/price-scatter.scm
+#. src/report/standard-reports/gnucash/report/net-barchart.scm
+#. src/report/standard-reports/gnucash/report/cash-flow.scm
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#. src/report/standard-reports/gnucash/report/income-statement.scm
+#. src/report/standard-reports/gnucash/report/category-barchart.scm
+#. src/report/standard-reports/gnucash/report/balance-sheet.scm
+#. src/report/standard-reports/gnucash/report/account-summary.scm
+#. src/report/standard-reports/gnucash/report/equity-statement.scm
+#. src/report/standard-reports/gnucash/report/average-balance.scm
+#. src/report/standard-reports/gnucash/report/daily-reports.scm
+#. src/report/standard-reports/gnucash/report/account-piecharts.scm
 #. src/report/standard-reports/balance-sheet.scm
 #. src/report/standard-reports/account-summary.scm
 #. src/report/standard-reports/equity-statement.scm
 #. src/report/standard-reports/average-balance.scm
 #. src/report/standard-reports/daily-reports.scm
 #. src/report/standard-reports/account-piecharts.scm
+#. src/business/business-reports/gnucash/report/aging.scm
 #. src/business/business-reports/aging.scm
-#: ../intl-scm/guile-strings.c:1126 ../intl-scm/guile-strings.c:1210
-#: ../intl-scm/guile-strings.c:1306 ../intl-scm/guile-strings.c:1408
-#: ../intl-scm/guile-strings.c:1596 ../intl-scm/guile-strings.c:1672
-#: ../intl-scm/guile-strings.c:1818 ../intl-scm/guile-strings.c:1918
-#: ../intl-scm/guile-strings.c:2084 ../intl-scm/guile-strings.c:2694
-#: ../intl-scm/guile-strings.c:2778 ../intl-scm/guile-strings.c:2852
-#: ../intl-scm/guile-strings.c:3708
+#: ../intl-scm/guile-strings.c:1838 ../intl-scm/guile-strings.c:1922
+#: ../intl-scm/guile-strings.c:2016 ../intl-scm/guile-strings.c:2118
+#: ../intl-scm/guile-strings.c:2306 ../intl-scm/guile-strings.c:2382
+#: ../intl-scm/guile-strings.c:2462 ../intl-scm/guile-strings.c:2546
+#: ../intl-scm/guile-strings.c:2640 ../intl-scm/guile-strings.c:2742
+#: ../intl-scm/guile-strings.c:2930 ../intl-scm/guile-strings.c:3006
+#: ../intl-scm/guile-strings.c:3152 ../intl-scm/guile-strings.c:3252
+#: ../intl-scm/guile-strings.c:3418 ../intl-scm/guile-strings.c:4032
+#: ../intl-scm/guile-strings.c:4116 ../intl-scm/guile-strings.c:4190
+#: ../intl-scm/guile-strings.c:4302 ../intl-scm/guile-strings.c:4402
+#: ../intl-scm/guile-strings.c:4568 ../intl-scm/guile-strings.c:5182
+#: ../intl-scm/guile-strings.c:5266 ../intl-scm/guile-strings.c:5340
+#: ../intl-scm/guile-strings.c:6958 ../intl-scm/guile-strings.c:7198
 msgid "Report's currency"
 msgstr "Währung des Berichts"
 
 #. src/report/standard-reports/price-scatter.scm
-#: ../intl-scm/guile-strings.c:1128
+#. src/report/standard-reports/gnucash/report/price-scatter.scm
+#: ../intl-scm/guile-strings.c:1840 ../intl-scm/guile-strings.c:2464
 msgid "Price of Commodity"
 msgstr "Preis der Währung/Aktie"
 
@@ -16753,6 +17674,21 @@
 #. src/report/standard-reports/income-statement.scm
 #. src/report/standard-reports/category-barchart.scm
 #. src/report/standard-reports/portfolio.scm
+#. src/report/standard-reports/gnucash/report/price-scatter.scm
+#. src/report/standard-reports/gnucash/report/net-barchart.scm
+#. src/report/standard-reports/gnucash/report/cash-flow.scm
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#. src/report/standard-reports/gnucash/report/income-statement.scm
+#. src/report/standard-reports/gnucash/report/category-barchart.scm
+#. src/report/standard-reports/gnucash/report/portfolio.scm
+#. src/report/standard-reports/gnucash/report/balance-sheet.scm
+#. src/report/standard-reports/gnucash/report/account-summary.scm
+#. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
+#. src/report/standard-reports/gnucash/report/equity-statement.scm
+#. src/report/standard-reports/gnucash/report/budget.scm
+#. src/report/standard-reports/gnucash/report/average-balance.scm
+#. src/report/standard-reports/gnucash/report/daily-reports.scm
+#. src/report/standard-reports/gnucash/report/account-piecharts.scm
 #. src/report/standard-reports/balance-sheet.scm
 #. src/report/standard-reports/account-summary.scm
 #. src/report/standard-reports/advanced-portfolio.scm
@@ -16761,102 +17697,146 @@
 #. src/report/standard-reports/average-balance.scm
 #. src/report/standard-reports/daily-reports.scm
 #. src/report/standard-reports/account-piecharts.scm
+#. src/business/business-reports/gnucash/report/aging.scm
 #. src/business/business-reports/aging.scm
-#: ../intl-scm/guile-strings.c:1130 ../intl-scm/guile-strings.c:1212
-#: ../intl-scm/guile-strings.c:1308 ../intl-scm/guile-strings.c:1410
-#: ../intl-scm/guile-strings.c:1598 ../intl-scm/guile-strings.c:1674
-#: ../intl-scm/guile-strings.c:1712 ../intl-scm/guile-strings.c:1820
-#: ../intl-scm/guile-strings.c:1920 ../intl-scm/guile-strings.c:1956
-#: ../intl-scm/guile-strings.c:2086 ../intl-scm/guile-strings.c:2672
-#: ../intl-scm/guile-strings.c:2696 ../intl-scm/guile-strings.c:2780
-#: ../intl-scm/guile-strings.c:2854 ../intl-scm/guile-strings.c:3710
+#: ../intl-scm/guile-strings.c:1842 ../intl-scm/guile-strings.c:1924
+#: ../intl-scm/guile-strings.c:2018 ../intl-scm/guile-strings.c:2120
+#: ../intl-scm/guile-strings.c:2308 ../intl-scm/guile-strings.c:2384
+#: ../intl-scm/guile-strings.c:2422 ../intl-scm/guile-strings.c:2466
+#: ../intl-scm/guile-strings.c:2548 ../intl-scm/guile-strings.c:2642
+#: ../intl-scm/guile-strings.c:2744 ../intl-scm/guile-strings.c:2932
+#: ../intl-scm/guile-strings.c:3008 ../intl-scm/guile-strings.c:3046
+#: ../intl-scm/guile-strings.c:3154 ../intl-scm/guile-strings.c:3254
+#: ../intl-scm/guile-strings.c:3290 ../intl-scm/guile-strings.c:3420
+#: ../intl-scm/guile-strings.c:4006 ../intl-scm/guile-strings.c:4034
+#: ../intl-scm/guile-strings.c:4118 ../intl-scm/guile-strings.c:4192
+#: ../intl-scm/guile-strings.c:4304 ../intl-scm/guile-strings.c:4404
+#: ../intl-scm/guile-strings.c:4440 ../intl-scm/guile-strings.c:4570
+#: ../intl-scm/guile-strings.c:5156 ../intl-scm/guile-strings.c:5184
+#: ../intl-scm/guile-strings.c:5268 ../intl-scm/guile-strings.c:5342
+#: ../intl-scm/guile-strings.c:6960 ../intl-scm/guile-strings.c:7200
 msgid "Price Source"
 msgstr "Preisberechnungsquelle"
 
 #. src/report/standard-reports/price-scatter.scm
 #. src/report/standard-reports/net-barchart.scm
-#: ../intl-scm/guile-strings.c:1134 ../intl-scm/guile-strings.c:1218
+#. src/report/standard-reports/gnucash/report/price-scatter.scm
+#. src/report/standard-reports/gnucash/report/net-barchart.scm
+#: ../intl-scm/guile-strings.c:1846 ../intl-scm/guile-strings.c:1930
+#: ../intl-scm/guile-strings.c:2470 ../intl-scm/guile-strings.c:2554
 msgid "Show Net Profit"
 msgstr "Reingewinn anzeigen"
 
 #. src/report/standard-reports/price-scatter.scm
 #. src/report/standard-reports/net-barchart.scm
-#: ../intl-scm/guile-strings.c:1136 ../intl-scm/guile-strings.c:1220
+#. src/report/standard-reports/gnucash/report/price-scatter.scm
+#. src/report/standard-reports/gnucash/report/net-barchart.scm
+#: ../intl-scm/guile-strings.c:1848 ../intl-scm/guile-strings.c:1932
+#: ../intl-scm/guile-strings.c:2472 ../intl-scm/guile-strings.c:2556
 msgid "Show Asset & Liability bars"
 msgstr "Aktiva und Passiva Balken anzeigen"
 
 #. src/report/standard-reports/price-scatter.scm
 #. src/report/standard-reports/net-barchart.scm
-#: ../intl-scm/guile-strings.c:1138 ../intl-scm/guile-strings.c:1222
+#. src/report/standard-reports/gnucash/report/price-scatter.scm
+#. src/report/standard-reports/gnucash/report/net-barchart.scm
+#: ../intl-scm/guile-strings.c:1850 ../intl-scm/guile-strings.c:1934
+#: ../intl-scm/guile-strings.c:2474 ../intl-scm/guile-strings.c:2558
 msgid "Show Net Worth bars"
 msgstr "Reinvermögen-Balken anzeigen"
 
 #. src/report/standard-reports/price-scatter.scm
-#: ../intl-scm/guile-strings.c:1140
+#. src/report/standard-reports/gnucash/report/price-scatter.scm
+#: ../intl-scm/guile-strings.c:1852 ../intl-scm/guile-strings.c:2476
 msgid "Marker"
 msgstr "Markierung"
 
 #. src/report/standard-reports/price-scatter.scm
-#: ../intl-scm/guile-strings.c:1142
+#. src/report/standard-reports/gnucash/report/price-scatter.scm
+#: ../intl-scm/guile-strings.c:1854 ../intl-scm/guile-strings.c:2478
 msgid "Marker Color"
 msgstr "Markierungsfarbe"
 
 #. src/report/standard-reports/price-scatter.scm
 #. src/report/standard-reports/net-barchart.scm
 #. src/report/standard-reports/category-barchart.scm
+#. src/report/standard-reports/gnucash/report/price-scatter.scm
+#. src/report/standard-reports/gnucash/report/net-barchart.scm
+#. src/report/standard-reports/gnucash/report/category-barchart.scm
+#. src/report/standard-reports/gnucash/report/average-balance.scm
+#. src/report/standard-reports/gnucash/report/daily-reports.scm
+#. src/report/standard-reports/gnucash/report/account-piecharts.scm
 #. src/report/standard-reports/average-balance.scm
 #. src/report/standard-reports/daily-reports.scm
 #. src/report/standard-reports/account-piecharts.scm
-#: ../intl-scm/guile-strings.c:1144 ../intl-scm/guile-strings.c:1224
-#: ../intl-scm/guile-strings.c:1686 ../intl-scm/guile-strings.c:2730
-#: ../intl-scm/guile-strings.c:2758 ../intl-scm/guile-strings.c:2794
-#: ../intl-scm/guile-strings.c:2866
+#: ../intl-scm/guile-strings.c:1856 ../intl-scm/guile-strings.c:1936
+#: ../intl-scm/guile-strings.c:2396 ../intl-scm/guile-strings.c:2480
+#: ../intl-scm/guile-strings.c:2560 ../intl-scm/guile-strings.c:3020
+#: ../intl-scm/guile-strings.c:4068 ../intl-scm/guile-strings.c:4096
+#: ../intl-scm/guile-strings.c:4132 ../intl-scm/guile-strings.c:4204
+#: ../intl-scm/guile-strings.c:5218 ../intl-scm/guile-strings.c:5246
+#: ../intl-scm/guile-strings.c:5282 ../intl-scm/guile-strings.c:5354
 msgid "Plot Width"
 msgstr "Diagrammbreite"
 
 #. src/report/standard-reports/price-scatter.scm
 #. src/report/standard-reports/net-barchart.scm
 #. src/report/standard-reports/category-barchart.scm
+#. src/report/standard-reports/gnucash/report/price-scatter.scm
+#. src/report/standard-reports/gnucash/report/net-barchart.scm
+#. src/report/standard-reports/gnucash/report/category-barchart.scm
+#. src/report/standard-reports/gnucash/report/average-balance.scm
+#. src/report/standard-reports/gnucash/report/daily-reports.scm
+#. src/report/standard-reports/gnucash/report/account-piecharts.scm
 #. src/report/standard-reports/average-balance.scm
 #. src/report/standard-reports/daily-reports.scm
 #. src/report/standard-reports/account-piecharts.scm
-#: ../intl-scm/guile-strings.c:1146 ../intl-scm/guile-strings.c:1226
-#: ../intl-scm/guile-strings.c:1688 ../intl-scm/guile-strings.c:2732
-#: ../intl-scm/guile-strings.c:2760 ../intl-scm/guile-strings.c:2796
-#: ../intl-scm/guile-strings.c:2868
+#: ../intl-scm/guile-strings.c:1858 ../intl-scm/guile-strings.c:1938
+#: ../intl-scm/guile-strings.c:2398 ../intl-scm/guile-strings.c:2482
+#: ../intl-scm/guile-strings.c:2562 ../intl-scm/guile-strings.c:3022
+#: ../intl-scm/guile-strings.c:4070 ../intl-scm/guile-strings.c:4098
+#: ../intl-scm/guile-strings.c:4134 ../intl-scm/guile-strings.c:4206
+#: ../intl-scm/guile-strings.c:5220 ../intl-scm/guile-strings.c:5248
+#: ../intl-scm/guile-strings.c:5284 ../intl-scm/guile-strings.c:5356
 msgid "Plot Height"
 msgstr "Diagrammhöhe"
 
 #. src/report/standard-reports/price-scatter.scm
-#: ../intl-scm/guile-strings.c:1148
+#. src/report/standard-reports/gnucash/report/price-scatter.scm
+#: ../intl-scm/guile-strings.c:1860 ../intl-scm/guile-strings.c:2484
 msgid "Calculate the price of this commodity."
 msgstr ""
 "Die Währung/Aktie, für die der Preis in diesem Bericht dargestellt werden "
 "soll."
 
 #. src/report/standard-reports/price-scatter.scm
-#: ../intl-scm/guile-strings.c:1156
+#. src/report/standard-reports/gnucash/report/price-scatter.scm
+#: ../intl-scm/guile-strings.c:1868 ../intl-scm/guile-strings.c:2492
 msgid "Actual Transactions"
 msgstr "Tatsächliche Buchungen"
 
 #. src/report/standard-reports/price-scatter.scm
-#: ../intl-scm/guile-strings.c:1158
+#. src/report/standard-reports/gnucash/report/price-scatter.scm
+#: ../intl-scm/guile-strings.c:1870 ../intl-scm/guile-strings.c:2494
 msgid "The instantaneous price of actual currency transactions in the past"
 msgstr ""
 "Der aufgezeichnete Preis von tatsächlichen Buchungen in der Vergangenheit"
 
 #. src/report/standard-reports/price-scatter.scm
-#: ../intl-scm/guile-strings.c:1160
+#. src/report/standard-reports/gnucash/report/price-scatter.scm
+#: ../intl-scm/guile-strings.c:1872 ../intl-scm/guile-strings.c:2496
 msgid "Price Database"
 msgstr "Preis-Editor"
 
 #. src/report/standard-reports/price-scatter.scm
-#: ../intl-scm/guile-strings.c:1162
+#. src/report/standard-reports/gnucash/report/price-scatter.scm
+#: ../intl-scm/guile-strings.c:1874 ../intl-scm/guile-strings.c:2498
 msgid "The recorded prices"
 msgstr "Die explizit eingetragenen Preise"
 
 #. src/report/standard-reports/price-scatter.scm
-#: ../intl-scm/guile-strings.c:1164
+#. src/report/standard-reports/gnucash/report/price-scatter.scm
+#: ../intl-scm/guile-strings.c:1876 ../intl-scm/guile-strings.c:2500
 msgid "Color of the marker"
 msgstr "Farbe der Markierung"
 
@@ -16865,29 +17845,44 @@
 #. src/report/standard-reports/trial-balance.scm
 #. src/report/standard-reports/income-statement.scm
 #. src/report/standard-reports/category-barchart.scm
+#. src/report/standard-reports/gnucash/report/price-scatter.scm
+#. src/report/standard-reports/gnucash/report/net-barchart.scm
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#. src/report/standard-reports/gnucash/report/income-statement.scm
+#. src/report/standard-reports/gnucash/report/category-barchart.scm
+#. src/report/standard-reports/gnucash/report/equity-statement.scm
+#. src/report/standard-reports/gnucash/report/daily-reports.scm
+#. src/report/standard-reports/gnucash/report/account-piecharts.scm
 #. src/report/standard-reports/equity-statement.scm
 #. src/report/standard-reports/daily-reports.scm
 #. src/report/standard-reports/account-piecharts.scm
-#: ../intl-scm/guile-strings.c:1166 ../intl-scm/guile-strings.c:1238
-#: ../intl-scm/guile-strings.c:1442 ../intl-scm/guile-strings.c:1628
-#: ../intl-scm/guile-strings.c:1702 ../intl-scm/guile-strings.c:2120
-#: ../intl-scm/guile-strings.c:2822 ../intl-scm/guile-strings.c:2884
+#: ../intl-scm/guile-strings.c:1878 ../intl-scm/guile-strings.c:1950
+#: ../intl-scm/guile-strings.c:2152 ../intl-scm/guile-strings.c:2338
+#: ../intl-scm/guile-strings.c:2412 ../intl-scm/guile-strings.c:2502
+#: ../intl-scm/guile-strings.c:2574 ../intl-scm/guile-strings.c:2776
+#: ../intl-scm/guile-strings.c:2962 ../intl-scm/guile-strings.c:3036
+#: ../intl-scm/guile-strings.c:3454 ../intl-scm/guile-strings.c:4160
+#: ../intl-scm/guile-strings.c:4222 ../intl-scm/guile-strings.c:4604
+#: ../intl-scm/guile-strings.c:5310 ../intl-scm/guile-strings.c:5372
 #, c-format
 msgid "%s to %s"
 msgstr "%s bis %s"
 
 #. src/report/standard-reports/price-scatter.scm
-#: ../intl-scm/guile-strings.c:1172
+#. src/report/standard-reports/gnucash/report/price-scatter.scm
+#: ../intl-scm/guile-strings.c:1884 ../intl-scm/guile-strings.c:2508
 msgid "Double-Weeks"
 msgstr "Zweiwöchentlich"
 
 #. src/report/standard-reports/price-scatter.scm
-#: ../intl-scm/guile-strings.c:1178
+#. src/report/standard-reports/gnucash/report/price-scatter.scm
+#: ../intl-scm/guile-strings.c:1890 ../intl-scm/guile-strings.c:2514
 msgid "All Prices equal"
 msgstr "Alle Preise gleich"
 
 #. src/report/standard-reports/price-scatter.scm
-#: ../intl-scm/guile-strings.c:1180
+#. src/report/standard-reports/gnucash/report/price-scatter.scm
+#: ../intl-scm/guile-strings.c:1892 ../intl-scm/guile-strings.c:2516
 msgid ""
 "All the prices found are equal. This would result in a plot with one "
 "straight line. Unfortunately, the plotting tool can't handle that."
@@ -16897,12 +17892,14 @@
 "nicht anzeigen."
 
 #. src/report/standard-reports/price-scatter.scm
-#: ../intl-scm/guile-strings.c:1182
+#. src/report/standard-reports/gnucash/report/price-scatter.scm
+#: ../intl-scm/guile-strings.c:1894 ../intl-scm/guile-strings.c:2518
 msgid "All Prices at the same date"
 msgstr "Alle Preise mit gleichem Datum"
 
 #. src/report/standard-reports/price-scatter.scm
-#: ../intl-scm/guile-strings.c:1184
+#. src/report/standard-reports/gnucash/report/price-scatter.scm
+#: ../intl-scm/guile-strings.c:1896 ../intl-scm/guile-strings.c:2520
 msgid ""
 "All the prices found are from the same date. This would result in a plot "
 "with one straight line. Unfortunately, the plotting tool can't handle that."
@@ -16912,12 +17909,14 @@
 "etwas nicht anzeigen."
 
 #. src/report/standard-reports/price-scatter.scm
-#: ../intl-scm/guile-strings.c:1186
+#. src/report/standard-reports/gnucash/report/price-scatter.scm
+#: ../intl-scm/guile-strings.c:1898 ../intl-scm/guile-strings.c:2522
 msgid "Only one price"
 msgstr "Nur ein Preis gefunden"
 
 #. src/report/standard-reports/price-scatter.scm
-#: ../intl-scm/guile-strings.c:1188
+#. src/report/standard-reports/gnucash/report/price-scatter.scm
+#: ../intl-scm/guile-strings.c:1900 ../intl-scm/guile-strings.c:2524
 msgid ""
 "There was only one single price found for the selected commodities in the "
 "selected time period. This doesn't give a useful plot."
@@ -16926,7 +17925,8 @@
 "Zeitraum gefunden. Dies ergibt kein sinnvolles Diagramm."
 
 #. src/report/standard-reports/price-scatter.scm
-#: ../intl-scm/guile-strings.c:1192
+#. src/report/standard-reports/gnucash/report/price-scatter.scm
+#: ../intl-scm/guile-strings.c:1904 ../intl-scm/guile-strings.c:2528
 msgid ""
 "There is no price information available for the selected commodities in the "
 "selected time period."
@@ -16935,12 +17935,14 @@
 "Zeitraum vorhanden."
 
 #. src/report/standard-reports/price-scatter.scm
-#: ../intl-scm/guile-strings.c:1194
+#. src/report/standard-reports/gnucash/report/price-scatter.scm
+#: ../intl-scm/guile-strings.c:1906 ../intl-scm/guile-strings.c:2530
 msgid "Identical commodities"
 msgstr "Identische Währungen/Aktien"
 
 #. src/report/standard-reports/price-scatter.scm
-#: ../intl-scm/guile-strings.c:1196
+#. src/report/standard-reports/gnucash/report/price-scatter.scm
+#: ../intl-scm/guile-strings.c:1908 ../intl-scm/guile-strings.c:2532
 msgid ""
 "Your selected commodity and the currency of the report are identical. It "
 "doesn't make sense to show prices for identical commodities."
@@ -16950,330 +17952,470 @@
 "identische Währungen/Aktien anzuzeigen."
 
 #. src/report/standard-reports/price-scatter.scm
-#: ../intl-scm/guile-strings.c:1200
+#. src/report/standard-reports/gnucash/report/price-scatter.scm
+#: ../intl-scm/guile-strings.c:1912 ../intl-scm/guile-strings.c:2536
 msgid "Price Scatterplot"
 msgstr "Preisdiagramm"
 
 #. src/report/standard-reports/net-barchart.scm
-#: ../intl-scm/guile-strings.c:1202
+#. src/report/standard-reports/gnucash/report/net-barchart.scm
+#: ../intl-scm/guile-strings.c:1914 ../intl-scm/guile-strings.c:2538
 msgid "Income/Expense Chart"
 msgstr "Erträge/Aufwendungen Diagramm"
 
 #. src/report/standard-reports/net-barchart.scm
 #. src/report/standard-reports/category-barchart.scm
+#. src/report/standard-reports/gnucash/report/net-barchart.scm
+#. src/report/standard-reports/gnucash/report/category-barchart.scm
+#. src/report/standard-reports/gnucash/report/daily-reports.scm
+#. src/report/standard-reports/gnucash/report/account-piecharts.scm
 #. src/report/standard-reports/daily-reports.scm
 #. src/report/standard-reports/account-piecharts.scm
-#: ../intl-scm/guile-strings.c:1228 ../intl-scm/guile-strings.c:1692
-#: ../intl-scm/guile-strings.c:2802 ../intl-scm/guile-strings.c:2872
+#: ../intl-scm/guile-strings.c:1940 ../intl-scm/guile-strings.c:2402
+#: ../intl-scm/guile-strings.c:2564 ../intl-scm/guile-strings.c:3026
+#: ../intl-scm/guile-strings.c:4140 ../intl-scm/guile-strings.c:4210
+#: ../intl-scm/guile-strings.c:5290 ../intl-scm/guile-strings.c:5360
 msgid "Report on these accounts, if chosen account level allows."
 msgstr ""
 "Diese Konten anzeigen, solange die Verschachtelungstiefe eingehalten wird."
 
 #. src/report/standard-reports/net-barchart.scm
-#: ../intl-scm/guile-strings.c:1230
+#. src/report/standard-reports/gnucash/report/net-barchart.scm
+#: ../intl-scm/guile-strings.c:1942 ../intl-scm/guile-strings.c:2566
 msgid "Show Income and Expenses?"
 msgstr "Erträge/Aufwendungen anzeigen"
 
 #. src/report/standard-reports/net-barchart.scm
-#: ../intl-scm/guile-strings.c:1232
+#. src/report/standard-reports/gnucash/report/net-barchart.scm
+#: ../intl-scm/guile-strings.c:1944 ../intl-scm/guile-strings.c:2568
 msgid "Show the Asset and the Liability bars?"
 msgstr "Balken für Aktiva und Passiva anzeigen?"
 
 #. src/report/standard-reports/net-barchart.scm
-#: ../intl-scm/guile-strings.c:1234
+#. src/report/standard-reports/gnucash/report/net-barchart.scm
+#: ../intl-scm/guile-strings.c:1946 ../intl-scm/guile-strings.c:2570
 msgid "Show the net profit?"
 msgstr "Den Reingewinn anzeigen?"
 
 #. src/report/standard-reports/net-barchart.scm
-#: ../intl-scm/guile-strings.c:1236
+#. src/report/standard-reports/gnucash/report/net-barchart.scm
+#: ../intl-scm/guile-strings.c:1948 ../intl-scm/guile-strings.c:2572
 msgid "Show a Net Worth bar?"
 msgstr "Reinvermögen anzeigen?"
 
 #. src/report/standard-reports/net-barchart.scm
-#: ../intl-scm/guile-strings.c:1248
+#. src/report/standard-reports/gnucash/report/net-barchart.scm
+#: ../intl-scm/guile-strings.c:1960 ../intl-scm/guile-strings.c:2584
 msgid "Net Profit"
 msgstr "Reingewinn"
 
 #. src/report/standard-reports/net-barchart.scm
-#: ../intl-scm/guile-strings.c:1250
+#. src/report/standard-reports/gnucash/report/net-barchart.scm
+#: ../intl-scm/guile-strings.c:1962 ../intl-scm/guile-strings.c:2586
 msgid "Net Worth"
 msgstr "Reinvermögen"
 
 #. src/report/standard-reports/net-barchart.scm
-#: ../intl-scm/guile-strings.c:1252
+#. src/report/standard-reports/gnucash/report/net-barchart.scm
+#: ../intl-scm/guile-strings.c:1964 ../intl-scm/guile-strings.c:2588
 msgid "Income Chart"
 msgstr "Erträge Diagramm"
 
 #. src/report/standard-reports/net-barchart.scm
-#: ../intl-scm/guile-strings.c:1254
+#. src/report/standard-reports/gnucash/report/net-barchart.scm
+#: ../intl-scm/guile-strings.c:1966 ../intl-scm/guile-strings.c:2590
 msgid "Asset Chart"
 msgstr "Aktiva Diagramm"
 
 #. src/report/standard-reports/net-barchart.scm
-#: ../intl-scm/guile-strings.c:1256
+#. src/report/standard-reports/gnucash/report/net-barchart.scm
+#: ../intl-scm/guile-strings.c:1968 ../intl-scm/guile-strings.c:2592
 msgid "Expense Chart"
 msgstr "Aufwendungen Diagramm"
 
 #. src/report/standard-reports/net-barchart.scm
-#: ../intl-scm/guile-strings.c:1258
+#. src/report/standard-reports/gnucash/report/net-barchart.scm
+#: ../intl-scm/guile-strings.c:1970 ../intl-scm/guile-strings.c:2594
 msgid "Liability Chart"
 msgstr "Passiva Diagramm"
 
 #. src/report/standard-reports/net-barchart.scm
-#: ../intl-scm/guile-strings.c:1260
+#. src/report/standard-reports/gnucash/report/net-barchart.scm
+#: ../intl-scm/guile-strings.c:1972 ../intl-scm/guile-strings.c:2596
 msgid "Net Worth Barchart"
 msgstr "Reinvermögen Balkendiagramm"
 
 #. src/report/standard-reports/net-barchart.scm
-#: ../intl-scm/guile-strings.c:1262
+#. src/report/standard-reports/gnucash/report/net-barchart.scm
+#: ../intl-scm/guile-strings.c:1974 ../intl-scm/guile-strings.c:2598
 msgid "Income & Expense Chart"
 msgstr "Erträge/Aufwendungen Diagramm"
 
 #. src/report/standard-reports/general-journal.scm
-#: ../intl-scm/guile-strings.c:1264 ../intl-scm/guile-strings.c:1274
+#. src/report/standard-reports/gnucash/report/general-journal.scm
+#: ../intl-scm/guile-strings.c:1976 ../intl-scm/guile-strings.c:2600
 msgid "General Journal"
 msgstr "Hauptbuch Journal"
 
 #. src/report/standard-reports/general-journal.scm
 #. src/report/standard-reports/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/general-journal.scm
+#. src/report/standard-reports/gnucash/report/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/transaction.scm
+#. src/report/standard-reports/gnucash/report/register.scm
 #. src/report/standard-reports/transaction.scm
 #. src/report/standard-reports/register.scm
-#: ../intl-scm/guile-strings.c:1290 ../intl-scm/guile-strings.c:1504
-#: ../intl-scm/guile-strings.c:2210 ../intl-scm/guile-strings.c:2480
-#: ../intl-scm/guile-strings.c:2636
+#: ../intl-scm/guile-strings.c:2000 ../intl-scm/guile-strings.c:2214
+#: ../intl-scm/guile-strings.c:2624 ../intl-scm/guile-strings.c:2838
+#: ../intl-scm/guile-strings.c:3544 ../intl-scm/guile-strings.c:3814
+#: ../intl-scm/guile-strings.c:3970 ../intl-scm/guile-strings.c:4694
+#: ../intl-scm/guile-strings.c:4964 ../intl-scm/guile-strings.c:5120
 msgid "Running Balance"
 msgstr "Laufender Saldo"
 
 #. src/report/standard-reports/general-journal.scm
 #. src/report/standard-reports/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/general-journal.scm
+#. src/report/standard-reports/gnucash/report/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/transaction.scm
+#. src/report/standard-reports/gnucash/report/register.scm
 #. src/report/standard-reports/transaction.scm
 #. src/report/standard-reports/register.scm
 #. src/business/business-reports/fancy-invoice.scm
 #. src/business/business-reports/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/fancy-invoice.scm
+#. src/business/business-reports/gnucash/report/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/invoice.scm
 #. src/business/business-reports/invoice.scm
-#: ../intl-scm/guile-strings.c:1292 ../intl-scm/guile-strings.c:1506
-#: ../intl-scm/guile-strings.c:2484 ../intl-scm/guile-strings.c:2642
-#: ../intl-scm/guile-strings.c:3272 ../intl-scm/guile-strings.c:3608
-#: ../intl-scm/guile-strings.c:3848
+#: ../intl-scm/guile-strings.c:2002 ../intl-scm/guile-strings.c:2216
+#: ../intl-scm/guile-strings.c:2626 ../intl-scm/guile-strings.c:2840
+#: ../intl-scm/guile-strings.c:3818 ../intl-scm/guile-strings.c:3976
+#: ../intl-scm/guile-strings.c:4968 ../intl-scm/guile-strings.c:5126
+#: ../intl-scm/guile-strings.c:5998 ../intl-scm/guile-strings.c:6334
+#: ../intl-scm/guile-strings.c:6522 ../intl-scm/guile-strings.c:6858
+#: ../intl-scm/guile-strings.c:7100 ../intl-scm/guile-strings.c:7340
 msgid "Totals"
 msgstr "Beträge"
 
 #. src/report/standard-reports/cash-flow.scm
-#: ../intl-scm/guile-strings.c:1294
+#. src/report/standard-reports/gnucash/report/cash-flow.scm
+#: ../intl-scm/guile-strings.c:2004 ../intl-scm/guile-strings.c:2628
 msgid "Cash Flow"
 msgstr "Cash Flow"
 
 #. src/report/standard-reports/cash-flow.scm
+#. src/report/standard-reports/gnucash/report/cash-flow.scm
+#. src/report/standard-reports/gnucash/report/budget.scm
 #. src/report/standard-reports/budget.scm
-#: ../intl-scm/guile-strings.c:1300 ../intl-scm/guile-strings.c:2666
+#: ../intl-scm/guile-strings.c:2010 ../intl-scm/guile-strings.c:2634
+#: ../intl-scm/guile-strings.c:4000 ../intl-scm/guile-strings.c:5150
 msgid "Account Display Depth"
 msgstr "Verschachtelungstiefe der Konten"
 
 #. src/report/standard-reports/cash-flow.scm
+#. src/report/standard-reports/gnucash/report/cash-flow.scm
+#. src/report/standard-reports/gnucash/report/budget.scm
 #. src/report/standard-reports/budget.scm
-#: ../intl-scm/guile-strings.c:1302 ../intl-scm/guile-strings.c:2668
+#: ../intl-scm/guile-strings.c:2012 ../intl-scm/guile-strings.c:2636
+#: ../intl-scm/guile-strings.c:4002 ../intl-scm/guile-strings.c:5152
 msgid "Always show sub-accounts"
 msgstr "Unterkonten immer anzeigen"
 
 #. src/report/standard-reports/cash-flow.scm
 #. src/report/standard-reports/trial-balance.scm
 #. src/report/standard-reports/income-statement.scm
+#. src/report/standard-reports/gnucash/report/cash-flow.scm
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#. src/report/standard-reports/gnucash/report/income-statement.scm
+#. src/report/standard-reports/gnucash/report/balance-sheet.scm
+#. src/report/standard-reports/gnucash/report/account-summary.scm
+#. src/report/standard-reports/gnucash/report/equity-statement.scm
+#. src/report/standard-reports/gnucash/report/budget.scm
 #. src/report/standard-reports/balance-sheet.scm
 #. src/report/standard-reports/account-summary.scm
 #. src/report/standard-reports/equity-statement.scm
 #. src/report/standard-reports/budget.scm
-#: ../intl-scm/guile-strings.c:1310 ../intl-scm/guile-strings.c:1416
-#: ../intl-scm/guile-strings.c:1604 ../intl-scm/guile-strings.c:1826
-#: ../intl-scm/guile-strings.c:1926 ../intl-scm/guile-strings.c:2092
-#: ../intl-scm/guile-strings.c:2674
+#: ../intl-scm/guile-strings.c:2020 ../intl-scm/guile-strings.c:2126
+#: ../intl-scm/guile-strings.c:2314 ../intl-scm/guile-strings.c:2644
+#: ../intl-scm/guile-strings.c:2750 ../intl-scm/guile-strings.c:2938
+#: ../intl-scm/guile-strings.c:3160 ../intl-scm/guile-strings.c:3260
+#: ../intl-scm/guile-strings.c:3426 ../intl-scm/guile-strings.c:4008
+#: ../intl-scm/guile-strings.c:4310 ../intl-scm/guile-strings.c:4410
+#: ../intl-scm/guile-strings.c:4576 ../intl-scm/guile-strings.c:5158
 msgid "Show Exchange Rates"
 msgstr "Wechselkurse anzeigen"
 
 #. src/report/standard-reports/cash-flow.scm
+#. src/report/standard-reports/gnucash/report/cash-flow.scm
+#. src/report/standard-reports/gnucash/report/budget.scm
 #. src/report/standard-reports/budget.scm
-#: ../intl-scm/guile-strings.c:1312 ../intl-scm/guile-strings.c:2676
+#: ../intl-scm/guile-strings.c:2022 ../intl-scm/guile-strings.c:2646
+#: ../intl-scm/guile-strings.c:4010 ../intl-scm/guile-strings.c:5160
 msgid "Show Full Account Names"
 msgstr "Lange Kontobezeichnung anzeigen"
 
 #. src/report/standard-reports/cash-flow.scm
 #. src/report/standard-reports/trial-balance.scm
 #. src/report/standard-reports/income-statement.scm
+#. src/report/standard-reports/gnucash/report/cash-flow.scm
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#. src/report/standard-reports/gnucash/report/income-statement.scm
+#. src/report/standard-reports/gnucash/report/balance-sheet.scm
+#. src/report/standard-reports/gnucash/report/account-summary.scm
+#. src/report/standard-reports/gnucash/report/equity-statement.scm
 #. src/report/standard-reports/balance-sheet.scm
 #. src/report/standard-reports/account-summary.scm
 #. src/report/standard-reports/equity-statement.scm
-#: ../intl-scm/guile-strings.c:1314 ../intl-scm/guile-strings.c:1418
-#: ../intl-scm/guile-strings.c:1606 ../intl-scm/guile-strings.c:1828
-#: ../intl-scm/guile-strings.c:1928 ../intl-scm/guile-strings.c:2094
+#: ../intl-scm/guile-strings.c:2024 ../intl-scm/guile-strings.c:2128
+#: ../intl-scm/guile-strings.c:2316 ../intl-scm/guile-strings.c:2648
+#: ../intl-scm/guile-strings.c:2752 ../intl-scm/guile-strings.c:2940
+#: ../intl-scm/guile-strings.c:3162 ../intl-scm/guile-strings.c:3262
+#: ../intl-scm/guile-strings.c:3428 ../intl-scm/guile-strings.c:4312
+#: ../intl-scm/guile-strings.c:4412 ../intl-scm/guile-strings.c:4578
 msgid "Show the exchange rates used"
 msgstr "Aktuelle Wechselkurse anzeigen"
 
 #. src/report/standard-reports/cash-flow.scm
+#. src/report/standard-reports/gnucash/report/cash-flow.scm
+#. src/report/standard-reports/gnucash/report/budget.scm
 #. src/report/standard-reports/budget.scm
-#: ../intl-scm/guile-strings.c:1316 ../intl-scm/guile-strings.c:2682
+#: ../intl-scm/guile-strings.c:2026 ../intl-scm/guile-strings.c:2650
+#: ../intl-scm/guile-strings.c:4016 ../intl-scm/guile-strings.c:5166
 msgid "Show full account names (including parent accounts)"
 msgstr "Lange Kontenbezeichung (einschließlich Hauptkonten) anzeigen"
 
 #. src/report/standard-reports/cash-flow.scm
-#: ../intl-scm/guile-strings.c:1318
+#. src/report/standard-reports/gnucash/report/cash-flow.scm
+#: ../intl-scm/guile-strings.c:2028 ../intl-scm/guile-strings.c:2652
 #, c-format
 msgid "%s - %s to %s for"
 msgstr "%s - %s bis %s für"
 
 #. src/report/standard-reports/cash-flow.scm
-#: ../intl-scm/guile-strings.c:1320
+#. src/report/standard-reports/gnucash/report/cash-flow.scm
+#: ../intl-scm/guile-strings.c:2030 ../intl-scm/guile-strings.c:2654
 #, c-format
 msgid "%s and subaccounts"
 msgstr "%s und Unterkonten"
 
 #. src/report/standard-reports/cash-flow.scm
-#: ../intl-scm/guile-strings.c:1322
+#. src/report/standard-reports/gnucash/report/cash-flow.scm
+#: ../intl-scm/guile-strings.c:2032 ../intl-scm/guile-strings.c:2656
 #, c-format
 msgid "%s and selected subaccounts"
 msgstr "%s und ausgewählte Unterkonten"
 
 #. src/report/standard-reports/cash-flow.scm
-#: ../intl-scm/guile-strings.c:1326
+#. src/report/standard-reports/gnucash/report/cash-flow.scm
+#: ../intl-scm/guile-strings.c:2036 ../intl-scm/guile-strings.c:2660
 msgid "Money into selected accounts comes from"
 msgstr "Zahlung in gewählte Konten kommen aus"
 
 #. src/report/standard-reports/cash-flow.scm
+#. src/report/standard-reports/gnucash/report/cash-flow.scm
+#. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
 #. src/report/standard-reports/advanced-portfolio.scm
-#: ../intl-scm/guile-strings.c:1328 ../intl-scm/guile-strings.c:2044
+#: ../intl-scm/guile-strings.c:2038 ../intl-scm/guile-strings.c:2662
+#: ../intl-scm/guile-strings.c:3378 ../intl-scm/guile-strings.c:4528
 msgid "Money In"
 msgstr "Einzahlung"
 
 #. src/report/standard-reports/cash-flow.scm
-#: ../intl-scm/guile-strings.c:1330
+#. src/report/standard-reports/gnucash/report/cash-flow.scm
+#: ../intl-scm/guile-strings.c:2040 ../intl-scm/guile-strings.c:2664
 msgid "Money out of selected accounts goes to"
 msgstr "Zahlung von gewählten Konten gehen nach"
 
 #. src/report/standard-reports/cash-flow.scm
+#. src/report/standard-reports/gnucash/report/cash-flow.scm
+#. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
 #. src/report/standard-reports/advanced-portfolio.scm
-#: ../intl-scm/guile-strings.c:1332 ../intl-scm/guile-strings.c:2046
+#: ../intl-scm/guile-strings.c:2042 ../intl-scm/guile-strings.c:2666
+#: ../intl-scm/guile-strings.c:3380 ../intl-scm/guile-strings.c:4530
 msgid "Money Out"
 msgstr "Auszahlung"
 
 #. src/report/standard-reports/cash-flow.scm
-#: ../intl-scm/guile-strings.c:1334
+#. src/report/standard-reports/gnucash/report/cash-flow.scm
+#: ../intl-scm/guile-strings.c:2044 ../intl-scm/guile-strings.c:2668
 msgid "Difference"
 msgstr "Differenz"
 
 #. src/report/standard-reports/trial-balance.scm
-#: ../intl-scm/guile-strings.c:1336 ../intl-scm/guile-strings.c:1446
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#: ../intl-scm/guile-strings.c:2046 ../intl-scm/guile-strings.c:2156
+#: ../intl-scm/guile-strings.c:2670 ../intl-scm/guile-strings.c:2780
 msgid "Trial Balance"
 msgstr "Rohbilanz"
 
 #. src/report/standard-reports/trial-balance.scm
 #. src/report/standard-reports/income-statement.scm
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#. src/report/standard-reports/gnucash/report/income-statement.scm
+#. src/report/standard-reports/gnucash/report/balance-sheet.scm
+#. src/report/standard-reports/gnucash/report/account-summary.scm
+#. src/report/standard-reports/gnucash/report/equity-statement.scm
 #. src/report/standard-reports/balance-sheet.scm
 #. src/report/standard-reports/account-summary.scm
 #. src/report/standard-reports/equity-statement.scm
-#: ../intl-scm/guile-strings.c:1338 ../intl-scm/guile-strings.c:1534
-#: ../intl-scm/guile-strings.c:1746 ../intl-scm/guile-strings.c:1854
-#: ../intl-scm/guile-strings.c:2062
+#: ../intl-scm/guile-strings.c:2048 ../intl-scm/guile-strings.c:2244
+#: ../intl-scm/guile-strings.c:2672 ../intl-scm/guile-strings.c:2868
+#: ../intl-scm/guile-strings.c:3080 ../intl-scm/guile-strings.c:3188
+#: ../intl-scm/guile-strings.c:3396 ../intl-scm/guile-strings.c:4230
+#: ../intl-scm/guile-strings.c:4338 ../intl-scm/guile-strings.c:4546
 msgid "Report Title"
 msgstr "Berichtstitel"
 
 #. src/report/standard-reports/trial-balance.scm
 #. src/report/standard-reports/income-statement.scm
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#. src/report/standard-reports/gnucash/report/income-statement.scm
+#. src/report/standard-reports/gnucash/report/balance-sheet.scm
+#. src/report/standard-reports/gnucash/report/account-summary.scm
+#. src/report/standard-reports/gnucash/report/equity-statement.scm
 #. src/report/standard-reports/balance-sheet.scm
 #. src/report/standard-reports/account-summary.scm
 #. src/report/standard-reports/equity-statement.scm
-#: ../intl-scm/guile-strings.c:1340 ../intl-scm/guile-strings.c:1536
-#: ../intl-scm/guile-strings.c:1748 ../intl-scm/guile-strings.c:1856
-#: ../intl-scm/guile-strings.c:2064
+#: ../intl-scm/guile-strings.c:2050 ../intl-scm/guile-strings.c:2246
+#: ../intl-scm/guile-strings.c:2674 ../intl-scm/guile-strings.c:2870
+#: ../intl-scm/guile-strings.c:3082 ../intl-scm/guile-strings.c:3190
+#: ../intl-scm/guile-strings.c:3398 ../intl-scm/guile-strings.c:4232
+#: ../intl-scm/guile-strings.c:4340 ../intl-scm/guile-strings.c:4548
 msgid "Title for this report"
 msgstr "Titel des Berichts"
 
 #. src/report/standard-reports/trial-balance.scm
 #. src/report/standard-reports/income-statement.scm
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#. src/report/standard-reports/gnucash/report/income-statement.scm
+#. src/report/standard-reports/gnucash/report/balance-sheet.scm
+#. src/report/standard-reports/gnucash/report/account-summary.scm
+#. src/report/standard-reports/gnucash/report/equity-statement.scm
 #. src/report/standard-reports/balance-sheet.scm
 #. src/report/standard-reports/account-summary.scm
 #. src/report/standard-reports/equity-statement.scm
-#: ../intl-scm/guile-strings.c:1342 ../intl-scm/guile-strings.c:1538
-#: ../intl-scm/guile-strings.c:1750 ../intl-scm/guile-strings.c:1858
-#: ../intl-scm/guile-strings.c:2066
+#: ../intl-scm/guile-strings.c:2052 ../intl-scm/guile-strings.c:2248
+#: ../intl-scm/guile-strings.c:2676 ../intl-scm/guile-strings.c:2872
+#: ../intl-scm/guile-strings.c:3084 ../intl-scm/guile-strings.c:3192
+#: ../intl-scm/guile-strings.c:3400 ../intl-scm/guile-strings.c:4234
+#: ../intl-scm/guile-strings.c:4342 ../intl-scm/guile-strings.c:4550
 msgid "Company name"
 msgstr "Firmenname"
 
 #. src/report/standard-reports/trial-balance.scm
 #. src/report/standard-reports/income-statement.scm
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#. src/report/standard-reports/gnucash/report/income-statement.scm
+#. src/report/standard-reports/gnucash/report/balance-sheet.scm
+#. src/report/standard-reports/gnucash/report/account-summary.scm
+#. src/report/standard-reports/gnucash/report/equity-statement.scm
 #. src/report/standard-reports/balance-sheet.scm
 #. src/report/standard-reports/account-summary.scm
 #. src/report/standard-reports/equity-statement.scm
-#: ../intl-scm/guile-strings.c:1344 ../intl-scm/guile-strings.c:1540
-#: ../intl-scm/guile-strings.c:1752 ../intl-scm/guile-strings.c:1860
-#: ../intl-scm/guile-strings.c:2068
+#: ../intl-scm/guile-strings.c:2054 ../intl-scm/guile-strings.c:2250
+#: ../intl-scm/guile-strings.c:2678 ../intl-scm/guile-strings.c:2874
+#: ../intl-scm/guile-strings.c:3086 ../intl-scm/guile-strings.c:3194
+#: ../intl-scm/guile-strings.c:3402 ../intl-scm/guile-strings.c:4236
+#: ../intl-scm/guile-strings.c:4344 ../intl-scm/guile-strings.c:4552
 msgid "Name of company/individual"
 msgstr "Name der Organisation/Firma"
 
 #. src/report/standard-reports/trial-balance.scm
-#: ../intl-scm/guile-strings.c:1346
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#: ../intl-scm/guile-strings.c:2056 ../intl-scm/guile-strings.c:2680
 msgid "Start of Adjusting/Closing"
 msgstr "Anfangsdatum Anpassung/Abschluss"
 
 #. src/report/standard-reports/trial-balance.scm
-#: ../intl-scm/guile-strings.c:1348
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#: ../intl-scm/guile-strings.c:2058 ../intl-scm/guile-strings.c:2682
 msgid "Date of Report"
 msgstr "Berichtsdatum"
 
 #. src/report/standard-reports/trial-balance.scm
-#: ../intl-scm/guile-strings.c:1350
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#: ../intl-scm/guile-strings.c:2060 ../intl-scm/guile-strings.c:2684
 msgid "Report variation"
 msgstr "Berichtsart"
 
 #. src/report/standard-reports/trial-balance.scm
-#: ../intl-scm/guile-strings.c:1352
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#: ../intl-scm/guile-strings.c:2062 ../intl-scm/guile-strings.c:2686
 msgid "Kind of trial balance to generate"
 msgstr "Art der Rohbilanz, die berechnet werden soll"
 
 #. src/report/standard-reports/trial-balance.scm
 #. src/report/standard-reports/income-statement.scm
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#. src/report/standard-reports/gnucash/report/income-statement.scm
+#. src/report/standard-reports/gnucash/report/balance-sheet.scm
+#. src/report/standard-reports/gnucash/report/account-summary.scm
+#. src/report/standard-reports/gnucash/report/equity-statement.scm
 #. src/report/standard-reports/balance-sheet.scm
 #. src/report/standard-reports/account-summary.scm
 #. src/report/standard-reports/equity-statement.scm
-#: ../intl-scm/guile-strings.c:1354 ../intl-scm/guile-strings.c:1546
-#: ../intl-scm/guile-strings.c:1760 ../intl-scm/guile-strings.c:1864
-#: ../intl-scm/guile-strings.c:2074
+#: ../intl-scm/guile-strings.c:2064 ../intl-scm/guile-strings.c:2256
+#: ../intl-scm/guile-strings.c:2688 ../intl-scm/guile-strings.c:2880
+#: ../intl-scm/guile-strings.c:3094 ../intl-scm/guile-strings.c:3198
+#: ../intl-scm/guile-strings.c:3408 ../intl-scm/guile-strings.c:4244
+#: ../intl-scm/guile-strings.c:4348 ../intl-scm/guile-strings.c:4558
 msgid "Accounts to include"
 msgstr "Einbezogene Konten"
 
 #. src/report/standard-reports/trial-balance.scm
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:1356 ../intl-scm/guile-strings.c:2288
+#: ../intl-scm/guile-strings.c:2066 ../intl-scm/guile-strings.c:2690
+#: ../intl-scm/guile-strings.c:3622 ../intl-scm/guile-strings.c:4772
 msgid "Report on these accounts"
 msgstr "Den Buchungsbericht für diese Konten erstellen"
 
 #. src/report/standard-reports/trial-balance.scm
 #. src/report/standard-reports/income-statement.scm
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#. src/report/standard-reports/gnucash/report/income-statement.scm
+#. src/report/standard-reports/gnucash/report/balance-sheet.scm
+#. src/report/standard-reports/gnucash/report/account-summary.scm
 #. src/report/standard-reports/balance-sheet.scm
 #. src/report/standard-reports/account-summary.scm
-#: ../intl-scm/guile-strings.c:1358 ../intl-scm/guile-strings.c:1550
-#: ../intl-scm/guile-strings.c:1764 ../intl-scm/guile-strings.c:1868
+#: ../intl-scm/guile-strings.c:2068 ../intl-scm/guile-strings.c:2260
+#: ../intl-scm/guile-strings.c:2692 ../intl-scm/guile-strings.c:2884
+#: ../intl-scm/guile-strings.c:3098 ../intl-scm/guile-strings.c:3202
+#: ../intl-scm/guile-strings.c:4248 ../intl-scm/guile-strings.c:4352
 msgid "Levels of Subaccounts"
 msgstr "Verschachtelungstiefe Unterkonten"
 
 #. src/report/standard-reports/trial-balance.scm
 #. src/report/standard-reports/income-statement.scm
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#. src/report/standard-reports/gnucash/report/income-statement.scm
+#. src/report/standard-reports/gnucash/report/balance-sheet.scm
+#. src/report/standard-reports/gnucash/report/account-summary.scm
 #. src/report/standard-reports/balance-sheet.scm
 #. src/report/standard-reports/account-summary.scm
-#: ../intl-scm/guile-strings.c:1360 ../intl-scm/guile-strings.c:1552
-#: ../intl-scm/guile-strings.c:1766 ../intl-scm/guile-strings.c:1870
+#: ../intl-scm/guile-strings.c:2070 ../intl-scm/guile-strings.c:2262
+#: ../intl-scm/guile-strings.c:2694 ../intl-scm/guile-strings.c:2886
+#: ../intl-scm/guile-strings.c:3100 ../intl-scm/guile-strings.c:3204
+#: ../intl-scm/guile-strings.c:4250 ../intl-scm/guile-strings.c:4354
 msgid "Maximum number of levels in the account tree displayed"
 msgstr "Maximale Verschachtelungstiefe in der Kontenhierarchie"
 
 #. src/report/standard-reports/trial-balance.scm
-#: ../intl-scm/guile-strings.c:1362
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#: ../intl-scm/guile-strings.c:2072 ../intl-scm/guile-strings.c:2696
 msgid "Merchandising"
 msgstr "Handel"
 
 #. src/report/standard-reports/trial-balance.scm
-#: ../intl-scm/guile-strings.c:1364
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#: ../intl-scm/guile-strings.c:2074 ../intl-scm/guile-strings.c:2698
 msgid "Gross adjustment accounts"
 msgstr "Gesamte Anpassungskonten"
 
 #. src/report/standard-reports/trial-balance.scm
-#: ../intl-scm/guile-strings.c:1366
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#: ../intl-scm/guile-strings.c:2076 ../intl-scm/guile-strings.c:2700
 msgid ""
 "Do not net, but show gross debit/credit adjustments to these accounts. "
 "Merchandising businesses will normally select their inventory accounts here."
@@ -17283,12 +18425,14 @@
 "werden hier normalerweise ihre Sachanlagen-Konten wählen."
 
 #. src/report/standard-reports/trial-balance.scm
-#: ../intl-scm/guile-strings.c:1368
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#: ../intl-scm/guile-strings.c:2078 ../intl-scm/guile-strings.c:2702
 msgid "Income summary accounts"
 msgstr "Ãœbersicht Ertragskonten"
 
 #. src/report/standard-reports/trial-balance.scm
-#: ../intl-scm/guile-strings.c:1370
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#: ../intl-scm/guile-strings.c:2080 ../intl-scm/guile-strings.c:2704
 msgid ""
 "Adjustments made to these accounts are gross adjusted (see above) in the "
 "Adjustments, Adjusted Trial Balance, and Income Statement columns. Mostly "
@@ -17300,76 +18444,102 @@
 
 #. src/report/standard-reports/trial-balance.scm
 #. src/report/standard-reports/income-statement.scm
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#. src/report/standard-reports/gnucash/report/income-statement.scm
+#. src/report/standard-reports/gnucash/report/equity-statement.scm
 #. src/report/standard-reports/equity-statement.scm
-#: ../intl-scm/guile-strings.c:1372 ../intl-scm/guile-strings.c:1608
-#: ../intl-scm/guile-strings.c:2096
+#: ../intl-scm/guile-strings.c:2082 ../intl-scm/guile-strings.c:2318
+#: ../intl-scm/guile-strings.c:2706 ../intl-scm/guile-strings.c:2942
+#: ../intl-scm/guile-strings.c:3430 ../intl-scm/guile-strings.c:4580
 msgid "Entries"
 msgstr "Einträge"
 
 #. src/report/standard-reports/trial-balance.scm
-#: ../intl-scm/guile-strings.c:1374
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#: ../intl-scm/guile-strings.c:2084 ../intl-scm/guile-strings.c:2708
 msgid "Adjusting Entries pattern"
 msgstr "Muster für Anpassungseinträge"
 
 #. src/report/standard-reports/trial-balance.scm
-#: ../intl-scm/guile-strings.c:1376
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#: ../intl-scm/guile-strings.c:2086 ../intl-scm/guile-strings.c:2710
 msgid "Any text in the Description column which identifies adjusting entries"
 msgstr ""
 "Textmuster in der Buchungsbeschreibung, das Anpassungseinträge identifiziert"
 
 #. src/report/standard-reports/trial-balance.scm
-#: ../intl-scm/guile-strings.c:1378
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#: ../intl-scm/guile-strings.c:2088 ../intl-scm/guile-strings.c:2712
 msgid "Adjusting Entries pattern is case-sensitive"
 msgstr "Muster für Anpassungseinträge unterscheidet Groß-/Kleinschreibung"
 
 #. src/report/standard-reports/trial-balance.scm
-#: ../intl-scm/guile-strings.c:1380
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#: ../intl-scm/guile-strings.c:2090 ../intl-scm/guile-strings.c:2714
 msgid "Causes the Adjusting Entries Pattern match to be case-sensitive"
 msgstr ""
 "Lässt das Muster für Anpassungseinträge nach Groß-/Kleinschreibung "
 "unterscheiden"
 
 #. src/report/standard-reports/trial-balance.scm
-#: ../intl-scm/guile-strings.c:1382
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#: ../intl-scm/guile-strings.c:2092 ../intl-scm/guile-strings.c:2716
 msgid "Adjusting Entries Pattern is regular expression"
 msgstr "Muster für Anpassungseinträge ist ein regulärer Ausdruck"
 
 #. src/report/standard-reports/trial-balance.scm
-#: ../intl-scm/guile-strings.c:1384
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#: ../intl-scm/guile-strings.c:2094 ../intl-scm/guile-strings.c:2718
 msgid ""
 "Causes the Adjusting Entries Pattern to be treated as a regular expression"
 msgstr "Lässt das Muster für Anpassungseinträge ein regulärer Ausdruck sein"
 
 #. src/report/standard-reports/trial-balance.scm
 #. src/report/standard-reports/income-statement.scm
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#. src/report/standard-reports/gnucash/report/income-statement.scm
+#. src/report/standard-reports/gnucash/report/equity-statement.scm
 #. src/report/standard-reports/equity-statement.scm
-#: ../intl-scm/guile-strings.c:1386 ../intl-scm/guile-strings.c:1610
-#: ../intl-scm/guile-strings.c:2098
+#: ../intl-scm/guile-strings.c:2096 ../intl-scm/guile-strings.c:2320
+#: ../intl-scm/guile-strings.c:2720 ../intl-scm/guile-strings.c:2944
+#: ../intl-scm/guile-strings.c:3432 ../intl-scm/guile-strings.c:4582
 msgid "Closing Entries pattern"
 msgstr "Muster für Abschlussbuchungen"
 
 #. src/report/standard-reports/trial-balance.scm
 #. src/report/standard-reports/income-statement.scm
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#. src/report/standard-reports/gnucash/report/income-statement.scm
+#. src/report/standard-reports/gnucash/report/equity-statement.scm
 #. src/report/standard-reports/equity-statement.scm
-#: ../intl-scm/guile-strings.c:1388 ../intl-scm/guile-strings.c:1612
-#: ../intl-scm/guile-strings.c:2100
+#: ../intl-scm/guile-strings.c:2098 ../intl-scm/guile-strings.c:2322
+#: ../intl-scm/guile-strings.c:2722 ../intl-scm/guile-strings.c:2946
+#: ../intl-scm/guile-strings.c:3434 ../intl-scm/guile-strings.c:4584
 msgid "Any text in the Description column which identifies closing entries"
 msgstr ""
 "Textmuster in der Buchungsbeschreibung, das Abschlussbuchungen identifiziert"
 
 #. src/report/standard-reports/trial-balance.scm
 #. src/report/standard-reports/income-statement.scm
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#. src/report/standard-reports/gnucash/report/income-statement.scm
+#. src/report/standard-reports/gnucash/report/equity-statement.scm
 #. src/report/standard-reports/equity-statement.scm
-#: ../intl-scm/guile-strings.c:1390 ../intl-scm/guile-strings.c:1614
-#: ../intl-scm/guile-strings.c:2102
+#: ../intl-scm/guile-strings.c:2100 ../intl-scm/guile-strings.c:2324
+#: ../intl-scm/guile-strings.c:2724 ../intl-scm/guile-strings.c:2948
+#: ../intl-scm/guile-strings.c:3436 ../intl-scm/guile-strings.c:4586
 msgid "Closing Entries pattern is case-sensitive"
 msgstr "Muster für Abschlussbuchungen unterscheidet Groß-/Kleinschreibung"
 
 #. src/report/standard-reports/trial-balance.scm
 #. src/report/standard-reports/income-statement.scm
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#. src/report/standard-reports/gnucash/report/income-statement.scm
+#. src/report/standard-reports/gnucash/report/equity-statement.scm
 #. src/report/standard-reports/equity-statement.scm
-#: ../intl-scm/guile-strings.c:1392 ../intl-scm/guile-strings.c:1616
-#: ../intl-scm/guile-strings.c:2104
+#: ../intl-scm/guile-strings.c:2102 ../intl-scm/guile-strings.c:2326
+#: ../intl-scm/guile-strings.c:2726 ../intl-scm/guile-strings.c:2950
+#: ../intl-scm/guile-strings.c:3438 ../intl-scm/guile-strings.c:4588
 msgid "Causes the Closing Entries Pattern match to be case-sensitive"
 msgstr ""
 "Lässt das Muster für Abschlussbuchungen nach Groß-/Kleinschreibung "
@@ -17377,54 +18547,86 @@
 
 #. src/report/standard-reports/trial-balance.scm
 #. src/report/standard-reports/income-statement.scm
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#. src/report/standard-reports/gnucash/report/income-statement.scm
+#. src/report/standard-reports/gnucash/report/equity-statement.scm
 #. src/report/standard-reports/equity-statement.scm
-#: ../intl-scm/guile-strings.c:1394 ../intl-scm/guile-strings.c:1618
-#: ../intl-scm/guile-strings.c:2106
+#: ../intl-scm/guile-strings.c:2104 ../intl-scm/guile-strings.c:2328
+#: ../intl-scm/guile-strings.c:2728 ../intl-scm/guile-strings.c:2952
+#: ../intl-scm/guile-strings.c:3440 ../intl-scm/guile-strings.c:4590
 msgid "Closing Entries Pattern is regular expression"
 msgstr "Muster für Abschlussbuchungen ist ein regulärer Ausdruck"
 
 #. src/report/standard-reports/trial-balance.scm
 #. src/report/standard-reports/income-statement.scm
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#. src/report/standard-reports/gnucash/report/income-statement.scm
+#. src/report/standard-reports/gnucash/report/equity-statement.scm
 #. src/report/standard-reports/equity-statement.scm
-#: ../intl-scm/guile-strings.c:1396 ../intl-scm/guile-strings.c:1620
-#: ../intl-scm/guile-strings.c:2108
+#: ../intl-scm/guile-strings.c:2106 ../intl-scm/guile-strings.c:2330
+#: ../intl-scm/guile-strings.c:2730 ../intl-scm/guile-strings.c:2954
+#: ../intl-scm/guile-strings.c:3442 ../intl-scm/guile-strings.c:4592
 msgid ""
 "Causes the Closing Entries Pattern to be treated as a regular expression"
 msgstr "Lässt das Muster für Abschlussbuchungen ein regulärer Ausdruck sein"
 
 #. src/report/standard-reports/trial-balance.scm
 #. src/report/standard-reports/income-statement.scm
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#. src/report/standard-reports/gnucash/report/income-statement.scm
+#. src/report/standard-reports/gnucash/report/balance-sheet.scm
+#. src/report/standard-reports/gnucash/report/account-summary.scm
 #. src/report/standard-reports/balance-sheet.scm
 #. src/report/standard-reports/account-summary.scm
-#: ../intl-scm/guile-strings.c:1398 ../intl-scm/guile-strings.c:1562
-#: ../intl-scm/guile-strings.c:1776 ../intl-scm/guile-strings.c:1880
+#: ../intl-scm/guile-strings.c:2108 ../intl-scm/guile-strings.c:2272
+#: ../intl-scm/guile-strings.c:2732 ../intl-scm/guile-strings.c:2896
+#: ../intl-scm/guile-strings.c:3110 ../intl-scm/guile-strings.c:3214
+#: ../intl-scm/guile-strings.c:4260 ../intl-scm/guile-strings.c:4364
 msgid "Include accounts with zero total balances"
 msgstr "Unterkonten, die Kontostand Null haben, mit einbeziehen."
 
 #. src/report/standard-reports/trial-balance.scm
 #. src/report/standard-reports/income-statement.scm
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#. src/report/standard-reports/gnucash/report/income-statement.scm
+#. src/report/standard-reports/gnucash/report/balance-sheet.scm
+#. src/report/standard-reports/gnucash/report/account-summary.scm
 #. src/report/standard-reports/balance-sheet.scm
 #. src/report/standard-reports/account-summary.scm
-#: ../intl-scm/guile-strings.c:1400 ../intl-scm/guile-strings.c:1564
-#: ../intl-scm/guile-strings.c:1778 ../intl-scm/guile-strings.c:1882
+#: ../intl-scm/guile-strings.c:2110 ../intl-scm/guile-strings.c:2274
+#: ../intl-scm/guile-strings.c:2734 ../intl-scm/guile-strings.c:2898
+#: ../intl-scm/guile-strings.c:3112 ../intl-scm/guile-strings.c:3216
+#: ../intl-scm/guile-strings.c:4262 ../intl-scm/guile-strings.c:4366
 msgid "Include accounts with zero total (recursive) balances in this report"
 msgstr "Unterkonten, die Kontostand Null haben, mit einbeziehen."
 
 #. src/report/standard-reports/trial-balance.scm
 #. src/report/standard-reports/income-statement.scm
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#. src/report/standard-reports/gnucash/report/income-statement.scm
+#. src/report/standard-reports/gnucash/report/balance-sheet.scm
+#. src/report/standard-reports/gnucash/report/account-summary.scm
 #. src/report/standard-reports/balance-sheet.scm
 #. src/report/standard-reports/account-summary.scm
-#: ../intl-scm/guile-strings.c:1402 ../intl-scm/guile-strings.c:1574
-#: ../intl-scm/guile-strings.c:1788 ../intl-scm/guile-strings.c:1892
+#: ../intl-scm/guile-strings.c:2112 ../intl-scm/guile-strings.c:2284
+#: ../intl-scm/guile-strings.c:2736 ../intl-scm/guile-strings.c:2908
+#: ../intl-scm/guile-strings.c:3122 ../intl-scm/guile-strings.c:3226
+#: ../intl-scm/guile-strings.c:4272 ../intl-scm/guile-strings.c:4376
 msgid "Display accounts as hyperlinks"
 msgstr "Kontonamen anklickbar anzeigen"
 
 #. src/report/standard-reports/trial-balance.scm
 #. src/report/standard-reports/income-statement.scm
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#. src/report/standard-reports/gnucash/report/income-statement.scm
+#. src/report/standard-reports/gnucash/report/balance-sheet.scm
+#. src/report/standard-reports/gnucash/report/account-summary.scm
 #. src/report/standard-reports/balance-sheet.scm
 #. src/report/standard-reports/account-summary.scm
-#: ../intl-scm/guile-strings.c:1404 ../intl-scm/guile-strings.c:1576
-#: ../intl-scm/guile-strings.c:1790 ../intl-scm/guile-strings.c:1894
+#: ../intl-scm/guile-strings.c:2114 ../intl-scm/guile-strings.c:2286
+#: ../intl-scm/guile-strings.c:2738 ../intl-scm/guile-strings.c:2910
+#: ../intl-scm/guile-strings.c:3124 ../intl-scm/guile-strings.c:3228
+#: ../intl-scm/guile-strings.c:4274 ../intl-scm/guile-strings.c:4378
 msgid "Shows each account in the table as a hyperlink to its register window"
 msgstr ""
 "Konto als klickbaren Hyperlink anzeigen, der beim Anklicken das Kontofenster "
@@ -17432,754 +18634,1022 @@
 
 #. src/report/standard-reports/trial-balance.scm
 #. src/report/standard-reports/income-statement.scm
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#. src/report/standard-reports/gnucash/report/income-statement.scm
+#. src/report/standard-reports/gnucash/report/balance-sheet.scm
+#. src/report/standard-reports/gnucash/report/account-summary.scm
+#. src/report/standard-reports/gnucash/report/equity-statement.scm
 #. src/report/standard-reports/balance-sheet.scm
 #. src/report/standard-reports/account-summary.scm
 #. src/report/standard-reports/equity-statement.scm
-#: ../intl-scm/guile-strings.c:1406 ../intl-scm/guile-strings.c:1594
-#: ../intl-scm/guile-strings.c:1816 ../intl-scm/guile-strings.c:1916
-#: ../intl-scm/guile-strings.c:2082
+#: ../intl-scm/guile-strings.c:2116 ../intl-scm/guile-strings.c:2304
+#: ../intl-scm/guile-strings.c:2740 ../intl-scm/guile-strings.c:2928
+#: ../intl-scm/guile-strings.c:3150 ../intl-scm/guile-strings.c:3250
+#: ../intl-scm/guile-strings.c:3416 ../intl-scm/guile-strings.c:4300
+#: ../intl-scm/guile-strings.c:4400 ../intl-scm/guile-strings.c:4566
 msgid "Commodities"
 msgstr "Währungen/Aktien"
 
 #. src/report/standard-reports/trial-balance.scm
 #. src/report/standard-reports/income-statement.scm
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#. src/report/standard-reports/gnucash/report/income-statement.scm
+#. src/report/standard-reports/gnucash/report/balance-sheet.scm
+#. src/report/standard-reports/gnucash/report/account-summary.scm
+#. src/report/standard-reports/gnucash/report/equity-statement.scm
 #. src/report/standard-reports/balance-sheet.scm
 #. src/report/standard-reports/account-summary.scm
 #. src/report/standard-reports/equity-statement.scm
-#: ../intl-scm/guile-strings.c:1412 ../intl-scm/guile-strings.c:1600
-#: ../intl-scm/guile-strings.c:1822 ../intl-scm/guile-strings.c:1922
-#: ../intl-scm/guile-strings.c:2088
+#: ../intl-scm/guile-strings.c:2122 ../intl-scm/guile-strings.c:2310
+#: ../intl-scm/guile-strings.c:2746 ../intl-scm/guile-strings.c:2934
+#: ../intl-scm/guile-strings.c:3156 ../intl-scm/guile-strings.c:3256
+#: ../intl-scm/guile-strings.c:3422 ../intl-scm/guile-strings.c:4306
+#: ../intl-scm/guile-strings.c:4406 ../intl-scm/guile-strings.c:4572
 msgid "Show Foreign Currencies"
 msgstr "Fremdwährungen anzeigen"
 
 #. src/report/standard-reports/trial-balance.scm
 #. src/report/standard-reports/income-statement.scm
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#. src/report/standard-reports/gnucash/report/income-statement.scm
+#. src/report/standard-reports/gnucash/report/balance-sheet.scm
+#. src/report/standard-reports/gnucash/report/account-summary.scm
+#. src/report/standard-reports/gnucash/report/equity-statement.scm
 #. src/report/standard-reports/balance-sheet.scm
 #. src/report/standard-reports/account-summary.scm
 #. src/report/standard-reports/equity-statement.scm
-#: ../intl-scm/guile-strings.c:1414 ../intl-scm/guile-strings.c:1602
-#: ../intl-scm/guile-strings.c:1824 ../intl-scm/guile-strings.c:1924
-#: ../intl-scm/guile-strings.c:2090
+#: ../intl-scm/guile-strings.c:2124 ../intl-scm/guile-strings.c:2312
+#: ../intl-scm/guile-strings.c:2748 ../intl-scm/guile-strings.c:2936
+#: ../intl-scm/guile-strings.c:3158 ../intl-scm/guile-strings.c:3258
+#: ../intl-scm/guile-strings.c:3424 ../intl-scm/guile-strings.c:4308
+#: ../intl-scm/guile-strings.c:4408 ../intl-scm/guile-strings.c:4574
 msgid "Display any foreign currency amount in an account"
 msgstr "Fremdwährungen in Konten anzeigen"
 
 #. src/report/standard-reports/trial-balance.scm
-#: ../intl-scm/guile-strings.c:1424
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#: ../intl-scm/guile-strings.c:2134 ../intl-scm/guile-strings.c:2758
 msgid "Current Trial Balance"
 msgstr "Aktuelle Rohbilanz"
 
 #. src/report/standard-reports/trial-balance.scm
-#: ../intl-scm/guile-strings.c:1426
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#: ../intl-scm/guile-strings.c:2136 ../intl-scm/guile-strings.c:2760
 msgid "Uses the exact balances in the general ledger"
 msgstr "Exakte Salden aus Hauptbuch verwenden"
 
 #. src/report/standard-reports/trial-balance.scm
-#: ../intl-scm/guile-strings.c:1428
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#: ../intl-scm/guile-strings.c:2138 ../intl-scm/guile-strings.c:2762
 msgid "Pre-adjustment Trial Balance"
 msgstr "Angepasste Rohbilanz"
 
 #. src/report/standard-reports/trial-balance.scm
-#: ../intl-scm/guile-strings.c:1430
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#: ../intl-scm/guile-strings.c:2140 ../intl-scm/guile-strings.c:2764
 msgid "Ignores Adjusting/Closing entries"
 msgstr "Anpassungsbuchungen / Abschlussbuchungen ignorieren"
 
 #. src/report/standard-reports/trial-balance.scm
-#: ../intl-scm/guile-strings.c:1432
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#: ../intl-scm/guile-strings.c:2142 ../intl-scm/guile-strings.c:2766
 msgid "Work Sheet"
 msgstr "Arbeitsblatt"
 
 #. src/report/standard-reports/trial-balance.scm
-#: ../intl-scm/guile-strings.c:1434
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#: ../intl-scm/guile-strings.c:2144 ../intl-scm/guile-strings.c:2768
 msgid "Creates a complete end-of-period work sheet"
 msgstr "Vollständiges Periodenende-Arbeitsblatt"
 
 #. src/report/standard-reports/trial-balance.scm
 #. src/report/standard-reports/income-statement.scm
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#. src/report/standard-reports/gnucash/report/income-statement.scm
+#. src/report/standard-reports/gnucash/report/equity-statement.scm
 #. src/report/standard-reports/equity-statement.scm
-#: ../intl-scm/guile-strings.c:1440 ../intl-scm/guile-strings.c:1626
-#: ../intl-scm/guile-strings.c:2118
+#: ../intl-scm/guile-strings.c:2150 ../intl-scm/guile-strings.c:2336
+#: ../intl-scm/guile-strings.c:2774 ../intl-scm/guile-strings.c:2960
+#: ../intl-scm/guile-strings.c:3452 ../intl-scm/guile-strings.c:4602
 msgid "for Period"
 msgstr "für Buchungszeitraum"
 
 #. src/report/standard-reports/trial-balance.scm
 #. src/report/standard-reports/income-statement.scm
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#. src/report/standard-reports/gnucash/report/income-statement.scm
+#. src/report/standard-reports/gnucash/report/equity-statement.scm
 #. src/report/standard-reports/equity-statement.scm
-#: ../intl-scm/guile-strings.c:1444 ../intl-scm/guile-strings.c:1624
-#: ../intl-scm/guile-strings.c:2116
+#: ../intl-scm/guile-strings.c:2154 ../intl-scm/guile-strings.c:2334
+#: ../intl-scm/guile-strings.c:2778 ../intl-scm/guile-strings.c:2958
+#: ../intl-scm/guile-strings.c:3450 ../intl-scm/guile-strings.c:4600
 #, c-format
 msgid "For Period Covering %s to %s"
-msgstr "Für Periode %s bis %s"
+msgstr "für Periode %s bis %s"
 
 #. src/report/standard-reports/trial-balance.scm
-#: ../intl-scm/guile-strings.c:1448
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#: ../intl-scm/guile-strings.c:2158 ../intl-scm/guile-strings.c:2782
 msgid "Adjustments"
 msgstr "Anpassungsbuchungen"
 
 #. src/report/standard-reports/trial-balance.scm
-#: ../intl-scm/guile-strings.c:1450
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#: ../intl-scm/guile-strings.c:2160 ../intl-scm/guile-strings.c:2784
 msgid "Adjusted Trial Balance"
 msgstr "Angepasste Rohbilanz"
 
 #. src/report/standard-reports/trial-balance.scm
 #. src/report/standard-reports/income-statement.scm
-#: ../intl-scm/guile-strings.c:1452 ../intl-scm/guile-strings.c:1532
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#. src/report/standard-reports/gnucash/report/income-statement.scm
+#: ../intl-scm/guile-strings.c:2162 ../intl-scm/guile-strings.c:2242
+#: ../intl-scm/guile-strings.c:2786 ../intl-scm/guile-strings.c:2866
 msgid "Income Statement"
 msgstr "Einnahmeüberschussrechnung"
 
 #. src/report/standard-reports/trial-balance.scm
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#. src/report/standard-reports/gnucash/report/balance-sheet.scm
 #. src/report/standard-reports/balance-sheet.scm
-#: ../intl-scm/guile-strings.c:1454 ../intl-scm/guile-strings.c:1744
+#: ../intl-scm/guile-strings.c:2164 ../intl-scm/guile-strings.c:2788
+#: ../intl-scm/guile-strings.c:3078 ../intl-scm/guile-strings.c:4228
 msgid "Balance Sheet"
 msgstr "Bilanz"
 
 #. src/report/standard-reports/trial-balance.scm
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#. src/report/standard-reports/gnucash/report/balance-sheet.scm
+#. src/report/standard-reports/gnucash/report/equity-statement.scm
 #. src/report/standard-reports/balance-sheet.scm
 #. src/report/standard-reports/equity-statement.scm
-#: ../intl-scm/guile-strings.c:1462 ../intl-scm/guile-strings.c:1844
-#: ../intl-scm/guile-strings.c:2132
+#: ../intl-scm/guile-strings.c:2172 ../intl-scm/guile-strings.c:2796
+#: ../intl-scm/guile-strings.c:3178 ../intl-scm/guile-strings.c:3466
+#: ../intl-scm/guile-strings.c:4328 ../intl-scm/guile-strings.c:4616
 msgid "Unrealized Gains"
 msgstr "Noch nicht erzielter Gewinn/Verlust"
 
 #. src/report/standard-reports/trial-balance.scm
-#: ../intl-scm/guile-strings.c:1464
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#: ../intl-scm/guile-strings.c:2174 ../intl-scm/guile-strings.c:2798
 msgid "Net Income"
 msgstr "Netto Erträge"
 
 #. src/report/standard-reports/trial-balance.scm
-#: ../intl-scm/guile-strings.c:1466
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#: ../intl-scm/guile-strings.c:2176 ../intl-scm/guile-strings.c:2800
 msgid "Net Loss"
 msgstr "Netto Verlust"
 
 #. src/report/standard-reports/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:1470 ../intl-scm/guile-strings.c:2144
-#: ../intl-scm/guile-strings.c:2232 ../intl-scm/guile-strings.c:2236
+#: ../intl-scm/guile-strings.c:2180 ../intl-scm/guile-strings.c:2804
+#: ../intl-scm/guile-strings.c:3478 ../intl-scm/guile-strings.c:3566
+#: ../intl-scm/guile-strings.c:3570 ../intl-scm/guile-strings.c:4628
+#: ../intl-scm/guile-strings.c:4716 ../intl-scm/guile-strings.c:4720
 msgid "Sorting"
 msgstr "Sortieren"
 
 #. src/report/standard-reports/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:1472 ../intl-scm/guile-strings.c:2294
+#: ../intl-scm/guile-strings.c:2182 ../intl-scm/guile-strings.c:2806
+#: ../intl-scm/guile-strings.c:3628 ../intl-scm/guile-strings.c:4778
 msgid "Filter Type"
 msgstr "Filtertyp"
 
 #. src/report/standard-reports/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:1474 ../intl-scm/guile-strings.c:2158
+#: ../intl-scm/guile-strings.c:2184 ../intl-scm/guile-strings.c:2808
+#: ../intl-scm/guile-strings.c:3492 ../intl-scm/guile-strings.c:4642
 msgid "Void Transactions?"
 msgstr "Stornierte Buchungssätze?"
 
 #. src/report/standard-reports/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:1478 ../intl-scm/guile-strings.c:2178
-#: ../intl-scm/guile-strings.c:2242 ../intl-scm/guile-strings.c:2344
-#: ../intl-scm/guile-strings.c:2432
+#: ../intl-scm/guile-strings.c:2188 ../intl-scm/guile-strings.c:2812
+#: ../intl-scm/guile-strings.c:3512 ../intl-scm/guile-strings.c:3576
+#: ../intl-scm/guile-strings.c:3678 ../intl-scm/guile-strings.c:3766
+#: ../intl-scm/guile-strings.c:4662 ../intl-scm/guile-strings.c:4726
+#: ../intl-scm/guile-strings.c:4828 ../intl-scm/guile-strings.c:4916
 msgid "Reconciled Date"
 msgstr "Datum Abgeglichen"
 
 #. src/report/standard-reports/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:1488 ../intl-scm/guile-strings.c:2214
-#: ../intl-scm/guile-strings.c:2452
+#: ../intl-scm/guile-strings.c:2198 ../intl-scm/guile-strings.c:2822
+#: ../intl-scm/guile-strings.c:3548 ../intl-scm/guile-strings.c:3786
+#: ../intl-scm/guile-strings.c:4698 ../intl-scm/guile-strings.c:4936
 msgid "Use Full Account Name?"
 msgstr "Volle Kontobezeichnung benutzen?"
 
 #. src/report/standard-reports/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:1492 ../intl-scm/guile-strings.c:2194
-#: ../intl-scm/guile-strings.c:2352 ../intl-scm/guile-strings.c:2460
+#: ../intl-scm/guile-strings.c:2202 ../intl-scm/guile-strings.c:2826
+#: ../intl-scm/guile-strings.c:3528 ../intl-scm/guile-strings.c:3686
+#: ../intl-scm/guile-strings.c:3794 ../intl-scm/guile-strings.c:4678
+#: ../intl-scm/guile-strings.c:4836 ../intl-scm/guile-strings.c:4944
 msgid "Other Account Name"
 msgstr "Name des Gegenkontos"
 
 #. src/report/standard-reports/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:1494 ../intl-scm/guile-strings.c:2230
-#: ../intl-scm/guile-strings.c:2464
+#: ../intl-scm/guile-strings.c:2204 ../intl-scm/guile-strings.c:2828
+#: ../intl-scm/guile-strings.c:3564 ../intl-scm/guile-strings.c:3798
+#: ../intl-scm/guile-strings.c:4714 ../intl-scm/guile-strings.c:4948
 msgid "Use Full Other Account Name?"
 msgstr "Volle Kontobezeichnung des Gegenkontos benutzen?"
 
 #. src/report/standard-reports/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:1496 ../intl-scm/guile-strings.c:2226
-#: ../intl-scm/guile-strings.c:2356 ../intl-scm/guile-strings.c:2468
+#: ../intl-scm/guile-strings.c:2206 ../intl-scm/guile-strings.c:2830
+#: ../intl-scm/guile-strings.c:3560 ../intl-scm/guile-strings.c:3690
+#: ../intl-scm/guile-strings.c:3802 ../intl-scm/guile-strings.c:4710
+#: ../intl-scm/guile-strings.c:4840 ../intl-scm/guile-strings.c:4952
 msgid "Other Account Code"
 msgstr "Nummer des Gegenkontos"
 
 #. src/report/standard-reports/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:1508 ../intl-scm/guile-strings.c:2504
-#: ../intl-scm/guile-strings.c:2544
+#: ../intl-scm/guile-strings.c:2218 ../intl-scm/guile-strings.c:2842
+#: ../intl-scm/guile-strings.c:3838 ../intl-scm/guile-strings.c:3878
+#: ../intl-scm/guile-strings.c:4988 ../intl-scm/guile-strings.c:5028
 msgid "Sign Reverses?"
 msgstr "Vorzeichenumkehr?"
 
 #. src/report/standard-reports/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:1510 ../intl-scm/guile-strings.c:2270
-#: ../intl-scm/guile-strings.c:2546
+#: ../intl-scm/guile-strings.c:2220 ../intl-scm/guile-strings.c:2844
+#: ../intl-scm/guile-strings.c:3604 ../intl-scm/guile-strings.c:3880
+#: ../intl-scm/guile-strings.c:4754 ../intl-scm/guile-strings.c:5030
 msgid "Style"
 msgstr "Buchung"
 
 #. src/report/standard-reports/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:1512 ../intl-scm/guile-strings.c:2146
+#: ../intl-scm/guile-strings.c:2222 ../intl-scm/guile-strings.c:2846
+#: ../intl-scm/guile-strings.c:3480 ../intl-scm/guile-strings.c:4630
 msgid "Primary Key"
 msgstr "Primärschlüssel"
 
 #. src/report/standard-reports/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:1514 ../intl-scm/guile-strings.c:2238
-#: ../intl-scm/guile-strings.c:2402
+#: ../intl-scm/guile-strings.c:2224 ../intl-scm/guile-strings.c:2848
+#: ../intl-scm/guile-strings.c:3572 ../intl-scm/guile-strings.c:3736
+#: ../intl-scm/guile-strings.c:4722 ../intl-scm/guile-strings.c:4886
 msgid "Show Full Account Name?"
 msgstr "Lange Kontobezeichnung anzeigen?"
 
 #. src/report/standard-reports/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:1516 ../intl-scm/guile-strings.c:2234
-#: ../intl-scm/guile-strings.c:2406
+#: ../intl-scm/guile-strings.c:2226 ../intl-scm/guile-strings.c:2850
+#: ../intl-scm/guile-strings.c:3568 ../intl-scm/guile-strings.c:3740
+#: ../intl-scm/guile-strings.c:4718 ../intl-scm/guile-strings.c:4890
 msgid "Show Account Code?"
 msgstr "Kontonummer anzeigen?"
 
 #. src/report/standard-reports/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:1518 ../intl-scm/guile-strings.c:2148
+#: ../intl-scm/guile-strings.c:2228 ../intl-scm/guile-strings.c:2852
+#: ../intl-scm/guile-strings.c:3482 ../intl-scm/guile-strings.c:4632
 msgid "Primary Subtotal"
 msgstr "Primärschlüssel mit Zwischensumme"
 
 #. src/report/standard-reports/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:1520 ../intl-scm/guile-strings.c:2150
+#: ../intl-scm/guile-strings.c:2230 ../intl-scm/guile-strings.c:2854
+#: ../intl-scm/guile-strings.c:3484 ../intl-scm/guile-strings.c:4634
 msgid "Primary Subtotal for Date Key"
 msgstr "Primäre Zwischensumme für Datumsschlüssel"
 
 #. src/report/standard-reports/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:1522 ../intl-scm/guile-strings.c:2414
+#: ../intl-scm/guile-strings.c:2232 ../intl-scm/guile-strings.c:2856
+#: ../intl-scm/guile-strings.c:3748 ../intl-scm/guile-strings.c:4898
 msgid "Primary Sort Order"
 msgstr "Hauptsortier-Reihenfolge"
 
 #. src/report/standard-reports/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:1524 ../intl-scm/guile-strings.c:2152
+#: ../intl-scm/guile-strings.c:2234 ../intl-scm/guile-strings.c:2858
+#: ../intl-scm/guile-strings.c:3486 ../intl-scm/guile-strings.c:4636
 msgid "Secondary Key"
 msgstr "Sekundärschlüssel"
 
 #. src/report/standard-reports/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:1526 ../intl-scm/guile-strings.c:2154
+#: ../intl-scm/guile-strings.c:2236 ../intl-scm/guile-strings.c:2860
+#: ../intl-scm/guile-strings.c:3488 ../intl-scm/guile-strings.c:4638
 msgid "Secondary Subtotal"
 msgstr "Sekundärschlüssel mit Zwischensumme"
 
 #. src/report/standard-reports/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:1528 ../intl-scm/guile-strings.c:2156
+#: ../intl-scm/guile-strings.c:2238 ../intl-scm/guile-strings.c:2862
+#: ../intl-scm/guile-strings.c:3490 ../intl-scm/guile-strings.c:4640
 msgid "Secondary Subtotal for Date Key"
 msgstr "Sekundäre Zwischensumme für Datumsschlüssel"
 
 #. src/report/standard-reports/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/transaction.scm
 #. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:1530 ../intl-scm/guile-strings.c:2424
+#: ../intl-scm/guile-strings.c:2240 ../intl-scm/guile-strings.c:2864
+#: ../intl-scm/guile-strings.c:3758 ../intl-scm/guile-strings.c:4908
 msgid "Secondary Sort Order"
 msgstr "Sekundäre Sortierreihenfolge"
 
 #. src/report/standard-reports/income-statement.scm
+#. src/report/standard-reports/gnucash/report/income-statement.scm
+#. src/report/standard-reports/gnucash/report/equity-statement.scm
 #. src/report/standard-reports/equity-statement.scm
-#: ../intl-scm/guile-strings.c:1542 ../intl-scm/guile-strings.c:2070
+#: ../intl-scm/guile-strings.c:2252 ../intl-scm/guile-strings.c:2876
+#: ../intl-scm/guile-strings.c:3404 ../intl-scm/guile-strings.c:4554
 msgid "Start Date"
 msgstr "Anfangsdatum"
 
 #. src/report/standard-reports/income-statement.scm
+#. src/report/standard-reports/gnucash/report/income-statement.scm
+#. src/report/standard-reports/gnucash/report/equity-statement.scm
 #. src/report/standard-reports/equity-statement.scm
-#: ../intl-scm/guile-strings.c:1544 ../intl-scm/guile-strings.c:2072
+#: ../intl-scm/guile-strings.c:2254 ../intl-scm/guile-strings.c:2878
+#: ../intl-scm/guile-strings.c:3406 ../intl-scm/guile-strings.c:4556
 msgid "End Date"
 msgstr "Enddatum"
 
 #. src/report/standard-reports/income-statement.scm
+#. src/report/standard-reports/gnucash/report/income-statement.scm
+#. src/report/standard-reports/gnucash/report/balance-sheet.scm
 #. src/report/standard-reports/balance-sheet.scm
-#: ../intl-scm/guile-strings.c:1554 ../intl-scm/guile-strings.c:1768
+#: ../intl-scm/guile-strings.c:2264 ../intl-scm/guile-strings.c:2888
+#: ../intl-scm/guile-strings.c:3102 ../intl-scm/guile-strings.c:4252
 msgid "Flatten list to depth limit"
 msgstr "Baumstruktur ab Tiefenlimit flach darstellen"
 
 #. src/report/standard-reports/income-statement.scm
+#. src/report/standard-reports/gnucash/report/income-statement.scm
+#. src/report/standard-reports/gnucash/report/balance-sheet.scm
 #. src/report/standard-reports/balance-sheet.scm
-#: ../intl-scm/guile-strings.c:1556 ../intl-scm/guile-strings.c:1770
+#: ../intl-scm/guile-strings.c:2266 ../intl-scm/guile-strings.c:2890
+#: ../intl-scm/guile-strings.c:3104 ../intl-scm/guile-strings.c:4254
 msgid "Displays accounts which exceed the depth limit at the depth limit"
 msgstr ""
 "Konten, die tiefer als das gegebene Tiefenlimit in der Baumstruktur stehen, "
 "am Tiefenlimit darstellen"
 
 #. src/report/standard-reports/income-statement.scm
+#. src/report/standard-reports/gnucash/report/income-statement.scm
+#. src/report/standard-reports/gnucash/report/balance-sheet.scm
+#. src/report/standard-reports/gnucash/report/account-summary.scm
 #. src/report/standard-reports/balance-sheet.scm
 #. src/report/standard-reports/account-summary.scm
-#: ../intl-scm/guile-strings.c:1558 ../intl-scm/guile-strings.c:1772
-#: ../intl-scm/guile-strings.c:1876
+#: ../intl-scm/guile-strings.c:2268 ../intl-scm/guile-strings.c:2892
+#: ../intl-scm/guile-strings.c:3106 ../intl-scm/guile-strings.c:3210
+#: ../intl-scm/guile-strings.c:4256 ../intl-scm/guile-strings.c:4360
 msgid "Parent account balances"
 msgstr "Salden Hauptkonto"
 
 #. src/report/standard-reports/income-statement.scm
+#. src/report/standard-reports/gnucash/report/income-statement.scm
+#. src/report/standard-reports/gnucash/report/balance-sheet.scm
+#. src/report/standard-reports/gnucash/report/account-summary.scm
 #. src/report/standard-reports/balance-sheet.scm
 #. src/report/standard-reports/account-summary.scm
-#: ../intl-scm/guile-strings.c:1560 ../intl-scm/guile-strings.c:1774
-#: ../intl-scm/guile-strings.c:1878
+#: ../intl-scm/guile-strings.c:2270 ../intl-scm/guile-strings.c:2894
+#: ../intl-scm/guile-strings.c:3108 ../intl-scm/guile-strings.c:3212
+#: ../intl-scm/guile-strings.c:4258 ../intl-scm/guile-strings.c:4362
 msgid "Parent account subtotals"
 msgstr "Zwischensummen für Hauptkonten"
 
 #. src/report/standard-reports/income-statement.scm
+#. src/report/standard-reports/gnucash/report/income-statement.scm
+#. src/report/standard-reports/gnucash/report/balance-sheet.scm
+#. src/report/standard-reports/gnucash/report/account-summary.scm
 #. src/report/standard-reports/balance-sheet.scm
 #. src/report/standard-reports/account-summary.scm
-#: ../intl-scm/guile-strings.c:1566 ../intl-scm/guile-strings.c:1780
-#: ../intl-scm/guile-strings.c:1884
+#: ../intl-scm/guile-strings.c:2276 ../intl-scm/guile-strings.c:2900
+#: ../intl-scm/guile-strings.c:3114 ../intl-scm/guile-strings.c:3218
+#: ../intl-scm/guile-strings.c:4264 ../intl-scm/guile-strings.c:4368
 msgid "Omit zero balance figures"
 msgstr "Salden ignorieren, die Null betragen"
 
 #. src/report/standard-reports/income-statement.scm
+#. src/report/standard-reports/gnucash/report/income-statement.scm
+#. src/report/standard-reports/gnucash/report/balance-sheet.scm
+#. src/report/standard-reports/gnucash/report/account-summary.scm
 #. src/report/standard-reports/balance-sheet.scm
 #. src/report/standard-reports/account-summary.scm
-#: ../intl-scm/guile-strings.c:1568 ../intl-scm/guile-strings.c:1782
-#: ../intl-scm/guile-strings.c:1886
+#: ../intl-scm/guile-strings.c:2278 ../intl-scm/guile-strings.c:2902
+#: ../intl-scm/guile-strings.c:3116 ../intl-scm/guile-strings.c:3220
+#: ../intl-scm/guile-strings.c:4266 ../intl-scm/guile-strings.c:4370
 msgid "Show blank space in place of any zero balances which would be shown"
 msgstr "Leerstellen anstatt Nullen bei Null-Salden anzeigen"
 
 #. src/report/standard-reports/income-statement.scm
+#. src/report/standard-reports/gnucash/report/income-statement.scm
+#. src/report/standard-reports/gnucash/report/balance-sheet.scm
+#. src/report/standard-reports/gnucash/report/account-summary.scm
+#. src/report/standard-reports/gnucash/report/equity-statement.scm
 #. src/report/standard-reports/balance-sheet.scm
 #. src/report/standard-reports/account-summary.scm
 #. src/report/standard-reports/equity-statement.scm
-#: ../intl-scm/guile-strings.c:1570 ../intl-scm/guile-strings.c:1784
-#: ../intl-scm/guile-strings.c:1888 ../intl-scm/guile-strings.c:2078
+#: ../intl-scm/guile-strings.c:2280 ../intl-scm/guile-strings.c:2904
+#: ../intl-scm/guile-strings.c:3118 ../intl-scm/guile-strings.c:3222
+#: ../intl-scm/guile-strings.c:3412 ../intl-scm/guile-strings.c:4268
+#: ../intl-scm/guile-strings.c:4372 ../intl-scm/guile-strings.c:4562
 msgid "Show accounting-style rules"
 msgstr "Linien aus Rechnungswesen anzeigen"
 
 #. src/report/standard-reports/income-statement.scm
+#. src/report/standard-reports/gnucash/report/income-statement.scm
+#. src/report/standard-reports/gnucash/report/balance-sheet.scm
+#. src/report/standard-reports/gnucash/report/account-summary.scm
+#. src/report/standard-reports/gnucash/report/equity-statement.scm
 #. src/report/standard-reports/balance-sheet.scm
 #. src/report/standard-reports/account-summary.scm
 #. src/report/standard-reports/equity-statement.scm
-#: ../intl-scm/guile-strings.c:1572 ../intl-scm/guile-strings.c:1786
-#: ../intl-scm/guile-strings.c:1890 ../intl-scm/guile-strings.c:2080
+#: ../intl-scm/guile-strings.c:2282 ../intl-scm/guile-strings.c:2906
+#: ../intl-scm/guile-strings.c:3120 ../intl-scm/guile-strings.c:3224
+#: ../intl-scm/guile-strings.c:3414 ../intl-scm/guile-strings.c:4270
+#: ../intl-scm/guile-strings.c:4374 ../intl-scm/guile-strings.c:4564
 msgid "Use rules beneath columns of added numbers like accountants do"
 msgstr "Linien neben Spalten mit Salden anzeigen, wie im Rechnungswesen üblich"
 
 #. src/report/standard-reports/income-statement.scm
-#: ../intl-scm/guile-strings.c:1578
+#. src/report/standard-reports/gnucash/report/income-statement.scm
+#: ../intl-scm/guile-strings.c:2288 ../intl-scm/guile-strings.c:2912
 msgid "Label the revenue section"
 msgstr "Abschnitt Erträge beschriften"
 
 #. src/report/standard-reports/income-statement.scm
-#: ../intl-scm/guile-strings.c:1580
+#. src/report/standard-reports/gnucash/report/income-statement.scm
+#: ../intl-scm/guile-strings.c:2290 ../intl-scm/guile-strings.c:2914
 msgid "Whether or not to include a label for the revenue section"
 msgstr "Beschriftung für Abschnitt mit Ertragskonten anzeigen"
 
 #. src/report/standard-reports/income-statement.scm
-#: ../intl-scm/guile-strings.c:1582
+#. src/report/standard-reports/gnucash/report/income-statement.scm
+#: ../intl-scm/guile-strings.c:2292 ../intl-scm/guile-strings.c:2916
 msgid "Include revenue total"
 msgstr "Summe Erträge anzeigen"
 
 #. src/report/standard-reports/income-statement.scm
-#: ../intl-scm/guile-strings.c:1584
+#. src/report/standard-reports/gnucash/report/income-statement.scm
+#: ../intl-scm/guile-strings.c:2294 ../intl-scm/guile-strings.c:2918
 msgid "Whether or not to include a line indicating total revenue"
 msgstr "Eine Zeile für die Summe Erträge anzeigen"
 
 #. src/report/standard-reports/income-statement.scm
-#: ../intl-scm/guile-strings.c:1586
+#. src/report/standard-reports/gnucash/report/income-statement.scm
+#: ../intl-scm/guile-strings.c:2296 ../intl-scm/guile-strings.c:2920
 msgid "Label the expense section"
 msgstr "Aufwendungsabschnitt beschriften"
 
 #. src/report/standard-reports/income-statement.scm
-#: ../intl-scm/guile-strings.c:1588
+#. src/report/standard-reports/gnucash/report/income-statement.scm
+#: ../intl-scm/guile-strings.c:2298 ../intl-scm/guile-strings.c:2922
 msgid "Whether or not to include a label for the expense section"
 msgstr ""
 "Ob eine Beschriftung für den Abschnitt mit Aufwandskonten angezeigt wird"
 
 #. src/report/standard-reports/income-statement.scm
-#: ../intl-scm/guile-strings.c:1590
+#. src/report/standard-reports/gnucash/report/income-statement.scm
+#: ../intl-scm/guile-strings.c:2300 ../intl-scm/guile-strings.c:2924
 msgid "Include expense total"
 msgstr "Summe Aufwendungen anzeigen"
 
 #. src/report/standard-reports/income-statement.scm
-#: ../intl-scm/guile-strings.c:1592
+#. src/report/standard-reports/gnucash/report/income-statement.scm
+#: ../intl-scm/guile-strings.c:2302 ../intl-scm/guile-strings.c:2926
 msgid "Whether or not to include a line indicating total expense"
 msgstr "Eine Zeile für die Summe Aufwendungen anzeigen"
 
 #. src/report/standard-reports/income-statement.scm
-#: ../intl-scm/guile-strings.c:1630
+#. src/report/standard-reports/gnucash/report/income-statement.scm
+#: ../intl-scm/guile-strings.c:2340 ../intl-scm/guile-strings.c:2964
 msgid "Revenues"
 msgstr "Gewinn"
 
 #. src/report/standard-reports/income-statement.scm
-#: ../intl-scm/guile-strings.c:1632
+#. src/report/standard-reports/gnucash/report/income-statement.scm
+#: ../intl-scm/guile-strings.c:2342 ../intl-scm/guile-strings.c:2966
 msgid "Total Revenue"
 msgstr "Gesamtgewinn"
 
 #. src/report/standard-reports/income-statement.scm
-#: ../intl-scm/guile-strings.c:1636
+#. src/report/standard-reports/gnucash/report/income-statement.scm
+#: ../intl-scm/guile-strings.c:2346 ../intl-scm/guile-strings.c:2970
 msgid "Total Expenses"
 msgstr "Gesamt Aufwendungen"
 
 #. src/report/standard-reports/income-statement.scm
+#. src/report/standard-reports/gnucash/report/income-statement.scm
+#. src/report/standard-reports/gnucash/report/equity-statement.scm
 #. src/report/standard-reports/equity-statement.scm
-#: ../intl-scm/guile-strings.c:1638 ../intl-scm/guile-strings.c:2124
+#: ../intl-scm/guile-strings.c:2348 ../intl-scm/guile-strings.c:2972
+#: ../intl-scm/guile-strings.c:3458 ../intl-scm/guile-strings.c:4608
 msgid "Net income"
 msgstr "Netto Ertrag"
 
 #. src/report/standard-reports/income-statement.scm
+#. src/report/standard-reports/gnucash/report/income-statement.scm
+#. src/report/standard-reports/gnucash/report/equity-statement.scm
 #. src/report/standard-reports/equity-statement.scm
-#: ../intl-scm/guile-strings.c:1640 ../intl-scm/guile-strings.c:2126
+#: ../intl-scm/guile-strings.c:2350 ../intl-scm/guile-strings.c:2974
+#: ../intl-scm/guile-strings.c:3460 ../intl-scm/guile-strings.c:4610
 msgid "Net loss"
 msgstr "Netto Verlust"
 
 #. src/report/standard-reports/category-barchart.scm
-#: ../intl-scm/guile-strings.c:1642
+#. src/report/standard-reports/gnucash/report/category-barchart.scm
+#: ../intl-scm/guile-strings.c:2352 ../intl-scm/guile-strings.c:2976
 msgid "Income Barchart"
 msgstr "Erträge Balkendiagramm"
 
 #. src/report/standard-reports/category-barchart.scm
-#: ../intl-scm/guile-strings.c:1644
+#. src/report/standard-reports/gnucash/report/category-barchart.scm
+#: ../intl-scm/guile-strings.c:2354 ../intl-scm/guile-strings.c:2978
 msgid "Expense Barchart"
 msgstr "Aufwendungen Balkendiagramm"
 
 #. src/report/standard-reports/category-barchart.scm
-#: ../intl-scm/guile-strings.c:1646
+#. src/report/standard-reports/gnucash/report/category-barchart.scm
+#: ../intl-scm/guile-strings.c:2356 ../intl-scm/guile-strings.c:2980
 msgid "Asset Barchart"
 msgstr "Aktiva Balkendiagramm"
 
 #. src/report/standard-reports/category-barchart.scm
-#: ../intl-scm/guile-strings.c:1648
+#. src/report/standard-reports/gnucash/report/category-barchart.scm
+#: ../intl-scm/guile-strings.c:2358 ../intl-scm/guile-strings.c:2982
 msgid "Liability Barchart"
 msgstr "Passiva Balkendiagramm"
 
 #. src/report/standard-reports/category-barchart.scm
-#: ../intl-scm/guile-strings.c:1650
+#. src/report/standard-reports/gnucash/report/category-barchart.scm
+#: ../intl-scm/guile-strings.c:2360 ../intl-scm/guile-strings.c:2984
 msgid "Shows a barchart with the Income per interval developing over time"
 msgstr "Balkendiagramm der Erträge pro Zeit anzeigen"
 
 #. src/report/standard-reports/category-barchart.scm
-#: ../intl-scm/guile-strings.c:1652
+#. src/report/standard-reports/gnucash/report/category-barchart.scm
+#: ../intl-scm/guile-strings.c:2362 ../intl-scm/guile-strings.c:2986
 msgid "Shows a barchart with the Expenses per interval developing over time"
 msgstr "Balkendiagramm der Aufwendungen pro Zeit anzeigen"
 
 #. src/report/standard-reports/category-barchart.scm
-#: ../intl-scm/guile-strings.c:1654
+#. src/report/standard-reports/gnucash/report/category-barchart.scm
+#: ../intl-scm/guile-strings.c:2364 ../intl-scm/guile-strings.c:2988
 msgid "Shows a barchart with the Assets developing over time"
 msgstr "Balkendiagramm der Aktiva pro Zeit anzeigen"
 
 #. src/report/standard-reports/category-barchart.scm
-#: ../intl-scm/guile-strings.c:1656
+#. src/report/standard-reports/gnucash/report/category-barchart.scm
+#: ../intl-scm/guile-strings.c:2366 ../intl-scm/guile-strings.c:2990
 msgid "Shows a barchart with the Liabilities developing over time"
 msgstr "Balkendiagramm der Passiva pro Zeit anzeigen"
 
 #. src/report/standard-reports/category-barchart.scm
-#: ../intl-scm/guile-strings.c:1658
+#. src/report/standard-reports/gnucash/report/category-barchart.scm
+#: ../intl-scm/guile-strings.c:2368 ../intl-scm/guile-strings.c:2992
 msgid "Income Over Time"
 msgstr "Ertragsentwicklung"
 
 #. src/report/standard-reports/category-barchart.scm
-#: ../intl-scm/guile-strings.c:1660
+#. src/report/standard-reports/gnucash/report/category-barchart.scm
+#: ../intl-scm/guile-strings.c:2370 ../intl-scm/guile-strings.c:2994
 msgid "Expense Over Time"
 msgstr "Aufwendungen pro Zeit"
 
 #. src/report/standard-reports/category-barchart.scm
-#: ../intl-scm/guile-strings.c:1662
+#. src/report/standard-reports/gnucash/report/category-barchart.scm
+#: ../intl-scm/guile-strings.c:2372 ../intl-scm/guile-strings.c:2996
 msgid "Assets Over Time"
 msgstr "Aktiva Entwicklung"
 
 #. src/report/standard-reports/category-barchart.scm
-#: ../intl-scm/guile-strings.c:1664
+#. src/report/standard-reports/gnucash/report/category-barchart.scm
+#: ../intl-scm/guile-strings.c:2374 ../intl-scm/guile-strings.c:2998
 msgid "Liabilities Over Time"
 msgstr "Passiva Entwicklung"
 
 #. src/report/standard-reports/category-barchart.scm
+#. src/report/standard-reports/gnucash/report/category-barchart.scm
+#. src/report/standard-reports/gnucash/report/daily-reports.scm
+#. src/report/standard-reports/gnucash/report/account-piecharts.scm
 #. src/report/standard-reports/daily-reports.scm
 #. src/report/standard-reports/account-piecharts.scm
-#: ../intl-scm/guile-strings.c:1678 ../intl-scm/guile-strings.c:2784
-#: ../intl-scm/guile-strings.c:2858
+#: ../intl-scm/guile-strings.c:2388 ../intl-scm/guile-strings.c:3012
+#: ../intl-scm/guile-strings.c:4122 ../intl-scm/guile-strings.c:4196
+#: ../intl-scm/guile-strings.c:5272 ../intl-scm/guile-strings.c:5346
 msgid "Show Accounts until level"
 msgstr "Verschachtelungstiefe der angezeigten Konten"
 
 #. src/report/standard-reports/category-barchart.scm
+#. src/report/standard-reports/gnucash/report/category-barchart.scm
+#. src/report/standard-reports/gnucash/report/daily-reports.scm
+#. src/report/standard-reports/gnucash/report/account-piecharts.scm
 #. src/report/standard-reports/daily-reports.scm
 #. src/report/standard-reports/account-piecharts.scm
-#: ../intl-scm/guile-strings.c:1680 ../intl-scm/guile-strings.c:2788
-#: ../intl-scm/guile-strings.c:2860
+#: ../intl-scm/guile-strings.c:2390 ../intl-scm/guile-strings.c:3014
+#: ../intl-scm/guile-strings.c:4126 ../intl-scm/guile-strings.c:4198
+#: ../intl-scm/guile-strings.c:5276 ../intl-scm/guile-strings.c:5348
 msgid "Show long account names"
 msgstr "Lange Kontennamen anzeigen"
 
 #. src/report/standard-reports/category-barchart.scm
-#: ../intl-scm/guile-strings.c:1682
+#. src/report/standard-reports/gnucash/report/category-barchart.scm
+#: ../intl-scm/guile-strings.c:2392 ../intl-scm/guile-strings.c:3016
 msgid "Use Stacked Bars"
 msgstr "Gestapelte Balken"
 
 #. src/report/standard-reports/category-barchart.scm
-#: ../intl-scm/guile-strings.c:1684
+#. src/report/standard-reports/gnucash/report/category-barchart.scm
+#: ../intl-scm/guile-strings.c:2394 ../intl-scm/guile-strings.c:3018
 msgid "Maximum Bars"
 msgstr "Maximale Anzahl Segmente"
 
 #. src/report/standard-reports/category-barchart.scm
+#. src/report/standard-reports/gnucash/report/category-barchart.scm
+#. src/report/standard-reports/gnucash/report/daily-reports.scm
+#. src/report/standard-reports/gnucash/report/account-piecharts.scm
 #. src/report/standard-reports/daily-reports.scm
 #. src/report/standard-reports/account-piecharts.scm
-#: ../intl-scm/guile-strings.c:1690 ../intl-scm/guile-strings.c:2798
-#: ../intl-scm/guile-strings.c:2870
+#: ../intl-scm/guile-strings.c:2400 ../intl-scm/guile-strings.c:3024
+#: ../intl-scm/guile-strings.c:4136 ../intl-scm/guile-strings.c:4208
+#: ../intl-scm/guile-strings.c:5286 ../intl-scm/guile-strings.c:5358
 msgid "Sort Method"
 msgstr "Sortierreihenfolge"
 
 #. src/report/standard-reports/category-barchart.scm
+#. src/report/standard-reports/gnucash/report/category-barchart.scm
+#. src/report/standard-reports/gnucash/report/daily-reports.scm
+#. src/report/standard-reports/gnucash/report/account-piecharts.scm
 #. src/report/standard-reports/daily-reports.scm
 #. src/report/standard-reports/account-piecharts.scm
-#: ../intl-scm/guile-strings.c:1694 ../intl-scm/guile-strings.c:2804
-#: ../intl-scm/guile-strings.c:2874
+#: ../intl-scm/guile-strings.c:2404 ../intl-scm/guile-strings.c:3028
+#: ../intl-scm/guile-strings.c:4142 ../intl-scm/guile-strings.c:4212
+#: ../intl-scm/guile-strings.c:5292 ../intl-scm/guile-strings.c:5362
 msgid "Show accounts to this depth and not further"
 msgstr ""
 "Konten nur bis zu dieser Verschachtelungstiefe anzeigen (überstimmt alle "
 "anderen Optionen)."
 
 #. src/report/standard-reports/category-barchart.scm
+#. src/report/standard-reports/gnucash/report/category-barchart.scm
+#. src/report/standard-reports/gnucash/report/account-piecharts.scm
 #. src/report/standard-reports/account-piecharts.scm
-#: ../intl-scm/guile-strings.c:1696 ../intl-scm/guile-strings.c:2876
+#: ../intl-scm/guile-strings.c:2406 ../intl-scm/guile-strings.c:3030
+#: ../intl-scm/guile-strings.c:4214 ../intl-scm/guile-strings.c:5364
 msgid "Show the full account name in legend?"
 msgstr "Lange Kontenbezeichung in der Legende anzeigen?"
 
 #. src/report/standard-reports/category-barchart.scm
-#: ../intl-scm/guile-strings.c:1698
+#. src/report/standard-reports/gnucash/report/category-barchart.scm
+#: ../intl-scm/guile-strings.c:2408 ../intl-scm/guile-strings.c:3032
 msgid "Show barchart as stacked barchart? (Guppi>=0.35.4 required)"
 msgstr ""
 "Balkendiagram mit gestapelten Balken anzeigen? (Benötigt Guppi >=0.35.4)"
 
 #. src/report/standard-reports/category-barchart.scm
-#: ../intl-scm/guile-strings.c:1700
+#. src/report/standard-reports/gnucash/report/category-barchart.scm
+#: ../intl-scm/guile-strings.c:2410 ../intl-scm/guile-strings.c:3034
 msgid "Maximum number of bars in the chart"
 msgstr "Maximale Anzahl Segmente im Diagramm"
 
 #. src/report/standard-reports/category-barchart.scm
-#: ../intl-scm/guile-strings.c:1704
+#. src/report/standard-reports/gnucash/report/category-barchart.scm
+#: ../intl-scm/guile-strings.c:2414 ../intl-scm/guile-strings.c:3038
 #, c-format
 msgid "Balances %s to %s"
 msgstr "Salden %s bis %s"
 
 #. src/report/standard-reports/category-barchart.scm
+#. src/report/standard-reports/gnucash/report/category-barchart.scm
+#. src/report/standard-reports/gnucash/report/account-piecharts.scm
 #. src/report/standard-reports/account-piecharts.scm
-#: ../intl-scm/guile-strings.c:1708 ../intl-scm/guile-strings.c:2888
+#: ../intl-scm/guile-strings.c:2418 ../intl-scm/guile-strings.c:3042
+#: ../intl-scm/guile-strings.c:4226 ../intl-scm/guile-strings.c:5376
 msgid "and"
 msgstr "und"
 
 #. src/report/standard-reports/portfolio.scm
-#: ../intl-scm/guile-strings.c:1710
+#. src/report/standard-reports/gnucash/report/portfolio.scm
+#: ../intl-scm/guile-strings.c:2420 ../intl-scm/guile-strings.c:3044
 msgid "Investment Portfolio"
 msgstr "Portfolio"
 
 #. src/report/standard-reports/portfolio.scm
+#. src/report/standard-reports/gnucash/report/portfolio.scm
+#. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
 #. src/report/standard-reports/advanced-portfolio.scm
-#: ../intl-scm/guile-strings.c:1714 ../intl-scm/guile-strings.c:1958
+#: ../intl-scm/guile-strings.c:2424 ../intl-scm/guile-strings.c:3048
+#: ../intl-scm/guile-strings.c:3292 ../intl-scm/guile-strings.c:4442
 msgid "Share decimal places"
 msgstr "Dezimalstellen für Aktien"
 
 #. src/report/standard-reports/portfolio.scm
+#. src/report/standard-reports/gnucash/report/portfolio.scm
+#. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
 #. src/report/standard-reports/advanced-portfolio.scm
-#: ../intl-scm/guile-strings.c:1716 ../intl-scm/guile-strings.c:1960
+#: ../intl-scm/guile-strings.c:2426 ../intl-scm/guile-string